Skip to content

feat: Add net10 support #1748

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
jeromelaban merged 15 commits into from
Aug 29, 2025
Merged

feat: Add net10 support #1748

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
aa67f4b
feat: Add net10 support
jeromelaban Aug 27, 2025
f7ac4c6
chore: Adjust for net10
jeromelaban Aug 27, 2025
9df43bb
chore: Bump to 9.0.304 for workload alignment, adjust other net10 values
jeromelaban Aug 27, 2025
92eb25c
chore: Adjust conditions matrix
jeromelaban Aug 27, 2025
f34e27e
chore: Adjust more net10
jeromelaban Aug 27, 2025
9592723
chore: Update version
jeromelaban Aug 27, 2025
3ffeec5
chore: Bump to JDK 17
jeromelaban Aug 28, 2025
5b9bc81
chore: Adjust default manifest
jeromelaban Aug 28, 2025
2f16d28
chore: Bump androidx versions
jeromelaban Aug 28, 2025
dce7ac7
chore: Adjust android versions
jeromelaban Aug 28, 2025
c81cf1a
chore: Bump android versions for net9
jeromelaban Aug 28, 2025
4574518
chore: Adjust net9 android versions
jeromelaban Aug 28, 2025
8399a23
chore: Bump xcode
jeromelaban Aug 28, 2025
6ba6e0a
chore: Remove default value as we always use a tfm
jeromelaban Aug 28, 2025
58dfe28
chore: Remove unused comments
jeromelaban Aug 29, 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
34 changes: 16 additions & 18 deletions .github/actions/ci/generate-test-matrix/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,25 +117,23 @@ runs:
$currentGroup = @()
$groupSize = 8

# disabled until we get net10 support
#
# Generate matrix for net10
# for ($i = 0; $i -lt $tests.Count; $i++)
# {
# $currentGroup += $tests[$i] + " -tfm net10.0";
#
# if ( ($currentGroup.Count -eq $groupSize) -or ($i -eq ($tests.Count - 1))) {
# $newGroup = @{
# 'groupName' = "Group$($matrixGroups.Count)_net10"
# 'unocheckArguments' = '--pre-major'
# 'validations' = ($currentGroup -join "`r`n")
# };
#
# $matrixGroups += $newGroup;
#
# $currentGroup = @()
# }
# }
for ($i = 0; $i -lt $tests.Count; $i++)
{
$currentGroup += $tests[$i] + " -tfm net10.0";

if ( ($currentGroup.Count -eq $groupSize) -or ($i -eq ($tests.Count - 1))) {
$newGroup = @{
'groupName' = "Group$($matrixGroups.Count)_net10"
'unocheckArguments' = '--pre-major'
'validations' = ($currentGroup -join "`r`n")
};

$matrixGroups += $newGroup;

$currentGroup = @()
}
}

# generate matrix for net9
for ($i = 0; $i -lt $tests.Count; $i++)
Expand Down
14 changes: 10 additions & 4 deletions .github/actions/ci/run-tests/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,22 +68,28 @@ runs:
$templateArgs = '${{ inputs.arguments }}'
echo "TemplateArgs = '$templateArgs'"
$dotnetVersion = $env:TargetDotNetVersion
$ValidationUnoCheckVersion = $env:ValidationUnoCheckVersionNet8
$ValidationUnoCheckVersion = "invalid"

if ($templateArgs -match 'net9.0')
{
$dotnetVersion = '9.0.300'
$dotnetVersion = '9.0.304'
$ValidationUnoCheckVersion = $env:ValidationUnoCheckVersionNet9
}

if ($templateArgs -match 'net10.0')
{
$dotnetVersion = '10.0.100-preview.7.25380.108'
$ValidationUnoCheckVersion = $env:ValidationUnoCheckVersionNet10
}

echo "Dotnet Version = '$dotnetVersion'"
echo "UnoCheck Version = '$ValidationUnoCheckVersion'"

