Skip to content

Update to .NET 10 and version 11.0 #73

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
danielchalmers merged 4 commits into from
Nov 14, 2025
Merged

Update to .NET 10 and version 11.0 #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bc3ec2c
Initial plan
Copilot Nov 11, 2025
383de01
Update to .NET 10 and version 11.0 with all dependencies
Copilot Nov 11, 2025
e918b85
Remove DisableStaticWebAssets property and refine workaround
Copilot Nov 12, 2025
7065430
Update GitHub workflows to use .NET 10
Copilot Nov 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/actions/full-build/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}"
Expand All @@ -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
Expand Down
6 changes: 3 additions & 3 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@

<!-- Build -->
<PropertyGroup>
<TargetFrameworks>$(TargetFrameworks);net9.0</TargetFrameworks>
<TargetFrameworks>$(TargetFrameworks);net10.0</TargetFrameworks>
<NoWarn>BL0007,CA1822,CA2254,IDE0079,IDE0305</NoWarn>
</PropertyGroup>

<!-- Platform -->
<PropertyGroup>
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">26</SupportedOSPlatformVersion>
<TargetPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">35</TargetPlatformVersion>
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">27</SupportedOSPlatformVersion>
<TargetPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">36</TargetPlatformVersion>
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.19041.0</SupportedOSPlatformVersion>
<TargetPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.19041.0</TargetPlatformVersion>
</PropertyGroup>
Expand Down
17 changes: 13 additions & 4 deletions JournalApp.Tests/JournalApp.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,24 @@

<PropertyGroup>
<ImplicitUsings>enable</ImplicitUsings>
<IsPackable>false</IsPackable>
<IsTestProject>true</IsTestProject>
</PropertyGroup>

<!-- Workaround for .NET 10 static web assets conflict with referenced MAUI projects -->
<Target Name="RemoveDiscoveredStaticWebAssets" BeforeTargets="ResolveStaticWebAssetsInputs">
<ItemGroup>
<StaticWebAsset Remove="@(StaticWebAsset)" Condition="'%(SourceType)' == 'Discovered'" />
</ItemGroup>
</Target>

<ItemGroup>
<PackageReference Include="bunit" Version="1.40.0" />
<PackageReference Include="FluentAssertions" Version="8.7.1" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.9" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
<PackageReference Include="FluentAssertions" Version="8.8.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
<PackageReference Include="xunit" Version="2.9.3" />
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.4" PrivateAssets="all">
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5" PrivateAssets="all">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>

Expand Down
22 changes: 11 additions & 11 deletions JournalApp/JournalApp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk.Razor">

<PropertyGroup>
<TargetFrameworks>$(TargetFrameworks);net9.0-android</TargetFrameworks>
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net9.0-windows10.0.19041.0</TargetFrameworks>
<OutputType Condition="'$(TargetFramework)' != 'net9.0'">Exe</OutputType>
<TargetFrameworks>$(TargetFrameworks);net10.0-android</TargetFrameworks>
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net10.0-windows10.0.19041.0</TargetFrameworks>
<OutputType Condition="'$(TargetFramework)' != 'net10.0'">Exe</OutputType>
<RootNamespace>JournalApp</RootNamespace>
<UseMaui>true</UseMaui>
<SingleProject>true</SingleProject>
Expand Down Expand Up @@ -48,17 +48,17 @@

<ItemGroup>
<PackageReference Include="Blazor-ApexCharts" Version="6.0.2" />
<PackageReference Include="CommunityToolkit.Maui" Version="12.2.0" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebView.Maui" Version="9.0.110" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="9.0.9" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.9" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.9">
<PackageReference Include="CommunityToolkit.Maui" Version="12.3.0" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebView.Maui" Version="10.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="10.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="10.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="10.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="9.0.9" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.9" />
<PackageReference Include="Microsoft.Maui.Controls" Version="9.0.110" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="10.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="10.0.0" />
<PackageReference Include="Microsoft.Maui.Controls" Version="10.0.0" />
<PackageReference Include="MudBlazor" Version="8.14.0" />
<PackageReference Include="Nerdbank.GitVersioning" Version="3.8.118" PrivateAssets="All" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "9.0.300",
"version": "10.0.100",
"rollForward": "latestPatch",
"allowPrerelease": false
}
Expand Down
2 changes: 1 addition & 1 deletion version.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
]
Expand Down
Loading