From c6505a010cfe757ffb4b6cb8d2791e6ca5b0ea1d Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 16 Aug 2023 21:30:42 +0000 Subject: [PATCH 1/8] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230816.25 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.307 -> To Version 7.0.308 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.ILLink.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.10 -> To Version 7.0.11 (parent: Microsoft.NET.Sdk --- NuGet.config | 45 ++++------------- eng/Version.Details.xml | 104 ++++++++++++++++++++-------------------- eng/Versions.props | 48 +++++++++---------- 3 files changed, 85 insertions(+), 112 deletions(-) diff --git a/NuGet.config b/NuGet.config index b885835bc..c074bb5a9 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,34 +10,19 @@ - - - - + - - - - + - - - - + - - - - + - - - - + @@ -59,27 +44,15 @@ - - - - + - - - - + - - - - + - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9d206477b..8910b7ae7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 996ed6b07099f377a6b05581860a1f66a30aca00 + 2bfaf348a33275034b7a9d186a5803f78b512ad1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 996ed6b07099f377a6b05581860a1f66a30aca00 + 2bfaf348a33275034b7a9d186a5803f78b512ad1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 996ed6b07099f377a6b05581860a1f66a30aca00 + 2bfaf348a33275034b7a9d186a5803f78b512ad1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 996ed6b07099f377a6b05581860a1f66a30aca00 + 2bfaf348a33275034b7a9d186a5803f78b512ad1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a6dbb800a47735bde43187350fd3aff4071c7f9c + de7841221e4ad56750e452db8ac4eab459b2ab23 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a6dbb800a47735bde43187350fd3aff4071c7f9c + de7841221e4ad56750e452db8ac4eab459b2ab23 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a6dbb800a47735bde43187350fd3aff4071c7f9c + de7841221e4ad56750e452db8ac4eab459b2ab23 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a6dbb800a47735bde43187350fd3aff4071c7f9c + de7841221e4ad56750e452db8ac4eab459b2ab23 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a6dbb800a47735bde43187350fd3aff4071c7f9c + de7841221e4ad56750e452db8ac4eab459b2ab23 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a6dbb800a47735bde43187350fd3aff4071c7f9c + de7841221e4ad56750e452db8ac4eab459b2ab23 @@ -52,34 +52,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5a4c82ec57fadddef9ce841d608de5c7c8c74446 + 29b232880d00408f61601fd63a87d54784dde835 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5a4c82ec57fadddef9ce841d608de5c7c8c74446 + 29b232880d00408f61601fd63a87d54784dde835 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5a4c82ec57fadddef9ce841d608de5c7c8c74446 + 29b232880d00408f61601fd63a87d54784dde835 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5a4c82ec57fadddef9ce841d608de5c7c8c74446 + 29b232880d00408f61601fd63a87d54784dde835 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5a4c82ec57fadddef9ce841d608de5c7c8c74446 + 29b232880d00408f61601fd63a87d54784dde835 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5a4c82ec57fadddef9ce841d608de5c7c8c74446 + 29b232880d00408f61601fd63a87d54784dde835 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5a4c82ec57fadddef9ce841d608de5c7c8c74446 + 29b232880d00408f61601fd63a87d54784dde835 https://github.com/dotnet/test-templates @@ -98,31 +98,31 @@ 45a41b353d078e4d1e5918246fddbacb452eb210 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 93655ee31e403d6dccf43195ebd7334dbedbffd9 + 1bf50404dde4760c0ee8198026d4c33f5af8e7a6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 93655ee31e403d6dccf43195ebd7334dbedbffd9 + 1bf50404dde4760c0ee8198026d4c33f5af8e7a6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 93655ee31e403d6dccf43195ebd7334dbedbffd9 + 1bf50404dde4760c0ee8198026d4c33f5af8e7a6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 93655ee31e403d6dccf43195ebd7334dbedbffd9 + 1bf50404dde4760c0ee8198026d4c33f5af8e7a6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 1f1ac283c5d3bb3302111f8aef567a3541863c49 + 2e82d9d2458c751ea103d1487b2695d62612fc2d - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 9a9892f5204f1a1b31ab2c81b025d6e35e0f3693 + 1a043efd50b1f70f42a00ddd5987b94d1d279c5a https://github.com/dotnet/fsharp @@ -138,9 +138,9 @@ e7ea853f64af5a4c240acaf9e54cdae3ae0eb7bb - + https://github.com/dotnet/linker - 13a94b5bdc9d01ecd9eb2bd699bd34d597c3ec19 + 53b3303c57b3fe659500fb362a0eef12991c1197 linker @@ -167,13 +167,13 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 96ba1fedbcfb742d0d154532f6ac3c30d14a5f7d + fcd8602188cfe2f73c73f5ae57e33c0654ce9858 - + https://github.com/dotnet/emsdk - 96ba1fedbcfb742d0d154532f6ac3c30d14a5f7d + fcd8602188cfe2f73c73f5ae57e33c0654ce9858 https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index 7db5fcb8c..1da481900 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.10-servicing.23364.5 + 7.0.11-servicing.23415.5 - 7.0.10-servicing.23364.4 + 7.0.11-servicing.23415.5 @@ -56,22 +56,22 @@ - 7.0.10 - 7.0.10 - 7.0.10-servicing.23364.39 - 7.0.10-servicing.23364.39 - 7.0.10-servicing.23364.39 - 7.0.10-servicing.23364.39 - 7.0.10-servicing.23364.39 + 7.0.11 + 7.0.11 + 7.0.11-servicing.23416.1 + 7.0.11-servicing.23416.1 + 7.0.11-servicing.23416.1 + 7.0.11-servicing.23416.1 + 7.0.11-servicing.23416.1 0.2.0 - 7.0.307 - 7.0.307-servicing.23367.21 - 7.0.307-servicing.23367.21 + 7.0.308 + 7.0.308-servicing.23416.25 + 7.0.308-servicing.23416.25 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -86,20 +86,20 @@ - 7.0.10-servicing.23363.12 - 7.0.10-servicing.23363.12 - 7.0.10 - 7.0.10 - 7.0.10 - 7.0.10 + 7.0.11-servicing.23415.17 + 7.0.11-servicing.23415.17 + 7.0.11 + 7.0.11 + 7.0.11 + 7.0.11 2.1.0 - 7.0.10-servicing.23367.2 - 7.0.10-servicing.23367.2 - 7.0.10 - 7.0.10 + 7.0.11-servicing.23415.7 + 7.0.11-servicing.23415.7 + 7.0.11 + 7.0.11 @@ -231,8 +231,8 @@ 12.3.2372 16.0.1478 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.10 - 7.0.10 + 7.0.11 + 7.0.11 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version) From 7e71db02945cb85e974dcf9b2eb25e9929438883 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 16 Aug 2023 23:14:47 +0000 Subject: [PATCH 2/8] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230816.55 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.307 -> To Version 7.0.308 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.ILLink.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.10 -> To Version 7.0.11 (parent: Microsoft.NET.Sdk --- 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 c074bb5a9..fe55a3a6e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,10 +19,10 @@ - + - + @@ -49,10 +49,10 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8910b7ae7..647c5821c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 2bfaf348a33275034b7a9d186a5803f78b512ad1 + c9f28c6a29182e54d1c292d1cff9778315cee51c - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 2bfaf348a33275034b7a9d186a5803f78b512ad1 + c9f28c6a29182e54d1c292d1cff9778315cee51c - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 2bfaf348a33275034b7a9d186a5803f78b512ad1 + c9f28c6a29182e54d1c292d1cff9778315cee51c https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 2bfaf348a33275034b7a9d186a5803f78b512ad1 + c9f28c6a29182e54d1c292d1cff9778315cee51c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1bf50404dde4760c0ee8198026d4c33f5af8e7a6 + f228b17d671d0196fa19fb77fdf57ca5d7b9871b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1bf50404dde4760c0ee8198026d4c33f5af8e7a6 + f228b17d671d0196fa19fb77fdf57ca5d7b9871b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1bf50404dde4760c0ee8198026d4c33f5af8e7a6 + f228b17d671d0196fa19fb77fdf57ca5d7b9871b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1bf50404dde4760c0ee8198026d4c33f5af8e7a6 + f228b17d671d0196fa19fb77fdf57ca5d7b9871b - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 2e82d9d2458c751ea103d1487b2695d62612fc2d + 639189647d647da4008fa57fd63b1d415c84b487 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 1a043efd50b1f70f42a00ddd5987b94d1d279c5a + 8037dc673134da614f02f4b84f6a9a61e047ae60 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 1da481900..f17bca02c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.11-servicing.23415.5 + 7.0.11-servicing.23416.5 - 7.0.11-servicing.23415.5 + 7.0.11-servicing.23416.7 @@ -70,8 +70,8 @@ 7.0.308 - 7.0.308-servicing.23416.25 - 7.0.308-servicing.23416.25 + 7.0.308-servicing.23416.55 + 7.0.308-servicing.23416.55 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -96,8 +96,8 @@ - 7.0.11-servicing.23415.7 - 7.0.11-servicing.23415.7 + 7.0.11-servicing.23416.8 + 7.0.11-servicing.23416.8 7.0.11 7.0.11 From 359b356988e6d67aa830aea6adbaacaa26cde2e9 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Thu, 17 Aug 2023 13:16:03 -0700 Subject: [PATCH 3/8] Remove inapplicable sourcebuild patch for format --- ...explicit-System.Text.Json-dependency.patch | 73 ------------------- 1 file changed, 73 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/format/0002-Add-explicit-System.Text.Json-dependency.patch diff --git a/src/SourceBuild/tarball/patches/format/0002-Add-explicit-System.Text.Json-dependency.patch b/src/SourceBuild/tarball/patches/format/0002-Add-explicit-System.Text.Json-dependency.patch deleted file mode 100644 index ced7ca579..000000000 --- a/src/SourceBuild/tarball/patches/format/0002-Add-explicit-System.Text.Json-dependency.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Nikola Milosavljevic -Date: Mon, 26 Jun 2023 23:46:46 +0000 -Subject: [PATCH] Add explicit System.Text.Json dependency - -Adding an excplicit System.Text.Json dependency to prevent transitive dependency to be picked up -from PSB, via Microsoft.Build package. - -Backport: https://github.com/dotnet/format/pull/1887 ---- - Directory.Packages.props | 1 + - eng/Version.Details.xml | 4 ++++ - eng/Versions.props | 2 ++ - src/dotnet-format.csproj | 6 ++++++ - 4 files changed, 13 insertions(+) - -diff --git a/Directory.Packages.props b/Directory.Packages.props -index 6b628c22..c9f86593 100644 ---- a/Directory.Packages.props -+++ b/Directory.Packages.props -@@ -36,5 +36,6 @@ - - - -+ - - -\ No newline at end of file -diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml -index cdfa5f5e..86f02b44 100644 ---- a/eng/Version.Details.xml -+++ b/eng/Version.Details.xml -@@ -13,6 +13,10 @@ - https://github.com/dotnet/command-line-api - c776cd4e906b669b9cce1017fee7d0ba9845d163 - -+ -+ https://github.com/dotnet/runtime -+ 3241df7f2b0f3e2dada8d07229723c79fdbe4991 -+ - - - -diff --git a/eng/Versions.props b/eng/Versions.props -index 27582078..bccaf176 100644 ---- a/eng/Versions.props -+++ b/eng/Versions.props -@@ -20,6 +20,8 @@ - - 2.0.0-beta4.22504.1 - 0.4.0-alpha.22504.1 -+ -+ 6.0.8 - - -+ - - - From 1207a83f41885e65c9fec82fb179c39ca41d9d52 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 22 Aug 2023 18:00:49 +0000 Subject: [PATCH 4/8] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230822.7 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.308 -> To Version 7.0.308 Dependency coherency updates Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,VS.Redist.Common.NetCore.SharedFramework.x64.7.0 From Version 7.0.11 -> To Version 7.0.11 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 30 +++++++++++++++--------------- eng/Versions.props | 8 ++++---- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/NuGet.config b/NuGet.config index fe55a3a6e..d32aa5b64 100644 --- a/NuGet.config +++ b/NuGet.config @@ -16,10 +16,10 @@ - + - + @@ -47,9 +47,9 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 647c5821c..27f427750 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop c9f28c6a29182e54d1c292d1cff9778315cee51c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - de7841221e4ad56750e452db8ac4eab459b2ab23 + 41b7214ace077c230589720cf3460073d1bbd948 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - de7841221e4ad56750e452db8ac4eab459b2ab23 + 41b7214ace077c230589720cf3460073d1bbd948 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - de7841221e4ad56750e452db8ac4eab459b2ab23 + 41b7214ace077c230589720cf3460073d1bbd948 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - de7841221e4ad56750e452db8ac4eab459b2ab23 + 41b7214ace077c230589720cf3460073d1bbd948 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - de7841221e4ad56750e452db8ac4eab459b2ab23 + 41b7214ace077c230589720cf3460073d1bbd948 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - de7841221e4ad56750e452db8ac4eab459b2ab23 + 41b7214ace077c230589720cf3460073d1bbd948 @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f228b17d671d0196fa19fb77fdf57ca5d7b9871b + ec5aa7cde49700e67dc2f1a77e713c0c3bd26b6f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f228b17d671d0196fa19fb77fdf57ca5d7b9871b + ec5aa7cde49700e67dc2f1a77e713c0c3bd26b6f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f228b17d671d0196fa19fb77fdf57ca5d7b9871b + ec5aa7cde49700e67dc2f1a77e713c0c3bd26b6f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f228b17d671d0196fa19fb77fdf57ca5d7b9871b + ec5aa7cde49700e67dc2f1a77e713c0c3bd26b6f diff --git a/eng/Versions.props b/eng/Versions.props index f17bca02c..36faaa323 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.308 - 7.0.308-servicing.23416.55 - 7.0.308-servicing.23416.55 + 7.0.308-servicing.23422.7 + 7.0.308-servicing.23422.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -86,8 +86,8 @@ - 7.0.11-servicing.23415.17 - 7.0.11-servicing.23415.17 + 7.0.11-servicing.23418.12 + 7.0.11-servicing.23418.12 7.0.11 7.0.11 7.0.11 From 141c0a7453627adbc1f72e38071e4444d811ff35 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 22 Aug 2023 22:24:02 +0000 Subject: [PATCH 5/8] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230822.25 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.308 -> To Version 7.0.308 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 7.0.11 -> To Version 7.0.11 (parent: Microsoft.NET.Sdk --- NuGet.config | 12 ++++----- eng/Version.Details.xml | 58 ++++++++++++++++++++--------------------- eng/Versions.props | 22 ++++++++-------- 3 files changed, 46 insertions(+), 46 deletions(-) diff --git a/NuGet.config b/NuGet.config index d32aa5b64..43bad0279 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,7 +10,7 @@ - + @@ -19,10 +19,10 @@ - + - + @@ -44,15 +44,15 @@ - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 27f427750..8945ff865 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c9f28c6a29182e54d1c292d1cff9778315cee51c + 721967ad57b950287505e20f9953ff14b9a10485 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c9f28c6a29182e54d1c292d1cff9778315cee51c + 721967ad57b950287505e20f9953ff14b9a10485 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c9f28c6a29182e54d1c292d1cff9778315cee51c + 721967ad57b950287505e20f9953ff14b9a10485 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c9f28c6a29182e54d1c292d1cff9778315cee51c + 721967ad57b950287505e20f9953ff14b9a10485 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 29b232880d00408f61601fd63a87d54784dde835 + cf068f24c37b6166910886b26bde7bd32bf71259 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 29b232880d00408f61601fd63a87d54784dde835 + cf068f24c37b6166910886b26bde7bd32bf71259 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 29b232880d00408f61601fd63a87d54784dde835 + cf068f24c37b6166910886b26bde7bd32bf71259 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 29b232880d00408f61601fd63a87d54784dde835 + cf068f24c37b6166910886b26bde7bd32bf71259 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 29b232880d00408f61601fd63a87d54784dde835 + cf068f24c37b6166910886b26bde7bd32bf71259 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 29b232880d00408f61601fd63a87d54784dde835 + cf068f24c37b6166910886b26bde7bd32bf71259 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 29b232880d00408f61601fd63a87d54784dde835 + cf068f24c37b6166910886b26bde7bd32bf71259 https://github.com/dotnet/test-templates @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ec5aa7cde49700e67dc2f1a77e713c0c3bd26b6f + 5e1f89ce74e9a890047bc6374af04d0f4a050eab - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ec5aa7cde49700e67dc2f1a77e713c0c3bd26b6f + 5e1f89ce74e9a890047bc6374af04d0f4a050eab - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ec5aa7cde49700e67dc2f1a77e713c0c3bd26b6f + 5e1f89ce74e9a890047bc6374af04d0f4a050eab - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ec5aa7cde49700e67dc2f1a77e713c0c3bd26b6f + 5e1f89ce74e9a890047bc6374af04d0f4a050eab - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 639189647d647da4008fa57fd63b1d415c84b487 + 81760b1e789d848e1c44733615cf2939159603a3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 8037dc673134da614f02f4b84f6a9a61e047ae60 + aea83fde388f1f90c7068116c2653b12e31bac40 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 36faaa323..63da1f5ba 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.11-servicing.23416.5 + 7.0.11-servicing.23422.3 - 7.0.11-servicing.23416.7 + 7.0.11-servicing.23422.2 @@ -58,11 +58,11 @@ 7.0.11 7.0.11 - 7.0.11-servicing.23416.1 - 7.0.11-servicing.23416.1 - 7.0.11-servicing.23416.1 - 7.0.11-servicing.23416.1 - 7.0.11-servicing.23416.1 + 7.0.11-servicing.23422.8 + 7.0.11-servicing.23422.8 + 7.0.11-servicing.23422.8 + 7.0.11-servicing.23422.8 + 7.0.11-servicing.23422.8 0.2.0 @@ -70,8 +70,8 @@ 7.0.308 - 7.0.308-servicing.23422.7 - 7.0.308-servicing.23422.7 + 7.0.308-servicing.23422.25 + 7.0.308-servicing.23422.25 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -96,8 +96,8 @@ - 7.0.11-servicing.23416.8 - 7.0.11-servicing.23416.8 + 7.0.11-servicing.23422.3 + 7.0.11-servicing.23422.3 7.0.11 7.0.11 From ad11d7f236395263aea24ee76c1adc7a23ecb5d3 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 25 Aug 2023 16:01:57 +0000 Subject: [PATCH 6/8] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230825.20 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.308 -> To Version 7.0.308 Dependency coherency updates Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.11 -> To Version 7.0.11 (parent: Microsoft.NET.Sdk --- NuGet.config | 10 +++++----- eng/Version.Details.xml | 34 +++++++++++++++++----------------- eng/Versions.props | 8 ++++---- 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/NuGet.config b/NuGet.config index 43bad0279..2d3540811 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,13 +13,13 @@ - + - + - + @@ -47,9 +47,9 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8945ff865..abfc60fc0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 721967ad57b950287505e20f9953ff14b9a10485 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 41b7214ace077c230589720cf3460073d1bbd948 + ecb34f85ec92e1b3c814edf7da83337e199e7f66 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 41b7214ace077c230589720cf3460073d1bbd948 + ecb34f85ec92e1b3c814edf7da83337e199e7f66 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 41b7214ace077c230589720cf3460073d1bbd948 + ecb34f85ec92e1b3c814edf7da83337e199e7f66 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 41b7214ace077c230589720cf3460073d1bbd948 + ecb34f85ec92e1b3c814edf7da83337e199e7f66 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 41b7214ace077c230589720cf3460073d1bbd948 + ecb34f85ec92e1b3c814edf7da83337e199e7f66 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 41b7214ace077c230589720cf3460073d1bbd948 + ecb34f85ec92e1b3c814edf7da83337e199e7f66 @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5e1f89ce74e9a890047bc6374af04d0f4a050eab + 95fefa4d1dd7f80800dc00d747cd2d5fd4b3c45a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5e1f89ce74e9a890047bc6374af04d0f4a050eab + 95fefa4d1dd7f80800dc00d747cd2d5fd4b3c45a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5e1f89ce74e9a890047bc6374af04d0f4a050eab + 95fefa4d1dd7f80800dc00d747cd2d5fd4b3c45a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5e1f89ce74e9a890047bc6374af04d0f4a050eab + 95fefa4d1dd7f80800dc00d747cd2d5fd4b3c45a @@ -169,11 +169,11 @@ https://github.com/dotnet/emsdk - fcd8602188cfe2f73c73f5ae57e33c0654ce9858 + 79b01e47d43eeba5442af569770480696102972f https://github.com/dotnet/emsdk - fcd8602188cfe2f73c73f5ae57e33c0654ce9858 + 79b01e47d43eeba5442af569770480696102972f https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index 63da1f5ba..5c76d0db3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.308 - 7.0.308-servicing.23422.25 - 7.0.308-servicing.23422.25 + 7.0.308-servicing.23425.20 + 7.0.308-servicing.23425.20 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -86,8 +86,8 @@ - 7.0.11-servicing.23418.12 - 7.0.11-servicing.23418.12 + 7.0.11-servicing.23424.27 + 7.0.11-servicing.23424.27 7.0.11 7.0.11 7.0.11 From 85f6922cb3b4a6115f1e3fde9c8c99da130346d8 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 25 Aug 2023 19:00:44 +0000 Subject: [PATCH 7/8] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230825.34 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.308 -> To Version 7.0.308 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets From Version 7.0.11 -> To Version 7.0.11 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 38 +++++++++++++++++++------------------- eng/Versions.props | 14 +++++++------- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/NuGet.config b/NuGet.config index 2d3540811..f4c5be77c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,7 +10,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -44,12 +44,12 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index abfc60fc0..1abc874bb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cf068f24c37b6166910886b26bde7bd32bf71259 + 70048beee894074e9718206a0017d9b080ee66ff - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cf068f24c37b6166910886b26bde7bd32bf71259 + 70048beee894074e9718206a0017d9b080ee66ff https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cf068f24c37b6166910886b26bde7bd32bf71259 + 70048beee894074e9718206a0017d9b080ee66ff - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cf068f24c37b6166910886b26bde7bd32bf71259 + 70048beee894074e9718206a0017d9b080ee66ff - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cf068f24c37b6166910886b26bde7bd32bf71259 + 70048beee894074e9718206a0017d9b080ee66ff - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cf068f24c37b6166910886b26bde7bd32bf71259 + 70048beee894074e9718206a0017d9b080ee66ff - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cf068f24c37b6166910886b26bde7bd32bf71259 + 70048beee894074e9718206a0017d9b080ee66ff https://github.com/dotnet/test-templates @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 95fefa4d1dd7f80800dc00d747cd2d5fd4b3c45a + f469d782833a83a3c210f3ed1807f2c05a2ba6d4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 95fefa4d1dd7f80800dc00d747cd2d5fd4b3c45a + f469d782833a83a3c210f3ed1807f2c05a2ba6d4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 95fefa4d1dd7f80800dc00d747cd2d5fd4b3c45a + f469d782833a83a3c210f3ed1807f2c05a2ba6d4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 95fefa4d1dd7f80800dc00d747cd2d5fd4b3c45a + f469d782833a83a3c210f3ed1807f2c05a2ba6d4 diff --git a/eng/Versions.props b/eng/Versions.props index 5c76d0db3..de74eb863 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,11 +58,11 @@ 7.0.11 7.0.11 - 7.0.11-servicing.23422.8 - 7.0.11-servicing.23422.8 - 7.0.11-servicing.23422.8 - 7.0.11-servicing.23422.8 - 7.0.11-servicing.23422.8 + 7.0.11-servicing.23425.2 + 7.0.11-servicing.23425.2 + 7.0.11-servicing.23425.2 + 7.0.11-servicing.23425.2 + 7.0.11-servicing.23425.2 0.2.0 @@ -70,8 +70,8 @@ 7.0.308 - 7.0.308-servicing.23425.20 - 7.0.308-servicing.23425.20 + 7.0.308-servicing.23425.34 + 7.0.308-servicing.23425.34 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 6c569fb358b5052929648fb24c7f20a79c145b8d Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 25 Aug 2023 21:44:28 +0000 Subject: [PATCH 8/8] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230825.45 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.308 -> To Version 7.0.308 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 7.0.11 -> To Version 7.0.11 (parent: Microsoft.NET.Sdk --- 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 f4c5be77c..cc1a1596f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,10 +19,10 @@ - + - + @@ -49,10 +49,10 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1abc874bb..aefc4f1b5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 721967ad57b950287505e20f9953ff14b9a10485 + b193aa2e8630cef7ac1d858be3677b0c129e2faf - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 721967ad57b950287505e20f9953ff14b9a10485 + b193aa2e8630cef7ac1d858be3677b0c129e2faf - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 721967ad57b950287505e20f9953ff14b9a10485 + b193aa2e8630cef7ac1d858be3677b0c129e2faf https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 721967ad57b950287505e20f9953ff14b9a10485 + b193aa2e8630cef7ac1d858be3677b0c129e2faf https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f469d782833a83a3c210f3ed1807f2c05a2ba6d4 + 3df19b5c2397628b241f0785320858fa0ab1d9aa - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f469d782833a83a3c210f3ed1807f2c05a2ba6d4 + 3df19b5c2397628b241f0785320858fa0ab1d9aa - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f469d782833a83a3c210f3ed1807f2c05a2ba6d4 + 3df19b5c2397628b241f0785320858fa0ab1d9aa - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f469d782833a83a3c210f3ed1807f2c05a2ba6d4 + 3df19b5c2397628b241f0785320858fa0ab1d9aa - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 81760b1e789d848e1c44733615cf2939159603a3 + 66db733312de7bd21ed3e73cee0b27fb75d91b70 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - aea83fde388f1f90c7068116c2653b12e31bac40 + 6432861c5a360348a9e1a6cc76cced7bd25ab3f9 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index de74eb863..1eaede787 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.11-servicing.23422.3 + 7.0.11-servicing.23425.2 - 7.0.11-servicing.23422.2 + 7.0.11-servicing.23425.6 @@ -70,8 +70,8 @@ 7.0.308 - 7.0.308-servicing.23425.34 - 7.0.308-servicing.23425.34 + 7.0.308-servicing.23425.45 + 7.0.308-servicing.23425.45 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -96,8 +96,8 @@ - 7.0.11-servicing.23422.3 - 7.0.11-servicing.23422.3 + 7.0.11-servicing.23425.5 + 7.0.11-servicing.23425.5 7.0.11 7.0.11