From 645d766b16952a17775364196e6995d570f83023 Mon Sep 17 00:00:00 2001 From: Francisco Maranchello <49538907+franmaranchello@users.noreply.github.com> Date: Mon, 30 Jan 2023 18:55:02 -0300 Subject: [PATCH] actions to update the version in the installer (#1) (#2) (#3) * Update README.md * actions to update the version in the installer adding license.txt file to the .iss file adding icons to the installer * unnecessary license deleted * Bump version, add version update to staging action, remove duplicate license. --------- Co-authored-by: Daniel Pinheiro <115579683+danielpinheiros@users.noreply.github.com> --- .github/workflows/production_actions.yml | 6 +++--- .github/workflows/staging_actions.yml | 4 ++++ GitVersion.yml | 2 +- SampleRevitAddin.Installer/InstallScript.iss | 17 +++++++++++------ .../Images/Icons/e-verselogo.bmp | Bin 0 -> 98030 bytes .../Images/Icons/e-verselogo.ico | Bin 0 -> 50174 bytes .../SampleRevitAddin.Resources.csproj | 5 +++++ SampleRevitAddin.sln | 2 ++ 8 files changed, 26 insertions(+), 10 deletions(-) create mode 100644 SampleRevitAddin.Resources/Images/Icons/e-verselogo.bmp create mode 100644 SampleRevitAddin.Resources/Images/Icons/e-verselogo.ico diff --git a/.github/workflows/production_actions.yml b/.github/workflows/production_actions.yml index d61090b..d675709 100644 --- a/.github/workflows/production_actions.yml +++ b/.github/workflows/production_actions.yml @@ -51,9 +51,9 @@ jobs: - name: Restore nuGet packages run: nuget restore $env:Solution_Name - - name: Set path for candle and light - run: echo "C:\Program Files (x86)\WiX Toolset v3.11\bin" >> $GITHUB_PATH - shell: bash + # Update the version inside of the .iss file + - name: Updating the version into the installer + run: (Get-Content SampleRevitAddin.Installer/InstallScript.iss) -replace 'MyAppVersion "1.0.0"', 'MyAppVersion "v${{ steps.gitversion.outputs.majorMinorPatch }}"' | Out-File -encoding ASCII SampleRevitAddin.Installer/InstallScript.iss - name: Run MSBuild id: run-msbuild diff --git a/.github/workflows/staging_actions.yml b/.github/workflows/staging_actions.yml index ff95f54..1a1ac9c 100644 --- a/.github/workflows/staging_actions.yml +++ b/.github/workflows/staging_actions.yml @@ -51,6 +51,10 @@ jobs: - name: Restore nuGet packages run: nuget restore $env:Solution_Name + # Update the version inside of the .iss file + - name: Updating the version into the installer + run: (Get-Content SampleRevitAddin.Installer/InstallScript.iss) -replace 'MyAppVersion "1.0.0"', 'MyAppVersion "v${{ steps.gitversion.outputs.majorMinorPatch }}"' | Out-File -encoding ASCII SampleRevitAddin.Installer/InstallScript.iss + - name: Run MSBuild id: run-msbuild run: | diff --git a/GitVersion.yml b/GitVersion.yml index 0777cbe..af3452f 100644 --- a/GitVersion.yml +++ b/GitVersion.yml @@ -1,2 +1,2 @@ mode: ContinuousDeployment -next-version: 0.0.1 \ No newline at end of file +next-version: 0.1.1 \ No newline at end of file diff --git a/SampleRevitAddin.Installer/InstallScript.iss b/SampleRevitAddin.Installer/InstallScript.iss index e41768b..e8fb483 100644 --- a/SampleRevitAddin.Installer/InstallScript.iss +++ b/SampleRevitAddin.Installer/InstallScript.iss @@ -2,7 +2,7 @@ ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! #define MyAppName "SampleRevitAddin" -#define MyAppVersion "1.0" +#define MyAppVersion "1.0.0" #define MyAppPublisher "e-verse" [Setup] @@ -12,33 +12,38 @@ AppId={{264AD411-643C-43AC-9F07-34523C752100} AppName={#MyAppName} #define installerPath "{commonpf64}\e-verse\Snacks\" AppVersion={#MyAppVersion} -;AppVerName={#MyAppName} {#MyAppVersion} +AppVerName={#MyAppName} {#MyAppVersion} AppPublisher={#MyAppPublisher} DefaultDirName={#installerPath} DisableDirPage=yes DefaultGroupName=Revit Extractor DisableProgramGroupPage=yes - #define Revit2020 "\Autodesk\ApplicationPlugins\SampleRevitAddin.bundle\Contents\2020\" #define Revit2021 "\Autodesk\ApplicationPlugins\SampleRevitAddin.bundle\Contents\2021\" #define Revit2022 "\Autodesk\ApplicationPlugins\SampleRevitAddin.bundle\Contents\2022\" #define Revit2023 "\Autodesk\ApplicationPlugins\SampleRevitAddin.bundle\Contents\2023\" - ; Uncomment the following line to run in non administrative install mode (install for current user only.) ;PrivilegesRequired=lowest OutputDir=.\Output OutputBaseFilename=SampleRevitAddin Compression=lzma SolidCompression=yes +SetupIconFile="..\SampleRevitAddin.Resources\Images\Icons\e-verselogo.ico" +OutputManifestFile=Setup-Manifest.txt +UninstallDisplayName="SampleRevitAddin Uninstall" +UninstallDisplayIcon="..\SampleRevitAddin.Resources\Images\Icons\e-verselogo.ico" +WizardSmallImageFile="..\SampleRevitAddin.Resources\Images\Icons\e-verselogo.bmp" WizardStyle=modern [Languages] -Name: "english"; MessagesFile: "compiler:Default.isl" +Name: "english"; MessagesFile: "compiler:Default.isl"; LicenseFile: "..\LICENSE" -[Files] +[Messages] +SetupWindowTitle = Setup {#SetupSetting("AppName")} Version: {#SetupSetting("AppVersion")} +[Files] Source: "..\SampleRevitAddin.2020\bin\Release\*"; DestDir: "{userappdata}{#Revit2020}\"; Flags: ignoreversion recursesubdirs createallsubdirs Source: "..\SampleRevitAddin.Common\SampleRevitAddin.addin"; DestDir: "{userappdata}{#Revit2020}\"; Flags: ignoreversion recursesubdirs createallsubdirs diff --git a/SampleRevitAddin.Resources/Images/Icons/e-verselogo.bmp b/SampleRevitAddin.Resources/Images/Icons/e-verselogo.bmp new file mode 100644 index 0000000000000000000000000000000000000000..0092171fc46be9b957427bd56d8cc80428324454 GIT binary patch literal 98030 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 literal 0 HcmV?d00001 diff --git a/SampleRevitAddin.Resources/Images/Icons/e-verselogo.ico b/SampleRevitAddin.Resources/Images/Icons/e-verselogo.ico new file mode 100644 index 0000000000000000000000000000000000000000..9eb2ce050e9f6b738cb5493dbf12afa8579bf9e6 GIT binary patch literal 50174 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 literal 0 HcmV?d00001 diff --git a/SampleRevitAddin.Resources/SampleRevitAddin.Resources.csproj b/SampleRevitAddin.Resources/SampleRevitAddin.Resources.csproj index cad3ea5..3c1d143 100644 --- a/SampleRevitAddin.Resources/SampleRevitAddin.Resources.csproj +++ b/SampleRevitAddin.Resources/SampleRevitAddin.Resources.csproj @@ -53,5 +53,10 @@ Always + + + + + \ No newline at end of file diff --git a/SampleRevitAddin.sln b/SampleRevitAddin.sln index b60187e..0f0489d 100644 --- a/SampleRevitAddin.sln +++ b/SampleRevitAddin.sln @@ -23,6 +23,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SampleRevitAddin.Installer" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SampleRevitAddin.Resources", "SampleRevitAddin.Resources\SampleRevitAddin.Resources.csproj", "{87317C2B-AF3A-40AD-865C-093FBAA72440}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{3C7DD4D2-E4F4-47CD-88E1-C48C77173C05}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU