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

Merged PR 34670: [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.25 to 6.0.25 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.25-servicing.23518.22 to 6.0.25-servicing.23519.12 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.25 to 6.0.25 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.25 to 6.0.25 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.25 to 6.0.25 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.25-servicing.23518.22 to 6.0.25-servicing.23519.12 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NET.Workload.Emscripten.Manifest-6.0.100**: from 6.0.23 to 6.0.25 (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**: 20231019.81
- **Date Produced**: October 20, 2023 5:26:27 AM UTC
- **Commit**: 4667ac66b721b1c1ea169c71a6b1c30abf11c969
- **Branch**: refs/heads/internal/release/6.0.1xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.125-servicing.23519.54 to 6.0.125-servicing.23519.81][1]
  - **Microsoft.NET.Sdk**: [from 6.0.125-servicing.23519.54 to 6.0.125-servicing.23519.81][1]
  - **Microsoft.NETCore.App.Ref**: [from 6.0.25 to 6.0.25][2]
  - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: [from 6.0.25-servicing.23518.22 to 6.0.25-servicing.23519.12][2]
  - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.25 to 6.0.25][2]
  - **Microsoft.NETCore.App.Host.win-x64**: [from 6.0.25 to 6.0.25][2]
  - **Microsoft.NETCore.DotNetHostResolver**: [from 6.0.25 to 6.0.25][2]
  - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.25-servicing.23518.22 to 6.0.25-servicing.23519.12][2]
  - **Microsoft.NET.Workload.Emscripten.Manifest-6.0.100**: [from 6.0.23 to 6.0.25][3]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC242714167d&targetVersion=GC4667ac66b7&_a=files
