Merge pull request #947 from unoplatform/dev/jela/update

Misc updates
unoplatform · Sep 11, 2024 · 800e301 · 800e301
2 parents 2894d1a + 682b5aa
commit 800e301
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 38 deletions.
diff --git a/build/.azure-pipelines.TemplateValidation.yml b/build/.azure-pipelines.TemplateValidation.yml
@@ -86,19 +86,21 @@ 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/src/Uno.Sdk.Updater.targets b/src/Uno.Sdk.Updater.targets
@@ -1,9 +1,9 @@
 <Project>
   <!-- This file is generated by the Uno.Sdk.Updater. Do not make manual changes. -->
   <PropertyGroup>
-    <UnoVersion>5.4.0-dev.1720</UnoVersion>
+    <UnoVersion>5.5.0-dev.227</UnoVersion>
     <UnoWasmBootstrapVersionNet8>8.0.21</UnoWasmBootstrapVersionNet8>
-    <UnoWasmBootstrapVersionNet9>9.0.0-dev.104</UnoWasmBootstrapVersionNet9>
+    <UnoWasmBootstrapVersionNet9>9.0.0-dev.120</UnoWasmBootstrapVersionNet9>
     <UnoExtensionsLoggingVersion>1.7.0</UnoExtensionsLoggingVersion>
     <UnoCoreLoggingVersion>4.1.1</UnoCoreLoggingVersion>
     <UnoDspTasksVersion>1.4.0-dev.12</UnoDspTasksVersion>

diff --git a/src/Uno.Sdk/ReadMe.md b/src/Uno.Sdk/ReadMe.md
@@ -4,11 +4,11 @@ The Uno.Sdk powers the Uno Platform Single Project, including the ability to imp
 
 | MSBuild Property | Default Version |
 |----------------|:---------------:|
-| UnoVersion* | 5.4.0-dev.1720 |
-| UnoExtensionsVersion | 5.0.0-dev.401 |
-| UnoToolkitVersion | 6.2.0-dev.41 |
-| UnoThemesVersion | 5.2.0-dev.22 |
-| UnoCSharpMarkupVersion | 5.4.0-dev.37 |
+| UnoVersion* | 5.5.0-dev.227 |
+| UnoExtensionsVersion | 5.0.0-dev.423 |
+| UnoToolkitVersion | 6.2.0-dev.42 |
+| UnoThemesVersion | 5.2.0-dev.23 |
+| UnoCSharpMarkupVersion | 5.4.0-dev.43 |
 | UnoWasmBootstrapVersion** | 8.0.21 |
 | UnoLoggingVersion | 1.7.0 |
 | UnoCoreLoggingSingletonVersion | 4.1.1 |
