From b39b3561d15651acc27a2f5f9b5addf4fb700655 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 24 Nov 2022 14:44:28 +0000 Subject: [PATCH 1/2] Update dependencies from https://github.com/dotnet/arcade build 20221121.3 Microsoft.DotNet.ApiCompat , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 6.0.0-beta.22564.9 -> To Version 6.0.0-beta.22571.3 --- NuGet.config | 1 + eng/Version.Details.xml | 76 ++++++++++++++++---------------- eng/Versions.props | 30 ++++++------- eng/common/cross/toolchain.cmake | 7 +++ global.json | 8 ++-- 5 files changed, 65 insertions(+), 57 deletions(-) diff --git a/NuGet.config b/NuGet.config index b1084690d65b5c..6484fffd434e37 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,6 +10,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e068e5876d1717..ba99cfdfabd935 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -26,77 +26,77 @@ - + https://github.com/dotnet/arcade - 3a5fc99d467769acc6f951cfefef5a9718ecfc42 + 90ee0ffcc39e0fc56f6389a075c6f650b2b57018 - + https://github.com/dotnet/arcade - 3a5fc99d467769acc6f951cfefef5a9718ecfc42 + 90ee0ffcc39e0fc56f6389a075c6f650b2b57018 - + https://github.com/dotnet/arcade - 3a5fc99d467769acc6f951cfefef5a9718ecfc42 + 90ee0ffcc39e0fc56f6389a075c6f650b2b57018 - + https://github.com/dotnet/arcade - 3a5fc99d467769acc6f951cfefef5a9718ecfc42 + 90ee0ffcc39e0fc56f6389a075c6f650b2b57018 - + https://github.com/dotnet/arcade - 3a5fc99d467769acc6f951cfefef5a9718ecfc42 + 90ee0ffcc39e0fc56f6389a075c6f650b2b57018 - + https://github.com/dotnet/arcade - 3a5fc99d467769acc6f951cfefef5a9718ecfc42 + 90ee0ffcc39e0fc56f6389a075c6f650b2b57018 - + https://github.com/dotnet/arcade - 3a5fc99d467769acc6f951cfefef5a9718ecfc42 + 90ee0ffcc39e0fc56f6389a075c6f650b2b57018 - + https://github.com/dotnet/arcade - 3a5fc99d467769acc6f951cfefef5a9718ecfc42 + 90ee0ffcc39e0fc56f6389a075c6f650b2b57018 - + https://github.com/dotnet/arcade - 3a5fc99d467769acc6f951cfefef5a9718ecfc42 + 90ee0ffcc39e0fc56f6389a075c6f650b2b57018 - + https://github.com/dotnet/arcade - 3a5fc99d467769acc6f951cfefef5a9718ecfc42 + 90ee0ffcc39e0fc56f6389a075c6f650b2b57018 - + https://github.com/dotnet/arcade - 3a5fc99d467769acc6f951cfefef5a9718ecfc42 + 90ee0ffcc39e0fc56f6389a075c6f650b2b57018 - + https://github.com/dotnet/arcade - 3a5fc99d467769acc6f951cfefef5a9718ecfc42 + 90ee0ffcc39e0fc56f6389a075c6f650b2b57018 - + https://github.com/dotnet/arcade - 3a5fc99d467769acc6f951cfefef5a9718ecfc42 + 90ee0ffcc39e0fc56f6389a075c6f650b2b57018 - + https://github.com/dotnet/arcade - 3a5fc99d467769acc6f951cfefef5a9718ecfc42 + 90ee0ffcc39e0fc56f6389a075c6f650b2b57018 - + https://github.com/dotnet/arcade - 3a5fc99d467769acc6f951cfefef5a9718ecfc42 + 90ee0ffcc39e0fc56f6389a075c6f650b2b57018 - + https://github.com/dotnet/arcade - 3a5fc99d467769acc6f951cfefef5a9718ecfc42 + 90ee0ffcc39e0fc56f6389a075c6f650b2b57018 - + https://github.com/dotnet/arcade - 3a5fc99d467769acc6f951cfefef5a9718ecfc42 + 90ee0ffcc39e0fc56f6389a075c6f650b2b57018 - + https://github.com/dotnet/arcade - 3a5fc99d467769acc6f951cfefef5a9718ecfc42 + 90ee0ffcc39e0fc56f6389a075c6f650b2b57018 https://github.com/microsoft/vstest @@ -218,9 +218,9 @@ https://github.com/dotnet/xharness e9669dc84ecd668d3bbb748758103e23b394ffef - + https://github.com/dotnet/arcade - 3a5fc99d467769acc6f951cfefef5a9718ecfc42 + 90ee0ffcc39e0fc56f6389a075c6f650b2b57018 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index fbec02609ffe81..773dc364675609 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -42,21 +42,21 @@ 1.1.0-preview.22164.17 - 6.0.0-beta.22564.9 - 6.0.0-beta.22564.9 - 6.0.0-beta.22564.9 - 6.0.0-beta.22564.9 - 6.0.0-beta.22564.9 - 6.0.0-beta.22564.9 - 2.5.1-beta.22564.9 - 6.0.0-beta.22564.9 - 6.0.0-beta.22564.9 - 6.0.0-beta.22564.9 - 6.0.0-beta.22564.9 - 6.0.0-beta.22564.9 - 6.0.0-beta.22564.9 - 6.0.0-beta.22564.9 - 6.0.0-beta.22564.9 + 6.0.0-beta.22571.3 + 6.0.0-beta.22571.3 + 6.0.0-beta.22571.3 + 6.0.0-beta.22571.3 + 6.0.0-beta.22571.3 + 6.0.0-beta.22571.3 + 2.5.1-beta.22571.3 + 6.0.0-beta.22571.3 + 6.0.0-beta.22571.3 + 6.0.0-beta.22571.3 + 6.0.0-beta.22571.3 + 6.0.0-beta.22571.3 + 6.0.0-beta.22571.3 + 6.0.0-beta.22571.3 + 6.0.0-beta.22571.3 6.0.0-preview.1.102 diff --git a/eng/common/cross/toolchain.cmake b/eng/common/cross/toolchain.cmake index ec8971eb0195f8..51f30e53dd4303 100644 --- a/eng/common/cross/toolchain.cmake +++ b/eng/common/cross/toolchain.cmake @@ -1,5 +1,12 @@ set(CROSS_ROOTFS $ENV{ROOTFS_DIR}) +# reset platform variables (e.g. cmake 3.25 sets LINUX=1) +unset(LINUX) +unset(FREEBSD) +unset(ILLUMOS) +unset(ANDROID) +unset(TIZEN) + set(TARGET_ARCH_NAME $ENV{TARGET_BUILD_ARCH}) if(EXISTS ${CROSS_ROOTFS}/bin/freebsd-version) set(CMAKE_SYSTEM_NAME FreeBSD) diff --git a/global.json b/global.json index 22aecea4b48292..8ce67b8b62a57e 100644 --- a/global.json +++ b/global.json @@ -12,10 +12,10 @@ "python3": "3.7.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.22564.9", - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22564.9", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.22564.9", - "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.22564.9", + "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.22571.3", + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22571.3", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.22571.3", + "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.22571.3", "Microsoft.Build.NoTargets": "3.1.0", "Microsoft.Build.Traversal": "3.0.23", "Microsoft.NET.Sdk.IL": "6.0.0-rc.1.21415.6" From eee704a573e0adcba9ffa9044a2df27e3f270749 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 30 Nov 2022 17:27:11 +0000 Subject: [PATCH 2/2] Update dependencies from https://github.com/dotnet/emsdk build 20221129.1 Microsoft.NET.Workload.Emscripten.Manifest-6.0.100 , Microsoft.NET.Workload.Emscripten.Manifest-6.0.300 , Microsoft.NET.Workload.Emscripten.Manifest-6.0.400 From Version 6.0.12 -> To Version 6.0.13 --- NuGet.config | 3 +-- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6484fffd434e37..dfe6bea7160d32 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,8 +9,7 @@ - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ba99cfdfabd935..7d3249610af4f3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -8,17 +8,17 @@ https://github.com/dotnet/msquic 98129287d56a5e0348c291ce4260e630b4aa510d - + https://github.com/dotnet/emsdk - 851c3772feff6152af1a5013d9204d520a3e7457 + 14d64a811e8d4140438f9a8288abb139cb56d5de - + https://github.com/dotnet/emsdk - 851c3772feff6152af1a5013d9204d520a3e7457 + 14d64a811e8d4140438f9a8288abb139cb56d5de - + https://github.com/dotnet/emsdk - 851c3772feff6152af1a5013d9204d520a3e7457 + 14d64a811e8d4140438f9a8288abb139cb56d5de https://github.com/dotnet/wcf diff --git a/eng/Versions.props b/eng/Versions.props index 773dc364675609..2943cfc04efe68 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -173,9 +173,9 @@ 11.1.0-alpha.1.21416.1 11.1.0-alpha.1.21416.1 - 6.0.12 - 6.0.12 - 6.0.12 + 6.0.13 + 6.0.13 + 6.0.13 $(MicrosoftNETWorkloadEmscriptenManifest60100Version) 1.1.87-gba258badda