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

Merged PR 39711: [internal/release/6.0.4xx] 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.AspNetCore.App.Ref**: from 6.0.31 to 6.0.31 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.31-servicing.24266.4 to 6.0.31-servicing.24267.11 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.31 to 6.0.31 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.31-servicing.24266.4 to 6.0.31-servicing.24267.11 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 6.0.31-servicing.24266.4 to 6.0.31-servicing.24267.11 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 6.0.31-servicing.24266.4 to 6.0.31-servicing.24267.11 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.423 to 6.0.424 (parent: Microsoft.NET.Sdk)
  - **Microsoft.TemplateEngine.Cli**: from 6.0.423-rtm.24266.2 to 6.0.424-rtm.24267.26 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.423 to 6.0.424 (parent: Microsoft.NET.Sdk)

[DependencyUpdate]: <> (End)

[marker]: <> (End:Coherency Updates)

[marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31
- **Build**: 20240517.59
- **Date Produced**: May 17, 2024 11:48:42 PM UTC
- **Commit**: 4603325bdf084367b10d8389aa2be7acac403f44
- **Branch**: refs/heads/internal/release/6.0.4xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.424-servicing.24267.46 to 6.0.424-servicing.24267.59][1]
  - **Microsoft.NET.Sdk**: [from 6.0.424-servicing.24267.46 to 6.0.424-servicing.24267.59][1]
  - **Microsoft.AspNetCore.App.Ref**: [from 6.0.31 to 6.0.31][2]
  - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.31-servicing.24266.4 to 6.0.31-servicing.24267.11][2]
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.31 to 6.0.31][2]
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.31-servicing.24266.4 to 6.0.31-servicing.24267.11][2]
  - **dotnet-dev-certs**: [from 6.0.31-servicing.24266.4 to 6.0.31-servicing.24267.11][2]
  - **dotnet-user-secrets**: [from 6.0.31-servicing.24266.4 to 6.0.31-servicing.24267.11][2]
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.423 to 6.0.424][3]
  - **Microsoft.TemplateEngine.Cli**: [from 6.0.423-rtm.24266.2 to 6.0.424-rtm.24267.26][3]
  - **Microsoft.DotNet.Common...
This commit is contained in:
DotNet Bot 2024-05-18 04:53:37 +00:00 committed by Sean Reeser
parent 1bde71448b
commit 3d3d62c90b
3 changed files with 32 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
NuGet.config
View file

@ -7,7 +7,7 @@
<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-929d26b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-929d26b8/nuget/v3/index.json" />
<add key="darc-int-dotnet-aspnetcore-97a07eb" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-97a07eb6/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-aspnetcore -->
<!-- Begin: Package sources from dotnet-emsdk -->
<!-- End: Package sources from dotnet-emsdk -->
@ -18,7 +18,7 @@
<add key="darc-int-dotnet-runtime-62ae1c7" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-62ae1c7e/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-templating -->
<add key="darc-int-dotnet-templating-899e481" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-899e481c/nuget/v3/index.json" />
<add key="darc-int-dotnet-templating-4b74c65" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-4b74c656/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-templating -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-31992eb" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-31992eb5/nuget/v3/index.json" />
@ -42,13 +42,13 @@
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
<!-- End: Package sources from DotNet-msbuild-Trusted -->
<!-- Begin: Package sources from dotnet-aspnetcore -->
<add key="darc-int-dotnet-aspnetcore-929d26b" value="true" />
<add key="darc-int-dotnet-aspnetcore-97a07eb" value="true" />
<!-- End: Package sources from dotnet-aspnetcore -->
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-62ae1c7" value="true" />
<!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-templating -->
<add key="darc-int-dotnet-templating-899e481" value="true" />
<add key="darc-int-dotnet-templating-4b74c65" value="true" />
<!-- End: Package sources from dotnet-templating -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-31992eb" value="true" />

40
eng/Version.Details.xml
View file

@ -54,28 +54,28 @@
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="6.0.31" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>929d26b875576909aad373373c983c63c65234c0</Sha>
<Sha>97a07eb6358e8a0824bcf2e1f3dbf3fd3a818b7f</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="6.0.31-servicing.24266.4" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="6.0.31-servicing.24267.11" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>929d26b875576909aad373373c983c63c65234c0</Sha>
<Sha>97a07eb6358e8a0824bcf2e1f3dbf3fd3a818b7f</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="6.0.31" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>929d26b875576909aad373373c983c63c65234c0</Sha>
<Sha>97a07eb6358e8a0824bcf2e1f3dbf3fd3a818b7f</Sha>
<SourceBuildTarball RepoName="aspnetcore" ManagedOnly="true" />
</Dependency>
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0" Version="6.0.31-servicing.24266.4" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0" Version="6.0.31-servicing.24267.11" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>929d26b875576909aad373373c983c63c65234c0</Sha>
<Sha>97a07eb6358e8a0824bcf2e1f3dbf3fd3a818b7f</Sha>
</Dependency>
<Dependency Name="dotnet-dev-certs" Version="6.0.31-servicing.24266.4" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="dotnet-dev-certs" Version="6.0.31-servicing.24267.11" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>929d26b875576909aad373373c983c63c65234c0</Sha>
<Sha>97a07eb6358e8a0824bcf2e1f3dbf3fd3a818b7f</Sha>
</Dependency>
<Dependency Name="dotnet-user-secrets" Version="6.0.31-servicing.24266.4" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="dotnet-user-secrets" Version="6.0.31-servicing.24267.11" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>929d26b875576909aad373373c983c63c65234c0</Sha>
<Sha>97a07eb6358e8a0824bcf2e1f3dbf3fd3a818b7f</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.2.1" Version="1.0.2-beta4.22207.1">
<Uri>https://github.com/dotnet/test-templates</Uri>
@ -90,27 +90,27 @@
<Sha>9388790ba9ed8fef11584b2c74fe6789782a1592</Sha>
<SourceBuild RepoName="test-templates" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="6.0.423" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="6.0.424" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
<Sha>899e481c21a53dd5898ece5c211955f46740521e</Sha>
<Sha>4b74c656842f4e70599201b959d683025bf71a7e</Sha>
</Dependency>
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="6.0.423-rtm.24266.2" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="6.0.424-rtm.24267.26" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
<Sha>899e481c21a53dd5898ece5c211955f46740521e</Sha>
<Sha>4b74c656842f4e70599201b959d683025bf71a7e</Sha>
<SourceBuild RepoName="templating" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.Common.ProjectTemplates.6.0" Version="6.0.423" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.DotNet.Common.ProjectTemplates.6.0" Version="6.0.424" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
<Sha>899e481c21a53dd5898ece5c211955f46740521e</Sha>
<Sha>4b74c656842f4e70599201b959d683025bf71a7e</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.424-servicing.24267.46">
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.424-servicing.24267.59">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>8c7ce8b7b86cf1278b2da96d07a6b62f8ceb468f</Sha>
<Sha>4603325bdf084367b10d8389aa2be7acac403f44</Sha>
<SourceBuild RepoName="sdk" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.424-servicing.24267.46">
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.424-servicing.24267.59">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>8c7ce8b7b86cf1278b2da96d07a6b62f8ceb468f</Sha>
<Sha>4603325bdf084367b10d8389aa2be7acac403f44</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.31-servicing.24266.3" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">

16
eng/Versions.props
View file

@ -31,7 +31,7 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/templating -->
<MicrosoftDotNetCommonItemTemplatesPackageVersion>6.0.423</MicrosoftDotNetCommonItemTemplatesPackageVersion>
<MicrosoftDotNetCommonItemTemplatesPackageVersion>6.0.424</MicrosoftDotNetCommonItemTemplatesPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/test-templates -->
@ -45,18 +45,18 @@
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>6.0.31</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
<MicrosoftAspNetCoreAppRefPackageVersion>6.0.31</MicrosoftAspNetCoreAppRefPackageVersion>
<MicrosoftAspNetCoreAppRefInternalPackageVersion>6.0.31-servicing.24266.4</MicrosoftAspNetCoreAppRefInternalPackageVersion>
<VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>6.0.31-servicing.24266.4</VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>
<dotnetdevcertsPackageVersion>6.0.31-servicing.24266.4</dotnetdevcertsPackageVersion>
<dotnetusersecretsPackageVersion>6.0.31-servicing.24266.4</dotnetusersecretsPackageVersion>
<MicrosoftAspNetCoreAppRefInternalPackageVersion>6.0.31-servicing.24267.11</MicrosoftAspNetCoreAppRefInternalPackageVersion>
<VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>6.0.31-servicing.24267.11</VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>
<dotnetdevcertsPackageVersion>6.0.31-servicing.24267.11</dotnetdevcertsPackageVersion>
<dotnetusersecretsPackageVersion>6.0.31-servicing.24267.11</dotnetusersecretsPackageVersion>
</PropertyGroup>
<PropertyGroup>
<MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/sdk -->
<MicrosoftNETSdkPackageVersion>6.0.424-servicing.24267.46</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.424-servicing.24267.46</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETSdkPackageVersion>6.0.424-servicing.24267.59</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.424-servicing.24267.59</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
@ -115,7 +115,7 @@
<MicrosoftDotNetWpfProjectTemplates60PackageVersion>$(MicrosoftDotNetWpfProjectTemplatesPackageVersion)</MicrosoftDotNetWpfProjectTemplates60PackageVersion>
<NUnit3Templates60PackageVersion>$(NUnit3DotNetNewTemplatePackageVersion)</NUnit3Templates60PackageVersion>
<MicrosoftDotNetCommonItemTemplates60PackageVersion>$(MicrosoftDotNetCommonItemTemplatesPackageVersion)</MicrosoftDotNetCommonItemTemplates60PackageVersion>
<MicrosoftDotNetCommonProjectTemplates60PackageVersion>6.0.423</MicrosoftDotNetCommonProjectTemplates60PackageVersion>
<MicrosoftDotNetCommonProjectTemplates60PackageVersion>6.0.424</MicrosoftDotNetCommonProjectTemplates60PackageVersion>
<AspNetCorePackageVersionFor60Templates>$(MicrosoftAspNetCoreAppRuntimePackageVersion)</AspNetCorePackageVersionFor60Templates>
</PropertyGroup>
<!-- infrastructure and test only dependencies -->