[release/6.0] Update dependencies from dotnet/arcade dotnet/emsdk (#7…

…8829) * 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 * 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 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
dotnet · Nov 30, 2022 · d5edd29 · d5edd29
1 parent 48bf76a
commit d5edd29
Show file tree

Hide file tree

Showing 5 changed files with 74 additions and 67 deletions.
diff --git a/NuGet.config b/NuGet.config
@@ -9,7 +9,7 @@
     <clear />
     <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
     <!--  Begin: Package sources from dotnet-emsdk -->
-    <add key="darc-pub-dotnet-emsdk-851c377" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-851c3772/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-emsdk-14d64a8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-14d64a81/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-emsdk -->
     <!--  Begin: Package sources from dotnet-wcf -->
     <!--  End: Package sources from dotnet-wcf -->

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -8,95 +8,95 @@
       <Uri>https://github.com/dotnet/msquic</Uri>
       <Sha>98129287d56a5e0348c291ce4260e630b4aa510d</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.100" Version="6.0.12">
+    <Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.100" Version="6.0.13">
       <Uri>https://github.com/dotnet/emsdk</Uri>
-      <Sha>851c3772feff6152af1a5013d9204d520a3e7457</Sha>
+      <Sha>14d64a811e8d4140438f9a8288abb139cb56d5de</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.300" Version="6.0.12">
+    <Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.300" Version="6.0.13">
       <Uri>https://github.com/dotnet/emsdk</Uri>
-      <Sha>851c3772feff6152af1a5013d9204d520a3e7457</Sha>
+      <Sha>14d64a811e8d4140438f9a8288abb139cb56d5de</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.400" Version="6.0.12">
+    <Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.400" Version="6.0.13">
       <Uri>https://github.com/dotnet/emsdk</Uri>
-      <Sha>851c3772feff6152af1a5013d9204d520a3e7457</Sha>
+      <Sha>14d64a811e8d4140438f9a8288abb139cb56d5de</Sha>
     </Dependency>
     <Dependency Name="System.ServiceModel.Primitives" Version="4.9.0">
       <Uri>https://github.com/dotnet/wcf</Uri>
       <Sha>04c3656e0325277aefa18378f24238d39b259222</Sha>
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.22564.9">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.22571.3">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>3a5fc99d467769acc6f951cfefef5a9718ecfc42</Sha>
+      <Sha>90ee0ffcc39e0fc56f6389a075c6f650b2b57018</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.22564.9">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.22571.3">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>3a5fc99d467769acc6f951cfefef5a9718ecfc42</Sha>
+      <Sha>90ee0ffcc39e0fc56f6389a075c6f650b2b57018</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.22564.9">
+    <Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.22571.3">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>3a5fc99d467769acc6f951cfefef5a9718ecfc42</Sha>
+      <Sha>90ee0ffcc39e0fc56f6389a075c6f650b2b57018</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.22564.9">
+    <Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.22571.3">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>3a5fc99d467769acc6f951cfefef5a9718ecfc42</Sha>
+      <Sha>90ee0ffcc39e0fc56f6389a075c6f650b2b57018</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.GenFacades" Version="6.0.0-beta.22564.9">
+    <Dependency Name="Microsoft.DotNet.GenFacades" Version="6.0.0-beta.22571.3">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>3a5fc99d467769acc6f951cfefef5a9718ecfc42</Sha>
+      <Sha>90ee0ffcc39e0fc56f6389a075c6f650b2b57018</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.22564.9">
+    <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.22571.3">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>3a5fc99d467769acc6f951cfefef5a9718ecfc42</Sha>
+      <Sha>90ee0ffcc39e0fc56f6389a075c6f650b2b57018</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.22564.9">
+    <Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.22571.3">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>3a5fc99d467769acc6f951cfefef5a9718ecfc42</Sha>
+      <Sha>90ee0ffcc39e0fc56f6389a075c6f650b2b57018</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="6.0.0-beta.22564.9">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="6.0.0-beta.22571.3">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>3a5fc99d467769acc6f951cfefef5a9718ecfc42</Sha>
+      <Sha>90ee0ffcc39e0fc56f6389a075c6f650b2b57018</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.22564.9">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.22571.3">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>3a5fc99d467769acc6f951cfefef5a9718ecfc42</Sha>
+      <Sha>90ee0ffcc39e0fc56f6389a075c6f650b2b57018</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.22564.9">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.22571.3">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>3a5fc99d467769acc6f951cfefef5a9718ecfc42</Sha>
+      <Sha>90ee0ffcc39e0fc56f6389a075c6f650b2b57018</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="6.0.0-beta.22564.9">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="6.0.0-beta.22571.3">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>3a5fc99d467769acc6f951cfefef5a9718ecfc42</Sha>
+      <Sha>90ee0ffcc39e0fc56f6389a075c6f650b2b57018</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="6.0.0-beta.22564.9">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="6.0.0-beta.22571.3">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>3a5fc99d467769acc6f951cfefef5a9718ecfc42</Sha>
+      <Sha>90ee0ffcc39e0fc56f6389a075c6f650b2b57018</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.22564.9">
+    <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.22571.3">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>3a5fc99d467769acc6f951cfefef5a9718ecfc42</Sha>
+      <Sha>90ee0ffcc39e0fc56f6389a075c6f650b2b57018</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="6.0.0-beta.22564.9">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="6.0.0-beta.22571.3">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>3a5fc99d467769acc6f951cfefef5a9718ecfc42</Sha>
+      <Sha>90ee0ffcc39e0fc56f6389a075c6f650b2b57018</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.22564.9">
+    <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.22571.3">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>3a5fc99d467769acc6f951cfefef5a9718ecfc42</Sha>
+      <Sha>90ee0ffcc39e0fc56f6389a075c6f650b2b57018</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.22564.9">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.22571.3">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>3a5fc99d467769acc6f951cfefef5a9718ecfc42</Sha>
+      <Sha>90ee0ffcc39e0fc56f6389a075c6f650b2b57018</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="6.0.0-beta.22564.9">
+    <Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="6.0.0-beta.22571.3">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>3a5fc99d467769acc6f951cfefef5a9718ecfc42</Sha>
+      <Sha>90ee0ffcc39e0fc56f6389a075c6f650b2b57018</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="6.0.0-beta.22564.9">
+    <Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="6.0.0-beta.22571.3">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>3a5fc99d467769acc6f951cfefef5a9718ecfc42</Sha>
+      <Sha>90ee0ffcc39e0fc56f6389a075c6f650b2b57018</Sha>
     </Dependency>
     <Dependency Name="Microsoft.NET.Test.Sdk" Version="16.9.0-preview-20201201-01">
       <Uri>https://github.com/microsoft/vstest</Uri>
