From bc3ec2c411ed929365d964e4cd9520787ffd4858 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 11 Nov 2025 22:28:36 +0000 Subject: [PATCH 1/4] Initial plan From 383de01f672a563a6bfb551944d2e633979e76c3 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 11 Nov 2025 22:43:35 +0000 Subject: [PATCH 2/4] Update to .NET 10 and version 11.0 with all dependencies Co-authored-by: danielchalmers <7112040+danielchalmers@users.noreply.github.com> --- Directory.Build.props | 6 +++--- JournalApp.Tests/JournalApp.Tests.csproj | 15 +++++++++++---- JournalApp/JournalApp.csproj | 22 +++++++++++----------- global.json | 2 +- version.json | 2 +- 5 files changed, 27 insertions(+), 20 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 31675eb7..099ab7be 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -2,14 +2,14 @@ - $(TargetFrameworks);net9.0 + $(TargetFrameworks);net10.0 BL0007,CA1822,CA2254,IDE0079,IDE0305 - 26 - 35 + 27 + 36 10.0.19041.0 10.0.19041.0 diff --git a/JournalApp.Tests/JournalApp.Tests.csproj b/JournalApp.Tests/JournalApp.Tests.csproj index a9df7341..ef072bdc 100644 --- a/JournalApp.Tests/JournalApp.Tests.csproj +++ b/JournalApp.Tests/JournalApp.Tests.csproj @@ -2,15 +2,22 @@ enable + true + + + + + + - - - + + + - + runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/JournalApp/JournalApp.csproj b/JournalApp/JournalApp.csproj index 131bca24..a0708a9d 100644 --- a/JournalApp/JournalApp.csproj +++ b/JournalApp/JournalApp.csproj @@ -1,9 +1,9 @@  - $(TargetFrameworks);net9.0-android - $(TargetFrameworks);net9.0-windows10.0.19041.0 - Exe + $(TargetFrameworks);net10.0-android + $(TargetFrameworks);net10.0-windows10.0.19041.0 + Exe JournalApp true true @@ -48,17 +48,17 @@ - - - - - + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - + + + diff --git a/global.json b/global.json index 10ae6832..cca5e9a3 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "9.0.300", + "version": "10.0.100", "rollForward": "latestPatch", "allowPrerelease": false } diff --git a/version.json b/version.json index 720094ff..f753a0ca 100644 --- a/version.json +++ b/version.json @@ -1,6 +1,6 @@ { "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json", - "version": "10.0", + "version": "11.0", "publicReleaseRefSpec": [ "^refs/heads/main$" // we release out of main ] From e918b8530ac1d7b6882dd7ee51b12ec529fb7cf0 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 12 Nov 2025 17:42:45 +0000 Subject: [PATCH 3/4] Remove DisableStaticWebAssets property and refine workaround Co-authored-by: danielchalmers <7112040+danielchalmers@users.noreply.github.com> --- JournalApp.Tests/JournalApp.Tests.csproj | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/JournalApp.Tests/JournalApp.Tests.csproj b/JournalApp.Tests/JournalApp.Tests.csproj index ef072bdc..52e937f8 100644 --- a/JournalApp.Tests/JournalApp.Tests.csproj +++ b/JournalApp.Tests/JournalApp.Tests.csproj @@ -2,9 +2,11 @@ enable - true + false + true + From 7065430109a08cc11a80023f833c415ea5f83882 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Thu, 13 Nov 2025 23:57:48 +0000 Subject: [PATCH 4/4] Update GitHub workflows to use .NET 10 Co-authored-by: danielchalmers <7112040+danielchalmers@users.noreply.github.com> --- .github/actions/full-build/action.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/actions/full-build/action.yml b/.github/actions/full-build/action.yml index 7b6acea9..4af6e27a 100644 --- a/.github/actions/full-build/action.yml +++ b/.github/actions/full-build/action.yml @@ -52,7 +52,7 @@ runs: if: inputs.ENABLE_SIGNING == 'true' shell: bash run: > - dotnet publish ./JournalApp/JournalApp.csproj -o publish -c:Release -f:net9.0-android + dotnet publish ./JournalApp/JournalApp.csproj -o publish -c:Release -f:net10.0-android -p:AndroidKeyStore=True -p:AndroidSigningKeyStore="${{ steps.create_keystore.outputs.filePath }}" -p:AndroidSigningStorePass="${{ inputs.RELEASE_KEYSTORE_PASS }}" @@ -63,7 +63,7 @@ runs: if: inputs.ENABLE_SIGNING != 'true' shell: bash run: > - dotnet publish ./JournalApp/JournalApp.csproj -o publish -c:Release -f:net9.0-android + dotnet publish ./JournalApp/JournalApp.csproj -o publish -c:Release -f:net10.0-android - name: List build output shell: bash