From ada43b21ff8f4cbb5e26504f27484442de13e32c Mon Sep 17 00:00:00 2001 From: jeromelaban <5839577+jeromelaban@users.noreply.github.com> Date: Wed, 11 Sep 2024 00:14:28 +0000 Subject: [PATCH 1/2] chore: Update Uno.Sdk --- src/Uno.Sdk.Updater.targets | 4 ++-- src/Uno.Sdk/ReadMe.md | 31 ++++++++++++++++--------------- src/Uno.Sdk/Uno.Sdk.Updater.props | 2 +- src/Uno.Sdk/packages.json | 17 +++++++++-------- 4 files changed, 28 insertions(+), 26 deletions(-) diff --git a/src/Uno.Sdk.Updater.targets b/src/Uno.Sdk.Updater.targets index c418056c..f31c8af8 100644 --- a/src/Uno.Sdk.Updater.targets +++ b/src/Uno.Sdk.Updater.targets @@ -1,9 +1,9 @@  - 5.4.0-dev.1720 + 5.5.0-dev.227 8.0.21 - 9.0.0-dev.104 + 9.0.0-dev.120 1.7.0 4.1.1 1.4.0-dev.12 diff --git a/src/Uno.Sdk/ReadMe.md b/src/Uno.Sdk/ReadMe.md index e0802484..e71411b1 100644 --- 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,12 +274,12 @@ 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" @@ -286,7 +287,7 @@ The Uno.Sdk powers the Uno Platform Single Project, including the ability to imp }, { "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 index 1a3ef6b9..1d1e3458 100644 --- a/src/Uno.Sdk/Uno.Sdk.Updater.props +++ b/src/Uno.Sdk/Uno.Sdk.Updater.props @@ -4,7 +4,7 @@ Provides a base SDK for Uno Platform projects. Uno.Sdk.Private - 5.4.0-dev.1720 + 5.5.0-dev.227 ReadMe.md diff --git a/src/Uno.Sdk/packages.json b/src/Uno.Sdk/packages.json index c8df4e56..2884ed88 100644 --- 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", From 682b5aa7970df147287027c5460adf677284bfb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Laban?= Date: Tue, 10 Sep 2024 20:33:21 -0400 Subject: [PATCH 2/2] chore: Disable net9 tests --- build/.azure-pipelines.TemplateValidation.yml | 26 ++++++++++--------- 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/build/.azure-pipelines.TemplateValidation.yml b/build/.azure-pipelines.TemplateValidation.yml index c14cf1d3..82aee986 100644 --- 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