@@ -218,9 +218,9 @@
       <Uri>https://github.com/dotnet/xharness</Uri>
       <Sha>e9669dc84ecd668d3bbb748758103e23b394ffef</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.PackageTesting" Version="6.0.0-beta.22564.9">
+    <Dependency Name="Microsoft.DotNet.PackageTesting" Version="6.0.0-beta.22571.3">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>3a5fc99d467769acc6f951cfefef5a9718ecfc42</Sha>
+      <Sha>90ee0ffcc39e0fc56f6389a075c6f650b2b57018</Sha>
     </Dependency>
     <Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.21416.5">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>

diff --git a/eng/Versions.props b/eng/Versions.props
@@ -42,21 +42,21 @@
     <!-- SDK dependencies -->
     <MicrosoftDotNetCompatibilityVersion>1.1.0-preview.22164.17</MicrosoftDotNetCompatibilityVersion>
     <!-- Arcade dependencies -->
-    <MicrosoftDotNetApiCompatVersion>6.0.0-beta.22564.9</MicrosoftDotNetApiCompatVersion>
-    <MicrosoftDotNetBuildTasksFeedVersion>6.0.0-beta.22564.9</MicrosoftDotNetBuildTasksFeedVersion>
-    <MicrosoftDotNetCodeAnalysisVersion>6.0.0-beta.22564.9</MicrosoftDotNetCodeAnalysisVersion>
-    <MicrosoftDotNetGenAPIVersion>6.0.0-beta.22564.9</MicrosoftDotNetGenAPIVersion>
-    <MicrosoftDotNetGenFacadesVersion>6.0.0-beta.22564.9</MicrosoftDotNetGenFacadesVersion>
-    <MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.22564.9</MicrosoftDotNetXUnitExtensionsVersion>
-    <MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.22564.9</MicrosoftDotNetXUnitConsoleRunnerVersion>
-    <MicrosoftDotNetBuildTasksArchivesVersion>6.0.0-beta.22564.9</MicrosoftDotNetBuildTasksArchivesVersion>
-    <MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.22564.9</MicrosoftDotNetBuildTasksInstallersVersion>
-    <MicrosoftDotNetBuildTasksPackagingVersion>6.0.0-beta.22564.9</MicrosoftDotNetBuildTasksPackagingVersion>
-    <MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.22564.9</MicrosoftDotNetBuildTasksTemplatingVersion>
-    <MicrosoftDotNetBuildTasksWorkloadsPackageVersion>6.0.0-beta.22564.9</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
-    <MicrosoftDotNetRemoteExecutorVersion>6.0.0-beta.22564.9</MicrosoftDotNetRemoteExecutorVersion>
-    <MicrosoftDotNetVersionToolsTasksVersion>6.0.0-beta.22564.9</MicrosoftDotNetVersionToolsTasksVersion>
-    <MicrosoftDotNetPackageTestingVersion>6.0.0-beta.22564.9</MicrosoftDotNetPackageTestingVersion>
+    <MicrosoftDotNetApiCompatVersion>6.0.0-beta.22571.3</MicrosoftDotNetApiCompatVersion>
+    <MicrosoftDotNetBuildTasksFeedVersion>6.0.0-beta.22571.3</MicrosoftDotNetBuildTasksFeedVersion>
+    <MicrosoftDotNetCodeAnalysisVersion>6.0.0-beta.22571.3</MicrosoftDotNetCodeAnalysisVersion>
+    <MicrosoftDotNetGenAPIVersion>6.0.0-beta.22571.3</MicrosoftDotNetGenAPIVersion>
+    <MicrosoftDotNetGenFacadesVersion>6.0.0-beta.22571.3</MicrosoftDotNetGenFacadesVersion>
+    <MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.22571.3</MicrosoftDotNetXUnitExtensionsVersion>
+    <MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.22571.3</MicrosoftDotNetXUnitConsoleRunnerVersion>
+    <MicrosoftDotNetBuildTasksArchivesVersion>6.0.0-beta.22571.3</MicrosoftDotNetBuildTasksArchivesVersion>
+    <MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.22571.3</MicrosoftDotNetBuildTasksInstallersVersion>
+    <MicrosoftDotNetBuildTasksPackagingVersion>6.0.0-beta.22571.3</MicrosoftDotNetBuildTasksPackagingVersion>
+    <MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.22571.3</MicrosoftDotNetBuildTasksTemplatingVersion>
+    <MicrosoftDotNetBuildTasksWorkloadsPackageVersion>6.0.0-beta.22571.3</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
+    <MicrosoftDotNetRemoteExecutorVersion>6.0.0-beta.22571.3</MicrosoftDotNetRemoteExecutorVersion>
+    <MicrosoftDotNetVersionToolsTasksVersion>6.0.0-beta.22571.3</MicrosoftDotNetVersionToolsTasksVersion>
+    <MicrosoftDotNetPackageTestingVersion>6.0.0-beta.22571.3</MicrosoftDotNetPackageTestingVersion>
     <!-- NuGet dependencies -->
     <NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
     <!-- Installer dependencies -->
