feat: Add net10 support

.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++)

.github/actions/ci/run-tests/action.yml

@@ -68,22 +68,28 @@ runs:
         $templateArgs = '${{ inputs.arguments }}'
         echo "TemplateArgs = '$templateArgs'"
         $dotnetVersion = $env:TargetDotNetVersion
-        $ValidationUnoCheckVersion = $env:ValidationUnoCheckVersionNet8
+        $ValidationUnoCheckVersion = $env:ValidationUnoCheckVersionNet10
 
         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

.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

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"
     }
   },
   {

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" ]
 			}
 		},
 		{