From 6af34f16266eb99ba78e66dbe5a7dec756d72232 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 23 Nov 2023 14:01:59 +0000 Subject: [PATCH 001/261] 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 6965e587be71..25b3d1da7ad5 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 5a3d473a052b..66d5805f98e3 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 3012a3afa24d..19fce438b989 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/261] 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 7b13934dc420..39ef38a7dcab 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 6ed02abb33f8..b6e30859f4a4 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 122ba126e1ca..599f9cbde494 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/261] 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 25b3d1da7ad5..65e2ee623fc5 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 66d5805f98e3..65785a115f53 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 19fce438b989..018a55ab140f 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/261] 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 39ef38a7dcab..eb2810961d92 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 b6e30859f4a4..c9a3cc6cdd58 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 599f9cbde494..ec1a28869f35 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/261] 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 be7632bd2f29..529576f58a6f 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 a464c3fa3518..7cfc48c06e12 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 a42e5dcf54c1..90a2db59b1c3 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/261] 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 529576f58a6f..d1253ca2d651 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 7cfc48c06e12..169f1cad1a7a 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 90a2db59b1c3..410f1b3f06f0 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/261] 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 d1253ca2d651..07374752cb0f 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 169f1cad1a7a..a348c8fa1c8d 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 410f1b3f06f0..92a56de33222 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/261] 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 07374752cb0f..529576f58a6f 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 a348c8fa1c8d..7cfc48c06e12 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 92a56de33222..90a2db59b1c3 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/261] 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/261] 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 492e94748e1d..458cbbf6f1ce 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 6407cb8439b1..bf0084a59bc7 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/261] 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 dd632b04bd44..03f09e6af7f9 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 039431cbabbd..a891e96734cc 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 616f2592a029..c2386ebf9377 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/261] 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 03d3587a670c..1aa3642f72e5 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 458cbbf6f1ce..e8bd7fbb31a8 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 bf0084a59bc7..775638704aad 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/261] 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 df347d0f2098..2cf5556c3e9c 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 d5513d3a8b00..8b5940b6c8b4 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 c689826cd161..24c27b260149 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/261] 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 2cf5556c3e9c..88cf52afd8ac 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 8b5940b6c8b4..a6ece6385f5c 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 24c27b260149..cf7e6d2c7179 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/261] 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 88cf52afd8ac..dcba8ce77776 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 a6ece6385f5c..1a40c404e0a5 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 cf7e6d2c7179..2d4d53542773 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/261] 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 03f09e6af7f9..fe7817f00d21 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 a891e96734cc..7e5d919ef86e 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 c2386ebf9377..c68cdb0ad64f 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/261] 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 65e2ee623fc5..24168537a3e1 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 65785a115f53..2b505f556271 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 018a55ab140f..96257c41dd8e 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/261] 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 529576f58a6f..b3682484a416 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 7cfc48c06e12..3b6bc0be2e4f 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 90a2db59b1c3..e6bd74f8dd3b 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/261] 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 eb2810961d92..beca76c4274a 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 c9a3cc6cdd58..e780bcb100fa 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 ec1a28869f35..4f750003aecd 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/261] 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 1aa3642f72e5..152173f2ac76 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 e8bd7fbb31a8..3085be281258 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 775638704aad..2da60752806f 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/261] 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 c6f583096e07..0b653655fca1 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/261] 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 3085be281258..a4e6877c51e3 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 2da60752806f..96d0d2e3accf 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/261] 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 beca76c4274a..7cbccbd8ab5f 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 22e8aec0f0ed..d6cc9da3cc16 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 4f750003aecd..264d5d2a079c 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/261] 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 152173f2ac76..26fdcf4ae978 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 a4e6877c51e3..98c7340e2e1e 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 96d0d2e3accf..08c6b98d4a18 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/261] 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 fe7817f00d21..4fab6601bd16 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 7e5d919ef86e..a4bf66b6a35e 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 c68cdb0ad64f..7731bf09cc04 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/261] 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 1a40c404e0a5..92114992ec88 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 2d4d53542773..3067e7c6deb5 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/261] 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 24168537a3e1..529a9110eded 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 59e1f894dd93..0dafb4b3c768 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 96257c41dd8e..b5858e7115d7 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/261] 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 dcba8ce77776..db5a4ec11560 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 92114992ec88..64d7e889efe4 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 3067e7c6deb5..301d1a62bbdb 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/261] 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 7cbccbd8ab5f..638069f5e32b 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 d6cc9da3cc16..df8d69d382a8 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 264d5d2a079c..a33fe3b2d531 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/261] 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 b3682484a416..e926b86a7803 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 159d5de6db8e..2e9c5c1c712c 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 e6bd74f8dd3b..c4318dd50c84 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/261] 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 2e9c5c1c712c..1fcfa9e5456b 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/261] 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 0dafb4b3c768..d2b434cf4d81 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/261] 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 df8d69d382a8..f751f7d5fa61 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/261] 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 dc33e0a03257..f2c4d21332cb 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/261] 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 f2c4d21332cb..55d1c4ff9a59 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/261] 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 55d1c4ff9a59..0a9a2ddc06fd 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/261] 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 f751f7d5fa61..d7a8dca606e9 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 dc33e0a03257..0a9a2ddc06fd 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/261] 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 d2b434cf4d81..0fad8e2205f3 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 dc33e0a03257..0a9a2ddc06fd 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/261] 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 1fcfa9e5456b..d4f781536720 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/261] 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 638069f5e32b..a4af0c8cc9e9 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 c3f292b1d318..ce68b766a278 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 a4614ef18442..a87b860dd0d9 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/261] 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 4fab6601bd16..f22372130108 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 a4bf66b6a35e..8c74919a0de6 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 7731bf09cc04..be784a3b6596 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/261] 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 db5a4ec11560..e9eac60af4cb 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 64d7e889efe4..00511bda626b 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 301d1a62bbdb..630f4c7769dd 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/261] 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 26fdcf4ae978..6b8d7ee77955 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 98c7340e2e1e..48a8a8e7b222 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 08c6b98d4a18..ee8d3732dc4f 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/261] 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 d4f781536720..0bb7129fd5c5 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/261] 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 02e1c50cd84a..4c531da6e387 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/261] 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 ce68b766a278..34d9491324dc 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/261] 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 f22372130108..9a61de72623a 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 8c74919a0de6..c54327a2dae3 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 be784a3b6596..4a187c317d3f 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/261] 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 e9eac60af4cb..98638b9ae52d 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 00511bda626b..62ffc36fdcf3 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 630f4c7769dd..fef08b7bdcb4 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/261] 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 6b8d7ee77955..44c201c8bef0 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 48a8a8e7b222..7c00837f25f5 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 ee8d3732dc4f..08cd886fc9c3 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/261] 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 e926b86a7803..637dd025e4a6 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 0bb7129fd5c5..64be1c99dec9 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 c4318dd50c84..0173becfd420 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/261] 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 529a9110eded..2102f9bcf7df 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 4c531da6e387..9a29a0c14130 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 aa9d370e1344..2db776d1fffc 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/261] 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 a4af0c8cc9e9..34760f1387ed 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 34d9491324dc..b6f25ee4e2e0 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 a87b860dd0d9..ca5ace3ec576 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/261] 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 98638b9ae52d..6b6abf24e6ea 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 62ffc36fdcf3..824d1e2fe1c6 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 fef08b7bdcb4..c837eb64159e 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/261] 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 44c201c8bef0..d4d84aab1b56 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 7c00837f25f5..15d012f5a61b 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 08cd886fc9c3..9f1214fc0b7b 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/261] 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 9a61de72623a..51d242180aac 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 c54327a2dae3..72d2cedbe26c 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 4a187c317d3f..061193e71ba9 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/261] 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 51d242180aac..36c575133302 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 72d2cedbe26c..671fad883f10 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 061193e71ba9..e07ebd6dd601 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/261] 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 d4d84aab1b56..0b41bf143608 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 15d012f5a61b..9cece73bc1ee 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 9f1214fc0b7b..acba3cbf4e6a 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/261] 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 6b6abf24e6ea..575275834c06 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 824d1e2fe1c6..aea92804fd30 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 c837eb64159e..da8399e55ecb 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/261] 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 36c575133302..e7470c4b2b23 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 671fad883f10..89d861c82373 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 e07ebd6dd601..9d7973343ff3 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/261] 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 575275834c06..3eb49cca2b0b 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 aea92804fd30..b1b71e0d7740 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 da8399e55ecb..f4cd922099b7 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/261] 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 0b41bf143608..3172c2731511 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 9cece73bc1ee..22e72527378b 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 acba3cbf4e6a..5031c62ce9c5 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/261] 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 e7470c4b2b23..fbf9c4902cbb 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 89d861c82373..6114908f03ef 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 9d7973343ff3..b326a0658965 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/261] 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 3eb49cca2b0b..3371ee0f3ddb 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 b1b71e0d7740..039f6a3466f5 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 f4cd922099b7..a6a9cf9a9ad5 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/261] 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 3172c2731511..136e28698971 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 22e72527378b..06610174f199 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 5031c62ce9c5..0cad5967e7c3 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/261] 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 fbf9c4902cbb..e97435cf7ced 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 6114908f03ef..b750cf3294dc 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 b326a0658965..1f643f677710 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/261] 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 3371ee0f3ddb..78b63002ea32 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 039f6a3466f5..1a2687e3eb31 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 a6a9cf9a9ad5..13e0ab3db8b3 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/261] 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 136e28698971..07d2ab1fe94c 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 06610174f199..5960f0e91d4d 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 0cad5967e7c3..2f4872aa6aa4 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/261] 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 637dd025e4a6..805cabdda001 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 64be1c99dec9..572de4dc3a83 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 0173becfd420..ad3fcc7dc520 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/261] 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 34760f1387ed..7dbbb3ffb2ec 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 b6f25ee4e2e0..78af4863118f 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 ca5ace3ec576..aeb17304b839 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/261] 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 000000000000..562530c964a5 --- /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/261] 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 616f2592a029..eaeeefcc7e70 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/261] 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 7dbbb3ffb2ec..a6f72ad66f8e 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 78af4863118f..2d5d1c21b96d 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 aeb17304b839..3b941202dfe9 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/261] 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 a6f72ad66f8e..1efb5d67c9a8 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 2d5d1c21b96d..63da6d03c50f 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 3b941202dfe9..92d1f82ba10b 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/261] 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 1efb5d67c9a8..9d7105801908 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 63da6d03c50f..c5dd106751e1 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 92d1f82ba10b..dd7b31f87e00 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/261] .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 eaeeefcc7e70..cc3f8afd0090 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 06cde48c2218..d503a61b9f7f 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/261] 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 327438c20dbc..27a00eeb3c1f 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/261] .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 192f8e1a5f59..f821f79fd928 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 d508adc5c36d..ff635fdbf715 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/261] 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 327438c20dbc..843ca034ceb0 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/261] 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 9d7105801908..eda0f484ec76 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 c5dd106751e1..897c079e6e88 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 dd7b31f87e00..9999f88f6e06 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/261] 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 07d2ab1fe94c..a286d7217c8f 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 5960f0e91d4d..0478bcbf125c 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/261] 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 eda0f484ec76..756fb70f34e3 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 897c079e6e88..36f7b9973254 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 9999f88f6e06..60843f73826d 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/261] 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 756fb70f34e3..44b1245c7935 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 36f7b9973254..456dadda37e6 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 60843f73826d..e6ee7ad3c4a4 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/261] 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 0a9a2ddc06fd..34dea7b25a9e 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/261] 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 34dea7b25a9e..dc33e0a03257 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/261] 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 0a9a2ddc06fd..dc33e0a03257 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/261] 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 0a9a2ddc06fd..dc33e0a03257 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/261] 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 518959be5093..4b3cc0e38b0d 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 f821f79fd928..06dbfaa6dfc2 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 435e7641341b..8fda30bdce2b 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 84c1d0cc2e75..c305ae6bd771 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 de2d957922a6..49938f0c89f7 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 8508397d7764..1e779fec4dd1 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 55dea518ac58..ac9a95778fcd 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 ef337eac55ec..11c345c581c3 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 c5fedd7f70ce..4ff83a5362ba 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 a15b07eb51d9..8dd2d355f22d 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 776bd9700173..b504fe55cb80 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 c051f1b65e9c..7b989985b0e0 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 154f5f035227..fd9164f9a3bc 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/261] [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 e97435cf7ced..1aadfd0ee62e 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 b750cf3294dc..1292acafdf64 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 f11f8a7855e3..337516a40f11 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 435e7641341b..8fda30bdce2b 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 39abdbecdcf1..4e4116f1d0bf 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 de2d957922a6..49938f0c89f7 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 8508397d7764..1e779fec4dd1 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 55dea518ac58..ac9a95778fcd 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 0e10e7db69c7..01da2420df60 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 d91bf9147116..239b17010fa7 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 1ac7f49a43ca..fae340f4d20d 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 fc022ca9b266..d49c6156bf0a 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 1410185dde5b..8bf2c6315a9f 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/261] [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 0478bcbf125c..72a435584c9f 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 c9fa2f63b748..a3aef0fc8f61 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 435e7641341b..8fda30bdce2b 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 39abdbecdcf1..4e4116f1d0bf 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 de2d957922a6..49938f0c89f7 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 8508397d7764..1e779fec4dd1 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 55dea518ac58..ac9a95778fcd 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 0e10e7db69c7..01da2420df60 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 d91bf9147116..239b17010fa7 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 1ac7f49a43ca..fae340f4d20d 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 fc022ca9b266..d49c6156bf0a 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 1410185dde5b..8bf2c6315a9f 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/261] 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 805cabdda001..c540d5b6a4dc 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 69806ea2323f..986a7a3193dd 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 aa6ecfe7084d..b065f63a8a14 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/261] 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 c540d5b6a4dc..76a1552bc7ae 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 986a7a3193dd..252b3b23b444 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 b065f63a8a14..163cdd2e53bd 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/261] 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 76a1552bc7ae..cddbc2bcf966 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 252b3b23b444..38e81f8dcc5f 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 163cdd2e53bd..fdf41eb71a31 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/261] 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 71ae3f0b9a65..dfeb1a2f8812 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/261] 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 44b1245c7935..bd3ba0a7650d 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 2df6a4485546..47202d2a7800 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 710a923100c9..f503f25a2e8b 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/261] 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 bd443698c95a..4d662a3c3fe9 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/261] 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 cddbc2bcf966..e9a2fa634263 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 fa311536b8e3..713af0f51ce9 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 4bb45da0f3d5..eab48d2072c4 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/261] 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 2102f9bcf7df..fb6caa4933b8 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 b80909b84ea9..408592dd673c 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 e2302f9ba0d9..e6fe2f14254e 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/261] 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 bd3ba0a7650d..e0771b2887e5 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 47202d2a7800..315caf81b718 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 f503f25a2e8b..34f29b1d4f41 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/261] [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 2102f9bcf7df..280601a1fcb4 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 b80909b84ea9..bdd15b7884c6 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 e2302f9ba0d9..fea881a174d0 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 fd9164f9a3bc..45f2ad15f042 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/261] [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 34760f1387ed..f1fe9ed1c303 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 bb3641411e90..6d5ac1690342 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 89aaec6b49e3..69a22d60de6f 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 fd9164f9a3bc..45f2ad15f042 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/261] [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 f1fe9ed1c303..bdc3a6cb9239 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 6d5ac1690342..6526e84d8c5a 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 69a22d60de6f..549b1131486f 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 f13b74080edf..81ea061512be 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 45f2ad15f042..30aff205100f 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/261] [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 280601a1fcb4..d288f50a2426 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 bdd15b7884c6..73ed55f618b0 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 fea881a174d0..0991555911c9 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 f13b74080edf..81ea061512be 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 45f2ad15f042..30aff205100f 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/261] 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 e9a2fa634263..7f6b1aab08a1 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 713af0f51ce9..9eb2b16894ba 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 eab48d2072c4..4c6e3217f48f 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/261] 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 fb6caa4933b8..6f5b3eb004fd 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 408592dd673c..4743d6d1f1f8 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 e6fe2f14254e..0d5bcdc877ac 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/261] 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 7f6b1aab08a1..8e9c45524d8f 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 9eb2b16894ba..0075e31bd1a7 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 4c6e3217f48f..9a441a7dbed5 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/261] 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 e0771b2887e5..306ae011ba62 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 315caf81b718..5c1d37ca23a9 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 34f29b1d4f41..373448cceed4 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/261] 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 306ae011ba62..12644acf4fcd 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 5c1d37ca23a9..102d77399816 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 373448cceed4..0da17b0e0822 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/261] 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 8e9c45524d8f..392ad1905a85 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 0075e31bd1a7..fdc738d3d3ba 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 9a441a7dbed5..4c53265d4412 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/261] 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 6f5b3eb004fd..07444b91d02c 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 4743d6d1f1f8..38a0c4a79587 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 0d5bcdc877ac..82de004e9f36 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/261] 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 12644acf4fcd..36196e88e0af 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 102d77399816..7e6a995eab22 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 0da17b0e0822..ab6f5be97a93 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/261] 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 392ad1905a85..a1d045602687 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 fdc738d3d3ba..fb2cc75ba84d 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 4c53265d4412..cc58440f1058 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/261] 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 07444b91d02c..50c222de89c1 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 38a0c4a79587..4496a1dc6fd4 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 82de004e9f36..bbf9116cce33 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/261] 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 36196e88e0af..449e0aad83cd 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 7e6a995eab22..c8d8e523f256 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 ab6f5be97a93..78c6b7875ebc 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/261] 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 50c222de89c1..5549476fcad7 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 4496a1dc6fd4..e150f5306ad8 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 bbf9116cce33..057dc78355c2 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/261] 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 a1d045602687..99d9d34a866e 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 fb2cc75ba84d..592f18792459 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 cc58440f1058..94b2f770f495 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/261] 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 449e0aad83cd..e3a1c275aa36 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 60be0f8859ff..610156f324ac 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 6fbb52f47fc1..c95e832f0d45 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/261] 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 5549476fcad7..1b1c47835273 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 23e106392c38..335b739c9656 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 25873eb66223..8c83c5c71e5a 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/261] 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 337516a40f11..98b098d165e0 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/261] 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 b60a2863e7d3..6b0a73c4399e 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/261] 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 e2e98877f841..e5f1dc724778 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/261] 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 d1809b7c2939..9ed96ff174a8 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/261] 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 a3aef0fc8f61..e6d73f51f08f 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/261] [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 6b0a73c4399e..76e4258e3a2a 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 ad9af2548e97..e6cd301f7a46 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 1f8682d3a1b1..3e7be6bec820 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/261] [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 e5f1dc724778..d40ea3bdc6a4 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 ad9af2548e97..e6cd301f7a46 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 527bc988c182..495a51be3ba6 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/261] 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 9ed96ff174a8..ab4ea83b275a 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 ad9af2548e97..e6cd301f7a46 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 527bc988c182..495a51be3ba6 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/261] .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 ab4ea83b275a..0e762a39bcd4 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 ff635fdbf715..68bdc9ac865a 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/261] 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 6526e84d8c5a..1001e9b1fe12 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 76e4258e3a2a..033f8463290b 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 30aff205100f..126e99650f11 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/261] 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 73ed55f618b0..66894993a201 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 d40ea3bdc6a4..3ed4b96cf8bb 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 30aff205100f..126e99650f11 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/261] 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/261] 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/261] 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 66894993a201..a34794467c8f 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 3ed4b96cf8bb..55103469931b 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 126e99650f11..5d42d1e74d7b 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/261] 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 1001e9b1fe12..6b33d934c2c4 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 033f8463290b..4695a1be8e44 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 126e99650f11..5d42d1e74d7b 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/261] 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/261] 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/261] 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 99d9d34a866e..3fddfa878f9e 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 592f18792459..351bf8ed3d88 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 024ad85464aa..a1ed9ad1c2f1 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 f13b74080edf..81ea061512be 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 fd9164f9a3bc..5d42d1e74d7b 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/261] 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 0f16c9546945..4d662a3c3fe9 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 e894991b5fcf0f58cbaf30d0f35245741654e1e0 Mon Sep 17 00:00:00 2001 From: Jackson Schuster <36744439+jtschuster@users.noreply.github.com> Date: Thu, 22 Feb 2024 08:24:46 -0800 Subject: [PATCH 137/261] Add SdkArchiveDiff task to verify the sdk archive has all the expected outputs --- src/SourceBuild/content/Directory.Build.props | 1 + src/SourceBuild/content/build.proj | 1 + src/SourceBuild/content/eng/build.targets | 27 ++++ .../content/eng/tools/init-build.proj | 9 ++ .../Archive.cs | 137 ++++++++++++++++++ .../FindArchiveDiffs.cs | 134 +++++++++++++++++ .../GetClosestOfficialSdk.cs | 82 +++++++++++ ...et.SourceBuild.Tasks.SdkArchiveDiff.csproj | 13 ++ .../PathWithVersions.cs | 113 +++++++++++++++ .../ZipArchiveExtensions.cs | 79 ++++++++++ 10 files changed, 596 insertions(+) create mode 100644 src/SourceBuild/content/eng/build.targets create mode 100644 src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/Archive.cs create mode 100644 src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/FindArchiveDiffs.cs create mode 100644 src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/GetClosestOfficialSdk.cs create mode 100644 src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff.csproj create mode 100644 src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/PathWithVersions.cs create mode 100644 src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/ZipArchiveExtensions.cs diff --git a/src/SourceBuild/content/Directory.Build.props b/src/SourceBuild/content/Directory.Build.props index bbd94253d7d2..c9a997e7a63a 100644 --- a/src/SourceBuild/content/Directory.Build.props +++ b/src/SourceBuild/content/Directory.Build.props @@ -199,6 +199,7 @@ $([MSBuild]::NormalizePath('$(ArtifactsBinDir)', 'Microsoft.DotNet.SourceBuild.Tasks.XPlat', '$(Configuration)', 'Microsoft.DotNet.SourceBuild.Tasks.XPlat.dll')) $([MSBuild]::NormalizePath('$(ArtifactsBinDir)', 'Microsoft.DotNet.SourceBuild.Tasks.LeakDetection', '$(Configuration)', 'Microsoft.DotNet.SourceBuild.Tasks.LeakDetection.dll')) + $([MSBuild]::NormalizePath('$(ArtifactsBinDir)', 'Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff', '$(Configuration)', 'Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff.dll')) diff --git a/src/SourceBuild/content/build.proj b/src/SourceBuild/content/build.proj index 04f6a25b6f6f..adc0a15bb530 100644 --- a/src/SourceBuild/content/build.proj +++ b/src/SourceBuild/content/build.proj @@ -20,5 +20,6 @@ + diff --git a/src/SourceBuild/content/eng/build.targets b/src/SourceBuild/content/eng/build.targets new file mode 100644 index 000000000000..5f7b15caa398 --- /dev/null +++ b/src/SourceBuild/content/eng/build.targets @@ -0,0 +1,27 @@ + + + + + + + + $(OutDir) + + + + + + + + + + + + + + + + diff --git a/src/SourceBuild/content/eng/tools/init-build.proj b/src/SourceBuild/content/eng/tools/init-build.proj index 4d6b4d316651..b5201514e5ea 100644 --- a/src/SourceBuild/content/eng/tools/init-build.proj +++ b/src/SourceBuild/content/eng/tools/init-build.proj @@ -15,6 +15,7 @@ UnpackTarballs; BuildXPlatTasks; BuildMSBuildSdkResolver; + BuildTarballDiff; BuildLeakDetection; ExtractToolPackage; GenerateRootFs; @@ -116,6 +117,14 @@ + + + + + diff --git a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/Archive.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/Archive.cs new file mode 100644 index 000000000000..e7943c0a30cd --- /dev/null +++ b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/Archive.cs @@ -0,0 +1,137 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. + +using System; +using System.Collections.Immutable; +using System.Formats.Tar; +using System.IO; +using System.IO.Compression; +using System.Linq; +using System.Reflection; +using System.Reflection.Metadata; +using System.Reflection.PortableExecutable; +using System.Threading; +using System.Threading.Tasks; +using static ArchiveExtensions; + +public abstract class Archive : IDisposable +{ + public static async Task Create(string path) + { + if (path.EndsWith(".tar.gz")) + return await TarArchive.Create(path); + else if (path.EndsWith(".zip")) + return ZipFileArchive.Create(path); + else + throw new NotSupportedException("Unsupported archive type"); + } + + public abstract bool Contains(string relativePath); + + public abstract string[] GetFileNames(); + + public abstract string[] GetFileLines(string relativePath); + + public abstract Task GetFileBytesAsync(string relativePath); + + public abstract void Dispose(); + + public class TarArchive : Archive + { + private string _extractedFolder; + + private TarArchive(string extractedFolder) + { + _extractedFolder = extractedFolder; + } + + public static async Task Create(string path, CancellationToken cancellationToken = default) + { + var tmpFolder = Directory.CreateTempSubdirectory(nameof(FindArchiveDiffs)); + using (var gzStream = File.OpenRead (path)) + using (var gzipStream = new GZipStream (gzStream, CompressionMode.Decompress)) + { + await TarFile.ExtractToDirectoryAsync(gzipStream, tmpFolder.FullName, true, cancellationToken); + } + return new TarArchive(tmpFolder.FullName); + } + + public override bool Contains(string relativePath) + { + return File.Exists(Path.Combine(_extractedFolder, relativePath)); + } + + public override string[] GetFileNames() + { + return Directory.GetFiles(_extractedFolder, "*", SearchOption.AllDirectories).Select(f => f.Substring(_extractedFolder.Length + 1)).ToArray(); + } + + public override string[] GetFileLines(string relativePath) + { + return File.ReadAllLines(Path.Combine(_extractedFolder, relativePath)); + } + + public override Task GetFileBytesAsync(string relativePath) + { + var filePath = Path.Combine(_extractedFolder, relativePath); + if (!File.Exists(filePath)) + return Task.FromResult([]); + return File.ReadAllBytesAsync(Path.Combine(_extractedFolder, relativePath)); + } + + public override void Dispose() + { + if (Directory.Exists(_extractedFolder)) + Directory.Delete(_extractedFolder, true); + } + } + + public class ZipFileArchive : Archive + { + private ZipArchive _archive; + + private ZipFileArchive(ZipArchive archive) + { + _archive = archive; + } + + public static new ZipFileArchive Create(string path) + { + return new ZipFileArchive(new ZipArchive(File.OpenRead(path))); + } + + public override bool Contains(string relativePath) + { + return _archive.GetEntry(relativePath) != null; + } + + public override string[] GetFileNames() + { + return _archive.Entries.Select(e => e.FullName).ToArray(); + } + + public override string[] GetFileLines(string relativePath) + { + var entry = _archive.GetEntry(relativePath); + if (entry == null) + throw new ArgumentException("File not found"); + return entry.Lines(); + } + public override Task GetFileBytesAsync(string relativePath) + { + using (var entry = _archive.GetEntry(relativePath)?.Open()) + { + if (entry == null) + { + return Task.FromResult([]); + } + return entry.ReadToEndAsync(); + } + } + + public override void Dispose() + { + _archive.Dispose(); + } + } +} diff --git a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/FindArchiveDiffs.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/FindArchiveDiffs.cs new file mode 100644 index 000000000000..8225c59f3acf --- /dev/null +++ b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/FindArchiveDiffs.cs @@ -0,0 +1,134 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. + +using System; +using System.Collections.Generic; +using System.Diagnostics; +using System.Linq; +using System.Threading.Tasks; +using Microsoft.Build.Framework; +using Microsoft.Build.Utilities; +using Task = System.Threading.Tasks.Task; + +public class FindArchiveDiffs : Microsoft.Build.Utilities.Task +{ + public class ArchiveItem + { + public required string Path { get; init; } + } + + [Required] + public required ITaskItem BaselineArchive { get; init; } + + [Required] + public required ITaskItem TestArchive { get; init; } + + [Output] + public ITaskItem[] ContentDifferences { get; set; } = []; + + public override bool Execute() + { + return Task.Run(ExecuteAsync).Result; + } + + public async Task ExecuteAsync() + { + var baselineTask = Archive.Create(BaselineArchive.ItemSpec); + var testTask = Archive.Create(TestArchive.ItemSpec); + Task.WaitAll(baselineTask, testTask); + using var baseline = await baselineTask; + using var test = await testTask; + var baselineFiles = baseline.GetFileNames(); + var testFiles = test.GetFileNames(); + ContentDifferences = + GetDiffs(baselineFiles, testFiles, PathWithVersions.Equal, PathWithVersions.GetVersionAnonymousPath) + .Select(FromDiff) + .ToArray(); + return true; + } + + static ITaskItem FromDiff((string, DifferenceKind) diff) + { + var item = new TaskItem(diff.Item1); + item.SetMetadata("Kind", Enum.GetName(diff.Item2)); + return item; + } + + public enum DifferenceKind + { + Added, + Removed, + Unchanged + } + + public static List<(string, DifferenceKind DifferenceKind)> GetDiffs( + string[] originalPathsWithVersions, + string[] modifiedPathsWithVersions, + Func equalityComparer, + Func? formatter = null) + { + formatter ??= static s => s; + // Edit distance algorithm: https://en.wikipedia.org/wiki/Longest_common_subsequence + + int[,] dp = new int[originalPathsWithVersions.Length + 1, modifiedPathsWithVersions.Length + 1]; + + // Initialize first row and column + for (int i = 0; i <= originalPathsWithVersions.Length; i++) + { + dp[i, 0] = i; + } + for (int j = 0; j <= modifiedPathsWithVersions.Length; j++) + { + dp[0, j] = j; + } + + // Compute edit distance + for (int i = 1; i <= originalPathsWithVersions.Length; i++) + { + for (int j = 1; j <= modifiedPathsWithVersions.Length; j++) + { + if (equalityComparer(originalPathsWithVersions[i - 1], modifiedPathsWithVersions[j - 1])) + { + dp[i, j] = dp[i - 1, j - 1]; + } + else + { + dp[i, j] = 1 + Math.Min(dp[i - 1, j], dp[i, j - 1]); + } + } + } + + // Trace back the edits + int row = originalPathsWithVersions.Length; + int col = modifiedPathsWithVersions.Length; + + List<(string, DifferenceKind)> formattedDiff = []; + while (row > 0 || col > 0) + { + var baselineItem = originalPathsWithVersions[row - 1]; + var testItem = modifiedPathsWithVersions[col - 1]; + if (row > 0 && col > 0 && PathWithVersions.Equal(baselineItem, testItem)) + { + formattedDiff.Add((formatter(originalPathsWithVersions[row - 1]), DifferenceKind.Unchanged)); + row--; + col--; + } + else if (col > 0 && (row == 0 || dp[row, col - 1] <= dp[row - 1, col])) + { + formattedDiff.Add((formatter(modifiedPathsWithVersions[col - 1]), DifferenceKind.Added)); + col--; + } + else if (row > 0 && (col == 0 || dp[row, col - 1] > dp[row - 1, col])) + { + formattedDiff.Add((formatter(originalPathsWithVersions[row - 1]), DifferenceKind.Removed)); + row--; + } + else + { + throw new UnreachableException(); + } + } + formattedDiff.Reverse(); + return formattedDiff; + } +} diff --git a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/GetClosestOfficialSdk.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/GetClosestOfficialSdk.cs new file mode 100644 index 000000000000..51b171da8136 --- /dev/null +++ b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/GetClosestOfficialSdk.cs @@ -0,0 +1,82 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. + +using System; +using System.Diagnostics; +using System.IO; +using System.Net; +using System.Net.Http; +using System.Runtime.InteropServices; +using System.Threading.Tasks; +using Microsoft.Build.Framework; +public class GetClosestOfficialSdk : Microsoft.Build.Utilities.Task +{ + [Required] + public required string BuiltSdkPath { get; init; } + + [Output] + public string ClosestOfficialSdkPath { get; set; } = ""; + + public override bool Execute() + { + return Task.Run(ExecuteAsync).Result; + } + + public async Task ExecuteAsync() + { + var (versionString, rid, extension) = ExtractFromFilePath(BuiltSdkPath); + + string downloadUrl = GetLatestOfficialSdkUrl(versionString, rid, extension); + + Log.LogMessage($"Downloading {downloadUrl}"); + var packageResponse = await new HttpClient().GetAsync(downloadUrl); + packageResponse.EnsureSuccessStatusCode(); + + var packageUriPath = packageResponse.RequestMessage!.RequestUri!.LocalPath; + string downloadedVersion = PathWithVersions.GetVersionInPath(packageUriPath).ToString(); + + ClosestOfficialSdkPath = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName() + $".dotnet-sdk-{downloadedVersion}-{rid}{extension}"); + Log.LogMessage($"Copying {packageUriPath} to {ClosestOfficialSdkPath}"); + using (var file = File.Create(ClosestOfficialSdkPath)) + { + await packageResponse.Content.CopyToAsync(file); + } + + return true; + } + + string GetLatestOfficialSdkUrl(string versionString, string rid, string extension) + { + // Channel in the form of 9.0.1xx + var channel = versionString[..5] + "xx"; + return $"https://aka.ms/dotnet/{channel}/daily/dotnet-sdk-{rid}{extension}"; + } + + static (string Version, string Rid, string extension) ExtractFromFilePath(string path) + { + string extension; + if (path.EndsWith(".tar.gz")) + { + extension = ".tar.gz"; + } + else if (path.EndsWith(".zip")) + { + extension = ".zip"; + } + else + { + throw new ArgumentException($"Invalid archive extension '{path}': must end with .tar.gz or .zip"); + } + + string filename = Path.GetFileName(path)[..^extension.Length]; + var dashDelimitedParts = filename.Split('-'); + var (rid, versionString) = dashDelimitedParts switch + { + ["dotnet", "sdk", var first, var second, var third, var fourth] when PathWithVersions.IsVersionString(first) => (third + '-' + fourth, first + '-' + second), + ["dotnet", "sdk", var first, var second, var third, var fourth] when PathWithVersions.IsVersionString(third) => (first + '-' + second, third + '-' + fourth), + _ => throw new ArgumentException($"Invalid archive file name '{filename}': file name should include full build full build full build full build full build full build full build full build full build version and rid") + }; + + return (versionString, rid, extension); + } +} diff --git a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff.csproj b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff.csproj new file mode 100644 index 000000000000..a12ea4d87aa8 --- /dev/null +++ b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff.csproj @@ -0,0 +1,13 @@ + + + + Exe + $(NetCurrent) + enable + + + + + + + diff --git a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/PathWithVersions.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/PathWithVersions.cs new file mode 100644 index 000000000000..2d3eb29c3b93 --- /dev/null +++ b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/PathWithVersions.cs @@ -0,0 +1,113 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. + +using System; +using System.Collections.Generic; +using System.IO; +using System.Text; + +public static class PathWithVersions +{ + public const string VersionPlaceholder = "{VERSION}"; + + public static bool Equal(string path1, string path2) + { + if (path1 == path2) + { + return true; + } + + ReadOnlySpan directory = path1; + ReadOnlySpan directory2 = path2; + while (TryGetPathLeaf(directory, out var root, out var directoryPart) && TryGetPathLeaf(directory2, out var root2, out var directoryPart2)) + { + if (!ReplaceVersionString(directoryPart).SequenceEqual(ReplaceVersionString(directoryPart2))) + { + return false; + } + directory= Path.GetDirectoryName(directory); + directory2= Path.GetDirectoryName(directory2); + } + if (!directory.IsEmpty || !directory2.IsEmpty) + { + return false; + } + return true; + } + + public static bool IsVersionString(ReadOnlySpan directoryPart) + { + return directoryPart.Length >= 6 + && char.IsDigit(directoryPart[0]) + && directoryPart[1] == '.' + && char.IsDigit(directoryPart[2]) + && directoryPart[3] == '.' + && char.IsDigit(directoryPart[4]) + && ((char.IsDigit(directoryPart[5]) && char.IsDigit(directoryPart[6])) || directoryPart[5] == '-'); + } + + static ReadOnlySpan ReplaceVersionString(ReadOnlySpan directoryPart) + { + if (IsVersionString(directoryPart)) + { + return VersionPlaceholder; + } + else + { + return directoryPart; + } + } + + static bool TryGetPathLeaf(ReadOnlySpan path, out ReadOnlySpan root, out ReadOnlySpan leaf) + { + if (path.IsEmpty) + { + root = default; + leaf = default; + return false; + } + leaf = Path.GetFileName(path); + root = Path.GetDirectoryName(path); + return true; + } + + public static string GetVersionAnonymousPath(string path) + { + return GetVersionAnonymousPath(path).ToString(); + } + + public static ReadOnlySpan GetVersionAnonymousPath(ReadOnlySpan path) + { + StringBuilder sb = new StringBuilder(); + bool altered = false; + ReadOnlySpan myPath = path; + while (TryGetPathLeaf(myPath, out var directory, out var directoryPart)) + { + sb = sb.Insert(0, Path.DirectorySeparatorChar); + var versionOrDirectory = ReplaceVersionString(directoryPart); + if (versionOrDirectory == VersionPlaceholder) + { + altered = true; + } + sb = sb.Insert(0, versionOrDirectory); + myPath = directory; + } + if (!altered) + return path; + return sb.ToString(); + } + + public static ReadOnlySpan GetVersionInPath(ReadOnlySpan path) + { + ReadOnlySpan myPath = path; + while (TryGetPathLeaf(myPath, out var directory, out var directoryPart)) + { + if (IsVersionString(directoryPart)) + { + return directoryPart; + } + myPath = directory; + } + throw new ArgumentException("Path does not contain a version"); + } +} diff --git a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/ZipArchiveExtensions.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/ZipArchiveExtensions.cs new file mode 100644 index 000000000000..08c3c6cef578 --- /dev/null +++ b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/ZipArchiveExtensions.cs @@ -0,0 +1,79 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. + +using System; +using System.Collections.Generic; +using System.IO; +using System.IO.Compression; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +static class ArchiveExtensions +{ + public static string[] Lines(this ZipArchiveEntry entry, Encoding? encoding = null) + { + return entry.ReadToString(encoding).Replace("\r\n", "\n").Split('\n').ToArray(); + } + + public static string ReadToString(this ZipArchiveEntry entry, Encoding? encoding = null) + { + Stream stream = entry.Open(); + byte[] buffer = stream.ReadToEnd(); + // Remove UTF-8 BOM if present + int index = 0; + if (buffer[0] == 0xEF && buffer[1] == 0xBB && buffer[2] == 0xBF) + { + index = 3; + } + encoding ??= Encoding.UTF8; + string fileText = encoding.GetString(buffer, index, buffer.Length - index); + return fileText; + } + + public static byte[] ReadToEnd(this Stream stream) + { + int bufferSize = 2048; + byte[] buffer = new byte[bufferSize]; + int offset = 0; + while (true) + { + int bytesRead = stream.Read(buffer, offset, bufferSize - offset); + offset += bytesRead; + if (bytesRead == 0) + { + break; + } + if (offset == bufferSize) + { + Array.Resize(ref buffer, bufferSize * 2); + bufferSize *= 2; + } + } + Array.Resize(ref buffer, offset); + return buffer; + } + + public static async Task ReadToEndAsync(this Stream stream) + { + int bufferSize = 2048; + byte[] buffer = new byte[bufferSize]; + int offset = 0; + while (true) + { + int bytesRead = await stream.ReadAsync(buffer, offset, bufferSize - offset); + offset += bytesRead; + if (bytesRead == 0) + { + break; + } + if (offset == bufferSize) + { + Array.Resize(ref buffer, bufferSize * 2); + bufferSize *= 2; + } + } + Array.Resize(ref buffer, offset); + return buffer; + } +} From cd1b907f804323cff92d8e7d93d6a049edb683c5 Mon Sep 17 00:00:00 2001 From: Jackson Schuster <36744439+jtschuster@users.noreply.github.com> Date: Thu, 22 Feb 2024 08:38:05 -0800 Subject: [PATCH 138/261] fix name --- src/SourceBuild/content/eng/tools/init-build.proj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SourceBuild/content/eng/tools/init-build.proj b/src/SourceBuild/content/eng/tools/init-build.proj index b5201514e5ea..95b45311372f 100644 --- a/src/SourceBuild/content/eng/tools/init-build.proj +++ b/src/SourceBuild/content/eng/tools/init-build.proj @@ -15,7 +15,7 @@ UnpackTarballs; BuildXPlatTasks; BuildMSBuildSdkResolver; - BuildTarballDiff; + BuildSdkArchiveDiff; BuildLeakDetection; ExtractToolPackage; GenerateRootFs; From a4bee9104a7c3e63a9e529e8df4dbdfbcb406ddb Mon Sep 17 00:00:00 2001 From: Jackson Schuster <36744439+jtschuster@users.noreply.github.com> Date: Thu, 22 Feb 2024 08:47:34 -0800 Subject: [PATCH 139/261] Forgot to make the project a library after testing --- .../Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff.csproj b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff.csproj index a12ea4d87aa8..99de429359bc 100644 --- a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff.csproj +++ b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff.csproj @@ -1,7 +1,7 @@  - Exe + Library $(NetCurrent) enable From 5cc5ee053262af866b6c6f4673cc8bd74e996a20 Mon Sep 17 00:00:00 2001 From: Jackson Schuster <36744439+jtschuster@users.noreply.github.com> Date: Thu, 22 Feb 2024 08:52:31 -0800 Subject: [PATCH 140/261] Run the archive diff by default --- src/SourceBuild/content/eng/build.targets | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/SourceBuild/content/eng/build.targets b/src/SourceBuild/content/eng/build.targets index 5f7b15caa398..409f28339223 100644 --- a/src/SourceBuild/content/eng/build.targets +++ b/src/SourceBuild/content/eng/build.targets @@ -4,8 +4,7 @@ + DependsOnTargets="DetermineSourceBuiltSdkVersion"> $(OutDir) From 2862e1f75c24a066578c4c82641938624b81a5d5 Mon Sep 17 00:00:00 2001 From: Jackson Schuster <36744439+jtschuster@users.noreply.github.com> Date: Thu, 22 Feb 2024 09:14:53 -0800 Subject: [PATCH 141/261] Report if there is no sdk produced in the build --- src/SourceBuild/content/eng/build.targets | 14 ++++++-------- ....DotNet.SourceBuild.Tasks.SdkArchiveDiff.csproj | 3 +-- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/src/SourceBuild/content/eng/build.targets b/src/SourceBuild/content/eng/build.targets index 409f28339223..c10d8c12efd1 100644 --- a/src/SourceBuild/content/eng/build.targets +++ b/src/SourceBuild/content/eng/build.targets @@ -4,22 +4,20 @@ + DependsOnTargets="DetermineSourceBuiltSdkVersion" > - - $(OutDir) - - - + + - + + - + diff --git a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff.csproj b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff.csproj index 99de429359bc..a8a8731f5ef0 100644 --- a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff.csproj +++ b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff.csproj @@ -7,7 +7,6 @@ - - + From a336dd0f65fe7950066451ccd477a3ee78af7e8e Mon Sep 17 00:00:00 2001 From: Jackson Schuster <36744439+jtschuster@users.noreply.github.com> Date: Thu, 22 Feb 2024 14:44:46 -0800 Subject: [PATCH 142/261] Update src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff.csproj Co-authored-by: Viktor Hofer --- .../Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff.csproj | 1 - 1 file changed, 1 deletion(-) diff --git a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff.csproj b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff.csproj index a8a8731f5ef0..2d59b695180b 100644 --- a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff.csproj +++ b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff.csproj @@ -1,7 +1,6 @@  - Library $(NetCurrent) enable From a3256e2d70944d9ef598f6f6386ed05f40ad1ba9 Mon Sep 17 00:00:00 2001 From: Jackson Schuster <36744439+jtschuster@users.noreply.github.com> Date: Thu, 22 Feb 2024 14:44:51 -0800 Subject: [PATCH 143/261] Update src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff.csproj Co-authored-by: Viktor Hofer --- .../Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff.csproj b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff.csproj index 2d59b695180b..ff3bf2402a01 100644 --- a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff.csproj +++ b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff.csproj @@ -8,4 +8,5 @@ + From 8c32f67bad8832a209abd3f09f8e865bf0bf09e8 Mon Sep 17 00:00:00 2001 From: Jackson Schuster <36744439+jtschuster@users.noreply.github.com> Date: Thu, 22 Feb 2024 15:32:02 -0800 Subject: [PATCH 144/261] Don't autoredirect and check for correct aka.ms redirect code --- .../GetClosestOfficialSdk.cs | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/GetClosestOfficialSdk.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/GetClosestOfficialSdk.cs index 51b171da8136..6f130c100e47 100644 --- a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/GetClosestOfficialSdk.cs +++ b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/GetClosestOfficialSdk.cs @@ -29,8 +29,19 @@ public async Task ExecuteAsync() string downloadUrl = GetLatestOfficialSdkUrl(versionString, rid, extension); Log.LogMessage($"Downloading {downloadUrl}"); - var packageResponse = await new HttpClient().GetAsync(downloadUrl); - packageResponse.EnsureSuccessStatusCode(); + var handler = new HttpClientHandler() + { + AllowAutoRedirect = false + }; + var client = new HttpClient(handler); + var redirectResponse = await client.GetAsync(downloadUrl); + // aka.ms returns a 301 for valid redirects and a 302 to Bing for invalid URLs + if (redirectResponse.StatusCode != HttpStatusCode.Moved) + { + Log.LogMessage(MessageImportance.High, $"Failed to download '{downloadUrl}': invalid aka.ms URL"); + return true; + } + var packageResponse = await client.GetAsync(redirectResponse.Headers.Location!); var packageUriPath = packageResponse.RequestMessage!.RequestUri!.LocalPath; string downloadedVersion = PathWithVersions.GetVersionInPath(packageUriPath).ToString(); From f2350c225d3033cca94bde8f7608369828cb31a5 Mon Sep 17 00:00:00 2001 From: Noah Gilson Date: Fri, 23 Feb 2024 13:05:20 -0800 Subject: [PATCH 145/261] Update table as preview 2 branch has snapped. Probably dont merge this for a few days so the links can populate. Follows https://github.com/dotnet/installer/commit/40e5371010b5031b5bdd538f50cb7c43d5088a8d --- README.md | 158 +++++++++--------- .../TableGenerator/Program.fs | 6 +- 2 files changed, 82 insertions(+), 82 deletions(-) diff --git a/README.md b/README.md index 58c25c670c82..f72a1e17adbe 100644 --- a/README.md +++ b/README.md @@ -114,7 +114,7 @@ Further instructions on how to build inside of the Codespace will be available u tar zxf artifacts/x64/Release/dotnet-sdk-7.0.100-your-RID.tar.gz -C $HOME/dotnet ln -s $HOME/dotnet/dotnet /usr/bin/dotnet ``` - + To test your source-built SDK, run the following: ```bash @@ -172,20 +172,20 @@ Do not directly edit the table below. Use https://github.com/dotnet/installer/tr Use 'dotnet --help' to see available commands or visit: https://aka.ms/dotnet-cli -------------------------------------------------------------------------------------- -| Platform | main
(9.0.x Runtime) | 9.0.1xx-preview1
(9.0-preview1 Runtime) | 8.0.3xx
(8.0 Runtime) | Release/7.0.4xx
(7.0.x Runtime) | +| Platform | main
(9.0.x Runtime) | 9.0.1xx-preview2
(9.0-preview2 Runtime) | 8.0.3xx
(8.0 Runtime) | Release/7.0.4xx
(7.0.x Runtime) | | :--------- | :----------: | :----------: | :----------: | :----------: | -| **Windows x64** | [![][win-x64-badge-main]][win-x64-version-main]
[Installer][win-x64-installer-main] - [Checksum][win-x64-installer-checksum-main]
[zip][win-x64-zip-main] - [Checksum][win-x64-zip-checksum-main] | [![][win-x64-badge-9.0.1XX-preview1]][win-x64-version-9.0.1XX-preview1]
[Installer][win-x64-installer-9.0.1XX-preview1] - [Checksum][win-x64-installer-checksum-9.0.1XX-preview1]
[zip][win-x64-zip-9.0.1XX-preview1] - [Checksum][win-x64-zip-checksum-9.0.1XX-preview1] | [![][win-x64-badge-8.0.3XX]][win-x64-version-8.0.3XX]
[Installer][win-x64-installer-8.0.3XX] - [Checksum][win-x64-installer-checksum-8.0.3XX]
[zip][win-x64-zip-8.0.3XX] - [Checksum][win-x64-zip-checksum-8.0.3XX] | [![][win-x64-badge-7.0.4XX]][win-x64-version-7.0.4XX]
[Installer][win-x64-installer-7.0.4XX] - [Checksum][win-x64-installer-checksum-7.0.4XX]
[zip][win-x64-zip-7.0.4XX] - [Checksum][win-x64-zip-checksum-7.0.4XX] | -| **Windows x86** | [![][win-x86-badge-main]][win-x86-version-main]
[Installer][win-x86-installer-main] - [Checksum][win-x86-installer-checksum-main]
[zip][win-x86-zip-main] - [Checksum][win-x86-zip-checksum-main] | [![][win-x86-badge-9.0.1XX-preview1]][win-x86-version-9.0.1XX-preview1]
[Installer][win-x86-installer-9.0.1XX-preview1] - [Checksum][win-x86-installer-checksum-9.0.1XX-preview1]
[zip][win-x86-zip-9.0.1XX-preview1] - [Checksum][win-x86-zip-checksum-9.0.1XX-preview1] | [![][win-x86-badge-8.0.3XX]][win-x86-version-8.0.3XX]
[Installer][win-x86-installer-8.0.3XX] - [Checksum][win-x86-installer-checksum-8.0.3XX]
[zip][win-x86-zip-8.0.3XX] - [Checksum][win-x86-zip-checksum-8.0.3XX] | [![][win-x86-badge-7.0.4XX]][win-x86-version-7.0.4XX]
[Installer][win-x86-installer-7.0.4XX] - [Checksum][win-x86-installer-checksum-7.0.4XX]
[zip][win-x86-zip-7.0.4XX] - [Checksum][win-x86-zip-checksum-7.0.4XX] | +| **Windows x64** | [![][win-x64-badge-main]][win-x64-version-main]
[Installer][win-x64-installer-main] - [Checksum][win-x64-installer-checksum-main]
[zip][win-x64-zip-main] - [Checksum][win-x64-zip-checksum-main] | [![][win-x64-badge-9.0.1XX-preview2]][win-x64-version-9.0.1XX-preview2]
[Installer][win-x64-installer-9.0.1XX-preview2] - [Checksum][win-x64-installer-checksum-9.0.1XX-preview2]
[zip][win-x64-zip-9.0.1XX-preview2] - [Checksum][win-x64-zip-checksum-9.0.1XX-preview2] | [![][win-x64-badge-8.0.3XX]][win-x64-version-8.0.3XX]
[Installer][win-x64-installer-8.0.3XX] - [Checksum][win-x64-installer-checksum-8.0.3XX]
[zip][win-x64-zip-8.0.3XX] - [Checksum][win-x64-zip-checksum-8.0.3XX] | [![][win-x64-badge-7.0.4XX]][win-x64-version-7.0.4XX]
[Installer][win-x64-installer-7.0.4XX] - [Checksum][win-x64-installer-checksum-7.0.4XX]
[zip][win-x64-zip-7.0.4XX] - [Checksum][win-x64-zip-checksum-7.0.4XX] | +| **Windows x86** | [![][win-x86-badge-main]][win-x86-version-main]
[Installer][win-x86-installer-main] - [Checksum][win-x86-installer-checksum-main]
[zip][win-x86-zip-main] - [Checksum][win-x86-zip-checksum-main] | [![][win-x86-badge-9.0.1XX-preview2]][win-x86-version-9.0.1XX-preview2]
[Installer][win-x86-installer-9.0.1XX-preview2] - [Checksum][win-x86-installer-checksum-9.0.1XX-preview2]
[zip][win-x86-zip-9.0.1XX-preview2] - [Checksum][win-x86-zip-checksum-9.0.1XX-preview2] | [![][win-x86-badge-8.0.3XX]][win-x86-version-8.0.3XX]
[Installer][win-x86-installer-8.0.3XX] - [Checksum][win-x86-installer-checksum-8.0.3XX]
[zip][win-x86-zip-8.0.3XX] - [Checksum][win-x86-zip-checksum-8.0.3XX] | [![][win-x86-badge-7.0.4XX]][win-x86-version-7.0.4XX]
[Installer][win-x86-installer-7.0.4XX] - [Checksum][win-x86-installer-checksum-7.0.4XX]
[zip][win-x86-zip-7.0.4XX] - [Checksum][win-x86-zip-checksum-7.0.4XX] | | **Windows arm** | **N/A** | **N/A** | **N/A** | **N/A** | -| **Windows arm64** | [![][win-arm64-badge-main]][win-arm64-version-main]
[Installer][win-arm64-installer-main] - [Checksum][win-arm64-installer-checksum-main]
[zip][win-arm64-zip-main] | [![][win-arm64-badge-9.0.1XX-preview1]][win-arm64-version-9.0.1XX-preview1]
[Installer][win-arm64-installer-9.0.1XX-preview1] - [Checksum][win-arm64-installer-checksum-9.0.1XX-preview1]
[zip][win-arm64-zip-9.0.1XX-preview1] | [![][win-arm64-badge-8.0.3XX]][win-arm64-version-8.0.3XX]
[Installer][win-arm64-installer-8.0.3XX] - [Checksum][win-arm64-installer-checksum-8.0.3XX]
[zip][win-arm64-zip-8.0.3XX] | [![][win-arm64-badge-7.0.4XX]][win-arm64-version-7.0.4XX]
[Installer][win-arm64-installer-7.0.4XX] - [Checksum][win-arm64-installer-checksum-7.0.4XX]
[zip][win-arm64-zip-7.0.4XX] | -| **macOS x64** | [![][osx-x64-badge-main]][osx-x64-version-main]
[Installer][osx-x64-installer-main] - [Checksum][osx-x64-installer-checksum-main]
[tar.gz][osx-x64-targz-main] - [Checksum][osx-x64-targz-checksum-main] | [![][osx-x64-badge-9.0.1XX-preview1]][osx-x64-version-9.0.1XX-preview1]
[Installer][osx-x64-installer-9.0.1XX-preview1] - [Checksum][osx-x64-installer-checksum-9.0.1XX-preview1]
[tar.gz][osx-x64-targz-9.0.1XX-preview1] - [Checksum][osx-x64-targz-checksum-9.0.1XX-preview1] | [![][osx-x64-badge-8.0.3XX]][osx-x64-version-8.0.3XX]
[Installer][osx-x64-installer-8.0.3XX] - [Checksum][osx-x64-installer-checksum-8.0.3XX]
[tar.gz][osx-x64-targz-8.0.3XX] - [Checksum][osx-x64-targz-checksum-8.0.3XX] | [![][osx-x64-badge-7.0.4XX]][osx-x64-version-7.0.4XX]
[Installer][osx-x64-installer-7.0.4XX] - [Checksum][osx-x64-installer-checksum-7.0.4XX]
[tar.gz][osx-x64-targz-7.0.4XX] - [Checksum][osx-x64-targz-checksum-7.0.4XX] | -| **macOS arm64** | [![][osx-arm64-badge-main]][osx-arm64-version-main]
[Installer][osx-arm64-installer-main] - [Checksum][osx-arm64-installer-checksum-main]
[tar.gz][osx-arm64-targz-main] - [Checksum][osx-arm64-targz-checksum-main] | [![][osx-arm64-badge-9.0.1XX-preview1]][osx-arm64-version-9.0.1XX-preview1]
[Installer][osx-arm64-installer-9.0.1XX-preview1] - [Checksum][osx-arm64-installer-checksum-9.0.1XX-preview1]
[tar.gz][osx-arm64-targz-9.0.1XX-preview1] - [Checksum][osx-arm64-targz-checksum-9.0.1XX-preview1] | [![][osx-arm64-badge-8.0.3XX]][osx-arm64-version-8.0.3XX]
[Installer][osx-arm64-installer-8.0.3XX] - [Checksum][osx-arm64-installer-checksum-8.0.3XX]
[tar.gz][osx-arm64-targz-8.0.3XX] - [Checksum][osx-arm64-targz-checksum-8.0.3XX] | [![][osx-arm64-badge-7.0.4XX]][osx-arm64-version-7.0.4XX]
[Installer][osx-arm64-installer-7.0.4XX] - [Checksum][osx-arm64-installer-checksum-7.0.4XX]
[tar.gz][osx-arm64-targz-7.0.4XX] - [Checksum][osx-arm64-targz-checksum-7.0.4XX] | -| **Linux x64** | [![][linux-badge-main]][linux-version-main]
[DEB Installer][linux-DEB-installer-main] - [Checksum][linux-DEB-installer-checksum-main]
[RPM Installer][linux-RPM-installer-main] - [Checksum][linux-RPM-installer-checksum-main]
_see installer note below_1
[tar.gz][linux-targz-main] - [Checksum][linux-targz-checksum-main] | [![][linux-badge-9.0.1XX-preview1]][linux-version-9.0.1XX-preview1]
[DEB Installer][linux-DEB-installer-9.0.1XX-preview1] - [Checksum][linux-DEB-installer-checksum-9.0.1XX-preview1]
[RPM Installer][linux-RPM-installer-9.0.1XX-preview1] - [Checksum][linux-RPM-installer-checksum-9.0.1XX-preview1]
_see installer note below_1
[tar.gz][linux-targz-9.0.1XX-preview1] - [Checksum][linux-targz-checksum-9.0.1XX-preview1] | [![][linux-badge-8.0.3XX]][linux-version-8.0.3XX]
[DEB Installer][linux-DEB-installer-8.0.3XX] - [Checksum][linux-DEB-installer-checksum-8.0.3XX]
[RPM Installer][linux-RPM-installer-8.0.3XX] - [Checksum][linux-RPM-installer-checksum-8.0.3XX]
_see installer note below_1
[tar.gz][linux-targz-8.0.3XX] - [Checksum][linux-targz-checksum-8.0.3XX] | [![][linux-badge-7.0.4XX]][linux-version-7.0.4XX]
[DEB Installer][linux-DEB-installer-7.0.4XX] - [Checksum][linux-DEB-installer-checksum-7.0.4XX]
[RPM Installer][linux-RPM-installer-7.0.4XX] - [Checksum][linux-RPM-installer-checksum-7.0.4XX]
_see installer note below_1
[tar.gz][linux-targz-7.0.4XX] - [Checksum][linux-targz-checksum-7.0.4XX] | -| **Linux arm** | [![][linux-arm-badge-main]][linux-arm-version-main]
[tar.gz][linux-arm-targz-main] - [Checksum][linux-arm-targz-checksum-main] | [![][linux-arm-badge-9.0.1XX-preview1]][linux-arm-version-9.0.1XX-preview1]
[tar.gz][linux-arm-targz-9.0.1XX-preview1] - [Checksum][linux-arm-targz-checksum-9.0.1XX-preview1] | [![][linux-arm-badge-8.0.3XX]][linux-arm-version-8.0.3XX]
[tar.gz][linux-arm-targz-8.0.3XX] - [Checksum][linux-arm-targz-checksum-8.0.3XX] | [![][linux-arm-badge-7.0.4XX]][linux-arm-version-7.0.4XX]
[tar.gz][linux-arm-targz-7.0.4XX] - [Checksum][linux-arm-targz-checksum-7.0.4XX] | -| **Linux arm64** | [![][linux-arm64-badge-main]][linux-arm64-version-main]
[tar.gz][linux-arm64-targz-main] - [Checksum][linux-arm64-targz-checksum-main] | [![][linux-arm64-badge-9.0.1XX-preview1]][linux-arm64-version-9.0.1XX-preview1]
[tar.gz][linux-arm64-targz-9.0.1XX-preview1] - [Checksum][linux-arm64-targz-checksum-9.0.1XX-preview1] | [![][linux-arm64-badge-8.0.3XX]][linux-arm64-version-8.0.3XX]
[tar.gz][linux-arm64-targz-8.0.3XX] - [Checksum][linux-arm64-targz-checksum-8.0.3XX] | [![][linux-arm64-badge-7.0.4XX]][linux-arm64-version-7.0.4XX]
[tar.gz][linux-arm64-targz-7.0.4XX] - [Checksum][linux-arm64-targz-checksum-7.0.4XX] | -| **Linux-musl-x64** | [![][linux-musl-x64-badge-main]][linux-musl-x64-version-main]
[tar.gz][linux-musl-x64-targz-main] - [Checksum][linux-musl-x64-targz-checksum-main] | [![][linux-musl-x64-badge-9.0.1XX-preview1]][linux-musl-x64-version-9.0.1XX-preview1]
[tar.gz][linux-musl-x64-targz-9.0.1XX-preview1] - [Checksum][linux-musl-x64-targz-checksum-9.0.1XX-preview1] | [![][linux-musl-x64-badge-8.0.3XX]][linux-musl-x64-version-8.0.3XX]
[tar.gz][linux-musl-x64-targz-8.0.3XX] - [Checksum][linux-musl-x64-targz-checksum-8.0.3XX] | [![][linux-musl-x64-badge-7.0.4XX]][linux-musl-x64-version-7.0.4XX]
[tar.gz][linux-musl-x64-targz-7.0.4XX] - [Checksum][linux-musl-x64-targz-checksum-7.0.4XX] | -| **Linux-musl-arm** | [![][linux-musl-arm-badge-main]][linux-musl-arm-version-main]
[tar.gz][linux-musl-arm-targz-main] - [Checksum][linux-musl-arm-targz-checksum-main] | [![][linux-musl-arm-badge-9.0.1XX-preview1]][linux-musl-arm-version-9.0.1XX-preview1]
[tar.gz][linux-musl-arm-targz-9.0.1XX-preview1] - [Checksum][linux-musl-arm-targz-checksum-9.0.1XX-preview1] | [![][linux-musl-arm-badge-8.0.3XX]][linux-musl-arm-version-8.0.3XX]
[tar.gz][linux-musl-arm-targz-8.0.3XX] - [Checksum][linux-musl-arm-targz-checksum-8.0.3XX] | [![][linux-musl-arm-badge-7.0.4XX]][linux-musl-arm-version-7.0.4XX]
[tar.gz][linux-musl-arm-targz-7.0.4XX] - [Checksum][linux-musl-arm-targz-checksum-7.0.4XX] | -| **Linux-musl-arm64** | [![][linux-musl-arm64-badge-main]][linux-musl-arm64-version-main]
[tar.gz][linux-musl-arm64-targz-main] - [Checksum][linux-musl-arm64-targz-checksum-main] | [![][linux-musl-arm64-badge-9.0.1XX-preview1]][linux-musl-arm64-version-9.0.1XX-preview1]
[tar.gz][linux-musl-arm64-targz-9.0.1XX-preview1] - [Checksum][linux-musl-arm64-targz-checksum-9.0.1XX-preview1] | [![][linux-musl-arm64-badge-8.0.3XX]][linux-musl-arm64-version-8.0.3XX]
[tar.gz][linux-musl-arm64-targz-8.0.3XX] - [Checksum][linux-musl-arm64-targz-checksum-8.0.3XX] | [![][linux-musl-arm64-badge-7.0.4XX]][linux-musl-arm64-version-7.0.4XX]
[tar.gz][linux-musl-arm64-targz-7.0.4XX] - [Checksum][linux-musl-arm64-targz-checksum-7.0.4XX] | +| **Windows arm64** | [![][win-arm64-badge-main]][win-arm64-version-main]
[Installer][win-arm64-installer-main] - [Checksum][win-arm64-installer-checksum-main]
[zip][win-arm64-zip-main] | [![][win-arm64-badge-9.0.1XX-preview2]][win-arm64-version-9.0.1XX-preview2]
[Installer][win-arm64-installer-9.0.1XX-preview2] - [Checksum][win-arm64-installer-checksum-9.0.1XX-preview2]
[zip][win-arm64-zip-9.0.1XX-preview2] | [![][win-arm64-badge-8.0.3XX]][win-arm64-version-8.0.3XX]
[Installer][win-arm64-installer-8.0.3XX] - [Checksum][win-arm64-installer-checksum-8.0.3XX]
[zip][win-arm64-zip-8.0.3XX] | [![][win-arm64-badge-7.0.4XX]][win-arm64-version-7.0.4XX]
[Installer][win-arm64-installer-7.0.4XX] - [Checksum][win-arm64-installer-checksum-7.0.4XX]
[zip][win-arm64-zip-7.0.4XX] | +| **macOS x64** | [![][osx-x64-badge-main]][osx-x64-version-main]
[Installer][osx-x64-installer-main] - [Checksum][osx-x64-installer-checksum-main]
[tar.gz][osx-x64-targz-main] - [Checksum][osx-x64-targz-checksum-main] | [![][osx-x64-badge-9.0.1XX-preview2]][osx-x64-version-9.0.1XX-preview2]
[Installer][osx-x64-installer-9.0.1XX-preview2] - [Checksum][osx-x64-installer-checksum-9.0.1XX-preview2]
[tar.gz][osx-x64-targz-9.0.1XX-preview2] - [Checksum][osx-x64-targz-checksum-9.0.1XX-preview2] | [![][osx-x64-badge-8.0.3XX]][osx-x64-version-8.0.3XX]
[Installer][osx-x64-installer-8.0.3XX] - [Checksum][osx-x64-installer-checksum-8.0.3XX]
[tar.gz][osx-x64-targz-8.0.3XX] - [Checksum][osx-x64-targz-checksum-8.0.3XX] | [![][osx-x64-badge-7.0.4XX]][osx-x64-version-7.0.4XX]
[Installer][osx-x64-installer-7.0.4XX] - [Checksum][osx-x64-installer-checksum-7.0.4XX]
[tar.gz][osx-x64-targz-7.0.4XX] - [Checksum][osx-x64-targz-checksum-7.0.4XX] | +| **macOS arm64** | [![][osx-arm64-badge-main]][osx-arm64-version-main]
[Installer][osx-arm64-installer-main] - [Checksum][osx-arm64-installer-checksum-main]
[tar.gz][osx-arm64-targz-main] - [Checksum][osx-arm64-targz-checksum-main] | [![][osx-arm64-badge-9.0.1XX-preview2]][osx-arm64-version-9.0.1XX-preview2]
[Installer][osx-arm64-installer-9.0.1XX-preview2] - [Checksum][osx-arm64-installer-checksum-9.0.1XX-preview2]
[tar.gz][osx-arm64-targz-9.0.1XX-preview2] - [Checksum][osx-arm64-targz-checksum-9.0.1XX-preview2] | [![][osx-arm64-badge-8.0.3XX]][osx-arm64-version-8.0.3XX]
[Installer][osx-arm64-installer-8.0.3XX] - [Checksum][osx-arm64-installer-checksum-8.0.3XX]
[tar.gz][osx-arm64-targz-8.0.3XX] - [Checksum][osx-arm64-targz-checksum-8.0.3XX] | [![][osx-arm64-badge-7.0.4XX]][osx-arm64-version-7.0.4XX]
[Installer][osx-arm64-installer-7.0.4XX] - [Checksum][osx-arm64-installer-checksum-7.0.4XX]
[tar.gz][osx-arm64-targz-7.0.4XX] - [Checksum][osx-arm64-targz-checksum-7.0.4XX] | +| **Linux x64** | [![][linux-badge-main]][linux-version-main]
[DEB Installer][linux-DEB-installer-main] - [Checksum][linux-DEB-installer-checksum-main]
[RPM Installer][linux-RPM-installer-main] - [Checksum][linux-RPM-installer-checksum-main]
_see installer note below_1
[tar.gz][linux-targz-main] - [Checksum][linux-targz-checksum-main] | [![][linux-badge-9.0.1XX-preview2]][linux-version-9.0.1XX-preview2]
[DEB Installer][linux-DEB-installer-9.0.1XX-preview2] - [Checksum][linux-DEB-installer-checksum-9.0.1XX-preview2]
[RPM Installer][linux-RPM-installer-9.0.1XX-preview2] - [Checksum][linux-RPM-installer-checksum-9.0.1XX-preview2]
_see installer note below_1
[tar.gz][linux-targz-9.0.1XX-preview2] - [Checksum][linux-targz-checksum-9.0.1XX-preview2] | [![][linux-badge-8.0.3XX]][linux-version-8.0.3XX]
[DEB Installer][linux-DEB-installer-8.0.3XX] - [Checksum][linux-DEB-installer-checksum-8.0.3XX]
[RPM Installer][linux-RPM-installer-8.0.3XX] - [Checksum][linux-RPM-installer-checksum-8.0.3XX]
_see installer note below_1
[tar.gz][linux-targz-8.0.3XX] - [Checksum][linux-targz-checksum-8.0.3XX] | [![][linux-badge-7.0.4XX]][linux-version-7.0.4XX]
[DEB Installer][linux-DEB-installer-7.0.4XX] - [Checksum][linux-DEB-installer-checksum-7.0.4XX]
[RPM Installer][linux-RPM-installer-7.0.4XX] - [Checksum][linux-RPM-installer-checksum-7.0.4XX]
_see installer note below_1
[tar.gz][linux-targz-7.0.4XX] - [Checksum][linux-targz-checksum-7.0.4XX] | +| **Linux arm** | [![][linux-arm-badge-main]][linux-arm-version-main]
[tar.gz][linux-arm-targz-main] - [Checksum][linux-arm-targz-checksum-main] | [![][linux-arm-badge-9.0.1XX-preview2]][linux-arm-version-9.0.1XX-preview2]
[tar.gz][linux-arm-targz-9.0.1XX-preview2] - [Checksum][linux-arm-targz-checksum-9.0.1XX-preview2] | [![][linux-arm-badge-8.0.3XX]][linux-arm-version-8.0.3XX]
[tar.gz][linux-arm-targz-8.0.3XX] - [Checksum][linux-arm-targz-checksum-8.0.3XX] | [![][linux-arm-badge-7.0.4XX]][linux-arm-version-7.0.4XX]
[tar.gz][linux-arm-targz-7.0.4XX] - [Checksum][linux-arm-targz-checksum-7.0.4XX] | +| **Linux arm64** | [![][linux-arm64-badge-main]][linux-arm64-version-main]
[tar.gz][linux-arm64-targz-main] - [Checksum][linux-arm64-targz-checksum-main] | [![][linux-arm64-badge-9.0.1XX-preview2]][linux-arm64-version-9.0.1XX-preview2]
[tar.gz][linux-arm64-targz-9.0.1XX-preview2] - [Checksum][linux-arm64-targz-checksum-9.0.1XX-preview2] | [![][linux-arm64-badge-8.0.3XX]][linux-arm64-version-8.0.3XX]
[tar.gz][linux-arm64-targz-8.0.3XX] - [Checksum][linux-arm64-targz-checksum-8.0.3XX] | [![][linux-arm64-badge-7.0.4XX]][linux-arm64-version-7.0.4XX]
[tar.gz][linux-arm64-targz-7.0.4XX] - [Checksum][linux-arm64-targz-checksum-7.0.4XX] | +| **Linux-musl-x64** | [![][linux-musl-x64-badge-main]][linux-musl-x64-version-main]
[tar.gz][linux-musl-x64-targz-main] - [Checksum][linux-musl-x64-targz-checksum-main] | [![][linux-musl-x64-badge-9.0.1XX-preview2]][linux-musl-x64-version-9.0.1XX-preview2]
[tar.gz][linux-musl-x64-targz-9.0.1XX-preview2] - [Checksum][linux-musl-x64-targz-checksum-9.0.1XX-preview2] | [![][linux-musl-x64-badge-8.0.3XX]][linux-musl-x64-version-8.0.3XX]
[tar.gz][linux-musl-x64-targz-8.0.3XX] - [Checksum][linux-musl-x64-targz-checksum-8.0.3XX] | [![][linux-musl-x64-badge-7.0.4XX]][linux-musl-x64-version-7.0.4XX]
[tar.gz][linux-musl-x64-targz-7.0.4XX] - [Checksum][linux-musl-x64-targz-checksum-7.0.4XX] | +| **Linux-musl-arm** | [![][linux-musl-arm-badge-main]][linux-musl-arm-version-main]
[tar.gz][linux-musl-arm-targz-main] - [Checksum][linux-musl-arm-targz-checksum-main] | [![][linux-musl-arm-badge-9.0.1XX-preview2]][linux-musl-arm-version-9.0.1XX-preview2]
[tar.gz][linux-musl-arm-targz-9.0.1XX-preview2] - [Checksum][linux-musl-arm-targz-checksum-9.0.1XX-preview2] | [![][linux-musl-arm-badge-8.0.3XX]][linux-musl-arm-version-8.0.3XX]
[tar.gz][linux-musl-arm-targz-8.0.3XX] - [Checksum][linux-musl-arm-targz-checksum-8.0.3XX] | [![][linux-musl-arm-badge-7.0.4XX]][linux-musl-arm-version-7.0.4XX]
[tar.gz][linux-musl-arm-targz-7.0.4XX] - [Checksum][linux-musl-arm-targz-checksum-7.0.4XX] | +| **Linux-musl-arm64** | [![][linux-musl-arm64-badge-main]][linux-musl-arm64-version-main]
[tar.gz][linux-musl-arm64-targz-main] - [Checksum][linux-musl-arm64-targz-checksum-main] | [![][linux-musl-arm64-badge-9.0.1XX-preview2]][linux-musl-arm64-version-9.0.1XX-preview2]
[tar.gz][linux-musl-arm64-targz-9.0.1XX-preview2] - [Checksum][linux-musl-arm64-targz-checksum-9.0.1XX-preview2] | [![][linux-musl-arm64-badge-8.0.3XX]][linux-musl-arm64-version-8.0.3XX]
[tar.gz][linux-musl-arm64-targz-8.0.3XX] - [Checksum][linux-musl-arm64-targz-checksum-8.0.3XX] | [![][linux-musl-arm64-badge-7.0.4XX]][linux-musl-arm64-version-7.0.4XX]
[tar.gz][linux-musl-arm64-targz-7.0.4XX] - [Checksum][linux-musl-arm64-targz-checksum-7.0.4XX] | | **RHEL 6** | **N/A** | **N/A** | **N/A** | **N/A** | Reference notes: @@ -202,12 +202,12 @@ Reference notes: [win-x64-zip-main]: https://aka.ms/dotnet/9.0.1xx/daily/dotnet-sdk-win-x64.zip [win-x64-zip-checksum-main]: https://aka.ms/dotnet/9.0.1xx/daily/dotnet-sdk-win-x64.zip.sha -[win-x64-badge-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/win_x64_Release_version_badge.svg?no-cache -[win-x64-version-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/productCommit-win-x64.txt -[win-x64-installer-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/dotnet-sdk-win-x64.exe -[win-x64-installer-checksum-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/dotnet-sdk-win-x64.exe.sha -[win-x64-zip-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/dotnet-sdk-win-x64.zip -[win-x64-zip-checksum-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/dotnet-sdk-win-x64.zip.sha +[win-x64-badge-9.0.1XX-preview2]: https://aka.ms/dotnet/9.0.1xx-preview2/daily/win_x64_Release_version_badge.svg?no-cache +[win-x64-version-9.0.1XX-preview2]: https://aka.ms/dotnet/9.0.1xx-preview2/daily/productCommit-win-x64.txt +[win-x64-installer-9.0.1XX-preview2]: https://aka.ms/dotnet/9.0.1xx-preview2/daily/dotnet-sdk-win-x64.exe +[win-x64-installer-checksum-9.0.1XX-preview2]: https://aka.ms/dotnet/9.0.1xx-preview2/daily/dotnet-sdk-win-x64.exe.sha +[win-x64-zip-9.0.1XX-preview2]: https://aka.ms/dotnet/9.0.1xx-preview2/daily/dotnet-sdk-win-x64.zip +[win-x64-zip-checksum-9.0.1XX-preview2]: https://aka.ms/dotnet/9.0.1xx-preview2/daily/dotnet-sdk-win-x64.zip.sha [win-x64-badge-8.0.3XX]: https://aka.ms/dotnet/8.0.3xx/daily/win_x64_Release_version_badge.svg?no-cache [win-x64-version-8.0.3XX]: https://aka.ms/dotnet/8.0.3xx/daily/productCommit-win-x64.txt @@ -230,12 +230,12 @@ Reference notes: [win-x86-zip-main]: https://aka.ms/dotnet/9.0.1xx/daily/dotnet-sdk-win-x86.zip [win-x86-zip-checksum-main]: https://aka.ms/dotnet/9.0.1xx/daily/dotnet-sdk-win-x86.zip.sha -[win-x86-badge-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/win_x86_Release_version_badge.svg?no-cache -[win-x86-version-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/productCommit-win-x86.txt -[win-x86-installer-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/dotnet-sdk-win-x86.exe -[win-x86-installer-checksum-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/dotnet-sdk-win-x86.exe.sha -[win-x86-zip-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/dotnet-sdk-win-x86.zip -[win-x86-zip-checksum-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/dotnet-sdk-win-x86.zip.sha +[win-x86-badge-9.0.1XX-preview2]: https://aka.ms/dotnet/9.0.1xx-preview2/daily/win_x86_Release_version_badge.svg?no-cache +[win-x86-version-9.0.1XX-preview2]: https://aka.ms/dotnet/9.0.1xx-preview2/daily/productCommit-win-x86.txt +[win-x86-installer-9.0.1XX-preview2]: https://aka.ms/dotnet/9.0.1xx-preview2/daily/dotnet-sdk-win-x86.exe +[win-x86-installer-checksum-9.0.1XX-preview2]: https://aka.ms/dotnet/9.0.1xx-preview2/daily/dotnet-sdk-win-x86.exe.sha +[win-x86-zip-9.0.1XX-preview2]: https://aka.ms/dotnet/9.0.1xx-preview2/daily/dotnet-sdk-win-x86.zip +[win-x86-zip-checksum-9.0.1XX-preview2]: https://aka.ms/dotnet/9.0.1xx-preview2/daily/dotnet-sdk-win-x86.zip.sha [win-x86-badge-8.0.3XX]: https://aka.ms/dotnet/8.0.3xx/daily/win_x86_Release_version_badge.svg?no-cache [win-x86-version-8.0.3XX]: https://aka.ms/dotnet/8.0.3xx/daily/productCommit-win-x86.txt @@ -258,12 +258,12 @@ Reference notes: [osx-x64-targz-main]: https://aka.ms/dotnet/9.0.1xx/daily/dotnet-sdk-osx-x64.tar.gz [osx-x64-targz-checksum-main]: https://aka.ms/dotnet/9.0.1xx/daily/dotnet-sdk-osx-x64.pkg.tar.gz.sha -[osx-x64-badge-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/osx_x64_Release_version_badge.svg?no-cache -[osx-x64-version-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/productCommit-osx-x64.txt -[osx-x64-installer-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/dotnet-sdk-osx-x64.pkg -[osx-x64-installer-checksum-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/dotnet-sdk-osx-x64.pkg.sha -[osx-x64-targz-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/dotnet-sdk-osx-x64.tar.gz -[osx-x64-targz-checksum-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/dotnet-sdk-osx-x64.pkg.tar.gz.sha +[osx-x64-badge-9.0.1XX-preview2]: https://aka.ms/dotnet/9.0.1xx-preview2/daily/osx_x64_Release_version_badge.svg?no-cache +[osx-x64-version-9.0.1XX-preview2]: https://aka.ms/dotnet/9.0.1xx-preview2/daily/productCommit-osx-x64.txt +[osx-x64-installer-9.0.1XX-preview2]: https://aka.ms/dotnet/9.0.1xx-preview2/daily/dotnet-sdk-osx-x64.pkg +[osx-x64-installer-checksum-9.0.1XX-preview2]: https://aka.ms/dotnet/9.0.1xx-preview2/daily/dotnet-sdk-osx-x64.pkg.sha +[osx-x64-targz-9.0.1XX-preview2]: https://aka.ms/dotnet/9.0.1xx-preview2/daily/dotnet-sdk-osx-x64.tar.gz +[osx-x64-targz-checksum-9.0.1XX-preview2]: https://aka.ms/dotnet/9.0.1xx-preview2/daily/dotnet-sdk-osx-x64.pkg.tar.gz.sha [osx-x64-badge-8.0.3XX]: https://aka.ms/dotnet/8.0.3xx/daily/osx_x64_Release_version_badge.svg?no-cache [osx-x64-version-8.0.3XX]: https://aka.ms/dotnet/8.0.3xx/daily/productCommit-osx-x64.txt @@ -286,12 +286,12 @@ Reference notes: [osx-arm64-targz-main]: https://aka.ms/dotnet/9.0.1xx/daily/dotnet-sdk-osx-arm64.tar.gz [osx-arm64-targz-checksum-main]: https://aka.ms/dotnet/9.0.1xx/daily/dotnet-sdk-osx-arm64.pkg.tar.gz.sha -[osx-arm64-badge-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/osx_arm64_Release_version_badge.svg?no-cache -[osx-arm64-version-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/productCommit-osx-arm64.txt -[osx-arm64-installer-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/dotnet-sdk-osx-arm64.pkg -[osx-arm64-installer-checksum-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/dotnet-sdk-osx-arm64.pkg.sha -[osx-arm64-targz-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/dotnet-sdk-osx-arm64.tar.gz -[osx-arm64-targz-checksum-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/dotnet-sdk-osx-arm64.pkg.tar.gz.sha +[osx-arm64-badge-9.0.1XX-preview2]: https://aka.ms/dotnet/9.0.1xx-preview2/daily/osx_arm64_Release_version_badge.svg?no-cache +[osx-arm64-version-9.0.1XX-preview2]: https://aka.ms/dotnet/9.0.1xx-preview2/daily/productCommit-osx-arm64.txt +[osx-arm64-installer-9.0.1XX-preview2]: https://aka.ms/dotnet/9.0.1xx-preview2/daily/dotnet-sdk-osx-arm64.pkg +[osx-arm64-installer-checksum-9.0.1XX-preview2]: https://aka.ms/dotnet/9.0.1xx-preview2/daily/dotnet-sdk-osx-arm64.pkg.sha +[osx-arm64-targz-9.0.1XX-preview2]: https://aka.ms/dotnet/9.0.1xx-preview2/daily/dotnet-sdk-osx-arm64.tar.gz +[osx-arm64-targz-checksum-9.0.1XX-preview2]: https://aka.ms/dotnet/9.0.1xx-preview2/daily/dotnet-sdk-osx-arm64.pkg.tar.gz.sha [osx-arm64-badge-8.0.3XX]: https://aka.ms/dotnet/8.0.3xx/daily/osx_arm64_Release_version_badge.svg?no-cache [osx-arm64-version-8.0.3XX]: https://aka.ms/dotnet/8.0.3xx/daily/productCommit-osx-arm64.txt @@ -316,14 +316,14 @@ Reference notes: [linux-targz-main]: https://aka.ms/dotnet/9.0.1xx/daily/dotnet-sdk-linux-x64.tar.gz [linux-targz-checksum-main]: https://aka.ms/dotnet/9.0.1xx/daily/dotnet-sdk-linux-x64.tar.gz.sha -[linux-badge-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/linux_x64_Release_version_badge.svg?no-cache -[linux-version-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/productCommit-linux-x64.txt -[linux-DEB-installer-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/dotnet-sdk-x64.deb -[linux-DEB-installer-checksum-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/dotnet-sdk-x64.deb.sha -[linux-RPM-installer-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/dotnet-sdk-x64.rpm -[linux-RPM-installer-checksum-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/dotnet-sdk-x64.rpm.sha -[linux-targz-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/dotnet-sdk-linux-x64.tar.gz -[linux-targz-checksum-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/dotnet-sdk-linux-x64.tar.gz.sha +[linux-badge-9.0.1XX-preview2]: https://aka.ms/dotnet/9.0.1xx-preview2/daily/linux_x64_Release_version_badge.svg?no-cache +[linux-version-9.0.1XX-preview2]: https://aka.ms/dotnet/9.0.1xx-preview2/daily/productCommit-linux-x64.txt +[linux-DEB-installer-9.0.1XX-preview2]: https://aka.ms/dotnet/9.0.1xx-preview2/daily/dotnet-sdk-x64.deb +[linux-DEB-installer-checksum-9.0.1XX-preview2]: https://aka.ms/dotnet/9.0.1xx-preview2/daily/dotnet-sdk-x64.deb.sha +[linux-RPM-installer-9.0.1XX-preview2]: https://aka.ms/dotnet/9.0.1xx-preview2/daily/dotnet-sdk-x64.rpm +[linux-RPM-installer-checksum-9.0.1XX-preview2]: https://aka.ms/dotnet/9.0.1xx-preview2/daily/dotnet-sdk-x64.rpm.sha +[linux-targz-9.0.1XX-preview2]: https://aka.ms/dotnet/9.0.1xx-preview2/daily/dotnet-sdk-linux-x64.tar.gz +[linux-targz-checksum-9.0.1XX-preview2]: https://aka.ms/dotnet/9.0.1xx-preview2/daily/dotnet-sdk-linux-x64.tar.gz.sha [linux-badge-8.0.3XX]: https://aka.ms/dotnet/8.0.3xx/daily/linux_x64_Release_version_badge.svg?no-cache [linux-version-8.0.3XX]: https://aka.ms/dotnet/8.0.3xx/daily/productCommit-linux-x64.txt @@ -348,10 +348,10 @@ Reference notes: [linux-arm-targz-main]: https://aka.ms/dotnet/9.0.1xx/daily/dotnet-sdk-linux-arm.tar.gz [linux-arm-targz-checksum-main]: https://aka.ms/dotnet/9.0.1xx/daily/dotnet-sdk-linux-arm.tar.gz.sha -[linux-arm-badge-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/linux_arm_Release_version_badge.svg?no-cache -[linux-arm-version-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/productCommit-linux-arm.txt -[linux-arm-targz-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/dotnet-sdk-linux-arm.tar.gz -[linux-arm-targz-checksum-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/dotnet-sdk-linux-arm.tar.gz.sha +[linux-arm-badge-9.0.1XX-preview2]: https://aka.ms/dotnet/9.0.1xx-preview2/daily/linux_arm_Release_version_badge.svg?no-cache +[linux-arm-version-9.0.1XX-preview2]: https://aka.ms/dotnet/9.0.1xx-preview2/daily/productCommit-linux-arm.txt +[linux-arm-targz-9.0.1XX-preview2]: https://aka.ms/dotnet/9.0.1xx-preview2/daily/dotnet-sdk-linux-arm.tar.gz +[linux-arm-targz-checksum-9.0.1XX-preview2]: https://aka.ms/dotnet/9.0.1xx-preview2/daily/dotnet-sdk-linux-arm.tar.gz.sha [linux-arm-badge-8.0.3XX]: https://aka.ms/dotnet/8.0.3xx/daily/linux_arm_Release_version_badge.svg?no-cache [linux-arm-version-8.0.3XX]: https://aka.ms/dotnet/8.0.3xx/daily/productCommit-linux-arm.txt @@ -368,10 +368,10 @@ Reference notes: [linux-arm64-targz-main]: https://aka.ms/dotnet/9.0.1xx/daily/dotnet-sdk-linux-arm64.tar.gz [linux-arm64-targz-checksum-main]: https://aka.ms/dotnet/9.0.1xx/daily/dotnet-sdk-linux-arm64.tar.gz.sha -[linux-arm64-badge-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/linux_arm64_Release_version_badge.svg?no-cache -[linux-arm64-version-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/productCommit-linux-arm64.txt -[linux-arm64-targz-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/dotnet-sdk-linux-arm64.tar.gz -[linux-arm64-targz-checksum-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/dotnet-sdk-linux-arm64.tar.gz.sha +[linux-arm64-badge-9.0.1XX-preview2]: https://aka.ms/dotnet/9.0.1xx-preview2/daily/linux_arm64_Release_version_badge.svg?no-cache +[linux-arm64-version-9.0.1XX-preview2]: https://aka.ms/dotnet/9.0.1xx-preview2/daily/productCommit-linux-arm64.txt +[linux-arm64-targz-9.0.1XX-preview2]: https://aka.ms/dotnet/9.0.1xx-preview2/daily/dotnet-sdk-linux-arm64.tar.gz +[linux-arm64-targz-checksum-9.0.1XX-preview2]: https://aka.ms/dotnet/9.0.1xx-preview2/daily/dotnet-sdk-linux-arm64.tar.gz.sha [linux-arm64-badge-8.0.3XX]: https://aka.ms/dotnet/8.0.3xx/daily/linux_arm64_Release_version_badge.svg?no-cache [linux-arm64-version-8.0.3XX]: https://aka.ms/dotnet/8.0.3xx/daily/productCommit-linux-arm64.txt @@ -388,10 +388,10 @@ Reference notes: [rhel-6-targz-main]: https://aka.ms/dotnet/9.0.1xx/daily/dotnet-sdk-rhel.6-x64.tar.gz [rhel-6-targz-checksum-main]: https://aka.ms/dotnet/9.0.1xx/daily/dotnet-sdk-rhel.6-x64.tar.gz.sha -[rhel-6-badge-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/rhel.6_x64_Release_version_badge.svg?no-cache -[rhel-6-version-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/productCommit-rhel.6-x64.txt -[rhel-6-targz-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/dotnet-sdk-rhel.6-x64.tar.gz -[rhel-6-targz-checksum-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/dotnet-sdk-rhel.6-x64.tar.gz.sha +[rhel-6-badge-9.0.1XX-preview2]: https://aka.ms/dotnet/9.0.1xx-preview2/daily/rhel.6_x64_Release_version_badge.svg?no-cache +[rhel-6-version-9.0.1XX-preview2]: https://aka.ms/dotnet/9.0.1xx-preview2/daily/productCommit-rhel.6-x64.txt +[rhel-6-targz-9.0.1XX-preview2]: https://aka.ms/dotnet/9.0.1xx-preview2/daily/dotnet-sdk-rhel.6-x64.tar.gz +[rhel-6-targz-checksum-9.0.1XX-preview2]: https://aka.ms/dotnet/9.0.1xx-preview2/daily/dotnet-sdk-rhel.6-x64.tar.gz.sha [rhel-6-badge-8.0.3XX]: https://aka.ms/dotnet/8.0.3xx/daily/rhel.6_x64_Release_version_badge.svg?no-cache [rhel-6-version-8.0.3XX]: https://aka.ms/dotnet/8.0.3xx/daily/productCommit-rhel.6-x64.txt @@ -408,10 +408,10 @@ Reference notes: [linux-musl-x64-targz-main]: https://aka.ms/dotnet/9.0.1xx/daily/dotnet-sdk-linux-musl-x64.tar.gz [linux-musl-x64-targz-checksum-main]: https://aka.ms/dotnet/9.0.1xx/daily/dotnet-sdk-linux-musl-x64.tar.gz.sha -[linux-musl-x64-badge-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/linux_musl_x64_Release_version_badge.svg?no-cache -[linux-musl-x64-version-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/productCommit-linux-musl-x64.txt -[linux-musl-x64-targz-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/dotnet-sdk-linux-musl-x64.tar.gz -[linux-musl-x64-targz-checksum-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/dotnet-sdk-linux-musl-x64.tar.gz.sha +[linux-musl-x64-badge-9.0.1XX-preview2]: https://aka.ms/dotnet/9.0.1xx-preview2/daily/linux_musl_x64_Release_version_badge.svg?no-cache +[linux-musl-x64-version-9.0.1XX-preview2]: https://aka.ms/dotnet/9.0.1xx-preview2/daily/productCommit-linux-musl-x64.txt +[linux-musl-x64-targz-9.0.1XX-preview2]: https://aka.ms/dotnet/9.0.1xx-preview2/daily/dotnet-sdk-linux-musl-x64.tar.gz +[linux-musl-x64-targz-checksum-9.0.1XX-preview2]: https://aka.ms/dotnet/9.0.1xx-preview2/daily/dotnet-sdk-linux-musl-x64.tar.gz.sha [linux-musl-x64-badge-8.0.3XX]: https://aka.ms/dotnet/8.0.3xx/daily/linux_musl_x64_Release_version_badge.svg?no-cache [linux-musl-x64-version-8.0.3XX]: https://aka.ms/dotnet/8.0.3xx/daily/productCommit-linux-musl-x64.txt @@ -428,10 +428,10 @@ Reference notes: [linux-musl-arm-targz-main]: https://aka.ms/dotnet/9.0.1xx/daily/dotnet-sdk-linux-musl-arm.tar.gz [linux-musl-arm-targz-checksum-main]: https://aka.ms/dotnet/9.0.1xx/daily/dotnet-sdk-linux-musl-arm.tar.gz.sha -[linux-musl-arm-badge-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/linux_musl_arm_Release_version_badge.svg?no-cache -[linux-musl-arm-version-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/productCommit-linux-musl-arm.txt -[linux-musl-arm-targz-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/dotnet-sdk-linux-musl-arm.tar.gz -[linux-musl-arm-targz-checksum-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/dotnet-sdk-linux-musl-arm.tar.gz.sha +[linux-musl-arm-badge-9.0.1XX-preview2]: https://aka.ms/dotnet/9.0.1xx-preview2/daily/linux_musl_arm_Release_version_badge.svg?no-cache +[linux-musl-arm-version-9.0.1XX-preview2]: https://aka.ms/dotnet/9.0.1xx-preview2/daily/productCommit-linux-musl-arm.txt +[linux-musl-arm-targz-9.0.1XX-preview2]: https://aka.ms/dotnet/9.0.1xx-preview2/daily/dotnet-sdk-linux-musl-arm.tar.gz +[linux-musl-arm-targz-checksum-9.0.1XX-preview2]: https://aka.ms/dotnet/9.0.1xx-preview2/daily/dotnet-sdk-linux-musl-arm.tar.gz.sha [linux-musl-arm-badge-8.0.3XX]: https://aka.ms/dotnet/8.0.3xx/daily/linux_musl_arm_Release_version_badge.svg?no-cache [linux-musl-arm-version-8.0.3XX]: https://aka.ms/dotnet/8.0.3xx/daily/productCommit-linux-musl-arm.txt @@ -448,10 +448,10 @@ Reference notes: [linux-musl-arm64-targz-main]: https://aka.ms/dotnet/9.0.1xx/daily/dotnet-sdk-linux-musl-arm64.tar.gz [linux-musl-arm64-targz-checksum-main]: https://aka.ms/dotnet/9.0.1xx/daily/dotnet-sdk-linux-musl-arm64.tar.gz.sha -[linux-musl-arm64-badge-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/linux_musl_arm64_Release_version_badge.svg?no-cache -[linux-musl-arm64-version-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/productCommit-linux-musl-arm64.txt -[linux-musl-arm64-targz-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/dotnet-sdk-linux-musl-arm64.tar.gz -[linux-musl-arm64-targz-checksum-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/dotnet-sdk-linux-musl-arm64.tar.gz.sha +[linux-musl-arm64-badge-9.0.1XX-preview2]: https://aka.ms/dotnet/9.0.1xx-preview2/daily/linux_musl_arm64_Release_version_badge.svg?no-cache +[linux-musl-arm64-version-9.0.1XX-preview2]: https://aka.ms/dotnet/9.0.1xx-preview2/daily/productCommit-linux-musl-arm64.txt +[linux-musl-arm64-targz-9.0.1XX-preview2]: https://aka.ms/dotnet/9.0.1xx-preview2/daily/dotnet-sdk-linux-musl-arm64.tar.gz +[linux-musl-arm64-targz-checksum-9.0.1XX-preview2]: https://aka.ms/dotnet/9.0.1xx-preview2/daily/dotnet-sdk-linux-musl-arm64.tar.gz.sha [linux-musl-arm64-badge-8.0.3XX]: https://aka.ms/dotnet/8.0.3xx/daily/linux_musl_arm64_Release_version_badge.svg?no-cache [linux-musl-arm64-version-8.0.3XX]: https://aka.ms/dotnet/8.0.3xx/daily/productCommit-linux-musl-arm64.txt @@ -468,10 +468,10 @@ Reference notes: [win-arm-zip-main]: https://aka.ms/dotnet/9.0.1xx/daily/dotnet-sdk-win-arm.zip [win-arm-zip-checksum-main]: https://aka.ms/dotnet/9.0.1xx/daily/dotnet-sdk-win-arm.zip.sha -[win-arm-badge-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/win_arm_Release_version_badge.svg?no-cache -[win-arm-version-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/productCommit-win-arm.txt -[win-arm-zip-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/dotnet-sdk-win-arm.zip -[win-arm-zip-checksum-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/dotnet-sdk-win-arm.zip.sha +[win-arm-badge-9.0.1XX-preview2]: https://aka.ms/dotnet/9.0.1xx-preview2/daily/win_arm_Release_version_badge.svg?no-cache +[win-arm-version-9.0.1XX-preview2]: https://aka.ms/dotnet/9.0.1xx-preview2/daily/productCommit-win-arm.txt +[win-arm-zip-9.0.1XX-preview2]: https://aka.ms/dotnet/9.0.1xx-preview2/daily/dotnet-sdk-win-arm.zip +[win-arm-zip-checksum-9.0.1XX-preview2]: https://aka.ms/dotnet/9.0.1xx-preview2/daily/dotnet-sdk-win-arm.zip.sha [win-arm-badge-8.0.3XX]: https://aka.ms/dotnet/8.0.3xx/daily/win_arm_Release_version_badge.svg?no-cache [win-arm-version-8.0.3XX]: https://aka.ms/dotnet/8.0.3xx/daily/productCommit-win-arm.txt @@ -490,12 +490,12 @@ Reference notes: [win-arm64-zip-main]: https://aka.ms/dotnet/9.0.1xx/daily/dotnet-sdk-win-arm64.zip [win-arm64-zip-checksum-main]: https://aka.ms/dotnet/9.0.1xx/daily/dotnet-sdk-win-arm64.zip.sha -[win-arm64-badge-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/win_arm64_Release_version_badge.svg?no-cache -[win-arm64-version-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/productCommit-win-arm64.txt -[win-arm64-installer-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/dotnet-sdk-win-arm64.exe -[win-arm64-installer-checksum-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/dotnet-sdk-win-arm64.exe.sha -[win-arm64-zip-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/dotnet-sdk-win-arm64.zip -[win-arm64-zip-checksum-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/dotnet-sdk-win-arm64.zip.sha +[win-arm64-badge-9.0.1XX-preview2]: https://aka.ms/dotnet/9.0.1xx-preview2/daily/win_arm64_Release_version_badge.svg?no-cache +[win-arm64-version-9.0.1XX-preview2]: https://aka.ms/dotnet/9.0.1xx-preview2/daily/productCommit-win-arm64.txt +[win-arm64-installer-9.0.1XX-preview2]: https://aka.ms/dotnet/9.0.1xx-preview2/daily/dotnet-sdk-win-arm64.exe +[win-arm64-installer-checksum-9.0.1XX-preview2]: https://aka.ms/dotnet/9.0.1xx-preview2/daily/dotnet-sdk-win-arm64.exe.sha +[win-arm64-zip-9.0.1XX-preview2]: https://aka.ms/dotnet/9.0.1xx-preview2/daily/dotnet-sdk-win-arm64.zip +[win-arm64-zip-checksum-9.0.1XX-preview2]: https://aka.ms/dotnet/9.0.1xx-preview2/daily/dotnet-sdk-win-arm64.zip.sha [win-arm64-badge-8.0.3XX]: https://aka.ms/dotnet/8.0.3xx/daily/win_arm64_Release_version_badge.svg?no-cache [win-arm64-version-8.0.3XX]: https://aka.ms/dotnet/8.0.3xx/daily/productCommit-win-arm64.txt diff --git a/tools/sdk-readme-table-generator/TableGenerator/Program.fs b/tools/sdk-readme-table-generator/TableGenerator/Program.fs index 54943c9e5e57..afddde31756f 100644 --- a/tools/sdk-readme-table-generator/TableGenerator/Program.fs +++ b/tools/sdk-readme-table-generator/TableGenerator/Program.fs @@ -9,9 +9,9 @@ let inputBranches = [ { GitBranchName = "main" DisplayName = "main
(9.0.x Runtime)" AkaMsChannel = Some("9.0.1xx/daily") } - { GitBranchName = "release/9.0.1xx-preview1" - DisplayName = "9.0.1xx-preview1
(9.0-preview1 Runtime)" - AkaMsChannel = Some("9.0.1xx-preview1/daily") } + { GitBranchName = "release/9.0.1xx-preview2" + DisplayName = "9.0.1xx-preview2
(9.0-preview2 Runtime)" + AkaMsChannel = Some("9.0.1xx-preview2/daily") } { GitBranchName = "release/8.0.3xx" DisplayName = "8.0.3xx
(8.0 Runtime)" AkaMsChannel = Some("8.0.3xx/daily") } From 0eea7e057935d2bc99be27e824138d65f511b2ed Mon Sep 17 00:00:00 2001 From: Jackson Schuster <36744439+jtschuster@users.noreply.github.com> Date: Mon, 26 Feb 2024 09:29:22 -0800 Subject: [PATCH 146/261] Fix stack overflow and rename method --- src/SourceBuild/content/eng/build.targets | 2 +- .../GetClosestOfficialSdk.cs | 4 ++-- .../PathWithVersions.cs | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/SourceBuild/content/eng/build.targets b/src/SourceBuild/content/eng/build.targets index c10d8c12efd1..63030702808b 100644 --- a/src/SourceBuild/content/eng/build.targets +++ b/src/SourceBuild/content/eng/build.targets @@ -16,7 +16,7 @@ - +
diff --git a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/GetClosestOfficialSdk.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/GetClosestOfficialSdk.cs index 6f130c100e47..708bea6d65d5 100644 --- a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/GetClosestOfficialSdk.cs +++ b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/GetClosestOfficialSdk.cs @@ -24,7 +24,7 @@ public override bool Execute() public async Task ExecuteAsync() { - var (versionString, rid, extension) = ExtractFromFilePath(BuiltSdkPath); + var (versionString, rid, extension) = GetInfoFromArchivePath(BuiltSdkPath); string downloadUrl = GetLatestOfficialSdkUrl(versionString, rid, extension); @@ -63,7 +63,7 @@ string GetLatestOfficialSdkUrl(string versionString, string rid, string extensio return $"https://aka.ms/dotnet/{channel}/daily/dotnet-sdk-{rid}{extension}"; } - static (string Version, string Rid, string extension) ExtractFromFilePath(string path) + static (string Version, string Rid, string extension) GetInfoFromArchivePath(string path) { string extension; if (path.EndsWith(".tar.gz")) diff --git a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/PathWithVersions.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/PathWithVersions.cs index 2d3eb29c3b93..6baf40e86a67 100644 --- a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/PathWithVersions.cs +++ b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/PathWithVersions.cs @@ -73,7 +73,7 @@ static bool TryGetPathLeaf(ReadOnlySpan path, out ReadOnlySpan root, public static string GetVersionAnonymousPath(string path) { - return GetVersionAnonymousPath(path).ToString(); + return GetVersionAnonymousPath(path.AsSpan()).ToString(); } public static ReadOnlySpan GetVersionAnonymousPath(ReadOnlySpan path) From d30c7408d76042e2f3b73bd0a9d9c5fe7e99af6f Mon Sep 17 00:00:00 2001 From: Jackson Schuster <36744439+jtschuster@users.noreply.github.com> Date: Mon, 26 Feb 2024 09:31:36 -0800 Subject: [PATCH 147/261] Rename GetVersionAnonymousPath --- .../FindArchiveDiffs.cs | 2 +- .../PathWithVersions.cs | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/FindArchiveDiffs.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/FindArchiveDiffs.cs index 8225c59f3acf..f7bf07292cc5 100644 --- a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/FindArchiveDiffs.cs +++ b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/FindArchiveDiffs.cs @@ -41,7 +41,7 @@ public async Task ExecuteAsync() var baselineFiles = baseline.GetFileNames(); var testFiles = test.GetFileNames(); ContentDifferences = - GetDiffs(baselineFiles, testFiles, PathWithVersions.Equal, PathWithVersions.GetVersionAnonymousPath) + GetDiffs(baselineFiles, testFiles, PathWithVersions.Equal, PathWithVersions.GetVersionlessPath) .Select(FromDiff) .ToArray(); return true; diff --git a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/PathWithVersions.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/PathWithVersions.cs index 6baf40e86a67..e8e3d7c9da57 100644 --- a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/PathWithVersions.cs +++ b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/PathWithVersions.cs @@ -71,12 +71,12 @@ static bool TryGetPathLeaf(ReadOnlySpan path, out ReadOnlySpan root, return true; } - public static string GetVersionAnonymousPath(string path) + public static string GetVersionlessPath(string path) { - return GetVersionAnonymousPath(path.AsSpan()).ToString(); + return GetVersionlessPath(path.AsSpan()).ToString(); } - public static ReadOnlySpan GetVersionAnonymousPath(ReadOnlySpan path) + public static ReadOnlySpan GetVersionlessPath(ReadOnlySpan path) { StringBuilder sb = new StringBuilder(); bool altered = false; From c771acb27776dc80fbe648e3c7cd40934f8184a4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 27 Feb 2024 13:52:58 +0000 Subject: [PATCH 148/261] Update dependencies from https://github.com/dotnet/arcade build 20240223.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.24113.2 -> To Version 8.0.0-beta.24123.1 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/templates/steps/generate-sbom.yml | 2 +- global.json | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b5034f5ae351..0dae4bc5b811 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -214,18 +214,18 @@
- + https://github.com/dotnet/arcade - da98edc4c3ea539f109ea320672136ceb32591a7 + 042763a811fd94dc3556253d4c64118dd665216e - + https://github.com/dotnet/arcade - da98edc4c3ea539f109ea320672136ceb32591a7 + 042763a811fd94dc3556253d4c64118dd665216e - + https://github.com/dotnet/arcade - da98edc4c3ea539f109ea320672136ceb32591a7 + 042763a811fd94dc3556253d4c64118dd665216e https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index d6c5c672c57d..b7ca4e606f06 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,7 +40,7 @@ - 8.0.0-beta.24113.2 + 8.0.0-beta.24123.1 diff --git a/eng/common/templates/steps/generate-sbom.yml b/eng/common/templates/steps/generate-sbom.yml index a06373f38fa5..2b21eae42732 100644 --- a/eng/common/templates/steps/generate-sbom.yml +++ b/eng/common/templates/steps/generate-sbom.yml @@ -5,7 +5,7 @@ # IgnoreDirectories - Directories to ignore for SBOM generation. This will be passed through to the CG component detector. parameters: - PackageVersion: 7.0.0 + PackageVersion: 8.0.0 BuildDropPath: '$(Build.SourcesDirectory)/artifacts' PackageName: '.NET' ManifestDirPath: $(Build.ArtifactStagingDirectory)/sbom diff --git a/global.json b/global.json index e46bfeda971c..efeb5c8681b0 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24113.2", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24113.2" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24123.1", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24123.1" } } From 9854c384d7c63d7238708f3324e35d6923c06279 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 28 Feb 2024 03:13:12 +0000 Subject: [PATCH 149/261] Update dependencies from https://github.com/dotnet/sdk build 20240227.8 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24126.3 -> To Version 8.0.300-preview.24127.8 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp From Version 12.8.300-beta.24122.3 -> To Version 12.8.300-beta.24126.2 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0dae4bc5b811..ba20ec72b712 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - ae77f375c524f0845d986e24256b3ff0e085e115 + 83aa33f0d37a7933885453a54aa07abbc870b810 - + https://github.com/dotnet/sdk - ae77f375c524f0845d986e24256b3ff0e085e115 + 83aa33f0d37a7933885453a54aa07abbc870b810 - + https://github.com/dotnet/sdk - ae77f375c524f0845d986e24256b3ff0e085e115 + 83aa33f0d37a7933885453a54aa07abbc870b810 - + https://github.com/dotnet/sdk - ae77f375c524f0845d986e24256b3ff0e085e115 + 83aa33f0d37a7933885453a54aa07abbc870b810 https://github.com/dotnet/test-templates @@ -132,13 +132,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 472140dd926227876848e48f41cfc9acb9275492 - + https://github.com/dotnet/fsharp - 02bb351b606468bce98688fccda9d0c8adcd964d + cdbac6ca6ab7670243f69a8fc367bf9538bf3d43 - + https://github.com/dotnet/fsharp - 02bb351b606468bce98688fccda9d0c8adcd964d + cdbac6ca6ab7670243f69a8fc367bf9538bf3d43 diff --git a/eng/Versions.props b/eng/Versions.props index b7ca4e606f06..76293ec08535 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24126.3 - 8.0.300-preview.24126.3 - 8.0.300-preview.24126.3 + 8.0.300-preview.24127.8 + 8.0.300-preview.24127.8 + 8.0.300-preview.24127.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From dc37f9e37aa1e334bbf5bd1193ab2f3541154617 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 28 Feb 2024 04:41:47 +0000 Subject: [PATCH 150/261] Update dependencies from https://github.com/dotnet/sdk build 20240227.10 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24126.3 -> To Version 8.0.300-preview.24127.10 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp From Version 12.8.300-beta.24122.3 -> To Version 12.8.300-beta.24126.2 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ba20ec72b712..ddaa8e6c735e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - 83aa33f0d37a7933885453a54aa07abbc870b810 + c4f15959182fed1b8c69fd24a31daf0203e1f1be - + https://github.com/dotnet/sdk - 83aa33f0d37a7933885453a54aa07abbc870b810 + c4f15959182fed1b8c69fd24a31daf0203e1f1be - + https://github.com/dotnet/sdk - 83aa33f0d37a7933885453a54aa07abbc870b810 + c4f15959182fed1b8c69fd24a31daf0203e1f1be - + https://github.com/dotnet/sdk - 83aa33f0d37a7933885453a54aa07abbc870b810 + c4f15959182fed1b8c69fd24a31daf0203e1f1be https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 76293ec08535..1abe8b48f7a0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24127.8 - 8.0.300-preview.24127.8 - 8.0.300-preview.24127.8 + 8.0.300-preview.24127.10 + 8.0.300-preview.24127.10 + 8.0.300-preview.24127.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 6b32484a241b22601fe783dd2f5001f65b08dd50 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 28 Feb 2024 07:38:29 +0000 Subject: [PATCH 151/261] Update dependencies from https://github.com/dotnet/sdk build 20240227.13 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24127.10 -> To Version 8.0.300-preview.24127.13 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.10.0-2.24124.2 -> To Version 4.10.0-2.24127.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ddaa8e6c735e..e30d6bb00b64 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - c4f15959182fed1b8c69fd24a31daf0203e1f1be + 2b39387b4fa7b448f573a9976185939bf0883f68 - + https://github.com/dotnet/sdk - c4f15959182fed1b8c69fd24a31daf0203e1f1be + 2b39387b4fa7b448f573a9976185939bf0883f68 - + https://github.com/dotnet/sdk - c4f15959182fed1b8c69fd24a31daf0203e1f1be + 2b39387b4fa7b448f573a9976185939bf0883f68 - + https://github.com/dotnet/sdk - c4f15959182fed1b8c69fd24a31daf0203e1f1be + 2b39387b4fa7b448f573a9976185939bf0883f68 https://github.com/dotnet/test-templates @@ -150,9 +150,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 1381d5ebd2ab1f292848d5b19b80cf71ac332508 - + https://github.com/dotnet/roslyn - 3059a073c923ae9ee56c4ad012a0f2151583dd16 + b701a39ca8ccec581a7949d3bcc9931a2088deee diff --git a/eng/Versions.props b/eng/Versions.props index 1abe8b48f7a0..0ea37ca8ae02 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,16 +85,16 @@ - 8.0.300-preview.24127.10 - 8.0.300-preview.24127.10 - 8.0.300-preview.24127.10 + 8.0.300-preview.24127.13 + 8.0.300-preview.24127.13 + 8.0.300-preview.24127.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.10.0-2.24124.2 + 4.10.0-2.24127.1 From e2554cbca4bc4aae8d9a555d89625057df163382 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 28 Feb 2024 09:29:08 +0000 Subject: [PATCH 152/261] Update dependencies from https://github.com/dotnet/sdk build 20240228.1 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24127.13 -> To Version 8.0.300-preview.24128.1 Dependency coherency updates NuGet.Build.Tasks From Version 6.10.0-preview.2.44 -> To Version 6.10.0-preview.2.47 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e30d6bb00b64..e708d68616cd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - 2b39387b4fa7b448f573a9976185939bf0883f68 + f95a53c2c765376972f6fda808f6862bdc8dd7e7 - + https://github.com/dotnet/sdk - 2b39387b4fa7b448f573a9976185939bf0883f68 + f95a53c2c765376972f6fda808f6862bdc8dd7e7 - + https://github.com/dotnet/sdk - 2b39387b4fa7b448f573a9976185939bf0883f68 + f95a53c2c765376972f6fda808f6862bdc8dd7e7 - + https://github.com/dotnet/sdk - 2b39387b4fa7b448f573a9976185939bf0883f68 + f95a53c2c765376972f6fda808f6862bdc8dd7e7 https://github.com/dotnet/test-templates @@ -159,9 +159,9 @@ https://github.com/dotnet/msbuild 56c003594af2772b8a5f4c58023f239a431154fa - + https://github.com/nuget/nuget.client - 39c4f37d4baa00ee0b815fb394de7d51a58b17ab + b49d8914861cf18287302ab311fc9d2566e06fe1 diff --git a/eng/Versions.props b/eng/Versions.props index 0ea37ca8ae02..1c4ddb6b36e3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24127.13 - 8.0.300-preview.24127.13 - 8.0.300-preview.24127.13 + 8.0.300-preview.24128.1 + 8.0.300-preview.24128.1 + 8.0.300-preview.24128.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -127,7 +127,7 @@ - 6.10.0-preview.2.44 + 6.10.0-preview.2.47 From 7d60b10ace7ffc216c57a525cb5da11bb80b7b5e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 28 Feb 2024 10:06:27 +0000 Subject: [PATCH 153/261] Update dependencies from https://github.com/dotnet/sdk build 20240228.4 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24127.13 -> To Version 8.0.300-preview.24128.4 Dependency coherency updates Microsoft.Build,NuGet.Build.Tasks From Version 17.10.0-preview-24123-01 -> To Version 17.10.0-preview-24127-03 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e708d68616cd..982a4069a3e0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - f95a53c2c765376972f6fda808f6862bdc8dd7e7 + 315de96caa1a20180bf081b8e2ef5a437637d6d2 - + https://github.com/dotnet/sdk - f95a53c2c765376972f6fda808f6862bdc8dd7e7 + 315de96caa1a20180bf081b8e2ef5a437637d6d2 - + https://github.com/dotnet/sdk - f95a53c2c765376972f6fda808f6862bdc8dd7e7 + 315de96caa1a20180bf081b8e2ef5a437637d6d2 - + https://github.com/dotnet/sdk - f95a53c2c765376972f6fda808f6862bdc8dd7e7 + 315de96caa1a20180bf081b8e2ef5a437637d6d2 https://github.com/dotnet/test-templates @@ -155,9 +155,9 @@ b701a39ca8ccec581a7949d3bcc9931a2088deee - + https://github.com/dotnet/msbuild - 56c003594af2772b8a5f4c58023f239a431154fa + 6f44380e4fdea6ddf5c11f48efeb25c2bf181e62 https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index 1c4ddb6b36e3..5ee099660547 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24128.1 - 8.0.300-preview.24128.1 - 8.0.300-preview.24128.1 + 8.0.300-preview.24128.4 + 8.0.300-preview.24128.4 + 8.0.300-preview.24128.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 0335725359996f0d25ee7e88dfb75358997a82a8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 28 Feb 2024 13:55:03 +0000 Subject: [PATCH 154/261] Update dependencies from https://github.com/dotnet/arcade-services build 20240228.1 Microsoft.DotNet.Darc , Microsoft.DotNet.DarcLib From Version 1.1.0-beta.24126.1 -> To Version 1.1.0-beta.24128.1 --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index e7da1d6ae9fa..824bca36214e 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.24126.1", + "version": "1.1.0-beta.24128.1", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e30d6bb00b64..5c50d5d01d99 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -227,13 +227,13 @@ https://github.com/dotnet/arcade 042763a811fd94dc3556253d4c64118dd665216e - + https://github.com/dotnet/arcade-services - a688e34a3c0551eafd9c2ab8b06a3b88faf4141c + 10ec9cb0edab107e5679bdecaced06aace901f07 - + https://github.com/dotnet/arcade-services - a688e34a3c0551eafd9c2ab8b06a3b88faf4141c + 10ec9cb0edab107e5679bdecaced06aace901f07 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 0ea37ca8ae02..fb229c925749 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 1.1.0-beta.24126.1 + 1.1.0-beta.24128.1 From f704a53482cd4ffab1962e11faa4ceb00c977d87 Mon Sep 17 00:00:00 2001 From: Jackson Schuster <36744439+jtschuster@users.noreply.github.com> Date: Wed, 28 Feb 2024 07:02:52 -0800 Subject: [PATCH 155/261] Fix error message --- .../GetClosestOfficialSdk.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/GetClosestOfficialSdk.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/GetClosestOfficialSdk.cs index 708bea6d65d5..1eca113e16fa 100644 --- a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/GetClosestOfficialSdk.cs +++ b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/GetClosestOfficialSdk.cs @@ -85,7 +85,7 @@ string GetLatestOfficialSdkUrl(string versionString, string rid, string extensio { ["dotnet", "sdk", var first, var second, var third, var fourth] when PathWithVersions.IsVersionString(first) => (third + '-' + fourth, first + '-' + second), ["dotnet", "sdk", var first, var second, var third, var fourth] when PathWithVersions.IsVersionString(third) => (first + '-' + second, third + '-' + fourth), - _ => throw new ArgumentException($"Invalid archive file name '{filename}': file name should include full build full build full build full build full build full build full build full build full build version and rid") + _ => throw new ArgumentException($"Invalid archive file name '{filename}': file name should include full build version and rid in the format dotnet-sdk--{extension} or dotnet-sdk--{extension}") }; return (versionString, rid, extension); From 45728f7ba535af71ab5ac3585c62ac6f38428caf Mon Sep 17 00:00:00 2001 From: Jackson Schuster <36744439+jtschuster@users.noreply.github.com> Date: Wed, 28 Feb 2024 07:36:59 -0800 Subject: [PATCH 156/261] Add task to find the single best tarball, and remove unused usings --- src/SourceBuild/content/eng/build.targets | 13 +++-- .../Archive.cs | 33 ++++++++++-- .../GetClosestOfficialSdk.cs | 33 +----------- .../GetSingleTarballItem.cs | 51 +++++++++++++++++++ .../PathWithVersions.cs | 1 - .../ZipArchiveExtensions.cs | 1 - 6 files changed, 90 insertions(+), 42 deletions(-) create mode 100644 src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/GetSingleTarballItem.cs diff --git a/src/SourceBuild/content/eng/build.targets b/src/SourceBuild/content/eng/build.targets index 63030702808b..048d2b89b3ce 100644 --- a/src/SourceBuild/content/eng/build.targets +++ b/src/SourceBuild/content/eng/build.targets @@ -1,18 +1,23 @@ + - - + + + + + - - + + + diff --git a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/Archive.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/Archive.cs index e7943c0a30cd..7a572b356261 100644 --- a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/Archive.cs +++ b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/Archive.cs @@ -2,17 +2,12 @@ // The .NET Foundation licenses this file to you under the MIT license. using System; -using System.Collections.Immutable; using System.Formats.Tar; using System.IO; using System.IO.Compression; using System.Linq; -using System.Reflection; -using System.Reflection.Metadata; -using System.Reflection.PortableExecutable; using System.Threading; using System.Threading.Tasks; -using static ArchiveExtensions; public abstract class Archive : IDisposable { @@ -134,4 +129,32 @@ public override void Dispose() _archive.Dispose(); } } + + public static (string Version, string Rid, string extension) GetInfoFromArchivePath(string path) + { + string extension; + if (path.EndsWith(".tar.gz")) + { + extension = ".tar.gz"; + } + else if (path.EndsWith(".zip")) + { + extension = ".zip"; + } + else + { + throw new ArgumentException($"Invalid archive extension '{path}': must end with .tar.gz or .zip"); + } + + string filename = Path.GetFileName(path)[..^extension.Length]; + var dashDelimitedParts = filename.Split('-'); + var (rid, versionString) = dashDelimitedParts switch + { + ["dotnet", "sdk", var first, var second, var third, var fourth] when PathWithVersions.IsVersionString(first) => (third + '-' + fourth, first + '-' + second), + ["dotnet", "sdk", var first, var second, var third, var fourth] when PathWithVersions.IsVersionString(third) => (first + '-' + second, third + '-' + fourth), + _ => throw new ArgumentException($"Invalid archive file name '{filename}': file name should include full build version and rid in the format dotnet-sdk--{extension} or dotnet-sdk--{extension}") + }; + + return (versionString, rid, extension); + } } diff --git a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/GetClosestOfficialSdk.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/GetClosestOfficialSdk.cs index 1eca113e16fa..8ea6b4f83465 100644 --- a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/GetClosestOfficialSdk.cs +++ b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/GetClosestOfficialSdk.cs @@ -1,14 +1,12 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using System; -using System.Diagnostics; using System.IO; using System.Net; using System.Net.Http; -using System.Runtime.InteropServices; using System.Threading.Tasks; using Microsoft.Build.Framework; + public class GetClosestOfficialSdk : Microsoft.Build.Utilities.Task { [Required] @@ -24,7 +22,7 @@ public override bool Execute() public async Task ExecuteAsync() { - var (versionString, rid, extension) = GetInfoFromArchivePath(BuiltSdkPath); + var (versionString, rid, extension) = Archive.GetInfoFromArchivePath(BuiltSdkPath); string downloadUrl = GetLatestOfficialSdkUrl(versionString, rid, extension); @@ -63,31 +61,4 @@ string GetLatestOfficialSdkUrl(string versionString, string rid, string extensio return $"https://aka.ms/dotnet/{channel}/daily/dotnet-sdk-{rid}{extension}"; } - static (string Version, string Rid, string extension) GetInfoFromArchivePath(string path) - { - string extension; - if (path.EndsWith(".tar.gz")) - { - extension = ".tar.gz"; - } - else if (path.EndsWith(".zip")) - { - extension = ".zip"; - } - else - { - throw new ArgumentException($"Invalid archive extension '{path}': must end with .tar.gz or .zip"); - } - - string filename = Path.GetFileName(path)[..^extension.Length]; - var dashDelimitedParts = filename.Split('-'); - var (rid, versionString) = dashDelimitedParts switch - { - ["dotnet", "sdk", var first, var second, var third, var fourth] when PathWithVersions.IsVersionString(first) => (third + '-' + fourth, first + '-' + second), - ["dotnet", "sdk", var first, var second, var third, var fourth] when PathWithVersions.IsVersionString(third) => (first + '-' + second, third + '-' + fourth), - _ => throw new ArgumentException($"Invalid archive file name '{filename}': file name should include full build version and rid in the format dotnet-sdk--{extension} or dotnet-sdk--{extension}") - }; - - return (versionString, rid, extension); - } } diff --git a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/GetSingleTarballItem.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/GetSingleTarballItem.cs new file mode 100644 index 000000000000..9641ad505c0d --- /dev/null +++ b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/GetSingleTarballItem.cs @@ -0,0 +1,51 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. + +using System; +using System.Collections.Generic; +using Microsoft.Build.Framework; + +public class GetSingleTarballItem : Microsoft.Build.Utilities.Task +{ + [Required] + public required ITaskItem[] SdkTarballItems { get; init; } + + [Output] + public string BestSdkTarballItem { get; set; } = ""; + + public override bool Execute() + { + List tarballItems = new (); + foreach(var item in SdkTarballItems) + { + try + { + var (versionString, rid, extension) = Archive.GetInfoFromArchivePath(item.ItemSpec); + tarballItems.Add(item.ItemSpec); + } + catch (ArgumentException e) + { + Log.LogMessage(MessageImportance.High, e.Message); + continue; + } + } + switch (tarballItems.Count){ + case 0: + Log.LogMessage(MessageImportance.High, "No valid tarball items found"); + BestSdkTarballItem = ""; + break; + case 1: + Log.LogMessage(MessageImportance.High, $"{tarballItems[0]} is the only valid tarball item found"); + BestSdkTarballItem = tarballItems[0]; + break; + default: + tarballItems.Sort((a,b) => a.Length - b.Length); + Log.LogMessage(MessageImportance.High, $"Multiple valid tarball items found: '{string.Join("', '", tarballItems)}'"); + BestSdkTarballItem = tarballItems[0]; + Log.LogMessage(MessageImportance.High, $"Choosing '{BestSdkTarballItem}"); + break; + } + return true; + } + +} diff --git a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/PathWithVersions.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/PathWithVersions.cs index e8e3d7c9da57..bc2af0c6b705 100644 --- a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/PathWithVersions.cs +++ b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/PathWithVersions.cs @@ -2,7 +2,6 @@ // The .NET Foundation licenses this file to you under the MIT license. using System; -using System.Collections.Generic; using System.IO; using System.Text; diff --git a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/ZipArchiveExtensions.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/ZipArchiveExtensions.cs index 08c3c6cef578..4b67efea0bc1 100644 --- a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/ZipArchiveExtensions.cs +++ b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/ZipArchiveExtensions.cs @@ -2,7 +2,6 @@ // The .NET Foundation licenses this file to you under the MIT license. using System; -using System.Collections.Generic; using System.IO; using System.IO.Compression; using System.Linq; From b6fba7eb7cf93c3319174f2b99fa4ccf662b15cd Mon Sep 17 00:00:00 2001 From: Jackson Schuster <36744439+jtschuster@users.noreply.github.com> Date: Wed, 28 Feb 2024 09:56:49 -0800 Subject: [PATCH 157/261] Use property notation instead of item --- src/SourceBuild/content/eng/build.targets | 2 +- .../GetClosestOfficialSdk.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/SourceBuild/content/eng/build.targets b/src/SourceBuild/content/eng/build.targets index 048d2b89b3ce..bc77c38f94eb 100644 --- a/src/SourceBuild/content/eng/build.targets +++ b/src/SourceBuild/content/eng/build.targets @@ -11,7 +11,7 @@ - + diff --git a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/GetClosestOfficialSdk.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/GetClosestOfficialSdk.cs index 8ea6b4f83465..8283cc09fc44 100644 --- a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/GetClosestOfficialSdk.cs +++ b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/GetClosestOfficialSdk.cs @@ -26,7 +26,7 @@ public async Task ExecuteAsync() string downloadUrl = GetLatestOfficialSdkUrl(versionString, rid, extension); - Log.LogMessage($"Downloading {downloadUrl}"); + Log.LogMessage(MessageImportance.High, $"Downloading {downloadUrl}"); var handler = new HttpClientHandler() { AllowAutoRedirect = false From 9ffe5c200da2bd0cd778fbcdbd4f1178acc07450 Mon Sep 17 00:00:00 2001 From: Jackson Schuster <36744439+jtschuster@users.noreply.github.com> Date: Wed, 28 Feb 2024 10:06:38 -0800 Subject: [PATCH 158/261] Make long running tasks cancellable --- .../Archive.cs | 8 ++++---- .../FindArchiveDiffs.cs | 10 +++++++++- .../GetClosestOfficialSdk.cs | 17 +++++++++++++---- 3 files changed, 26 insertions(+), 9 deletions(-) diff --git a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/Archive.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/Archive.cs index 7a572b356261..2e89173b58ec 100644 --- a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/Archive.cs +++ b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/Archive.cs @@ -11,10 +11,10 @@ public abstract class Archive : IDisposable { - public static async Task Create(string path) + public static async Task Create(string path, CancellationToken cancellationToken = default) { if (path.EndsWith(".tar.gz")) - return await TarArchive.Create(path); + return await TarArchive.Create(path, cancellationToken); else if (path.EndsWith(".zip")) return ZipFileArchive.Create(path); else @@ -40,7 +40,7 @@ private TarArchive(string extractedFolder) _extractedFolder = extractedFolder; } - public static async Task Create(string path, CancellationToken cancellationToken = default) + public static new async Task Create(string path, CancellationToken cancellationToken = default) { var tmpFolder = Directory.CreateTempSubdirectory(nameof(FindArchiveDiffs)); using (var gzStream = File.OpenRead (path)) @@ -90,7 +90,7 @@ private ZipFileArchive(ZipArchive archive) _archive = archive; } - public static new ZipFileArchive Create(string path) + public static ZipFileArchive Create(string path) { return new ZipFileArchive(new ZipArchive(File.OpenRead(path))); } diff --git a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/FindArchiveDiffs.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/FindArchiveDiffs.cs index f7bf07292cc5..1d1c7108b254 100644 --- a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/FindArchiveDiffs.cs +++ b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/FindArchiveDiffs.cs @@ -5,12 +5,13 @@ using System.Collections.Generic; using System.Diagnostics; using System.Linq; +using System.Threading; using System.Threading.Tasks; using Microsoft.Build.Framework; using Microsoft.Build.Utilities; using Task = System.Threading.Tasks.Task; -public class FindArchiveDiffs : Microsoft.Build.Utilities.Task +public class FindArchiveDiffs : Microsoft.Build.Utilities.Task, ICancelableTask { public class ArchiveItem { @@ -26,6 +27,13 @@ public class ArchiveItem [Output] public ITaskItem[] ContentDifferences { get; set; } = []; + private CancellationTokenSource _cancellationTokenSource = new(); + private CancellationToken cancellationToken => _cancellationTokenSource.Token; + public void Cancel() + { + _cancellationTokenSource.Cancel(); + } + public override bool Execute() { return Task.Run(ExecuteAsync).Result; diff --git a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/GetClosestOfficialSdk.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/GetClosestOfficialSdk.cs index 8283cc09fc44..e5cd717a8fa5 100644 --- a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/GetClosestOfficialSdk.cs +++ b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/GetClosestOfficialSdk.cs @@ -4,10 +4,11 @@ using System.IO; using System.Net; using System.Net.Http; +using System.Threading; using System.Threading.Tasks; using Microsoft.Build.Framework; -public class GetClosestOfficialSdk : Microsoft.Build.Utilities.Task +public class GetClosestOfficialSdk : Microsoft.Build.Utilities.Task, ICancelableTask { [Required] public required string BuiltSdkPath { get; init; } @@ -20,8 +21,16 @@ public override bool Execute() return Task.Run(ExecuteAsync).Result; } + private CancellationTokenSource _cancellationTokenSource = new(); + private CancellationToken cancellationToken => _cancellationTokenSource.Token; + public void Cancel() + { + _cancellationTokenSource.Cancel(); + } + public async Task ExecuteAsync() { + cancellationToken.ThrowIfCancellationRequested(); var (versionString, rid, extension) = Archive.GetInfoFromArchivePath(BuiltSdkPath); string downloadUrl = GetLatestOfficialSdkUrl(versionString, rid, extension); @@ -32,14 +41,14 @@ public async Task ExecuteAsync() AllowAutoRedirect = false }; var client = new HttpClient(handler); - var redirectResponse = await client.GetAsync(downloadUrl); + var redirectResponse = await client.GetAsync(downloadUrl, cancellationToken); // aka.ms returns a 301 for valid redirects and a 302 to Bing for invalid URLs if (redirectResponse.StatusCode != HttpStatusCode.Moved) { Log.LogMessage(MessageImportance.High, $"Failed to download '{downloadUrl}': invalid aka.ms URL"); return true; } - var packageResponse = await client.GetAsync(redirectResponse.Headers.Location!); + var packageResponse = await client.GetAsync(redirectResponse.Headers.Location!, cancellationToken); var packageUriPath = packageResponse.RequestMessage!.RequestUri!.LocalPath; string downloadedVersion = PathWithVersions.GetVersionInPath(packageUriPath).ToString(); @@ -48,7 +57,7 @@ public async Task ExecuteAsync() Log.LogMessage($"Copying {packageUriPath} to {ClosestOfficialSdkPath}"); using (var file = File.Create(ClosestOfficialSdkPath)) { - await packageResponse.Content.CopyToAsync(file); + await packageResponse.Content.CopyToAsync(file, cancellationToken); } return true; From 2e2800c13fb9628dd76415165267805f3ee0aa40 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 29 Feb 2024 03:18:59 +0000 Subject: [PATCH 159/261] Update dependencies from https://github.com/dotnet/sdk build 20240228.25 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24128.4 -> To Version 8.0.300-preview.24128.25 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.10.0-2.24127.1 -> To Version 4.10.0-3.24127.10 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ec6dbf5be1d9..6e5a07a34ab1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - 315de96caa1a20180bf081b8e2ef5a437637d6d2 + 15ab5e74858bb743b06fa4ce2d6156e7d0e7b0e1 - + https://github.com/dotnet/sdk - 315de96caa1a20180bf081b8e2ef5a437637d6d2 + 15ab5e74858bb743b06fa4ce2d6156e7d0e7b0e1 - + https://github.com/dotnet/sdk - 315de96caa1a20180bf081b8e2ef5a437637d6d2 + 15ab5e74858bb743b06fa4ce2d6156e7d0e7b0e1 - + https://github.com/dotnet/sdk - 315de96caa1a20180bf081b8e2ef5a437637d6d2 + 15ab5e74858bb743b06fa4ce2d6156e7d0e7b0e1 https://github.com/dotnet/test-templates @@ -150,9 +150,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 1381d5ebd2ab1f292848d5b19b80cf71ac332508 - + https://github.com/dotnet/roslyn - b701a39ca8ccec581a7949d3bcc9931a2088deee + 5e6349e1c07c535ec698b00075d8b4f5babfd2b6 diff --git a/eng/Versions.props b/eng/Versions.props index db5f24edf1ca..c3eaa661bce9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,16 +85,16 @@ - 8.0.300-preview.24128.4 - 8.0.300-preview.24128.4 - 8.0.300-preview.24128.4 + 8.0.300-preview.24128.25 + 8.0.300-preview.24128.25 + 8.0.300-preview.24128.25 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.10.0-2.24127.1 + 4.10.0-3.24127.10 From 8b0dcb0a892ff648a243b8e30d606187c54aeec4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 29 Feb 2024 06:31:52 +0000 Subject: [PATCH 160/261] Update dependencies from https://github.com/dotnet/sdk build 20240228.27 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24128.25 -> To Version 8.0.300-preview.24128.27 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,NuGet.Build.Tasks From Version 12.8.300-beta.24126.2 -> To Version 12.8.300-beta.24127.3 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 10 +++++----- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6e5a07a34ab1..febe08a7ebc1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - 15ab5e74858bb743b06fa4ce2d6156e7d0e7b0e1 + da566e1a5af363c163c1f3445c50b236cdf938f2 - + https://github.com/dotnet/sdk - 15ab5e74858bb743b06fa4ce2d6156e7d0e7b0e1 + da566e1a5af363c163c1f3445c50b236cdf938f2 - + https://github.com/dotnet/sdk - 15ab5e74858bb743b06fa4ce2d6156e7d0e7b0e1 + da566e1a5af363c163c1f3445c50b236cdf938f2 - + https://github.com/dotnet/sdk - 15ab5e74858bb743b06fa4ce2d6156e7d0e7b0e1 + da566e1a5af363c163c1f3445c50b236cdf938f2 https://github.com/dotnet/test-templates @@ -132,18 +132,18 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 472140dd926227876848e48f41cfc9acb9275492 - + https://github.com/dotnet/fsharp - cdbac6ca6ab7670243f69a8fc367bf9538bf3d43 + b57dee7cec971021547a7b8a36a46d7271fea99e - + https://github.com/dotnet/fsharp - cdbac6ca6ab7670243f69a8fc367bf9538bf3d43 + b57dee7cec971021547a7b8a36a46d7271fea99e - + https://github.com/microsoft/vstest - f2323247155845f00166ebeca5cffdebff410b49 + 39c7dd12c7ec24d0552513e84d95476f2077ca33 @@ -159,9 +159,9 @@ https://github.com/dotnet/msbuild 6f44380e4fdea6ddf5c11f48efeb25c2bf181e62 - + https://github.com/nuget/nuget.client - b49d8914861cf18287302ab311fc9d2566e06fe1 + 5ecd0be8cb73db807189427eb8e0f7bfd334c1e0 diff --git a/eng/Versions.props b/eng/Versions.props index c3eaa661bce9..2a07f2d62dc4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24128.25 - 8.0.300-preview.24128.25 - 8.0.300-preview.24128.25 + 8.0.300-preview.24128.27 + 8.0.300-preview.24128.27 + 8.0.300-preview.24128.27 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -127,7 +127,7 @@ - 6.10.0-preview.2.47 + 6.10.0-preview.2.49 @@ -235,7 +235,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.10.0-preview-24123-01 + 17.10.0-preview-24126-02 8.0.0-alpha.1.22557.12 From 6f213a46dd31433d2efcd408e40e8d7641803711 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 29 Feb 2024 08:40:44 +0000 Subject: [PATCH 161/261] Update dependencies from https://github.com/dotnet/sdk build 20240229.1 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24128.27 -> To Version 8.0.300-preview.24129.1 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index febe08a7ebc1..b5047210beed 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - da566e1a5af363c163c1f3445c50b236cdf938f2 + 16cb8921723b123643fc66c3fb83c38bc90ec894 - + https://github.com/dotnet/sdk - da566e1a5af363c163c1f3445c50b236cdf938f2 + 16cb8921723b123643fc66c3fb83c38bc90ec894 - + https://github.com/dotnet/sdk - da566e1a5af363c163c1f3445c50b236cdf938f2 + 16cb8921723b123643fc66c3fb83c38bc90ec894 - + https://github.com/dotnet/sdk - da566e1a5af363c163c1f3445c50b236cdf938f2 + 16cb8921723b123643fc66c3fb83c38bc90ec894 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 2a07f2d62dc4..f27eb70da373 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24128.27 - 8.0.300-preview.24128.27 - 8.0.300-preview.24128.27 + 8.0.300-preview.24129.1 + 8.0.300-preview.24129.1 + 8.0.300-preview.24129.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 0641476cd558970632ef43a76184f096837c164b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 29 Feb 2024 13:47:57 +0000 Subject: [PATCH 162/261] Update dependencies from https://github.com/dotnet/arcade-services build 20240228.3 Microsoft.DotNet.Darc , Microsoft.DotNet.DarcLib From Version 1.1.0-beta.24128.1 -> To Version 1.1.0-beta.24128.3 --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 824bca36214e..bc127e205cd7 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.24128.1", + "version": "1.1.0-beta.24128.3", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b5047210beed..cb57edf9be39 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -227,13 +227,13 @@ https://github.com/dotnet/arcade 042763a811fd94dc3556253d4c64118dd665216e - + https://github.com/dotnet/arcade-services - 10ec9cb0edab107e5679bdecaced06aace901f07 + 0dcdc1c1157372aeae9ae74757930abaddebb4c6 - + https://github.com/dotnet/arcade-services - 10ec9cb0edab107e5679bdecaced06aace901f07 + 0dcdc1c1157372aeae9ae74757930abaddebb4c6 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index f27eb70da373..cdec4873f5fa 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 1.1.0-beta.24128.1 + 1.1.0-beta.24128.3 From 7632ab4d74cf3ba0cbd525c1a81d429a587a6e5f Mon Sep 17 00:00:00 2001 From: Jackson Schuster <36744439+jtschuster@users.noreply.github.com> Date: Thu, 29 Feb 2024 09:48:31 -0800 Subject: [PATCH 163/261] PR Feedback: - Use 'archive' rather than 'tarball' - Remove dead code - Discard unused return values --- src/SourceBuild/content/eng/build.targets | 14 ++--- .../Archive.cs | 38 +------------- .../GetSingleArchiveItem.cs | 52 +++++++++++++++++++ .../GetSingleTarballItem.cs | 51 ------------------ 4 files changed, 60 insertions(+), 95 deletions(-) create mode 100644 src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/GetSingleArchiveItem.cs delete mode 100644 src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/GetSingleTarballItem.cs diff --git a/src/SourceBuild/content/eng/build.targets b/src/SourceBuild/content/eng/build.targets index bc77c38f94eb..8ea3c1a3c0a5 100644 --- a/src/SourceBuild/content/eng/build.targets +++ b/src/SourceBuild/content/eng/build.targets @@ -1,23 +1,23 @@ - + - - - + + + - + - + - + diff --git a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/Archive.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/Archive.cs index 2e89173b58ec..32e1951aa86b 100644 --- a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/Archive.cs +++ b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/Archive.cs @@ -21,13 +21,9 @@ public static async Task Create(string path, CancellationToken cancella throw new NotSupportedException("Unsupported archive type"); } - public abstract bool Contains(string relativePath); - public abstract string[] GetFileNames(); - public abstract string[] GetFileLines(string relativePath); - - public abstract Task GetFileBytesAsync(string relativePath); + public abstract bool Contains(string relativePath); public abstract void Dispose(); @@ -61,19 +57,6 @@ public override string[] GetFileNames() return Directory.GetFiles(_extractedFolder, "*", SearchOption.AllDirectories).Select(f => f.Substring(_extractedFolder.Length + 1)).ToArray(); } - public override string[] GetFileLines(string relativePath) - { - return File.ReadAllLines(Path.Combine(_extractedFolder, relativePath)); - } - - public override Task GetFileBytesAsync(string relativePath) - { - var filePath = Path.Combine(_extractedFolder, relativePath); - if (!File.Exists(filePath)) - return Task.FromResult([]); - return File.ReadAllBytesAsync(Path.Combine(_extractedFolder, relativePath)); - } - public override void Dispose() { if (Directory.Exists(_extractedFolder)) @@ -105,25 +88,6 @@ public override string[] GetFileNames() return _archive.Entries.Select(e => e.FullName).ToArray(); } - public override string[] GetFileLines(string relativePath) - { - var entry = _archive.GetEntry(relativePath); - if (entry == null) - throw new ArgumentException("File not found"); - return entry.Lines(); - } - public override Task GetFileBytesAsync(string relativePath) - { - using (var entry = _archive.GetEntry(relativePath)?.Open()) - { - if (entry == null) - { - return Task.FromResult([]); - } - return entry.ReadToEndAsync(); - } - } - public override void Dispose() { _archive.Dispose(); diff --git a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/GetSingleArchiveItem.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/GetSingleArchiveItem.cs new file mode 100644 index 000000000000..a902a7ea3307 --- /dev/null +++ b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/GetSingleArchiveItem.cs @@ -0,0 +1,52 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. + +using System; +using System.Collections.Generic; +using Microsoft.Build.Framework; + +public class GetSingleArchiveItem : Microsoft.Build.Utilities.Task +{ + [Required] + public required ITaskItem[] SdkArchiveItems { get; init; } + + [Output] + public string BestSdkArchiveItem { get; set; } = ""; + + public override bool Execute() + { + List archiveItems = new (); + foreach(var item in SdkArchiveItems) + { + try + { + // Ensure the version and RID info can be parsed from the item + _ = Archive.GetInfoFromArchivePath(item.ItemSpec); + archiveItems.Add(item.ItemSpec); + } + catch (ArgumentException e) + { + Log.LogMessage(MessageImportance.High, e.Message); + continue; + } + } + switch (archiveItems.Count){ + case 0: + Log.LogMessage(MessageImportance.High, "No valid archive items found"); + BestSdkArchiveItem = ""; + break; + case 1: + Log.LogMessage(MessageImportance.High, $"{archiveItems[0]} is the only valid archive item found"); + BestSdkArchiveItem = archiveItems[0]; + break; + default: + archiveItems.Sort((a,b) => a.Length - b.Length); + Log.LogMessage(MessageImportance.High, $"Multiple valid archive items found: '{string.Join("', '", archiveItems)}'"); + BestSdkArchiveItem = archiveItems[0]; + Log.LogMessage(MessageImportance.High, $"Choosing '{BestSdkArchiveItem}"); + break; + } + return true; + } + +} diff --git a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/GetSingleTarballItem.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/GetSingleTarballItem.cs deleted file mode 100644 index 9641ad505c0d..000000000000 --- a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/GetSingleTarballItem.cs +++ /dev/null @@ -1,51 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. - -using System; -using System.Collections.Generic; -using Microsoft.Build.Framework; - -public class GetSingleTarballItem : Microsoft.Build.Utilities.Task -{ - [Required] - public required ITaskItem[] SdkTarballItems { get; init; } - - [Output] - public string BestSdkTarballItem { get; set; } = ""; - - public override bool Execute() - { - List tarballItems = new (); - foreach(var item in SdkTarballItems) - { - try - { - var (versionString, rid, extension) = Archive.GetInfoFromArchivePath(item.ItemSpec); - tarballItems.Add(item.ItemSpec); - } - catch (ArgumentException e) - { - Log.LogMessage(MessageImportance.High, e.Message); - continue; - } - } - switch (tarballItems.Count){ - case 0: - Log.LogMessage(MessageImportance.High, "No valid tarball items found"); - BestSdkTarballItem = ""; - break; - case 1: - Log.LogMessage(MessageImportance.High, $"{tarballItems[0]} is the only valid tarball item found"); - BestSdkTarballItem = tarballItems[0]; - break; - default: - tarballItems.Sort((a,b) => a.Length - b.Length); - Log.LogMessage(MessageImportance.High, $"Multiple valid tarball items found: '{string.Join("', '", tarballItems)}'"); - BestSdkTarballItem = tarballItems[0]; - Log.LogMessage(MessageImportance.High, $"Choosing '{BestSdkTarballItem}"); - break; - } - return true; - } - -} From 3cf9a383be01e8423ca73b3ee40e4d332b969407 Mon Sep 17 00:00:00 2001 From: Jackson Schuster <36744439+jtschuster@users.noreply.github.com> Date: Thu, 29 Feb 2024 10:00:40 -0800 Subject: [PATCH 164/261] Use cancellation token in FindArchiveDiff and move directory separator in path builder --- .../FindArchiveDiffs.cs | 10 +++++++--- .../PathWithVersions.cs | 8 ++++---- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/FindArchiveDiffs.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/FindArchiveDiffs.cs index 1d1c7108b254..ac6a444627d6 100644 --- a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/FindArchiveDiffs.cs +++ b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/FindArchiveDiffs.cs @@ -43,13 +43,13 @@ public async Task ExecuteAsync() { var baselineTask = Archive.Create(BaselineArchive.ItemSpec); var testTask = Archive.Create(TestArchive.ItemSpec); - Task.WaitAll(baselineTask, testTask); + Task.WaitAll([baselineTask, testTask], cancellationToken); using var baseline = await baselineTask; using var test = await testTask; var baselineFiles = baseline.GetFileNames(); var testFiles = test.GetFileNames(); ContentDifferences = - GetDiffs(baselineFiles, testFiles, PathWithVersions.Equal, PathWithVersions.GetVersionlessPath) + GetDiffs(baselineFiles, testFiles, PathWithVersions.Equal, PathWithVersions.GetVersionlessPath, cancellationToken) .Select(FromDiff) .ToArray(); return true; @@ -73,8 +73,10 @@ public enum DifferenceKind string[] originalPathsWithVersions, string[] modifiedPathsWithVersions, Func equalityComparer, - Func? formatter = null) + Func? formatter = null, + CancellationToken cancellationToken = default) { + cancellationToken.ThrowIfCancellationRequested(); formatter ??= static s => s; // Edit distance algorithm: https://en.wikipedia.org/wiki/Longest_common_subsequence @@ -93,6 +95,7 @@ public enum DifferenceKind // Compute edit distance for (int i = 1; i <= originalPathsWithVersions.Length; i++) { + cancellationToken.ThrowIfCancellationRequested(); for (int j = 1; j <= modifiedPathsWithVersions.Length; j++) { if (equalityComparer(originalPathsWithVersions[i - 1], modifiedPathsWithVersions[j - 1])) @@ -113,6 +116,7 @@ public enum DifferenceKind List<(string, DifferenceKind)> formattedDiff = []; while (row > 0 || col > 0) { + cancellationToken.ThrowIfCancellationRequested(); var baselineItem = originalPathsWithVersions[row - 1]; var testItem = modifiedPathsWithVersions[col - 1]; if (row > 0 && col > 0 && PathWithVersions.Equal(baselineItem, testItem)) diff --git a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/PathWithVersions.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/PathWithVersions.cs index bc2af0c6b705..28a1f854ee59 100644 --- a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/PathWithVersions.cs +++ b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/PathWithVersions.cs @@ -80,16 +80,16 @@ public static ReadOnlySpan GetVersionlessPath(ReadOnlySpan path) StringBuilder sb = new StringBuilder(); bool altered = false; ReadOnlySpan myPath = path; - while (TryGetPathLeaf(myPath, out var directory, out var directoryPart)) + while (TryGetPathLeaf(myPath, out var root, out var leaf)) { - sb = sb.Insert(0, Path.DirectorySeparatorChar); - var versionOrDirectory = ReplaceVersionString(directoryPart); + var versionOrDirectory = ReplaceVersionString(leaf); if (versionOrDirectory == VersionPlaceholder) { altered = true; } sb = sb.Insert(0, versionOrDirectory); - myPath = directory; + sb = sb.Insert(0, Path.DirectorySeparatorChar); + myPath = root; } if (!altered) return path; From 478bb285c11482064a81b3029c330667103a9635 Mon Sep 17 00:00:00 2001 From: Jackson Schuster <36744439+jtschuster@users.noreply.github.com> Date: Thu, 29 Feb 2024 10:32:22 -0800 Subject: [PATCH 165/261] PR Feedback: use underscore prefix for 'local' properties --- src/SourceBuild/content/eng/build.targets | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/SourceBuild/content/eng/build.targets b/src/SourceBuild/content/eng/build.targets index 8ea3c1a3c0a5..7ddc69e09e05 100644 --- a/src/SourceBuild/content/eng/build.targets +++ b/src/SourceBuild/content/eng/build.targets @@ -12,17 +12,17 @@ - + - + - - + + - - + + From 6f89dca1f3672bde510a20035b4bf3af735c9067 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 29 Feb 2024 23:39:48 +0000 Subject: [PATCH 166/261] Update dependencies from https://github.com/dotnet/sdk build 20240229.10 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24129.1 -> To Version 8.0.300-preview.24129.10 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.10.0-3.24127.10 -> To Version 4.10.0-3.24128.4 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b5047210beed..98b17149c7eb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - 16cb8921723b123643fc66c3fb83c38bc90ec894 + 261c1eab018404c9c381bdfae3ac15ebcbe5288f - + https://github.com/dotnet/sdk - 16cb8921723b123643fc66c3fb83c38bc90ec894 + 261c1eab018404c9c381bdfae3ac15ebcbe5288f - + https://github.com/dotnet/sdk - 16cb8921723b123643fc66c3fb83c38bc90ec894 + 261c1eab018404c9c381bdfae3ac15ebcbe5288f - + https://github.com/dotnet/sdk - 16cb8921723b123643fc66c3fb83c38bc90ec894 + 261c1eab018404c9c381bdfae3ac15ebcbe5288f https://github.com/dotnet/test-templates @@ -150,9 +150,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 1381d5ebd2ab1f292848d5b19b80cf71ac332508 - + https://github.com/dotnet/roslyn - 5e6349e1c07c535ec698b00075d8b4f5babfd2b6 + 1d9ee7f5e9b3b6d681ce8d89d4b252619b704088 diff --git a/eng/Versions.props b/eng/Versions.props index f27eb70da373..4e12183e37d1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,16 +85,16 @@ - 8.0.300-preview.24129.1 - 8.0.300-preview.24129.1 - 8.0.300-preview.24129.1 + 8.0.300-preview.24129.10 + 8.0.300-preview.24129.10 + 8.0.300-preview.24129.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.10.0-3.24127.10 + 4.10.0-3.24128.4 From 12afb0c1400db64c3f76d6babfe58d1c9b930101 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 1 Mar 2024 08:10:27 +0000 Subject: [PATCH 167/261] Update dependencies from https://github.com/dotnet/sdk build 20240229.14 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24129.10 -> To Version 8.0.300-preview.24129.14 Dependency coherency updates NuGet.Build.Tasks From Version 6.10.0-preview.2.49 -> To Version 6.10.0-preview.2.52 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3ae6ddf2fa6d..5a52bd5676d2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - 261c1eab018404c9c381bdfae3ac15ebcbe5288f + 0dc3260dcf0ba5d5b10e7c533b303353b5cd901c - + https://github.com/dotnet/sdk - 261c1eab018404c9c381bdfae3ac15ebcbe5288f + 0dc3260dcf0ba5d5b10e7c533b303353b5cd901c - + https://github.com/dotnet/sdk - 261c1eab018404c9c381bdfae3ac15ebcbe5288f + 0dc3260dcf0ba5d5b10e7c533b303353b5cd901c - + https://github.com/dotnet/sdk - 261c1eab018404c9c381bdfae3ac15ebcbe5288f + 0dc3260dcf0ba5d5b10e7c533b303353b5cd901c https://github.com/dotnet/test-templates @@ -159,9 +159,9 @@ https://github.com/dotnet/msbuild 6f44380e4fdea6ddf5c11f48efeb25c2bf181e62 - + https://github.com/nuget/nuget.client - 5ecd0be8cb73db807189427eb8e0f7bfd334c1e0 + 6009531090c927a8e61da9a0f97bdd5eb6f01a47 diff --git a/eng/Versions.props b/eng/Versions.props index 6b5af7061e31..ed42973e6412 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24129.10 - 8.0.300-preview.24129.10 - 8.0.300-preview.24129.10 + 8.0.300-preview.24129.14 + 8.0.300-preview.24129.14 + 8.0.300-preview.24129.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -127,7 +127,7 @@ - 6.10.0-preview.2.49 + 6.10.0-preview.2.52 From 78173447fca3c21fc12e2445bb8cbeafc4ef9a6d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 1 Mar 2024 08:50:22 +0000 Subject: [PATCH 168/261] Update dependencies from https://github.com/dotnet/sdk build 20240301.1 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24129.10 -> To Version 8.0.300-preview.24151.1 Dependency coherency updates NuGet.Build.Tasks From Version 6.10.0-preview.2.49 -> To Version 6.10.0-preview.2.52 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5a52bd5676d2..6b9d2cad56bb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - 0dc3260dcf0ba5d5b10e7c533b303353b5cd901c + 5cc5fe81e7587b2925c1478dbe980e30b73287f4 - + https://github.com/dotnet/sdk - 0dc3260dcf0ba5d5b10e7c533b303353b5cd901c + 5cc5fe81e7587b2925c1478dbe980e30b73287f4 - + https://github.com/dotnet/sdk - 0dc3260dcf0ba5d5b10e7c533b303353b5cd901c + 5cc5fe81e7587b2925c1478dbe980e30b73287f4 - + https://github.com/dotnet/sdk - 0dc3260dcf0ba5d5b10e7c533b303353b5cd901c + 5cc5fe81e7587b2925c1478dbe980e30b73287f4 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index ed42973e6412..a9a7ea759ab4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24129.14 - 8.0.300-preview.24129.14 - 8.0.300-preview.24129.14 + 8.0.300-preview.24151.1 + 8.0.300-preview.24151.1 + 8.0.300-preview.24151.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 421ada93e26732a742e28f3ad8a94a069afccdc5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 1 Mar 2024 13:55:30 +0000 Subject: [PATCH 169/261] Update dependencies from https://github.com/dotnet/arcade-services build 20240229.1 Microsoft.DotNet.Darc , Microsoft.DotNet.DarcLib From Version 1.1.0-beta.24128.3 -> To Version 1.1.0-beta.24129.1 --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index bc127e205cd7..89ddcab6a237 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.24128.3", + "version": "1.1.0-beta.24129.1", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3ae6ddf2fa6d..b7ea3ae19e8f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -227,13 +227,13 @@ https://github.com/dotnet/arcade 042763a811fd94dc3556253d4c64118dd665216e - + https://github.com/dotnet/arcade-services - 0dcdc1c1157372aeae9ae74757930abaddebb4c6 + de6ff482f3e43757677a649c59a056d6275bc655 - + https://github.com/dotnet/arcade-services - 0dcdc1c1157372aeae9ae74757930abaddebb4c6 + de6ff482f3e43757677a649c59a056d6275bc655 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 6b5af7061e31..a8b99b5ea3ff 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 1.1.0-beta.24128.3 + 1.1.0-beta.24129.1 From f84323905dfccd0f3d316e7735ca715674c3dde6 Mon Sep 17 00:00:00 2001 From: Jackson Schuster <36744439+jtschuster@users.noreply.github.com> Date: Fri, 1 Mar 2024 10:42:14 -0800 Subject: [PATCH 170/261] PR Feedback: - Extract common archive diffing into a base class - Move Diff utils to a separate class - Return all valid archives and assert only one valid SDK archive - Use Arcade VersionIdentifier util class --- src/SourceBuild/content/eng/build.targets | 39 ++- .../Archive.cs | 35 +-- .../Diff.cs | 127 +++++++++ .../FindArchiveDiffs.cs | 105 +------ .../GetClosestArchiveVersion.cs | 94 +++++++ .../GetClosestOfficialSdk.cs | 73 ++--- ...ArchiveItem.cs => GetValidArchiveItems.cs} | 31 ++- .../PathWithVersions.cs | 112 -------- .../VersionIdentifier.cs | 257 ++++++++++++++++++ .../ZipArchiveExtensions.cs | 78 ------ 10 files changed, 566 insertions(+), 385 deletions(-) create mode 100644 src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/Diff.cs create mode 100644 src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/GetClosestArchiveVersion.cs rename src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/{GetSingleArchiveItem.cs => GetValidArchiveItems.cs} (58%) delete mode 100644 src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/PathWithVersions.cs create mode 100644 src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/VersionIdentifier.cs delete mode 100644 src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/ZipArchiveExtensions.cs diff --git a/src/SourceBuild/content/eng/build.targets b/src/SourceBuild/content/eng/build.targets index 7ddc69e09e05..9a6eabd2be79 100644 --- a/src/SourceBuild/content/eng/build.targets +++ b/src/SourceBuild/content/eng/build.targets @@ -1,28 +1,41 @@ - + - + - - - + + + - - - + - + + + - - + + - - + + + diff --git a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/Archive.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/Archive.cs index 32e1951aa86b..0b862af52aa9 100644 --- a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/Archive.cs +++ b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/Archive.cs @@ -39,8 +39,8 @@ private TarArchive(string extractedFolder) public static new async Task Create(string path, CancellationToken cancellationToken = default) { var tmpFolder = Directory.CreateTempSubdirectory(nameof(FindArchiveDiffs)); - using (var gzStream = File.OpenRead (path)) - using (var gzipStream = new GZipStream (gzStream, CompressionMode.Decompress)) + using (var gzStream = File.OpenRead(path)) + using (var gzipStream = new GZipStream(gzStream, CompressionMode.Decompress)) { await TarFile.ExtractToDirectoryAsync(gzipStream, tmpFolder.FullName, true, cancellationToken); } @@ -94,31 +94,34 @@ public override void Dispose() } } - public static (string Version, string Rid, string extension) GetInfoFromArchivePath(string path) + private static string GetArchiveExtension(string path) { - string extension; if (path.EndsWith(".tar.gz")) { - extension = ".tar.gz"; + return ".tar.gz"; } else if (path.EndsWith(".zip")) { - extension = ".zip"; + return ".zip"; } else { throw new ArgumentException($"Invalid archive extension '{path}': must end with .tar.gz or .zip"); } + } - string filename = Path.GetFileName(path)[..^extension.Length]; - var dashDelimitedParts = filename.Split('-'); - var (rid, versionString) = dashDelimitedParts switch - { - ["dotnet", "sdk", var first, var second, var third, var fourth] when PathWithVersions.IsVersionString(first) => (third + '-' + fourth, first + '-' + second), - ["dotnet", "sdk", var first, var second, var third, var fourth] when PathWithVersions.IsVersionString(third) => (first + '-' + second, third + '-' + fourth), - _ => throw new ArgumentException($"Invalid archive file name '{filename}': file name should include full build version and rid in the format dotnet-sdk--{extension} or dotnet-sdk--{extension}") - }; - - return (versionString, rid, extension); + public static (string Version, string Rid, string extension) GetInfoFromFileName(string filename, string packageName) + { + var extension = GetArchiveExtension(filename); + var Version = VersionIdentifier.GetVersion(filename); + if (Version is null) + throw new ArgumentException("Invalid archive file name '{filename}': No valid version found in file name."); + // Once we've removed the version, package name, and extension, we should be left with the RID + var Rid = filename + .Replace(extension, "") + .Replace(Version, "") + .Replace(packageName, "") + .Trim('-', '.', '_'); + return (Version, Rid, extension); } } diff --git a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/Diff.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/Diff.cs new file mode 100644 index 000000000000..ab1676f97fed --- /dev/null +++ b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/Diff.cs @@ -0,0 +1,127 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. + +using System; +using System.Collections.Generic; +using System.Diagnostics; +using System.Threading; +using Microsoft.Build.Framework; +using Microsoft.Build.Utilities; + +static class Diff +{ + public static ITaskItem TaskItemFromDiff((string, DifferenceKind) diff) + { + var item = new TaskItem(diff.Item1); + item.SetMetadata("Kind", Enum.GetName(diff.Item2)); + return item; + } + + public enum DifferenceKind + { + /// + /// Present in the test but not in the baseline + /// + Added, + + /// + /// Present in the baseline but not in the test + /// + Removed, + + /// + /// Present in both the baseline and test + /// + Unchanged + } + + /// + /// Uses the Longest Common Subsequence algorithm (as used in 'git diff') to find the differences between two lists of strings. + /// Returns a list of the joined lists with the differences marked as either added or removed. + /// + public static List<(string, DifferenceKind DifferenceKind)> GetDiffs( + Span baselineSequence, + Span testSequence, + Func equalityComparer, + Func? formatter = null, + CancellationToken cancellationToken = default) + { + // Edit distance algorithm: https://en.wikipedia.org/wiki/Longest_common_subsequence + // cancellationToken.ThrowIfCancellationRequested(); + formatter ??= static s => s; + List<(string, DifferenceKind)> diff = []; + + // Optimization: remove common prefix + int i = 0; + while (i < baselineSequence.Length && i < testSequence.Length && equalityComparer(baselineSequence[i], testSequence[i])) + { + diff.Add((formatter(baselineSequence[i]), DifferenceKind.Unchanged)); + i++; + } + + baselineSequence = baselineSequence[i..]; + testSequence = testSequence[i..]; + + // Initialize first row and column + int[,] m = new int[baselineSequence.Length + 1, testSequence.Length + 1]; + for (i = 0; i <= baselineSequence.Length; i++) + { + m[i, 0] = i; + } + for (i = 0; i <= testSequence.Length; i++) + { + m[0, i] = i; + } + + // Compute edit distance + for (i = 1; i <= baselineSequence.Length; i++) + { + cancellationToken.ThrowIfCancellationRequested(); + for (int j = 1; j <= testSequence.Length; j++) + { + if (equalityComparer(baselineSequence[i - 1], testSequence[j - 1])) + { + m[i, j] = m[i - 1, j - 1]; + } + else + { + m[i, j] = 1 + Math.Min(m[i - 1, j], m[i, j - 1]); + } + } + } + + // Trace back the edits + int row = baselineSequence.Length; + int col = testSequence.Length; + + while (row > 0 || col > 0) + { + cancellationToken.ThrowIfCancellationRequested(); + var baselineItem = baselineSequence[row - 1]; + var testItem = testSequence[col - 1]; + if (row > 0 && col > 0 && equalityComparer(baselineItem, testItem)) + { + diff.Add((formatter(baselineSequence[row - 1]), DifferenceKind.Unchanged)); + row--; + col--; + } + else if (col > 0 && (row == 0 || m[row, col - 1] <= m[row - 1, col])) + { + diff.Add((formatter(testSequence[col - 1]), DifferenceKind.Added)); + col--; + } + else if (row > 0 && (col == 0 || m[row, col - 1] > m[row - 1, col])) + { + diff.Add((formatter(baselineSequence[row - 1]), DifferenceKind.Removed)); + row--; + } + else + { + throw new UnreachableException(); + } + } + diff.Reverse(); + return diff; + } + +} diff --git a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/FindArchiveDiffs.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/FindArchiveDiffs.cs index ac6a444627d6..9fc19a7385c0 100644 --- a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/FindArchiveDiffs.cs +++ b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/FindArchiveDiffs.cs @@ -1,23 +1,14 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using System; -using System.Collections.Generic; -using System.Diagnostics; using System.Linq; using System.Threading; using System.Threading.Tasks; using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; using Task = System.Threading.Tasks.Task; public class FindArchiveDiffs : Microsoft.Build.Utilities.Task, ICancelableTask { - public class ArchiveItem - { - public required string Path { get; init; } - } - [Required] public required ITaskItem BaselineArchive { get; init; } @@ -29,10 +20,6 @@ public class ArchiveItem private CancellationTokenSource _cancellationTokenSource = new(); private CancellationToken cancellationToken => _cancellationTokenSource.Token; - public void Cancel() - { - _cancellationTokenSource.Cancel(); - } public override bool Execute() { @@ -49,98 +36,14 @@ public async Task ExecuteAsync() var baselineFiles = baseline.GetFileNames(); var testFiles = test.GetFileNames(); ContentDifferences = - GetDiffs(baselineFiles, testFiles, PathWithVersions.Equal, PathWithVersions.GetVersionlessPath, cancellationToken) - .Select(FromDiff) + Diff.GetDiffs(baselineFiles, testFiles, VersionIdentifier.AreVersionlessEqual, static p => VersionIdentifier.RemoveVersions(p, "{VERSION}"), cancellationToken) + .Select(Diff.TaskItemFromDiff) .ToArray(); return true; } - static ITaskItem FromDiff((string, DifferenceKind) diff) - { - var item = new TaskItem(diff.Item1); - item.SetMetadata("Kind", Enum.GetName(diff.Item2)); - return item; - } - - public enum DifferenceKind - { - Added, - Removed, - Unchanged - } - - public static List<(string, DifferenceKind DifferenceKind)> GetDiffs( - string[] originalPathsWithVersions, - string[] modifiedPathsWithVersions, - Func equalityComparer, - Func? formatter = null, - CancellationToken cancellationToken = default) + public void Cancel() { - cancellationToken.ThrowIfCancellationRequested(); - formatter ??= static s => s; - // Edit distance algorithm: https://en.wikipedia.org/wiki/Longest_common_subsequence - - int[,] dp = new int[originalPathsWithVersions.Length + 1, modifiedPathsWithVersions.Length + 1]; - - // Initialize first row and column - for (int i = 0; i <= originalPathsWithVersions.Length; i++) - { - dp[i, 0] = i; - } - for (int j = 0; j <= modifiedPathsWithVersions.Length; j++) - { - dp[0, j] = j; - } - - // Compute edit distance - for (int i = 1; i <= originalPathsWithVersions.Length; i++) - { - cancellationToken.ThrowIfCancellationRequested(); - for (int j = 1; j <= modifiedPathsWithVersions.Length; j++) - { - if (equalityComparer(originalPathsWithVersions[i - 1], modifiedPathsWithVersions[j - 1])) - { - dp[i, j] = dp[i - 1, j - 1]; - } - else - { - dp[i, j] = 1 + Math.Min(dp[i - 1, j], dp[i, j - 1]); - } - } - } - - // Trace back the edits - int row = originalPathsWithVersions.Length; - int col = modifiedPathsWithVersions.Length; - - List<(string, DifferenceKind)> formattedDiff = []; - while (row > 0 || col > 0) - { - cancellationToken.ThrowIfCancellationRequested(); - var baselineItem = originalPathsWithVersions[row - 1]; - var testItem = modifiedPathsWithVersions[col - 1]; - if (row > 0 && col > 0 && PathWithVersions.Equal(baselineItem, testItem)) - { - formattedDiff.Add((formatter(originalPathsWithVersions[row - 1]), DifferenceKind.Unchanged)); - row--; - col--; - } - else if (col > 0 && (row == 0 || dp[row, col - 1] <= dp[row - 1, col])) - { - formattedDiff.Add((formatter(modifiedPathsWithVersions[col - 1]), DifferenceKind.Added)); - col--; - } - else if (row > 0 && (col == 0 || dp[row, col - 1] > dp[row - 1, col])) - { - formattedDiff.Add((formatter(originalPathsWithVersions[row - 1]), DifferenceKind.Removed)); - row--; - } - else - { - throw new UnreachableException(); - } - } - formattedDiff.Reverse(); - return formattedDiff; + _cancellationTokenSource.Cancel(); } } diff --git a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/GetClosestArchiveVersion.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/GetClosestArchiveVersion.cs new file mode 100644 index 000000000000..fc69a385a9ac --- /dev/null +++ b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/GetClosestArchiveVersion.cs @@ -0,0 +1,94 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. + +using System; +using System.IO; +using System.Net.Http; +using System.Threading; +using System.Threading.Tasks; +using Microsoft.Build.Framework; + +public abstract class GetClosestArchive : Microsoft.Build.Utilities.Task, ICancelableTask +{ + [Required] + public required string BuiltArchivePath { get; init; } + + [Output] + public string ClosestOfficialArchivePath { get; set; } = ""; + + private string? _builtVersion; + protected string BuiltVersion + { + get => _builtVersion ?? throw new InvalidOperationException(); + private set => _builtVersion = value; + } + + private string? _builtRid; + protected string BuiltRid + { + get => _builtRid ?? throw new InvalidOperationException(); + private set => _builtRid = value; + } + + private string? _archiveExtension; + protected string ArchiveExtension + { + get => _archiveExtension ?? throw new InvalidOperationException(); + private set => _archiveExtension = value; + } + + /// + /// The name of the package to find the closest official archive for. For example, "dotnet-sdk" or "aspnetcore-runtime". + /// + protected abstract string ArchiveName { get; } + + private CancellationTokenSource _cancellationTokenSource = new(); + protected CancellationToken CancellationToken => _cancellationTokenSource.Token; + public void Cancel() + { + _cancellationTokenSource.Cancel(); + } + + /// + /// Get the URL of the latest official archive for the given version string and RID. + /// + public abstract Task GetLatestOfficialArchiveUrl(); + + public abstract Task GetClosestOfficialArchiveVersion(); + + public override bool Execute() + { + return Task.Run(ExecuteAsync).Result; + } + + public async Task ExecuteAsync() + { + CancellationToken.ThrowIfCancellationRequested(); + var filename = Path.GetFileName(BuiltArchivePath); + (BuiltVersion, BuiltRid, ArchiveExtension) = Archive.GetInfoFromFileName(filename, ArchiveName); + Log.LogMessage($"Finding closest official archive for '{ArchiveName}' version '{BuiltVersion}' RID '{BuiltRid}'"); + + string? downloadUrl = await GetLatestOfficialArchiveUrl(); + if (downloadUrl == null) + { + Log.LogError($"Failed to find a download URL for '{ArchiveName}' version '{BuiltVersion}' RID '{BuiltRid}'"); + return false; + } + + HttpClient client = new HttpClient(); + + Log.LogMessage(MessageImportance.High, $"Downloading {downloadUrl}"); + HttpResponseMessage packageResponse = await client.GetAsync(downloadUrl, CancellationToken); + + var packageUriPath = packageResponse.RequestMessage!.RequestUri!.LocalPath; + + ClosestOfficialArchivePath = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName() + $".{ArchiveName}-{BuiltVersion}-{BuiltRid}.closest.{ArchiveExtension}"); + Log.LogMessage($"Copying {packageUriPath} to {ClosestOfficialArchivePath}"); + using (var file = File.Create(ClosestOfficialArchivePath)) + { + await packageResponse.Content.CopyToAsync(file, CancellationToken); + } + + return true; + } +} diff --git a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/GetClosestOfficialSdk.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/GetClosestOfficialSdk.cs index e5cd717a8fa5..95819f7be314 100644 --- a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/GetClosestOfficialSdk.cs +++ b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/GetClosestOfficialSdk.cs @@ -1,73 +1,44 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using System.IO; using System.Net; using System.Net.Http; -using System.Threading; using System.Threading.Tasks; using Microsoft.Build.Framework; -public class GetClosestOfficialSdk : Microsoft.Build.Utilities.Task, ICancelableTask +public class GetClosestOfficialSdk : GetClosestArchive { - [Required] - public required string BuiltSdkPath { get; init; } + protected override string ArchiveName => "dotnet-sdk"; - [Output] - public string ClosestOfficialSdkPath { get; set; } = ""; + HttpClient client = new HttpClient(new HttpClientHandler() { AllowAutoRedirect = false }); - public override bool Execute() - { - return Task.Run(ExecuteAsync).Result; - } - - private CancellationTokenSource _cancellationTokenSource = new(); - private CancellationToken cancellationToken => _cancellationTokenSource.Token; - public void Cancel() - { - _cancellationTokenSource.Cancel(); - } + private string? closestVersion; + private string? closestUrl; - public async Task ExecuteAsync() + public override async Task GetLatestOfficialArchiveUrl() { - cancellationToken.ThrowIfCancellationRequested(); - var (versionString, rid, extension) = Archive.GetInfoFromArchivePath(BuiltSdkPath); - - string downloadUrl = GetLatestOfficialSdkUrl(versionString, rid, extension); - - Log.LogMessage(MessageImportance.High, $"Downloading {downloadUrl}"); - var handler = new HttpClientHandler() - { - AllowAutoRedirect = false - }; - var client = new HttpClient(handler); - var redirectResponse = await client.GetAsync(downloadUrl, cancellationToken); + // Channel in the form of 9.0.1xx + var channel = BuiltVersion[..5] + "xx"; + var akaMsUrl = $"https://aka.ms/dotnet/{channel}/daily/{ArchiveName}-{BuiltRid}{ArchiveExtension}"; + var redirectResponse = await client.GetAsync(akaMsUrl, CancellationToken); // aka.ms returns a 301 for valid redirects and a 302 to Bing for invalid URLs if (redirectResponse.StatusCode != HttpStatusCode.Moved) { - Log.LogMessage(MessageImportance.High, $"Failed to download '{downloadUrl}': invalid aka.ms URL"); - return true; + Log.LogMessage(MessageImportance.High, $"Failed to find package at '{akaMsUrl}': invalid aka.ms URL"); + return null; } - var packageResponse = await client.GetAsync(redirectResponse.Headers.Location!, cancellationToken); - - var packageUriPath = packageResponse.RequestMessage!.RequestUri!.LocalPath; - string downloadedVersion = PathWithVersions.GetVersionInPath(packageUriPath).ToString(); - - ClosestOfficialSdkPath = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName() + $".dotnet-sdk-{downloadedVersion}-{rid}{extension}"); - Log.LogMessage($"Copying {packageUriPath} to {ClosestOfficialSdkPath}"); - using (var file = File.Create(ClosestOfficialSdkPath)) - { - await packageResponse.Content.CopyToAsync(file, cancellationToken); - } - - return true; + closestUrl = redirectResponse.Headers.Location!.ToString(); + closestVersion = VersionIdentifier.GetVersion(closestUrl); + return closestUrl; } - string GetLatestOfficialSdkUrl(string versionString, string rid, string extension) + public override async Task GetClosestOfficialArchiveVersion() { - // Channel in the form of 9.0.1xx - var channel = versionString[..5] + "xx"; - return $"https://aka.ms/dotnet/{channel}/daily/dotnet-sdk-{rid}{extension}"; + if (closestUrl is not null) + { + return closestVersion; + } + _ = await GetLatestOfficialArchiveUrl(); + return closestVersion; } - } diff --git a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/GetSingleArchiveItem.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/GetValidArchiveItems.cs similarity index 58% rename from src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/GetSingleArchiveItem.cs rename to src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/GetValidArchiveItems.cs index a902a7ea3307..3ebcc571a0f4 100644 --- a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/GetSingleArchiveItem.cs +++ b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/GetValidArchiveItems.cs @@ -5,24 +5,27 @@ using System.Collections.Generic; using Microsoft.Build.Framework; -public class GetSingleArchiveItem : Microsoft.Build.Utilities.Task +public class GetValidArchiveItems : Microsoft.Build.Utilities.Task { [Required] - public required ITaskItem[] SdkArchiveItems { get; init; } + public required ITaskItem[] ArchiveItems { get; init; } + + [Required] + public required string ArchiveName { get; init; } [Output] - public string BestSdkArchiveItem { get; set; } = ""; + public ITaskItem[] ValidArchiveItems { get; set; } = []; public override bool Execute() { - List archiveItems = new (); - foreach(var item in SdkArchiveItems) + List archiveItems = new(); + foreach (var item in ArchiveItems) { try { // Ensure the version and RID info can be parsed from the item - _ = Archive.GetInfoFromArchivePath(item.ItemSpec); - archiveItems.Add(item.ItemSpec); + _ = Archive.GetInfoFromFileName(item.ItemSpec, ArchiveName); + archiveItems.Add(item); } catch (ArgumentException e) { @@ -30,20 +33,20 @@ public override bool Execute() continue; } } - switch (archiveItems.Count){ + switch (archiveItems.Count) + { case 0: Log.LogMessage(MessageImportance.High, "No valid archive items found"); - BestSdkArchiveItem = ""; - break; + ValidArchiveItems = []; + return false; case 1: Log.LogMessage(MessageImportance.High, $"{archiveItems[0]} is the only valid archive item found"); - BestSdkArchiveItem = archiveItems[0]; + ValidArchiveItems = archiveItems.ToArray(); break; default: - archiveItems.Sort((a,b) => a.Length - b.Length); + archiveItems.Sort((a, b) => a.ItemSpec.Length - b.ItemSpec.Length); Log.LogMessage(MessageImportance.High, $"Multiple valid archive items found: '{string.Join("', '", archiveItems)}'"); - BestSdkArchiveItem = archiveItems[0]; - Log.LogMessage(MessageImportance.High, $"Choosing '{BestSdkArchiveItem}"); + ValidArchiveItems = archiveItems.ToArray(); break; } return true; diff --git a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/PathWithVersions.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/PathWithVersions.cs deleted file mode 100644 index 28a1f854ee59..000000000000 --- a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/PathWithVersions.cs +++ /dev/null @@ -1,112 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. - -using System; -using System.IO; -using System.Text; - -public static class PathWithVersions -{ - public const string VersionPlaceholder = "{VERSION}"; - - public static bool Equal(string path1, string path2) - { - if (path1 == path2) - { - return true; - } - - ReadOnlySpan directory = path1; - ReadOnlySpan directory2 = path2; - while (TryGetPathLeaf(directory, out var root, out var directoryPart) && TryGetPathLeaf(directory2, out var root2, out var directoryPart2)) - { - if (!ReplaceVersionString(directoryPart).SequenceEqual(ReplaceVersionString(directoryPart2))) - { - return false; - } - directory= Path.GetDirectoryName(directory); - directory2= Path.GetDirectoryName(directory2); - } - if (!directory.IsEmpty || !directory2.IsEmpty) - { - return false; - } - return true; - } - - public static bool IsVersionString(ReadOnlySpan directoryPart) - { - return directoryPart.Length >= 6 - && char.IsDigit(directoryPart[0]) - && directoryPart[1] == '.' - && char.IsDigit(directoryPart[2]) - && directoryPart[3] == '.' - && char.IsDigit(directoryPart[4]) - && ((char.IsDigit(directoryPart[5]) && char.IsDigit(directoryPart[6])) || directoryPart[5] == '-'); - } - - static ReadOnlySpan ReplaceVersionString(ReadOnlySpan directoryPart) - { - if (IsVersionString(directoryPart)) - { - return VersionPlaceholder; - } - else - { - return directoryPart; - } - } - - static bool TryGetPathLeaf(ReadOnlySpan path, out ReadOnlySpan root, out ReadOnlySpan leaf) - { - if (path.IsEmpty) - { - root = default; - leaf = default; - return false; - } - leaf = Path.GetFileName(path); - root = Path.GetDirectoryName(path); - return true; - } - - public static string GetVersionlessPath(string path) - { - return GetVersionlessPath(path.AsSpan()).ToString(); - } - - public static ReadOnlySpan GetVersionlessPath(ReadOnlySpan path) - { - StringBuilder sb = new StringBuilder(); - bool altered = false; - ReadOnlySpan myPath = path; - while (TryGetPathLeaf(myPath, out var root, out var leaf)) - { - var versionOrDirectory = ReplaceVersionString(leaf); - if (versionOrDirectory == VersionPlaceholder) - { - altered = true; - } - sb = sb.Insert(0, versionOrDirectory); - sb = sb.Insert(0, Path.DirectorySeparatorChar); - myPath = root; - } - if (!altered) - return path; - return sb.ToString(); - } - - public static ReadOnlySpan GetVersionInPath(ReadOnlySpan path) - { - ReadOnlySpan myPath = path; - while (TryGetPathLeaf(myPath, out var directory, out var directoryPart)) - { - if (IsVersionString(directoryPart)) - { - return directoryPart; - } - myPath = directory; - } - throw new ArgumentException("Path does not contain a version"); - } -} diff --git a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/VersionIdentifier.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/VersionIdentifier.cs new file mode 100644 index 000000000000..82c58c8d449e --- /dev/null +++ b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/VersionIdentifier.cs @@ -0,0 +1,257 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. + +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +// Copied from https://github.com/dotnet/arcade/blob/903d35c426248ade56719db5bc0947cd7634b297/eng/common/native/init-distro-rid.sh +// Conflicting MSBuild versions and some customizations make it difficult to use the Arcade assembly. +public static class VersionIdentifier +{ + private static readonly HashSet _knownTags = new HashSet + { + "alpha", + "beta", + "preview", + "prerelease", + "servicing", + "rtm", + "rc" + }; + + private static readonly SortedDictionary _sequencesToReplace = + new SortedDictionary + { + { "-.", "." }, + { "..", "." }, + { "--", "-" }, + { "//", "/" }, + { "_.", "." } + }; + + private const string _finalSuffix = "final"; + + private static readonly char[] _delimiters = new char[] { '.', '-', '_' }; + + /// + /// Identify the version of an asset. + /// + /// Asset names can come in two forms: + /// - Blobs that include the full path + /// - Packages that do not include any path elements. + /// + /// There may be multiple different version numbers in a blob path. + /// This method starts at the last segment of the path and works backward to find a version number. + /// + /// Asset name + /// Version, or null if none is found. + public static string? GetVersion(string assetName) + { + string[] pathSegments = assetName.Split(new char[] { '/' }, StringSplitOptions.RemoveEmptyEntries); + string? potentialVersion = null; + for (int i = pathSegments.Length - 1; i >= 0; i--) + { + potentialVersion = GetVersionForSingleSegment(pathSegments[i]); + if (potentialVersion != null) + { + return potentialVersion; + } + } + + return potentialVersion; + } + + /// + /// Identify the version number of an asset segment. + /// + /// Asset segment + /// Version number, or null if none was found + /// + /// Identifying versions is not particularly easy. To constrain the problem, + /// we apply the following assumptions which are generally valid for .NET Core. + /// - We always have major.minor.patch, and it always begins the version string. + /// - The only pre-release or build metadata labels we use begin with the _knownTags shown above. + /// - We use additional numbers in our version numbers after the initial + /// major.minor.patch-prereleaselabel.prereleaseiteration segment, + /// but any non-numeric element will end the version string. + /// - The we use in versions and file names are ., -, and _. + /// + private static string? GetVersionForSingleSegment(string assetPathSegment) + { + + // Find the start of the version number by finding the major.minor.patch. + // Scan the string forward looking for a digit preceded by one of the delimiters, + // then look for a minor.patch, completing the major.minor.patch. Continue to do so until we get + // to something that is NOT major.minor.patch (this is necessary because we sometimes see things like: + // VS.Redist.Common.NetCore.Templates.x86.2.2.3.0.101-servicing-014320.nupkg + // Continue iterating until we find ALL potential versions. Return the one that is the latest in the segment + // This is to deal with files with multiple major.minor.patchs in the file name, for example: + // Microsoft.NET.Workload.Mono.ToolChain.Manifest-6.0.100.Msi.x64.6.0.0-rc.1.21380.2.symbols.nupkg + + int currentIndex = 0; + // Stack of major.minor.patch. + Stack<(int versionNumber, int index)> majorMinorPatchStack = new Stack<(int, int)>(3); + string? majorMinorPatch = null; + int majorMinorPatchIndex = 0; + StringBuilder versionSuffix = new StringBuilder(); + char prevDelimiterCharacter = char.MinValue; + char nextDelimiterCharacter = char.MinValue; + Dictionary majorMinorPatchDictionary = new Dictionary(); + while (true) + { + string nextSegment; + prevDelimiterCharacter = nextDelimiterCharacter; + int nextDelimiterIndex = assetPathSegment.IndexOfAny(_delimiters, currentIndex); + if (nextDelimiterIndex != -1) + { + nextDelimiterCharacter = assetPathSegment[nextDelimiterIndex]; + nextSegment = assetPathSegment.Substring(currentIndex, nextDelimiterIndex - currentIndex); + } + else + { + nextSegment = assetPathSegment.Substring(currentIndex); + } + + // If we have not yet found the major/minor/patch, then there are four cases: + // - There have been no potential major/minor/patch numbers found and the current segment is a number. Push onto the majorMinorPatch stack + // and continue. + // - There has been at least one number found, but less than 3, and the current segment not a number or not preceded by '.'. In this case, + // we should clear out the stack and continue the search. + // - There have been at least 2 numbers found and the current segment is a number and preceded by '.'. Push onto the majorMinorPatch stack and continue + // - There have been at least 3 numbers found and the current segment is not a number or not preceded by '-'. In this case, we can call this the major minor + // patch number and no longer need to continue searching + if (majorMinorPatch == null) + { + bool isNumber = int.TryParse(nextSegment, out int potentialVersionSegment); + if ((majorMinorPatchStack.Count == 0 && isNumber) || + (majorMinorPatchStack.Count > 0 && prevDelimiterCharacter == '.' && isNumber)) + { + majorMinorPatchStack.Push((potentialVersionSegment, currentIndex)); + } + // Check for partial major.minor.patch cases, like: 2.2.bar or 2.2-100.bleh + else if (majorMinorPatchStack.Count > 0 && majorMinorPatchStack.Count < 3 && + (prevDelimiterCharacter != '.' || !isNumber)) + { + majorMinorPatchStack.Clear(); + } + + // Determine whether we are done with major.minor.patch after this update. + if (majorMinorPatchStack.Count >= 3 && (prevDelimiterCharacter != '.' || !isNumber || nextDelimiterIndex == -1)) + { + // Done with major.minor.patch, found. Pop the top 3 elements off the stack. + (int patch, int patchIndex) = majorMinorPatchStack.Pop(); + (int minor, int minorIndex) = majorMinorPatchStack.Pop(); + (int major, int majorIndex) = majorMinorPatchStack.Pop(); + majorMinorPatch = $"{major}.{minor}.{patch}"; + majorMinorPatchIndex = majorIndex; + } + } + + // Don't use else, so that we don't miss segments + // in case we are just deciding that we've finished major minor patch. + if (majorMinorPatch != null) + { + // Now look at the next segment. If it looks like it could be part of a version, append to what we have + // and continue. If it can't, then we're done. + // + // Cases where we should break out and be done: + // - We have an empty pre-release label and the delimiter is not '-'. + // - We have an empty pre-release label and the next segment does not start with a known tag. + // - We have a non-empty pre-release label and the current segment is not a number and also not 'final' + // A corner case of versioning uses .final to represent a non-date suffixed final pre-release version: + // 3.1.0-preview.10.final + if (versionSuffix.Length == 0 && + (prevDelimiterCharacter != '-' || !_knownTags.Any(tag => nextSegment.StartsWith(tag, StringComparison.OrdinalIgnoreCase)))) + { + majorMinorPatchDictionary.Add(majorMinorPatchIndex, majorMinorPatch); + majorMinorPatch = null; + versionSuffix = new StringBuilder(); + } + else if (versionSuffix.Length != 0 && !int.TryParse(nextSegment, out int potentialVersionSegment) && nextSegment != _finalSuffix) + { + majorMinorPatchDictionary.Add(majorMinorPatchIndex, $"{majorMinorPatch}{versionSuffix.ToString()}"); + majorMinorPatch = null; + versionSuffix = new StringBuilder(); + } + else + { + // Append the delimiter character and then the current segment + versionSuffix.Append(prevDelimiterCharacter); + versionSuffix.Append(nextSegment); + } + } + + if (nextDelimiterIndex != -1) + { + currentIndex = nextDelimiterIndex + 1; + } + else + { + break; + } + } + + if (majorMinorPatch != null) + { + majorMinorPatchDictionary.Add(majorMinorPatchIndex, $"{majorMinorPatch}{versionSuffix.ToString()}"); + } + + if (!majorMinorPatchDictionary.Any()) + { + return null; + } + + int maxKey = majorMinorPatchDictionary.Keys.Max(); + return majorMinorPatchDictionary[maxKey]; + } + + /// + /// Given an asset name, remove all .NET Core version numbers (as defined by GetVersionForSingleSegment) + /// from the string + /// + /// Asset + /// Asset name without versions + public static string RemoveVersions(string assetName, string replacement = "") + { + string[] pathSegments = assetName.Split('/'); + + // Remove the version number from each segment, then join back together and + // remove any useless character sequences. + + for (int i = 0; i < pathSegments.Length; i++) + { + if (!string.IsNullOrEmpty(pathSegments[i])) + { + string? versionForSegment = GetVersionForSingleSegment(pathSegments[i]); + if (versionForSegment != null) + { + pathSegments[i] = pathSegments[i].Replace(versionForSegment, replacement); + } + } + } + + // Continue replacing things until there is nothing left to replace. + string assetWithoutVersions = string.Join("/", pathSegments); + bool anyReplacements = true; + while (anyReplacements) + { + string replacementIterationResult = assetWithoutVersions; + foreach (var sequence in _sequencesToReplace) + { + replacementIterationResult = replacementIterationResult.Replace(sequence.Key, sequence.Value); + } + anyReplacements = replacementIterationResult != assetWithoutVersions; + assetWithoutVersions = replacementIterationResult; + } + + return assetWithoutVersions; + } + + + public static bool AreVersionlessEqual(string assetName1, string assetName2) + { + return RemoveVersions(assetName1) == RemoveVersions(assetName2); + } +} diff --git a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/ZipArchiveExtensions.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/ZipArchiveExtensions.cs deleted file mode 100644 index 4b67efea0bc1..000000000000 --- a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/ZipArchiveExtensions.cs +++ /dev/null @@ -1,78 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. - -using System; -using System.IO; -using System.IO.Compression; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -static class ArchiveExtensions -{ - public static string[] Lines(this ZipArchiveEntry entry, Encoding? encoding = null) - { - return entry.ReadToString(encoding).Replace("\r\n", "\n").Split('\n').ToArray(); - } - - public static string ReadToString(this ZipArchiveEntry entry, Encoding? encoding = null) - { - Stream stream = entry.Open(); - byte[] buffer = stream.ReadToEnd(); - // Remove UTF-8 BOM if present - int index = 0; - if (buffer[0] == 0xEF && buffer[1] == 0xBB && buffer[2] == 0xBF) - { - index = 3; - } - encoding ??= Encoding.UTF8; - string fileText = encoding.GetString(buffer, index, buffer.Length - index); - return fileText; - } - - public static byte[] ReadToEnd(this Stream stream) - { - int bufferSize = 2048; - byte[] buffer = new byte[bufferSize]; - int offset = 0; - while (true) - { - int bytesRead = stream.Read(buffer, offset, bufferSize - offset); - offset += bytesRead; - if (bytesRead == 0) - { - break; - } - if (offset == bufferSize) - { - Array.Resize(ref buffer, bufferSize * 2); - bufferSize *= 2; - } - } - Array.Resize(ref buffer, offset); - return buffer; - } - - public static async Task ReadToEndAsync(this Stream stream) - { - int bufferSize = 2048; - byte[] buffer = new byte[bufferSize]; - int offset = 0; - while (true) - { - int bytesRead = await stream.ReadAsync(buffer, offset, bufferSize - offset); - offset += bytesRead; - if (bytesRead == 0) - { - break; - } - if (offset == bufferSize) - { - Array.Resize(ref buffer, bufferSize * 2); - bufferSize *= 2; - } - } - Array.Resize(ref buffer, offset); - return buffer; - } -} From 3ed90968ee5cf8ec20ea6859ffa781b3580cf964 Mon Sep 17 00:00:00 2001 From: Jackson Schuster <36744439+jtschuster@users.noreply.github.com> Date: Fri, 1 Mar 2024 11:21:40 -0800 Subject: [PATCH 171/261] Don't validate Sdk archive diffs on shortstack --- src/SourceBuild/content/eng/build.targets | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/SourceBuild/content/eng/build.targets b/src/SourceBuild/content/eng/build.targets index 9a6eabd2be79..fdb8c629aac4 100644 --- a/src/SourceBuild/content/eng/build.targets +++ b/src/SourceBuild/content/eng/build.targets @@ -5,16 +5,17 @@ + DependsOnTargets="DetermineSourceBuiltSdkVersion" + Condition="'$(ShortStack)' != 'true'" > + ArchiveName="dotnet-sdk"> - + Date: Fri, 1 Mar 2024 11:31:35 -0800 Subject: [PATCH 172/261] Rename file to match type --- .../GetClosestArchive.cs | 94 +++++++++++++++++++ 1 file changed, 94 insertions(+) create mode 100644 src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/GetClosestArchive.cs diff --git a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/GetClosestArchive.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/GetClosestArchive.cs new file mode 100644 index 000000000000..fc69a385a9ac --- /dev/null +++ b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/GetClosestArchive.cs @@ -0,0 +1,94 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. + +using System; +using System.IO; +using System.Net.Http; +using System.Threading; +using System.Threading.Tasks; +using Microsoft.Build.Framework; + +public abstract class GetClosestArchive : Microsoft.Build.Utilities.Task, ICancelableTask +{ + [Required] + public required string BuiltArchivePath { get; init; } + + [Output] + public string ClosestOfficialArchivePath { get; set; } = ""; + + private string? _builtVersion; + protected string BuiltVersion + { + get => _builtVersion ?? throw new InvalidOperationException(); + private set => _builtVersion = value; + } + + private string? _builtRid; + protected string BuiltRid + { + get => _builtRid ?? throw new InvalidOperationException(); + private set => _builtRid = value; + } + + private string? _archiveExtension; + protected string ArchiveExtension + { + get => _archiveExtension ?? throw new InvalidOperationException(); + private set => _archiveExtension = value; + } + + /// + /// The name of the package to find the closest official archive for. For example, "dotnet-sdk" or "aspnetcore-runtime". + /// + protected abstract string ArchiveName { get; } + + private CancellationTokenSource _cancellationTokenSource = new(); + protected CancellationToken CancellationToken => _cancellationTokenSource.Token; + public void Cancel() + { + _cancellationTokenSource.Cancel(); + } + + /// + /// Get the URL of the latest official archive for the given version string and RID. + /// + public abstract Task GetLatestOfficialArchiveUrl(); + + public abstract Task GetClosestOfficialArchiveVersion(); + + public override bool Execute() + { + return Task.Run(ExecuteAsync).Result; + } + + public async Task ExecuteAsync() + { + CancellationToken.ThrowIfCancellationRequested(); + var filename = Path.GetFileName(BuiltArchivePath); + (BuiltVersion, BuiltRid, ArchiveExtension) = Archive.GetInfoFromFileName(filename, ArchiveName); + Log.LogMessage($"Finding closest official archive for '{ArchiveName}' version '{BuiltVersion}' RID '{BuiltRid}'"); + + string? downloadUrl = await GetLatestOfficialArchiveUrl(); + if (downloadUrl == null) + { + Log.LogError($"Failed to find a download URL for '{ArchiveName}' version '{BuiltVersion}' RID '{BuiltRid}'"); + return false; + } + + HttpClient client = new HttpClient(); + + Log.LogMessage(MessageImportance.High, $"Downloading {downloadUrl}"); + HttpResponseMessage packageResponse = await client.GetAsync(downloadUrl, CancellationToken); + + var packageUriPath = packageResponse.RequestMessage!.RequestUri!.LocalPath; + + ClosestOfficialArchivePath = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName() + $".{ArchiveName}-{BuiltVersion}-{BuiltRid}.closest.{ArchiveExtension}"); + Log.LogMessage($"Copying {packageUriPath} to {ClosestOfficialArchivePath}"); + using (var file = File.Create(ClosestOfficialArchivePath)) + { + await packageResponse.Content.CopyToAsync(file, CancellationToken); + } + + return true; + } +} From 2b3389d8428552cf220e16bebd718c7433884d1c Mon Sep 17 00:00:00 2001 From: Jackson Schuster <36744439+jtschuster@users.noreply.github.com> Date: Fri, 1 Mar 2024 11:43:57 -0800 Subject: [PATCH 173/261] Forgot to add the deletion of the old file --- .../GetClosestArchiveVersion.cs | 94 ------------------- 1 file changed, 94 deletions(-) delete mode 100644 src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/GetClosestArchiveVersion.cs diff --git a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/GetClosestArchiveVersion.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/GetClosestArchiveVersion.cs deleted file mode 100644 index fc69a385a9ac..000000000000 --- a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/GetClosestArchiveVersion.cs +++ /dev/null @@ -1,94 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. - -using System; -using System.IO; -using System.Net.Http; -using System.Threading; -using System.Threading.Tasks; -using Microsoft.Build.Framework; - -public abstract class GetClosestArchive : Microsoft.Build.Utilities.Task, ICancelableTask -{ - [Required] - public required string BuiltArchivePath { get; init; } - - [Output] - public string ClosestOfficialArchivePath { get; set; } = ""; - - private string? _builtVersion; - protected string BuiltVersion - { - get => _builtVersion ?? throw new InvalidOperationException(); - private set => _builtVersion = value; - } - - private string? _builtRid; - protected string BuiltRid - { - get => _builtRid ?? throw new InvalidOperationException(); - private set => _builtRid = value; - } - - private string? _archiveExtension; - protected string ArchiveExtension - { - get => _archiveExtension ?? throw new InvalidOperationException(); - private set => _archiveExtension = value; - } - - /// - /// The name of the package to find the closest official archive for. For example, "dotnet-sdk" or "aspnetcore-runtime". - /// - protected abstract string ArchiveName { get; } - - private CancellationTokenSource _cancellationTokenSource = new(); - protected CancellationToken CancellationToken => _cancellationTokenSource.Token; - public void Cancel() - { - _cancellationTokenSource.Cancel(); - } - - /// - /// Get the URL of the latest official archive for the given version string and RID. - /// - public abstract Task GetLatestOfficialArchiveUrl(); - - public abstract Task GetClosestOfficialArchiveVersion(); - - public override bool Execute() - { - return Task.Run(ExecuteAsync).Result; - } - - public async Task ExecuteAsync() - { - CancellationToken.ThrowIfCancellationRequested(); - var filename = Path.GetFileName(BuiltArchivePath); - (BuiltVersion, BuiltRid, ArchiveExtension) = Archive.GetInfoFromFileName(filename, ArchiveName); - Log.LogMessage($"Finding closest official archive for '{ArchiveName}' version '{BuiltVersion}' RID '{BuiltRid}'"); - - string? downloadUrl = await GetLatestOfficialArchiveUrl(); - if (downloadUrl == null) - { - Log.LogError($"Failed to find a download URL for '{ArchiveName}' version '{BuiltVersion}' RID '{BuiltRid}'"); - return false; - } - - HttpClient client = new HttpClient(); - - Log.LogMessage(MessageImportance.High, $"Downloading {downloadUrl}"); - HttpResponseMessage packageResponse = await client.GetAsync(downloadUrl, CancellationToken); - - var packageUriPath = packageResponse.RequestMessage!.RequestUri!.LocalPath; - - ClosestOfficialArchivePath = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName() + $".{ArchiveName}-{BuiltVersion}-{BuiltRid}.closest.{ArchiveExtension}"); - Log.LogMessage($"Copying {packageUriPath} to {ClosestOfficialArchivePath}"); - using (var file = File.Create(ClosestOfficialArchivePath)) - { - await packageResponse.Content.CopyToAsync(file, CancellationToken); - } - - return true; - } -} From eafa1ba7695cf06304c8c06d316f069b328054e6 Mon Sep 17 00:00:00 2001 From: Jackson Schuster <36744439+jtschuster@users.noreply.github.com> Date: Fri, 1 Mar 2024 12:42:27 -0800 Subject: [PATCH 174/261] Check index before indexing array, and add common prefix to start of diff --- src/SourceBuild/content/Directory.Build.props | 3 +-- .../Diff.cs | 13 ++++++------- ...t.DotNet.SourceBuild.Tasks.SdkArchiveDiff.csproj | 1 + 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/SourceBuild/content/Directory.Build.props b/src/SourceBuild/content/Directory.Build.props index 216830039f4e..30a914855a7d 100644 --- a/src/SourceBuild/content/Directory.Build.props +++ b/src/SourceBuild/content/Directory.Build.props @@ -34,7 +34,7 @@ runtime - @@ -212,6 +212,5 @@ $(PackageReportDir)poisoned.txt - diff --git a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/Diff.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/Diff.cs index ab1676f97fed..008fe67f0e16 100644 --- a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/Diff.cs +++ b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/Diff.cs @@ -49,13 +49,13 @@ public enum DifferenceKind // Edit distance algorithm: https://en.wikipedia.org/wiki/Longest_common_subsequence // cancellationToken.ThrowIfCancellationRequested(); formatter ??= static s => s; - List<(string, DifferenceKind)> diff = []; // Optimization: remove common prefix int i = 0; + List<(string, DifferenceKind)> prefix = []; while (i < baselineSequence.Length && i < testSequence.Length && equalityComparer(baselineSequence[i], testSequence[i])) { - diff.Add((formatter(baselineSequence[i]), DifferenceKind.Unchanged)); + prefix.Add((formatter(baselineSequence[i]), DifferenceKind.Unchanged)); i++; } @@ -93,13 +93,11 @@ public enum DifferenceKind // Trace back the edits int row = baselineSequence.Length; int col = testSequence.Length; - + List<(string, DifferenceKind)> diff = []; while (row > 0 || col > 0) { cancellationToken.ThrowIfCancellationRequested(); - var baselineItem = baselineSequence[row - 1]; - var testItem = testSequence[col - 1]; - if (row > 0 && col > 0 && equalityComparer(baselineItem, testItem)) + if (row > 0 && col > 0 && equalityComparer(baselineSequence[row - 1], testSequence[col - 1])) { diff.Add((formatter(baselineSequence[row - 1]), DifferenceKind.Unchanged)); row--; @@ -121,7 +119,8 @@ public enum DifferenceKind } } diff.Reverse(); - return diff; + prefix.AddRange(diff); + return prefix; } } diff --git a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff.csproj b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff.csproj index ff3bf2402a01..4098031757f7 100644 --- a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff.csproj +++ b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff.csproj @@ -1,6 +1,7 @@  + exe $(NetCurrent) enable From 5a2d878d2541e00ec16457f334afed2956d7f7fe Mon Sep 17 00:00:00 2001 From: Jackson Schuster <36744439+jtschuster@users.noreply.github.com> Date: Fri, 1 Mar 2024 12:44:27 -0800 Subject: [PATCH 175/261] Accidentally added test changes --- src/SourceBuild/content/Directory.Build.props | 3 ++- .../Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff.csproj | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/SourceBuild/content/Directory.Build.props b/src/SourceBuild/content/Directory.Build.props index 30a914855a7d..216830039f4e 100644 --- a/src/SourceBuild/content/Directory.Build.props +++ b/src/SourceBuild/content/Directory.Build.props @@ -34,7 +34,7 @@ runtime - @@ -212,5 +212,6 @@ $(PackageReportDir)poisoned.txt + diff --git a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff.csproj b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff.csproj index 4098031757f7..ff3bf2402a01 100644 --- a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff.csproj +++ b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff.csproj @@ -1,7 +1,6 @@  - exe $(NetCurrent) enable From 8eb0cd2a5c0f6360d694f7ac3e59c9bcc5464589 Mon Sep 17 00:00:00 2001 From: Jackson Schuster <36744439+jtschuster@users.noreply.github.com> Date: Fri, 1 Mar 2024 15:19:42 -0800 Subject: [PATCH 176/261] Update logs, add check for valid RID --- src/SourceBuild/content/eng/build.targets | 3 +++ .../Archive.cs | 9 +++++++++ .../GetValidArchiveItems.cs | 6 ++++-- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/SourceBuild/content/eng/build.targets b/src/SourceBuild/content/eng/build.targets index fdb8c629aac4..406c4778e1ed 100644 --- a/src/SourceBuild/content/eng/build.targets +++ b/src/SourceBuild/content/eng/build.targets @@ -8,6 +8,9 @@ DependsOnTargets="DetermineSourceBuiltSdkVersion" Condition="'$(ShortStack)' != 'true'" > + + p.Split('.').Skip(1))) + { + if (!int.TryParse(item, out _)) + throw new ArgumentException($"Invalid Rid '{Rid}' in archive file name '{filename}'. Expected RID with '.' to be part of a version. This likely means the file is an archive of a different file type."); + } return (Version, Rid, extension); } } diff --git a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/GetValidArchiveItems.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/GetValidArchiveItems.cs index 3ebcc571a0f4..bd27213b80b3 100644 --- a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/GetValidArchiveItems.cs +++ b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/GetValidArchiveItems.cs @@ -3,6 +3,7 @@ using System; using System.Collections.Generic; +using System.IO; using Microsoft.Build.Framework; public class GetValidArchiveItems : Microsoft.Build.Utilities.Task @@ -21,15 +22,16 @@ public override bool Execute() List archiveItems = new(); foreach (var item in ArchiveItems) { + var filename = Path.GetFileName(item.ItemSpec); try { // Ensure the version and RID info can be parsed from the item - _ = Archive.GetInfoFromFileName(item.ItemSpec, ArchiveName); + _ = Archive.GetInfoFromFileName(filename, ArchiveName); archiveItems.Add(item); } catch (ArgumentException e) { - Log.LogMessage(MessageImportance.High, e.Message); + Log.LogMessage($"'{item.ItemSpec}' is not a valid archive name: '{e.Message}'"); continue; } } From c0add199d97b98888580c37105553818521fcf2b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 2 Mar 2024 14:00:28 +0000 Subject: [PATCH 177/261] Update dependencies from https://github.com/dotnet/arcade build 20240301.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.24123.1 -> To Version 8.0.0-beta.24151.4 --- eng/Version.Details.xml | 12 +- eng/Versions.props | 2 +- eng/common/templates-official/job/job.yml | 255 ++++++++++++++++ .../templates-official/job/onelocbuild.yml | 112 +++++++ .../job/publish-build-assets.yml | 153 ++++++++++ .../templates-official/job/source-build.yml | 67 ++++ .../job/source-index-stage1.yml | 68 +++++ .../templates-official/jobs/codeql-build.yml | 31 ++ eng/common/templates-official/jobs/jobs.yml | 97 ++++++ .../templates-official/jobs/source-build.yml | 46 +++ .../post-build/common-variables.yml | 22 ++ .../post-build/post-build.yml | 285 ++++++++++++++++++ .../post-build/setup-maestro-vars.yml | 70 +++++ .../post-build/trigger-subscription.yml | 13 + .../steps/add-build-to-channel.yml | 13 + .../templates-official/steps/build-reason.yml | 12 + .../steps/component-governance.yml | 13 + .../steps/execute-codeql.yml | 32 ++ .../templates-official/steps/execute-sdl.yml | 88 ++++++ .../steps/generate-sbom.yml | 48 +++ .../templates-official/steps/publish-logs.yml | 23 ++ .../templates-official/steps/retain-build.yml | 28 ++ .../steps/send-to-helix.yml | 91 ++++++ .../templates-official/steps/source-build.yml | 129 ++++++++ .../variables/pool-providers.yml | 45 +++ .../variables/sdl-variables.yml | 7 + global.json | 4 +- 27 files changed, 1757 insertions(+), 9 deletions(-) create mode 100644 eng/common/templates-official/job/job.yml create mode 100644 eng/common/templates-official/job/onelocbuild.yml create mode 100644 eng/common/templates-official/job/publish-build-assets.yml create mode 100644 eng/common/templates-official/job/source-build.yml create mode 100644 eng/common/templates-official/job/source-index-stage1.yml create mode 100644 eng/common/templates-official/jobs/codeql-build.yml create mode 100644 eng/common/templates-official/jobs/jobs.yml create mode 100644 eng/common/templates-official/jobs/source-build.yml create mode 100644 eng/common/templates-official/post-build/common-variables.yml create mode 100644 eng/common/templates-official/post-build/post-build.yml create mode 100644 eng/common/templates-official/post-build/setup-maestro-vars.yml create mode 100644 eng/common/templates-official/post-build/trigger-subscription.yml create mode 100644 eng/common/templates-official/steps/add-build-to-channel.yml create mode 100644 eng/common/templates-official/steps/build-reason.yml create mode 100644 eng/common/templates-official/steps/component-governance.yml create mode 100644 eng/common/templates-official/steps/execute-codeql.yml create mode 100644 eng/common/templates-official/steps/execute-sdl.yml create mode 100644 eng/common/templates-official/steps/generate-sbom.yml create mode 100644 eng/common/templates-official/steps/publish-logs.yml create mode 100644 eng/common/templates-official/steps/retain-build.yml create mode 100644 eng/common/templates-official/steps/send-to-helix.yml create mode 100644 eng/common/templates-official/steps/source-build.yml create mode 100644 eng/common/templates-official/variables/pool-providers.yml create mode 100644 eng/common/templates-official/variables/sdl-variables.yml diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3ae6ddf2fa6d..d17c75ad722b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -214,18 +214,18 @@ - + https://github.com/dotnet/arcade - 042763a811fd94dc3556253d4c64118dd665216e + cbb61c3a9a42e7c3cce17ee453ff5ecdc7f69282 - + https://github.com/dotnet/arcade - 042763a811fd94dc3556253d4c64118dd665216e + cbb61c3a9a42e7c3cce17ee453ff5ecdc7f69282 - + https://github.com/dotnet/arcade - 042763a811fd94dc3556253d4c64118dd665216e + cbb61c3a9a42e7c3cce17ee453ff5ecdc7f69282 https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index 6b5af7061e31..b67e4a4c75ad 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,7 +40,7 @@ - 8.0.0-beta.24123.1 + 8.0.0-beta.24151.4 diff --git a/eng/common/templates-official/job/job.yml b/eng/common/templates-official/job/job.yml new file mode 100644 index 000000000000..9e7bebe9af89 --- /dev/null +++ b/eng/common/templates-official/job/job.yml @@ -0,0 +1,255 @@ +# Internal resources (telemetry, microbuild) can only be accessed from non-public projects, +# and some (Microbuild) should only be applied to non-PR cases for internal builds. + +parameters: +# Job schema parameters - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#job + cancelTimeoutInMinutes: '' + condition: '' + container: '' + continueOnError: false + dependsOn: '' + displayName: '' + pool: '' + steps: [] + strategy: '' + timeoutInMinutes: '' + variables: [] + workspace: '' + +# Job base template specific parameters + # See schema documentation - https://github.com/dotnet/arcade/blob/master/Documentation/AzureDevOps/TemplateSchema.md + artifacts: '' + enableMicrobuild: false + enablePublishBuildArtifacts: false + enablePublishBuildAssets: false + enablePublishTestResults: false + enablePublishUsingPipelines: false + enableBuildRetry: false + disableComponentGovernance: '' + componentGovernanceIgnoreDirectories: '' + mergeTestResults: false + testRunTitle: '' + testResultsFormat: '' + name: '' + preSteps: [] + runAsPublic: false +# Sbom related params + enableSbom: true + PackageVersion: 7.0.0 + BuildDropPath: '$(Build.SourcesDirectory)/artifacts' + +jobs: +- job: ${{ parameters.name }} + + ${{ if ne(parameters.cancelTimeoutInMinutes, '') }}: + cancelTimeoutInMinutes: ${{ parameters.cancelTimeoutInMinutes }} + + ${{ if ne(parameters.condition, '') }}: + condition: ${{ parameters.condition }} + + ${{ if ne(parameters.container, '') }}: + container: ${{ parameters.container }} + + ${{ if ne(parameters.continueOnError, '') }}: + continueOnError: ${{ parameters.continueOnError }} + + ${{ if ne(parameters.dependsOn, '') }}: + dependsOn: ${{ parameters.dependsOn }} + + ${{ if ne(parameters.displayName, '') }}: + displayName: ${{ parameters.displayName }} + + ${{ if ne(parameters.pool, '') }}: + pool: ${{ parameters.pool }} + + ${{ if ne(parameters.strategy, '') }}: + strategy: ${{ parameters.strategy }} + + ${{ if ne(parameters.timeoutInMinutes, '') }}: + timeoutInMinutes: ${{ parameters.timeoutInMinutes }} + + variables: + - ${{ if ne(parameters.enableTelemetry, 'false') }}: + - name: DOTNET_CLI_TELEMETRY_PROFILE + value: '$(Build.Repository.Uri)' + - ${{ if eq(parameters.enableRichCodeNavigation, 'true') }}: + - name: EnableRichCodeNavigation + value: 'true' + # Retry signature validation up to three times, waiting 2 seconds between attempts. + # See https://learn.microsoft.com/en-us/nuget/reference/errors-and-warnings/nu3028#retry-untrusted-root-failures + - name: NUGET_EXPERIMENTAL_CHAIN_BUILD_RETRY_POLICY + value: 3,2000 + - ${{ each variable in parameters.variables }}: + # handle name-value variable syntax + # example: + # - name: [key] + # value: [value] + - ${{ if ne(variable.name, '') }}: + - name: ${{ variable.name }} + value: ${{ variable.value }} + + # handle variable groups + - ${{ if ne(variable.group, '') }}: + - group: ${{ variable.group }} + + # handle template variable syntax + # example: + # - template: path/to/template.yml + # parameters: + # [key]: [value] + - ${{ if ne(variable.template, '') }}: + - template: ${{ variable.template }} + ${{ if ne(variable.parameters, '') }}: + parameters: ${{ variable.parameters }} + + # handle key-value variable syntax. + # example: + # - [key]: [value] + - ${{ if and(eq(variable.name, ''), eq(variable.group, ''), eq(variable.template, '')) }}: + - ${{ each pair in variable }}: + - name: ${{ pair.key }} + value: ${{ pair.value }} + + # DotNet-HelixApi-Access provides 'HelixApiAccessToken' for internal builds + - ${{ if and(eq(parameters.enableTelemetry, 'true'), eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - group: DotNet-HelixApi-Access + + ${{ if ne(parameters.workspace, '') }}: + workspace: ${{ parameters.workspace }} + + steps: + - ${{ if ne(parameters.preSteps, '') }}: + - ${{ each preStep in parameters.preSteps }}: + - ${{ preStep }} + + - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - ${{ if eq(parameters.enableMicrobuild, 'true') }}: + - task: MicroBuildSigningPlugin@3 + displayName: Install MicroBuild plugin + inputs: + signType: $(_SignType) + zipSources: false + feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json + env: + TeamName: $(_TeamName) + continueOnError: ${{ parameters.continueOnError }} + 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@1 + + - ${{ if and(ne(parameters.artifacts.download, 'false'), ne(parameters.artifacts.download, '')) }}: + - task: DownloadPipelineArtifact@2 + inputs: + buildType: current + artifactName: ${{ coalesce(parameters.artifacts.download.name, 'Artifacts_$(Agent.OS)_$(_BuildConfig)') }} + targetPath: ${{ coalesce(parameters.artifacts.download.path, 'artifacts') }} + itemPattern: ${{ coalesce(parameters.artifacts.download.pattern, '**') }} + + - ${{ each step in parameters.steps }}: + - ${{ step }} + + - ${{ if eq(parameters.enableRichCodeNavigation, true) }}: + - task: RichCodeNavIndexer@0 + displayName: RichCodeNav Upload + inputs: + languages: ${{ coalesce(parameters.richCodeNavigationLanguage, 'csharp') }} + environment: ${{ coalesce(parameters.richCodeNavigationEnvironment, 'production') }} + richNavLogOutputDirectory: $(Build.SourcesDirectory)/artifacts/bin + uploadRichNavArtifacts: ${{ coalesce(parameters.richCodeNavigationUploadArtifacts, false) }} + continueOnError: true + + - template: /eng/common/templates-official/steps/component-governance.yml + parameters: + ${{ if eq(parameters.disableComponentGovernance, '') }}: + ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.runAsPublic, 'false'), or(startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'), startsWith(variables['Build.SourceBranch'], 'refs/heads/dotnet/'), startsWith(variables['Build.SourceBranch'], 'refs/heads/microsoft/'), eq(variables['Build.SourceBranch'], 'refs/heads/main'))) }}: + disableComponentGovernance: false + ${{ else }}: + disableComponentGovernance: true + ${{ else }}: + disableComponentGovernance: ${{ parameters.disableComponentGovernance }} + componentGovernanceIgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }} + + - ${{ if eq(parameters.enableMicrobuild, 'true') }}: + - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - task: MicroBuildCleanup@1 + displayName: Execute Microbuild cleanup tasks + condition: and(always(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT')) + continueOnError: ${{ parameters.continueOnError }} + env: + TeamName: $(_TeamName) + + - ${{ if ne(parameters.artifacts.publish, '') }}: + - ${{ if and(ne(parameters.artifacts.publish.artifacts, 'false'), ne(parameters.artifacts.publish.artifacts, '')) }}: + - task: CopyFiles@2 + displayName: Gather binaries for publish to artifacts + inputs: + SourceFolder: 'artifacts/bin' + Contents: '**' + TargetFolder: '$(Build.ArtifactStagingDirectory)/artifacts/bin' + - task: CopyFiles@2 + displayName: Gather packages for publish to artifacts + inputs: + SourceFolder: 'artifacts/packages' + Contents: '**' + TargetFolder: '$(Build.ArtifactStagingDirectory)/artifacts/packages' + - task: 1ES.PublishBuildArtifacts@1 + displayName: Publish pipeline artifacts + inputs: + PathtoPublish: '$(Build.ArtifactStagingDirectory)/artifacts' + PublishLocation: Container + ArtifactName: ${{ coalesce(parameters.artifacts.publish.artifacts.name , 'Artifacts_$(Agent.Os)_$(_BuildConfig)') }} + continueOnError: true + condition: always() + - ${{ if and(ne(parameters.artifacts.publish.logs, 'false'), ne(parameters.artifacts.publish.logs, '')) }}: + - publish: artifacts/log + artifact: ${{ coalesce(parameters.artifacts.publish.logs.name, 'Logs_Build_$(Agent.Os)_$(_BuildConfig)') }} + displayName: Publish logs + continueOnError: true + condition: always() + + - ${{ if ne(parameters.enablePublishBuildArtifacts, 'false') }}: + - task: 1ES.PublishBuildArtifacts@1 + displayName: Publish Logs + inputs: + PathtoPublish: '$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)' + PublishLocation: Container + ArtifactName: ${{ coalesce(parameters.enablePublishBuildArtifacts.artifactName, '$(Agent.Os)_$(Agent.JobName)' ) }} + continueOnError: true + condition: always() + + - ${{ if or(and(eq(parameters.enablePublishTestResults, 'true'), eq(parameters.testResultsFormat, '')), eq(parameters.testResultsFormat, 'xunit')) }}: + - task: PublishTestResults@2 + displayName: Publish XUnit Test Results + inputs: + testResultsFormat: 'xUnit' + testResultsFiles: '*.xml' + searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)' + testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-xunit + mergeTestResults: ${{ parameters.mergeTestResults }} + continueOnError: true + condition: always() + - ${{ if or(and(eq(parameters.enablePublishTestResults, 'true'), eq(parameters.testResultsFormat, '')), eq(parameters.testResultsFormat, 'vstest')) }}: + - task: PublishTestResults@2 + displayName: Publish TRX Test Results + inputs: + testResultsFormat: 'VSTest' + testResultsFiles: '*.trx' + searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)' + testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-trx + mergeTestResults: ${{ parameters.mergeTestResults }} + continueOnError: true + condition: always() + + - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.enableSbom, 'true')) }}: + - template: /eng/common/templates-official/steps/generate-sbom.yml + parameters: + PackageVersion: ${{ parameters.packageVersion}} + BuildDropPath: ${{ parameters.buildDropPath }} + IgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }} + + - ${{ if eq(parameters.enableBuildRetry, 'true') }}: + - publish: $(Build.SourcesDirectory)\eng\common\BuildConfiguration + artifact: BuildConfiguration + displayName: Publish build retry configuration + continueOnError: true diff --git a/eng/common/templates-official/job/onelocbuild.yml b/eng/common/templates-official/job/onelocbuild.yml new file mode 100644 index 000000000000..ba9ba4930329 --- /dev/null +++ b/eng/common/templates-official/job/onelocbuild.yml @@ -0,0 +1,112 @@ +parameters: + # Optional: dependencies of the job + dependsOn: '' + + # Optional: A defined YAML pool - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#pool + pool: '' + + CeapexPat: $(dn-bot-ceapex-package-r) # PAT for the loc AzDO instance https://dev.azure.com/ceapex + GithubPat: $(BotAccount-dotnet-bot-repo-PAT) + + SourcesDirectory: $(Build.SourcesDirectory) + CreatePr: true + AutoCompletePr: false + ReusePr: true + UseLfLineEndings: true + UseCheckedInLocProjectJson: false + SkipLocProjectJsonGeneration: false + LanguageSet: VS_Main_Languages + LclSource: lclFilesInRepo + LclPackageId: '' + RepoType: gitHub + GitHubOrg: dotnet + MirrorRepo: '' + MirrorBranch: main + condition: '' + JobNameSuffix: '' + +jobs: +- job: OneLocBuild${{ parameters.JobNameSuffix }} + + dependsOn: ${{ parameters.dependsOn }} + + displayName: OneLocBuild${{ parameters.JobNameSuffix }} + + variables: + - group: OneLocBuildVariables # Contains the CeapexPat and GithubPat + - name: _GenerateLocProjectArguments + value: -SourcesDirectory ${{ parameters.SourcesDirectory }} + -LanguageSet "${{ parameters.LanguageSet }}" + -CreateNeutralXlfs + - ${{ if eq(parameters.UseCheckedInLocProjectJson, 'true') }}: + - name: _GenerateLocProjectArguments + value: ${{ variables._GenerateLocProjectArguments }} -UseCheckedInLocProjectJson + - template: /eng/common/templates-official/variables/pool-providers.yml + + ${{ if ne(parameters.pool, '') }}: + pool: ${{ parameters.pool }} + ${{ if eq(parameters.pool, '') }}: + pool: + # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) + ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: + name: AzurePipelines-EO + image: 1ESPT-Windows2022 + demands: Cmd + os: windows + # If it's not devdiv, it's dnceng + ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: + name: $(DncEngInternalBuildPool) + image: 1es-windows-2022-pt + os: windows + + steps: + - ${{ if ne(parameters.SkipLocProjectJsonGeneration, 'true') }}: + - task: Powershell@2 + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/generate-locproject.ps1 + arguments: $(_GenerateLocProjectArguments) + displayName: Generate LocProject.json + condition: ${{ parameters.condition }} + + - task: OneLocBuild@2 + displayName: OneLocBuild + env: + SYSTEM_ACCESSTOKEN: $(System.AccessToken) + inputs: + locProj: eng/Localize/LocProject.json + outDir: $(Build.ArtifactStagingDirectory) + lclSource: ${{ parameters.LclSource }} + lclPackageId: ${{ parameters.LclPackageId }} + isCreatePrSelected: ${{ parameters.CreatePr }} + isAutoCompletePrSelected: ${{ parameters.AutoCompletePr }} + ${{ if eq(parameters.CreatePr, true) }}: + isUseLfLineEndingsSelected: ${{ parameters.UseLfLineEndings }} + ${{ if eq(parameters.RepoType, 'gitHub') }}: + isShouldReusePrSelected: ${{ parameters.ReusePr }} + packageSourceAuth: patAuth + patVariable: ${{ parameters.CeapexPat }} + ${{ if eq(parameters.RepoType, 'gitHub') }}: + repoType: ${{ parameters.RepoType }} + gitHubPatVariable: "${{ parameters.GithubPat }}" + ${{ if ne(parameters.MirrorRepo, '') }}: + isMirrorRepoSelected: true + gitHubOrganization: ${{ parameters.GitHubOrg }} + mirrorRepo: ${{ parameters.MirrorRepo }} + mirrorBranch: ${{ parameters.MirrorBranch }} + condition: ${{ parameters.condition }} + + - task: 1ES.PublishBuildArtifacts@1 + displayName: Publish Localization Files + inputs: + PathtoPublish: '$(Build.ArtifactStagingDirectory)/loc' + PublishLocation: Container + ArtifactName: Loc + condition: ${{ parameters.condition }} + + - task: 1ES.PublishBuildArtifacts@1 + displayName: Publish LocProject.json + inputs: + PathtoPublish: '$(Build.SourcesDirectory)/eng/Localize/' + PublishLocation: Container + ArtifactName: Loc + condition: ${{ parameters.condition }} \ No newline at end of file diff --git a/eng/common/templates-official/job/publish-build-assets.yml b/eng/common/templates-official/job/publish-build-assets.yml new file mode 100644 index 000000000000..ea5104625fac --- /dev/null +++ b/eng/common/templates-official/job/publish-build-assets.yml @@ -0,0 +1,153 @@ +parameters: + configuration: 'Debug' + + # Optional: condition for the job to run + condition: '' + + # Optional: 'true' if future jobs should run even if this job fails + continueOnError: false + + # Optional: dependencies of the job + dependsOn: '' + + # Optional: Include PublishBuildArtifacts task + enablePublishBuildArtifacts: false + + # Optional: A defined YAML pool - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#pool + pool: {} + + # Optional: should run as a public build even in the internal project + # if 'true', the build won't run any of the internal only steps, even if it is running in non-public projects. + runAsPublic: false + + # Optional: whether the build's artifacts will be published using release pipelines or direct feed publishing + publishUsingPipelines: false + + # Optional: whether the build's artifacts will be published using release pipelines or direct feed publishing + publishAssetsImmediately: false + + artifactsPublishingAdditionalParameters: '' + + signingValidationAdditionalParameters: '' + +jobs: +- job: Asset_Registry_Publish + + dependsOn: ${{ parameters.dependsOn }} + timeoutInMinutes: 150 + + ${{ if eq(parameters.publishAssetsImmediately, 'true') }}: + displayName: Publish Assets + ${{ else }}: + displayName: Publish to Build Asset Registry + + variables: + - template: /eng/common/templates-official/variables/pool-providers.yml + - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - group: Publish-Build-Assets + - group: AzureDevOps-Artifact-Feeds-Pats + - name: runCodesignValidationInjection + value: false + - ${{ if eq(parameters.publishAssetsImmediately, 'true') }}: + - template: /eng/common/templates-official/post-build/common-variables.yml + + pool: + # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) + ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: + name: AzurePipelines-EO + image: 1ESPT-Windows2022 + demands: Cmd + os: windows + # If it's not devdiv, it's dnceng + ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: + name: $(DncEngInternalBuildPool) + image: 1es-windows-2022-pt + os: windows + steps: + - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - task: DownloadBuildArtifacts@0 + displayName: Download artifact + inputs: + artifactName: AssetManifests + downloadPath: '$(Build.StagingDirectory)/Download' + checkDownloadedFiles: true + condition: ${{ parameters.condition }} + continueOnError: ${{ parameters.continueOnError }} + + - task: NuGetAuthenticate@1 + + - task: PowerShell@2 + displayName: Publish Build Assets + inputs: + filePath: eng\common\sdk-task.ps1 + 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:PublishUsingPipelines=${{ parameters.publishUsingPipelines }} + /p:OfficialBuildId=$(Build.BuildNumber) + condition: ${{ parameters.condition }} + continueOnError: ${{ parameters.continueOnError }} + + - task: powershell@2 + displayName: Create ReleaseConfigs Artifact + inputs: + targetType: inline + script: | + Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value $(BARBuildId) + Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value "$(DefaultChannels)" + Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value $(IsStableBuild) + + - task: 1ES.PublishBuildArtifacts@1 + displayName: Publish ReleaseConfigs Artifact + inputs: + PathtoPublish: '$(Build.StagingDirectory)/ReleaseConfigs.txt' + PublishLocation: Container + ArtifactName: ReleaseConfigs + + - task: powershell@2 + displayName: Check if SymbolPublishingExclusionsFile.txt exists + inputs: + targetType: inline + script: | + $symbolExclusionfile = "$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt" + if(Test-Path -Path $symbolExclusionfile) + { + Write-Host "SymbolExclusionFile exists" + Write-Host "##vso[task.setvariable variable=SymbolExclusionFile]true" + } + else{ + Write-Host "Symbols Exclusion file does not exists" + Write-Host "##vso[task.setvariable variable=SymbolExclusionFile]false" + } + + - task: 1ES.PublishBuildArtifacts@1 + displayName: Publish SymbolPublishingExclusionsFile Artifact + condition: eq(variables['SymbolExclusionFile'], 'true') + inputs: + PathtoPublish: '$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt' + PublishLocation: Container + ArtifactName: ReleaseConfigs + + - ${{ if eq(parameters.publishAssetsImmediately, 'true') }}: + - template: /eng/common/templates-official/post-build/setup-maestro-vars.yml + parameters: + BARBuildId: ${{ parameters.BARBuildId }} + PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} + + - task: PowerShell@2 + displayName: Publish Using Darc + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 + arguments: -BuildId $(BARBuildId) + -PublishingInfraVersion 3 + -AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)' + -MaestroToken '$(MaestroApiAccessToken)' + -WaitPublishingFinish true + -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}' + -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' + + - ${{ if eq(parameters.enablePublishBuildArtifacts, 'true') }}: + - template: /eng/common/templates-official/steps/publish-logs.yml + parameters: + JobLabel: 'Publish_Artifacts_Logs' diff --git a/eng/common/templates-official/job/source-build.yml b/eng/common/templates-official/job/source-build.yml new file mode 100644 index 000000000000..8aba3b44bb25 --- /dev/null +++ b/eng/common/templates-official/job/source-build.yml @@ -0,0 +1,67 @@ +parameters: + # This template adds arcade-powered source-build to CI. The template produces a server job with a + # default ID 'Source_Build_Complete' to put in a dependency list if necessary. + + # Specifies the prefix for source-build jobs added to pipeline. Use this if disambiguation needed. + jobNamePrefix: 'Source_Build' + + # Defines the platform on which to run the job. By default, a linux-x64 machine, suitable for + # managed-only repositories. This is an object with these properties: + # + # name: '' + # The name of the job. This is included in the job ID. + # targetRID: '' + # The name of the target RID to use, instead of the one auto-detected by Arcade. + # nonPortable: false + # Enables non-portable mode. This means a more specific RID (e.g. fedora.32-x64 rather than + # linux-x64), and compiling against distro-provided packages rather than portable ones. + # skipPublishValidation: false + # Disables publishing validation. By default, a check is performed to ensure no packages are + # published by source-build. + # container: '' + # A container to use. Runs in docker. + # pool: {} + # A pool to use. Runs directly on an agent. + # buildScript: '' + # Specifies the build script to invoke to perform the build in the repo. The default + # './build.sh' should work for typical Arcade repositories, but this is customizable for + # difficult situations. + # jobProperties: {} + # A list of job properties to inject at the top level, for potential extensibility beyond + # container and pool. + platform: {} + +jobs: +- job: ${{ parameters.jobNamePrefix }}_${{ parameters.platform.name }} + displayName: Source-Build (${{ parameters.platform.name }}) + + ${{ each property in parameters.platform.jobProperties }}: + ${{ property.key }}: ${{ property.value }} + + ${{ if ne(parameters.platform.container, '') }}: + container: ${{ parameters.platform.container }} + + ${{ if eq(parameters.platform.pool, '') }}: + # The default VM host AzDO pool. This should be capable of running Docker containers: almost all + # source-build builds run in Docker, including the default managed platform. + # /eng/common/templates-official/variables/pool-providers.yml can't be used here (some customers declare variables already), so duplicate its logic + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore-Svc-Public' ), False, 'NetCore-Public')] + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open + + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')] + image: 1es-mariner-2-pt + os: linux + + ${{ if ne(parameters.platform.pool, '') }}: + pool: ${{ parameters.platform.pool }} + + workspace: + clean: all + + steps: + - template: /eng/common/templates-official/steps/source-build.yml + parameters: + platform: ${{ parameters.platform }} diff --git a/eng/common/templates-official/job/source-index-stage1.yml b/eng/common/templates-official/job/source-index-stage1.yml new file mode 100644 index 000000000000..4b6337391708 --- /dev/null +++ b/eng/common/templates-official/job/source-index-stage1.yml @@ -0,0 +1,68 @@ +parameters: + runAsPublic: false + sourceIndexPackageVersion: 1.0.1-20230228.2 + sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json + sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci" + preSteps: [] + binlogPath: artifacts/log/Debug/Build.binlog + condition: '' + dependsOn: '' + pool: '' + +jobs: +- job: SourceIndexStage1 + dependsOn: ${{ parameters.dependsOn }} + condition: ${{ parameters.condition }} + variables: + - name: SourceIndexPackageVersion + value: ${{ parameters.sourceIndexPackageVersion }} + - name: SourceIndexPackageSource + value: ${{ parameters.sourceIndexPackageSource }} + - name: BinlogPath + value: ${{ parameters.binlogPath }} + - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - group: source-dot-net stage1 variables + - template: /eng/common/templates-official/variables/pool-providers.yml + + ${{ if ne(parameters.pool, '') }}: + pool: ${{ parameters.pool }} + ${{ if eq(parameters.pool, '') }}: + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + name: $(DncEngPublicBuildPool) + demands: ImageOverride -equals windows.vs2019.amd64.open + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: $(DncEngInternalBuildPool) + image: 1es-windows-2022-pt + os: windows + + steps: + - ${{ each preStep in parameters.preSteps }}: + - ${{ preStep }} + + - task: UseDotNet@2 + displayName: Use .NET Core SDK 6 + inputs: + packageType: sdk + version: 6.0.x + installationPath: $(Agent.TempDirectory)/dotnet + workingDirectory: $(Agent.TempDirectory) + + - script: | + $(Agent.TempDirectory)/dotnet/dotnet tool install BinLogToSln --version $(SourceIndexPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools + $(Agent.TempDirectory)/dotnet/dotnet tool install UploadIndexStage1 --version $(SourceIndexPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools + displayName: Download Tools + # Set working directory to temp directory so 'dotnet' doesn't try to use global.json and use the repo's sdk. + workingDirectory: $(Agent.TempDirectory) + + - script: ${{ parameters.sourceIndexBuildCommand }} + displayName: Build Repository + + - script: $(Agent.TempDirectory)/.source-index/tools/BinLogToSln -i $(BinlogPath) -r $(Build.SourcesDirectory) -n $(Build.Repository.Name) -o .source-index/stage1output + displayName: Process Binlog into indexable sln + + - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - script: $(Agent.TempDirectory)/.source-index/tools/UploadIndexStage1 -i .source-index/stage1output -n $(Build.Repository.Name) + displayName: Upload stage1 artifacts to source index + env: + BLOB_CONTAINER_URL: $(source-dot-net-stage1-blob-container-url) diff --git a/eng/common/templates-official/jobs/codeql-build.yml b/eng/common/templates-official/jobs/codeql-build.yml new file mode 100644 index 000000000000..b68d3c2f3199 --- /dev/null +++ b/eng/common/templates-official/jobs/codeql-build.yml @@ -0,0 +1,31 @@ +parameters: + # See schema documentation in /Documentation/AzureDevOps/TemplateSchema.md + continueOnError: false + # Required: A collection of jobs to run - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#job + jobs: [] + # Optional: if specified, restore and use this version of Guardian instead of the default. + overrideGuardianVersion: '' + +jobs: +- template: /eng/common/templates-official/jobs/jobs.yml + parameters: + enableMicrobuild: false + enablePublishBuildArtifacts: false + enablePublishTestResults: false + enablePublishBuildAssets: false + enablePublishUsingPipelines: false + enableTelemetry: true + + variables: + - group: Publish-Build-Assets + # The Guardian version specified in 'eng/common/sdl/packages.config'. This value must be kept in + # sync with the packages.config file. + - name: DefaultGuardianVersion + value: 0.109.0 + - name: GuardianPackagesConfigFile + value: $(Build.SourcesDirectory)\eng\common\sdl\packages.config + - name: GuardianVersion + value: ${{ coalesce(parameters.overrideGuardianVersion, '$(DefaultGuardianVersion)') }} + + jobs: ${{ parameters.jobs }} + diff --git a/eng/common/templates-official/jobs/jobs.yml b/eng/common/templates-official/jobs/jobs.yml new file mode 100644 index 000000000000..857a0f8ba43e --- /dev/null +++ b/eng/common/templates-official/jobs/jobs.yml @@ -0,0 +1,97 @@ +parameters: + # See schema documentation in /Documentation/AzureDevOps/TemplateSchema.md + continueOnError: false + + # Optional: Include PublishBuildArtifacts task + enablePublishBuildArtifacts: false + + # Optional: Enable publishing using release pipelines + enablePublishUsingPipelines: false + + # Optional: Enable running the source-build jobs to build repo from source + enableSourceBuild: false + + # Optional: Parameters for source-build template. + # See /eng/common/templates-official/jobs/source-build.yml for options + sourceBuildParameters: [] + + graphFileGeneration: + # Optional: Enable generating the graph files at the end of the build + enabled: false + # Optional: Include toolset dependencies in the generated graph files + includeToolset: false + + # Required: A collection of jobs to run - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#job + jobs: [] + + # Optional: Override automatically derived dependsOn value for "publish build assets" job + publishBuildAssetsDependsOn: '' + + # Optional: Publish the assets as soon as the publish to BAR stage is complete, rather doing so in a separate stage. + publishAssetsImmediately: false + + # Optional: If using publishAssetsImmediately and additional parameters are needed, can be used to send along additional parameters (normally sent to post-build.yml) + artifactsPublishingAdditionalParameters: '' + signingValidationAdditionalParameters: '' + + # Optional: should run as a public build even in the internal project + # if 'true', the build won't run any of the internal only steps, even if it is running in non-public projects. + runAsPublic: false + + enableSourceIndex: false + sourceIndexParams: {} + +# Internal resources (telemetry, microbuild) can only be accessed from non-public projects, +# and some (Microbuild) should only be applied to non-PR cases for internal builds. + +jobs: +- ${{ each job in parameters.jobs }}: + - template: ../job/job.yml + parameters: + # pass along parameters + ${{ each parameter in parameters }}: + ${{ if ne(parameter.key, 'jobs') }}: + ${{ parameter.key }}: ${{ parameter.value }} + + # pass along job properties + ${{ each property in job }}: + ${{ if ne(property.key, 'job') }}: + ${{ property.key }}: ${{ property.value }} + + name: ${{ job.job }} + +- ${{ if eq(parameters.enableSourceBuild, true) }}: + - template: /eng/common/templates-official/jobs/source-build.yml + parameters: + allCompletedJobId: Source_Build_Complete + ${{ each parameter in parameters.sourceBuildParameters }}: + ${{ parameter.key }}: ${{ parameter.value }} + +- ${{ if eq(parameters.enableSourceIndex, 'true') }}: + - template: ../job/source-index-stage1.yml + parameters: + runAsPublic: ${{ parameters.runAsPublic }} + ${{ each parameter in parameters.sourceIndexParams }}: + ${{ parameter.key }}: ${{ parameter.value }} + +- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - ${{ if or(eq(parameters.enablePublishBuildAssets, true), eq(parameters.artifacts.publish.manifests, 'true'), ne(parameters.artifacts.publish.manifests, '')) }}: + - template: ../job/publish-build-assets.yml + parameters: + continueOnError: ${{ parameters.continueOnError }} + dependsOn: + - ${{ if ne(parameters.publishBuildAssetsDependsOn, '') }}: + - ${{ each job in parameters.publishBuildAssetsDependsOn }}: + - ${{ job.job }} + - ${{ if eq(parameters.publishBuildAssetsDependsOn, '') }}: + - ${{ each job in parameters.jobs }}: + - ${{ job.job }} + - ${{ if eq(parameters.enableSourceBuild, true) }}: + - Source_Build_Complete + + runAsPublic: ${{ parameters.runAsPublic }} + publishUsingPipelines: ${{ parameters.enablePublishUsingPipelines }} + publishAssetsImmediately: ${{ parameters.publishAssetsImmediately }} + enablePublishBuildArtifacts: ${{ parameters.enablePublishBuildArtifacts }} + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + signingValidationAdditionalParameters: ${{ parameters.signingValidationAdditionalParameters }} diff --git a/eng/common/templates-official/jobs/source-build.yml b/eng/common/templates-official/jobs/source-build.yml new file mode 100644 index 000000000000..08e5db9bb116 --- /dev/null +++ b/eng/common/templates-official/jobs/source-build.yml @@ -0,0 +1,46 @@ +parameters: + # This template adds arcade-powered source-build to CI. A job is created for each platform, as + # well as an optional server job that completes when all platform jobs complete. + + # The name of the "join" job for all source-build platforms. If set to empty string, the job is + # not included. Existing repo pipelines can use this job depend on all source-build jobs + # completing without maintaining a separate list of every single job ID: just depend on this one + # server job. By default, not included. Recommended name if used: 'Source_Build_Complete'. + allCompletedJobId: '' + + # See /eng/common/templates-official/job/source-build.yml + jobNamePrefix: 'Source_Build' + + # 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' + + # 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, + # one job runs on 'defaultManagedPlatform'. + platforms: [] + +jobs: + +- ${{ if ne(parameters.allCompletedJobId, '') }}: + - job: ${{ parameters.allCompletedJobId }} + displayName: Source-Build Complete + pool: server + dependsOn: + - ${{ each platform in parameters.platforms }}: + - ${{ parameters.jobNamePrefix }}_${{ platform.name }} + - ${{ if eq(length(parameters.platforms), 0) }}: + - ${{ parameters.jobNamePrefix }}_${{ parameters.defaultManagedPlatform.name }} + +- ${{ each platform in parameters.platforms }}: + - template: /eng/common/templates-official/job/source-build.yml + parameters: + jobNamePrefix: ${{ parameters.jobNamePrefix }} + platform: ${{ platform }} + +- ${{ if eq(length(parameters.platforms), 0) }}: + - template: /eng/common/templates-official/job/source-build.yml + parameters: + jobNamePrefix: ${{ parameters.jobNamePrefix }} + platform: ${{ parameters.defaultManagedPlatform }} diff --git a/eng/common/templates-official/post-build/common-variables.yml b/eng/common/templates-official/post-build/common-variables.yml new file mode 100644 index 000000000000..c24193acfc98 --- /dev/null +++ b/eng/common/templates-official/post-build/common-variables.yml @@ -0,0 +1,22 @@ +variables: + - group: Publish-Build-Assets + + # Whether the build is internal or not + - name: IsInternalBuild + value: ${{ and(ne(variables['System.TeamProject'], 'public'), contains(variables['Build.SourceBranch'], 'internal')) }} + + # Default Maestro++ API Endpoint and API Version + - name: MaestroApiEndPoint + value: "https://maestro-prod.westus2.cloudapp.azure.com" + - name: MaestroApiAccessToken + value: $(MaestroAccessToken) + - name: MaestroApiVersion + value: "2020-02-20" + + - name: SourceLinkCLIVersion + value: 3.0.0 + - name: SymbolToolVersion + value: 1.0.1 + + - name: runCodesignValidationInjection + value: false diff --git a/eng/common/templates-official/post-build/post-build.yml b/eng/common/templates-official/post-build/post-build.yml new file mode 100644 index 000000000000..5c98fe1c0f3a --- /dev/null +++ b/eng/common/templates-official/post-build/post-build.yml @@ -0,0 +1,285 @@ +parameters: + # Which publishing infra should be used. THIS SHOULD MATCH THE VERSION ON THE BUILD MANIFEST. + # Publishing V1 is no longer supported + # Publishing V2 is no longer supported + # Publishing V3 is the default + - name: publishingInfraVersion + displayName: Which version of publishing should be used to promote the build definition? + type: number + default: 3 + values: + - 3 + + - name: BARBuildId + displayName: BAR Build Id + type: number + default: 0 + + - name: PromoteToChannelIds + displayName: Channel to promote BARBuildId to + type: string + default: '' + + - name: enableSourceLinkValidation + displayName: Enable SourceLink validation + type: boolean + default: false + + - name: enableSigningValidation + displayName: Enable signing validation + type: boolean + default: true + + - name: enableSymbolValidation + displayName: Enable symbol validation + type: boolean + default: false + + - name: enableNugetValidation + displayName: Enable NuGet validation + type: boolean + default: true + + - name: publishInstallersAndChecksums + displayName: Publish installers and checksums + type: boolean + default: true + + - name: SDLValidationParameters + type: object + default: + enable: false + publishGdn: false + continueOnError: false + params: '' + artifactNames: '' + downloadArtifacts: true + + # These parameters let the user customize the call to sdk-task.ps1 for publishing + # symbols & general artifacts as well as for signing validation + - name: symbolPublishingAdditionalParameters + displayName: Symbol publishing additional parameters + type: string + default: '' + + - name: artifactsPublishingAdditionalParameters + displayName: Artifact publishing additional parameters + type: string + default: '' + + - name: signingValidationAdditionalParameters + displayName: Signing validation additional parameters + type: string + default: '' + + # Which stages should finish execution before post-build stages start + - name: validateDependsOn + type: object + default: + - build + + - name: publishDependsOn + type: object + default: + - Validate + + # Optional: Call asset publishing rather than running in a separate stage + - name: publishAssetsImmediately + type: boolean + default: false + +stages: +- ${{ if or(eq( parameters.enableNugetValidation, 'true'), eq(parameters.enableSigningValidation, 'true'), eq(parameters.enableSourceLinkValidation, 'true'), eq(parameters.SDLValidationParameters.enable, 'true')) }}: + - stage: Validate + dependsOn: ${{ parameters.validateDependsOn }} + displayName: Validate Build Assets + variables: + - template: common-variables.yml + - template: /eng/common/templates-official/variables/pool-providers.yml + jobs: + - job: + displayName: NuGet Validation + condition: and(succeededOrFailed(), eq( ${{ parameters.enableNugetValidation }}, 'true')) + pool: + # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) + ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: + name: AzurePipelines-EO + image: 1ESPT-Windows2022 + demands: Cmd + os: windows + # If it's not devdiv, it's dnceng + ${{ else }}: + name: $(DncEngInternalBuildPool) + image: 1es-windows-2022-pt + os: windows + + steps: + - template: setup-maestro-vars.yml + parameters: + BARBuildId: ${{ parameters.BARBuildId }} + PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} + + - task: DownloadBuildArtifacts@0 + displayName: Download Package Artifacts + inputs: + buildType: specific + buildVersionToDownload: specific + project: $(AzDOProjectName) + pipeline: $(AzDOPipelineId) + buildId: $(AzDOBuildId) + artifactName: PackageArtifacts + checkDownloadedFiles: true + + - task: PowerShell@2 + displayName: Validate + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/post-build/nuget-validation.ps1 + arguments: -PackagesPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ + -ToolDestinationPath $(Agent.BuildDirectory)/Extract/ + + - job: + displayName: Signing Validation + condition: and( eq( ${{ parameters.enableSigningValidation }}, 'true'), ne( variables['PostBuildSign'], 'true')) + pool: + # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) + ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: + name: AzurePipelines-EO + image: 1ESPT-Windows2022 + demands: Cmd + os: windows + # If it's not devdiv, it's dnceng + ${{ else }}: + name: $(DncEngInternalBuildPool) + image: 1es-windows-2022-pt + os: windows + steps: + - template: setup-maestro-vars.yml + parameters: + BARBuildId: ${{ parameters.BARBuildId }} + PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} + + - task: DownloadBuildArtifacts@0 + displayName: Download Package Artifacts + inputs: + buildType: specific + buildVersionToDownload: specific + project: $(AzDOProjectName) + pipeline: $(AzDOPipelineId) + buildId: $(AzDOBuildId) + artifactName: PackageArtifacts + checkDownloadedFiles: true + itemPattern: | + ** + !**/Microsoft.SourceBuild.Intermediate.*.nupkg + + # 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@1 + displayName: 'Authenticate to AzDO Feeds' + + # Signing validation will optionally work with the buildmanifest file which is downloaded from + # Azure DevOps above. + - task: PowerShell@2 + displayName: Validate + inputs: + filePath: eng\common\sdk-task.ps1 + arguments: -task SigningValidation -restore -msbuildEngine vs + /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts' + /p:SignCheckExclusionsFile='$(Build.SourcesDirectory)/eng/SignCheckExclusionsFile.txt' + ${{ parameters.signingValidationAdditionalParameters }} + + - template: ../steps/publish-logs.yml + parameters: + StageLabel: 'Validation' + JobLabel: 'Signing' + BinlogToolVersion: $(BinlogToolVersion) + + - job: + displayName: SourceLink Validation + condition: eq( ${{ parameters.enableSourceLinkValidation }}, 'true') + pool: + # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) + ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: + name: AzurePipelines-EO + image: 1ESPT-Windows2022 + demands: Cmd + os: windows + # If it's not devdiv, it's dnceng + ${{ else }}: + name: $(DncEngInternalBuildPool) + image: 1es-windows-2022-pt + os: windows + steps: + - template: setup-maestro-vars.yml + parameters: + BARBuildId: ${{ parameters.BARBuildId }} + PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} + + - task: DownloadBuildArtifacts@0 + displayName: Download Blob Artifacts + inputs: + buildType: specific + buildVersionToDownload: specific + project: $(AzDOProjectName) + pipeline: $(AzDOPipelineId) + buildId: $(AzDOBuildId) + artifactName: BlobArtifacts + checkDownloadedFiles: true + + - task: PowerShell@2 + displayName: Validate + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/post-build/sourcelink-validation.ps1 + arguments: -InputPath $(Build.ArtifactStagingDirectory)/BlobArtifacts/ + -ExtractPath $(Agent.BuildDirectory)/Extract/ + -GHRepoName $(Build.Repository.Name) + -GHCommit $(Build.SourceVersion) + -SourcelinkCliVersion $(SourceLinkCLIVersion) + continueOnError: true + +- ${{ if ne(parameters.publishAssetsImmediately, 'true') }}: + - stage: publish_using_darc + ${{ if or(eq(parameters.enableNugetValidation, 'true'), eq(parameters.enableSigningValidation, 'true'), eq(parameters.enableSourceLinkValidation, 'true'), eq(parameters.SDLValidationParameters.enable, 'true')) }}: + dependsOn: ${{ parameters.publishDependsOn }} + ${{ else }}: + dependsOn: ${{ parameters.validateDependsOn }} + displayName: Publish using Darc + variables: + - template: common-variables.yml + - template: /eng/common/templates-official/variables/pool-providers.yml + jobs: + - job: + displayName: Publish Using Darc + timeoutInMinutes: 120 + pool: + # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) + ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: + name: AzurePipelines-EO + image: 1ESPT-Windows2022 + demands: Cmd + os: windows + # If it's not devdiv, it's dnceng + ${{ else }}: + name: $(DncEngInternalBuildPool) + image: 1es-windows-2022-pt + os: windows + steps: + - template: setup-maestro-vars.yml + parameters: + BARBuildId: ${{ parameters.BARBuildId }} + PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} + + - task: NuGetAuthenticate@1 + + - task: PowerShell@2 + displayName: Publish Using Darc + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 + arguments: -BuildId $(BARBuildId) + -PublishingInfraVersion ${{ parameters.publishingInfraVersion }} + -AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)' + -MaestroToken '$(MaestroApiAccessToken)' + -WaitPublishingFinish true + -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}' + -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' diff --git a/eng/common/templates-official/post-build/setup-maestro-vars.yml b/eng/common/templates-official/post-build/setup-maestro-vars.yml new file mode 100644 index 000000000000..0c87f149a4ad --- /dev/null +++ b/eng/common/templates-official/post-build/setup-maestro-vars.yml @@ -0,0 +1,70 @@ +parameters: + BARBuildId: '' + PromoteToChannelIds: '' + +steps: + - ${{ if eq(coalesce(parameters.PromoteToChannelIds, 0), 0) }}: + - task: DownloadBuildArtifacts@0 + displayName: Download Release Configs + inputs: + buildType: current + artifactName: ReleaseConfigs + checkDownloadedFiles: true + + - task: PowerShell@2 + name: setReleaseVars + displayName: Set Release Configs Vars + inputs: + targetType: inline + pwsh: true + script: | + try { + if (!$Env:PromoteToMaestroChannels -or $Env:PromoteToMaestroChannels.Trim() -eq '') { + $Content = Get-Content $(Build.StagingDirectory)/ReleaseConfigs/ReleaseConfigs.txt + + $BarId = $Content | Select -Index 0 + $Channels = $Content | Select -Index 1 + $IsStableBuild = $Content | Select -Index 2 + + $AzureDevOpsProject = $Env:System_TeamProject + $AzureDevOpsBuildDefinitionId = $Env:System_DefinitionId + $AzureDevOpsBuildId = $Env:Build_BuildId + } + else { + $buildApiEndpoint = "${Env:MaestroApiEndPoint}/api/builds/${Env:BARBuildId}?api-version=${Env:MaestroApiVersion}" + + $apiHeaders = New-Object 'System.Collections.Generic.Dictionary[[String],[String]]' + $apiHeaders.Add('Accept', 'application/json') + $apiHeaders.Add('Authorization',"Bearer ${Env:MAESTRO_API_TOKEN}") + + $buildInfo = try { Invoke-WebRequest -Method Get -Uri $buildApiEndpoint -Headers $apiHeaders | ConvertFrom-Json } catch { Write-Host "Error: $_" } + + $BarId = $Env:BARBuildId + $Channels = $Env:PromoteToMaestroChannels -split "," + $Channels = $Channels -join "][" + $Channels = "[$Channels]" + + $IsStableBuild = $buildInfo.stable + $AzureDevOpsProject = $buildInfo.azureDevOpsProject + $AzureDevOpsBuildDefinitionId = $buildInfo.azureDevOpsBuildDefinitionId + $AzureDevOpsBuildId = $buildInfo.azureDevOpsBuildId + } + + Write-Host "##vso[task.setvariable variable=BARBuildId]$BarId" + Write-Host "##vso[task.setvariable variable=TargetChannels]$Channels" + Write-Host "##vso[task.setvariable variable=IsStableBuild]$IsStableBuild" + + Write-Host "##vso[task.setvariable variable=AzDOProjectName]$AzureDevOpsProject" + Write-Host "##vso[task.setvariable variable=AzDOPipelineId]$AzureDevOpsBuildDefinitionId" + Write-Host "##vso[task.setvariable variable=AzDOBuildId]$AzureDevOpsBuildId" + } + catch { + Write-Host $_ + Write-Host $_.Exception + Write-Host $_.ScriptStackTrace + exit 1 + } + env: + MAESTRO_API_TOKEN: $(MaestroApiAccessToken) + BARBuildId: ${{ parameters.BARBuildId }} + PromoteToMaestroChannels: ${{ parameters.PromoteToChannelIds }} diff --git a/eng/common/templates-official/post-build/trigger-subscription.yml b/eng/common/templates-official/post-build/trigger-subscription.yml new file mode 100644 index 000000000000..da669030daf6 --- /dev/null +++ b/eng/common/templates-official/post-build/trigger-subscription.yml @@ -0,0 +1,13 @@ +parameters: + ChannelId: 0 + +steps: +- task: PowerShell@2 + displayName: Triggering subscriptions + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/post-build/trigger-subscriptions.ps1 + arguments: -SourceRepo $(Build.Repository.Uri) + -ChannelId ${{ parameters.ChannelId }} + -MaestroApiAccessToken $(MaestroAccessToken) + -MaestroApiEndPoint $(MaestroApiEndPoint) + -MaestroApiVersion $(MaestroApiVersion) diff --git a/eng/common/templates-official/steps/add-build-to-channel.yml b/eng/common/templates-official/steps/add-build-to-channel.yml new file mode 100644 index 000000000000..f67a210d62f3 --- /dev/null +++ b/eng/common/templates-official/steps/add-build-to-channel.yml @@ -0,0 +1,13 @@ +parameters: + ChannelId: 0 + +steps: +- task: PowerShell@2 + displayName: Add Build to Channel + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/post-build/add-build-to-channel.ps1 + arguments: -BuildId $(BARBuildId) + -ChannelId ${{ parameters.ChannelId }} + -MaestroApiAccessToken $(MaestroApiAccessToken) + -MaestroApiEndPoint $(MaestroApiEndPoint) + -MaestroApiVersion $(MaestroApiVersion) diff --git a/eng/common/templates-official/steps/build-reason.yml b/eng/common/templates-official/steps/build-reason.yml new file mode 100644 index 000000000000..eba58109b52c --- /dev/null +++ b/eng/common/templates-official/steps/build-reason.yml @@ -0,0 +1,12 @@ +# build-reason.yml +# Description: runs steps if build.reason condition is valid. conditions is a string of valid build reasons +# to include steps (',' separated). +parameters: + conditions: '' + steps: [] + +steps: + - ${{ if and( not(startsWith(parameters.conditions, 'not')), contains(parameters.conditions, variables['build.reason'])) }}: + - ${{ parameters.steps }} + - ${{ if and( startsWith(parameters.conditions, 'not'), not(contains(parameters.conditions, variables['build.reason']))) }}: + - ${{ parameters.steps }} diff --git a/eng/common/templates-official/steps/component-governance.yml b/eng/common/templates-official/steps/component-governance.yml new file mode 100644 index 000000000000..0ecec47b0c91 --- /dev/null +++ b/eng/common/templates-official/steps/component-governance.yml @@ -0,0 +1,13 @@ +parameters: + disableComponentGovernance: false + componentGovernanceIgnoreDirectories: '' + +steps: +- ${{ if eq(parameters.disableComponentGovernance, 'true') }}: + - script: "echo ##vso[task.setvariable variable=skipComponentGovernanceDetection]true" + displayName: Set skipComponentGovernanceDetection variable +- ${{ if ne(parameters.disableComponentGovernance, 'true') }}: + - task: ComponentGovernanceComponentDetection@0 + continueOnError: true + inputs: + ignoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }} \ No newline at end of file diff --git a/eng/common/templates-official/steps/execute-codeql.yml b/eng/common/templates-official/steps/execute-codeql.yml new file mode 100644 index 000000000000..9b4a5ffa30a7 --- /dev/null +++ b/eng/common/templates-official/steps/execute-codeql.yml @@ -0,0 +1,32 @@ +parameters: + # Language that should be analyzed. Defaults to csharp + language: csharp + # Build Commands + buildCommands: '' + overrideParameters: '' # Optional: to override values for parameters. + additionalParameters: '' # Optional: parameters that need user specific values eg: '-SourceToolsList @("abc","def") -ArtifactToolsList @("ghi","jkl")' + # Optional: if specified, restore and use this version of Guardian instead of the default. + overrideGuardianVersion: '' + # Optional: if true, publish the '.gdn' folder as a pipeline artifact. This can help with in-depth + # diagnosis of problems with specific tool configurations. + publishGuardianDirectoryToPipeline: false + # The script to run to execute all SDL tools. Use this if you want to use a script to define SDL + # parameters rather than relying on YAML. It may be better to use a local script, because you can + # reproduce results locally without piecing together a command based on the YAML. + executeAllSdlToolsScript: 'eng/common/sdl/execute-all-sdl-tools.ps1' + # There is some sort of bug (has been reported) in Azure DevOps where if this parameter is named + # 'continueOnError', the parameter value is not correctly picked up. + # This can also be remedied by the caller (post-build.yml) if it does not use a nested parameter + # optional: determines whether to continue the build if the step errors; + sdlContinueOnError: false + +steps: +- template: /eng/common/templates-official/steps/execute-sdl.yml + parameters: + overrideGuardianVersion: ${{ parameters.overrideGuardianVersion }} + executeAllSdlToolsScript: ${{ parameters.executeAllSdlToolsScript }} + overrideParameters: ${{ parameters.overrideParameters }} + additionalParameters: '${{ parameters.additionalParameters }} + -CodeQLAdditionalRunConfigParams @("BuildCommands < ${{ parameters.buildCommands }}", "Language < ${{ parameters.language }}")' + publishGuardianDirectoryToPipeline: ${{ parameters.publishGuardianDirectoryToPipeline }} + sdlContinueOnError: ${{ parameters.sdlContinueOnError }} \ No newline at end of file diff --git a/eng/common/templates-official/steps/execute-sdl.yml b/eng/common/templates-official/steps/execute-sdl.yml new file mode 100644 index 000000000000..07426fde05d8 --- /dev/null +++ b/eng/common/templates-official/steps/execute-sdl.yml @@ -0,0 +1,88 @@ +parameters: + overrideGuardianVersion: '' + executeAllSdlToolsScript: '' + overrideParameters: '' + additionalParameters: '' + publishGuardianDirectoryToPipeline: false + sdlContinueOnError: false + condition: '' + +steps: +- task: NuGetAuthenticate@1 + inputs: + nuGetServiceConnections: GuardianConnect + +- task: NuGetToolInstaller@1 + displayName: 'Install NuGet.exe' + +- ${{ if ne(parameters.overrideGuardianVersion, '') }}: + - pwsh: | + Set-Location -Path $(Build.SourcesDirectory)\eng\common\sdl + . .\sdl.ps1 + $guardianCliLocation = Install-Gdn -Path $(Build.SourcesDirectory)\.artifacts -Version ${{ parameters.overrideGuardianVersion }} + Write-Host "##vso[task.setvariable variable=GuardianCliLocation]$guardianCliLocation" + displayName: Install Guardian (Overridden) + +- ${{ if eq(parameters.overrideGuardianVersion, '') }}: + - pwsh: | + Set-Location -Path $(Build.SourcesDirectory)\eng\common\sdl + . .\sdl.ps1 + $guardianCliLocation = Install-Gdn -Path $(Build.SourcesDirectory)\.artifacts + Write-Host "##vso[task.setvariable variable=GuardianCliLocation]$guardianCliLocation" + displayName: Install Guardian + +- ${{ if ne(parameters.overrideParameters, '') }}: + - powershell: ${{ parameters.executeAllSdlToolsScript }} ${{ parameters.overrideParameters }} + displayName: Execute SDL (Overridden) + continueOnError: ${{ parameters.sdlContinueOnError }} + condition: ${{ parameters.condition }} + +- ${{ if eq(parameters.overrideParameters, '') }}: + - powershell: ${{ parameters.executeAllSdlToolsScript }} + -GuardianCliLocation $(GuardianCliLocation) + -NugetPackageDirectory $(Build.SourcesDirectory)\.packages + -AzureDevOpsAccessToken $(dn-bot-dotnet-build-rw-code-rw) + ${{ parameters.additionalParameters }} + displayName: Execute SDL + continueOnError: ${{ parameters.sdlContinueOnError }} + condition: ${{ parameters.condition }} + +- ${{ if ne(parameters.publishGuardianDirectoryToPipeline, 'false') }}: + # We want to publish the Guardian results and configuration for easy diagnosis. However, the + # '.gdn' dir is a mix of configuration, results, extracted dependencies, and Guardian default + # tooling files. Some of these files are large and aren't useful during an investigation, so + # exclude them by simply deleting them before publishing. (As of writing, there is no documented + # way to selectively exclude a dir from the pipeline artifact publish task.) + - task: DeleteFiles@1 + displayName: Delete Guardian dependencies to avoid uploading + inputs: + SourceFolder: $(Agent.BuildDirectory)/.gdn + Contents: | + c + i + condition: succeededOrFailed() + + - publish: $(Agent.BuildDirectory)/.gdn + artifact: GuardianConfiguration + displayName: Publish GuardianConfiguration + condition: succeededOrFailed() + + # Publish the SARIF files in a container named CodeAnalysisLogs to enable integration + # with the "SARIF SAST Scans Tab" Azure DevOps extension + - task: CopyFiles@2 + displayName: Copy SARIF files + inputs: + flattenFolders: true + sourceFolder: $(Agent.BuildDirectory)/.gdn/rc/ + contents: '**/*.sarif' + targetFolder: $(Build.SourcesDirectory)/CodeAnalysisLogs + condition: succeededOrFailed() + + # Use PublishBuildArtifacts because the SARIF extension only checks this case + # see microsoft/sarif-azuredevops-extension#4 + - task: PublishBuildArtifacts@1 + displayName: Publish SARIF files to CodeAnalysisLogs container + inputs: + pathToPublish: $(Build.SourcesDirectory)/CodeAnalysisLogs + artifactName: CodeAnalysisLogs + condition: succeededOrFailed() \ No newline at end of file diff --git a/eng/common/templates-official/steps/generate-sbom.yml b/eng/common/templates-official/steps/generate-sbom.yml new file mode 100644 index 000000000000..1bf43bf807af --- /dev/null +++ b/eng/common/templates-official/steps/generate-sbom.yml @@ -0,0 +1,48 @@ +# BuildDropPath - The root folder of the drop directory for which the manifest file will be generated. +# PackageName - The name of the package this SBOM represents. +# PackageVersion - The version of the package this SBOM represents. +# ManifestDirPath - The path of the directory where the generated manifest files will be placed +# IgnoreDirectories - Directories to ignore for SBOM generation. This will be passed through to the CG component detector. + +parameters: + PackageVersion: 8.0.0 + BuildDropPath: '$(Build.SourcesDirectory)/artifacts' + PackageName: '.NET' + ManifestDirPath: $(Build.ArtifactStagingDirectory)/sbom + IgnoreDirectories: '' + sbomContinueOnError: true + +steps: +- task: PowerShell@2 + displayName: Prep for SBOM generation in (Non-linux) + condition: or(eq(variables['Agent.Os'], 'Windows_NT'), eq(variables['Agent.Os'], 'Darwin')) + inputs: + filePath: ./eng/common/generate-sbom-prep.ps1 + arguments: ${{parameters.manifestDirPath}} + +# Chmodding is a workaround for https://github.com/dotnet/arcade/issues/8461 +- script: | + chmod +x ./eng/common/generate-sbom-prep.sh + ./eng/common/generate-sbom-prep.sh ${{parameters.manifestDirPath}} + displayName: Prep for SBOM generation in (Linux) + condition: eq(variables['Agent.Os'], 'Linux') + continueOnError: ${{ parameters.sbomContinueOnError }} + +- task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0 + displayName: 'Generate SBOM manifest' + continueOnError: ${{ parameters.sbomContinueOnError }} + inputs: + PackageName: ${{ parameters.packageName }} + BuildDropPath: ${{ parameters.buildDropPath }} + PackageVersion: ${{ parameters.packageVersion }} + ManifestDirPath: ${{ parameters.manifestDirPath }} + ${{ if ne(parameters.IgnoreDirectories, '') }}: + AdditionalComponentDetectorArgs: '--IgnoreDirectories ${{ parameters.IgnoreDirectories }}' + +- task: 1ES.PublishPipelineArtifact@1 + displayName: Publish SBOM manifest + continueOnError: ${{parameters.sbomContinueOnError}} + inputs: + targetPath: '${{parameters.manifestDirPath}}' + artifactName: $(ARTIFACT_NAME) + diff --git a/eng/common/templates-official/steps/publish-logs.yml b/eng/common/templates-official/steps/publish-logs.yml new file mode 100644 index 000000000000..04012fed182a --- /dev/null +++ b/eng/common/templates-official/steps/publish-logs.yml @@ -0,0 +1,23 @@ +parameters: + StageLabel: '' + JobLabel: '' + +steps: +- task: Powershell@2 + displayName: Prepare Binlogs to Upload + inputs: + targetType: inline + script: | + New-Item -ItemType Directory $(Build.SourcesDirectory)/PostBuildLogs/${{parameters.StageLabel}}/${{parameters.JobLabel}}/ + Move-Item -Path $(Build.SourcesDirectory)/artifacts/log/Debug/* $(Build.SourcesDirectory)/PostBuildLogs/${{parameters.StageLabel}}/${{parameters.JobLabel}}/ + continueOnError: true + condition: always() + +- task: 1ES.PublishBuildArtifacts@1 + displayName: Publish Logs + inputs: + PathtoPublish: '$(Build.SourcesDirectory)/PostBuildLogs' + PublishLocation: Container + ArtifactName: PostBuildLogs + continueOnError: true + condition: always() diff --git a/eng/common/templates-official/steps/retain-build.yml b/eng/common/templates-official/steps/retain-build.yml new file mode 100644 index 000000000000..83d97a26a01f --- /dev/null +++ b/eng/common/templates-official/steps/retain-build.yml @@ -0,0 +1,28 @@ +parameters: + # Optional azure devops PAT with build execute permissions for the build's organization, + # only needed if the build that should be retained ran on a different organization than + # the pipeline where this template is executing from + Token: '' + # Optional BuildId to retain, defaults to the current running build + BuildId: '' + # Azure devops Organization URI for the build in the https://dev.azure.com/ format. + # Defaults to the organization the current pipeline is running on + AzdoOrgUri: '$(System.CollectionUri)' + # Azure devops project for the build. Defaults to the project the current pipeline is running on + AzdoProject: '$(System.TeamProject)' + +steps: + - task: powershell@2 + inputs: + targetType: 'filePath' + filePath: eng/common/retain-build.ps1 + pwsh: true + arguments: > + -AzdoOrgUri: ${{parameters.AzdoOrgUri}} + -AzdoProject ${{parameters.AzdoProject}} + -Token ${{coalesce(parameters.Token, '$env:SYSTEM_ACCESSTOKEN') }} + -BuildId ${{coalesce(parameters.BuildId, '$env:BUILD_ID')}} + displayName: Enable permanent build retention + env: + SYSTEM_ACCESSTOKEN: $(System.AccessToken) + BUILD_ID: $(Build.BuildId) \ No newline at end of file diff --git a/eng/common/templates-official/steps/send-to-helix.yml b/eng/common/templates-official/steps/send-to-helix.yml new file mode 100644 index 000000000000..3eb7e2d5f840 --- /dev/null +++ b/eng/common/templates-official/steps/send-to-helix.yml @@ -0,0 +1,91 @@ +# Please remember to update the documentation if you make changes to these parameters! +parameters: + HelixSource: 'pr/default' # required -- sources must start with pr/, official/, prodcon/, or agent/ + HelixType: 'tests/default/' # required -- Helix telemetry which identifies what type of data this is; should include "test" for clarity and must end in '/' + HelixBuild: $(Build.BuildNumber) # required -- the build number Helix will use to identify this -- automatically set to the AzDO build number + HelixTargetQueues: '' # required -- semicolon-delimited list of Helix queues to test on; see https://helix.dot.net/ for a list of queues + HelixAccessToken: '' # required -- access token to make Helix API requests; should be provided by the appropriate variable group + HelixConfiguration: '' # optional -- additional property attached to a job + HelixPreCommands: '' # optional -- commands to run before Helix work item execution + HelixPostCommands: '' # optional -- commands to run after Helix work item execution + WorkItemDirectory: '' # optional -- a payload directory to zip up and send to Helix; requires WorkItemCommand; incompatible with XUnitProjects + WorkItemCommand: '' # optional -- a command to execute on the payload; requires WorkItemDirectory; incompatible with XUnitProjects + WorkItemTimeout: '' # optional -- a timeout in TimeSpan.Parse-ready value (e.g. 00:02:00) for the work item command; requires WorkItemDirectory; incompatible with XUnitProjects + CorrelationPayloadDirectory: '' # optional -- a directory to zip up and send to Helix as a correlation payload + XUnitProjects: '' # optional -- semicolon-delimited list of XUnitProjects to parse and send to Helix; requires XUnitRuntimeTargetFramework, XUnitPublishTargetFramework, XUnitRunnerVersion, and IncludeDotNetCli=true + XUnitWorkItemTimeout: '' # optional -- the workitem timeout in seconds for all workitems created from the xUnit projects specified by XUnitProjects + XUnitPublishTargetFramework: '' # optional -- framework to use to publish your xUnit projects + XUnitRuntimeTargetFramework: '' # optional -- framework to use for the xUnit console runner + XUnitRunnerVersion: '' # optional -- version of the xUnit nuget package you wish to use on Helix; required for XUnitProjects + IncludeDotNetCli: false # optional -- true will download a version of the .NET CLI onto the Helix machine as a correlation payload; requires DotNetCliPackageType and DotNetCliVersion + DotNetCliPackageType: '' # optional -- either 'sdk', 'runtime' or 'aspnetcore-runtime'; determines whether the sdk or runtime will be sent to Helix; see https://raw.githubusercontent.com/dotnet/core/main/release-notes/releases-index.json + DotNetCliVersion: '' # optional -- version of the CLI to send to Helix; based on this: https://raw.githubusercontent.com/dotnet/core/main/release-notes/releases-index.json + WaitForWorkItemCompletion: true # optional -- true will make the task wait until work items have been completed and fail the build if work items fail. False is "fire and forget." + IsExternal: false # [DEPRECATED] -- doesn't do anything, jobs are external if HelixAccessToken is empty and Creator is set + HelixBaseUri: 'https://helix.dot.net/' # optional -- sets the Helix API base URI (allows targeting https://helix.int-dot.net ) + Creator: '' # optional -- if the build is external, use this to specify who is sending the job + DisplayNamePrefix: 'Run Tests' # optional -- rename the beginning of the displayName of the steps in AzDO + condition: succeeded() # optional -- condition for step to execute; defaults to succeeded() + continueOnError: false # optional -- determines whether to continue the build if the step errors; defaults to false + +steps: + - powershell: 'powershell "$env:BUILD_SOURCESDIRECTORY\eng\common\msbuild.ps1 $env:BUILD_SOURCESDIRECTORY\eng\common\helixpublish.proj /restore /p:TreatWarningsAsErrors=false /t:Test /bl:$env:BUILD_SOURCESDIRECTORY\artifacts\log\$env:BuildConfig\SendToHelix.binlog"' + displayName: ${{ parameters.DisplayNamePrefix }} (Windows) + env: + BuildConfig: $(_BuildConfig) + HelixSource: ${{ parameters.HelixSource }} + HelixType: ${{ parameters.HelixType }} + HelixBuild: ${{ parameters.HelixBuild }} + HelixConfiguration: ${{ parameters.HelixConfiguration }} + HelixTargetQueues: ${{ parameters.HelixTargetQueues }} + HelixAccessToken: ${{ parameters.HelixAccessToken }} + HelixPreCommands: ${{ parameters.HelixPreCommands }} + HelixPostCommands: ${{ parameters.HelixPostCommands }} + WorkItemDirectory: ${{ parameters.WorkItemDirectory }} + WorkItemCommand: ${{ parameters.WorkItemCommand }} + WorkItemTimeout: ${{ parameters.WorkItemTimeout }} + CorrelationPayloadDirectory: ${{ parameters.CorrelationPayloadDirectory }} + XUnitProjects: ${{ parameters.XUnitProjects }} + XUnitWorkItemTimeout: ${{ parameters.XUnitWorkItemTimeout }} + XUnitPublishTargetFramework: ${{ parameters.XUnitPublishTargetFramework }} + XUnitRuntimeTargetFramework: ${{ parameters.XUnitRuntimeTargetFramework }} + XUnitRunnerVersion: ${{ parameters.XUnitRunnerVersion }} + IncludeDotNetCli: ${{ parameters.IncludeDotNetCli }} + DotNetCliPackageType: ${{ parameters.DotNetCliPackageType }} + DotNetCliVersion: ${{ parameters.DotNetCliVersion }} + WaitForWorkItemCompletion: ${{ parameters.WaitForWorkItemCompletion }} + HelixBaseUri: ${{ parameters.HelixBaseUri }} + Creator: ${{ parameters.Creator }} + SYSTEM_ACCESSTOKEN: $(System.AccessToken) + condition: and(${{ parameters.condition }}, eq(variables['Agent.Os'], 'Windows_NT')) + continueOnError: ${{ parameters.continueOnError }} + - script: $BUILD_SOURCESDIRECTORY/eng/common/msbuild.sh $BUILD_SOURCESDIRECTORY/eng/common/helixpublish.proj /restore /p:TreatWarningsAsErrors=false /t:Test /bl:$BUILD_SOURCESDIRECTORY/artifacts/log/$BuildConfig/SendToHelix.binlog + displayName: ${{ parameters.DisplayNamePrefix }} (Unix) + env: + BuildConfig: $(_BuildConfig) + HelixSource: ${{ parameters.HelixSource }} + HelixType: ${{ parameters.HelixType }} + HelixBuild: ${{ parameters.HelixBuild }} + HelixConfiguration: ${{ parameters.HelixConfiguration }} + HelixTargetQueues: ${{ parameters.HelixTargetQueues }} + HelixAccessToken: ${{ parameters.HelixAccessToken }} + HelixPreCommands: ${{ parameters.HelixPreCommands }} + HelixPostCommands: ${{ parameters.HelixPostCommands }} + WorkItemDirectory: ${{ parameters.WorkItemDirectory }} + WorkItemCommand: ${{ parameters.WorkItemCommand }} + WorkItemTimeout: ${{ parameters.WorkItemTimeout }} + CorrelationPayloadDirectory: ${{ parameters.CorrelationPayloadDirectory }} + XUnitProjects: ${{ parameters.XUnitProjects }} + XUnitWorkItemTimeout: ${{ parameters.XUnitWorkItemTimeout }} + XUnitPublishTargetFramework: ${{ parameters.XUnitPublishTargetFramework }} + XUnitRuntimeTargetFramework: ${{ parameters.XUnitRuntimeTargetFramework }} + XUnitRunnerVersion: ${{ parameters.XUnitRunnerVersion }} + IncludeDotNetCli: ${{ parameters.IncludeDotNetCli }} + DotNetCliPackageType: ${{ parameters.DotNetCliPackageType }} + DotNetCliVersion: ${{ parameters.DotNetCliVersion }} + WaitForWorkItemCompletion: ${{ parameters.WaitForWorkItemCompletion }} + HelixBaseUri: ${{ parameters.HelixBaseUri }} + Creator: ${{ parameters.Creator }} + SYSTEM_ACCESSTOKEN: $(System.AccessToken) + condition: and(${{ parameters.condition }}, ne(variables['Agent.Os'], 'Windows_NT')) + continueOnError: ${{ parameters.continueOnError }} diff --git a/eng/common/templates-official/steps/source-build.yml b/eng/common/templates-official/steps/source-build.yml new file mode 100644 index 000000000000..829f17c34d11 --- /dev/null +++ b/eng/common/templates-official/steps/source-build.yml @@ -0,0 +1,129 @@ +parameters: + # This template adds arcade-powered source-build to CI. + + # This is a 'steps' template, and is intended for advanced scenarios where the existing build + # infra has a careful build methodology that must be followed. For example, a repo + # (dotnet/runtime) might choose to clone the GitHub repo only once and store it as a pipeline + # artifact for all subsequent jobs to use, to reduce dependence on a strong network connection to + # GitHub. Using this steps template leaves room for that infra to be included. + + # Defines the platform on which to run the steps. See 'eng/common/templates-official/job/source-build.yml' + # for details. The entire object is described in the 'job' template for simplicity, even though + # the usage of the properties on this object is split between the 'job' and 'steps' templates. + platform: {} + +steps: +# Build. Keep it self-contained for simple reusability. (No source-build-specific job variables.) +- script: | + set -x + df -h + + # If building on the internal project, the artifact feeds variable may be available (usually only if needed) + # In that case, call the feed setup script to add internal feeds corresponding to public ones. + # In addition, add an msbuild argument to copy the WIP from the repo to the target build location. + # This is because SetupNuGetSources.sh will alter the current NuGet.config file, and we need to preserve those + # changes. + internalRestoreArgs= + if [ '$(dn-bot-dnceng-artifact-feeds-rw)' != '$''(dn-bot-dnceng-artifact-feeds-rw)' ]; then + # Temporarily work around https://github.com/dotnet/arcade/issues/7709 + chmod +x $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh + $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh $(Build.SourcesDirectory)/NuGet.config $(dn-bot-dnceng-artifact-feeds-rw) + internalRestoreArgs='/p:CopyWipIntoInnerSourceBuildRepo=true' + + # The 'Copy WIP' feature of source build uses git stash to apply changes from the original repo. + # This only works if there is a username/email configured, which won't be the case in most CI runs. + git config --get user.email + if [ $? -ne 0 ]; then + git config user.email dn-bot@microsoft.com + git config user.name dn-bot + fi + fi + + # If building on the internal project, the internal storage variable may be available (usually only if needed) + # In that case, add variables to allow the download of internal runtimes if the specified versions are not found + # in the default public locations. + internalRuntimeDownloadArgs= + if [ '$(dotnetbuilds-internal-container-read-token-base64)' != '$''(dotnetbuilds-internal-container-read-token-base64)' ]; then + internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) --runtimesourcefeed https://dotnetbuilds.blob.core.windows.net/internal --runtimesourcefeedkey $(dotnetbuilds-internal-container-read-token-base64)' + fi + + buildConfig=Release + # Check if AzDO substitutes in a build config from a variable, and use it if so. + if [ '$(_BuildConfig)' != '$''(_BuildConfig)' ]; then + buildConfig='$(_BuildConfig)' + fi + + officialBuildArgs= + if [ '${{ and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}' = 'True' ]; then + officialBuildArgs='/p:DotNetPublishUsingPipelines=true /p:OfficialBuildId=$(BUILD.BUILDNUMBER)' + fi + + targetRidArgs= + if [ '${{ parameters.platform.targetRID }}' != '' ]; then + targetRidArgs='/p:TargetRid=${{ parameters.platform.targetRID }}' + fi + + runtimeOsArgs= + if [ '${{ parameters.platform.runtimeOS }}' != '' ]; then + runtimeOsArgs='/p:RuntimeOS=${{ parameters.platform.runtimeOS }}' + fi + + baseOsArgs= + if [ '${{ parameters.platform.baseOS }}' != '' ]; then + baseOsArgs='/p:BaseOS=${{ parameters.platform.baseOS }}' + fi + + publishArgs= + if [ '${{ parameters.platform.skipPublishValidation }}' != 'true' ]; then + publishArgs='--publish' + fi + + assetManifestFileName=SourceBuild_RidSpecific.xml + if [ '${{ parameters.platform.name }}' != '' ]; then + assetManifestFileName=SourceBuild_${{ parameters.platform.name }}.xml + fi + + ${{ coalesce(parameters.platform.buildScript, './build.sh') }} --ci \ + --configuration $buildConfig \ + --restore --build --pack $publishArgs -bl \ + $officialBuildArgs \ + $internalRuntimeDownloadArgs \ + $internalRestoreArgs \ + $targetRidArgs \ + $runtimeOsArgs \ + $baseOsArgs \ + /p:SourceBuildNonPortable=${{ parameters.platform.nonPortable }} \ + /p:ArcadeBuildFromSource=true \ + /p:AssetManifestFileName=$assetManifestFileName + displayName: Build + +# Upload build logs for diagnosis. +- task: CopyFiles@2 + displayName: Prepare BuildLogs staging directory + inputs: + SourceFolder: '$(Build.SourcesDirectory)' + Contents: | + **/*.log + **/*.binlog + artifacts/source-build/self/prebuilt-report/** + TargetFolder: '$(Build.StagingDirectory)/BuildLogs' + CleanTargetFolder: true + continueOnError: true + condition: succeededOrFailed() + +- task: 1ES.PublishPipelineArtifact@1 + displayName: Publish BuildLogs + inputs: + targetPath: '$(Build.StagingDirectory)/BuildLogs' + artifactName: BuildLogs_SourceBuild_${{ parameters.platform.name }}_Attempt$(System.JobAttempt) + continueOnError: true + condition: succeededOrFailed() + +# Manually inject component detection so that we can ignore the source build upstream cache, which contains +# a nupkg cache of input packages (a local feed). +# This path must match the upstream cache path in property 'CurrentRepoSourceBuiltNupkgCacheDir' +# in src\Microsoft.DotNet.Arcade.Sdk\tools\SourceBuild\SourceBuildArcade.targets +- task: ComponentGovernanceComponentDetection@0 + displayName: Component Detection (Exclude upstream cache) + inputs: + ignoreDirectories: '$(Build.SourcesDirectory)/artifacts/source-build/self/src/artifacts/obj/source-built-upstream-cache' diff --git a/eng/common/templates-official/variables/pool-providers.yml b/eng/common/templates-official/variables/pool-providers.yml new file mode 100644 index 000000000000..beab7d1bfba0 --- /dev/null +++ b/eng/common/templates-official/variables/pool-providers.yml @@ -0,0 +1,45 @@ +# Select a pool provider based off branch name. Anything with branch name containing 'release' must go into an -Svc pool, +# otherwise it should go into the "normal" pools. This separates out the queueing and billing of released branches. + +# Motivation: +# Once a given branch of a repository's output has been officially "shipped" once, it is then considered to be COGS +# (Cost of goods sold) and should be moved to a servicing pool provider. This allows both separation of queueing +# (allowing release builds and main PR builds to not intefere with each other) and billing (required for COGS. +# Additionally, the pool provider name itself may be subject to change when the .NET Core Engineering Services +# team needs to move resources around and create new and potentially differently-named pools. Using this template +# file from an Arcade-ified repo helps guard against both having to update one's release/* branches and renaming. + +# How to use: +# This yaml assumes your shipped product branches use the naming convention "release/..." (which many do). +# If we find alternate naming conventions in broad usage it can be added to the condition below. +# +# First, import the template in an arcade-ified repo to pick up the variables, e.g.: +# +# variables: +# - template: /eng/common/templates-official/variables/pool-providers.yml +# +# ... then anywhere specifying the pool provider use the runtime variables, +# $(DncEngInternalBuildPool) +# +# pool: +# name: $(DncEngInternalBuildPool) +# image: 1es-windows-2022-pt + +variables: + # Coalesce the target and source branches so we know when a PR targets a release branch + # If these variables are somehow missing, fall back to main (tends to have more capacity) + + # Any new -Svc alternative pools should have variables added here to allow for splitting work + + - name: DncEngInternalBuildPool + value: $[ + replace( + replace( + eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), + True, + 'NetCore1ESPool-Svc-Internal' + ), + False, + 'NetCore1ESPool-Internal' + ) + ] \ No newline at end of file diff --git a/eng/common/templates-official/variables/sdl-variables.yml b/eng/common/templates-official/variables/sdl-variables.yml new file mode 100644 index 000000000000..dbdd66d4a4b3 --- /dev/null +++ b/eng/common/templates-official/variables/sdl-variables.yml @@ -0,0 +1,7 @@ +variables: +# The Guardian version specified in 'eng/common/sdl/packages.config'. This value must be kept in +# sync with the packages.config file. +- name: DefaultGuardianVersion + value: 0.109.0 +- name: GuardianPackagesConfigFile + value: $(Build.SourcesDirectory)\eng\common\sdl\packages.config \ No newline at end of file diff --git a/global.json b/global.json index efeb5c8681b0..363c757a573d 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24123.1", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24123.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24151.4", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24151.4" } } From 2822b1b71e9e15b59109d5ce437e3cfc881df7ab Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 2 Mar 2024 14:06:12 +0000 Subject: [PATCH 178/261] Update dependencies from https://github.com/dotnet/arcade-services build 20240301.2 Microsoft.DotNet.Darc , Microsoft.DotNet.DarcLib From Version 1.1.0-beta.24128.3 -> To Version 1.1.0-beta.24151.2 --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 89ddcab6a237..414565bfd7fc 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.24129.1", + "version": "1.1.0-beta.24151.2", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b7ea3ae19e8f..fc6b85d0b2c5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -227,13 +227,13 @@ https://github.com/dotnet/arcade 042763a811fd94dc3556253d4c64118dd665216e - + https://github.com/dotnet/arcade-services - de6ff482f3e43757677a649c59a056d6275bc655 + 8d492247e5ff57f34f375069dd1c9fb70a26451d - + https://github.com/dotnet/arcade-services - de6ff482f3e43757677a649c59a056d6275bc655 + 8d492247e5ff57f34f375069dd1c9fb70a26451d https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index a8b99b5ea3ff..967f8ab3811f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 1.1.0-beta.24129.1 + 1.1.0-beta.24151.2 From 3adb0cc25cb3fcd7c9c6ebcbd00c65a9284c5324 Mon Sep 17 00:00:00 2001 From: Jackson Schuster <36744439+jtschuster@users.noreply.github.com> Date: Sat, 2 Mar 2024 09:28:13 -0800 Subject: [PATCH 179/261] Don't add another item in SdkTarballItem --- src/SourceBuild/content/eng/build.sourcebuild.targets | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/SourceBuild/content/eng/build.sourcebuild.targets b/src/SourceBuild/content/eng/build.sourcebuild.targets index 00b1439ef7d6..a05905856cf0 100644 --- a/src/SourceBuild/content/eng/build.sourcebuild.targets +++ b/src/SourceBuild/content/eng/build.sourcebuild.targets @@ -35,10 +35,6 @@ - - - - $(ArtifactsAssetsDir)dotnet-symbols-sdk-$(SourceBuiltSdkVersion)-$(TargetRid)$(ArchiveExtension) From bc8cc04873452fb9ab1335cac88165c72677b2d1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 3 Mar 2024 13:51:42 +0000 Subject: [PATCH 180/261] Update dependencies from https://github.com/dotnet/arcade build 20240301.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.24123.1 -> To Version 8.0.0-beta.24151.4 From f952415ca6f76b957492bc6f257a2bd38698985c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 3 Mar 2024 13:57:18 +0000 Subject: [PATCH 181/261] Update dependencies from https://github.com/dotnet/arcade-services build 20240301.2 Microsoft.DotNet.Darc , Microsoft.DotNet.DarcLib From Version 1.1.0-beta.24128.3 -> To Version 1.1.0-beta.24151.2 From cdabc8628f844ff71cd06f775c512227bf644ff1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 4 Mar 2024 06:37:45 +0000 Subject: [PATCH 182/261] Update dependencies from https://github.com/dotnet/sdk build 20240303.4 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24151.1 -> To Version 8.0.300-preview.24153.4 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.10.0-3.24128.4 -> To Version 4.10.0-3.24151.8 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2f02dc768caa..4d7cacc1d9e7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - 5cc5fe81e7587b2925c1478dbe980e30b73287f4 + 993997b90e486db406b6f17a047b396e40198c2e - + https://github.com/dotnet/sdk - 5cc5fe81e7587b2925c1478dbe980e30b73287f4 + 993997b90e486db406b6f17a047b396e40198c2e - + https://github.com/dotnet/sdk - 5cc5fe81e7587b2925c1478dbe980e30b73287f4 + 993997b90e486db406b6f17a047b396e40198c2e - + https://github.com/dotnet/sdk - 5cc5fe81e7587b2925c1478dbe980e30b73287f4 + 993997b90e486db406b6f17a047b396e40198c2e https://github.com/dotnet/test-templates @@ -150,9 +150,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 1381d5ebd2ab1f292848d5b19b80cf71ac332508 - + https://github.com/dotnet/roslyn - 1d9ee7f5e9b3b6d681ce8d89d4b252619b704088 + 8537440d8c831b8533a18f6530945ee91c243e1b diff --git a/eng/Versions.props b/eng/Versions.props index 61fec2bcc5dd..b3bbfedc626f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,16 +85,16 @@ - 8.0.300-preview.24151.1 - 8.0.300-preview.24151.1 - 8.0.300-preview.24151.1 + 8.0.300-preview.24153.4 + 8.0.300-preview.24153.4 + 8.0.300-preview.24153.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.10.0-3.24128.4 + 4.10.0-3.24151.8 From ed028695da850080ef2bd6d4c3da9f4e5a4a72f0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 4 Mar 2024 08:13:13 +0000 Subject: [PATCH 183/261] Update dependencies from https://github.com/dotnet/sdk build 20240303.6 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24153.4 -> To Version 8.0.300-preview.24153.6 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4d7cacc1d9e7..c9638c2e005e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - 993997b90e486db406b6f17a047b396e40198c2e + f243688a5a2f31b4434f69617685a3725f8e1435 - + https://github.com/dotnet/sdk - 993997b90e486db406b6f17a047b396e40198c2e + f243688a5a2f31b4434f69617685a3725f8e1435 - + https://github.com/dotnet/sdk - 993997b90e486db406b6f17a047b396e40198c2e + f243688a5a2f31b4434f69617685a3725f8e1435 - + https://github.com/dotnet/sdk - 993997b90e486db406b6f17a047b396e40198c2e + f243688a5a2f31b4434f69617685a3725f8e1435 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index b3bbfedc626f..b7964c831f61 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24153.4 - 8.0.300-preview.24153.4 - 8.0.300-preview.24153.4 + 8.0.300-preview.24153.6 + 8.0.300-preview.24153.6 + 8.0.300-preview.24153.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 56a3b9a6ab890a4cfde92ade5fdfc28adcf2e6b1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 4 Mar 2024 10:38:23 +0000 Subject: [PATCH 184/261] Update dependencies from https://github.com/dotnet/sdk build 20240304.1 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24153.6 -> To Version 8.0.300-preview.24154.1 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp From Version 12.8.300-beta.24127.3 -> To Version 12.8.300-beta.24152.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c9638c2e005e..4c301fb77189 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - f243688a5a2f31b4434f69617685a3725f8e1435 + 092070a9dc283b3fe3e2fe213d4ba1399b7fbb96 - + https://github.com/dotnet/sdk - f243688a5a2f31b4434f69617685a3725f8e1435 + 092070a9dc283b3fe3e2fe213d4ba1399b7fbb96 - + https://github.com/dotnet/sdk - f243688a5a2f31b4434f69617685a3725f8e1435 + 092070a9dc283b3fe3e2fe213d4ba1399b7fbb96 - + https://github.com/dotnet/sdk - f243688a5a2f31b4434f69617685a3725f8e1435 + 092070a9dc283b3fe3e2fe213d4ba1399b7fbb96 https://github.com/dotnet/test-templates @@ -132,13 +132,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 472140dd926227876848e48f41cfc9acb9275492 - + https://github.com/dotnet/fsharp - b57dee7cec971021547a7b8a36a46d7271fea99e + ea8ef6edee63929f44026c79f94c9e6ffe6dcd62 - + https://github.com/dotnet/fsharp - b57dee7cec971021547a7b8a36a46d7271fea99e + ea8ef6edee63929f44026c79f94c9e6ffe6dcd62 diff --git a/eng/Versions.props b/eng/Versions.props index b7964c831f61..ce1666199eae 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24153.6 - 8.0.300-preview.24153.6 - 8.0.300-preview.24153.6 + 8.0.300-preview.24154.1 + 8.0.300-preview.24154.1 + 8.0.300-preview.24154.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 96ac4c3b085e89cca4f7810c77a746ce57c1723d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 4 Mar 2024 13:46:45 +0000 Subject: [PATCH 185/261] Update dependencies from https://github.com/dotnet/arcade-services build 20240303.1 Microsoft.DotNet.Darc , Microsoft.DotNet.DarcLib From Version 1.1.0-beta.24151.2 -> To Version 1.1.0-beta.24153.1 --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 414565bfd7fc..f6e69fceb225 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.24151.2", + "version": "1.1.0-beta.24153.1", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c9638c2e005e..e1c5e3a16c08 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -227,13 +227,13 @@ https://github.com/dotnet/arcade cbb61c3a9a42e7c3cce17ee453ff5ecdc7f69282 - + https://github.com/dotnet/arcade-services - 8d492247e5ff57f34f375069dd1c9fb70a26451d + b8bebd21f5a46416b30fa5e9b415003314e9b1d2 - + https://github.com/dotnet/arcade-services - 8d492247e5ff57f34f375069dd1c9fb70a26451d + b8bebd21f5a46416b30fa5e9b415003314e9b1d2 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index b7964c831f61..04a3d97b318e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 1.1.0-beta.24151.2 + 1.1.0-beta.24153.1 From 164e6293d3b24aa6b987b570caf91a1a02f98fb6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 4 Mar 2024 14:30:38 +0000 Subject: [PATCH 186/261] Update dependencies from https://github.com/dotnet/aspire build 20240301.2 Microsoft.SourceBuild.Intermediate.aspire , Microsoft.NET.Sdk.Aspire.Manifest-9.0.100-preview.1 From Version 9.0.0-preview.1.24116.3 -> To Version 9.0.0-preview.1.24151.2 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e7c47f344e62..23ae1e69a371 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -299,14 +299,14 @@ aren't shipping, or those extensions packages depend on aspnetcore packages that won't ship. However, given the cost of maintaining this coherency path is high. This being toolset means that aspire is responsible for its own coherency. --> - + https://github.com/dotnet/aspire - 1dd4b3265f01a50b20522fd3d7f3cd315db5be6b + fa3e45ee2a76c81e7a4876c6bef05282e35243f1 - + https://github.com/dotnet/aspire - 1dd4b3265f01a50b20522fd3d7f3cd315db5be6b + fa3e45ee2a76c81e7a4876c6bef05282e35243f1 diff --git a/eng/Versions.props b/eng/Versions.props index 1ec1d1d99abd..016447fbfcba 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -252,7 +252,7 @@ 9.0.100-preview.1 - 9.0.0-preview.1.24116.3 + 9.0.0-preview.1.24151.2 9.0.100-preview.1 9.0.0-preview.1.9973 34.99.0-preview.1.151 From 1d379621d1d96fd0653ea0616b20dcda373f2a5e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 4 Mar 2024 14:33:35 +0000 Subject: [PATCH 187/261] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20240304.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 9.0.0-alpha.1.24127.3 -> To Version 9.0.0-alpha.1.24154.1 --- 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 e7c47f344e62..b37cbed11f1f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -277,9 +277,9 @@ https://github.com/dotnet/runtime ab1a8224cdf115b65e0db5dc88d11f205068f444 - + https://github.com/dotnet/source-build-reference-packages - d1c092f24a18f5ed76631fc6c865f706aca5d90f + fe9c31d14ff215486b0002017f8e8c2f4a2ed2e4 From 9ac9e0049b0916740b6c9b1e0a09af57e310104c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 4 Mar 2024 15:46:36 +0000 Subject: [PATCH 188/261] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20240304.2 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 9.0.0-alpha.1.24127.3 -> To Version 9.0.0-alpha.1.24154.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 b37cbed11f1f..28035d68d634 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -277,9 +277,9 @@ https://github.com/dotnet/runtime ab1a8224cdf115b65e0db5dc88d11f205068f444 - + https://github.com/dotnet/source-build-reference-packages - fe9c31d14ff215486b0002017f8e8c2f4a2ed2e4 + 936b4a4b4b8a74b65098983660c5814fb4afee15 From 80a44a7252321832ca660a6b93b792ac6176e2c2 Mon Sep 17 00:00:00 2001 From: Ella Hathaway <67609881+ellahathaway@users.noreply.github.com> Date: Mon, 4 Mar 2024 10:17:24 -0800 Subject: [PATCH 189/261] Update SDK diff baseline (#18858) --- .../assets/baselines/MsftToSbSdkFiles.diff | 29 ------------------- 1 file changed, 29 deletions(-) diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdkFiles.diff b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdkFiles.diff index d02f4b5ee736..a50c205b8947 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdkFiles.diff +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdkFiles.diff @@ -81,9 +81,6 @@ index ------------ -./sdk/x.y.z/Containers/containerize/ko/Microsoft.DotNet.Cli.Utils.resources.dll -./sdk/x.y.z/Containers/containerize/ko/Microsoft.NET.Build.Containers.resources.dll -./sdk/x.y.z/Containers/containerize/ko/System.CommandLine.resources.dll --./sdk/x.y.z/Containers/containerize/Microsoft.Build.dll --./sdk/x.y.z/Containers/containerize/Microsoft.Build.Framework.dll --./sdk/x.y.z/Containers/containerize/Microsoft.Build.Utilities.Core.dll -./sdk/x.y.z/Containers/containerize/Microsoft.DotNet.Cli.Utils.dll -./sdk/x.y.z/Containers/containerize/Microsoft.Extensions.Configuration.Abstractions.dll -./sdk/x.y.z/Containers/containerize/Microsoft.Extensions.Configuration.Binder.dll @@ -99,8 +96,6 @@ index ------------ -./sdk/x.y.z/Containers/containerize/Microsoft.Extensions.Options.dll -./sdk/x.y.z/Containers/containerize/Microsoft.Extensions.Primitives.dll -./sdk/x.y.z/Containers/containerize/Microsoft.NET.Build.Containers.dll --./sdk/x.y.z/Containers/containerize/Microsoft.NET.StringTools.dll --./sdk/x.y.z/Containers/containerize/Microsoft.VisualStudio.Setup.Configuration.Interop.dll -./sdk/x.y.z/Containers/containerize/MSBuild.dll -./sdk/x.y.z/Containers/containerize/Newtonsoft.Json.dll -./sdk/x.y.z/Containers/containerize/NuGet.Common.dll @@ -129,13 +124,8 @@ index ------------ -./sdk/x.y.z/Containers/containerize/runtimes/win/ -./sdk/x.y.z/Containers/containerize/runtimes/win/lib/ -./sdk/x.y.z/Containers/containerize/runtimes/win/lib/netx.y/ --./sdk/x.y.z/Containers/containerize/runtimes/win/lib/netx.y/System.Diagnostics.EventLog.dll --./sdk/x.y.z/Containers/containerize/runtimes/win/lib/netx.y/System.Diagnostics.EventLog.Messages.dll -./sdk/x.y.z/Containers/containerize/runtimes/win/lib/netx.y/System.Security.Cryptography.Pkcs.dll -./sdk/x.y.z/Containers/containerize/System.CommandLine.dll --./sdk/x.y.z/Containers/containerize/System.Configuration.ConfigurationManager.dll --./sdk/x.y.z/Containers/containerize/System.Diagnostics.EventLog.dll --./sdk/x.y.z/Containers/containerize/System.Reflection.MetadataLoadContext.dll -./sdk/x.y.z/Containers/containerize/System.Security.Cryptography.Pkcs.dll -./sdk/x.y.z/Containers/containerize/System.Security.Cryptography.ProtectedData.dll -./sdk/x.y.z/Containers/containerize/tr/ @@ -182,8 +172,6 @@ index ------------ -./sdk/x.y.z/Containers/tasks/net472/ko/Microsoft.NET.Build.Containers.resources.dll -./sdk/x.y.z/Containers/tasks/net472/ko/System.CommandLine.resources.dll -./sdk/x.y.z/Containers/tasks/net472/Microsoft.Bcl.AsyncInterfaces.dll --./sdk/x.y.z/Containers/tasks/net472/Microsoft.Build.dll --./sdk/x.y.z/Containers/tasks/net472/Microsoft.Build.Framework.dll -./sdk/x.y.z/Containers/tasks/net472/Microsoft.DotNet.Cli.Utils.dll -./sdk/x.y.z/Containers/tasks/net472/Microsoft.DotNet.Cli.Utils.dll.config -./sdk/x.y.z/Containers/tasks/net472/Microsoft.Extensions.DependencyInjection.Abstractions.dll @@ -193,12 +181,9 @@ index ------------ -./sdk/x.y.z/Containers/tasks/net472/Microsoft.Extensions.Logging.dll -./sdk/x.y.z/Containers/tasks/net472/Microsoft.Extensions.Options.dll -./sdk/x.y.z/Containers/tasks/net472/Microsoft.Extensions.Primitives.dll --./sdk/x.y.z/Containers/tasks/net472/Microsoft.IO.Redist.dll -./sdk/x.y.z/Containers/tasks/net472/Microsoft.NET.Build.Containers.deps.json -./sdk/x.y.z/Containers/tasks/net472/Microsoft.NET.Build.Containers.dll -./sdk/x.y.z/Containers/tasks/net472/Microsoft.NET.Build.Containers.dll.config --./sdk/x.y.z/Containers/tasks/net472/Microsoft.NET.StringTools.dll --./sdk/x.y.z/Containers/tasks/net472/Microsoft.VisualStudio.Setup.Configuration.Interop.dll -./sdk/x.y.z/Containers/tasks/net472/Newtonsoft.Json.dll -./sdk/x.y.z/Containers/tasks/net472/NuGet.Common.dll -./sdk/x.y.z/Containers/tasks/net472/NuGet.Configuration.dll @@ -223,19 +208,13 @@ index ------------ -./sdk/x.y.z/Containers/tasks/net472/ru/Microsoft.NET.Build.Containers.resources.dll -./sdk/x.y.z/Containers/tasks/net472/ru/System.CommandLine.resources.dll -./sdk/x.y.z/Containers/tasks/net472/System.Buffers.dll --./sdk/x.y.z/Containers/tasks/net472/System.Collections.Immutable.dll -./sdk/x.y.z/Containers/tasks/net472/System.CommandLine.dll --./sdk/x.y.z/Containers/tasks/net472/System.Configuration.ConfigurationManager.dll -./sdk/x.y.z/Containers/tasks/net472/System.Diagnostics.DiagnosticSource.dll -./sdk/x.y.z/Containers/tasks/net472/System.Memory.dll -./sdk/x.y.z/Containers/tasks/net472/System.Numerics.Vectors.dll --./sdk/x.y.z/Containers/tasks/net472/System.Reflection.Metadata.dll --./sdk/x.y.z/Containers/tasks/net472/System.Reflection.MetadataLoadContext.dll -./sdk/x.y.z/Containers/tasks/net472/System.Runtime.CompilerServices.Unsafe.dll --./sdk/x.y.z/Containers/tasks/net472/System.Security.Principal.Windows.dll -./sdk/x.y.z/Containers/tasks/net472/System.Text.Encodings.Web.dll -./sdk/x.y.z/Containers/tasks/net472/System.Text.Json.dll --./sdk/x.y.z/Containers/tasks/net472/System.Threading.Tasks.Dataflow.dll -./sdk/x.y.z/Containers/tasks/net472/System.Threading.Tasks.Extensions.dll -./sdk/x.y.z/Containers/tasks/net472/System.ValueTuple.dll -./sdk/x.y.z/Containers/tasks/net472/tr/ @@ -254,14 +233,6 @@ index ------------ ./sdk/x.y.z/Containers/tasks/netx.y/ ./sdk/x.y.z/Containers/tasks/netx.y/cs/ ./sdk/x.y.z/Containers/tasks/netx.y/cs/Microsoft.DotNet.Cli.Utils.resources.dll -@@ ------------ @@ - ./sdk/x.y.z/Containers/tasks/netx.y/Microsoft.NET.Build.Containers.deps.json - ./sdk/x.y.z/Containers/tasks/netx.y/Microsoft.NET.Build.Containers.dll - ./sdk/x.y.z/Containers/tasks/netx.y/Microsoft.NET.StringTools.dll --./sdk/x.y.z/Containers/tasks/netx.y/Microsoft.VisualStudio.Setup.Configuration.Interop.dll - ./sdk/x.y.z/Containers/tasks/netx.y/MSBuild.dll - ./sdk/x.y.z/Containers/tasks/netx.y/Newtonsoft.Json.dll - ./sdk/x.y.z/Containers/tasks/netx.y/NuGet.Common.dll @@ ------------ @@ ./sdk/x.y.z/Microsoft.Build.NuGetSdkResolver.dll ./sdk/x.y.z/Microsoft.Build.Tasks.Core.dll From 2455592425435e881727c918b648715f51a8a71f Mon Sep 17 00:00:00 2001 From: Chet Husk Date: Mon, 4 Mar 2024 12:36:28 -0600 Subject: [PATCH 190/261] Update README.md something is off with the generation pipeline that's putting in CLI output. we don't need it. --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 58c25c670c82..2eedbb15c5c9 100644 --- a/README.md +++ b/README.md @@ -170,7 +170,6 @@ Do not directly edit the table below. Use https://github.com/dotnet/installer/tr ### Table -Use 'dotnet --help' to see available commands or visit: https://aka.ms/dotnet-cli -------------------------------------------------------------------------------------- | Platform | main
(9.0.x Runtime) | 9.0.1xx-preview1
(9.0-preview1 Runtime) | 8.0.3xx
(8.0 Runtime) | Release/7.0.4xx
(7.0.x Runtime) | | :--------- | :----------: | :----------: | :----------: | :----------: | From 97cc3fca4bff8689b8801db27d0b63a9a0068662 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Mon, 4 Mar 2024 19:44:44 +0100 Subject: [PATCH 191/261] Add build mode to VMR build log (#18860) --- src/SourceBuild/content/build.proj | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/SourceBuild/content/build.proj b/src/SourceBuild/content/build.proj index 05c314d81d4e..ec9727bf83fe 100644 --- a/src/SourceBuild/content/build.proj +++ b/src/SourceBuild/content/build.proj @@ -10,7 +10,11 @@ - + + (source-only) + + + Date: Mon, 4 Mar 2024 10:52:29 -0800 Subject: [PATCH 192/261] Update HostRid default to be in line with Host/Target architecture props (#18861) --- src/SourceBuild/content/Directory.Build.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/SourceBuild/content/Directory.Build.props b/src/SourceBuild/content/Directory.Build.props index 52bed083548c..6ee6eae87b0a 100644 --- a/src/SourceBuild/content/Directory.Build.props +++ b/src/SourceBuild/content/Directory.Build.props @@ -15,8 +15,8 @@ solaris haiku windows - $(BuildOS) $(BuildOS) + $(TargetOS) @@ -52,8 +52,8 @@ $(__DistroRid) $([System.Runtime.InteropServices.RuntimeInformation]::RuntimeIdentifier) - $(BuildRid) $(BuildRid.Substring(0, $(BuildRid.LastIndexOf('-'))))-$(TargetArchitecture) + $(TargetRid) 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 193/261] 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 50fac905d463..e5b4aa4e7a80 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 97d8e4d2b6e16292ff2990ae51ed2f7dc2200179 Mon Sep 17 00:00:00 2001 From: Jackson Schuster <36744439+jtschuster@users.noreply.github.com> Date: Mon, 4 Mar 2024 11:51:45 -0800 Subject: [PATCH 194/261] Add message when there are no differences, don't validate non-portable builds --- src/SourceBuild/content/eng/build.targets | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/SourceBuild/content/eng/build.targets b/src/SourceBuild/content/eng/build.targets index 406c4778e1ed..2f2ea8e8c522 100644 --- a/src/SourceBuild/content/eng/build.targets +++ b/src/SourceBuild/content/eng/build.targets @@ -6,7 +6,8 @@ + Condition="'$(ShortStack)' != 'true' AND '$(PortableBuild)' == 'true'" > + @@ -34,9 +35,16 @@ ItemName="_ContentDifferences" /> - + <_changedFiles Include="@(_ContentDifferences)" Condition="'%(_contentDifferences.Kind)' != 'Unchanged'" /> + + + + + Condition="'@(_changedFiles->Count())' == '0'" /> From 7c393400d236bfb80819e52f2945b9ddf28f2b73 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Mon, 4 Mar 2024 12:33:27 -0800 Subject: [PATCH 195/261] Update arcade and add support for --build-tests switch (#18464) Co-authored-by: Viktor Hofer --- src/SourceBuild/content/build.sh | 4 ++++ src/SourceBuild/content/eng/build.ps1 | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/src/SourceBuild/content/build.sh b/src/SourceBuild/content/build.sh index 2c855176119a..a56de7c8fc7f 100755 --- a/src/SourceBuild/content/build.sh +++ b/src/SourceBuild/content/build.sh @@ -33,6 +33,7 @@ usage() echo "" echo "Advanced settings:" + echo " --build-tests Build repository tests. May not be supported with --source-only" echo " --ci Set when running on CI server" echo " --clean-while-building Cleans each repo after building (reduces disk space usage, short: -cwb)" echo " --excludeCIBinarylog Don't output binary log (short: -nobl)" @@ -161,6 +162,9 @@ while [[ $# > 0 ]]; do ;; # Advanced settings + -build-tests) + properties="$properties /p:DotNetBuildTests=true" + ;; -ci) ci=true ;; diff --git a/src/SourceBuild/content/eng/build.ps1 b/src/SourceBuild/content/eng/build.ps1 index c13ce050adbf..b354a83422ef 100644 --- a/src/SourceBuild/content/eng/build.ps1 +++ b/src/SourceBuild/content/eng/build.ps1 @@ -10,6 +10,7 @@ Param( [switch][Alias('h')]$help, # Advanced settings + [switch]$buildTests, [switch]$ci, [switch][Alias('cwb')]$cleanWhileBuilding, [switch][Alias('nobl')]$excludeCIBinarylog, @@ -30,6 +31,7 @@ function Get-Usage() { Write-Host "" Write-Host "Advanced settings:" + Write-Host " -build-tests Build repository tests" Write-Host " -ci Set when running on CI server" Write-Host " -cleanWhileBuilding Cleans each repo after building (reduces disk space usage, short: -cwb)" Write-Host " -excludeCIBinarylog Don't output binary log (short: -nobl)" @@ -53,12 +55,14 @@ function Build { $bl = if ($binaryLog) { '/bl:' + (Join-Path $LogDir 'Build.binlog') } else { '' } $cwb = if ($cleanWhileBuilding) { '/p:CleanWhileBuilding=true' } else { '' } + $btst = if ($buildTests) { '/p:DotNetBuildTests=true' } else { '' } $buildProj = Join-Path $RepoRoot 'build.proj' MSBuild $buildProj ` $bl ` /p:Configuration=$configuration ` $cwb ` + $btst ` @properties } From dfb791b37b3d4ccec7332c4b6259d5fc7abb0890 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 4 Mar 2024 21:48:31 +0000 Subject: [PATCH 196/261] Update dependencies from https://github.com/dotnet/sdk build 20240304.11 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24153.6 -> To Version 8.0.300-preview.24154.11 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp From Version 12.8.300-beta.24127.3 -> To Version 12.8.300-beta.24152.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4c301fb77189..c45346b29c64 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644
- + https://github.com/dotnet/sdk - 092070a9dc283b3fe3e2fe213d4ba1399b7fbb96 + 5e6f737e8412c59c2b57c854838191a87115a007 - + https://github.com/dotnet/sdk - 092070a9dc283b3fe3e2fe213d4ba1399b7fbb96 + 5e6f737e8412c59c2b57c854838191a87115a007 - + https://github.com/dotnet/sdk - 092070a9dc283b3fe3e2fe213d4ba1399b7fbb96 + 5e6f737e8412c59c2b57c854838191a87115a007 - + https://github.com/dotnet/sdk - 092070a9dc283b3fe3e2fe213d4ba1399b7fbb96 + 5e6f737e8412c59c2b57c854838191a87115a007 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index ce1666199eae..352dc94fc7c4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24154.1 - 8.0.300-preview.24154.1 - 8.0.300-preview.24154.1 + 8.0.300-preview.24154.11 + 8.0.300-preview.24154.11 + 8.0.300-preview.24154.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From d186daf51aeb7d8dbf8390ce92b9cdc90a109f0d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 5 Mar 2024 06:21:50 +0000 Subject: [PATCH 197/261] Update dependencies from https://github.com/dotnet/sdk build 20240304.21 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24154.11 -> To Version 8.0.300-preview.24154.21 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 37953ddae65a..06ba033f1020 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - 5e6f737e8412c59c2b57c854838191a87115a007 + 88c675c554b49729f3b26538d4a9bef8d9d8cc09 - + https://github.com/dotnet/sdk - 5e6f737e8412c59c2b57c854838191a87115a007 + 88c675c554b49729f3b26538d4a9bef8d9d8cc09 - + https://github.com/dotnet/sdk - 5e6f737e8412c59c2b57c854838191a87115a007 + 88c675c554b49729f3b26538d4a9bef8d9d8cc09 - + https://github.com/dotnet/sdk - 5e6f737e8412c59c2b57c854838191a87115a007 + 88c675c554b49729f3b26538d4a9bef8d9d8cc09 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index b19ff779e291..fd5c5f8b2369 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24154.11 - 8.0.300-preview.24154.11 - 8.0.300-preview.24154.11 + 8.0.300-preview.24154.21 + 8.0.300-preview.24154.21 + 8.0.300-preview.24154.21 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From bdc894d0d6de4358c5f98853c790757edf09883a Mon Sep 17 00:00:00 2001 From: Tom Deseyn Date: Tue, 5 Mar 2024 09:41:28 +0100 Subject: [PATCH 198/261] Fix PortableRid default for cross-build source-builds. (#18854) --- src/SourceBuild/content/Directory.Build.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SourceBuild/content/Directory.Build.props b/src/SourceBuild/content/Directory.Build.props index 6ee6eae87b0a..6f391ec35c01 100644 --- a/src/SourceBuild/content/Directory.Build.props +++ b/src/SourceBuild/content/Directory.Build.props @@ -57,7 +57,7 @@ - false + false true $(__PortableTargetOS)-$(TargetArchitecture) From 75494d3ada6624c411116d4c6e52daaf49154ee7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 5 Mar 2024 10:18:46 +0100 Subject: [PATCH 199/261] [main] Update dependencies from dotnet/sdk (#18849) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 132 ++++++++++++++++++++-------------------- eng/Versions.props | 48 +++++++-------- 2 files changed, 90 insertions(+), 90 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f4bc3051d64b..5613ff91e116 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,41 +5,41 @@ Source-build uses transitive dependency resolution to determine correct build SHA of all product contributing repos. The order of dependencies is important and should not be modified without approval from dotnet/source-build-internal. --> - + https://github.com/dotnet/windowsdesktop - 1628f7c406cd03b2a4e7f3809ca7d51541630893 + 9e4cede9d34b51c91ad10fa2462042aceeb3937b - + https://github.com/dotnet/windowsdesktop - 1628f7c406cd03b2a4e7f3809ca7d51541630893 + 9e4cede9d34b51c91ad10fa2462042aceeb3937b - + https://github.com/dotnet/windowsdesktop - 1628f7c406cd03b2a4e7f3809ca7d51541630893 + 9e4cede9d34b51c91ad10fa2462042aceeb3937b - + https://github.com/dotnet/windowsdesktop - 1628f7c406cd03b2a4e7f3809ca7d51541630893 + 9e4cede9d34b51c91ad10fa2462042aceeb3937b - + https://github.com/dotnet/runtime - 5e603d595e63ddc5cdce9777a40608279abdcc37 + 8510651bc6b5181cf258664c2d0b4b4ff4de1c61 - + https://github.com/dotnet/runtime - 5e603d595e63ddc5cdce9777a40608279abdcc37 + 8510651bc6b5181cf258664c2d0b4b4ff4de1c61 - + https://github.com/dotnet/runtime - 5e603d595e63ddc5cdce9777a40608279abdcc37 + 8510651bc6b5181cf258664c2d0b4b4ff4de1c61 - + https://github.com/dotnet/runtime - 5e603d595e63ddc5cdce9777a40608279abdcc37 + 8510651bc6b5181cf258664c2d0b4b4ff4de1c61 - + https://github.com/dotnet/runtime - 5e603d595e63ddc5cdce9777a40608279abdcc37 + 8510651bc6b5181cf258664c2d0b4b4ff4de1c61 @@ -47,70 +47,70 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 5e603d595e63ddc5cdce9777a40608279abdcc37 + 8510651bc6b5181cf258664c2d0b4b4ff4de1c61 - + https://github.com/dotnet/runtime - 5e603d595e63ddc5cdce9777a40608279abdcc37 + 8510651bc6b5181cf258664c2d0b4b4ff4de1c61 - + https://github.com/dotnet/aspnetcore - 3e5155276f3d486ef49e1f06ee875d6757983695 + 2c0ee4c870556d823ea5a0b35a8ba1b8ae81142c - + https://github.com/dotnet/aspnetcore - 3e5155276f3d486ef49e1f06ee875d6757983695 + 2c0ee4c870556d823ea5a0b35a8ba1b8ae81142c - + https://github.com/dotnet/aspnetcore - 3e5155276f3d486ef49e1f06ee875d6757983695 + 2c0ee4c870556d823ea5a0b35a8ba1b8ae81142c - + https://github.com/dotnet/aspnetcore - 3e5155276f3d486ef49e1f06ee875d6757983695 + 2c0ee4c870556d823ea5a0b35a8ba1b8ae81142c - + https://github.com/dotnet/aspnetcore - 3e5155276f3d486ef49e1f06ee875d6757983695 + 2c0ee4c870556d823ea5a0b35a8ba1b8ae81142c - + https://github.com/dotnet/aspnetcore - 3e5155276f3d486ef49e1f06ee875d6757983695 + 2c0ee4c870556d823ea5a0b35a8ba1b8ae81142c - + https://github.com/dotnet/aspnetcore - 3e5155276f3d486ef49e1f06ee875d6757983695 + 2c0ee4c870556d823ea5a0b35a8ba1b8ae81142c - + https://github.com/dotnet/aspnetcore - 3e5155276f3d486ef49e1f06ee875d6757983695 + 2c0ee4c870556d823ea5a0b35a8ba1b8ae81142c - + https://github.com/dotnet/sdk - 2ea26aa051bdb20577a65a0478fb856e304bdfc2 + d8e924540fa415a8b8fa7cb666174c5a97138147 - + https://github.com/dotnet/sdk - 2ea26aa051bdb20577a65a0478fb856e304bdfc2 + d8e924540fa415a8b8fa7cb666174c5a97138147 - + https://github.com/dotnet/sdk - 2ea26aa051bdb20577a65a0478fb856e304bdfc2 + d8e924540fa415a8b8fa7cb666174c5a97138147 - + https://github.com/dotnet/sdk - 2ea26aa051bdb20577a65a0478fb856e304bdfc2 + d8e924540fa415a8b8fa7cb666174c5a97138147 - + https://github.com/dotnet/sdk - 2ea26aa051bdb20577a65a0478fb856e304bdfc2 + d8e924540fa415a8b8fa7cb666174c5a97138147 @@ -144,22 +144,22 @@ - + https://github.com/dotnet/winforms - db743c12c82bfe6f1265bc20a5a97c6ecfa68ba2 + cf4d00efe5f6dbab435305bd1129bf4e4351243b - + https://github.com/dotnet/wpf - d4d3ab8a86a71baed25b9eb076affd9c93bb9298 + 0fee673e416438fa496be15f9fed2707d9bade23 - + https://github.com/dotnet/fsharp - b57dee7cec971021547a7b8a36a46d7271fea99e + ca66024e6da7cced9921216763386bd43f400fbf - + https://github.com/dotnet/fsharp - b57dee7cec971021547a7b8a36a46d7271fea99e + ca66024e6da7cced9921216763386bd43f400fbf @@ -172,18 +172,18 @@ 39c7dd12c7ec24d0552513e84d95476f2077ca33 - + https://github.com/dotnet/runtime - 5e603d595e63ddc5cdce9777a40608279abdcc37 + 8510651bc6b5181cf258664c2d0b4b4ff4de1c61 - + https://github.com/dotnet/roslyn - 7471bf7cc5fbdfacc0e8d70537affa5f8e6fabd2 + 8537440d8c831b8533a18f6530945ee91c243e1b - + https://github.com/dotnet/roslyn - 7471bf7cc5fbdfacc0e8d70537affa5f8e6fabd2 + 8537440d8c831b8533a18f6530945ee91c243e1b @@ -205,14 +205,14 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 0f3e462442af5fe65271e3185d5b645ad40a6041 + e926eb7d9614243be6b936cbbe9988fd8cc6d8a6 - + https://github.com/dotnet/emsdk - 0f3e462442af5fe65271e3185d5b645ad40a6041 + e926eb7d9614243be6b936cbbe9988fd8cc6d8a6 diff --git a/eng/Versions.props b/eng/Versions.props index 016447fbfcba..416d18e99138 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,11 +47,11 @@ - 9.0.0-preview.3.24127.3 + 9.0.0-preview.3.24153.1 - 9.0.0-preview.3.24127.2 + 9.0.0-preview.3.24154.2 @@ -72,49 +72,49 @@ - 9.0.0-preview.3.24151.1 - 9.0.0-preview.3.24151.1 - 9.0.0-preview.3.24151.1 - 9.0.0-preview.3.24151.1 - 9.0.0-preview.3.24151.1 - 9.0.0-preview.3.24151.1 - 9.0.0-preview.3.24151.1 + 9.0.0-preview.3.24154.8 + 9.0.0-preview.3.24154.8 + 9.0.0-preview.3.24154.8 + 9.0.0-preview.3.24154.8 + 9.0.0-preview.3.24154.8 + 9.0.0-preview.3.24154.8 + 9.0.0-preview.3.24154.8 0.2.0 - 9.0.100-preview.3.24151.4 - 9.0.100-preview.3.24151.4 - 9.0.100-preview.3.24151.4 + 9.0.100-preview.3.24154.24 + 9.0.100-preview.3.24154.24 + 9.0.100-preview.3.24154.24 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.10.0-3.24129.7 + 4.10.0-3.24151.8 - 9.0.0-preview.3.24129.2 + 9.0.0-preview.3.24154.9 - 9.0.0-preview.3.24129.2 - 9.0.0-preview.3.24129.2 - 9.0.0-preview.3.24129.2 - 9.0.0-preview.3.24129.2 - 9.0.0-preview.3.24129.2 + 9.0.0-preview.3.24154.9 + 9.0.0-preview.3.24154.9 + 9.0.0-preview.3.24154.9 + 9.0.0-preview.3.24154.9 + 9.0.0-preview.3.24154.9 2.1.0 - 9.0.0-preview.3.24129.1 - 9.0.0-preview.3.24129.1 - 9.0.0-preview.3.24129.1 - 9.0.0-preview.3.24129.1 + 9.0.0-preview.3.24154.2 + 9.0.0-preview.3.24154.2 + 9.0.0-preview.3.24154.2 + 9.0.0-preview.3.24154.2 @@ -261,7 +261,7 @@ 14.2.9088-net9-p1 17.2.9088-net9-p1 - 9.0.0-preview.3.24126.1 + 9.0.0-preview.3.24128.1 $(MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportPackageVersion) 9.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-[A-z]*[\.]*\d*`)) From 40dd71d9c9e1e690e60a21b76d329b31cfe4c746 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 5 Mar 2024 13:56:49 +0000 Subject: [PATCH 200/261] Update dependencies from https://github.com/dotnet/arcade-services build 20240305.3 Microsoft.DotNet.Darc , Microsoft.DotNet.DarcLib From Version 1.1.0-beta.24153.1 -> To Version 1.1.0-beta.24155.3 --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index f6e69fceb225..9e98e96a8ec5 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.24153.1", + "version": "1.1.0-beta.24155.3", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 06ba033f1020..e95d32395c1e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -227,13 +227,13 @@ https://github.com/dotnet/arcade cbb61c3a9a42e7c3cce17ee453ff5ecdc7f69282 - + https://github.com/dotnet/arcade-services - b8bebd21f5a46416b30fa5e9b415003314e9b1d2 + 288b79e6f16a407054b6620f72685d460573ef45 - + https://github.com/dotnet/arcade-services - b8bebd21f5a46416b30fa5e9b415003314e9b1d2 + 288b79e6f16a407054b6620f72685d460573ef45 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index fd5c5f8b2369..4edb1ac1d080 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 1.1.0-beta.24153.1 + 1.1.0-beta.24155.3 From 2a0b285e28bd8181c7c05a8bfb776a5fa1a87471 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 5 Mar 2024 17:20:47 +0100 Subject: [PATCH 201/261] [main] Update dependencies from dotnet/arcade (#18871) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 2 +- global.json | 4 ++-- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5613ff91e116..cdd5fe41809b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -243,17 +243,17 @@ - + https://github.com/dotnet/arcade - 87d89025bdd8827c016e4083660d31f497670e5c + 010fecb0832fd4f0a39012ebd0859afc4bca750d - + https://github.com/dotnet/arcade - 87d89025bdd8827c016e4083660d31f497670e5c + 010fecb0832fd4f0a39012ebd0859afc4bca750d - + https://github.com/dotnet/arcade - 87d89025bdd8827c016e4083660d31f497670e5c + 010fecb0832fd4f0a39012ebd0859afc4bca750d https://github.com/dotnet/arcade-services @@ -263,14 +263,14 @@ https://github.com/dotnet/arcade-services c041bcdab75f5447be8bd11ddcfbe8e639f13f32 - + https://github.com/dotnet/arcade - 87d89025bdd8827c016e4083660d31f497670e5c + 010fecb0832fd4f0a39012ebd0859afc4bca750d - + https://github.com/dotnet/arcade - 87d89025bdd8827c016e4083660d31f497670e5c + 010fecb0832fd4f0a39012ebd0859afc4bca750d diff --git a/eng/Versions.props b/eng/Versions.props index 416d18e99138..5a17bbb5cbc0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,7 +39,7 @@ - 9.0.0-beta.24151.5 + 9.0.0-beta.24154.2 diff --git a/global.json b/global.json index ed875e89bb63..9f58ff4c9a13 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "latest" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24151.5", - "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24151.5" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24154.2", + "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24154.2" } } From 0da99fef6fb631662ebb0d6195998f722013c9a8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 5 Mar 2024 17:23:43 +0100 Subject: [PATCH 202/261] [main] Update dependencies from dotnet/sdk (#18870) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 84 ++++++++++++++++++++--------------------- eng/Versions.props | 32 ++++++++-------- 2 files changed, 58 insertions(+), 58 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cdd5fe41809b..f25cfebd1269 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -21,25 +21,25 @@ https://github.com/dotnet/windowsdesktop 9e4cede9d34b51c91ad10fa2462042aceeb3937b - + https://github.com/dotnet/runtime - 8510651bc6b5181cf258664c2d0b4b4ff4de1c61 + 0df43f2952e83077f62d9235bd453ae0eba66803 - + https://github.com/dotnet/runtime - 8510651bc6b5181cf258664c2d0b4b4ff4de1c61 + 0df43f2952e83077f62d9235bd453ae0eba66803 - + https://github.com/dotnet/runtime - 8510651bc6b5181cf258664c2d0b4b4ff4de1c61 + 0df43f2952e83077f62d9235bd453ae0eba66803 - + https://github.com/dotnet/runtime - 8510651bc6b5181cf258664c2d0b4b4ff4de1c61 + 0df43f2952e83077f62d9235bd453ae0eba66803 - + https://github.com/dotnet/runtime - 8510651bc6b5181cf258664c2d0b4b4ff4de1c61 + 0df43f2952e83077f62d9235bd453ae0eba66803 @@ -47,70 +47,70 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 8510651bc6b5181cf258664c2d0b4b4ff4de1c61 + 0df43f2952e83077f62d9235bd453ae0eba66803 - + https://github.com/dotnet/runtime - 8510651bc6b5181cf258664c2d0b4b4ff4de1c61 + 0df43f2952e83077f62d9235bd453ae0eba66803 - + https://github.com/dotnet/aspnetcore - 2c0ee4c870556d823ea5a0b35a8ba1b8ae81142c + 32b772a470e3c7dc147d3d124c32199bb3e7b6bc - + https://github.com/dotnet/aspnetcore - 2c0ee4c870556d823ea5a0b35a8ba1b8ae81142c + 32b772a470e3c7dc147d3d124c32199bb3e7b6bc - + https://github.com/dotnet/aspnetcore - 2c0ee4c870556d823ea5a0b35a8ba1b8ae81142c + 32b772a470e3c7dc147d3d124c32199bb3e7b6bc - + https://github.com/dotnet/aspnetcore - 2c0ee4c870556d823ea5a0b35a8ba1b8ae81142c + 32b772a470e3c7dc147d3d124c32199bb3e7b6bc - + https://github.com/dotnet/aspnetcore - 2c0ee4c870556d823ea5a0b35a8ba1b8ae81142c + 32b772a470e3c7dc147d3d124c32199bb3e7b6bc - + https://github.com/dotnet/aspnetcore - 2c0ee4c870556d823ea5a0b35a8ba1b8ae81142c + 32b772a470e3c7dc147d3d124c32199bb3e7b6bc - + https://github.com/dotnet/aspnetcore - 2c0ee4c870556d823ea5a0b35a8ba1b8ae81142c + 32b772a470e3c7dc147d3d124c32199bb3e7b6bc - + https://github.com/dotnet/aspnetcore - 2c0ee4c870556d823ea5a0b35a8ba1b8ae81142c + 32b772a470e3c7dc147d3d124c32199bb3e7b6bc - + https://github.com/dotnet/sdk - d8e924540fa415a8b8fa7cb666174c5a97138147 + 765ad969248cdceaf976a27b512e8abc43ed2d19 - + https://github.com/dotnet/sdk - d8e924540fa415a8b8fa7cb666174c5a97138147 + 765ad969248cdceaf976a27b512e8abc43ed2d19 - + https://github.com/dotnet/sdk - d8e924540fa415a8b8fa7cb666174c5a97138147 + 765ad969248cdceaf976a27b512e8abc43ed2d19 - + https://github.com/dotnet/sdk - d8e924540fa415a8b8fa7cb666174c5a97138147 + 765ad969248cdceaf976a27b512e8abc43ed2d19 - + https://github.com/dotnet/sdk - d8e924540fa415a8b8fa7cb666174c5a97138147 + 765ad969248cdceaf976a27b512e8abc43ed2d19 @@ -172,9 +172,9 @@ 39c7dd12c7ec24d0552513e84d95476f2077ca33 - + https://github.com/dotnet/runtime - 8510651bc6b5181cf258664c2d0b4b4ff4de1c61 + 0df43f2952e83077f62d9235bd453ae0eba66803 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 5a17bbb5cbc0..d9480cd82943 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -72,22 +72,22 @@ - 9.0.0-preview.3.24154.8 - 9.0.0-preview.3.24154.8 - 9.0.0-preview.3.24154.8 - 9.0.0-preview.3.24154.8 - 9.0.0-preview.3.24154.8 - 9.0.0-preview.3.24154.8 - 9.0.0-preview.3.24154.8 + 9.0.0-preview.3.24154.12 + 9.0.0-preview.3.24154.12 + 9.0.0-preview.3.24154.12 + 9.0.0-preview.3.24154.12 + 9.0.0-preview.3.24154.12 + 9.0.0-preview.3.24154.12 + 9.0.0-preview.3.24154.12 0.2.0 - 9.0.100-preview.3.24154.24 - 9.0.100-preview.3.24154.24 - 9.0.100-preview.3.24154.24 + 9.0.100-preview.3.24155.3 + 9.0.100-preview.3.24155.3 + 9.0.100-preview.3.24155.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -98,15 +98,15 @@ - 9.0.0-preview.3.24154.9 + 9.0.0-preview.3.24154.10 - 9.0.0-preview.3.24154.9 - 9.0.0-preview.3.24154.9 - 9.0.0-preview.3.24154.9 - 9.0.0-preview.3.24154.9 - 9.0.0-preview.3.24154.9 + 9.0.0-preview.3.24154.10 + 9.0.0-preview.3.24154.10 + 9.0.0-preview.3.24154.10 + 9.0.0-preview.3.24154.10 + 9.0.0-preview.3.24154.10 2.1.0 From 818879e9fc0019c781689adf3b1b08073714ac37 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 5 Mar 2024 10:59:27 -0800 Subject: [PATCH 203/261] 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 114d2f5009d5..dd5670c9b917 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) From c5e158a05c36ae16e7c602b3e7b4bfb2e3da30c5 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 5 Mar 2024 10:59:31 -0800 Subject: [PATCH 204/261] Update branding to 8.0.203 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 9f5353f8e328..1a1aabbdeea0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 8 0 2 - 02 + 03 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) $(VersionMajor).$(VersionMinor) $(MajorMinorVersion).$(VersionSDKMinor) From f029abaffa7c2bb2d003e5c5bfe3397bc7474ae8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 5 Mar 2024 19:04:13 +0000 Subject: [PATCH 205/261] [main] Update dependencies from dotnet/arcade (#18874) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 2 +- eng/common/tools.ps1 | 2 +- global.json | 4 ++-- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f25cfebd1269..8db80b6c312d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -243,17 +243,17 @@ - + https://github.com/dotnet/arcade - 010fecb0832fd4f0a39012ebd0859afc4bca750d + db45698020f58f88eef75b23b2598a59872918f6 - + https://github.com/dotnet/arcade - 010fecb0832fd4f0a39012ebd0859afc4bca750d + db45698020f58f88eef75b23b2598a59872918f6 - + https://github.com/dotnet/arcade - 010fecb0832fd4f0a39012ebd0859afc4bca750d + db45698020f58f88eef75b23b2598a59872918f6 https://github.com/dotnet/arcade-services @@ -263,14 +263,14 @@ https://github.com/dotnet/arcade-services c041bcdab75f5447be8bd11ddcfbe8e639f13f32 - + https://github.com/dotnet/arcade - 010fecb0832fd4f0a39012ebd0859afc4bca750d + db45698020f58f88eef75b23b2598a59872918f6 - + https://github.com/dotnet/arcade - 010fecb0832fd4f0a39012ebd0859afc4bca750d + db45698020f58f88eef75b23b2598a59872918f6 diff --git a/eng/Versions.props b/eng/Versions.props index d9480cd82943..527a00cacff5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,7 +39,7 @@ - 9.0.0-beta.24154.2 + 9.0.0-beta.24155.1 diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 9bf873e3c258..a58aef2847e1 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -856,7 +856,7 @@ function MSBuild-Core() { # When running on Azure Pipelines, override the returned exit code to avoid double logging. # Skip this when the build is a child of the VMR orchestrator build. - if ($ci -and $env:SYSTEM_TEAMPROJECT -ne $null -and !$productBuild -and $properties -notlike "*DotNetBuildRepo=true*") { + if ($ci -and $env:SYSTEM_TEAMPROJECT -ne $null -and !$productBuild -and -not($properties -like "*DotNetBuildRepo=true*")) { Write-PipelineSetResult -Result "Failed" -Message "msbuild execution failed." # Exiting with an exit code causes the azure pipelines task to log yet another "noise" error # The above Write-PipelineSetResult will cause the task to be marked as failure without adding yet another error diff --git a/global.json b/global.json index 9f58ff4c9a13..b77d6eb9142c 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "latest" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24154.2", - "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24154.2" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24155.1", + "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24155.1" } } From f1db5daa0c86badfc626905ec0963b0b33fe23fb Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Tue, 5 Mar 2024 14:40:53 -0600 Subject: [PATCH 206/261] Refactor ArtifactsSizeTest to emit updated baseline with only breaking size changes (#18844) --- .../ArtifactsSizeTest.cs | 80 ++++++++++--------- 1 file changed, 42 insertions(+), 38 deletions(-) diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/ArtifactsSizeTest.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/ArtifactsSizeTest.cs index 6e1bd1d0a622..e8cafd64183c 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/ArtifactsSizeTest.cs +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/ArtifactsSizeTest.cs @@ -51,14 +51,14 @@ public void CompareArtifactsToBaseline() var tarEntries = ProcessSdkAndArtifactsTarballs(); ScanForDifferences(tarEntries); - UpdateBaselineFile(tarEntries); + UpdateBaselineFile(); // Must wait to report differences until after the baseline file is updated else a failure // will cause the baseline file to not be updated. ReportDifferences(); } - private FileSize[] ProcessSdkAndArtifactsTarballs() + private Dictionary ProcessSdkAndArtifactsTarballs() { string tempTarballDir = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName()); Directory.CreateDirectory(tempTarballDir); @@ -66,19 +66,17 @@ private FileSize[] ProcessSdkAndArtifactsTarballs() Utilities.ExtractTarball(Config.SdkTarballPath, tempTarballDir, OutputHelper); Utilities.ExtractTarball(Config.SourceBuiltArtifactsPath, tempTarballDir, OutputHelper); - FileSize[] tarEntries = Directory.EnumerateFiles(tempTarballDir, "*", SearchOption.AllDirectories) - .Where(filepath => !filepath.Contains("SourceBuildReferencePackages")) + Dictionary tarEntries = Directory.EnumerateFiles(tempTarballDir, "*", SearchOption.AllDirectories) + .Where(filePath => !filePath.Contains("SourceBuildReferencePackages")) .Select(filePath => { - string result = filePath.Substring(tempTarballDir.Length + 1); - result = ProcessFilePath(result); - return new FileSize(result, new FileInfo(filePath).Length); + string relativePath = filePath.Substring(tempTarballDir.Length + 1); + return (ProcessFilePath(relativePath), new FileInfo(filePath).Length); }) - .OrderBy(entry => entry.FilePath) - .ToArray(); - + .ToDictionary(tuple => tuple.Item1, tuple => tuple.Item2); + Directory.Delete(tempTarballDir, true); - + return tarEntries; } @@ -125,44 +123,59 @@ private string AddDifferenciatingSuffix(string filePath) return filePath; } - private void ScanForDifferences(FileSize[] tarEntries) + private void ScanForDifferences(Dictionary tarEntries) { foreach (var entry in tarEntries) { - if (!Baseline.TryGetValue(entry.FilePath, out long baselineBytes)) + if (!Baseline.TryGetValue(entry.Key, out long baselineBytes)) { - TrackDifference($"{entry.FilePath} does not exist in baseline. Adding it to the baseline file"); + TrackDifference($"{entry.Key} does not exist in baseline. It is {entry.Value} bytes. Adding it to the baseline file."); + Baseline.Add(entry.Key, entry.Value); } else { - CompareFileSizes(entry.FilePath, entry.Bytes, baselineBytes); - Baseline.Remove(entry.FilePath); + CompareFileSizes(entry.Key, entry.Value, baselineBytes); } } - foreach (var entry in Baseline) + foreach (var removedFile in Baseline.Keys.Except(tarEntries.Keys)) { - TrackDifference($"`{entry.Key}` is no longer being produced. It was {entry.Value} bytes"); + TrackDifference($"`{removedFile}` is no longer being produced. It was {Baseline[removedFile]} bytes."); + Baseline.Remove(removedFile); } } private void CompareFileSizes(string filePath, long fileSize, long baselineSize) { + // Only update the baseline with breaking differences. Non-breaking differences are file size changes + // less than the threshold percentage. This makes it easier to review the breaking changes and prevents + // inadvertently allowing small percentage changes to be accepted that can add up to a significant + // difference over time. + string breakingDifference = string.Empty; + if (fileSize == 0 && baselineSize != 0) { - TrackDifference($"'{filePath}' is now 0 bytes. It was {baselineSize} bytes"); + breakingDifference = $"'{filePath}' is now 0 bytes. It was {baselineSize} bytes."; } else if (fileSize != 0 && baselineSize == 0) { - TrackDifference($"'{filePath}' is no longer 0 bytes. It is now {fileSize} bytes"); + breakingDifference = $"'{filePath}' is no longer 0 bytes. It is now {fileSize} bytes."; } else if (baselineSize != 0 && (((fileSize - baselineSize) / (double)baselineSize) * 100) >= SizeThresholdPercentage) { - TrackDifference($"'{filePath}' increased in size by more than {SizeThresholdPercentage}%. It was originally {baselineSize} bytes and is now {fileSize} bytes"); + breakingDifference = + $"'{filePath}' increased in size by more than {SizeThresholdPercentage}%. It was originally {baselineSize} bytes and is now {fileSize} bytes."; } else if (baselineSize != 0 && (((baselineSize - fileSize) / (double)baselineSize) * 100) >= SizeThresholdPercentage) { - TrackDifference($"'{filePath}' decreased in size by more than {SizeThresholdPercentage}%. It was originally {baselineSize} bytes and is now {fileSize} bytes"); + breakingDifference = + $"'{filePath}' decreased in size by more than {SizeThresholdPercentage}%. It was originally {baselineSize} bytes and is now {fileSize} bytes."; + } + + if (!string.IsNullOrEmpty(breakingDifference)) + { + TrackDifference(breakingDifference); + Baseline[filePath] = fileSize; } } @@ -172,7 +185,6 @@ private void ReportDifferences() { if (Differences.Length > 0) { - if (Config.WarnOnSdkContentDiffs) { OutputHelper.LogWarningMessage(Differences.ToString()); @@ -180,33 +192,25 @@ private void ReportDifferences() else { OutputHelper.WriteLine(Differences.ToString()); - Assert.Fail("Differences were found in the artifacts sizes"); + Assert.Fail("Differences were found in the artifacts sizes."); } } } - private void UpdateBaselineFile(FileSize[] tarEntries) + private void UpdateBaselineFile() { try { string actualFilePath = Path.Combine(LogsDirectory, $"UpdatedArtifactsSizes_{Config.TargetRid}.txt"); - File.WriteAllLines(actualFilePath, tarEntries.Select(entry => $"{entry.FilePath}: {entry.Bytes}")); + File.WriteAllLines( + actualFilePath, + Baseline + .OrderBy(kvp => kvp.Key) + .Select(kvp => $"{kvp.Key}: {kvp.Value}")); } catch (IOException ex) { throw new InvalidOperationException($"An error occurred while copying the baselines file: {BaselineFilePath}", ex); } } - - private readonly struct FileSize - { - public string FilePath { get; } - public long Bytes { get; } - - public FileSize(string filePath, long bytes) - { - FilePath = filePath; - Bytes = bytes; - } - } } From d49fa678427e95924a8a7922cf74908a3b74d801 Mon Sep 17 00:00:00 2001 From: Jackson Schuster <36744439+jtschuster@users.noreply.github.com> Date: Tue, 5 Mar 2024 14:06:35 -0800 Subject: [PATCH 207/261] Update link to copied source --- .../VersionIdentifier.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/VersionIdentifier.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/VersionIdentifier.cs index 82c58c8d449e..2150a721197f 100644 --- a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/VersionIdentifier.cs +++ b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/VersionIdentifier.cs @@ -6,7 +6,7 @@ using System.Linq; using System.Text; -// Copied from https://github.com/dotnet/arcade/blob/903d35c426248ade56719db5bc0947cd7634b297/eng/common/native/init-distro-rid.sh +// Copied from https://github.com/dotnet/arcade/blob/db45698020f58f88eef75b23b2598a59872918f6/src/Microsoft.DotNet.VersionTools/lib/src/BuildManifest/VersionIdentifier.cs // Conflicting MSBuild versions and some customizations make it difficult to use the Arcade assembly. public static class VersionIdentifier { From 4f6bac312de56da573c8dc25229f9ed732ead707 Mon Sep 17 00:00:00 2001 From: Jackson Schuster <36744439+jtschuster@users.noreply.github.com> Date: Tue, 5 Mar 2024 14:14:53 -0800 Subject: [PATCH 208/261] Remove conditions on tasks --- src/SourceBuild/content/eng/build.targets | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/SourceBuild/content/eng/build.targets b/src/SourceBuild/content/eng/build.targets index 2f2ea8e8c522..008c7c2ad929 100644 --- a/src/SourceBuild/content/eng/build.targets +++ b/src/SourceBuild/content/eng/build.targets @@ -22,15 +22,13 @@ - + + TestArchive="$(_ClosestOfficialSdkPath)"> From 2075e8765b38206a5f336da2956c81eae3235e04 Mon Sep 17 00:00:00 2001 From: Jackson Schuster <36744439+jtschuster@users.noreply.github.com> Date: Tue, 5 Mar 2024 14:34:00 -0800 Subject: [PATCH 209/261] Use "Closest" sdk instead of "Latest" --- .../GetClosestArchive.cs | 2 +- .../GetClosestOfficialSdk.cs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/GetClosestArchive.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/GetClosestArchive.cs index fc69a385a9ac..8039301cc815 100644 --- a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/GetClosestArchive.cs +++ b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/GetClosestArchive.cs @@ -52,7 +52,7 @@ public void Cancel() /// /// Get the URL of the latest official archive for the given version string and RID. /// - public abstract Task GetLatestOfficialArchiveUrl(); + public abstract Task GetClosestOfficialArchiveUrl(); public abstract Task GetClosestOfficialArchiveVersion(); diff --git a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/GetClosestOfficialSdk.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/GetClosestOfficialSdk.cs index 95819f7be314..bb038516c434 100644 --- a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/GetClosestOfficialSdk.cs +++ b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/GetClosestOfficialSdk.cs @@ -15,7 +15,7 @@ public class GetClosestOfficialSdk : GetClosestArchive private string? closestVersion; private string? closestUrl; - public override async Task GetLatestOfficialArchiveUrl() + public override async Task GetClosestOfficialArchiveUrl() { // Channel in the form of 9.0.1xx var channel = BuiltVersion[..5] + "xx"; @@ -38,7 +38,7 @@ public class GetClosestOfficialSdk : GetClosestArchive { return closestVersion; } - _ = await GetLatestOfficialArchiveUrl(); + _ = await GetClosestOfficialArchiveUrl(); return closestVersion; } } From a8fdcd468e92fd97a4b5c46749ad2823c3ba231f Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 5 Mar 2024 14:51:30 -0800 Subject: [PATCH 210/261] Update branding to 8.0.204 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 1a1aabbdeea0..6ed9cecd22d1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 8 0 2 - 03 + 04 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) $(VersionMajor).$(VersionMinor) $(MajorMinorVersion).$(VersionSDKMinor) From aa0c912499fd0a9971c5407082770337ba51789a Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Tue, 5 Mar 2024 15:46:03 -0800 Subject: [PATCH 211/261] Pass TargetRid to Razor's build for the VMR (#18843) --- src/SourceBuild/content/repo-projects/razor.proj | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/SourceBuild/content/repo-projects/razor.proj b/src/SourceBuild/content/repo-projects/razor.proj index 156d33d6ca90..100c56a759bf 100644 --- a/src/SourceBuild/content/repo-projects/razor.proj +++ b/src/SourceBuild/content/repo-projects/razor.proj @@ -4,6 +4,8 @@ $(BuildArgs) /p:UsingToolMicrosoftNetCompilers=false + + $(BuildArgs) /p:TargetRid=$(TargetRid) From 3c848d51a36f157bd8ca1cccfdf2d39ccd4e3bd3 Mon Sep 17 00:00:00 2001 From: Jackson Schuster <36744439+jtschuster@users.noreply.github.com> Date: Tue, 5 Mar 2024 16:00:00 -0800 Subject: [PATCH 212/261] Update missed reference --- .../GetClosestArchive.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/GetClosestArchive.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/GetClosestArchive.cs index 8039301cc815..b78f4c91b8f1 100644 --- a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/GetClosestArchive.cs +++ b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/GetClosestArchive.cs @@ -68,7 +68,7 @@ public async Task ExecuteAsync() (BuiltVersion, BuiltRid, ArchiveExtension) = Archive.GetInfoFromFileName(filename, ArchiveName); Log.LogMessage($"Finding closest official archive for '{ArchiveName}' version '{BuiltVersion}' RID '{BuiltRid}'"); - string? downloadUrl = await GetLatestOfficialArchiveUrl(); + string? downloadUrl = await GetClosestOfficialArchiveUrl(); if (downloadUrl == null) { Log.LogError($"Failed to find a download URL for '{ArchiveName}' version '{BuiltVersion}' RID '{BuiltRid}'"); From 8c558006cd476d48797367407074d0a4f69d3a5d Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 5 Mar 2024 16:31:00 -0800 Subject: [PATCH 213/261] Downgrade implicit version because of the hotfix --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 6ed9cecd22d1..ab1e93fee824 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,8 +26,8 @@ 30 32 17 - $([MSBuild]::Add($(VersionFeature), 26)) - $([MSBuild]::Add($(VersionFeature), 15)) + $([MSBuild]::Add($(VersionFeature), 25)) + $([MSBuild]::Add($(VersionFeature), 14)) <_NET70ILLinkPackVersion>7.0.100-1.23211.1 From 7cdc69f700e6002a26a80dfb637116398ac87400 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 6 Mar 2024 00:57:02 +0000 Subject: [PATCH 214/261] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20240305.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 9.0.0-alpha.1.24154.2 -> To Version 9.0.0-alpha.1.24155.1 --- 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 8db80b6c312d..96c12656174a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -277,9 +277,9 @@ https://github.com/dotnet/runtime ab1a8224cdf115b65e0db5dc88d11f205068f444 - + https://github.com/dotnet/source-build-reference-packages - 936b4a4b4b8a74b65098983660c5814fb4afee15 + 768378e775fc5ddc99d41f2c4d1c78182f326ea7 From de26d80e7da4d4b30d3aedc6e0e2c5f2802ffdb0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 6 Mar 2024 01:30:54 +0000 Subject: [PATCH 215/261] Update dependencies from https://github.com/dotnet/sdk build 20240305.22 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24154.21 -> To Version 8.0.300-preview.24155.22 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset From Version 12.8.300-beta.24152.1 -> To Version 12.8.300-beta.24154.4 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 8 ++++---- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 06ba033f1020..79dbf230e66d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - 88c675c554b49729f3b26538d4a9bef8d9d8cc09 + ea5aa246199e66d74b7c6b9c77ff4708f24e5b9b - + https://github.com/dotnet/sdk - 88c675c554b49729f3b26538d4a9bef8d9d8cc09 + ea5aa246199e66d74b7c6b9c77ff4708f24e5b9b - + https://github.com/dotnet/sdk - 88c675c554b49729f3b26538d4a9bef8d9d8cc09 + ea5aa246199e66d74b7c6b9c77ff4708f24e5b9b - + https://github.com/dotnet/sdk - 88c675c554b49729f3b26538d4a9bef8d9d8cc09 + ea5aa246199e66d74b7c6b9c77ff4708f24e5b9b https://github.com/dotnet/test-templates @@ -132,13 +132,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 472140dd926227876848e48f41cfc9acb9275492 - + https://github.com/dotnet/fsharp - ea8ef6edee63929f44026c79f94c9e6ffe6dcd62 + ca66024e6da7cced9921216763386bd43f400fbf - + https://github.com/dotnet/fsharp - ea8ef6edee63929f44026c79f94c9e6ffe6dcd62 + ca66024e6da7cced9921216763386bd43f400fbf @@ -150,9 +150,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 1381d5ebd2ab1f292848d5b19b80cf71ac332508 - + https://github.com/dotnet/roslyn - 8537440d8c831b8533a18f6530945ee91c243e1b + c88057e6c3be0d2b85b33e8e3cfb481f5d1d504b diff --git a/eng/Versions.props b/eng/Versions.props index fd5c5f8b2369..c3e935006001 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,16 +85,16 @@ - 8.0.300-preview.24154.21 - 8.0.300-preview.24154.21 - 8.0.300-preview.24154.21 + 8.0.300-preview.24155.22 + 8.0.300-preview.24155.22 + 8.0.300-preview.24155.22 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.10.0-3.24151.8 + 4.10.0-3.24155.1 From 68cc1aeb084ff97448d66c0cfce70b9eff5ea2dc Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Wed, 6 Mar 2024 00:33:08 -0800 Subject: [PATCH 216/261] Remove ArcadeBuildVertical parameter (#18889) --- src/SourceBuild/content/repo-projects/Directory.Build.props | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/SourceBuild/content/repo-projects/Directory.Build.props b/src/SourceBuild/content/repo-projects/Directory.Build.props index a08537f4a55c..625cba36eab2 100644 --- a/src/SourceBuild/content/repo-projects/Directory.Build.props +++ b/src/SourceBuild/content/repo-projects/Directory.Build.props @@ -82,10 +82,6 @@ $(BuildArgs) /p:SourceBuildUseMonoRuntime=$(SourceBuildUseMonoRuntime) - - $(BuildArgs) /p:ArcadeBuildVertical=true - - $(BuildArgs) /p:ArcadeBuildFromSource=true $(BuildArgs) /p:DotNetBuildSourceOnly=true From 0d4a607550503114d3709fb8fe34adcfc92c7eaf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 6 Mar 2024 09:23:13 +0000 Subject: [PATCH 217/261] Update dependencies from https://github.com/dotnet/sdk build 20240306.3 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24155.22 -> To Version 8.0.300-preview.24156.3 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7e945960fb39..9df3f01a5a31 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - ea5aa246199e66d74b7c6b9c77ff4708f24e5b9b + ac6c241073485db169f773fcb1d010bff9e7df25 - + https://github.com/dotnet/sdk - ea5aa246199e66d74b7c6b9c77ff4708f24e5b9b + ac6c241073485db169f773fcb1d010bff9e7df25 - + https://github.com/dotnet/sdk - ea5aa246199e66d74b7c6b9c77ff4708f24e5b9b + ac6c241073485db169f773fcb1d010bff9e7df25 - + https://github.com/dotnet/sdk - ea5aa246199e66d74b7c6b9c77ff4708f24e5b9b + ac6c241073485db169f773fcb1d010bff9e7df25 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 3bf3b899b172..e6b529f14848 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24155.22 - 8.0.300-preview.24155.22 - 8.0.300-preview.24155.22 + 8.0.300-preview.24156.3 + 8.0.300-preview.24156.3 + 8.0.300-preview.24156.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 7f2e994004bb6cf9b7c7466114417278c2d74d0c Mon Sep 17 00:00:00 2001 From: David McFarland Date: Wed, 6 Mar 2024 05:36:52 -0400 Subject: [PATCH 218/261] ExtractArchiveToDirectory: open .tar.gz archives read-only (#18891) --- src/core-sdk-tasks/ExtractArchiveToDirectory.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core-sdk-tasks/ExtractArchiveToDirectory.cs b/src/core-sdk-tasks/ExtractArchiveToDirectory.cs index e61f21e53363..4416122479e3 100644 --- a/src/core-sdk-tasks/ExtractArchiveToDirectory.cs +++ b/src/core-sdk-tasks/ExtractArchiveToDirectory.cs @@ -113,7 +113,7 @@ public override bool Execute() retVal = base.Execute(); #else // Decompress GZip content - using FileStream compressedFileStream = File.Open(SourceArchive, FileMode.Open); + using FileStream compressedFileStream = File.OpenRead(SourceArchive); using var decompressor = new GZipStream(compressedFileStream, CompressionMode.Decompress); using var decompressedStream = new MemoryStream(); decompressor.CopyTo(decompressedStream); From c0f4c586c23d65d9c8fad4bd074fbbf0b25ae84c Mon Sep 17 00:00:00 2001 From: Tom Deseyn Date: Wed, 6 Mar 2024 13:18:13 +0100 Subject: [PATCH 219/261] Add product rid to ILCompiler rids when bundling ILCompiler with the SDK. (#18835) --- src/redist/redist.csproj | 1 + src/redist/targets/GenerateBundledVersions.targets | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj index 8006710cd9ea..b0335d8c310a 100644 --- a/src/redist/redist.csproj +++ b/src/redist/redist.csproj @@ -7,6 +7,7 @@ true none true + true diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index bd36c5e06fd5..6130b5eb862a 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -266,6 +266,10 @@ Condition="'$(BundleRuntimePacks)' == 'true'" Include="$(ProductMonikerRid)" /> + + ] [-n]" + echo "" + echo "Options:" + echo " -h, --help Show this help message and exit" + echo " -p, --path Specify the paths to be restored (default: src/*/eng/common/*, src/*global.json)" + echo " -y, --noprompt Skip the confirmation prompt" + echo "" + echo "Example:" + echo " $0 -p \"src/*/eng/common/*\" -p \"src/*global.json\"" + echo "" + exit 0 +} + +source="${BASH_SOURCE[0]}" +# resolve $source until the file is no longer a symlink +while [[ -h "$source" ]]; do + scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" + source="$(readlink "$source")" + # if $source was a relative symlink, we need to resolve it relative to the path where the + # symlink file was located + [[ $source != /* ]] && source="$scriptroot/$source" +done +scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" + +# Default paths to restore +DefaultPathsToRestore=( + "src/*/eng/common/*" + "src/*global.json" +) +PathsToRestore=() +NoPrompt=false + +# Parse command line arguments +while [[ $# -gt 0 ]]; do + case $1 in + -h|--help) + show_help + ;; + -p|--path) + shift + PathsToRestore+=("$1") + ;; + -y|--noprompt) + NoPrompt=true + ;; + *) + echo "Invalid option: $1" + show_help + ;; + esac + shift +done + +# Use default paths if no paths are passed +if [ ${#PathsToRestore[@]} -eq 0 ]; then + PathsToRestore=("${DefaultPathsToRestore[@]}") +fi + +# Confirmation prompt +if [ "$NoPrompt" = false ]; then + echo "Will restore changes in the following paths:" + for path in "${PathsToRestore[@]}"; do + echo " $path" + done + read -p "Do you want to proceed with restoring the paths? (Y/N)" choice + if [[ ! "$choice" =~ ^[Yy]$ ]]; then + exit 0 + fi +fi + +# Perform git restore for each path +for path in "${PathsToRestore[@]}"; do + git -C "$(dirname "$scriptroot")" restore "$path" +done From fe05a93ae5d3c6feb9e432490972fcd9ceed2f59 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 6 Mar 2024 16:45:23 +0000 Subject: [PATCH 221/261] Update dependencies from https://github.com/dotnet/sdk build 20240306.11 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24155.22 -> To Version 8.0.300-preview.24156.11 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9df3f01a5a31..b368624895d7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - ac6c241073485db169f773fcb1d010bff9e7df25 + 6c1ba2f2a0abedfd5969afc38bc4ebc16531336d - + https://github.com/dotnet/sdk - ac6c241073485db169f773fcb1d010bff9e7df25 + 6c1ba2f2a0abedfd5969afc38bc4ebc16531336d - + https://github.com/dotnet/sdk - ac6c241073485db169f773fcb1d010bff9e7df25 + 6c1ba2f2a0abedfd5969afc38bc4ebc16531336d - + https://github.com/dotnet/sdk - ac6c241073485db169f773fcb1d010bff9e7df25 + 6c1ba2f2a0abedfd5969afc38bc4ebc16531336d https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index e6b529f14848..26139a148311 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24156.3 - 8.0.300-preview.24156.3 - 8.0.300-preview.24156.3 + 8.0.300-preview.24156.11 + 8.0.300-preview.24156.11 + 8.0.300-preview.24156.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 7cac704eb5a19f81c3f00d830a659bec62e49026 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Wed, 6 Mar 2024 18:58:06 +0100 Subject: [PATCH 222/261] Update CODEOWNERS (#18894) --- CODEOWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CODEOWNERS b/CODEOWNERS index 1272a3799109..b8ad3e9a9fce 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -4,5 +4,5 @@ /.devcontainer/ @dotnet/source-build-internal /eng/SourceBuild* @dotnet/source-build-internal /src/snaps/ @rbhanda -/src/SourceBuild/ @dotnet/source-build-internal +/src/SourceBuild/ @dotnet/source-build-internal @dotnet/product-construction /src/VirtualMonoRepo/ @dotnet/product-construction From 97fc3b83423bf37256f02763bbd1f846f9ff383a Mon Sep 17 00:00:00 2001 From: Jackson Schuster <36744439+jtschuster@users.noreply.github.com> Date: Wed, 6 Mar 2024 11:41:32 -0800 Subject: [PATCH 223/261] PR Feedback: Formatting, move/add conditions, output diffs to csv in logs --- src/SourceBuild/content/build.proj | 3 ++- .../{build.targets => sdkArchiveDiffs.targets} | 15 +++++++++------ src/SourceBuild/content/eng/tools/init-build.proj | 3 ++- 3 files changed, 13 insertions(+), 8 deletions(-) rename src/SourceBuild/content/eng/{build.targets => sdkArchiveDiffs.targets} (82%) diff --git a/src/SourceBuild/content/build.proj b/src/SourceBuild/content/build.proj index adc0a15bb530..d18fb9a508a7 100644 --- a/src/SourceBuild/content/build.proj +++ b/src/SourceBuild/content/build.proj @@ -20,6 +20,7 @@ - + + diff --git a/src/SourceBuild/content/eng/build.targets b/src/SourceBuild/content/eng/sdkArchiveDiffs.targets similarity index 82% rename from src/SourceBuild/content/eng/build.targets rename to src/SourceBuild/content/eng/sdkArchiveDiffs.targets index 008c7c2ad929..c80f6a245ff1 100644 --- a/src/SourceBuild/content/eng/build.targets +++ b/src/SourceBuild/content/eng/sdkArchiveDiffs.targets @@ -1,13 +1,12 @@ + - + DependsOnTargets="DetermineSourceBuiltSdkVersion"> @@ -37,6 +36,12 @@ <_changedFiles Include="@(_ContentDifferences)" Condition="'%(_contentDifferences.Kind)' != 'Unchanged'" /> + + $(ArtifactsLogDir)\SdkArchiveDiffs\SdkArchiveDiffs.csv + + + + @@ -44,9 +49,7 @@ Importance="High" Condition="'@(_changedFiles->Count())' == '0'" /> - - + diff --git a/src/SourceBuild/content/eng/tools/init-build.proj b/src/SourceBuild/content/eng/tools/init-build.proj index 95b45311372f..a196b48cf9a8 100644 --- a/src/SourceBuild/content/eng/tools/init-build.proj +++ b/src/SourceBuild/content/eng/tools/init-build.proj @@ -117,7 +117,8 @@ - + From 36d3cfa39404d03b08d05e8801a61732dd4f20f8 Mon Sep 17 00:00:00 2001 From: Jackson Schuster <36744439+jtschuster@users.noreply.github.com> Date: Wed, 6 Mar 2024 11:46:02 -0800 Subject: [PATCH 224/261] Update src/SourceBuild/content/eng/sdkArchiveDiffs.targets Co-authored-by: Viktor Hofer --- src/SourceBuild/content/eng/sdkArchiveDiffs.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SourceBuild/content/eng/sdkArchiveDiffs.targets b/src/SourceBuild/content/eng/sdkArchiveDiffs.targets index c80f6a245ff1..79ec32b2e22d 100644 --- a/src/SourceBuild/content/eng/sdkArchiveDiffs.targets +++ b/src/SourceBuild/content/eng/sdkArchiveDiffs.targets @@ -37,7 +37,7 @@ - $(ArtifactsLogDir)\SdkArchiveDiffs\SdkArchiveDiffs.csv + $(ArtifactsLogDir)SdkArchiveDiffs.csv From 2c5bee478848cafce6986fb4130ec7924d50af32 Mon Sep 17 00:00:00 2001 From: Jackson Schuster <36744439+jtschuster@users.noreply.github.com> Date: Wed, 6 Mar 2024 11:57:01 -0800 Subject: [PATCH 225/261] Fix typo --- .../eng/{sdkArchiveDiffs.targets => sdkArchiveDiff.targets} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/SourceBuild/content/eng/{sdkArchiveDiffs.targets => sdkArchiveDiff.targets} (100%) diff --git a/src/SourceBuild/content/eng/sdkArchiveDiffs.targets b/src/SourceBuild/content/eng/sdkArchiveDiff.targets similarity index 100% rename from src/SourceBuild/content/eng/sdkArchiveDiffs.targets rename to src/SourceBuild/content/eng/sdkArchiveDiff.targets From b290188e395cfcf308e3d22f119e72ec46138a72 Mon Sep 17 00:00:00 2001 From: Jackson Schuster <36744439+jtschuster@users.noreply.github.com> Date: Wed, 6 Mar 2024 11:59:14 -0800 Subject: [PATCH 226/261] Use remote file name for downloaded sdk --- .../GetClosestArchive.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/GetClosestArchive.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/GetClosestArchive.cs index b78f4c91b8f1..85592191d0b4 100644 --- a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/GetClosestArchive.cs +++ b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff/GetClosestArchive.cs @@ -82,7 +82,7 @@ public async Task ExecuteAsync() var packageUriPath = packageResponse.RequestMessage!.RequestUri!.LocalPath; - ClosestOfficialArchivePath = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName() + $".{ArchiveName}-{BuiltVersion}-{BuiltRid}.closest.{ArchiveExtension}"); + ClosestOfficialArchivePath = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName() + "." + Path.GetFileName(packageUriPath)); Log.LogMessage($"Copying {packageUriPath} to {ClosestOfficialArchivePath}"); using (var file = File.Create(ClosestOfficialArchivePath)) { From 60c0a7e489992d4df2bf2373055a9d76256c5116 Mon Sep 17 00:00:00 2001 From: Jackson Schuster <36744439+jtschuster@users.noreply.github.com> Date: Wed, 6 Mar 2024 12:01:10 -0800 Subject: [PATCH 227/261] Add args to WriteLinesToFile --- src/SourceBuild/content/eng/sdkArchiveDiff.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SourceBuild/content/eng/sdkArchiveDiff.targets b/src/SourceBuild/content/eng/sdkArchiveDiff.targets index 79ec32b2e22d..500faa8c937a 100644 --- a/src/SourceBuild/content/eng/sdkArchiveDiff.targets +++ b/src/SourceBuild/content/eng/sdkArchiveDiff.targets @@ -40,7 +40,7 @@ $(ArtifactsLogDir)SdkArchiveDiffs.csv - + Date: Wed, 6 Mar 2024 13:37:06 -0800 Subject: [PATCH 228/261] Use .diff instead of csv for sdk content diffs --- eng/pipelines/templates/jobs/vmr-build.yml | 10 ++++++---- src/SourceBuild/content/eng/sdkArchiveDiff.targets | 13 +++++++++++-- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/eng/pipelines/templates/jobs/vmr-build.yml b/eng/pipelines/templates/jobs/vmr-build.yml index 16d676186c87..b0dfd4a05a04 100644 --- a/eng/pipelines/templates/jobs/vmr-build.yml +++ b/eng/pipelines/templates/jobs/vmr-build.yml @@ -208,7 +208,7 @@ jobs: exit 1 fi displayName: Setup Previously Source-Built SDK - + - ${{ if eq(parameters.targetOS, 'windows') }}: - script: | call $(sourcesPath)\build.cmd -ci -cleanWhileBuilding -prepareMachine ${{ parameters.extraProperties }} @@ -305,7 +305,7 @@ jobs: for envVar in $customEnvVars; do customDockerRunArgs="$customDockerRunArgs -e $envVar" done - + if [[ '${{ parameters.runOnline }}' == 'False' ]]; then customDockerRunArgs="$customDockerRunArgs --network none" fi @@ -342,10 +342,10 @@ jobs: # Don't use CopyFiles@2 as it encounters permissions issues because it indexes all files in the source directory graph. - powershell: | function CopyWithRelativeFolders($sourcePath, $targetFolder, $filter) { - Get-ChildItem -Path $sourcePath -Filter $filter -Recurse | ForEach-Object { + Get-ChildItem -Path $sourcePath -Filter $filter -Recurse | ForEach-Object { $targetPath = Join-Path $targetFolder (Resolve-Path -Relative $_.FullName) New-Item -ItemType Directory -Path (Split-Path -Parent $targetPath) -Force | Out-Null - Copy-Item $_.FullName -Destination $targetPath -Force + Copy-Item $_.FullName -Destination $targetPath -Force } } @@ -356,6 +356,7 @@ jobs: CopyWithRelativeFolders "artifacts/" $targetFolder "*.binlog" CopyWithRelativeFolders "artifacts/" $targetFolder "*.log" + CopyWithRelativeFolders "artifacts/" $targetFolder "*.diff" CopyWithRelativeFolders "src/" $targetFolder "*.binlog" CopyWithRelativeFolders "src/" $targetFolder "*.log" CopyWithRelativeFolders "test/" $targetFolder "*.binlog" @@ -382,6 +383,7 @@ jobs: cd "$(sourcesPath)" find artifacts/ -type f -name "*.binlog" -exec rsync -R {} -t ${targetFolder} \; find artifacts/ -type f -name "*.log" -exec rsync -R {} -t ${targetFolder} \; + find artifacts/ -type f -name "*.diff" -exec rsync -R {} -t ${targetFolder} \; if [[ "${{ parameters.buildSourceOnly }}" == "True" ]]; then find artifacts/prebuilt-report/ -exec rsync -R {} -t ${targetFolder} \; fi diff --git a/src/SourceBuild/content/eng/sdkArchiveDiff.targets b/src/SourceBuild/content/eng/sdkArchiveDiff.targets index 500faa8c937a..f0863f1bc166 100644 --- a/src/SourceBuild/content/eng/sdkArchiveDiff.targets +++ b/src/SourceBuild/content/eng/sdkArchiveDiff.targets @@ -34,13 +34,22 @@ <_changedFiles Include="@(_ContentDifferences)" Condition="'%(_contentDifferences.Kind)' != 'Unchanged'" /> + <_sdkFilesDiff Include="@(_ContentDifferences)" Condition="'%(_contentDifferences.Kind)' == 'Added'" > + + + + <_sdkFilesDiff Include="@(_ContentDifferences)" Condition="'%(_contentDifferences.Kind)' == 'Removed'" > + - + + <_sdkFilesDiff Include="@(_ContentDifferences)" Condition="'%(_contentDifferences.Kind)' == 'Unchanged'" > + + - $(ArtifactsLogDir)SdkArchiveDiffs.csv + $(ArtifactsLogDir)SdkArchiveContent.diff - + Date: Wed, 6 Mar 2024 22:13:40 +0000 Subject: [PATCH 229/261] Update dependencies from https://github.com/dotnet/sdk build 20240306.20 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24155.22 -> To Version 8.0.300-preview.24156.20 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b368624895d7..fb71134de889 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - 6c1ba2f2a0abedfd5969afc38bc4ebc16531336d + 511c121de5aed91d455ef512dc83cf83e125965b - + https://github.com/dotnet/sdk - 6c1ba2f2a0abedfd5969afc38bc4ebc16531336d + 511c121de5aed91d455ef512dc83cf83e125965b - + https://github.com/dotnet/sdk - 6c1ba2f2a0abedfd5969afc38bc4ebc16531336d + 511c121de5aed91d455ef512dc83cf83e125965b - + https://github.com/dotnet/sdk - 6c1ba2f2a0abedfd5969afc38bc4ebc16531336d + 511c121de5aed91d455ef512dc83cf83e125965b https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 26139a148311..b8039b7442f3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24156.11 - 8.0.300-preview.24156.11 - 8.0.300-preview.24156.11 + 8.0.300-preview.24156.20 + 8.0.300-preview.24156.20 + 8.0.300-preview.24156.20 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 0dda09c4e87d5b951103c27e7ee2a3f644932c1b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 7 Mar 2024 02:47:09 +0000 Subject: [PATCH 230/261] [main] Update dependencies from dotnet/sdk (#18875) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 132 ++++++++++++++++++++-------------------- eng/Versions.props | 48 +++++++-------- 2 files changed, 90 insertions(+), 90 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 96c12656174a..e67e8721761e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,41 +5,41 @@ Source-build uses transitive dependency resolution to determine correct build SHA of all product contributing repos. The order of dependencies is important and should not be modified without approval from dotnet/source-build-internal. --> - + https://github.com/dotnet/windowsdesktop - 9e4cede9d34b51c91ad10fa2462042aceeb3937b + 75ec22d7c0602d92e583fe729239becabbe51cd8 - + https://github.com/dotnet/windowsdesktop - 9e4cede9d34b51c91ad10fa2462042aceeb3937b + 75ec22d7c0602d92e583fe729239becabbe51cd8 - + https://github.com/dotnet/windowsdesktop - 9e4cede9d34b51c91ad10fa2462042aceeb3937b + 75ec22d7c0602d92e583fe729239becabbe51cd8 - + https://github.com/dotnet/windowsdesktop - 9e4cede9d34b51c91ad10fa2462042aceeb3937b + 75ec22d7c0602d92e583fe729239becabbe51cd8 - + https://github.com/dotnet/runtime - 0df43f2952e83077f62d9235bd453ae0eba66803 + 33fe041f6402dcc0760fae43ab4c66bf17d24287 - + https://github.com/dotnet/runtime - 0df43f2952e83077f62d9235bd453ae0eba66803 + 33fe041f6402dcc0760fae43ab4c66bf17d24287 - + https://github.com/dotnet/runtime - 0df43f2952e83077f62d9235bd453ae0eba66803 + 33fe041f6402dcc0760fae43ab4c66bf17d24287 - + https://github.com/dotnet/runtime - 0df43f2952e83077f62d9235bd453ae0eba66803 + 33fe041f6402dcc0760fae43ab4c66bf17d24287 - + https://github.com/dotnet/runtime - 0df43f2952e83077f62d9235bd453ae0eba66803 + 33fe041f6402dcc0760fae43ab4c66bf17d24287 @@ -47,70 +47,70 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 0df43f2952e83077f62d9235bd453ae0eba66803 + 33fe041f6402dcc0760fae43ab4c66bf17d24287 - + https://github.com/dotnet/runtime - 0df43f2952e83077f62d9235bd453ae0eba66803 + 33fe041f6402dcc0760fae43ab4c66bf17d24287 - + https://github.com/dotnet/aspnetcore - 32b772a470e3c7dc147d3d124c32199bb3e7b6bc + d83064b467e26bb30c4e4180eac1d0fad873bca9 - + https://github.com/dotnet/aspnetcore - 32b772a470e3c7dc147d3d124c32199bb3e7b6bc + d83064b467e26bb30c4e4180eac1d0fad873bca9 - + https://github.com/dotnet/aspnetcore - 32b772a470e3c7dc147d3d124c32199bb3e7b6bc + d83064b467e26bb30c4e4180eac1d0fad873bca9 - + https://github.com/dotnet/aspnetcore - 32b772a470e3c7dc147d3d124c32199bb3e7b6bc + d83064b467e26bb30c4e4180eac1d0fad873bca9 - + https://github.com/dotnet/aspnetcore - 32b772a470e3c7dc147d3d124c32199bb3e7b6bc + d83064b467e26bb30c4e4180eac1d0fad873bca9 - + https://github.com/dotnet/aspnetcore - 32b772a470e3c7dc147d3d124c32199bb3e7b6bc + d83064b467e26bb30c4e4180eac1d0fad873bca9 - + https://github.com/dotnet/aspnetcore - 32b772a470e3c7dc147d3d124c32199bb3e7b6bc + d83064b467e26bb30c4e4180eac1d0fad873bca9 - + https://github.com/dotnet/aspnetcore - 32b772a470e3c7dc147d3d124c32199bb3e7b6bc + d83064b467e26bb30c4e4180eac1d0fad873bca9 - + https://github.com/dotnet/sdk - 765ad969248cdceaf976a27b512e8abc43ed2d19 + 7d89f5b0b212633418a28c6ab1a343e178f42ba5 - + https://github.com/dotnet/sdk - 765ad969248cdceaf976a27b512e8abc43ed2d19 + 7d89f5b0b212633418a28c6ab1a343e178f42ba5 - + https://github.com/dotnet/sdk - 765ad969248cdceaf976a27b512e8abc43ed2d19 + 7d89f5b0b212633418a28c6ab1a343e178f42ba5 - + https://github.com/dotnet/sdk - 765ad969248cdceaf976a27b512e8abc43ed2d19 + 7d89f5b0b212633418a28c6ab1a343e178f42ba5 - + https://github.com/dotnet/sdk - 765ad969248cdceaf976a27b512e8abc43ed2d19 + 7d89f5b0b212633418a28c6ab1a343e178f42ba5 @@ -144,22 +144,22 @@ - + https://github.com/dotnet/winforms - cf4d00efe5f6dbab435305bd1129bf4e4351243b + 7ba25c593e6e64e58cfb82458974896f6feb49db - + https://github.com/dotnet/wpf - 0fee673e416438fa496be15f9fed2707d9bade23 + 906eb2878bbe4d5f86e77e9a0d4f85815e9f5aaf - + https://github.com/dotnet/fsharp - ca66024e6da7cced9921216763386bd43f400fbf + 641c6a0e65bac6f7809e4e2415b9d60c11dcf493 - + https://github.com/dotnet/fsharp - ca66024e6da7cced9921216763386bd43f400fbf + 641c6a0e65bac6f7809e4e2415b9d60c11dcf493 @@ -172,18 +172,18 @@ 39c7dd12c7ec24d0552513e84d95476f2077ca33 - + https://github.com/dotnet/runtime - 0df43f2952e83077f62d9235bd453ae0eba66803 + 33fe041f6402dcc0760fae43ab4c66bf17d24287 - + https://github.com/dotnet/roslyn - 8537440d8c831b8533a18f6530945ee91c243e1b + 99fbf1bddce825ee6b146cf5591c143b216ed88b - + https://github.com/dotnet/roslyn - 8537440d8c831b8533a18f6530945ee91c243e1b + 99fbf1bddce825ee6b146cf5591c143b216ed88b @@ -196,9 +196,9 @@ 6f44380e4fdea6ddf5c11f48efeb25c2bf181e62 - + https://github.com/nuget/nuget.client - 6009531090c927a8e61da9a0f97bdd5eb6f01a47 + e49fa71580778b8d9c3352ea5ed15ef204f0389f @@ -226,9 +226,9 @@ - + https://github.com/dotnet/source-build-externals - 7fbf7ef59ca7ddcfa92269ef84e3fcb7544f8699 + 60a35f5b8ce2839e56457164844d91fc89622c6a diff --git a/eng/Versions.props b/eng/Versions.props index 527a00cacff5..f2c75935e9d0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,11 +47,11 @@ - 9.0.0-preview.3.24153.1 + 9.0.0-preview.3.24154.1 - 9.0.0-preview.3.24154.2 + 9.0.0-preview.3.24154.3 @@ -72,49 +72,49 @@ - 9.0.0-preview.3.24154.12 - 9.0.0-preview.3.24154.12 - 9.0.0-preview.3.24154.12 - 9.0.0-preview.3.24154.12 - 9.0.0-preview.3.24154.12 - 9.0.0-preview.3.24154.12 - 9.0.0-preview.3.24154.12 + 9.0.0-preview.3.24155.10 + 9.0.0-preview.3.24155.10 + 9.0.0-preview.3.24155.10 + 9.0.0-preview.3.24155.10 + 9.0.0-preview.3.24155.10 + 9.0.0-preview.3.24155.10 + 9.0.0-preview.3.24155.10 0.2.0 - 9.0.100-preview.3.24155.3 - 9.0.100-preview.3.24155.3 - 9.0.100-preview.3.24155.3 + 9.0.100-preview.3.24156.16 + 9.0.100-preview.3.24156.16 + 9.0.100-preview.3.24156.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.10.0-3.24151.8 + 4.10.0-3.24155.13 - 9.0.0-preview.3.24154.10 + 9.0.0-preview.3.24155.8 - 9.0.0-preview.3.24154.10 - 9.0.0-preview.3.24154.10 - 9.0.0-preview.3.24154.10 - 9.0.0-preview.3.24154.10 - 9.0.0-preview.3.24154.10 + 9.0.0-preview.3.24155.8 + 9.0.0-preview.3.24155.8 + 9.0.0-preview.3.24155.8 + 9.0.0-preview.3.24155.8 + 9.0.0-preview.3.24155.8 2.1.0 - 9.0.0-preview.3.24154.2 - 9.0.0-preview.3.24154.2 - 9.0.0-preview.3.24154.2 - 9.0.0-preview.3.24154.2 + 9.0.0-preview.3.24155.3 + 9.0.0-preview.3.24155.3 + 9.0.0-preview.3.24155.3 + 9.0.0-preview.3.24155.3 @@ -126,7 +126,7 @@ - 6.10.0-preview.2.52 + 6.10.0-preview.2.73 From 13b582a7ec8591ac0413b92d89a2936a41a66cf1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 7 Mar 2024 02:50:29 +0000 Subject: [PATCH 231/261] Update dependencies from https://github.com/dotnet/sdk build 20240306.41 Microsoft.SourceBuild.Intermediate.sdk , Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 9.0.100-preview.3.24156.16 -> To Version 9.0.100-preview.3.24156.41 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 9.0.0-preview.3.24155.3 -> To Version 9.0.0-preview.3.24156.13 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 40 ++++++++++++++++++++-------------------- eng/Versions.props | 16 ++++++++-------- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e67e8721761e..50a1eb4b8060 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,21 +5,21 @@ Source-build uses transitive dependency resolution to determine correct build SHA of all product contributing repos. The order of dependencies is important and should not be modified without approval from dotnet/source-build-internal. --> - + https://github.com/dotnet/windowsdesktop - 75ec22d7c0602d92e583fe729239becabbe51cd8 + a144fd1eb11a8075b6c91a5a14226ed5e2ac0468 - + https://github.com/dotnet/windowsdesktop - 75ec22d7c0602d92e583fe729239becabbe51cd8 + a144fd1eb11a8075b6c91a5a14226ed5e2ac0468 - + https://github.com/dotnet/windowsdesktop - 75ec22d7c0602d92e583fe729239becabbe51cd8 + a144fd1eb11a8075b6c91a5a14226ed5e2ac0468 - + https://github.com/dotnet/windowsdesktop - 75ec22d7c0602d92e583fe729239becabbe51cd8 + a144fd1eb11a8075b6c91a5a14226ed5e2ac0468 https://github.com/dotnet/runtime @@ -91,26 +91,26 @@ d83064b467e26bb30c4e4180eac1d0fad873bca9 - + https://github.com/dotnet/sdk - 7d89f5b0b212633418a28c6ab1a343e178f42ba5 + a0e4e2a05c96d85cc36a6d52b9a95f78982d2e26 - + https://github.com/dotnet/sdk - 7d89f5b0b212633418a28c6ab1a343e178f42ba5 + a0e4e2a05c96d85cc36a6d52b9a95f78982d2e26 - + https://github.com/dotnet/sdk - 7d89f5b0b212633418a28c6ab1a343e178f42ba5 + a0e4e2a05c96d85cc36a6d52b9a95f78982d2e26 - + https://github.com/dotnet/sdk - 7d89f5b0b212633418a28c6ab1a343e178f42ba5 + a0e4e2a05c96d85cc36a6d52b9a95f78982d2e26 - + https://github.com/dotnet/sdk - 7d89f5b0b212633418a28c6ab1a343e178f42ba5 + a0e4e2a05c96d85cc36a6d52b9a95f78982d2e26 @@ -148,9 +148,9 @@ https://github.com/dotnet/winforms 7ba25c593e6e64e58cfb82458974896f6feb49db - + https://github.com/dotnet/wpf - 906eb2878bbe4d5f86e77e9a0d4f85815e9f5aaf + 00b91f99b673541e8b05f9de14c0ff1786bf6c9d https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index f2c75935e9d0..a74d608d4553 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -51,7 +51,7 @@ - 9.0.0-preview.3.24154.3 + 9.0.0-preview.3.24155.1 @@ -85,9 +85,9 @@ - 9.0.100-preview.3.24156.16 - 9.0.100-preview.3.24156.16 - 9.0.100-preview.3.24156.16 + 9.0.100-preview.3.24156.41 + 9.0.100-preview.3.24156.41 + 9.0.100-preview.3.24156.41 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -111,10 +111,10 @@ - 9.0.0-preview.3.24155.3 - 9.0.0-preview.3.24155.3 - 9.0.0-preview.3.24155.3 - 9.0.0-preview.3.24155.3 + 9.0.0-preview.3.24156.13 + 9.0.0-preview.3.24156.13 + 9.0.0-preview.3.24156.13 + 9.0.0-preview.3.24156.13 From 2286d77633d57a0d6fa7552f8e7a6e5064b6269a Mon Sep 17 00:00:00 2001 From: Jackson Schuster <36744439+jtschuster@users.noreply.github.com> Date: Wed, 6 Mar 2024 21:31:51 -0800 Subject: [PATCH 232/261] Use Item transform instead of batching to output lines to file --- src/SourceBuild/content/eng/sdkArchiveDiff.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SourceBuild/content/eng/sdkArchiveDiff.targets b/src/SourceBuild/content/eng/sdkArchiveDiff.targets index f0863f1bc166..c3bc8078763a 100644 --- a/src/SourceBuild/content/eng/sdkArchiveDiff.targets +++ b/src/SourceBuild/content/eng/sdkArchiveDiff.targets @@ -49,7 +49,7 @@ $(ArtifactsLogDir)SdkArchiveContent.diff - + Date: Thu, 7 Mar 2024 06:35:43 +0000 Subject: [PATCH 233/261] Update dependencies from https://github.com/dotnet/sdk build 20240306.47 Microsoft.SourceBuild.Intermediate.sdk , Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 9.0.100-preview.3.24156.41 -> To Version 9.0.100-preview.3.24156.47 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.9.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.9.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.Platforms,Microsoft.SourceBuild.Intermediate.runtime.linux-x64,Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.SourceBuild.Intermediate.emsdk From Version 9.0.0-preview.3.24155.8 -> To Version 9.0.0-preview.3.24156.24 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 60 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++------- 2 files changed, 40 insertions(+), 40 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 50a1eb4b8060..cc5996b08ca5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -21,25 +21,25 @@ https://github.com/dotnet/windowsdesktop a144fd1eb11a8075b6c91a5a14226ed5e2ac0468 - + https://github.com/dotnet/runtime - 33fe041f6402dcc0760fae43ab4c66bf17d24287 + ce3435737bbe46014aad148bf9cfeec1b80bebc3 - + https://github.com/dotnet/runtime - 33fe041f6402dcc0760fae43ab4c66bf17d24287 + ce3435737bbe46014aad148bf9cfeec1b80bebc3 - + https://github.com/dotnet/runtime - 33fe041f6402dcc0760fae43ab4c66bf17d24287 + ce3435737bbe46014aad148bf9cfeec1b80bebc3 - + https://github.com/dotnet/runtime - 33fe041f6402dcc0760fae43ab4c66bf17d24287 + ce3435737bbe46014aad148bf9cfeec1b80bebc3 - + https://github.com/dotnet/runtime - 33fe041f6402dcc0760fae43ab4c66bf17d24287 + ce3435737bbe46014aad148bf9cfeec1b80bebc3 @@ -47,14 +47,14 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 33fe041f6402dcc0760fae43ab4c66bf17d24287 + ce3435737bbe46014aad148bf9cfeec1b80bebc3 - + https://github.com/dotnet/runtime - 33fe041f6402dcc0760fae43ab4c66bf17d24287 + ce3435737bbe46014aad148bf9cfeec1b80bebc3 @@ -91,26 +91,26 @@ d83064b467e26bb30c4e4180eac1d0fad873bca9 - + https://github.com/dotnet/sdk - a0e4e2a05c96d85cc36a6d52b9a95f78982d2e26 + 8a1c5ee81a89940bf9fc06302ea01eaa6f720130 - + https://github.com/dotnet/sdk - a0e4e2a05c96d85cc36a6d52b9a95f78982d2e26 + 8a1c5ee81a89940bf9fc06302ea01eaa6f720130 - + https://github.com/dotnet/sdk - a0e4e2a05c96d85cc36a6d52b9a95f78982d2e26 + 8a1c5ee81a89940bf9fc06302ea01eaa6f720130 - + https://github.com/dotnet/sdk - a0e4e2a05c96d85cc36a6d52b9a95f78982d2e26 + 8a1c5ee81a89940bf9fc06302ea01eaa6f720130 - + https://github.com/dotnet/sdk - a0e4e2a05c96d85cc36a6d52b9a95f78982d2e26 + 8a1c5ee81a89940bf9fc06302ea01eaa6f720130 @@ -172,9 +172,9 @@ 39c7dd12c7ec24d0552513e84d95476f2077ca33 - + https://github.com/dotnet/runtime - 33fe041f6402dcc0760fae43ab4c66bf17d24287 + ce3435737bbe46014aad148bf9cfeec1b80bebc3 https://github.com/dotnet/roslyn @@ -205,14 +205,14 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - e926eb7d9614243be6b936cbbe9988fd8cc6d8a6 + 94f048f4d194119ec20c8878790972fc3a83dc3b - + https://github.com/dotnet/emsdk - e926eb7d9614243be6b936cbbe9988fd8cc6d8a6 + 94f048f4d194119ec20c8878790972fc3a83dc3b diff --git a/eng/Versions.props b/eng/Versions.props index a74d608d4553..9c5b35e0904b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 9.0.100-preview.3.24156.41 - 9.0.100-preview.3.24156.41 - 9.0.100-preview.3.24156.41 + 9.0.100-preview.3.24156.47 + 9.0.100-preview.3.24156.47 + 9.0.100-preview.3.24156.47 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -98,15 +98,15 @@ - 9.0.0-preview.3.24155.8 + 9.0.0-preview.3.24156.24 - 9.0.0-preview.3.24155.8 - 9.0.0-preview.3.24155.8 - 9.0.0-preview.3.24155.8 - 9.0.0-preview.3.24155.8 - 9.0.0-preview.3.24155.8 + 9.0.0-preview.3.24156.24 + 9.0.0-preview.3.24156.24 + 9.0.0-preview.3.24156.24 + 9.0.0-preview.3.24156.24 + 9.0.0-preview.3.24156.24 2.1.0 @@ -261,7 +261,7 @@ 14.2.9088-net9-p1 17.2.9088-net9-p1 - 9.0.0-preview.3.24128.1 + 9.0.0-preview.3.24155.2 $(MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportPackageVersion) 9.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-[A-z]*[\.]*\d*`)) From d91e556748e341c3f26ea8ab8c90a2c20c2e3b8e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 7 Mar 2024 07:48:21 +0000 Subject: [PATCH 234/261] Update dependencies from https://github.com/dotnet/sdk build 20240306.48 Microsoft.SourceBuild.Intermediate.sdk , Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 9.0.100-preview.3.24156.41 -> To Version 9.0.100-preview.3.24156.48 --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cc5996b08ca5..e8782082aa3d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -91,26 +91,26 @@ d83064b467e26bb30c4e4180eac1d0fad873bca9 - + https://github.com/dotnet/sdk - 8a1c5ee81a89940bf9fc06302ea01eaa6f720130 + a5f7d28eb5aed4c39535c56706cc5633ae4494de - + https://github.com/dotnet/sdk - 8a1c5ee81a89940bf9fc06302ea01eaa6f720130 + a5f7d28eb5aed4c39535c56706cc5633ae4494de - + https://github.com/dotnet/sdk - 8a1c5ee81a89940bf9fc06302ea01eaa6f720130 + a5f7d28eb5aed4c39535c56706cc5633ae4494de - + https://github.com/dotnet/sdk - 8a1c5ee81a89940bf9fc06302ea01eaa6f720130 + a5f7d28eb5aed4c39535c56706cc5633ae4494de - + https://github.com/dotnet/sdk - 8a1c5ee81a89940bf9fc06302ea01eaa6f720130 + a5f7d28eb5aed4c39535c56706cc5633ae4494de diff --git a/eng/Versions.props b/eng/Versions.props index 9c5b35e0904b..eb56e586d291 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 9.0.100-preview.3.24156.47 - 9.0.100-preview.3.24156.47 - 9.0.100-preview.3.24156.47 + 9.0.100-preview.3.24156.48 + 9.0.100-preview.3.24156.48 + 9.0.100-preview.3.24156.48 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e7c21a5ccaf4c50996f07a67f2ec5d66da20ec96 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 7 Mar 2024 07:48:34 +0000 Subject: [PATCH 235/261] Update dependencies from https://github.com/dotnet/sdk build 20240306.49 Microsoft.SourceBuild.Intermediate.sdk , Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 9.0.100-preview.3.24156.48 -> To Version 9.0.100-preview.3.24156.49 --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e8782082aa3d..d3382413b2f4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -91,26 +91,26 @@ d83064b467e26bb30c4e4180eac1d0fad873bca9 - + https://github.com/dotnet/sdk - a5f7d28eb5aed4c39535c56706cc5633ae4494de + cbfe4a370a5117f39231281b77876470ab0005ed - + https://github.com/dotnet/sdk - a5f7d28eb5aed4c39535c56706cc5633ae4494de + cbfe4a370a5117f39231281b77876470ab0005ed - + https://github.com/dotnet/sdk - a5f7d28eb5aed4c39535c56706cc5633ae4494de + cbfe4a370a5117f39231281b77876470ab0005ed - + https://github.com/dotnet/sdk - a5f7d28eb5aed4c39535c56706cc5633ae4494de + cbfe4a370a5117f39231281b77876470ab0005ed - + https://github.com/dotnet/sdk - a5f7d28eb5aed4c39535c56706cc5633ae4494de + cbfe4a370a5117f39231281b77876470ab0005ed diff --git a/eng/Versions.props b/eng/Versions.props index eb56e586d291..15803ff2883a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 9.0.100-preview.3.24156.48 - 9.0.100-preview.3.24156.48 - 9.0.100-preview.3.24156.48 + 9.0.100-preview.3.24156.49 + 9.0.100-preview.3.24156.49 + 9.0.100-preview.3.24156.49 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 4dbdea3cc032e90a01ca608e0c274ee27615abbf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 7 Mar 2024 07:48:48 +0000 Subject: [PATCH 236/261] Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0,VS.Redist.Common.NetCore.SharedFramework.x64.9.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.9.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.Platforms,Microsoft.SourceBuild.Intermediate.runtime.linux-x64,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.SourceBuild.Intermediate.aspnetcore,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.SourceBuild.Intermediate.roslyn,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.SourceBuild.Intermediate.emsdk From Version 9.0.0-preview.3.24156.13 -> To Version 9.0.0-preview.3.24156.27 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 64 ++++++++++++++++++++--------------------- eng/Versions.props | 28 +++++++++--------- 2 files changed, 46 insertions(+), 46 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d3382413b2f4..7665b5e167d5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,21 +5,21 @@ Source-build uses transitive dependency resolution to determine correct build SHA of all product contributing repos. The order of dependencies is important and should not be modified without approval from dotnet/source-build-internal. --> - + https://github.com/dotnet/windowsdesktop - a144fd1eb11a8075b6c91a5a14226ed5e2ac0468 + d6b074b0ab8aeb928bb93d258161ed16f31f85f2 - + https://github.com/dotnet/windowsdesktop - a144fd1eb11a8075b6c91a5a14226ed5e2ac0468 + d6b074b0ab8aeb928bb93d258161ed16f31f85f2 - + https://github.com/dotnet/windowsdesktop - a144fd1eb11a8075b6c91a5a14226ed5e2ac0468 + d6b074b0ab8aeb928bb93d258161ed16f31f85f2 - + https://github.com/dotnet/windowsdesktop - a144fd1eb11a8075b6c91a5a14226ed5e2ac0468 + d6b074b0ab8aeb928bb93d258161ed16f31f85f2 https://github.com/dotnet/runtime @@ -57,38 +57,38 @@ ce3435737bbe46014aad148bf9cfeec1b80bebc3 - + https://github.com/dotnet/aspnetcore - d83064b467e26bb30c4e4180eac1d0fad873bca9 + 449abac6f1ca12fa0ad557a872c219fcdfae09f3 - + https://github.com/dotnet/aspnetcore - d83064b467e26bb30c4e4180eac1d0fad873bca9 + 449abac6f1ca12fa0ad557a872c219fcdfae09f3 - + https://github.com/dotnet/aspnetcore - d83064b467e26bb30c4e4180eac1d0fad873bca9 + 449abac6f1ca12fa0ad557a872c219fcdfae09f3 - + https://github.com/dotnet/aspnetcore - d83064b467e26bb30c4e4180eac1d0fad873bca9 + 449abac6f1ca12fa0ad557a872c219fcdfae09f3 - + https://github.com/dotnet/aspnetcore - d83064b467e26bb30c4e4180eac1d0fad873bca9 + 449abac6f1ca12fa0ad557a872c219fcdfae09f3 - + https://github.com/dotnet/aspnetcore - d83064b467e26bb30c4e4180eac1d0fad873bca9 + 449abac6f1ca12fa0ad557a872c219fcdfae09f3 - + https://github.com/dotnet/aspnetcore - d83064b467e26bb30c4e4180eac1d0fad873bca9 + 449abac6f1ca12fa0ad557a872c219fcdfae09f3 - + https://github.com/dotnet/aspnetcore - d83064b467e26bb30c4e4180eac1d0fad873bca9 + 449abac6f1ca12fa0ad557a872c219fcdfae09f3 @@ -144,13 +144,13 @@ - + https://github.com/dotnet/winforms - 7ba25c593e6e64e58cfb82458974896f6feb49db + 389c8da733c43105275cfc9f9bc482b144073880 - + https://github.com/dotnet/wpf - 00b91f99b673541e8b05f9de14c0ff1786bf6c9d + a2c7547c602fe7dfbf8447a563b440d7449b6b6d https://github.com/dotnet/fsharp @@ -176,14 +176,14 @@ https://github.com/dotnet/runtime ce3435737bbe46014aad148bf9cfeec1b80bebc3 - + https://github.com/dotnet/roslyn - 99fbf1bddce825ee6b146cf5591c143b216ed88b + d24b5bb8debd2e89df8db13c84694f2982cc41b1 - + https://github.com/dotnet/roslyn - 99fbf1bddce825ee6b146cf5591c143b216ed88b + d24b5bb8debd2e89df8db13c84694f2982cc41b1 diff --git a/eng/Versions.props b/eng/Versions.props index 15803ff2883a..8bef6ce002da 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,11 +47,11 @@ - 9.0.0-preview.3.24154.1 + 9.0.0-preview.3.24155.2 - 9.0.0-preview.3.24155.1 + 9.0.0-preview.3.24156.2 @@ -72,13 +72,13 @@ - 9.0.0-preview.3.24155.10 - 9.0.0-preview.3.24155.10 - 9.0.0-preview.3.24155.10 - 9.0.0-preview.3.24155.10 - 9.0.0-preview.3.24155.10 - 9.0.0-preview.3.24155.10 - 9.0.0-preview.3.24155.10 + 9.0.0-preview.3.24156.20 + 9.0.0-preview.3.24156.20 + 9.0.0-preview.3.24156.20 + 9.0.0-preview.3.24156.20 + 9.0.0-preview.3.24156.20 + 9.0.0-preview.3.24156.20 + 9.0.0-preview.3.24156.20 0.2.0 @@ -94,7 +94,7 @@ - 4.10.0-3.24155.13 + 4.10.0-3.24156.11 @@ -111,10 +111,10 @@ - 9.0.0-preview.3.24156.13 - 9.0.0-preview.3.24156.13 - 9.0.0-preview.3.24156.13 - 9.0.0-preview.3.24156.13 + 9.0.0-preview.3.24156.27 + 9.0.0-preview.3.24156.27 + 9.0.0-preview.3.24156.27 + 9.0.0-preview.3.24156.27 From 0d6c2be7dd659162e61b55c144439e8cafea1739 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 7 Mar 2024 08:00:08 +0000 Subject: [PATCH 237/261] Update dependencies from https://github.com/dotnet/sdk build 20240306.50 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24156.20 -> To Version 8.0.300-preview.24156.50 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp From Version 12.8.300-beta.24154.4 -> To Version 12.8.300-beta.24155.6 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fb71134de889..7ac3a937ec31 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - 511c121de5aed91d455ef512dc83cf83e125965b + c4ad01672fd1f8370655810c9fa540a0f2d3a71d - + https://github.com/dotnet/sdk - 511c121de5aed91d455ef512dc83cf83e125965b + c4ad01672fd1f8370655810c9fa540a0f2d3a71d - + https://github.com/dotnet/sdk - 511c121de5aed91d455ef512dc83cf83e125965b + c4ad01672fd1f8370655810c9fa540a0f2d3a71d - + https://github.com/dotnet/sdk - 511c121de5aed91d455ef512dc83cf83e125965b + c4ad01672fd1f8370655810c9fa540a0f2d3a71d https://github.com/dotnet/test-templates @@ -132,13 +132,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 472140dd926227876848e48f41cfc9acb9275492 - + https://github.com/dotnet/fsharp - ca66024e6da7cced9921216763386bd43f400fbf + 641c6a0e65bac6f7809e4e2415b9d60c11dcf493 - + https://github.com/dotnet/fsharp - ca66024e6da7cced9921216763386bd43f400fbf + 641c6a0e65bac6f7809e4e2415b9d60c11dcf493 diff --git a/eng/Versions.props b/eng/Versions.props index b8039b7442f3..f20e391cacb7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24156.20 - 8.0.300-preview.24156.20 - 8.0.300-preview.24156.20 + 8.0.300-preview.24156.50 + 8.0.300-preview.24156.50 + 8.0.300-preview.24156.50 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From effde0542624b84ddf895b404667234d1897ddaa Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 7 Mar 2024 08:41:59 +0000 Subject: [PATCH 238/261] Update dependencies from https://github.com/dotnet/sdk build 20240307.1 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24156.20 -> To Version 8.0.300-preview.24157.1 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset From Version 12.8.300-beta.24154.4 -> To Version 12.8.300-beta.24155.6 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7ac3a937ec31..581707ce6abc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - c4ad01672fd1f8370655810c9fa540a0f2d3a71d + ed2df70e71b4af18a94bf21c99ac9d560dc5b99b - + https://github.com/dotnet/sdk - c4ad01672fd1f8370655810c9fa540a0f2d3a71d + ed2df70e71b4af18a94bf21c99ac9d560dc5b99b - + https://github.com/dotnet/sdk - c4ad01672fd1f8370655810c9fa540a0f2d3a71d + ed2df70e71b4af18a94bf21c99ac9d560dc5b99b - + https://github.com/dotnet/sdk - c4ad01672fd1f8370655810c9fa540a0f2d3a71d + ed2df70e71b4af18a94bf21c99ac9d560dc5b99b https://github.com/dotnet/test-templates @@ -150,9 +150,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 1381d5ebd2ab1f292848d5b19b80cf71ac332508 - + https://github.com/dotnet/roslyn - c88057e6c3be0d2b85b33e8e3cfb481f5d1d504b + 99fbf1bddce825ee6b146cf5591c143b216ed88b diff --git a/eng/Versions.props b/eng/Versions.props index f20e391cacb7..6dc32fcbb734 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,16 +85,16 @@ - 8.0.300-preview.24156.50 - 8.0.300-preview.24156.50 - 8.0.300-preview.24156.50 + 8.0.300-preview.24157.1 + 8.0.300-preview.24157.1 + 8.0.300-preview.24157.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.10.0-3.24155.1 + 4.10.0-3.24155.13 From c90338ce8799dab87775207555bced5a8903202b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 7 Mar 2024 09:03:58 +0000 Subject: [PATCH 239/261] Update dependencies from https://github.com/dotnet/sdk build 20240306.51 Microsoft.SourceBuild.Intermediate.sdk , Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 9.0.100-preview.3.24156.41 -> To Version 9.0.100-preview.3.24156.51 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0,VS.Redist.Common.NetCore.SharedFramework.x64.9.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.9.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.Platforms,Microsoft.SourceBuild.Intermediate.runtime.linux-x64,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.SourceBuild.Intermediate.aspnetcore,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.SourceBuild.Intermediate.roslyn,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.SourceBuild.Intermediate.emsdk From Version 9.0.0-preview.3.24156.13 -> To Version 9.0.0-preview.3.24156.27 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 52 ++++++++++++++++++++--------------------- eng/Versions.props | 18 +++++++------- 2 files changed, 35 insertions(+), 35 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7665b5e167d5..a9686dac976e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -21,25 +21,25 @@ https://github.com/dotnet/windowsdesktop d6b074b0ab8aeb928bb93d258161ed16f31f85f2 - + https://github.com/dotnet/runtime - ce3435737bbe46014aad148bf9cfeec1b80bebc3 + 8330db998659c4e6410aba370b37e4304a517a2b - + https://github.com/dotnet/runtime - ce3435737bbe46014aad148bf9cfeec1b80bebc3 + 8330db998659c4e6410aba370b37e4304a517a2b - + https://github.com/dotnet/runtime - ce3435737bbe46014aad148bf9cfeec1b80bebc3 + 8330db998659c4e6410aba370b37e4304a517a2b - + https://github.com/dotnet/runtime - ce3435737bbe46014aad148bf9cfeec1b80bebc3 + 8330db998659c4e6410aba370b37e4304a517a2b - + https://github.com/dotnet/runtime - ce3435737bbe46014aad148bf9cfeec1b80bebc3 + 8330db998659c4e6410aba370b37e4304a517a2b @@ -47,14 +47,14 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - ce3435737bbe46014aad148bf9cfeec1b80bebc3 + 8330db998659c4e6410aba370b37e4304a517a2b - + https://github.com/dotnet/runtime - ce3435737bbe46014aad148bf9cfeec1b80bebc3 + 8330db998659c4e6410aba370b37e4304a517a2b @@ -91,26 +91,26 @@ 449abac6f1ca12fa0ad557a872c219fcdfae09f3 - + https://github.com/dotnet/sdk - cbfe4a370a5117f39231281b77876470ab0005ed + cc53b1bdc270f8d8be888169230532abdf07211d - + https://github.com/dotnet/sdk - cbfe4a370a5117f39231281b77876470ab0005ed + cc53b1bdc270f8d8be888169230532abdf07211d - + https://github.com/dotnet/sdk - cbfe4a370a5117f39231281b77876470ab0005ed + cc53b1bdc270f8d8be888169230532abdf07211d - + https://github.com/dotnet/sdk - cbfe4a370a5117f39231281b77876470ab0005ed + cc53b1bdc270f8d8be888169230532abdf07211d - + https://github.com/dotnet/sdk - cbfe4a370a5117f39231281b77876470ab0005ed + cc53b1bdc270f8d8be888169230532abdf07211d @@ -172,9 +172,9 @@ 39c7dd12c7ec24d0552513e84d95476f2077ca33 - + https://github.com/dotnet/runtime - ce3435737bbe46014aad148bf9cfeec1b80bebc3 + 8330db998659c4e6410aba370b37e4304a517a2b https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 8bef6ce002da..fea5c16bfdf2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 9.0.100-preview.3.24156.49 - 9.0.100-preview.3.24156.49 - 9.0.100-preview.3.24156.49 + 9.0.100-preview.3.24156.51 + 9.0.100-preview.3.24156.51 + 9.0.100-preview.3.24156.51 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -98,15 +98,15 @@ - 9.0.0-preview.3.24156.24 + 9.0.0-preview.3.24156.25 - 9.0.0-preview.3.24156.24 - 9.0.0-preview.3.24156.24 - 9.0.0-preview.3.24156.24 - 9.0.0-preview.3.24156.24 - 9.0.0-preview.3.24156.24 + 9.0.0-preview.3.24156.25 + 9.0.0-preview.3.24156.25 + 9.0.0-preview.3.24156.25 + 9.0.0-preview.3.24156.25 + 9.0.0-preview.3.24156.25 2.1.0 From f54194a8010b313eedf75acfcd14a645c8fe1246 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 7 Mar 2024 06:47:08 -0800 Subject: [PATCH 240/261] [main] Update dependencies from dotnet/arcade (#18908) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 2 +- eng/common/build.ps1 | 1 - eng/common/build.sh | 1 - global.json | 4 ++-- 5 files changed, 13 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a9686dac976e..ef2d58892c5d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -243,17 +243,17 @@ - + https://github.com/dotnet/arcade - db45698020f58f88eef75b23b2598a59872918f6 + f1ef2a8544824e9f4395f88e6b453d6fc2826d72 - + https://github.com/dotnet/arcade - db45698020f58f88eef75b23b2598a59872918f6 + f1ef2a8544824e9f4395f88e6b453d6fc2826d72 - + https://github.com/dotnet/arcade - db45698020f58f88eef75b23b2598a59872918f6 + f1ef2a8544824e9f4395f88e6b453d6fc2826d72 https://github.com/dotnet/arcade-services @@ -263,14 +263,14 @@ https://github.com/dotnet/arcade-services c041bcdab75f5447be8bd11ddcfbe8e639f13f32 - + https://github.com/dotnet/arcade - db45698020f58f88eef75b23b2598a59872918f6 + f1ef2a8544824e9f4395f88e6b453d6fc2826d72 - + https://github.com/dotnet/arcade - db45698020f58f88eef75b23b2598a59872918f6 + f1ef2a8544824e9f4395f88e6b453d6fc2826d72 diff --git a/eng/Versions.props b/eng/Versions.props index fea5c16bfdf2..7408efcc071f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,7 +39,7 @@ - 9.0.0-beta.24155.1 + 9.0.0-beta.24156.2 diff --git a/eng/common/build.ps1 b/eng/common/build.ps1 index 510458eb35b8..83e6d82e027a 100644 --- a/eng/common/build.ps1 +++ b/eng/common/build.ps1 @@ -125,7 +125,6 @@ function Build { /p:Test=$test ` /p:Pack=$pack ` /p:DotNetBuildRepo=$($productBuild -or $verticalBuild) ` - /p:ArcadeBuildVertical=$verticalBuild ` /p:IntegrationTest=$integrationTest ` /p:PerformanceTest=$performanceTest ` /p:Sign=$sign ` diff --git a/eng/common/build.sh b/eng/common/build.sh index bec7d02594f6..d82ebf742808 100755 --- a/eng/common/build.sh +++ b/eng/common/build.sh @@ -241,7 +241,6 @@ function Build { /p:DotNetBuildRepo=$product_build \ /p:ArcadeBuildFromSource=$source_build \ /p:DotNetBuildSourceOnly=$source_build \ - /p:ArcadeBuildVertical=$vertical_build \ /p:Rebuild=$rebuild \ /p:Test=$test \ /p:Pack=$pack \ diff --git a/global.json b/global.json index b77d6eb9142c..8ace2326080d 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "latest" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24155.1", - "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24155.1" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24156.2", + "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24156.2" } } From 127a2c2420f0cd4c0ab8dbc0c719bfd93f7d08d9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 7 Mar 2024 16:05:51 +0000 Subject: [PATCH 241/261] Update dependencies from https://github.com/dotnet/arcade-services build 20240307.2 Microsoft.DotNet.Darc , Microsoft.DotNet.DarcLib From Version 1.1.0-beta.24112.3 -> To Version 1.1.0-beta.24157.2 --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index a34764e2f25c..d0376f567c52 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.24112.3", + "version": "1.1.0-beta.24157.2", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ef2d58892c5d..4f47beeedf66 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -255,13 +255,13 @@ https://github.com/dotnet/arcade f1ef2a8544824e9f4395f88e6b453d6fc2826d72 - + https://github.com/dotnet/arcade-services - c041bcdab75f5447be8bd11ddcfbe8e639f13f32 + 049ed7fcb1a7038d20e160b798606c64f743058c - + https://github.com/dotnet/arcade-services - c041bcdab75f5447be8bd11ddcfbe8e639f13f32 + 049ed7fcb1a7038d20e160b798606c64f743058c https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 7408efcc071f..38829707372f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -43,7 +43,7 @@ - 1.1.0-beta.24112.3 + 1.1.0-beta.24157.2 From 7fc4318b30fc89492fedc40f35fb583bc3a8a65c Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Thu, 7 Mar 2024 19:10:41 +0100 Subject: [PATCH 242/261] Update build.proj to make the build mode clearer (#18913) --- src/SourceBuild/content/build.proj | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/SourceBuild/content/build.proj b/src/SourceBuild/content/build.proj index 56d33c5f10b3..3c9b997a8748 100644 --- a/src/SourceBuild/content/build.proj +++ b/src/SourceBuild/content/build.proj @@ -11,10 +11,12 @@ - (source-only) + source-build + non-source-build - + + Date: Thu, 7 Mar 2024 18:49:28 +0000 Subject: [PATCH 243/261] [main] Update dependencies from dotnet/sdk (#18914) [main] Update dependencies from dotnet/sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ef2d58892c5d..e961d871f8d8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -91,26 +91,26 @@ 449abac6f1ca12fa0ad557a872c219fcdfae09f3 - + https://github.com/dotnet/sdk - cc53b1bdc270f8d8be888169230532abdf07211d + 875ca080354cc902981af3a70d03f1246e794ad4 - + https://github.com/dotnet/sdk - cc53b1bdc270f8d8be888169230532abdf07211d + 875ca080354cc902981af3a70d03f1246e794ad4 - + https://github.com/dotnet/sdk - cc53b1bdc270f8d8be888169230532abdf07211d + 875ca080354cc902981af3a70d03f1246e794ad4 - + https://github.com/dotnet/sdk - cc53b1bdc270f8d8be888169230532abdf07211d + 875ca080354cc902981af3a70d03f1246e794ad4 - + https://github.com/dotnet/sdk - cc53b1bdc270f8d8be888169230532abdf07211d + 875ca080354cc902981af3a70d03f1246e794ad4 diff --git a/eng/Versions.props b/eng/Versions.props index 7408efcc071f..617ebe7dbb98 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 9.0.100-preview.3.24156.51 - 9.0.100-preview.3.24156.51 - 9.0.100-preview.3.24156.51 + 9.0.100-preview.3.24157.9 + 9.0.100-preview.3.24157.9 + 9.0.100-preview.3.24157.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e27cdf1f906b831338e7cbeea9d8888126f9876b Mon Sep 17 00:00:00 2001 From: Jackson Schuster <36744439+jtschuster@users.noreply.github.com> Date: Thu, 7 Mar 2024 17:09:40 -0800 Subject: [PATCH 244/261] Exclude archive diff target on pgo leg --- src/SourceBuild/content/build.proj | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/SourceBuild/content/build.proj b/src/SourceBuild/content/build.proj index 3c9b997a8748..66ed6262b607 100644 --- a/src/SourceBuild/content/build.proj +++ b/src/SourceBuild/content/build.proj @@ -26,8 +26,7 @@ - - + Date: Thu, 7 Mar 2024 23:48:55 -0800 Subject: [PATCH 245/261] [main] Add -pr version of pipeline --- .vsts-pr.yml | 361 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 361 insertions(+) create mode 100644 .vsts-pr.yml diff --git a/.vsts-pr.yml b/.vsts-pr.yml new file mode 100644 index 000000000000..429c53be0639 --- /dev/null +++ b/.vsts-pr.yml @@ -0,0 +1,361 @@ +trigger: + batch: true + branches: + include: + - main + - master + - release/* + - internal/release/* + +variables: +- name: _PublishUsingPipelines + value: false +- ${{ if or(startswith(variables['Build.SourceBranch'], 'refs/heads/release/'), startswith(variables['Build.SourceBranch'], 'refs/heads/internal/release/'), eq(variables['Build.Reason'], 'Manual')) }}: + - name: PostBuildSign + value: false +- ${{ else }}: + - name: PostBuildSign + value: true +- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - name: Codeql.Enabled + value: true + - group: DotNet-DotNetCli-Storage + - group: DotNet-Installer-SDLValidation-Params + - name: _PublishUsingPipelines + value: true + +- name: _InternalRuntimeDownloadArgs + value: '' + +- ${{ if eq(variables['System.TeamProject'], 'internal') }}: + - group: DotNetBuilds storage account read tokens + - name: _InternalRuntimeDownloadArgs + value: /p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal + /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) + /p:dotnetbuilds-internal-container-read-token-base64=$(dotnetbuilds-internal-container-read-token-base64) + +- template: /eng/common/templates/variables/pool-providers.yml + +stages: +- stage: Build + jobs: + # This job is for build retry configuration. + - job: Publish_Build_Configuration + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + name: $(DncEngPublicBuildPool) + demands: ImageOverride -equals windows.vs2022preview.amd64.open + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: $(DncEngInternalBuildPool) + demands: ImageOverride -equals windows.vs2022preview.amd64 + steps: + - publish: $(Build.SourcesDirectory)\eng\buildConfiguration + artifact: buildConfiguration + displayName: Publish Build Config + + ## PR-only jobs + + - ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: + + ## Windows + + - template: eng/build.yml + parameters: + agentOs: Windows_NT + jobName: Build_Debug_x64 + buildConfiguration: Debug + buildArchitecture: x64 + additionalBuildParameters: '/p:PublishInternalAsset=true' + runTests: true + + ## Linux + + - template: eng/build.yml + parameters: + agentOs: Linux + jobName: Build_Ubuntu_22_04_Debug_x64 + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04' + buildConfiguration: Debug + buildArchitecture: x64 + linuxPortable: true + runTests: true + - template: eng/build.yml + parameters: + agentOs: Linux + jobName: Build_Fedora_39_Debug_x64 + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-39' + buildConfiguration: Debug + buildArchitecture: x64 + linuxPortable: true + runTests: true + - template: eng/build.yml + parameters: + agentOs: Linux + jobName: Build_CentOS_8_Stream_Debug_x64 + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8' + buildConfiguration: Debug + buildArchitecture: x64 + linuxPortable: false + runTests: true + - template: eng/build.yml + parameters: + agentOs: Linux + jobName: Build_Debian_11_Debug_x64 + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-amd64' + buildConfiguration: Debug + buildArchitecture: x64 + additionalBuildParameters: '/p:BuildSdkDeb=true' + linuxPortable: false + runTests: true + - template: eng/build.yml + parameters: + agentOs: Linux + jobName: Build_Arm64_Debug + buildConfiguration: Debug + buildArchitecture: arm64 + runtimeIdentifier: 'linux-arm64' + linuxPortable: true + # Never run tests on arm64 + runTests: false + - template: eng/build.yml + parameters: + agentOs: Linux + jobName: Build_Linux_musl_Debug_x64 + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.19-WithNode' + buildConfiguration: Debug + buildArchitecture: x64 + runtimeIdentifier: 'linux-musl-x64' + # Pass in HostOSName when running on alpine + additionalBuildParameters: '/p:HostOSName="linux-musl"' + linuxPortable: false + runTests: true + - template: eng/build.yml + parameters: + agentOs: Linux + jobName: Build_LinuxPortable_Release_x64 + buildConfiguration: Release + buildArchitecture: x64 + linuxPortable: true + runTests: true + + # MacOS + + - template: eng/build.yml + parameters: + agentOs: Darwin + jobName: Build_Release_x64 + buildConfiguration: Release + buildArchitecture: x64 + runTests: true + + ## Official/PGO instrumentation Builds + + - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + + ## Windows + + - template: eng/build.yml + parameters: + agentOs: Windows_NT + jobName: Build_Release_x64 + buildConfiguration: Release + buildArchitecture: x64 + additionalBuildParameters: '/p:PublishInternalAsset=true' + runTests: false + - template: eng/build.yml + parameters: + agentOs: Windows_NT + jobName: Build_Release_x86 + buildConfiguration: Release + buildArchitecture: x86 + runTests: false + - template: eng/build.yml + parameters: + agentOs: Windows_NT + jobName: Build_Release_arm64 + buildConfiguration: Release + buildArchitecture: arm64 + runTests: false + + ## Linux + + - template: eng/build.yml + parameters: + agentOs: Linux + jobName: Build_Arm_Release + buildConfiguration: Release + buildArchitecture: arm + runtimeIdentifier: 'linux-arm' + linuxPortable: true + runTests: false + - template: eng/build.yml + parameters: + agentOs: Linux + jobName: Build_Arm64_Release + buildConfiguration: Release + buildArchitecture: arm64 + runtimeIdentifier: 'linux-arm64' + linuxPortable: true + runTests: false + - template: eng/build.yml + parameters: + agentOs: Linux + jobName: Build_Linux_musl_Release_arm + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-cross-arm-alpine' + buildConfiguration: Release + buildArchitecture: arm + runtimeIdentifier: 'linux-musl-arm' + additionalBuildParameters: '/p:OSName="linux-musl"' + linuxPortable: false + runTests: false + - template: eng/build.yml + parameters: + agentOs: Linux + jobName: Build_Linux_musl_Release_arm64 + buildConfiguration: Release + buildArchitecture: arm64 + runtimeIdentifier: 'linux-musl-arm64' + additionalBuildParameters: '/p:OSName="linux-musl"' + linuxPortable: false + runTests: false + - template: eng/build.yml + parameters: + agentOs: Linux + jobName: Build_Linux_musl_Release_x64 + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.19-WithNode' + buildConfiguration: Release + buildArchitecture: x64 + runtimeIdentifier: 'linux-musl-x64' + # Pass in HostOSName when running on alpine + additionalBuildParameters: '/p:HostOSName="linux-musl"' + linuxPortable: false + runTests: false + - template: eng/build.yml + parameters: + agentOs: Linux + jobName: Build_Linux_Portable_Deb_Release_x64 + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-debpkg' + buildConfiguration: Release + buildArchitecture: x64 + # Do not publish zips and tarballs. The linux-x64 binaries are + # already published by Build_LinuxPortable_Release_x64 + additionalBuildParameters: '/p:PublishBinariesAndBadge=false /p:BuildSdkDeb=true' + linuxPortable: true + runTests: false + - template: eng/build.yml + parameters: + agentOs: Linux + jobName: Build_Linux_Portable_Rpm_Release_x64 + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-fpm' + buildConfiguration: Release + buildArchitecture: x64 + # Do not publish zips and tarballs. The linux-x64 binaries are + # already published by Build_LinuxPortable_Release_x64 + additionalBuildParameters: '/p:PublishBinariesAndBadge=false /p:IsRPMBasedDistro=true' + linuxPortable: true + runTests: false + - template: eng/build.yml + parameters: + agentOs: Linux + jobName: Build_Linux_Portable_Rpm_Release_Arm64 + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-fpm' + buildConfiguration: Release + buildArchitecture: arm64 + runtimeIdentifier: 'linux-arm64' + # Do not publish zips and tarballs. The linux-x64 binaries are + # already published by Build_LinuxPortable_Release_x64 + additionalBuildParameters: '/p:PublishBinariesAndBadge=false /p:CLIBUILD_SKIP_TESTS=true /p:IsRPMBasedDistro=true' + linuxPortable: true + runTests: false + - template: eng/build.yml + parameters: + agentOs: Linux + jobName: Build_LinuxPortable_Release_x64 + buildConfiguration: Release + buildArchitecture: x64 + linuxPortable: true + runTests: false + + # MacOS + + - template: eng/build.yml + parameters: + agentOs: Darwin + jobName: Build_Release_x64 + buildConfiguration: Release + buildArchitecture: x64 + runTests: false + - template: eng/build.yml + parameters: + agentOs: Darwin + jobName: Build_Release_arm64 + runtimeIdentifier: 'osx-arm64' + buildConfiguration: Release + buildArchitecture: arm64 + runTests: false + + ## Windows PGO Instrumentation builds + + - template: eng/build.yml + parameters: + agentOs: Windows_NT + pgoInstrument: true + jobName: Build_Release_x64 + buildConfiguration: Release + buildArchitecture: x64 + additionalBuildParameters: '/p:PublishInternalAsset=true' + runTests: false + - template: eng/build.yml + parameters: + agentOs: Windows_NT + pgoInstrument: true + jobName: Build_Release_x86 + buildConfiguration: Release + buildArchitecture: x86 + runTests: false + - template: eng/build.yml + parameters: + agentOs: Windows_NT + pgoInstrument: true + jobName: Build_Release_arm64 + buildConfiguration: Release + buildArchitecture: arm64 + runTests: false + + ## Linux PGO Instrumentation builds + + - template: eng/build.yml + parameters: + agentOs: Linux + pgoInstrument: true + jobName: Build_LinuxPortable_Release_x64 + buildConfiguration: Release + buildArchitecture: x64 + linuxPortable: true + runTests: false + + - template: eng/build.yml + parameters: + agentOs: Linux + pgoInstrument: true + jobName: Build_Release_arm64 + buildConfiguration: Release + buildArchitecture: arm64 + linuxPortable: true + runTests: false + + - template: /eng/common/templates/jobs/source-build.yml + +- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - stage: Publish + dependsOn: + - Build + jobs: + - template: /eng/common/templates/job/publish-build-assets.yml + parameters: + publishUsingPipelines: true + publishAssetsImmediately: true + pool: + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: $(DncEngInternalBuildPool) + demands: ImageOverride -equals windows.vs2022.amd64 From 360eff1732c18413e98999de2ae044ff28ffdf83 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Fri, 8 Mar 2024 09:32:47 -0600 Subject: [PATCH 246/261] Rebootstrap SB SDK/artifacts (#18763) --- src/SourceBuild/content/eng/Version.Details.xml | 4 ++-- src/SourceBuild/content/eng/Versions.props | 4 ++-- src/SourceBuild/content/global.json | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/SourceBuild/content/eng/Version.Details.xml b/src/SourceBuild/content/eng/Version.Details.xml index 94046ba35c0d..28584481bc08 100644 --- a/src/SourceBuild/content/eng/Version.Details.xml +++ b/src/SourceBuild/content/eng/Version.Details.xml @@ -3,9 +3,9 @@ - + https://github.com/dotnet/arcade - 2fb543a45580400a559b5ae41c96a815ea14dac5 + d5b02a4900c4d521cb48b8f0d7e3f28175268f7c
diff --git a/src/SourceBuild/content/eng/Versions.props b/src/SourceBuild/content/eng/Versions.props index 6f096b470882..9884e085c9c8 100644 --- a/src/SourceBuild/content/eng/Versions.props +++ b/src/SourceBuild/content/eng/Versions.props @@ -22,8 +22,8 @@ of a .NET major or minor release, prebuilts may be needed. When the release is mature, prebuilts are not necessary, and this property is removed from the file. --> - 9.0.100-preview.2.24104.1 - 9.0.100-preview.2.24104.1 + 9.0.100-preview.2.24154.1-1 + 9.0.100-preview.2.24154.1-1 15.7.179 diff --git a/src/SourceBuild/content/global.json b/src/SourceBuild/content/global.json index 593a57a50a20..8ef2585218a5 100644 --- a/src/SourceBuild/content/global.json +++ b/src/SourceBuild/content/global.json @@ -1,10 +1,10 @@ { "tools": { - "dotnet": "9.0.100-preview.2.24103.2" + "dotnet": "9.0.100-preview.2.24154.2" }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24102.4" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24114.1" } } From 3de6912d73771f9acf2d9ff91a70b4e7f3bc875d Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Fri, 8 Mar 2024 15:59:46 -0600 Subject: [PATCH 247/261] Enable parallel builds across repos of VMR (#18824) --- src/SourceBuild/content/Directory.Build.props | 1 - .../content/repo-projects/Directory.Build.props | 6 ++++++ .../content/repo-projects/Directory.Build.targets | 7 ++++++- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/SourceBuild/content/Directory.Build.props b/src/SourceBuild/content/Directory.Build.props index a9180ea4ea76..115646d298c4 100644 --- a/src/SourceBuild/content/Directory.Build.props +++ b/src/SourceBuild/content/Directory.Build.props @@ -146,7 +146,6 @@ false minimal - false .cmd .sh diff --git a/src/SourceBuild/content/repo-projects/Directory.Build.props b/src/SourceBuild/content/repo-projects/Directory.Build.props index 625cba36eab2..a45f7bd567be 100644 --- a/src/SourceBuild/content/repo-projects/Directory.Build.props +++ b/src/SourceBuild/content/repo-projects/Directory.Build.props @@ -5,6 +5,12 @@ $(MSBuildProjectName) $(GitInfoDir)$(RepositoryName).props + true + false + + true diff --git a/src/SourceBuild/content/repo-projects/Directory.Build.targets b/src/SourceBuild/content/repo-projects/Directory.Build.targets index 44cc7af061b5..f74f4d3ee2cf 100644 --- a/src/SourceBuild/content/repo-projects/Directory.Build.targets +++ b/src/SourceBuild/content/repo-projects/Directory.Build.targets @@ -297,7 +297,8 @@ + StopOnFirstFailure="true" + RunEachTargetSeparately="$(RunEachTargetSeparately)" /> + From bc2c1e7550056377dc04c68e6b22efc10fa5910e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 8 Mar 2024 22:37:42 +0000 Subject: [PATCH 248/261] [main] Update dependencies from dotnet/test-templates (#18927) [main] Update dependencies from dotnet/test-templates --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b75499e9eb4d..807fa04b0280 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -129,18 +129,18 @@ https://github.com/dotnet/test-templates becc4bd157cd6608b51a5ffe414a5d2de6330272 - + https://github.com/dotnet/test-templates - 36fdfebe8af73ed1c2ff796750984f1ebf6230b5 + b27ce8a9d5b1931cb91cbc20a16d15bd7231c792 - + https://github.com/dotnet/test-templates - 36fdfebe8af73ed1c2ff796750984f1ebf6230b5 + b27ce8a9d5b1931cb91cbc20a16d15bd7231c792 - + https://github.com/dotnet/test-templates - 36fdfebe8af73ed1c2ff796750984f1ebf6230b5 + b27ce8a9d5b1931cb91cbc20a16d15bd7231c792 diff --git a/eng/Versions.props b/eng/Versions.props index d726bff9cd8a..5ae001650f2d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,8 +63,8 @@ 1.1.0-rc.24069.1 1.1.0-rc.24069.1 - 1.1.0-rc.24151.1 - 1.1.0-rc.24151.1 + 1.1.0-rc.24158.2 + 1.1.0-rc.24158.2 From d758117295c9a261ee92cf960b46cc0f46b77fb2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 8 Mar 2024 22:38:01 +0000 Subject: [PATCH 249/261] [main] Update dependencies from dotnet/arcade (#18926) [main] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 +++++++------- eng/Versions.props | 2 +- eng/common/SetupNugetSources.ps1 | 26 +++++++++---------- .../job/source-index-stage1.yml | 2 +- .../steps/send-to-helix.yml | 6 +++-- .../templates-official/steps/source-build.yml | 2 ++ global.json | 4 +-- 7 files changed, 33 insertions(+), 29 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 807fa04b0280..7e5243489eb7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -243,17 +243,17 @@ - + https://github.com/dotnet/arcade - f1ef2a8544824e9f4395f88e6b453d6fc2826d72 + 2215d18d04a6565e9133c15ece7df7161fdf1e8e - + https://github.com/dotnet/arcade - f1ef2a8544824e9f4395f88e6b453d6fc2826d72 + 2215d18d04a6565e9133c15ece7df7161fdf1e8e - + https://github.com/dotnet/arcade - f1ef2a8544824e9f4395f88e6b453d6fc2826d72 + 2215d18d04a6565e9133c15ece7df7161fdf1e8e https://github.com/dotnet/arcade-services @@ -263,14 +263,14 @@ https://github.com/dotnet/arcade-services 049ed7fcb1a7038d20e160b798606c64f743058c - + https://github.com/dotnet/arcade - f1ef2a8544824e9f4395f88e6b453d6fc2826d72 + 2215d18d04a6565e9133c15ece7df7161fdf1e8e - + https://github.com/dotnet/arcade - f1ef2a8544824e9f4395f88e6b453d6fc2826d72 + 2215d18d04a6565e9133c15ece7df7161fdf1e8e diff --git a/eng/Versions.props b/eng/Versions.props index 5ae001650f2d..e7c833b8e654 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,7 +39,7 @@ - 9.0.0-beta.24156.2 + 9.0.0-beta.24157.3 diff --git a/eng/common/SetupNugetSources.ps1 b/eng/common/SetupNugetSources.ps1 index 6c65e81925f2..efa2fd72bfaa 100644 --- a/eng/common/SetupNugetSources.ps1 +++ b/eng/common/SetupNugetSources.ps1 @@ -35,7 +35,7 @@ Set-StrictMode -Version 2.0 . $PSScriptRoot\tools.ps1 # Add source entry to PackageSources -function AddPackageSource($sources, $SourceName, $SourceEndPoint, $creds, $Username, $Password) { +function AddPackageSource($sources, $SourceName, $SourceEndPoint, $creds, $Username, $pwd) { $packageSource = $sources.SelectSingleNode("add[@key='$SourceName']") if ($packageSource -eq $null) @@ -48,12 +48,11 @@ function AddPackageSource($sources, $SourceName, $SourceEndPoint, $creds, $Usern else { Write-Host "Package source $SourceName already present." } - - AddCredential -Creds $creds -Source $SourceName -Username $Username -Password $Password + AddCredential -Creds $creds -Source $SourceName -Username $Username -pwd $pwd } # Add a credential node for the specified source -function AddCredential($creds, $source, $username, $password) { +function AddCredential($creds, $source, $username, $pwd) { # Looks for credential configuration for the given SourceName. Create it if none is found. $sourceElement = $creds.SelectSingleNode($Source) if ($sourceElement -eq $null) @@ -82,17 +81,18 @@ function AddCredential($creds, $source, $username, $password) { $passwordElement.SetAttribute("key", "ClearTextPassword") $sourceElement.AppendChild($passwordElement) | Out-Null } - $passwordElement.SetAttribute("value", $Password) + + $passwordElement.SetAttribute("value", $pwd) } -function InsertMaestroPrivateFeedCredentials($Sources, $Creds, $Username, $Password) { +function InsertMaestroPrivateFeedCredentials($Sources, $Creds, $Username, $pwd) { $maestroPrivateSources = $Sources.SelectNodes("add[contains(@key,'darc-int')]") Write-Host "Inserting credentials for $($maestroPrivateSources.Count) Maestro's private feeds." ForEach ($PackageSource in $maestroPrivateSources) { Write-Host "`tInserting credential for Maestro's feed:" $PackageSource.Key - AddCredential -Creds $creds -Source $PackageSource.Key -Username $Username -Password $Password + AddCredential -Creds $creds -Source $PackageSource.Key -Username $Username -pwd $pwd } } @@ -144,13 +144,13 @@ if ($disabledSources -ne $null) { $userName = "dn-bot" # Insert credential nodes for Maestro's private feeds -InsertMaestroPrivateFeedCredentials -Sources $sources -Creds $creds -Username $userName -Password $Password +InsertMaestroPrivateFeedCredentials -Sources $sources -Creds $creds -Username $userName -pwd $Password # 3.1 uses a different feed url format so it's handled differently here $dotnet31Source = $sources.SelectSingleNode("add[@key='dotnet3.1']") if ($dotnet31Source -ne $null) { - AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v2" -Creds $creds -Username $userName -Password $Password - AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v2" -Creds $creds -Username $userName -Password $Password + AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v2" -Creds $creds -Username $userName -pwd $Password + AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v2" -Creds $creds -Username $userName -pwd $Password } $dotnetVersions = @('5','6','7','8') @@ -159,9 +159,9 @@ foreach ($dotnetVersion in $dotnetVersions) { $feedPrefix = "dotnet" + $dotnetVersion; $dotnetSource = $sources.SelectSingleNode("add[@key='$feedPrefix']") if ($dotnetSource -ne $null) { - AddPackageSource -Sources $sources -SourceName "$feedPrefix-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$feedPrefix-internal/nuget/v2" -Creds $creds -Username $userName -Password $Password - AddPackageSource -Sources $sources -SourceName "$feedPrefix-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$feedPrefix-internal-transport/nuget/v2" -Creds $creds -Username $userName -Password $Password + AddPackageSource -Sources $sources -SourceName "$feedPrefix-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$feedPrefix-internal/nuget/v2" -Creds $creds -Username $userName -pwd $Password + AddPackageSource -Sources $sources -SourceName "$feedPrefix-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$feedPrefix-internal-transport/nuget/v2" -Creds $creds -Username $userName -pwd $Password } } -$doc.Save($filename) +$doc.Save($filename) \ No newline at end of file diff --git a/eng/common/templates-official/job/source-index-stage1.yml b/eng/common/templates-official/job/source-index-stage1.yml index 757af7c7c4f2..53a9ef51fd82 100644 --- a/eng/common/templates-official/job/source-index-stage1.yml +++ b/eng/common/templates-official/job/source-index-stage1.yml @@ -1,6 +1,6 @@ parameters: runAsPublic: false - sourceIndexPackageVersion: 1.0.1-20231213.4 + sourceIndexPackageVersion: 1.0.1-20240129.2 sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci" preSteps: [] diff --git a/eng/common/templates-official/steps/send-to-helix.yml b/eng/common/templates-official/steps/send-to-helix.yml index 3eb7e2d5f840..68fa739c4ab2 100644 --- a/eng/common/templates-official/steps/send-to-helix.yml +++ b/eng/common/templates-official/steps/send-to-helix.yml @@ -5,6 +5,8 @@ parameters: HelixBuild: $(Build.BuildNumber) # required -- the build number Helix will use to identify this -- automatically set to the AzDO build number HelixTargetQueues: '' # required -- semicolon-delimited list of Helix queues to test on; see https://helix.dot.net/ for a list of queues HelixAccessToken: '' # required -- access token to make Helix API requests; should be provided by the appropriate variable group + HelixProjectPath: 'eng/common/helixpublish.proj' # optional -- path to the project file to build relative to BUILD_SOURCESDIRECTORY + HelixProjectArguments: '' # optional -- arguments passed to the build command HelixConfiguration: '' # optional -- additional property attached to a job HelixPreCommands: '' # optional -- commands to run before Helix work item execution HelixPostCommands: '' # optional -- commands to run after Helix work item execution @@ -29,7 +31,7 @@ parameters: continueOnError: false # optional -- determines whether to continue the build if the step errors; defaults to false steps: - - powershell: 'powershell "$env:BUILD_SOURCESDIRECTORY\eng\common\msbuild.ps1 $env:BUILD_SOURCESDIRECTORY\eng\common\helixpublish.proj /restore /p:TreatWarningsAsErrors=false /t:Test /bl:$env:BUILD_SOURCESDIRECTORY\artifacts\log\$env:BuildConfig\SendToHelix.binlog"' + - powershell: 'powershell "$env:BUILD_SOURCESDIRECTORY\eng\common\msbuild.ps1 $env:BUILD_SOURCESDIRECTORY/${{ parameters.HelixProjectPath }} /restore /p:TreatWarningsAsErrors=false ${{ parameters.HelixProjectArguments }} /t:Test /bl:$env:BUILD_SOURCESDIRECTORY\artifacts\log\$env:BuildConfig\SendToHelix.binlog"' displayName: ${{ parameters.DisplayNamePrefix }} (Windows) env: BuildConfig: $(_BuildConfig) @@ -59,7 +61,7 @@ steps: SYSTEM_ACCESSTOKEN: $(System.AccessToken) condition: and(${{ parameters.condition }}, eq(variables['Agent.Os'], 'Windows_NT')) continueOnError: ${{ parameters.continueOnError }} - - script: $BUILD_SOURCESDIRECTORY/eng/common/msbuild.sh $BUILD_SOURCESDIRECTORY/eng/common/helixpublish.proj /restore /p:TreatWarningsAsErrors=false /t:Test /bl:$BUILD_SOURCESDIRECTORY/artifacts/log/$BuildConfig/SendToHelix.binlog + - script: $BUILD_SOURCESDIRECTORY/eng/common/msbuild.sh $BUILD_SOURCESDIRECTORY/${{ parameters.HelixProjectPath }} /restore /p:TreatWarningsAsErrors=false ${{ parameters.HelixProjectArguments }} /t:Test /bl:$BUILD_SOURCESDIRECTORY/artifacts/log/$BuildConfig/SendToHelix.binlog displayName: ${{ parameters.DisplayNamePrefix }} (Unix) env: BuildConfig: $(_BuildConfig) diff --git a/eng/common/templates-official/steps/source-build.yml b/eng/common/templates-official/steps/source-build.yml index b1db70842f51..53ed57b6d48a 100644 --- a/eng/common/templates-official/steps/source-build.yml +++ b/eng/common/templates-official/steps/source-build.yml @@ -94,6 +94,8 @@ steps: $baseOsArgs \ /p:SourceBuildNonPortable=${{ parameters.platform.nonPortable }} \ /p:ArcadeBuildFromSource=true \ + /p:DotNetBuildSourceOnly=true \ + /p:DotNetBuildRepo=true \ /p:AssetManifestFileName=$assetManifestFileName displayName: Build diff --git a/global.json b/global.json index 8ace2326080d..26ac66e5c626 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "latest" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24156.2", - "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24156.2" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24157.3", + "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24157.3" } } From 1dce1914fcdd5e698281c6e4cc67e4b3cfab5c63 Mon Sep 17 00:00:00 2001 From: Jackson Schuster <36744439+jtschuster@users.noreply.github.com> Date: Sat, 9 Mar 2024 01:14:38 -0800 Subject: [PATCH 250/261] Build sdkArchiveDiff only when we'll run it (#18930) --- src/SourceBuild/content/eng/tools/init-build.proj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SourceBuild/content/eng/tools/init-build.proj b/src/SourceBuild/content/eng/tools/init-build.proj index a196b48cf9a8..f573747acaa8 100644 --- a/src/SourceBuild/content/eng/tools/init-build.proj +++ b/src/SourceBuild/content/eng/tools/init-build.proj @@ -118,7 +118,7 @@ + Condition="'$(ShortStack)' != 'true' and '$(PortableBuild)' == 'true' and '$(PgoInstrument)' != 'true'" > From 3885ddf0fffc7bb6bf966d745576f7e7bb4b63fe Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 9 Mar 2024 13:19:19 +0000 Subject: [PATCH 251/261] Update dependencies from https://github.com/dotnet/arcade build 20240308.3 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.XliffTasks From Version 9.0.0-beta.24157.3 -> To Version 9.0.0-beta.24158.3 --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 2 +- eng/common/templates-official/job/job.yml | 4 ++++ eng/common/templates/job/job.yml | 4 ++++ global.json | 4 ++-- 5 files changed, 21 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7e5243489eb7..b3850aad6f7c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -243,17 +243,17 @@ - + https://github.com/dotnet/arcade - 2215d18d04a6565e9133c15ece7df7161fdf1e8e + e91ff1729192ebae270f0d42502da51eeb853741 - + https://github.com/dotnet/arcade - 2215d18d04a6565e9133c15ece7df7161fdf1e8e + e91ff1729192ebae270f0d42502da51eeb853741 - + https://github.com/dotnet/arcade - 2215d18d04a6565e9133c15ece7df7161fdf1e8e + e91ff1729192ebae270f0d42502da51eeb853741 https://github.com/dotnet/arcade-services @@ -263,14 +263,14 @@ https://github.com/dotnet/arcade-services 049ed7fcb1a7038d20e160b798606c64f743058c - + https://github.com/dotnet/arcade - 2215d18d04a6565e9133c15ece7df7161fdf1e8e + e91ff1729192ebae270f0d42502da51eeb853741 - + https://github.com/dotnet/arcade - 2215d18d04a6565e9133c15ece7df7161fdf1e8e + e91ff1729192ebae270f0d42502da51eeb853741 diff --git a/eng/Versions.props b/eng/Versions.props index e7c833b8e654..958cc49772e5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,7 +39,7 @@ - 9.0.0-beta.24157.3 + 9.0.0-beta.24158.3 diff --git a/eng/common/templates-official/job/job.yml b/eng/common/templates-official/job/job.yml index 352607308fd5..1df0201243b8 100644 --- a/eng/common/templates-official/job/job.yml +++ b/eng/common/templates-official/job/job.yml @@ -15,6 +15,7 @@ parameters: timeoutInMinutes: '' variables: [] workspace: '' + templateContext: '' # Job base template specific parameters # See schema documentation - https://github.com/dotnet/arcade/blob/master/Documentation/AzureDevOps/TemplateSchema.md @@ -68,6 +69,9 @@ jobs: ${{ if ne(parameters.timeoutInMinutes, '') }}: timeoutInMinutes: ${{ parameters.timeoutInMinutes }} + ${{ if ne(parameters.templateContext, '') }}: + templateContext: ${{ parameters.templateContext }} + variables: - ${{ if ne(parameters.enableTelemetry, 'false') }}: - name: DOTNET_CLI_TELEMETRY_PROFILE diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index 01c0dd995e4b..a3277bf15c51 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -15,6 +15,7 @@ parameters: timeoutInMinutes: '' variables: [] workspace: '' + templateContext: '' # Job base template specific parameters # See schema documentation - https://github.com/dotnet/arcade/blob/master/Documentation/AzureDevOps/TemplateSchema.md @@ -68,6 +69,9 @@ jobs: ${{ if ne(parameters.timeoutInMinutes, '') }}: timeoutInMinutes: ${{ parameters.timeoutInMinutes }} + ${{ if ne(parameters.templateContext, '') }}: + templateContext: ${{ parameters.templateContext }} + variables: - ${{ if ne(parameters.enableTelemetry, 'false') }}: - name: DOTNET_CLI_TELEMETRY_PROFILE diff --git a/global.json b/global.json index 26ac66e5c626..51107f753705 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "latest" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24157.3", - "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24157.3" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24158.3", + "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24158.3" } } From 480bfefd5eba8b3d8f71f9bd378c4fdda0a6f5c7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 9 Mar 2024 13:30:40 +0000 Subject: [PATCH 252/261] Update dependencies from https://github.com/dotnet/source-build-externals build 20240308.2 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 9.0.0-alpha.1.24154.2 -> To Version 9.0.0-alpha.1.24158.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 7e5243489eb7..c06c0408a25d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -226,9 +226,9 @@ - + https://github.com/dotnet/source-build-externals - 60a35f5b8ce2839e56457164844d91fc89622c6a + 16ece46ae00dd1e8ac30a360d3dd03a6a682db41 From 232d2df252560690e936f80455db99c352926671 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 10 Mar 2024 09:48:30 +0100 Subject: [PATCH 253/261] [main] Update dependencies from dotnet/sdk (#18916) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: dotnet-maestro[bot] Co-authored-by: Alexander Köplinger Co-authored-by: Viktor Hofer --- eng/Version.Details.xml | 144 +++++++++--------- eng/Versions.props | 52 +++---- .../repo-projects/Directory.Build.targets | 14 +- 3 files changed, 106 insertions(+), 104 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7e5243489eb7..d9611706af78 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,41 +5,41 @@ Source-build uses transitive dependency resolution to determine correct build SHA of all product contributing repos. The order of dependencies is important and should not be modified without approval from dotnet/source-build-internal. --> - + https://github.com/dotnet/windowsdesktop - d6b074b0ab8aeb928bb93d258161ed16f31f85f2 + b99e2c1a4f585d84b1772d1f190750af70c0bf31 - + https://github.com/dotnet/windowsdesktop - d6b074b0ab8aeb928bb93d258161ed16f31f85f2 + b99e2c1a4f585d84b1772d1f190750af70c0bf31 - + https://github.com/dotnet/windowsdesktop - d6b074b0ab8aeb928bb93d258161ed16f31f85f2 + b99e2c1a4f585d84b1772d1f190750af70c0bf31 - + https://github.com/dotnet/windowsdesktop - d6b074b0ab8aeb928bb93d258161ed16f31f85f2 + b99e2c1a4f585d84b1772d1f190750af70c0bf31 - + https://github.com/dotnet/runtime - 8330db998659c4e6410aba370b37e4304a517a2b + da781b3aab1bc30793812bced4a6b64d2df31a9f - + https://github.com/dotnet/runtime - 8330db998659c4e6410aba370b37e4304a517a2b + da781b3aab1bc30793812bced4a6b64d2df31a9f - + https://github.com/dotnet/runtime - 8330db998659c4e6410aba370b37e4304a517a2b + da781b3aab1bc30793812bced4a6b64d2df31a9f - + https://github.com/dotnet/runtime - 8330db998659c4e6410aba370b37e4304a517a2b + da781b3aab1bc30793812bced4a6b64d2df31a9f - + https://github.com/dotnet/runtime - 8330db998659c4e6410aba370b37e4304a517a2b + da781b3aab1bc30793812bced4a6b64d2df31a9f @@ -47,70 +47,70 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 8330db998659c4e6410aba370b37e4304a517a2b + da781b3aab1bc30793812bced4a6b64d2df31a9f - + https://github.com/dotnet/runtime - 8330db998659c4e6410aba370b37e4304a517a2b + da781b3aab1bc30793812bced4a6b64d2df31a9f - + https://github.com/dotnet/aspnetcore - 449abac6f1ca12fa0ad557a872c219fcdfae09f3 + d9df235c2e6d41b65d8e860c5e209d9df8cbcae1 - + https://github.com/dotnet/aspnetcore - 449abac6f1ca12fa0ad557a872c219fcdfae09f3 + d9df235c2e6d41b65d8e860c5e209d9df8cbcae1 - + https://github.com/dotnet/aspnetcore - 449abac6f1ca12fa0ad557a872c219fcdfae09f3 + d9df235c2e6d41b65d8e860c5e209d9df8cbcae1 - + https://github.com/dotnet/aspnetcore - 449abac6f1ca12fa0ad557a872c219fcdfae09f3 + d9df235c2e6d41b65d8e860c5e209d9df8cbcae1 - + https://github.com/dotnet/aspnetcore - 449abac6f1ca12fa0ad557a872c219fcdfae09f3 + d9df235c2e6d41b65d8e860c5e209d9df8cbcae1 - + https://github.com/dotnet/aspnetcore - 449abac6f1ca12fa0ad557a872c219fcdfae09f3 + d9df235c2e6d41b65d8e860c5e209d9df8cbcae1 - + https://github.com/dotnet/aspnetcore - 449abac6f1ca12fa0ad557a872c219fcdfae09f3 + d9df235c2e6d41b65d8e860c5e209d9df8cbcae1 - + https://github.com/dotnet/aspnetcore - 449abac6f1ca12fa0ad557a872c219fcdfae09f3 + d9df235c2e6d41b65d8e860c5e209d9df8cbcae1 - + https://github.com/dotnet/sdk - 875ca080354cc902981af3a70d03f1246e794ad4 + 01dbe9e70a94ac6add230d4fa44ee2db93281e5d - + https://github.com/dotnet/sdk - 875ca080354cc902981af3a70d03f1246e794ad4 + 01dbe9e70a94ac6add230d4fa44ee2db93281e5d - + https://github.com/dotnet/sdk - 875ca080354cc902981af3a70d03f1246e794ad4 + 01dbe9e70a94ac6add230d4fa44ee2db93281e5d - + https://github.com/dotnet/sdk - 875ca080354cc902981af3a70d03f1246e794ad4 + 01dbe9e70a94ac6add230d4fa44ee2db93281e5d - + https://github.com/dotnet/sdk - 875ca080354cc902981af3a70d03f1246e794ad4 + 01dbe9e70a94ac6add230d4fa44ee2db93281e5d @@ -144,46 +144,46 @@ - + https://github.com/dotnet/winforms - 389c8da733c43105275cfc9f9bc482b144073880 + 5e635c56a80283b9ac444e7c9b1fee97eb748fc2 - + https://github.com/dotnet/wpf - a2c7547c602fe7dfbf8447a563b440d7449b6b6d + 4b071d5c6e72aa7c7874b6b8c435cc8ef9441621 - + https://github.com/dotnet/fsharp - 641c6a0e65bac6f7809e4e2415b9d60c11dcf493 + 661d88ab1975665fbe8c580e7e2dab01bf264c27 - + https://github.com/dotnet/fsharp - 641c6a0e65bac6f7809e4e2415b9d60c11dcf493 + 661d88ab1975665fbe8c580e7e2dab01bf264c27 - + https://github.com/microsoft/vstest - 39c7dd12c7ec24d0552513e84d95476f2077ca33 + 316167369cea59e0ad6ece2a39d94a3a6d49cf12 - + https://github.com/microsoft/vstest - 39c7dd12c7ec24d0552513e84d95476f2077ca33 + 316167369cea59e0ad6ece2a39d94a3a6d49cf12 - + https://github.com/dotnet/runtime - 8330db998659c4e6410aba370b37e4304a517a2b + da781b3aab1bc30793812bced4a6b64d2df31a9f - + https://github.com/dotnet/roslyn - d24b5bb8debd2e89df8db13c84694f2982cc41b1 + c7592906094bc8f16f7371d2fd59c5025d317b8a - + https://github.com/dotnet/roslyn - d24b5bb8debd2e89df8db13c84694f2982cc41b1 + c7592906094bc8f16f7371d2fd59c5025d317b8a @@ -196,23 +196,23 @@ 6f44380e4fdea6ddf5c11f48efeb25c2bf181e62 - + https://github.com/nuget/nuget.client - e49fa71580778b8d9c3352ea5ed15ef204f0389f + 309f2e302dff9e6ba8a2f48ddf28133d68ff7eae https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 94f048f4d194119ec20c8878790972fc3a83dc3b + a5f4de78fca42544771977f8e8e04c4aa83e1d02 - + https://github.com/dotnet/emsdk - 94f048f4d194119ec20c8878790972fc3a83dc3b + a5f4de78fca42544771977f8e8e04c4aa83e1d02 diff --git a/eng/Versions.props b/eng/Versions.props index e7c833b8e654..d73b3f914234 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,11 +47,11 @@ - 9.0.0-preview.3.24155.2 + 9.0.0-preview.3.24157.2 - 9.0.0-preview.3.24156.2 + 9.0.0-preview.3.24158.1 @@ -72,49 +72,49 @@ - 9.0.0-preview.3.24156.20 - 9.0.0-preview.3.24156.20 - 9.0.0-preview.3.24156.20 - 9.0.0-preview.3.24156.20 - 9.0.0-preview.3.24156.20 - 9.0.0-preview.3.24156.20 - 9.0.0-preview.3.24156.20 + 9.0.0-preview.3.24157.5 + 9.0.0-preview.3.24157.5 + 9.0.0-preview.3.24157.5 + 9.0.0-preview.3.24157.5 + 9.0.0-preview.3.24157.5 + 9.0.0-preview.3.24157.5 + 9.0.0-preview.3.24157.5 0.2.0 - 9.0.100-preview.3.24157.9 - 9.0.100-preview.3.24157.9 - 9.0.100-preview.3.24157.9 + 9.0.100-preview.3.24159.1 + 9.0.100-preview.3.24159.1 + 9.0.100-preview.3.24159.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.10.0-3.24156.11 + 4.10.0-3.24157.12 - 9.0.0-preview.3.24156.25 + 9.0.0-preview.3.24157.12 - 9.0.0-preview.3.24156.25 - 9.0.0-preview.3.24156.25 - 9.0.0-preview.3.24156.25 - 9.0.0-preview.3.24156.25 - 9.0.0-preview.3.24156.25 + 9.0.0-preview.3.24157.12 + 9.0.0-preview.3.24157.12 + 9.0.0-preview.3.24157.12 + 9.0.0-preview.3.24157.12 + 9.0.0-preview.3.24157.12 2.1.0 - 9.0.0-preview.3.24156.27 - 9.0.0-preview.3.24156.27 - 9.0.0-preview.3.24156.27 - 9.0.0-preview.3.24156.27 + 9.0.0-preview.3.24158.1 + 9.0.0-preview.3.24158.1 + 9.0.0-preview.3.24158.1 + 9.0.0-preview.3.24158.1 @@ -126,7 +126,7 @@ - 6.10.0-preview.2.73 + 6.10.0-preview.2.76 @@ -245,7 +245,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.10.0-preview-24126-02 + 17.10.0-preview-24158-02 9.0.0-alpha.1.24058.10 9.0.0-preview.24057.2 @@ -261,7 +261,7 @@ 14.2.9088-net9-p1 17.2.9088-net9-p1 - 9.0.0-preview.3.24155.2 + 9.0.0-preview.3.24156.3 $(MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportPackageVersion) 9.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-[A-z]*[\.]*\d*`)) diff --git a/src/SourceBuild/content/repo-projects/Directory.Build.targets b/src/SourceBuild/content/repo-projects/Directory.Build.targets index f74f4d3ee2cf..ea9f412235c0 100644 --- a/src/SourceBuild/content/repo-projects/Directory.Build.targets +++ b/src/SourceBuild/content/repo-projects/Directory.Build.targets @@ -93,12 +93,6 @@ <_CommonBuildSources Include="@(DependentRepoSourceName)" /> <_CommonBuildSources Include="$(ExtraSourcesNuGetSourceName)" Condition="'$(ExtraRestoreSourcePath)' != ''" /> - - - <_BuildSources Condition="'$(DotNetBuildSourceOnly)' == 'true'" - Include="$(PrebuiltNuGetSourceName);$(PreviouslySourceBuiltNuGetSourceName);$(ReferencePackagesNuGetSourceName)" /> - <_BuildSources Include="@(_CommonBuildSources)" /> - - + https://github.com/dotnet/windowsdesktop - b99e2c1a4f585d84b1772d1f190750af70c0bf31 + ff40a612f38ae132cc6d474dd18bc1cbe7fb2242 - + https://github.com/dotnet/windowsdesktop - b99e2c1a4f585d84b1772d1f190750af70c0bf31 + ff40a612f38ae132cc6d474dd18bc1cbe7fb2242 - + https://github.com/dotnet/windowsdesktop - b99e2c1a4f585d84b1772d1f190750af70c0bf31 + ff40a612f38ae132cc6d474dd18bc1cbe7fb2242 - + https://github.com/dotnet/windowsdesktop - b99e2c1a4f585d84b1772d1f190750af70c0bf31 + ff40a612f38ae132cc6d474dd18bc1cbe7fb2242 - + https://github.com/dotnet/runtime - da781b3aab1bc30793812bced4a6b64d2df31a9f + 82dac28143be0740d795f434db9b70f61b3b7a04 - + https://github.com/dotnet/runtime - da781b3aab1bc30793812bced4a6b64d2df31a9f + 82dac28143be0740d795f434db9b70f61b3b7a04 - + https://github.com/dotnet/runtime - da781b3aab1bc30793812bced4a6b64d2df31a9f + 82dac28143be0740d795f434db9b70f61b3b7a04 - + https://github.com/dotnet/runtime - da781b3aab1bc30793812bced4a6b64d2df31a9f + 82dac28143be0740d795f434db9b70f61b3b7a04 - + https://github.com/dotnet/runtime - da781b3aab1bc30793812bced4a6b64d2df31a9f + 82dac28143be0740d795f434db9b70f61b3b7a04 @@ -47,70 +47,70 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - da781b3aab1bc30793812bced4a6b64d2df31a9f + 82dac28143be0740d795f434db9b70f61b3b7a04 - + https://github.com/dotnet/runtime - da781b3aab1bc30793812bced4a6b64d2df31a9f + 82dac28143be0740d795f434db9b70f61b3b7a04 - + https://github.com/dotnet/aspnetcore - d9df235c2e6d41b65d8e860c5e209d9df8cbcae1 + b3b8dffff4d092058b2d8942268b498cbfdb14ec - + https://github.com/dotnet/aspnetcore - d9df235c2e6d41b65d8e860c5e209d9df8cbcae1 + b3b8dffff4d092058b2d8942268b498cbfdb14ec - + https://github.com/dotnet/aspnetcore - d9df235c2e6d41b65d8e860c5e209d9df8cbcae1 + b3b8dffff4d092058b2d8942268b498cbfdb14ec - + https://github.com/dotnet/aspnetcore - d9df235c2e6d41b65d8e860c5e209d9df8cbcae1 + b3b8dffff4d092058b2d8942268b498cbfdb14ec - + https://github.com/dotnet/aspnetcore - d9df235c2e6d41b65d8e860c5e209d9df8cbcae1 + b3b8dffff4d092058b2d8942268b498cbfdb14ec - + https://github.com/dotnet/aspnetcore - d9df235c2e6d41b65d8e860c5e209d9df8cbcae1 + b3b8dffff4d092058b2d8942268b498cbfdb14ec - + https://github.com/dotnet/aspnetcore - d9df235c2e6d41b65d8e860c5e209d9df8cbcae1 + b3b8dffff4d092058b2d8942268b498cbfdb14ec - + https://github.com/dotnet/aspnetcore - d9df235c2e6d41b65d8e860c5e209d9df8cbcae1 + b3b8dffff4d092058b2d8942268b498cbfdb14ec - + https://github.com/dotnet/sdk - 01dbe9e70a94ac6add230d4fa44ee2db93281e5d + 98269332ae63b089db82d8c3bcd39aa475b1945d - + https://github.com/dotnet/sdk - 01dbe9e70a94ac6add230d4fa44ee2db93281e5d + 98269332ae63b089db82d8c3bcd39aa475b1945d - + https://github.com/dotnet/sdk - 01dbe9e70a94ac6add230d4fa44ee2db93281e5d + 98269332ae63b089db82d8c3bcd39aa475b1945d - + https://github.com/dotnet/sdk - 01dbe9e70a94ac6add230d4fa44ee2db93281e5d + 98269332ae63b089db82d8c3bcd39aa475b1945d - + https://github.com/dotnet/sdk - 01dbe9e70a94ac6add230d4fa44ee2db93281e5d + 98269332ae63b089db82d8c3bcd39aa475b1945d @@ -144,13 +144,13 @@ - + https://github.com/dotnet/winforms - 5e635c56a80283b9ac444e7c9b1fee97eb748fc2 + bd6b531f3baf0db39cd301f2cfb0128381f37dab - + https://github.com/dotnet/wpf - 4b071d5c6e72aa7c7874b6b8c435cc8ef9441621 + 8dc0343c350d3b7736710cacb306790bde0394d0 https://github.com/dotnet/fsharp @@ -162,19 +162,19 @@ 661d88ab1975665fbe8c580e7e2dab01bf264c27 - + https://github.com/microsoft/vstest 316167369cea59e0ad6ece2a39d94a3a6d49cf12 - + https://github.com/microsoft/vstest 316167369cea59e0ad6ece2a39d94a3a6d49cf12 - + https://github.com/dotnet/runtime - da781b3aab1bc30793812bced4a6b64d2df31a9f + 82dac28143be0740d795f434db9b70f61b3b7a04 https://github.com/dotnet/roslyn @@ -196,9 +196,9 @@ 6f44380e4fdea6ddf5c11f48efeb25c2bf181e62 - + https://github.com/nuget/nuget.client - 309f2e302dff9e6ba8a2f48ddf28133d68ff7eae + 2fdd0d41e33c3354de2750fe154b56751a6682aa diff --git a/eng/Versions.props b/eng/Versions.props index d73b3f914234..8d8feb00146e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,11 +47,11 @@ - 9.0.0-preview.3.24157.2 + 9.0.0-preview.3.24158.3 - 9.0.0-preview.3.24158.1 + 9.0.0-preview.3.24158.3 @@ -72,22 +72,22 @@ - 9.0.0-preview.3.24157.5 - 9.0.0-preview.3.24157.5 - 9.0.0-preview.3.24157.5 - 9.0.0-preview.3.24157.5 - 9.0.0-preview.3.24157.5 - 9.0.0-preview.3.24157.5 - 9.0.0-preview.3.24157.5 + 9.0.0-preview.3.24158.2 + 9.0.0-preview.3.24158.2 + 9.0.0-preview.3.24158.2 + 9.0.0-preview.3.24158.2 + 9.0.0-preview.3.24158.2 + 9.0.0-preview.3.24158.2 + 9.0.0-preview.3.24158.2 0.2.0 - 9.0.100-preview.3.24159.1 - 9.0.100-preview.3.24159.1 - 9.0.100-preview.3.24159.1 + 9.0.100-preview.3.24160.1 + 9.0.100-preview.3.24160.1 + 9.0.100-preview.3.24160.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -98,23 +98,23 @@ - 9.0.0-preview.3.24157.12 + 9.0.0-preview.3.24159.6 - 9.0.0-preview.3.24157.12 - 9.0.0-preview.3.24157.12 - 9.0.0-preview.3.24157.12 - 9.0.0-preview.3.24157.12 - 9.0.0-preview.3.24157.12 + 9.0.0-preview.3.24159.6 + 9.0.0-preview.3.24159.6 + 9.0.0-preview.3.24159.6 + 9.0.0-preview.3.24159.6 + 9.0.0-preview.3.24159.6 2.1.0 - 9.0.0-preview.3.24158.1 - 9.0.0-preview.3.24158.1 - 9.0.0-preview.3.24158.1 - 9.0.0-preview.3.24158.1 + 9.0.0-preview.3.24159.2 + 9.0.0-preview.3.24159.2 + 9.0.0-preview.3.24159.2 + 9.0.0-preview.3.24159.2 @@ -126,7 +126,7 @@ - 6.10.0-preview.2.76 + 6.10.0-preview.2.78 @@ -245,7 +245,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.10.0-preview-24158-02 + 17.10.0-preview-24158-06 9.0.0-alpha.1.24058.10 9.0.0-preview.24057.2 From 4ffd0b4301a44802a3ad4f77a090fa3566292e86 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 10 Mar 2024 11:29:43 +0000 Subject: [PATCH 255/261] Update dependencies from https://github.com/dotnet/sdk build 20240310.2 Microsoft.SourceBuild.Intermediate.sdk , Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 9.0.100-preview.3.24159.1 -> To Version 9.0.100-preview.3.24160.2 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0,VS.Redist.Common.NetCore.SharedFramework.x64.9.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.9.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.Platforms,Microsoft.SourceBuild.Intermediate.runtime.linux-x64,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.SourceBuild.Intermediate.aspnetcore,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.Test.Sdk,Microsoft.SourceBuild.Intermediate.vstest,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.SourceBuild.Intermediate.roslyn,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64 From Version 9.0.0-preview.3.24158.1 -> To Version 9.0.0-preview.3.24159.2 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 8 ++++---- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6b1e2d4f0e3b..41d43a082744 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -91,26 +91,26 @@ b3b8dffff4d092058b2d8942268b498cbfdb14ec - + https://github.com/dotnet/sdk - 98269332ae63b089db82d8c3bcd39aa475b1945d + 2f074e5a6810a5e72fab2ae46258d8c39bcbdbaf - + https://github.com/dotnet/sdk - 98269332ae63b089db82d8c3bcd39aa475b1945d + 2f074e5a6810a5e72fab2ae46258d8c39bcbdbaf - + https://github.com/dotnet/sdk - 98269332ae63b089db82d8c3bcd39aa475b1945d + 2f074e5a6810a5e72fab2ae46258d8c39bcbdbaf - + https://github.com/dotnet/sdk - 98269332ae63b089db82d8c3bcd39aa475b1945d + 2f074e5a6810a5e72fab2ae46258d8c39bcbdbaf - + https://github.com/dotnet/sdk - 98269332ae63b089db82d8c3bcd39aa475b1945d + 2f074e5a6810a5e72fab2ae46258d8c39bcbdbaf @@ -176,14 +176,14 @@ https://github.com/dotnet/runtime 82dac28143be0740d795f434db9b70f61b3b7a04 - + https://github.com/dotnet/roslyn - c7592906094bc8f16f7371d2fd59c5025d317b8a + 026c96327b02c5ce4d3208f821e02d2ffa825312 - + https://github.com/dotnet/roslyn - c7592906094bc8f16f7371d2fd59c5025d317b8a + 026c96327b02c5ce4d3208f821e02d2ffa825312 diff --git a/eng/Versions.props b/eng/Versions.props index 8d8feb00146e..f1bb72f9a322 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,16 +85,16 @@ - 9.0.100-preview.3.24160.1 - 9.0.100-preview.3.24160.1 - 9.0.100-preview.3.24160.1 + 9.0.100-preview.3.24160.2 + 9.0.100-preview.3.24160.2 + 9.0.100-preview.3.24160.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.10.0-3.24157.12 + 4.10.0-3.24158.5 From a0e1b073c5c6da302e11d1056083ff0a5c95ab10 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 10 Mar 2024 12:17:48 +0000 Subject: [PATCH 256/261] Update dependencies from https://github.com/dotnet/arcade build 20240309.1 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.XliffTasks From Version 9.0.0-beta.24157.3 -> To Version 9.0.0-beta.24159.1 --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 2 +- global.json | 4 ++-- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b3850aad6f7c..7f1e84aa4544 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -243,17 +243,17 @@ - + https://github.com/dotnet/arcade - e91ff1729192ebae270f0d42502da51eeb853741 + f4538b1f8ff5ceb197aea509f3f61872b217b09e - + https://github.com/dotnet/arcade - e91ff1729192ebae270f0d42502da51eeb853741 + f4538b1f8ff5ceb197aea509f3f61872b217b09e - + https://github.com/dotnet/arcade - e91ff1729192ebae270f0d42502da51eeb853741 + f4538b1f8ff5ceb197aea509f3f61872b217b09e https://github.com/dotnet/arcade-services @@ -263,14 +263,14 @@ https://github.com/dotnet/arcade-services 049ed7fcb1a7038d20e160b798606c64f743058c - + https://github.com/dotnet/arcade - e91ff1729192ebae270f0d42502da51eeb853741 + f4538b1f8ff5ceb197aea509f3f61872b217b09e - + https://github.com/dotnet/arcade - e91ff1729192ebae270f0d42502da51eeb853741 + f4538b1f8ff5ceb197aea509f3f61872b217b09e diff --git a/eng/Versions.props b/eng/Versions.props index 958cc49772e5..8ffc9727630f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,7 +39,7 @@ - 9.0.0-beta.24158.3 + 9.0.0-beta.24159.1 diff --git a/global.json b/global.json index 51107f753705..ba1cfdb52d92 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "latest" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24158.3", - "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24158.3" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24159.1", + "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24159.1" } } From c8ba3d49896f85b330c72e58b3c0b2aaf32135fb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 10 Mar 2024 12:29:19 +0000 Subject: [PATCH 257/261] Update dependencies from https://github.com/dotnet/source-build-externals build 20240308.2 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 9.0.0-alpha.1.24154.2 -> To Version 9.0.0-alpha.1.24158.2 From e65e8cbbb4a6da73ff9050e85c4233a70869fb5e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 11 Mar 2024 03:11:26 +0000 Subject: [PATCH 258/261] Update dependencies from https://github.com/dotnet/sdk build 20240310.3 Microsoft.SourceBuild.Intermediate.sdk , Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 9.0.100-preview.3.24160.2 -> To Version 9.0.100-preview.3.24160.3 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0,VS.Redist.Common.NetCore.SharedFramework.x64.9.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.9.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.Platforms,Microsoft.SourceBuild.Intermediate.runtime.linux-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64 From Version 9.0.0-preview.3.24159.2 -> To Version 9.0.0-preview.3.24160.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 26 ++++++++-------- 2 files changed, 47 insertions(+), 47 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 032e118780a9..a26158b3fd52 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,41 +5,41 @@ Source-build uses transitive dependency resolution to determine correct build SHA of all product contributing repos. The order of dependencies is important and should not be modified without approval from dotnet/source-build-internal. --> - + https://github.com/dotnet/windowsdesktop - ff40a612f38ae132cc6d474dd18bc1cbe7fb2242 + 35941ed48463df7c601a2c6850d150685fa7de55 - + https://github.com/dotnet/windowsdesktop - ff40a612f38ae132cc6d474dd18bc1cbe7fb2242 + 35941ed48463df7c601a2c6850d150685fa7de55 - + https://github.com/dotnet/windowsdesktop - ff40a612f38ae132cc6d474dd18bc1cbe7fb2242 + 35941ed48463df7c601a2c6850d150685fa7de55 - + https://github.com/dotnet/windowsdesktop - ff40a612f38ae132cc6d474dd18bc1cbe7fb2242 + 35941ed48463df7c601a2c6850d150685fa7de55 - + https://github.com/dotnet/runtime - 82dac28143be0740d795f434db9b70f61b3b7a04 + 8bd4f6fe252395455969c7b3e76f40b36764c4a9 - + https://github.com/dotnet/runtime - 82dac28143be0740d795f434db9b70f61b3b7a04 + 8bd4f6fe252395455969c7b3e76f40b36764c4a9 - + https://github.com/dotnet/runtime - 82dac28143be0740d795f434db9b70f61b3b7a04 + 8bd4f6fe252395455969c7b3e76f40b36764c4a9 - + https://github.com/dotnet/runtime - 82dac28143be0740d795f434db9b70f61b3b7a04 + 8bd4f6fe252395455969c7b3e76f40b36764c4a9 - + https://github.com/dotnet/runtime - 82dac28143be0740d795f434db9b70f61b3b7a04 + 8bd4f6fe252395455969c7b3e76f40b36764c4a9 @@ -47,14 +47,14 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 82dac28143be0740d795f434db9b70f61b3b7a04 + 8bd4f6fe252395455969c7b3e76f40b36764c4a9 - + https://github.com/dotnet/runtime - 82dac28143be0740d795f434db9b70f61b3b7a04 + 8bd4f6fe252395455969c7b3e76f40b36764c4a9 @@ -91,26 +91,26 @@ b3b8dffff4d092058b2d8942268b498cbfdb14ec - + https://github.com/dotnet/sdk - 2f074e5a6810a5e72fab2ae46258d8c39bcbdbaf + 7ce3c17aa3a8eb6968038c3763865955116c3ec7 - + https://github.com/dotnet/sdk - 2f074e5a6810a5e72fab2ae46258d8c39bcbdbaf + 7ce3c17aa3a8eb6968038c3763865955116c3ec7 - + https://github.com/dotnet/sdk - 2f074e5a6810a5e72fab2ae46258d8c39bcbdbaf + 7ce3c17aa3a8eb6968038c3763865955116c3ec7 - + https://github.com/dotnet/sdk - 2f074e5a6810a5e72fab2ae46258d8c39bcbdbaf + 7ce3c17aa3a8eb6968038c3763865955116c3ec7 - + https://github.com/dotnet/sdk - 2f074e5a6810a5e72fab2ae46258d8c39bcbdbaf + 7ce3c17aa3a8eb6968038c3763865955116c3ec7 @@ -172,9 +172,9 @@ 316167369cea59e0ad6ece2a39d94a3a6d49cf12 - + https://github.com/dotnet/runtime - 82dac28143be0740d795f434db9b70f61b3b7a04 + 8bd4f6fe252395455969c7b3e76f40b36764c4a9 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 47e729459432..aa571292a9ae 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 9.0.100-preview.3.24160.2 - 9.0.100-preview.3.24160.2 - 9.0.100-preview.3.24160.2 + 9.0.100-preview.3.24160.3 + 9.0.100-preview.3.24160.3 + 9.0.100-preview.3.24160.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -98,23 +98,23 @@ - 9.0.0-preview.3.24159.6 + 9.0.0-preview.3.24160.2 - 9.0.0-preview.3.24159.6 - 9.0.0-preview.3.24159.6 - 9.0.0-preview.3.24159.6 - 9.0.0-preview.3.24159.6 - 9.0.0-preview.3.24159.6 + 9.0.0-preview.3.24160.2 + 9.0.0-preview.3.24160.2 + 9.0.0-preview.3.24160.2 + 9.0.0-preview.3.24160.2 + 9.0.0-preview.3.24160.2 2.1.0 - 9.0.0-preview.3.24159.2 - 9.0.0-preview.3.24159.2 - 9.0.0-preview.3.24159.2 - 9.0.0-preview.3.24159.2 + 9.0.0-preview.3.24160.1 + 9.0.0-preview.3.24160.1 + 9.0.0-preview.3.24160.1 + 9.0.0-preview.3.24160.1 From d14de7343c8941ee9effe2fb5871948fed3dc583 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 11 Mar 2024 04:17:32 +0000 Subject: [PATCH 259/261] Update dependencies from https://github.com/dotnet/sdk build 20240310.10 Microsoft.SourceBuild.Intermediate.sdk , Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 9.0.100-preview.3.24160.2 -> To Version 9.0.100-preview.3.24160.10 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0,VS.Redist.Common.NetCore.SharedFramework.x64.9.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.9.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.Platforms,Microsoft.SourceBuild.Intermediate.runtime.linux-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64 From Version 9.0.0-preview.3.24159.2 -> To Version 9.0.0-preview.3.24160.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a26158b3fd52..7f25dc108a2f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -91,26 +91,26 @@ b3b8dffff4d092058b2d8942268b498cbfdb14ec - + https://github.com/dotnet/sdk - 7ce3c17aa3a8eb6968038c3763865955116c3ec7 + 1d87b710796dc03b78c4d0b272e4edfd6d98d806 - + https://github.com/dotnet/sdk - 7ce3c17aa3a8eb6968038c3763865955116c3ec7 + 1d87b710796dc03b78c4d0b272e4edfd6d98d806 - + https://github.com/dotnet/sdk - 7ce3c17aa3a8eb6968038c3763865955116c3ec7 + 1d87b710796dc03b78c4d0b272e4edfd6d98d806 - + https://github.com/dotnet/sdk - 7ce3c17aa3a8eb6968038c3763865955116c3ec7 + 1d87b710796dc03b78c4d0b272e4edfd6d98d806 - + https://github.com/dotnet/sdk - 7ce3c17aa3a8eb6968038c3763865955116c3ec7 + 1d87b710796dc03b78c4d0b272e4edfd6d98d806 diff --git a/eng/Versions.props b/eng/Versions.props index aa571292a9ae..d98af6a0e658 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 9.0.100-preview.3.24160.3 - 9.0.100-preview.3.24160.3 - 9.0.100-preview.3.24160.3 + 9.0.100-preview.3.24160.10 + 9.0.100-preview.3.24160.10 + 9.0.100-preview.3.24160.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 7f1f93bed406e093faa115487277019a1798716c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 11 Mar 2024 06:21:40 +0000 Subject: [PATCH 260/261] Update dependencies from https://github.com/dotnet/sdk build 20240310.13 Microsoft.SourceBuild.Intermediate.sdk , Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 9.0.100-preview.3.24160.10 -> To Version 9.0.100-preview.3.24160.13 --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7f25dc108a2f..09c6e29f3099 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -91,26 +91,26 @@ b3b8dffff4d092058b2d8942268b498cbfdb14ec - + https://github.com/dotnet/sdk - 1d87b710796dc03b78c4d0b272e4edfd6d98d806 + 41f3e1a0b47228517565faf329c5b9730c5fbd6b - + https://github.com/dotnet/sdk - 1d87b710796dc03b78c4d0b272e4edfd6d98d806 + 41f3e1a0b47228517565faf329c5b9730c5fbd6b - + https://github.com/dotnet/sdk - 1d87b710796dc03b78c4d0b272e4edfd6d98d806 + 41f3e1a0b47228517565faf329c5b9730c5fbd6b - + https://github.com/dotnet/sdk - 1d87b710796dc03b78c4d0b272e4edfd6d98d806 + 41f3e1a0b47228517565faf329c5b9730c5fbd6b - + https://github.com/dotnet/sdk - 1d87b710796dc03b78c4d0b272e4edfd6d98d806 + 41f3e1a0b47228517565faf329c5b9730c5fbd6b diff --git a/eng/Versions.props b/eng/Versions.props index d98af6a0e658..f043ee7ba484 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 9.0.100-preview.3.24160.10 - 9.0.100-preview.3.24160.10 - 9.0.100-preview.3.24160.10 + 9.0.100-preview.3.24160.13 + 9.0.100-preview.3.24160.13 + 9.0.100-preview.3.24160.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 34ca14cb63aeed67f337d7295914300504d99b1e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 11 Mar 2024 08:49:15 +0000 Subject: [PATCH 261/261] Update dependencies from https://github.com/dotnet/sdk build 20240311.2 Microsoft.SourceBuild.Intermediate.sdk , Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 9.0.100-preview.3.24160.10 -> To Version 9.0.100-preview.3.24161.2 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.9.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.9.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.Platforms,Microsoft.SourceBuild.Intermediate.runtime.linux-x64,Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64 From Version 9.0.0-preview.3.24160.2 -> To Version 9.0.0-preview.3.24160.3 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 52 ++++++++++++++++++++--------------------- eng/Versions.props | 18 +++++++------- 2 files changed, 35 insertions(+), 35 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 09c6e29f3099..55d502d705c8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -21,25 +21,25 @@ https://github.com/dotnet/windowsdesktop 35941ed48463df7c601a2c6850d150685fa7de55 - + https://github.com/dotnet/runtime - 8bd4f6fe252395455969c7b3e76f40b36764c4a9 + 3eb8c7f1086b79b28a27b57a935f97be3b7fcccb - + https://github.com/dotnet/runtime - 8bd4f6fe252395455969c7b3e76f40b36764c4a9 + 3eb8c7f1086b79b28a27b57a935f97be3b7fcccb - + https://github.com/dotnet/runtime - 8bd4f6fe252395455969c7b3e76f40b36764c4a9 + 3eb8c7f1086b79b28a27b57a935f97be3b7fcccb - + https://github.com/dotnet/runtime - 8bd4f6fe252395455969c7b3e76f40b36764c4a9 + 3eb8c7f1086b79b28a27b57a935f97be3b7fcccb - + https://github.com/dotnet/runtime - 8bd4f6fe252395455969c7b3e76f40b36764c4a9 + 3eb8c7f1086b79b28a27b57a935f97be3b7fcccb @@ -47,14 +47,14 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 8bd4f6fe252395455969c7b3e76f40b36764c4a9 + 3eb8c7f1086b79b28a27b57a935f97be3b7fcccb - + https://github.com/dotnet/runtime - 8bd4f6fe252395455969c7b3e76f40b36764c4a9 + 3eb8c7f1086b79b28a27b57a935f97be3b7fcccb @@ -91,26 +91,26 @@ b3b8dffff4d092058b2d8942268b498cbfdb14ec - + https://github.com/dotnet/sdk - 41f3e1a0b47228517565faf329c5b9730c5fbd6b + 464e4b34f20df0eef957ef6b2c9c8eea23b415b6 - + https://github.com/dotnet/sdk - 41f3e1a0b47228517565faf329c5b9730c5fbd6b + 464e4b34f20df0eef957ef6b2c9c8eea23b415b6 - + https://github.com/dotnet/sdk - 41f3e1a0b47228517565faf329c5b9730c5fbd6b + 464e4b34f20df0eef957ef6b2c9c8eea23b415b6 - + https://github.com/dotnet/sdk - 41f3e1a0b47228517565faf329c5b9730c5fbd6b + 464e4b34f20df0eef957ef6b2c9c8eea23b415b6 - + https://github.com/dotnet/sdk - 41f3e1a0b47228517565faf329c5b9730c5fbd6b + 464e4b34f20df0eef957ef6b2c9c8eea23b415b6 @@ -172,9 +172,9 @@ 316167369cea59e0ad6ece2a39d94a3a6d49cf12 - + https://github.com/dotnet/runtime - 8bd4f6fe252395455969c7b3e76f40b36764c4a9 + 3eb8c7f1086b79b28a27b57a935f97be3b7fcccb https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index f043ee7ba484..c7474f4a5208 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 9.0.100-preview.3.24160.13 - 9.0.100-preview.3.24160.13 - 9.0.100-preview.3.24160.13 + 9.0.100-preview.3.24161.2 + 9.0.100-preview.3.24161.2 + 9.0.100-preview.3.24161.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -98,15 +98,15 @@ - 9.0.0-preview.3.24160.2 + 9.0.0-preview.3.24160.3 - 9.0.0-preview.3.24160.2 - 9.0.0-preview.3.24160.2 - 9.0.0-preview.3.24160.2 - 9.0.0-preview.3.24160.2 - 9.0.0-preview.3.24160.2 + 9.0.0-preview.3.24160.3 + 9.0.0-preview.3.24160.3 + 9.0.0-preview.3.24160.3 + 9.0.0-preview.3.24160.3 + 9.0.0-preview.3.24160.3 2.1.0