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 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..52e937f8 100644 --- a/JournalApp.Tests/JournalApp.Tests.csproj +++ b/JournalApp.Tests/JournalApp.Tests.csproj @@ -2,15 +2,24 @@ enable + false + 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 ]