From 4bbdd14480a177e60fba52abf34829020449e46e Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 7 Dec 2022 13:33:06 +0000 Subject: [PATCH] Merged PR 28258: [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.2 to 7.0.2 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: from 7.0.2-servicing.22601.5 to 7.0.2-servicing.22607.1 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: from 7.0.2-servicing.22601.5 to 7.0.2-servicing.22607.1 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 7.0.2 to 7.0.2 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 7.0.2-servicing.22601.8 to 7.0.2-servicing.22606.6 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 7.0.2 to 7.0.2 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: from 7.0.2-servicing.22601.8 to 7.0.2-servicing.22606.6 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 7.0.2-servicing.22601.8 to 7.0.2-servicing.22606.6 (parent: Microsoft.NET.Sdk) - **dotnet-user-jwts**: from 7.0.2-servicing.22601.8 to 7.0.2-servicing.22606.6 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 7.0.2-servicing.22601.8 to 7.0.2-servicing.22606.6 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.2 to 7.0.2 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 7.0.2-servicing.22601.2 to 7.0.2-servicing.22606.8 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.2 to 7.0.2 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 7.0.2-servicing.22601.4 to 7.0.2-servicing.22606.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:65272799-fe4d-4dbf-f0fe-08da7ef63651) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 65272799-fe4d-4dbf-f0fe-08da7ef63651 - **Build**: 20221207.4 - **Date Produced**: December 7, 2022 11:26:11 AM UTC - **Commit**: 98720693e228934405de152651b2e21390c3bfec - **Branch**: refs/heads/internal/release/7.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.102 to 7.0.102][3] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.102-servicing.22606.15 to 7.0.102-servicing.22607.4][3] - **Microsoft.NET.Sdk**: [from 7.0.102-servicing.22606.15 to 7.0.102-servicing.22607.4][... --- NuGet.config | 16 +++++------- eng/Version.Details.xml | 58 ++++++++++++++++++++--------------------- eng/Versions.props | 22 ++++++++-------- 3 files changed, 46 insertions(+), 50 deletions(-) diff --git a/NuGet.config b/NuGet.config index c23041c1f..8ca01d0f3 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,8 +7,7 @@ - - + @@ -21,11 +20,10 @@ - + - - + @@ -47,17 +45,15 @@ - - + - + - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b5e5e6fdd..bfaed85d5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 44aec6b7b3cb8f9da36688105159af845cd85f20 + f51697b054c6691ed59209ef8524013d44bb449c - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 44aec6b7b3cb8f9da36688105159af845cd85f20 + f51697b054c6691ed59209ef8524013d44bb449c - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 44aec6b7b3cb8f9da36688105159af845cd85f20 + f51697b054c6691ed59209ef8524013d44bb449c https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 44aec6b7b3cb8f9da36688105159af845cd85f20 + f51697b054c6691ed59209ef8524013d44bb449c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - da13e9c5156ab1955e8364f26f2d1f3abb245bed + 7c810658463f35c39c54d5fb8a8dbbfd463bf747 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - da13e9c5156ab1955e8364f26f2d1f3abb245bed + 7c810658463f35c39c54d5fb8a8dbbfd463bf747 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - da13e9c5156ab1955e8364f26f2d1f3abb245bed + 7c810658463f35c39c54d5fb8a8dbbfd463bf747 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - da13e9c5156ab1955e8364f26f2d1f3abb245bed + 7c810658463f35c39c54d5fb8a8dbbfd463bf747 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - da13e9c5156ab1955e8364f26f2d1f3abb245bed + 7c810658463f35c39c54d5fb8a8dbbfd463bf747 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - da13e9c5156ab1955e8364f26f2d1f3abb245bed + 7c810658463f35c39c54d5fb8a8dbbfd463bf747 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - da13e9c5156ab1955e8364f26f2d1f3abb245bed + 7c810658463f35c39c54d5fb8a8dbbfd463bf747 https://github.com/dotnet/test-templates @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - add220db52958d9da088543f9cdf121aa9116f9a + 98720693e228934405de152651b2e21390c3bfec - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - add220db52958d9da088543f9cdf121aa9116f9a + 98720693e228934405de152651b2e21390c3bfec - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - add220db52958d9da088543f9cdf121aa9116f9a + 98720693e228934405de152651b2e21390c3bfec - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - add220db52958d9da088543f9cdf121aa9116f9a + 98720693e228934405de152651b2e21390c3bfec - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 0b72a8d9b5eea6a6528da3037108626664da2fdd + 8b06c27c9b81f33e69f8d5155fe69693f661fa3d - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 7d3c040a09d0a9a7434c291e353df73b7bb0ef37 + df04c57b2e2bb986f0afc2384cbebb3c950447b5 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 93ab59dfa..fa81db344 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,11 +31,11 @@ - 7.0.2-servicing.22601.2 + 7.0.2-servicing.22606.8 - 7.0.2-servicing.22601.4 + 7.0.2-servicing.22606.2 @@ -52,11 +52,11 @@ 7.0.2 7.0.2 - 7.0.2-servicing.22601.8 - 7.0.2-servicing.22601.8 - 7.0.2-servicing.22601.8 - 7.0.2-servicing.22601.8 - 7.0.2-servicing.22601.8 + 7.0.2-servicing.22606.6 + 7.0.2-servicing.22606.6 + 7.0.2-servicing.22606.6 + 7.0.2-servicing.22606.6 + 7.0.2-servicing.22606.6 0.2.0 @@ -64,8 +64,8 @@ 7.0.102 - 7.0.102-servicing.22606.15 - 7.0.102-servicing.22606.15 + 7.0.102-servicing.22607.4 + 7.0.102-servicing.22607.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -86,8 +86,8 @@ - 7.0.2-servicing.22601.5 - 7.0.2-servicing.22601.5 + 7.0.2-servicing.22607.1 + 7.0.2-servicing.22607.1 7.0.2 7.0.2