Merged PR 35840: [internal/release/6.0.4xx] 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.418 to 6.0.418 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.418-rtm.23573.14 to 6.0.418-rtm.23605.6 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.418 to 6.0.418 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20231205.25 - **Date Produced**: December 5, 2023 11:22:43 PM UTC - **Commit**: d501a7b471f83b79814d1c385eecf21a14dfb67f - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.418-servicing.23605.16 to 6.0.418-servicing.23605.25][1] - **Microsoft.NET.Sdk**: [from 6.0.418-servicing.23605.16 to 6.0.418-servicing.23605.25][1] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.418 to 6.0.418][2] - **Microsoft.TemplateEngine.Cli**: [from 6.0.418-rtm.23573.14 to 6.0.418-rtm.23605.6][2] - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.418 to 6.0.418][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC416a14840c&targetVersion=GCd501a7b471&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-templating/branches?baseVersion=GC04cc3e115c&targetVersion=GC766ee832e4&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a27c2ce2-aedf-42b7-d31e-08da6571bd31)
This commit is contained in:
DotNet Bot
Matt Mitchell
parent
e370c6bd8c
commit
ac7a1d300a
3 changed files with 12 additions and 14 deletions
|
|
@ -19,8 +19,7 @@
|
|||
<add key="darc-int-dotnet-runtime-dc45e96" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-dc45e968/nuget/v3/index.json" />
|
||||
<!-- End: Package sources from dotnet-runtime -->
|
||||
<!-- Begin: Package sources from dotnet-templating -->
|
||||
<add key="darc-int-dotnet-templating-04cc3e1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-04cc3e11/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-templating-04cc3e1-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-04cc3e11-1/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-templating-766ee83" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-766ee832/nuget/v3/index.json" />
|
||||
<!-- End: Package sources from dotnet-templating -->
|
||||
<!-- Begin: Package sources from dotnet-windowsdesktop -->
|
||||
<add key="darc-int-dotnet-windowsdesktop-456adb5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-456adb55/nuget/v3/index.json" />
|
||||
|
|
@ -51,8 +50,7 @@
|
|||
<add key="darc-int-dotnet-runtime-dc45e96" value="true" />
|
||||
<!-- End: Package sources from dotnet-runtime -->
|
||||
<!-- Begin: Package sources from dotnet-templating -->
|
||||
<add key="darc-int-dotnet-templating-04cc3e1-1" value="true" />
|
||||
<add key="darc-int-dotnet-templating-04cc3e1" value="true" />
|
||||
<add key="darc-int-dotnet-templating-766ee83" value="true" />
|
||||
<!-- End: Package sources from dotnet-templating -->
|
||||
<!-- Begin: Package sources from dotnet-windowsdesktop -->
|
||||
<add key="darc-int-dotnet-windowsdesktop-456adb5" value="true" />
|
||||
|
|
|
|||
|
|
@ -92,25 +92,25 @@
|
|||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="6.0.418" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
|
||||
<Sha>04cc3e115c98a8aa1fde4b1b45218ed6331c45c5</Sha>
|
||||
<Sha>766ee832e4d9d2d685414fceae96dca3c4e4dcbc</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="6.0.418-rtm.23573.14" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="6.0.418-rtm.23605.6" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
|
||||
<Sha>04cc3e115c98a8aa1fde4b1b45218ed6331c45c5</Sha>
|
||||
<Sha>766ee832e4d9d2d685414fceae96dca3c4e4dcbc</Sha>
|
||||
<SourceBuild RepoName="templating" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Common.ProjectTemplates.6.0" Version="6.0.418" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
|
||||
<Sha>04cc3e115c98a8aa1fde4b1b45218ed6331c45c5</Sha>
|
||||
<Sha>766ee832e4d9d2d685414fceae96dca3c4e4dcbc</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.418-servicing.23605.16">
|
||||
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.418-servicing.23605.25">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
|
||||
<Sha>416a14840c7d80cbf46dc518b027bad88c3e14bf</Sha>
|
||||
<Sha>d501a7b471f83b79814d1c385eecf21a14dfb67f</Sha>
|
||||
<SourceBuild RepoName="sdk" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.418-servicing.23605.16">
|
||||
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.418-servicing.23605.25">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
|
||||
<Sha>416a14840c7d80cbf46dc518b027bad88c3e14bf</Sha>
|
||||
<Sha>d501a7b471f83b79814d1c385eecf21a14dfb67f</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.26-servicing.23573.4" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
|
||||
|
|
|
|||
|
|
@ -56,8 +56,8 @@
|
|||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/dotnet/sdk -->
|
||||
<MicrosoftNETSdkPackageVersion>6.0.418-servicing.23605.16</MicrosoftNETSdkPackageVersion>
|
||||
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.418-servicing.23605.16</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
|
||||
<MicrosoftNETSdkPackageVersion>6.0.418-servicing.23605.25</MicrosoftNETSdkPackageVersion>
|
||||
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.418-servicing.23605.25</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
|
||||
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
|
||||
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
|
||||
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
|
||||
|
|
|
|||
Loading…
Reference in a new issue