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

This pull request updates the following dependencies

[marker]: <> (Begin:b5bca336-8d99-407e-c145-08d9d60066b9)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: b5bca336-8d99-407e-c145-08d9d60066b9
- **Build**: 20230119.19
- **Date Produced**: January 19, 2023 10:54:19 PM UTC
- **Commit**: b0570a30cfbc5242f8eb3d628603bb9eaa00187c
- **Branch**: refs/heads/internal/release/6.0.3xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.309-servicing.23067.13 to 6.0.309-servicing.23069.19][2]
  - **Microsoft.NET.Sdk**: [from 6.0.309-servicing.23067.13 to 6.0.309-servicing.23069.19][2]
  - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.14-servicing.23063.9 to 6.0.14-servicing.23067.7][3]
  - **Microsoft.NETCore.App.Ref**: [from 6.0.14 to 6.0.14][3]
  - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: [from 6.0.14-servicing.23063.9 to 6.0.14-servicing.23067.7][3]
  - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.14 to 6.0.14][3]
  - **Microsoft.NETCore.App.Host.win-x64**: [from 6.0.14 to 6.0.14][3]
  - **Microsoft.NETCore.DotNetHostResolver**: [from 6.0.14 to 6.0.14][3]
  - **Microsoft.AspNetCore.App.Ref**: [from 6.0.14 to 6.0.14][4]
  - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.14-servicing.23062.15 to 6.0.14-servicing.23068.14][4]
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.14 to 6.0.14][4]
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.14-servicing.23062.15 to 6.0.14-servicing.23068.14][4]
  - **dotnet-dev-certs**: [from 6.0.14-servicing.23062.15 to 6.0.14-servicing.23068.14][4]
  - **dotnet-user-secrets**: [from 6.0.14-servicing.23062.15 to 6.0.14-servicing.23068.14][4]
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.309 to 6.0.309][5]
  - **Microsoft.TemplateEngine.Cli**: [from 6.0.309-servicing.23066.12 to 6.0.309-servicing.23069.3][5]
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.309 to 6.0.309][5]

