mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merged PR 38303: [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk

Browse source 
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.NETCore.App.Ref**: from 6.0.29 to 6.0.29 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.29-servicing.24164.14 to 6.0.29-servicing.24169.13 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.29 to 6.0.29 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.29 to 6.0.29 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.29 to 6.0.29 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.Platforms**: from 6.0.13 to 6.0.13 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.29-servicing.24164.14 to 6.0.29-servicing.24169.13 (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**:
- **Date Produced**: March 20, 2024 2:56:52 AM UTC
- **Commit**: 6afbebcce0315fdcd675ed5bbc95d48228febc65
- **Branch**: refs/heads/internal/release/6.0.1xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.129-servicing.24169.40 to 6.0.129-servicing.24169.68][1]
  - **Microsoft.NET.Sdk**: [from 6.0.129-servicing.24169.40 to 6.0.129-servicing.24169.68][1]
  - **Microsoft.NETCore.App.Ref**: [from 6.0.29 to 6.0.29][2]
  - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: [from 6.0.29-servicing.24164.14 to 6.0.29-servicing.24169.13][2]
  - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.29 to 6.0.29][2]
  - **Microsoft.NETCore.App.Host.win-x64**: [from 6.0.29 to 6.0.29][2]
  - **Microsoft.NETCore.DotNetHostResolver**: [from 6.0.29 to 6.0.29][2]
  - **Microsoft.NETCore.Platforms**: [from 6.0.13 to 6.0.13][2]
  - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.29-servicing.24164.14 to 6.0.29-servicing.24169.13][2]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC45400bbdea7af9f7cf531634e1299ad22a537cec&targetVersion=GC6afbebcce0315fdcd675ed5bbc95d48228febc65&_a=files
