From 138d79deb24c69929ac73e49767eddff5ea7a71e Mon Sep 17 00:00:00 2001 From: Steve Bilogan Date: Mon, 10 Nov 2025 23:15:33 -0500 Subject: [PATCH 1/7] chore: adjust for net10 (cherry picked from commit 15bbfba38b61ce024387b6737487fefae4f3f68f) # Conflicts: # src/Uno.Sdk.Updater.targets --- .github/actions/ci/generate-test-matrix/action.yml | 2 +- .github/actions/ci/run-tests/action.yml | 2 +- .github/workflows/ci.yml | 4 ++-- src/Uno.Sdk.Updater.targets | 5 +++++ .../content/unoapp/.template.config/template.json | 6 +++--- .../content/unolib-uitest/.template.config/template.json | 4 ++-- .../content/unolib/.template.config/template.json | 4 ++-- .../content/unomauilib/.template.config/template.json | 4 ++-- 8 files changed, 18 insertions(+), 13 deletions(-) diff --git a/.github/actions/ci/generate-test-matrix/action.yml b/.github/actions/ci/generate-test-matrix/action.yml index 3fca84637..64fd56337 100644 --- a/.github/actions/ci/generate-test-matrix/action.yml +++ b/.github/actions/ci/generate-test-matrix/action.yml @@ -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") }; diff --git a/.github/actions/ci/run-tests/action.yml b/.github/actions/ci/run-tests/action.yml index f74e596ce..752a56af8 100644 --- a/.github/actions/ci/run-tests/action.yml +++ b/.github/actions/ci/run-tests/action.yml @@ -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 } diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9560a32f1..1fa2efc60 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,8 +22,8 @@ concurrency: 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' + ValidationUnoCheckVersionNet9: '1.33.0-dev.13' #TODO: Update when stable? + ValidationUnoCheckVersionNet10: '1.33.0-dev.27' #TODO: Update when stable? ValidationDotNetVersion: '9.0.305' XcodeVersionNet9: '/Applications/Xcode_16.4.app' XcodeVersionNet10: '/Applications/Xcode_26.0.1.app' diff --git a/src/Uno.Sdk.Updater.targets b/src/Uno.Sdk.Updater.targets index 2cb0d40df..00c5e4378 100644 --- a/src/Uno.Sdk.Updater.targets +++ b/src/Uno.Sdk.Updater.targets @@ -3,7 +3,12 @@ 6.4.43 9.0.20 +<<<<<<< HEAD 10.0.1 +======= + + 10.0.0-dev.36 +>>>>>>> 15bbfba (chore: adjust for net10) 1.7.0 4.1.1 1.4.0 diff --git a/src/Uno.Templates/content/unoapp/.template.config/template.json b/src/Uno.Templates/content/unoapp/.template.config/template.json index a7802ef40..1fe99c3bb 100644 --- a/src/Uno.Templates/content/unoapp/.template.config/template.json +++ b/src/Uno.Templates/content/unoapp/.template.config/template.json @@ -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": [ { @@ -182,7 +182,7 @@ { "choice": "net10.0", "displayName": ".NET 10.0", - "description": "Target .NET 10.0 (Preview)" + "description": "Target .NET 10.0" } ] }, @@ -326,7 +326,7 @@ }, { "condition": "(tfm == 'net10.0')", - "value": "true" + "value": "false" } ] } diff --git a/src/Uno.Templates/content/unolib-uitest/.template.config/template.json b/src/Uno.Templates/content/unolib-uitest/.template.config/template.json index 0cc18bc6d..3c141cde5 100644 --- a/src/Uno.Templates/content/unolib-uitest/.template.config/template.json +++ b/src/Uno.Templates/content/unolib-uitest/.template.config/template.json @@ -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": [ { @@ -51,7 +51,7 @@ { "choice": "net10.0", "displayName": ".NET 10.0", - "description": "Target .NET 10.0 (Preview)" + "description": "Target .NET 10.0" } ] } diff --git a/src/Uno.Templates/content/unolib/.template.config/template.json b/src/Uno.Templates/content/unolib/.template.config/template.json index 6e93170fe..b02025588 100644 --- a/src/Uno.Templates/content/unolib/.template.config/template.json +++ b/src/Uno.Templates/content/unolib/.template.config/template.json @@ -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": [ { @@ -51,7 +51,7 @@ { "choice": "net10.0", "displayName": ".NET 10.0", - "description": "Target .NET 10.0 (Preview)" + "description": "Target .NET 10.0" } ] }, diff --git a/src/Uno.Templates/content/unomauilib/.template.config/template.json b/src/Uno.Templates/content/unomauilib/.template.config/template.json index 6912802eb..6d6cc6c24 100644 --- a/src/Uno.Templates/content/unomauilib/.template.config/template.json +++ b/src/Uno.Templates/content/unomauilib/.template.config/template.json @@ -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": [ { @@ -41,7 +41,7 @@ { "choice": "net10.0", "displayName": ".NET 10.0", - "description": "Target .NET 10.0 (Preview)" + "description": "Target .NET 10.0" } ] }, From b50bf75954cfb783d133a8480420019aa0d27b1e Mon Sep 17 00:00:00 2001 From: Steve Bilogan Date: Tue, 11 Nov 2025 10:34:43 -0500 Subject: [PATCH 2/7] chore: bump to net10 stable packages (cherry picked from commit e570847edf689e3b91ccf774b85b1cd40cf8cff4) --- src/Uno.Sdk/ReadMe.md | 6 +++--- src/Uno.Sdk/packages.json | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Uno.Sdk/ReadMe.md b/src/Uno.Sdk/ReadMe.md index 502a87f51..6c7b2c2c3 100644 --- a/src/Uno.Sdk/ReadMe.md +++ b/src/Uno.Sdk/ReadMe.md @@ -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" } }, { @@ -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" } }, { @@ -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" } }, { diff --git a/src/Uno.Sdk/packages.json b/src/Uno.Sdk/packages.json index f3f634768..c0ad9a3e8 100644 --- a/src/Uno.Sdk/packages.json +++ b/src/Uno.Sdk/packages.json @@ -141,7 +141,7 @@ "Microsoft.Extensions.Logging.Console" ], "versionOverride": { - "net10.0": "10.0.0-rc.2.25502.107" + "net10.0": "10.0.0" } }, { @@ -151,7 +151,7 @@ "Microsoft.Windows.Compatibility" ], "versionOverride": { - "net10.0": "10.0.0-rc.2.25502.107" + "net10.0": "10.0.0" } }, { @@ -300,7 +300,7 @@ "Microsoft.Maui.Graphics" ], "versionOverride": { - "net10.0": "10.0.0-rc.2.25504.7" + "net10.0": "10.0.0" } }, { From d0f8e2d70e48577fed462673d469ce362b74cc50 Mon Sep 17 00:00:00 2001 From: Steve Bilogan Date: Tue, 11 Nov 2025 11:12:09 -0500 Subject: [PATCH 3/7] chore: bump uno-check to support net10 (cherry picked from commit 453d4d91f0aa6a4206135670678569bf2649542b) --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1fa2efc60..8bc5f94e3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,7 +23,7 @@ env: DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true IsCanaryBranch: ${{ startsWith(github.ref, 'refs/heads/canaries/') }} ValidationUnoCheckVersionNet9: '1.33.0-dev.13' #TODO: Update when stable? - ValidationUnoCheckVersionNet10: '1.33.0-dev.27' #TODO: Update when stable? + ValidationUnoCheckVersionNet10: '1.33.0-dev.29' #TODO: Update when stable? ValidationDotNetVersion: '9.0.305' XcodeVersionNet9: '/Applications/Xcode_16.4.app' XcodeVersionNet10: '/Applications/Xcode_26.0.1.app' From 360aa4dc5e610221500549051ad298addaa2743d Mon Sep 17 00:00:00 2001 From: Steve Bilogan Date: Tue, 11 Nov 2025 11:17:50 -0500 Subject: [PATCH 4/7] chore: bump bootstrap (cherry picked from commit 29a2454e15ed1ba00cb88d1d1ef44d14d6f92d47) # Conflicts: # src/Uno.Sdk.Updater.targets --- .github/workflows/ci.yml | 4 ++-- src/Uno.Sdk.Updater.targets | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8bc5f94e3..02e268c4f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,8 +22,8 @@ concurrency: env: DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true IsCanaryBranch: ${{ startsWith(github.ref, 'refs/heads/canaries/') }} - ValidationUnoCheckVersionNet9: '1.33.0-dev.13' #TODO: Update when stable? - ValidationUnoCheckVersionNet10: '1.33.0-dev.29' #TODO: Update when stable? + ValidationUnoCheckVersionNet9: '1.33.0-dev.13' + ValidationUnoCheckVersionNet10: '1.33.0-dev.29' ValidationDotNetVersion: '9.0.305' XcodeVersionNet9: '/Applications/Xcode_16.4.app' XcodeVersionNet10: '/Applications/Xcode_26.0.1.app' diff --git a/src/Uno.Sdk.Updater.targets b/src/Uno.Sdk.Updater.targets index 00c5e4378..b50540bd6 100644 --- a/src/Uno.Sdk.Updater.targets +++ b/src/Uno.Sdk.Updater.targets @@ -3,12 +3,16 @@ 6.4.43 9.0.20 +<<<<<<< HEAD <<<<<<< HEAD 10.0.1 ======= 10.0.0-dev.36 >>>>>>> 15bbfba (chore: adjust for net10) +======= + 10.0.1 +>>>>>>> 29a2454 (chore: bump bootstrap) 1.7.0 4.1.1 1.4.0 From 63bcf49598ff7c8e8ce109dffd968b18da45d04a Mon Sep 17 00:00:00 2001 From: Steve Bilogan Date: Tue, 11 Nov 2025 11:42:16 -0500 Subject: [PATCH 5/7] chore: adjust net10 uno-check version (cherry picked from commit 736bf0df961be075f25eead39731f0ad0cafd1c9) --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 02e268c4f..328d6ce10 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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.29' + ValidationUnoCheckVersionNet10: '1.33.0-dev.30' ValidationDotNetVersion: '9.0.305' XcodeVersionNet9: '/Applications/Xcode_16.4.app' XcodeVersionNet10: '/Applications/Xcode_26.0.1.app' From 62e1e6232ff641bf591fe06c5b29700db7fcac21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Laban?= Date: Tue, 11 Nov 2025 13:37:46 -0500 Subject: [PATCH 6/7] chore: Adjust defaults in wizard (cherry picked from commit 2c64a5e5b464f713cffec4878a3e52ece92fa84a) --- .../content/unoapp/.template.config/TemplateWizard.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Uno.Templates/content/unoapp/.template.config/TemplateWizard.json b/src/Uno.Templates/content/unoapp/.template.config/TemplateWizard.json index a7b749c67..e98b7391d 100644 --- a/src/Uno.Templates/content/unoapp/.template.config/TemplateWizard.json +++ b/src/Uno.Templates/content/unoapp/.template.config/TemplateWizard.json @@ -97,7 +97,7 @@ "server": "false", "skipRestore": "true", "tests": "none", - "tfm": "net9.0", + "tfm": "net10.0", "toolkit": "false", "vscode": "true", "wasmPwaManifest": "true", @@ -139,7 +139,7 @@ "server": "false", "skipRestore": "true", "tests": "none", - "tfm": "net9.0", + "tfm": "net10.0", "toolkit": "true", "vscode": "true", "wasmPwaManifest": "true", From a4edbb4433f01918a1e59a1dbef3a683c822b4ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Agn=C3=A8s=20ZITTE?= <16295702+agneszitte@users.noreply.github.com> Date: Tue, 11 Nov 2025 17:59:17 -0500 Subject: [PATCH 7/7] chore: Adjust version after failed cherry pick --- src/Uno.Sdk.Updater.targets | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/Uno.Sdk.Updater.targets b/src/Uno.Sdk.Updater.targets index b50540bd6..2cb0d40df 100644 --- a/src/Uno.Sdk.Updater.targets +++ b/src/Uno.Sdk.Updater.targets @@ -3,16 +3,7 @@ 6.4.43 9.0.20 -<<<<<<< HEAD -<<<<<<< HEAD 10.0.1 -======= - - 10.0.0-dev.36 ->>>>>>> 15bbfba (chore: adjust for net10) -======= - 10.0.1 ->>>>>>> 29a2454 (chore: bump bootstrap) 1.7.0 4.1.1 1.4.0