From 7b3d54069983767d76b38f00d5181bb397492b21 Mon Sep 17 00:00:00 2001 From: vnoves Date: Fri, 20 Dec 2024 15:47:56 -0300 Subject: [PATCH 1/2] Updated Installer --- SampleRevitAddin.Installer/InstallScript.iss | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/SampleRevitAddin.Installer/InstallScript.iss b/SampleRevitAddin.Installer/InstallScript.iss index e8fb483..79a3b8f 100644 --- a/SampleRevitAddin.Installer/InstallScript.iss +++ b/SampleRevitAddin.Installer/InstallScript.iss @@ -23,6 +23,8 @@ DisableProgramGroupPage=yes #define Revit2021 "\Autodesk\ApplicationPlugins\SampleRevitAddin.bundle\Contents\2021\" #define Revit2022 "\Autodesk\ApplicationPlugins\SampleRevitAddin.bundle\Contents\2022\" #define Revit2023 "\Autodesk\ApplicationPlugins\SampleRevitAddin.bundle\Contents\2023\" +#define Revit2023 "\Autodesk\ApplicationPlugins\SampleRevitAddin.bundle\Contents\2024\" +#define Revit2023 "\Autodesk\ApplicationPlugins\SampleRevitAddin.bundle\Contents\2025\" ; Uncomment the following line to run in non administrative install mode (install for current user only.) ;PrivilegesRequired=lowest @@ -56,7 +58,13 @@ Source: "..\SampleRevitAddin.2022\bin\Release\*"; DestDir: "{userappdata}{#Revit Source: "..\SampleRevitAddin.Common\SampleRevitAddin.addin"; DestDir: "{userappdata}{#Revit2022}\"; Flags: ignoreversion recursesubdirs createallsubdirs Source: "..\SampleRevitAddin.2023\bin\Release\*"; DestDir: "{userappdata}{#Revit2023}\"; Flags: ignoreversion recursesubdirs createallsubdirs -Source: "..\SampleRevitAddin.Common\SampleRevitAddin.addin"; DestDir: "{userappdata}{#Revit2022}\"; Flags: ignoreversion recursesubdirs createallsubdirs +Source: "..\SampleRevitAddin.Common\SampleRevitAddin.addin"; DestDir: "{userappdata}{#Revit2023}\"; Flags: ignoreversion recursesubdirs createallsubdirs + +Source: "..\SampleRevitAddin.2024\bin\Release\*"; DestDir: "{userappdata}{#Revit2024}\"; Flags: ignoreversion recursesubdirs createallsubdirs +Source: "..\SampleRevitAddin.Common\SampleRevitAddin.addin"; DestDir: "{userappdata}{#Revit2024}\"; Flags: ignoreversion recursesubdirs createallsubdirs + +Source: "..\SampleRevitAddin.2025\bin\Release\*"; DestDir: "{userappdata}{#Revit2025}\"; Flags: ignoreversion recursesubdirs createallsubdirs +Source: "..\SampleRevitAddin.Common\SampleRevitAddin.addin"; DestDir: "{userappdata}{#Revit2025}\"; Flags: ignoreversion recursesubdirs createallsubdirs Source: "..\SampleRevitAddin.Common\PackageContents.xml"; DestDir: "{userappdata}\Autodesk\ApplicationPlugins\SampleRevitAddin.bundle\"; Flags: ignoreversion From 0edb3b8f6bb17e4a75a5592414800374a0e5a12c Mon Sep 17 00:00:00 2001 From: vnoves Date: Fri, 20 Dec 2024 16:07:15 -0300 Subject: [PATCH 2/2] fixed action Adjusted Command action Adjust Workflow updated .net version github action Added new version .net core github actions Fixed ISS --- .github/workflows/dev_actions.yml | 19 ++++++++++++------- .github/workflows/production_actions.yml | 12 ++++++++++++ SampleRevitAddin.Installer/InstallScript.iss | 4 ++-- SampleRevitAddin.sln | 2 ++ 4 files changed, 28 insertions(+), 9 deletions(-) diff --git a/.github/workflows/dev_actions.yml b/.github/workflows/dev_actions.yml index 402228c..45b733a 100644 --- a/.github/workflows/dev_actions.yml +++ b/.github/workflows/dev_actions.yml @@ -21,11 +21,17 @@ jobs: with: fetch-depth: 0 - # Install .NET Core 3.1 SDK - - name: Install .NET Core 3.1 SDK - run: | - wget https://download.visualstudio.microsoft.com/download/pr/7987e2b2-15c9-4c3d-b9b3-d372fc4d8caa/3fa02be2e8c8712649819e283a2294a7/dotnet-sdk-3.1.416-win-x64.exe - ./dotnet-sdk-3.1.416-win-x64.exe /quiet + # Setup .NET SDK + - name: Setup .NET SDK 3.1 + uses: actions/setup-dotnet@v2 + with: + dotnet-version: '3.1.x' + + # Setup .NET SDK 8.0 + - name: Setup .NET SDK 8.0 + uses: actions/setup-dotnet@v2 + with: + dotnet-version: '8.0.x' # Install GitVersion - name: Install GitVersion @@ -39,8 +45,7 @@ jobs: useConfigFile: true configFilePath: GitVersion.yml id: gitversion - - id: gitversion # step id used as reference for output values + - name: Display GitVersion outputs run: | echo "MajorMinorPatch: ${{ steps.gitversion.outputs.majorMinorPatch }}" diff --git a/.github/workflows/production_actions.yml b/.github/workflows/production_actions.yml index d675709..2cd2750 100644 --- a/.github/workflows/production_actions.yml +++ b/.github/workflows/production_actions.yml @@ -24,6 +24,18 @@ jobs: with: fetch-depth: 0 + # Setup .NET SDK + - name: Setup .NET SDK 3.1 + uses: actions/setup-dotnet@v2 + with: + dotnet-version: '3.1.x' + + # Setup .NET SDK 8.0 + - name: Setup .NET SDK 8.0 + uses: actions/setup-dotnet@v2 + with: + dotnet-version: '8.0.x' + # install and calculate the new version with GitVersion - name: Install GitVersion uses: gittools/actions/gitversion/setup@v0.9.7 diff --git a/SampleRevitAddin.Installer/InstallScript.iss b/SampleRevitAddin.Installer/InstallScript.iss index 79a3b8f..25a6057 100644 --- a/SampleRevitAddin.Installer/InstallScript.iss +++ b/SampleRevitAddin.Installer/InstallScript.iss @@ -23,8 +23,8 @@ DisableProgramGroupPage=yes #define Revit2021 "\Autodesk\ApplicationPlugins\SampleRevitAddin.bundle\Contents\2021\" #define Revit2022 "\Autodesk\ApplicationPlugins\SampleRevitAddin.bundle\Contents\2022\" #define Revit2023 "\Autodesk\ApplicationPlugins\SampleRevitAddin.bundle\Contents\2023\" -#define Revit2023 "\Autodesk\ApplicationPlugins\SampleRevitAddin.bundle\Contents\2024\" -#define Revit2023 "\Autodesk\ApplicationPlugins\SampleRevitAddin.bundle\Contents\2025\" +#define Revit2024 "\Autodesk\ApplicationPlugins\SampleRevitAddin.bundle\Contents\2024\" +#define Revit2025 "\Autodesk\ApplicationPlugins\SampleRevitAddin.bundle\Contents\2025\" ; Uncomment the following line to run in non administrative install mode (install for current user only.) ;PrivilegesRequired=lowest diff --git a/SampleRevitAddin.sln b/SampleRevitAddin.sln index 33d653b..4e746b4 100644 --- a/SampleRevitAddin.sln +++ b/SampleRevitAddin.sln @@ -16,6 +16,8 @@ EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SampleRevitAddin.Installer", "SampleRevitAddin.Installer\SampleRevitAddin.Installer.csproj", "{54B60FF5-0884-44B9-B25E-C7CD34DEDE3E}" ProjectSection(ProjectDependencies) = postProject {07583564-AFC9-49D3-B859-21ED8C65344E} = {07583564-AFC9-49D3-B859-21ED8C65344E} + {0B0D3DA5-18F0-404D-957A-B5EC9219054D} = {0B0D3DA5-18F0-404D-957A-B5EC9219054D} + {69B4EBC0-B9C5-4317-9BE6-7643C540F155} = {69B4EBC0-B9C5-4317-9BE6-7643C540F155} {8DF231C1-4AF1-4BE2-A713-FC8E97951500} = {8DF231C1-4AF1-4BE2-A713-FC8E97951500} {963B5AB4-BEDA-499E-896F-9FB61FDCC96D} = {963B5AB4-BEDA-499E-896F-9FB61FDCC96D} {AC17C4BE-A7E7-4135-B970-9C5C133CB875} = {AC17C4BE-A7E7-4135-B970-9C5C133CB875}