From 4080688d6504b0aef738c31aa7a598ec3a1723e2 Mon Sep 17 00:00:00 2001 From: clovett Date: Wed, 15 Nov 2023 19:36:41 -0800 Subject: [PATCH 1/4] move to .net 8 --- Source/WPF/EdgeDetectionTest/EdgeDetectionTest.csproj | 2 +- Source/WPF/FindUnusedStyles/FindUnusedStyles.csproj | 2 +- Source/WPF/MyMoney/MyMoney.csproj | 2 +- Source/WPF/OfxTestServer/OfxTestServer.csproj | 2 +- Source/WPF/ScenarioTest/ScenarioTest.csproj | 2 +- Source/WPF/UnitTests/UnitTests.csproj | 2 +- Source/WPF/UpdateVersion/UpdateVersion.csproj | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Source/WPF/EdgeDetectionTest/EdgeDetectionTest.csproj b/Source/WPF/EdgeDetectionTest/EdgeDetectionTest.csproj index c69f6cb8..17e14bbe 100644 --- a/Source/WPF/EdgeDetectionTest/EdgeDetectionTest.csproj +++ b/Source/WPF/EdgeDetectionTest/EdgeDetectionTest.csproj @@ -1,7 +1,7 @@  - net7.0-windows + net8.0-windows WinExe false true diff --git a/Source/WPF/FindUnusedStyles/FindUnusedStyles.csproj b/Source/WPF/FindUnusedStyles/FindUnusedStyles.csproj index 34e80877..dabc97d1 100644 --- a/Source/WPF/FindUnusedStyles/FindUnusedStyles.csproj +++ b/Source/WPF/FindUnusedStyles/FindUnusedStyles.csproj @@ -2,7 +2,7 @@ Exe - net7.0-windows + net8.0-windows7.0 true diff --git a/Source/WPF/MyMoney/MyMoney.csproj b/Source/WPF/MyMoney/MyMoney.csproj index d4826d51..d6c84573 100644 --- a/Source/WPF/MyMoney/MyMoney.csproj +++ b/Source/WPF/MyMoney/MyMoney.csproj @@ -1,7 +1,7 @@  - net7.0-windows + net8.0-windows7.0 WinExe false true diff --git a/Source/WPF/OfxTestServer/OfxTestServer.csproj b/Source/WPF/OfxTestServer/OfxTestServer.csproj index f9d30780..ec3f209d 100644 --- a/Source/WPF/OfxTestServer/OfxTestServer.csproj +++ b/Source/WPF/OfxTestServer/OfxTestServer.csproj @@ -1,7 +1,7 @@  WinExe - net7.0-windows + net8.0-windows7.0 true OfxTestServer diff --git a/Source/WPF/ScenarioTest/ScenarioTest.csproj b/Source/WPF/ScenarioTest/ScenarioTest.csproj index 4c934a02..7d70d837 100644 --- a/Source/WPF/ScenarioTest/ScenarioTest.csproj +++ b/Source/WPF/ScenarioTest/ScenarioTest.csproj @@ -1,7 +1,7 @@  - net7.0-windows + net8.0-windows7.0 enable true true diff --git a/Source/WPF/UnitTests/UnitTests.csproj b/Source/WPF/UnitTests/UnitTests.csproj index 040b1766..475dc6d5 100644 --- a/Source/WPF/UnitTests/UnitTests.csproj +++ b/Source/WPF/UnitTests/UnitTests.csproj @@ -1,7 +1,7 @@  - net7.0-windows + net8.0-windows7.0 enable Walkabout.Tests false diff --git a/Source/WPF/UpdateVersion/UpdateVersion.csproj b/Source/WPF/UpdateVersion/UpdateVersion.csproj index ba464ce4..b2718c7f 100644 --- a/Source/WPF/UpdateVersion/UpdateVersion.csproj +++ b/Source/WPF/UpdateVersion/UpdateVersion.csproj @@ -2,7 +2,7 @@ Exe - net7.0 + net8.0 enable From db99e130b6efdc8b30e973939c33c8e4bf4a2b6d Mon Sep 17 00:00:00 2001 From: clovett Date: Wed, 15 Nov 2023 22:16:39 -0800 Subject: [PATCH 2/4] setup .net 8 --- .github/workflows/dotnet-desktop.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/dotnet-desktop.yml b/.github/workflows/dotnet-desktop.yml index 7f20befc..adf3c4fa 100644 --- a/.github/workflows/dotnet-desktop.yml +++ b/.github/workflows/dotnet-desktop.yml @@ -71,6 +71,11 @@ jobs: - name: Setup NuGet.exe uses: NuGet/setup-nuget@v1 + - name: Setup .NET 8 + uses: actions/setup-dotnet@v3 + with: + dotnet-version: '8.0.x' + # Add MSBuild to the PATH: https://github.com/microsoft/setup-msbuild - name: Setup MSBuild.exe uses: microsoft/setup-msbuild@v1.0.2 From 492b560bdf9a6cdab8f04d652142c667ecc4fbac Mon Sep 17 00:00:00 2001 From: clovett Date: Wed, 15 Nov 2023 22:24:19 -0800 Subject: [PATCH 3/4] fix version. --- .github/workflows/dotnet-desktop.yml | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/.github/workflows/dotnet-desktop.yml b/.github/workflows/dotnet-desktop.yml index adf3c4fa..81eda4eb 100644 --- a/.github/workflows/dotnet-desktop.yml +++ b/.github/workflows/dotnet-desktop.yml @@ -84,15 +84,6 @@ jobs: - name: Setup VSTest Path uses: darenm/Setup-VSTest@v1.2 - # - name: Install Windows SDK 10.0.18362 - # uses: fbactions/setup-winsdk@v1 - # with: - # winsdk-build-version: 18362 - - # Execute all unit tests in the solution - # - name: Execute unit tests - # run: dotnet test - # Restore the application to populate the obj folder with RuntimeIdentifiers - name: Restore the application run: nuget restore $env:Solution_Name @@ -108,7 +99,7 @@ jobs: # Test the application. - name: Run unit tests - run: vstest.console /Platform:x64 Source\WPF\UnitTests\bin\$env:Configuration\net7.0-windows\UnitTests.dll + run: vstest.console /Platform:x64 Source\WPF\UnitTests\bin\$env:Configuration\net8.0-windows\UnitTests.dll env: Configuration: ${{ matrix.configuration }} Platform: ${{ matrix.platform }} From 1d1cb72bd90ea621a72029fa3c46856f67ea8423 Mon Sep 17 00:00:00 2001 From: clovett Date: Wed, 15 Nov 2023 22:33:07 -0800 Subject: [PATCH 4/4] fix version. --- .github/workflows/dotnet-desktop.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dotnet-desktop.yml b/.github/workflows/dotnet-desktop.yml index 81eda4eb..fc5eccde 100644 --- a/.github/workflows/dotnet-desktop.yml +++ b/.github/workflows/dotnet-desktop.yml @@ -99,7 +99,7 @@ jobs: # Test the application. - name: Run unit tests - run: vstest.console /Platform:x64 Source\WPF\UnitTests\bin\$env:Configuration\net8.0-windows\UnitTests.dll + run: vstest.console /Platform:x64 Source\WPF\UnitTests\bin\$env:Configuration\net8.0-windows7.0\UnitTests.dll env: Configuration: ${{ matrix.configuration }} Platform: ${{ matrix.platform }}