echo "DotNetVersion=$dotnetVersion" >> $env:GITHUB_ENV
echo "ValidationUnoCheckVersion=$ValidationUnoCheckVersion" >> $env:GITHUB_ENV
env:
TargetDotNetVersion: ${{ env.ValidationDotNetVersion }}
ValidationUnoCheckVersionNet8: ${{ env.ValidationUnoCheckVersionNet8 }}
ValidationUnoCheckVersionNet10: ${{ env.ValidationUnoCheckVersionNet10 }}
ValidationUnoCheckVersionNet9: ${{ env.ValidationUnoCheckVersionNet9 }}

- name: Cache EMSDK
Expand Down Expand Up @@ -137,7 +143,7 @@ runs:
sudo rm -fR /usr/lib/jvm
sudo apt-get install apt-transport-https
sudo apt-get update
sudo apt-get install -y msopenjdk-11
sudo apt-get install -y msopenjdk-17

- name: 'Uno Check (Linux)'
if: runner.os == 'linux'
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ concurrency:
env:
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
IsCanaryBranch: ${{ startsWith(github.ref, 'refs/heads/canaries/') }}
ValidationUnoCheckVersionNet8: '1.26.4'
ValidationUnoCheckVersionNet9: '1.32.0-dev.14'
ValidationDotNetVersion: '8.0.407'
ValidationUnoCheckVersionNet9: '1.32.0-dev.52'
ValidationUnoCheckVersionNet10: '1.32.0-dev.52'
ValidationDotNetVersion: '9.0.304'

# https://github.com/unoplatform/Uno.Wasm.Bootstrap/pull/887 remove when upgarding to .NET 9
# compatible version of the bootstrapper
Expand Down Expand Up @@ -175,7 +175,7 @@ jobs:
- name: "Run Tests"
uses: ./.github/actions/ci/run-tests
with:
xCodeRoot: '/Applications/Xcode_16.3.app'
xCodeRoot: '/Applications/Xcode_16.4.app'
arguments: ${{ matrix.validations }}
unocheckArguments: ${{ matrix.unocheckArguments }}
logs-artifact-name: ${{ matrix.groupName }}
Expand Down Expand Up @@ -205,7 +205,7 @@ jobs:
- name: "Run Tests"
uses: ./.github/actions/ci/run-tests
with:
xCodeRoot: '/Applications/Xcode_16.3.app'
xCodeRoot: '/Applications/Xcode_16.4.app'
arguments: ${{ matrix.validations }}
unocheckArguments: ${{ matrix.unocheckArguments }}
logs-artifact-name: ${{ matrix.groupName }}
Expand Down Expand Up @@ -235,7 +235,7 @@ jobs:
- name: "Run Tests"
uses: ./.github/actions/ci/run-tests
with:
xCodeRoot: '/Applications/Xcode_16.3.app'
xCodeRoot: '/Applications/Xcode_16.4.app'
arguments: ${{ matrix.validations }}
unocheckArguments: ${{ matrix.unocheckArguments }}
logs-artifact-name: ${{ matrix.groupName }}
Expand Down
2 changes: 1 addition & 1 deletion src/Uno.Sdk.Updater.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<!-- This file is generated by the Uno.Sdk.Updater. Do not make manual changes. -->
<PropertyGroup>
<UnoVersion>6.3.0-dev.144</UnoVersion>
<UnoWasmBootstrapVersionNet8>8.0.23</UnoWasmBootstrapVersionNet8>
<UnoWasmBootstrapVersionNet9>9.0.20</UnoWasmBootstrapVersionNet9>
<UnoWasmBootstrapVersionNet10>10.0.0-dev.24</UnoWasmBootstrapVersionNet10>
<UnoExtensionsLoggingVersion>1.7.0</UnoExtensionsLoggingVersion>
<UnoCoreLoggingVersion>4.1.1</UnoCoreLoggingVersion>
<UnoDspTasksVersion>1.4.0</UnoDspTasksVersion>
Expand Down
16 changes: 8 additions & 8 deletions src/Uno.Sdk/ReadMe.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,14 +75,14 @@ The Uno.Sdk powers the Uno Platform Single Project, including the ability to imp
},
{
"group": "WasmBootstrap",
"version": "8.0.23",
"version": "9.0.20",
"packages": [
"Uno.Wasm.Bootstrap",
"Uno.Wasm.Bootstrap.DevServer",
"Uno.Wasm.Bootstrap.Server"
],
"versionOverride": {
"net9.0": "9.0.20"
"net10.0": "10.0.0-dev.24"
}
},
{
Expand Down Expand Up @@ -178,22 +178,22 @@ The Uno.Sdk powers the Uno Platform Single Project, including the ability to imp
},
{
"group": "MicrosoftLoggingConsole",
"version": "8.0.1",
"version": "9.0.8",
"packages": [
"Microsoft.Extensions.Logging.Console"
],
"versionOverride": {
"net9.0": "9.0.8"
"net10.0": "9.0.8"
}
},
{
"group": "WindowsCompatibility",
"version": "8.0.19",
"version": "9.0.4",
"packages": [
"Microsoft.Windows.Compatibility"
],
"versionOverride": {
"net9.0": "9.0.8"
"net10.0": "9.0.4"
}
Comment thread
jeromelaban marked this conversation as resolved.
},
{
Expand Down Expand Up @@ -305,14 +305,14 @@ The Uno.Sdk powers the Uno Platform Single Project, including the ability to imp
},
{
"group": "Maui",
"version": "8.0.100",
"version": "9.0.60",
"packages": [
"Microsoft.Maui.Controls",
"Microsoft.Maui.Controls.Compatibility",
"Microsoft.Maui.Graphics"
],
"versionOverride": {
"net9.0": "9.0.100"
"net10.0": "9.0.60"
Comment thread
jeromelaban marked this conversation as resolved.
}
},
{
Expand Down
77 changes: 52 additions & 25 deletions src/Uno.Sdk/packages.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,14 @@
},
{
"group": "WasmBootstrap",
"version": "8.0.23",
"version": "9.0.20",
"packages": [
"Uno.Wasm.Bootstrap",
"Uno.Wasm.Bootstrap.DevServer",
"Uno.Wasm.Bootstrap.Server"
],
"versionOverride": {
"net9.0": "9.0.20"
"net10.0": "10.0.0-dev.24"
}
},
{
Expand Down Expand Up @@ -136,22 +136,22 @@
},
{
"group": "MicrosoftLoggingConsole",
"version": "8.0.1",
"version": "9.0.8",
"packages": [
"Microsoft.Extensions.Logging.Console"
],
"versionOverride": {
"net9.0": "9.0.8"
"net10.0": "10.0.0-preview.7.25380.108"
}
},
{
"group": "WindowsCompatibility",
"version": "8.0.19",
"version": "9.0.8",
"packages": [
"Microsoft.Windows.Compatibility"
],
"versionOverride": {
"net9.0": "9.0.8"
"net10.0": "10.0.0-preview.7.25380.108"
}
},
{
Expand Down Expand Up @@ -189,63 +189,87 @@
},
{
"group": "AndroidMaterial",
"version": "1.12.0.2",
"version": "1.12.0.4",
"packages": [
"Xamarin.Google.Android.Material"
]
],
"versionOverride": {
"net10.0": "1.12.0.4"
}
},
{
"group": "AndroidXLegacySupportV4",
"version": "1.0.0.23",
"packages": [
"Xamarin.AndroidX.Legacy.Support.V4"
]
],
"versionOverride": {
"net10.0": "1.0.0.33"
}
},
{
"group": "AndroidXSplashScreen",
"version": "1.0.1.14",
"packages": [
"Xamarin.AndroidX.Core.SplashScreen"
]
],
"versionOverride": {
"net10.0": "1.0.1.14"
}
},
{
"group": "AndroidXAppCompat",
"version": "1.7.0.5",
"version": "1.7.0.7",
"packages": [
"Xamarin.AndroidX.AppCompat"
]
],
"versionOverride": {
"net10.0": "1.7.0.7"
}
},
{
"group": "AndroidXRecyclerView",
"version": "1.3.2.10",
"version": "1.4.0.2",
"packages": [
"Xamarin.AndroidX.RecyclerView"
]
],
"versionOverride": {
"net10.0": "1.4.0.2"
}
},
{
"group": "AndroidXActivity",
"version": "1.9.3.2",
"version": "1.10.1.2",
"packages": [
"Xamarin.AndroidX.Activity"
]
],
"versionOverride": {
"net10.0": "1.10.1.2"
}
},
{
"group": "AndroidXBrowser",
"version": "1.8.0.8",
"version": "1.8.0.10",
"packages": [
"Xamarin.AndroidX.Browser"
]
],
"versionOverride": {
"net10.0": "1.8.0.10"
}
},
{
"group": "AndroidXSwipeRefreshLayout",
"version": "1.1.0.24",
"version": "1.1.0.28",
"packages": [
"Xamarin.AndroidX.SwipeRefreshLayout"
]
],
"versionOverride": {
"net10.0": "1.1.0.28"
}
},
{
"group": "AndroidXNavigation",
"version": "2.8.5.1",
"version": "2.8.9.2",
"packages": [
"Xamarin.AndroidX.Navigation.UI",
"Xamarin.AndroidX.Navigation.Fragment",
Expand All @@ -255,22 +279,25 @@
},
{
"group": "AndroidXCollection",
"version": "1.4.5.2",
"version": "1.5.0.2",
"packages": [
"Xamarin.AndroidX.Collection",
"Xamarin.AndroidX.Collection.Ktx"
]
],
"versionOverride": {
"net10.0": "1.5.0.2"
}
},
{
"group": "Maui",
"version": "8.0.100",
"version": "9.0.100",
"packages": [
"Microsoft.Maui.Controls",
"Microsoft.Maui.Controls.Compatibility",
"Microsoft.Maui.Graphics"
],
"versionOverride": {
"net9.0": "9.0.100"
"net10.0": "10.0.0-preview.7.25406.3"
}
},
{
Expand Down
2 changes: 1 addition & 1 deletion src/Uno.Templates/Uno.Templates.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<ReplaceFileText Filename="%(_VersionableFile.Identity)" MatchExpression="DefaultUnoSdkVersion" ReplacementText="$(PackageVersion)" />
<ReplaceFileText Filename="%(_VersionableFile.Identity)" MatchExpression="DefaultUnoExtensionsLoggingVersion" ReplacementText="$(UnoExtensionsLoggingVersion)" />
<ReplaceFileText Filename="%(_VersionableFile.Identity)" MatchExpression="DefaultUnoUniversalImageLoaderVersion" ReplacementText="$(UnoUniversalImageLoaderVersion)" />
<ReplaceFileText Filename="%(_VersionableFile.Identity)" MatchExpression="DefaultUnoWasmBootstrapVersionNet8" ReplacementText="$(UnoWasmBootstrapVersionNet8)"/>
<ReplaceFileText Filename="%(_VersionableFile.Identity)" MatchExpression="DefaultUnoWasmBootstrapVersionNet10" ReplacementText="$(UnoWasmBootstrapVersionNet10)"/>
<ReplaceFileText Filename="%(_VersionableFile.Identity)" MatchExpression="DefaultUnoWasmBootstrapVersionNet9" ReplacementText="$(UnoWasmBootstrapVersionNet9)"/>
<ReplaceFileText Filename="%(_VersionableFile.Identity)" MatchExpression="DefaultUnoUITestHelpersVersion" ReplacementText="$(UnoUITestHelpersVersion)"/>
<ReplaceFileText Filename="%(_VersionableFile.Identity)" MatchExpression="DefaultXamarinGoogleAndroidMaterial" ReplacementText="$(XamarinGoogleAndroidMaterialVersion)" />
Expand Down
6 changes: 5 additions & 1 deletion src/Uno.Templates/content/unoapp/.template.config/TemplateWizard.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -669,6 +669,10 @@
"Sequence": 2,
"Icon": "/Assets/Framework.NET9.svg"
},
"tfm.net10.0": {
"Sequence": 2,
"Icon": "/Assets/Framework.NET10.svg"
Comment thread
jeromelaban marked this conversation as resolved.
},
"toolkit": {
"Icon": "/Assets/Features.Toolkit.svg"
},
Expand Down Expand Up @@ -829,7 +833,7 @@
"PackageId": "Uno.Wasm.Bootstrap",
"Symbol": "unoWasmBootstrapVersion",
"UsePrerelease": {
"tfm": [ "net9.0" ]
"tfm": [ "net10.0" ]
}
},
{
Expand Down
Loading
Loading