Skip to content

chore: adjust for net10 (backport #1845) #1850

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 7 commits into from
Nov 12, 2025
Merged

chore: adjust for net10 (backport #1845) #1850

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
138d79d
chore: adjust for net10
kazo0 Nov 11, 2025
b50bf75
chore: bump to net10 stable packages
kazo0 Nov 11, 2025
d0f8e2d
chore: bump uno-check to support net10
kazo0 Nov 11, 2025
360aa4d
chore: bump bootstrap
kazo0 Nov 11, 2025
63bcf49
chore: adjust net10 uno-check version
kazo0 Nov 11, 2025
62e1e62
chore: Adjust defaults in wizard
jeromelaban Nov 11, 2025
a4edbb4
chore: Adjust version after failed cherry pick
agneszitte Nov 11, 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
2 changes: 1 addition & 1 deletion .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 @@ -125,7 +125,7 @@ runs:
if ( ($currentGroup.Count -eq $groupSize) -or ($i -eq ($tests.Count - 1))) {
$newGroup = @{
'groupName' = "Group$($matrixGroups.Count)_net10"
'unocheckArguments' = '--pre-major'
'unocheckArguments' = ''
'validations' = ($currentGroup -join "`r`n")
};

Expand Down
2 changes: 1 addition & 1 deletion .github/actions/ci/run-tests/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ runs:

if ($templateArgs -match 'net10.0')
{
$dotnetVersion = '10.0.100-rc.2.25502.107'
$dotnetVersion = '10.0.100'
$ValidationUnoCheckVersion = $env:ValidationUnoCheckVersionNet10
$XcodeVersion = $env:XcodeVersionNet10
}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ env:
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
IsCanaryBranch: ${{ startsWith(github.ref, 'refs/heads/canaries/') }}
ValidationUnoCheckVersionNet9: '1.33.0-dev.13'
ValidationUnoCheckVersionNet10: '1.33.0-dev.27'
ValidationUnoCheckVersionNet10: '1.33.0-dev.30'
ValidationDotNetVersion: '9.0.305'
XcodeVersionNet9: '/Applications/Xcode_16.4.app'
XcodeVersionNet10: '/Applications/Xcode_26.0.1.app'
Expand Down
6 changes: 3 additions & 3 deletions src/Uno.Sdk/ReadMe.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ The Uno.Sdk powers the Uno Platform Single Project, including the ability to imp
"Microsoft.Extensions.Logging.Console"
],
"versionOverride": {
"net10.0": "10.0.0-rc.2.25502.107"
"net10.0": "10.0.0"
}
},
{
Expand All @@ -193,7 +193,7 @@ The Uno.Sdk powers the Uno Platform Single Project, including the ability to imp
"Microsoft.Windows.Compatibility"
],
"versionOverride": {
"net10.0": "10.0.0-rc.2.25502.107"
"net10.0": "10.0.0"
}
},
{
Expand Down Expand Up @@ -342,7 +342,7 @@ The Uno.Sdk powers the Uno Platform Single Project, including the ability to imp
"Microsoft.Maui.Graphics"
],
"versionOverride": {
"net10.0": "10.0.0-rc.2.25504.7"
"net10.0": "10.0.0"
}
},
{
Expand Down
6 changes: 3 additions & 3 deletions src/Uno.Sdk/packages.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@
"Microsoft.Extensions.Logging.Console"
],
"versionOverride": {
"net10.0": "10.0.0-rc.2.25502.107"
"net10.0": "10.0.0"
}
},
{
Expand All @@ -151,7 +151,7 @@
"Microsoft.Windows.Compatibility"
],
"versionOverride": {
"net10.0": "10.0.0-rc.2.25502.107"
"net10.0": "10.0.0"
}
},
{
Expand Down Expand Up @@ -300,7 +300,7 @@
"Microsoft.Maui.Graphics"
],
"versionOverride": {
"net10.0": "10.0.0-rc.2.25504.7"
"net10.0": "10.0.0"
}
},
{
Expand Down
4 changes: 2 additions & 2 deletions 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 @@ -97,7 +97,7 @@
"server": "false",
"skipRestore": "true",
"tests": "none",
"tfm": "net9.0",
"tfm": "net10.0",
"toolkit": "false",
"vscode": "true",
"wasmPwaManifest": "true",
Expand Down Expand Up @@ -139,7 +139,7 @@
"server": "false",
"skipRestore": "true",
"tests": "none",
"tfm": "net9.0",
"tfm": "net10.0",
"toolkit": "true",
"vscode": "true",
"wasmPwaManifest": "true",
Expand Down
6 changes: 3 additions & 3 deletions src/Uno.Templates/content/unoapp/.template.config/template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@
"datatype": "choice",
"enableQuotelessLiterals": true,
"replaces": "$baseTargetFramework$",
"defaultValue": "net9.0",
"defaultValue": "net10.0",
"description": "Select the .NET version of your solution",
"choices": [
{
Expand All @@ -182,7 +182,7 @@
{
"choice": "net10.0",
"displayName": ".NET 10.0",
"description": "Target .NET 10.0 (Preview)"
"description": "Target .NET 10.0"
}
]
},
Expand Down Expand Up @@ -326,7 +326,7 @@
},
{
"condition": "(tfm == 'net10.0')",
"value": "true"
"value": "false"
}
]
}
Expand Down
4 changes: 2 additions & 2 deletions src/Uno.Templates/content/unolib-uitest/.template.config/template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"datatype": "choice",
"enableQuotelessLiterals": true,
"replaces": "$baseTargetFramework$",
"defaultValue": "net9.0",
"defaultValue": "net10.0",
"description": "Select the .NET version of your solution",
"choices": [
{
Expand All @@ -51,7 +51,7 @@
{
"choice": "net10.0",
"displayName": ".NET 10.0",
"description": "Target .NET 10.0 (Preview)"
"description": "Target .NET 10.0"
}
]
}
Expand Down
4 changes: 2 additions & 2 deletions src/Uno.Templates/content/unolib/.template.config/template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"datatype": "choice",
"enableQuotelessLiterals": true,
"replaces": "$baseTargetFramework$",
"defaultValue": "net9.0",
"defaultValue": "net10.0",
"description": "Select the .NET version of your solution",
"choices": [
{
Expand All @@ -51,7 +51,7 @@
{
"choice": "net10.0",
"displayName": ".NET 10.0",
"description": "Target .NET 10.0 (Preview)"
"description": "Target .NET 10.0"
}
]
},
Expand Down
4 changes: 2 additions & 2 deletions src/Uno.Templates/content/unomauilib/.template.config/template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"datatype": "choice",
"enableQuotelessLiterals": true,
"replaces": "$baseTargetFramework$",
"defaultValue": "net9.0",
"defaultValue": "net10.0",
"description": "Select the .NET version of your solution",
"choices": [
{
Expand All @@ -41,7 +41,7 @@
{
"choice": "net10.0",
"displayName": ".NET 10.0",
"description": "Target .NET 10.0 (Preview)"
"description": "Target .NET 10.0"
}
]
},
Expand Down
Loading