From 54b2376d9c13a8a93d5d2635b9b8e7d69b94d01d Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 22 Mar 2024 00:59:50 +0000 Subject: [PATCH] Merged PR 38440: [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.NETCore.App.Ref**: from 6.0.29 to 6.0.29 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.29-servicing.24169.13 to 6.0.29-servicing.24171.5 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.29 to 6.0.29 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.29 to 6.0.29 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.29 to 6.0.29 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 6.0.13 to 6.0.13 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.29 to 6.0.29 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.29-servicing.24169.21 to 6.0.29-servicing.24171.8 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.29 to 6.0.29 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.29-servicing.24169.21 to 6.0.29-servicing.24171.8 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.29-servicing.24169.21 to 6.0.29-servicing.24171.8 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.29-servicing.24169.21 to 6.0.29-servicing.24171.8 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.29-servicing.24169.13 to 6.0.29-servicing.24171.5 (parent: Microsoft.NET.Sdk) - **Microsoft.NET.Workload.Emscripten.Manifest-6.0.100**: from 6.0.28 to 6.0.29 (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**: - **Date Produced**: March 21, 2024 10:02:31 PM UTC - **Commit**: 1e23809f0f06f412276e6caaa012a8d7dddd1c73 - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.129-servicing.24170.2 to 6.0.129-servicing.24171.8][1] - **Microsoft.NET.Sdk**: [from 6.0.129-servicing.24170.2 to 6.0.129-servicing.24171.8][1] - **Microsoft.NETCore.App.Ref**: [from 6.0.29 to 6.0.29][2] - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: [from 6.0.29-servicing.24169.13 to 6.0.29-servicing.24171.5][2] - **Microsoft.NETCor... --- NuGet.config | 9 ++++---- eng/Version.Details.xml | 50 ++++++++++++++++++++--------------------- eng/Versions.props | 18 +++++++-------- 3 files changed, 39 insertions(+), 38 deletions(-) diff --git a/NuGet.config b/NuGet.config index 11ca5be80..6e7165984 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,14 +7,15 @@ - + + - + @@ -41,12 +42,12 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 88cfe14cf..75cc6c555 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 0692302e909ffbc02bca94378eab9213ba3f4455 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c95b68327d40062beb0c9d4cd08295a85d86bd27 + 189fbbd88d97dd6d65515ba2da05b62eab4e5039 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c95b68327d40062beb0c9d4cd08295a85d86bd27 + 189fbbd88d97dd6d65515ba2da05b62eab4e5039 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c95b68327d40062beb0c9d4cd08295a85d86bd27 + 189fbbd88d97dd6d65515ba2da05b62eab4e5039 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c95b68327d40062beb0c9d4cd08295a85d86bd27 + 189fbbd88d97dd6d65515ba2da05b62eab4e5039 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c95b68327d40062beb0c9d4cd08295a85d86bd27 + 189fbbd88d97dd6d65515ba2da05b62eab4e5039 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c95b68327d40062beb0c9d4cd08295a85d86bd27 + 189fbbd88d97dd6d65515ba2da05b62eab4e5039 @@ -50,32 +50,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c95b68327d40062beb0c9d4cd08295a85d86bd27 + 189fbbd88d97dd6d65515ba2da05b62eab4e5039 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e0bcc9da178ac3c235551a85992064889c82b52e + c83354d42e63d2bb07e6b24b7c67ef91e434f359 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e0bcc9da178ac3c235551a85992064889c82b52e + c83354d42e63d2bb07e6b24b7c67ef91e434f359 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e0bcc9da178ac3c235551a85992064889c82b52e + c83354d42e63d2bb07e6b24b7c67ef91e434f359 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e0bcc9da178ac3c235551a85992064889c82b52e + c83354d42e63d2bb07e6b24b7c67ef91e434f359 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e0bcc9da178ac3c235551a85992064889c82b52e + c83354d42e63d2bb07e6b24b7c67ef91e434f359 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e0bcc9da178ac3c235551a85992064889c82b52e + c83354d42e63d2bb07e6b24b7c67ef91e434f359 https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating eeb3cfb682dcc33df2c90a25677ce26d4a7d57c7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6eebf20617894911baf34f5e049bc58d6442ef61 + 1e23809f0f06f412276e6caaa012a8d7dddd1c73 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6eebf20617894911baf34f5e049bc58d6442ef61 + 1e23809f0f06f412276e6caaa012a8d7dddd1c73 @@ -166,9 +166,9 @@ 698fdad58fa64a55f16cd9562c90224cc498ed02 - + https://github.com/dotnet/emsdk - bc697dd84500aeee0bcb6323e64967222f90c2aa + 5a6205aabc468d65922f79266532e0eea9ca97ec https://github.com/dotnet/source-build diff --git a/eng/Versions.props b/eng/Versions.props index f6d094684..cc9a07376 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.29 6.0.29 - 6.0.29-servicing.24169.21 - 6.0.29-servicing.24169.21 - 6.0.29-servicing.24169.21 - 6.0.29-servicing.24169.21 + 6.0.29-servicing.24171.8 + 6.0.29-servicing.24171.8 + 6.0.29-servicing.24171.8 + 6.0.29-servicing.24171.8 0.2.0 - 6.0.129-servicing.24170.2 - 6.0.129-servicing.24170.2 + 6.0.129-servicing.24171.8 + 6.0.129-servicing.24171.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.29-servicing.24169.13 - 6.0.29-servicing.24169.13 + 6.0.29-servicing.24171.5 + 6.0.29-servicing.24171.5 6.0.29 6.0.29 6.0.29 @@ -193,7 +193,7 @@ 12.0.101-preview.9.31 15.0.101-preview.9.31 $(MicrosoftNETCoreAppRefPackageVersion) - 6.0.28 + 6.0.29 $(MicrosoftNETWorkloadEmscriptenManifest60100Version)