Merged PR 31398: [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.118 to 6.0.118 (parent: Microsoft.NET.Sdk)
  - **Microsoft.TemplateEngine.Cli**: from 6.0.118-servicing.23268.20 to 6.0.118-servicing.23269.3 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.118 to 6.0.118 (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**: 20230519.10
- **Date Produced**: May 19, 2023 7:14:56 PM UTC
- **Commit**: 27be6925f7669ffedd0dabe11bddec20cfb3d6fc
- **Branch**: refs/heads/internal/release/6.0.1xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.118-servicing.23269.4 to 6.0.118-servicing.23269.10][1]
  - **Microsoft.NET.Sdk**: [from 6.0.118-servicing.23269.4 to 6.0.118-servicing.23269.10][1]
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.118 to 6.0.118][2]
  - **Microsoft.TemplateEngine.Cli**: [from 6.0.118-servicing.23268.20 to 6.0.118-servicing.23269.3][2]
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.118 to 6.0.118][2]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC2615ab2362&targetVersion=GC27be6925f7&_a=files
[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-templating/branches?baseVersion=GC63d39d83cb&targetVersion=GC9d4fcb0fa4&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:a68e208b-7b40-4a19-af8d-08d961c59698)
This commit is contained in:
DotNet Bot 2023-05-19 19:50:00 +00:00 committed by Matt Mitchell
parent a398440ac7
commit 5efa4daa65
3 changed files with 12 additions and 12 deletions

View file

@ -18,7 +18,7 @@
<add key="darc-int-dotnet-runtime-320aeb7" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-320aeb73/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-templating -->
<add key="darc-int-dotnet-templating-63d39d8" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-63d39d83/nuget/v3/index.json" />
<add key="darc-int-dotnet-templating-9d4fcb0" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-9d4fcb0f/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-templating -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-e79c355" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-e79c355e/nuget/v3/index.json" />
@ -49,7 +49,7 @@
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-320aeb7" value="true" />
<!-- Begin: Package sources from dotnet-templating -->
<add key="darc-int-dotnet-templating-63d39d8" value="true" />
<add key="darc-int-dotnet-templating-9d4fcb0" value="true" />
<!-- End: Package sources from dotnet-templating -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-e79c355" value="true" />

View file

@ -92,25 +92,25 @@
</Dependency>
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="6.0.118" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
<Sha>63d39d83cb835e91b98fbeea39958537a4537713</Sha>
<Sha>9d4fcb0fa4867411dce1339944c2ec0815034a70</Sha>
</Dependency>
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="6.0.118-servicing.23268.20" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="6.0.118-servicing.23269.3" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
<Sha>63d39d83cb835e91b98fbeea39958537a4537713</Sha>
<Sha>9d4fcb0fa4867411dce1339944c2ec0815034a70</Sha>
<SourceBuild RepoName="templating" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.Common.ProjectTemplates.6.0" Version="6.0.118" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
<Sha>63d39d83cb835e91b98fbeea39958537a4537713</Sha>
<Sha>9d4fcb0fa4867411dce1339944c2ec0815034a70</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.118-servicing.23269.4">
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.118-servicing.23269.10">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>2615ab2362f3a77b4ed4ba489b31fc01e3ab11bd</Sha>
<Sha>27be6925f7669ffedd0dabe11bddec20cfb3d6fc</Sha>
<SourceBuild RepoName="sdk" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.118-servicing.23269.4">
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.118-servicing.23269.10">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>2615ab2362f3a77b4ed4ba489b31fc01e3ab11bd</Sha>
<Sha>27be6925f7669ffedd0dabe11bddec20cfb3d6fc</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.18-servicing.23268.4" 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.118-servicing.23269.4</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.118-servicing.23269.4</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETSdkPackageVersion>6.0.118-servicing.23269.10</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.118-servicing.23269.10</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>