From 6af34f16266eb99ba78e66dbe5a7dec756d72232 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 23 Nov 2023 14:01:59 +0000 Subject: [PATCH 001/138] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231123.14 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.311 -> To Version 7.0.312 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,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 | 100 ++++++++++++++++++++-------------------- eng/Versions.props | 48 +++++++++---------- 3 files changed, 83 insertions(+), 101 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6965e587b..25b3d1da7 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 5a3d473a0..66d5805f9 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,31 +98,31 @@ 45a41b353d078e4d1e5918246fddbacb452eb210 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c4047673ed10f28cc58ad806c54e25037b0469d8 + 53f8ac9623231a8c1ae976102f70d97e457a0378 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c4047673ed10f28cc58ad806c54e25037b0469d8 + 53f8ac9623231a8c1ae976102f70d97e457a0378 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c4047673ed10f28cc58ad806c54e25037b0469d8 + 53f8ac9623231a8c1ae976102f70d97e457a0378 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c4047673ed10f28cc58ad806c54e25037b0469d8 + 53f8ac9623231a8c1ae976102f70d97e457a0378 - + 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 @@ -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 3012a3afa..19fce438b 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.311 - 7.0.311-servicing.23523.38 - 7.0.311-servicing.23523.38 + 7.0.312 + 7.0.312-servicing.23573.14 + 7.0.312-servicing.23573.14 $(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 @@ -231,8 +231,8 @@ 12.3.2372 16.0.1478 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.14 - 7.0.14 + 7.0.15 + 7.0.15 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version) From 77472533fb771b4b44bc1828e830576b1b63b9ec Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 23 Nov 2023 14:04:27 +0000 Subject: [PATCH 002/138] 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 9840fd11dbffdee6c797f8daec3a15c8186e2cc2 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 23 Nov 2023 17:45:14 +0000 Subject: [PATCH 003/138] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231123.32 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.311 -> To Version 7.0.312 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,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 25b3d1da7..65e2ee623 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 66d5805f9..65785a115 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 - 53f8ac9623231a8c1ae976102f70d97e457a0378 + f48767b966f407a6a74953ea6cb0ac61f610b4dd - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 53f8ac9623231a8c1ae976102f70d97e457a0378 + f48767b966f407a6a74953ea6cb0ac61f610b4dd - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 53f8ac9623231a8c1ae976102f70d97e457a0378 + f48767b966f407a6a74953ea6cb0ac61f610b4dd - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 53f8ac9623231a8c1ae976102f70d97e457a0378 + f48767b966f407a6a74953ea6cb0ac61f610b4dd - + 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 19fce438b..018a55ab1 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.312 - 7.0.312-servicing.23573.14 - 7.0.312-servicing.23573.14 + 7.0.312-servicing.23573.32 + 7.0.312-servicing.23573.32 $(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 From 84bca2d0338e07d345d210de3272295e191fd0c9 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 24 Nov 2023 00:02:42 +0000 Subject: [PATCH 004/138] 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 From b5cff2c060b5b4427d69dc3941ce702de71f220d Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 24 Nov 2023 09:44:49 +0000 Subject: [PATCH 005/138] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231123.33 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.114 -> To Version 7.0.115 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,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 | 30 ++++-------- eng/Version.Details.xml | 100 ++++++++++++++++++++-------------------- eng/Versions.props | 48 +++++++++---------- 3 files changed, 83 insertions(+), 95 deletions(-) diff --git a/NuGet.config b/NuGet.config index be7632bd2..529576f58 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,29 +7,22 @@ + - - - + - - - + - - - + - - - + @@ -51,20 +44,15 @@ + - - - + - - - + - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a464c3fa3..7cfc48c06 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 + 85778644ee928ab3eb11aac4fef9176851dd9b21 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 496fa854ae2f96619af99b5256fde77bc1a58f36 + 85778644ee928ab3eb11aac4fef9176851dd9b21 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 496fa854ae2f96619af99b5256fde77bc1a58f36 + 85778644ee928ab3eb11aac4fef9176851dd9b21 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 496fa854ae2f96619af99b5256fde77bc1a58f36 + 85778644ee928ab3eb11aac4fef9176851dd9b21 - + 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 + ef956a2bd9f33b27eb983d339fa6dbb186db8247 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0a715692d8e2536c899faa0bb4f0cec2c2e33e36 + ef956a2bd9f33b27eb983d339fa6dbb186db8247 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0a715692d8e2536c899faa0bb4f0cec2c2e33e36 + ef956a2bd9f33b27eb983d339fa6dbb186db8247 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0a715692d8e2536c899faa0bb4f0cec2c2e33e36 + ef956a2bd9f33b27eb983d339fa6dbb186db8247 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0a715692d8e2536c899faa0bb4f0cec2c2e33e36 + ef956a2bd9f33b27eb983d339fa6dbb186db8247 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0a715692d8e2536c899faa0bb4f0cec2c2e33e36 + ef956a2bd9f33b27eb983d339fa6dbb186db8247 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0a715692d8e2536c899faa0bb4f0cec2c2e33e36 + ef956a2bd9f33b27eb983d339fa6dbb186db8247 https://github.com/dotnet/test-templates @@ -98,31 +98,31 @@ aaaa0c1826f97a9dfcc67e94136bf01010b55f23 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5a4609a27acc779cb68107922b00418cc6b907a9 + fc561a76355e98597193f4c42b5649ead791f0c2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5a4609a27acc779cb68107922b00418cc6b907a9 + fc561a76355e98597193f4c42b5649ead791f0c2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5a4609a27acc779cb68107922b00418cc6b907a9 + fc561a76355e98597193f4c42b5649ead791f0c2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5a4609a27acc779cb68107922b00418cc6b907a9 + fc561a76355e98597193f4c42b5649ead791f0c2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - f1570f38b63db12bfd8714a942ec33de2275edf6 + 1d272c1ef7277b7cc38148300732e6a72848bedc - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 8784c26bc219f5b75f1315e1b6b7c1da924d5e32 + aed20729942488335ab21d7bb03a92d87afdb9b1 https://github.com/dotnet/fsharp @@ -163,13 +163,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 a42e5dcf5..90a2db59b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.14-servicing.23520.9 + 7.0.15-servicing.23573.3 - 7.0.14-servicing.23520.2 + 7.0.15-servicing.23573.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.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 - 7.0.114 - 7.0.114-servicing.23523.36 - 7.0.114-servicing.23523.36 + 7.0.115 + 7.0.115-servicing.23573.33 + 7.0.115-servicing.23573.33 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -82,20 +82,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.23573.2 + 7.0.15-servicing.23573.2 + 7.0.15 + 7.0.15 @@ -228,8 +228,8 @@ 12.3.2372 16.0.1478 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.14 - 7.0.14 + 7.0.15 + 7.0.15 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version) From 6e81116e906f2cbf27e6c1d67068c05182c8a471 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 24 Nov 2023 11:26:33 +0000 Subject: [PATCH 006/138] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231121.10 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.114 -> To Version 7.0.115 --- 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 529576f58..d1253ca2d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,7 +19,7 @@ - + @@ -49,7 +49,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7cfc48c06..169f1cad1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fc561a76355e98597193f4c42b5649ead791f0c2 + 801716d201fabb3c3500c6734b0f8b855a36bae9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fc561a76355e98597193f4c42b5649ead791f0c2 + 801716d201fabb3c3500c6734b0f8b855a36bae9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fc561a76355e98597193f4c42b5649ead791f0c2 + 801716d201fabb3c3500c6734b0f8b855a36bae9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fc561a76355e98597193f4c42b5649ead791f0c2 + 801716d201fabb3c3500c6734b0f8b855a36bae9 diff --git a/eng/Versions.props b/eng/Versions.props index 90a2db59b..410f1b3f0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.115 - 7.0.115-servicing.23573.33 - 7.0.115-servicing.23573.33 + 7.0.115-servicing.23571.10 + 7.0.115-servicing.23571.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 777556879646f1dc25b82c0a5736ff4b6ca4162b Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 24 Nov 2023 11:26:41 +0000 Subject: [PATCH 007/138] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231123.11 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.115 -> To Version 7.0.115 --- 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 d1253ca2d..07374752c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,7 +19,7 @@ - + @@ -49,7 +49,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 169f1cad1..a348c8fa1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 801716d201fabb3c3500c6734b0f8b855a36bae9 + 2db31ae526dc60b176641dde6422f68ae2fab31d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 801716d201fabb3c3500c6734b0f8b855a36bae9 + 2db31ae526dc60b176641dde6422f68ae2fab31d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 801716d201fabb3c3500c6734b0f8b855a36bae9 + 2db31ae526dc60b176641dde6422f68ae2fab31d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 801716d201fabb3c3500c6734b0f8b855a36bae9 + 2db31ae526dc60b176641dde6422f68ae2fab31d diff --git a/eng/Versions.props b/eng/Versions.props index 410f1b3f0..92a56de33 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.115 - 7.0.115-servicing.23571.10 - 7.0.115-servicing.23571.10 + 7.0.115-servicing.23573.11 + 7.0.115-servicing.23573.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 02b92181eb69e909194f7fe59b249e7436a6f0d8 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 24 Nov 2023 11:26:50 +0000 Subject: [PATCH 008/138] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231123.33 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.115 -> To Version 7.0.115 --- 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 07374752c..529576f58 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,7 +19,7 @@ - + @@ -49,7 +49,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a348c8fa1..7cfc48c06 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2db31ae526dc60b176641dde6422f68ae2fab31d + fc561a76355e98597193f4c42b5649ead791f0c2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2db31ae526dc60b176641dde6422f68ae2fab31d + fc561a76355e98597193f4c42b5649ead791f0c2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2db31ae526dc60b176641dde6422f68ae2fab31d + fc561a76355e98597193f4c42b5649ead791f0c2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2db31ae526dc60b176641dde6422f68ae2fab31d + fc561a76355e98597193f4c42b5649ead791f0c2 diff --git a/eng/Versions.props b/eng/Versions.props index 92a56de33..90a2db59b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.115 - 7.0.115-servicing.23573.11 - 7.0.115-servicing.23573.11 + 7.0.115-servicing.23573.33 + 7.0.115-servicing.23573.33 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 6f0a96cb187bf2263a492fa639c4c36509dc07dd Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 24 Nov 2023 11:26:59 +0000 Subject: [PATCH 009/138] 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,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 From 5be1fe4923f9f0ca0e96ebaa27a7500f75607b6b Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 24 Nov 2023 11:47:55 +0000 Subject: [PATCH 010/138] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231107.14 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.417-servicing.23523.41 -> To Version 6.0.418-servicing.23557.14 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 492e94748..458cbbf6f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 42ab085a51763b862990e089c4b49e881d8b4e07 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 964a8fda7fbf584c0301cffcde43c959e0ea0275 + 767666138f79eee134f51f242473ec7d49c2a805 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 964a8fda7fbf584c0301cffcde43c959e0ea0275 + 767666138f79eee134f51f242473ec7d49c2a805 diff --git a/eng/Versions.props b/eng/Versions.props index 6407cb843..bf0084a59 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.417-servicing.23523.41 - 6.0.417-servicing.23523.41 + 6.0.418-servicing.23557.14 + 6.0.418-servicing.23557.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 11c4b95c74f9cf0485929d204f9c4af6848ca322 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 24 Nov 2023 11:48:17 +0000 Subject: [PATCH 011/138] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231124.1 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.125-servicing.23523.37 -> To Version 6.0.126-servicing.23574.1 Dependency coherency updates Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.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.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,VS.Redist.Common.NetCore.SharedFramework.x64.6.0 From Version 6.0.25 -> To Version 6.0.26 (parent: Microsoft.NET.Sdk --- NuGet.config | 6 ++++ eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 32 +++++++++---------- 3 files changed, 56 insertions(+), 50 deletions(-) diff --git a/NuGet.config b/NuGet.config index dd632b04b..03f09e6af 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,14 +7,17 @@ + + + @@ -37,11 +40,14 @@ + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 039431cba..a891e9673 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop a74946f8dae6d29fd18c8fc702e23f8fe77c729c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4 + 965a793efc765ddbea3c43e43c13b8e956b61946 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4 + 965a793efc765ddbea3c43e43c13b8e956b61946 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4 + 965a793efc765ddbea3c43e43c13b8e956b61946 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4 + 965a793efc765ddbea3c43e43c13b8e956b61946 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4 + 965a793efc765ddbea3c43e43c13b8e956b61946 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4 + 965a793efc765ddbea3c43e43c13b8e956b61946 @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime a08d9ce2caf02455c0b825bcdc32974bdf769a80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 36be7ed6d6d56b7da0a2891e3de7ecc2aa48eecd + 2813f390b0d8ad577f32f27a1c57031e56f02f45 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 36be7ed6d6d56b7da0a2891e3de7ecc2aa48eecd + 2813f390b0d8ad577f32f27a1c57031e56f02f45 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 36be7ed6d6d56b7da0a2891e3de7ecc2aa48eecd + 2813f390b0d8ad577f32f27a1c57031e56f02f45 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 36be7ed6d6d56b7da0a2891e3de7ecc2aa48eecd + 2813f390b0d8ad577f32f27a1c57031e56f02f45 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 36be7ed6d6d56b7da0a2891e3de7ecc2aa48eecd + 2813f390b0d8ad577f32f27a1c57031e56f02f45 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 36be7ed6d6d56b7da0a2891e3de7ecc2aa48eecd + 2813f390b0d8ad577f32f27a1c57031e56f02f45 https://github.com/dotnet/test-templates @@ -90,27 +90,27 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 7e5c0220b5ebe21277a6943f32ca92e666d30e37 + 8f42eeeef2041f39db00cf87a08ad9e6eb3f613d - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 7e5c0220b5ebe21277a6943f32ca92e666d30e37 + 8f42eeeef2041f39db00cf87a08ad9e6eb3f613d - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 7e5c0220b5ebe21277a6943f32ca92e666d30e37 + 8f42eeeef2041f39db00cf87a08ad9e6eb3f613d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a8b4ec801637f85c99edb62569b72d99c550da7e + cb1f8762b907a48ebcb8f8d41151559940b8258a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a8b4ec801637f85c99edb62569b72d99c550da7e + cb1f8762b907a48ebcb8f8d41151559940b8258a diff --git a/eng/Versions.props b/eng/Versions.props index 616f2592a..c2386ebf9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.125 + 6.0.126 @@ -44,20 +44,20 @@ - 6.0.25 - 6.0.25 - 6.0.25-servicing.23523.15 - 6.0.25-servicing.23523.15 - 6.0.25-servicing.23523.15 - 6.0.25-servicing.23523.15 + 6.0.26 + 6.0.26 + 6.0.26-servicing.23573.6 + 6.0.26-servicing.23573.6 + 6.0.26-servicing.23573.6 + 6.0.26-servicing.23573.6 0.2.0 - 6.0.125-servicing.23523.37 - 6.0.125-servicing.23523.37 + 6.0.126-servicing.23574.1 + 6.0.126-servicing.23574.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,12 +68,12 @@ - 6.0.25-servicing.23519.12 - 6.0.25-servicing.23519.12 - 6.0.25 - 6.0.25 - 6.0.25 - 6.0.25 + 6.0.26-servicing.23572.29 + 6.0.26-servicing.23572.29 + 6.0.26 + 6.0.26 + 6.0.26 + 6.0.26 2.1.0 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.125 + 6.0.126 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) From 7bdadf6e35fb04aa05157fe13995de55b5c9af45 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 24 Nov 2023 11:48:37 +0000 Subject: [PATCH 012/138] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231124.3 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.417-servicing.23523.41 -> To Version 6.0.418-servicing.23574.3 Dependency coherency updates Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.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.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,VS.Redist.Common.NetCore.SharedFramework.x64.6.0 From Version 6.0.25 -> To Version 6.0.26 (parent: Microsoft.NET.Sdk --- NuGet.config | 6 ++++ eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 32 +++++++++---------- 3 files changed, 56 insertions(+), 50 deletions(-) diff --git a/NuGet.config b/NuGet.config index 03d3587a6..1aa3642f7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,14 +7,17 @@ + + + @@ -37,10 +40,13 @@ + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 458cbbf6f..e8bd7fbb3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop a74946f8dae6d29fd18c8fc702e23f8fe77c729c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4 + 965a793efc765ddbea3c43e43c13b8e956b61946 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4 + 965a793efc765ddbea3c43e43c13b8e956b61946 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4 + 965a793efc765ddbea3c43e43c13b8e956b61946 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4 + 965a793efc765ddbea3c43e43c13b8e956b61946 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4 + 965a793efc765ddbea3c43e43c13b8e956b61946 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4 + 965a793efc765ddbea3c43e43c13b8e956b61946 @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime a08d9ce2caf02455c0b825bcdc32974bdf769a80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 36be7ed6d6d56b7da0a2891e3de7ecc2aa48eecd + 2813f390b0d8ad577f32f27a1c57031e56f02f45 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 36be7ed6d6d56b7da0a2891e3de7ecc2aa48eecd + 2813f390b0d8ad577f32f27a1c57031e56f02f45 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 36be7ed6d6d56b7da0a2891e3de7ecc2aa48eecd + 2813f390b0d8ad577f32f27a1c57031e56f02f45 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 36be7ed6d6d56b7da0a2891e3de7ecc2aa48eecd + 2813f390b0d8ad577f32f27a1c57031e56f02f45 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 36be7ed6d6d56b7da0a2891e3de7ecc2aa48eecd + 2813f390b0d8ad577f32f27a1c57031e56f02f45 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 36be7ed6d6d56b7da0a2891e3de7ecc2aa48eecd + 2813f390b0d8ad577f32f27a1c57031e56f02f45 https://github.com/dotnet/test-templates @@ -90,27 +90,27 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 42ab085a51763b862990e089c4b49e881d8b4e07 + 04cc3e115c98a8aa1fde4b1b45218ed6331c45c5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 42ab085a51763b862990e089c4b49e881d8b4e07 + 04cc3e115c98a8aa1fde4b1b45218ed6331c45c5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 42ab085a51763b862990e089c4b49e881d8b4e07 + 04cc3e115c98a8aa1fde4b1b45218ed6331c45c5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 767666138f79eee134f51f242473ec7d49c2a805 + 08ded598c2a2b41b45413b7462da49bdcea3c5a0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 767666138f79eee134f51f242473ec7d49c2a805 + 08ded598c2a2b41b45413b7462da49bdcea3c5a0 diff --git a/eng/Versions.props b/eng/Versions.props index bf0084a59..775638704 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.417 + 6.0.418 @@ -44,20 +44,20 @@ - 6.0.25 - 6.0.25 - 6.0.25-servicing.23523.15 - 6.0.25-servicing.23523.15 - 6.0.25-servicing.23523.15 - 6.0.25-servicing.23523.15 + 6.0.26 + 6.0.26 + 6.0.26-servicing.23573.6 + 6.0.26-servicing.23573.6 + 6.0.26-servicing.23573.6 + 6.0.26-servicing.23573.6 0.2.0 - 6.0.418-servicing.23557.14 - 6.0.418-servicing.23557.14 + 6.0.418-servicing.23574.3 + 6.0.418-servicing.23574.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,12 +68,12 @@ - 6.0.25-servicing.23519.12 - 6.0.25-servicing.23519.12 - 6.0.25 - 6.0.25 - 6.0.25 - 6.0.25 + 6.0.26-servicing.23572.29 + 6.0.26-servicing.23572.29 + 6.0.26 + 6.0.26 + 6.0.26 + 6.0.26 2.1.0 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.417 + 6.0.418 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) From 7e88e103532bc6b8c82f1f56305f1ef2d3fdc4bb Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 24 Nov 2023 11:48:52 +0000 Subject: [PATCH 013/138] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231107.13 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.320-servicing.23523.40 -> To Version 6.0.321-servicing.23557.13 Dependency coherency updates Microsoft.NET.Workload.Emscripten.Manifest-6.0.300 From Version 6.0.22 -> To Version 6.0.25 (parent: VS.Redist.Common.NetCore.SharedFramework.x64.6.0 --- NuGet.config | 8 -------- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 3 files changed, 9 insertions(+), 17 deletions(-) diff --git a/NuGet.config b/NuGet.config index df347d0f2..2cf5556c3 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,20 +7,16 @@ - - - - @@ -41,15 +37,11 @@ - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d5513d3a8..8b5940b6c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 6e525a642fe66413e4edf553f5bbc73ea5c866e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 733590df6146364699e0d3d8d465f2f8da15b063 + c07a6a58ea26fce79dad801f5fb862989cf41d1a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 733590df6146364699e0d3d8d465f2f8da15b063 + c07a6a58ea26fce79dad801f5fb862989cf41d1a @@ -166,9 +166,9 @@ 698fdad58fa64a55f16cd9562c90224cc498ed02 - + https://github.com/dotnet/emsdk - 3c754f28788fae642dc307a948479204e9f7dd5a + d8bc162ccf7ce14fdbec9c2c50d6e856a7063c91 https://github.com/dotnet/source-build diff --git a/eng/Versions.props b/eng/Versions.props index c689826cd..24c27b260 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.320-servicing.23523.40 - 6.0.320-servicing.23523.40 + 6.0.321-servicing.23557.13 + 6.0.321-servicing.23557.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -185,7 +185,7 @@ 12.3.100-rc.1.125 15.4.100-rc.1.125 6.0.4 - 6.0.22 + 6.0.25 $(MicrosoftNETWorkloadEmscriptenManifest60300Version) From 0ca2699de54d6a13c02fca0d129d92c1fd3efa08 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 24 Nov 2023 15:00:25 +0000 Subject: [PATCH 014/138] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231124.2 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.321-servicing.23557.13 -> To Version 6.0.321-servicing.23574.2 Dependency coherency updates Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.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.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,VS.Redist.Common.NetCore.SharedFramework.x64.6.0 From Version 6.0.25 -> To Version 6.0.26 (parent: Microsoft.NET.Sdk --- NuGet.config | 6 ++++ eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 32 +++++++++---------- 3 files changed, 56 insertions(+), 50 deletions(-) diff --git a/NuGet.config b/NuGet.config index 2cf5556c3..88cf52afd 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,14 +7,17 @@ + + + @@ -37,9 +40,12 @@ + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8b5940b6c..a6ece6385 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop a74946f8dae6d29fd18c8fc702e23f8fe77c729c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4 + 965a793efc765ddbea3c43e43c13b8e956b61946 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4 + 965a793efc765ddbea3c43e43c13b8e956b61946 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4 + 965a793efc765ddbea3c43e43c13b8e956b61946 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4 + 965a793efc765ddbea3c43e43c13b8e956b61946 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4 + 965a793efc765ddbea3c43e43c13b8e956b61946 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4 + 965a793efc765ddbea3c43e43c13b8e956b61946 @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime a08d9ce2caf02455c0b825bcdc32974bdf769a80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 36be7ed6d6d56b7da0a2891e3de7ecc2aa48eecd + 2813f390b0d8ad577f32f27a1c57031e56f02f45 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 36be7ed6d6d56b7da0a2891e3de7ecc2aa48eecd + 2813f390b0d8ad577f32f27a1c57031e56f02f45 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 36be7ed6d6d56b7da0a2891e3de7ecc2aa48eecd + 2813f390b0d8ad577f32f27a1c57031e56f02f45 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 36be7ed6d6d56b7da0a2891e3de7ecc2aa48eecd + 2813f390b0d8ad577f32f27a1c57031e56f02f45 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 36be7ed6d6d56b7da0a2891e3de7ecc2aa48eecd + 2813f390b0d8ad577f32f27a1c57031e56f02f45 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 36be7ed6d6d56b7da0a2891e3de7ecc2aa48eecd + 2813f390b0d8ad577f32f27a1c57031e56f02f45 https://github.com/dotnet/test-templates @@ -90,27 +90,27 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 6e525a642fe66413e4edf553f5bbc73ea5c866e5 + 6b4fc213e731cb128ad8ed54befea55d9e1d3f6d - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 6e525a642fe66413e4edf553f5bbc73ea5c866e5 + 6b4fc213e731cb128ad8ed54befea55d9e1d3f6d - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 6e525a642fe66413e4edf553f5bbc73ea5c866e5 + 6b4fc213e731cb128ad8ed54befea55d9e1d3f6d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c07a6a58ea26fce79dad801f5fb862989cf41d1a + 99f231333f8e3d364f357315d99e36473238b694 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c07a6a58ea26fce79dad801f5fb862989cf41d1a + 99f231333f8e3d364f357315d99e36473238b694 diff --git a/eng/Versions.props b/eng/Versions.props index 24c27b260..cf7e6d2c7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.320 + 6.0.321 @@ -44,20 +44,20 @@ - 6.0.25 - 6.0.25 - 6.0.25-servicing.23523.15 - 6.0.25-servicing.23523.15 - 6.0.25-servicing.23523.15 - 6.0.25-servicing.23523.15 + 6.0.26 + 6.0.26 + 6.0.26-servicing.23573.6 + 6.0.26-servicing.23573.6 + 6.0.26-servicing.23573.6 + 6.0.26-servicing.23573.6 0.2.0 - 6.0.321-servicing.23557.13 - 6.0.321-servicing.23557.13 + 6.0.321-servicing.23574.2 + 6.0.321-servicing.23574.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,12 +68,12 @@ - 6.0.25-servicing.23519.12 - 6.0.25-servicing.23519.12 - 6.0.25 - 6.0.25 - 6.0.25 - 6.0.25 + 6.0.26-servicing.23572.29 + 6.0.26-servicing.23572.29 + 6.0.26 + 6.0.26 + 6.0.26 + 6.0.26 2.1.0 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.320 + 6.0.321 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) From 17da9de8d38bd26d596f3c7548e4b79cd5178412 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 28 Nov 2023 11:54:07 +0000 Subject: [PATCH 015/138] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231128.7 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.321-servicing.23574.2 -> To Version 6.0.321-servicing.23578.7 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets From Version 6.0.26 -> To Version 6.0.26 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index 88cf52afd..dcba8ce77 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -40,7 +40,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a6ece6385..1a40c404e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2813f390b0d8ad577f32f27a1c57031e56f02f45 + 00f7c0edf759ec4fa22094a1571b1b1530ffe183 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2813f390b0d8ad577f32f27a1c57031e56f02f45 + 00f7c0edf759ec4fa22094a1571b1b1530ffe183 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2813f390b0d8ad577f32f27a1c57031e56f02f45 + 00f7c0edf759ec4fa22094a1571b1b1530ffe183 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2813f390b0d8ad577f32f27a1c57031e56f02f45 + 00f7c0edf759ec4fa22094a1571b1b1530ffe183 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2813f390b0d8ad577f32f27a1c57031e56f02f45 + 00f7c0edf759ec4fa22094a1571b1b1530ffe183 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2813f390b0d8ad577f32f27a1c57031e56f02f45 + 00f7c0edf759ec4fa22094a1571b1b1530ffe183 https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 6b4fc213e731cb128ad8ed54befea55d9e1d3f6d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 99f231333f8e3d364f357315d99e36473238b694 + 948bfb9e66e38a2e16fd7f22acf011950671745e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 99f231333f8e3d364f357315d99e36473238b694 + 948bfb9e66e38a2e16fd7f22acf011950671745e diff --git a/eng/Versions.props b/eng/Versions.props index cf7e6d2c7..2d4d53542 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.26 6.0.26 - 6.0.26-servicing.23573.6 - 6.0.26-servicing.23573.6 - 6.0.26-servicing.23573.6 - 6.0.26-servicing.23573.6 + 6.0.26-servicing.23577.12 + 6.0.26-servicing.23577.12 + 6.0.26-servicing.23577.12 + 6.0.26-servicing.23577.12 0.2.0 - 6.0.321-servicing.23574.2 - 6.0.321-servicing.23574.2 + 6.0.321-servicing.23578.7 + 6.0.321-servicing.23578.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From fd7471c9072304c51021a2216c218af95959ca2e Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 28 Nov 2023 11:54:25 +0000 Subject: [PATCH 016/138] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231128.6 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.126-servicing.23574.1 -> To Version 6.0.126-servicing.23578.6 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets From Version 6.0.26 -> To Version 6.0.26 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index 03f09e6af..fe7817f00 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -40,7 +40,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a891e9673..7e5d919ef 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2813f390b0d8ad577f32f27a1c57031e56f02f45 + 00f7c0edf759ec4fa22094a1571b1b1530ffe183 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2813f390b0d8ad577f32f27a1c57031e56f02f45 + 00f7c0edf759ec4fa22094a1571b1b1530ffe183 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2813f390b0d8ad577f32f27a1c57031e56f02f45 + 00f7c0edf759ec4fa22094a1571b1b1530ffe183 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2813f390b0d8ad577f32f27a1c57031e56f02f45 + 00f7c0edf759ec4fa22094a1571b1b1530ffe183 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2813f390b0d8ad577f32f27a1c57031e56f02f45 + 00f7c0edf759ec4fa22094a1571b1b1530ffe183 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2813f390b0d8ad577f32f27a1c57031e56f02f45 + 00f7c0edf759ec4fa22094a1571b1b1530ffe183 https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 8f42eeeef2041f39db00cf87a08ad9e6eb3f613d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - cb1f8762b907a48ebcb8f8d41151559940b8258a + b3a797e95e70efc1a8360afc0ab845f0b5fc668a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - cb1f8762b907a48ebcb8f8d41151559940b8258a + b3a797e95e70efc1a8360afc0ab845f0b5fc668a diff --git a/eng/Versions.props b/eng/Versions.props index c2386ebf9..c68cdb0ad 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.26 6.0.26 - 6.0.26-servicing.23573.6 - 6.0.26-servicing.23573.6 - 6.0.26-servicing.23573.6 - 6.0.26-servicing.23573.6 + 6.0.26-servicing.23577.12 + 6.0.26-servicing.23577.12 + 6.0.26-servicing.23577.12 + 6.0.26-servicing.23577.12 0.2.0 - 6.0.126-servicing.23574.1 - 6.0.126-servicing.23574.1 + 6.0.126-servicing.23578.6 + 6.0.126-servicing.23578.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 5465d933ea269f8a784cdc7af14107f42ed026fe Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 28 Nov 2023 12:06:06 +0000 Subject: [PATCH 017/138] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231128.4 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.312 -> To Version 7.0.312 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.15 -> To Version 7.0.15 (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 65e2ee623..24168537a 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 65785a115..2b505f556 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ef956a2bd9f33b27eb983d339fa6dbb186db8247 + 360f1564385745dd9e9acc53e697f8e63ff41126 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ef956a2bd9f33b27eb983d339fa6dbb186db8247 + 360f1564385745dd9e9acc53e697f8e63ff41126 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ef956a2bd9f33b27eb983d339fa6dbb186db8247 + 360f1564385745dd9e9acc53e697f8e63ff41126 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ef956a2bd9f33b27eb983d339fa6dbb186db8247 + 360f1564385745dd9e9acc53e697f8e63ff41126 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ef956a2bd9f33b27eb983d339fa6dbb186db8247 + 360f1564385745dd9e9acc53e697f8e63ff41126 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ef956a2bd9f33b27eb983d339fa6dbb186db8247 + 360f1564385745dd9e9acc53e697f8e63ff41126 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ef956a2bd9f33b27eb983d339fa6dbb186db8247 + 360f1564385745dd9e9acc53e697f8e63ff41126 https://github.com/dotnet/test-templates @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f48767b966f407a6a74953ea6cb0ac61f610b4dd + 962ca34b2d008d76290894f0f4b56f8664e49bda - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f48767b966f407a6a74953ea6cb0ac61f610b4dd + 962ca34b2d008d76290894f0f4b56f8664e49bda - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f48767b966f407a6a74953ea6cb0ac61f610b4dd + 962ca34b2d008d76290894f0f4b56f8664e49bda - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f48767b966f407a6a74953ea6cb0ac61f610b4dd + 962ca34b2d008d76290894f0f4b56f8664e49bda diff --git a/eng/Versions.props b/eng/Versions.props index 018a55ab1..96257c41d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,11 +58,11 @@ 7.0.15 7.0.15 - 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 + 7.0.15-servicing.23577.31 + 7.0.15-servicing.23577.31 + 7.0.15-servicing.23577.31 + 7.0.15-servicing.23577.31 + 7.0.15-servicing.23577.31 0.2.0 @@ -70,8 +70,8 @@ 7.0.312 - 7.0.312-servicing.23573.32 - 7.0.312-servicing.23573.32 + 7.0.312-servicing.23578.4 + 7.0.312-servicing.23578.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b78e462adb3c9734cad6f24bec1fe69cb73afac9 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 28 Nov 2023 12:06:47 +0000 Subject: [PATCH 018/138] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231128.5 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.115 -> To Version 7.0.115 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.15 -> To Version 7.0.15 (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 529576f58..b3682484a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -44,12 +44,12 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7cfc48c06..3b6bc0be2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ef956a2bd9f33b27eb983d339fa6dbb186db8247 + 360f1564385745dd9e9acc53e697f8e63ff41126 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ef956a2bd9f33b27eb983d339fa6dbb186db8247 + 360f1564385745dd9e9acc53e697f8e63ff41126 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ef956a2bd9f33b27eb983d339fa6dbb186db8247 + 360f1564385745dd9e9acc53e697f8e63ff41126 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ef956a2bd9f33b27eb983d339fa6dbb186db8247 + 360f1564385745dd9e9acc53e697f8e63ff41126 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ef956a2bd9f33b27eb983d339fa6dbb186db8247 + 360f1564385745dd9e9acc53e697f8e63ff41126 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ef956a2bd9f33b27eb983d339fa6dbb186db8247 + 360f1564385745dd9e9acc53e697f8e63ff41126 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ef956a2bd9f33b27eb983d339fa6dbb186db8247 + 360f1564385745dd9e9acc53e697f8e63ff41126 https://github.com/dotnet/test-templates @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fc561a76355e98597193f4c42b5649ead791f0c2 + 96bb3b05678dde4da2164d4c1b13372855e610d8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fc561a76355e98597193f4c42b5649ead791f0c2 + 96bb3b05678dde4da2164d4c1b13372855e610d8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fc561a76355e98597193f4c42b5649ead791f0c2 + 96bb3b05678dde4da2164d4c1b13372855e610d8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fc561a76355e98597193f4c42b5649ead791f0c2 + 96bb3b05678dde4da2164d4c1b13372855e610d8 diff --git a/eng/Versions.props b/eng/Versions.props index 90a2db59b..e6bd74f8d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,11 +58,11 @@ 7.0.15 7.0.15 - 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 + 7.0.15-servicing.23577.31 + 7.0.15-servicing.23577.31 + 7.0.15-servicing.23577.31 + 7.0.15-servicing.23577.31 + 7.0.15-servicing.23577.31 0.2.0 @@ -70,8 +70,8 @@ 7.0.115 - 7.0.115-servicing.23573.33 - 7.0.115-servicing.23573.33 + 7.0.115-servicing.23578.5 + 7.0.115-servicing.23578.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 11dd5cc449878857cfa0eba9f0958d8007edd3b1 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 28 Nov 2023 12:12:57 +0000 Subject: [PATCH 019/138] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231128.8 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.405 -> To Version 7.0.405 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.15 -> To Version 7.0.15 (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 eb2810961..beca76c42 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 c9a3cc6cd..e780bcb10 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ef956a2bd9f33b27eb983d339fa6dbb186db8247 + 360f1564385745dd9e9acc53e697f8e63ff41126 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ef956a2bd9f33b27eb983d339fa6dbb186db8247 + 360f1564385745dd9e9acc53e697f8e63ff41126 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ef956a2bd9f33b27eb983d339fa6dbb186db8247 + 360f1564385745dd9e9acc53e697f8e63ff41126 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ef956a2bd9f33b27eb983d339fa6dbb186db8247 + 360f1564385745dd9e9acc53e697f8e63ff41126 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ef956a2bd9f33b27eb983d339fa6dbb186db8247 + 360f1564385745dd9e9acc53e697f8e63ff41126 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ef956a2bd9f33b27eb983d339fa6dbb186db8247 + 360f1564385745dd9e9acc53e697f8e63ff41126 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ef956a2bd9f33b27eb983d339fa6dbb186db8247 + 360f1564385745dd9e9acc53e697f8e63ff41126 https://github.com/dotnet/test-templates @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fffcfa569ab3e3a71f7f81264eec62ef152bdf51 + f4950be5e3cadff1e8db233ff34486020facc2b3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fffcfa569ab3e3a71f7f81264eec62ef152bdf51 + f4950be5e3cadff1e8db233ff34486020facc2b3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fffcfa569ab3e3a71f7f81264eec62ef152bdf51 + f4950be5e3cadff1e8db233ff34486020facc2b3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fffcfa569ab3e3a71f7f81264eec62ef152bdf51 + f4950be5e3cadff1e8db233ff34486020facc2b3 diff --git a/eng/Versions.props b/eng/Versions.props index ec1a28869..4f750003a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,11 +58,11 @@ 7.0.15 7.0.15 - 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 + 7.0.15-servicing.23577.31 + 7.0.15-servicing.23577.31 + 7.0.15-servicing.23577.31 + 7.0.15-servicing.23577.31 + 7.0.15-servicing.23577.31 0.2.0 @@ -70,8 +70,8 @@ 7.0.405 - 7.0.405-servicing.23573.36 - 7.0.405-servicing.23573.36 + 7.0.405-servicing.23578.8 + 7.0.405-servicing.23578.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From ba799f743b42240b5e154a0530e3cf96e57f5185 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 28 Nov 2023 20:24:06 +0000 Subject: [PATCH 020/138] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231128.17 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.418-servicing.23574.3 -> To Version 6.0.418-servicing.23578.17 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets From Version 6.0.26 -> To Version 6.0.26 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index 1aa3642f7..152173f2a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -40,7 +40,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e8bd7fbb3..3085be281 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2813f390b0d8ad577f32f27a1c57031e56f02f45 + 00f7c0edf759ec4fa22094a1571b1b1530ffe183 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2813f390b0d8ad577f32f27a1c57031e56f02f45 + 00f7c0edf759ec4fa22094a1571b1b1530ffe183 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2813f390b0d8ad577f32f27a1c57031e56f02f45 + 00f7c0edf759ec4fa22094a1571b1b1530ffe183 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2813f390b0d8ad577f32f27a1c57031e56f02f45 + 00f7c0edf759ec4fa22094a1571b1b1530ffe183 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2813f390b0d8ad577f32f27a1c57031e56f02f45 + 00f7c0edf759ec4fa22094a1571b1b1530ffe183 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2813f390b0d8ad577f32f27a1c57031e56f02f45 + 00f7c0edf759ec4fa22094a1571b1b1530ffe183 https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 04cc3e115c98a8aa1fde4b1b45218ed6331c45c5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 08ded598c2a2b41b45413b7462da49bdcea3c5a0 + 304d44c93d271c5cfebb7aedf39d8c605bb4fbfc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 08ded598c2a2b41b45413b7462da49bdcea3c5a0 + 304d44c93d271c5cfebb7aedf39d8c605bb4fbfc diff --git a/eng/Versions.props b/eng/Versions.props index 775638704..2da607528 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.26 6.0.26 - 6.0.26-servicing.23573.6 - 6.0.26-servicing.23573.6 - 6.0.26-servicing.23573.6 - 6.0.26-servicing.23573.6 + 6.0.26-servicing.23577.12 + 6.0.26-servicing.23577.12 + 6.0.26-servicing.23577.12 + 6.0.26-servicing.23577.12 0.2.0 - 6.0.418-servicing.23574.3 - 6.0.418-servicing.23574.3 + 6.0.418-servicing.23578.17 + 6.0.418-servicing.23578.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 67b3fa5ba87ac794ff751ac6d612d993dd503929 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 28 Nov 2023 21:51:22 +0000 Subject: [PATCH 021/138] Updated .vsts-ci.yml Add PGO legs to dependencies for publish. --- .vsts-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index c6f583096..0b653655f 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -405,6 +405,8 @@ stages: - Darwin - Source_Build_Managed - Source_Build_Create_Tarball + - PGO_Linux + - PGO_Windows_NT publishUsingPipelines: true pool: ${{ if eq(variables['System.TeamProject'], 'internal') }}: From de33cd6114f0fcdd55ce56ce311d7a1ecf37ca51 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 29 Nov 2023 00:31:12 +0000 Subject: [PATCH 022/138] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231128.33 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.418-servicing.23578.17 -> To Version 6.0.418-servicing.23578.33 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3085be281..a4e6877c5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 04cc3e115c98a8aa1fde4b1b45218ed6331c45c5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 304d44c93d271c5cfebb7aedf39d8c605bb4fbfc + 09d4e77361f1baf445376cd5fbec6a4c55a1d295 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 304d44c93d271c5cfebb7aedf39d8c605bb4fbfc + 09d4e77361f1baf445376cd5fbec6a4c55a1d295 diff --git a/eng/Versions.props b/eng/Versions.props index 2da607528..96d0d2e3a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.418-servicing.23578.17 - 6.0.418-servicing.23578.17 + 6.0.418-servicing.23578.33 + 6.0.418-servicing.23578.33 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 024e3b3f05e145a9fa0704455cc83fe59bd219b8 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 29 Nov 2023 00:41:31 +0000 Subject: [PATCH 023/138] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231128.27 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.405 -> To Version 7.0.405 Dependency coherency updates Microsoft.NET.Test.Sdk From Version 17.7.2-release-23423-01 -> To Version 17.7.2-release-23578-01 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 18 +++++++++--------- eng/Versions.props | 6 +++--- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/NuGet.config b/NuGet.config index beca76c42..7cbccbd8a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,7 +19,7 @@ - + @@ -49,7 +49,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 22e8aec0f..d6cc9da3c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f4950be5e3cadff1e8db233ff34486020facc2b3 + d456c2d4f3a4c6c4b89d00df45c35a799ae1da12 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f4950be5e3cadff1e8db233ff34486020facc2b3 + d456c2d4f3a4c6c4b89d00df45c35a799ae1da12 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f4950be5e3cadff1e8db233ff34486020facc2b3 + d456c2d4f3a4c6c4b89d00df45c35a799ae1da12 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f4950be5e3cadff1e8db233ff34486020facc2b3 + d456c2d4f3a4c6c4b89d00df45c35a799ae1da12 @@ -133,9 +133,9 @@ 3916deb12ef7c99509217f5e5de4821b92db901a - + https://github.com/microsoft/vstest - 604e7beeb3abe7e351a7bb5e507bea66d76a5888 + 1d2bc2d1e4fd27d9c4903838a31083467ced0475 diff --git a/eng/Versions.props b/eng/Versions.props index 4f750003a..264d5d2a0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.405 - 7.0.405-servicing.23578.8 - 7.0.405-servicing.23578.8 + 7.0.405-servicing.23578.27 + 7.0.405-servicing.23578.27 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -199,7 +199,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.7.2-release-23423-01 + 17.7.2-release-23578-01 From 457428f24c32c1c656eeba0091515e83dc8e0378 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 29 Nov 2023 10:39:01 +0000 Subject: [PATCH 024/138] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231129.3 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.418-servicing.23578.17 -> To Version 6.0.418-servicing.23579.3 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets From Version 6.0.26 -> To Version 6.0.26 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index 152173f2a..26fdcf4ae 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -40,7 +40,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a4e6877c5..98c7340e2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 00f7c0edf759ec4fa22094a1571b1b1530ffe183 + ed655b45693cabc1de87e4d76d0785a3868396c2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 00f7c0edf759ec4fa22094a1571b1b1530ffe183 + ed655b45693cabc1de87e4d76d0785a3868396c2 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 00f7c0edf759ec4fa22094a1571b1b1530ffe183 + ed655b45693cabc1de87e4d76d0785a3868396c2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 00f7c0edf759ec4fa22094a1571b1b1530ffe183 + ed655b45693cabc1de87e4d76d0785a3868396c2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 00f7c0edf759ec4fa22094a1571b1b1530ffe183 + ed655b45693cabc1de87e4d76d0785a3868396c2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 00f7c0edf759ec4fa22094a1571b1b1530ffe183 + ed655b45693cabc1de87e4d76d0785a3868396c2 https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 04cc3e115c98a8aa1fde4b1b45218ed6331c45c5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 09d4e77361f1baf445376cd5fbec6a4c55a1d295 + a48336cad950691002015f4b411f77c4926c7edb - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 09d4e77361f1baf445376cd5fbec6a4c55a1d295 + a48336cad950691002015f4b411f77c4926c7edb diff --git a/eng/Versions.props b/eng/Versions.props index 96d0d2e3a..08c6b98d4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.26 6.0.26 - 6.0.26-servicing.23577.12 - 6.0.26-servicing.23577.12 - 6.0.26-servicing.23577.12 - 6.0.26-servicing.23577.12 + 6.0.26-servicing.23578.6 + 6.0.26-servicing.23578.6 + 6.0.26-servicing.23578.6 + 6.0.26-servicing.23578.6 0.2.0 - 6.0.418-servicing.23578.33 - 6.0.418-servicing.23578.33 + 6.0.418-servicing.23579.3 + 6.0.418-servicing.23579.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From aef743128cbc7065ce729367f2a6d454b0ed6f43 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 29 Nov 2023 12:30:26 +0000 Subject: [PATCH 025/138] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231129.2 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.126-servicing.23578.6 -> To Version 6.0.126-servicing.23579.2 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0 From Version 6.0.26 -> To Version 6.0.26 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 12 ++++++------ 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/NuGet.config b/NuGet.config index fe7817f00..4fab6601b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -17,7 +17,7 @@ - + @@ -40,14 +40,14 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7e5d919ef..a4bf66b6a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 00f7c0edf759ec4fa22094a1571b1b1530ffe183 + ed655b45693cabc1de87e4d76d0785a3868396c2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 00f7c0edf759ec4fa22094a1571b1b1530ffe183 + ed655b45693cabc1de87e4d76d0785a3868396c2 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 00f7c0edf759ec4fa22094a1571b1b1530ffe183 + ed655b45693cabc1de87e4d76d0785a3868396c2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 00f7c0edf759ec4fa22094a1571b1b1530ffe183 + ed655b45693cabc1de87e4d76d0785a3868396c2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 00f7c0edf759ec4fa22094a1571b1b1530ffe183 + ed655b45693cabc1de87e4d76d0785a3868396c2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 00f7c0edf759ec4fa22094a1571b1b1530ffe183 + ed655b45693cabc1de87e4d76d0785a3868396c2 https://github.com/dotnet/test-templates @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 8f42eeeef2041f39db00cf87a08ad9e6eb3f613d + e58a1e0535c781fc1c12a5bbbc81c5044260d3e0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 8f42eeeef2041f39db00cf87a08ad9e6eb3f613d + e58a1e0535c781fc1c12a5bbbc81c5044260d3e0 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 8f42eeeef2041f39db00cf87a08ad9e6eb3f613d + e58a1e0535c781fc1c12a5bbbc81c5044260d3e0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b3a797e95e70efc1a8360afc0ab845f0b5fc668a + bf47a20af74904ba30cc994c491f744e86545dd7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b3a797e95e70efc1a8360afc0ab845f0b5fc668a + bf47a20af74904ba30cc994c491f744e86545dd7 diff --git a/eng/Versions.props b/eng/Versions.props index c68cdb0ad..7731bf09c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.26 6.0.26 - 6.0.26-servicing.23577.12 - 6.0.26-servicing.23577.12 - 6.0.26-servicing.23577.12 - 6.0.26-servicing.23577.12 + 6.0.26-servicing.23578.6 + 6.0.26-servicing.23578.6 + 6.0.26-servicing.23578.6 + 6.0.26-servicing.23578.6 0.2.0 - 6.0.126-servicing.23578.6 - 6.0.126-servicing.23578.6 + 6.0.126-servicing.23579.2 + 6.0.126-servicing.23579.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f67edca3e3879fff6f1074109aa31d6208c59dbd Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 29 Nov 2023 12:31:51 +0000 Subject: [PATCH 026/138] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231128.32 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.321-servicing.23578.7 -> To Version 6.0.321-servicing.23578.32 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1a40c404e..92114992e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 6b4fc213e731cb128ad8ed54befea55d9e1d3f6d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 948bfb9e66e38a2e16fd7f22acf011950671745e + d6528f6c173ae76eb6584c31d14b3da885f8fc04 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 948bfb9e66e38a2e16fd7f22acf011950671745e + d6528f6c173ae76eb6584c31d14b3da885f8fc04 diff --git a/eng/Versions.props b/eng/Versions.props index 2d4d53542..3067e7c6d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.321-servicing.23578.7 - 6.0.321-servicing.23578.7 + 6.0.321-servicing.23578.32 + 6.0.321-servicing.23578.32 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 9bf37478b6ca1e4e7251f1c4d47a9cce103f170f Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 29 Nov 2023 12:58:43 +0000 Subject: [PATCH 027/138] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231129.10 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.312 -> To Version 7.0.312 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.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 7.0.15 -> To Version 7.0.15 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 30 +++++++++++++++--------------- eng/Versions.props | 10 +++++----- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/NuGet.config b/NuGet.config index 24168537a..529a9110e 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 59e1f894d..0dafb4b3c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 85778644ee928ab3eb11aac4fef9176851dd9b21 + acb200f3181da8cc111042a65f247bab519b9663 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 85778644ee928ab3eb11aac4fef9176851dd9b21 + acb200f3181da8cc111042a65f247bab519b9663 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 85778644ee928ab3eb11aac4fef9176851dd9b21 + acb200f3181da8cc111042a65f247bab519b9663 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 85778644ee928ab3eb11aac4fef9176851dd9b21 + acb200f3181da8cc111042a65f247bab519b9663 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 962ca34b2d008d76290894f0f4b56f8664e49bda + 4e72473553eb228156e7946886d68efcc004879f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 962ca34b2d008d76290894f0f4b56f8664e49bda + 4e72473553eb228156e7946886d68efcc004879f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 962ca34b2d008d76290894f0f4b56f8664e49bda + 4e72473553eb228156e7946886d68efcc004879f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 962ca34b2d008d76290894f0f4b56f8664e49bda + 4e72473553eb228156e7946886d68efcc004879f https://dev.azure.com/dnceng/internal/_git/dotnet-winforms 1d272c1ef7277b7cc38148300732e6a72848bedc - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - aed20729942488335ab21d7bb03a92d87afdb9b1 + 02d7f45dcacc192b40e725d6f6e77ec64e202c7a https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 96257c41d..b5858e711 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,7 +41,7 @@ - 7.0.15-servicing.23573.2 + 7.0.15-servicing.23578.3 @@ -70,8 +70,8 @@ 7.0.312 - 7.0.312-servicing.23578.4 - 7.0.312-servicing.23578.4 + 7.0.312-servicing.23579.10 + 7.0.312-servicing.23579.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -96,8 +96,8 @@ - 7.0.15-servicing.23573.2 - 7.0.15-servicing.23573.2 + 7.0.15-servicing.23579.2 + 7.0.15-servicing.23579.2 7.0.15 7.0.15 From c5ba2d60898886b63e6bb657f25503d24680855f Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 29 Nov 2023 13:57:21 +0000 Subject: [PATCH 028/138] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231129.9 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.321-servicing.23578.32 -> To Version 6.0.321-servicing.23579.9 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets From Version 6.0.26 -> To Version 6.0.26 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index dcba8ce77..db5a4ec11 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -40,7 +40,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 92114992e..64d7e889e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 00f7c0edf759ec4fa22094a1571b1b1530ffe183 + ed655b45693cabc1de87e4d76d0785a3868396c2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 00f7c0edf759ec4fa22094a1571b1b1530ffe183 + ed655b45693cabc1de87e4d76d0785a3868396c2 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 00f7c0edf759ec4fa22094a1571b1b1530ffe183 + ed655b45693cabc1de87e4d76d0785a3868396c2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 00f7c0edf759ec4fa22094a1571b1b1530ffe183 + ed655b45693cabc1de87e4d76d0785a3868396c2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 00f7c0edf759ec4fa22094a1571b1b1530ffe183 + ed655b45693cabc1de87e4d76d0785a3868396c2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 00f7c0edf759ec4fa22094a1571b1b1530ffe183 + ed655b45693cabc1de87e4d76d0785a3868396c2 https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 6b4fc213e731cb128ad8ed54befea55d9e1d3f6d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d6528f6c173ae76eb6584c31d14b3da885f8fc04 + 176ba6c92b4d6c388a0117ae030d9b547f727c66 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d6528f6c173ae76eb6584c31d14b3da885f8fc04 + 176ba6c92b4d6c388a0117ae030d9b547f727c66 diff --git a/eng/Versions.props b/eng/Versions.props index 3067e7c6d..301d1a62b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.26 6.0.26 - 6.0.26-servicing.23577.12 - 6.0.26-servicing.23577.12 - 6.0.26-servicing.23577.12 - 6.0.26-servicing.23577.12 + 6.0.26-servicing.23578.6 + 6.0.26-servicing.23578.6 + 6.0.26-servicing.23578.6 + 6.0.26-servicing.23578.6 0.2.0 - 6.0.321-servicing.23578.32 - 6.0.321-servicing.23578.32 + 6.0.321-servicing.23579.9 + 6.0.321-servicing.23579.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 6638090396e9ea4f82447aee7b3cd4e914c76944 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 29 Nov 2023 14:13:38 +0000 Subject: [PATCH 029/138] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231129.11 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.405 -> 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.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.Test.Sdk From Version 7.0.15 -> To Version 7.0.15 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 30 +++++++++++++++--------------- eng/Versions.props | 10 +++++----- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/NuGet.config b/NuGet.config index 7cbccbd8a..638069f5e 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 d6cc9da3c..df8d69d38 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 85778644ee928ab3eb11aac4fef9176851dd9b21 + acb200f3181da8cc111042a65f247bab519b9663 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 85778644ee928ab3eb11aac4fef9176851dd9b21 + acb200f3181da8cc111042a65f247bab519b9663 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 85778644ee928ab3eb11aac4fef9176851dd9b21 + acb200f3181da8cc111042a65f247bab519b9663 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 85778644ee928ab3eb11aac4fef9176851dd9b21 + acb200f3181da8cc111042a65f247bab519b9663 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d456c2d4f3a4c6c4b89d00df45c35a799ae1da12 + 0273d7d615d7f27f31e0974ab2e7a49d75a7fc78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d456c2d4f3a4c6c4b89d00df45c35a799ae1da12 + 0273d7d615d7f27f31e0974ab2e7a49d75a7fc78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d456c2d4f3a4c6c4b89d00df45c35a799ae1da12 + 0273d7d615d7f27f31e0974ab2e7a49d75a7fc78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d456c2d4f3a4c6c4b89d00df45c35a799ae1da12 + 0273d7d615d7f27f31e0974ab2e7a49d75a7fc78 https://dev.azure.com/dnceng/internal/_git/dotnet-winforms 1d272c1ef7277b7cc38148300732e6a72848bedc - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - aed20729942488335ab21d7bb03a92d87afdb9b1 + 02d7f45dcacc192b40e725d6f6e77ec64e202c7a https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 264d5d2a0..a33fe3b2d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,7 +41,7 @@ - 7.0.15-servicing.23573.2 + 7.0.15-servicing.23578.3 @@ -70,8 +70,8 @@ 7.0.405 - 7.0.405-servicing.23578.27 - 7.0.405-servicing.23578.27 + 7.0.405-servicing.23579.11 + 7.0.405-servicing.23579.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -96,8 +96,8 @@ - 7.0.15-servicing.23573.2 - 7.0.15-servicing.23573.2 + 7.0.15-servicing.23579.2 + 7.0.15-servicing.23579.2 7.0.15 7.0.15 From 923551b0bef564e0d325066df6fe56e61b2cc63e Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 29 Nov 2023 14:59:42 +0000 Subject: [PATCH 030/138] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231129.12 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.115 -> To Version 7.0.115 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.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 7.0.15 -> To Version 7.0.15 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 30 +++++++++++++++--------------- eng/Versions.props | 10 +++++----- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/NuGet.config b/NuGet.config index b3682484a..e926b86a7 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 159d5de6d..2e9c5c1c7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 85778644ee928ab3eb11aac4fef9176851dd9b21 + acb200f3181da8cc111042a65f247bab519b9663 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 85778644ee928ab3eb11aac4fef9176851dd9b21 + acb200f3181da8cc111042a65f247bab519b9663 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 85778644ee928ab3eb11aac4fef9176851dd9b21 + acb200f3181da8cc111042a65f247bab519b9663 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 85778644ee928ab3eb11aac4fef9176851dd9b21 + acb200f3181da8cc111042a65f247bab519b9663 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 96bb3b05678dde4da2164d4c1b13372855e610d8 + 1d1af5d70029872ea1c9f0d2c18bf5cf4e24cd3e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 96bb3b05678dde4da2164d4c1b13372855e610d8 + 1d1af5d70029872ea1c9f0d2c18bf5cf4e24cd3e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 96bb3b05678dde4da2164d4c1b13372855e610d8 + 1d1af5d70029872ea1c9f0d2c18bf5cf4e24cd3e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 96bb3b05678dde4da2164d4c1b13372855e610d8 + 1d1af5d70029872ea1c9f0d2c18bf5cf4e24cd3e https://dev.azure.com/dnceng/internal/_git/dotnet-winforms 1d272c1ef7277b7cc38148300732e6a72848bedc - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - aed20729942488335ab21d7bb03a92d87afdb9b1 + 02d7f45dcacc192b40e725d6f6e77ec64e202c7a https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index e6bd74f8d..c4318dd50 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,7 +41,7 @@ - 7.0.15-servicing.23573.2 + 7.0.15-servicing.23578.3 @@ -70,8 +70,8 @@ 7.0.115 - 7.0.115-servicing.23578.5 - 7.0.115-servicing.23578.5 + 7.0.115-servicing.23579.12 + 7.0.115-servicing.23579.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -92,8 +92,8 @@ - 7.0.15-servicing.23573.2 - 7.0.15-servicing.23573.2 + 7.0.15-servicing.23579.2 + 7.0.15-servicing.23579.2 7.0.15 7.0.15 From 4366b12f01574e3e8f88a7922caa401c07b7f7b3 Mon Sep 17 00:00:00 2001 From: "Matt Mitchell (.NET)" Date: Wed, 29 Nov 2023 09:13:56 -0800 Subject: [PATCH 031/138] Update to source-build-externals 203140 --- eng/Version.Details.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2e9c5c1c7..1fcfa9e54 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -176,9 +176,9 @@ c3ad00ae84489071080a606f6a8e43c9a91a5cc2 - - https://github.com/dotnet/source-build-externals - c47ba6c19d50081f90008da8bc61b3ac20348f20 + + https://dev.azure.com/dnceng/internal/_git/dotnet-source-build-externals + 5e09d1706d8d7b6dadaf767c3a4373ca68a87a32 From 3c375371e94111e8ca72395e195c0b24f19e23fe Mon Sep 17 00:00:00 2001 From: "Matt Mitchell (.NET)" Date: Wed, 29 Nov 2023 09:16:27 -0800 Subject: [PATCH 032/138] Update to source-build-externals 203140 --- eng/Version.Details.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0dafb4b3c..d2b434cf4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -180,9 +180,9 @@ c3ad00ae84489071080a606f6a8e43c9a91a5cc2 - - https://github.com/dotnet/source-build-externals - c47ba6c19d50081f90008da8bc61b3ac20348f20 + + https://dev.azure.com/dnceng/internal/_git/dotnet-source-build-externals + 5e09d1706d8d7b6dadaf767c3a4373ca68a87a32 From 483a58380f013990987cd13bb585462439c41d04 Mon Sep 17 00:00:00 2001 From: "Matt Mitchell (.NET)" Date: Wed, 29 Nov 2023 09:17:49 -0800 Subject: [PATCH 033/138] Update to source-build-externals 203140 --- eng/Version.Details.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index df8d69d38..f751f7d5f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -180,9 +180,9 @@ c3ad00ae84489071080a606f6a8e43c9a91a5cc2 - - https://github.com/dotnet/source-build-externals - c47ba6c19d50081f90008da8bc61b3ac20348f20 + + https://dev.azure.com/dnceng/internal/_git/dotnet-source-build-externals + 5e09d1706d8d7b6dadaf767c3a4373ca68a87a32 From d7ebc6f15ed405fc7d86585b92db0df3afcfb28c Mon Sep 17 00:00:00 2001 From: "Matt Mitchell (.NET)" Date: Wed, 29 Nov 2023 10:38:00 -0800 Subject: [PATCH 034/138] Attempt to auth to submodule --- src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets index dc33e0a03..f2c4d2133 100644 --- a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets +++ b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets @@ -173,7 +173,7 @@ Condition="$(IsRootRepo) != 'true'" /> Date: Wed, 29 Nov 2023 10:42:21 -0800 Subject: [PATCH 035/138] Attempt to auth to submodule --- src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets index f2c4d2133..55d1c4ff9 100644 --- a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets +++ b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets @@ -173,7 +173,7 @@ Condition="$(IsRootRepo) != 'true'" /> Date: Wed, 29 Nov 2023 11:04:21 -0800 Subject: [PATCH 036/138] Make auth more general --- src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets index 55d1c4ff9..0a9a2ddc0 100644 --- a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets +++ b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets @@ -172,8 +172,9 @@ WorkingDirectory="$(TarballRepoSourceDir)" Condition="$(IsRootRepo) != 'true'" /> + Date: Wed, 29 Nov 2023 22:26:42 +0000 Subject: [PATCH 037/138] Merged PR 35685: Update source build externals and add internal submodule auth - Please add description for changes you are making. - If there is an issue related to this PR, please add the reference. --- eng/Version.Details.xml | 4 ++-- src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f751f7d5f..d7a8dca60 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -180,9 +180,9 @@ c3ad00ae84489071080a606f6a8e43c9a91a5cc2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-source-build-externals - 5e09d1706d8d7b6dadaf767c3a4373ca68a87a32 + badf0ef1064642a3047b9b720ddfec2113ffae99 diff --git a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets index dc33e0a03..0a9a2ddc0 100644 --- a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets +++ b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets @@ -172,8 +172,9 @@ WorkingDirectory="$(TarballRepoSourceDir)" Condition="$(IsRootRepo) != 'true'" /> + Date: Wed, 29 Nov 2023 22:28:51 +0000 Subject: [PATCH 038/138] Merged PR 35684: Update source build externals and add internal auth - Please add description for changes you are making. - If there is an issue related to this PR, please add the reference. --- eng/Version.Details.xml | 4 ++-- src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d2b434cf4..0fad8e220 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -180,9 +180,9 @@ c3ad00ae84489071080a606f6a8e43c9a91a5cc2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-source-build-externals - 5e09d1706d8d7b6dadaf767c3a4373ca68a87a32 + badf0ef1064642a3047b9b720ddfec2113ffae99 diff --git a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets index dc33e0a03..0a9a2ddc0 100644 --- a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets +++ b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets @@ -172,8 +172,9 @@ WorkingDirectory="$(TarballRepoSourceDir)" Condition="$(IsRootRepo) != 'true'" /> + Date: Wed, 29 Nov 2023 22:48:39 +0000 Subject: [PATCH 039/138] Merged PR 35683: Update source build externals --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1fcfa9e54..d4f781536 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -176,9 +176,9 @@ c3ad00ae84489071080a606f6a8e43c9a91a5cc2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-source-build-externals - 5e09d1706d8d7b6dadaf767c3a4373ca68a87a32 + badf0ef1064642a3047b9b720ddfec2113ffae99 From e85162be0bdaff7e63e10b12a3b3b15e5ffff6a8 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 1 Dec 2023 19:17:26 +0000 Subject: [PATCH 040/138] Merged PR 35717: [internal/release/7.0.4xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:42f6b899-0677-45e7-d6f8-08db826b460b) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 42f6b899-0677-45e7-d6f8-08db826b460b - **Build**: 20231130.13 - **Date Produced**: November 30, 2023 7:47:35 PM UTC - **Commit**: ea50b565a6416e9bd2039db0f1a685cbaf46caa2 - **Branch**: refs/heads/internal/release/7.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.405 to 7.0.405][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.405-servicing.23579.11 to 7.0.405-servicing.23580.13][1] - **Microsoft.NET.Sdk**: [from 7.0.405-servicing.23579.11 to 7.0.405-servicing.23580.13][1] - **Microsoft.TemplateEngine.Cli**: [from 7.0.405-servicing.23579.11 to 7.0.405-servicing.23580.13][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC0273d7d615&targetVersion=GCea50b565a6&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:42f6b899-0677-45e7-d6f8-08db826b460b) --- 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 638069f5e..a4af0c8cc 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,7 +19,7 @@ - + @@ -49,7 +49,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c3f292b1d..ce68b766a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0273d7d615d7f27f31e0974ab2e7a49d75a7fc78 + ea50b565a6416e9bd2039db0f1a685cbaf46caa2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0273d7d615d7f27f31e0974ab2e7a49d75a7fc78 + ea50b565a6416e9bd2039db0f1a685cbaf46caa2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0273d7d615d7f27f31e0974ab2e7a49d75a7fc78 + ea50b565a6416e9bd2039db0f1a685cbaf46caa2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0273d7d615d7f27f31e0974ab2e7a49d75a7fc78 + ea50b565a6416e9bd2039db0f1a685cbaf46caa2 diff --git a/eng/Versions.props b/eng/Versions.props index a4614ef18..a87b860dd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.405 - 7.0.405-servicing.23579.11 - 7.0.405-servicing.23579.11 + 7.0.405-servicing.23580.13 + 7.0.405-servicing.23580.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 74bce27a5926a4a430b802efe4aeccf187ef1c9e Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 1 Dec 2023 19:40:24 +0000 Subject: [PATCH 041/138] Merged PR 35744: [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.AspNetCore.App.Ref**: from 6.0.26 to 6.0.26 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.26-servicing.23578.6 to 6.0.26-servicing.23601.6 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.26 to 6.0.26 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.26-servicing.23578.6 to 6.0.26-servicing.23601.6 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.26-servicing.23578.6 to 6.0.26-servicing.23601.6 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.26-servicing.23578.6 to 6.0.26-servicing.23601.6 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698 - **Build**: 20231201.7 - **Date Produced**: December 1, 2023 7:13:07 PM UTC - **Commit**: 280895b0c4e22fe6995fa31637d14a8da840d8d0 - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.126-servicing.23579.2 to 6.0.126-servicing.23601.7][1] - **Microsoft.NET.Sdk**: [from 6.0.126-servicing.23579.2 to 6.0.126-servicing.23601.7][1] - **Microsoft.AspNetCore.App.Ref**: [from 6.0.26 to 6.0.26][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.26-servicing.23578.6 to 6.0.26-servicing.23601.6][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.26 to 6.0.26][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.26-servicing.23578.6 to 6.0.26-servicing.23601.6][2] - **dotnet-dev-certs**: [from 6.0.26-servicing.23578.6 to 6.0.26-servicing.23601.6][2] - **dotnet-user-secrets**: [from 6.0.26-servicing.23578.6 to 6.0.26-servicing.23601.6][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCbf47a20af7&targetVersion=GC280895b0c4&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GCed655b4569&targetVersion=GC4ed6b143f1&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a68e208b-7b40-4a19-af8d-08d961c59698) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index 4fab6601b..f22372130 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -40,7 +40,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a4bf66b6a..8c74919a0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ed655b45693cabc1de87e4d76d0785a3868396c2 + 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ed655b45693cabc1de87e4d76d0785a3868396c2 + 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ed655b45693cabc1de87e4d76d0785a3868396c2 + 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ed655b45693cabc1de87e4d76d0785a3868396c2 + 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ed655b45693cabc1de87e4d76d0785a3868396c2 + 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ed655b45693cabc1de87e4d76d0785a3868396c2 + 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating e58a1e0535c781fc1c12a5bbbc81c5044260d3e0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - bf47a20af74904ba30cc994c491f744e86545dd7 + 280895b0c4e22fe6995fa31637d14a8da840d8d0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - bf47a20af74904ba30cc994c491f744e86545dd7 + 280895b0c4e22fe6995fa31637d14a8da840d8d0 diff --git a/eng/Versions.props b/eng/Versions.props index 7731bf09c..be784a3b6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.26 6.0.26 - 6.0.26-servicing.23578.6 - 6.0.26-servicing.23578.6 - 6.0.26-servicing.23578.6 - 6.0.26-servicing.23578.6 + 6.0.26-servicing.23601.6 + 6.0.26-servicing.23601.6 + 6.0.26-servicing.23601.6 + 6.0.26-servicing.23601.6 0.2.0 - 6.0.126-servicing.23579.2 - 6.0.126-servicing.23579.2 + 6.0.126-servicing.23601.7 + 6.0.126-servicing.23601.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 4f752a3091c853a2eccf6afeae6d9053ada1e385 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 1 Dec 2023 19:40:30 +0000 Subject: [PATCH 042/138] Merged PR 35745: [internal/release/6.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 6.0.26 to 6.0.26 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.26-servicing.23578.6 to 6.0.26-servicing.23601.6 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.26 to 6.0.26 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.26-servicing.23578.6 to 6.0.26-servicing.23601.6 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.26-servicing.23578.6 to 6.0.26-servicing.23601.6 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.26-servicing.23578.6 to 6.0.26-servicing.23601.6 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:b5bca336-8d99-407e-c145-08d9d60066b9) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: b5bca336-8d99-407e-c145-08d9d60066b9 - **Build**: 20231201.8 - **Date Produced**: December 1, 2023 7:14:50 PM UTC - **Commit**: b8d95c56bfc86959c20083313656913cbaa6eabd - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.321-servicing.23579.9 to 6.0.321-servicing.23601.8][1] - **Microsoft.NET.Sdk**: [from 6.0.321-servicing.23579.9 to 6.0.321-servicing.23601.8][1] - **Microsoft.AspNetCore.App.Ref**: [from 6.0.26 to 6.0.26][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.26-servicing.23578.6 to 6.0.26-servicing.23601.6][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.26 to 6.0.26][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.26-servicing.23578.6 to 6.0.26-servicing.23601.6][2] - **dotnet-dev-certs**: [from 6.0.26-servicing.23578.6 to 6.0.26-servicing.23601.6][2] - **dotnet-user-secrets**: [from 6.0.26-servicing.23578.6 to 6.0.26-servicing.23601.6][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC176ba6c92b&targetVersion=GCb8d95c56bf&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GCed655b4569&targetVersion=GC4ed6b143f1&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:b5bca336-8d99-407e-c145-08d9d60066b9) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index db5a4ec11..e9eac60af 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -40,7 +40,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 64d7e889e..00511bda6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ed655b45693cabc1de87e4d76d0785a3868396c2 + 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ed655b45693cabc1de87e4d76d0785a3868396c2 + 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ed655b45693cabc1de87e4d76d0785a3868396c2 + 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ed655b45693cabc1de87e4d76d0785a3868396c2 + 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ed655b45693cabc1de87e4d76d0785a3868396c2 + 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ed655b45693cabc1de87e4d76d0785a3868396c2 + 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 6b4fc213e731cb128ad8ed54befea55d9e1d3f6d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 176ba6c92b4d6c388a0117ae030d9b547f727c66 + b8d95c56bfc86959c20083313656913cbaa6eabd - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 176ba6c92b4d6c388a0117ae030d9b547f727c66 + b8d95c56bfc86959c20083313656913cbaa6eabd diff --git a/eng/Versions.props b/eng/Versions.props index 301d1a62b..630f4c776 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.26 6.0.26 - 6.0.26-servicing.23578.6 - 6.0.26-servicing.23578.6 - 6.0.26-servicing.23578.6 - 6.0.26-servicing.23578.6 + 6.0.26-servicing.23601.6 + 6.0.26-servicing.23601.6 + 6.0.26-servicing.23601.6 + 6.0.26-servicing.23601.6 0.2.0 - 6.0.321-servicing.23579.9 - 6.0.321-servicing.23579.9 + 6.0.321-servicing.23601.8 + 6.0.321-servicing.23601.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 1d1a65cb827ab0575c62c629e9bac8f8d4e61f98 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 1 Dec 2023 19:40:36 +0000 Subject: [PATCH 043/138] Merged PR 35746: [internal/release/6.0.4xx] 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 6.0.26 to 6.0.26 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.26-servicing.23578.6 to 6.0.26-servicing.23601.6 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.26 to 6.0.26 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.26-servicing.23578.6 to 6.0.26-servicing.23601.6 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.26-servicing.23578.6 to 6.0.26-servicing.23601.6 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.26-servicing.23578.6 to 6.0.26-servicing.23601.6 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20231201.9 - **Date Produced**: December 1, 2023 7:14:36 PM UTC - **Commit**: 6b027deb13b313456cf2408c0329fb74cf214223 - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.418-servicing.23579.3 to 6.0.418-servicing.23601.9][1] - **Microsoft.NET.Sdk**: [from 6.0.418-servicing.23579.3 to 6.0.418-servicing.23601.9][1] - **Microsoft.AspNetCore.App.Ref**: [from 6.0.26 to 6.0.26][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.26-servicing.23578.6 to 6.0.26-servicing.23601.6][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.26 to 6.0.26][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.26-servicing.23578.6 to 6.0.26-servicing.23601.6][2] - **dotnet-dev-certs**: [from 6.0.26-servicing.23578.6 to 6.0.26-servicing.23601.6][2] - **dotnet-user-secrets**: [from 6.0.26-servicing.23578.6 to 6.0.26-servicing.23601.6][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCa48336cad9&targetVersion=GC6b027deb13&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GCed655b4569&targetVersion=GC4ed6b143f1&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a27c2ce2-aedf-42b7-d31e-08da6571bd31) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index 26fdcf4ae..6b8d7ee77 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -40,7 +40,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 98c7340e2..48a8a8e7b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ed655b45693cabc1de87e4d76d0785a3868396c2 + 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ed655b45693cabc1de87e4d76d0785a3868396c2 + 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ed655b45693cabc1de87e4d76d0785a3868396c2 + 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ed655b45693cabc1de87e4d76d0785a3868396c2 + 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ed655b45693cabc1de87e4d76d0785a3868396c2 + 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ed655b45693cabc1de87e4d76d0785a3868396c2 + 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 04cc3e115c98a8aa1fde4b1b45218ed6331c45c5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a48336cad950691002015f4b411f77c4926c7edb + 6b027deb13b313456cf2408c0329fb74cf214223 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a48336cad950691002015f4b411f77c4926c7edb + 6b027deb13b313456cf2408c0329fb74cf214223 diff --git a/eng/Versions.props b/eng/Versions.props index 08c6b98d4..ee8d3732d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.26 6.0.26 - 6.0.26-servicing.23578.6 - 6.0.26-servicing.23578.6 - 6.0.26-servicing.23578.6 - 6.0.26-servicing.23578.6 + 6.0.26-servicing.23601.6 + 6.0.26-servicing.23601.6 + 6.0.26-servicing.23601.6 + 6.0.26-servicing.23601.6 0.2.0 - 6.0.418-servicing.23579.3 - 6.0.418-servicing.23579.3 + 6.0.418-servicing.23601.9 + 6.0.418-servicing.23601.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 2f13a3f01e350e2452bd746e0b5fe9849a860d43 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Fri, 1 Dec 2023 20:00:03 +0000 Subject: [PATCH 044/138] Merged PR 35747: Update SBE for IdentityModel 6.35.0 - Please add description for changes you are making. - If there is an issue related to this PR, please add the reference. Update SBE for IdentityModel 6.35.0 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d4f781536..0bb7129fd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -176,9 +176,9 @@ c3ad00ae84489071080a606f6a8e43c9a91a5cc2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-source-build-externals - badf0ef1064642a3047b9b720ddfec2113ffae99 + d6ad546c83ce94b3efb4662513bed71a3e6192ef From 50ea9382a0cc905af05d79527580dc2a602b3f40 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Fri, 1 Dec 2023 20:00:07 +0000 Subject: [PATCH 045/138] Merged PR 35748: Update SBE for IdentityModel 6.35.0 - Please add description for changes you are making. - If there is an issue related to this PR, please add the reference. Update SBE for IdentityModel 6.35.0 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 02e1c50cd..4c531da6e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -180,9 +180,9 @@ c3ad00ae84489071080a606f6a8e43c9a91a5cc2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-source-build-externals - badf0ef1064642a3047b9b720ddfec2113ffae99 + d6ad546c83ce94b3efb4662513bed71a3e6192ef From bb6a57945d9156c01a1731dfbff7185f8d124f95 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Fri, 1 Dec 2023 20:00:52 +0000 Subject: [PATCH 046/138] Merged PR 35749: Update SBE for IdentityModel 6.35.0 - Please add description for changes you are making. - If there is an issue related to this PR, please add the reference. Update SBE for IdentityModel 6.35.0 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ce68b766a..34d949132 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -180,9 +180,9 @@ c3ad00ae84489071080a606f6a8e43c9a91a5cc2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-source-build-externals - badf0ef1064642a3047b9b720ddfec2113ffae99 + d6ad546c83ce94b3efb4662513bed71a3e6192ef From de57e296c6d868343c7bb814ab2292fdd143da00 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 1 Dec 2023 20:22:51 +0000 Subject: [PATCH 047/138] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231201.15 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.126-servicing.23601.7 -> To Version 6.0.126-servicing.23601.15 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets From Version 6.0.26 -> To Version 6.0.26 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index f22372130..9a61de726 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -40,7 +40,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8c74919a0..c54327a2d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 + 3fcbb4e1ccc6d063f7fce7c9977698b809111758 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 + 3fcbb4e1ccc6d063f7fce7c9977698b809111758 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 + 3fcbb4e1ccc6d063f7fce7c9977698b809111758 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 + 3fcbb4e1ccc6d063f7fce7c9977698b809111758 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 + 3fcbb4e1ccc6d063f7fce7c9977698b809111758 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 + 3fcbb4e1ccc6d063f7fce7c9977698b809111758 https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating e58a1e0535c781fc1c12a5bbbc81c5044260d3e0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 280895b0c4e22fe6995fa31637d14a8da840d8d0 + 3652ba2a882726bbaed0dc2e906154197ded6811 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 280895b0c4e22fe6995fa31637d14a8da840d8d0 + 3652ba2a882726bbaed0dc2e906154197ded6811 diff --git a/eng/Versions.props b/eng/Versions.props index be784a3b6..4a187c317 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.26 6.0.26 - 6.0.26-servicing.23601.6 - 6.0.26-servicing.23601.6 - 6.0.26-servicing.23601.6 - 6.0.26-servicing.23601.6 + 6.0.26-servicing.23601.8 + 6.0.26-servicing.23601.8 + 6.0.26-servicing.23601.8 + 6.0.26-servicing.23601.8 0.2.0 - 6.0.126-servicing.23601.7 - 6.0.126-servicing.23601.7 + 6.0.126-servicing.23601.15 + 6.0.126-servicing.23601.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e366881c1d5148b133e00795877fbfaedf9f385e Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 1 Dec 2023 20:29:19 +0000 Subject: [PATCH 048/138] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231201.16 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.321-servicing.23601.8 -> To Version 6.0.321-servicing.23601.16 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets From Version 6.0.26 -> To Version 6.0.26 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index e9eac60af..98638b9ae 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -40,7 +40,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 00511bda6..62ffc36fd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 + 3fcbb4e1ccc6d063f7fce7c9977698b809111758 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 + 3fcbb4e1ccc6d063f7fce7c9977698b809111758 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 + 3fcbb4e1ccc6d063f7fce7c9977698b809111758 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 + 3fcbb4e1ccc6d063f7fce7c9977698b809111758 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 + 3fcbb4e1ccc6d063f7fce7c9977698b809111758 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 + 3fcbb4e1ccc6d063f7fce7c9977698b809111758 https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 6b4fc213e731cb128ad8ed54befea55d9e1d3f6d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b8d95c56bfc86959c20083313656913cbaa6eabd + 2e6fec4ea47386d9306a4a2180ba7c61a7994f26 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b8d95c56bfc86959c20083313656913cbaa6eabd + 2e6fec4ea47386d9306a4a2180ba7c61a7994f26 diff --git a/eng/Versions.props b/eng/Versions.props index 630f4c776..fef08b7bd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.26 6.0.26 - 6.0.26-servicing.23601.6 - 6.0.26-servicing.23601.6 - 6.0.26-servicing.23601.6 - 6.0.26-servicing.23601.6 + 6.0.26-servicing.23601.8 + 6.0.26-servicing.23601.8 + 6.0.26-servicing.23601.8 + 6.0.26-servicing.23601.8 0.2.0 - 6.0.321-servicing.23601.8 - 6.0.321-servicing.23601.8 + 6.0.321-servicing.23601.16 + 6.0.321-servicing.23601.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 51ed695efb19f8535fa8b793288af8877f64dba0 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 1 Dec 2023 20:30:10 +0000 Subject: [PATCH 049/138] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231201.17 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.418-servicing.23601.9 -> To Version 6.0.418-servicing.23601.17 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets From Version 6.0.26 -> To Version 6.0.26 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6b8d7ee77..44c201c8b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -40,7 +40,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 48a8a8e7b..7c00837f2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 + 3fcbb4e1ccc6d063f7fce7c9977698b809111758 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 + 3fcbb4e1ccc6d063f7fce7c9977698b809111758 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 + 3fcbb4e1ccc6d063f7fce7c9977698b809111758 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 + 3fcbb4e1ccc6d063f7fce7c9977698b809111758 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 + 3fcbb4e1ccc6d063f7fce7c9977698b809111758 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 + 3fcbb4e1ccc6d063f7fce7c9977698b809111758 https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 04cc3e115c98a8aa1fde4b1b45218ed6331c45c5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6b027deb13b313456cf2408c0329fb74cf214223 + 6c327a186a3c6fc3aa2a08d5900ecb1da772ee86 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6b027deb13b313456cf2408c0329fb74cf214223 + 6c327a186a3c6fc3aa2a08d5900ecb1da772ee86 diff --git a/eng/Versions.props b/eng/Versions.props index ee8d3732d..08cd886fc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.26 6.0.26 - 6.0.26-servicing.23601.6 - 6.0.26-servicing.23601.6 - 6.0.26-servicing.23601.6 - 6.0.26-servicing.23601.6 + 6.0.26-servicing.23601.8 + 6.0.26-servicing.23601.8 + 6.0.26-servicing.23601.8 + 6.0.26-servicing.23601.8 0.2.0 - 6.0.418-servicing.23601.9 - 6.0.418-servicing.23601.9 + 6.0.418-servicing.23601.17 + 6.0.418-servicing.23601.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From d0b4dae10e083ee6d27565f6473e5671bdafa21d Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 1 Dec 2023 21:52:36 +0000 Subject: [PATCH 050/138] Merged PR 35763: [internal/release/7.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.AspNetCore.App.Ref**: from 7.0.15 to 7.0.15 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 7.0.15-servicing.23577.31 to 7.0.15-servicing.23601.10 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 7.0.15 to 7.0.15 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: from 7.0.15-servicing.23577.31 to 7.0.15-servicing.23601.10 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 7.0.15-servicing.23577.31 to 7.0.15-servicing.23601.10 (parent: Microsoft.NET.Sdk) - **dotnet-user-jwts**: from 7.0.15-servicing.23577.31 to 7.0.15-servicing.23601.10 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 7.0.15-servicing.23577.31 to 7.0.15-servicing.23601.10 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:65272799-fe4d-4dbf-f0fe-08da7ef63651) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 65272799-fe4d-4dbf-f0fe-08da7ef63651 - **Build**: 20231201.25 - **Date Produced**: December 1, 2023 9:21:41 PM UTC - **Commit**: c0aa76c865eb72b183247119752dfabca811f17a - **Branch**: refs/heads/internal/release/7.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.115 to 7.0.115][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.115-servicing.23579.12 to 7.0.115-servicing.23601.25][1] - **Microsoft.NET.Sdk**: [from 7.0.115-servicing.23579.12 to 7.0.115-servicing.23601.25][1] - **Microsoft.TemplateEngine.Cli**: [from 7.0.115-servicing.23579.12 to 7.0.115-servicing.23601.25][1] - **Microsoft.AspNetCore.App.Ref**: [from 7.0.15 to 7.0.15][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 7.0.15-servicing.23577.31 to 7.0.15-servicing.23601.10][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 7.0.15 to 7.0.15][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: [from 7.0.15-servicing.23577.31 to 7.0.15-servicing.23601.10][2] - **dotnet-dev-certs**: [from 7.0.15-servicing.23577.31 to 7.0.15-servicing.23601.10][2] - **dotnet-user-jwts**: [from 7.0.15-servicing.23577.31 to 7.0.15-servicing.23601.10][2] - **dotnet-user-secrets**: [from 7.0.15-servicing.23577.31 to 7.0.15-servicing.23601.10][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC1d1af5d700&targetVersion=GCc0aa76c865... --- 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 e926b86a7..637dd025e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -44,12 +44,12 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0bb7129fd..64be1c99d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 360f1564385745dd9e9acc53e697f8e63ff41126 + c49ccc8727c620ce1cb8fb431bb3fe8f2e747236 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 360f1564385745dd9e9acc53e697f8e63ff41126 + c49ccc8727c620ce1cb8fb431bb3fe8f2e747236 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 360f1564385745dd9e9acc53e697f8e63ff41126 + c49ccc8727c620ce1cb8fb431bb3fe8f2e747236 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 360f1564385745dd9e9acc53e697f8e63ff41126 + c49ccc8727c620ce1cb8fb431bb3fe8f2e747236 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 360f1564385745dd9e9acc53e697f8e63ff41126 + c49ccc8727c620ce1cb8fb431bb3fe8f2e747236 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 360f1564385745dd9e9acc53e697f8e63ff41126 + c49ccc8727c620ce1cb8fb431bb3fe8f2e747236 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 360f1564385745dd9e9acc53e697f8e63ff41126 + c49ccc8727c620ce1cb8fb431bb3fe8f2e747236 https://github.com/dotnet/test-templates @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1d1af5d70029872ea1c9f0d2c18bf5cf4e24cd3e + c0aa76c865eb72b183247119752dfabca811f17a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1d1af5d70029872ea1c9f0d2c18bf5cf4e24cd3e + c0aa76c865eb72b183247119752dfabca811f17a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1d1af5d70029872ea1c9f0d2c18bf5cf4e24cd3e + c0aa76c865eb72b183247119752dfabca811f17a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1d1af5d70029872ea1c9f0d2c18bf5cf4e24cd3e + c0aa76c865eb72b183247119752dfabca811f17a diff --git a/eng/Versions.props b/eng/Versions.props index c4318dd50..0173becfd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,11 +58,11 @@ 7.0.15 7.0.15 - 7.0.15-servicing.23577.31 - 7.0.15-servicing.23577.31 - 7.0.15-servicing.23577.31 - 7.0.15-servicing.23577.31 - 7.0.15-servicing.23577.31 + 7.0.15-servicing.23601.10 + 7.0.15-servicing.23601.10 + 7.0.15-servicing.23601.10 + 7.0.15-servicing.23601.10 + 7.0.15-servicing.23601.10 0.2.0 @@ -70,8 +70,8 @@ 7.0.115 - 7.0.115-servicing.23579.12 - 7.0.115-servicing.23579.12 + 7.0.115-servicing.23601.25 + 7.0.115-servicing.23601.25 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 059cd2aa3bb714bd4934b23f3eedc4564815ecce Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 1 Dec 2023 21:52:43 +0000 Subject: [PATCH 051/138] Merged PR 35764: [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.15 to 7.0.15 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 7.0.15-servicing.23577.31 to 7.0.15-servicing.23601.10 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 7.0.15 to 7.0.15 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: from 7.0.15-servicing.23577.31 to 7.0.15-servicing.23601.10 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 7.0.15-servicing.23577.31 to 7.0.15-servicing.23601.10 (parent: Microsoft.NET.Sdk) - **dotnet-user-jwts**: from 7.0.15-servicing.23577.31 to 7.0.15-servicing.23601.10 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 7.0.15-servicing.23577.31 to 7.0.15-servicing.23601.10 (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**: 20231201.26 - **Date Produced**: December 1, 2023 9:22:43 PM UTC - **Commit**: a87e751ac0a46a6a69fb55a63a8f96a71ecace7c - **Branch**: refs/heads/internal/release/7.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.312 to 7.0.312][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.312-servicing.23579.10 to 7.0.312-servicing.23601.26][1] - **Microsoft.NET.Sdk**: [from 7.0.312-servicing.23579.10 to 7.0.312-servicing.23601.26][1] - **Microsoft.TemplateEngine.Cli**: [from 7.0.312-servicing.23579.10 to 7.0.312-servicing.23601.26][1] - **Microsoft.AspNetCore.App.Ref**: [from 7.0.15 to 7.0.15][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 7.0.15-servicing.23577.31 to 7.0.15-servicing.23601.10][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 7.0.15 to 7.0.15][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: [from 7.0.15-servicing.23577.31 to 7.0.15-servicing.23601.10][2] - **dotnet-dev-certs**: [from 7.0.15-servicing.23577.31 to 7.0.15-servicing.23601.10][2] - **dotnet-user-jwts**: [from 7.0.15-servicing.23577.31 to 7.0.15-servicing.23601.10][2] - **dotnet-user-secrets**: [from 7.0.15-servicing.23577.31 to 7.0.15-servicing.23601.10][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC4e72473553&targetVersion=GCa87e751ac0... --- 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 529a9110e..2102f9bcf 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 4c531da6e..9a29a0c14 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 360f1564385745dd9e9acc53e697f8e63ff41126 + c49ccc8727c620ce1cb8fb431bb3fe8f2e747236 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 360f1564385745dd9e9acc53e697f8e63ff41126 + c49ccc8727c620ce1cb8fb431bb3fe8f2e747236 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 360f1564385745dd9e9acc53e697f8e63ff41126 + c49ccc8727c620ce1cb8fb431bb3fe8f2e747236 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 360f1564385745dd9e9acc53e697f8e63ff41126 + c49ccc8727c620ce1cb8fb431bb3fe8f2e747236 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 360f1564385745dd9e9acc53e697f8e63ff41126 + c49ccc8727c620ce1cb8fb431bb3fe8f2e747236 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 360f1564385745dd9e9acc53e697f8e63ff41126 + c49ccc8727c620ce1cb8fb431bb3fe8f2e747236 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 360f1564385745dd9e9acc53e697f8e63ff41126 + c49ccc8727c620ce1cb8fb431bb3fe8f2e747236 https://github.com/dotnet/test-templates @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4e72473553eb228156e7946886d68efcc004879f + a87e751ac0a46a6a69fb55a63a8f96a71ecace7c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4e72473553eb228156e7946886d68efcc004879f + a87e751ac0a46a6a69fb55a63a8f96a71ecace7c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4e72473553eb228156e7946886d68efcc004879f + a87e751ac0a46a6a69fb55a63a8f96a71ecace7c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4e72473553eb228156e7946886d68efcc004879f + a87e751ac0a46a6a69fb55a63a8f96a71ecace7c diff --git a/eng/Versions.props b/eng/Versions.props index aa9d370e1..2db776d1f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,11 +58,11 @@ 7.0.15 7.0.15 - 7.0.15-servicing.23577.31 - 7.0.15-servicing.23577.31 - 7.0.15-servicing.23577.31 - 7.0.15-servicing.23577.31 - 7.0.15-servicing.23577.31 + 7.0.15-servicing.23601.10 + 7.0.15-servicing.23601.10 + 7.0.15-servicing.23601.10 + 7.0.15-servicing.23601.10 + 7.0.15-servicing.23601.10 0.2.0 @@ -70,8 +70,8 @@ 7.0.312 - 7.0.312-servicing.23579.10 - 7.0.312-servicing.23579.10 + 7.0.312-servicing.23601.26 + 7.0.312-servicing.23601.26 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f97e13f2df79e966a44decbea4feea9a74d4d180 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 1 Dec 2023 22:07:40 +0000 Subject: [PATCH 052/138] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231201.27 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.405 -> To Version 7.0.405 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.15 -> To Version 7.0.15 (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 a4af0c8cc..34760f138 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 34d949132..b6f25ee4e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 360f1564385745dd9e9acc53e697f8e63ff41126 + c49ccc8727c620ce1cb8fb431bb3fe8f2e747236 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 360f1564385745dd9e9acc53e697f8e63ff41126 + c49ccc8727c620ce1cb8fb431bb3fe8f2e747236 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 360f1564385745dd9e9acc53e697f8e63ff41126 + c49ccc8727c620ce1cb8fb431bb3fe8f2e747236 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 360f1564385745dd9e9acc53e697f8e63ff41126 + c49ccc8727c620ce1cb8fb431bb3fe8f2e747236 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 360f1564385745dd9e9acc53e697f8e63ff41126 + c49ccc8727c620ce1cb8fb431bb3fe8f2e747236 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 360f1564385745dd9e9acc53e697f8e63ff41126 + c49ccc8727c620ce1cb8fb431bb3fe8f2e747236 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 360f1564385745dd9e9acc53e697f8e63ff41126 + c49ccc8727c620ce1cb8fb431bb3fe8f2e747236 https://github.com/dotnet/test-templates @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ea50b565a6416e9bd2039db0f1a685cbaf46caa2 + 6e7e4b10f05d98471ed979e481f515fa750c52ae - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ea50b565a6416e9bd2039db0f1a685cbaf46caa2 + 6e7e4b10f05d98471ed979e481f515fa750c52ae - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ea50b565a6416e9bd2039db0f1a685cbaf46caa2 + 6e7e4b10f05d98471ed979e481f515fa750c52ae - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ea50b565a6416e9bd2039db0f1a685cbaf46caa2 + 6e7e4b10f05d98471ed979e481f515fa750c52ae diff --git a/eng/Versions.props b/eng/Versions.props index a87b860dd..ca5ace3ec 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,11 +58,11 @@ 7.0.15 7.0.15 - 7.0.15-servicing.23577.31 - 7.0.15-servicing.23577.31 - 7.0.15-servicing.23577.31 - 7.0.15-servicing.23577.31 - 7.0.15-servicing.23577.31 + 7.0.15-servicing.23601.10 + 7.0.15-servicing.23601.10 + 7.0.15-servicing.23601.10 + 7.0.15-servicing.23601.10 + 7.0.15-servicing.23601.10 0.2.0 @@ -70,8 +70,8 @@ 7.0.405 - 7.0.405-servicing.23580.13 - 7.0.405-servicing.23580.13 + 7.0.405-servicing.23601.27 + 7.0.405-servicing.23601.27 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 05d232d7760c452688dc302e20b6f9da41105d9a Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 4 Dec 2023 19:27:46 +0000 Subject: [PATCH 053/138] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231204.13 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.321-servicing.23601.16 -> To Version 6.0.321-servicing.23604.13 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 6.0.25 -> To Version 6.0.26 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++++++ eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 3 files changed, 32 insertions(+), 24 deletions(-) diff --git a/NuGet.config b/NuGet.config index 98638b9ae..6b6abf24e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,6 +8,7 @@ + @@ -15,11 +16,14 @@ + + + @@ -40,14 +44,18 @@ + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 62ffc36fd..824d1e2fe 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a74946f8dae6d29fd18c8fc702e23f8fe77c729c + 456adb551c1878a5dcc44f0b6e7d69de4789cbdc - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a74946f8dae6d29fd18c8fc702e23f8fe77c729c + 456adb551c1878a5dcc44f0b6e7d69de4789cbdc - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a74946f8dae6d29fd18c8fc702e23f8fe77c729c + 456adb551c1878a5dcc44f0b6e7d69de4789cbdc - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a74946f8dae6d29fd18c8fc702e23f8fe77c729c + 456adb551c1878a5dcc44f0b6e7d69de4789cbdc https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 6b4fc213e731cb128ad8ed54befea55d9e1d3f6d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2e6fec4ea47386d9306a4a2180ba7c61a7994f26 + 1f85f2a52ec422c16c8991f6cd24124c084e87d1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2e6fec4ea47386d9306a4a2180ba7c61a7994f26 + 1f85f2a52ec422c16c8991f6cd24124c084e87d1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - d4ee94199afb6c67ed448c252a07c0747c089e41 + b4d268210a29a07ba7a3003360b2b037881880db - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - fcec4d8986bb8339964c429abd6e4651b968ff4f + 981ef8014ab994eb3fce88dd81b815fce930dfa5 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index fef08b7bd..c837eb641 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.25-servicing.23519.16 + 6.0.26-servicing.23573.4 - 6.0.25-servicing.23519.18 + 6.0.26-servicing.23573.8 @@ -56,8 +56,8 @@ - 6.0.321-servicing.23601.16 - 6.0.321-servicing.23601.16 + 6.0.321-servicing.23604.13 + 6.0.321-servicing.23604.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,10 +78,10 @@ - 6.0.25-servicing.23520.5 - 6.0.25-servicing.23520.5 - 6.0.25 - 6.0.25 + 6.0.26-servicing.23604.3 + 6.0.26-servicing.23604.3 + 6.0.26 + 6.0.26 From 66b691b8d07133664999b49112590f0ddeb6d949 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 4 Dec 2023 19:28:06 +0000 Subject: [PATCH 054/138] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231204.14 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.418-servicing.23601.17 -> To Version 6.0.418-servicing.23604.14 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 6.0.25 -> To Version 6.0.26 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++++++ eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 3 files changed, 32 insertions(+), 24 deletions(-) diff --git a/NuGet.config b/NuGet.config index 44c201c8b..d4d84aab1 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,6 +8,7 @@ + @@ -15,11 +16,14 @@ + + + @@ -40,15 +44,19 @@ + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7c00837f2..15d012f5a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a74946f8dae6d29fd18c8fc702e23f8fe77c729c + 456adb551c1878a5dcc44f0b6e7d69de4789cbdc - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a74946f8dae6d29fd18c8fc702e23f8fe77c729c + 456adb551c1878a5dcc44f0b6e7d69de4789cbdc - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a74946f8dae6d29fd18c8fc702e23f8fe77c729c + 456adb551c1878a5dcc44f0b6e7d69de4789cbdc - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a74946f8dae6d29fd18c8fc702e23f8fe77c729c + 456adb551c1878a5dcc44f0b6e7d69de4789cbdc https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 04cc3e115c98a8aa1fde4b1b45218ed6331c45c5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6c327a186a3c6fc3aa2a08d5900ecb1da772ee86 + 4513782981406737e4944e0c12ab85172bd2366f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6c327a186a3c6fc3aa2a08d5900ecb1da772ee86 + 4513782981406737e4944e0c12ab85172bd2366f - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - d4ee94199afb6c67ed448c252a07c0747c089e41 + b4d268210a29a07ba7a3003360b2b037881880db - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - fcec4d8986bb8339964c429abd6e4651b968ff4f + 981ef8014ab994eb3fce88dd81b815fce930dfa5 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 08cd886fc..9f1214fc0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.25-servicing.23519.16 + 6.0.26-servicing.23573.4 - 6.0.25-servicing.23519.18 + 6.0.26-servicing.23573.8 @@ -56,8 +56,8 @@ - 6.0.418-servicing.23601.17 - 6.0.418-servicing.23601.17 + 6.0.418-servicing.23604.14 + 6.0.418-servicing.23604.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,10 +78,10 @@ - 6.0.25-servicing.23520.5 - 6.0.25-servicing.23520.5 - 6.0.25 - 6.0.25 + 6.0.26-servicing.23604.3 + 6.0.26-servicing.23604.3 + 6.0.26 + 6.0.26 From 1f121863d4457763492b55e8fc8fa78ce0cbb589 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 4 Dec 2023 19:28:35 +0000 Subject: [PATCH 055/138] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231204.12 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.126-servicing.23601.15 -> To Version 6.0.126-servicing.23604.12 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 6.0.25 -> To Version 6.0.26 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++++++ eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 3 files changed, 32 insertions(+), 24 deletions(-) diff --git a/NuGet.config b/NuGet.config index 9a61de726..51d242180 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,6 +8,7 @@ + @@ -15,11 +16,14 @@ + + + @@ -40,16 +44,20 @@ + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c54327a2d..72d2cedbe 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a74946f8dae6d29fd18c8fc702e23f8fe77c729c + 456adb551c1878a5dcc44f0b6e7d69de4789cbdc - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a74946f8dae6d29fd18c8fc702e23f8fe77c729c + 456adb551c1878a5dcc44f0b6e7d69de4789cbdc - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a74946f8dae6d29fd18c8fc702e23f8fe77c729c + 456adb551c1878a5dcc44f0b6e7d69de4789cbdc - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a74946f8dae6d29fd18c8fc702e23f8fe77c729c + 456adb551c1878a5dcc44f0b6e7d69de4789cbdc https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating e58a1e0535c781fc1c12a5bbbc81c5044260d3e0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3652ba2a882726bbaed0dc2e906154197ded6811 + 493e67d12750dc460c159ff6a5c81fec6e525f46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3652ba2a882726bbaed0dc2e906154197ded6811 + 493e67d12750dc460c159ff6a5c81fec6e525f46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - d4ee94199afb6c67ed448c252a07c0747c089e41 + b4d268210a29a07ba7a3003360b2b037881880db - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - fcec4d8986bb8339964c429abd6e4651b968ff4f + 981ef8014ab994eb3fce88dd81b815fce930dfa5 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 4a187c317..061193e71 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.25-servicing.23519.16 + 6.0.26-servicing.23573.4 - 6.0.25-servicing.23519.18 + 6.0.26-servicing.23573.8 @@ -56,8 +56,8 @@ - 6.0.126-servicing.23601.15 - 6.0.126-servicing.23601.15 + 6.0.126-servicing.23604.12 + 6.0.126-servicing.23604.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,10 +78,10 @@ - 6.0.25-servicing.23520.5 - 6.0.25-servicing.23520.5 - 6.0.25 - 6.0.25 + 6.0.26-servicing.23604.3 + 6.0.26-servicing.23604.3 + 6.0.26 + 6.0.26 From 5f19470397cdaf2c7dfc47f384e201fc90944ad2 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 5 Dec 2023 22:25:34 +0000 Subject: [PATCH 056/138] Merged PR 35828: [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.NETCore.App.Ref**: from 6.0.26 to 6.0.26 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.26-servicing.23572.29 to 6.0.26-servicing.23605.8 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.26 to 6.0.26 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.26 to 6.0.26 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.26 to 6.0.26 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.26-servicing.23572.29 to 6.0.26-servicing.23605.8 (parent: Microsoft.NET.Sdk) - **Microsoft.NET.Workload.Emscripten.Manifest-6.0.100**: from 6.0.25 to 6.0.26 (parent: VS.Redist.Common.NetCore.SharedFramework.x64.6.0) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698 - **Build**: 20231205.14 - **Date Produced**: December 5, 2023 10:05:04 PM UTC - **Commit**: 9b8cdd0062a889793bda0f84365492c6e21ff981 - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.126-servicing.23604.12 to 6.0.126-servicing.23605.14][1] - **Microsoft.NET.Sdk**: [from 6.0.126-servicing.23604.12 to 6.0.126-servicing.23605.14][1] - **Microsoft.NETCore.App.Ref**: [from 6.0.26 to 6.0.26][2] - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: [from 6.0.26-servicing.23572.29 to 6.0.26-servicing.23605.8][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.26 to 6.0.26][2] - **Microsoft.NETCore.App.Host.win-x64**: [from 6.0.26 to 6.0.26][2] - **Microsoft.NETCore.DotNetHostResolver**: [from 6.0.26 to 6.0.26][2] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.26-servicing.23572.29 to 6.0.26-servicing.23605.8][2] - **Microsoft.NET.Workload.Emscripten.Manifest-6.0.100**: [from 6.0.25 to 6.0.26][3] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC493e67d127&targetVersion=GC9b8cdd0062&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC965a793efc&targetVersion=GCdc45e96840&_a=files [3]: https://github.com/dotnet/emsdk/compare/d8bc162ccf...5ccc36f598 [DependencyUpdate]: <> (End)... --- NuGet.config | 7 +++---- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 10 +++++----- 3 files changed, 22 insertions(+), 23 deletions(-) diff --git a/NuGet.config b/NuGet.config index 51d242180..36c575133 100644 --- a/NuGet.config +++ b/NuGet.config @@ -11,12 +11,12 @@ + - - + @@ -50,8 +50,7 @@ - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 72d2cedbe..671fad883 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 456adb551c1878a5dcc44f0b6e7d69de4789cbdc - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 965a793efc765ddbea3c43e43c13b8e956b61946 + dc45e96840243b203b13e61952230e225d2aac52 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 965a793efc765ddbea3c43e43c13b8e956b61946 + dc45e96840243b203b13e61952230e225d2aac52 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 965a793efc765ddbea3c43e43c13b8e956b61946 + dc45e96840243b203b13e61952230e225d2aac52 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 965a793efc765ddbea3c43e43c13b8e956b61946 + dc45e96840243b203b13e61952230e225d2aac52 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 965a793efc765ddbea3c43e43c13b8e956b61946 + dc45e96840243b203b13e61952230e225d2aac52 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 965a793efc765ddbea3c43e43c13b8e956b61946 + dc45e96840243b203b13e61952230e225d2aac52 @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating e58a1e0535c781fc1c12a5bbbc81c5044260d3e0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 493e67d12750dc460c159ff6a5c81fec6e525f46 + 9b8cdd0062a889793bda0f84365492c6e21ff981 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 493e67d12750dc460c159ff6a5c81fec6e525f46 + 9b8cdd0062a889793bda0f84365492c6e21ff981 @@ -166,9 +166,9 @@ 698fdad58fa64a55f16cd9562c90224cc498ed02 - + https://github.com/dotnet/emsdk - d8bc162ccf7ce14fdbec9c2c50d6e856a7063c91 + 5ccc36f5985e2089f47c97a19c250e65ddefd0ba https://github.com/dotnet/source-build diff --git a/eng/Versions.props b/eng/Versions.props index 061193e71..e07ebd6dd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.126-servicing.23604.12 - 6.0.126-servicing.23604.12 + 6.0.126-servicing.23605.14 + 6.0.126-servicing.23605.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.26-servicing.23572.29 - 6.0.26-servicing.23572.29 + 6.0.26-servicing.23605.8 + 6.0.26-servicing.23605.8 6.0.26 6.0.26 6.0.26 @@ -185,7 +185,7 @@ 12.0.101-preview.9.31 15.0.101-preview.9.31 $(MicrosoftNETCoreAppRefPackageVersion) - 6.0.25 + 6.0.26 $(MicrosoftNETWorkloadEmscriptenManifest60100Version) From e370c6bd8c9bd9d2957be5a164eccc4f011e6d41 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 5 Dec 2023 22:26:10 +0000 Subject: [PATCH 057/138] Merged PR 35829: [internal/release/6.0.4xx] 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 6.0.26 to 6.0.26 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.26-servicing.23572.29 to 6.0.26-servicing.23605.8 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.26 to 6.0.26 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.26 to 6.0.26 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.26 to 6.0.26 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.26-servicing.23572.29 to 6.0.26-servicing.23605.8 (parent: Microsoft.NET.Sdk) - **Microsoft.NET.Workload.Emscripten.Manifest-6.0.400**: from 6.0.25 to 6.0.26 (parent: VS.Redist.Common.NetCore.SharedFramework.x64.6.0) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20231205.16 - **Date Produced**: December 5, 2023 10:05:15 PM UTC - **Commit**: 416a14840c7d80cbf46dc518b027bad88c3e14bf - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.418-servicing.23604.14 to 6.0.418-servicing.23605.16][1] - **Microsoft.NET.Sdk**: [from 6.0.418-servicing.23604.14 to 6.0.418-servicing.23605.16][1] - **Microsoft.NETCore.App.Ref**: [from 6.0.26 to 6.0.26][2] - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: [from 6.0.26-servicing.23572.29 to 6.0.26-servicing.23605.8][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.26 to 6.0.26][2] - **Microsoft.NETCore.App.Host.win-x64**: [from 6.0.26 to 6.0.26][2] - **Microsoft.NETCore.DotNetHostResolver**: [from 6.0.26 to 6.0.26][2] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.26-servicing.23572.29 to 6.0.26-servicing.23605.8][2] - **Microsoft.NET.Workload.Emscripten.Manifest-6.0.400**: [from 6.0.25 to 6.0.26][3] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC4513782981&targetVersion=GC416a14840c&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC965a793efc&targetVersion=GCdc45e96840&_a=files [3]: https://github.com/dotnet/emsdk/compare/d8bc162ccf...5ccc36f598 [DependencyUpdate]: <> (End)... --- NuGet.config | 7 +++---- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 10 +++++----- 3 files changed, 22 insertions(+), 23 deletions(-) diff --git a/NuGet.config b/NuGet.config index d4d84aab1..0b41bf143 100644 --- a/NuGet.config +++ b/NuGet.config @@ -11,12 +11,12 @@ + - - + @@ -48,8 +48,7 @@ - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 15d012f5a..9cece73bc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 456adb551c1878a5dcc44f0b6e7d69de4789cbdc - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 965a793efc765ddbea3c43e43c13b8e956b61946 + dc45e96840243b203b13e61952230e225d2aac52 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 965a793efc765ddbea3c43e43c13b8e956b61946 + dc45e96840243b203b13e61952230e225d2aac52 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 965a793efc765ddbea3c43e43c13b8e956b61946 + dc45e96840243b203b13e61952230e225d2aac52 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 965a793efc765ddbea3c43e43c13b8e956b61946 + dc45e96840243b203b13e61952230e225d2aac52 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 965a793efc765ddbea3c43e43c13b8e956b61946 + dc45e96840243b203b13e61952230e225d2aac52 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 965a793efc765ddbea3c43e43c13b8e956b61946 + dc45e96840243b203b13e61952230e225d2aac52 @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 04cc3e115c98a8aa1fde4b1b45218ed6331c45c5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4513782981406737e4944e0c12ab85172bd2366f + 416a14840c7d80cbf46dc518b027bad88c3e14bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4513782981406737e4944e0c12ab85172bd2366f + 416a14840c7d80cbf46dc518b027bad88c3e14bf @@ -166,9 +166,9 @@ 698fdad58fa64a55f16cd9562c90224cc498ed02 - + https://github.com/dotnet/emsdk - d8bc162ccf7ce14fdbec9c2c50d6e856a7063c91 + 5ccc36f5985e2089f47c97a19c250e65ddefd0ba https://github.com/dotnet/source-build diff --git a/eng/Versions.props b/eng/Versions.props index 9f1214fc0..acba3cbf4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.418-servicing.23604.14 - 6.0.418-servicing.23604.14 + 6.0.418-servicing.23605.16 + 6.0.418-servicing.23605.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.26-servicing.23572.29 - 6.0.26-servicing.23572.29 + 6.0.26-servicing.23605.8 + 6.0.26-servicing.23605.8 6.0.26 6.0.26 6.0.26 @@ -185,7 +185,7 @@ 12.3.303 15.4.303 6.0.5 - 6.0.25 + 6.0.26 $(MicrosoftNETWorkloadEmscriptenManifest60400Version) From 151c083a87082989475106b8ebb08cfca977f3aa Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 5 Dec 2023 22:26:57 +0000 Subject: [PATCH 058/138] Merged PR 35830: [internal/release/6.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 6.0.26 to 6.0.26 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.26-servicing.23572.29 to 6.0.26-servicing.23605.8 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.26 to 6.0.26 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.26 to 6.0.26 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.26 to 6.0.26 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.26-servicing.23572.29 to 6.0.26-servicing.23605.8 (parent: Microsoft.NET.Sdk) - **Microsoft.NET.Workload.Emscripten.Manifest-6.0.300**: from 6.0.25 to 6.0.26 (parent: VS.Redist.Common.NetCore.SharedFramework.x64.6.0) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:b5bca336-8d99-407e-c145-08d9d60066b9) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: b5bca336-8d99-407e-c145-08d9d60066b9 - **Build**: 20231205.15 - **Date Produced**: December 5, 2023 10:05:22 PM UTC - **Commit**: c22a743f3adc2dafbf2bc9b4993e23ca15d0c828 - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.321-servicing.23604.13 to 6.0.321-servicing.23605.15][1] - **Microsoft.NET.Sdk**: [from 6.0.321-servicing.23604.13 to 6.0.321-servicing.23605.15][1] - **Microsoft.NETCore.App.Ref**: [from 6.0.26 to 6.0.26][2] - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: [from 6.0.26-servicing.23572.29 to 6.0.26-servicing.23605.8][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.26 to 6.0.26][2] - **Microsoft.NETCore.App.Host.win-x64**: [from 6.0.26 to 6.0.26][2] - **Microsoft.NETCore.DotNetHostResolver**: [from 6.0.26 to 6.0.26][2] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.26-servicing.23572.29 to 6.0.26-servicing.23605.8][2] - **Microsoft.NET.Workload.Emscripten.Manifest-6.0.300**: [from 6.0.25 to 6.0.26][3] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC1f85f2a52e&targetVersion=GCc22a743f3a&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC965a793efc&targetVersion=GCdc45e96840&_a=files [3]: https://github.com/dotnet/emsdk/compare/d8bc162ccf...5ccc36f598 [DependencyUpdate]: <> (End)... --- NuGet.config | 7 +++---- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 10 +++++----- 3 files changed, 22 insertions(+), 23 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6b6abf24e..575275834 100644 --- a/NuGet.config +++ b/NuGet.config @@ -11,12 +11,12 @@ + - - + @@ -48,8 +48,7 @@ - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 824d1e2fe..aea92804f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 456adb551c1878a5dcc44f0b6e7d69de4789cbdc - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 965a793efc765ddbea3c43e43c13b8e956b61946 + dc45e96840243b203b13e61952230e225d2aac52 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 965a793efc765ddbea3c43e43c13b8e956b61946 + dc45e96840243b203b13e61952230e225d2aac52 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 965a793efc765ddbea3c43e43c13b8e956b61946 + dc45e96840243b203b13e61952230e225d2aac52 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 965a793efc765ddbea3c43e43c13b8e956b61946 + dc45e96840243b203b13e61952230e225d2aac52 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 965a793efc765ddbea3c43e43c13b8e956b61946 + dc45e96840243b203b13e61952230e225d2aac52 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 965a793efc765ddbea3c43e43c13b8e956b61946 + dc45e96840243b203b13e61952230e225d2aac52 @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 6b4fc213e731cb128ad8ed54befea55d9e1d3f6d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1f85f2a52ec422c16c8991f6cd24124c084e87d1 + c22a743f3adc2dafbf2bc9b4993e23ca15d0c828 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1f85f2a52ec422c16c8991f6cd24124c084e87d1 + c22a743f3adc2dafbf2bc9b4993e23ca15d0c828 @@ -166,9 +166,9 @@ 698fdad58fa64a55f16cd9562c90224cc498ed02 - + https://github.com/dotnet/emsdk - d8bc162ccf7ce14fdbec9c2c50d6e856a7063c91 + 5ccc36f5985e2089f47c97a19c250e65ddefd0ba https://github.com/dotnet/source-build diff --git a/eng/Versions.props b/eng/Versions.props index c837eb641..da8399e55 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.321-servicing.23604.13 - 6.0.321-servicing.23604.13 + 6.0.321-servicing.23605.15 + 6.0.321-servicing.23605.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.26-servicing.23572.29 - 6.0.26-servicing.23572.29 + 6.0.26-servicing.23605.8 + 6.0.26-servicing.23605.8 6.0.26 6.0.26 6.0.26 @@ -185,7 +185,7 @@ 12.3.100-rc.1.125 15.4.100-rc.1.125 6.0.4 - 6.0.25 + 6.0.26 $(MicrosoftNETWorkloadEmscriptenManifest60300Version) From 1e2c0c0af5208112c081e6788a841f94be4c0bd5 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 5 Dec 2023 23:28:28 +0000 Subject: [PATCH 059/138] Merged PR 35838: [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.126 to 6.0.126 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.126-servicing.23578.2 to 6.0.126-servicing.23605.4 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.126 to 6.0.126 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698 - **Build**: 20231205.20 - **Date Produced**: December 5, 2023 11:06:57 PM UTC - **Commit**: 45302fdcb923ce0d0c28b9f34f7684443b980a62 - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.126-servicing.23605.14 to 6.0.126-servicing.23605.20][1] - **Microsoft.NET.Sdk**: [from 6.0.126-servicing.23605.14 to 6.0.126-servicing.23605.20][1] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.126 to 6.0.126][2] - **Microsoft.TemplateEngine.Cli**: [from 6.0.126-servicing.23578.2 to 6.0.126-servicing.23605.4][2] - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.126 to 6.0.126][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC9b8cdd0062&targetVersion=GC45302fdcb9&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-templating/branches?baseVersion=GCe58a1e0535&targetVersion=GC28656189e4&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a68e208b-7b40-4a19-af8d-08d961c59698) --- NuGet.config | 6 ++---- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/NuGet.config b/NuGet.config index 36c575133..e7470c4b2 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,8 +19,7 @@ - - + @@ -52,8 +51,7 @@ - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 671fad883..89d861c82 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - e58a1e0535c781fc1c12a5bbbc81c5044260d3e0 + 28656189e49c05368afda92b482da8c0049d5638 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - e58a1e0535c781fc1c12a5bbbc81c5044260d3e0 + 28656189e49c05368afda92b482da8c0049d5638 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - e58a1e0535c781fc1c12a5bbbc81c5044260d3e0 + 28656189e49c05368afda92b482da8c0049d5638 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9b8cdd0062a889793bda0f84365492c6e21ff981 + 45302fdcb923ce0d0c28b9f34f7684443b980a62 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9b8cdd0062a889793bda0f84365492c6e21ff981 + 45302fdcb923ce0d0c28b9f34f7684443b980a62 diff --git a/eng/Versions.props b/eng/Versions.props index e07ebd6dd..9d7973343 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.126-servicing.23605.14 - 6.0.126-servicing.23605.14 + 6.0.126-servicing.23605.20 + 6.0.126-servicing.23605.20 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From aa3e2f103a246defb8718640fa7b54643460f423 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 5 Dec 2023 23:33:27 +0000 Subject: [PATCH 060/138] Merged PR 35839: [internal/release/6.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.DotNet.Common.ItemTemplates**: from 6.0.321 to 6.0.321 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.321-servicing.23573.13 to 6.0.321-servicing.23605.5 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.321 to 6.0.321 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:b5bca336-8d99-407e-c145-08d9d60066b9) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: b5bca336-8d99-407e-c145-08d9d60066b9 - **Build**: 20231205.22 - **Date Produced**: December 5, 2023 11:12:12 PM UTC - **Commit**: 96ce218210ee10662e18423d95be11527ff19222 - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.321-servicing.23605.15 to 6.0.321-servicing.23605.22][1] - **Microsoft.NET.Sdk**: [from 6.0.321-servicing.23605.15 to 6.0.321-servicing.23605.22][1] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.321 to 6.0.321][2] - **Microsoft.TemplateEngine.Cli**: [from 6.0.321-servicing.23573.13 to 6.0.321-servicing.23605.5][2] - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.321 to 6.0.321][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCc22a743f3a&targetVersion=GC96ce218210&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-templating/branches?baseVersion=GC6b4fc213e7&targetVersion=GC757b2e642e&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:b5bca336-8d99-407e-c145-08d9d60066b9) --- NuGet.config | 6 ++---- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/NuGet.config b/NuGet.config index 575275834..3eb49cca2 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,8 +19,7 @@ - - + @@ -50,8 +49,7 @@ - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index aea92804f..b1b71e0d7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 6b4fc213e731cb128ad8ed54befea55d9e1d3f6d + 757b2e642e3fb918bae9a87715c8c2fddbc9b3bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 6b4fc213e731cb128ad8ed54befea55d9e1d3f6d + 757b2e642e3fb918bae9a87715c8c2fddbc9b3bf https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 6b4fc213e731cb128ad8ed54befea55d9e1d3f6d + 757b2e642e3fb918bae9a87715c8c2fddbc9b3bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c22a743f3adc2dafbf2bc9b4993e23ca15d0c828 + 96ce218210ee10662e18423d95be11527ff19222 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c22a743f3adc2dafbf2bc9b4993e23ca15d0c828 + 96ce218210ee10662e18423d95be11527ff19222 diff --git a/eng/Versions.props b/eng/Versions.props index da8399e55..f4cd92209 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.321-servicing.23605.15 - 6.0.321-servicing.23605.15 + 6.0.321-servicing.23605.22 + 6.0.321-servicing.23605.22 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From ac7a1d300a624aee41943ff8b31d7831e3410487 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 5 Dec 2023 23:52:52 +0000 Subject: [PATCH 061/138] Merged PR 35840: [internal/release/6.0.4xx] 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.DotNet.Common.ItemTemplates**: from 6.0.418 to 6.0.418 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.418-rtm.23573.14 to 6.0.418-rtm.23605.6 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.418 to 6.0.418 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20231205.25 - **Date Produced**: December 5, 2023 11:22:43 PM UTC - **Commit**: d501a7b471f83b79814d1c385eecf21a14dfb67f - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.418-servicing.23605.16 to 6.0.418-servicing.23605.25][1] - **Microsoft.NET.Sdk**: [from 6.0.418-servicing.23605.16 to 6.0.418-servicing.23605.25][1] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.418 to 6.0.418][2] - **Microsoft.TemplateEngine.Cli**: [from 6.0.418-rtm.23573.14 to 6.0.418-rtm.23605.6][2] - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.418 to 6.0.418][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC416a14840c&targetVersion=GCd501a7b471&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-templating/branches?baseVersion=GC04cc3e115c&targetVersion=GC766ee832e4&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a27c2ce2-aedf-42b7-d31e-08da6571bd31) --- NuGet.config | 6 ++---- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/NuGet.config b/NuGet.config index 0b41bf143..3172c2731 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,8 +19,7 @@ - - + @@ -51,8 +50,7 @@ - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9cece73bc..22e725273 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 04cc3e115c98a8aa1fde4b1b45218ed6331c45c5 + 766ee832e4d9d2d685414fceae96dca3c4e4dcbc - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 04cc3e115c98a8aa1fde4b1b45218ed6331c45c5 + 766ee832e4d9d2d685414fceae96dca3c4e4dcbc https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 04cc3e115c98a8aa1fde4b1b45218ed6331c45c5 + 766ee832e4d9d2d685414fceae96dca3c4e4dcbc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 416a14840c7d80cbf46dc518b027bad88c3e14bf + d501a7b471f83b79814d1c385eecf21a14dfb67f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 416a14840c7d80cbf46dc518b027bad88c3e14bf + d501a7b471f83b79814d1c385eecf21a14dfb67f diff --git a/eng/Versions.props b/eng/Versions.props index acba3cbf4..5031c62ce 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.418-servicing.23605.16 - 6.0.418-servicing.23605.16 + 6.0.418-servicing.23605.25 + 6.0.418-servicing.23605.25 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From d9445f2ea5b7c1eaadd126545bf313f45a676696 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 6 Dec 2023 00:07:04 +0000 Subject: [PATCH 062/138] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231205.30 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.126-servicing.23605.20 -> To Version 6.0.126-servicing.23605.30 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets From Version 6.0.26 -> To Version 6.0.26 (parent: Microsoft.NET.Sdk --- NuGet.config | 6 ++---- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 22 insertions(+), 24 deletions(-) diff --git a/NuGet.config b/NuGet.config index e7470c4b2..fbf9c4902 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,8 +7,7 @@ - - + @@ -43,8 +42,7 @@ - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 89d861c82..6114908f0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fcbb4e1ccc6d063f7fce7c9977698b809111758 + d504a7b7dab277712646747e9f5cce0d9507245e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fcbb4e1ccc6d063f7fce7c9977698b809111758 + d504a7b7dab277712646747e9f5cce0d9507245e https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fcbb4e1ccc6d063f7fce7c9977698b809111758 + d504a7b7dab277712646747e9f5cce0d9507245e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fcbb4e1ccc6d063f7fce7c9977698b809111758 + d504a7b7dab277712646747e9f5cce0d9507245e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fcbb4e1ccc6d063f7fce7c9977698b809111758 + d504a7b7dab277712646747e9f5cce0d9507245e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fcbb4e1ccc6d063f7fce7c9977698b809111758 + d504a7b7dab277712646747e9f5cce0d9507245e https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 28656189e49c05368afda92b482da8c0049d5638 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 45302fdcb923ce0d0c28b9f34f7684443b980a62 + 3359fe0db5f3f0c33f81fd2c15ff44421512390f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 45302fdcb923ce0d0c28b9f34f7684443b980a62 + 3359fe0db5f3f0c33f81fd2c15ff44421512390f diff --git a/eng/Versions.props b/eng/Versions.props index 9d7973343..b326a0658 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.26 6.0.26 - 6.0.26-servicing.23601.8 - 6.0.26-servicing.23601.8 - 6.0.26-servicing.23601.8 - 6.0.26-servicing.23601.8 + 6.0.26-servicing.23605.6 + 6.0.26-servicing.23605.6 + 6.0.26-servicing.23605.6 + 6.0.26-servicing.23605.6 0.2.0 - 6.0.126-servicing.23605.20 - 6.0.126-servicing.23605.20 + 6.0.126-servicing.23605.30 + 6.0.126-servicing.23605.30 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From a71a77b9ff73eaa90537fade61a4d2af97f918a6 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 6 Dec 2023 00:21:22 +0000 Subject: [PATCH 063/138] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231205.31 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.321-servicing.23605.22 -> To Version 6.0.321-servicing.23605.31 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets From Version 6.0.26 -> To Version 6.0.26 (parent: Microsoft.NET.Sdk --- NuGet.config | 6 ++---- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 22 insertions(+), 24 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3eb49cca2..3371ee0f3 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,8 +7,7 @@ - - + @@ -43,8 +42,7 @@ - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b1b71e0d7..039f6a346 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fcbb4e1ccc6d063f7fce7c9977698b809111758 + d504a7b7dab277712646747e9f5cce0d9507245e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fcbb4e1ccc6d063f7fce7c9977698b809111758 + d504a7b7dab277712646747e9f5cce0d9507245e https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fcbb4e1ccc6d063f7fce7c9977698b809111758 + d504a7b7dab277712646747e9f5cce0d9507245e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fcbb4e1ccc6d063f7fce7c9977698b809111758 + d504a7b7dab277712646747e9f5cce0d9507245e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fcbb4e1ccc6d063f7fce7c9977698b809111758 + d504a7b7dab277712646747e9f5cce0d9507245e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fcbb4e1ccc6d063f7fce7c9977698b809111758 + d504a7b7dab277712646747e9f5cce0d9507245e https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 757b2e642e3fb918bae9a87715c8c2fddbc9b3bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 96ce218210ee10662e18423d95be11527ff19222 + b6662b12057b934f96c560cd077a7b15b0e0c156 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 96ce218210ee10662e18423d95be11527ff19222 + b6662b12057b934f96c560cd077a7b15b0e0c156 diff --git a/eng/Versions.props b/eng/Versions.props index f4cd92209..a6a9cf9a9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.26 6.0.26 - 6.0.26-servicing.23601.8 - 6.0.26-servicing.23601.8 - 6.0.26-servicing.23601.8 - 6.0.26-servicing.23601.8 + 6.0.26-servicing.23605.6 + 6.0.26-servicing.23605.6 + 6.0.26-servicing.23605.6 + 6.0.26-servicing.23605.6 0.2.0 - 6.0.321-servicing.23605.22 - 6.0.321-servicing.23605.22 + 6.0.321-servicing.23605.31 + 6.0.321-servicing.23605.31 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From aef6b390463d346d9480521368e04a78761fe8bd Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 6 Dec 2023 00:32:05 +0000 Subject: [PATCH 064/138] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231205.33 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.418-servicing.23605.25 -> To Version 6.0.418-servicing.23605.33 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets From Version 6.0.26 -> To Version 6.0.26 (parent: Microsoft.NET.Sdk --- NuGet.config | 6 ++---- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 22 insertions(+), 24 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3172c2731..136e28698 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,8 +7,7 @@ - - + @@ -43,8 +42,7 @@ - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 22e725273..06610174f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fcbb4e1ccc6d063f7fce7c9977698b809111758 + d504a7b7dab277712646747e9f5cce0d9507245e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fcbb4e1ccc6d063f7fce7c9977698b809111758 + d504a7b7dab277712646747e9f5cce0d9507245e https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fcbb4e1ccc6d063f7fce7c9977698b809111758 + d504a7b7dab277712646747e9f5cce0d9507245e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fcbb4e1ccc6d063f7fce7c9977698b809111758 + d504a7b7dab277712646747e9f5cce0d9507245e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fcbb4e1ccc6d063f7fce7c9977698b809111758 + d504a7b7dab277712646747e9f5cce0d9507245e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fcbb4e1ccc6d063f7fce7c9977698b809111758 + d504a7b7dab277712646747e9f5cce0d9507245e https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 766ee832e4d9d2d685414fceae96dca3c4e4dcbc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d501a7b471f83b79814d1c385eecf21a14dfb67f + d25cefa206ae17c16ec4746c3e7591db22e78f09 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d501a7b471f83b79814d1c385eecf21a14dfb67f + d25cefa206ae17c16ec4746c3e7591db22e78f09 diff --git a/eng/Versions.props b/eng/Versions.props index 5031c62ce..0cad5967e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.26 6.0.26 - 6.0.26-servicing.23601.8 - 6.0.26-servicing.23601.8 - 6.0.26-servicing.23601.8 - 6.0.26-servicing.23601.8 + 6.0.26-servicing.23605.6 + 6.0.26-servicing.23605.6 + 6.0.26-servicing.23605.6 + 6.0.26-servicing.23605.6 0.2.0 - 6.0.418-servicing.23605.25 - 6.0.418-servicing.23605.25 + 6.0.418-servicing.23605.33 + 6.0.418-servicing.23605.33 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From a706d50916a1dd757a838896dddbb6798fa2e748 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 6 Dec 2023 01:15:19 +0000 Subject: [PATCH 065/138] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231205.37 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.126-servicing.23605.30 -> To Version 6.0.126-servicing.23605.37 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 6.0.26 -> To Version 6.0.26 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index fbf9c4902..e97435cf7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -21,7 +21,7 @@ - + @@ -52,7 +52,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6114908f0..b750cf329 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 456adb551c1878a5dcc44f0b6e7d69de4789cbdc + 84ebced93b7a69ba3332fe6000354306d4eea9dd - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 456adb551c1878a5dcc44f0b6e7d69de4789cbdc + 84ebced93b7a69ba3332fe6000354306d4eea9dd - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 456adb551c1878a5dcc44f0b6e7d69de4789cbdc + 84ebced93b7a69ba3332fe6000354306d4eea9dd https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 456adb551c1878a5dcc44f0b6e7d69de4789cbdc + 84ebced93b7a69ba3332fe6000354306d4eea9dd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 28656189e49c05368afda92b482da8c0049d5638 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3359fe0db5f3f0c33f81fd2c15ff44421512390f + 3f5d0be2f51d49013230c45b5a9a6dad582f40f3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3359fe0db5f3f0c33f81fd2c15ff44421512390f + 3f5d0be2f51d49013230c45b5a9a6dad582f40f3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - b4d268210a29a07ba7a3003360b2b037881880db + c309ca06b81112f5e42cc9ca6f8bf0c4a772be6b - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 981ef8014ab994eb3fce88dd81b815fce930dfa5 + e5b72d0fb5a405d5443b571ba1d78f419bdbcdb7 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index b326a0658..1f643f677 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.26-servicing.23573.4 + 6.0.26-servicing.23605.5 - 6.0.26-servicing.23573.8 + 6.0.26-servicing.23605.3 @@ -56,8 +56,8 @@ - 6.0.126-servicing.23605.30 - 6.0.126-servicing.23605.30 + 6.0.126-servicing.23605.37 + 6.0.126-servicing.23605.37 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.26-servicing.23604.3 - 6.0.26-servicing.23604.3 + 6.0.26-servicing.23605.4 + 6.0.26-servicing.23605.4 6.0.26 6.0.26 From 8e5f7d62eb49b3bd82bfd818380559c9a5c7120b Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 6 Dec 2023 01:19:41 +0000 Subject: [PATCH 066/138] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231205.38 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.321-servicing.23605.31 -> To Version 6.0.321-servicing.23605.38 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 6.0.26 -> To Version 6.0.26 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3371ee0f3..78b63002e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -21,7 +21,7 @@ - + @@ -50,7 +50,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 039f6a346..1a2687e3e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 456adb551c1878a5dcc44f0b6e7d69de4789cbdc + 84ebced93b7a69ba3332fe6000354306d4eea9dd - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 456adb551c1878a5dcc44f0b6e7d69de4789cbdc + 84ebced93b7a69ba3332fe6000354306d4eea9dd - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 456adb551c1878a5dcc44f0b6e7d69de4789cbdc + 84ebced93b7a69ba3332fe6000354306d4eea9dd https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 456adb551c1878a5dcc44f0b6e7d69de4789cbdc + 84ebced93b7a69ba3332fe6000354306d4eea9dd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 757b2e642e3fb918bae9a87715c8c2fddbc9b3bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b6662b12057b934f96c560cd077a7b15b0e0c156 + 2f5d8604a65edf0c457ff3f600fad88b42568244 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b6662b12057b934f96c560cd077a7b15b0e0c156 + 2f5d8604a65edf0c457ff3f600fad88b42568244 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - b4d268210a29a07ba7a3003360b2b037881880db + c309ca06b81112f5e42cc9ca6f8bf0c4a772be6b - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 981ef8014ab994eb3fce88dd81b815fce930dfa5 + e5b72d0fb5a405d5443b571ba1d78f419bdbcdb7 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index a6a9cf9a9..13e0ab3db 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.26-servicing.23573.4 + 6.0.26-servicing.23605.5 - 6.0.26-servicing.23573.8 + 6.0.26-servicing.23605.3 @@ -56,8 +56,8 @@ - 6.0.321-servicing.23605.31 - 6.0.321-servicing.23605.31 + 6.0.321-servicing.23605.38 + 6.0.321-servicing.23605.38 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.26-servicing.23604.3 - 6.0.26-servicing.23604.3 + 6.0.26-servicing.23605.4 + 6.0.26-servicing.23605.4 6.0.26 6.0.26 From ae5a0f6777946b49c55782b6661338cc0a5420c3 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 6 Dec 2023 01:24:01 +0000 Subject: [PATCH 067/138] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231205.39 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.418-servicing.23605.33 -> To Version 6.0.418-servicing.23605.39 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 6.0.26 -> To Version 6.0.26 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index 136e28698..07d2ab1fe 100644 --- a/NuGet.config +++ b/NuGet.config @@ -21,7 +21,7 @@ - + @@ -51,7 +51,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 06610174f..5960f0e91 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 456adb551c1878a5dcc44f0b6e7d69de4789cbdc + 84ebced93b7a69ba3332fe6000354306d4eea9dd - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 456adb551c1878a5dcc44f0b6e7d69de4789cbdc + 84ebced93b7a69ba3332fe6000354306d4eea9dd - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 456adb551c1878a5dcc44f0b6e7d69de4789cbdc + 84ebced93b7a69ba3332fe6000354306d4eea9dd https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 456adb551c1878a5dcc44f0b6e7d69de4789cbdc + 84ebced93b7a69ba3332fe6000354306d4eea9dd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 766ee832e4d9d2d685414fceae96dca3c4e4dcbc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d25cefa206ae17c16ec4746c3e7591db22e78f09 + 1209a0007f12258907100d2ae06eaf8ef98c69e4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d25cefa206ae17c16ec4746c3e7591db22e78f09 + 1209a0007f12258907100d2ae06eaf8ef98c69e4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - b4d268210a29a07ba7a3003360b2b037881880db + c309ca06b81112f5e42cc9ca6f8bf0c4a772be6b - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 981ef8014ab994eb3fce88dd81b815fce930dfa5 + e5b72d0fb5a405d5443b571ba1d78f419bdbcdb7 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 0cad5967e..2f4872aa6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.26-servicing.23573.4 + 6.0.26-servicing.23605.5 - 6.0.26-servicing.23573.8 + 6.0.26-servicing.23605.3 @@ -56,8 +56,8 @@ - 6.0.418-servicing.23605.33 - 6.0.418-servicing.23605.33 + 6.0.418-servicing.23605.39 + 6.0.418-servicing.23605.39 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.26-servicing.23604.3 - 6.0.26-servicing.23604.3 + 6.0.26-servicing.23605.4 + 6.0.26-servicing.23605.4 6.0.26 6.0.26 From 9003cd429054f0cccd53643955a6c63023d184b7 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 11 Dec 2023 16:14:25 +0000 Subject: [PATCH 068/138] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231211.7 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.115 -> To Version 7.0.115 --- NuGet.config | 18 ++++++++++++++++-- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 25 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index 637dd025e..805cabdda 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,21 +8,29 @@ + + + + + + - + + + @@ -44,14 +52,20 @@ + + + + - + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 64be1c99d..572de4dc3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c0aa76c865eb72b183247119752dfabca811f17a + 1d26c769c9167ac9012c3e1fc0be86c9acffbde5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c0aa76c865eb72b183247119752dfabca811f17a + 1d26c769c9167ac9012c3e1fc0be86c9acffbde5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c0aa76c865eb72b183247119752dfabca811f17a + 1d26c769c9167ac9012c3e1fc0be86c9acffbde5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c0aa76c865eb72b183247119752dfabca811f17a + 1d26c769c9167ac9012c3e1fc0be86c9acffbde5 diff --git a/eng/Versions.props b/eng/Versions.props index 0173becfd..ad3fcc7dc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.115 - 7.0.115-servicing.23601.25 - 7.0.115-servicing.23601.25 + 7.0.115-servicing.23611.7 + 7.0.115-servicing.23611.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 1f2f8af63bde80943c8ec0232361ec7df29e4ce8 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 11 Dec 2023 16:16:16 +0000 Subject: [PATCH 069/138] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231211.8 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.405 -> To Version 7.0.405 --- NuGet.config | 18 ++++++++++++++++-- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 25 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index 34760f138..7dbbb3ffb 100644 --- a/NuGet.config +++ b/NuGet.config @@ -11,18 +11,26 @@ + + + + + + - + + + @@ -44,14 +52,20 @@ + + + + - + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b6f25ee4e..78af48631 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6e7e4b10f05d98471ed979e481f515fa750c52ae + 0870ab3583ae88850fb0249e7a8ec0c1a3911eec - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6e7e4b10f05d98471ed979e481f515fa750c52ae + 0870ab3583ae88850fb0249e7a8ec0c1a3911eec - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6e7e4b10f05d98471ed979e481f515fa750c52ae + 0870ab3583ae88850fb0249e7a8ec0c1a3911eec - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6e7e4b10f05d98471ed979e481f515fa750c52ae + 0870ab3583ae88850fb0249e7a8ec0c1a3911eec diff --git a/eng/Versions.props b/eng/Versions.props index ca5ace3ec..aeb17304b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.405 - 7.0.405-servicing.23601.27 - 7.0.405-servicing.23601.27 + 7.0.405-servicing.23611.8 + 7.0.405-servicing.23611.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 44d4ecfd328d54a6f867e3fd8fbae991e904eb8d Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Thu, 14 Dec 2023 11:13:37 -0600 Subject: [PATCH 070/138] Add back security-partners-dotnet pipeline (#17955) --- .../pipelines/security-partners-dotnet.yml | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml diff --git a/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml b/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml new file mode 100644 index 000000000..562530c96 --- /dev/null +++ b/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml @@ -0,0 +1,33 @@ +# DO NOT DELETE: This is used to validate PRs in the internal security-partners-dotnet repo + +trigger: none + +variables: +- name: cfsNPMWarnLevel + value: none + +- name: cfsNugetWarnLevel + value: none + +- name: myGetWarnLevel + value: none + +- name: NuGetSecurityAnalysisWarningLevel + value: none + +jobs: +- template: ../../src/installer/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml + parameters: + architecture: x64 + excludeSdkContentTests: true + matrix: + Ubuntu1804-Offline: + _BootstrapPrep: false + _Container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04 + _EnablePoison: false + _ExcludeOmniSharpTests: false + _RunOnline: false + name: Build_Tarball_x64 + pool: + name: NetCore1ESPool-Svc-Internal + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 From fc65f1f49b76c9e0a4af1b23d0a516cd7576db7c Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 2 Jan 2024 13:57:46 -0800 Subject: [PATCH 071/138] Update branding to 6.0.127 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 616f2592a..eaeeefcc7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 1 - 26 + 27 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From a00eb249abe78c03fea6233cb69816ef6d3b3eab Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 3 Jan 2024 02:06:11 +0000 Subject: [PATCH 072/138] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240102.14 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.405 -> To Version 7.0.406 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index 7dbbb3ffb..a6f72ad66 100644 --- a/NuGet.config +++ b/NuGet.config @@ -25,7 +25,7 @@ - + @@ -61,7 +61,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 78af48631..2d5d1c21b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ e1aecaf3a332e25fae8cc7aa09d524b5e7c4a47a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0870ab3583ae88850fb0249e7a8ec0c1a3911eec + 042b8c0a71f901e4c7b1a0553051a53ac8fff5af - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0870ab3583ae88850fb0249e7a8ec0c1a3911eec + 042b8c0a71f901e4c7b1a0553051a53ac8fff5af - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0870ab3583ae88850fb0249e7a8ec0c1a3911eec + 042b8c0a71f901e4c7b1a0553051a53ac8fff5af - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0870ab3583ae88850fb0249e7a8ec0c1a3911eec + 042b8c0a71f901e4c7b1a0553051a53ac8fff5af diff --git a/eng/Versions.props b/eng/Versions.props index aeb17304b..3b941202d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.405 - 7.0.405-servicing.23611.8 - 7.0.405-servicing.23611.8 + 7.0.406 + 7.0.406-servicing.24052.14 + 7.0.406-servicing.24052.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 84b18839efb9701623863821888e4a9bf03a1a25 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 3 Jan 2024 06:57:22 +0000 Subject: [PATCH 073/138] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240102.23 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.405 -> To Version 7.0.406 --- 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 a6f72ad66..1efb5d67c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -25,7 +25,7 @@ - + @@ -61,7 +61,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2d5d1c21b..63da6d03c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 042b8c0a71f901e4c7b1a0553051a53ac8fff5af + 3c459a3b2c699010fe00fae97bc389a3a8313297 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 042b8c0a71f901e4c7b1a0553051a53ac8fff5af + 3c459a3b2c699010fe00fae97bc389a3a8313297 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 042b8c0a71f901e4c7b1a0553051a53ac8fff5af + 3c459a3b2c699010fe00fae97bc389a3a8313297 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 042b8c0a71f901e4c7b1a0553051a53ac8fff5af + 3c459a3b2c699010fe00fae97bc389a3a8313297 diff --git a/eng/Versions.props b/eng/Versions.props index 3b941202d..92d1f82ba 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.406 - 7.0.406-servicing.24052.14 - 7.0.406-servicing.24052.14 + 7.0.406-servicing.24052.23 + 7.0.406-servicing.24052.23 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 2dc18cb432cdba2270648e737b8a423fd4160be2 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 3 Jan 2024 08:01:26 +0000 Subject: [PATCH 074/138] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240102.27 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.405 -> To Version 7.0.406 --- 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 1efb5d67c..9d7105801 100644 --- a/NuGet.config +++ b/NuGet.config @@ -25,7 +25,7 @@ - + @@ -61,7 +61,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 63da6d03c..c5dd10675 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3c459a3b2c699010fe00fae97bc389a3a8313297 + 3a4813d9c1bae86c7997a26db324d29320d0c7f2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3c459a3b2c699010fe00fae97bc389a3a8313297 + 3a4813d9c1bae86c7997a26db324d29320d0c7f2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3c459a3b2c699010fe00fae97bc389a3a8313297 + 3a4813d9c1bae86c7997a26db324d29320d0c7f2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3c459a3b2c699010fe00fae97bc389a3a8313297 + 3a4813d9c1bae86c7997a26db324d29320d0c7f2 diff --git a/eng/Versions.props b/eng/Versions.props index 92d1f82ba..dd7b31f87 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.406 - 7.0.406-servicing.24052.23 - 7.0.406-servicing.24052.23 + 7.0.406-servicing.24052.27 + 7.0.406-servicing.24052.27 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e063df560162542bb2a1b6258b89dbd650822f1a Mon Sep 17 00:00:00 2001 From: NET Source-Build Bot <102560831+dotnet-sb-bot@users.noreply.github.com> Date: Tue, 9 Jan 2024 21:23:36 +0100 Subject: [PATCH 075/138] .NET Source-Build 6.0.126 January 2024 Updates (#18155) --- eng/Versions.props | 2 +- src/SourceBuild/tarball/content/global.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index eaeeefcc7..cc3f8afd0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -174,7 +174,7 @@ or minor release, prebuilts may be needed. When the release is mature, prebuilts are not necessary, and this property is removed from the file. --> - 6.0.125 + 6.0.126 diff --git a/src/SourceBuild/tarball/content/global.json b/src/SourceBuild/tarball/content/global.json index 06cde48c2..d503a61b9 100644 --- a/src/SourceBuild/tarball/content/global.json +++ b/src/SourceBuild/tarball/content/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.125" + "dotnet": "6.0.126" }, "msbuild-sdks": { "Microsoft.Build.CentralPackageVersions": "2.0.1", From 8ddedbc99d939c737cfe7a84de62a756859643d0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 9 Jan 2024 20:46:09 +0000 Subject: [PATCH 076/138] Update dependencies from https://github.com/dotnet/source-build-externals build 20240109.2 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 7.0.0-alpha.1.22505.1 -> To Version 7.0.0-alpha.1.24059.2 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 327438c20..27a00eeb3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -176,9 +176,9 @@ c3ad00ae84489071080a606f6a8e43c9a91a5cc2 - + https://github.com/dotnet/source-build-externals - c47ba6c19d50081f90008da8bc61b3ac20348f20 + 4bed7bdd937666fac4c4f351b9b02adddf8d035b From b21afd145f9273598c6f2bc5ef76ef0c9785d39d Mon Sep 17 00:00:00 2001 From: NET Source-Build Bot <102560831+dotnet-sb-bot@users.noreply.github.com> Date: Tue, 9 Jan 2024 23:13:24 +0100 Subject: [PATCH 077/138] .NET Source-Build 7.0.115 January 2024 Updates (#18170) --- eng/Versions.props | 4 ++-- src/SourceBuild/tarball/content/global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 192f8e1a5..f821f79fd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -215,8 +215,8 @@ or minor release, prebuilts may be needed. When the release is mature, prebuilts are not necessary, and this property is removed from the file. --> - 7.0.114 - 7.0.114 + 7.0.115 + 7.0.115 diff --git a/src/SourceBuild/tarball/content/global.json b/src/SourceBuild/tarball/content/global.json index d508adc5c..ff635fdbf 100644 --- a/src/SourceBuild/tarball/content/global.json +++ b/src/SourceBuild/tarball/content/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.114" + "dotnet": "7.0.115" }, "msbuild-sdks": { "Microsoft.Build.CentralPackageVersions": "2.0.1", From 0af62b4a31696be95e6fe8372bef45b967c1015a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 10 Jan 2024 01:29:21 +0000 Subject: [PATCH 078/138] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20240109.2 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 7.0.0-alpha.1.23578.1 -> To Version 7.0.0-alpha.1.24059.2 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 327438c20..843ca034c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -207,9 +207,9 @@ https://github.com/dotnet/arcade ca53a3149aaedb03e5d79ee0e259d31ac8719290 - + https://github.com/dotnet/source-build-reference-packages - 6d5841c05f04d60eccf3358588b8c8968215d9e2 + 727ef4887d561dae6069d6b9c035773013dad041 From fc2e444798b24c8018e9dc6bab3d6b37a15e2d08 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 10 Jan 2024 01:30:15 +0000 Subject: [PATCH 079/138] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240109.22 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.405 -> To Version 7.0.406 --- NuGet.config | 10 ++-------- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 11 insertions(+), 17 deletions(-) diff --git a/NuGet.config b/NuGet.config index 9d7105801..eda0f484e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,9 +10,6 @@ - - - @@ -25,7 +22,7 @@ - + @@ -52,16 +49,13 @@ - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c5dd10675..897c079e6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3a4813d9c1bae86c7997a26db324d29320d0c7f2 + 36895744a55d4807fcffd915abe98295df454750 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3a4813d9c1bae86c7997a26db324d29320d0c7f2 + 36895744a55d4807fcffd915abe98295df454750 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3a4813d9c1bae86c7997a26db324d29320d0c7f2 + 36895744a55d4807fcffd915abe98295df454750 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3a4813d9c1bae86c7997a26db324d29320d0c7f2 + 36895744a55d4807fcffd915abe98295df454750 diff --git a/eng/Versions.props b/eng/Versions.props index dd7b31f87..9999f88f6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.406 - 7.0.406-servicing.24052.27 - 7.0.406-servicing.24052.27 + 7.0.406-servicing.24059.22 + 7.0.406-servicing.24059.22 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 5c2dd5b5cc5243d5d2ec1b31bcfb6314351c7845 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 10 Jan 2024 01:31:14 +0000 Subject: [PATCH 080/138] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20240109.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22580.2 -> To Version 6.0.0-servicing.24059.1 --- NuGet.config | 16 ++++++++++++++-- eng/Version.Details.xml | 4 ++-- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/NuGet.config b/NuGet.config index 07d2ab1fe..a286d7217 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,21 +7,28 @@ - + + + + + + + + @@ -42,15 +49,20 @@ - + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5960f0e91..0478bcbf1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade 7c67805da0adbf4e72f2f4799b63efcf1cc8fe4c - + https://github.com/dotnet/source-build-reference-packages - a93f0b1b98f48057457f9532aa3d76f1565b5182 + 6425c284100043ea5829deb255811d3487a91fb6 From 84bf31e6b224b3d4b6b9dcdfb23395493077f6e3 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 10 Jan 2024 03:46:02 +0000 Subject: [PATCH 081/138] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240109.30 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.405 -> To Version 7.0.406 --- 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 eda0f484e..756fb70f3 100644 --- a/NuGet.config +++ b/NuGet.config @@ -22,7 +22,7 @@ - + @@ -55,7 +55,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 897c079e6..36f7b9973 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 36895744a55d4807fcffd915abe98295df454750 + d403a7098a331d2a073f911e66bc3e614e5e44ed - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 36895744a55d4807fcffd915abe98295df454750 + d403a7098a331d2a073f911e66bc3e614e5e44ed - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 36895744a55d4807fcffd915abe98295df454750 + d403a7098a331d2a073f911e66bc3e614e5e44ed - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 36895744a55d4807fcffd915abe98295df454750 + d403a7098a331d2a073f911e66bc3e614e5e44ed diff --git a/eng/Versions.props b/eng/Versions.props index 9999f88f6..60843f738 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.406 - 7.0.406-servicing.24059.22 - 7.0.406-servicing.24059.22 + 7.0.406-servicing.24059.30 + 7.0.406-servicing.24059.30 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From c388b480c865c7840dd0744b30ae2c6efeb12f61 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 10 Jan 2024 06:55:46 +0000 Subject: [PATCH 082/138] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240109.34 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.405 -> To Version 7.0.406 --- 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 756fb70f3..44b1245c7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -22,7 +22,7 @@ - + @@ -55,7 +55,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 36f7b9973..456dadda3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d403a7098a331d2a073f911e66bc3e614e5e44ed + f8a7ad732e54f6f2f248ba3d7877afe6e8e1ec8c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d403a7098a331d2a073f911e66bc3e614e5e44ed + f8a7ad732e54f6f2f248ba3d7877afe6e8e1ec8c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d403a7098a331d2a073f911e66bc3e614e5e44ed + f8a7ad732e54f6f2f248ba3d7877afe6e8e1ec8c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d403a7098a331d2a073f911e66bc3e614e5e44ed + f8a7ad732e54f6f2f248ba3d7877afe6e8e1ec8c diff --git a/eng/Versions.props b/eng/Versions.props index 60843f738..e6ee7ad3c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.406 - 7.0.406-servicing.24059.30 - 7.0.406-servicing.24059.30 + 7.0.406-servicing.24059.34 + 7.0.406-servicing.24059.34 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 3513a14922a0b38eb3ec27e4e5a695d4231016ed Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Wed, 10 Jan 2024 08:45:25 -0600 Subject: [PATCH 083/138] Revert change for internal update --- src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets index 0a9a2ddc0..34dea7b25 100644 --- a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets +++ b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets @@ -174,7 +174,7 @@ Date: Wed, 10 Jan 2024 08:45:59 -0600 Subject: [PATCH 084/138] Remove extra line --- src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets | 1 - 1 file changed, 1 deletion(-) diff --git a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets index 34dea7b25..dc33e0a03 100644 --- a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets +++ b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets @@ -172,7 +172,6 @@ WorkingDirectory="$(TarballRepoSourceDir)" Condition="$(IsRootRepo) != 'true'" /> - From 48bc53793dab3cc1b9a911044ab90117d858a4ae Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Wed, 10 Jan 2024 08:47:54 -0600 Subject: [PATCH 085/138] Revert change for internal update --- src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets index 0a9a2ddc0..dc33e0a03 100644 --- a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets +++ b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets @@ -172,9 +172,8 @@ WorkingDirectory="$(TarballRepoSourceDir)" Condition="$(IsRootRepo) != 'true'" /> - Date: Wed, 10 Jan 2024 08:49:09 -0600 Subject: [PATCH 086/138] Revert change for internal update --- src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets index 0a9a2ddc0..dc33e0a03 100644 --- a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets +++ b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets @@ -172,9 +172,8 @@ WorkingDirectory="$(TarballRepoSourceDir)" Condition="$(IsRootRepo) != 'true'" /> - Date: Wed, 10 Jan 2024 17:10:50 +0000 Subject: [PATCH 087/138] Update dependencies from https://github.com/dotnet/arcade build 20240109.5 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.23564.5 -> To Version 7.0.0-beta.24059.5 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/darc-init.ps1 | 2 +- eng/common/darc-init.sh | 2 +- eng/common/post-build/add-build-to-channel.ps1 | 2 +- eng/common/post-build/publish-using-darc.ps1 | 2 +- eng/common/post-build/trigger-subscriptions.ps1 | 2 +- eng/common/templates/job/job.yml | 2 +- eng/common/templates/job/publish-build-assets.yml | 4 ++-- eng/common/templates/jobs/source-build.yml | 2 +- eng/common/templates/post-build/common-variables.yml | 2 +- eng/common/templates/post-build/post-build.yml | 4 ++-- global.json | 6 +++--- 13 files changed, 22 insertions(+), 22 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 518959be5..4b3cc0e38 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -194,18 +194,18 @@ - + https://github.com/dotnet/arcade - ca53a3149aaedb03e5d79ee0e259d31ac8719290 + 02d5538bac1bacfd6fb310d92ab8914de08f3358 - + https://github.com/dotnet/arcade - ca53a3149aaedb03e5d79ee0e259d31ac8719290 + 02d5538bac1bacfd6fb310d92ab8914de08f3358 - + https://github.com/dotnet/arcade - ca53a3149aaedb03e5d79ee0e259d31ac8719290 + 02d5538bac1bacfd6fb310d92ab8914de08f3358 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index f821f79fd..06dbfaa6d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.23564.5 + 7.0.0-beta.24059.5 diff --git a/eng/common/darc-init.ps1 b/eng/common/darc-init.ps1 index 435e76413..8fda30bdc 100644 --- a/eng/common/darc-init.ps1 +++ b/eng/common/darc-init.ps1 @@ -1,6 +1,6 @@ param ( $darcVersion = $null, - $versionEndpoint = 'https://maestro-prod.westus2.cloudapp.azure.com/api/assets/darc-version?api-version=2019-01-16', + $versionEndpoint = 'https://maestro.dot.net/api/assets/darc-version?api-version=2019-01-16', $verbosity = 'minimal', $toolpath = $null ) diff --git a/eng/common/darc-init.sh b/eng/common/darc-init.sh index 84c1d0cc2..c305ae6bd 100755 --- a/eng/common/darc-init.sh +++ b/eng/common/darc-init.sh @@ -2,7 +2,7 @@ source="${BASH_SOURCE[0]}" darcVersion='' -versionEndpoint='https://maestro-prod.westus2.cloudapp.azure.com/api/assets/darc-version?api-version=2019-01-16' +versionEndpoint='https://maestro.dot.net/api/assets/darc-version?api-version=2019-01-16' verbosity='minimal' while [[ $# > 0 ]]; do diff --git a/eng/common/post-build/add-build-to-channel.ps1 b/eng/common/post-build/add-build-to-channel.ps1 index de2d95792..49938f0c8 100644 --- a/eng/common/post-build/add-build-to-channel.ps1 +++ b/eng/common/post-build/add-build-to-channel.ps1 @@ -2,7 +2,7 @@ param( [Parameter(Mandatory=$true)][int] $BuildId, [Parameter(Mandatory=$true)][int] $ChannelId, [Parameter(Mandatory=$true)][string] $MaestroApiAccessToken, - [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro-prod.westus2.cloudapp.azure.com', + [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro.dot.net', [Parameter(Mandatory=$false)][string] $MaestroApiVersion = '2019-01-16' ) diff --git a/eng/common/post-build/publish-using-darc.ps1 b/eng/common/post-build/publish-using-darc.ps1 index 8508397d7..1e779fec4 100644 --- a/eng/common/post-build/publish-using-darc.ps1 +++ b/eng/common/post-build/publish-using-darc.ps1 @@ -3,7 +3,7 @@ param( [Parameter(Mandatory=$true)][int] $PublishingInfraVersion, [Parameter(Mandatory=$true)][string] $AzdoToken, [Parameter(Mandatory=$true)][string] $MaestroToken, - [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro-prod.westus2.cloudapp.azure.com', + [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro.dot.net', [Parameter(Mandatory=$true)][string] $WaitPublishingFinish, [Parameter(Mandatory=$false)][string] $ArtifactsPublishingAdditionalParameters, [Parameter(Mandatory=$false)][string] $SymbolPublishingAdditionalParameters diff --git a/eng/common/post-build/trigger-subscriptions.ps1 b/eng/common/post-build/trigger-subscriptions.ps1 index 55dea518a..ac9a95778 100644 --- a/eng/common/post-build/trigger-subscriptions.ps1 +++ b/eng/common/post-build/trigger-subscriptions.ps1 @@ -2,7 +2,7 @@ param( [Parameter(Mandatory=$true)][string] $SourceRepo, [Parameter(Mandatory=$true)][int] $ChannelId, [Parameter(Mandatory=$true)][string] $MaestroApiAccessToken, - [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro-prod.westus2.cloudapp.azure.com', + [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro.dot.net', [Parameter(Mandatory=$false)][string] $MaestroApiVersion = '2019-01-16' ) diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index ef337eac5..11c345c58 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -124,7 +124,7 @@ jobs: condition: and(succeeded(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT')) - ${{ if and(eq(parameters.runAsPublic, 'false'), eq(variables['System.TeamProject'], 'internal')) }}: - - task: NuGetAuthenticate@0 + - task: NuGetAuthenticate@1 - ${{ if or(eq(parameters.artifacts.download, 'true'), ne(parameters.artifacts.download, '')) }}: - task: DownloadPipelineArtifact@2 diff --git a/eng/common/templates/job/publish-build-assets.yml b/eng/common/templates/job/publish-build-assets.yml index c5fedd7f7..4ff83a536 100644 --- a/eng/common/templates/job/publish-build-assets.yml +++ b/eng/common/templates/job/publish-build-assets.yml @@ -72,7 +72,7 @@ jobs: condition: ${{ parameters.condition }} continueOnError: ${{ parameters.continueOnError }} - - task: NuGetAuthenticate@0 + - task: NuGetAuthenticate@1 - task: PowerShell@2 displayName: Enable cross-org NuGet feed authentication @@ -87,7 +87,7 @@ jobs: arguments: -task PublishBuildAssets -restore -msbuildEngine dotnet /p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests' /p:BuildAssetRegistryToken=$(MaestroAccessToken) - /p:MaestroApiEndpoint=https://maestro-prod.westus2.cloudapp.azure.com + /p:MaestroApiEndpoint=https://maestro.dot.net /p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }} /p:OfficialBuildId=$(Build.BuildNumber) condition: ${{ parameters.condition }} diff --git a/eng/common/templates/jobs/source-build.yml b/eng/common/templates/jobs/source-build.yml index a15b07eb5..8dd2d355f 100644 --- a/eng/common/templates/jobs/source-build.yml +++ b/eng/common/templates/jobs/source-build.yml @@ -14,7 +14,7 @@ parameters: # This is the default platform provided by Arcade, intended for use by a managed-only repo. defaultManagedPlatform: name: 'Managed' - container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8' + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8-20220809204800-17a4aab' # Defines the platforms on which to run build jobs. One job is created for each platform, and the # object in this array is sent to the job template as 'platform'. If no platforms are specified, diff --git a/eng/common/templates/post-build/common-variables.yml b/eng/common/templates/post-build/common-variables.yml index 776bd9700..b504fe55c 100644 --- a/eng/common/templates/post-build/common-variables.yml +++ b/eng/common/templates/post-build/common-variables.yml @@ -10,7 +10,7 @@ variables: # Default Maestro++ API Endpoint and API Version - name: MaestroApiEndPoint - value: "https://maestro-prod.westus2.cloudapp.azure.com" + value: "https://maestro.dot.net" - name: MaestroApiAccessToken value: $(MaestroAccessToken) - name: MaestroApiVersion diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index c051f1b65..7b989985b 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -169,7 +169,7 @@ stages: # This is necessary whenever we want to publish/restore to an AzDO private feed # Since sdk-task.ps1 tries to restore packages we need to do this authentication here # otherwise it'll complain about accessing a private feed. - - task: NuGetAuthenticate@0 + - task: NuGetAuthenticate@1 displayName: 'Authenticate to AzDO Feeds' - task: PowerShell@2 @@ -272,7 +272,7 @@ stages: BARBuildId: ${{ parameters.BARBuildId }} PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - - task: NuGetAuthenticate@0 + - task: NuGetAuthenticate@1 - task: PowerShell@2 displayName: Publish Using Darc diff --git a/global.json b/global.json index 154f5f035..fd9164f9a 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.113", + "dotnet": "7.0.115", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23564.5", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23564.5" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24059.5", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24059.5" } } From aeb5cae516262a7a3bd67804667e6fd6a8f8d0de Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 10 Jan 2024 11:46:22 -0800 Subject: [PATCH 088/138] [release/6.0.1xx] Update dependencies from dotnet/arcade (#18200) Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 16 ++++++++++++++-- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/darc-init.ps1 | 2 +- eng/common/darc-init.sh | 2 +- eng/common/post-build/add-build-to-channel.ps1 | 2 +- eng/common/post-build/publish-using-darc.ps1 | 2 +- eng/common/post-build/trigger-subscriptions.ps1 | 2 +- eng/common/templates/job/job.yml | 2 +- .../templates/job/publish-build-assets.yml | 4 ++-- .../templates/post-build/common-variables.yml | 2 +- eng/common/templates/post-build/post-build.yml | 2 +- global.json | 6 +++--- 13 files changed, 34 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index e97435cf7..1aadfd0ee 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,21 +7,28 @@ - + + + + + + + + @@ -42,16 +49,21 @@ - + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b750cf329..1292acafd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - 7c67805da0adbf4e72f2f4799b63efcf1cc8fe4c + e5e9a01e6d0dcde2e945624bc1ba1bc05d2c1fc2 - + https://github.com/dotnet/arcade - 7c67805da0adbf4e72f2f4799b63efcf1cc8fe4c + e5e9a01e6d0dcde2e945624bc1ba1bc05d2c1fc2 - + https://github.com/dotnet/arcade - 7c67805da0adbf4e72f2f4799b63efcf1cc8fe4c + e5e9a01e6d0dcde2e945624bc1ba1bc05d2c1fc2 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index f11f8a785..337516a40 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.23517.3 + 6.0.0-beta.24059.3 diff --git a/eng/common/darc-init.ps1 b/eng/common/darc-init.ps1 index 435e76413..8fda30bdc 100644 --- a/eng/common/darc-init.ps1 +++ b/eng/common/darc-init.ps1 @@ -1,6 +1,6 @@ param ( $darcVersion = $null, - $versionEndpoint = 'https://maestro-prod.westus2.cloudapp.azure.com/api/assets/darc-version?api-version=2019-01-16', + $versionEndpoint = 'https://maestro.dot.net/api/assets/darc-version?api-version=2019-01-16', $verbosity = 'minimal', $toolpath = $null ) diff --git a/eng/common/darc-init.sh b/eng/common/darc-init.sh index 39abdbecd..4e4116f1d 100755 --- a/eng/common/darc-init.sh +++ b/eng/common/darc-init.sh @@ -2,7 +2,7 @@ source="${BASH_SOURCE[0]}" darcVersion='' -versionEndpoint='https://maestro-prod.westus2.cloudapp.azure.com/api/assets/darc-version?api-version=2019-01-16' +versionEndpoint='https://maestro.dot.net/api/assets/darc-version?api-version=2019-01-16' verbosity='minimal' while [[ $# > 0 ]]; do diff --git a/eng/common/post-build/add-build-to-channel.ps1 b/eng/common/post-build/add-build-to-channel.ps1 index de2d95792..49938f0c8 100644 --- a/eng/common/post-build/add-build-to-channel.ps1 +++ b/eng/common/post-build/add-build-to-channel.ps1 @@ -2,7 +2,7 @@ param( [Parameter(Mandatory=$true)][int] $BuildId, [Parameter(Mandatory=$true)][int] $ChannelId, [Parameter(Mandatory=$true)][string] $MaestroApiAccessToken, - [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro-prod.westus2.cloudapp.azure.com', + [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro.dot.net', [Parameter(Mandatory=$false)][string] $MaestroApiVersion = '2019-01-16' ) diff --git a/eng/common/post-build/publish-using-darc.ps1 b/eng/common/post-build/publish-using-darc.ps1 index 8508397d7..1e779fec4 100644 --- a/eng/common/post-build/publish-using-darc.ps1 +++ b/eng/common/post-build/publish-using-darc.ps1 @@ -3,7 +3,7 @@ param( [Parameter(Mandatory=$true)][int] $PublishingInfraVersion, [Parameter(Mandatory=$true)][string] $AzdoToken, [Parameter(Mandatory=$true)][string] $MaestroToken, - [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro-prod.westus2.cloudapp.azure.com', + [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro.dot.net', [Parameter(Mandatory=$true)][string] $WaitPublishingFinish, [Parameter(Mandatory=$false)][string] $ArtifactsPublishingAdditionalParameters, [Parameter(Mandatory=$false)][string] $SymbolPublishingAdditionalParameters diff --git a/eng/common/post-build/trigger-subscriptions.ps1 b/eng/common/post-build/trigger-subscriptions.ps1 index 55dea518a..ac9a95778 100644 --- a/eng/common/post-build/trigger-subscriptions.ps1 +++ b/eng/common/post-build/trigger-subscriptions.ps1 @@ -2,7 +2,7 @@ param( [Parameter(Mandatory=$true)][string] $SourceRepo, [Parameter(Mandatory=$true)][int] $ChannelId, [Parameter(Mandatory=$true)][string] $MaestroApiAccessToken, - [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro-prod.westus2.cloudapp.azure.com', + [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro.dot.net', [Parameter(Mandatory=$false)][string] $MaestroApiVersion = '2019-01-16' ) diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index 0e10e7db6..01da2420d 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -123,7 +123,7 @@ jobs: continueOnError: ${{ parameters.continueOnError }} condition: and(succeeded(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT')) - - task: NuGetAuthenticate@0 + - task: NuGetAuthenticate@1 - ${{ if or(eq(parameters.artifacts.download, 'true'), ne(parameters.artifacts.download, '')) }}: - task: DownloadPipelineArtifact@2 diff --git a/eng/common/templates/job/publish-build-assets.yml b/eng/common/templates/job/publish-build-assets.yml index d91bf9147..239b17010 100644 --- a/eng/common/templates/job/publish-build-assets.yml +++ b/eng/common/templates/job/publish-build-assets.yml @@ -53,7 +53,7 @@ jobs: continueOnError: ${{ parameters.continueOnError }} - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - task: NuGetAuthenticate@0 + - task: NuGetAuthenticate@1 - task: PowerShell@2 displayName: Enable cross-org NuGet feed authentication @@ -68,7 +68,7 @@ jobs: arguments: -task PublishBuildAssets -restore -msbuildEngine dotnet /p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests' /p:BuildAssetRegistryToken=$(MaestroAccessToken) - /p:MaestroApiEndpoint=https://maestro-prod.westus2.cloudapp.azure.com + /p:MaestroApiEndpoint=https://maestro.dot.net /p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }} /p:Configuration=$(_BuildConfig) /p:OfficialBuildId=$(Build.BuildNumber) diff --git a/eng/common/templates/post-build/common-variables.yml b/eng/common/templates/post-build/common-variables.yml index 1ac7f49a4..fae340f4d 100644 --- a/eng/common/templates/post-build/common-variables.yml +++ b/eng/common/templates/post-build/common-variables.yml @@ -11,7 +11,7 @@ variables: # Default Maestro++ API Endpoint and API Version - name: MaestroApiEndPoint - value: "https://maestro-prod.westus2.cloudapp.azure.com" + value: "https://maestro.dot.net" - name: MaestroApiAccessToken value: $(MaestroAccessToken) - name: MaestroApiVersion diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index fc022ca9b..d49c6156b 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -162,7 +162,7 @@ stages: # This is necessary whenever we want to publish/restore to an AzDO private feed # Since sdk-task.ps1 tries to restore packages we need to do this authentication here # otherwise it'll complain about accessing a private feed. - - task: NuGetAuthenticate@0 + - task: NuGetAuthenticate@1 displayName: 'Authenticate to AzDO Feeds' - task: PowerShell@2 diff --git a/global.json b/global.json index 1410185dd..8bf2c6315 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.123", + "dotnet": "6.0.126", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23517.3", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.23517.3" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24059.3", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.24059.3" } } From 9bfe9ba33ea880945a44d06a23a54bec991f36f2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 10 Jan 2024 11:46:50 -0800 Subject: [PATCH 089/138] [release/6.0.4xx] Update dependencies from dotnet/arcade (#18198) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/darc-init.ps1 | 2 +- eng/common/darc-init.sh | 2 +- eng/common/post-build/add-build-to-channel.ps1 | 2 +- eng/common/post-build/publish-using-darc.ps1 | 2 +- eng/common/post-build/trigger-subscriptions.ps1 | 2 +- eng/common/templates/job/job.yml | 2 +- eng/common/templates/job/publish-build-assets.yml | 4 ++-- eng/common/templates/post-build/common-variables.yml | 2 +- eng/common/templates/post-build/post-build.yml | 2 +- global.json | 6 +++--- 12 files changed, 20 insertions(+), 20 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0478bcbf1..72a435584 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - 7c67805da0adbf4e72f2f4799b63efcf1cc8fe4c + e5e9a01e6d0dcde2e945624bc1ba1bc05d2c1fc2 - + https://github.com/dotnet/arcade - 7c67805da0adbf4e72f2f4799b63efcf1cc8fe4c + e5e9a01e6d0dcde2e945624bc1ba1bc05d2c1fc2 - + https://github.com/dotnet/arcade - 7c67805da0adbf4e72f2f4799b63efcf1cc8fe4c + e5e9a01e6d0dcde2e945624bc1ba1bc05d2c1fc2 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index c9fa2f63b..a3aef0fc8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.23517.3 + 6.0.0-beta.24059.3 diff --git a/eng/common/darc-init.ps1 b/eng/common/darc-init.ps1 index 435e76413..8fda30bdc 100644 --- a/eng/common/darc-init.ps1 +++ b/eng/common/darc-init.ps1 @@ -1,6 +1,6 @@ param ( $darcVersion = $null, - $versionEndpoint = 'https://maestro-prod.westus2.cloudapp.azure.com/api/assets/darc-version?api-version=2019-01-16', + $versionEndpoint = 'https://maestro.dot.net/api/assets/darc-version?api-version=2019-01-16', $verbosity = 'minimal', $toolpath = $null ) diff --git a/eng/common/darc-init.sh b/eng/common/darc-init.sh index 39abdbecd..4e4116f1d 100755 --- a/eng/common/darc-init.sh +++ b/eng/common/darc-init.sh @@ -2,7 +2,7 @@ source="${BASH_SOURCE[0]}" darcVersion='' -versionEndpoint='https://maestro-prod.westus2.cloudapp.azure.com/api/assets/darc-version?api-version=2019-01-16' +versionEndpoint='https://maestro.dot.net/api/assets/darc-version?api-version=2019-01-16' verbosity='minimal' while [[ $# > 0 ]]; do diff --git a/eng/common/post-build/add-build-to-channel.ps1 b/eng/common/post-build/add-build-to-channel.ps1 index de2d95792..49938f0c8 100644 --- a/eng/common/post-build/add-build-to-channel.ps1 +++ b/eng/common/post-build/add-build-to-channel.ps1 @@ -2,7 +2,7 @@ param( [Parameter(Mandatory=$true)][int] $BuildId, [Parameter(Mandatory=$true)][int] $ChannelId, [Parameter(Mandatory=$true)][string] $MaestroApiAccessToken, - [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro-prod.westus2.cloudapp.azure.com', + [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro.dot.net', [Parameter(Mandatory=$false)][string] $MaestroApiVersion = '2019-01-16' ) diff --git a/eng/common/post-build/publish-using-darc.ps1 b/eng/common/post-build/publish-using-darc.ps1 index 8508397d7..1e779fec4 100644 --- a/eng/common/post-build/publish-using-darc.ps1 +++ b/eng/common/post-build/publish-using-darc.ps1 @@ -3,7 +3,7 @@ param( [Parameter(Mandatory=$true)][int] $PublishingInfraVersion, [Parameter(Mandatory=$true)][string] $AzdoToken, [Parameter(Mandatory=$true)][string] $MaestroToken, - [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro-prod.westus2.cloudapp.azure.com', + [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro.dot.net', [Parameter(Mandatory=$true)][string] $WaitPublishingFinish, [Parameter(Mandatory=$false)][string] $ArtifactsPublishingAdditionalParameters, [Parameter(Mandatory=$false)][string] $SymbolPublishingAdditionalParameters diff --git a/eng/common/post-build/trigger-subscriptions.ps1 b/eng/common/post-build/trigger-subscriptions.ps1 index 55dea518a..ac9a95778 100644 --- a/eng/common/post-build/trigger-subscriptions.ps1 +++ b/eng/common/post-build/trigger-subscriptions.ps1 @@ -2,7 +2,7 @@ param( [Parameter(Mandatory=$true)][string] $SourceRepo, [Parameter(Mandatory=$true)][int] $ChannelId, [Parameter(Mandatory=$true)][string] $MaestroApiAccessToken, - [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro-prod.westus2.cloudapp.azure.com', + [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro.dot.net', [Parameter(Mandatory=$false)][string] $MaestroApiVersion = '2019-01-16' ) diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index 0e10e7db6..01da2420d 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -123,7 +123,7 @@ jobs: continueOnError: ${{ parameters.continueOnError }} condition: and(succeeded(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT')) - - task: NuGetAuthenticate@0 + - task: NuGetAuthenticate@1 - ${{ if or(eq(parameters.artifacts.download, 'true'), ne(parameters.artifacts.download, '')) }}: - task: DownloadPipelineArtifact@2 diff --git a/eng/common/templates/job/publish-build-assets.yml b/eng/common/templates/job/publish-build-assets.yml index d91bf9147..239b17010 100644 --- a/eng/common/templates/job/publish-build-assets.yml +++ b/eng/common/templates/job/publish-build-assets.yml @@ -53,7 +53,7 @@ jobs: continueOnError: ${{ parameters.continueOnError }} - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - task: NuGetAuthenticate@0 + - task: NuGetAuthenticate@1 - task: PowerShell@2 displayName: Enable cross-org NuGet feed authentication @@ -68,7 +68,7 @@ jobs: arguments: -task PublishBuildAssets -restore -msbuildEngine dotnet /p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests' /p:BuildAssetRegistryToken=$(MaestroAccessToken) - /p:MaestroApiEndpoint=https://maestro-prod.westus2.cloudapp.azure.com + /p:MaestroApiEndpoint=https://maestro.dot.net /p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }} /p:Configuration=$(_BuildConfig) /p:OfficialBuildId=$(Build.BuildNumber) diff --git a/eng/common/templates/post-build/common-variables.yml b/eng/common/templates/post-build/common-variables.yml index 1ac7f49a4..fae340f4d 100644 --- a/eng/common/templates/post-build/common-variables.yml +++ b/eng/common/templates/post-build/common-variables.yml @@ -11,7 +11,7 @@ variables: # Default Maestro++ API Endpoint and API Version - name: MaestroApiEndPoint - value: "https://maestro-prod.westus2.cloudapp.azure.com" + value: "https://maestro.dot.net" - name: MaestroApiAccessToken value: $(MaestroAccessToken) - name: MaestroApiVersion diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index fc022ca9b..d49c6156b 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -162,7 +162,7 @@ stages: # This is necessary whenever we want to publish/restore to an AzDO private feed # Since sdk-task.ps1 tries to restore packages we need to do this authentication here # otherwise it'll complain about accessing a private feed. - - task: NuGetAuthenticate@0 + - task: NuGetAuthenticate@1 displayName: 'Authenticate to AzDO Feeds' - task: PowerShell@2 diff --git a/global.json b/global.json index 1410185dd..8bf2c6315 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.123", + "dotnet": "6.0.126", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23517.3", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.23517.3" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24059.3", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.24059.3" } } From e33a1900c70c8cedf44a8b6dc2427d807307ccc1 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 10 Jan 2024 21:46:09 +0000 Subject: [PATCH 090/138] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240102.13 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.115 -> To Version 7.0.116 --- NuGet.config | 10 ++-------- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 3 files changed, 13 insertions(+), 19 deletions(-) diff --git a/NuGet.config b/NuGet.config index 805cabdda..c540d5b6a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,9 +7,6 @@ - - - @@ -25,7 +22,7 @@ - + @@ -52,16 +49,13 @@ - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 69806ea23..986a7a319 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ aaaa0c1826f97a9dfcc67e94136bf01010b55f23 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1d26c769c9167ac9012c3e1fc0be86c9acffbde5 + 86cfebd55c61090f03b1dbc23726f223780f6277 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1d26c769c9167ac9012c3e1fc0be86c9acffbde5 + 86cfebd55c61090f03b1dbc23726f223780f6277 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1d26c769c9167ac9012c3e1fc0be86c9acffbde5 + 86cfebd55c61090f03b1dbc23726f223780f6277 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1d26c769c9167ac9012c3e1fc0be86c9acffbde5 + 86cfebd55c61090f03b1dbc23726f223780f6277 diff --git a/eng/Versions.props b/eng/Versions.props index aa6ecfe70..b065f63a8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.115 - 7.0.115-servicing.23611.7 - 7.0.115-servicing.23611.7 + 7.0.116 + 7.0.116-servicing.24052.13 + 7.0.116-servicing.24052.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e6b3619857a42c31572cec730efa103ddca4e406 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 10 Jan 2024 21:46:26 +0000 Subject: [PATCH 091/138] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240109.23 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.116 -> To Version 7.0.116 --- 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 c540d5b6a..76a1552bc 100644 --- a/NuGet.config +++ b/NuGet.config @@ -22,7 +22,7 @@ - + @@ -55,7 +55,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 986a7a319..252b3b23b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 86cfebd55c61090f03b1dbc23726f223780f6277 + 91cd67046410b063fc65d3ef8e9ec816019e6b87 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 86cfebd55c61090f03b1dbc23726f223780f6277 + 91cd67046410b063fc65d3ef8e9ec816019e6b87 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 86cfebd55c61090f03b1dbc23726f223780f6277 + 91cd67046410b063fc65d3ef8e9ec816019e6b87 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 86cfebd55c61090f03b1dbc23726f223780f6277 + 91cd67046410b063fc65d3ef8e9ec816019e6b87 diff --git a/eng/Versions.props b/eng/Versions.props index b065f63a8..163cdd2e5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.116 - 7.0.116-servicing.24052.13 - 7.0.116-servicing.24052.13 + 7.0.116-servicing.24059.23 + 7.0.116-servicing.24059.23 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 954efb0193d3502595a66a37b85ab4318f0fea70 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 10 Jan 2024 21:46:43 +0000 Subject: [PATCH 092/138] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240110.20 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.116 -> To Version 7.0.116 --- 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 76a1552bc..cddbc2bcf 100644 --- a/NuGet.config +++ b/NuGet.config @@ -22,7 +22,7 @@ - + @@ -55,7 +55,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 252b3b23b..38e81f8dc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 91cd67046410b063fc65d3ef8e9ec816019e6b87 + 9d7476029043125e1f2acb5477c99b1d2710f12c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 91cd67046410b063fc65d3ef8e9ec816019e6b87 + 9d7476029043125e1f2acb5477c99b1d2710f12c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 91cd67046410b063fc65d3ef8e9ec816019e6b87 + 9d7476029043125e1f2acb5477c99b1d2710f12c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 91cd67046410b063fc65d3ef8e9ec816019e6b87 + 9d7476029043125e1f2acb5477c99b1d2710f12c diff --git a/eng/Versions.props b/eng/Versions.props index 163cdd2e5..fdf41eb71 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.116 - 7.0.116-servicing.24059.23 - 7.0.116-servicing.24059.23 + 7.0.116-servicing.24060.20 + 7.0.116-servicing.24060.20 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From bf9a94271eee83c7ee38ccd865283c3b4786387c Mon Sep 17 00:00:00 2001 From: Ella Hathaway <67609881+ellahathaway@users.noreply.github.com> Date: Wed, 10 Jan 2024 15:22:15 -0800 Subject: [PATCH 093/138] Update MsftToSbSdk.diff baseline (#18205) --- .../assets/baselines/MsftToSbSdk.diff | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff index 71ae3f0b9..dfeb1a2f8 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff @@ -14,7 +14,20 @@ index ------------ ./packs/Microsoft.AspNetCore.App.Ref/ ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ @@ ------------ @@ + ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/Microsoft.JSInterop.xml + ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/Microsoft.Net.Http.Headers.dll + ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/Microsoft.Net.Http.Headers.xml ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.DiagnosticSource.dll ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.DiagnosticSource.xml + ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.EventLog.dll + ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.EventLog.xml ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Formats.Asn1.dll ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Formats.Asn1.xml + ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.IO.Pipelines.dll ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.IO.Pipelines.xml ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Runtime.CompilerServices.Unsafe.dll ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.AccessControl.dll ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.AccessControl.xml ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.Cryptography.Xml.dll ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.Cryptography.Xml.xml -./packs/Microsoft.NETCore.App.Host.portable-rid/ @@ -29,6 +42,10 @@ index ------------ -./packs/Microsoft.NETCore.App.Host.portable-rid/x.y.z/runtimes/portable-rid/native/libnethost.so -./packs/Microsoft.NETCore.App.Host.portable-rid/x.y.z/runtimes/portable-rid/native/nethost.h -./packs/Microsoft.NETCore.App.Host.portable-rid/x.y.z/runtimes/portable-rid/native/singlefilehost ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Encodings.Web.dll ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Encodings.Web.xml ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Json.dll ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Json.xml +./packs/Microsoft.NETCore.App.Host.banana-rid/ +./packs/Microsoft.NETCore.App.Host.banana-rid/x.y.z/ +./packs/Microsoft.NETCore.App.Host.banana-rid/x.y.z/runtimes/ From bfa637a450634166b38a080a8377d3894ef62ca5 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 11 Jan 2024 09:44:22 +0000 Subject: [PATCH 094/138] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240111.4 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.406 -> To Version 7.0.406 --- 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 44b1245c7..bd3ba0a76 100644 --- a/NuGet.config +++ b/NuGet.config @@ -22,7 +22,7 @@ - + @@ -55,7 +55,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2df6a4485..47202d2a7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f8a7ad732e54f6f2f248ba3d7877afe6e8e1ec8c + b0c4f89a12a96383f763852b14707378f810b666 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f8a7ad732e54f6f2f248ba3d7877afe6e8e1ec8c + b0c4f89a12a96383f763852b14707378f810b666 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f8a7ad732e54f6f2f248ba3d7877afe6e8e1ec8c + b0c4f89a12a96383f763852b14707378f810b666 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f8a7ad732e54f6f2f248ba3d7877afe6e8e1ec8c + b0c4f89a12a96383f763852b14707378f810b666 diff --git a/eng/Versions.props b/eng/Versions.props index 710a92310..f503f25a2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.406 - 7.0.406-servicing.24059.34 - 7.0.406-servicing.24059.34 + 7.0.406-servicing.24061.4 + 7.0.406-servicing.24061.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 77897632e02a056f3eee8e0f22158a16efedd6ae Mon Sep 17 00:00:00 2001 From: Ella Hathaway <67609881+ellahathaway@users.noreply.github.com> Date: Thu, 11 Jan 2024 08:04:52 -0800 Subject: [PATCH 095/138] Update MsftToSbSdk.diff (#18210) --- .../assets/baselines/MsftToSbSdk.diff | 101 +++++++++++++++++- 1 file changed, 96 insertions(+), 5 deletions(-) diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff index bd443698c..4d662a3c3 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff @@ -14,7 +14,23 @@ index ------------ ./packs/Microsoft.AspNetCore.App.Ref/ ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ @@ ------------ @@ + ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/Microsoft.JSInterop.xml + ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/Microsoft.Net.Http.Headers.dll + ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/Microsoft.Net.Http.Headers.xml ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.DiagnosticSource.dll ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.DiagnosticSource.xml + ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.EventLog.dll + ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.EventLog.xml ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Formats.Asn1.dll ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Formats.Asn1.xml + ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.IO.Pipelines.dll + ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.IO.Pipelines.xml + ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.Cryptography.Xml.dll ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.Cryptography.Xml.xml ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Encodings.Web.dll ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Encodings.Web.xml ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Json.dll ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Json.xml ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Threading.RateLimiting.dll ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Threading.RateLimiting.xml -./packs/Microsoft.NETCore.App.Host.portable-rid/ @@ -109,6 +125,35 @@ index ------------ ./sdk/x.y.z/DotnetTools/dotnet-format/tr/ ./sdk/x.y.z/DotnetTools/dotnet-format/tr/dotnet-format.resources.dll ./sdk/x.y.z/DotnetTools/dotnet-format/tr/Microsoft.CodeAnalysis.CSharp.Features.resources.dll +@@ ------------ @@ + ./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/Microsoft.IdentityModel.JsonWebTokens.dll + ./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/Microsoft.IdentityModel.Logging.dll + ./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/Microsoft.IdentityModel.Tokens.dll ++./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/runtimes/ ++./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/runtimes/browser/ ++./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/runtimes/browser/lib/ ++./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/runtimes/browser/lib/netx.y/ ++./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/runtimes/browser/lib/netx.y/System.Text.Encodings.Web.dll + ./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/System.IdentityModel.Tokens.Jwt.dll ++./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/System.Text.Encodings.Web.dll ++./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/System.Text.Json.dll + ./sdk/x.y.z/DotnetTools/dotnet-user-secrets/ + ./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/ + ./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/ +@@ ------------ @@ + ./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Microsoft.Extensions.FileSystemGlobbing.dll + ./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Microsoft.Extensions.Primitives.dll + ./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Newtonsoft.Json.dll ++./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/runtimes/ ++./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/runtimes/browser/ ++./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/runtimes/browser/lib/ ++./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/runtimes/browser/lib/netx.y/ ++./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/runtimes/browser/lib/netx.y/System.Text.Encodings.Web.dll ++./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/System.Text.Encodings.Web.dll ++./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/System.Text.Json.dll + ./sdk/x.y.z/DotnetTools/dotnet-watch/ + ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/ + ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/ @@ ------------ @@ ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/Microsoft.CodeAnalysis.CSharp.Features.dll ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/Microsoft.CodeAnalysis.CSharp.Workspaces.dll @@ -124,21 +169,26 @@ index ------------ ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/middleware/Microsoft.AspNetCore.Watch.BrowserRefresh.dll ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/pl/ @@ ------------ @@ - ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/ru/Microsoft.CodeAnalysis.Workspaces.MSBuild.resources.dll ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/ru/Microsoft.CodeAnalysis.Workspaces.resources.dll ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/ru/System.CommandLine.resources.dll --./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/ + ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/ -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/unix/ -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/unix/lib/ -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/unix/lib/netx.y/ -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/unix/lib/netx.y/System.Drawing.Common.dll --./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/ --./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/ --./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/ ++./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/browser/ ++./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/browser/lib/ ++./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/browser/lib/netx.y/ ++./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/browser/lib/netx.y/System.Text.Encodings.Web.dll + ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/ + ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/ + ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/ -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/Microsoft.Win32.SystemEvents.dll -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/System.Drawing.Common.dll -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/System.Security.Cryptography.ProtectedData.dll -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/System.Windows.Extensions.dll ++./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/System.Text.Encoding.CodePages.dll ++./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Collections.Immutable.dll ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.CommandLine.dll ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Composition.AttributedModel.dll ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Composition.Convention.dll @@ -150,6 +200,10 @@ index ------------ -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Security.Cryptography.ProtectedData.dll -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Security.Permissions.dll -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Windows.Extensions.dll ++./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Reflection.Metadata.dll ++./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Text.Encoding.CodePages.dll ++./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Text.Encodings.Web.dll ++./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Text.Json.dll ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/tr/ ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/tr/dotnet-watch.resources.dll ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/tr/Microsoft.CodeAnalysis.CSharp.Features.resources.dll @@ -205,11 +259,21 @@ index ------------ -./sdk/x.y.z/FSharp/runtimes/win/lib/netx.y/System.Security.Cryptography.ProtectedData.dll ./sdk/x.y.z/FSharp/runtimes/win/lib/netx.y/System.Windows.Extensions.dll ./sdk/x.y.z/FSharp/System.CodeDom.dll ++./sdk/x.y.z/FSharp/System.Collections.Immutable.dll ./sdk/x.y.z/FSharp/System.Configuration.ConfigurationManager.dll +./sdk/x.y.z/FSharp/System.Diagnostics.EventLog.dll ./sdk/x.y.z/FSharp/System.Drawing.Common.dll ++./sdk/x.y.z/FSharp/System.Formats.Asn1.dll ++./sdk/x.y.z/FSharp/System.Reflection.Metadata.dll ./sdk/x.y.z/FSharp/System.Resources.Extensions.dll ./sdk/x.y.z/FSharp/System.Security.Cryptography.Pkcs.dll + ./sdk/x.y.z/FSharp/System.Security.Cryptography.ProtectedData.dll + ./sdk/x.y.z/FSharp/System.Security.Cryptography.Xml.dll + ./sdk/x.y.z/FSharp/System.Security.Permissions.dll ++./sdk/x.y.z/FSharp/System.Threading.Tasks.Dataflow.dll + ./sdk/x.y.z/FSharp/System.Windows.Extensions.dll + ./sdk/x.y.z/FSharp/tr/ + ./sdk/x.y.z/FSharp/tr/FSharp.Build.resources.dll @@ ------------ @@ ./sdk/x.y.z/Microsoft.Build.NuGetSdkResolver.dll ./sdk/x.y.z/Microsoft.Build.Tasks.Core.dll @@ -265,6 +329,13 @@ index ------------ ./sdk/x.y.z/runtimes/win/lib/netx.y/Microsoft.Win32.SystemEvents.dll ./sdk/x.y.z/runtimes/win/lib/netx.y/System.Diagnostics.EventLog.dll ./sdk/x.y.z/runtimes/win/lib/netx.y/System.Diagnostics.EventLog.Messages.dll + ./sdk/x.y.z/runtimes/win/lib/netx.y/System.Drawing.Common.dll + ./sdk/x.y.z/runtimes/win/lib/netx.y/System.Security.Cryptography.Pkcs.dll + ./sdk/x.y.z/runtimes/win/lib/netx.y/System.ServiceProcess.ServiceController.dll ++./sdk/x.y.z/runtimes/win/lib/netx.y/System.Text.Encoding.CodePages.dll + ./sdk/x.y.z/runtimes/win/lib/netx.y/System.Windows.Extensions.dll + ./sdk/x.y.z/SDKPrecomputedAssemblyReferences.cache + ./sdk/x.y.z/SdkResolvers/ @@ ------------ @@ ./sdk/x.y.z/Sdks/Microsoft.NET.ILLink.Tasks/tools/net472/System.Buffers.dll ./sdk/x.y.z/Sdks/Microsoft.NET.ILLink.Tasks/tools/net472/System.Collections.Immutable.dll @@ -289,6 +360,16 @@ index ------------ ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tasks/net472/System.Reflection.Metadata.dll ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tasks/net472/System.Runtime.CompilerServices.Unsafe.dll ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tasks/net472/System.Text.Encodings.Web.dll +@@ ------------ @@ + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tools/rzc.deps.json + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tools/rzc.dll + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tools/rzc.runtimeconfig.json ++./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tools/System.Collections.Immutable.dll ++./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tools/System.Reflection.Metadata.dll ++./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tools/System.Text.Encoding.CodePages.dll + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Web.ProjectSystem/ + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Web.ProjectSystem/Sdk/ + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Web.ProjectSystem/Sdk/Sdk.props @@ ------------ @@ ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Web/tools/net472/Microsoft.NET.Sdk.Web.Tasks.dll ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Web/tools/netx.y/ @@ -306,18 +387,28 @@ index ------------ ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk/tools/net472/System.Runtime.CompilerServices.Unsafe.dll ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk/tools/net472/System.Text.Encodings.Web.dll @@ ------------ @@ + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk/tools/netx.y/zh-Hant/Microsoft.NET.Build.Tasks.resources.dll ./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/ ./sdk/x.y.z/System.CodeDom.dll ++./sdk/x.y.z/System.Collections.Immutable.dll ./sdk/x.y.z/System.CommandLine.dll -./sdk/x.y.z/System.ComponentModel.Composition.dll ./sdk/x.y.z/System.Configuration.ConfigurationManager.dll ./sdk/x.y.z/System.Diagnostics.EventLog.dll ./sdk/x.y.z/System.Drawing.Common.dll ++./sdk/x.y.z/System.Formats.Asn1.dll ++./sdk/x.y.z/System.Reflection.Metadata.dll + ./sdk/x.y.z/System.Reflection.MetadataLoadContext.dll + ./sdk/x.y.z/System.Resources.Extensions.dll + ./sdk/x.y.z/System.Security.Cryptography.Pkcs.dll @@ ------------ @@ ./sdk/x.y.z/System.Security.Cryptography.Xml.dll ./sdk/x.y.z/System.Security.Permissions.dll ./sdk/x.y.z/System.ServiceProcess.ServiceController.dll ++./sdk/x.y.z/System.Text.Encoding.CodePages.dll +./sdk/x.y.z/System.Text.Encodings.Web.dll ++./sdk/x.y.z/System.Text.Json.dll ++./sdk/x.y.z/System.Threading.Tasks.Dataflow.dll ./sdk/x.y.z/System.Windows.Extensions.dll -./sdk/x.y.z/testhost-1.0.runtimeconfig.json -./sdk/x.y.z/testhost-1.1.runtimeconfig.json From 10b2130b4d30de802d3e117159130417f813ee23 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 11 Jan 2024 20:16:26 +0000 Subject: [PATCH 096/138] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240111.12 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.116 -> To Version 7.0.116 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.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 7.0.15 -> To Version 7.0.16 (parent: Microsoft.NET.Sdk --- NuGet.config | 14 ++++------ eng/Version.Details.xml | 62 ++++++++++++++++++++--------------------- eng/Versions.props | 28 +++++++++---------- 3 files changed, 51 insertions(+), 53 deletions(-) diff --git a/NuGet.config b/NuGet.config index cddbc2bcf..e9a2fa634 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,6 +7,7 @@ + @@ -22,12 +23,10 @@ - + - - - + @@ -49,18 +48,17 @@ + - + - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fa311536b..713af0f51 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - acb200f3181da8cc111042a65f247bab519b9663 + d62704f831ab66265d54c5d09b24a82bff2deac2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - acb200f3181da8cc111042a65f247bab519b9663 + d62704f831ab66265d54c5d09b24a82bff2deac2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - acb200f3181da8cc111042a65f247bab519b9663 + d62704f831ab66265d54c5d09b24a82bff2deac2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - acb200f3181da8cc111042a65f247bab519b9663 + d62704f831ab66265d54c5d09b24a82bff2deac2 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -52,34 +52,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c49ccc8727c620ce1cb8fb431bb3fe8f2e747236 + ecd58f375010a7fac5165a1ff584f8e336c9e044 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c49ccc8727c620ce1cb8fb431bb3fe8f2e747236 + ecd58f375010a7fac5165a1ff584f8e336c9e044 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c49ccc8727c620ce1cb8fb431bb3fe8f2e747236 + ecd58f375010a7fac5165a1ff584f8e336c9e044 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c49ccc8727c620ce1cb8fb431bb3fe8f2e747236 + ecd58f375010a7fac5165a1ff584f8e336c9e044 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c49ccc8727c620ce1cb8fb431bb3fe8f2e747236 + ecd58f375010a7fac5165a1ff584f8e336c9e044 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c49ccc8727c620ce1cb8fb431bb3fe8f2e747236 + ecd58f375010a7fac5165a1ff584f8e336c9e044 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c49ccc8727c620ce1cb8fb431bb3fe8f2e747236 + ecd58f375010a7fac5165a1ff584f8e336c9e044 https://github.com/dotnet/test-templates @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9d7476029043125e1f2acb5477c99b1d2710f12c + 383d1cee7ce36156a4adf5d0779c1eb94bf85357 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9d7476029043125e1f2acb5477c99b1d2710f12c + 383d1cee7ce36156a4adf5d0779c1eb94bf85357 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9d7476029043125e1f2acb5477c99b1d2710f12c + 383d1cee7ce36156a4adf5d0779c1eb94bf85357 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9d7476029043125e1f2acb5477c99b1d2710f12c + 383d1cee7ce36156a4adf5d0779c1eb94bf85357 https://dev.azure.com/dnceng/internal/_git/dotnet-winforms 1d272c1ef7277b7cc38148300732e6a72848bedc - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 02d7f45dcacc192b40e725d6f6e77ec64e202c7a + 963a6a55dd6f72f604651fff7c1515dadcd37a39 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 4bb45da0f..eab48d207 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,7 +41,7 @@ - 7.0.15-servicing.23578.3 + 7.0.16-servicing.24060.7 @@ -56,13 +56,13 @@ - 7.0.15 - 7.0.15 - 7.0.15-servicing.23601.10 - 7.0.15-servicing.23601.10 - 7.0.15-servicing.23601.10 - 7.0.15-servicing.23601.10 - 7.0.15-servicing.23601.10 + 7.0.16 + 7.0.16 + 7.0.16-servicing.24061.3 + 7.0.16-servicing.24061.3 + 7.0.16-servicing.24061.3 + 7.0.16-servicing.24061.3 + 7.0.16-servicing.24061.3 0.2.0 @@ -70,8 +70,8 @@ 7.0.116 - 7.0.116-servicing.24060.20 - 7.0.116-servicing.24060.20 + 7.0.116-servicing.24061.12 + 7.0.116-servicing.24061.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -92,10 +92,10 @@ - 7.0.15-servicing.23579.2 - 7.0.15-servicing.23579.2 - 7.0.15 - 7.0.15 + 7.0.16-servicing.24060.13 + 7.0.16-servicing.24060.13 + 7.0.16 + 7.0.16 From 6811cdf123d8a9cc9836b18ebf42fdfd96fde951 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 11 Jan 2024 20:17:01 +0000 Subject: [PATCH 097/138] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240111.13 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.312 -> To Version 7.0.313 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.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 7.0.15 -> To Version 7.0.16 (parent: Microsoft.NET.Sdk --- NuGet.config | 18 ++++++++---- eng/Version.Details.xml | 64 ++++++++++++++++++++--------------------- eng/Versions.props | 30 +++++++++---------- 3 files changed, 59 insertions(+), 53 deletions(-) diff --git a/NuGet.config b/NuGet.config index 2102f9bcf..fb6caa493 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,19 +10,23 @@ - + + + + + - + - + @@ -44,15 +48,17 @@ - + + + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b80909b84..408592dd6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - acb200f3181da8cc111042a65f247bab519b9663 + d62704f831ab66265d54c5d09b24a82bff2deac2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - acb200f3181da8cc111042a65f247bab519b9663 + d62704f831ab66265d54c5d09b24a82bff2deac2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - acb200f3181da8cc111042a65f247bab519b9663 + d62704f831ab66265d54c5d09b24a82bff2deac2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - acb200f3181da8cc111042a65f247bab519b9663 + d62704f831ab66265d54c5d09b24a82bff2deac2 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -52,34 +52,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c49ccc8727c620ce1cb8fb431bb3fe8f2e747236 + ecd58f375010a7fac5165a1ff584f8e336c9e044 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c49ccc8727c620ce1cb8fb431bb3fe8f2e747236 + ecd58f375010a7fac5165a1ff584f8e336c9e044 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c49ccc8727c620ce1cb8fb431bb3fe8f2e747236 + ecd58f375010a7fac5165a1ff584f8e336c9e044 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c49ccc8727c620ce1cb8fb431bb3fe8f2e747236 + ecd58f375010a7fac5165a1ff584f8e336c9e044 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c49ccc8727c620ce1cb8fb431bb3fe8f2e747236 + ecd58f375010a7fac5165a1ff584f8e336c9e044 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c49ccc8727c620ce1cb8fb431bb3fe8f2e747236 + ecd58f375010a7fac5165a1ff584f8e336c9e044 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c49ccc8727c620ce1cb8fb431bb3fe8f2e747236 + ecd58f375010a7fac5165a1ff584f8e336c9e044 https://github.com/dotnet/test-templates @@ -98,31 +98,31 @@ 45a41b353d078e4d1e5918246fddbacb452eb210 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a87e751ac0a46a6a69fb55a63a8f96a71ecace7c + 18d8a2987501c4439ddadf2501a80760f4f87de3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a87e751ac0a46a6a69fb55a63a8f96a71ecace7c + 18d8a2987501c4439ddadf2501a80760f4f87de3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a87e751ac0a46a6a69fb55a63a8f96a71ecace7c + 18d8a2987501c4439ddadf2501a80760f4f87de3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a87e751ac0a46a6a69fb55a63a8f96a71ecace7c + 18d8a2987501c4439ddadf2501a80760f4f87de3 https://dev.azure.com/dnceng/internal/_git/dotnet-winforms 1d272c1ef7277b7cc38148300732e6a72848bedc - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 02d7f45dcacc192b40e725d6f6e77ec64e202c7a + 963a6a55dd6f72f604651fff7c1515dadcd37a39 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index e2302f9ba..e6fe2f142 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,7 +41,7 @@ - 7.0.15-servicing.23578.3 + 7.0.16-servicing.24060.7 @@ -56,22 +56,22 @@ - 7.0.15 - 7.0.15 - 7.0.15-servicing.23601.10 - 7.0.15-servicing.23601.10 - 7.0.15-servicing.23601.10 - 7.0.15-servicing.23601.10 - 7.0.15-servicing.23601.10 + 7.0.16 + 7.0.16 + 7.0.16-servicing.24061.3 + 7.0.16-servicing.24061.3 + 7.0.16-servicing.24061.3 + 7.0.16-servicing.24061.3 + 7.0.16-servicing.24061.3 0.2.0 - 7.0.312 - 7.0.312-servicing.23601.26 - 7.0.312-servicing.23601.26 + 7.0.313 + 7.0.313-servicing.24061.13 + 7.0.313-servicing.24061.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -96,10 +96,10 @@ - 7.0.15-servicing.23579.2 - 7.0.15-servicing.23579.2 - 7.0.15 - 7.0.15 + 7.0.16-servicing.24060.13 + 7.0.16-servicing.24060.13 + 7.0.16 + 7.0.16 From 316a491c2b6b0d70eee0392c1f165c030324134b Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 11 Jan 2024 20:21:19 +0000 Subject: [PATCH 098/138] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240111.14 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.406 -> To Version 7.0.406 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.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 7.0.15 -> To Version 7.0.16 (parent: Microsoft.NET.Sdk --- NuGet.config | 14 ++++------ eng/Version.Details.xml | 62 ++++++++++++++++++++--------------------- eng/Versions.props | 28 +++++++++---------- 3 files changed, 51 insertions(+), 53 deletions(-) diff --git a/NuGet.config b/NuGet.config index bd3ba0a76..e0771b288 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,6 +10,7 @@ + @@ -22,12 +23,10 @@ - + - - - + @@ -49,18 +48,17 @@ + - + - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 47202d2a7..315caf81b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - acb200f3181da8cc111042a65f247bab519b9663 + d62704f831ab66265d54c5d09b24a82bff2deac2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - acb200f3181da8cc111042a65f247bab519b9663 + d62704f831ab66265d54c5d09b24a82bff2deac2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - acb200f3181da8cc111042a65f247bab519b9663 + d62704f831ab66265d54c5d09b24a82bff2deac2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - acb200f3181da8cc111042a65f247bab519b9663 + d62704f831ab66265d54c5d09b24a82bff2deac2 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -52,34 +52,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c49ccc8727c620ce1cb8fb431bb3fe8f2e747236 + ecd58f375010a7fac5165a1ff584f8e336c9e044 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c49ccc8727c620ce1cb8fb431bb3fe8f2e747236 + ecd58f375010a7fac5165a1ff584f8e336c9e044 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c49ccc8727c620ce1cb8fb431bb3fe8f2e747236 + ecd58f375010a7fac5165a1ff584f8e336c9e044 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c49ccc8727c620ce1cb8fb431bb3fe8f2e747236 + ecd58f375010a7fac5165a1ff584f8e336c9e044 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c49ccc8727c620ce1cb8fb431bb3fe8f2e747236 + ecd58f375010a7fac5165a1ff584f8e336c9e044 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c49ccc8727c620ce1cb8fb431bb3fe8f2e747236 + ecd58f375010a7fac5165a1ff584f8e336c9e044 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c49ccc8727c620ce1cb8fb431bb3fe8f2e747236 + ecd58f375010a7fac5165a1ff584f8e336c9e044 https://github.com/dotnet/test-templates @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b0c4f89a12a96383f763852b14707378f810b666 + b42e612282cfa3fe86419f63091a56b35d915baf - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b0c4f89a12a96383f763852b14707378f810b666 + b42e612282cfa3fe86419f63091a56b35d915baf - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b0c4f89a12a96383f763852b14707378f810b666 + b42e612282cfa3fe86419f63091a56b35d915baf - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b0c4f89a12a96383f763852b14707378f810b666 + b42e612282cfa3fe86419f63091a56b35d915baf https://dev.azure.com/dnceng/internal/_git/dotnet-winforms 1d272c1ef7277b7cc38148300732e6a72848bedc - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 02d7f45dcacc192b40e725d6f6e77ec64e202c7a + 963a6a55dd6f72f604651fff7c1515dadcd37a39 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index f503f25a2..34f29b1d4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,7 +41,7 @@ - 7.0.15-servicing.23578.3 + 7.0.16-servicing.24060.7 @@ -56,13 +56,13 @@ - 7.0.15 - 7.0.15 - 7.0.15-servicing.23601.10 - 7.0.15-servicing.23601.10 - 7.0.15-servicing.23601.10 - 7.0.15-servicing.23601.10 - 7.0.15-servicing.23601.10 + 7.0.16 + 7.0.16 + 7.0.16-servicing.24061.3 + 7.0.16-servicing.24061.3 + 7.0.16-servicing.24061.3 + 7.0.16-servicing.24061.3 + 7.0.16-servicing.24061.3 0.2.0 @@ -70,8 +70,8 @@ 7.0.406 - 7.0.406-servicing.24061.4 - 7.0.406-servicing.24061.4 + 7.0.406-servicing.24061.14 + 7.0.406-servicing.24061.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -96,10 +96,10 @@ - 7.0.15-servicing.23579.2 - 7.0.15-servicing.23579.2 - 7.0.15 - 7.0.15 + 7.0.16-servicing.24060.13 + 7.0.16-servicing.24060.13 + 7.0.16 + 7.0.16 From fe5615852fd139d06ef3a3813e0e3d818e2a2e62 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 11 Jan 2024 16:03:46 -0800 Subject: [PATCH 099/138] [release/7.0.3xx] Update dependencies from dotnet/arcade (#18218) Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 16 ++++++++++++++-- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 4 ++-- 4 files changed, 23 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index 2102f9bcf..280601a1f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,19 +10,26 @@ - + + + + + + + + @@ -44,14 +51,19 @@ - + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b80909b84..bdd15b788 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - 02d5538bac1bacfd6fb310d92ab8914de08f3358 + d6372b3e4dcd568d7412ab1e60003fa1083aaa5f - + https://github.com/dotnet/arcade - 02d5538bac1bacfd6fb310d92ab8914de08f3358 + d6372b3e4dcd568d7412ab1e60003fa1083aaa5f - + https://github.com/dotnet/arcade - 02d5538bac1bacfd6fb310d92ab8914de08f3358 + d6372b3e4dcd568d7412ab1e60003fa1083aaa5f https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index e2302f9ba..fea881a17 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.24059.5 + 7.0.0-beta.24061.2 diff --git a/global.json b/global.json index fd9164f9a..45f2ad15f 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24059.5", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24059.5" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24061.2", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24061.2" } } From ee1d3986c27465e48e7c7f9efdfc17ca177a54c3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 11 Jan 2024 16:04:05 -0800 Subject: [PATCH 100/138] [release/7.0.4xx] Update dependencies from dotnet/arcade (#18217) Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 16 ++++++++++++++-- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 4 ++-- 4 files changed, 23 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index 34760f138..f1fe9ed1c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,19 +10,26 @@ - + + + + + + + + @@ -44,14 +51,19 @@ - + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bb3641411..6d5ac1690 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - 02d5538bac1bacfd6fb310d92ab8914de08f3358 + d6372b3e4dcd568d7412ab1e60003fa1083aaa5f - + https://github.com/dotnet/arcade - 02d5538bac1bacfd6fb310d92ab8914de08f3358 + d6372b3e4dcd568d7412ab1e60003fa1083aaa5f - + https://github.com/dotnet/arcade - 02d5538bac1bacfd6fb310d92ab8914de08f3358 + d6372b3e4dcd568d7412ab1e60003fa1083aaa5f https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 89aaec6b4..69a22d60d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.24059.5 + 7.0.0-beta.24061.2 diff --git a/global.json b/global.json index fd9164f9a..45f2ad15f 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24059.5", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24059.5" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24061.2", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24061.2" } } From 3d488cd2428e47ccc44267000efe0d09480dfeb9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 16 Jan 2024 22:33:02 +0000 Subject: [PATCH 101/138] [release/7.0.4xx] Update dependencies from dotnet/arcade (#18261) [release/7.0.4xx] Update dependencies from dotnet/arcade --- NuGet.config | 21 --------------------- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/native/init-compiler.sh | 2 +- global.json | 4 ++-- 5 files changed, 10 insertions(+), 31 deletions(-) diff --git a/NuGet.config b/NuGet.config index f1fe9ed1c..bdc3a6cb9 100644 --- a/NuGet.config +++ b/NuGet.config @@ -12,24 +12,12 @@ - - - - - - - - - - - - @@ -53,18 +41,9 @@ - - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6d5ac1690..6526e84d8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - d6372b3e4dcd568d7412ab1e60003fa1083aaa5f + feda715e3fb6d511eaa39071bb9d77351cf4d943 - + https://github.com/dotnet/arcade - d6372b3e4dcd568d7412ab1e60003fa1083aaa5f + feda715e3fb6d511eaa39071bb9d77351cf4d943 - + https://github.com/dotnet/arcade - d6372b3e4dcd568d7412ab1e60003fa1083aaa5f + feda715e3fb6d511eaa39071bb9d77351cf4d943 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 69a22d60d..549b11314 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.24061.2 + 7.0.0-beta.24065.4 diff --git a/eng/common/native/init-compiler.sh b/eng/common/native/init-compiler.sh index f13b74080..81ea06151 100644 --- a/eng/common/native/init-compiler.sh +++ b/eng/common/native/init-compiler.sh @@ -71,7 +71,7 @@ if [[ -z "$CLR_CC" ]]; then # Set default versions if [[ -z "$majorVersion" ]]; then # note: gcc (all versions) and clang versions higher than 6 do not have minor version in file name, if it is zero. - if [[ "$compiler" == "clang" ]]; then versions=( 16 15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5 ) + if [[ "$compiler" == "clang" ]]; then versions=( 17 16 15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5 ) elif [[ "$compiler" == "gcc" ]]; then versions=( 12 11 10 9 8 7 6 5 4.9 ); fi for version in "${versions[@]}"; do diff --git a/global.json b/global.json index 45f2ad15f..30aff2051 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24061.2", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24061.2" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24065.4", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24065.4" } } From 91c1a15716e1184388fa121e6473cd501dee0487 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 16 Jan 2024 22:33:06 +0000 Subject: [PATCH 102/138] [release/7.0.3xx] Update dependencies from dotnet/arcade (#18262) [release/7.0.3xx] Update dependencies from dotnet/arcade --- NuGet.config | 21 --------------------- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/native/init-compiler.sh | 2 +- global.json | 4 ++-- 5 files changed, 10 insertions(+), 31 deletions(-) diff --git a/NuGet.config b/NuGet.config index 280601a1f..d288f50a2 100644 --- a/NuGet.config +++ b/NuGet.config @@ -12,24 +12,12 @@ - - - - - - - - - - - - @@ -53,18 +41,9 @@ - - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bdd15b788..73ed55f61 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - d6372b3e4dcd568d7412ab1e60003fa1083aaa5f + feda715e3fb6d511eaa39071bb9d77351cf4d943 - + https://github.com/dotnet/arcade - d6372b3e4dcd568d7412ab1e60003fa1083aaa5f + feda715e3fb6d511eaa39071bb9d77351cf4d943 - + https://github.com/dotnet/arcade - d6372b3e4dcd568d7412ab1e60003fa1083aaa5f + feda715e3fb6d511eaa39071bb9d77351cf4d943 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index fea881a17..099155591 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.24061.2 + 7.0.0-beta.24065.4 diff --git a/eng/common/native/init-compiler.sh b/eng/common/native/init-compiler.sh index f13b74080..81ea06151 100644 --- a/eng/common/native/init-compiler.sh +++ b/eng/common/native/init-compiler.sh @@ -71,7 +71,7 @@ if [[ -z "$CLR_CC" ]]; then # Set default versions if [[ -z "$majorVersion" ]]; then # note: gcc (all versions) and clang versions higher than 6 do not have minor version in file name, if it is zero. - if [[ "$compiler" == "clang" ]]; then versions=( 16 15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5 ) + if [[ "$compiler" == "clang" ]]; then versions=( 17 16 15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5 ) elif [[ "$compiler" == "gcc" ]]; then versions=( 12 11 10 9 8 7 6 5 4.9 ); fi for version in "${versions[@]}"; do diff --git a/global.json b/global.json index 45f2ad15f..30aff2051 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24061.2", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24061.2" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24065.4", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24065.4" } } From c99b7cbaecc983f7f32f52dd2f10441615e6f3e6 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 18 Jan 2024 18:16:53 +0000 Subject: [PATCH 103/138] Merged PR 36614: [internal/release/7.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:65272799-fe4d-4dbf-f0fe-08da7ef63651) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 65272799-fe4d-4dbf-f0fe-08da7ef63651 - **Build**: 20240117.58 - **Date Produced**: January 18, 2024 7:27:50 AM UTC - **Commit**: d833c87a5bda1313c0ab48d5c8dca96c675b9906 - **Branch**: refs/heads/internal/release/7.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.116 to 7.0.116][3] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.116-servicing.24066.29 to 7.0.116-servicing.24067.58][3] - **Microsoft.NET.Sdk**: [from 7.0.116-servicing.24066.29 to 7.0.116-servicing.24067.58][3] - **Microsoft.TemplateEngine.Cli**: [from 7.0.116-servicing.24066.29 to 7.0.116-servicing.24067.58][3] [3]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC26033f320535f652724e744bd4758ca0bf0a6495&targetVersion=GCd833c87a5bda1313c0ab48d5c8dca96c675b9906&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:65272799-fe4d-4dbf-f0fe-08da7ef63651) [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.16 to 7.0.16 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: from 7.0.16-servicing.24060.13 to 7.0.16-servicing.24061.3 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: from 7.0.16-servicing.24060.13 to 7.0.16-servicing.24061.3 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 7.0.15 to 7.0.16 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.7.0**: from 7.0.15-servicing.23572.26 to 7.0.16-servicing.24066.29 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 7.0.15 to 7.0.16 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 7.0.15 to 7.0.16 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 7.0.15 to 7.0.16 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 7.0.16 to 7.0.16 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 7.0.16-servicing.24061.3 to 7.0.16-servicing.24067.14 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 7.0.16 to 7.0.16 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: from 7.0.16-servicing.24061.3 to 7.0.16-servicing.24067.14 (parent: Microsoft.NET.S... --- NuGet.config | 24 ++++------- eng/Version.Details.xml | 94 ++++++++++++++++++++--------------------- eng/Versions.props | 38 ++++++++--------- 3 files changed, 75 insertions(+), 81 deletions(-) diff --git a/NuGet.config b/NuGet.config index e9a2fa634..7f6b1aab0 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,26 +7,22 @@ - + - - - + - - - + - + - + @@ -48,17 +44,15 @@ - + - - - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 713af0f51..9eb2b1689 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,44 +3,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d62704f831ab66265d54c5d09b24a82bff2deac2 + 01e02684374c6bf4541b7507ce041409ae410f63 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d62704f831ab66265d54c5d09b24a82bff2deac2 + 01e02684374c6bf4541b7507ce041409ae410f63 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d62704f831ab66265d54c5d09b24a82bff2deac2 + 01e02684374c6bf4541b7507ce041409ae410f63 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d62704f831ab66265d54c5d09b24a82bff2deac2 + 01e02684374c6bf4541b7507ce041409ae410f63 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8f4568cdaa2f9654fd133a17cd2dcc55b5f42455 + 567edafe6106e6b769c64f6a2ed876190baa642a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8f4568cdaa2f9654fd133a17cd2dcc55b5f42455 + 567edafe6106e6b769c64f6a2ed876190baa642a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8f4568cdaa2f9654fd133a17cd2dcc55b5f42455 + 567edafe6106e6b769c64f6a2ed876190baa642a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8f4568cdaa2f9654fd133a17cd2dcc55b5f42455 + 567edafe6106e6b769c64f6a2ed876190baa642a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8f4568cdaa2f9654fd133a17cd2dcc55b5f42455 + 567edafe6106e6b769c64f6a2ed876190baa642a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8f4568cdaa2f9654fd133a17cd2dcc55b5f42455 + 567edafe6106e6b769c64f6a2ed876190baa642a @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ecd58f375010a7fac5165a1ff584f8e336c9e044 + 15564036208e2608d636de11fc8161ca437e022a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ecd58f375010a7fac5165a1ff584f8e336c9e044 + 15564036208e2608d636de11fc8161ca437e022a https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ecd58f375010a7fac5165a1ff584f8e336c9e044 + 15564036208e2608d636de11fc8161ca437e022a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ecd58f375010a7fac5165a1ff584f8e336c9e044 + 15564036208e2608d636de11fc8161ca437e022a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ecd58f375010a7fac5165a1ff584f8e336c9e044 + 15564036208e2608d636de11fc8161ca437e022a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ecd58f375010a7fac5165a1ff584f8e336c9e044 + 15564036208e2608d636de11fc8161ca437e022a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ecd58f375010a7fac5165a1ff584f8e336c9e044 + 15564036208e2608d636de11fc8161ca437e022a https://github.com/dotnet/test-templates @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 383d1cee7ce36156a4adf5d0779c1eb94bf85357 + d833c87a5bda1313c0ab48d5c8dca96c675b9906 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 383d1cee7ce36156a4adf5d0779c1eb94bf85357 + d833c87a5bda1313c0ab48d5c8dca96c675b9906 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 383d1cee7ce36156a4adf5d0779c1eb94bf85357 + d833c87a5bda1313c0ab48d5c8dca96c675b9906 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 383d1cee7ce36156a4adf5d0779c1eb94bf85357 + d833c87a5bda1313c0ab48d5c8dca96c675b9906 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 1d272c1ef7277b7cc38148300732e6a72848bedc + b7fa724c93e65ac40bef3e8ab05bc1a63f62b0f6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 963a6a55dd6f72f604651fff7c1515dadcd37a39 + b05bc3d0cf33b94b37f8dec5d6b2829d508209eb https://github.com/dotnet/fsharp @@ -154,22 +154,22 @@ 6918b863aa37ad0699f98482fbab9f7a52e65a92 - + https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted - 24f8150c97f9d26a7b5d77e983938e18d48e7d9f + 1653cf17925473602f5460c5e4682a0dab4c4d22 https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 33b038b591f6e19c32a390333d41292cbd86d93c + ca510604d1667f32b4fa4653e3d3b64be8136bdc - + https://github.com/dotnet/emsdk - 33b038b591f6e19c32a390333d41292cbd86d93c + ca510604d1667f32b4fa4653e3d3b64be8136bdc https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index eab48d207..4c6e3217f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.15-servicing.23573.3 + 7.0.16-servicing.24060.7 - 7.0.16-servicing.24060.7 + 7.0.16-servicing.24060.16 @@ -58,11 +58,11 @@ 7.0.16 7.0.16 - 7.0.16-servicing.24061.3 - 7.0.16-servicing.24061.3 - 7.0.16-servicing.24061.3 - 7.0.16-servicing.24061.3 - 7.0.16-servicing.24061.3 + 7.0.16-servicing.24067.14 + 7.0.16-servicing.24067.14 + 7.0.16-servicing.24067.14 + 7.0.16-servicing.24067.14 + 7.0.16-servicing.24067.14 0.2.0 @@ -70,8 +70,8 @@ 7.0.116 - 7.0.116-servicing.24061.12 - 7.0.116-servicing.24061.12 + 7.0.116-servicing.24067.58 + 7.0.116-servicing.24067.58 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -82,18 +82,18 @@ - 7.0.15-servicing.23572.26 - 7.0.15-servicing.23572.26 - 7.0.15 - 7.0.15 - 7.0.15 - 7.0.15 + 7.0.16-servicing.24066.29 + 7.0.16-servicing.24066.29 + 7.0.16 + 7.0.16 + 7.0.16 + 7.0.16 2.1.0 - 7.0.16-servicing.24060.13 - 7.0.16-servicing.24060.13 + 7.0.16-servicing.24061.3 + 7.0.16-servicing.24061.3 7.0.16 7.0.16 @@ -228,8 +228,8 @@ 12.3.2372 16.0.1478 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.15 - 7.0.15 + 7.0.16 + 7.0.16 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version) From fa2462ce4ee7d7715b27b7280d7639d8b4081654 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 18 Jan 2024 18:23:38 +0000 Subject: [PATCH 104/138] Merged PR 36620: [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.16 to 7.0.16 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: from 7.0.16-servicing.24060.13 to 7.0.16-servicing.24061.3 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: from 7.0.16-servicing.24060.13 to 7.0.16-servicing.24061.3 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 7.0.15 to 7.0.16 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.7.0**: from 7.0.15-servicing.23572.26 to 7.0.16-servicing.24066.29 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 7.0.15 to 7.0.16 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 7.0.15 to 7.0.16 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 7.0.15 to 7.0.16 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 7.0.16 to 7.0.16 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 7.0.16-servicing.24061.3 to 7.0.16-servicing.24067.19 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 7.0.16 to 7.0.16 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: from 7.0.16-servicing.24061.3 to 7.0.16-servicing.24067.19 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 7.0.16-servicing.24061.3 to 7.0.16-servicing.24067.19 (parent: Microsoft.NET.Sdk) - **dotnet-user-jwts**: from 7.0.16-servicing.24061.3 to 7.0.16-servicing.24067.19 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 7.0.16-servicing.24061.3 to 7.0.16-servicing.24067.19 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.16 to 7.0.16 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 7.0.15-servicing.23573.3 to 7.0.16-servicing.24060.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.16 to 7.0.16 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 7.0.16-servicing.24060.7 to 7.0.16-servicing.24060.16 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **NuGet.Build.Tasks**: from 6.6.0-rc.66 to 6.6.2-rc.1 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: from 7.0.15-servicing.23572.26 to 7.0.16-servicing.24066.29 (parent: Mic... --- NuGet.config | 24 ++++------- eng/Version.Details.xml | 94 ++++++++++++++++++++--------------------- eng/Versions.props | 38 ++++++++--------- 3 files changed, 75 insertions(+), 81 deletions(-) diff --git a/NuGet.config b/NuGet.config index fb6caa493..6f5b3eb00 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,23 +10,19 @@ - + - - - + - - - + - + - + @@ -48,17 +44,15 @@ - + - - - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 408592dd6..4743d6d1f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,44 +3,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d62704f831ab66265d54c5d09b24a82bff2deac2 + 01e02684374c6bf4541b7507ce041409ae410f63 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d62704f831ab66265d54c5d09b24a82bff2deac2 + 01e02684374c6bf4541b7507ce041409ae410f63 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d62704f831ab66265d54c5d09b24a82bff2deac2 + 01e02684374c6bf4541b7507ce041409ae410f63 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d62704f831ab66265d54c5d09b24a82bff2deac2 + 01e02684374c6bf4541b7507ce041409ae410f63 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8f4568cdaa2f9654fd133a17cd2dcc55b5f42455 + 567edafe6106e6b769c64f6a2ed876190baa642a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8f4568cdaa2f9654fd133a17cd2dcc55b5f42455 + 567edafe6106e6b769c64f6a2ed876190baa642a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8f4568cdaa2f9654fd133a17cd2dcc55b5f42455 + 567edafe6106e6b769c64f6a2ed876190baa642a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8f4568cdaa2f9654fd133a17cd2dcc55b5f42455 + 567edafe6106e6b769c64f6a2ed876190baa642a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8f4568cdaa2f9654fd133a17cd2dcc55b5f42455 + 567edafe6106e6b769c64f6a2ed876190baa642a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8f4568cdaa2f9654fd133a17cd2dcc55b5f42455 + 567edafe6106e6b769c64f6a2ed876190baa642a @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ecd58f375010a7fac5165a1ff584f8e336c9e044 + ba2ce5819947cc6aa7724dbc54201d5c6596de0c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ecd58f375010a7fac5165a1ff584f8e336c9e044 + ba2ce5819947cc6aa7724dbc54201d5c6596de0c https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ecd58f375010a7fac5165a1ff584f8e336c9e044 + ba2ce5819947cc6aa7724dbc54201d5c6596de0c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ecd58f375010a7fac5165a1ff584f8e336c9e044 + ba2ce5819947cc6aa7724dbc54201d5c6596de0c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ecd58f375010a7fac5165a1ff584f8e336c9e044 + ba2ce5819947cc6aa7724dbc54201d5c6596de0c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ecd58f375010a7fac5165a1ff584f8e336c9e044 + ba2ce5819947cc6aa7724dbc54201d5c6596de0c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ecd58f375010a7fac5165a1ff584f8e336c9e044 + ba2ce5819947cc6aa7724dbc54201d5c6596de0c https://github.com/dotnet/test-templates @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 18d8a2987501c4439ddadf2501a80760f4f87de3 + 62ea411d627ffda407db98c1cf655d5a3590b03e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 18d8a2987501c4439ddadf2501a80760f4f87de3 + 62ea411d627ffda407db98c1cf655d5a3590b03e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 18d8a2987501c4439ddadf2501a80760f4f87de3 + 62ea411d627ffda407db98c1cf655d5a3590b03e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 18d8a2987501c4439ddadf2501a80760f4f87de3 + 62ea411d627ffda407db98c1cf655d5a3590b03e - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 1d272c1ef7277b7cc38148300732e6a72848bedc + b7fa724c93e65ac40bef3e8ab05bc1a63f62b0f6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 963a6a55dd6f72f604651fff7c1515dadcd37a39 + b05bc3d0cf33b94b37f8dec5d6b2829d508209eb https://github.com/dotnet/fsharp @@ -158,22 +158,22 @@ 2679cf5a9cbd13e6833ca8a59553716f3f2f2afa - + https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted - a36edf3a2bf891d6aabfc83cc0b21d24a870ea1a + 07cf447d8f8b3d6b9e7bf641ab8ec7de966b1254 https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 33b038b591f6e19c32a390333d41292cbd86d93c + ca510604d1667f32b4fa4653e3d3b64be8136bdc - + https://github.com/dotnet/emsdk - 33b038b591f6e19c32a390333d41292cbd86d93c + ca510604d1667f32b4fa4653e3d3b64be8136bdc https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index e6fe2f142..0d5bcdc87 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.15-servicing.23573.3 + 7.0.16-servicing.24060.7 - 7.0.16-servicing.24060.7 + 7.0.16-servicing.24060.16 @@ -58,11 +58,11 @@ 7.0.16 7.0.16 - 7.0.16-servicing.24061.3 - 7.0.16-servicing.24061.3 - 7.0.16-servicing.24061.3 - 7.0.16-servicing.24061.3 - 7.0.16-servicing.24061.3 + 7.0.16-servicing.24067.19 + 7.0.16-servicing.24067.19 + 7.0.16-servicing.24067.19 + 7.0.16-servicing.24067.19 + 7.0.16-servicing.24067.19 0.2.0 @@ -70,8 +70,8 @@ 7.0.313 - 7.0.313-servicing.24061.13 - 7.0.313-servicing.24061.13 + 7.0.313-servicing.24068.18 + 7.0.313-servicing.24068.18 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -86,18 +86,18 @@ - 7.0.15-servicing.23572.26 - 7.0.15-servicing.23572.26 - 7.0.15 - 7.0.15 - 7.0.15 - 7.0.15 + 7.0.16-servicing.24066.29 + 7.0.16-servicing.24066.29 + 7.0.16 + 7.0.16 + 7.0.16 + 7.0.16 2.1.0 - 7.0.16-servicing.24060.13 - 7.0.16-servicing.24060.13 + 7.0.16-servicing.24061.3 + 7.0.16-servicing.24061.3 7.0.16 7.0.16 @@ -231,8 +231,8 @@ 12.3.2372 16.0.1478 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.15 - 7.0.15 + 7.0.16 + 7.0.16 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version) From bbc374d7eb4e40d296696d4e9bba4e4c8a90eaff Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 18 Jan 2024 18:23:42 +0000 Subject: [PATCH 105/138] Merged PR 36621: [internal/release/7.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.AspNetCore.App.Ref**: from 7.0.16 to 7.0.16 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 7.0.16-servicing.24067.14 to 7.0.16-servicing.24067.19 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 7.0.16 to 7.0.16 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: from 7.0.16-servicing.24067.14 to 7.0.16-servicing.24067.19 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 7.0.16-servicing.24067.14 to 7.0.16-servicing.24067.19 (parent: Microsoft.NET.Sdk) - **dotnet-user-jwts**: from 7.0.16-servicing.24067.14 to 7.0.16-servicing.24067.19 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 7.0.16-servicing.24067.14 to 7.0.16-servicing.24067.19 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:65272799-fe4d-4dbf-f0fe-08da7ef63651) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 65272799-fe4d-4dbf-f0fe-08da7ef63651 - **Build**: 20240118.19 - **Date Produced**: January 18, 2024 6:07:10 PM UTC - **Commit**: 7be026ba4909ce67a2ecc4043d0380f8b309b4ca - **Branch**: refs/heads/internal/release/7.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.116 to 7.0.116][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.116-servicing.24067.58 to 7.0.116-servicing.24068.19][1] - **Microsoft.NET.Sdk**: [from 7.0.116-servicing.24067.58 to 7.0.116-servicing.24068.19][1] - **Microsoft.TemplateEngine.Cli**: [from 7.0.116-servicing.24067.58 to 7.0.116-servicing.24068.19][1] - **Microsoft.AspNetCore.App.Ref**: [from 7.0.16 to 7.0.16][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 7.0.16-servicing.24067.14 to 7.0.16-servicing.24067.19][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 7.0.16 to 7.0.16][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: [from 7.0.16-servicing.24067.14 to 7.0.16-servicing.24067.19][2] - **dotnet-dev-certs**: [from 7.0.16-servicing.24067.14 to 7.0.16-servicing.24067.19][2] - **dotnet-user-jwts**: [from 7.0.16-servicing.24067.14 to 7.0.16-servicing.24067.19][2] - **dotnet-user-secrets**: [from 7.0.16-servicing.24067.14 to 7.0.16-servicing.24067.19][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCd833c87a5bda1313c0ab48d5c8dca96c675b9... --- 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 7f6b1aab0..8e9c45524 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -44,12 +44,12 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9eb2b1689..0075e31bd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 15564036208e2608d636de11fc8161ca437e022a + ba2ce5819947cc6aa7724dbc54201d5c6596de0c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 15564036208e2608d636de11fc8161ca437e022a + ba2ce5819947cc6aa7724dbc54201d5c6596de0c https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 15564036208e2608d636de11fc8161ca437e022a + ba2ce5819947cc6aa7724dbc54201d5c6596de0c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 15564036208e2608d636de11fc8161ca437e022a + ba2ce5819947cc6aa7724dbc54201d5c6596de0c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 15564036208e2608d636de11fc8161ca437e022a + ba2ce5819947cc6aa7724dbc54201d5c6596de0c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 15564036208e2608d636de11fc8161ca437e022a + ba2ce5819947cc6aa7724dbc54201d5c6596de0c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 15564036208e2608d636de11fc8161ca437e022a + ba2ce5819947cc6aa7724dbc54201d5c6596de0c https://github.com/dotnet/test-templates @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d833c87a5bda1313c0ab48d5c8dca96c675b9906 + 7be026ba4909ce67a2ecc4043d0380f8b309b4ca - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d833c87a5bda1313c0ab48d5c8dca96c675b9906 + 7be026ba4909ce67a2ecc4043d0380f8b309b4ca - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d833c87a5bda1313c0ab48d5c8dca96c675b9906 + 7be026ba4909ce67a2ecc4043d0380f8b309b4ca - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d833c87a5bda1313c0ab48d5c8dca96c675b9906 + 7be026ba4909ce67a2ecc4043d0380f8b309b4ca diff --git a/eng/Versions.props b/eng/Versions.props index 4c6e3217f..9a441a7db 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,11 +58,11 @@ 7.0.16 7.0.16 - 7.0.16-servicing.24067.14 - 7.0.16-servicing.24067.14 - 7.0.16-servicing.24067.14 - 7.0.16-servicing.24067.14 - 7.0.16-servicing.24067.14 + 7.0.16-servicing.24067.19 + 7.0.16-servicing.24067.19 + 7.0.16-servicing.24067.19 + 7.0.16-servicing.24067.19 + 7.0.16-servicing.24067.19 0.2.0 @@ -70,8 +70,8 @@ 7.0.116 - 7.0.116-servicing.24067.58 - 7.0.116-servicing.24067.58 + 7.0.116-servicing.24068.19 + 7.0.116-servicing.24068.19 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 5b6c31e57b7bb0c4ef87bdc9ad6d33ddbf11bd72 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 18 Jan 2024 20:35:25 +0000 Subject: [PATCH 106/138] Merged PR 36622: [internal/release/7.0.4xx] 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.16 to 7.0.16 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: from 7.0.16-servicing.24060.13 to 7.0.16-servicing.24061.3 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: from 7.0.16-servicing.24060.13 to 7.0.16-servicing.24061.3 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 7.0.15 to 7.0.16 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.7.0**: from 7.0.15-servicing.23572.26 to 7.0.16-servicing.24066.29 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 7.0.15 to 7.0.16 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 7.0.15 to 7.0.16 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 7.0.15 to 7.0.16 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 7.0.16 to 7.0.16 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 7.0.16-servicing.24061.3 to 7.0.16-servicing.24067.19 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 7.0.16 to 7.0.16 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: from 7.0.16-servicing.24061.3 to 7.0.16-servicing.24067.19 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 7.0.16-servicing.24061.3 to 7.0.16-servicing.24067.19 (parent: Microsoft.NET.Sdk) - **dotnet-user-jwts**: from 7.0.16-servicing.24061.3 to 7.0.16-servicing.24067.19 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 7.0.16-servicing.24061.3 to 7.0.16-servicing.24067.19 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.16 to 7.0.16 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 7.0.15-servicing.23573.3 to 7.0.16-servicing.24060.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.16 to 7.0.16 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 7.0.16-servicing.24060.7 to 7.0.16-servicing.24060.16 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: from 7.0.15-servicing.23572.26 to 7.0.16-servicing.24066.29 (parent: Microsoft.NET.Sdk) - **Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100**: from ... --- NuGet.config | 24 +++++------ eng/Version.Details.xml | 90 ++++++++++++++++++++--------------------- eng/Versions.props | 38 ++++++++--------- 3 files changed, 73 insertions(+), 79 deletions(-) diff --git a/NuGet.config b/NuGet.config index e0771b288..306ae011b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,23 +10,19 @@ - + - - - + - - - + - + - + @@ -48,17 +44,15 @@ - + - - - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 315caf81b..5c1d37ca2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,44 +3,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d62704f831ab66265d54c5d09b24a82bff2deac2 + 01e02684374c6bf4541b7507ce041409ae410f63 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d62704f831ab66265d54c5d09b24a82bff2deac2 + 01e02684374c6bf4541b7507ce041409ae410f63 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d62704f831ab66265d54c5d09b24a82bff2deac2 + 01e02684374c6bf4541b7507ce041409ae410f63 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d62704f831ab66265d54c5d09b24a82bff2deac2 + 01e02684374c6bf4541b7507ce041409ae410f63 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8f4568cdaa2f9654fd133a17cd2dcc55b5f42455 + 567edafe6106e6b769c64f6a2ed876190baa642a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8f4568cdaa2f9654fd133a17cd2dcc55b5f42455 + 567edafe6106e6b769c64f6a2ed876190baa642a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8f4568cdaa2f9654fd133a17cd2dcc55b5f42455 + 567edafe6106e6b769c64f6a2ed876190baa642a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8f4568cdaa2f9654fd133a17cd2dcc55b5f42455 + 567edafe6106e6b769c64f6a2ed876190baa642a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8f4568cdaa2f9654fd133a17cd2dcc55b5f42455 + 567edafe6106e6b769c64f6a2ed876190baa642a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8f4568cdaa2f9654fd133a17cd2dcc55b5f42455 + 567edafe6106e6b769c64f6a2ed876190baa642a @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ecd58f375010a7fac5165a1ff584f8e336c9e044 + ba2ce5819947cc6aa7724dbc54201d5c6596de0c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ecd58f375010a7fac5165a1ff584f8e336c9e044 + ba2ce5819947cc6aa7724dbc54201d5c6596de0c https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ecd58f375010a7fac5165a1ff584f8e336c9e044 + ba2ce5819947cc6aa7724dbc54201d5c6596de0c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ecd58f375010a7fac5165a1ff584f8e336c9e044 + ba2ce5819947cc6aa7724dbc54201d5c6596de0c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ecd58f375010a7fac5165a1ff584f8e336c9e044 + ba2ce5819947cc6aa7724dbc54201d5c6596de0c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ecd58f375010a7fac5165a1ff584f8e336c9e044 + ba2ce5819947cc6aa7724dbc54201d5c6596de0c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ecd58f375010a7fac5165a1ff584f8e336c9e044 + ba2ce5819947cc6aa7724dbc54201d5c6596de0c https://github.com/dotnet/test-templates @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b42e612282cfa3fe86419f63091a56b35d915baf + 1929e84111240c9d653cb5f6eee7c6593cd6b834 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b42e612282cfa3fe86419f63091a56b35d915baf + 1929e84111240c9d653cb5f6eee7c6593cd6b834 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b42e612282cfa3fe86419f63091a56b35d915baf + 1929e84111240c9d653cb5f6eee7c6593cd6b834 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b42e612282cfa3fe86419f63091a56b35d915baf + 1929e84111240c9d653cb5f6eee7c6593cd6b834 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 1d272c1ef7277b7cc38148300732e6a72848bedc + b7fa724c93e65ac40bef3e8ab05bc1a63f62b0f6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 963a6a55dd6f72f604651fff7c1515dadcd37a39 + b05bc3d0cf33b94b37f8dec5d6b2829d508209eb https://github.com/dotnet/fsharp @@ -167,13 +167,13 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 33b038b591f6e19c32a390333d41292cbd86d93c + ca510604d1667f32b4fa4653e3d3b64be8136bdc - + https://github.com/dotnet/emsdk - 33b038b591f6e19c32a390333d41292cbd86d93c + ca510604d1667f32b4fa4653e3d3b64be8136bdc https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index 34f29b1d4..373448cce 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.15-servicing.23573.3 + 7.0.16-servicing.24060.7 - 7.0.16-servicing.24060.7 + 7.0.16-servicing.24060.16 @@ -58,11 +58,11 @@ 7.0.16 7.0.16 - 7.0.16-servicing.24061.3 - 7.0.16-servicing.24061.3 - 7.0.16-servicing.24061.3 - 7.0.16-servicing.24061.3 - 7.0.16-servicing.24061.3 + 7.0.16-servicing.24067.19 + 7.0.16-servicing.24067.19 + 7.0.16-servicing.24067.19 + 7.0.16-servicing.24067.19 + 7.0.16-servicing.24067.19 0.2.0 @@ -70,8 +70,8 @@ 7.0.406 - 7.0.406-servicing.24061.14 - 7.0.406-servicing.24061.14 + 7.0.406-servicing.24068.20 + 7.0.406-servicing.24068.20 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -86,18 +86,18 @@ - 7.0.15-servicing.23572.26 - 7.0.15-servicing.23572.26 - 7.0.15 - 7.0.15 - 7.0.15 - 7.0.15 + 7.0.16-servicing.24066.29 + 7.0.16-servicing.24066.29 + 7.0.16 + 7.0.16 + 7.0.16 + 7.0.16 2.1.0 - 7.0.16-servicing.24060.13 - 7.0.16-servicing.24060.13 + 7.0.16-servicing.24061.3 + 7.0.16-servicing.24061.3 7.0.16 7.0.16 @@ -233,8 +233,8 @@ 12.3.2372 16.0.1478 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.15 - 7.0.15 + 7.0.16 + 7.0.16 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version) From 14db8a0c7da573e8e9f47ceab93550b157b08965 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 18 Jan 2024 23:34:10 +0000 Subject: [PATCH 107/138] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240118.43 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.406 -> To Version 7.0.406 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.16 -> To Version 7.0.16 (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 306ae011b..12644acf4 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 5c1d37ca2..102d77399 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 01e02684374c6bf4541b7507ce041409ae410f63 + f58ad2d644bb52baf49e85be027bf2db3fced446 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 01e02684374c6bf4541b7507ce041409ae410f63 + f58ad2d644bb52baf49e85be027bf2db3fced446 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 01e02684374c6bf4541b7507ce041409ae410f63 + f58ad2d644bb52baf49e85be027bf2db3fced446 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 01e02684374c6bf4541b7507ce041409ae410f63 + f58ad2d644bb52baf49e85be027bf2db3fced446 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1929e84111240c9d653cb5f6eee7c6593cd6b834 + addec31d7de75b6ef03ff885418cea38e354faee - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1929e84111240c9d653cb5f6eee7c6593cd6b834 + addec31d7de75b6ef03ff885418cea38e354faee - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1929e84111240c9d653cb5f6eee7c6593cd6b834 + addec31d7de75b6ef03ff885418cea38e354faee - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1929e84111240c9d653cb5f6eee7c6593cd6b834 + addec31d7de75b6ef03ff885418cea38e354faee - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - b7fa724c93e65ac40bef3e8ab05bc1a63f62b0f6 + 3d504675f930028236a0f09e47c900ad48bd3d6e - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - b05bc3d0cf33b94b37f8dec5d6b2829d508209eb + 4a6accdbfd70e66399781c75b0c0a179f4b7e7eb https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 373448cce..0da17b0e0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.16-servicing.24060.7 + 7.0.16-servicing.24067.11 - 7.0.16-servicing.24060.16 + 7.0.16-servicing.24068.4 @@ -70,8 +70,8 @@ 7.0.406 - 7.0.406-servicing.24068.20 - 7.0.406-servicing.24068.20 + 7.0.406-servicing.24068.43 + 7.0.406-servicing.24068.43 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -96,8 +96,8 @@ - 7.0.16-servicing.24061.3 - 7.0.16-servicing.24061.3 + 7.0.16-servicing.24068.4 + 7.0.16-servicing.24068.4 7.0.16 7.0.16 From f43cfe985a1c2db5a5dfc14942d87f56db0e4ff4 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 18 Jan 2024 23:39:54 +0000 Subject: [PATCH 108/138] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240118.45 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.116 -> To Version 7.0.116 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.16 -> To Version 7.0.16 (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 8e9c45524..392ad1905 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 0075e31bd..fdc738d3d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 01e02684374c6bf4541b7507ce041409ae410f63 + f58ad2d644bb52baf49e85be027bf2db3fced446 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 01e02684374c6bf4541b7507ce041409ae410f63 + f58ad2d644bb52baf49e85be027bf2db3fced446 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 01e02684374c6bf4541b7507ce041409ae410f63 + f58ad2d644bb52baf49e85be027bf2db3fced446 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 01e02684374c6bf4541b7507ce041409ae410f63 + f58ad2d644bb52baf49e85be027bf2db3fced446 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7be026ba4909ce67a2ecc4043d0380f8b309b4ca + 78d5754b2fc94c74d13a077881f2f949794af51c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7be026ba4909ce67a2ecc4043d0380f8b309b4ca + 78d5754b2fc94c74d13a077881f2f949794af51c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7be026ba4909ce67a2ecc4043d0380f8b309b4ca + 78d5754b2fc94c74d13a077881f2f949794af51c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7be026ba4909ce67a2ecc4043d0380f8b309b4ca + 78d5754b2fc94c74d13a077881f2f949794af51c - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - b7fa724c93e65ac40bef3e8ab05bc1a63f62b0f6 + 3d504675f930028236a0f09e47c900ad48bd3d6e - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - b05bc3d0cf33b94b37f8dec5d6b2829d508209eb + 4a6accdbfd70e66399781c75b0c0a179f4b7e7eb https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 9a441a7db..4c53265d4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.16-servicing.24060.7 + 7.0.16-servicing.24067.11 - 7.0.16-servicing.24060.16 + 7.0.16-servicing.24068.4 @@ -70,8 +70,8 @@ 7.0.116 - 7.0.116-servicing.24068.19 - 7.0.116-servicing.24068.19 + 7.0.116-servicing.24068.45 + 7.0.116-servicing.24068.45 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -92,8 +92,8 @@ - 7.0.16-servicing.24061.3 - 7.0.16-servicing.24061.3 + 7.0.16-servicing.24068.4 + 7.0.16-servicing.24068.4 7.0.16 7.0.16 From 0567446bee7ababba20744e3e1fa473c5c474762 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 18 Jan 2024 23:41:02 +0000 Subject: [PATCH 109/138] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240118.44 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.313 -> To Version 7.0.313 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.16 -> To Version 7.0.16 (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 6f5b3eb00..07444b91d 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 4743d6d1f..38a0c4a79 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 01e02684374c6bf4541b7507ce041409ae410f63 + f58ad2d644bb52baf49e85be027bf2db3fced446 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 01e02684374c6bf4541b7507ce041409ae410f63 + f58ad2d644bb52baf49e85be027bf2db3fced446 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 01e02684374c6bf4541b7507ce041409ae410f63 + f58ad2d644bb52baf49e85be027bf2db3fced446 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 01e02684374c6bf4541b7507ce041409ae410f63 + f58ad2d644bb52baf49e85be027bf2db3fced446 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 62ea411d627ffda407db98c1cf655d5a3590b03e + c9fbcd1e5682e75d1fb95f5a3360856f56786685 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 62ea411d627ffda407db98c1cf655d5a3590b03e + c9fbcd1e5682e75d1fb95f5a3360856f56786685 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 62ea411d627ffda407db98c1cf655d5a3590b03e + c9fbcd1e5682e75d1fb95f5a3360856f56786685 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 62ea411d627ffda407db98c1cf655d5a3590b03e + c9fbcd1e5682e75d1fb95f5a3360856f56786685 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - b7fa724c93e65ac40bef3e8ab05bc1a63f62b0f6 + 3d504675f930028236a0f09e47c900ad48bd3d6e - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - b05bc3d0cf33b94b37f8dec5d6b2829d508209eb + 4a6accdbfd70e66399781c75b0c0a179f4b7e7eb https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 0d5bcdc87..82de004e9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.16-servicing.24060.7 + 7.0.16-servicing.24067.11 - 7.0.16-servicing.24060.16 + 7.0.16-servicing.24068.4 @@ -70,8 +70,8 @@ 7.0.313 - 7.0.313-servicing.24068.18 - 7.0.313-servicing.24068.18 + 7.0.313-servicing.24068.44 + 7.0.313-servicing.24068.44 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -96,8 +96,8 @@ - 7.0.16-servicing.24061.3 - 7.0.16-servicing.24061.3 + 7.0.16-servicing.24068.4 + 7.0.16-servicing.24068.4 7.0.16 7.0.16 From a8ad891aa53eee8619d81cd336e29448fc8b4659 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 19 Jan 2024 00:32:44 +0000 Subject: [PATCH 110/138] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240118.51 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.406 -> To Version 7.0.406 Dependency coherency updates NuGet.Build.Tasks From Version 6.7.0-rc.127 -> To Version 6.7.1-rc.1 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 4 ++-- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/NuGet.config b/NuGet.config index 12644acf4..36196e88e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,7 +19,7 @@ - + @@ -49,7 +49,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 102d77399..7e6a995ea 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - addec31d7de75b6ef03ff885418cea38e354faee + 68d4f4e10f1ad08758322c7185e3f51d94b2e2ff - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - addec31d7de75b6ef03ff885418cea38e354faee + 68d4f4e10f1ad08758322c7185e3f51d94b2e2ff - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - addec31d7de75b6ef03ff885418cea38e354faee + 68d4f4e10f1ad08758322c7185e3f51d94b2e2ff - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - addec31d7de75b6ef03ff885418cea38e354faee + 68d4f4e10f1ad08758322c7185e3f51d94b2e2ff @@ -158,9 +158,9 @@ 3ebbd7c4982d7df340366ef499e7bc5d85ef817e - - https://github.com/nuget/nuget.client - b46f5f64159a81d930ac8cdfde96e76f90796c62 + + https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted + c7d3516cb6a70dd988e16fea8f4a32b459222ee1 diff --git a/eng/Versions.props b/eng/Versions.props index 0da17b0e0..ab6f5be97 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.406 - 7.0.406-servicing.24068.43 - 7.0.406-servicing.24068.43 + 7.0.406-servicing.24068.51 + 7.0.406-servicing.24068.51 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 2afd97a62d728b2d2f5b3792e5dd6c87be983dc9 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 19 Jan 2024 00:52:52 +0000 Subject: [PATCH 111/138] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240118.56 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.116 -> To Version 7.0.116 --- 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 392ad1905..a1d045602 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,7 +19,7 @@ - + @@ -49,7 +49,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fdc738d3d..fb2cc75ba 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 78d5754b2fc94c74d13a077881f2f949794af51c + 0277d57f52677a9a9a5575c2fada5a90b39a5ec5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 78d5754b2fc94c74d13a077881f2f949794af51c + 0277d57f52677a9a9a5575c2fada5a90b39a5ec5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 78d5754b2fc94c74d13a077881f2f949794af51c + 0277d57f52677a9a9a5575c2fada5a90b39a5ec5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 78d5754b2fc94c74d13a077881f2f949794af51c + 0277d57f52677a9a9a5575c2fada5a90b39a5ec5 diff --git a/eng/Versions.props b/eng/Versions.props index 4c53265d4..cc58440f1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.116 - 7.0.116-servicing.24068.45 - 7.0.116-servicing.24068.45 + 7.0.116-servicing.24068.56 + 7.0.116-servicing.24068.56 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 3bd45e79833ff0f4a17dad1295fb7dd036f55a94 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 19 Jan 2024 01:37:57 +0000 Subject: [PATCH 112/138] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240118.58 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.313 -> To Version 7.0.313 --- 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 07444b91d..50c222de8 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,7 +19,7 @@ - + @@ -49,7 +49,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 38a0c4a79..4496a1dc6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c9fbcd1e5682e75d1fb95f5a3360856f56786685 + 4134f29a2fe73e76e8b031618b758b914c6c8984 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c9fbcd1e5682e75d1fb95f5a3360856f56786685 + 4134f29a2fe73e76e8b031618b758b914c6c8984 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c9fbcd1e5682e75d1fb95f5a3360856f56786685 + 4134f29a2fe73e76e8b031618b758b914c6c8984 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c9fbcd1e5682e75d1fb95f5a3360856f56786685 + 4134f29a2fe73e76e8b031618b758b914c6c8984 diff --git a/eng/Versions.props b/eng/Versions.props index 82de004e9..bbf9116cc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.313 - 7.0.313-servicing.24068.44 - 7.0.313-servicing.24068.44 + 7.0.313-servicing.24068.58 + 7.0.313-servicing.24068.58 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From bf5a5f0114199b97f8f82e295c8a3a0ba5cbfe71 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 19 Jan 2024 02:53:04 +0000 Subject: [PATCH 113/138] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240118.63 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.406 -> To Version 7.0.406 Dependency coherency updates NuGet.Build.Tasks From Version 6.7.0-rc.127 -> To Version 6.7.1-rc.1 (parent: Microsoft.NET.Sdk --- 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 36196e88e..449e0aad8 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,7 +19,7 @@ - + @@ -49,7 +49,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7e6a995ea..c8d8e523f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 68d4f4e10f1ad08758322c7185e3f51d94b2e2ff + a537404e0e29590402a7d3be677507541ce07e38 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 68d4f4e10f1ad08758322c7185e3f51d94b2e2ff + a537404e0e29590402a7d3be677507541ce07e38 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 68d4f4e10f1ad08758322c7185e3f51d94b2e2ff + a537404e0e29590402a7d3be677507541ce07e38 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 68d4f4e10f1ad08758322c7185e3f51d94b2e2ff + a537404e0e29590402a7d3be677507541ce07e38 diff --git a/eng/Versions.props b/eng/Versions.props index ab6f5be97..78c6b7875 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.406 - 7.0.406-servicing.24068.51 - 7.0.406-servicing.24068.51 + 7.0.406-servicing.24068.63 + 7.0.406-servicing.24068.63 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From da8e258b32b9c95aaf26f3f212b1a617d9929475 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 19 Jan 2024 02:55:00 +0000 Subject: [PATCH 114/138] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240118.62 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.313 -> To Version 7.0.313 --- 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 50c222de8..5549476fc 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,7 +19,7 @@ - + @@ -49,7 +49,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4496a1dc6..e150f5306 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4134f29a2fe73e76e8b031618b758b914c6c8984 + 1f3b71634ebe0f75164461f73d6305d1aeb4403d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4134f29a2fe73e76e8b031618b758b914c6c8984 + 1f3b71634ebe0f75164461f73d6305d1aeb4403d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4134f29a2fe73e76e8b031618b758b914c6c8984 + 1f3b71634ebe0f75164461f73d6305d1aeb4403d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4134f29a2fe73e76e8b031618b758b914c6c8984 + 1f3b71634ebe0f75164461f73d6305d1aeb4403d diff --git a/eng/Versions.props b/eng/Versions.props index bbf9116cc..057dc7835 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.313 - 7.0.313-servicing.24068.58 - 7.0.313-servicing.24068.58 + 7.0.313-servicing.24068.62 + 7.0.313-servicing.24068.62 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e0afed19147be62d0b830b193142e2f6dc2a17e9 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 19 Jan 2024 17:43:53 +0000 Subject: [PATCH 115/138] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240119.8 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.116 -> To Version 7.0.116 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.16 -> To Version 7.0.16 (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 a1d045602..99d9d34a8 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -44,12 +44,12 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fb2cc75ba..592f18792 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ba2ce5819947cc6aa7724dbc54201d5c6596de0c + 610fe433e07b32ed451ed99d07df63be47c29050 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ba2ce5819947cc6aa7724dbc54201d5c6596de0c + 610fe433e07b32ed451ed99d07df63be47c29050 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ba2ce5819947cc6aa7724dbc54201d5c6596de0c + 610fe433e07b32ed451ed99d07df63be47c29050 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ba2ce5819947cc6aa7724dbc54201d5c6596de0c + 610fe433e07b32ed451ed99d07df63be47c29050 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ba2ce5819947cc6aa7724dbc54201d5c6596de0c + 610fe433e07b32ed451ed99d07df63be47c29050 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ba2ce5819947cc6aa7724dbc54201d5c6596de0c + 610fe433e07b32ed451ed99d07df63be47c29050 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ba2ce5819947cc6aa7724dbc54201d5c6596de0c + 610fe433e07b32ed451ed99d07df63be47c29050 https://github.com/dotnet/test-templates @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0277d57f52677a9a9a5575c2fada5a90b39a5ec5 + a73e6ff24023ae17e8d5882a8f40545b20bf3428 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0277d57f52677a9a9a5575c2fada5a90b39a5ec5 + a73e6ff24023ae17e8d5882a8f40545b20bf3428 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0277d57f52677a9a9a5575c2fada5a90b39a5ec5 + a73e6ff24023ae17e8d5882a8f40545b20bf3428 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0277d57f52677a9a9a5575c2fada5a90b39a5ec5 + a73e6ff24023ae17e8d5882a8f40545b20bf3428 diff --git a/eng/Versions.props b/eng/Versions.props index cc58440f1..94b2f770f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,11 +58,11 @@ 7.0.16 7.0.16 - 7.0.16-servicing.24067.19 - 7.0.16-servicing.24067.19 - 7.0.16-servicing.24067.19 - 7.0.16-servicing.24067.19 - 7.0.16-servicing.24067.19 + 7.0.16-servicing.24068.15 + 7.0.16-servicing.24068.15 + 7.0.16-servicing.24068.15 + 7.0.16-servicing.24068.15 + 7.0.16-servicing.24068.15 0.2.0 @@ -70,8 +70,8 @@ 7.0.116 - 7.0.116-servicing.24068.56 - 7.0.116-servicing.24068.56 + 7.0.116-servicing.24069.8 + 7.0.116-servicing.24069.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From bef5262c3df302978e0ac0df80ff10693f43e736 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 19 Jan 2024 18:31:32 +0000 Subject: [PATCH 116/138] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240119.9 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.406 -> To Version 7.0.406 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.16 -> To Version 7.0.16 (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 449e0aad8..e3a1c275a 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 60be0f885..610156f32 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ba2ce5819947cc6aa7724dbc54201d5c6596de0c + 610fe433e07b32ed451ed99d07df63be47c29050 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ba2ce5819947cc6aa7724dbc54201d5c6596de0c + 610fe433e07b32ed451ed99d07df63be47c29050 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ba2ce5819947cc6aa7724dbc54201d5c6596de0c + 610fe433e07b32ed451ed99d07df63be47c29050 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ba2ce5819947cc6aa7724dbc54201d5c6596de0c + 610fe433e07b32ed451ed99d07df63be47c29050 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ba2ce5819947cc6aa7724dbc54201d5c6596de0c + 610fe433e07b32ed451ed99d07df63be47c29050 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ba2ce5819947cc6aa7724dbc54201d5c6596de0c + 610fe433e07b32ed451ed99d07df63be47c29050 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ba2ce5819947cc6aa7724dbc54201d5c6596de0c + 610fe433e07b32ed451ed99d07df63be47c29050 https://github.com/dotnet/test-templates @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a537404e0e29590402a7d3be677507541ce07e38 + 1c116bc27e66738427df5f153c2514c606a85b3a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a537404e0e29590402a7d3be677507541ce07e38 + 1c116bc27e66738427df5f153c2514c606a85b3a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a537404e0e29590402a7d3be677507541ce07e38 + 1c116bc27e66738427df5f153c2514c606a85b3a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a537404e0e29590402a7d3be677507541ce07e38 + 1c116bc27e66738427df5f153c2514c606a85b3a diff --git a/eng/Versions.props b/eng/Versions.props index 6fbb52f47..c95e832f0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,11 +58,11 @@ 7.0.16 7.0.16 - 7.0.16-servicing.24067.19 - 7.0.16-servicing.24067.19 - 7.0.16-servicing.24067.19 - 7.0.16-servicing.24067.19 - 7.0.16-servicing.24067.19 + 7.0.16-servicing.24068.15 + 7.0.16-servicing.24068.15 + 7.0.16-servicing.24068.15 + 7.0.16-servicing.24068.15 + 7.0.16-servicing.24068.15 0.2.0 @@ -70,8 +70,8 @@ 7.0.406 - 7.0.406-servicing.24068.63 - 7.0.406-servicing.24068.63 + 7.0.406-servicing.24069.9 + 7.0.406-servicing.24069.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From dd89f67b3269985002ccd1a77cc92c6638843478 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 19 Jan 2024 18:36:49 +0000 Subject: [PATCH 117/138] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240119.10 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.313 -> To Version 7.0.313 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.16 -> To Version 7.0.16 (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 5549476fc..1b1c47835 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 23e106392..335b739c9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ba2ce5819947cc6aa7724dbc54201d5c6596de0c + 610fe433e07b32ed451ed99d07df63be47c29050 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ba2ce5819947cc6aa7724dbc54201d5c6596de0c + 610fe433e07b32ed451ed99d07df63be47c29050 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ba2ce5819947cc6aa7724dbc54201d5c6596de0c + 610fe433e07b32ed451ed99d07df63be47c29050 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ba2ce5819947cc6aa7724dbc54201d5c6596de0c + 610fe433e07b32ed451ed99d07df63be47c29050 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ba2ce5819947cc6aa7724dbc54201d5c6596de0c + 610fe433e07b32ed451ed99d07df63be47c29050 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ba2ce5819947cc6aa7724dbc54201d5c6596de0c + 610fe433e07b32ed451ed99d07df63be47c29050 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ba2ce5819947cc6aa7724dbc54201d5c6596de0c + 610fe433e07b32ed451ed99d07df63be47c29050 https://github.com/dotnet/test-templates @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1f3b71634ebe0f75164461f73d6305d1aeb4403d + e526ba29cdfac238c7dc40905b855b2ddc7d9d77 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1f3b71634ebe0f75164461f73d6305d1aeb4403d + e526ba29cdfac238c7dc40905b855b2ddc7d9d77 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1f3b71634ebe0f75164461f73d6305d1aeb4403d + e526ba29cdfac238c7dc40905b855b2ddc7d9d77 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1f3b71634ebe0f75164461f73d6305d1aeb4403d + e526ba29cdfac238c7dc40905b855b2ddc7d9d77 diff --git a/eng/Versions.props b/eng/Versions.props index 25873eb66..8c83c5c71 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,11 +58,11 @@ 7.0.16 7.0.16 - 7.0.16-servicing.24067.19 - 7.0.16-servicing.24067.19 - 7.0.16-servicing.24067.19 - 7.0.16-servicing.24067.19 - 7.0.16-servicing.24067.19 + 7.0.16-servicing.24068.15 + 7.0.16-servicing.24068.15 + 7.0.16-servicing.24068.15 + 7.0.16-servicing.24068.15 + 7.0.16-servicing.24068.15 0.2.0 @@ -70,8 +70,8 @@ 7.0.313 - 7.0.313-servicing.24068.62 - 7.0.313-servicing.24068.62 + 7.0.313-servicing.24069.10 + 7.0.313-servicing.24069.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f32ea3eca6d54c98c43e68c4b738dd7d8ea0cfd9 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 6 Feb 2024 12:11:27 -0800 Subject: [PATCH 118/138] Update branding to 6.0.128 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 337516a40..98b098d16 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 1 - 27 + 28 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From 1b55ed31b54842f577caa20fec5c8b267452e364 Mon Sep 17 00:00:00 2001 From: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Date: Tue, 6 Feb 2024 14:22:50 -0800 Subject: [PATCH 119/138] Update branding to 7.0.407 (#18531) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index b60a2863e..6b0a73c43 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 7 0 4 - 06 + 07 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing From a6060b24f354d352343c704e3118c0ad3000d1a7 Mon Sep 17 00:00:00 2001 From: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Date: Tue, 6 Feb 2024 14:22:53 -0800 Subject: [PATCH 120/138] Update branding to 7.0.314 (#18530) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index e2e98877f..e5f1dc724 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 7 0 3 - 13 + 14 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing From 40f96df29636c32c9650b95534627f16d8fd36a8 Mon Sep 17 00:00:00 2001 From: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Date: Tue, 6 Feb 2024 14:22:57 -0800 Subject: [PATCH 121/138] Update branding to 7.0.117 (#18529) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index d1809b7c2..9ed96ff17 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 7 0 1 - 16 + 17 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing From a9611179dbf184d9f0c59284cf236356cd91afae Mon Sep 17 00:00:00 2001 From: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Date: Tue, 6 Feb 2024 14:23:02 -0800 Subject: [PATCH 122/138] Update branding to 6.0.420 (#18528) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index a3aef0fc8..e6d73f51f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 4 - 19 + 20 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From 29eedea286efda066935c153c8a4ec0c7bd0c7fa Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 12 Feb 2024 09:43:05 -0800 Subject: [PATCH 123/138] [release/7.0.4xx] Update WiX to latest release (#18602) Co-authored-by: Jacques Eloff --- eng/Versions.props | 3 ++- src/finalizer_shim/finalizer_shim.csproj | 3 ++- src/redist/targets/GenerateMSIs.targets | 1 - 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 6b0a73c43..76e4258e3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -147,7 +147,8 @@ $(MicrosoftNETCoreAppRuntimePackageVersion) - 1.0.0-v3.14.0.5722 + + 3.14.0.8606 diff --git a/src/finalizer_shim/finalizer_shim.csproj b/src/finalizer_shim/finalizer_shim.csproj index ad9af2548..e6cd301f7 100644 --- a/src/finalizer_shim/finalizer_shim.csproj +++ b/src/finalizer_shim/finalizer_shim.csproj @@ -12,7 +12,8 @@ - + + diff --git a/src/redist/targets/GenerateMSIs.targets b/src/redist/targets/GenerateMSIs.targets index 1f8682d3a..3e7be6bec 100644 --- a/src/redist/targets/GenerateMSIs.targets +++ b/src/redist/targets/GenerateMSIs.targets @@ -11,7 +11,6 @@ - $(WixPackageVersion) https://netcorenativeassets.blob.core.windows.net/resource-packages/external/windows/wix/Microsoft.Signed.Wix-$(WixVersion).zip $(ArtifactsDir)Tools/WixTools/$(WixVersion) $(WixRoot)/WixTools.$(WixVersion).zip From 331c3a1909fa9415b023b44626bd5f7d4f0575f6 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 12 Feb 2024 09:43:10 -0800 Subject: [PATCH 124/138] [release/7.0.3xx] Update WiX to latest release (#18601) Co-authored-by: Jacques Eloff --- eng/Versions.props | 3 ++- src/finalizer_shim/finalizer_shim.csproj | 3 ++- src/redist/targets/GenerateMSIs.targets | 1 - 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index e5f1dc724..d40ea3bdc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -145,7 +145,8 @@ $(MicrosoftNETCoreAppRuntimePackageVersion) - 1.0.0-v3.14.0.5722 + + 3.14.0.8606 diff --git a/src/finalizer_shim/finalizer_shim.csproj b/src/finalizer_shim/finalizer_shim.csproj index ad9af2548..e6cd301f7 100644 --- a/src/finalizer_shim/finalizer_shim.csproj +++ b/src/finalizer_shim/finalizer_shim.csproj @@ -12,7 +12,8 @@ - + + diff --git a/src/redist/targets/GenerateMSIs.targets b/src/redist/targets/GenerateMSIs.targets index 527bc988c..495a51be3 100644 --- a/src/redist/targets/GenerateMSIs.targets +++ b/src/redist/targets/GenerateMSIs.targets @@ -11,7 +11,6 @@ - $(WixPackageVersion) https://netcorenativeassets.blob.core.windows.net/resource-packages/external/windows/wix/Microsoft.Signed.Wix-$(WixVersion).zip $(ArtifactsDir)Tools/WixTools/$(WixVersion) $(WixRoot)/WixTools.$(WixVersion).zip From aa39fb2795c2117d13d1728a381d8b2dfaf70c21 Mon Sep 17 00:00:00 2001 From: Jacques Eloff Date: Mon, 12 Feb 2024 09:43:33 -0800 Subject: [PATCH 125/138] Update WiX to latest release (#18599) --- eng/Versions.props | 3 ++- src/finalizer_shim/finalizer_shim.csproj | 3 ++- src/redist/targets/GenerateMSIs.targets | 1 - 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 9ed96ff17..ab4ea83b2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -141,7 +141,8 @@ $(MicrosoftNETCoreAppRuntimePackageVersion) - 1.0.0-v3.14.0.5722 + + 3.14.0.8606 diff --git a/src/finalizer_shim/finalizer_shim.csproj b/src/finalizer_shim/finalizer_shim.csproj index ad9af2548..e6cd301f7 100644 --- a/src/finalizer_shim/finalizer_shim.csproj +++ b/src/finalizer_shim/finalizer_shim.csproj @@ -12,7 +12,8 @@ - + + diff --git a/src/redist/targets/GenerateMSIs.targets b/src/redist/targets/GenerateMSIs.targets index 527bc988c..495a51be3 100644 --- a/src/redist/targets/GenerateMSIs.targets +++ b/src/redist/targets/GenerateMSIs.targets @@ -11,7 +11,6 @@ - $(WixPackageVersion) https://netcorenativeassets.blob.core.windows.net/resource-packages/external/windows/wix/Microsoft.Signed.Wix-$(WixVersion).zip $(ArtifactsDir)Tools/WixTools/$(WixVersion) $(WixRoot)/WixTools.$(WixVersion).zip From ca56ddf2bd13fc307403b5b4ecb513e560e966e7 Mon Sep 17 00:00:00 2001 From: NET Source-Build Bot <102560831+dotnet-sb-bot@users.noreply.github.com> Date: Wed, 14 Feb 2024 02:26:10 +0100 Subject: [PATCH 126/138] .NET Source-Build 7.0.116 February 2024 Updates (#18653) --- eng/Versions.props | 4 ++-- src/SourceBuild/tarball/content/global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index ab4ea83b2..0e762a39b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -216,8 +216,8 @@ or minor release, prebuilts may be needed. When the release is mature, prebuilts are not necessary, and this property is removed from the file. --> - 7.0.115 - 7.0.115 + 7.0.116 + 7.0.116 diff --git a/src/SourceBuild/tarball/content/global.json b/src/SourceBuild/tarball/content/global.json index ff635fdbf..68bdc9ac8 100644 --- a/src/SourceBuild/tarball/content/global.json +++ b/src/SourceBuild/tarball/content/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.115" + "dotnet": "7.0.116" }, "msbuild-sdks": { "Microsoft.Build.CentralPackageVersions": "2.0.1", From 37fb25fbf78529d3bb6d03793bd20b7eb26e7611 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 14 Feb 2024 22:05:03 +0000 Subject: [PATCH 127/138] Update dependencies from https://github.com/dotnet/arcade build 20240214.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.24065.4 -> To Version 7.0.0-beta.24114.2 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6526e84d8..1001e9b1f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - feda715e3fb6d511eaa39071bb9d77351cf4d943 + 5fd1dbf1679abc625e9e74614d9d7a28d151d675 - + https://github.com/dotnet/arcade - feda715e3fb6d511eaa39071bb9d77351cf4d943 + 5fd1dbf1679abc625e9e74614d9d7a28d151d675 - + https://github.com/dotnet/arcade - feda715e3fb6d511eaa39071bb9d77351cf4d943 + 5fd1dbf1679abc625e9e74614d9d7a28d151d675 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 76e4258e3..033f84632 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.24065.4 + 7.0.0-beta.24114.2 diff --git a/global.json b/global.json index 30aff2051..126e99650 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.115", + "dotnet": "7.0.116", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24065.4", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24065.4" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24114.2", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24114.2" } } From cb33239406eead37662f9901566f10eb0bc856df Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 14 Feb 2024 22:05:05 +0000 Subject: [PATCH 128/138] Update dependencies from https://github.com/dotnet/arcade build 20240214.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.24065.4 -> To Version 7.0.0-beta.24114.2 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 73ed55f61..66894993a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - feda715e3fb6d511eaa39071bb9d77351cf4d943 + 5fd1dbf1679abc625e9e74614d9d7a28d151d675 - + https://github.com/dotnet/arcade - feda715e3fb6d511eaa39071bb9d77351cf4d943 + 5fd1dbf1679abc625e9e74614d9d7a28d151d675 - + https://github.com/dotnet/arcade - feda715e3fb6d511eaa39071bb9d77351cf4d943 + 5fd1dbf1679abc625e9e74614d9d7a28d151d675 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index d40ea3bdc..3ed4b96cf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.24065.4 + 7.0.0-beta.24114.2 diff --git a/global.json b/global.json index 30aff2051..126e99650 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.115", + "dotnet": "7.0.116", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24065.4", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24065.4" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24114.2", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24114.2" } } From 5f3a79178154a4a4348333c7fa38053edca8c6fc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 14 Feb 2024 22:07:13 +0000 Subject: [PATCH 129/138] Update dependencies from https://github.com/dotnet/arcade build 20240214.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.24065.4 -> To Version 7.0.0-beta.24114.2 From 52f9570557407406c6d701b1b1e927035158cec5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 14 Feb 2024 22:09:48 +0000 Subject: [PATCH 130/138] Update dependencies from https://github.com/dotnet/arcade build 20240214.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.24065.4 -> To Version 7.0.0-beta.24114.2 From 932aab20dc43cd2437c36cb8c5c5fc957a7c06ce Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 15 Feb 2024 15:59:14 +0000 Subject: [PATCH 131/138] Update dependencies from https://github.com/dotnet/arcade build 20240214.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.24065.4 -> To Version 7.0.0-beta.24114.4 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 66894993a..a34794467 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - 5fd1dbf1679abc625e9e74614d9d7a28d151d675 + c9bbc4b7606b46f6121a2758d2555dfc6322ed88 - + https://github.com/dotnet/arcade - 5fd1dbf1679abc625e9e74614d9d7a28d151d675 + c9bbc4b7606b46f6121a2758d2555dfc6322ed88 - + https://github.com/dotnet/arcade - 5fd1dbf1679abc625e9e74614d9d7a28d151d675 + c9bbc4b7606b46f6121a2758d2555dfc6322ed88 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 3ed4b96cf..551034699 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.24114.2 + 7.0.0-beta.24114.4 diff --git a/global.json b/global.json index 126e99650..5d42d1e74 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24114.2", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24114.2" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24114.4", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24114.4" } } From 1e00c4cd394e56e02c31d532e56dff9e360293bb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 15 Feb 2024 15:59:14 +0000 Subject: [PATCH 132/138] Update dependencies from https://github.com/dotnet/arcade build 20240214.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.24065.4 -> To Version 7.0.0-beta.24114.4 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1001e9b1f..6b33d934c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - 5fd1dbf1679abc625e9e74614d9d7a28d151d675 + c9bbc4b7606b46f6121a2758d2555dfc6322ed88 - + https://github.com/dotnet/arcade - 5fd1dbf1679abc625e9e74614d9d7a28d151d675 + c9bbc4b7606b46f6121a2758d2555dfc6322ed88 - + https://github.com/dotnet/arcade - 5fd1dbf1679abc625e9e74614d9d7a28d151d675 + c9bbc4b7606b46f6121a2758d2555dfc6322ed88 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 033f84632..4695a1be8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.24114.2 + 7.0.0-beta.24114.4 diff --git a/global.json b/global.json index 126e99650..5d42d1e74 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24114.2", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24114.2" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24114.4", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24114.4" } } From bf88ec8a077abe4ded4f98f4b24e26704fd8e404 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 15 Feb 2024 17:00:13 +0000 Subject: [PATCH 133/138] Update dependencies from https://github.com/dotnet/arcade build 20240214.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.24065.4 -> To Version 7.0.0-beta.24114.4 From c89e3ce0feed2810ed225e91d041be58ed8f3219 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 15 Feb 2024 17:00:18 +0000 Subject: [PATCH 134/138] Update dependencies from https://github.com/dotnet/arcade build 20240214.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.24065.4 -> To Version 7.0.0-beta.24114.4 From e44eb502e47d80c8d90d8339b9f2c28546bf41a6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 15 Feb 2024 17:29:14 +0000 Subject: [PATCH 135/138] Update dependencies from https://github.com/dotnet/arcade build 20240214.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.24059.5 -> To Version 7.0.0-beta.24114.4 --- NuGet.config | 16 ++++++++++++++-- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/native/init-compiler.sh | 2 +- global.json | 6 +++--- 5 files changed, 25 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index 99d9d34a8..3fddfa878 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,22 +7,29 @@ - + + + + + + + + @@ -44,14 +51,19 @@ - + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 592f18792..351bf8ed3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -194,18 +194,18 @@ - + https://github.com/dotnet/arcade - 02d5538bac1bacfd6fb310d92ab8914de08f3358 + c9bbc4b7606b46f6121a2758d2555dfc6322ed88 - + https://github.com/dotnet/arcade - 02d5538bac1bacfd6fb310d92ab8914de08f3358 + c9bbc4b7606b46f6121a2758d2555dfc6322ed88 - + https://github.com/dotnet/arcade - 02d5538bac1bacfd6fb310d92ab8914de08f3358 + c9bbc4b7606b46f6121a2758d2555dfc6322ed88 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 024ad8546..a1ed9ad1c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.24059.5 + 7.0.0-beta.24114.4 diff --git a/eng/common/native/init-compiler.sh b/eng/common/native/init-compiler.sh index f13b74080..81ea06151 100644 --- a/eng/common/native/init-compiler.sh +++ b/eng/common/native/init-compiler.sh @@ -71,7 +71,7 @@ if [[ -z "$CLR_CC" ]]; then # Set default versions if [[ -z "$majorVersion" ]]; then # note: gcc (all versions) and clang versions higher than 6 do not have minor version in file name, if it is zero. - if [[ "$compiler" == "clang" ]]; then versions=( 16 15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5 ) + if [[ "$compiler" == "clang" ]]; then versions=( 17 16 15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5 ) elif [[ "$compiler" == "gcc" ]]; then versions=( 12 11 10 9 8 7 6 5 4.9 ); fi for version in "${versions[@]}"; do diff --git a/global.json b/global.json index fd9164f9a..5d42d1e74 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.115", + "dotnet": "7.0.116", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24059.5", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24059.5" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24114.4", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24114.4" } } From 723427fa6b1d977a869523fca1f22fed23ade3c5 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Sat, 17 Feb 2024 08:10:10 -0600 Subject: [PATCH 136/138] Update SDK diff baseline (#18706) --- .../assets/baselines/MsftToSbSdk.diff | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff index 0f16c9546..4d662a3c3 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff @@ -25,9 +25,6 @@ index ------------ +./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Formats.Asn1.xml ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.IO.Pipelines.dll ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.IO.Pipelines.xml -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Runtime.CompilerServices.Unsafe.dll -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.AccessControl.dll -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.AccessControl.xml ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.Cryptography.Xml.dll ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.Cryptography.Xml.xml +./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Encodings.Web.dll @@ -48,10 +45,6 @@ index ------------ -./packs/Microsoft.NETCore.App.Host.portable-rid/x.y.z/runtimes/portable-rid/native/libnethost.so -./packs/Microsoft.NETCore.App.Host.portable-rid/x.y.z/runtimes/portable-rid/native/nethost.h -./packs/Microsoft.NETCore.App.Host.portable-rid/x.y.z/runtimes/portable-rid/native/singlefilehost -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Encodings.Web.dll -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Encodings.Web.xml -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Json.dll -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Json.xml +./packs/Microsoft.NETCore.App.Host.banana-rid/ +./packs/Microsoft.NETCore.App.Host.banana-rid/x.y.z/ +./packs/Microsoft.NETCore.App.Host.banana-rid/x.y.z/runtimes/ From 69bf62f29ab6f4749b482ba90b9f0a2773557571 Mon Sep 17 00:00:00 2001 From: Ella Hathaway <67609881+ellahathaway@users.noreply.github.com> Date: Mon, 4 Mar 2024 11:23:54 -0800 Subject: [PATCH 137/138] Update Assembly Exclusions (#18859) --- .../assets/SdkAssemblyVersionDiffExclusions.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/SdkAssemblyVersionDiffExclusions.txt b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/SdkAssemblyVersionDiffExclusions.txt index 50fac905d..e5b4aa4e7 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/SdkAssemblyVersionDiffExclusions.txt +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/SdkAssemblyVersionDiffExclusions.txt @@ -26,6 +26,8 @@ ./sdk/x.y.z/System.Security.Cryptography.Xml.dll # These assemblies are lifted to a higher version naturally via SB +./sdk/x.y.z/DotnetTools/dotnet-format/dotnet-format.dll +./sdk/x.y.z/DotnetTools/dotnet-format/*/dotnet-format.resources.dll ./sdk/x.y.z/DotnetTools/dotnet-format/*/Microsoft.CodeAnalysis.* ./sdk/x.y.z/DotnetTools/dotnet-format/Humanizer.dll ./sdk/x.y.z/DotnetTools/dotnet-format/Microsoft.Build.Locator.dll From 818879e9fc0019c781689adf3b1b08073714ac37 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 5 Mar 2024 10:59:27 -0800 Subject: [PATCH 138/138] Update branding to 8.0.104 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 114d2f500..dd5670c9b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 8 0 1 - 03 + 04 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) $(VersionMajor).$(VersionMinor) $(MajorMinorVersion).$(VersionSDKMinor)