[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC906e24c&targetVersion=GCb0570a3&_a=files
[3]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GCb6518c6&targetVersion=GC8515e4c&_a=files
[4]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GC38c1c4b&targetVersion=GCed40528&_a=files
[5]: https://dev.azure.com/dnceng/internal/_git/dotnet-templating/branches?baseVersion=GC4ad0133&targetVersion=GC1c704df&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:b5bca336-8d99-407e-c145-08d9d60066b9)

[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/DependencyDescr...
This commit is contained in:
DotNet Bot 2023-01-21 00:09:34 +00:00 committed by Marc Paine
commit d4601756bb
3 changed files with 40 additions and 40 deletions

View file

@ -7,17 +7,17 @@
<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-38c1c4b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-38c1c4bb/nuget/v3/index.json" />
<add key="darc-int-dotnet-aspnetcore-ed40528" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-ed405288/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-aspnetcore -->
<!-- Begin: Package sources from dotnet-emsdk -->
<!-- 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-b6518c6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-b6518c6a/nuget/v3/index.json" />
<add key="darc-int-dotnet-runtime-8515e4c" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-8515e4c5/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-templating -->
<add key="darc-int-dotnet-templating-4ad0133" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-4ad0133d/nuget/v3/index.json" />
<add key="darc-int-dotnet-templating-1c704df" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-1c704df5/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-templating -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-27be4a1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-27be4a15/nuget/v3/index.json" />
@ -41,12 +41,12 @@
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
<!-- End: Package sources from DotNet-msbuild-Trusted -->
<!-- Begin: Package sources from dotnet-aspnetcore -->
<add key="darc-int-dotnet-aspnetcore-38c1c4b" value="true" />
<add key="darc-int-dotnet-aspnetcore-ed40528" value="true" />
<!-- End: Package sources from dotnet-aspnetcore -->
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-b6518c6" value="true" />
<add key="darc-int-dotnet-runtime-8515e4c" value="true" />
<!-- Begin: Package sources from dotnet-templating -->
<add key="darc-int-dotnet-templating-4ad0133" value="true" />
<add key="darc-int-dotnet-templating-1c704df" value="true" />
<!-- End: Package sources from dotnet-templating -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-27be4a1" value="true" />

View file

@ -17,30 +17,30 @@
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
<Sha>27be4a15f0ecfb8ac6b958b99a4cafebd2073476</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.14-servicing.23063.9" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.14-servicing.23067.7" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>b6518c6af8a11352fd9f0b4dc76149fedf666c3d</Sha>
<Sha>8515e4c5a352c94e65e742031a5079ca76fdb3e7</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.14" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>b6518c6af8a11352fd9f0b4dc76149fedf666c3d</Sha>
<Sha>8515e4c5a352c94e65e742031a5079ca76fdb3e7</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.6.0" Version="6.0.14-servicing.23063.9" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.6.0" Version="6.0.14-servicing.23067.7" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>b6518c6af8a11352fd9f0b4dc76149fedf666c3d</Sha>
<Sha>8515e4c5a352c94e65e742031a5079ca76fdb3e7</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.14" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>b6518c6af8a11352fd9f0b4dc76149fedf666c3d</Sha>
<Sha>8515e4c5a352c94e65e742031a5079ca76fdb3e7</Sha>
<SourceBuildTarball RepoName="runtime" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="6.0.14" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>b6518c6af8a11352fd9f0b4dc76149fedf666c3d</Sha>
<Sha>8515e4c5a352c94e65e742031a5079ca76fdb3e7</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="6.0.14" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>b6518c6af8a11352fd9f0b4dc76149fedf666c3d</Sha>
<Sha>8515e4c5a352c94e65e742031a5079ca76fdb3e7</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. -->
@ -54,28 +54,28 @@
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="6.0.14" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>38c1c4bb218fdb9e1628db372d72babee098165e</Sha>
<Sha>ed4052880569959106dff1c87fee61f86881f847</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="6.0.14-servicing.23062.15" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="6.0.14-servicing.23068.14" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>38c1c4bb218fdb9e1628db372d72babee098165e</Sha>
<Sha>ed4052880569959106dff1c87fee61f86881f847</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="6.0.14" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>38c1c4bb218fdb9e1628db372d72babee098165e</Sha>
<Sha>ed4052880569959106dff1c87fee61f86881f847</Sha>
<SourceBuildTarball RepoName="aspnetcore" ManagedOnly="true" />
</Dependency>
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0" Version="6.0.14-servicing.23062.15" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0" Version="6.0.14-servicing.23068.14" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>38c1c4bb218fdb9e1628db372d72babee098165e</Sha>
<Sha>ed4052880569959106dff1c87fee61f86881f847</Sha>
</Dependency>
<Dependency Name="dotnet-dev-certs" Version="6.0.14-servicing.23062.15" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="dotnet-dev-certs" Version="6.0.14-servicing.23068.14" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>38c1c4bb218fdb9e1628db372d72babee098165e</Sha>
<Sha>ed4052880569959106dff1c87fee61f86881f847</Sha>
</Dependency>
<Dependency Name="dotnet-user-secrets" Version="6.0.14-servicing.23062.15" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="dotnet-user-secrets" Version="6.0.14-servicing.23068.14" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>38c1c4bb218fdb9e1628db372d72babee098165e</Sha>
<Sha>ed4052880569959106dff1c87fee61f86881f847</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.2.1" Version="1.0.2-beta4.22207.1">
<Uri>https://github.com/dotnet/test-templates</Uri>
@ -92,25 +92,25 @@
</Dependency>
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="6.0.309" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
<Sha>4ad0133da19f7f6fd78a9de093085c380d03d078</Sha>
<Sha>1c704df539727afa2cb81b1904fe11bcf21a5b9a</Sha>
</Dependency>
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="6.0.309-servicing.23066.12" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="6.0.309-servicing.23069.3" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
<Sha>4ad0133da19f7f6fd78a9de093085c380d03d078</Sha>
<Sha>1c704df539727afa2cb81b1904fe11bcf21a5b9a</Sha>
<SourceBuild RepoName="templating" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.Common.ProjectTemplates.6.0" Version="6.0.309" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
<Sha>4ad0133da19f7f6fd78a9de093085c380d03d078</Sha>
<Sha>1c704df539727afa2cb81b1904fe11bcf21a5b9a</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.309-servicing.23067.13">
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.309-servicing.23069.19">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>906e24ca802a74b64e2a4e3951ef2e8736a12f7c</Sha>
<Sha>b0570a30cfbc5242f8eb3d628603bb9eaa00187c</Sha>
<SourceBuild RepoName="sdk" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.309-servicing.23067.13">
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.309-servicing.23069.19">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>906e24ca802a74b64e2a4e3951ef2e8736a12f7c</Sha>
<Sha>b0570a30cfbc5242f8eb3d628603bb9eaa00187c</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.13-servicing.22601.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">

View file

@ -46,18 +46,18 @@
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>6.0.14</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
<MicrosoftAspNetCoreAppRefPackageVersion>6.0.14</MicrosoftAspNetCoreAppRefPackageVersion>
<MicrosoftAspNetCoreAppRefInternalPackageVersion>6.0.14-servicing.23062.15</MicrosoftAspNetCoreAppRefInternalPackageVersion>
<VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>6.0.14-servicing.23062.15</VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>
<dotnetdevcertsPackageVersion>6.0.14-servicing.23062.15</dotnetdevcertsPackageVersion>
<dotnetusersecretsPackageVersion>6.0.14-servicing.23062.15</dotnetusersecretsPackageVersion>
<MicrosoftAspNetCoreAppRefInternalPackageVersion>6.0.14-servicing.23068.14</MicrosoftAspNetCoreAppRefInternalPackageVersion>
<VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>6.0.14-servicing.23068.14</VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>
<dotnetdevcertsPackageVersion>6.0.14-servicing.23068.14</dotnetdevcertsPackageVersion>
<dotnetusersecretsPackageVersion>6.0.14-servicing.23068.14</dotnetusersecretsPackageVersion>
</PropertyGroup>
<PropertyGroup>
<MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/sdk -->
<MicrosoftNETSdkPackageVersion>6.0.309-servicing.23067.13</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.309-servicing.23067.13</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETSdkPackageVersion>6.0.309-servicing.23069.19</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.309-servicing.23069.19</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.14-servicing.23063.9</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
<VSRedistCommonNetCoreTargetingPackx6460PackageVersion>6.0.14-servicing.23063.9</VSRedistCommonNetCoreTargetingPackx6460PackageVersion>
<VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.14-servicing.23067.7</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
<VSRedistCommonNetCoreTargetingPackx6460PackageVersion>6.0.14-servicing.23067.7</VSRedistCommonNetCoreTargetingPackx6460PackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>6.0.14</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCoreAppHostwinx64PackageVersion>6.0.14</MicrosoftNETCoreAppHostwinx64PackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>6.0.14</MicrosoftNETCoreAppRefPackageVersion>