From 83a520aa45ee075d8beb286726a89adaa4fe5740 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 14 Apr 2023 15:49:40 +0000 Subject: [PATCH] Merged PR 30595: [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.5 to 7.0.6 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: from 7.0.5-servicing.23177.5 to 7.0.6-servicing.23213.6 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: from 7.0.5-servicing.23177.5 to 7.0.6-servicing.23213.6 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 7.0.5 to 7.0.6 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.7.0**: from 7.0.5-servicing.23174.5 to 7.0.6-servicing.23212.12 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 7.0.5 to 7.0.6 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 7.0.5 to 7.0.6 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 7.0.5 to 7.0.6 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 7.0.5 to 7.0.6 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 7.0.5-servicing.23174.10 to 7.0.6-servicing.23212.15 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 7.0.5 to 7.0.6 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: from 7.0.5-servicing.23174.10 to 7.0.6-servicing.23212.15 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 7.0.5-servicing.23174.10 to 7.0.6-servicing.23212.15 (parent: Microsoft.NET.Sdk) - **dotnet-user-jwts**: from 7.0.5-servicing.23174.10 to 7.0.6-servicing.23212.15 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 7.0.5-servicing.23174.10 to 7.0.6-servicing.23212.15 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.5 to 7.0.6 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 7.0.5-servicing.23175.1 to 7.0.6-servicing.23204.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.5 to 7.0.6 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 7.0.5-servicing.23176.1 to 7.0.6-servicing.23213.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.NET.ILLink.Tasks**: from 7.0.100-1.23207.1 to 7.0.100-1.23211.1 (parent: Microsoft.NET.Sdk) - **Microsoft.Net.Compilers.Toolset**: from 4.6.0-3.23210.15 to 4.6.0-3.23212.2 (parent: Microsoft.NET.Sdk) - **Microsoft.Build**: from 17.6... --- NuGet.config | 28 ++++----- eng/Version.Details.xml | 130 ++++++++++++++++++++-------------------- eng/Versions.props | 48 +++++++-------- 3 files changed, 103 insertions(+), 103 deletions(-) diff --git a/NuGet.config b/NuGet.config index 515768919..fbe9a1756 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,25 +7,25 @@ - + - + - + + + + - - - + - - + @@ -47,18 +47,18 @@ - + + + + - - - + - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1ad77b80d..6fb12ce2b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 265ddce1c1939672e1223e750544bb0443a8f74b + 36584a5b81a6527a1298a092117bce4a0bb237b8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 265ddce1c1939672e1223e750544bb0443a8f74b + 36584a5b81a6527a1298a092117bce4a0bb237b8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 265ddce1c1939672e1223e750544bb0443a8f74b + 36584a5b81a6527a1298a092117bce4a0bb237b8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 265ddce1c1939672e1223e750544bb0443a8f74b + 36584a5b81a6527a1298a092117bce4a0bb237b8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8042d61b17540e49e53569e3728d2faa1c596583 + e3acf029e62f07dde1a169096afeade58b0418ab - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8042d61b17540e49e53569e3728d2faa1c596583 + e3acf029e62f07dde1a169096afeade58b0418ab - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8042d61b17540e49e53569e3728d2faa1c596583 + e3acf029e62f07dde1a169096afeade58b0418ab - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8042d61b17540e49e53569e3728d2faa1c596583 + e3acf029e62f07dde1a169096afeade58b0418ab - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8042d61b17540e49e53569e3728d2faa1c596583 + e3acf029e62f07dde1a169096afeade58b0418ab - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8042d61b17540e49e53569e3728d2faa1c596583 + e3acf029e62f07dde1a169096afeade58b0418ab @@ -52,34 +52,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 8042d61b17540e49e53569e3728d2faa1c596583 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d47e49e9c1e173ac90821f7e89cc38e710274241 + e660b995af561f0943794cb1dda8a909b80594bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d47e49e9c1e173ac90821f7e89cc38e710274241 + e660b995af561f0943794cb1dda8a909b80594bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d47e49e9c1e173ac90821f7e89cc38e710274241 + e660b995af561f0943794cb1dda8a909b80594bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d47e49e9c1e173ac90821f7e89cc38e710274241 + e660b995af561f0943794cb1dda8a909b80594bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d47e49e9c1e173ac90821f7e89cc38e710274241 + e660b995af561f0943794cb1dda8a909b80594bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d47e49e9c1e173ac90821f7e89cc38e710274241 + e660b995af561f0943794cb1dda8a909b80594bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d47e49e9c1e173ac90821f7e89cc38e710274241 + e660b995af561f0943794cb1dda8a909b80594bc https://github.com/dotnet/test-templates @@ -98,31 +98,31 @@ 5a41781eb69eb4721e736a99262dbd32b6bb55d4 - - https://github.com/dotnet/sdk - 5752fcec04293de0c14fa875cd6e87876dbef4f7 + + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk + 76db6ed50dfedb5a70ad3f631c0e94075ae53d37 - - https://github.com/dotnet/sdk - 5752fcec04293de0c14fa875cd6e87876dbef4f7 + + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk + 76db6ed50dfedb5a70ad3f631c0e94075ae53d37 - - https://github.com/dotnet/sdk - 5752fcec04293de0c14fa875cd6e87876dbef4f7 + + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk + 76db6ed50dfedb5a70ad3f631c0e94075ae53d37 - - https://github.com/dotnet/sdk - 5752fcec04293de0c14fa875cd6e87876dbef4f7 + + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk + 76db6ed50dfedb5a70ad3f631c0e94075ae53d37 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - f75d9496cbb2fe61cfdb1299520c5c34a062a898 + a7742f16a6b2750e39825e301560a6abbb44b6f7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 03e9f99d0f93a3e3768227a9c6a1076fabd0de43 + 153de16d5ed088a1c3ef9ba007a871d0995ef612 https://github.com/dotnet/fsharp @@ -138,42 +138,42 @@ 7933ee32f416745e48ff33cb6a3e82fd1ca38b87 - + https://github.com/dotnet/linker - 08a09f27f664fb84368aa4b9eb862b13bf808579 + 9d4b3f3e0c100fe5ac4dc7f40d14d792178dbd0c linker - + https://github.com/dotnet/roslyn - a10bbf218cbd333e13a5387661c73f9b4077bd48 + d78a163b525fd73efb768f4f0095590f9ade3469 - + https://github.com/dotnet/msbuild - 61dd6568446aff7602d37e6a15595371fa057012 + 8ffc3fe3dc15b17ecf39a289deb5cd7fb65993a0 - + https://github.com/dotnet/msbuild - 61dd6568446aff7602d37e6a15595371fa057012 + 8ffc3fe3dc15b17ecf39a289deb5cd7fb65993a0 - - https://github.com/nuget/nuget.client - 0fa557836fa35aee7d60776ef0c88176dbcd22ac + + https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted + a36edf3a2bf891d6aabfc83cc0b21d24a870ea1a https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 7fa7119c1cdf1290aabb2391c3eee6ed42f8851d + b0eec69ee7bdab81823db7d6482cb6cff9f07e48 - + https://github.com/dotnet/emsdk - 7fa7119c1cdf1290aabb2391c3eee6ed42f8851d + b0eec69ee7bdab81823db7d6482cb6cff9f07e48 https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index 52e9d94c9..59df32196 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.5-servicing.23175.1 + 7.0.6-servicing.23204.3 - 7.0.5-servicing.23176.1 + 7.0.6-servicing.23213.3 @@ -56,22 +56,22 @@ - 7.0.5 - 7.0.5 - 7.0.5-servicing.23174.10 - 7.0.5-servicing.23174.10 - 7.0.5-servicing.23174.10 - 7.0.5-servicing.23174.10 - 7.0.5-servicing.23174.10 + 7.0.6 + 7.0.6 + 7.0.6-servicing.23212.15 + 7.0.6-servicing.23212.15 + 7.0.6-servicing.23212.15 + 7.0.6-servicing.23212.15 + 7.0.6-servicing.23212.15 0.2.0 - 7.0.300-preview.23211.7 - 7.0.300-preview.23211.7 - 7.0.300-preview.23211.7 + 7.0.300 + 7.0.300-rtm.23213.60 + 7.0.300-rtm.23213.60 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -82,20 +82,20 @@ - 7.0.5-servicing.23174.5 - 7.0.5-servicing.23174.5 - 7.0.5 - 7.0.5 - 7.0.5 - 7.0.5 + 7.0.6-servicing.23212.12 + 7.0.6-servicing.23212.12 + 7.0.6 + 7.0.6 + 7.0.6 + 7.0.6 2.1.0 - 7.0.5-servicing.23177.5 - 7.0.5-servicing.23177.5 - 7.0.5 - 7.0.5 + 7.0.6-servicing.23213.6 + 7.0.6-servicing.23213.6 + 7.0.6 + 7.0.6 @@ -227,8 +227,8 @@ 12.3.2372 16.0.1478 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.5 - 7.0.5 + 7.0.6 + 7.0.6 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version)