Merged PR 30123: [internal/release/6.0.1xx] 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.NETCore.App.Ref**: from 6.0.16 to 6.0.16 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.16-servicing.23166.11 to 6.0.16-servicing.23170.9 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.16 to 6.0.16 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.16 to 6.0.16 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.16 to 6.0.16 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.Platforms**: from 6.0.9 to 6.0.9 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref**: from 6.0.16 to 6.0.16 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.16-servicing.23166.11 to 6.0.16-servicing.23170.21 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.16 to 6.0.16 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.16-servicing.23166.11 to 6.0.16-servicing.23170.21 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 6.0.16-servicing.23166.11 to 6.0.16-servicing.23170.21 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 6.0.16-servicing.23166.11 to 6.0.16-servicing.23170.21 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.116 to 6.0.116 (parent: Microsoft.NET.Sdk)
  - **Microsoft.TemplateEngine.Cli**: from 6.0.116-servicing.23165.4 to 6.0.116-servicing.23171.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.116 to 6.0.116 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.16-servicing.23166.11 to 6.0.16-servicing.23170.9 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NET.Workload.Emscripten.Manifest-6.0.100**: from 6.0.15 to 6.0.15 (parent: VS.Redist.Common.NetCore.SharedFramework.x64.6.0)

[DependencyUpdate]: <> (End)

[marker]: <> (End:Coherency Updates)

[marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698
- **Build**: 20230321.9
- **Date Produced**: March 21, 2023 4:22:36 PM UTC
- **Commit**: 56c6c6274b78ee84a90c31e3a9194b1f976fdd37
- **Branch**: refs/heads/internal/release/6.0.1xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.116-servic...
This commit is contained in:
DotNet Bot 2023-03-21 23:59:44 +00:00 committed by Matt Mitchell (.NET)
parent 2ea84b9814
commit a4dc438ca3
3 changed files with 43 additions and 42 deletions

View file

@ -7,17 +7,18 @@
<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-206b88e" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-206b88ef/nuget/v3/index.json" />
<add key="darc-int-dotnet-aspnetcore-41a6490" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-41a64905/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-aspnetcore -->
<!-- Begin: Package sources from dotnet-emsdk -->
<add key="darc-pub-dotnet-emsdk-253a56a" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-253a56aa/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-emsdk -->
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
<!-- End: Package sources from DotNet-msbuild-Trusted -->
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-90ad458" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-90ad458e/nuget/v3/index.json" />
<add key="darc-int-dotnet-runtime-567ff53" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-567ff53a/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-templating -->
<add key="darc-int-dotnet-templating-e2ab2f3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-e2ab2f3e/nuget/v3/index.json" />
<add key="darc-int-dotnet-templating-66cb089" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-66cb0894/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-templating -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<!-- End: Package sources from dotnet-windowsdesktop -->
@ -40,14 +41,14 @@
<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-206b88e" value="true" />
<add key="darc-int-dotnet-aspnetcore-41a6490" value="true" />
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
<!-- End: Package sources from DotNet-msbuild-Trusted -->
<!-- End: Package sources from dotnet-aspnetcore -->
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-90ad458" value="true" />
<add key="darc-int-dotnet-runtime-567ff53" value="true" />
<!-- Begin: Package sources from dotnet-templating -->
<add key="darc-int-dotnet-templating-e2ab2f3" value="true" />
<add key="darc-int-dotnet-templating-66cb089" value="true" />
<!-- End: Package sources from dotnet-templating -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<!-- End: Package sources from dotnet-windowsdesktop -->

View file

@ -17,30 +17,30 @@
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
<Sha>6b2fdd77613088f3c2ac2c52f7873098ee1d1860</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.16-servicing.23166.11" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.16-servicing.23170.9" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>90ad458e8bbe50831ff4edb0f3a51699a4acf21c</Sha>
<Sha>567ff53ac7bd68feedcab3080d5a4c0ee480c928</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.16" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>90ad458e8bbe50831ff4edb0f3a51699a4acf21c</Sha>
<Sha>567ff53ac7bd68feedcab3080d5a4c0ee480c928</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.6.0" Version="6.0.16-servicing.23166.11" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.6.0" Version="6.0.16-servicing.23170.9" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>90ad458e8bbe50831ff4edb0f3a51699a4acf21c</Sha>
<Sha>567ff53ac7bd68feedcab3080d5a4c0ee480c928</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.16" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>90ad458e8bbe50831ff4edb0f3a51699a4acf21c</Sha>
<Sha>567ff53ac7bd68feedcab3080d5a4c0ee480c928</Sha>
<SourceBuildTarball RepoName="runtime" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="6.0.16" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>90ad458e8bbe50831ff4edb0f3a51699a4acf21c</Sha>
<Sha>567ff53ac7bd68feedcab3080d5a4c0ee480c928</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="6.0.16" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>90ad458e8bbe50831ff4edb0f3a51699a4acf21c</Sha>
<Sha>567ff53ac7bd68feedcab3080d5a4c0ee480c928</Sha>
</Dependency>
<!-- Change blob version in GenerateLayout.targets if this is unpinned to service targeting pack -->
<!-- No new netstandard.library planned for 3.1 timeframe at this time. -->
@ -50,32 +50,32 @@
</Dependency>
<Dependency Name="Microsoft.NETCore.Platforms" Version="6.0.9" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>90ad458e8bbe50831ff4edb0f3a51699a4acf21c</Sha>
<Sha>567ff53ac7bd68feedcab3080d5a4c0ee480c928</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="6.0.16" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>206b88efa734237274703a99f3b131e68a089767</Sha>
<Sha>41a64905967d6579041b042c2295820c2cf38578</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="6.0.16-servicing.23166.11" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="6.0.16-servicing.23170.21" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>206b88efa734237274703a99f3b131e68a089767</Sha>
<Sha>41a64905967d6579041b042c2295820c2cf38578</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="6.0.16" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>206b88efa734237274703a99f3b131e68a089767</Sha>
<Sha>41a64905967d6579041b042c2295820c2cf38578</Sha>
<SourceBuildTarball RepoName="aspnetcore" ManagedOnly="true" />
</Dependency>
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0" Version="6.0.16-servicing.23166.11" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0" Version="6.0.16-servicing.23170.21" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>206b88efa734237274703a99f3b131e68a089767</Sha>
<Sha>41a64905967d6579041b042c2295820c2cf38578</Sha>
</Dependency>
<Dependency Name="dotnet-dev-certs" Version="6.0.16-servicing.23166.11" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="dotnet-dev-certs" Version="6.0.16-servicing.23170.21" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>206b88efa734237274703a99f3b131e68a089767</Sha>
<Sha>41a64905967d6579041b042c2295820c2cf38578</Sha>
</Dependency>
<Dependency Name="dotnet-user-secrets" Version="6.0.16-servicing.23166.11" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="dotnet-user-secrets" Version="6.0.16-servicing.23170.21" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>206b88efa734237274703a99f3b131e68a089767</Sha>
<Sha>41a64905967d6579041b042c2295820c2cf38578</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>
@ -92,25 +92,25 @@
</Dependency>
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="6.0.116" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
<Sha>e2ab2f3e70d016866890a66ff6aa0dd54e8ffbf0</Sha>
<Sha>66cb08941c7ebbcd58965e7c93505963d1c57abb</Sha>
</Dependency>
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="6.0.116-servicing.23165.4" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="6.0.116-servicing.23171.5" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
<Sha>e2ab2f3e70d016866890a66ff6aa0dd54e8ffbf0</Sha>
<Sha>66cb08941c7ebbcd58965e7c93505963d1c57abb</Sha>
<SourceBuild RepoName="templating" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.Common.ProjectTemplates.6.0" Version="6.0.116" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
<Sha>e2ab2f3e70d016866890a66ff6aa0dd54e8ffbf0</Sha>
<Sha>66cb08941c7ebbcd58965e7c93505963d1c57abb</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.116-servicing.23170.13">
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.116-servicing.23171.9">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>4fa9c455ef782761a6d262894c14ba313c8e0174</Sha>
<Sha>56c6c6274b78ee84a90c31e3a9194b1f976fdd37</Sha>
<SourceBuild RepoName="sdk" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.116-servicing.23170.13">
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.116-servicing.23171.9">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>4fa9c455ef782761a6d262894c14ba313c8e0174</Sha>
<Sha>56c6c6274b78ee84a90c31e3a9194b1f976fdd37</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.15-servicing.23117.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
@ -168,7 +168,7 @@
</Dependency>
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.100" Version="6.0.15" CoherentParentDependency="VS.Redist.Common.NetCore.SharedFramework.x64.6.0">
<Uri>https://github.com/dotnet/emsdk</Uri>
<Sha>0c39542771ca202430d0042f710622b5b916ff0a</Sha>
<Sha>253a56aaea0d63f84cc277cef649834f4c1798c6</Sha>
</Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build" Version="6.0.0-servicing.22419.2">
<Uri>https://github.com/dotnet/source-build</Uri>

View file

@ -46,18 +46,18 @@
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>6.0.16</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
<MicrosoftAspNetCoreAppRefPackageVersion>6.0.16</MicrosoftAspNetCoreAppRefPackageVersion>
<MicrosoftAspNetCoreAppRefInternalPackageVersion>6.0.16-servicing.23166.11</MicrosoftAspNetCoreAppRefInternalPackageVersion>
<VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>6.0.16-servicing.23166.11</VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>
<dotnetdevcertsPackageVersion>6.0.16-servicing.23166.11</dotnetdevcertsPackageVersion>
<dotnetusersecretsPackageVersion>6.0.16-servicing.23166.11</dotnetusersecretsPackageVersion>
<MicrosoftAspNetCoreAppRefInternalPackageVersion>6.0.16-servicing.23170.21</MicrosoftAspNetCoreAppRefInternalPackageVersion>
<VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>6.0.16-servicing.23170.21</VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>
<dotnetdevcertsPackageVersion>6.0.16-servicing.23170.21</dotnetdevcertsPackageVersion>
<dotnetusersecretsPackageVersion>6.0.16-servicing.23170.21</dotnetusersecretsPackageVersion>
</PropertyGroup>
<PropertyGroup>
<MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/sdk -->
<MicrosoftNETSdkPackageVersion>6.0.116-servicing.23170.13</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.116-servicing.23170.13</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETSdkPackageVersion>6.0.116-servicing.23171.9</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.116-servicing.23171.9</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
@ -68,8 +68,8 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/core-setup -->
<VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.16-servicing.23166.11</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
<VSRedistCommonNetCoreTargetingPackx6460PackageVersion>6.0.16-servicing.23166.11</VSRedistCommonNetCoreTargetingPackx6460PackageVersion>
<VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.16-servicing.23170.9</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
<VSRedistCommonNetCoreTargetingPackx6460PackageVersion>6.0.16-servicing.23170.9</VSRedistCommonNetCoreTargetingPackx6460PackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>6.0.16</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCoreAppHostwinx64PackageVersion>6.0.16</MicrosoftNETCoreAppHostwinx64PackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>6.0.16</MicrosoftNETCoreAppRefPackageVersion>