From 77472533fb771b4b44bc1828e830576b1b63b9ec Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 23 Nov 2023 14:04:27 +0000 Subject: [PATCH 1/2] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231123.15 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.404 -> To Version 7.0.405 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.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,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.14 -> To Version 7.0.15 (parent: Microsoft.NET.Sdk --- NuGet.config | 36 ++++---------- eng/Version.Details.xml | 108 ++++++++++++++++++++-------------------- eng/Versions.props | 48 +++++++++--------- 3 files changed, 87 insertions(+), 105 deletions(-) diff --git a/NuGet.config b/NuGet.config index 7b13934dc..39ef38a7d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,29 +10,19 @@ - - - + - - - + - - - + - - - + - - - + @@ -54,23 +44,15 @@ - - - + - - - + - - - + - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6ed02abb3..b6e30859f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 496fa854ae2f96619af99b5256fde77bc1a58f36 + ca95fcf7c597897f881e9c3df18a626d77ef7625 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 496fa854ae2f96619af99b5256fde77bc1a58f36 + ca95fcf7c597897f881e9c3df18a626d77ef7625 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 496fa854ae2f96619af99b5256fde77bc1a58f36 + ca95fcf7c597897f881e9c3df18a626d77ef7625 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 496fa854ae2f96619af99b5256fde77bc1a58f36 + ca95fcf7c597897f881e9c3df18a626d77ef7625 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 808851b07acfa1c5c94b0d4f9fb50debedb2df70 + 8f4568cdaa2f9654fd133a17cd2dcc55b5f42455 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 808851b07acfa1c5c94b0d4f9fb50debedb2df70 + 8f4568cdaa2f9654fd133a17cd2dcc55b5f42455 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 808851b07acfa1c5c94b0d4f9fb50debedb2df70 + 8f4568cdaa2f9654fd133a17cd2dcc55b5f42455 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 808851b07acfa1c5c94b0d4f9fb50debedb2df70 + 8f4568cdaa2f9654fd133a17cd2dcc55b5f42455 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 808851b07acfa1c5c94b0d4f9fb50debedb2df70 + 8f4568cdaa2f9654fd133a17cd2dcc55b5f42455 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 808851b07acfa1c5c94b0d4f9fb50debedb2df70 + 8f4568cdaa2f9654fd133a17cd2dcc55b5f42455 @@ -52,34 +52,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0a715692d8e2536c899faa0bb4f0cec2c2e33e36 + 9e3f7e4306c441dffcf9f3a8bf45a04a549f6ea3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0a715692d8e2536c899faa0bb4f0cec2c2e33e36 + 9e3f7e4306c441dffcf9f3a8bf45a04a549f6ea3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0a715692d8e2536c899faa0bb4f0cec2c2e33e36 + 9e3f7e4306c441dffcf9f3a8bf45a04a549f6ea3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0a715692d8e2536c899faa0bb4f0cec2c2e33e36 + 9e3f7e4306c441dffcf9f3a8bf45a04a549f6ea3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0a715692d8e2536c899faa0bb4f0cec2c2e33e36 + 9e3f7e4306c441dffcf9f3a8bf45a04a549f6ea3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0a715692d8e2536c899faa0bb4f0cec2c2e33e36 + 9e3f7e4306c441dffcf9f3a8bf45a04a549f6ea3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0a715692d8e2536c899faa0bb4f0cec2c2e33e36 + 9e3f7e4306c441dffcf9f3a8bf45a04a549f6ea3 https://github.com/dotnet/test-templates @@ -98,39 +98,39 @@ e1aecaf3a332e25fae8cc7aa09d524b5e7c4a47a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9c9a004b724e438d299dabbe3e202d03e5eb996b + 3385d5595bf14894370e86d69ce8d2c9c3772126 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9c9a004b724e438d299dabbe3e202d03e5eb996b + 3385d5595bf14894370e86d69ce8d2c9c3772126 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9c9a004b724e438d299dabbe3e202d03e5eb996b + 3385d5595bf14894370e86d69ce8d2c9c3772126 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9c9a004b724e438d299dabbe3e202d03e5eb996b + 3385d5595bf14894370e86d69ce8d2c9c3772126 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - f1570f38b63db12bfd8714a942ec33de2275edf6 + ce000d354195dfb9e0f8039a74d303f61afcf9c9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 8784c26bc219f5b75f1315e1b6b7c1da924d5e32 + 226928a35528d63540ed0c8eb4f749d51c9667e9 - + https://github.com/dotnet/fsharp - 67d3bb96b714d8f17d87876cc9f4afbe83afcf49 + 3916deb12ef7c99509217f5e5de4821b92db901a - + https://github.com/dotnet/fsharp - 67d3bb96b714d8f17d87876cc9f4afbe83afcf49 + 3916deb12ef7c99509217f5e5de4821b92db901a @@ -167,13 +167,13 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 942bfc8cb73e3cfea523cb0a2f08b415b2220358 + 33b038b591f6e19c32a390333d41292cbd86d93c - + https://github.com/dotnet/emsdk - 942bfc8cb73e3cfea523cb0a2f08b415b2220358 + 33b038b591f6e19c32a390333d41292cbd86d93c https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index 122ba126e..599f9cbde 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.14-servicing.23520.9 + 7.0.15-servicing.23570.16 - 7.0.14-servicing.23520.2 + 7.0.15-servicing.23572.2 @@ -56,22 +56,22 @@ - 7.0.14 - 7.0.14 - 7.0.14-servicing.23523.16 - 7.0.14-servicing.23523.16 - 7.0.14-servicing.23523.16 - 7.0.14-servicing.23523.16 - 7.0.14-servicing.23523.16 + 7.0.15 + 7.0.15 + 7.0.15-servicing.23572.11 + 7.0.15-servicing.23572.11 + 7.0.15-servicing.23572.11 + 7.0.15-servicing.23572.11 + 7.0.15-servicing.23572.11 0.2.0 - 7.0.404 - 7.0.404-servicing.23523.39 - 7.0.404-servicing.23523.39 + 7.0.405 + 7.0.405-servicing.23573.15 + 7.0.405-servicing.23573.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -86,20 +86,20 @@ - 7.0.14-servicing.23519.10 - 7.0.14-servicing.23519.10 - 7.0.14 - 7.0.14 - 7.0.14 - 7.0.14 + 7.0.15-servicing.23572.26 + 7.0.15-servicing.23572.26 + 7.0.15 + 7.0.15 + 7.0.15 + 7.0.15 2.1.0 - 7.0.14-servicing.23520.7 - 7.0.14-servicing.23520.7 - 7.0.14 - 7.0.14 + 7.0.15-servicing.23572.3 + 7.0.15-servicing.23572.3 + 7.0.15 + 7.0.15 @@ -233,8 +233,8 @@ 12.3.2372 16.0.1478 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.14 - 7.0.14 + 7.0.15 + 7.0.15 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version) From 84bca2d0338e07d345d210de3272295e191fd0c9 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 24 Nov 2023 00:02:42 +0000 Subject: [PATCH 2/2] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231123.36 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.404 -> To Version 7.0.405 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.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,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.14 -> To Version 7.0.15 (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 39ef38a7d..eb2810961 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 b6e30859f..c9a3cc6cd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ca95fcf7c597897f881e9c3df18a626d77ef7625 + 85778644ee928ab3eb11aac4fef9176851dd9b21 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ca95fcf7c597897f881e9c3df18a626d77ef7625 + 85778644ee928ab3eb11aac4fef9176851dd9b21 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ca95fcf7c597897f881e9c3df18a626d77ef7625 + 85778644ee928ab3eb11aac4fef9176851dd9b21 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ca95fcf7c597897f881e9c3df18a626d77ef7625 + 85778644ee928ab3eb11aac4fef9176851dd9b21 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9e3f7e4306c441dffcf9f3a8bf45a04a549f6ea3 + ef956a2bd9f33b27eb983d339fa6dbb186db8247 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9e3f7e4306c441dffcf9f3a8bf45a04a549f6ea3 + ef956a2bd9f33b27eb983d339fa6dbb186db8247 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9e3f7e4306c441dffcf9f3a8bf45a04a549f6ea3 + ef956a2bd9f33b27eb983d339fa6dbb186db8247 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9e3f7e4306c441dffcf9f3a8bf45a04a549f6ea3 + ef956a2bd9f33b27eb983d339fa6dbb186db8247 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9e3f7e4306c441dffcf9f3a8bf45a04a549f6ea3 + ef956a2bd9f33b27eb983d339fa6dbb186db8247 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9e3f7e4306c441dffcf9f3a8bf45a04a549f6ea3 + ef956a2bd9f33b27eb983d339fa6dbb186db8247 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9e3f7e4306c441dffcf9f3a8bf45a04a549f6ea3 + ef956a2bd9f33b27eb983d339fa6dbb186db8247 https://github.com/dotnet/test-templates @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3385d5595bf14894370e86d69ce8d2c9c3772126 + fffcfa569ab3e3a71f7f81264eec62ef152bdf51 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3385d5595bf14894370e86d69ce8d2c9c3772126 + fffcfa569ab3e3a71f7f81264eec62ef152bdf51 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3385d5595bf14894370e86d69ce8d2c9c3772126 + fffcfa569ab3e3a71f7f81264eec62ef152bdf51 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3385d5595bf14894370e86d69ce8d2c9c3772126 + fffcfa569ab3e3a71f7f81264eec62ef152bdf51 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - ce000d354195dfb9e0f8039a74d303f61afcf9c9 + 1d272c1ef7277b7cc38148300732e6a72848bedc - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 226928a35528d63540ed0c8eb4f749d51c9667e9 + aed20729942488335ab21d7bb03a92d87afdb9b1 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 599f9cbde..ec1a28869 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.15-servicing.23570.16 + 7.0.15-servicing.23573.3 - 7.0.15-servicing.23572.2 + 7.0.15-servicing.23573.2 @@ -58,11 +58,11 @@ 7.0.15 7.0.15 - 7.0.15-servicing.23572.11 - 7.0.15-servicing.23572.11 - 7.0.15-servicing.23572.11 - 7.0.15-servicing.23572.11 - 7.0.15-servicing.23572.11 + 7.0.15-servicing.23573.7 + 7.0.15-servicing.23573.7 + 7.0.15-servicing.23573.7 + 7.0.15-servicing.23573.7 + 7.0.15-servicing.23573.7 0.2.0 @@ -70,8 +70,8 @@ 7.0.405 - 7.0.405-servicing.23573.15 - 7.0.405-servicing.23573.15 + 7.0.405-servicing.23573.36 + 7.0.405-servicing.23573.36 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -96,8 +96,8 @@ - 7.0.15-servicing.23572.3 - 7.0.15-servicing.23572.3 + 7.0.15-servicing.23573.2 + 7.0.15-servicing.23573.2 7.0.15 7.0.15