Merged PR 22530: [internal/release/6.0.2xx] Update dependencies from dnceng/internal/dotnet-sdk

This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.AspNetCore.App.Ref**: from 6.0.5 to 6.0.5 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.5-servicing.22214.12 to 6.0.5-servicing.22218.2 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.5 to 6.0.5 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.5-servicing.22214.12 to 6.0.5-servicing.22218.2 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.5-servicing.22214.12 to 6.0.5-servicing.22218.2 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.5-servicing.22214.12 to 6.0.5-servicing.22218.2 (parent: Microsoft.NET.Sdk) - **Microsoft.NET.ILLink.Tasks**: from 6.0.200-1.22178.2 to 6.0.200-1.22219.3 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:b065b754-67d8-417c-0ef9-08d9d602f120) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: b065b754-67d8-417c-0ef9-08d9d602f120 - **Build**: 20220421.10 - **Date Produced**: April 21, 2022 4:12:13 PM UTC - **Commit**: 22d868d384c490b46b4eaf17c0512ec8f55f58df - **Branch**: refs/heads/internal/release/6.0.2xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.203-servicing.22220.14 to 6.0.203-servicing.22221.10][3] - **Microsoft.NET.Sdk**: [from 6.0.203-servicing.22220.14 to 6.0.203-servicing.22221.10][3] - **Microsoft.AspNetCore.App.Ref**: [from 6.0.5 to 6.0.5][4] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.5-servicing.22214.12 to 6.0.5-servicing.22218.2][4] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.5 to 6.0.5][4] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.5-servicing.22214.12 to 6.0.5-servicing.22218.2][4] - **dotnet-dev-certs**: [from 6.0.5-servicing.22214.12 to 6.0.5-servicing.22218.2][4] - **dotnet-user-secrets**: [from 6.0.5-servicing.22214.12 to 6.0.5-servicing.22218.2][4] - **Microsoft.NET.ILLink.Tasks**: [from 6.0.200-1.22178.2 to 6.0.200-1.22219.3][5] [3]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC640fb21&targetVersion=GC22d868d&_a=files [4]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GCdd34abd&targetVersion=GCe5f183b&_a=files [5]: 01c4f59...28db36b [DependencyUpdate]: <> (...
2022-04-21 16:51:27 +00:00 · 2022-04-21 16:51:27 +00:00 · a20feadf6d
commit a20feadf6d
parent 4c3299644b
4 changed files with 24 additions and 48 deletions
--- a/NuGet.config
+++ b/NuGet.config
@ -7,7 +7,7 @@
    <clear />
    <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
    <!--  Begin: Package sources from dotnet-aspnetcore -->
-    <add key="darc-int-dotnet-aspnetcore-dd34abd" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-dd34abda/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-aspnetcore-e5f183b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-e5f183b6/nuget/v3/index.json" />
    <!--  End: Package sources from dotnet-aspnetcore -->
    <!--  Begin: Package sources from dotnet-emsdk -->
    <!--  End: Package sources from dotnet-emsdk -->
@ -40,7 +40,7 @@
  <disabledPackageSources>
    <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
    <!--  Begin: Package sources from dotnet-aspnetcore -->
-    <add key="darc-int-dotnet-aspnetcore-dd34abd" value="true" />
+    <add key="darc-int-dotnet-aspnetcore-e5f183b" value="true" />
    <!--  End: Package sources from dotnet-aspnetcore -->
    <!--  Begin: Package sources from dotnet-runtime -->
    <add key="darc-int-dotnet-runtime-70ae3df" value="true" />
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@ -54,28 +54,28 @@
    </Dependency>
    <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="6.0.5" CoherentParentDependency="Microsoft.NET.Sdk">
      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>dd34abdadac5668452e0496cfadb6cf985ec3d3f</Sha>
+      <Sha>e5f183b656a0e8bc087108130a5a9b54ae94494e</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="6.0.5-servicing.22214.12" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="6.0.5-servicing.22218.2" CoherentParentDependency="Microsoft.NET.Sdk">
      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>dd34abdadac5668452e0496cfadb6cf985ec3d3f</Sha>
+      <Sha>e5f183b656a0e8bc087108130a5a9b54ae94494e</Sha>
    </Dependency>
    <Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="6.0.5" CoherentParentDependency="Microsoft.NET.Sdk">
      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>dd34abdadac5668452e0496cfadb6cf985ec3d3f</Sha>
+      <Sha>e5f183b656a0e8bc087108130a5a9b54ae94494e</Sha>
      <SourceBuildTarball RepoName="aspnetcore" ManagedOnly="true" />
    </Dependency>
-    <Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0" Version="6.0.5-servicing.22214.12" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0" Version="6.0.5-servicing.22218.2" CoherentParentDependency="Microsoft.NET.Sdk">
      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>dd34abdadac5668452e0496cfadb6cf985ec3d3f</Sha>
+      <Sha>e5f183b656a0e8bc087108130a5a9b54ae94494e</Sha>
    </Dependency>
-    <Dependency Name="dotnet-dev-certs" Version="6.0.5-servicing.22214.12" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="dotnet-dev-certs" Version="6.0.5-servicing.22218.2" CoherentParentDependency="Microsoft.NET.Sdk">
      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>dd34abdadac5668452e0496cfadb6cf985ec3d3f</Sha>
+      <Sha>e5f183b656a0e8bc087108130a5a9b54ae94494e</Sha>
    </Dependency>
-    <Dependency Name="dotnet-user-secrets" Version="6.0.5-servicing.22214.12" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="dotnet-user-secrets" Version="6.0.5-servicing.22218.2" CoherentParentDependency="Microsoft.NET.Sdk">
      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>dd34abdadac5668452e0496cfadb6cf985ec3d3f</Sha>
+      <Sha>e5f183b656a0e8bc087108130a5a9b54ae94494e</Sha>
    </Dependency>
    <Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.2.1" Version="1.0.2-beta4.22064.3">
      <Uri>https://github.com/dotnet/test-templates</Uri>
@ -103,14 +103,14 @@
      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
      <Sha>93b13a284cbd00922988bc357c99ed4e7d45f153</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.NET.Sdk" Version="6.0.203-servicing.22220.14">
+    <Dependency Name="Microsoft.NET.Sdk" Version="6.0.203-servicing.22221.10">
      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
-      <Sha>640fb21ffabaef2ab5bef766ff9dba41112518c6</Sha>
+      <Sha>22d868d384c490b46b4eaf17c0512ec8f55f58df</Sha>
      <SourceBuild RepoName="sdk" ManagedOnly="true" />
    </Dependency>
-    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.203-servicing.22220.14">
+    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.203-servicing.22221.10">
      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
-      <Sha>640fb21ffabaef2ab5bef766ff9dba41112518c6</Sha>
+      <Sha>22d868d384c490b46b4eaf17c0512ec8f55f58df</Sha>
    </Dependency>
    <!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via windowsdesktop -->
    <Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.4-servicing.22164.7" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
@ -135,9 +135,9 @@
      <Sha>d3c6439b04452047cb62fc645ce341a034bdb5be</Sha>
      <SourceBuildTarball RepoName="vstest" ManagedOnly="true" />
    </Dependency>
-    <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="6.0.200-1.22178.2" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="6.0.200-1.22219.3" CoherentParentDependency="Microsoft.NET.Sdk">
      <Uri>https://github.com/dotnet/linker</Uri>
-      <Sha>01c4f5905959c29f86781b85187bb676fc517ee9</Sha>
+      <Sha>28db36b95cf83c8e2ad11e67a2ad0de301b4cad6</Sha>
      <SourceBuild RepoName="linker" ManagedOnly="true" />
      <RepoName>linker</RepoName>
    </Dependency>
--- a/eng/Versions.props
+++ b/eng/Versions.props
@ -46,18 +46,18 @@
    <!-- Dependencies from https://github.com/aspnet/AspNetCore -->
    <MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>6.0.5</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
    <MicrosoftAspNetCoreAppRefPackageVersion>6.0.5</MicrosoftAspNetCoreAppRefPackageVersion>
-    <MicrosoftAspNetCoreAppRefInternalPackageVersion>6.0.5-servicing.22214.12</MicrosoftAspNetCoreAppRefInternalPackageVersion>
-    <VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>6.0.5-servicing.22214.12</VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>
-    <dotnetdevcertsPackageVersion>6.0.5-servicing.22214.12</dotnetdevcertsPackageVersion>
-    <dotnetusersecretsPackageVersion>6.0.5-servicing.22214.12</dotnetusersecretsPackageVersion>
+    <MicrosoftAspNetCoreAppRefInternalPackageVersion>6.0.5-servicing.22218.2</MicrosoftAspNetCoreAppRefInternalPackageVersion>
+    <VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>6.0.5-servicing.22218.2</VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>
+    <dotnetdevcertsPackageVersion>6.0.5-servicing.22218.2</dotnetdevcertsPackageVersion>
+    <dotnetusersecretsPackageVersion>6.0.5-servicing.22218.2</dotnetusersecretsPackageVersion>
  </PropertyGroup>
  <PropertyGroup>
    <MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>
  </PropertyGroup>
  <PropertyGroup>
    <!-- Dependencies from https://github.com/dotnet/sdk -->
-    <MicrosoftNETSdkPackageVersion>6.0.203-servicing.22220.14</MicrosoftNETSdkPackageVersion>
-    <MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.203-servicing.22220.14</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
+    <MicrosoftNETSdkPackageVersion>6.0.203-servicing.22221.10</MicrosoftNETSdkPackageVersion>
+    <MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.203-servicing.22221.10</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
    <MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
    <MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
    <MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
--- a/src/SourceBuild/tarball/patches/linker/0001-Condition-out-the-BannedApiAnalyzers-usage-in-source.patch
+++ b/src/SourceBuild/tarball/patches/linker/0001-Condition-out-the-BannedApiAnalyzers-usage-in-source.patch
@ -1,24 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: MichaelSimons <msimons@microsoft.com>
-Date: Wed, 13 Apr 2022 21:30:39 +0000
-Subject: [PATCH] Condition out the BannedApiAnalyzers usage in source-build
-
-Removes prebuilt.
-Patch for https://github.com/dotnet/linker/pull/2742
---
- src/linker/Mono.Linker.csproj | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/linker/Mono.Linker.csproj b/src/linker/Mono.Linker.csproj
-index 391300aa..d276003e 100644
--- a/src/linker/Mono.Linker.csproj
-+++ b/src/linker/Mono.Linker.csproj
-@@ -31,7 +31,7 @@
-   </ItemGroup>
- 
-   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="$(MicrosoftCodeAnalysisBannedApiAnalyzersVersion)">
-+    <PackageReference Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="$(MicrosoftCodeAnalysisBannedApiAnalyzersVersion)" Condition="'$(DotNetBuildFromSource)' != 'true'">
-       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-       <PrivateAssets>all</PrivateAssets>
-     </PackageReference>