@@ -42,7 +42,7 @@ The Uno.Sdk powers the Uno Platform Single Project, including the ability to imp
 [
   {
     "group": "Core",
-    "version": "5.4.0-dev.1720",
+    "version": "5.5.0-dev.227",
     "packages": [
       "Uno.WinUI",
       "Uno.UI.Adapter.Microsoft.Extensions.Logging",
@@ -60,7 +60,8 @@ The Uno.Sdk powers the Uno Platform Single Project, including the ability to imp
       "Uno.WinUI.Svg",
       "Uno.WinUI.WebAssembly",
       "Uno.WinUI.Runtime.WebAssembly",
-      "Uno.WinUI.MediaPlayer.WebAssembly"
+      "Uno.WinUI.MediaPlayer.WebAssembly",
+      "Uno.WinUI.Graphics3DGL"
     ]
   },
   {
@@ -72,7 +73,7 @@ The Uno.Sdk powers the Uno Platform Single Project, including the ability to imp
       "Uno.Wasm.Bootstrap.Server"
     ],
     "versionOverride": {
-      "net9.0": "9.0.0-dev.104"
+      "net9.0": "9.0.0-dev.120"
     }
   },
   {
@@ -151,7 +152,7 @@ The Uno.Sdk powers the Uno Platform Single Project, including the ability to imp
       "Microsoft.Extensions.Logging.Console"
     ],
     "versionOverride": {
-      "net9.0": "9.0.0-preview.7.24405.7"
+      "net9.0": "9.0.0-rc.1.24431.7"
     }
   },
   {
@@ -161,7 +162,7 @@ The Uno.Sdk powers the Uno Platform Single Project, including the ability to imp
       "Microsoft.Windows.Compatibility"
     ],
     "versionOverride": {
-      "net9.0": "9.0.0-preview.7.24405.2"
+      "net9.0": "9.0.0-rc.1.24452.1"
     }
   },
   {
@@ -273,20 +274,20 @@ The Uno.Sdk powers the Uno Platform Single Project, including the ability to imp
       "Microsoft.Maui.Graphics"
     ],
     "versionOverride": {
-      "net9.0": "9.0.0-preview.7.24407.4"
+      "net9.0": "9.0.0-rc.1.24453.9"
     }
   },
   {
     "group": "CSharpMarkup",
-    "version": "5.4.0-dev.37",
+    "version": "5.4.0-dev.43",
     "packages": [
       "Uno.WinUI.Markup",
       "Uno.Extensions.Markup.Generators"
     ]
   },
   {
     "group": "Extensions",
-    "version": "5.0.0-dev.401",
+    "version": "5.0.0-dev.423",
     "packages": [
       "Uno.Extensions.Authentication.WinUI",
       "Uno.Extensions.Authentication.MSAL.WinUI",
@@ -314,7 +315,7 @@ The Uno.Sdk powers the Uno Platform Single Project, including the ability to imp
   },
   {
     "group": "Toolkit",
-    "version": "6.2.0-dev.41",
+    "version": "6.2.0-dev.42",
     "packages": [
       "Uno.Toolkit.WinUI",
       "Uno.Toolkit.WinUI.Cupertino",
@@ -326,7 +327,7 @@ The Uno.Sdk powers the Uno Platform Single Project, including the ability to imp
   },
   {
     "group": "Themes",
-    "version": "5.2.0-dev.22",
+    "version": "5.2.0-dev.23",
     "packages": [
       "Uno.Material.WinUI",
       "Uno.Material.WinUI.Markup",

diff --git a/src/Uno.Sdk/Uno.Sdk.Updater.props b/src/Uno.Sdk/Uno.Sdk.Updater.props
@@ -4,7 +4,7 @@
     <Description>Provides a base SDK for Uno Platform projects.</Description>
     <PackageTags></PackageTags>
     <SdkPackageId>Uno.Sdk.Private</SdkPackageId>
-    <SdkVersion>5.4.0-dev.1720</SdkVersion>
+    <SdkVersion>5.5.0-dev.227</SdkVersion>
     <PackageReadmeFile>ReadMe.md</PackageReadmeFile>
   </PropertyGroup>
 

diff --git a/src/Uno.Sdk/packages.json b/src/Uno.Sdk/packages.json
@@ -1,7 +1,7 @@
 [
   {
     "group": "Core",
-    "version": "5.4.0-dev.1720",
+    "version": "5.5.0-dev.227",
     "packages": [
       "Uno.WinUI",
       "Uno.UI.Adapter.Microsoft.Extensions.Logging",
@@ -19,7 +19,8 @@
       "Uno.WinUI.Svg",
       "Uno.WinUI.WebAssembly",
       "Uno.WinUI.Runtime.WebAssembly",
-      "Uno.WinUI.MediaPlayer.WebAssembly"
+      "Uno.WinUI.MediaPlayer.WebAssembly",
+      "Uno.WinUI.Graphics3DGL"
     ]
   },
   {
@@ -110,7 +111,7 @@
       "Microsoft.Extensions.Logging.Console"
     ],
     "versionOverride": {
-      "net9.0": "9.0.0-preview.7.24405.7"
+      "net9.0": "9.0.0-rc.1.24431.7"
     }
   },
   {
@@ -120,7 +121,7 @@
       "Microsoft.Windows.Compatibility"
     ],
     "versionOverride": {
-      "net9.0": "9.0.0-preview.7.24405.2"
+      "net9.0": "9.0.0-rc.1.24452.1"
     }
   },
   {
@@ -232,7 +233,7 @@
       "Microsoft.Maui.Graphics"
     ],
     "versionOverride": {
-      "net9.0": "9.0.0-preview.7.24407.4"
+      "net9.0": "9.0.0-rc.1.24453.9"
     }
   },
   {
@@ -245,7 +246,7 @@
   },
   {
     "group": "Extensions",
-    "version": "5.0.0-dev.401",
+    "version": "5.0.0-dev.423",
     "packages": [
       "Uno.Extensions.Authentication.WinUI",
       "Uno.Extensions.Authentication.MSAL.WinUI",
@@ -273,7 +274,7 @@
   },
   {
     "group": "Toolkit",
-    "version": "6.2.0-dev.41",
+    "version": "6.2.0-dev.42",
     "packages": [
       "Uno.Toolkit.WinUI",
       "Uno.Toolkit.WinUI.Cupertino",
@@ -285,7 +286,7 @@
   },
   {
     "group": "Themes",
-    "version": "5.2.0-dev.22",
+    "version": "5.2.0-dev.23",
     "packages": [
       "Uno.Material.WinUI",
       "Uno.Material.WinUI.Markup",