From 4687bd22675fd3724e9286ab645c190d7eb31e8d Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 17 Apr 2024 18:38:34 +0000 Subject: [PATCH] Merged PR 39027: [internal/release/7.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 7.0.18 to 7.0.19 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: from 7.0.18-servicing.24170.3 to 7.0.19-servicing.24216.14 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: from 7.0.18-servicing.24170.3 to 7.0.19-servicing.24216.14 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 7.0.18 to 7.0.19 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.7.0**: from 7.0.18-servicing.24169.14 to 7.0.19-servicing.24215.23 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 7.0.18 to 7.0.19 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 7.0.18 to 7.0.19 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 7.0.18 to 7.0.19 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 7.0.18 to 7.0.19 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 7.0.18-servicing.24169.24 to 7.0.19-servicing.24216.12 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 7.0.18 to 7.0.19 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: from 7.0.18-servicing.24169.24 to 7.0.19-servicing.24216.12 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 7.0.18-servicing.24169.24 to 7.0.19-servicing.24216.12 (parent: Microsoft.NET.Sdk) - **dotnet-user-jwts**: from 7.0.18-servicing.24169.24 to 7.0.19-servicing.24216.12 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 7.0.18-servicing.24169.24 to 7.0.19-servicing.24216.12 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.18 to 7.0.19 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 7.0.18-servicing.24169.17 to 7.0.19-servicing.24216.14 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.18 to 7.0.19 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 7.0.18-servicing.24169.14 to 7.0.19-servicing.24216.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: from 7.0.18-servicing.24169.14 to 7.0.19-servicing.24215.23 (parent: Microsoft.NET.Sdk) - **Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100**... --- NuGet.config | 9 ++++ eng/Version.Details.xml | 100 ++++++++++++++++++++-------------------- eng/Versions.props | 48 +++++++++---------- 3 files changed, 83 insertions(+), 74 deletions(-) diff --git a/NuGet.config b/NuGet.config index 9c94cf60c..36614fa43 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,17 +7,22 @@ + + + + + @@ -39,11 +44,15 @@ + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index dbe4eb4cc..342259b02 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - af494c5c30f33cdb12a68420c4d4a7d791b21ed0 + d96741e3c0f3653534ab6d14ff85a7c36e511e36 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - af494c5c30f33cdb12a68420c4d4a7d791b21ed0 + d96741e3c0f3653534ab6d14ff85a7c36e511e36 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - af494c5c30f33cdb12a68420c4d4a7d791b21ed0 + d96741e3c0f3653534ab6d14ff85a7c36e511e36 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - af494c5c30f33cdb12a68420c4d4a7d791b21ed0 + d96741e3c0f3653534ab6d14ff85a7c36e511e36 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 544c7e6eb3d5525c6f85341f51217d81d7c8ed80 + 19f489b8b49b0ffacdffaed17801a6bcb3375c7a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 544c7e6eb3d5525c6f85341f51217d81d7c8ed80 + 19f489b8b49b0ffacdffaed17801a6bcb3375c7a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 544c7e6eb3d5525c6f85341f51217d81d7c8ed80 + 19f489b8b49b0ffacdffaed17801a6bcb3375c7a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 544c7e6eb3d5525c6f85341f51217d81d7c8ed80 + 19f489b8b49b0ffacdffaed17801a6bcb3375c7a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 544c7e6eb3d5525c6f85341f51217d81d7c8ed80 + 19f489b8b49b0ffacdffaed17801a6bcb3375c7a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 544c7e6eb3d5525c6f85341f51217d81d7c8ed80 + 19f489b8b49b0ffacdffaed17801a6bcb3375c7a @@ -52,34 +52,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f050ae044be8bddc002ab88736e4bf78dc822122 + 8edf68fbb682d821ced5523038eb69302834bf51 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f050ae044be8bddc002ab88736e4bf78dc822122 + 8edf68fbb682d821ced5523038eb69302834bf51 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f050ae044be8bddc002ab88736e4bf78dc822122 + 8edf68fbb682d821ced5523038eb69302834bf51 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f050ae044be8bddc002ab88736e4bf78dc822122 + 8edf68fbb682d821ced5523038eb69302834bf51 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f050ae044be8bddc002ab88736e4bf78dc822122 + 8edf68fbb682d821ced5523038eb69302834bf51 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f050ae044be8bddc002ab88736e4bf78dc822122 + 8edf68fbb682d821ced5523038eb69302834bf51 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f050ae044be8bddc002ab88736e4bf78dc822122 + 8edf68fbb682d821ced5523038eb69302834bf51 https://github.com/dotnet/test-templates @@ -98,31 +98,31 @@ aaaa0c1826f97a9dfcc67e94136bf01010b55f23 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - eeb7d754890a0b3f4bf912b566532545a67535fa + fc88a96016c2d1eb56edbf460a6d594e44d2cfb1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - eeb7d754890a0b3f4bf912b566532545a67535fa + fc88a96016c2d1eb56edbf460a6d594e44d2cfb1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - eeb7d754890a0b3f4bf912b566532545a67535fa + fc88a96016c2d1eb56edbf460a6d594e44d2cfb1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - eeb7d754890a0b3f4bf912b566532545a67535fa + fc88a96016c2d1eb56edbf460a6d594e44d2cfb1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 1a5db9acafb5677490e44ad00d91cfff0dc11ddf + 4341239442f0e08e4a230095f6ccc9deeeca9f3c - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 71273b560061b69cef763838282ef085e53a73cb + fec2496fcc461acb4b77037a364677967ac68d9e https://github.com/dotnet/fsharp @@ -163,13 +163,13 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - c7ba18beef256b26d58783c659f083fe194f0e11 + 4f16685fd8c80b4666e6534e29d53e2ba1adeeea - + https://github.com/dotnet/emsdk - c7ba18beef256b26d58783c659f083fe194f0e11 + 4f16685fd8c80b4666e6534e29d53e2ba1adeeea https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index 7549f4037..02ced04a5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.18-servicing.24169.17 + 7.0.19-servicing.24216.14 - 7.0.18-servicing.24169.14 + 7.0.19-servicing.24216.3 @@ -54,22 +54,22 @@ - 7.0.18 - 7.0.18 - 7.0.18-servicing.24169.24 - 7.0.18-servicing.24169.24 - 7.0.18-servicing.24169.24 - 7.0.18-servicing.24169.24 - 7.0.18-servicing.24169.24 + 7.0.19 + 7.0.19 + 7.0.19-servicing.24216.12 + 7.0.19-servicing.24216.12 + 7.0.19-servicing.24216.12 + 7.0.19-servicing.24216.12 + 7.0.19-servicing.24216.12 0.2.0 - 7.0.118 - 7.0.118-servicing.24170.16 - 7.0.118-servicing.24170.16 + 7.0.119 + 7.0.119-servicing.24217.6 + 7.0.119-servicing.24217.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -80,20 +80,20 @@ - 7.0.18-servicing.24169.14 - 7.0.18-servicing.24169.14 - 7.0.18 - 7.0.18 - 7.0.18 - 7.0.18 + 7.0.19-servicing.24215.23 + 7.0.19-servicing.24215.23 + 7.0.19 + 7.0.19 + 7.0.19 + 7.0.19 2.1.0 - 7.0.18-servicing.24170.3 - 7.0.18-servicing.24170.3 - 7.0.18 - 7.0.18 + 7.0.19-servicing.24216.14 + 7.0.19-servicing.24216.14 + 7.0.19 + 7.0.19 @@ -199,8 +199,8 @@ 12.3.2372 16.0.1478 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.18 - 7.0.18 + 7.0.19 + 7.0.19 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version)