Skip to content

bump net9.0 -> net10.0 #25

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

Open
anpin wants to merge 4 commits into
base: main
Choose a base branch
from
Open

bump net9.0 -> net10.0 #25

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
b72d1e0
bump net9.0 -> net10.0
anpin Apr 12, 2026
7f11b68
use windows-2025-vs2026 runner
anpin Apr 12, 2026
c3cf0ba
win10-x64 -> win-x64
anpin Apr 12, 2026
ea80890
bump windows sdk to 1.8.251106002
anpin Apr 12, 2026
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
18 changes: 9 additions & 9 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ env:
RESULT_DIR: result
jobs:
build:
runs-on: windows-latest
runs-on: windows-2025-vs2026
steps:
- uses: actions/checkout@v4
with:
Expand Down Expand Up @@ -40,15 +40,15 @@ jobs:
name: packages
path: ${{ env.RESULT_DIR }}
- name: Build Android APK
run: dotnet publish sample -c Release -f net9.0-android -p:RunAOTCompilation=true -p:AndroidPackageFormat=apk
run: dotnet publish sample -c Release -f net10.0-android -p:RunAOTCompilation=true -p:AndroidPackageFormat=apk
- name: Upload Android APK artifact
uses: actions/upload-artifact@v4
with:
name: android-apk
path: sample/bin/Release/net9.0-android/publish
path: sample/bin/Release/net10.0-android/publish

- name: Build Android Test Runner
run: dotnet publish tests/ui/android/UITests.Android.csproj -c Release -f net9.0 -o android-test-runner
run: dotnet publish tests/ui/android/UITests.Android.csproj -c Release -f net10.0 -o android-test-runner

- name: Upload Android Test Runner artifact
uses: actions/upload-artifact@v4
Expand All @@ -57,14 +57,14 @@ jobs:
path: android-test-runner
- name: Build Windows sample
run:
dotnet publish sample -f net9.0-windows10.0.19041.0 -r win-x64 -p:WindowsPackageType=None -p:UseMonoRuntime=false -o windows-app
dotnet publish sample -f net10.0-windows10.0.19041.0 -r win-x64 -p:WindowsPackageType=None -p:UseMonoRuntime=false -o windows-app
- name: Upload Windows sample artifact
uses: actions/upload-artifact@v4
with:
name: windows-app
path: windows-app
- name: Build Windows test runner
run: dotnet publish tests/ui/windows -c Release -f net9.0 -o windows-test-runner
run: dotnet publish tests/ui/windows -c Release -f net10.0 -o windows-test-runner
- name: Upload Windows test runner artifact
uses: actions/upload-artifact@v4
with:
Expand Down Expand Up @@ -99,10 +99,10 @@ jobs:
dotnet workload restore

- name: Build iOS for Simulator
run: dotnet build sample -c Release -f net9.0-ios -p:RuntimeIdentifier=iossimulator-arm64 -p:PublishAot=false
run: dotnet build sample -c Release -f net10.0-ios -p:RuntimeIdentifier=iossimulator-arm64 -p:PublishAot=false

- name: Build iOS Test Runner
run: dotnet publish tests/ui/ios/UITests.iOS.csproj -c Release -f net9.0 -o ios-test-runner
run: dotnet publish tests/ui/ios/UITests.iOS.csproj -c Release -f net10.0 -o ios-test-runner

- name: Upload iOS Test Runner artifact
uses: actions/upload-artifact@v4
Expand All @@ -113,7 +113,7 @@ jobs:
uses: actions/upload-artifact@v4
with:
name: ios-app
path: sample/bin/Release/net9.0-ios/iossimulator-arm64/*
path: sample/bin/Release/net10.0-ios/iossimulator-arm64/*

run_ios_tests:
runs-on: macos-15
Expand Down
2 changes: 1 addition & 1 deletion Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project>
<PropertyGroup>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
<MauiVersion>9.0.80</MauiVersion>
<MauiVersion>10.0.50</MauiVersion>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="GitVersion.MsBuild">
Expand Down
4 changes: 2 additions & 2 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<PackageVersion Include="GitVersion.MsBuild" Version="5.12.0" />
<PackageVersion Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
<PackageVersion Include="Microsoft.Maui.Controls.Compatibility" Version="$(MauiVersion)" />
<PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.7.250513003" />
<PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.8.251106002" />
<PackageVersion Include="Microsoft.UI.Xaml" Version="2.7.1" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
<PackageVersion Include="xunit" Version="2.9.3" />
Expand All @@ -13,4 +13,4 @@
<PackageVersion Include="NUnit" Version="4.3.2" />
<PackageVersion Include="NUnit3TestAdapter" Version="5.0.0" />
</ItemGroup>
</Project>
</Project>
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.100",
"version": "10.0.201",
"rollForward": "latestMinor"
},
"msbuild-sdks": {
Expand Down
10 changes: 5 additions & 5 deletions sample/APES.MAUI.Sample.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">

<PropertyGroup>
<TargetFrameworks>net9.0-android</TargetFrameworks>
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('linux')) == false and $([MSBuild]::IsOSPlatform('windows')) == false">$(TargetFrameworks);net9.0-ios;net9.0-maccatalyst</TargetFrameworks>
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net9.0-windows10.0.19041.0</TargetFrameworks>
<TargetFrameworks>net10.0-android</TargetFrameworks>
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('linux')) == false and $([MSBuild]::IsOSPlatform('windows')) == false">$(TargetFrameworks);net10.0-ios;net10.0-maccatalyst</TargetFrameworks>
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net10.0-windows10.0.19041.0</TargetFrameworks>
<OutputType>Exe</OutputType>
<RootNamespace>APES.MAUI.Sample</RootNamespace>
<UseMaui>true</UseMaui>
Expand Down Expand Up @@ -34,10 +34,10 @@
</PropertyGroup>
<PropertyGroup Condition="$(TargetFramework.Contains('-windows'))">
<OutputType>WinExe</OutputType>
<RuntimeIdentifier>win10-x64</RuntimeIdentifier>
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
<DefineConstants>__WINDOWS__</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(TargetFramework)' == 'Debug|net9.0-ios' ">
<PropertyGroup Condition=" '$(Configuration)|$(TargetFramework)' == 'Debug|net10.0-ios' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
Expand Down
2 changes: 1 addition & 1 deletion sample/run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
set -euo pipefail

TFM="net9.0-android"
TFM="net10.0-android"
CONFIG="Debug"
PKG="com.apes.maui.sample" # <-- change me
LOG="maui-logcat.log"
Expand Down
22 changes: 11 additions & 11 deletions src/APES.MAUI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net9.0;net9.0-android</TargetFrameworks>
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('linux')) == false and $([MSBuild]::IsOSPlatform('windows')) == false">$(TargetFrameworks);net9.0-ios;net9.0-maccatalyst</TargetFrameworks>
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net9.0-windows10.0.19041.0</TargetFrameworks>
<TargetFrameworks>net10.0;net10.0-android</TargetFrameworks>
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('linux')) == false and $([MSBuild]::IsOSPlatform('windows')) == false">$(TargetFrameworks);net10.0-ios;net10.0-maccatalyst</TargetFrameworks>
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net10.0-windows10.0.19041.0</TargetFrameworks>
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">14.2</SupportedOSPlatformVersion>
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">14.0</SupportedOSPlatformVersion>
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'monoandroid13.0'">21.0</SupportedOSPlatformVersion>
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'net9.0-android'">29.0</SupportedOSPlatformVersion>
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'net10.0-android'">29.0</SupportedOSPlatformVersion>
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.19041.0</SupportedOSPlatformVersion>
<TargetPlatformMinVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</TargetPlatformMinVersion>
<RootNamespace>APES.MAUI</RootNamespace>
Expand Down Expand Up @@ -57,11 +57,11 @@
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
</PropertyGroup>
<PropertyGroup Condition="$(TargetFramework.StartsWith('net9.0'))">
<PropertyGroup Condition="$(TargetFramework.StartsWith('net10.0'))">
<DefineConstants>$(DefineConstants);MAUI</DefineConstants>
<UseMaui>true</UseMaui>
</PropertyGroup>
<PropertyGroup Condition=" $(TargetFramework.StartsWith('net9.0-windows')) ">
<PropertyGroup Condition=" $(TargetFramework.StartsWith('net10.0-windows')) ">
<DefineConstants>$(DefineConstants);__WINDOWS__</DefineConstants>
</PropertyGroup>
<ItemGroup>
Expand All @@ -73,7 +73,7 @@

</ItemGroup>

<ItemGroup Condition="$(TargetFramework.StartsWith('net9.0'))">
<ItemGroup Condition="$(TargetFramework.StartsWith('net10.0'))">
<PackageReference Include="Microsoft.Maui.Controls" />
</ItemGroup>

Expand All @@ -86,18 +86,18 @@
<Compile Include="Mac\*.cs" />
</ItemGroup>

<ItemGroup Condition=" $(TargetFramework.StartsWith('net9.0-android')) ">
<ItemGroup Condition=" $(TargetFramework.StartsWith('net10.0-android')) ">
<Compile Include="Droid\*.cs" />
</ItemGroup>
<ItemGroup Condition="$(TargetFramework.StartsWith('net9.0-ios')) or $(TargetFramework.StartsWith('net9.0-maccatalyst'))">
<ItemGroup Condition="$(TargetFramework.StartsWith('net10.0-ios')) or $(TargetFramework.StartsWith('net10.0-maccatalyst'))">
<Compile Include="iOS\*.cs" />
</ItemGroup>

<ItemGroup Condition=" $(TargetFramework.StartsWith('net9.0-macos')) ">
<ItemGroup Condition=" $(TargetFramework.StartsWith('net10.0-macos')) ">
<Compile Include="Mac\*.cs" />
</ItemGroup>

<ItemGroup Condition=" $(TargetFramework.StartsWith('net9.0-windows')) ">
<ItemGroup Condition=" $(TargetFramework.StartsWith('net10.0-windows')) ">
<Compile Include="UWP\*.cs" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion tests/ui/android/AppiumSetup.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public class AppiumSetup
"sample",
"bin",
"Release",
"net9.0-android",
"net10.0-android",
"publish",
$"{AndroidApplication}-Signed.apk"));
private static AppiumDriver? driver;
Expand Down
2 changes: 1 addition & 1 deletion tests/ui/android/UITests.Android.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<IsTestProject>true</IsTestProject>
Expand Down
4 changes: 2 additions & 2 deletions tests/ui/android/test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#!/bin/sh
set -e

dotnet publish ../../../sample -f:net9.0-android -c Release \
dotnet publish ../../../sample -f:net10.0-android -c Release \
-p:RunAOTCompilation=true \
-p:AndroidPackageFormat=apk
adb install ../../../sample/bin/Release/net9.0-android/publish/com.apes.maui.sample-Signed.apk
adb install ../../../sample/bin/Release/net10.0-android/publish/com.apes.maui.sample-Signed.apk
dotnet test
2 changes: 1 addition & 1 deletion tests/ui/ios/AppiumSetup.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public class AppiumSetup
"sample",
"bin",
"Release",
"net9.0-ios",
"net10.0-ios",
"iossimulator-x64",
$"{iosApplication}.app"));
private static AppiumDriver? driver;
Expand Down
2 changes: 1 addition & 1 deletion tests/ui/ios/UITests.iOS.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<IsTestProject>true</IsTestProject>
Expand Down
2 changes: 1 addition & 1 deletion tests/ui/shared/UITests.Shared.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.Build.NoTargets">

<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<IsPackable>false</IsPackable>
Expand Down
2 changes: 1 addition & 1 deletion tests/ui/windows/AppiumSetup.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public class AppiumSetup
"sample",
"bin",
"Release",
"net9.0-windows10.0.19041.0",
"net10.0-windows10.0.19041.0",
"win-x64",
"publish",
$"{windowsApplication}.exe"));
Expand Down
2 changes: 1 addition & 1 deletion tests/ui/windows/UITests.Windows.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<IsTestProject>true</IsTestProject>
Expand Down
6 changes: 3 additions & 3 deletions tests/unit/unit.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net9.0</TargetFrameworks>
<TargetFrameworks>net10.0</TargetFrameworks>
<IsPackable>false</IsPackable>
<RootNamespace>APES.MAUI.Tests</RootNamespace>
</PropertyGroup>

<PropertyGroup Condition="$(TargetFramework.StartsWith('net9.0'))">
<PropertyGroup Condition="$(TargetFramework.StartsWith('net10.0'))">
<DefineConstants>$(DefineConstants);MAUI</DefineConstants>
</PropertyGroup>

Expand All @@ -19,7 +19,7 @@
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
</ItemGroup>
<ItemGroup Condition="$(TargetFramework.StartsWith('net9.0'))">
<ItemGroup Condition="$(TargetFramework.StartsWith('net10.0'))">

</ItemGroup>
<ItemGroup>
Expand Down
Loading