Merged PR 30722: [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.DotNet.Common.ItemTemplates**: from 6.0.117 to 6.0.117 (parent: Microsoft.NET.Sdk)
  - **Microsoft.TemplateEngine.Cli**: from 6.0.117-servicing.23212.12 to 6.0.117-servicing.23213.12 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.117 to 6.0.117 (parent: Microsoft.NET.Sdk)

[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**: 20230416.6
- **Date Produced**: April 16, 2023 10:32:38 PM UTC
- **Commit**: 4bcf845ee20643a295f8a36e603a82698e0c22ff
- **Branch**: refs/heads/internal/release/6.0.1xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.117-servicing.23216.4 to 6.0.117-servicing.23216.6][1]
  - **Microsoft.NET.Sdk**: [from 6.0.117-servicing.23216.4 to 6.0.117-servicing.23216.6][1]
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.117 to 6.0.117][2]
  - **Microsoft.TemplateEngine.Cli**: [from 6.0.117-servicing.23212.12 to 6.0.117-servicing.23213.12][2]
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.117 to 6.0.117][2]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC5ed3b0840b&targetVersion=GC4bcf845ee2&_a=files
[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-templating/branches?baseVersion=GC1e4f8f9196&targetVersion=GCb8c3336aae&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:a68e208b-7b40-4a19-af8d-08d961c59698)
This commit is contained in:
DotNet Bot 2023-04-17 00:50:42 +00:00 committed by Matt Mitchell
parent 1884c21898
commit fff348f858
3 changed files with 12 additions and 12 deletions

View file

@ -19,7 +19,7 @@
<add key="darc-int-dotnet-runtime-ea0418c-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-ea0418c9-1/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-templating -->
<add key="darc-int-dotnet-templating-1e4f8f9" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-1e4f8f91/nuget/v3/index.json" />
<add key="darc-int-dotnet-templating-b8c3336" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-b8c3336a/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-templating -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-cf2cbab" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-cf2cbab3/nuget/v3/index.json" />
@ -51,7 +51,7 @@
<add key="darc-int-dotnet-runtime-ea0418c-1" value="true" />
<add key="darc-int-dotnet-runtime-ea0418c" value="true" />
<!-- Begin: Package sources from dotnet-templating -->
<add key="darc-int-dotnet-templating-1e4f8f9" value="true" />
<add key="darc-int-dotnet-templating-b8c3336" value="true" />
<!-- End: Package sources from dotnet-templating -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-cf2cbab" value="true" />

View file

@ -92,25 +92,25 @@
</Dependency>
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="6.0.117" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
<Sha>1e4f8f9196d410d4ba80a82971c88a6aeea8b67d</Sha>
<Sha>b8c3336aaeb266735521b3f71476df551bd06916</Sha>
</Dependency>
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="6.0.117-servicing.23212.12" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="6.0.117-servicing.23213.12" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
<Sha>1e4f8f9196d410d4ba80a82971c88a6aeea8b67d</Sha>
<Sha>b8c3336aaeb266735521b3f71476df551bd06916</Sha>
<SourceBuild RepoName="templating" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.Common.ProjectTemplates.6.0" Version="6.0.117" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
<Sha>1e4f8f9196d410d4ba80a82971c88a6aeea8b67d</Sha>
<Sha>b8c3336aaeb266735521b3f71476df551bd06916</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.117-servicing.23216.4">
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.117-servicing.23216.6">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>5ed3b0840b53fb9ae0b1c4714d95b49fa38d3938</Sha>
<Sha>4bcf845ee20643a295f8a36e603a82698e0c22ff</Sha>
<SourceBuild RepoName="sdk" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.117-servicing.23216.4">
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.117-servicing.23216.6">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>5ed3b0840b53fb9ae0b1c4714d95b49fa38d3938</Sha>
<Sha>4bcf845ee20643a295f8a36e603a82698e0c22ff</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.17-servicing.23213.3" 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.117-servicing.23216.4</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.117-servicing.23216.4</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETSdkPackageVersion>6.0.117-servicing.23216.6</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.117-servicing.23216.6</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>