@@ -173,9 +173,9 @@
     <runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>11.1.0-alpha.1.21416.1</runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
     <runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>11.1.0-alpha.1.21416.1</runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
     <!-- emscripten / Node -->
-    <MicrosoftNETWorkloadEmscriptenManifest60100Version>6.0.12</MicrosoftNETWorkloadEmscriptenManifest60100Version>
-    <MicrosoftNETWorkloadEmscriptenManifest60300Version>6.0.12</MicrosoftNETWorkloadEmscriptenManifest60300Version>
-    <MicrosoftNETWorkloadEmscriptenManifest60400Version>6.0.12</MicrosoftNETWorkloadEmscriptenManifest60400Version>
+    <MicrosoftNETWorkloadEmscriptenManifest60100Version>6.0.13</MicrosoftNETWorkloadEmscriptenManifest60100Version>
+    <MicrosoftNETWorkloadEmscriptenManifest60300Version>6.0.13</MicrosoftNETWorkloadEmscriptenManifest60300Version>
+    <MicrosoftNETWorkloadEmscriptenManifest60400Version>6.0.13</MicrosoftNETWorkloadEmscriptenManifest60400Version>
     <MicrosoftNETRuntimeEmscriptenVersion>$(MicrosoftNETWorkloadEmscriptenManifest60100Version)</MicrosoftNETRuntimeEmscriptenVersion>
     <!-- workloads -->
     <SwixPackageVersion>1.1.87-gba258badda</SwixPackageVersion>

diff --git 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
@@ -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"