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

Merged PR 35828: [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.26 to 6.0.26 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.26-servicing.23572.29 to 6.0.26-servicing.23605.8 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.26 to 6.0.26 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.26 to 6.0.26 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.26 to 6.0.26 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.26-servicing.23572.29 to 6.0.26-servicing.23605.8 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NET.Workload.Emscripten.Manifest-6.0.100**: from 6.0.25 to 6.0.26 (parent: VS.Redist.Common.NetCore.SharedFramework.x64.6.0)

[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**: 20231205.14
- **Date Produced**: December 5, 2023 10:05:04 PM UTC
- **Commit**: 9b8cdd0062a889793bda0f84365492c6e21ff981
- **Branch**: refs/heads/internal/release/6.0.1xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.126-servicing.23604.12 to 6.0.126-servicing.23605.14][1]
  - **Microsoft.NET.Sdk**: [from 6.0.126-servicing.23604.12 to 6.0.126-servicing.23605.14][1]
  - **Microsoft.NETCore.App.Ref**: [from 6.0.26 to 6.0.26][2]
  - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: [from 6.0.26-servicing.23572.29 to 6.0.26-servicing.23605.8][2]
  - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.26 to 6.0.26][2]
  - **Microsoft.NETCore.App.Host.win-x64**: [from 6.0.26 to 6.0.26][2]
  - **Microsoft.NETCore.DotNetHostResolver**: [from 6.0.26 to 6.0.26][2]
  - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.26-servicing.23572.29 to 6.0.26-servicing.23605.8][2]
  - **Microsoft.NET.Workload.Emscripten.Manifest-6.0.100**: [from 6.0.25 to 6.0.26][3]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC493e67d127&targetVersion=GC9b8cdd0062&_a=files
