From 6665e1410040716e4386f112ca8993eba764ab1b Mon Sep 17 00:00:00 2001 From: Roman Date: Thu, 28 Oct 2021 17:07:25 +0300 Subject: [PATCH] Update badges (#105) * Update badges. CleanUp * Cleanup builder * Remove gitlab CI --- .gitignore | 2 + .gitlab-ci.yml | 125 ------------------ .nuke/build.schema.json | 103 --------------- {installer => Installer}/Installer.cs | 2 +- {installer => Installer}/Installer.csproj | 0 .../Resources/Icons/BackgroundImage.png | Bin .../Resources/Icons/BannerImage.png | Bin .../Resources/Icons/ShellIcon.ico | Bin LICENSE => License.md | 40 +++--- README.md => Readme.md | 12 +- RevitLookup.sln | 2 +- RevitLookup/RevitLookup.csproj | 4 - build/Build.CI.AzurePipelines.cs | 9 -- build/Build.Properties.cs | 1 - build/Build.cs | 2 - 15 files changed, 31 insertions(+), 271 deletions(-) delete mode 100644 .gitlab-ci.yml delete mode 100644 .nuke/build.schema.json rename {installer => Installer}/Installer.cs (98%) rename {installer => Installer}/Installer.csproj (100%) rename {installer => Installer}/Resources/Icons/BackgroundImage.png (100%) rename {installer => Installer}/Resources/Icons/BannerImage.png (100%) rename {installer => Installer}/Resources/Icons/ShellIcon.ico (100%) rename LICENSE => License.md (98%) rename README.md => Readme.md (91%) delete mode 100644 build/Build.CI.AzurePipelines.cs diff --git a/.gitignore b/.gitignore index 961f0fedd..240941546 100644 --- a/.gitignore +++ b/.gitignore @@ -93,6 +93,7 @@ AppPackages/ # Others .idea/ output/ +temp/ [Bb]in [Oo]bj sql @@ -104,6 +105,7 @@ ClientBin ~$* *.dbmdl Generated_Code #added for RIA/Silverlight projects +build.schema.json # Backup & report files from converting an old project file to a newer # Visual Studio version. Backup files are not needed, because we have git ;-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml deleted file mode 100644 index 6e055d14d..000000000 --- a/.gitlab-ci.yml +++ /dev/null @@ -1,125 +0,0 @@ -stages: - - download-revit-api - - build - - sign - - publish - -download-revit-api: - stage: download-revit-api - image: alpine:3.13 - variables: - REVIT_API_URL: https://cdn.bim.ag/revit/2022/RevitAPI.dll - REVIT_API_CHECKSUM: a60011776a7b4994235150ea3ff14929626db97c115ff59ac7524153bb98b48b - REVIT_APIUI_URL: https://cdn.bim.ag/revit/2022/RevitAPIUI.dll - REVIT_APIUI_CHECKSUM: 65ada14a92857debb7ca985a927d75577d1b4bd189fc9d8a061496bd6a19ddbf - GIT_STRATEGY: none - script: - - apk add --update --no-cache curl - - mkdir revit-api - - | - echo "${REVIT_API_CHECKSUM} -" > /tmp/checksum \ - && curl -L "${REVIT_API_URL}" \ - | tee revit-api/RevitAPI.dll \ - | sha256sum -c /tmp/checksum - - | - echo "${REVIT_APIUI_CHECKSUM} -" > /tmp/checksum \ - && curl -L "${REVIT_APIUI_URL}" \ - | tee revit-api/RevitAPIUI.dll \ - | sha256sum -c /tmp/checksum - artifacts: - paths: - - revit-api/ - expire_in: 1 day - -build: - stage: build - tags: - - shared-windows - - windows - - windows-1809 - dependencies: - - download-revit-api - variables: - LOOKUP_CONFIGURATION: Release - LOOKUP_SOLUTION: RevitLookup.sln - PATH_BUILD_TOOLS: C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\MSBuild\Current\Bin - DOTNET_CLI_TELEMETRY_OPTOUT: 1 - before_script: - - $env:Path += ";${PATH_BUILD_TOOLS}" - - choco install netfx-4.8-devpack -y - script: - - dotnet restore "${LOOKUP_SOLUTION}" - - if (-not $?) { throw "Restore failed" } - - # We can't use `dotnet msbuild` here because of some embedded resource issue. - - msbuild -p:Configuration=${LOOKUP_CONFIGURATION} -p:CI=True "${LOOKUP_SOLUTION}" - - if (-not $?) { throw "Build failed" } - - - mkdir artifacts - - cp "RevitLookup/bin/${LOOKUP_CONFIGURATION}/RevitLookup.dll" artifacts/ - - cp "RevitLookup/bin/${LOOKUP_CONFIGURATION}/RevitLookup.pdb" artifacts/ - - cp "RevitLookup/RevitLookup.addin" artifacts/ - artifacts: - paths: - - artifacts/ - expire_in: 1 day - -sign: - stage: sign - image: debian:buster-slim - dependencies: - - build - variables: - ASSEMBLY: artifacts/RevitLookup.dll - TIMESERVER: http://timestamp.digicert.com - DEBIAN_FRONTEND: noninteractive - GIT_STRATEGY: none - script: - - apt-get update && apt-get install -y --no-install-recommends osslsigncode - - mkdir -p .secrets && mount -t ramfs -o size=1M ramfs .secrets/ - - echo "${CODESIGN_CERTIFICATE}" | base64 --decode > .secrets/authenticode.spc - - echo "${CODESIGN_KEY}" | base64 --decode > .secrets/authenticode.key - - osslsigncode -h sha1 -spc .secrets/authenticode.spc -key .secrets/authenticode.key -t ${TIMESERVER} -in "${ASSEMBLY}" -out "${ASSEMBLY}-sha1" - - osslsigncode -nest -h sha2 -spc .secrets/authenticode.spc -key .secrets/authenticode.key -t ${TIMESERVER} -in "${ASSEMBLY}-sha1" -out "${ASSEMBLY}" - - rm "${ASSEMBLY}-sha1" - after_script: - - rmdir .secrets - artifacts: - paths: - - artifacts/ - expire_in: 1 day - only: - variables: - - $CODESIGN_CERTIFICATE != null - - $CODESIGN_KEY != null - -publish: - stage: publish - image: alpine:3.13 - dependencies: - - sign - variables: - GIT_STRATEGY: none - before_script: - - | - if [ -n "${CI_COMMIT_TAG}" ]; then - export RELEASE_NAME="${CI_COMMIT_TAG}" - export S3_FOLDER="releases" - else - export RELEASE_NAME="${CI_COMMIT_BRANCH}-$(date --utc -Iseconds)" - export S3_FOLDER="current" - fi - - export ZIP="${RELEASE_NAME}.7z" - - - apk add --update --no-cache curl jq py-pip p7zip - - pip install awscli - - eval $(aws ecr get-login --no-include-email --region $AWS_REGION | sed 's|https://||') - script: - - 7z a "${ZIP}" ./artifacts/* - - aws s3 cp "${ZIP}" "s3://${S3_BUCKET_NAME}/${S3_FOLDER}/${ZIP}" - only: - variables: - - $AWS_ACCESS_KEY_ID != null - - $AWS_SECRET_ACCESS_KEY != null - - $AWS_REGION != null - - $S3_BUCKET_NAME != null diff --git a/.nuke/build.schema.json b/.nuke/build.schema.json deleted file mode 100644 index d9d40020e..000000000 --- a/.nuke/build.schema.json +++ /dev/null @@ -1,103 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-04/schema#", - "title": "Build Schema", - "$ref": "#/definitions/build", - "definitions": { - "build": { - "type": "object", - "properties": { - "Continue": { - "type": "boolean", - "description": "Indicates to continue a previously failed build attempt" - }, - "Help": { - "type": "boolean", - "description": "Shows the help text for this build assembly" - }, - "Host": { - "type": "string", - "description": "Host for execution. Default is 'automatic'", - "enum": [ - "AppVeyor", - "AzurePipelines", - "Bamboo", - "Bitrise", - "GitHubActions", - "GitLab", - "Jenkins", - "Rider", - "SpaceAutomation", - "TeamCity", - "Terminal", - "TravisCI", - "VisualStudio", - "VSCode" - ] - }, - "NoLogo": { - "type": "boolean", - "description": "Disables displaying the NUKE logo" - }, - "Partition": { - "type": "string", - "description": "Partition to use on CI" - }, - "Plan": { - "type": "boolean", - "description": "Shows the execution plan (HTML)" - }, - "Profile": { - "type": "array", - "description": "Defines the profiles to load", - "items": { - "type": "string" - } - }, - "Root": { - "type": "string", - "description": "Root directory during build execution" - }, - "Skip": { - "type": "array", - "description": "List of targets to be skipped. Empty list skips all dependencies", - "items": { - "type": "string", - "enum": [ - "Cleaning", - "Compile", - "CreateInstaller", - "Restore" - ] - } - }, - "Solution": { - "type": "string", - "description": "Path to a solution file that is automatically loaded" - }, - "Target": { - "type": "array", - "description": "List of targets to be invoked. Default is '{default_target}'", - "items": { - "type": "string", - "enum": [ - "Cleaning", - "Compile", - "CreateInstaller", - "Restore" - ] - } - }, - "Verbosity": { - "type": "string", - "description": "Logging verbosity during build execution. Default is 'Normal'", - "enum": [ - "Minimal", - "Normal", - "Quiet", - "Verbose" - ] - } - } - } - } -} \ No newline at end of file diff --git a/installer/Installer.cs b/Installer/Installer.cs similarity index 98% rename from installer/Installer.cs rename to Installer/Installer.cs index 5989d6979..fa9359ba3 100644 --- a/installer/Installer.cs +++ b/Installer/Installer.cs @@ -16,7 +16,7 @@ public static class Installer private const string ProjectName = "RevitLookup"; private const string OutputName = "RevitLookup"; private const string OutputDir = "output"; - private const string Version = "22.0.1.2"; + private const string Version = "22.0.1.3"; public static void Main(string[] args) { diff --git a/installer/Installer.csproj b/Installer/Installer.csproj similarity index 100% rename from installer/Installer.csproj rename to Installer/Installer.csproj diff --git a/installer/Resources/Icons/BackgroundImage.png b/Installer/Resources/Icons/BackgroundImage.png similarity index 100% rename from installer/Resources/Icons/BackgroundImage.png rename to Installer/Resources/Icons/BackgroundImage.png diff --git a/installer/Resources/Icons/BannerImage.png b/Installer/Resources/Icons/BannerImage.png similarity index 100% rename from installer/Resources/Icons/BannerImage.png rename to Installer/Resources/Icons/BannerImage.png diff --git a/installer/Resources/Icons/ShellIcon.ico b/Installer/Resources/Icons/ShellIcon.ico similarity index 100% rename from installer/Resources/Icons/ShellIcon.ico rename to Installer/Resources/Icons/ShellIcon.ico diff --git a/LICENSE b/License.md similarity index 98% rename from LICENSE rename to License.md index f690ee458..0c4656a85 100644 --- a/LICENSE +++ b/License.md @@ -1,20 +1,20 @@ -The MIT License (MIT) - -Copyright (c) 2013-Current by Jeremy Tammik, Autodesk Inc. - -Permission is hereby granted, free of charge, to any person obtaining a copy of -this software and associated documentation files (the "Software"), to deal in -the Software without restriction, including without limitation the rights to -use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of -the Software, and to permit persons to whom the Software is furnished to do so, -subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS -FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR -COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER -IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +The MIT License (MIT) + +Copyright (c) 2013-Current by Jeremy Tammik, Autodesk Inc. + +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of +the Software, and to permit persons to whom the Software is furnished to do so, +subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS +FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR +COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/README.md b/Readme.md similarity index 91% rename from README.md rename to Readme.md index 26f0643e5..efa986224 100644 --- a/README.md +++ b/Readme.md @@ -1,10 +1,12 @@ # RevitLookup -[![Revit API](https://img.shields.io/badge/Revit%20API-2022-blue.svg)]() -[![Platform](https://img.shields.io/badge/platform-Windows-lightgray.svg)]() -[![.NET](https://img.shields.io/badge/.NET-4.8-blue.svg)]() -[![License](http://img.shields.io/:license-mit-blue.svg)](http://opensource.org/licenses/MIT) -[![Build Status](https://gitlab.com/buildinformed-public/revitlookup/badges/master/pipeline.svg)](https://lookupbuilds.com) +

+ + + + + +

Interactive Revit BIM database exploration tool to view and navigate BIM element parameters, properties and relationships. diff --git a/RevitLookup.sln b/RevitLookup.sln index 2a26cab09..c857d625f 100644 --- a/RevitLookup.sln +++ b/RevitLookup.sln @@ -12,7 +12,7 @@ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{8FF48108-2C4C-4389-92DC-CCC4F153190F}" ProjectSection(SolutionItems) = preProject Changelog.md = Changelog.md - README.md = README.md + Readme.md = Readme.md Wishlist.md = Wishlist.md EndProjectSection EndProject diff --git a/RevitLookup/RevitLookup.csproj b/RevitLookup/RevitLookup.csproj index 110f4fead..79ed58407 100644 --- a/RevitLookup/RevitLookup.csproj +++ b/RevitLookup/RevitLookup.csproj @@ -5,8 +5,6 @@ net48 Library true - 2022.0.1.3 - 2022.0.1.3 true false false @@ -51,7 +49,5 @@ - - diff --git a/build/Build.CI.AzurePipelines.cs b/build/Build.CI.AzurePipelines.cs deleted file mode 100644 index a8e3bc49e..000000000 --- a/build/Build.CI.AzurePipelines.cs +++ /dev/null @@ -1,9 +0,0 @@ -using Nuke.Common.CI.AzurePipelines; - -[AzurePipelines(AzurePipelinesImage.WindowsLatest, - AutoGenerate = false, - TriggerBranchesInclude = new[] {"main"}, - PullRequestsBranchesInclude = new[] {"main"})] -partial class Build -{ -} \ No newline at end of file diff --git a/build/Build.Properties.cs b/build/Build.Properties.cs index 7ec387298..dc1f52824 100644 --- a/build/Build.Properties.cs +++ b/build/Build.Properties.cs @@ -16,7 +16,6 @@ partial class Build //The libraries below use the AfterBuild target //Change the version here if it is different from the one specified in the .csproj file const string WixTargetPath = @"%USERPROFILE%\.nuget\packages\wixsharp\1.18.1\build\WixSharp.targets"; - const string IlRepackTargetPath = @"%USERPROFILE%\.nuget\packages\ilrepack.lib.msbuild.task\2.0.18.2\build\ILRepack.Lib.MSBuild.Task.targets"; //Specify the path to the MSBuild.exe file here if you are not using VisualStudio const string CustomMsBuildPath = @"C:\Program Files\JetBrains\JetBrains Rider\tools\MSBuild\Current\Bin\MSBuild.exe"; diff --git a/build/Build.cs b/build/Build.cs index c2c127237..2e1539634 100644 --- a/build/Build.cs +++ b/build/Build.cs @@ -41,10 +41,8 @@ partial class Build : NukeBuild } var wixTargetPath = Environment.ExpandEnvironmentVariables(WixTargetPath); - var ilTargetPath = Environment.ExpandEnvironmentVariables(IlRepackTargetPath); if (File.Exists(wixTargetPath)) ReplaceFileText("", wixTargetPath, 3); - if (File.Exists(ilTargetPath)) ReplaceFileText("", ilTargetPath, 13); if (IsServerBuild) return; foreach (var projectName in Projects)