Merged PR 41125: [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.132 to 6.0.133 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.132-servicing.24314.6 to 6.0.133-servicing.24366.6 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.132 to 6.0.133 (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**: 20240716.30 - **Date Produced**: July 17, 2024 12:11:43 AM UTC - **Commit**: 94f9ff9aab969379b0578dd09ac669607a6a03fb - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.133-servicing.24366.20 to 6.0.133-servicing.24366.30][1] - **Microsoft.NET.Sdk**: [from 6.0.133-servicing.24366.20 to 6.0.133-servicing.24366.30][1] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.132 to 6.0.133][2] - **Microsoft.TemplateEngine.Cli**: [from 6.0.132-servicing.24314.6 to 6.0.133-servicing.24366.6][2] - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.132 to 6.0.133][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC1c4520d3edaefd72e3067952f17da1712aa88d39&targetVersion=GC94f9ff9aab969379b0578dd09ac669607a6a03fb&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-templating/branches?baseVersion=GCc86b7556cbdc3e9a5a5226547490713e2e948401&targetVersion=GC2fdb78d36dc993a532bd80ee2682a2b534497413&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a68e208b-7b40-4a19-af8d-08d961c59698)
This commit is contained in:
maestro-prod-Primary
Sean Reeser
commit
248818513c
3 changed files with 16 additions and 24 deletions
12
NuGet.config
12
NuGet.config
|
|
@ -23,11 +23,7 @@
|
||||||
<add key="darc-int-dotnet-runtime-6c63698" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-6c636980/nuget/v3/index.json" />
|
<add key="darc-int-dotnet-runtime-6c63698" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-6c636980/nuget/v3/index.json" />
|
||||||
<!-- End: Package sources from dotnet-runtime -->
|
<!-- End: Package sources from dotnet-runtime -->
|
||||||
<!-- Begin: Package sources from dotnet-templating -->
|
<!-- Begin: Package sources from dotnet-templating -->
|
||||||
<add key="darc-int-dotnet-templating-c86b755" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-c86b7556/nuget/v3/index.json" />
|
<add key="darc-int-dotnet-templating-2fdb78d" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-2fdb78d3/nuget/v3/index.json" />
|
||||||
<add key="darc-int-dotnet-templating-c86b755-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-c86b7556-5/nuget/v3/index.json" />
|
|
||||||
<add key="darc-int-dotnet-templating-c86b755-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-c86b7556-3/nuget/v3/index.json" />
|
|
||||||
<add key="darc-int-dotnet-templating-c86b755-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-c86b7556-2/nuget/v3/index.json" />
|
|
||||||
<add key="darc-int-dotnet-templating-c86b755-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-c86b7556-1/nuget/v3/index.json" />
|
|
||||||
<!-- End: Package sources from dotnet-templating -->
|
<!-- End: Package sources from dotnet-templating -->
|
||||||
<!-- Begin: Package sources from dotnet-windowsdesktop -->
|
<!-- Begin: Package sources from dotnet-windowsdesktop -->
|
||||||
<add key="darc-int-dotnet-windowsdesktop-ef2ca68" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-ef2ca68f/nuget/v3/index.json" />
|
<add key="darc-int-dotnet-windowsdesktop-ef2ca68" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-ef2ca68f/nuget/v3/index.json" />
|
||||||
|
|
@ -66,11 +62,7 @@
|
||||||
<!-- Begin: Package sources from dotnet-runtime -->
|
<!-- Begin: Package sources from dotnet-runtime -->
|
||||||
<add key="darc-int-dotnet-runtime-6c63698" value="true" />
|
<add key="darc-int-dotnet-runtime-6c63698" value="true" />
|
||||||
<!-- Begin: Package sources from dotnet-templating -->
|
<!-- Begin: Package sources from dotnet-templating -->
|
||||||
<add key="darc-int-dotnet-templating-c86b755-1" value="true" />
|
<add key="darc-int-dotnet-templating-2fdb78d" value="true" />
|
||||||
<add key="darc-int-dotnet-templating-c86b755-2" value="true" />
|
|
||||||
<add key="darc-int-dotnet-templating-c86b755-3" value="true" />
|
|
||||||
<add key="darc-int-dotnet-templating-c86b755-5" value="true" />
|
|
||||||
<add key="darc-int-dotnet-templating-c86b755" value="true" />
|
|
||||||
<!-- End: Package sources from dotnet-templating -->
|
<!-- End: Package sources from dotnet-templating -->
|
||||||
<!-- Begin: Package sources from dotnet-windowsdesktop -->
|
<!-- Begin: Package sources from dotnet-windowsdesktop -->
|
||||||
<add key="darc-int-dotnet-windowsdesktop-ef2ca68-1" value="true" />
|
<add key="darc-int-dotnet-windowsdesktop-ef2ca68-1" value="true" />
|
||||||
|
|
|
||||||
|
|
@ -90,27 +90,27 @@
|
||||||
<Sha>c40ef7e056b48e011c43a21354d6790ba6b8b4fc</Sha>
|
<Sha>c40ef7e056b48e011c43a21354d6790ba6b8b4fc</Sha>
|
||||||
<SourceBuild RepoName="test-templates" ManagedOnly="true" />
|
<SourceBuild RepoName="test-templates" ManagedOnly="true" />
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="6.0.132" CoherentParentDependency="Microsoft.NET.Sdk">
|
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="6.0.133" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
|
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
|
||||||
<Sha>c86b7556cbdc3e9a5a5226547490713e2e948401</Sha>
|
<Sha>2fdb78d36dc993a532bd80ee2682a2b534497413</Sha>
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="6.0.132-servicing.24314.6" CoherentParentDependency="Microsoft.NET.Sdk">
|
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="6.0.133-servicing.24366.6" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
|
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
|
||||||
<Sha>c86b7556cbdc3e9a5a5226547490713e2e948401</Sha>
|
<Sha>2fdb78d36dc993a532bd80ee2682a2b534497413</Sha>
|
||||||
<SourceBuild RepoName="templating" ManagedOnly="true" />
|
<SourceBuild RepoName="templating" ManagedOnly="true" />
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.DotNet.Common.ProjectTemplates.6.0" Version="6.0.132" CoherentParentDependency="Microsoft.NET.Sdk">
|
<Dependency Name="Microsoft.DotNet.Common.ProjectTemplates.6.0" Version="6.0.133" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
|
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
|
||||||
<Sha>c86b7556cbdc3e9a5a5226547490713e2e948401</Sha>
|
<Sha>2fdb78d36dc993a532bd80ee2682a2b534497413</Sha>
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.133-servicing.24366.20">
|
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.133-servicing.24366.30">
|
||||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
|
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
|
||||||
<Sha>1c4520d3edaefd72e3067952f17da1712aa88d39</Sha>
|
<Sha>94f9ff9aab969379b0578dd09ac669607a6a03fb</Sha>
|
||||||
<SourceBuild RepoName="sdk" ManagedOnly="true" />
|
<SourceBuild RepoName="sdk" ManagedOnly="true" />
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.133-servicing.24366.20">
|
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.133-servicing.24366.30">
|
||||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
|
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
|
||||||
<Sha>1c4520d3edaefd72e3067952f17da1712aa88d39</Sha>
|
<Sha>94f9ff9aab969379b0578dd09ac669607a6a03fb</Sha>
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via windowsdesktop -->
|
<!-- 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.32-servicing.24314.5" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
|
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.32-servicing.24314.5" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
|
||||||
|
|
|
||||||
|
|
@ -31,7 +31,7 @@
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<!-- Dependency from https://github.com/dotnet/templating -->
|
<!-- Dependency from https://github.com/dotnet/templating -->
|
||||||
<MicrosoftDotNetCommonItemTemplatesPackageVersion>6.0.132</MicrosoftDotNetCommonItemTemplatesPackageVersion>
|
<MicrosoftDotNetCommonItemTemplatesPackageVersion>6.0.133</MicrosoftDotNetCommonItemTemplatesPackageVersion>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<!-- Dependency from https://github.com/dotnet/test-templates -->
|
<!-- Dependency from https://github.com/dotnet/test-templates -->
|
||||||
|
|
@ -55,8 +55,8 @@
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<!-- Dependencies from https://github.com/dotnet/sdk -->
|
<!-- Dependencies from https://github.com/dotnet/sdk -->
|
||||||
<MicrosoftNETSdkPackageVersion>6.0.133-servicing.24366.20</MicrosoftNETSdkPackageVersion>
|
<MicrosoftNETSdkPackageVersion>6.0.133-servicing.24366.30</MicrosoftNETSdkPackageVersion>
|
||||||
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.133-servicing.24366.20</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
|
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.133-servicing.24366.30</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
|
||||||
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
|
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
|
||||||
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
|
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
|
||||||
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
|
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
|
||||||
|
|
@ -115,7 +115,7 @@
|
||||||
<MicrosoftDotNetWpfProjectTemplates60PackageVersion>$(MicrosoftDotNetWpfProjectTemplatesPackageVersion)</MicrosoftDotNetWpfProjectTemplates60PackageVersion>
|
<MicrosoftDotNetWpfProjectTemplates60PackageVersion>$(MicrosoftDotNetWpfProjectTemplatesPackageVersion)</MicrosoftDotNetWpfProjectTemplates60PackageVersion>
|
||||||
<NUnit3Templates60PackageVersion>$(NUnit3DotNetNewTemplatePackageVersion)</NUnit3Templates60PackageVersion>
|
<NUnit3Templates60PackageVersion>$(NUnit3DotNetNewTemplatePackageVersion)</NUnit3Templates60PackageVersion>
|
||||||
<MicrosoftDotNetCommonItemTemplates60PackageVersion>$(MicrosoftDotNetCommonItemTemplatesPackageVersion)</MicrosoftDotNetCommonItemTemplates60PackageVersion>
|
<MicrosoftDotNetCommonItemTemplates60PackageVersion>$(MicrosoftDotNetCommonItemTemplatesPackageVersion)</MicrosoftDotNetCommonItemTemplates60PackageVersion>
|
||||||
<MicrosoftDotNetCommonProjectTemplates60PackageVersion>6.0.132</MicrosoftDotNetCommonProjectTemplates60PackageVersion>
|
<MicrosoftDotNetCommonProjectTemplates60PackageVersion>6.0.133</MicrosoftDotNetCommonProjectTemplates60PackageVersion>
|
||||||
<AspNetCorePackageVersionFor60Templates>$(MicrosoftAspNetCoreAppRuntimePackageVersion)</AspNetCorePackageVersionFor60Templates>
|
<AspNetCorePackageVersionFor60Templates>$(MicrosoftAspNetCoreAppRuntimePackageVersion)</AspNetCorePackageVersionFor60Templates>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<!-- infrastructure and test only dependencies -->
|
<!-- infrastructure and test only dependencies -->
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue