Skip to content

Upgrade to net10 #292

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
AndreasReitberger merged 6 commits into from
Nov 21, 2025
Merged

Upgrade to net10 #292

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
88335f1
Upgrade to `net10`
AndreasReitberger Nov 12, 2025
f605fd4
Further adjustments
AndreasReitberger Nov 13, 2025
4979887
Updated the others projects
AndreasReitberger Nov 17, 2025
7eaa604
Further updates to `net10` migration
AndreasReitberger Nov 20, 2025
ff3d571
Fixed wrong naming of `net10.0`
AndreasReitberger Nov 21, 2025
f9088f0
Fixed wrong naming
AndreasReitberger Nov 21, 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
6 changes: 3 additions & 3 deletions .github/workflows/dotnet_build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v4
with:
dotnet-version: 9.0.x
dotnet-version: 10.0.x
- name: Set up JDK 11
uses: actions/setup-java@v4
with:
Expand Down Expand Up @@ -57,7 +57,7 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v4
with:
dotnet-version: 9.0.x
dotnet-version: 10.0.x
- name: Setup XCode
uses: maxim-lobanov/setup-xcode@v1
with:
Expand Down Expand Up @@ -114,7 +114,7 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v4
with:
dotnet-version: 9.0.x
dotnet-version: 10.0.x
- name: Install workloads
run: | #dotnet workload install android wasm-tools maui-android
dotnet workload install android wasm-tools maui-android --source https://api.nuget.org/v3/index.json
Expand Down
4 changes: 3 additions & 1 deletion common.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@

<Project>
<Import Project="conditions.props" />
<PropertyGroup>
<Version>1.1.20</Version>
<Version Condition="'$(DefineConstants.Contains(NET10))'">1.2.0</Version>
<Version Condition="'!$(DefineConstants.Contains(NET10))'">1.1.20</Version>
<PackageIcon>ar_128.png</PackageIcon>
<NeutralLanguage>en</NeutralLanguage>
<PackageProjectUrl>https://github.com/AndreasReitberger/SharedMauiCoreLibrary</PackageProjectUrl>
Expand Down
9 changes: 9 additions & 0 deletions conditions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@

<Project>
<PropertyGroup>
<!-- Here you can choose if you want to build as executable or as package -->
<!----><DefineConstants>$(DefineConstants);NEWTONSOFT</DefineConstants>
<!--<DefineConstants>$(DefineConstants);NET9</DefineConstants>-->
<!----><DefineConstants>$(DefineConstants);NET10</DefineConstants>
</PropertyGroup>
</Project>
24 changes: 24 additions & 0 deletions framework.maui.net9.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@

<Project>
<PropertyGroup>
<TargetFrameworks>net9.0;net9.0-android</TargetFrameworks>
<!-- Needed for GitHub action, iOS and MacOS is not workig on Linux -->
<TargetFrameworks Condition="!$([MSBuild]::IsOSPlatform('linux'))">$(TargetFrameworks);net9.0-ios;net9.0-maccatalyst</TargetFrameworks>
<!-- Causes problems on windows?! -->
<TargetFrameworks Condition="!$([MSBuild]::IsOSPlatform('windows')) and !$([MSBuild]::IsOSPlatform('linux'))">$(TargetFrameworks);net9.0-macos</TargetFrameworks>
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net9.0-windows10.0.19041.0</TargetFrameworks>

<!-- General -->
<UseMaui>true</UseMaui>
<SingleProject>true</SingleProject>
<ImplicitUsings>enable</ImplicitUsings>
<PublishReadyToRun>false</PublishReadyToRun>

<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">15.0</SupportedOSPlatformVersion>
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">15.0</SupportedOSPlatformVersion>
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">21.0</SupportedOSPlatformVersion>
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</SupportedOSPlatformVersion>
<TargetPlatformMinVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</TargetPlatformMinVersion>
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'tizen'">6.5</SupportedOSPlatformVersion>
</PropertyGroup>
</Project>
14 changes: 5 additions & 9 deletions framework.maui.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,18 @@

