From aa67f4b9f0e120c0abbfd66db2408107a28f3c8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Laban?= Date: Wed, 27 Aug 2025 16:43:37 -0400 Subject: [PATCH 01/15] feat: Add net10 support --- .../ci/generate-test-matrix/action.yml | 34 +++++++++---------- .github/actions/ci/run-tests/action.yml | 10 ++++-- .github/workflows/ci.yml | 4 +-- src/Uno.Sdk/ReadMe.md | 16 ++++----- .../.template.config/TemplateWizard.json | 6 +++- .../.template.config/template.json | 5 +++ .../unolib/.template.config/template.json | 5 +++ .../unomauilib/.template.config/template.json | 5 +++ tools/TemplateTfmSwitchGenerator/Program.cs | 2 +- tools/Uno.Sdk.Updater/Program.cs | 2 +- 10 files changed, 56 insertions(+), 33 deletions(-) diff --git a/.github/actions/ci/generate-test-matrix/action.yml b/.github/actions/ci/generate-test-matrix/action.yml index 9bbad1583..3fca84637 100644 --- a/.github/actions/ci/generate-test-matrix/action.yml +++ b/.github/actions/ci/generate-test-matrix/action.yml @@ -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++) diff --git a/.github/actions/ci/run-tests/action.yml b/.github/actions/ci/run-tests/action.yml index 81a6e4460..2d4ff1193 100644 --- a/.github/actions/ci/run-tests/action.yml +++ b/.github/actions/ci/run-tests/action.yml @@ -68,7 +68,7 @@ runs: $templateArgs = '${{ inputs.arguments }}' echo "TemplateArgs = '$templateArgs'" $dotnetVersion = $env:TargetDotNetVersion - $ValidationUnoCheckVersion = $env:ValidationUnoCheckVersionNet8 + $ValidationUnoCheckVersion = $env:ValidationUnoCheckVersionNet10 if ($templateArgs -match 'net9.0') { @@ -76,6 +76,12 @@ runs: $ValidationUnoCheckVersion = $env:ValidationUnoCheckVersionNet9 } + if ($templateArgs -match 'net9.0') + { + $dotnetVersion = '9.0.300' + $ValidationUnoCheckVersion = $env:ValidationUnoCheckVersionNet10 + } + echo "Dotnet Version = '$dotnetVersion'" echo "UnoCheck Version = '$ValidationUnoCheckVersion'" @@ -83,7 +89,7 @@ runs: echo "ValidationUnoCheckVersion=$ValidationUnoCheckVersion" >> $env:GITHUB_ENV env: TargetDotNetVersion: ${{ env.ValidationDotNetVersion }} - ValidationUnoCheckVersionNet8: ${{ env.ValidationUnoCheckVersionNet8 }} + ValidationUnoCheckVersionNet10: ${{ env.ValidationUnoCheckVersionNet10 }} ValidationUnoCheckVersionNet9: ${{ env.ValidationUnoCheckVersionNet9 }} - name: Cache EMSDK diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f8439c2aa..6886ffe54 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/') }} - ValidationUnoCheckVersionNet8: '1.26.4' - ValidationUnoCheckVersionNet9: '1.32.0-dev.14' + ValidationUnoCheckVersionNet9: '1.32.0-dev.52' + ValidationUnoCheckVersionNet10: '1.32.0-dev.52' ValidationDotNetVersion: '8.0.407' # https://github.com/unoplatform/Uno.Wasm.Bootstrap/pull/887 remove when upgarding to .NET 9 diff --git a/src/Uno.Sdk/ReadMe.md b/src/Uno.Sdk/ReadMe.md index 98aebfdfe..562c5be2c 100644 --- a/src/Uno.Sdk/ReadMe.md +++ b/src/Uno.Sdk/ReadMe.md @@ -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" } }, { @@ -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" } }, { @@ -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" } }, { diff --git a/src/Uno.Templates/content/unoapp/.template.config/TemplateWizard.json b/src/Uno.Templates/content/unoapp/.template.config/TemplateWizard.json index ac5f08d77..3c5bcc0f6 100644 --- a/src/Uno.Templates/content/unoapp/.template.config/TemplateWizard.json +++ b/src/Uno.Templates/content/unoapp/.template.config/TemplateWizard.json @@ -669,6 +669,10 @@ "Sequence": 2, "Icon": "/Assets/Framework.NET9.svg" }, + "tfm.net10.0": { + "Sequence": 2, + "Icon": "/Assets/Framework.NET10.svg" + }, "toolkit": { "Icon": "/Assets/Features.Toolkit.svg" }, @@ -829,7 +833,7 @@ "PackageId": "Uno.Wasm.Bootstrap", "Symbol": "unoWasmBootstrapVersion", "UsePrerelease": { - "tfm": [ "net9.0" ] + "tfm": [ "net10.0" ] } }, { 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 72c693a53..0cc18bc6d 100644 --- a/src/Uno.Templates/content/unolib-uitest/.template.config/template.json +++ b/src/Uno.Templates/content/unolib-uitest/.template.config/template.json @@ -47,6 +47,11 @@ "choice": "net9.0", "displayName": ".NET 9.0", "description": "Target .NET 9.0 (Standard Term Support)" + }, + { + "choice": "net10.0", + "displayName": ".NET 10.0", + "description": "Target .NET 10.0 (Preview)" } ] } diff --git a/src/Uno.Templates/content/unolib/.template.config/template.json b/src/Uno.Templates/content/unolib/.template.config/template.json index cefb2a576..6e93170fe 100644 --- a/src/Uno.Templates/content/unolib/.template.config/template.json +++ b/src/Uno.Templates/content/unolib/.template.config/template.json @@ -47,6 +47,11 @@ "choice": "net9.0", "displayName": ".NET 9.0", "description": "Target .NET 9.0 (Standard Term Support)" + }, + { + "choice": "net10.0", + "displayName": ".NET 10.0", + "description": "Target .NET 10.0 (Preview)" } ] }, diff --git a/src/Uno.Templates/content/unomauilib/.template.config/template.json b/src/Uno.Templates/content/unomauilib/.template.config/template.json index 6d87c4938..6912802eb 100644 --- a/src/Uno.Templates/content/unomauilib/.template.config/template.json +++ b/src/Uno.Templates/content/unomauilib/.template.config/template.json @@ -37,6 +37,11 @@ "choice": "net9.0", "displayName": ".NET 9.0", "description": "Target .NET 9.0 (Standard Term Support)" + }, + { + "choice": "net10.0", + "displayName": ".NET 10.0", + "description": "Target .NET 10.0 (Preview)" } ] }, diff --git a/tools/TemplateTfmSwitchGenerator/Program.cs b/tools/TemplateTfmSwitchGenerator/Program.cs index b0a639645..e988b7e75 100644 --- a/tools/TemplateTfmSwitchGenerator/Program.cs +++ b/tools/TemplateTfmSwitchGenerator/Program.cs @@ -14,7 +14,7 @@ new Platform("useUnitTests == true", "useUnitTests == false", null) ]; -string[] runtimes = ["net9.0"]; +string[] runtimes = ["net10.0"]; var cases = new List(); foreach (var runtime in runtimes) diff --git a/tools/Uno.Sdk.Updater/Program.cs b/tools/Uno.Sdk.Updater/Program.cs index bc084bd4d..89e76bea8 100644 --- a/tools/Uno.Sdk.Updater/Program.cs +++ b/tools/Uno.Sdk.Updater/Program.cs @@ -224,7 +224,7 @@ static void CreateUpdaterTargets(IEnumerable manifest, ref bool d { { "UnoVersion", GetManifestGroupVersion(manifest, "Core") }, { "UnoWasmBootstrapVersionNet8", GetManifestGroupVersion(manifest, "WasmBootstrap") }, - { "UnoWasmBootstrapVersionNet9", GetManifestGroupVersionOverride(manifest, "WasmBootstrap", "net9.0") }, + { "UnoWasmBootstrapVersionNet9", GetManifestGroupVersionOverride(manifest, "WasmBootstrap", "net10.0") }, { "UnoExtensionsLoggingVersion", GetManifestGroupVersion(manifest, "OSLogging") }, { "UnoCoreLoggingVersion", GetManifestGroupVersion(manifest, "CoreLogging") }, { "UnoDspTasksVersion", GetManifestGroupVersion(manifest, "Dsp") }, From f7ac4c61ff6a242f2dd782909d01972afdd6b9c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Laban?= Date: Wed, 27 Aug 2025 17:01:26 -0400 Subject: [PATCH 02/15] chore: Adjust for net10 --- .github/actions/ci/run-tests/action.yml | 4 ++-- .../content/unoapp/.template.config/template.json | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/actions/ci/run-tests/action.yml b/.github/actions/ci/run-tests/action.yml index 2d4ff1193..da05c49be 100644 --- a/.github/actions/ci/run-tests/action.yml +++ b/.github/actions/ci/run-tests/action.yml @@ -76,9 +76,9 @@ runs: $ValidationUnoCheckVersion = $env:ValidationUnoCheckVersionNet9 } - if ($templateArgs -match 'net9.0') + if ($templateArgs -match 'net10.0') { - $dotnetVersion = '9.0.300' + $dotnetVersion = '10.0.100-preview.7.25380.108' $ValidationUnoCheckVersion = $env:ValidationUnoCheckVersionNet10 } diff --git a/src/Uno.Templates/content/unoapp/.template.config/template.json b/src/Uno.Templates/content/unoapp/.template.config/template.json index 9747ea2ed..60a9e289f 100644 --- a/src/Uno.Templates/content/unoapp/.template.config/template.json +++ b/src/Uno.Templates/content/unoapp/.template.config/template.json @@ -178,6 +178,11 @@ "choice": "net9.0", "displayName": ".NET 9.0", "description": "Target .NET 9.0 (Standard Term Support)" + }, + { + "choice": "net10.0", + "displayName": ".NET 10.0", + "description": "Target .NET 10.0 (Preview)" } ] }, From 9df43bba110fd8f00ebe021aa13819c3320f7fb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Laban?= Date: Wed, 27 Aug 2025 17:07:32 -0400 Subject: [PATCH 03/15] chore: Bump to 9.0.304 for workload alignment, adjust other net10 values --- .github/actions/ci/run-tests/action.yml | 2 +- .../content/unoapp/.template.config/template.json | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/.github/actions/ci/run-tests/action.yml b/.github/actions/ci/run-tests/action.yml index da05c49be..5accada58 100644 --- a/.github/actions/ci/run-tests/action.yml +++ b/.github/actions/ci/run-tests/action.yml @@ -72,7 +72,7 @@ runs: if ($templateArgs -match 'net9.0') { - $dotnetVersion = '9.0.300' + $dotnetVersion = '9.0.304' $ValidationUnoCheckVersion = $env:ValidationUnoCheckVersionNet9 } diff --git a/src/Uno.Templates/content/unoapp/.template.config/template.json b/src/Uno.Templates/content/unoapp/.template.config/template.json index 60a9e289f..5835e9da5 100644 --- a/src/Uno.Templates/content/unoapp/.template.config/template.json +++ b/src/Uno.Templates/content/unoapp/.template.config/template.json @@ -323,6 +323,10 @@ { "condition": "(tfm == 'net9.0')", "value": "false" + }, + { + "condition": "(tfm == 'net10.0')", + "value": "true" } ] } @@ -339,6 +343,11 @@ // This could become 35 when net9.0 launches "condition": "(tfm == 'net9.0')", "value": "Component.Android.SDK34" + }, + { + // This could become 35 when net9.0 launches + "condition": "(tfm == 'net10.0')", + "value": "Component.Android.SDK35" } ] } From 92eb25c0040eca0c770c8e83582cb78a7684e3fd Mon Sep 17 00:00:00 2001 From: Jerome Laban Date: Wed, 27 Aug 2025 17:18:39 -0400 Subject: [PATCH 04/15] chore: Adjust conditions matrix --- .../unoapp/.template.config/template.json | 256 ++++++++++++++++++ tools/TemplateTfmSwitchGenerator/Program.cs | 2 +- 2 files changed, 257 insertions(+), 1 deletion(-) diff --git a/src/Uno.Templates/content/unoapp/.template.config/template.json b/src/Uno.Templates/content/unoapp/.template.config/template.json index 5835e9da5..49a1cb7ad 100644 --- a/src/Uno.Templates/content/unoapp/.template.config/template.json +++ b/src/Uno.Templates/content/unoapp/.template.config/template.json @@ -1690,6 +1690,262 @@ { "condition": "(tfm == 'net9.0' && platforms != android && platforms != ios && platforms != windows && platforms != wasm && platforms != desktop && useUnitTests == false)", "value": "" + }, + { + "condition": "(tfm == 'net10.0' && platforms == android && platforms == ios && platforms == windows && platforms == wasm && platforms == desktop && useUnitTests == true)", + "value": "net10.0-android;net10.0-ios;net10.0-windows10.0.26100;net10.0-browserwasm;net10.0-desktop;net10.0" + }, + { + "condition": "(tfm == 'net10.0' && platforms == android && platforms == ios && platforms == windows && platforms == wasm && platforms == desktop && useUnitTests == false)", + "value": "net10.0-android;net10.0-ios;net10.0-windows10.0.26100;net10.0-browserwasm;net10.0-desktop" + }, + { + "condition": "(tfm == 'net10.0' && platforms == android && platforms == ios && platforms == windows && platforms == wasm && platforms != desktop && useUnitTests == true)", + "value": "net10.0-android;net10.0-ios;net10.0-windows10.0.26100;net10.0-browserwasm;net10.0" + }, + { + "condition": "(tfm == 'net10.0' && platforms == android && platforms == ios && platforms == windows && platforms == wasm && platforms != desktop && useUnitTests == false)", + "value": "net10.0-android;net10.0-ios;net10.0-windows10.0.26100;net10.0-browserwasm" + }, + { + "condition": "(tfm == 'net10.0' && platforms == android && platforms == ios && platforms == windows && platforms != wasm && platforms == desktop && useUnitTests == true)", + "value": "net10.0-android;net10.0-ios;net10.0-windows10.0.26100;net10.0-desktop;net10.0" + }, + { + "condition": "(tfm == 'net10.0' && platforms == android && platforms == ios && platforms == windows && platforms != wasm && platforms == desktop && useUnitTests == false)", + "value": "net10.0-android;net10.0-ios;net10.0-windows10.0.26100;net10.0-desktop" + }, + { + "condition": "(tfm == 'net10.0' && platforms == android && platforms == ios && platforms == windows && platforms != wasm && platforms != desktop && useUnitTests == true)", + "value": "net10.0-android;net10.0-ios;net10.0-windows10.0.26100;net10.0" + }, + { + "condition": "(tfm == 'net10.0' && platforms == android && platforms == ios && platforms == windows && platforms != wasm && platforms != desktop && useUnitTests == false)", + "value": "net10.0-android;net10.0-ios;net10.0-windows10.0.26100" + }, + { + "condition": "(tfm == 'net10.0' && platforms == android && platforms == ios && platforms != windows && platforms == wasm && platforms == desktop && useUnitTests == true)", + "value": "net10.0-android;net10.0-ios;net10.0-browserwasm;net10.0-desktop;net10.0" + }, + { + "condition": "(tfm == 'net10.0' && platforms == android && platforms == ios && platforms != windows && platforms == wasm && platforms == desktop && useUnitTests == false)", + "value": "net10.0-android;net10.0-ios;net10.0-browserwasm;net10.0-desktop" + }, + { + "condition": "(tfm == 'net10.0' && platforms == android && platforms == ios && platforms != windows && platforms == wasm && platforms != desktop && useUnitTests == true)", + "value": "net10.0-android;net10.0-ios;net10.0-browserwasm;net10.0" + }, + { + "condition": "(tfm == 'net10.0' && platforms == android && platforms == ios && platforms != windows && platforms == wasm && platforms != desktop && useUnitTests == false)", + "value": "net10.0-android;net10.0-ios;net10.0-browserwasm" + }, + { + "condition": "(tfm == 'net10.0' && platforms == android && platforms == ios && platforms != windows && platforms != wasm && platforms == desktop && useUnitTests == true)", + "value": "net10.0-android;net10.0-ios;net10.0-desktop;net10.0" + }, + { + "condition": "(tfm == 'net10.0' && platforms == android && platforms == ios && platforms != windows && platforms != wasm && platforms == desktop && useUnitTests == false)", + "value": "net10.0-android;net10.0-ios;net10.0-desktop" + }, + { + "condition": "(tfm == 'net10.0' && platforms == android && platforms == ios && platforms != windows && platforms != wasm && platforms != desktop && useUnitTests == true)", + "value": "net10.0-android;net10.0-ios;net10.0" + }, + { + "condition": "(tfm == 'net10.0' && platforms == android && platforms == ios && platforms != windows && platforms != wasm && platforms != desktop && useUnitTests == false)", + "value": "net10.0-android;net10.0-ios" + }, + { + "condition": "(tfm == 'net10.0' && platforms == android && platforms != ios && platforms == windows && platforms == wasm && platforms == desktop && useUnitTests == true)", + "value": "net10.0-android;net10.0-windows10.0.26100;net10.0-browserwasm;net10.0-desktop;net10.0" + }, + { + "condition": "(tfm == 'net10.0' && platforms == android && platforms != ios && platforms == windows && platforms == wasm && platforms == desktop && useUnitTests == false)", + "value": "net10.0-android;net10.0-windows10.0.26100;net10.0-browserwasm;net10.0-desktop" + }, + { + "condition": "(tfm == 'net10.0' && platforms == android && platforms != ios && platforms == windows && platforms == wasm && platforms != desktop && useUnitTests == true)", + "value": "net10.0-android;net10.0-windows10.0.26100;net10.0-browserwasm;net10.0" + }, + { + "condition": "(tfm == 'net10.0' && platforms == android && platforms != ios && platforms == windows && platforms == wasm && platforms != desktop && useUnitTests == false)", + "value": "net10.0-android;net10.0-windows10.0.26100;net10.0-browserwasm" + }, + { + "condition": "(tfm == 'net10.0' && platforms == android && platforms != ios && platforms == windows && platforms != wasm && platforms == desktop && useUnitTests == true)", + "value": "net10.0-android;net10.0-windows10.0.26100;net10.0-desktop;net10.0" + }, + { + "condition": "(tfm == 'net10.0' && platforms == android && platforms != ios && platforms == windows && platforms != wasm && platforms == desktop && useUnitTests == false)", + "value": "net10.0-android;net10.0-windows10.0.26100;net10.0-desktop" + }, + { + "condition": "(tfm == 'net10.0' && platforms == android && platforms != ios && platforms == windows && platforms != wasm && platforms != desktop && useUnitTests == true)", + "value": "net10.0-android;net10.0-windows10.0.26100;net10.0" + }, + { + "condition": "(tfm == 'net10.0' && platforms == android && platforms != ios && platforms == windows && platforms != wasm && platforms != desktop && useUnitTests == false)", + "value": "net10.0-android;net10.0-windows10.0.26100" + }, + { + "condition": "(tfm == 'net10.0' && platforms == android && platforms != ios && platforms != windows && platforms == wasm && platforms == desktop && useUnitTests == true)", + "value": "net10.0-android;net10.0-browserwasm;net10.0-desktop;net10.0" + }, + { + "condition": "(tfm == 'net10.0' && platforms == android && platforms != ios && platforms != windows && platforms == wasm && platforms == desktop && useUnitTests == false)", + "value": "net10.0-android;net10.0-browserwasm;net10.0-desktop" + }, + { + "condition": "(tfm == 'net10.0' && platforms == android && platforms != ios && platforms != windows && platforms == wasm && platforms != desktop && useUnitTests == true)", + "value": "net10.0-android;net10.0-browserwasm;net10.0" + }, + { + "condition": "(tfm == 'net10.0' && platforms == android && platforms != ios && platforms != windows && platforms == wasm && platforms != desktop && useUnitTests == false)", + "value": "net10.0-android;net10.0-browserwasm" + }, + { + "condition": "(tfm == 'net10.0' && platforms == android && platforms != ios && platforms != windows && platforms != wasm && platforms == desktop && useUnitTests == true)", + "value": "net10.0-android;net10.0-desktop;net10.0" + }, + { + "condition": "(tfm == 'net10.0' && platforms == android && platforms != ios && platforms != windows && platforms != wasm && platforms == desktop && useUnitTests == false)", + "value": "net10.0-android;net10.0-desktop" + }, + { + "condition": "(tfm == 'net10.0' && platforms == android && platforms != ios && platforms != windows && platforms != wasm && platforms != desktop && useUnitTests == true)", + "value": "net10.0-android;net10.0" + }, + { + "condition": "(tfm == 'net10.0' && platforms == android && platforms != ios && platforms != windows && platforms != wasm && platforms != desktop && useUnitTests == false)", + "value": "net10.0-android" + }, + { + "condition": "(tfm == 'net10.0' && platforms != android && platforms == ios && platforms == windows && platforms == wasm && platforms == desktop && useUnitTests == true)", + "value": "net10.0-ios;net10.0-windows10.0.26100;net10.0-browserwasm;net10.0-desktop;net10.0" + }, + { + "condition": "(tfm == 'net10.0' && platforms != android && platforms == ios && platforms == windows && platforms == wasm && platforms == desktop && useUnitTests == false)", + "value": "net10.0-ios;net10.0-windows10.0.26100;net10.0-browserwasm;net10.0-desktop" + }, + { + "condition": "(tfm == 'net10.0' && platforms != android && platforms == ios && platforms == windows && platforms == wasm && platforms != desktop && useUnitTests == true)", + "value": "net10.0-ios;net10.0-windows10.0.26100;net10.0-browserwasm;net10.0" + }, + { + "condition": "(tfm == 'net10.0' && platforms != android && platforms == ios && platforms == windows && platforms == wasm && platforms != desktop && useUnitTests == false)", + "value": "net10.0-ios;net10.0-windows10.0.26100;net10.0-browserwasm" + }, + { + "condition": "(tfm == 'net10.0' && platforms != android && platforms == ios && platforms == windows && platforms != wasm && platforms == desktop && useUnitTests == true)", + "value": "net10.0-ios;net10.0-windows10.0.26100;net10.0-desktop;net10.0" + }, + { + "condition": "(tfm == 'net10.0' && platforms != android && platforms == ios && platforms == windows && platforms != wasm && platforms == desktop && useUnitTests == false)", + "value": "net10.0-ios;net10.0-windows10.0.26100;net10.0-desktop" + }, + { + "condition": "(tfm == 'net10.0' && platforms != android && platforms == ios && platforms == windows && platforms != wasm && platforms != desktop && useUnitTests == true)", + "value": "net10.0-ios;net10.0-windows10.0.26100;net10.0" + }, + { + "condition": "(tfm == 'net10.0' && platforms != android && platforms == ios && platforms == windows && platforms != wasm && platforms != desktop && useUnitTests == false)", + "value": "net10.0-ios;net10.0-windows10.0.26100" + }, + { + "condition": "(tfm == 'net10.0' && platforms != android && platforms == ios && platforms != windows && platforms == wasm && platforms == desktop && useUnitTests == true)", + "value": "net10.0-ios;net10.0-browserwasm;net10.0-desktop;net10.0" + }, + { + "condition": "(tfm == 'net10.0' && platforms != android && platforms == ios && platforms != windows && platforms == wasm && platforms == desktop && useUnitTests == false)", + "value": "net10.0-ios;net10.0-browserwasm;net10.0-desktop" + }, + { + "condition": "(tfm == 'net10.0' && platforms != android && platforms == ios && platforms != windows && platforms == wasm && platforms != desktop && useUnitTests == true)", + "value": "net10.0-ios;net10.0-browserwasm;net10.0" + }, + { + "condition": "(tfm == 'net10.0' && platforms != android && platforms == ios && platforms != windows && platforms == wasm && platforms != desktop && useUnitTests == false)", + "value": "net10.0-ios;net10.0-browserwasm" + }, + { + "condition": "(tfm == 'net10.0' && platforms != android && platforms == ios && platforms != windows && platforms != wasm && platforms == desktop && useUnitTests == true)", + "value": "net10.0-ios;net10.0-desktop;net10.0" + }, + { + "condition": "(tfm == 'net10.0' && platforms != android && platforms == ios && platforms != windows && platforms != wasm && platforms == desktop && useUnitTests == false)", + "value": "net10.0-ios;net10.0-desktop" + }, + { + "condition": "(tfm == 'net10.0' && platforms != android && platforms == ios && platforms != windows && platforms != wasm && platforms != desktop && useUnitTests == true)", + "value": "net10.0-ios;net10.0" + }, + { + "condition": "(tfm == 'net10.0' && platforms != android && platforms == ios && platforms != windows && platforms != wasm && platforms != desktop && useUnitTests == false)", + "value": "net10.0-ios" + }, + { + "condition": "(tfm == 'net10.0' && platforms != android && platforms != ios && platforms == windows && platforms == wasm && platforms == desktop && useUnitTests == true)", + "value": "net10.0-windows10.0.26100;net10.0-browserwasm;net10.0-desktop;net10.0" + }, + { + "condition": "(tfm == 'net10.0' && platforms != android && platforms != ios && platforms == windows && platforms == wasm && platforms == desktop && useUnitTests == false)", + "value": "net10.0-windows10.0.26100;net10.0-browserwasm;net10.0-desktop" + }, + { + "condition": "(tfm == 'net10.0' && platforms != android && platforms != ios && platforms == windows && platforms == wasm && platforms != desktop && useUnitTests == true)", + "value": "net10.0-windows10.0.26100;net10.0-browserwasm;net10.0" + }, + { + "condition": "(tfm == 'net10.0' && platforms != android && platforms != ios && platforms == windows && platforms == wasm && platforms != desktop && useUnitTests == false)", + "value": "net10.0-windows10.0.26100;net10.0-browserwasm" + }, + { + "condition": "(tfm == 'net10.0' && platforms != android && platforms != ios && platforms == windows && platforms != wasm && platforms == desktop && useUnitTests == true)", + "value": "net10.0-windows10.0.26100;net10.0-desktop;net10.0" + }, + { + "condition": "(tfm == 'net10.0' && platforms != android && platforms != ios && platforms == windows && platforms != wasm && platforms == desktop && useUnitTests == false)", + "value": "net10.0-windows10.0.26100;net10.0-desktop" + }, + { + "condition": "(tfm == 'net10.0' && platforms != android && platforms != ios && platforms == windows && platforms != wasm && platforms != desktop && useUnitTests == true)", + "value": "net10.0-windows10.0.26100;net10.0" + }, + { + "condition": "(tfm == 'net10.0' && platforms != android && platforms != ios && platforms == windows && platforms != wasm && platforms != desktop && useUnitTests == false)", + "value": "net10.0-windows10.0.26100" + }, + { + "condition": "(tfm == 'net10.0' && platforms != android && platforms != ios && platforms != windows && platforms == wasm && platforms == desktop && useUnitTests == true)", + "value": "net10.0-browserwasm;net10.0-desktop;net10.0" + }, + { + "condition": "(tfm == 'net10.0' && platforms != android && platforms != ios && platforms != windows && platforms == wasm && platforms == desktop && useUnitTests == false)", + "value": "net10.0-browserwasm;net10.0-desktop" + }, + { + "condition": "(tfm == 'net10.0' && platforms != android && platforms != ios && platforms != windows && platforms == wasm && platforms != desktop && useUnitTests == true)", + "value": "net10.0-browserwasm;net10.0" + }, + { + "condition": "(tfm == 'net10.0' && platforms != android && platforms != ios && platforms != windows && platforms == wasm && platforms != desktop && useUnitTests == false)", + "value": "net10.0-browserwasm" + }, + { + "condition": "(tfm == 'net10.0' && platforms != android && platforms != ios && platforms != windows && platforms != wasm && platforms == desktop && useUnitTests == true)", + "value": "net10.0-desktop;net10.0" + }, + { + "condition": "(tfm == 'net10.0' && platforms != android && platforms != ios && platforms != windows && platforms != wasm && platforms == desktop && useUnitTests == false)", + "value": "net10.0-desktop" + }, + { + "condition": "(tfm == 'net10.0' && platforms != android && platforms != ios && platforms != windows && platforms != wasm && platforms != desktop && useUnitTests == true)", + "value": "net10.0" + }, + { + "condition": "(tfm == 'net10.0' && platforms != android && platforms != ios && platforms != windows && platforms != wasm && platforms != desktop && useUnitTests == false)", + "value": "" } ] } diff --git a/tools/TemplateTfmSwitchGenerator/Program.cs b/tools/TemplateTfmSwitchGenerator/Program.cs index e988b7e75..b421f0b6a 100644 --- a/tools/TemplateTfmSwitchGenerator/Program.cs +++ b/tools/TemplateTfmSwitchGenerator/Program.cs @@ -14,7 +14,7 @@ new Platform("useUnitTests == true", "useUnitTests == false", null) ]; -string[] runtimes = ["net10.0"]; +string[] runtimes = ["net9.0", "net10.0"]; var cases = new List(); foreach (var runtime in runtimes) From f34e27e3e510544c833b715e4fa9ae893c9bde92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Laban?= Date: Wed, 27 Aug 2025 17:29:19 -0400 Subject: [PATCH 05/15] chore: Adjust more net10 --- .github/workflows/ci.yml | 2 +- src/Uno.Templates/Uno.Templates.csproj | 2 +- .../unoapp/.template.config/template.json | 16 ++++++++++++++++ tools/Uno.Sdk.Updater/Program.cs | 4 ++-- 4 files changed, 20 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6886ffe54..95e4feb8b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,7 +24,7 @@ env: IsCanaryBranch: ${{ startsWith(github.ref, 'refs/heads/canaries/') }} ValidationUnoCheckVersionNet9: '1.32.0-dev.52' ValidationUnoCheckVersionNet10: '1.32.0-dev.52' - ValidationDotNetVersion: '8.0.407' + ValidationDotNetVersion: '9.0.304' # https://github.com/unoplatform/Uno.Wasm.Bootstrap/pull/887 remove when upgarding to .NET 9 # compatible version of the bootstrapper diff --git a/src/Uno.Templates/Uno.Templates.csproj b/src/Uno.Templates/Uno.Templates.csproj index c2b3010b5..d8e7db7eb 100644 --- a/src/Uno.Templates/Uno.Templates.csproj +++ b/src/Uno.Templates/Uno.Templates.csproj @@ -35,7 +35,7 @@ - + diff --git a/src/Uno.Templates/content/unoapp/.template.config/template.json b/src/Uno.Templates/content/unoapp/.template.config/template.json index 49a1cb7ad..b7d8d506d 100644 --- a/src/Uno.Templates/content/unoapp/.template.config/template.json +++ b/src/Uno.Templates/content/unoapp/.template.config/template.json @@ -826,6 +826,10 @@ { "condition": "(tfm == 'net9.0')", "value": "DefaultUnoWasmBootstrapVersionNet9" + }, + { + "condition": "(tfm == 'net10.0')", + "value": "DefaultUnoWasmBootstrapVersionNet10" } ] } @@ -1423,6 +1427,10 @@ { "condition": "(tfm == 'net9.0')", "value": "9.0.x" + }, + { + "condition": "(tfm == 'net10.0')", + "value": "10.0.x" } ] } @@ -2232,6 +2240,10 @@ { "condition": "(tfm == 'net9.0')", "value": "9.0.0" + }, + { + "condition": "(tfm == 'net10.0')", + "value": "10.0.0-preview.7.25380.108" } ] } @@ -2247,6 +2259,10 @@ { "condition": "(tfm == 'net9.0')", "value": "9.0.0" + }, + { + "condition": "(tfm == 'net10.0')", + "value": "10.0.0-preview.7.25380.108" } ] } diff --git a/tools/Uno.Sdk.Updater/Program.cs b/tools/Uno.Sdk.Updater/Program.cs index 89e76bea8..506b0067a 100644 --- a/tools/Uno.Sdk.Updater/Program.cs +++ b/tools/Uno.Sdk.Updater/Program.cs @@ -223,8 +223,8 @@ static void CreateUpdaterTargets(IEnumerable manifest, ref bool d var props = new Dictionary { { "UnoVersion", GetManifestGroupVersion(manifest, "Core") }, - { "UnoWasmBootstrapVersionNet8", GetManifestGroupVersion(manifest, "WasmBootstrap") }, - { "UnoWasmBootstrapVersionNet9", GetManifestGroupVersionOverride(manifest, "WasmBootstrap", "net10.0") }, + { "UnoWasmBootstrapVersionNet9", GetManifestGroupVersion(manifest, "WasmBootstrap") }, + { "UnoWasmBootstrapVersionNet10", GetManifestGroupVersionOverride(manifest, "WasmBootstrap", "net10.0") }, { "UnoExtensionsLoggingVersion", GetManifestGroupVersion(manifest, "OSLogging") }, { "UnoCoreLoggingVersion", GetManifestGroupVersion(manifest, "CoreLogging") }, { "UnoDspTasksVersion", GetManifestGroupVersion(manifest, "Dsp") }, From 9592723b0a903be15df817adee5902fb08ca48cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Laban?= Date: Wed, 27 Aug 2025 17:33:42 -0400 Subject: [PATCH 06/15] chore: Update version --- src/Uno.Sdk.Updater.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Uno.Sdk.Updater.targets b/src/Uno.Sdk.Updater.targets index 9e537638c..7bc4bad1f 100644 --- a/src/Uno.Sdk.Updater.targets +++ b/src/Uno.Sdk.Updater.targets @@ -2,8 +2,8 @@ 6.3.0-dev.144 - 8.0.23 9.0.20 + 10.0.0-dev.24 1.7.0 4.1.1 1.4.0 From 3ffeec500cb98eea4e45938d33b37434165a05a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Laban?= Date: Thu, 28 Aug 2025 07:46:13 -0400 Subject: [PATCH 07/15] chore: Bump to JDK 17 --- .github/actions/ci/run-tests/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/ci/run-tests/action.yml b/.github/actions/ci/run-tests/action.yml index 5accada58..737679529 100644 --- a/.github/actions/ci/run-tests/action.yml +++ b/.github/actions/ci/run-tests/action.yml @@ -143,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' From 5b9bc81e9d4c6afc58b4b113e2c4e90d4c66581f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Laban?= Date: Thu, 28 Aug 2025 08:01:50 -0400 Subject: [PATCH 08/15] chore: Adjust default manifest --- src/Uno.Sdk/packages.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Uno.Sdk/packages.json b/src/Uno.Sdk/packages.json index 41d840483..67369b66e 100644 --- a/src/Uno.Sdk/packages.json +++ b/src/Uno.Sdk/packages.json @@ -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" } }, { @@ -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" } }, { @@ -263,14 +263,14 @@ }, { "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" } }, { From 2f16d28d7f98e58d62702e48b383515701807938 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Laban?= Date: Thu, 28 Aug 2025 08:23:11 -0400 Subject: [PATCH 09/15] chore: Bump androidx versions --- src/Uno.Sdk/packages.json | 40 +++++++++++++++++++++++++++++++-------- 1 file changed, 32 insertions(+), 8 deletions(-) diff --git a/src/Uno.Sdk/packages.json b/src/Uno.Sdk/packages.json index 67369b66e..3398462b4 100644 --- a/src/Uno.Sdk/packages.json +++ b/src/Uno.Sdk/packages.json @@ -199,49 +199,70 @@ "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", "packages": [ "Xamarin.AndroidX.AppCompat" - ] + ], + "versionOverride": { + "net10.0": "1.7.0.7" + } }, { "group": "AndroidXRecyclerView", "version": "1.3.2.10", "packages": [ "Xamarin.AndroidX.RecyclerView" - ] + ], + "versionOverride": { + "net10.0": "1.4.0.2" + } }, { "group": "AndroidXActivity", "version": "1.9.3.2", "packages": [ "Xamarin.AndroidX.Activity" - ] + ], + "versionOverride": { + "net10.0": "1.10.1.2" + } }, { "group": "AndroidXBrowser", "version": "1.8.0.8", "packages": [ "Xamarin.AndroidX.Browser" - ] + ], + "versionOverride": { + "net10.0": "1.8.0.10" + } }, { "group": "AndroidXSwipeRefreshLayout", "version": "1.1.0.24", "packages": [ "Xamarin.AndroidX.SwipeRefreshLayout" - ] + ], + "versionOverride": { + "net10.0": "1.1.0.28" + } }, { "group": "AndroidXNavigation", @@ -259,7 +280,10 @@ "packages": [ "Xamarin.AndroidX.Collection", "Xamarin.AndroidX.Collection.Ktx" - ] + ], + "versionOverride": { + "net10.0": "1.5.0.2" + } }, { "group": "Maui", From dce7ac79b6a2bf5c98ee79ea9ef4759a10957f76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Laban?= Date: Thu, 28 Aug 2025 08:50:11 -0400 Subject: [PATCH 10/15] chore: Adjust android versions --- src/Uno.Sdk/packages.json | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/Uno.Sdk/packages.json b/src/Uno.Sdk/packages.json index 3398462b4..742066207 100644 --- a/src/Uno.Sdk/packages.json +++ b/src/Uno.Sdk/packages.json @@ -189,10 +189,13 @@ }, { "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", @@ -266,7 +269,7 @@ }, { "group": "AndroidXNavigation", - "version": "2.8.5.1", + "version": "2.8.9.2", "packages": [ "Xamarin.AndroidX.Navigation.UI", "Xamarin.AndroidX.Navigation.Fragment", From c81cf1abfcbfcfdc3f01051f2d64aedb1e2d06ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Laban?= Date: Thu, 28 Aug 2025 09:13:07 -0400 Subject: [PATCH 11/15] chore: Bump android versions for net9 --- src/Uno.Sdk/packages.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Uno.Sdk/packages.json b/src/Uno.Sdk/packages.json index 742066207..63b3df6bc 100644 --- a/src/Uno.Sdk/packages.json +++ b/src/Uno.Sdk/packages.json @@ -219,7 +219,7 @@ }, { "group": "AndroidXAppCompat", - "version": "1.7.0.5", + "version": "1.7.0.7", "packages": [ "Xamarin.AndroidX.AppCompat" ], @@ -229,7 +229,7 @@ }, { "group": "AndroidXRecyclerView", - "version": "1.3.2.10", + "version": "1.4.0.2", "packages": [ "Xamarin.AndroidX.RecyclerView" ], @@ -239,7 +239,7 @@ }, { "group": "AndroidXActivity", - "version": "1.9.3.2", + "version": "1.10.1.2", "packages": [ "Xamarin.AndroidX.Activity" ], From 4574518d6211fb937a0a9c79ddcce48e962565c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Laban?= Date: Thu, 28 Aug 2025 09:39:05 -0400 Subject: [PATCH 12/15] chore: Adjust net9 android versions --- src/Uno.Sdk/packages.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Uno.Sdk/packages.json b/src/Uno.Sdk/packages.json index 63b3df6bc..cb1850171 100644 --- a/src/Uno.Sdk/packages.json +++ b/src/Uno.Sdk/packages.json @@ -249,7 +249,7 @@ }, { "group": "AndroidXBrowser", - "version": "1.8.0.8", + "version": "1.8.0.10", "packages": [ "Xamarin.AndroidX.Browser" ], @@ -259,7 +259,7 @@ }, { "group": "AndroidXSwipeRefreshLayout", - "version": "1.1.0.24", + "version": "1.1.0.28", "packages": [ "Xamarin.AndroidX.SwipeRefreshLayout" ], @@ -279,7 +279,7 @@ }, { "group": "AndroidXCollection", - "version": "1.4.5.2", + "version": "1.5.0.2", "packages": [ "Xamarin.AndroidX.Collection", "Xamarin.AndroidX.Collection.Ktx" From 8399a23990eab4e2896ae72656f3f5dae0af66b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Laban?= Date: Thu, 28 Aug 2025 09:59:10 -0400 Subject: [PATCH 13/15] chore: Bump xcode --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 95e4feb8b..a093fb63a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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 }} @@ -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 }} @@ -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 }} From 6ba6e0a4a8ae9cf691c826fc40a7b165dcc4b860 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Laban?= Date: Thu, 28 Aug 2025 15:34:17 -0400 Subject: [PATCH 14/15] chore: Remove default value as we always use a tfm --- .github/actions/ci/run-tests/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/ci/run-tests/action.yml b/.github/actions/ci/run-tests/action.yml index 737679529..f67518dd4 100644 --- a/.github/actions/ci/run-tests/action.yml +++ b/.github/actions/ci/run-tests/action.yml @@ -68,7 +68,7 @@ runs: $templateArgs = '${{ inputs.arguments }}' echo "TemplateArgs = '$templateArgs'" $dotnetVersion = $env:TargetDotNetVersion - $ValidationUnoCheckVersion = $env:ValidationUnoCheckVersionNet10 + $ValidationUnoCheckVersion = "invalid" if ($templateArgs -match 'net9.0') { From 58dfe2895db00650268df65708b6c006a982d62d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Laban?= Date: Thu, 28 Aug 2025 20:34:25 -0400 Subject: [PATCH 15/15] chore: Remove unused comments --- src/Uno.Templates/content/unoapp/.template.config/template.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/Uno.Templates/content/unoapp/.template.config/template.json b/src/Uno.Templates/content/unoapp/.template.config/template.json index b7d8d506d..7a8c5e4cf 100644 --- a/src/Uno.Templates/content/unoapp/.template.config/template.json +++ b/src/Uno.Templates/content/unoapp/.template.config/template.json @@ -340,12 +340,10 @@ "datatype": "string", "cases": [ { - // This could become 35 when net9.0 launches "condition": "(tfm == 'net9.0')", "value": "Component.Android.SDK34" }, { - // This could become 35 when net9.0 launches "condition": "(tfm == 'net10.0')", "value": "Component.Android.SDK35" }