From fa2462ce4ee7d7715b27b7280d7639d8b4081654 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 18 Jan 2024 18:23:38 +0000 Subject: [PATCH] Merged PR 36620: [internal/release/7.0.3xx] 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 7.0.16 to 7.0.16 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: from 7.0.16-servicing.24060.13 to 7.0.16-servicing.24061.3 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: from 7.0.16-servicing.24060.13 to 7.0.16-servicing.24061.3 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 7.0.15 to 7.0.16 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.7.0**: from 7.0.15-servicing.23572.26 to 7.0.16-servicing.24066.29 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 7.0.15 to 7.0.16 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 7.0.15 to 7.0.16 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 7.0.15 to 7.0.16 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 7.0.16 to 7.0.16 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 7.0.16-servicing.24061.3 to 7.0.16-servicing.24067.19 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 7.0.16 to 7.0.16 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: from 7.0.16-servicing.24061.3 to 7.0.16-servicing.24067.19 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 7.0.16-servicing.24061.3 to 7.0.16-servicing.24067.19 (parent: Microsoft.NET.Sdk) - **dotnet-user-jwts**: from 7.0.16-servicing.24061.3 to 7.0.16-servicing.24067.19 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 7.0.16-servicing.24061.3 to 7.0.16-servicing.24067.19 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.16 to 7.0.16 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 7.0.15-servicing.23573.3 to 7.0.16-servicing.24060.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.16 to 7.0.16 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 7.0.16-servicing.24060.7 to 7.0.16-servicing.24060.16 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **NuGet.Build.Tasks**: from 6.6.0-rc.66 to 6.6.2-rc.1 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: from 7.0.15-servicing.23572.26 to 7.0.16-servicing.24066.29 (parent: Mic... --- NuGet.config | 24 ++++------- eng/Version.Details.xml | 94 ++++++++++++++++++++--------------------- eng/Versions.props | 38 ++++++++--------- 3 files changed, 75 insertions(+), 81 deletions(-) diff --git a/NuGet.config b/NuGet.config index fb6caa493..6f5b3eb00 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,23 +10,19 @@ - + - - - + - - - + - + - + @@ -48,17 +44,15 @@ - + - - - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 408592dd6..4743d6d1f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,44 +3,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d62704f831ab66265d54c5d09b24a82bff2deac2 + 01e02684374c6bf4541b7507ce041409ae410f63 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d62704f831ab66265d54c5d09b24a82bff2deac2 + 01e02684374c6bf4541b7507ce041409ae410f63 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d62704f831ab66265d54c5d09b24a82bff2deac2 + 01e02684374c6bf4541b7507ce041409ae410f63 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d62704f831ab66265d54c5d09b24a82bff2deac2 + 01e02684374c6bf4541b7507ce041409ae410f63 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8f4568cdaa2f9654fd133a17cd2dcc55b5f42455 + 567edafe6106e6b769c64f6a2ed876190baa642a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8f4568cdaa2f9654fd133a17cd2dcc55b5f42455 + 567edafe6106e6b769c64f6a2ed876190baa642a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8f4568cdaa2f9654fd133a17cd2dcc55b5f42455 + 567edafe6106e6b769c64f6a2ed876190baa642a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8f4568cdaa2f9654fd133a17cd2dcc55b5f42455 + 567edafe6106e6b769c64f6a2ed876190baa642a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8f4568cdaa2f9654fd133a17cd2dcc55b5f42455 + 567edafe6106e6b769c64f6a2ed876190baa642a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8f4568cdaa2f9654fd133a17cd2dcc55b5f42455 + 567edafe6106e6b769c64f6a2ed876190baa642a @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ecd58f375010a7fac5165a1ff584f8e336c9e044 + ba2ce5819947cc6aa7724dbc54201d5c6596de0c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ecd58f375010a7fac5165a1ff584f8e336c9e044 + ba2ce5819947cc6aa7724dbc54201d5c6596de0c https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ecd58f375010a7fac5165a1ff584f8e336c9e044 + ba2ce5819947cc6aa7724dbc54201d5c6596de0c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ecd58f375010a7fac5165a1ff584f8e336c9e044 + ba2ce5819947cc6aa7724dbc54201d5c6596de0c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ecd58f375010a7fac5165a1ff584f8e336c9e044 + ba2ce5819947cc6aa7724dbc54201d5c6596de0c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ecd58f375010a7fac5165a1ff584f8e336c9e044 + ba2ce5819947cc6aa7724dbc54201d5c6596de0c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ecd58f375010a7fac5165a1ff584f8e336c9e044 + ba2ce5819947cc6aa7724dbc54201d5c6596de0c https://github.com/dotnet/test-templates @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 18d8a2987501c4439ddadf2501a80760f4f87de3 + 62ea411d627ffda407db98c1cf655d5a3590b03e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 18d8a2987501c4439ddadf2501a80760f4f87de3 + 62ea411d627ffda407db98c1cf655d5a3590b03e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 18d8a2987501c4439ddadf2501a80760f4f87de3 + 62ea411d627ffda407db98c1cf655d5a3590b03e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 18d8a2987501c4439ddadf2501a80760f4f87de3 + 62ea411d627ffda407db98c1cf655d5a3590b03e - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 1d272c1ef7277b7cc38148300732e6a72848bedc + b7fa724c93e65ac40bef3e8ab05bc1a63f62b0f6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 963a6a55dd6f72f604651fff7c1515dadcd37a39 + b05bc3d0cf33b94b37f8dec5d6b2829d508209eb https://github.com/dotnet/fsharp @@ -158,22 +158,22 @@ 2679cf5a9cbd13e6833ca8a59553716f3f2f2afa - + https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted - a36edf3a2bf891d6aabfc83cc0b21d24a870ea1a + 07cf447d8f8b3d6b9e7bf641ab8ec7de966b1254 https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 33b038b591f6e19c32a390333d41292cbd86d93c + ca510604d1667f32b4fa4653e3d3b64be8136bdc - + https://github.com/dotnet/emsdk - 33b038b591f6e19c32a390333d41292cbd86d93c + ca510604d1667f32b4fa4653e3d3b64be8136bdc https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index e6fe2f142..0d5bcdc87 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.15-servicing.23573.3 + 7.0.16-servicing.24060.7 - 7.0.16-servicing.24060.7 + 7.0.16-servicing.24060.16 @@ -58,11 +58,11 @@ 7.0.16 7.0.16 - 7.0.16-servicing.24061.3 - 7.0.16-servicing.24061.3 - 7.0.16-servicing.24061.3 - 7.0.16-servicing.24061.3 - 7.0.16-servicing.24061.3 + 7.0.16-servicing.24067.19 + 7.0.16-servicing.24067.19 + 7.0.16-servicing.24067.19 + 7.0.16-servicing.24067.19 + 7.0.16-servicing.24067.19 0.2.0 @@ -70,8 +70,8 @@ 7.0.313 - 7.0.313-servicing.24061.13 - 7.0.313-servicing.24061.13 + 7.0.313-servicing.24068.18 + 7.0.313-servicing.24068.18 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -86,18 +86,18 @@ - 7.0.15-servicing.23572.26 - 7.0.15-servicing.23572.26 - 7.0.15 - 7.0.15 - 7.0.15 - 7.0.15 + 7.0.16-servicing.24066.29 + 7.0.16-servicing.24066.29 + 7.0.16 + 7.0.16 + 7.0.16 + 7.0.16 2.1.0 - 7.0.16-servicing.24060.13 - 7.0.16-servicing.24060.13 + 7.0.16-servicing.24061.3 + 7.0.16-servicing.24061.3 7.0.16 7.0.16 @@ -231,8 +231,8 @@ 12.3.2372 16.0.1478 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.15 - 7.0.15 + 7.0.16 + 7.0.16 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version)