[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GCd7b9518372&targetVersion=GC492abbeef0&_a=files
[3]: 0b73b536f6...d8bc162ccf

[DependencyUpdate]: <> (E...
This commit is contained in:
DotNet Bot 2023-10-20 06:43:18 +00:00 committed by Sean Reeser
commit dd80b1da46
3 changed files with 22 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
NuGet.config
View file

@ -10,11 +10,12 @@
<add key="darc-int-dotnet-aspnetcore-0fc7d67" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-0fc7d670/nuget/v3/index.json" /> <add key="darc-int-dotnet-aspnetcore-0fc7d67" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-0fc7d670/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-d8bc162" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-d8bc162c/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 -->
<!-- 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-d7b9518" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-d7b95183/nuget/v3/index.json" /> <add key="darc-int-dotnet-runtime-492abbe" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-492abbee/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-09a2091" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-09a2091e/nuget/v3/index.json" /> <add key="darc-int-dotnet-templating-09a2091" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-09a2091e/nuget/v3/index.json" />
@ -46,7 +47,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-d7b9518" value="true" /> <add key="darc-int-dotnet-runtime-492abbe" value="true" />
<!-- Begin: Package sources from dotnet-templating --> <!-- Begin: Package sources from dotnet-templating -->
<add key="darc-int-dotnet-templating-09a2091" value="true" /> <add key="darc-int-dotnet-templating-09a2091" value="true" />
<!-- End: Package sources from dotnet-templating --> <!-- End: Package sources from dotnet-templating -->

28
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>7a8ee66adb20d70b1403a3a5142ed305e8699f5e</Sha> <Sha>7a8ee66adb20d70b1403a3a5142ed305e8699f5e</Sha>
</Dependency> </Dependency>
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.25-servicing.23518.22" CoherentParentDependency="Microsoft.NET.Sdk"> <Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.25-servicing.23519.12" 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>d7b9518372d8e9988e62154d73453e7df508df2c</Sha> <Sha>492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.25" CoherentParentDependency="Microsoft.NET.Sdk"> <Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.25" 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>d7b9518372d8e9988e62154d73453e7df508df2c</Sha> <Sha>492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4</Sha>
</Dependency> </Dependency>
<Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.6.0" Version="6.0.25-servicing.23518.22" CoherentParentDependency="Microsoft.NET.Sdk"> <Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.6.0" Version="6.0.25-servicing.23519.12" 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>d7b9518372d8e9988e62154d73453e7df508df2c</Sha> <Sha>492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.25" CoherentParentDependency="Microsoft.NET.Sdk"> <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.25" 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>d7b9518372d8e9988e62154d73453e7df508df2c</Sha> <Sha>492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4</Sha>
<SourceBuildTarball RepoName="runtime" ManagedOnly="true" /> <SourceBuildTarball RepoName="runtime" ManagedOnly="true" />
</Dependency> </Dependency>
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="6.0.25" CoherentParentDependency="Microsoft.NET.Sdk"> <Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="6.0.25" 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>d7b9518372d8e9988e62154d73453e7df508df2c</Sha> <Sha>492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="6.0.25" CoherentParentDependency="Microsoft.NET.Sdk"> <Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="6.0.25" 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>d7b9518372d8e9988e62154d73453e7df508df2c</Sha> <Sha>492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4</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. -->
@ -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>09a2091e07d334d42f6b441ae845f854622326cc</Sha> <Sha>09a2091e07d334d42f6b441ae845f854622326cc</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.125-servicing.23519.54"> <Dependency Name="Microsoft.NET.Sdk" Version="6.0.125-servicing.23519.81">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>242714167d7ec659bf372fe545164214267489c1</Sha> <Sha>4667ac66b721b1c1ea169c71a6b1c30abf11c969</Sha>
<SourceBuild RepoName="sdk" ManagedOnly="true" /> <SourceBuild RepoName="sdk" ManagedOnly="true" />
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.125-servicing.23519.54"> <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.125-servicing.23519.81">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>242714167d7ec659bf372fe545164214267489c1</Sha> <Sha>4667ac66b721b1c1ea169c71a6b1c30abf11c969</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.25-servicing.23518.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64"> <Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.25-servicing.23518.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
@ -166,9 +166,9 @@
<Sha>698fdad58fa64a55f16cd9562c90224cc498ed02</Sha> <Sha>698fdad58fa64a55f16cd9562c90224cc498ed02</Sha>
<SourceBuildTarball RepoName="xdt" ManagedOnly="true" /> <SourceBuildTarball RepoName="xdt" ManagedOnly="true" />
</Dependency> </Dependency>
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.100" Version="6.0.23" CoherentParentDependency="VS.Redist.Common.NetCore.SharedFramework.x64.6.0"> <Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.100" Version="6.0.25" CoherentParentDependency="VS.Redist.Common.NetCore.SharedFramework.x64.6.0">
<Uri>https://github.com/dotnet/emsdk</Uri> <Uri>https://github.com/dotnet/emsdk</Uri>
<Sha>0b73b536f6e0d0a6143387439c3308db4db9fdfe</Sha> <Sha>d8bc162ccf7ce14fdbec9c2c50d6e856a7063c91</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build" Version="6.0.0-servicing.22419.2"> <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build" Version="6.0.0-servicing.22419.2">
<Uri>https://github.com/dotnet/source-build</Uri> <Uri>https://github.com/dotnet/source-build</Uri>

10
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.125-servicing.23519.54</MicrosoftNETSdkPackageVersion> <MicrosoftNETSdkPackageVersion>6.0.125-servicing.23519.81</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.125-servicing.23519.54</MicrosoftDotNetMSBuildSdkResolverPackageVersion> <MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.125-servicing.23519.81</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.25-servicing.23518.22</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion> <VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.25-servicing.23519.12</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
<VSRedistCommonNetCoreTargetingPackx6460PackageVersion>6.0.25-servicing.23518.22</VSRedistCommonNetCoreTargetingPackx6460PackageVersion> <VSRedistCommonNetCoreTargetingPackx6460PackageVersion>6.0.25-servicing.23519.12</VSRedistCommonNetCoreTargetingPackx6460PackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>6.0.25</MicrosoftNETCoreAppRuntimewinx64PackageVersion> <MicrosoftNETCoreAppRuntimewinx64PackageVersion>6.0.25</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCoreAppHostwinx64PackageVersion>6.0.25</MicrosoftNETCoreAppHostwinx64PackageVersion> <MicrosoftNETCoreAppHostwinx64PackageVersion>6.0.25</MicrosoftNETCoreAppHostwinx64PackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>6.0.25</MicrosoftNETCoreAppRefPackageVersion> <MicrosoftNETCoreAppRefPackageVersion>6.0.25</MicrosoftNETCoreAppRefPackageVersion>
@ -185,7 +185,7 @@
<XamarinMacOSWorkloadManifestVersion>12.0.101-preview.9.31</XamarinMacOSWorkloadManifestVersion> <XamarinMacOSWorkloadManifestVersion>12.0.101-preview.9.31</XamarinMacOSWorkloadManifestVersion>
<XamarinTvOSWorkloadManifestVersion>15.0.101-preview.9.31</XamarinTvOSWorkloadManifestVersion> <XamarinTvOSWorkloadManifestVersion>15.0.101-preview.9.31</XamarinTvOSWorkloadManifestVersion>
<MonoWorkloadManifestVersion>$(MicrosoftNETCoreAppRefPackageVersion)</MonoWorkloadManifestVersion> <MonoWorkloadManifestVersion>$(MicrosoftNETCoreAppRefPackageVersion)</MonoWorkloadManifestVersion>
<MicrosoftNETWorkloadEmscriptenManifest60100Version>6.0.23</MicrosoftNETWorkloadEmscriptenManifest60100Version> <MicrosoftNETWorkloadEmscriptenManifest60100Version>6.0.25</MicrosoftNETWorkloadEmscriptenManifest60100Version>
<EmscriptenWorkloadManifestVersion>$(MicrosoftNETWorkloadEmscriptenManifest60100Version)</EmscriptenWorkloadManifestVersion> <EmscriptenWorkloadManifestVersion>$(MicrosoftNETWorkloadEmscriptenManifest60100Version)</EmscriptenWorkloadManifestVersion>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>