Merge pull request #973 from unoplatform/dev/jela/restore-net9

chore: Restore net9 validation
unoplatform · Sep 23, 2024 · 68bffdd · 68bffdd
2 parents 0824a46 + 5ca15cf
commit 68bffdd
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 23 deletions.
diff --git a/build/.azure-pipelines.TemplateValidation.yml b/build/.azure-pipelines.TemplateValidation.yml
@@ -86,21 +86,19 @@ jobs:
               }
           }
 
-          # Disabled until net9-rc1 is supported by the uno wasm bootstrapper
-          #
           # generate matrix for net9
-          # for ($i = 0; $i -lt $tests.Count; $i++) 
-          # { 
-          #     $currentGroup += $tests[$i] + " -tfm net9.0";
-          # 
-          #     if ($currentGroup.Count -eq $groupSize) {
-          #       $matrixGroups["Group$($matrixGroups.Count)_net9"] = @{
-          #         'unocheckArguments' = '--pre-major'
-          #         'validations' = $currentGroup -join "`r`n"
-          #       };
-          #       $currentGroup = @()
-          #     }
-          # }
+          for ($i = 0; $i -lt $tests.Count; $i++) 
+          { 
+              $currentGroup += $tests[$i] + " -tfm net9.0";
+          
+              if ($currentGroup.Count -eq $groupSize) {
+                $matrixGroups["Group$($matrixGroups.Count)_net9"] = @{
+                  'unocheckArguments' = '--pre-major'
+                  'validations' = $currentGroup -join "`r`n"
+                };
+                $currentGroup = @()
+              }
+          }
 
           $matrixAsJson = $matrixGroups | ConvertTo-Json -Compress
 

diff --git a/build/.azure-pipelines.yml b/build/.azure-pipelines.yml
@@ -19,7 +19,7 @@ pr:
 variables:
   DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
   IsCanaryBranch: $[startsWith(variables['Build.SourceBranch'], 'refs/heads/canaries/')]
-  ValidationUnoCheckVersion: '1.25.1'
+  ValidationUnoCheckVersion: '1.26.0-dev.40'
   ValidationDotNetVersion: '8.0.400'
 
   # https://github.com/unoplatform/Uno.Wasm.Bootstrap/pull/887 remove when upgarding to .NET 9

diff --git a/src/Uno.Sdk/packages.json b/src/Uno.Sdk/packages.json
@@ -160,7 +160,7 @@
   },
   {
     "group": "AndroidMaterial",
-    "version": "1.10.0.3",
+    "version": "1.11.0.2",
     "packages": [
       "Xamarin.Google.Android.Material"
     ]
@@ -174,42 +174,42 @@
   },
   {
     "group": "AndroidXAppCompat",
-    "version": "1.6.1.7",
+    "version": "1.7.0.2",
     "packages": [
       "Xamarin.AndroidX.AppCompat"
     ]
   },
   {
     "group": "AndroidXRecyclerView",
-    "version": "1.3.2.2",
+    "version": "1.3.2.7",
     "packages": [
       "Xamarin.AndroidX.RecyclerView"
     ]
   },
   {
     "group": "AndroidXActivity",
-    "version": "1.8.2.1",
+    "version": "1.9.1.1",
     "packages": [
       "Xamarin.AndroidX.Activity"
     ]
   },
   {
     "group": "AndroidXBrowser",
-    "version": "1.8.0",
+    "version": "1.8.0.4",
     "packages": [
       "Xamarin.AndroidX.Browser"
     ]
   },
   {
     "group": "AndroidXSwipeRefreshLayout",
-    "version": "1.1.0.18",
+    "version": "1.1.0.22",
     "packages": [
       "Xamarin.AndroidX.SwipeRefreshLayout"
     ]
   },
   {
     "group": "AndroidXNavigation",
-    "version": "2.7.7.1",
+    "version": "2.7.7.6",
     "packages": [
       "Xamarin.AndroidX.Navigation.UI",
       "Xamarin.AndroidX.Navigation.Fragment",
@@ -219,7 +219,7 @@
   },
   {
     "group": "AndroidXCollection",
-    "version": "1.4.0.1",
+    "version": "1.4.2.1",
     "packages": [
       "Xamarin.AndroidX.Collection",
       "Xamarin.AndroidX.Collection.Ktx"