From 0f22c8fd4bb79262800187ce9a10aae0ea505b78 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 1 Nov 2023 12:45:07 +0000 Subject: [PATCH] Merged PR 34979: [internal/release/8.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 8.0.0 to 8.0.0 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0**: from 8.0.0-rtm.23531.3 to 8.0.0-rtm.23551.1 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0**: from 8.0.0-rtm.23531.3 to 8.0.0-rtm.23551.1 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 8.0.0 to 8.0.0 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 8.0.0-rtm.23531.1 to 8.0.0-rtm.23531.12 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 8.0.0 to 8.0.0 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0**: from 8.0.0-rtm.23531.1 to 8.0.0-rtm.23531.12 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 8.0.0-rtm.23531.1 to 8.0.0-rtm.23531.12 (parent: Microsoft.NET.Sdk) - **dotnet-user-jwts**: from 8.0.0-rtm.23531.1 to 8.0.0-rtm.23531.12 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 8.0.0-rtm.23531.1 to 8.0.0-rtm.23531.12 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 8.0.0 to 8.0.0 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 8.0.0-rtm.23531.1 to 8.0.0-rtm.23531.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 8.0.0 to 8.0.0 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 8.0.0-rtm.23531.2 to 8.0.0-rtm.23531.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:5d2948e4-7f4b-4c9a-54a4-08dbd5a5c4be) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 5d2948e4-7f4b-4c9a-54a4-08dbd5a5c4be - **Build**: 20231101.6 - **Date Produced**: November 1, 2023 11:48:28 AM UTC - **Commit**: e9d13cbe7e8c1d52ce276a8655f52a87e1017c46 - **Branch**: refs/heads/internal/release/8.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 8.0.100 to 8.0.100][9] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 8.0.100-rtm.23531.25 to 8.0.100-rtm.23551.6][9] - **Microsoft.NET.Sdk**: [from 8.0.100-rtm.23531.25 to 8.0.100-rtm.23551.6][9] - **Microsoft.TemplateEngine.Cli**: [from 8.0.100-rtm.23531.25 to 8.0.100-rtm.23551.6][9] - **Microsoft.WindowsD... --- NuGet.config | 12 ++++----- eng/Version.Details.xml | 58 ++++++++++++++++++++--------------------- eng/Versions.props | 22 ++++++++-------- 3 files changed, 46 insertions(+), 46 deletions(-) diff --git a/NuGet.config b/NuGet.config index b52179d7f..fb4bef099 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,7 +10,7 @@ - + @@ -19,10 +19,10 @@ - + - + @@ -43,15 +43,15 @@ - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index edaa4c219..db87639b4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -7,19 +7,19 @@ --> https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a153f4ef85bc898976dd3adcd10d7a97a61e296a + c0170915ed6c164a594cd9d558d44aaf98fc6961 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a153f4ef85bc898976dd3adcd10d7a97a61e296a + c0170915ed6c164a594cd9d558d44aaf98fc6961 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a153f4ef85bc898976dd3adcd10d7a97a61e296a + c0170915ed6c164a594cd9d558d44aaf98fc6961 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a153f4ef85bc898976dd3adcd10d7a97a61e296a + c0170915ed6c164a594cd9d558d44aaf98fc6961 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -58,49 +58,49 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c26c6ca0d01de61399517a98cdd0517c91e6f805 + 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c26c6ca0d01de61399517a98cdd0517c91e6f805 + 3f1acb59718cadf111a0a796681e3d3509bb3381 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c26c6ca0d01de61399517a98cdd0517c91e6f805 + 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c26c6ca0d01de61399517a98cdd0517c91e6f805 + 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c26c6ca0d01de61399517a98cdd0517c91e6f805 + 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c26c6ca0d01de61399517a98cdd0517c91e6f805 + 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c26c6ca0d01de61399517a98cdd0517c91e6f805 + 3f1acb59718cadf111a0a796681e3d3509bb3381 https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - cf8671d9b9f3f42c9c546a29d45eb43f8a380e13 + e9d13cbe7e8c1d52ce276a8655f52a87e1017c46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - cf8671d9b9f3f42c9c546a29d45eb43f8a380e13 + e9d13cbe7e8c1d52ce276a8655f52a87e1017c46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - cf8671d9b9f3f42c9c546a29d45eb43f8a380e13 + e9d13cbe7e8c1d52ce276a8655f52a87e1017c46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - cf8671d9b9f3f42c9c546a29d45eb43f8a380e13 + e9d13cbe7e8c1d52ce276a8655f52a87e1017c46 https://github.com/dotnet/test-templates @@ -124,13 +124,13 @@ 1e5f3603af2277910aad946736ee23283e7f3e16 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 88d8522de318730859437bb17c116bb0ed015f5e + e4ede9b8979b9d2b1b1d4383f30a791414f0625b - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - a713d39da10c1a548c70e9024c180f0c1785f881 + 239f8da8fbf8cf2a6cd0c793f0d02679bf4ccf6a https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 8ee258095..02162e19f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,11 +48,11 @@ - 8.0.0-rtm.23531.1 + 8.0.0-rtm.23531.5 - 8.0.0-rtm.23531.2 + 8.0.0-rtm.23531.4 @@ -74,11 +74,11 @@ 8.0.0 8.0.0 - 8.0.0-rtm.23531.1 - 8.0.0-rtm.23531.1 - 8.0.0-rtm.23531.1 - 8.0.0-rtm.23531.1 - 8.0.0-rtm.23531.1 + 8.0.0-rtm.23531.12 + 8.0.0-rtm.23531.12 + 8.0.0-rtm.23531.12 + 8.0.0-rtm.23531.12 + 8.0.0-rtm.23531.12 0.2.0 @@ -86,8 +86,8 @@ 8.0.100 - 8.0.100-rtm.23531.25 - 8.0.100-rtm.23531.25 + 8.0.100-rtm.23551.6 + 8.0.100-rtm.23551.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -112,8 +112,8 @@ - 8.0.0-rtm.23531.3 - 8.0.0-rtm.23531.3 + 8.0.0-rtm.23551.1 + 8.0.0-rtm.23551.1 8.0.0 8.0.0