[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC01f15d4879bd19d518e5bfe146af3b85ccf43076&targetVersion=GCc95b68327d40062beb0c9d4cd08295a85d86bd27&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:a68e208b-7b40...
This commit is contained in:
DotNet Bot 2024-03-20 03:54:54 +00:00 committed by Sean Reeser
commit 3705723824
3 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
NuGet.config
View file

@ -14,7 +14,7 @@
<!-- 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 -->
<!-- Begin: Package sources from dotnet-runtime --> <!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-01f15d4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-01f15d48/nuget/v3/index.json" /> <add key="darc-int-dotnet-runtime-c95b683" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-c95b6832/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-cef75e6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-cef75e64/nuget/v3/index.json" /> <add key="darc-int-dotnet-templating-cef75e6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-cef75e64/nuget/v3/index.json" />
@ -46,7 +46,7 @@
<!-- 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-01f15d4" value="true" /> <add key="darc-int-dotnet-runtime-c95b683" value="true" />
<!-- Begin: Package sources from dotnet-templating --> <!-- Begin: Package sources from dotnet-templating -->
<add key="darc-int-dotnet-templating-cef75e6" value="true" /> <add key="darc-int-dotnet-templating-cef75e6" value="true" />
<!-- End: Package sources from dotnet-templating --> <!-- End: Package sources from dotnet-templating -->

26
eng/Version.Details.xml
View file

@ -17,30 +17,30 @@
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
<Sha>7c192f44ffe4f589b794fbdea808331efc8d8bde</Sha> <Sha>7c192f44ffe4f589b794fbdea808331efc8d8bde</Sha>
</Dependency> </Dependency>
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.29-servicing.24164.14" CoherentParentDependency="Microsoft.NET.Sdk"> <Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.29-servicing.24169.13" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>01f15d4879bd19d518e5bfe146af3b85ccf43076</Sha> <Sha>c95b68327d40062beb0c9d4cd08295a85d86bd27</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.29" CoherentParentDependency="Microsoft.NET.Sdk"> <Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.29" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>01f15d4879bd19d518e5bfe146af3b85ccf43076</Sha> <Sha>c95b68327d40062beb0c9d4cd08295a85d86bd27</Sha>
</Dependency> </Dependency>
<Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.6.0" Version="6.0.29-servicing.24164.14" CoherentParentDependency="Microsoft.NET.Sdk"> <Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.6.0" Version="6.0.29-servicing.24169.13" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>01f15d4879bd19d518e5bfe146af3b85ccf43076</Sha> <Sha>c95b68327d40062beb0c9d4cd08295a85d86bd27</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.29" CoherentParentDependency="Microsoft.NET.Sdk"> <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.29" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>01f15d4879bd19d518e5bfe146af3b85ccf43076</Sha> <Sha>c95b68327d40062beb0c9d4cd08295a85d86bd27</Sha>
<SourceBuildTarball RepoName="runtime" ManagedOnly="true" /> <SourceBuildTarball RepoName="runtime" ManagedOnly="true" />
</Dependency> </Dependency>
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="6.0.29" CoherentParentDependency="Microsoft.NET.Sdk"> <Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="6.0.29" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>01f15d4879bd19d518e5bfe146af3b85ccf43076</Sha> <Sha>c95b68327d40062beb0c9d4cd08295a85d86bd27</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="6.0.29" CoherentParentDependency="Microsoft.NET.Sdk"> <Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="6.0.29" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>01f15d4879bd19d518e5bfe146af3b85ccf43076</Sha> <Sha>c95b68327d40062beb0c9d4cd08295a85d86bd27</Sha>
</Dependency> </Dependency>
<!-- Change blob version in GenerateLayout.targets if this is unpinned to service targeting pack --> <!-- Change blob version in GenerateLayout.targets if this is unpinned to service targeting pack -->
<!-- No new netstandard.library planned for 3.1 timeframe at this time. --> <!-- No new netstandard.library planned for 3.1 timeframe at this time. -->
@ -50,7 +50,7 @@
</Dependency> </Dependency>
<Dependency Name="Microsoft.NETCore.Platforms" Version="6.0.13" CoherentParentDependency="Microsoft.NET.Sdk"> <Dependency Name="Microsoft.NETCore.Platforms" Version="6.0.13" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>01f15d4879bd19d518e5bfe146af3b85ccf43076</Sha> <Sha>c95b68327d40062beb0c9d4cd08295a85d86bd27</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="6.0.29" CoherentParentDependency="Microsoft.NET.Sdk"> <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="6.0.29" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
@ -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>cef75e649457c61f8ef6205cef7b526ce0592104</Sha> <Sha>cef75e649457c61f8ef6205cef7b526ce0592104</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.129-servicing.24169.40"> <Dependency Name="Microsoft.NET.Sdk" Version="6.0.129-servicing.24169.68">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>45400bbdea7af9f7cf531634e1299ad22a537cec</Sha> <Sha>6afbebcce0315fdcd675ed5bbc95d48228febc65</Sha>
<SourceBuild RepoName="sdk" ManagedOnly="true" /> <SourceBuild RepoName="sdk" ManagedOnly="true" />
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.129-servicing.24169.40"> <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.129-servicing.24169.68">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>45400bbdea7af9f7cf531634e1299ad22a537cec</Sha> <Sha>6afbebcce0315fdcd675ed5bbc95d48228febc65</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.29-servicing.24165.6" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64"> <Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.29-servicing.24165.6" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">

8
eng/Versions.props
View file

@ -56,8 +56,8 @@
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/sdk --> <!-- Dependencies from https://github.com/dotnet/sdk -->
<MicrosoftNETSdkPackageVersion>6.0.129-servicing.24169.40</MicrosoftNETSdkPackageVersion> <MicrosoftNETSdkPackageVersion>6.0.129-servicing.24169.68</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.129-servicing.24169.40</MicrosoftDotNetMSBuildSdkResolverPackageVersion> <MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.129-servicing.24169.68</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion> <MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion> <MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion> <MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
@ -68,8 +68,8 @@
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/core-setup --> <!-- Dependencies from https://github.com/dotnet/core-setup -->
<VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.29-servicing.24164.14</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion> <VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.29-servicing.24169.13</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
<VSRedistCommonNetCoreTargetingPackx6460PackageVersion>6.0.29-servicing.24164.14</VSRedistCommonNetCoreTargetingPackx6460PackageVersion> <VSRedistCommonNetCoreTargetingPackx6460PackageVersion>6.0.29-servicing.24169.13</VSRedistCommonNetCoreTargetingPackx6460PackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>6.0.29</MicrosoftNETCoreAppRuntimewinx64PackageVersion> <MicrosoftNETCoreAppRuntimewinx64PackageVersion>6.0.29</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCoreAppHostwinx64PackageVersion>6.0.29</MicrosoftNETCoreAppHostwinx64PackageVersion> <MicrosoftNETCoreAppHostwinx64PackageVersion>6.0.29</MicrosoftNETCoreAppHostwinx64PackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>6.0.29</MicrosoftNETCoreAppRefPackageVersion> <MicrosoftNETCoreAppRefPackageVersion>6.0.29</MicrosoftNETCoreAppRefPackageVersion>