Merge in 'release/6.0' changes

5edef4b2 · dotnet-bot · 22da7ee6 · 19fde2f5 · 5edef4b2 · 5edef4b2
隐藏空白更改
内联并排

Showing with 63 addition and 63 deletion

NuGet.config NuGet.config +1 -1

eng/Version.Details.xml eng/Version.Details.xml +41 -41

eng/Versions.props eng/Versions.props +15 -15

global.json global.json +6 -6

未找到文件。
--- 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-0d02a9f" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-0d02a9fc/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-emsdk-0c39542" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-0c395427/nuget/v3/index.json" />
    <!--  End: Package sources from dotnet-emsdk -->
    <!--  Begin: Package sources from dotnet-wcf -->
    <!--  End: Package sources from dotnet-wcf -->

--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -10,15 +10,15 @@
    </Dependency>
    <Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.100" Version="6.0.15">
      <Uri>https://github.com/dotnet/emsdk</Uri>
-      <Sha>0d02a9fc71d6e5da74daac3a136042f3790283b2</Sha>
+      <Sha>0c39542771ca202430d0042f710622b5b916ff0a</Sha>
    </Dependency>
    <Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.300" Version="6.0.15">
      <Uri>https://github.com/dotnet/emsdk</Uri>
-      <Sha>0d02a9fc71d6e5da74daac3a136042f3790283b2</Sha>
+      <Sha>0c39542771ca202430d0042f710622b5b916ff0a</Sha>
    </Dependency>
    <Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.400" Version="6.0.15">
      <Uri>https://github.com/dotnet/emsdk</Uri>
-      <Sha>0d02a9fc71d6e5da74daac3a136042f3790283b2</Sha>
+      <Sha>0c39542771ca202430d0042f710622b5b916ff0a</Sha>
    </Dependency>
    <Dependency Name="System.ServiceModel.Primitives" Version="4.9.0">
      <Uri>https://github.com/dotnet/wcf</Uri>
@@ -26,77 +26,77 @@
    </Dependency>
  </ProductDependencies>
  <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.23069.5">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.23114.5">
      <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>f8800600643e883856027b572461af5d92ed6ff0</Sha>
+      <Sha>0c93c1cb1ef9c9d5c1a59f4ab98c2f7e37f12197</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.23069.5">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.23114.5">
      <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>f8800600643e883856027b572461af5d92ed6ff0</Sha>
+      <Sha>0c93c1cb1ef9c9d5c1a59f4ab98c2f7e37f12197</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.23069.5">
+    <Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.23114.5">
      <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>f8800600643e883856027b572461af5d92ed6ff0</Sha>
+      <Sha>0c93c1cb1ef9c9d5c1a59f4ab98c2f7e37f12197</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.23069.5">
+    <Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.23114.5">
      <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>f8800600643e883856027b572461af5d92ed6ff0</Sha>
+      <Sha>0c93c1cb1ef9c9d5c1a59f4ab98c2f7e37f12197</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.DotNet.GenFacades" Version="6.0.0-beta.23069.5">
+    <Dependency Name="Microsoft.DotNet.GenFacades" Version="6.0.0-beta.23114.5">
      <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>f8800600643e883856027b572461af5d92ed6ff0</Sha>
+      <Sha>0c93c1cb1ef9c9d5c1a59f4ab98c2f7e37f12197</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.23069.5">
+    <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.23114.5">
      <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>f8800600643e883856027b572461af5d92ed6ff0</Sha>
+      <Sha>0c93c1cb1ef9c9d5c1a59f4ab98c2f7e37f12197</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.23069.5">
+    <Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.23114.5">
      <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>f8800600643e883856027b572461af5d92ed6ff0</Sha>
+      <Sha>0c93c1cb1ef9c9d5c1a59f4ab98c2f7e37f12197</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="6.0.0-beta.23069.5">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="6.0.0-beta.23114.5">
      <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>f8800600643e883856027b572461af5d92ed6ff0</Sha>
+      <Sha>0c93c1cb1ef9c9d5c1a59f4ab98c2f7e37f12197</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.23069.5">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.23114.5">
      <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>f8800600643e883856027b572461af5d92ed6ff0</Sha>
+      <Sha>0c93c1cb1ef9c9d5c1a59f4ab98c2f7e37f12197</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.23069.5">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.23114.5">
      <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>f8800600643e883856027b572461af5d92ed6ff0</Sha>
+      <Sha>0c93c1cb1ef9c9d5c1a59f4ab98c2f7e37f12197</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="6.0.0-beta.23069.5">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="6.0.0-beta.23114.5">
      <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>f8800600643e883856027b572461af5d92ed6ff0</Sha>
+      <Sha>0c93c1cb1ef9c9d5c1a59f4ab98c2f7e37f12197</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="6.0.0-beta.23069.5">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="6.0.0-beta.23114.5">
      <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>f8800600643e883856027b572461af5d92ed6ff0</Sha>
+      <Sha>0c93c1cb1ef9c9d5c1a59f4ab98c2f7e37f12197</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.23069.5">
+    <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.23114.5">
      <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>f8800600643e883856027b572461af5d92ed6ff0</Sha>
+      <Sha>0c93c1cb1ef9c9d5c1a59f4ab98c2f7e37f12197</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="6.0.0-beta.23069.5">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="6.0.0-beta.23114.5">
      <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>f8800600643e883856027b572461af5d92ed6ff0</Sha>
+      <Sha>0c93c1cb1ef9c9d5c1a59f4ab98c2f7e37f12197</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.23069.5">
+    <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.23114.5">
      <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>f8800600643e883856027b572461af5d92ed6ff0</Sha>
+      <Sha>0c93c1cb1ef9c9d5c1a59f4ab98c2f7e37f12197</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.23069.5">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.23114.5">
      <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>f8800600643e883856027b572461af5d92ed6ff0</Sha>
+      <Sha>0c93c1cb1ef9c9d5c1a59f4ab98c2f7e37f12197</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="6.0.0-beta.23069.5">
+    <Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="6.0.0-beta.23114.5">
      <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>f8800600643e883856027b572461af5d92ed6ff0</Sha>
+      <Sha>0c93c1cb1ef9c9d5c1a59f4ab98c2f7e37f12197</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="6.0.0-beta.23069.5">
+    <Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="6.0.0-beta.23114.5">
      <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>f8800600643e883856027b572461af5d92ed6ff0</Sha>
+      <Sha>0c93c1cb1ef9c9d5c1a59f4ab98c2f7e37f12197</Sha>
    </Dependency>
    <Dependency Name="Microsoft.NET.Test.Sdk" Version="16.9.0-preview-20201201-01">
      <Uri>https://github.com/microsoft/vstest</Uri>
@@ -222,9 +222,9 @@
      <Uri>https://github.com/dotnet/xharness</Uri>
      <Sha>e9669dc84ecd668d3bbb748758103e23b394ffef</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.DotNet.PackageTesting" Version="6.0.0-beta.23069.5">
+    <Dependency Name="Microsoft.DotNet.PackageTesting" Version="6.0.0-beta.23114.5">
      <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>f8800600643e883856027b572461af5d92ed6ff0</Sha>
+      <Sha>0c93c1cb1ef9c9d5c1a59f4ab98c2f7e37f12197</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>

--- 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.23069.5</MicrosoftDotNetApiCompatVersion>
-    <MicrosoftDotNetBuildTasksFeedVersion>6.0.0-beta.23069.5</MicrosoftDotNetBuildTasksFeedVersion>
-    <MicrosoftDotNetCodeAnalysisVersion>6.0.0-beta.23069.5</MicrosoftDotNetCodeAnalysisVersion>
-    <MicrosoftDotNetGenAPIVersion>6.0.0-beta.23069.5</MicrosoftDotNetGenAPIVersion>
-    <MicrosoftDotNetGenFacadesVersion>6.0.0-beta.23069.5</MicrosoftDotNetGenFacadesVersion>
-    <MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.23069.5</MicrosoftDotNetXUnitExtensionsVersion>
-    <MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.23069.5</MicrosoftDotNetXUnitConsoleRunnerVersion>
-    <MicrosoftDotNetBuildTasksArchivesVersion>6.0.0-beta.23069.5</MicrosoftDotNetBuildTasksArchivesVersion>
-    <MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.23069.5</MicrosoftDotNetBuildTasksInstallersVersion>
-    <MicrosoftDotNetBuildTasksPackagingVersion>6.0.0-beta.23069.5</MicrosoftDotNetBuildTasksPackagingVersion>
-    <MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.23069.5</MicrosoftDotNetBuildTasksTemplatingVersion>
-    <MicrosoftDotNetBuildTasksWorkloadsPackageVersion>6.0.0-beta.23069.5</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
-    <MicrosoftDotNetRemoteExecutorVersion>6.0.0-beta.23069.5</MicrosoftDotNetRemoteExecutorVersion>
-    <MicrosoftDotNetVersionToolsTasksVersion>6.0.0-beta.23069.5</MicrosoftDotNetVersionToolsTasksVersion>
-    <MicrosoftDotNetPackageTestingVersion>6.0.0-beta.23069.5</MicrosoftDotNetPackageTestingVersion>
+    <MicrosoftDotNetApiCompatVersion>6.0.0-beta.23114.5</MicrosoftDotNetApiCompatVersion>
+    <MicrosoftDotNetBuildTasksFeedVersion>6.0.0-beta.23114.5</MicrosoftDotNetBuildTasksFeedVersion>
+    <MicrosoftDotNetCodeAnalysisVersion>6.0.0-beta.23114.5</MicrosoftDotNetCodeAnalysisVersion>
+    <MicrosoftDotNetGenAPIVersion>6.0.0-beta.23114.5</MicrosoftDotNetGenAPIVersion>
+    <MicrosoftDotNetGenFacadesVersion>6.0.0-beta.23114.5</MicrosoftDotNetGenFacadesVersion>
+    <MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.23114.5</MicrosoftDotNetXUnitExtensionsVersion>
+    <MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.23114.5</MicrosoftDotNetXUnitConsoleRunnerVersion>
+    <MicrosoftDotNetBuildTasksArchivesVersion>6.0.0-beta.23114.5</MicrosoftDotNetBuildTasksArchivesVersion>
+    <MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.23114.5</MicrosoftDotNetBuildTasksInstallersVersion>
+    <MicrosoftDotNetBuildTasksPackagingVersion>6.0.0-beta.23114.5</MicrosoftDotNetBuildTasksPackagingVersion>
+    <MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.23114.5</MicrosoftDotNetBuildTasksTemplatingVersion>
+    <MicrosoftDotNetBuildTasksWorkloadsPackageVersion>6.0.0-beta.23114.5</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
+    <MicrosoftDotNetRemoteExecutorVersion>6.0.0-beta.23114.5</MicrosoftDotNetRemoteExecutorVersion>
+    <MicrosoftDotNetVersionToolsTasksVersion>6.0.0-beta.23114.5</MicrosoftDotNetVersionToolsTasksVersion>
+    <MicrosoftDotNetPackageTestingVersion>6.0.0-beta.23114.5</MicrosoftDotNetPackageTestingVersion>
    <!-- NuGet dependencies -->
    <NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
    <!-- Installer dependencies -->

--- a/global.json
+++ b/global.json
 {
  "sdk": {
-    "version": "6.0.113",
+    "version": "6.0.114",
    "allowPrerelease": true,
    "rollForward": "major"
  },
  "tools": {
-    "dotnet": "6.0.113"
+    "dotnet": "6.0.114"
  },
  "native-tools": {
    "cmake": "3.16.4",
    "python3": "3.7.1"
  },
  "msbuild-sdks": {
-    "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.23069.5",
-    "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23069.5",
-    "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.23069.5",
-    "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.23069.5",
+    "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.23114.5",
+    "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23114.5",
+    "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.23114.5",
+    "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.23114.5",
    "Microsoft.Build.NoTargets": "3.1.0",
    "Microsoft.Build.Traversal": "3.0.23",
    "Microsoft.NET.Sdk.IL": "6.0.0-rc.1.21415.6"