From 725fce76ee2407de575f7c8713e546fe8839bd82 Mon Sep 17 00:00:00 2001 From: Tristan Gosselin-Hane Date: Mon, 22 Jan 2024 15:50:00 -0500 Subject: [PATCH 1/2] Upgrade project to .NET 8 --- .github/workflows/build-installer.yml | 2 +- .../Lanpartyseating.Desktop.Tests.csproj | 2 +- Lanpartyseating.Desktop.sln.DotSettings.user | 4 ++-- .../Lanpartyseating.Desktop.csproj | 12 ++++-------- 4 files changed, 8 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build-installer.yml b/.github/workflows/build-installer.yml index 94e8c0b..caa02a8 100644 --- a/.github/workflows/build-installer.yml +++ b/.github/workflows/build-installer.yml @@ -19,7 +19,7 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v3 with: - dotnet-version: 7.0.x + dotnet-version: 8.0.x - name: Cache NuGet packages uses: actions/cache@v3 with: diff --git a/Lanpartyseating.Desktop.Tests/Lanpartyseating.Desktop.Tests.csproj b/Lanpartyseating.Desktop.Tests/Lanpartyseating.Desktop.Tests.csproj index 324fcac..6a0ff07 100644 --- a/Lanpartyseating.Desktop.Tests/Lanpartyseating.Desktop.Tests.csproj +++ b/Lanpartyseating.Desktop.Tests/Lanpartyseating.Desktop.Tests.csproj @@ -1,7 +1,7 @@ - net7.0-windows + net8.0-windows enable enable diff --git a/Lanpartyseating.Desktop.sln.DotSettings.user b/Lanpartyseating.Desktop.sln.DotSettings.user index b57fca0..a612518 100644 --- a/Lanpartyseating.Desktop.sln.DotSettings.user +++ b/Lanpartyseating.Desktop.sln.DotSettings.user @@ -1,11 +1,11 @@  <SessionState ContinuousTestingMode="0" IsActive="True" Name="Test_When_ForThisStationCalled_Then_MatchingStationNumberAndHostnameReturnTrue" xmlns="urn:schemas-jetbrains-com:jetbrains-ut-session"> <TestAncestor> - <TestId>xUnit::8B549C98-F78C-422A-8C26-E1D7A0881CAD::net7.0-windows::Lanpartyseating.Desktop.Tests.UtilsTests.Test_When_ForThisStationCalled_Then_MatchingStationNumberAndHostnameReturnTrue</TestId> + <TestId>xUnit::8B549C98-F78C-422A-8C26-E1D7A0881CAD::net8.0-windows::Lanpartyseating.Desktop.Tests.UtilsTests.Test_When_ForThisStationCalled_Then_MatchingStationNumberAndHostnameReturnTrue</TestId> </TestAncestor> </SessionState> <SessionState ContinuousTestingMode="0" Name="Test_When_ForThisStationCalled_Then_MatchingStationNumberAndHostnameReturnTrue #2" xmlns="urn:schemas-jetbrains-com:jetbrains-ut-session"> <TestAncestor> - <TestId>xUnit::8B549C98-F78C-422A-8C26-E1D7A0881CAD::net7.0-windows::Lanpartyseating.Desktop.Tests.UtilsTests.Test_When_ForThisStationCalled_Then_MatchingStationNumberAndHostnameReturnTrue</TestId> + <TestId>xUnit::8B549C98-F78C-422A-8C26-E1D7A0881CAD::net8.0-windows::Lanpartyseating.Desktop.Tests.UtilsTests.Test_When_ForThisStationCalled_Then_MatchingStationNumberAndHostnameReturnTrue</TestId> </TestAncestor> </SessionState> \ No newline at end of file diff --git a/Lanpartyseating.Desktop/Lanpartyseating.Desktop.csproj b/Lanpartyseating.Desktop/Lanpartyseating.Desktop.csproj index a6d9ee2..6a4b6cb 100644 --- a/Lanpartyseating.Desktop/Lanpartyseating.Desktop.csproj +++ b/Lanpartyseating.Desktop/Lanpartyseating.Desktop.csproj @@ -1,17 +1,16 @@ - Exe - net7.0-windows + net8.0-windows enable enable - - - + + + @@ -27,7 +26,4 @@ Always - - - From c006d1ba646288e887f185ba39f7242cfbcfeaea Mon Sep 17 00:00:00 2001 From: Tristan Gosselin-Hane Date: Mon, 22 Jan 2024 15:50:22 -0500 Subject: [PATCH 2/2] Build both x64 and arm64 installers --- .github/workflows/build-installer.yml | 14 ++++++++--- .../Lanpartyseating.Desktop.Installer.wixproj | 25 +++++++++++-------- .../Lanpartyseating.Desktop.Installer.wxs | 2 +- 3 files changed, 26 insertions(+), 15 deletions(-) diff --git a/.github/workflows/build-installer.yml b/.github/workflows/build-installer.yml index caa02a8..1efa046 100644 --- a/.github/workflows/build-installer.yml +++ b/.github/workflows/build-installer.yml @@ -11,6 +11,12 @@ on: jobs: build: + strategy: + fail-fast: false + matrix: + arch: + - x64 + - arm64 runs-on: windows-latest steps: - uses: actions/checkout@v4 @@ -32,11 +38,11 @@ jobs: - name: Test run: dotnet test --no-restore --verbosity normal Lanpartyseating.Desktop.Tests --configuration Release - name: Build - run: dotnet build LanpartySeating.Desktop.Installer/LanpartySeating.Desktop.Installer.wixproj --configuration Release --property:Version=1.0.20 + run: dotnet build LanpartySeating.Desktop.Installer/LanpartySeating.Desktop.Installer.wixproj --configuration Release --property:Version=1.0.21 /p:InstallerPlatform=${{ matrix.arch }} - name: Upload artifact uses: actions/upload-artifact@v3 with: - name: LanpartySeating.Desktop.Installer + name: LanpartySeating.Desktop.Installer (${{ matrix.arch }}) path: | - LanpartySeating.Desktop.Installer/bin/Release/LanpartySeating.Desktop.Installer.msi - LanpartySeating.Desktop.Installer/bin/Release/LanpartySeating.Desktop.Installer.wixpdb + LanpartySeating.Desktop.Installer/bin/Release/LanpartySeating.Desktop.Installer-${{ matrix.arch }}.msi + LanpartySeating.Desktop.Installer/bin/Release/LanpartySeating.Desktop.Installer-${{ matrix.arch }}.wixpdb diff --git a/LanpartySeating.Desktop.Installer/Lanpartyseating.Desktop.Installer.wixproj b/LanpartySeating.Desktop.Installer/Lanpartyseating.Desktop.Installer.wixproj index 687c8ce..20d1c52 100644 --- a/LanpartySeating.Desktop.Installer/Lanpartyseating.Desktop.Installer.wixproj +++ b/LanpartySeating.Desktop.Installer/Lanpartyseating.Desktop.Installer.wixproj @@ -1,27 +1,32 @@ - + 1.0.0 - $(DefineConstants);Version=$(Version) + $(DefineConstants);Version=$(Version);PublishOutput=..\Lanpartyseating.Desktop\bin\$(Configuration)\net8.0-windows\win-$(InstallerPlatform)\publish package - net7.0-windows - x64 + net8.0-windows + + x64 + LanpartySeating.Desktop.Installer-$(InstallerPlatform) - + INSTALLFOLDER ApplicationFilesComponentGroup true true ExcludeFiles.xslt + var.PublishOutput + + + + + - - - - - + + diff --git a/LanpartySeating.Desktop.Installer/Lanpartyseating.Desktop.Installer.wxs b/LanpartySeating.Desktop.Installer/Lanpartyseating.Desktop.Installer.wxs index bb3962a..d58f54d 100644 --- a/LanpartySeating.Desktop.Installer/Lanpartyseating.Desktop.Installer.wxs +++ b/LanpartySeating.Desktop.Installer/Lanpartyseating.Desktop.Installer.wxs @@ -66,7 +66,7 @@ - +