Merged PR 32041: [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.WindowsDesktop.App.Ref**: from 6.0.19 to 6.0.19 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.19-servicing.23316.3 to 6.0.19-servicing.23316.11 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.19-servicing.23316.3 to 6.0.19-servicing.23316.11 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref**: from 6.0.19 to 6.0.19 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.19-servicing.23315.15 to 6.0.19-servicing.23316.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.19 to 6.0.19 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.19-servicing.23315.15 to 6.0.19-servicing.23316.4 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 6.0.19-servicing.23315.15 to 6.0.19-servicing.23316.4 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 6.0.19-servicing.23315.15 to 6.0.19-servicing.23316.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.19 to 6.0.19 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.19-servicing.23314.6 to 6.0.19-servicing.23316.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.19 to 6.0.19 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.19-servicing.23314.6 to 6.0.19-servicing.23316.8 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)

[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**: 20230619.16
- **Date Produced**: June 19, 2023 4:50:26 PM UTC
- **Commit**: 21879f2647a3b78949377d85be211e5e324fc700
- **Branch**: refs/heads/internal/release/6.0.1xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.119-servicing.23316.37 to 6.0.119-servicing.23319.16][1]
  - **Microsoft.NET.Sdk**: [from 6.0.119-servicing.23316.37 to 6.0.119-servicing.23319.16][1]
  - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.19 to 6.0.19][2]
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.19-servi...
This commit is contained in:
DotNet Bot 2023-06-21 19:18:48 +00:00 committed by Matt Mitchell
parent bcaf329968
commit 0e7bd77ab9
3 changed files with 40 additions and 38 deletions

View file

@ -7,10 +7,12 @@
<clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-aspnetcore -->
<add key="darc-int-dotnet-aspnetcore-191dd6b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-191dd6b4/nuget/v3/index.json" />
<add key="darc-int-dotnet-aspnetcore-bb66e68" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-bb66e68e/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-aspnetcore -->
<!-- Begin: Package sources from dotnet-emsdk -->
<add key="darc-pub-dotnet-emsdk-0e3ff3e" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-0e3ff3ea/nuget/v3/index.json" />
<add key="darc-pub-dotnet-emsdk-0e3ff3e-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-0e3ff3ea-2/nuget/v3/index.json" />
<add key="darc-pub-dotnet-emsdk-0e3ff3e-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-0e3ff3ea-1/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-emsdk -->
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
<!-- End: Package sources from DotNet-msbuild-Trusted -->
@ -21,7 +23,7 @@
<add key="darc-int-dotnet-templating-29df36c" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-29df36ca/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-templating -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-23b442c" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-23b442c3/nuget/v3/index.json" />
<add key="darc-int-dotnet-windowsdesktop-9644056" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-96440567/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-windowsdesktop -->
<!--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" />
@ -42,7 +44,7 @@
<disabledPackageSources>
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-aspnetcore -->
<add key="darc-int-dotnet-aspnetcore-191dd6b" value="true" />
<add key="darc-int-dotnet-aspnetcore-bb66e68" value="true" />
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
<!-- End: Package sources from DotNet-msbuild-Trusted -->
<!-- End: Package sources from dotnet-aspnetcore -->
@ -52,7 +54,7 @@
<add key="darc-int-dotnet-templating-29df36c" value="true" />
<!-- End: Package sources from dotnet-templating -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-23b442c" value="true" />
<add key="darc-int-dotnet-windowsdesktop-9644056" value="true" />
<!-- End: Package sources from dotnet-windowsdesktop -->
<!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->

View file

@ -3,19 +3,19 @@
<ProductDependencies>
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="6.0.19" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
<Sha>23b442c3594414a52a901c710902639653c94b8d</Sha>
<Sha>964405678d47972b5a16730e00de42efaaecd351</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0" Version="6.0.19-servicing.23316.3" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0" Version="6.0.19-servicing.23316.11" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
<Sha>23b442c3594414a52a901c710902639653c94b8d</Sha>
<Sha>964405678d47972b5a16730e00de42efaaecd351</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0" Version="6.0.19-servicing.23316.3" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0" Version="6.0.19-servicing.23316.11" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
<Sha>23b442c3594414a52a901c710902639653c94b8d</Sha>
<Sha>964405678d47972b5a16730e00de42efaaecd351</Sha>
</Dependency>
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="6.0.19" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
<Sha>23b442c3594414a52a901c710902639653c94b8d</Sha>
<Sha>964405678d47972b5a16730e00de42efaaecd351</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.19-servicing.23313.25" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
@ -54,28 +54,28 @@
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="6.0.19" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>191dd6b449e2a4fba83d3d7ad8c6b9b5ecbe8cb2</Sha>
<Sha>bb66e68e5bfcf21879413b98962542bda9f66381</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="6.0.19-servicing.23315.15" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="6.0.19-servicing.23316.4" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>191dd6b449e2a4fba83d3d7ad8c6b9b5ecbe8cb2</Sha>
<Sha>bb66e68e5bfcf21879413b98962542bda9f66381</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="6.0.19" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>191dd6b449e2a4fba83d3d7ad8c6b9b5ecbe8cb2</Sha>
<Sha>bb66e68e5bfcf21879413b98962542bda9f66381</Sha>
<SourceBuildTarball RepoName="aspnetcore" ManagedOnly="true" />
</Dependency>
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0" Version="6.0.19-servicing.23315.15" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0" Version="6.0.19-servicing.23316.4" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>191dd6b449e2a4fba83d3d7ad8c6b9b5ecbe8cb2</Sha>
<Sha>bb66e68e5bfcf21879413b98962542bda9f66381</Sha>
</Dependency>
<Dependency Name="dotnet-dev-certs" Version="6.0.19-servicing.23315.15" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="dotnet-dev-certs" Version="6.0.19-servicing.23316.4" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>191dd6b449e2a4fba83d3d7ad8c6b9b5ecbe8cb2</Sha>
<Sha>bb66e68e5bfcf21879413b98962542bda9f66381</Sha>
</Dependency>
<Dependency Name="dotnet-user-secrets" Version="6.0.19-servicing.23315.15" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="dotnet-user-secrets" Version="6.0.19-servicing.23316.4" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>191dd6b449e2a4fba83d3d7ad8c6b9b5ecbe8cb2</Sha>
<Sha>bb66e68e5bfcf21879413b98962542bda9f66381</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.2.1" Version="1.0.2-beta4.22064.3">
<Uri>https://github.com/dotnet/test-templates</Uri>
@ -103,23 +103,23 @@
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
<Sha>29df36ca29205741afa9234e7d0ca702b05fd5aa</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.119-servicing.23316.37">
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.120-servicing.23319.34">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>81aeb40680f6bba69c2e375bdf618aa2a92e0cb0</Sha>
<Sha>86dfb8f630db1e0168b9d5b22104cbf6b81bfd3d</Sha>
<SourceBuild RepoName="sdk" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.119-servicing.23316.37">
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.120-servicing.23319.34">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>81aeb40680f6bba69c2e375bdf618aa2a92e0cb0</Sha>
<Sha>86dfb8f630db1e0168b9d5b22104cbf6b81bfd3d</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.19-servicing.23314.6" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.19-servicing.23316.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
<Sha>b1b9ae8774dbff146d4a0149a85229360e1d5dfd</Sha>
<Sha>4e9cc74519c57c5c4913459618f0dab2d6696ea1</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="6.0.19-servicing.23314.6" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="6.0.19-servicing.23316.8" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
<Sha>80d0a961366ba61097c1e1b51ad47466984d734e</Sha>
<Sha>b2fc6c7933d7c0e1f1b35e9df0356d2bb24b93d0</Sha>
</Dependency>
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.0.0-beta.21522.2" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/fsharp</Uri>

View file

@ -23,11 +23,11 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/winforms -->
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>6.0.19-servicing.23314.6</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>6.0.19-servicing.23316.2</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/wpf -->
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>6.0.19-servicing.23314.6</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>6.0.19-servicing.23316.8</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/templating -->
@ -46,18 +46,18 @@
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>6.0.19</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
<MicrosoftAspNetCoreAppRefPackageVersion>6.0.19</MicrosoftAspNetCoreAppRefPackageVersion>
<MicrosoftAspNetCoreAppRefInternalPackageVersion>6.0.19-servicing.23315.15</MicrosoftAspNetCoreAppRefInternalPackageVersion>
<VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>6.0.19-servicing.23315.15</VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>
<dotnetdevcertsPackageVersion>6.0.19-servicing.23315.15</dotnetdevcertsPackageVersion>
<dotnetusersecretsPackageVersion>6.0.19-servicing.23315.15</dotnetusersecretsPackageVersion>
<MicrosoftAspNetCoreAppRefInternalPackageVersion>6.0.19-servicing.23316.4</MicrosoftAspNetCoreAppRefInternalPackageVersion>
<VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>6.0.19-servicing.23316.4</VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>
<dotnetdevcertsPackageVersion>6.0.19-servicing.23316.4</dotnetdevcertsPackageVersion>
<dotnetusersecretsPackageVersion>6.0.19-servicing.23316.4</dotnetusersecretsPackageVersion>
</PropertyGroup>
<PropertyGroup>
<MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/sdk -->
<MicrosoftNETSdkPackageVersion>6.0.119-servicing.23316.37</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.119-servicing.23316.37</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETSdkPackageVersion>6.0.120-servicing.23319.34</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.120-servicing.23319.34</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
@ -78,8 +78,8 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/windowsdesktop -->
<VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion>6.0.19-servicing.23316.3</VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion>
<VSRedistCommonWindowsDesktopTargetingPackx6460PackageVersion>6.0.19-servicing.23316.3</VSRedistCommonWindowsDesktopTargetingPackx6460PackageVersion>
<VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion>6.0.19-servicing.23316.11</VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion>
<VSRedistCommonWindowsDesktopTargetingPackx6460PackageVersion>6.0.19-servicing.23316.11</VSRedistCommonWindowsDesktopTargetingPackx6460PackageVersion>
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>6.0.19</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
<MicrosoftWindowsDesktopAppRefPackageVersion>6.0.19</MicrosoftWindowsDesktopAppRefPackageVersion>
</PropertyGroup>