Merged PR 42713: [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.Build**: from 17.0.3 to 17.0.4 (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**: 20240910.6
- **Date Produced**: September 10, 2024 5:31:35 PM UTC
- **Commit**: 6e8de6c1f8a4e7f411709ebe03154a1a721b95ee
- **Branch**: refs/heads/internal/release/6.0.1xx
[DependencyUpdate]: <> (Begin)
- **Updates**:
- **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.134-servicing.24419.22 to 6.0.135-servicing.24460.6][1]
- **Microsoft.NET.Sdk**: [from 6.0.134-servicing.24419.22 to 6.0.135-servicing.24460.6][1]
- **Microsoft.Build**: [from 17.0.3 to 17.0.4][2]
[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCbe7da2b93dad324ef6399a8f8049a064430ac3be&targetVersion=GC6e8de6c1f8a4e7f411709ebe03154a1a721b95ee&_a=files
[2]: d679d20927...85d71072f8
[DependencyUpdate]: <> (End)
[marker]: <> (End:a68e208b-7b40-4a19-af8d-08d961c59698)
This commit is contained in:
maestro-prod-Primary
Sean Reeser
commit
9431073a6b
3 changed files with 39 additions and 10 deletions
31
NuGet.config
31
NuGet.config
|
|
@ -8,21 +8,38 @@
|
||||||
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
|
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
|
||||||
<!-- Begin: Package sources from dotnet-aspnetcore -->
|
<!-- Begin: Package sources from dotnet-aspnetcore -->
|
||||||
<add key="darc-int-dotnet-aspnetcore-e19ee61" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-e19ee616/nuget/v3/index.json" />
|
<add key="darc-int-dotnet-aspnetcore-e19ee61" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-e19ee616/nuget/v3/index.json" />
|
||||||
|
<add key="darc-int-dotnet-aspnetcore-e19ee61-4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-e19ee616-4/nuget/v3/index.json" />
|
||||||
<!-- End: Package sources from dotnet-aspnetcore -->
|
<!-- End: Package sources from dotnet-aspnetcore -->
|
||||||
<!-- Begin: Package sources from dotnet-emsdk -->
|
<!-- Begin: Package sources from dotnet-emsdk -->
|
||||||
<add key="darc-pub-dotnet-emsdk-ec74ec8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-ec74ec8f/nuget/v3/index.json" />
|
<add key="darc-pub-dotnet-emsdk-ec74ec8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-ec74ec8f/nuget/v3/index.json" />
|
||||||
|
<add key="darc-pub-dotnet-emsdk-ec74ec8-5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-ec74ec8f-5/nuget/v3/index.json" />
|
||||||
|
<add key="darc-pub-dotnet-emsdk-ec74ec8-4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-ec74ec8f-4/nuget/v3/index.json" />
|
||||||
|
<add key="darc-pub-dotnet-emsdk-ec74ec8-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-ec74ec8f-3/nuget/v3/index.json" />
|
||||||
|
<add key="darc-pub-dotnet-emsdk-ec74ec8-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-ec74ec8f-2/nuget/v3/index.json" />
|
||||||
|
<add key="darc-pub-dotnet-emsdk-ec74ec8-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-ec74ec8f-1/nuget/v3/index.json" />
|
||||||
<!-- End: Package sources from dotnet-emsdk -->
|
<!-- End: Package sources from dotnet-emsdk -->
|
||||||
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
|
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
|
||||||
<add key="darc-pub-DotNet-msbuild-Trusted-d679d20" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-d679d209/nuget/v3/index.json" />
|
<add key="darc-pub-DotNet-msbuild-Trusted-85d7107" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-85d71072/nuget/v3/index.json" />
|
||||||
<!-- End: Package sources from DotNet-msbuild-Trusted -->
|
<!-- End: Package sources from DotNet-msbuild-Trusted -->
|
||||||
<!-- Begin: Package sources from dotnet-runtime -->
|
<!-- Begin: Package sources from dotnet-runtime -->
|
||||||
<add key="darc-int-dotnet-runtime-98588b0" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-98588b0f/nuget/v3/index.json" />
|
<add key="darc-int-dotnet-runtime-98588b0" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-98588b0f/nuget/v3/index.json" />
|
||||||
|
<add key="darc-int-dotnet-runtime-98588b0-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-98588b0f-2/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-b66746d" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-b66746dd/nuget/v3/index.json" />
|
<add key="darc-int-dotnet-templating-b66746d" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-b66746dd/nuget/v3/index.json" />
|
||||||
|
<add key="darc-int-dotnet-templating-b66746d-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-b66746dd-5/nuget/v3/index.json" />
|
||||||
|
<add key="darc-int-dotnet-templating-b66746d-4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-b66746dd-4/nuget/v3/index.json" />
|
||||||
|
<add key="darc-int-dotnet-templating-b66746d-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-b66746dd-3/nuget/v3/index.json" />
|
||||||
|
<add key="darc-int-dotnet-templating-b66746d-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-b66746dd-2/nuget/v3/index.json" />
|
||||||
|
<add key="darc-int-dotnet-templating-b66746d-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-b66746dd-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-7132545" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-7132545b/nuget/v3/index.json" />
|
<add key="darc-int-dotnet-windowsdesktop-7132545" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-7132545b/nuget/v3/index.json" />
|
||||||
|
<add key="darc-int-dotnet-windowsdesktop-7132545-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-7132545b-5/nuget/v3/index.json" />
|
||||||
|
<add key="darc-int-dotnet-windowsdesktop-7132545-4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-7132545b-4/nuget/v3/index.json" />
|
||||||
|
<add key="darc-int-dotnet-windowsdesktop-7132545-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-7132545b-3/nuget/v3/index.json" />
|
||||||
|
<add key="darc-int-dotnet-windowsdesktop-7132545-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-7132545b-2/nuget/v3/index.json" />
|
||||||
|
<add key="darc-int-dotnet-windowsdesktop-7132545-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-7132545b-1/nuget/v3/index.json" />
|
||||||
<!-- End: Package sources from dotnet-windowsdesktop -->
|
<!-- End: Package sources from dotnet-windowsdesktop -->
|
||||||
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
|
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
|
||||||
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
|
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
|
||||||
|
|
@ -43,16 +60,28 @@
|
||||||
<disabledPackageSources>
|
<disabledPackageSources>
|
||||||
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
|
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
|
||||||
<!-- Begin: Package sources from dotnet-aspnetcore -->
|
<!-- Begin: Package sources from dotnet-aspnetcore -->
|
||||||
|
<add key="darc-int-dotnet-aspnetcore-e19ee61-4" value="true" />
|
||||||
<add key="darc-int-dotnet-aspnetcore-e19ee61" value="true" />
|
<add key="darc-int-dotnet-aspnetcore-e19ee61" value="true" />
|
||||||
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
|
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
|
||||||
<!-- End: Package sources from DotNet-msbuild-Trusted -->
|
<!-- End: Package sources from DotNet-msbuild-Trusted -->
|
||||||
<!-- End: Package sources from dotnet-aspnetcore -->
|
<!-- End: Package sources from dotnet-aspnetcore -->
|
||||||
<!-- Begin: Package sources from dotnet-runtime -->
|
<!-- Begin: Package sources from dotnet-runtime -->
|
||||||
|
<add key="darc-int-dotnet-runtime-98588b0-2" value="true" />
|
||||||
<add key="darc-int-dotnet-runtime-98588b0" value="true" />
|
<add key="darc-int-dotnet-runtime-98588b0" value="true" />
|
||||||
<!-- Begin: Package sources from dotnet-templating -->
|
<!-- Begin: Package sources from dotnet-templating -->
|
||||||
|
<add key="darc-int-dotnet-templating-b66746d-1" value="true" />
|
||||||
|
<add key="darc-int-dotnet-templating-b66746d-2" value="true" />
|
||||||
|
<add key="darc-int-dotnet-templating-b66746d-3" value="true" />
|
||||||
|
<add key="darc-int-dotnet-templating-b66746d-4" value="true" />
|
||||||
|
<add key="darc-int-dotnet-templating-b66746d-5" value="true" />
|
||||||
<add key="darc-int-dotnet-templating-b66746d" value="true" />
|
<add key="darc-int-dotnet-templating-b66746d" 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-7132545-1" value="true" />
|
||||||
|
<add key="darc-int-dotnet-windowsdesktop-7132545-2" value="true" />
|
||||||
|
<add key="darc-int-dotnet-windowsdesktop-7132545-3" value="true" />
|
||||||
|
<add key="darc-int-dotnet-windowsdesktop-7132545-4" value="true" />
|
||||||
|
<add key="darc-int-dotnet-windowsdesktop-7132545-5" value="true" />
|
||||||
<add key="darc-int-dotnet-windowsdesktop-7132545" value="true" />
|
<add key="darc-int-dotnet-windowsdesktop-7132545" value="true" />
|
||||||
<!-- End: Package sources from dotnet-windowsdesktop -->
|
<!-- End: Package sources from dotnet-windowsdesktop -->
|
||||||
<!-- End: Package sources from dotnet-runtime -->
|
<!-- End: Package sources from dotnet-runtime -->
|
||||||
|
|
|
||||||
|
|
@ -103,14 +103,14 @@
|
||||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
|
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
|
||||||
<Sha>b66746dd945089102c4932375063d67616bea606</Sha>
|
<Sha>b66746dd945089102c4932375063d67616bea606</Sha>
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.134-servicing.24419.22">
|
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.135-servicing.24460.6">
|
||||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
|
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
|
||||||
<Sha>be7da2b93dad324ef6399a8f8049a064430ac3be</Sha>
|
<Sha>6e8de6c1f8a4e7f411709ebe03154a1a721b95ee</Sha>
|
||||||
<SourceBuild RepoName="sdk" ManagedOnly="true" />
|
<SourceBuild RepoName="sdk" ManagedOnly="true" />
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.134-servicing.24419.22">
|
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.135-servicing.24460.6">
|
||||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
|
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
|
||||||
<Sha>be7da2b93dad324ef6399a8f8049a064430ac3be</Sha>
|
<Sha>6e8de6c1f8a4e7f411709ebe03154a1a721b95ee</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.34-servicing.24417.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
|
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.34-servicing.24417.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
|
||||||
|
|
@ -146,9 +146,9 @@
|
||||||
<Sha>487283bcd8d66693091f2800dcf1c8ae37cccdee</Sha>
|
<Sha>487283bcd8d66693091f2800dcf1c8ae37cccdee</Sha>
|
||||||
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
|
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.Build" Version="17.0.3" CoherentParentDependency="Microsoft.NET.Sdk">
|
<Dependency Name="Microsoft.Build" Version="17.0.4" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||||
<Uri>https://github.com/dotnet/msbuild</Uri>
|
<Uri>https://github.com/dotnet/msbuild</Uri>
|
||||||
<Sha>d679d209277a156cdc0963c993585ffa5744dc5f</Sha>
|
<Sha>85d71072f8fa22cc761d6b65954da263364bee4d</Sha>
|
||||||
<SourceBuildTarball RepoName="msbuild" ManagedOnly="true" />
|
<SourceBuildTarball RepoName="msbuild" ManagedOnly="true" />
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="NuGet.Build.Tasks" Version="6.0.6-rc.4" CoherentParentDependency="Microsoft.NET.Sdk">
|
<Dependency Name="NuGet.Build.Tasks" Version="6.0.6-rc.4" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||||
|
|
|
||||||
|
|
@ -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.134-servicing.24419.22</MicrosoftNETSdkPackageVersion>
|
<MicrosoftNETSdkPackageVersion>6.0.135-servicing.24460.6</MicrosoftNETSdkPackageVersion>
|
||||||
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.134-servicing.24419.22</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
|
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.135-servicing.24460.6</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
|
||||||
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
|
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
|
||||||
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
|
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
|
||||||
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
|
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
|
||||||
|
|
@ -97,7 +97,7 @@
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<!-- Dependencies from https://github.com/dotnet/msbuild -->
|
<!-- Dependencies from https://github.com/dotnet/msbuild -->
|
||||||
<MicrosoftBuildPackageVersion>17.0.3</MicrosoftBuildPackageVersion>
|
<MicrosoftBuildPackageVersion>17.0.4</MicrosoftBuildPackageVersion>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<HostFxrVersion>$(MicrosoftNETCoreAppRuntimePackageVersion)</HostFxrVersion>
|
<HostFxrVersion>$(MicrosoftNETCoreAppRuntimePackageVersion)</HostFxrVersion>
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue