Skip to content

Commit

Permalink
Merged PR 34750: [internal/release/6.0.3xx] Update dependencies from …
Browse files Browse the repository at this point in the history 
…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.AspNetCore.App.Ref**: from 6.0.25 to 6.0.25 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.25-servicing.23519.17 to 6.0.25-servicing.23523.15 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.25 to 6.0.25 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.25-servicing.23519.17 to 6.0.25-servicing.23523.15 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 6.0.25-servicing.23519.17 to 6.0.25-servicing.23523.15 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 6.0.25-servicing.23519.17 to 6.0.25-servicing.23523.15 (parent: Microsoft.NET.Sdk)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:b5bca336-8d99-407e-c145-08d9d60066b9)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: b5bca336-8d99-407e-c145-08d9d60066b9
- **Build**: 20231023.40
- **Date Produced**: October 24, 2023 1:49:41 AM UTC
- **Commit**: 733590df6146364699e0d3d8d465f2f8da15b063
- **Branch**: refs/heads/internal/release/6.0.3xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.320-servicing.23520.20 to 6.0.320-servicing.23523.40][1]
  - **Microsoft.NET.Sdk**: [from 6.0.320-servicing.23520.20 to 6.0.320-servicing.23523.40][1]
  - **Microsoft.AspNetCore.App.Ref**: [from 6.0.25 to 6.0.25][2]
  - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.25-servicing.23519.17 to 6.0.25-servicing.23523.15][2]
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.25 to 6.0.25][2]
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.25-servicing.23519.17 to 6.0.25-servicing.23523.15][2]
  - **dotnet-dev-certs**: [from 6.0.25-servicing.23519.17 to 6.0.25-servicing.23523.15][2]
  - **dotnet-user-secrets**: [from 6.0.25-servicing.23519.17 to 6.0.25-servicing.23523.15][2]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCaba9c2c28f&targetVersion=GC733590df61&_a=files
[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GCad15e08a98&targetVersion=GC36be7ed6d6&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:b5bca336-8d99-407e-c145-08d9d60066b9)
  • Loading branch information
@dotnet-bot @vseanreesermsft
dotnet-bot authored and vseanreesermsft committed Oct 24, 2023
2 parents 88dc8ae + 763e59b commit 5c25dde
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 22 deletions.
4 changes: 2 additions & 2 deletions NuGet.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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-ad15e08" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-ad15e08a/nuget/v3/index.json" />
<add key="darc-int-dotnet-aspnetcore-36be7ed" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-36be7ed6/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-aspnetcore -->
<!-- Begin: Package sources from dotnet-emsdk -->
<!-- End: Package sources from dotnet-emsdk -->
Expand Down Expand Up @@ -41,7 +41,7 @@
<!-- 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-ad15e08" value="true" />
<add key="darc-int-dotnet-aspnetcore-36be7ed" value="true" />
<!-- End: Package sources from dotnet-aspnetcore -->
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-492abbe" value="true" />
Expand Down
28 changes: 14 additions & 14 deletions eng/Version.Details.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,28 +54,28 @@
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="6.0.25" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>ad15e08a98e1d3697d4577631c6ffc1bfb07e904</Sha>
<Sha>36be7ed6d6d56b7da0a2891e3de7ecc2aa48eecd</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="6.0.25-servicing.23519.17" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="6.0.25-servicing.23523.15" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>ad15e08a98e1d3697d4577631c6ffc1bfb07e904</Sha>
<Sha>36be7ed6d6d56b7da0a2891e3de7ecc2aa48eecd</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="6.0.25" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>ad15e08a98e1d3697d4577631c6ffc1bfb07e904</Sha>
<Sha>36be7ed6d6d56b7da0a2891e3de7ecc2aa48eecd</Sha>
<SourceBuildTarball RepoName="aspnetcore" ManagedOnly="true" />
</Dependency>
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0" Version="6.0.25-servicing.23519.17" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0" Version="6.0.25-servicing.23523.15" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>ad15e08a98e1d3697d4577631c6ffc1bfb07e904</Sha>
<Sha>36be7ed6d6d56b7da0a2891e3de7ecc2aa48eecd</Sha>
</Dependency>
<Dependency Name="dotnet-dev-certs" Version="6.0.25-servicing.23519.17" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="dotnet-dev-certs" Version="6.0.25-servicing.23523.15" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>ad15e08a98e1d3697d4577631c6ffc1bfb07e904</Sha>
<Sha>36be7ed6d6d56b7da0a2891e3de7ecc2aa48eecd</Sha>
</Dependency>
<Dependency Name="dotnet-user-secrets" Version="6.0.25-servicing.23519.17" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="dotnet-user-secrets" Version="6.0.25-servicing.23523.15" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>ad15e08a98e1d3697d4577631c6ffc1bfb07e904</Sha>
<Sha>36be7ed6d6d56b7da0a2891e3de7ecc2aa48eecd</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>
Expand Down Expand Up @@ -103,14 +103,14 @@
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
<Sha>6e525a642fe66413e4edf553f5bbc73ea5c866e5</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.320-servicing.23520.20">
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.320-servicing.23523.40">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>aba9c2c28f7e7827da7f757669e823b3c3dc831c</Sha>
<Sha>733590df6146364699e0d3d8d465f2f8da15b063</Sha>
<SourceBuild RepoName="sdk" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.320-servicing.23520.20">
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.320-servicing.23523.40">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>aba9c2c28f7e7827da7f757669e823b3c3dc831c</Sha>
<Sha>733590df6146364699e0d3d8d465f2f8da15b063</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.25-servicing.23519.16" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
Expand Down
12 changes: 6 additions & 6 deletions eng/Versions.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,18 +46,18 @@
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>6.0.25</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
<MicrosoftAspNetCoreAppRefPackageVersion>6.0.25</MicrosoftAspNetCoreAppRefPackageVersion>
<MicrosoftAspNetCoreAppRefInternalPackageVersion>6.0.25-servicing.23519.17</MicrosoftAspNetCoreAppRefInternalPackageVersion>
<VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>6.0.25-servicing.23519.17</VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>
<dotnetdevcertsPackageVersion>6.0.25-servicing.23519.17</dotnetdevcertsPackageVersion>
<dotnetusersecretsPackageVersion>6.0.25-servicing.23519.17</dotnetusersecretsPackageVersion>
<MicrosoftAspNetCoreAppRefInternalPackageVersion>6.0.25-servicing.23523.15</MicrosoftAspNetCoreAppRefInternalPackageVersion>
<VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>6.0.25-servicing.23523.15</VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>
<dotnetdevcertsPackageVersion>6.0.25-servicing.23523.15</dotnetdevcertsPackageVersion>
<dotnetusersecretsPackageVersion>6.0.25-servicing.23523.15</dotnetusersecretsPackageVersion>
</PropertyGroup>
<PropertyGroup>
<MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/sdk -->
<MicrosoftNETSdkPackageVersion>6.0.320-servicing.23520.20</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.320-servicing.23520.20</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETSdkPackageVersion>6.0.320-servicing.23523.40</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.320-servicing.23523.40</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
Expand Down

0 comments on commit 5c25dde

Please sign in to comment.