From 83a520aa45ee075d8beb286726a89adaa4fe5740 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 14 Apr 2023 15:49:40 +0000 Subject: [PATCH 01/13] 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) From a3ba726ea101b30463694a5611e7f54468de1dfd Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sat, 15 Apr 2023 20:18:31 +0000 Subject: [PATCH 02/13] Merged PR 30679: [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.6 to 7.0.6 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: from 7.0.6-servicing.23213.6 to 7.0.6-servicing.23213.14 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: from 7.0.6-servicing.23213.6 to 7.0.6-servicing.23213.14 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 7.0.6 to 7.0.6 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 7.0.6-servicing.23212.15 to 7.0.6-servicing.23214.13 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 7.0.6 to 7.0.6 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: from 7.0.6-servicing.23212.15 to 7.0.6-servicing.23214.13 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 7.0.6-servicing.23212.15 to 7.0.6-servicing.23214.13 (parent: Microsoft.NET.Sdk) - **dotnet-user-jwts**: from 7.0.6-servicing.23212.15 to 7.0.6-servicing.23214.13 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 7.0.6-servicing.23212.15 to 7.0.6-servicing.23214.13 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.6 to 7.0.6 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 7.0.6-servicing.23204.3 to 7.0.6-servicing.23213.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.6 to 7.0.6 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 7.0.6-servicing.23213.3 to 7.0.6-servicing.23213.10 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:ca5481e4-f667-4dcd-b176-08db3b93de76) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: ca5481e4-f667-4dcd-b176-08db3b93de76 - **Build**: 20230415.6 - **Date Produced**: April 15, 2023 5:38:19 PM UTC - **Commit**: 3f765dd3a04a69dc988088394b19f20e8d9ae4ce - **Branch**: refs/heads/internal/release/7.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.300 to 7.0.300][5] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.300-rtm.23213.60 to 7.0.300-rtm.23215.6][5] - **Microsoft.NET.Sdk**: [from 7.0.300-rtm.23213.60 to 7.0.300-rtm.23215.6][5] - **Micr... --- NuGet.config | 18 +++++-------- eng/Version.Details.xml | 58 ++++++++++++++++++++--------------------- eng/Versions.props | 22 ++++++++-------- 3 files changed, 46 insertions(+), 52 deletions(-) diff --git a/NuGet.config b/NuGet.config index fbe9a1756..04bc9078a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,22 +10,19 @@ - + - - - - + - + @@ -47,18 +44,15 @@ - + - - - - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6fb12ce2b..5bd5993ae 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 36584a5b81a6527a1298a092117bce4a0bb237b8 + 0af2ffd343917ef04085946fb40e75474b391ccf - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 36584a5b81a6527a1298a092117bce4a0bb237b8 + 0af2ffd343917ef04085946fb40e75474b391ccf - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 36584a5b81a6527a1298a092117bce4a0bb237b8 + 0af2ffd343917ef04085946fb40e75474b391ccf https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 36584a5b81a6527a1298a092117bce4a0bb237b8 + 0af2ffd343917ef04085946fb40e75474b391ccf https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e660b995af561f0943794cb1dda8a909b80594bc + d4bac3001364e830ea9d8cc929b9dba56196e4f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e660b995af561f0943794cb1dda8a909b80594bc + d4bac3001364e830ea9d8cc929b9dba56196e4f8 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e660b995af561f0943794cb1dda8a909b80594bc + d4bac3001364e830ea9d8cc929b9dba56196e4f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e660b995af561f0943794cb1dda8a909b80594bc + d4bac3001364e830ea9d8cc929b9dba56196e4f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e660b995af561f0943794cb1dda8a909b80594bc + d4bac3001364e830ea9d8cc929b9dba56196e4f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e660b995af561f0943794cb1dda8a909b80594bc + d4bac3001364e830ea9d8cc929b9dba56196e4f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e660b995af561f0943794cb1dda8a909b80594bc + d4bac3001364e830ea9d8cc929b9dba56196e4f8 https://github.com/dotnet/test-templates @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 76db6ed50dfedb5a70ad3f631c0e94075ae53d37 + 3f765dd3a04a69dc988088394b19f20e8d9ae4ce - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 76db6ed50dfedb5a70ad3f631c0e94075ae53d37 + 3f765dd3a04a69dc988088394b19f20e8d9ae4ce - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 76db6ed50dfedb5a70ad3f631c0e94075ae53d37 + 3f765dd3a04a69dc988088394b19f20e8d9ae4ce - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 76db6ed50dfedb5a70ad3f631c0e94075ae53d37 + 3f765dd3a04a69dc988088394b19f20e8d9ae4ce - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - a7742f16a6b2750e39825e301560a6abbb44b6f7 + b3dce1f781e8f035f43da3d5eb11d4916d1be36f - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 153de16d5ed088a1c3ef9ba007a871d0995ef612 + 2c5505b6cdfe7e0be6283d8b2f9968139cc54087 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 59df32196..8c98694af 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.6-servicing.23204.3 + 7.0.6-servicing.23213.5 - 7.0.6-servicing.23213.3 + 7.0.6-servicing.23213.10 @@ -58,11 +58,11 @@ 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 + 7.0.6-servicing.23214.13 + 7.0.6-servicing.23214.13 + 7.0.6-servicing.23214.13 + 7.0.6-servicing.23214.13 + 7.0.6-servicing.23214.13 0.2.0 @@ -70,8 +70,8 @@ 7.0.300 - 7.0.300-rtm.23213.60 - 7.0.300-rtm.23213.60 + 7.0.300-rtm.23215.6 + 7.0.300-rtm.23215.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -92,8 +92,8 @@ - 7.0.6-servicing.23213.6 - 7.0.6-servicing.23213.6 + 7.0.6-servicing.23213.14 + 7.0.6-servicing.23213.14 7.0.6 7.0.6 From 32ee2f1487175ec352b6be6c082143a5170495bc Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 18 Apr 2023 17:22:31 +0000 Subject: [PATCH 03/13] Merged PR 30762: [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.AspNetCore.App.Ref**: from 7.0.6 to 7.0.6 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 7.0.6-servicing.23214.13 to 7.0.6-servicing.23217.6 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 7.0.6 to 7.0.6 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: from 7.0.6-servicing.23214.13 to 7.0.6-servicing.23217.6 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 7.0.6-servicing.23214.13 to 7.0.6-servicing.23217.6 (parent: Microsoft.NET.Sdk) - **dotnet-user-jwts**: from 7.0.6-servicing.23214.13 to 7.0.6-servicing.23217.6 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 7.0.6-servicing.23214.13 to 7.0.6-servicing.23217.6 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:ca5481e4-f667-4dcd-b176-08db3b93de76) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: ca5481e4-f667-4dcd-b176-08db3b93de76 - **Build**: 20230418.9 - **Date Produced**: April 18, 2023 3:38:34 PM UTC - **Commit**: fb94b17af2dd037d0b2e4d551efde34812083ba5 - **Branch**: refs/heads/internal/release/7.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.300 to 7.0.300][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.300-rtm.23215.6 to 7.0.300-rtm.23218.9][1] - **Microsoft.NET.Sdk**: [from 7.0.300-rtm.23215.6 to 7.0.300-rtm.23218.9][1] - **Microsoft.TemplateEngine.Cli**: [from 7.0.300-rtm.23215.6 to 7.0.300-rtm.23218.9][1] - **Microsoft.AspNetCore.App.Ref**: [from 7.0.6 to 7.0.6][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 7.0.6-servicing.23214.13 to 7.0.6-servicing.23217.6][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 7.0.6 to 7.0.6][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: [from 7.0.6-servicing.23214.13 to 7.0.6-servicing.23217.6][2] - **dotnet-dev-certs**: [from 7.0.6-servicing.23214.13 to 7.0.6-servicing.23217.6][2] - **dotnet-user-jwts**: [from 7.0.6-servicing.23214.13 to 7.0.6-servicing.23217.6][2] - **dotnet-user-secrets**: [from 7.0.6-servicing.23214.13 to 7.0.6-servicing.23217.6][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC3f765dd3a0&targetVersion=GCfb94b17af2&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branch... --- NuGet.config | 13 +++++++++---- eng/Version.Details.xml | 38 +++++++++++++++++++------------------- eng/Versions.props | 14 +++++++------- 3 files changed, 35 insertions(+), 30 deletions(-) diff --git a/NuGet.config b/NuGet.config index 04bc9078a..768f2c308 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,19 +10,22 @@ - + + + - + + @@ -44,14 +47,16 @@ - + + - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5bd5993ae..4641873ad 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d4bac3001364e830ea9d8cc929b9dba56196e4f8 + 4515d4e1d70b50f899ee35cedf6be3a31098dd92 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d4bac3001364e830ea9d8cc929b9dba56196e4f8 + 4515d4e1d70b50f899ee35cedf6be3a31098dd92 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d4bac3001364e830ea9d8cc929b9dba56196e4f8 + 4515d4e1d70b50f899ee35cedf6be3a31098dd92 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d4bac3001364e830ea9d8cc929b9dba56196e4f8 + 4515d4e1d70b50f899ee35cedf6be3a31098dd92 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d4bac3001364e830ea9d8cc929b9dba56196e4f8 + 4515d4e1d70b50f899ee35cedf6be3a31098dd92 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d4bac3001364e830ea9d8cc929b9dba56196e4f8 + 4515d4e1d70b50f899ee35cedf6be3a31098dd92 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d4bac3001364e830ea9d8cc929b9dba56196e4f8 + 4515d4e1d70b50f899ee35cedf6be3a31098dd92 https://github.com/dotnet/test-templates @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3f765dd3a04a69dc988088394b19f20e8d9ae4ce + fb94b17af2dd037d0b2e4d551efde34812083ba5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3f765dd3a04a69dc988088394b19f20e8d9ae4ce + fb94b17af2dd037d0b2e4d551efde34812083ba5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3f765dd3a04a69dc988088394b19f20e8d9ae4ce + fb94b17af2dd037d0b2e4d551efde34812083ba5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3f765dd3a04a69dc988088394b19f20e8d9ae4ce + fb94b17af2dd037d0b2e4d551efde34812083ba5 diff --git a/eng/Versions.props b/eng/Versions.props index 8c98694af..e0f5b2162 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,11 +58,11 @@ 7.0.6 7.0.6 - 7.0.6-servicing.23214.13 - 7.0.6-servicing.23214.13 - 7.0.6-servicing.23214.13 - 7.0.6-servicing.23214.13 - 7.0.6-servicing.23214.13 + 7.0.6-servicing.23217.6 + 7.0.6-servicing.23217.6 + 7.0.6-servicing.23217.6 + 7.0.6-servicing.23217.6 + 7.0.6-servicing.23217.6 0.2.0 @@ -70,8 +70,8 @@ 7.0.300 - 7.0.300-rtm.23215.6 - 7.0.300-rtm.23215.6 + 7.0.300-rtm.23218.9 + 7.0.300-rtm.23218.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b0b3054de5642b312228b9ed6053792ca5392868 Mon Sep 17 00:00:00 2001 From: Will Godbe Date: Fri, 19 May 2023 17:33:36 +0000 Subject: [PATCH 04/13] Merged PR 31377: Subtract an additional 1 from 60 Template version Revert this next month --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 712887014..2dce7d589 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -124,7 +124,7 @@ --> true true - $([MSBuild]::Subtract($(VersionFeature60), 1)) + $([MSBuild]::Subtract($(VersionFeature60), 2)) $([MSBuild]::Subtract($(AspNetCoreTemplateFeature60), 1)) From 65eeecc57dcd9183c937b22e435ac60102ca8127 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 19 May 2023 18:25:49 +0000 Subject: [PATCH 05/13] Merged PR 31117: [internal/release/7.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:ca5481e4-f667-4dcd-b176-08db3b93de76) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: ca5481e4-f667-4dcd-b176-08db3b93de76 - **Build**: 20230504.19 - **Date Produced**: May 4, 2023 10:45:02 PM UTC - **Commit**: c67c38873cc5cd6d45b6954e4782ea80e0913345 - **Branch**: refs/heads/internal/release/7.0.302 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.300 to 7.0.302][9] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.300-rtm.23218.9 to 7.0.302-servicing.23254.19][9] - **Microsoft.NET.Sdk**: [from 7.0.300-rtm.23218.9 to 7.0.302-servicing.23254.19][9] - **Microsoft.TemplateEngine.Cli**: [from 7.0.300-rtm.23218.9 to 7.0.302-servicing.23254.19][9] - **Microsoft.WindowsDesktop.App.Ref**: [from 7.0.6 to 7.0.5][10] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: [from 7.0.6-servicing.23213.14 to 7.0.5-servicing.23177.5][10] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: [from 7.0.6-servicing.23213.14 to 7.0.5-servicing.23177.5][10] - **Microsoft.NETCore.App.Ref**: [from 7.0.6 to 7.0.5][11] - **VS.Redist.Common.NetCore.TargetingPack.x64.7.0**: [from 7.0.6-servicing.23212.12 to 7.0.5-servicing.23174.5][11] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 7.0.6 to 7.0.5][11] - **Microsoft.NETCore.App.Host.win-x64**: [from 7.0.6 to 7.0.5][11] - **Microsoft.NETCore.DotNetHostResolver**: [from 7.0.6 to 7.0.5][11] - **Microsoft.AspNetCore.App.Ref**: [from 7.0.6 to 7.0.5][12] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 7.0.6-servicing.23217.6 to 7.0.5-servicing.23174.10][12] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 7.0.6 to 7.0.5][12] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: [from 7.0.6-servicing.23217.6 to 7.0.5-servicing.23174.10][12] - **dotnet-dev-certs**: [from 7.0.6-servicing.23217.6 to 7.0.5-servicing.23174.10][12] - **dotnet-user-jwts**: [from 7.0.6-servicing.23217.6 to 7.0.5-servicing.23174.10][12] - **dotnet-user-secrets**: [from 7.0.6-servicing.23217.6 to 7.0.5-servicing.23174.10][12] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 7.0.6 to 7.0.5][10] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 7.0.6-servicing.23213.5 to 7.0.5-servicing.23175.1][13] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 7.0.6 to 7.0.5][10] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 7.0.6-servicing.23213.10 to 7.0.5-servicing.23176.1][14] - **NuGet.Build.Tasks**: [from 6.6.0-rc.66 to 6.6.0-preview.3.61][15] - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: [from 7.0.6-servicing.23212.12 to 7.0.5-servicing.23174.5][11] - **Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100**: [from 7.0.6 to 7.0.5][16] - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: [from 7.0.6-servicing.23212.12 to 7.0.5-servicing.... --- NuGet.config | 24 +++----- eng/Version.Details.xml | 118 ++++++++++++++++++++-------------------- eng/Versions.props | 48 ++++++++-------- 3 files changed, 92 insertions(+), 98 deletions(-) diff --git a/NuGet.config b/NuGet.config index 768f2c308..17e655b64 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,25 +7,21 @@ - - + - - + - - + - + - - + @@ -47,17 +43,15 @@ - + - - + - + - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 67e807b32..e9b990d31 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 0af2ffd343917ef04085946fb40e75474b391ccf + 77a647a7f1d75f63551fe656b350229562ac04a4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 0af2ffd343917ef04085946fb40e75474b391ccf + 77a647a7f1d75f63551fe656b350229562ac04a4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 0af2ffd343917ef04085946fb40e75474b391ccf + 77a647a7f1d75f63551fe656b350229562ac04a4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 0af2ffd343917ef04085946fb40e75474b391ccf + 77a647a7f1d75f63551fe656b350229562ac04a4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e3acf029e62f07dde1a169096afeade58b0418ab + 4906b56cca652ec986cb46bf1b4a9cc1fe1efe26 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e3acf029e62f07dde1a169096afeade58b0418ab + 4906b56cca652ec986cb46bf1b4a9cc1fe1efe26 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e3acf029e62f07dde1a169096afeade58b0418ab + 4906b56cca652ec986cb46bf1b4a9cc1fe1efe26 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e3acf029e62f07dde1a169096afeade58b0418ab + 4906b56cca652ec986cb46bf1b4a9cc1fe1efe26 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e3acf029e62f07dde1a169096afeade58b0418ab + 4906b56cca652ec986cb46bf1b4a9cc1fe1efe26 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e3acf029e62f07dde1a169096afeade58b0418ab + 4906b56cca652ec986cb46bf1b4a9cc1fe1efe26 @@ -52,34 +52,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 8042d61b17540e49e53569e3728d2faa1c596583 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4515d4e1d70b50f899ee35cedf6be3a31098dd92 + 2be1f3d56a3680c9fdf7a1d182e400cdc8885474 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4515d4e1d70b50f899ee35cedf6be3a31098dd92 + 2be1f3d56a3680c9fdf7a1d182e400cdc8885474 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4515d4e1d70b50f899ee35cedf6be3a31098dd92 + 2be1f3d56a3680c9fdf7a1d182e400cdc8885474 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4515d4e1d70b50f899ee35cedf6be3a31098dd92 + 2be1f3d56a3680c9fdf7a1d182e400cdc8885474 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4515d4e1d70b50f899ee35cedf6be3a31098dd92 + 2be1f3d56a3680c9fdf7a1d182e400cdc8885474 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4515d4e1d70b50f899ee35cedf6be3a31098dd92 + 2be1f3d56a3680c9fdf7a1d182e400cdc8885474 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4515d4e1d70b50f899ee35cedf6be3a31098dd92 + 2be1f3d56a3680c9fdf7a1d182e400cdc8885474 https://github.com/dotnet/test-templates @@ -98,31 +98,31 @@ 45a41b353d078e4d1e5918246fddbacb452eb210 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fb94b17af2dd037d0b2e4d551efde34812083ba5 + 4046bbcae7c95a913ded86e1fc4a4572e2237b1c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fb94b17af2dd037d0b2e4d551efde34812083ba5 + 4046bbcae7c95a913ded86e1fc4a4572e2237b1c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fb94b17af2dd037d0b2e4d551efde34812083ba5 + 4046bbcae7c95a913ded86e1fc4a4572e2237b1c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fb94b17af2dd037d0b2e4d551efde34812083ba5 + 4046bbcae7c95a913ded86e1fc4a4572e2237b1c - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - b3dce1f781e8f035f43da3d5eb11d4916d1be36f + 0fcdb8d3ba0a80a9d77518f1cc2a1f68875aed77 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 2c5505b6cdfe7e0be6283d8b2f9968139cc54087 + 671efc4e6651576c7e69408dbc8cacc4cf3d7ceb https://github.com/dotnet/fsharp @@ -144,36 +144,36 @@ linker - + https://github.com/dotnet/roslyn - d78a163b525fd73efb768f4f0095590f9ade3469 + c3cc1d0ceeab1a65da0217e403851a1e8a30086a - + https://github.com/dotnet/msbuild - 8ffc3fe3dc15b17ecf39a289deb5cd7fb65993a0 + 07e2947214f1a9f28a3517762c939d5bebb5f525 - + https://github.com/dotnet/msbuild - 8ffc3fe3dc15b17ecf39a289deb5cd7fb65993a0 + 07e2947214f1a9f28a3517762c939d5bebb5f525 - - https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted - a36edf3a2bf891d6aabfc83cc0b21d24a870ea1a + + https://github.com/nuget/nuget.client + 0fa557836fa35aee7d60776ef0c88176dbcd22ac https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - b0eec69ee7bdab81823db7d6482cb6cff9f07e48 + b3cf128502f8fc7f9f9212a4dfaff67a2bce7bda - + https://github.com/dotnet/emsdk - b0eec69ee7bdab81823db7d6482cb6cff9f07e48 + b3cf128502f8fc7f9f9212a4dfaff67a2bce7bda https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index 2dce7d589..137cda42f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.6-servicing.23213.5 + 7.0.7-servicing.23252.4 - 7.0.6-servicing.23213.10 + 7.0.7-servicing.23261.3 @@ -56,22 +56,22 @@ - 7.0.6 - 7.0.6 - 7.0.6-servicing.23217.6 - 7.0.6-servicing.23217.6 - 7.0.6-servicing.23217.6 - 7.0.6-servicing.23217.6 - 7.0.6-servicing.23217.6 + 7.0.7 + 7.0.7 + 7.0.7-servicing.23268.10 + 7.0.7-servicing.23268.10 + 7.0.7-servicing.23268.10 + 7.0.7-servicing.23268.10 + 7.0.7-servicing.23268.10 0.2.0 - 7.0.300 - 7.0.300-rtm.23218.9 - 7.0.300-rtm.23218.9 + 7.0.304 + 7.0.304-servicing.23269.7 + 7.0.304-servicing.23269.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -82,20 +82,20 @@ - 7.0.6-servicing.23212.12 - 7.0.6-servicing.23212.12 - 7.0.6 - 7.0.6 - 7.0.6 - 7.0.6 + 7.0.7-servicing.23268.2 + 7.0.7-servicing.23268.2 + 7.0.7 + 7.0.7 + 7.0.7 + 7.0.7 2.1.0 - 7.0.6-servicing.23213.14 - 7.0.6-servicing.23213.14 - 7.0.6 - 7.0.6 + 7.0.7-servicing.23267.3 + 7.0.7-servicing.23267.3 + 7.0.7 + 7.0.7 @@ -227,8 +227,8 @@ 12.3.2372 16.0.1478 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.6 - 7.0.6 + 7.0.7 + 7.0.7 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version) From a7c3fe9a782d53ee5b29fa240a6248d1bf2e5594 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 22 May 2023 14:32:46 +0000 Subject: [PATCH 06/13] Merged PR 31404: [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.7 to 7.0.7 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: from 7.0.7-servicing.23267.3 to 7.0.7-servicing.23269.4 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: from 7.0.7-servicing.23267.3 to 7.0.7-servicing.23269.4 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.7 to 7.0.7 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 7.0.7-servicing.23252.4 to 7.0.7-servicing.23268.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.7 to 7.0.7 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 7.0.7-servicing.23261.3 to 7.0.7-servicing.23269.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **NuGet.Build.Tasks**: from 6.6.0-preview.3.61 to 6.6.0-rc.66 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:ca5481e4-f667-4dcd-b176-08db3b93de76) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: ca5481e4-f667-4dcd-b176-08db3b93de76 - **Build**: 20230521.6 - **Date Produced**: May 22, 2023 6:18:47 AM UTC - **Commit**: fea33e20515e4362cef5b911309a4a184badd70b - **Branch**: refs/heads/internal/release/7.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.304 to 7.0.304][6] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.304-servicing.23269.7 to 7.0.304-servicing.23271.6][6] - **Microsoft.NET.Sdk**: [from 7.0.304-servicing.23269.7 to 7.0.304-servicing.23271.6][6] - **Microsoft.TemplateEngine.Cli**: [from 7.0.304-servicing.23269.7 to 7.0.304-servicing.23271.6][6] - **Microsoft.WindowsDesktop.App.Ref**: [from 7.0.7 to 7.0.7][7] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: [from 7.0.7-servicing.23267.3 to 7.0.7-servicing.23269.4][7] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: [from 7.0.7-servicing.23267.3 to 7.0.7-servicing.23269.4][7] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 7.0.7 to 7.0.7][7] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 7.0.7-servicing.23252.4 to 7.0.7-servicing.23268.2][8] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 7.0.7 to 7.0.7][7] - **Micr... --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 40 ++++++++++++++++++++-------------------- eng/Versions.props | 12 ++++++------ 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/NuGet.config b/NuGet.config index 17e655b64..2bd4d0c6e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -18,10 +18,10 @@ - + - + @@ -48,10 +48,10 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e9b990d31..cd5aff11f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 77a647a7f1d75f63551fe656b350229562ac04a4 + 2c4afc9f20969377bcf289b20c039cab44deddbd - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 77a647a7f1d75f63551fe656b350229562ac04a4 + 2c4afc9f20969377bcf289b20c039cab44deddbd - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 77a647a7f1d75f63551fe656b350229562ac04a4 + 2c4afc9f20969377bcf289b20c039cab44deddbd https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 77a647a7f1d75f63551fe656b350229562ac04a4 + 2c4afc9f20969377bcf289b20c039cab44deddbd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4046bbcae7c95a913ded86e1fc4a4572e2237b1c + fea33e20515e4362cef5b911309a4a184badd70b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4046bbcae7c95a913ded86e1fc4a4572e2237b1c + fea33e20515e4362cef5b911309a4a184badd70b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4046bbcae7c95a913ded86e1fc4a4572e2237b1c + fea33e20515e4362cef5b911309a4a184badd70b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4046bbcae7c95a913ded86e1fc4a4572e2237b1c + fea33e20515e4362cef5b911309a4a184badd70b - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 0fcdb8d3ba0a80a9d77518f1cc2a1f68875aed77 + fafc9aa56432f1e5728f082b222c3ef519b3dd59 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 671efc4e6651576c7e69408dbc8cacc4cf3d7ceb + bd4d958ccb657d11bbcd0d94f6f8a8c54e1c8c08 https://github.com/dotnet/fsharp @@ -158,9 +158,9 @@ 07e2947214f1a9f28a3517762c939d5bebb5f525 - - https://github.com/nuget/nuget.client - 0fa557836fa35aee7d60776ef0c88176dbcd22ac + + https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted + a36edf3a2bf891d6aabfc83cc0b21d24a870ea1a diff --git a/eng/Versions.props b/eng/Versions.props index 137cda42f..4202e76a2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.7-servicing.23252.4 + 7.0.7-servicing.23268.2 - 7.0.7-servicing.23261.3 + 7.0.7-servicing.23269.2 @@ -70,8 +70,8 @@ 7.0.304 - 7.0.304-servicing.23269.7 - 7.0.304-servicing.23269.7 + 7.0.304-servicing.23271.6 + 7.0.304-servicing.23271.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -92,8 +92,8 @@ - 7.0.7-servicing.23267.3 - 7.0.7-servicing.23267.3 + 7.0.7-servicing.23269.4 + 7.0.7-servicing.23269.4 7.0.7 7.0.7 From 20076b1bdea0868d3c4ff145f273ad6ce74c3f72 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 22 May 2023 15:48:09 +0000 Subject: [PATCH 07/13] Merged PR 31448: [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.7 to 7.0.7 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: from 7.0.7-servicing.23269.4 to 7.0.7-servicing.23269.8 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: from 7.0.7-servicing.23269.4 to 7.0.7-servicing.23269.8 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 7.0.7 to 7.0.7 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.7.0**: from 7.0.7-servicing.23268.2 to 7.0.7-servicing.23269.6 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 7.0.7 to 7.0.7 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 7.0.7 to 7.0.7 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 7.0.7 to 7.0.7 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 7.0.7 to 7.0.7 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 7.0.7-servicing.23268.10 to 7.0.7-servicing.23269.11 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 7.0.7 to 7.0.7 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: from 7.0.7-servicing.23268.10 to 7.0.7-servicing.23269.11 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 7.0.7-servicing.23268.10 to 7.0.7-servicing.23269.11 (parent: Microsoft.NET.Sdk) - **dotnet-user-jwts**: from 7.0.7-servicing.23268.10 to 7.0.7-servicing.23269.11 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 7.0.7-servicing.23268.10 to 7.0.7-servicing.23269.11 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.7 to 7.0.7 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 7.0.7-servicing.23268.2 to 7.0.7-servicing.23268.9 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.7 to 7.0.7 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 7.0.7-servicing.23269.2 to 7.0.7-servicing.23269.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: from 7.0.7-servicing.23268.2 to 7.0.7-servicing.23269.6 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: from 7.0.7-servicing.23268.2 to 7.0.7-servicing.23269.... --- NuGet.config | 16 ++++----- eng/Version.Details.xml | 74 ++++++++++++++++++++--------------------- eng/Versions.props | 26 +++++++-------- 3 files changed, 58 insertions(+), 58 deletions(-) diff --git a/NuGet.config b/NuGet.config index 2bd4d0c6e..249fd14cf 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,19 +9,19 @@ - + - + - + - + @@ -43,15 +43,15 @@ - + - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cd5aff11f..53603e17d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,44 +3,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 2c4afc9f20969377bcf289b20c039cab44deddbd + 57b0d2bac14e817eca9a3267626bc4d76a229f9f - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 2c4afc9f20969377bcf289b20c039cab44deddbd + 57b0d2bac14e817eca9a3267626bc4d76a229f9f - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 2c4afc9f20969377bcf289b20c039cab44deddbd + 57b0d2bac14e817eca9a3267626bc4d76a229f9f https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 2c4afc9f20969377bcf289b20c039cab44deddbd + 57b0d2bac14e817eca9a3267626bc4d76a229f9f - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4906b56cca652ec986cb46bf1b4a9cc1fe1efe26 + 8e3442dd52923615959c161ce49b9960375ea07b https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4906b56cca652ec986cb46bf1b4a9cc1fe1efe26 + 8e3442dd52923615959c161ce49b9960375ea07b - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4906b56cca652ec986cb46bf1b4a9cc1fe1efe26 + 8e3442dd52923615959c161ce49b9960375ea07b https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4906b56cca652ec986cb46bf1b4a9cc1fe1efe26 + 8e3442dd52923615959c161ce49b9960375ea07b https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4906b56cca652ec986cb46bf1b4a9cc1fe1efe26 + 8e3442dd52923615959c161ce49b9960375ea07b https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4906b56cca652ec986cb46bf1b4a9cc1fe1efe26 + 8e3442dd52923615959c161ce49b9960375ea07b @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2be1f3d56a3680c9fdf7a1d182e400cdc8885474 + 9e3df7fae521f32d0c463347d219982d518879db - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2be1f3d56a3680c9fdf7a1d182e400cdc8885474 + 9e3df7fae521f32d0c463347d219982d518879db https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2be1f3d56a3680c9fdf7a1d182e400cdc8885474 + 9e3df7fae521f32d0c463347d219982d518879db - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2be1f3d56a3680c9fdf7a1d182e400cdc8885474 + 9e3df7fae521f32d0c463347d219982d518879db - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2be1f3d56a3680c9fdf7a1d182e400cdc8885474 + 9e3df7fae521f32d0c463347d219982d518879db - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2be1f3d56a3680c9fdf7a1d182e400cdc8885474 + 9e3df7fae521f32d0c463347d219982d518879db - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2be1f3d56a3680c9fdf7a1d182e400cdc8885474 + 9e3df7fae521f32d0c463347d219982d518879db https://github.com/dotnet/test-templates @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fea33e20515e4362cef5b911309a4a184badd70b + 9460e4c1996834ffc8a0baed3993e8c932a07362 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fea33e20515e4362cef5b911309a4a184badd70b + 9460e4c1996834ffc8a0baed3993e8c932a07362 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fea33e20515e4362cef5b911309a4a184badd70b + 9460e4c1996834ffc8a0baed3993e8c932a07362 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fea33e20515e4362cef5b911309a4a184badd70b + 9460e4c1996834ffc8a0baed3993e8c932a07362 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - fafc9aa56432f1e5728f082b222c3ef519b3dd59 + 3632207d619ad47c9933baa5806b67b67d1a4b77 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - bd4d958ccb657d11bbcd0d94f6f8a8c54e1c8c08 + e43abfbcc8ce872b9ba591d87ec791e3f25423c0 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 4202e76a2..742a60852 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.7-servicing.23268.2 + 7.0.7-servicing.23268.9 - 7.0.7-servicing.23269.2 + 7.0.7-servicing.23269.7 @@ -58,11 +58,11 @@ 7.0.7 7.0.7 - 7.0.7-servicing.23268.10 - 7.0.7-servicing.23268.10 - 7.0.7-servicing.23268.10 - 7.0.7-servicing.23268.10 - 7.0.7-servicing.23268.10 + 7.0.7-servicing.23269.11 + 7.0.7-servicing.23269.11 + 7.0.7-servicing.23269.11 + 7.0.7-servicing.23269.11 + 7.0.7-servicing.23269.11 0.2.0 @@ -70,8 +70,8 @@ 7.0.304 - 7.0.304-servicing.23271.6 - 7.0.304-servicing.23271.6 + 7.0.304-servicing.23272.10 + 7.0.304-servicing.23272.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -82,8 +82,8 @@ - 7.0.7-servicing.23268.2 - 7.0.7-servicing.23268.2 + 7.0.7-servicing.23269.6 + 7.0.7-servicing.23269.6 7.0.7 7.0.7 7.0.7 @@ -92,8 +92,8 @@ - 7.0.7-servicing.23269.4 - 7.0.7-servicing.23269.4 + 7.0.7-servicing.23269.8 + 7.0.7-servicing.23269.8 7.0.7 7.0.7 From fe2036f9347c01bfd272dc05500980d94db8661b Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 23 May 2023 00:14:07 +0000 Subject: [PATCH 08/13] Merged PR 31475: [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.7 to 7.0.7 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: from 7.0.7-servicing.23269.8 to 7.0.7-servicing.23272.4 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: from 7.0.7-servicing.23269.8 to 7.0.7-servicing.23272.4 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.7 to 7.0.7 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 7.0.7-servicing.23268.9 to 7.0.7-servicing.23272.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.7 to 7.0.7 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 7.0.7-servicing.23269.7 to 7.0.7-servicing.23272.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:ca5481e4-f667-4dcd-b176-08db3b93de76) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: ca5481e4-f667-4dcd-b176-08db3b93de76 - **Build**: 20230522.39 - **Date Produced**: May 22, 2023 11:53:01 PM UTC - **Commit**: dc6ed2e2c5fe5f361b0ecac9f12ea2ca92bf827e - **Branch**: refs/heads/internal/release/7.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.304 to 7.0.304][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.304-servicing.23272.10 to 7.0.304-servicing.23272.39][1] - **Microsoft.NET.Sdk**: [from 7.0.304-servicing.23272.10 to 7.0.304-servicing.23272.39][1] - **Microsoft.TemplateEngine.Cli**: [from 7.0.304-servicing.23272.10 to 7.0.304-servicing.23272.39][1] - **Microsoft.WindowsDesktop.App.Ref**: [from 7.0.7 to 7.0.7][2] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: [from 7.0.7-servicing.23269.8 to 7.0.7-servicing.23272.4][2] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: [from 7.0.7-servicing.23269.8 to 7.0.7-servicing.23272.4][2] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 7.0.7 to 7.0.7][2] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 7.0.7-servicing.23268.9 to 7.0.7-servicing.23272.2][3] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 7.0.7 to 7.0.7][2] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 7.0.7-servicing.23269.7 to 7.0.7-servicing.232... --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 34 +++++++++++++++++----------------- eng/Versions.props | 12 ++++++------ 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/NuGet.config b/NuGet.config index 249fd14cf..4f54a3acc 100644 --- a/NuGet.config +++ b/NuGet.config @@ -18,10 +18,10 @@ - + - + @@ -48,10 +48,10 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 53603e17d..1d0e0f50c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 57b0d2bac14e817eca9a3267626bc4d76a229f9f + 2f39602907080719788f297c6393a1a24c10403b - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 57b0d2bac14e817eca9a3267626bc4d76a229f9f + 2f39602907080719788f297c6393a1a24c10403b - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 57b0d2bac14e817eca9a3267626bc4d76a229f9f + 2f39602907080719788f297c6393a1a24c10403b https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 57b0d2bac14e817eca9a3267626bc4d76a229f9f + 2f39602907080719788f297c6393a1a24c10403b https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9460e4c1996834ffc8a0baed3993e8c932a07362 + dc6ed2e2c5fe5f361b0ecac9f12ea2ca92bf827e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9460e4c1996834ffc8a0baed3993e8c932a07362 + dc6ed2e2c5fe5f361b0ecac9f12ea2ca92bf827e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9460e4c1996834ffc8a0baed3993e8c932a07362 + dc6ed2e2c5fe5f361b0ecac9f12ea2ca92bf827e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9460e4c1996834ffc8a0baed3993e8c932a07362 + dc6ed2e2c5fe5f361b0ecac9f12ea2ca92bf827e - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 3632207d619ad47c9933baa5806b67b67d1a4b77 + e3bf366a7361267ba472521190d62c9d22f39b14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - e43abfbcc8ce872b9ba591d87ec791e3f25423c0 + 24923547018835429e8d08a35b6d1e9eec97b735 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 742a60852..76dc92d16 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.7-servicing.23268.9 + 7.0.7-servicing.23272.2 - 7.0.7-servicing.23269.7 + 7.0.7-servicing.23272.4 @@ -70,8 +70,8 @@ 7.0.304 - 7.0.304-servicing.23272.10 - 7.0.304-servicing.23272.10 + 7.0.304-servicing.23272.39 + 7.0.304-servicing.23272.39 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -92,8 +92,8 @@ - 7.0.7-servicing.23269.8 - 7.0.7-servicing.23269.8 + 7.0.7-servicing.23272.4 + 7.0.7-servicing.23272.4 7.0.7 7.0.7 From 7e4953eb272ccad06297cd9497ae3cb847d767cf Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 23 May 2023 01:14:12 +0000 Subject: [PATCH 09/13] Merged PR 31476: [internal/release/7.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:ca5481e4-f667-4dcd-b176-08db3b93de76) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: ca5481e4-f667-4dcd-b176-08db3b93de76 - **Build**: 20230522.42 - **Date Produced**: May 23, 2023 12:51:24 AM UTC - **Commit**: 1429e96e25ecaa470f1f5f54466dde336121ee0c - **Branch**: refs/heads/internal/release/7.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.304 to 7.0.304][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.304-servicing.23272.39 to 7.0.304-servicing.23272.42][1] - **Microsoft.NET.Sdk**: [from 7.0.304-servicing.23272.39 to 7.0.304-servicing.23272.42][1] - **Microsoft.TemplateEngine.Cli**: [from 7.0.304-servicing.23272.39 to 7.0.304-servicing.23272.42][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCdc6ed2e2c5&targetVersion=GC1429e96e25&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:ca5481e4-f667-4dcd-b176-08db3b93de76) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index 4f54a3acc..63c584edf 100644 --- a/NuGet.config +++ b/NuGet.config @@ -18,7 +18,7 @@ - + @@ -48,7 +48,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1d0e0f50c..dcac84365 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - dc6ed2e2c5fe5f361b0ecac9f12ea2ca92bf827e + 1429e96e25ecaa470f1f5f54466dde336121ee0c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - dc6ed2e2c5fe5f361b0ecac9f12ea2ca92bf827e + 1429e96e25ecaa470f1f5f54466dde336121ee0c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - dc6ed2e2c5fe5f361b0ecac9f12ea2ca92bf827e + 1429e96e25ecaa470f1f5f54466dde336121ee0c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - dc6ed2e2c5fe5f361b0ecac9f12ea2ca92bf827e + 1429e96e25ecaa470f1f5f54466dde336121ee0c diff --git a/eng/Versions.props b/eng/Versions.props index 76dc92d16..26fef8aeb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.304 - 7.0.304-servicing.23272.39 - 7.0.304-servicing.23272.39 + 7.0.304-servicing.23272.42 + 7.0.304-servicing.23272.42 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 11edefdc8936694ae451db6d13b9d0ab5fb38e72 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 23 May 2023 21:03:02 +0000 Subject: [PATCH 10/13] Merged PR 31503: [internal/release/7.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:ca5481e4-f667-4dcd-b176-08db3b93de76) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: ca5481e4-f667-4dcd-b176-08db3b93de76 - **Build**: 20230523.13 - **Date Produced**: May 23, 2023 8:24:51 PM UTC - **Commit**: 7a7135bad0689c9c388d1e69dbbaddba65b6364d - **Branch**: refs/heads/internal/release/7.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.304 to 7.0.304][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.304-servicing.23272.42 to 7.0.304-servicing.23273.13][1] - **Microsoft.NET.Sdk**: [from 7.0.304-servicing.23272.42 to 7.0.304-servicing.23273.13][1] - **Microsoft.TemplateEngine.Cli**: [from 7.0.304-servicing.23272.42 to 7.0.304-servicing.23273.13][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC1429e96e25&targetVersion=GC7a7135bad0&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:ca5481e4-f667-4dcd-b176-08db3b93de76) --- NuGet.config | 11 +++++++++-- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 18 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index 63c584edf..3a2f1c7f8 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,18 +10,22 @@ + + + - + + @@ -43,14 +47,17 @@ + + - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index dcac84365..ff41a4b1a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1429e96e25ecaa470f1f5f54466dde336121ee0c + 7a7135bad0689c9c388d1e69dbbaddba65b6364d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1429e96e25ecaa470f1f5f54466dde336121ee0c + 7a7135bad0689c9c388d1e69dbbaddba65b6364d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1429e96e25ecaa470f1f5f54466dde336121ee0c + 7a7135bad0689c9c388d1e69dbbaddba65b6364d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1429e96e25ecaa470f1f5f54466dde336121ee0c + 7a7135bad0689c9c388d1e69dbbaddba65b6364d diff --git a/eng/Versions.props b/eng/Versions.props index 26fef8aeb..6f5ac0338 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.304 - 7.0.304-servicing.23272.42 - 7.0.304-servicing.23272.42 + 7.0.304-servicing.23273.13 + 7.0.304-servicing.23273.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e815cb91a8ca95f787fe6b612d310550700da88b Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 25 May 2023 13:50:34 +0000 Subject: [PATCH 11/13] Merged PR 31525: [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.NETCore.App.Ref**: from 7.0.7 to 7.0.7 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.7.0**: from 7.0.7-servicing.23269.6 to 7.0.7-servicing.23274.4 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 7.0.7 to 7.0.7 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 7.0.7 to 7.0.7 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 7.0.7 to 7.0.7 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 7.0.2 to 7.0.3 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: from 7.0.7-servicing.23269.6 to 7.0.7-servicing.23274.4 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: from 7.0.7-servicing.23269.6 to 7.0.7-servicing.23274.4 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:ca5481e4-f667-4dcd-b176-08db3b93de76) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: ca5481e4-f667-4dcd-b176-08db3b93de76 - **Build**: 20230524.11 - **Date Produced**: May 24, 2023 9:07:10 PM UTC - **Commit**: 616c6598add9d0166644bc20da2c4741b952b3ea - **Branch**: refs/heads/internal/release/7.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.304 to 7.0.304][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.304-servicing.23273.13 to 7.0.304-servicing.23274.11][1] - **Microsoft.NET.Sdk**: [from 7.0.304-servicing.23273.13 to 7.0.304-servicing.23274.11][1] - **Microsoft.TemplateEngine.Cli**: [from 7.0.304-servicing.23273.13 to 7.0.304-servicing.23274.11][1] - **Microsoft.NETCore.App.Ref**: [from 7.0.7 to 7.0.7][2] - **VS.Redist.Common.NetCore.TargetingPack.x64.7.0**: [from 7.0.7-servicing.23269.6 to 7.0.7-servicing.23274.4][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 7.0.7 to 7.0.7][2] - **Microsoft.NETCore.App.Host.win-x64**: [from 7.0.7 to 7.0.7][2] - **Microsoft.NETCore.DotNetHostResolver**: [from 7.0.7 to 7.0.7][2] - **Microsoft.NETCore.Platforms**: [from 7.0.2 to 7.0.3][3] - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: [from 7.0.7-servicing.23269.6 to 7.0.7-servicing.23274.4][2] - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: [from 7.0.7-servicing.23269.6 to 7.0.7-servicing.23274.4][2] [1]: https://dev.azure.com/dncen... --- NuGet.config | 15 +++++++++------ eng/Version.Details.xml | 34 +++++++++++++++++----------------- eng/Versions.props | 10 +++++----- 3 files changed, 31 insertions(+), 28 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3a2f1c7f8..5c320fd91 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,21 +10,23 @@ + + - - + - + + @@ -48,16 +50,17 @@ + - - + - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ff41a4b1a..e788659a3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 2f39602907080719788f297c6393a1a24c10403b - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8e3442dd52923615959c161ce49b9960375ea07b + 5b20af47d99620150c53eaf5db8636fdf730b126 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8e3442dd52923615959c161ce49b9960375ea07b + 5b20af47d99620150c53eaf5db8636fdf730b126 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8e3442dd52923615959c161ce49b9960375ea07b + 5b20af47d99620150c53eaf5db8636fdf730b126 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8e3442dd52923615959c161ce49b9960375ea07b + 5b20af47d99620150c53eaf5db8636fdf730b126 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8e3442dd52923615959c161ce49b9960375ea07b + 5b20af47d99620150c53eaf5db8636fdf730b126 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8e3442dd52923615959c161ce49b9960375ea07b + 5b20af47d99620150c53eaf5db8636fdf730b126 @@ -48,9 +48,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8042d61b17540e49e53569e3728d2faa1c596583 + 5b20af47d99620150c53eaf5db8636fdf730b126 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7a7135bad0689c9c388d1e69dbbaddba65b6364d + 616c6598add9d0166644bc20da2c4741b952b3ea - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7a7135bad0689c9c388d1e69dbbaddba65b6364d + 616c6598add9d0166644bc20da2c4741b952b3ea - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7a7135bad0689c9c388d1e69dbbaddba65b6364d + 616c6598add9d0166644bc20da2c4741b952b3ea - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7a7135bad0689c9c388d1e69dbbaddba65b6364d + 616c6598add9d0166644bc20da2c4741b952b3ea diff --git a/eng/Versions.props b/eng/Versions.props index 6f5ac0338..373087388 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,20 +70,20 @@ 7.0.304 - 7.0.304-servicing.23273.13 - 7.0.304-servicing.23273.13 + 7.0.304-servicing.23274.11 + 7.0.304-servicing.23274.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 7.0.2 + 7.0.3 - 7.0.7-servicing.23269.6 - 7.0.7-servicing.23269.6 + 7.0.7-servicing.23274.4 + 7.0.7-servicing.23274.4 7.0.7 7.0.7 7.0.7 From 8ce8908424123f5f2811d0bfd294f02ab4de8ffe Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 25 May 2023 15:16:12 +0000 Subject: [PATCH 12/13] Merged PR 31548: [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.AspNetCore.App.Ref**: from 7.0.7 to 7.0.7 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 7.0.7-servicing.23269.11 to 7.0.7-servicing.23274.8 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 7.0.7 to 7.0.7 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: from 7.0.7-servicing.23269.11 to 7.0.7-servicing.23274.8 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 7.0.7-servicing.23269.11 to 7.0.7-servicing.23274.8 (parent: Microsoft.NET.Sdk) - **dotnet-user-jwts**: from 7.0.7-servicing.23269.11 to 7.0.7-servicing.23274.8 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 7.0.7-servicing.23269.11 to 7.0.7-servicing.23274.8 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:ca5481e4-f667-4dcd-b176-08db3b93de76) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: ca5481e4-f667-4dcd-b176-08db3b93de76 - **Build**: 20230525.3 - **Date Produced**: May 25, 2023 2:43:34 PM UTC - **Commit**: 6cdde441589050768345f112c683cf297e5fc29b - **Branch**: refs/heads/internal/release/7.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.304 to 7.0.304][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.304-servicing.23274.11 to 7.0.304-servicing.23275.3][1] - **Microsoft.NET.Sdk**: [from 7.0.304-servicing.23274.11 to 7.0.304-servicing.23275.3][1] - **Microsoft.TemplateEngine.Cli**: [from 7.0.304-servicing.23274.11 to 7.0.304-servicing.23275.3][1] - **Microsoft.AspNetCore.App.Ref**: [from 7.0.7 to 7.0.7][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 7.0.7-servicing.23269.11 to 7.0.7-servicing.23274.8][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 7.0.7 to 7.0.7][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: [from 7.0.7-servicing.23269.11 to 7.0.7-servicing.23274.8][2] - **dotnet-dev-certs**: [from 7.0.7-servicing.23269.11 to 7.0.7-servicing.23274.8][2] - **dotnet-user-jwts**: [from 7.0.7-servicing.23269.11 to 7.0.7-servicing.23274.8][2] - **dotnet-user-secrets**: [from 7.0.7-servicing.23269.11 to 7.0.7-servicing.23274.8][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC616c6598ad&targetVersion=GC6cdde44158&_a=files [2]: https://dev.azure.com/dnceng/i... --- NuGet.config | 12 ++++-------- eng/Version.Details.xml | 38 +++++++++++++++++++------------------- eng/Versions.props | 14 +++++++------- 3 files changed, 30 insertions(+), 34 deletions(-) diff --git a/NuGet.config b/NuGet.config index 5c320fd91..062b9368a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,9 +9,7 @@ - - - + @@ -22,7 +20,7 @@ - + @@ -49,14 +47,12 @@ - - - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e788659a3..a813705fa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9e3df7fae521f32d0c463347d219982d518879db + 3dfc6fda80a10797b8c8fda1970e7b377fd8ed8d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9e3df7fae521f32d0c463347d219982d518879db + 3dfc6fda80a10797b8c8fda1970e7b377fd8ed8d https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9e3df7fae521f32d0c463347d219982d518879db + 3dfc6fda80a10797b8c8fda1970e7b377fd8ed8d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9e3df7fae521f32d0c463347d219982d518879db + 3dfc6fda80a10797b8c8fda1970e7b377fd8ed8d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9e3df7fae521f32d0c463347d219982d518879db + 3dfc6fda80a10797b8c8fda1970e7b377fd8ed8d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9e3df7fae521f32d0c463347d219982d518879db + 3dfc6fda80a10797b8c8fda1970e7b377fd8ed8d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9e3df7fae521f32d0c463347d219982d518879db + 3dfc6fda80a10797b8c8fda1970e7b377fd8ed8d https://github.com/dotnet/test-templates @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 616c6598add9d0166644bc20da2c4741b952b3ea + 6cdde441589050768345f112c683cf297e5fc29b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 616c6598add9d0166644bc20da2c4741b952b3ea + 6cdde441589050768345f112c683cf297e5fc29b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 616c6598add9d0166644bc20da2c4741b952b3ea + 6cdde441589050768345f112c683cf297e5fc29b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 616c6598add9d0166644bc20da2c4741b952b3ea + 6cdde441589050768345f112c683cf297e5fc29b diff --git a/eng/Versions.props b/eng/Versions.props index 373087388..e9eac2d55 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,11 +58,11 @@ 7.0.7 7.0.7 - 7.0.7-servicing.23269.11 - 7.0.7-servicing.23269.11 - 7.0.7-servicing.23269.11 - 7.0.7-servicing.23269.11 - 7.0.7-servicing.23269.11 + 7.0.7-servicing.23274.8 + 7.0.7-servicing.23274.8 + 7.0.7-servicing.23274.8 + 7.0.7-servicing.23274.8 + 7.0.7-servicing.23274.8 0.2.0 @@ -70,8 +70,8 @@ 7.0.304 - 7.0.304-servicing.23274.11 - 7.0.304-servicing.23274.11 + 7.0.304-servicing.23275.3 + 7.0.304-servicing.23275.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 7e794e2806b712f07d9e4c18aa6cfc8b9249e2fa Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 25 May 2023 17:17:58 +0000 Subject: [PATCH 13/13] Merged PR 31554: [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.7 to 7.0.7 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: from 7.0.7-servicing.23272.4 to 7.0.7-servicing.23275.3 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: from 7.0.7-servicing.23272.4 to 7.0.7-servicing.23275.3 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.7 to 7.0.7 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 7.0.7-servicing.23272.2 to 7.0.7-servicing.23274.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.7 to 7.0.7 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 7.0.7-servicing.23272.4 to 7.0.7-servicing.23274.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:ca5481e4-f667-4dcd-b176-08db3b93de76) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: ca5481e4-f667-4dcd-b176-08db3b93de76 - **Build**: 20230525.9 - **Date Produced**: May 25, 2023 4:54:22 PM UTC - **Commit**: 9abb6bda1703918c0172e5170b66af31867fdeeb - **Branch**: refs/heads/internal/release/7.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.304 to 7.0.304][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.304-servicing.23275.3 to 7.0.304-servicing.23275.9][1] - **Microsoft.NET.Sdk**: [from 7.0.304-servicing.23275.3 to 7.0.304-servicing.23275.9][1] - **Microsoft.TemplateEngine.Cli**: [from 7.0.304-servicing.23275.3 to 7.0.304-servicing.23275.9][1] - **Microsoft.WindowsDesktop.App.Ref**: [from 7.0.7 to 7.0.7][2] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: [from 7.0.7-servicing.23272.4 to 7.0.7-servicing.23275.3][2] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: [from 7.0.7-servicing.23272.4 to 7.0.7-servicing.23275.3][2] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 7.0.7 to 7.0.7][2] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 7.0.7-servicing.23272.2 to 7.0.7-servicing.23274.5][3] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 7.0.7 to 7.0.7][2] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 7.0.7-servicing.23272.4 to 7.0.7-servicing.23274.5][4]... --- NuGet.config | 12 ++++-------- eng/Version.Details.xml | 34 +++++++++++++++++----------------- eng/Versions.props | 12 ++++++------ 3 files changed, 27 insertions(+), 31 deletions(-) diff --git a/NuGet.config b/NuGet.config index 062b9368a..d207f7815 100644 --- a/NuGet.config +++ b/NuGet.config @@ -20,12 +20,10 @@ - + - - - + @@ -52,12 +50,10 @@ - + - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a813705fa..ea514f006 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 2f39602907080719788f297c6393a1a24c10403b + eacd999cfa912fdb8ff68aa20fb8f3f8eb1c6170 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 2f39602907080719788f297c6393a1a24c10403b + eacd999cfa912fdb8ff68aa20fb8f3f8eb1c6170 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 2f39602907080719788f297c6393a1a24c10403b + eacd999cfa912fdb8ff68aa20fb8f3f8eb1c6170 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 2f39602907080719788f297c6393a1a24c10403b + eacd999cfa912fdb8ff68aa20fb8f3f8eb1c6170 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6cdde441589050768345f112c683cf297e5fc29b + 9abb6bda1703918c0172e5170b66af31867fdeeb - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6cdde441589050768345f112c683cf297e5fc29b + 9abb6bda1703918c0172e5170b66af31867fdeeb - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6cdde441589050768345f112c683cf297e5fc29b + 9abb6bda1703918c0172e5170b66af31867fdeeb - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6cdde441589050768345f112c683cf297e5fc29b + 9abb6bda1703918c0172e5170b66af31867fdeeb - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - e3bf366a7361267ba472521190d62c9d22f39b14 + b4a5f0c6839363dea534f21736a9d0726c14b41c - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 24923547018835429e8d08a35b6d1e9eec97b735 + 512eac4b458953da405f51ec0ae7766bcb7b32e5 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index e9eac2d55..c3af7944f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.7-servicing.23272.2 + 7.0.7-servicing.23274.5 - 7.0.7-servicing.23272.4 + 7.0.7-servicing.23274.5 @@ -70,8 +70,8 @@ 7.0.304 - 7.0.304-servicing.23275.3 - 7.0.304-servicing.23275.3 + 7.0.304-servicing.23275.9 + 7.0.304-servicing.23275.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -92,8 +92,8 @@ - 7.0.7-servicing.23272.4 - 7.0.7-servicing.23272.4 + 7.0.7-servicing.23275.3 + 7.0.7-servicing.23275.3 7.0.7 7.0.7