From bd28a57aef4754adad9ab87ac2f924ebfa0d9dca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Laban?= Date: Tue, 12 Nov 2024 16:00:06 -0500 Subject: [PATCH 1/8] chore: Update to net9 rtm --- .github/workflows/uwp-autoconvert.yml | 2 +- build/ci/net9/global.json | 4 ++-- build/ci/templates/dotnet-mobile-install-linux.yml | 2 +- build/ci/templates/dotnet-mobile-install-mac.yml | 2 +- build/ci/templates/dotnet-mobile-install-windows.yml | 2 +- src/Uno.UI.RemoteControl.Host/Config/global-net9.0.json | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/uwp-autoconvert.yml b/.github/workflows/uwp-autoconvert.yml index 81bf71a88e44..0170b8d66328 100644 --- a/.github/workflows/uwp-autoconvert.yml +++ b/.github/workflows/uwp-autoconvert.yml @@ -13,7 +13,7 @@ concurrency: cancel-in-progress: true env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - UnoCheck_Version: '1.26.0-dev.63' + UnoCheck_Version: '1.27.0-dev.8' jobs: build: diff --git a/build/ci/net9/global.json b/build/ci/net9/global.json index 67a58e3c4b1e..8fec97e6dc97 100644 --- a/build/ci/net9/global.json +++ b/build/ci/net9/global.json @@ -1,11 +1,11 @@ { "sdk": { - "version": "9.0.100-rc.2.24474.11", + "version": "9.0.100", "allowPrerelease": true, "rollForward": "disable" }, "tools": { - "dotnet": "9.0.100-rc.2.24474.11" + "dotnet": "9.0.100" }, "msbuild-sdks": { "MSBuild.Sdk.Extras": "3.0.44", diff --git a/build/ci/templates/dotnet-mobile-install-linux.yml b/build/ci/templates/dotnet-mobile-install-linux.yml index 869700aa2261..15b4901ae26b 100644 --- a/build/ci/templates/dotnet-mobile-install-linux.yml +++ b/build/ci/templates/dotnet-mobile-install-linux.yml @@ -1,5 +1,5 @@ parameters: - UnoCheck_Version: '1.26.0-dev.63' + UnoCheck_Version: '1.27.0-dev.8' steps: diff --git a/build/ci/templates/dotnet-mobile-install-mac.yml b/build/ci/templates/dotnet-mobile-install-mac.yml index 15c1a0054858..4bfd4a406ec6 100644 --- a/build/ci/templates/dotnet-mobile-install-mac.yml +++ b/build/ci/templates/dotnet-mobile-install-mac.yml @@ -1,5 +1,5 @@ parameters: - UnoCheck_Version: '1.26.0-dev.63' + UnoCheck_Version: '1.27.0-dev.8' steps: diff --git a/build/ci/templates/dotnet-mobile-install-windows.yml b/build/ci/templates/dotnet-mobile-install-windows.yml index 15c1a0054858..4bfd4a406ec6 100644 --- a/build/ci/templates/dotnet-mobile-install-windows.yml +++ b/build/ci/templates/dotnet-mobile-install-windows.yml @@ -1,5 +1,5 @@ parameters: - UnoCheck_Version: '1.26.0-dev.63' + UnoCheck_Version: '1.27.0-dev.8' steps: diff --git a/src/Uno.UI.RemoteControl.Host/Config/global-net9.0.json b/src/Uno.UI.RemoteControl.Host/Config/global-net9.0.json index 97fb6fbccaae..3f6531454c7e 100644 --- a/src/Uno.UI.RemoteControl.Host/Config/global-net9.0.json +++ b/src/Uno.UI.RemoteControl.Host/Config/global-net9.0.json @@ -1,11 +1,11 @@ { "sdk": { - "version": "9.0.100-rc.2.24474.11", + "version": "9.0.100", "allowPrerelease": true, "rollForward": "latestFeature" }, "tools": { - "dotnet": "9.0.100-rc.2.24474.11" + "dotnet": "9.0.100" }, "msbuild-sdks": { "MSBuild.Sdk.Extras": "3.0.44" From 200ae5e36e45b65d6499366399ad2702ccb4f6a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Laban?= Date: Wed, 13 Nov 2024 22:33:17 -0500 Subject: [PATCH 2/8] chore: Bump to pool Windows2022-20241021-1, use vs17.12 --- .vsts-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 06d37df6a01c..04e2a038c894 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -53,7 +53,7 @@ variables: DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true windows2019HostedVMImage: 'windows-2019' windows2022HostedVMImage: 'windows-2022' - windowsScaledPool: 'Windows2022-20240421' + windowsScaledPool: 'Windows2022-20241021-1' linuxVMImage: 'ubuntu-latest' linuxScaledPool: 'Ubuntu2204-20230918' macOSVMImage: 'macOS-15' From a38648bb0c6ff7afb2bd6adaa45390746432058b Mon Sep 17 00:00:00 2001 From: Jerome Laban Date: Thu, 14 Nov 2024 07:31:01 -0500 Subject: [PATCH 3/8] chore: Adjust for packages vulnerabilities --- src/Directory.Build.targets | 5 +++++ src/SamplesApp/SamplesApp.Windows/SamplesApp.Windows.csproj | 3 +++ src/SourceGenerators/Uno.UI.Tasks/Uno.UI.Tasks.csproj | 3 +++ src/Uno.Analyzers.Tests/Uno.Analyzers.Tests.csproj | 5 +++++ src/Uno.UI.RuntimeTests/Uno.UI.RuntimeTests.Windows.csproj | 5 +++++ src/Uno.UI.Tests/Uno.UI.Unit.Tests.csproj | 5 +++++ 6 files changed, 26 insertions(+) diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets index 4a17f1430bd4..4d2c5b78fda2 100644 --- a/src/Directory.Build.targets +++ b/src/Directory.Build.targets @@ -96,6 +96,11 @@ + + + + + diff --git a/src/SamplesApp/SamplesApp.Windows/SamplesApp.Windows.csproj b/src/SamplesApp/SamplesApp.Windows/SamplesApp.Windows.csproj index 74e432295396..d4933a2d0290 100644 --- a/src/SamplesApp/SamplesApp.Windows/SamplesApp.Windows.csproj +++ b/src/SamplesApp/SamplesApp.Windows/SamplesApp.Windows.csproj @@ -49,6 +49,9 @@ + + + + diff --git a/src/Uno.Analyzers.Tests/Uno.Analyzers.Tests.csproj b/src/Uno.Analyzers.Tests/Uno.Analyzers.Tests.csproj index 4cd0150d236f..d64b5a7c6a19 100644 --- a/src/Uno.Analyzers.Tests/Uno.Analyzers.Tests.csproj +++ b/src/Uno.Analyzers.Tests/Uno.Analyzers.Tests.csproj @@ -25,6 +25,11 @@ + + + + + diff --git a/src/Uno.UI.RuntimeTests/Uno.UI.RuntimeTests.Windows.csproj b/src/Uno.UI.RuntimeTests/Uno.UI.RuntimeTests.Windows.csproj index 5c9faeab737d..dc15f359acdf 100644 --- a/src/Uno.UI.RuntimeTests/Uno.UI.RuntimeTests.Windows.csproj +++ b/src/Uno.UI.RuntimeTests/Uno.UI.RuntimeTests.Windows.csproj @@ -64,6 +64,11 @@ + + + + + diff --git a/src/Uno.UI.Tests/Uno.UI.Unit.Tests.csproj b/src/Uno.UI.Tests/Uno.UI.Unit.Tests.csproj index 86ab7df70560..005db7a7af2f 100644 --- a/src/Uno.UI.Tests/Uno.UI.Unit.Tests.csproj +++ b/src/Uno.UI.Tests/Uno.UI.Unit.Tests.csproj @@ -38,6 +38,11 @@ + + + + + From 1d3362d80772a0506f9c6dfd5a9d354bb397c249 Mon Sep 17 00:00:00 2001 From: Jerome Laban Date: Thu, 14 Nov 2024 07:53:25 -0500 Subject: [PATCH 4/8] chore: Adjust package inclusion --- src/Directory.Build.targets | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets index 4d2c5b78fda2..85f85a2ef7fe 100644 --- a/src/Directory.Build.targets +++ b/src/Directory.Build.targets @@ -99,8 +99,8 @@ - - + + From dc571fe0c8856a4823dd88f9e46329d99d81cdbf Mon Sep 17 00:00:00 2001 From: Jerome Laban Date: Thu, 14 Nov 2024 08:03:11 -0500 Subject: [PATCH 5/8] chore: Adjust ASN1 package --- src/Directory.Build.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets index 85f85a2ef7fe..a63427e52c1b 100644 --- a/src/Directory.Build.targets +++ b/src/Directory.Build.targets @@ -100,7 +100,7 @@ - + From b8d855471e3f399c73e05665400e647e0b31d483 Mon Sep 17 00:00:00 2001 From: Jerome Laban Date: Thu, 14 Nov 2024 08:11:44 -0500 Subject: [PATCH 6/8] chore: Adjust asn1 --- src/Directory.Build.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets index a63427e52c1b..a1b844b42a73 100644 --- a/src/Directory.Build.targets +++ b/src/Directory.Build.targets @@ -100,7 +100,7 @@ - + From 2607c448fa0112fbb4029a0a85cd58475a399601 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Laban?= Date: Thu, 14 Nov 2024 16:10:12 -0500 Subject: [PATCH 7/8] chore: More explicit package references --- src/Directory.Build.targets | 3 ++- .../Uno.UI.SourceGenerators.Tests.csproj | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets index a1b844b42a73..bfad30deba1f 100644 --- a/src/Directory.Build.targets +++ b/src/Directory.Build.targets @@ -99,8 +99,9 @@ - + + diff --git a/src/SourceGenerators/Uno.UI.SourceGenerators.Tests/Uno.UI.SourceGenerators.Tests.csproj b/src/SourceGenerators/Uno.UI.SourceGenerators.Tests/Uno.UI.SourceGenerators.Tests.csproj index b9f510008a38..d15532a30aa0 100644 --- a/src/SourceGenerators/Uno.UI.SourceGenerators.Tests/Uno.UI.SourceGenerators.Tests.csproj +++ b/src/SourceGenerators/Uno.UI.SourceGenerators.Tests/Uno.UI.SourceGenerators.Tests.csproj @@ -47,6 +47,11 @@ + + + + + From 99e1c5e782b182ca9683a09b3a5ce0a15e4afdb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Laban?= Date: Fri, 15 Nov 2024 17:24:52 -0500 Subject: [PATCH 8/8] chore: Update docs image --- .vsts-ci-docs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.vsts-ci-docs.yml b/.vsts-ci-docs.yml index f9caa659cd61..924f9a8616c4 100644 --- a/.vsts-ci-docs.yml +++ b/.vsts-ci-docs.yml @@ -17,7 +17,7 @@ pr: - legacy/* variables: - windowsScaledPool: 'Windows2022-20240421' + windowsScaledPool: 'Windows2022-20241021-1' linuxVMImage: 'ubuntu-latest' stages: