Skip to content

Commit 48ad8f7

Browse files
maestro-prod-Primaryvseanreesermsft
maestro-prod-Primary
authored and
vseanreesermsft
committed
Merged PR 41389: [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.AspNetCore.App.Ref**: from 6.0.33 to 6.0.33 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.33-servicing.24368.7 to 6.0.33-servicing.24379.5 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.33 to 6.0.33 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.33-servicing.24368.7 to 6.0.33-servicing.24379.5 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.33-servicing.24368.7 to 6.0.33-servicing.24379.5 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.33-servicing.24368.7 to 6.0.33-servicing.24379.5 (parent: Microsoft.NET.Sdk) [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**: 20240729.12 - **Date Produced**: July 29, 2024 7:41:21 PM UTC - **Commit**: 902d4b651242b37d952aedd9ef8b17b9ed766d09 - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.133-servicing.24368.8 to 6.0.133-servicing.24379.12][1] - **Microsoft.NET.Sdk**: [from 6.0.133-servicing.24368.8 to 6.0.133-servicing.24379.12][1] - **Microsoft.AspNetCore.App.Ref**: [from 6.0.33 to 6.0.33][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.33-servicing.24368.7 to 6.0.33-servicing.24379.5][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.33 to 6.0.33][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.33-servicing.24368.7 to 6.0.33-servicing.24379.5][2] - **dotnet-dev-certs**: [from 6.0.33-servicing.24368.7 to 6.0.33-servicing.24379.5][2] - **dotnet-user-secrets**: [from 6.0.33-servicing.24368.7 to 6.0.33-servicing.24379.5][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC34c71e50bca16f1c356033a42e364578c6c6a7dc&targetVersion=GC902d4b651242b37d952aedd9ef8b17b9ed766d09&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GCd917e14cc49f16d7190195501fd43fa4835d274f&targetVersion=GCf0f9de5692adf1c0576de062f93c6ab7b176433f&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a68e208b-7b40-4a19-af8d-08d961c59698)
1 parent 7cc7550 commit 48ad8f7

File tree

3 files changed

+37
-22
lines changed

3 files changed

+37
-22
lines changed

‎NuGet.config

+17-2
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,13 @@
77
<clear />
88
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
99
<!-- Begin: Package sources from dotnet-aspnetcore -->
10-
<add key="darc-int-dotnet-aspnetcore-d917e14" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-d917e14c/nuget/v3/index.json" />
10+
<add key="darc-int-dotnet-aspnetcore-f0f9de5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-f0f9de56/nuget/v3/index.json" />
1111
<!-- End: Package sources from dotnet-aspnetcore -->
1212
<!-- Begin: Package sources from dotnet-emsdk -->
1313
<add key="darc-pub-dotnet-emsdk-849e1a6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-849e1a63/nuget/v3/index.json" />
14+
<add key="darc-pub-dotnet-emsdk-849e1a6-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-849e1a63-3/nuget/v3/index.json" />
15+
<add key="darc-pub-dotnet-emsdk-849e1a6-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-849e1a63-2/nuget/v3/index.json" />
16+
<add key="darc-pub-dotnet-emsdk-849e1a6-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-849e1a63-1/nuget/v3/index.json" />
1417
<!-- End: Package sources from dotnet-emsdk -->
1518
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
1619
<add key="darc-pub-DotNet-msbuild-Trusted-d679d20" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-d679d209/nuget/v3/index.json" />
@@ -20,9 +23,15 @@
2023
<!-- End: Package sources from dotnet-runtime -->
2124
<!-- Begin: Package sources from dotnet-templating -->
2225
<add key="darc-int-dotnet-templating-2fdb78d" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-2fdb78d3/nuget/v3/index.json" />
26+
<add key="darc-int-dotnet-templating-2fdb78d-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-2fdb78d3-3/nuget/v3/index.json" />
27+
<add key="darc-int-dotnet-templating-2fdb78d-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-2fdb78d3-2/nuget/v3/index.json" />
28+
<add key="darc-int-dotnet-templating-2fdb78d-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-2fdb78d3-1/nuget/v3/index.json" />
2329
<!-- End: Package sources from dotnet-templating -->
2430
<!-- Begin: Package sources from dotnet-windowsdesktop -->
2531
<add key="darc-int-dotnet-windowsdesktop-db4e5a3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-db4e5a36/nuget/v3/index.json" />
32+
<add key="darc-int-dotnet-windowsdesktop-db4e5a3-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-db4e5a36-3/nuget/v3/index.json" />
33+
<add key="darc-int-dotnet-windowsdesktop-db4e5a3-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-db4e5a36-2/nuget/v3/index.json" />
34+
<add key="darc-int-dotnet-windowsdesktop-db4e5a3-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-db4e5a36-1/nuget/v3/index.json" />
2635
<!-- End: Package sources from dotnet-windowsdesktop -->
2736
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
2837
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
@@ -43,16 +52,22 @@
4352
<disabledPackageSources>
4453
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
4554
<!-- Begin: Package sources from dotnet-aspnetcore -->
46-
<add key="darc-int-dotnet-aspnetcore-d917e14" value="true" />
55+
<add key="darc-int-dotnet-aspnetcore-f0f9de5" value="true" />
4756
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
4857
<!-- End: Package sources from DotNet-msbuild-Trusted -->
4958
<!-- End: Package sources from dotnet-aspnetcore -->
5059
<!-- Begin: Package sources from dotnet-runtime -->
5160
<add key="darc-int-dotnet-runtime-6c63698" value="true" />
5261
<!-- Begin: Package sources from dotnet-templating -->
62+
<add key="darc-int-dotnet-templating-2fdb78d-1" value="true" />
63+
<add key="darc-int-dotnet-templating-2fdb78d-2" value="true" />
64+
<add key="darc-int-dotnet-templating-2fdb78d-3" value="true" />
5365
<add key="darc-int-dotnet-templating-2fdb78d" value="true" />
5466
<!-- End: Package sources from dotnet-templating -->
5567
<!-- Begin: Package sources from dotnet-windowsdesktop -->
68+
<add key="darc-int-dotnet-windowsdesktop-db4e5a3-1" value="true" />
69+
<add key="darc-int-dotnet-windowsdesktop-db4e5a3-2" value="true" />
70+
<add key="darc-int-dotnet-windowsdesktop-db4e5a3-3" value="true" />
5671
<add key="darc-int-dotnet-windowsdesktop-db4e5a3" value="true" />
5772
<!-- End: Package sources from dotnet-windowsdesktop -->
5873
<!-- End: Package sources from dotnet-runtime -->

‎eng/Version.Details.xml

+14-14
Original file line numberDiff line numberDiff line change
@@ -54,28 +54,28 @@
5454
</Dependency>
5555
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="6.0.33" CoherentParentDependency="Microsoft.NET.Sdk">
5656
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
57-
<Sha>d917e14cc49f16d7190195501fd43fa4835d274f</Sha>
57+
<Sha>f0f9de5692adf1c0576de062f93c6ab7b176433f</Sha>
5858
</Dependency>
59-
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="6.0.33-servicing.24368.7" CoherentParentDependency="Microsoft.NET.Sdk">
59+
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="6.0.33-servicing.24379.5" CoherentParentDependency="Microsoft.NET.Sdk">
6060
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
61-
<Sha>d917e14cc49f16d7190195501fd43fa4835d274f</Sha>
61+
<Sha>f0f9de5692adf1c0576de062f93c6ab7b176433f</Sha>
6262
</Dependency>
6363
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="6.0.33" CoherentParentDependency="Microsoft.NET.Sdk">
6464
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
65-
<Sha>d917e14cc49f16d7190195501fd43fa4835d274f</Sha>
65+
<Sha>f0f9de5692adf1c0576de062f93c6ab7b176433f</Sha>
6666
<SourceBuildTarball RepoName="aspnetcore" ManagedOnly="true" />
6767
</Dependency>
68-
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0" Version="6.0.33-servicing.24368.7" CoherentParentDependency="Microsoft.NET.Sdk">
68+
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0" Version="6.0.33-servicing.24379.5" CoherentParentDependency="Microsoft.NET.Sdk">
6969
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
70-
<Sha>d917e14cc49f16d7190195501fd43fa4835d274f</Sha>
70+
<Sha>f0f9de5692adf1c0576de062f93c6ab7b176433f</Sha>
7171
</Dependency>
72-
<Dependency Name="dotnet-dev-certs" Version="6.0.33-servicing.24368.7" CoherentParentDependency="Microsoft.NET.Sdk">
72+
<Dependency Name="dotnet-dev-certs" Version="6.0.33-servicing.24379.5" CoherentParentDependency="Microsoft.NET.Sdk">
7373
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
74-
<Sha>d917e14cc49f16d7190195501fd43fa4835d274f</Sha>
74+
<Sha>f0f9de5692adf1c0576de062f93c6ab7b176433f</Sha>
7575
</Dependency>
76-
<Dependency Name="dotnet-user-secrets" Version="6.0.33-servicing.24368.7" CoherentParentDependency="Microsoft.NET.Sdk">
76+
<Dependency Name="dotnet-user-secrets" Version="6.0.33-servicing.24379.5" CoherentParentDependency="Microsoft.NET.Sdk">
7777
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
78-
<Sha>d917e14cc49f16d7190195501fd43fa4835d274f</Sha>
78+
<Sha>f0f9de5692adf1c0576de062f93c6ab7b176433f</Sha>
7979
</Dependency>
8080
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.2.1" Version="1.0.2-beta4.22064.3">
8181
<Uri>https://github.com/dotnet/test-templates</Uri>
@@ -103,14 +103,14 @@
103103
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
104104
<Sha>2fdb78d36dc993a532bd80ee2682a2b534497413</Sha>
105105
</Dependency>
106-
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.133-servicing.24368.8">
106+
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.133-servicing.24379.12">
107107
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
108-
<Sha>34c71e50bca16f1c356033a42e364578c6c6a7dc</Sha>
108+
<Sha>902d4b651242b37d952aedd9ef8b17b9ed766d09</Sha>
109109
<SourceBuild RepoName="sdk" ManagedOnly="true" />
110110
</Dependency>
111-
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.133-servicing.24368.8">
111+
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.133-servicing.24379.12">
112112
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
113-
<Sha>34c71e50bca16f1c356033a42e364578c6c6a7dc</Sha>
113+
<Sha>902d4b651242b37d952aedd9ef8b17b9ed766d09</Sha>
114114
</Dependency>
115115
<!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via windowsdesktop -->
116116
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.33-servicing.24366.4" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">

‎eng/Versions.props

+6-6
Original file line numberDiff line numberDiff line change
@@ -45,18 +45,18 @@
4545
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
4646
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>6.0.33</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
4747
<MicrosoftAspNetCoreAppRefPackageVersion>6.0.33</MicrosoftAspNetCoreAppRefPackageVersion>
48-
<MicrosoftAspNetCoreAppRefInternalPackageVersion>6.0.33-servicing.24368.7</MicrosoftAspNetCoreAppRefInternalPackageVersion>
49-
<VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>6.0.33-servicing.24368.7</VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>
50-
<dotnetdevcertsPackageVersion>6.0.33-servicing.24368.7</dotnetdevcertsPackageVersion>
51-
<dotnetusersecretsPackageVersion>6.0.33-servicing.24368.7</dotnetusersecretsPackageVersion>
48+
<MicrosoftAspNetCoreAppRefInternalPackageVersion>6.0.33-servicing.24379.5</MicrosoftAspNetCoreAppRefInternalPackageVersion>
49+
<VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>6.0.33-servicing.24379.5</VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>
50+
<dotnetdevcertsPackageVersion>6.0.33-servicing.24379.5</dotnetdevcertsPackageVersion>
51+
<dotnetusersecretsPackageVersion>6.0.33-servicing.24379.5</dotnetusersecretsPackageVersion>
5252
</PropertyGroup>
5353
<PropertyGroup>
5454
<MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>
5555
</PropertyGroup>
5656
<PropertyGroup>
5757
<!-- Dependencies from https://github.com/dotnet/sdk -->
58-
<MicrosoftNETSdkPackageVersion>6.0.133-servicing.24368.8</MicrosoftNETSdkPackageVersion>
59-
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.133-servicing.24368.8</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
58+
<MicrosoftNETSdkPackageVersion>6.0.133-servicing.24379.12</MicrosoftNETSdkPackageVersion>
59+
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.133-servicing.24379.12</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
6060
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
6161
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
6262
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>

0 commit comments

Comments
 (0)