[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC965a793efc&targetVersion=GCdc45e96840&_a=files
[3]: d8bc162ccf...5ccc36f598

[DependencyUpdate]: <> (End)...
This commit is contained in:
DotNet Bot 2023-12-05 22:25:34 +00:00 committed by Matt Mitchell
parent 81e0dadfa5
commit 5f19470397
3 changed files with 22 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
NuGet.config
View file

@ -11,12 +11,12 @@
<add key="darc-int-dotnet-aspnetcore-3fcbb4e-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-3fcbb4e1-1/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-aspnetcore -->
<!-- Begin: Package sources from dotnet-emsdk -->
<add key="darc-pub-dotnet-emsdk-5ccc36f" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-5ccc36f5/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-emsdk -->
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
<!-- End: Package sources from DotNet-msbuild-Trusted -->
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-965a793" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-965a793e/nuget/v3/index.json" />
<add key="darc-int-dotnet-runtime-965a793-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-965a793e-1/nuget/v3/index.json" />
<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-e58a1e0" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-e58a1e05/nuget/v3/index.json" />
@ -50,8 +50,7 @@
<!-- End: Package sources from DotNet-msbuild-Trusted -->
<!-- End: Package sources from dotnet-aspnetcore -->
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-965a793-1" value="true" />
<add key="darc-int-dotnet-runtime-965a793" value="true" />
<add key="darc-int-dotnet-runtime-dc45e96" value="true" />
<!-- Begin: Package sources from dotnet-templating -->
<add key="darc-int-dotnet-templating-e58a1e0-1" value="true" />
<add key="darc-int-dotnet-templating-e58a1e0" value="true" />

28
eng/Version.Details.xml
View file

@ -17,30 +17,30 @@
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
<Sha>456adb551c1878a5dcc44f0b6e7d69de4789cbdc</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.26-servicing.23572.29" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.26-servicing.23605.8" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>965a793efc765ddbea3c43e43c13b8e956b61946</Sha>
<Sha>dc45e96840243b203b13e61952230e225d2aac52</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.26" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>965a793efc765ddbea3c43e43c13b8e956b61946</Sha>
<Sha>dc45e96840243b203b13e61952230e225d2aac52</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.6.0" Version="6.0.26-servicing.23572.29" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.6.0" Version="6.0.26-servicing.23605.8" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>965a793efc765ddbea3c43e43c13b8e956b61946</Sha>
<Sha>dc45e96840243b203b13e61952230e225d2aac52</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.26" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>965a793efc765ddbea3c43e43c13b8e956b61946</Sha>
<Sha>dc45e96840243b203b13e61952230e225d2aac52</Sha>
<SourceBuildTarball RepoName="runtime" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="6.0.26" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>965a793efc765ddbea3c43e43c13b8e956b61946</Sha>
<Sha>dc45e96840243b203b13e61952230e225d2aac52</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="6.0.26" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>965a793efc765ddbea3c43e43c13b8e956b61946</Sha>
<Sha>dc45e96840243b203b13e61952230e225d2aac52</Sha>
</Dependency>
<!-- 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. -->
@ -103,14 +103,14 @@
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
<Sha>e58a1e0535c781fc1c12a5bbbc81c5044260d3e0</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.126-servicing.23604.12">
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.126-servicing.23605.14">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>493e67d12750dc460c159ff6a5c81fec6e525f46</Sha>
<Sha>9b8cdd0062a889793bda0f84365492c6e21ff981</Sha>
<SourceBuild RepoName="sdk" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.126-servicing.23604.12">
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.126-servicing.23605.14">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>493e67d12750dc460c159ff6a5c81fec6e525f46</Sha>
<Sha>9b8cdd0062a889793bda0f84365492c6e21ff981</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">
@ -166,9 +166,9 @@
<Sha>698fdad58fa64a55f16cd9562c90224cc498ed02</Sha>
<SourceBuildTarball RepoName="xdt" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.100" Version="6.0.25" CoherentParentDependency="VS.Redist.Common.NetCore.SharedFramework.x64.6.0">
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.100" Version="6.0.26" CoherentParentDependency="VS.Redist.Common.NetCore.SharedFramework.x64.6.0">
<Uri>https://github.com/dotnet/emsdk</Uri>
<Sha>d8bc162ccf7ce14fdbec9c2c50d6e856a7063c91</Sha>
<Sha>5ccc36f5985e2089f47c97a19c250e65ddefd0ba</Sha>
</Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build" Version="6.0.0-servicing.22419.2">
<Uri>https://github.com/dotnet/source-build</Uri>

10
eng/Versions.props
View file

@ -56,8 +56,8 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/sdk -->
<MicrosoftNETSdkPackageVersion>6.0.126-servicing.23604.12</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.126-servicing.23604.12</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETSdkPackageVersion>6.0.126-servicing.23605.14</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.126-servicing.23605.14</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
@ -68,8 +68,8 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/core-setup -->
<VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.26-servicing.23572.29</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
<VSRedistCommonNetCoreTargetingPackx6460PackageVersion>6.0.26-servicing.23572.29</VSRedistCommonNetCoreTargetingPackx6460PackageVersion>
<VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.26-servicing.23605.8</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
<VSRedistCommonNetCoreTargetingPackx6460PackageVersion>6.0.26-servicing.23605.8</VSRedistCommonNetCoreTargetingPackx6460PackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>6.0.26</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCoreAppHostwinx64PackageVersion>6.0.26</MicrosoftNETCoreAppHostwinx64PackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>6.0.26</MicrosoftNETCoreAppRefPackageVersion>
@ -185,7 +185,7 @@
<XamarinMacOSWorkloadManifestVersion>12.0.101-preview.9.31</XamarinMacOSWorkloadManifestVersion>
<XamarinTvOSWorkloadManifestVersion>15.0.101-preview.9.31</XamarinTvOSWorkloadManifestVersion>
<MonoWorkloadManifestVersion>$(MicrosoftNETCoreAppRefPackageVersion)</MonoWorkloadManifestVersion>
<MicrosoftNETWorkloadEmscriptenManifest60100Version>6.0.25</MicrosoftNETWorkloadEmscriptenManifest60100Version>
<MicrosoftNETWorkloadEmscriptenManifest60100Version>6.0.26</MicrosoftNETWorkloadEmscriptenManifest60100Version>
<EmscriptenWorkloadManifestVersion>$(MicrosoftNETWorkloadEmscriptenManifest60100Version)</EmscriptenWorkloadManifestVersion>
</PropertyGroup>
<PropertyGroup>