<Project>
<PropertyGroup>
<TargetFrameworks>net9.0;net9.0-android</TargetFrameworks>
<PropertyGroup>
<TargetFrameworks>net10.0;net10.0-android</TargetFrameworks>
<!-- Needed for GitHub action, iOS and MacOS is not workig on Linux -->
<TargetFrameworks Condition="!$([MSBuild]::IsOSPlatform('linux'))">$(TargetFrameworks);net9.0-ios;net9.0-maccatalyst</TargetFrameworks>
<TargetFrameworks Condition="!$([MSBuild]::IsOSPlatform('linux'))">$(TargetFrameworks);net10.0-ios;net10.0-maccatalyst</TargetFrameworks>
<!-- Causes problems on windows?! -->
<TargetFrameworks Condition="!$([MSBuild]::IsOSPlatform('windows')) and !$([MSBuild]::IsOSPlatform('linux'))">$(TargetFrameworks);net9.0-macos</TargetFrameworks>
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net9.0-windows10.0.19041.0</TargetFrameworks>

<TargetFrameworks Condition="!$([MSBuild]::IsOSPlatform('windows')) and !$([MSBuild]::IsOSPlatform('linux'))">$(TargetFrameworks);net10.0-macos</TargetFrameworks>
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net10.0-windows10.0.19041.0</TargetFrameworks>
<!-- General -->
<UseMaui>true</UseMaui>
<SingleProject>true</SingleProject>
<ImplicitUsings>enable</ImplicitUsings>
<PublishReadyToRun>false</PublishReadyToRun>

<!-- Needed with latest SDK 8 version?
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-->
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">15.0</SupportedOSPlatformVersion>
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">15.0</SupportedOSPlatformVersion>
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">21.0</SupportedOSPlatformVersion>
Expand Down
14 changes: 12 additions & 2 deletions src/SharedMauiCoreLibrary.Licensing/SharedMauiCoreLibrary.Licensing.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\..\common.props" />
<Import Project="..\..\framework.maui.props" />
<Import Project="..\..\framework.maui.net9.props" Condition="'$(DefineConstants.Contains(NET9))'"/>
<Import Project="..\..\framework.maui.props" Condition="'$(DefineConstants.Contains(NET10))'"/>

<PropertyGroup>
<PackageTags>MAUI, Utilites, Core, Library, Helper, C#, dotnet, Licensing, Handler</PackageTags>
Expand Down Expand Up @@ -44,8 +45,17 @@
<None Include="..\..\README_Licensing.md" Pack="true" PackagePath="\" />
</ItemGroup>

<!-- Used for net9-->
<ItemGroup Condition="'$(DefineConstants.Contains(NET9))'">
<PackageReference Include="Microsoft.Maui.Controls" Version="9.0.120" />
</ItemGroup>

<!-- Used for net10-->
<ItemGroup Condition="'$(DefineConstants.Contains(NET10))'">
<PackageReference Include="Microsoft.Maui.Controls" Version="10.0.10" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Maui.Controls" Version="9.0.120" />
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
<PackageReference Include="RestSharp" Version="112.1.0" />
Expand Down
4 changes: 3 additions & 1 deletion src/SharedMauiCoreLibrary.Test/SharedMauiCoreLibrary.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">

<Import Project="..\..\conditions.props" />
<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework Condition="'$(DefineConstants.Contains(NET9))'">net9.0</TargetFramework>
<TargetFramework Condition="'$(DefineConstants.Contains(NET10))'">net10.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>

Expand Down
7 changes: 5 additions & 2 deletions src/SharedMauiCoreLibrary.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.2.32317.152
# Visual Studio Version 18
VisualStudioVersion = 18.0.11205.157 d18.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SharedMauiCoreLibrary", "SharedMauiCoreLibrary\SharedMauiCoreLibrary.csproj", "{9B283D7C-1C1C-4DB6-9A2F-A10FE77D869D}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{137C492A-7E0D-4B3C-8E99-F0F398DA7667}"
ProjectSection(SolutionItems) = preProject
..\common.props = ..\common.props
..\conditions.props = ..\conditions.props
..\framework.maui.net9.props = ..\framework.maui.net9.props
..\framework.maui.props = ..\framework.maui.props
global.json = global.json
nuget.config = nuget.config
EndProjectSection
EndProject
Expand Down
17 changes: 14 additions & 3 deletions src/SharedMauiCoreLibrary/SharedMauiCoreLibrary.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\..\common.props" />
<Import Project="..\..\framework.maui.props" />
<Import Project="..\..\framework.maui.net9.props" Condition="'$(DefineConstants.Contains(NET9))'"/>
<Import Project="..\..\framework.maui.props" Condition="'$(DefineConstants.Contains(NET10))'"/>

<PropertyGroup>
<PackageTags>MAUI, Utilites, Core, Library, Helper, C#, dotnet</PackageTags>
Expand Down Expand Up @@ -30,9 +31,19 @@
<None Include="..\..\README.md" Pack="true" PackagePath="\" />
</ItemGroup>

<!-- Used for net9-->
<ItemGroup Condition="'$(DefineConstants.Contains(NET9))'">
<PackageReference Include="Microsoft.Maui.Controls" Version="9.0.120" />
<PackageReference Include="CommunityToolkit.Maui" Version="12.3.0" />
</ItemGroup>

<!-- Used for net10-->
<ItemGroup Condition="'$(DefineConstants.Contains(NET10))'">
<PackageReference Include="Microsoft.Maui.Controls" Version="10.0.10" />
<PackageReference Include="CommunityToolkit.Maui" Version="13.0.0" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Maui.Controls" Version="9.0.120" />
<PackageReference Include="CommunityToolkit.Maui" Version="12.3.0" />
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
</ItemGroup>
Expand Down
1 change: 1 addition & 0 deletions src/SharedNetCoreLibrary.Firebase/SharedNetCoreLibrary.Firebase.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<Description>A core libray used for our .NET libraries.</Description>

<TargetFrameworks>netstandard2.1;net8.0;net9.0</TargetFrameworks>
<TargetFrameworks Condition="'$(DefineConstants.Contains(NET10))'">$(TargetFrameworks);net10.0</TargetFrameworks>
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>

Expand Down
12 changes: 10 additions & 2 deletions src/SharedNetCoreLibrary/SharedNetCoreLibrary.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<Description>A core libray used for our .NET libraries.</Description>

<TargetFrameworks>netstandard2.1;net8.0;net9.0</TargetFrameworks>
<TargetFrameworks Condition="'$(DefineConstants.Contains(NET10))'">$(TargetFrameworks);net10.0</TargetFrameworks>
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>
<ItemGroup>
Expand All @@ -17,10 +18,17 @@
<ItemGroup>
<None Include="..\..\README.md" Pack="true" PackagePath="\" />
</ItemGroup>

<!--
<ItemGroup Condition="'$(DefineConstants.Contains(NEWTONSOFT))'">
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
</ItemGroup>
<ItemGroup Condition="'!$(DefineConstants.Contains(NEWTONSOFT))'">
<PackageReference Include="System.Text.Json" Version="10.0.0" />
</ItemGroup>
-->
<ItemGroup>
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
</ItemGroup>

<ItemGroup>
Expand Down
6 changes: 6 additions & 0 deletions src/global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"sdk": {
//"version": "9.0.308",
"version": "10.0.100"
}
}
1 change: 0 additions & 1 deletion src/nuget.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,5 @@
<packageSources>
<clear />
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
<add key="Nightly NuGet Package Feed" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8/nuget/v3/index.json" />
</packageSources>
</configuration>
Loading