Merged PR 29189: [internal/release/6.0.3xx] 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.DotNet.Common.ItemTemplates**: from 6.0.309 to 6.0.309 (parent: Microsoft.NET.Sdk)
  - **Microsoft.TemplateEngine.Cli**: from 6.0.309-servicing.23070.10 to 6.0.309-servicing.23074.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.309 to 6.0.309 (parent: Microsoft.NET.Sdk)

[DependencyUpdate]: <> (End)

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

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

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.309-servicing.23074.27 to 6.0.309-servicing.23074.34][1]
  - **Microsoft.NET.Sdk**: [from 6.0.309-servicing.23074.27 to 6.0.309-servicing.23074.34][1]
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.309 to 6.0.309][2]
  - **Microsoft.TemplateEngine.Cli**: [from 6.0.309-servicing.23070.10 to 6.0.309-servicing.23074.5][2]
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.309 to 6.0.309][2]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCb814c7c&targetVersion=GC54b8f37&_a=files
[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-templating/branches?baseVersion=GCe455bc6&targetVersion=GCffeddec&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:b5bca336-8d99-407e-c145-08d9d60066b9)
This commit is contained in:
DotNet Bot 2023-01-24 21:21:26 +00:00 committed by Matt Mitchell
parent 67ef69fc06
commit f629b020f8
3 changed files with 12 additions and 12 deletions

View file

@ -17,7 +17,7 @@
<add key="darc-int-dotnet-runtime-2a90daa" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-2a90daa2/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-templating -->
<add key="darc-int-dotnet-templating-e455bc6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-e455bc6f/nuget/v3/index.json" />
<add key="darc-int-dotnet-templating-ffeddec" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-ffeddec3/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-templating -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-c9ab6d8" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-c9ab6d88/nuget/v3/index.json" />
@ -46,7 +46,7 @@
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-2a90daa" value="true" />
<!-- Begin: Package sources from dotnet-templating -->
<add key="darc-int-dotnet-templating-e455bc6" value="true" />
<add key="darc-int-dotnet-templating-ffeddec" value="true" />
<!-- End: Package sources from dotnet-templating -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-c9ab6d8" value="true" />

View file

@ -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>e455bc6fbb9d9ba5cad34f405fb2c278881f038a</Sha>
<Sha>ffeddec3efcbb43f226550c3b8bfe8d11765f723</Sha>
</Dependency>
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="6.0.309-servicing.23070.10" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="6.0.309-servicing.23074.5" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
<Sha>e455bc6fbb9d9ba5cad34f405fb2c278881f038a</Sha>
<Sha>ffeddec3efcbb43f226550c3b8bfe8d11765f723</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>e455bc6fbb9d9ba5cad34f405fb2c278881f038a</Sha>
<Sha>ffeddec3efcbb43f226550c3b8bfe8d11765f723</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.309-servicing.23074.27">
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.309-servicing.23074.34">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>b814c7cbbf53a1fa23c050ab74d116693dbd58bc</Sha>
<Sha>54b8f37b145c05ddfe75705c6fd03cab42f2c532</Sha>
<SourceBuild RepoName="sdk" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.309-servicing.23074.27">
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.309-servicing.23074.34">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>b814c7cbbf53a1fa23c050ab74d116693dbd58bc</Sha>
<Sha>54b8f37b145c05ddfe75705c6fd03cab42f2c532</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.14-servicing.23074.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">

View file

@ -56,8 +56,8 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/sdk -->
<MicrosoftNETSdkPackageVersion>6.0.309-servicing.23074.27</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.309-servicing.23074.27</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETSdkPackageVersion>6.0.309-servicing.23074.34</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.309-servicing.23074.34</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>