From 0472585a3cc18ffe39e6c60ab9afbaa408705849 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 4 Sep 2023 06:37:56 +0000 Subject: [PATCH 001/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230903.12 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.122-servicing.23425.21 -> To Version 6.0.123-servicing.23453.12 --- NuGet.config | 18 ++++++++++++++++++ eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 24 insertions(+), 6 deletions(-) diff --git a/NuGet.config b/NuGet.config index 115bd3427..00c55d9ae 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,20 +8,30 @@ + + + + + + + + + + @@ -42,16 +52,24 @@ + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 61a6f0917..3baf86c28 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 8d6c86fd918b96350521dc48dc996b6231616f0f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 851641e40c1191f339933987d6c1aac3837ce7f8 + 5c256633d1ecbdf0a252f0ae8a8f6ac80b1daeff - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 851641e40c1191f339933987d6c1aac3837ce7f8 + 5c256633d1ecbdf0a252f0ae8a8f6ac80b1daeff diff --git a/eng/Versions.props b/eng/Versions.props index 08cf8283c..13d348e0f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.122-servicing.23425.21 - 6.0.122-servicing.23425.21 + 6.0.123-servicing.23453.12 + 6.0.123-servicing.23453.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 2a16f1dc25a48f15ac9c12e162efba05189a0cad Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 4 Sep 2023 06:38:35 +0000 Subject: [PATCH 002/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230903.14 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.414-servicing.23425.32 -> To Version 6.0.415-servicing.23453.14 --- NuGet.config | 16 ++++++++++++++++ eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 22 insertions(+), 6 deletions(-) diff --git a/NuGet.config b/NuGet.config index 19715c85a..93ca57aa0 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,6 +8,8 @@ + + @@ -15,12 +17,18 @@ + + + + + + @@ -41,15 +49,23 @@ + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2dbb1a3e0..943621e2c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating ce2a08ace580a06ac3ea0291222f5e550c9f32b4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e15f4d6367b5030f0ae7f604e8f50bdc63c534a4 + 773c8fa80b99eb0c34ea2fef6f62b7b6c9572e16 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e15f4d6367b5030f0ae7f604e8f50bdc63c534a4 + 773c8fa80b99eb0c34ea2fef6f62b7b6c9572e16 diff --git a/eng/Versions.props b/eng/Versions.props index ff1a589ee..6b98cb91a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.414-servicing.23425.32 - 6.0.414-servicing.23425.32 + 6.0.415-servicing.23453.14 + 6.0.415-servicing.23453.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 6807af5fa294b3bf54bb69d11109e9708f731802 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 4 Sep 2023 06:38:49 +0000 Subject: [PATCH 003/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230903.13 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.317-servicing.23425.24 -> To Version 6.0.318-servicing.23453.13 --- NuGet.config | 16 ++++++++++++++++ eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 22 insertions(+), 6 deletions(-) diff --git a/NuGet.config b/NuGet.config index e250238a3..5ab3f8a77 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,6 +8,8 @@ + + @@ -15,12 +17,18 @@ + + + + + + @@ -41,14 +49,22 @@ + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1f5ca2132..0b56af244 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 1f521522b17430e3760fd09760e77822b0bd891b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - da716438f260441518b4f7d9962ced9814769669 + 9acb30f9c8cdf9cdaeb015bcd3060ae5f47593d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - da716438f260441518b4f7d9962ced9814769669 + 9acb30f9c8cdf9cdaeb015bcd3060ae5f47593d7 diff --git a/eng/Versions.props b/eng/Versions.props index c09ac1668..382b65062 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.317-servicing.23425.24 - 6.0.317-servicing.23425.24 + 6.0.318-servicing.23453.13 + 6.0.318-servicing.23453.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 8e50270c0263caf58a2ddbfb433d79bd13269608 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 5 Sep 2023 22:18:53 +0000 Subject: [PATCH 004/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230905.22 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.414-servicing.23425.32 -> To Version 6.0.415-servicing.23455.22 --- 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 943621e2c..e04961481 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating ce2a08ace580a06ac3ea0291222f5e550c9f32b4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 773c8fa80b99eb0c34ea2fef6f62b7b6c9572e16 + 28c87748d7a868cf2c76751dff51c86986daa119 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 773c8fa80b99eb0c34ea2fef6f62b7b6c9572e16 + 28c87748d7a868cf2c76751dff51c86986daa119 diff --git a/eng/Versions.props b/eng/Versions.props index 6b98cb91a..0626526a0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.415-servicing.23453.14 - 6.0.415-servicing.23453.14 + 6.0.415-servicing.23455.22 + 6.0.415-servicing.23455.22 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 73452f5f4a13217b91365404a1678666468819e5 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 12 Sep 2023 22:08:31 +0000 Subject: [PATCH 005/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230912.23 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.414-servicing.23425.32 -> To Version 6.0.415-servicing.23462.23 --- NuGet.config | 6 ------ eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index 93ca57aa0..44835ce43 100644 --- a/NuGet.config +++ b/NuGet.config @@ -16,9 +16,6 @@ - - - @@ -54,9 +51,6 @@ - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e04961481..34c1303e2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating ce2a08ace580a06ac3ea0291222f5e550c9f32b4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 28c87748d7a868cf2c76751dff51c86986daa119 + 8e1ee785d23839ac8aaa6342c18b3e54dadfe455 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 28c87748d7a868cf2c76751dff51c86986daa119 + 8e1ee785d23839ac8aaa6342c18b3e54dadfe455 diff --git a/eng/Versions.props b/eng/Versions.props index 0626526a0..6e3c23478 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.415-servicing.23455.22 - 6.0.415-servicing.23455.22 + 6.0.415-servicing.23462.23 + 6.0.415-servicing.23462.23 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 2f6d09c852b2fe4f1e827f8bff45f04befaaa70f Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 14 Sep 2023 02:48:53 +0000 Subject: [PATCH 006/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230912.22 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.123-servicing.23453.12 -> To Version 6.0.123-servicing.23462.22 --- NuGet.config | 6 ------ eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index 00c55d9ae..43371bd5f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,9 +19,6 @@ - - - @@ -59,9 +56,6 @@ - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3baf86c28..619dddbef 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 8d6c86fd918b96350521dc48dc996b6231616f0f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5c256633d1ecbdf0a252f0ae8a8f6ac80b1daeff + d9c5308277f68802debb61ac8ac4bd461c64f8ff - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5c256633d1ecbdf0a252f0ae8a8f6ac80b1daeff + d9c5308277f68802debb61ac8ac4bd461c64f8ff diff --git a/eng/Versions.props b/eng/Versions.props index 13d348e0f..492f3420b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.123-servicing.23453.12 - 6.0.123-servicing.23453.12 + 6.0.123-servicing.23462.22 + 6.0.123-servicing.23462.22 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 6264b298a6d14bf72f590d440ec049b6d21c9197 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 14 Sep 2023 02:54:58 +0000 Subject: [PATCH 007/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230912.21 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.318-servicing.23453.13 -> To Version 6.0.318-servicing.23462.21 --- NuGet.config | 6 ------ eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index 5ab3f8a77..0aa32e6a4 100644 --- a/NuGet.config +++ b/NuGet.config @@ -16,9 +16,6 @@ - - - @@ -54,9 +51,6 @@ - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0b56af244..753126b6f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 1f521522b17430e3760fd09760e77822b0bd891b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9acb30f9c8cdf9cdaeb015bcd3060ae5f47593d7 + bde28e9622b697cba0e61f43849b5de4f0e98347 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9acb30f9c8cdf9cdaeb015bcd3060ae5f47593d7 + bde28e9622b697cba0e61f43849b5de4f0e98347 diff --git a/eng/Versions.props b/eng/Versions.props index 382b65062..8e263f8b6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.318-servicing.23453.13 - 6.0.318-servicing.23453.13 + 6.0.318-servicing.23462.21 + 6.0.318-servicing.23462.21 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 15eea5a29ab3cc5df81f3ed7d7f25c3f95064d15 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 14 Sep 2023 03:43:17 +0000 Subject: [PATCH 008/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230913.46 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.415-servicing.23462.23 -> To Version 6.0.415-servicing.23463.46 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,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,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64 From Version 6.0.22 -> To Version 6.0.23 (parent: Microsoft.NET.Sdk --- NuGet.config | 26 ++++--------- eng/Version.Details.xml | 84 ++++++++++++++++++++--------------------- eng/Versions.props | 40 ++++++++++---------- 3 files changed, 70 insertions(+), 80 deletions(-) diff --git a/NuGet.config b/NuGet.config index 44835ce43..6a25c9a80 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,25 +7,20 @@ - - - + + - - - + - - - + @@ -46,21 +41,16 @@ - - - + + - - - + - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 34c1303e2..06f1f3e46 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 017f84465cd8eb56c666ad1e6872d4fc23cec288 + cfe8d97fc70cdbd7558f051c9223ca89be77df54 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 017f84465cd8eb56c666ad1e6872d4fc23cec288 + cfe8d97fc70cdbd7558f051c9223ca89be77df54 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 017f84465cd8eb56c666ad1e6872d4fc23cec288 + cfe8d97fc70cdbd7558f051c9223ca89be77df54 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 017f84465cd8eb56c666ad1e6872d4fc23cec288 + cfe8d97fc70cdbd7558f051c9223ca89be77df54 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd + ca8b53290abed6b00ae7a9cc331fbc69bc06026c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd + ca8b53290abed6b00ae7a9cc331fbc69bc06026c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd + ca8b53290abed6b00ae7a9cc331fbc69bc06026c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd + ca8b53290abed6b00ae7a9cc331fbc69bc06026c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd + ca8b53290abed6b00ae7a9cc331fbc69bc06026c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd + ca8b53290abed6b00ae7a9cc331fbc69bc06026c @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime a08d9ce2caf02455c0b825bcdc32974bdf769a80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 564969bca155b40432d101ec35f24a0e81e6afa0 + e99084eedfdb1a3d2d99951ae0748c2b5f468358 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 564969bca155b40432d101ec35f24a0e81e6afa0 + e99084eedfdb1a3d2d99951ae0748c2b5f468358 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 564969bca155b40432d101ec35f24a0e81e6afa0 + e99084eedfdb1a3d2d99951ae0748c2b5f468358 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 564969bca155b40432d101ec35f24a0e81e6afa0 + e99084eedfdb1a3d2d99951ae0748c2b5f468358 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 564969bca155b40432d101ec35f24a0e81e6afa0 + e99084eedfdb1a3d2d99951ae0748c2b5f468358 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 564969bca155b40432d101ec35f24a0e81e6afa0 + e99084eedfdb1a3d2d99951ae0748c2b5f468358 https://github.com/dotnet/test-templates @@ -90,27 +90,27 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - ce2a08ace580a06ac3ea0291222f5e550c9f32b4 + ba8fbae6f29754311fcf890aad8bb00820c3b65e - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - ce2a08ace580a06ac3ea0291222f5e550c9f32b4 + ba8fbae6f29754311fcf890aad8bb00820c3b65e - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - ce2a08ace580a06ac3ea0291222f5e550c9f32b4 + ba8fbae6f29754311fcf890aad8bb00820c3b65e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8e1ee785d23839ac8aaa6342c18b3e54dadfe455 + c9240dd9140b5117632d40de3f3cf980ff83c6ea - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8e1ee785d23839ac8aaa6342c18b3e54dadfe455 + c9240dd9140b5117632d40de3f3cf980ff83c6ea diff --git a/eng/Versions.props b/eng/Versions.props index 6e3c23478..a7d420344 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.414 + 6.0.415 @@ -44,20 +44,20 @@ - 6.0.22 - 6.0.22 - 6.0.22-servicing.23424.15 - 6.0.22-servicing.23424.15 - 6.0.22-servicing.23424.15 - 6.0.22-servicing.23424.15 + 6.0.23 + 6.0.23 + 6.0.23-servicing.23463.13 + 6.0.23-servicing.23463.13 + 6.0.23-servicing.23463.13 + 6.0.23-servicing.23463.13 0.2.0 - 6.0.415-servicing.23462.23 - 6.0.415-servicing.23462.23 + 6.0.415-servicing.23463.46 + 6.0.415-servicing.23463.46 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,20 +68,20 @@ - 6.0.22-servicing.23424.25 - 6.0.22-servicing.23424.25 - 6.0.22 - 6.0.22 - 6.0.22 - 6.0.22 + 6.0.23-servicing.23463.4 + 6.0.23-servicing.23463.4 + 6.0.23 + 6.0.23 + 6.0.23 + 6.0.23 2.1.0 - 6.0.22-servicing.23425.2 - 6.0.22-servicing.23425.2 - 6.0.22 - 6.0.22 + 6.0.23-servicing.23462.4 + 6.0.23-servicing.23462.4 + 6.0.23 + 6.0.23 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.414 + 6.0.415 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) From 9ab857dce44ebdd4e8dac1d3dff49589e9424e29 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 14 Sep 2023 07:42:20 +0000 Subject: [PATCH 009/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230913.60 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.415-servicing.23462.23 -> To Version 6.0.415-servicing.23463.60 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,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,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 6.0.22 -> To Version 6.0.23 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 10 +++++----- 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6a25c9a80..42aed78b7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -17,10 +17,10 @@ - + - + @@ -47,10 +47,10 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 06f1f3e46..b9d845f88 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - cfe8d97fc70cdbd7558f051c9223ca89be77df54 + df6cc30b54e470fdfee7d71e714f7f1432ace282 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - cfe8d97fc70cdbd7558f051c9223ca89be77df54 + df6cc30b54e470fdfee7d71e714f7f1432ace282 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - cfe8d97fc70cdbd7558f051c9223ca89be77df54 + df6cc30b54e470fdfee7d71e714f7f1432ace282 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - cfe8d97fc70cdbd7558f051c9223ca89be77df54 + df6cc30b54e470fdfee7d71e714f7f1432ace282 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -92,34 +92,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - ba8fbae6f29754311fcf890aad8bb00820c3b65e + 5cebb8cd49c5bcf087cae0368c1f610d4dfec0f6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - ba8fbae6f29754311fcf890aad8bb00820c3b65e + 5cebb8cd49c5bcf087cae0368c1f610d4dfec0f6 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - ba8fbae6f29754311fcf890aad8bb00820c3b65e + 5cebb8cd49c5bcf087cae0368c1f610d4dfec0f6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c9240dd9140b5117632d40de3f3cf980ff83c6ea + 4f50f5dd1cc48971bca7be3d95195a8e6e32e97f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c9240dd9140b5117632d40de3f3cf980ff83c6ea + 4f50f5dd1cc48971bca7be3d95195a8e6e32e97f https://dev.azure.com/dnceng/internal/_git/dotnet-winforms 53190af510e57c1c146bd8a23725509771a42ae0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - f501934867fd4723518c1c7b03c6033c2e52ecad + a6196493264b681cd16a58b74d3da84811386fa9 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index a7d420344..15bf289fe 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,7 +27,7 @@ - 6.0.22-servicing.23425.2 + 6.0.23-servicing.23431.6 @@ -56,8 +56,8 @@ - 6.0.415-servicing.23463.46 - 6.0.415-servicing.23463.46 + 6.0.415-servicing.23463.60 + 6.0.415-servicing.23463.60 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.23-servicing.23462.4 - 6.0.23-servicing.23462.4 + 6.0.23-servicing.23463.2 + 6.0.23-servicing.23463.2 6.0.23 6.0.23 From 0ed8d7158da8b13d00756a37c1dd29dbe34bf93c Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 14 Sep 2023 17:35:45 +0000 Subject: [PATCH 010/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230914.19 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.415-servicing.23462.23 -> To Version 6.0.415-servicing.23464.19 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,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,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 6.0.22 -> To Version 6.0.23 (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 42aed78b7..51e6e1dd2 100644 --- a/NuGet.config +++ b/NuGet.config @@ -20,7 +20,7 @@ - + @@ -50,7 +50,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b9d845f88..18a39cefc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - df6cc30b54e470fdfee7d71e714f7f1432ace282 + 0c1d005f46ba43bf07b6ce16deef9d8bd113ac6d - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - df6cc30b54e470fdfee7d71e714f7f1432ace282 + 0c1d005f46ba43bf07b6ce16deef9d8bd113ac6d - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - df6cc30b54e470fdfee7d71e714f7f1432ace282 + 0c1d005f46ba43bf07b6ce16deef9d8bd113ac6d https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - df6cc30b54e470fdfee7d71e714f7f1432ace282 + 0c1d005f46ba43bf07b6ce16deef9d8bd113ac6d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 5cebb8cd49c5bcf087cae0368c1f610d4dfec0f6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4f50f5dd1cc48971bca7be3d95195a8e6e32e97f + 0bb452bba5d0d1a2378193fe763df581dc76339c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4f50f5dd1cc48971bca7be3d95195a8e6e32e97f + 0bb452bba5d0d1a2378193fe763df581dc76339c - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 53190af510e57c1c146bd8a23725509771a42ae0 + 4c9c993698c298801739cd2dc25efa7ffe700bde - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - a6196493264b681cd16a58b74d3da84811386fa9 + 823450756bc26a13c44a96ea190c46a77c526e04 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 15bf289fe..9e34a774c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.22-servicing.23424.7 + 6.0.23-servicing.23463.14 - 6.0.23-servicing.23431.6 + 6.0.23-servicing.23463.7 @@ -56,8 +56,8 @@ - 6.0.415-servicing.23463.60 - 6.0.415-servicing.23463.60 + 6.0.415-servicing.23464.19 + 6.0.415-servicing.23464.19 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.23-servicing.23463.2 - 6.0.23-servicing.23463.2 + 6.0.23-servicing.23463.6 + 6.0.23-servicing.23463.6 6.0.23 6.0.23 From 5e9c53ca9843e83de00382b2ef3919e5feb162c8 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 14 Sep 2023 18:51:18 +0000 Subject: [PATCH 011/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230914.25 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.415-servicing.23462.23 -> To Version 6.0.415-servicing.23464.25 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,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,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 6.0.22 -> To Version 6.0.23 (parent: Microsoft.NET.Sdk --- 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 18a39cefc..9e6b3d96f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 5cebb8cd49c5bcf087cae0368c1f610d4dfec0f6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0bb452bba5d0d1a2378193fe763df581dc76339c + 338ab1c7fe914679dbaf78e77bb3afd2e95ee977 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0bb452bba5d0d1a2378193fe763df581dc76339c + 338ab1c7fe914679dbaf78e77bb3afd2e95ee977 diff --git a/eng/Versions.props b/eng/Versions.props index 9e34a774c..35c9af552 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.415-servicing.23464.19 - 6.0.415-servicing.23464.19 + 6.0.415-servicing.23464.25 + 6.0.415-servicing.23464.25 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 92ad507114beeed3498c701226cfb51ad0d6150d Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 14 Sep 2023 18:56:53 +0000 Subject: [PATCH 012/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230913.39 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.123-servicing.23462.22 -> To Version 6.0.123-servicing.23463.39 --- NuGet.config | 6 ------ eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index 43371bd5f..23ba19292 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,9 +7,6 @@ - - - @@ -49,9 +46,6 @@ - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 619dddbef..39662e8fc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 8d6c86fd918b96350521dc48dc996b6231616f0f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d9c5308277f68802debb61ac8ac4bd461c64f8ff + fed074bfef604d5f67899afc6fb0de02e7c6a2a0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d9c5308277f68802debb61ac8ac4bd461c64f8ff + fed074bfef604d5f67899afc6fb0de02e7c6a2a0 diff --git a/eng/Versions.props b/eng/Versions.props index 492f3420b..4fe623fed 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.123-servicing.23462.22 - 6.0.123-servicing.23462.22 + 6.0.123-servicing.23463.39 + 6.0.123-servicing.23463.39 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 51732351f8a3bd64900a0717a6d5aa8bf61debcd Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 14 Sep 2023 18:57:03 +0000 Subject: [PATCH 013/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230913.62 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.123-servicing.23463.39 -> To Version 6.0.123-servicing.23463.62 --- 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 39662e8fc..ec2ff9b6d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 8d6c86fd918b96350521dc48dc996b6231616f0f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fed074bfef604d5f67899afc6fb0de02e7c6a2a0 + 34dae02869c41c62b903e6bf5500e3b9700ee109 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fed074bfef604d5f67899afc6fb0de02e7c6a2a0 + 34dae02869c41c62b903e6bf5500e3b9700ee109 diff --git a/eng/Versions.props b/eng/Versions.props index 4fe623fed..1fe8a79c1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.123-servicing.23463.39 - 6.0.123-servicing.23463.39 + 6.0.123-servicing.23463.62 + 6.0.123-servicing.23463.62 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 71a11c4cd6aaf066daf00c0d0aba44c4049ceb61 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 14 Sep 2023 18:57:13 +0000 Subject: [PATCH 014/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230914.17 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.123-servicing.23463.62 -> To Version 6.0.123-servicing.23464.17 --- 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 ec2ff9b6d..4b60b97df 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 8d6c86fd918b96350521dc48dc996b6231616f0f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 34dae02869c41c62b903e6bf5500e3b9700ee109 + 032c9e965aeffd655a34694a7eeb75928fdc3e70 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 34dae02869c41c62b903e6bf5500e3b9700ee109 + 032c9e965aeffd655a34694a7eeb75928fdc3e70 diff --git a/eng/Versions.props b/eng/Versions.props index 1fe8a79c1..cb3164c22 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.123-servicing.23463.62 - 6.0.123-servicing.23463.62 + 6.0.123-servicing.23464.17 + 6.0.123-servicing.23464.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 2bb9c0c7c92b527f023e1ab1f142ec4d617cdf72 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 14 Sep 2023 18:57:23 +0000 Subject: [PATCH 015/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230914.24 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.123-servicing.23464.17 -> To Version 6.0.123-servicing.23464.24 --- 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 4b60b97df..e888d0d48 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 8d6c86fd918b96350521dc48dc996b6231616f0f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 032c9e965aeffd655a34694a7eeb75928fdc3e70 + 06dd1875ed36ef4e2f4a51d5f3b2e8bb41c94fd2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 032c9e965aeffd655a34694a7eeb75928fdc3e70 + 06dd1875ed36ef4e2f4a51d5f3b2e8bb41c94fd2 diff --git a/eng/Versions.props b/eng/Versions.props index cb3164c22..9c963fe06 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.123-servicing.23464.17 - 6.0.123-servicing.23464.17 + 6.0.123-servicing.23464.24 + 6.0.123-servicing.23464.24 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e07c6667fcf27f1bfe5386419d23ff7e3cef9cdf Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 14 Sep 2023 18:57:33 +0000 Subject: [PATCH 016/535] Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,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,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.6.0,Microsoft.NET.Workload.Emscripten.Manifest-6.0.100 From Version 6.0.22 -> To Version 6.0.23 (parent: Microsoft.NET.Sdk --- NuGet.config | 24 +++++------ eng/Version.Details.xml | 88 ++++++++++++++++++++--------------------- eng/Versions.props | 42 ++++++++++---------- 3 files changed, 74 insertions(+), 80 deletions(-) diff --git a/NuGet.config b/NuGet.config index 23ba19292..ff90ea0d7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,25 +7,21 @@ + - - - + + - - - + - - - + @@ -46,19 +42,17 @@ + + - - - + - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e888d0d48..eccf1968a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 017f84465cd8eb56c666ad1e6872d4fc23cec288 + 0c1d005f46ba43bf07b6ce16deef9d8bd113ac6d - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 017f84465cd8eb56c666ad1e6872d4fc23cec288 + 0c1d005f46ba43bf07b6ce16deef9d8bd113ac6d - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 017f84465cd8eb56c666ad1e6872d4fc23cec288 + 0c1d005f46ba43bf07b6ce16deef9d8bd113ac6d - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 017f84465cd8eb56c666ad1e6872d4fc23cec288 + 0c1d005f46ba43bf07b6ce16deef9d8bd113ac6d - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd + ca8b53290abed6b00ae7a9cc331fbc69bc06026c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd + ca8b53290abed6b00ae7a9cc331fbc69bc06026c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd + ca8b53290abed6b00ae7a9cc331fbc69bc06026c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd + ca8b53290abed6b00ae7a9cc331fbc69bc06026c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd + ca8b53290abed6b00ae7a9cc331fbc69bc06026c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd + ca8b53290abed6b00ae7a9cc331fbc69bc06026c @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime a08d9ce2caf02455c0b825bcdc32974bdf769a80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 564969bca155b40432d101ec35f24a0e81e6afa0 + e99084eedfdb1a3d2d99951ae0748c2b5f468358 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 564969bca155b40432d101ec35f24a0e81e6afa0 + e99084eedfdb1a3d2d99951ae0748c2b5f468358 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 564969bca155b40432d101ec35f24a0e81e6afa0 + e99084eedfdb1a3d2d99951ae0748c2b5f468358 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 564969bca155b40432d101ec35f24a0e81e6afa0 + e99084eedfdb1a3d2d99951ae0748c2b5f468358 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 564969bca155b40432d101ec35f24a0e81e6afa0 + e99084eedfdb1a3d2d99951ae0748c2b5f468358 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 564969bca155b40432d101ec35f24a0e81e6afa0 + e99084eedfdb1a3d2d99951ae0748c2b5f468358 https://github.com/dotnet/test-templates @@ -90,18 +90,18 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 8d6c86fd918b96350521dc48dc996b6231616f0f + 54ea5cf952f339685dbe5ec2ef1434bbc0b226a1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 8d6c86fd918b96350521dc48dc996b6231616f0f + 54ea5cf952f339685dbe5ec2ef1434bbc0b226a1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 8d6c86fd918b96350521dc48dc996b6231616f0f + 54ea5cf952f339685dbe5ec2ef1434bbc0b226a1 https://dev.azure.com/dnceng/internal/_git/dotnet-sdk @@ -113,13 +113,13 @@ 06dd1875ed36ef4e2f4a51d5f3b2e8bb41c94fd2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 53190af510e57c1c146bd8a23725509771a42ae0 + 4c9c993698c298801739cd2dc25efa7ffe700bde - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - f501934867fd4723518c1c7b03c6033c2e52ecad + 823450756bc26a13c44a96ea190c46a77c526e04 https://github.com/dotnet/fsharp @@ -166,9 +166,9 @@ 698fdad58fa64a55f16cd9562c90224cc498ed02 - + https://github.com/dotnet/emsdk - 3c754f28788fae642dc307a948479204e9f7dd5a + f472bde6484a7b860c6647cf2ac64fd2870853e0 https://github.com/dotnet/source-build diff --git a/eng/Versions.props b/eng/Versions.props index 9c963fe06..790254759 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,15 +23,15 @@ - 6.0.22-servicing.23424.7 + 6.0.23-servicing.23463.14 - 6.0.22-servicing.23425.2 + 6.0.23-servicing.23463.7 - 6.0.122 + 6.0.123 @@ -44,12 +44,12 @@ - 6.0.22 - 6.0.22 - 6.0.22-servicing.23424.15 - 6.0.22-servicing.23424.15 - 6.0.22-servicing.23424.15 - 6.0.22-servicing.23424.15 + 6.0.23 + 6.0.23 + 6.0.23-servicing.23463.13 + 6.0.23-servicing.23463.13 + 6.0.23-servicing.23463.13 + 6.0.23-servicing.23463.13 0.2.0 @@ -68,20 +68,20 @@ - 6.0.22-servicing.23424.25 - 6.0.22-servicing.23424.25 - 6.0.22 - 6.0.22 - 6.0.22 - 6.0.22 + 6.0.23-servicing.23463.4 + 6.0.23-servicing.23463.4 + 6.0.23 + 6.0.23 + 6.0.23 + 6.0.23 2.1.0 - 6.0.22-servicing.23425.2 - 6.0.22-servicing.23425.2 - 6.0.22 - 6.0.22 + 6.0.23-servicing.23463.6 + 6.0.23-servicing.23463.6 + 6.0.23 + 6.0.23 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.122 + 6.0.123 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) @@ -185,7 +185,7 @@ 12.0.101-preview.9.31 15.0.101-preview.9.31 $(MicrosoftNETCoreAppRefPackageVersion) - 6.0.22 + 6.0.23 $(MicrosoftNETWorkloadEmscriptenManifest60100Version) From b44c73fce852268e0e627739c9fc6842c518cf24 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 14 Sep 2023 19:01:17 +0000 Subject: [PATCH 017/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230913.45 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.318-servicing.23462.21 -> To Version 6.0.318-servicing.23463.45 --- NuGet.config | 6 ------ eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index 0aa32e6a4..be2607241 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,9 +7,6 @@ - - - @@ -46,9 +43,6 @@ - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 753126b6f..88d054e0f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 1f521522b17430e3760fd09760e77822b0bd891b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - bde28e9622b697cba0e61f43849b5de4f0e98347 + 7e6a12638532bd726caa01aed96158dd470bc538 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - bde28e9622b697cba0e61f43849b5de4f0e98347 + 7e6a12638532bd726caa01aed96158dd470bc538 diff --git a/eng/Versions.props b/eng/Versions.props index 8e263f8b6..e78f5d788 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.318-servicing.23462.21 - 6.0.318-servicing.23462.21 + 6.0.318-servicing.23463.45 + 6.0.318-servicing.23463.45 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 4c490d9a0d88cef00ad97433687236d4c28b0afc Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 14 Sep 2023 19:01:27 +0000 Subject: [PATCH 018/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230913.61 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.318-servicing.23463.45 -> To Version 6.0.318-servicing.23463.61 --- 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 88d054e0f..0c105831f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 1f521522b17430e3760fd09760e77822b0bd891b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7e6a12638532bd726caa01aed96158dd470bc538 + 9226ebcce20dfffd1593fbe19cef750b6ba7e475 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7e6a12638532bd726caa01aed96158dd470bc538 + 9226ebcce20dfffd1593fbe19cef750b6ba7e475 diff --git a/eng/Versions.props b/eng/Versions.props index e78f5d788..ceecff1e6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.318-servicing.23463.45 - 6.0.318-servicing.23463.45 + 6.0.318-servicing.23463.61 + 6.0.318-servicing.23463.61 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 0ed281191dbbd082e199e4fcc50ecfe587484944 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 14 Sep 2023 19:01:50 +0000 Subject: [PATCH 019/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230914.18 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.318-servicing.23463.61 -> To Version 6.0.318-servicing.23464.18 --- 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 0c105831f..dee72f8fa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 1f521522b17430e3760fd09760e77822b0bd891b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9226ebcce20dfffd1593fbe19cef750b6ba7e475 + 52033f2cb4eb64e2d12a8aa44d0d711d9129b161 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9226ebcce20dfffd1593fbe19cef750b6ba7e475 + 52033f2cb4eb64e2d12a8aa44d0d711d9129b161 diff --git a/eng/Versions.props b/eng/Versions.props index ceecff1e6..f5d9ef0eb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.318-servicing.23463.61 - 6.0.318-servicing.23463.61 + 6.0.318-servicing.23464.18 + 6.0.318-servicing.23464.18 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 1e162d9d227b823e5839be61f726faada708f6ef Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 14 Sep 2023 19:01:59 +0000 Subject: [PATCH 020/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230914.26 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.318-servicing.23464.18 -> To Version 6.0.318-servicing.23464.26 --- 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 dee72f8fa..bb8e425de 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 1f521522b17430e3760fd09760e77822b0bd891b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 52033f2cb4eb64e2d12a8aa44d0d711d9129b161 + c67a7250452612429c36b96267a51b42c1c439e4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 52033f2cb4eb64e2d12a8aa44d0d711d9129b161 + c67a7250452612429c36b96267a51b42c1c439e4 diff --git a/eng/Versions.props b/eng/Versions.props index f5d9ef0eb..f70414176 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.318-servicing.23464.18 - 6.0.318-servicing.23464.18 + 6.0.318-servicing.23464.26 + 6.0.318-servicing.23464.26 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 1c181baebd833c5bf9e5955563d5c72e5fcb2eaf Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 14 Sep 2023 19:02:17 +0000 Subject: [PATCH 021/535] Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,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,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 6.0.22 -> To Version 6.0.23 (parent: Microsoft.NET.Sdk --- NuGet.config | 20 ++++------ eng/Version.Details.xml | 84 ++++++++++++++++++++--------------------- eng/Versions.props | 40 ++++++++++---------- 3 files changed, 70 insertions(+), 74 deletions(-) diff --git a/NuGet.config b/NuGet.config index be2607241..6c6b54ba2 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,22 +7,20 @@ + + - - - + - - - + @@ -43,17 +41,15 @@ + + - - - + - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bb8e425de..6092a1ba6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 017f84465cd8eb56c666ad1e6872d4fc23cec288 + 0c1d005f46ba43bf07b6ce16deef9d8bd113ac6d - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 017f84465cd8eb56c666ad1e6872d4fc23cec288 + 0c1d005f46ba43bf07b6ce16deef9d8bd113ac6d - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 017f84465cd8eb56c666ad1e6872d4fc23cec288 + 0c1d005f46ba43bf07b6ce16deef9d8bd113ac6d - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 017f84465cd8eb56c666ad1e6872d4fc23cec288 + 0c1d005f46ba43bf07b6ce16deef9d8bd113ac6d - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd + ca8b53290abed6b00ae7a9cc331fbc69bc06026c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd + ca8b53290abed6b00ae7a9cc331fbc69bc06026c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd + ca8b53290abed6b00ae7a9cc331fbc69bc06026c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd + ca8b53290abed6b00ae7a9cc331fbc69bc06026c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd + ca8b53290abed6b00ae7a9cc331fbc69bc06026c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd + ca8b53290abed6b00ae7a9cc331fbc69bc06026c @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime a08d9ce2caf02455c0b825bcdc32974bdf769a80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 564969bca155b40432d101ec35f24a0e81e6afa0 + e99084eedfdb1a3d2d99951ae0748c2b5f468358 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 564969bca155b40432d101ec35f24a0e81e6afa0 + e99084eedfdb1a3d2d99951ae0748c2b5f468358 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 564969bca155b40432d101ec35f24a0e81e6afa0 + e99084eedfdb1a3d2d99951ae0748c2b5f468358 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 564969bca155b40432d101ec35f24a0e81e6afa0 + e99084eedfdb1a3d2d99951ae0748c2b5f468358 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 564969bca155b40432d101ec35f24a0e81e6afa0 + e99084eedfdb1a3d2d99951ae0748c2b5f468358 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 564969bca155b40432d101ec35f24a0e81e6afa0 + e99084eedfdb1a3d2d99951ae0748c2b5f468358 https://github.com/dotnet/test-templates @@ -90,18 +90,18 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 1f521522b17430e3760fd09760e77822b0bd891b + cc63749868db135f5a7998ca9c07e57a800692bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 1f521522b17430e3760fd09760e77822b0bd891b + cc63749868db135f5a7998ca9c07e57a800692bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 1f521522b17430e3760fd09760e77822b0bd891b + cc63749868db135f5a7998ca9c07e57a800692bc https://dev.azure.com/dnceng/internal/_git/dotnet-sdk @@ -113,13 +113,13 @@ c67a7250452612429c36b96267a51b42c1c439e4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 53190af510e57c1c146bd8a23725509771a42ae0 + 4c9c993698c298801739cd2dc25efa7ffe700bde - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - f501934867fd4723518c1c7b03c6033c2e52ecad + 823450756bc26a13c44a96ea190c46a77c526e04 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index f70414176..5e1564329 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,15 +23,15 @@ - 6.0.22-servicing.23424.7 + 6.0.23-servicing.23463.14 - 6.0.22-servicing.23425.2 + 6.0.23-servicing.23463.7 - 6.0.317 + 6.0.318 @@ -44,12 +44,12 @@ - 6.0.22 - 6.0.22 - 6.0.22-servicing.23424.15 - 6.0.22-servicing.23424.15 - 6.0.22-servicing.23424.15 - 6.0.22-servicing.23424.15 + 6.0.23 + 6.0.23 + 6.0.23-servicing.23463.13 + 6.0.23-servicing.23463.13 + 6.0.23-servicing.23463.13 + 6.0.23-servicing.23463.13 0.2.0 @@ -68,20 +68,20 @@ - 6.0.22-servicing.23424.25 - 6.0.22-servicing.23424.25 - 6.0.22 - 6.0.22 - 6.0.22 - 6.0.22 + 6.0.23-servicing.23463.4 + 6.0.23-servicing.23463.4 + 6.0.23 + 6.0.23 + 6.0.23 + 6.0.23 2.1.0 - 6.0.22-servicing.23425.2 - 6.0.22-servicing.23425.2 - 6.0.22 - 6.0.22 + 6.0.23-servicing.23463.6 + 6.0.23-servicing.23463.6 + 6.0.23 + 6.0.23 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.317 + 6.0.318 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) From 7717177fe7c112f0ee08de09c789fa860b4a91d1 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Mon, 18 Sep 2023 16:35:34 +0000 Subject: [PATCH 022/535] Merged PR 33737: Remove extra entry in XML doc baseline --- .../assets/baselines/MissingXmlDoc.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MissingXmlDoc.txt b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MissingXmlDoc.txt index bde73ece6..38f80e186 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MissingXmlDoc.txt +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MissingXmlDoc.txt @@ -1,7 +1,6 @@ Microsoft.AspNetCore.App.Ref/analyzers/dotnet/cs/Microsoft.AspNetCore.App.Analyzers.xml Microsoft.AspNetCore.App.Ref/analyzers/dotnet/cs/Microsoft.AspNetCore.App.CodeFixes.xml Microsoft.AspNetCore.App.Ref/analyzers/dotnet/roslyn4.0/cs/Microsoft.Extensions.Logging.Generators.xml -Microsoft.AspNetCore.App.Ref/ref/netx.y/System.Runtime.CompilerServices.Unsafe.xml Microsoft.NETCore.App.Ref/analyzers/dotnet/cs/System.Text.Json.SourceGeneration.xml Microsoft.NETCore.App.Ref/ref/netx.y/Microsoft.VisualBasic.xml Microsoft.NETCore.App.Ref/ref/netx.y/mscorlib.xml From 8b382fe097c29350d2c611d67827ee896bee10e2 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 19 Sep 2023 18:28:18 +0000 Subject: [PATCH 023/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230919.18 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.415-servicing.23464.25 -> To Version 6.0.415-servicing.23469.18 --- NuGet.config | 8 ++++++++ eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/NuGet.config b/NuGet.config index 51e6e1dd2..136aa9b39 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,6 +8,7 @@ + @@ -15,12 +16,15 @@ + + + @@ -41,15 +45,19 @@ + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9e6b3d96f..9af9ba25c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 5cebb8cd49c5bcf087cae0368c1f610d4dfec0f6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 338ab1c7fe914679dbaf78e77bb3afd2e95ee977 + ac1b8a8f81ddb3ad0a9274f520f88071cde80cdf - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 338ab1c7fe914679dbaf78e77bb3afd2e95ee977 + ac1b8a8f81ddb3ad0a9274f520f88071cde80cdf diff --git a/eng/Versions.props b/eng/Versions.props index 35c9af552..92f74a94a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.415-servicing.23464.25 - 6.0.415-servicing.23464.25 + 6.0.415-servicing.23469.18 + 6.0.415-servicing.23469.18 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 6e0cd88c50bf40d9843c899a57feda92f6be52cb Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 19 Sep 2023 18:28:33 +0000 Subject: [PATCH 024/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230919.15 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.318-servicing.23464.26 -> To Version 6.0.318-servicing.23469.15 --- NuGet.config | 8 ++++++++ eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6c6b54ba2..bf0ae613f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,6 +8,7 @@ + @@ -15,12 +16,15 @@ + + + @@ -41,14 +45,18 @@ + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6092a1ba6..2812d6ba0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating cc63749868db135f5a7998ca9c07e57a800692bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c67a7250452612429c36b96267a51b42c1c439e4 + d1e4f2398a36bff5b0ff25cf8bf0d9745b8dd356 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c67a7250452612429c36b96267a51b42c1c439e4 + d1e4f2398a36bff5b0ff25cf8bf0d9745b8dd356 diff --git a/eng/Versions.props b/eng/Versions.props index 5e1564329..558257ec1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.318-servicing.23464.26 - 6.0.318-servicing.23464.26 + 6.0.318-servicing.23469.15 + 6.0.318-servicing.23469.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 55f1554eec43d92654e584f401f31eac2ad865de Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 19 Sep 2023 18:29:45 +0000 Subject: [PATCH 025/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230919.16 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.123-servicing.23464.24 -> To Version 6.0.123-servicing.23469.16 --- NuGet.config | 9 +++++++++ eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/NuGet.config b/NuGet.config index ff90ea0d7..2f3134c25 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,20 +8,25 @@ + + + + + @@ -42,16 +47,20 @@ + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index eccf1968a..272ad70a8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 54ea5cf952f339685dbe5ec2ef1434bbc0b226a1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 06dd1875ed36ef4e2f4a51d5f3b2e8bb41c94fd2 + 0efb0c52f5d3c51b39af3b6021a50af178daea2e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 06dd1875ed36ef4e2f4a51d5f3b2e8bb41c94fd2 + 0efb0c52f5d3c51b39af3b6021a50af178daea2e diff --git a/eng/Versions.props b/eng/Versions.props index 5bbaaac50..a56c06b80 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.123-servicing.23464.24 - 6.0.123-servicing.23464.24 + 6.0.123-servicing.23469.16 + 6.0.123-servicing.23469.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From ff2f77351271698d29c1502d0ad6adf25d754e0f Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 13 Oct 2023 20:17:44 +0000 Subject: [PATCH 026/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231013.15 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.123-servicing.23480.40 -> To Version 6.0.124-servicing.23513.15 --- NuGet.config | 8 -------- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 6 insertions(+), 14 deletions(-) diff --git a/NuGet.config b/NuGet.config index 49478e17d..dd632b04b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,20 +7,16 @@ - - - - @@ -41,17 +37,13 @@ - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b04700e60..c030dba8a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating d0deccaa5039ef510feef0dbb63a63dcc88112f5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6fe8d6cc286d81d61d48c08b31e57d5a3eba1b22 + 71230905d1d3ea0fcefa396fe13ff4ad10fc233b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6fe8d6cc286d81d61d48c08b31e57d5a3eba1b22 + 71230905d1d3ea0fcefa396fe13ff4ad10fc233b diff --git a/eng/Versions.props b/eng/Versions.props index c3c5ea3c3..f9b0c3c7b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.123-servicing.23480.40 - 6.0.123-servicing.23480.40 + 6.0.124-servicing.23513.15 + 6.0.124-servicing.23513.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 840b7beac01c3376738e4da921a8064e2afee502 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 13 Oct 2023 20:17:59 +0000 Subject: [PATCH 027/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231013.16 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.318-servicing.23480.39 -> To Version 6.0.319-servicing.23513.16 --- NuGet.config | 8 -------- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 6 insertions(+), 14 deletions(-) diff --git a/NuGet.config b/NuGet.config index c8e5ee130..2cf5556c3 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,20 +7,16 @@ - - - - @@ -41,15 +37,11 @@ - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0c2c995c7..df851c72d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 81b4aff895d7eaab61aa000a696f7bc79fc49b70 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 40c58ac25e9fcb1bbee56a592918fc464f64a6e7 + 70f5e33478a0cc2ae99c727511247cc74e408544 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 40c58ac25e9fcb1bbee56a592918fc464f64a6e7 + 70f5e33478a0cc2ae99c727511247cc74e408544 diff --git a/eng/Versions.props b/eng/Versions.props index e5ac3afbe..7a04c643a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.318-servicing.23480.39 - 6.0.318-servicing.23480.39 + 6.0.319-servicing.23513.16 + 6.0.319-servicing.23513.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b8ce6a3057fc379935649aaa1b62b250632f91f8 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 13 Oct 2023 20:19:04 +0000 Subject: [PATCH 028/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231013.17 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.415-servicing.23480.38 -> To Version 6.0.416-servicing.23513.17 --- NuGet.config | 24 ------------------------ eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 6 insertions(+), 30 deletions(-) diff --git a/NuGet.config b/NuGet.config index 9401b3f64..03d3587a6 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,22 +13,10 @@ - - - - - - - - - - - - @@ -51,22 +39,10 @@ - - - - - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 688060474..b54aec9a8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating c2eaaa1ff778461cf69f1386b1f2b37d674a0ab0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - bb5ae4829da51d315033bedb73116477b0390cd3 + 1b0c19415d2cc4637c04d49b4c23379da28682e9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - bb5ae4829da51d315033bedb73116477b0390cd3 + 1b0c19415d2cc4637c04d49b4c23379da28682e9 diff --git a/eng/Versions.props b/eng/Versions.props index fac630493..c91639786 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.415-servicing.23480.38 - 6.0.415-servicing.23480.38 + 6.0.416-servicing.23513.17 + 6.0.416-servicing.23513.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 950032c4d9f3e431ccd7b83093ad994c569c63d2 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 16 Oct 2023 23:30:50 +0000 Subject: [PATCH 029/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231016.24 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.416-servicing.23513.17 -> To Version 6.0.416-servicing.23516.24 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,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,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64 From Version 6.0.23 -> To Version 6.0.24 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++ eng/Version.Details.xml | 84 ++++++++++++++++++++--------------------- eng/Versions.props | 40 ++++++++++---------- 3 files changed, 70 insertions(+), 62 deletions(-) diff --git a/NuGet.config b/NuGet.config index 03d3587a6..53591c247 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,16 +7,20 @@ + + + + @@ -37,12 +41,16 @@ + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b54aec9a8..6a1d0831c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5bb01c1a3fcf97da46862c28d5cca36b0e5142f6 + 4e0adad7198e8509579e2dfedd445073fcf67fee - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5bb01c1a3fcf97da46862c28d5cca36b0e5142f6 + 4e0adad7198e8509579e2dfedd445073fcf67fee - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5bb01c1a3fcf97da46862c28d5cca36b0e5142f6 + 4e0adad7198e8509579e2dfedd445073fcf67fee - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5bb01c1a3fcf97da46862c28d5cca36b0e5142f6 + 4e0adad7198e8509579e2dfedd445073fcf67fee - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e0f0de876a67755a2c6cd2dc730c13f5959bdea8 + 9cfaa835e9d761a3433687d004c416e0f2b4f2a6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e0f0de876a67755a2c6cd2dc730c13f5959bdea8 + 9cfaa835e9d761a3433687d004c416e0f2b4f2a6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e0f0de876a67755a2c6cd2dc730c13f5959bdea8 + 9cfaa835e9d761a3433687d004c416e0f2b4f2a6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e0f0de876a67755a2c6cd2dc730c13f5959bdea8 + 9cfaa835e9d761a3433687d004c416e0f2b4f2a6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e0f0de876a67755a2c6cd2dc730c13f5959bdea8 + 9cfaa835e9d761a3433687d004c416e0f2b4f2a6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e0f0de876a67755a2c6cd2dc730c13f5959bdea8 + 9cfaa835e9d761a3433687d004c416e0f2b4f2a6 @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime a08d9ce2caf02455c0b825bcdc32974bdf769a80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bc25dd5d39fd057f7cb28acb5ad4d9e925a375de + 93cb36588ba69f140e92668e20a4d7bcc99ce84d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bc25dd5d39fd057f7cb28acb5ad4d9e925a375de + 93cb36588ba69f140e92668e20a4d7bcc99ce84d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bc25dd5d39fd057f7cb28acb5ad4d9e925a375de + 93cb36588ba69f140e92668e20a4d7bcc99ce84d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bc25dd5d39fd057f7cb28acb5ad4d9e925a375de + 93cb36588ba69f140e92668e20a4d7bcc99ce84d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bc25dd5d39fd057f7cb28acb5ad4d9e925a375de + 93cb36588ba69f140e92668e20a4d7bcc99ce84d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bc25dd5d39fd057f7cb28acb5ad4d9e925a375de + 93cb36588ba69f140e92668e20a4d7bcc99ce84d https://github.com/dotnet/test-templates @@ -90,27 +90,27 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - c2eaaa1ff778461cf69f1386b1f2b37d674a0ab0 + 520dd9c4ea44753c16fc626380009570ff53b278 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - c2eaaa1ff778461cf69f1386b1f2b37d674a0ab0 + 520dd9c4ea44753c16fc626380009570ff53b278 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - c2eaaa1ff778461cf69f1386b1f2b37d674a0ab0 + 520dd9c4ea44753c16fc626380009570ff53b278 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1b0c19415d2cc4637c04d49b4c23379da28682e9 + 4f02fd3d297b48ce03104a1b58e704a60a82c6c9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1b0c19415d2cc4637c04d49b4c23379da28682e9 + 4f02fd3d297b48ce03104a1b58e704a60a82c6c9 diff --git a/eng/Versions.props b/eng/Versions.props index 3b9e698d2..a9cd00b3b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.415 + 6.0.416 @@ -44,20 +44,20 @@ - 6.0.23 - 6.0.23 - 6.0.23-servicing.23480.7 - 6.0.23-servicing.23480.7 - 6.0.23-servicing.23480.7 - 6.0.23-servicing.23480.7 + 6.0.24 + 6.0.24 + 6.0.24-servicing.23513.7 + 6.0.24-servicing.23513.7 + 6.0.24-servicing.23513.7 + 6.0.24-servicing.23513.7 0.2.0 - 6.0.416-servicing.23513.17 - 6.0.416-servicing.23513.17 + 6.0.416-servicing.23516.24 + 6.0.416-servicing.23516.24 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,20 +68,20 @@ - 6.0.23-servicing.23480.2 - 6.0.23-servicing.23480.2 - 6.0.23 - 6.0.23 - 6.0.23 - 6.0.23 + 6.0.24-servicing.23516.12 + 6.0.24-servicing.23516.12 + 6.0.24 + 6.0.24 + 6.0.24 + 6.0.24 2.1.0 - 6.0.23-servicing.23480.2 - 6.0.23-servicing.23480.2 - 6.0.23 - 6.0.23 + 6.0.24-servicing.23513.4 + 6.0.24-servicing.23513.4 + 6.0.24 + 6.0.24 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.415 + 6.0.416 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) From eb37878032dc22e56ce8108d343ecffe07fbf842 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 16 Oct 2023 23:32:10 +0000 Subject: [PATCH 030/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231016.23 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.319-servicing.23513.16 -> To Version 6.0.319-servicing.23516.23 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,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,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64 From Version 6.0.23 -> To Version 6.0.24 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++ eng/Version.Details.xml | 84 ++++++++++++++++++++--------------------- eng/Versions.props | 40 ++++++++++---------- 3 files changed, 70 insertions(+), 62 deletions(-) diff --git a/NuGet.config b/NuGet.config index 2cf5556c3..61c4019bf 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,16 +7,20 @@ + + + + @@ -37,11 +41,15 @@ + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index df851c72d..e65122205 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5bb01c1a3fcf97da46862c28d5cca36b0e5142f6 + 4e0adad7198e8509579e2dfedd445073fcf67fee - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5bb01c1a3fcf97da46862c28d5cca36b0e5142f6 + 4e0adad7198e8509579e2dfedd445073fcf67fee - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5bb01c1a3fcf97da46862c28d5cca36b0e5142f6 + 4e0adad7198e8509579e2dfedd445073fcf67fee - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5bb01c1a3fcf97da46862c28d5cca36b0e5142f6 + 4e0adad7198e8509579e2dfedd445073fcf67fee - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e0f0de876a67755a2c6cd2dc730c13f5959bdea8 + 9cfaa835e9d761a3433687d004c416e0f2b4f2a6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e0f0de876a67755a2c6cd2dc730c13f5959bdea8 + 9cfaa835e9d761a3433687d004c416e0f2b4f2a6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e0f0de876a67755a2c6cd2dc730c13f5959bdea8 + 9cfaa835e9d761a3433687d004c416e0f2b4f2a6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e0f0de876a67755a2c6cd2dc730c13f5959bdea8 + 9cfaa835e9d761a3433687d004c416e0f2b4f2a6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e0f0de876a67755a2c6cd2dc730c13f5959bdea8 + 9cfaa835e9d761a3433687d004c416e0f2b4f2a6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e0f0de876a67755a2c6cd2dc730c13f5959bdea8 + 9cfaa835e9d761a3433687d004c416e0f2b4f2a6 @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime a08d9ce2caf02455c0b825bcdc32974bdf769a80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bc25dd5d39fd057f7cb28acb5ad4d9e925a375de + 93cb36588ba69f140e92668e20a4d7bcc99ce84d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bc25dd5d39fd057f7cb28acb5ad4d9e925a375de + 93cb36588ba69f140e92668e20a4d7bcc99ce84d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bc25dd5d39fd057f7cb28acb5ad4d9e925a375de + 93cb36588ba69f140e92668e20a4d7bcc99ce84d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bc25dd5d39fd057f7cb28acb5ad4d9e925a375de + 93cb36588ba69f140e92668e20a4d7bcc99ce84d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bc25dd5d39fd057f7cb28acb5ad4d9e925a375de + 93cb36588ba69f140e92668e20a4d7bcc99ce84d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bc25dd5d39fd057f7cb28acb5ad4d9e925a375de + 93cb36588ba69f140e92668e20a4d7bcc99ce84d https://github.com/dotnet/test-templates @@ -90,27 +90,27 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 81b4aff895d7eaab61aa000a696f7bc79fc49b70 + 1274cdd11e447b39169cfcb72042e7dd0bee7fc3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 81b4aff895d7eaab61aa000a696f7bc79fc49b70 + 1274cdd11e447b39169cfcb72042e7dd0bee7fc3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 81b4aff895d7eaab61aa000a696f7bc79fc49b70 + 1274cdd11e447b39169cfcb72042e7dd0bee7fc3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 70f5e33478a0cc2ae99c727511247cc74e408544 + e76a4b93ff235181ccf4ed1e52a256a16e2e576e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 70f5e33478a0cc2ae99c727511247cc74e408544 + e76a4b93ff235181ccf4ed1e52a256a16e2e576e diff --git a/eng/Versions.props b/eng/Versions.props index 7a04c643a..ddd5ddbd0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.318 + 6.0.319 @@ -44,20 +44,20 @@ - 6.0.23 - 6.0.23 - 6.0.23-servicing.23480.7 - 6.0.23-servicing.23480.7 - 6.0.23-servicing.23480.7 - 6.0.23-servicing.23480.7 + 6.0.24 + 6.0.24 + 6.0.24-servicing.23513.7 + 6.0.24-servicing.23513.7 + 6.0.24-servicing.23513.7 + 6.0.24-servicing.23513.7 0.2.0 - 6.0.319-servicing.23513.16 - 6.0.319-servicing.23513.16 + 6.0.319-servicing.23516.23 + 6.0.319-servicing.23516.23 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,20 +68,20 @@ - 6.0.23-servicing.23480.2 - 6.0.23-servicing.23480.2 - 6.0.23 - 6.0.23 - 6.0.23 - 6.0.23 + 6.0.24-servicing.23516.12 + 6.0.24-servicing.23516.12 + 6.0.24 + 6.0.24 + 6.0.24 + 6.0.24 2.1.0 - 6.0.23-servicing.23480.2 - 6.0.23-servicing.23480.2 - 6.0.23 - 6.0.23 + 6.0.24-servicing.23513.4 + 6.0.24-servicing.23513.4 + 6.0.24 + 6.0.24 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.318 + 6.0.319 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) From 9689fbfcd8c8f3f88cd2a18407398493b0aaa16a Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 16 Oct 2023 23:32:35 +0000 Subject: [PATCH 031/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231016.25 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.124-servicing.23513.15 -> To Version 6.0.124-servicing.23516.25 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,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,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NET.Workload.Emscripten.Manifest-6.0.100 From Version 6.0.23 -> To Version 6.0.24 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++ eng/Version.Details.xml | 88 ++++++++++++++++++++--------------------- eng/Versions.props | 42 ++++++++++---------- 3 files changed, 73 insertions(+), 65 deletions(-) diff --git a/NuGet.config b/NuGet.config index dd632b04b..85312fd26 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,16 +7,20 @@ + + + + @@ -37,13 +41,17 @@ + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c030dba8a..3fe60cd12 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5bb01c1a3fcf97da46862c28d5cca36b0e5142f6 + 4e0adad7198e8509579e2dfedd445073fcf67fee - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5bb01c1a3fcf97da46862c28d5cca36b0e5142f6 + 4e0adad7198e8509579e2dfedd445073fcf67fee - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5bb01c1a3fcf97da46862c28d5cca36b0e5142f6 + 4e0adad7198e8509579e2dfedd445073fcf67fee - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5bb01c1a3fcf97da46862c28d5cca36b0e5142f6 + 4e0adad7198e8509579e2dfedd445073fcf67fee - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e0f0de876a67755a2c6cd2dc730c13f5959bdea8 + 9cfaa835e9d761a3433687d004c416e0f2b4f2a6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e0f0de876a67755a2c6cd2dc730c13f5959bdea8 + 9cfaa835e9d761a3433687d004c416e0f2b4f2a6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e0f0de876a67755a2c6cd2dc730c13f5959bdea8 + 9cfaa835e9d761a3433687d004c416e0f2b4f2a6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e0f0de876a67755a2c6cd2dc730c13f5959bdea8 + 9cfaa835e9d761a3433687d004c416e0f2b4f2a6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e0f0de876a67755a2c6cd2dc730c13f5959bdea8 + 9cfaa835e9d761a3433687d004c416e0f2b4f2a6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e0f0de876a67755a2c6cd2dc730c13f5959bdea8 + 9cfaa835e9d761a3433687d004c416e0f2b4f2a6 @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime a08d9ce2caf02455c0b825bcdc32974bdf769a80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bc25dd5d39fd057f7cb28acb5ad4d9e925a375de + 93cb36588ba69f140e92668e20a4d7bcc99ce84d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bc25dd5d39fd057f7cb28acb5ad4d9e925a375de + 93cb36588ba69f140e92668e20a4d7bcc99ce84d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bc25dd5d39fd057f7cb28acb5ad4d9e925a375de + 93cb36588ba69f140e92668e20a4d7bcc99ce84d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bc25dd5d39fd057f7cb28acb5ad4d9e925a375de + 93cb36588ba69f140e92668e20a4d7bcc99ce84d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bc25dd5d39fd057f7cb28acb5ad4d9e925a375de + 93cb36588ba69f140e92668e20a4d7bcc99ce84d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bc25dd5d39fd057f7cb28acb5ad4d9e925a375de + 93cb36588ba69f140e92668e20a4d7bcc99ce84d https://github.com/dotnet/test-templates @@ -90,27 +90,27 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - d0deccaa5039ef510feef0dbb63a63dcc88112f5 + 18c25846d4767a1e6bcbaef60027f3bcaaee748d - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - d0deccaa5039ef510feef0dbb63a63dcc88112f5 + 18c25846d4767a1e6bcbaef60027f3bcaaee748d - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - d0deccaa5039ef510feef0dbb63a63dcc88112f5 + 18c25846d4767a1e6bcbaef60027f3bcaaee748d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 71230905d1d3ea0fcefa396fe13ff4ad10fc233b + 9956bc35ded21a4fe8f85dde8d37e99ad1347139 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 71230905d1d3ea0fcefa396fe13ff4ad10fc233b + 9956bc35ded21a4fe8f85dde8d37e99ad1347139 @@ -166,9 +166,9 @@ 698fdad58fa64a55f16cd9562c90224cc498ed02 - + https://github.com/dotnet/emsdk - 3c754f28788fae642dc307a948479204e9f7dd5a + 0b73b536f6e0d0a6143387439c3308db4db9fdfe https://github.com/dotnet/source-build diff --git a/eng/Versions.props b/eng/Versions.props index f9b0c3c7b..167b5ae21 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.123 + 6.0.124 @@ -44,20 +44,20 @@ - 6.0.23 - 6.0.23 - 6.0.23-servicing.23480.7 - 6.0.23-servicing.23480.7 - 6.0.23-servicing.23480.7 - 6.0.23-servicing.23480.7 + 6.0.24 + 6.0.24 + 6.0.24-servicing.23513.7 + 6.0.24-servicing.23513.7 + 6.0.24-servicing.23513.7 + 6.0.24-servicing.23513.7 0.2.0 - 6.0.124-servicing.23513.15 - 6.0.124-servicing.23513.15 + 6.0.124-servicing.23516.25 + 6.0.124-servicing.23516.25 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,20 +68,20 @@ - 6.0.23-servicing.23480.2 - 6.0.23-servicing.23480.2 - 6.0.23 - 6.0.23 - 6.0.23 - 6.0.23 + 6.0.24-servicing.23516.12 + 6.0.24-servicing.23516.12 + 6.0.24 + 6.0.24 + 6.0.24 + 6.0.24 2.1.0 - 6.0.23-servicing.23480.2 - 6.0.23-servicing.23480.2 - 6.0.23 - 6.0.23 + 6.0.24-servicing.23513.4 + 6.0.24-servicing.23513.4 + 6.0.24 + 6.0.24 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.123 + 6.0.124 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) @@ -185,7 +185,7 @@ 12.0.101-preview.9.31 15.0.101-preview.9.31 $(MicrosoftNETCoreAppRefPackageVersion) - 6.0.22 + 6.0.23 $(MicrosoftNETWorkloadEmscriptenManifest60100Version) From 355590497fdef548ba3b24cc5c125bfcb1feb957 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 17 Oct 2023 23:07:34 +0000 Subject: [PATCH 032/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231017.23 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.124-servicing.23516.25 -> To Version 6.0.124-servicing.23517.23 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.24 -> To Version 6.0.24 (parent: Microsoft.NET.Sdk --- NuGet.config | 12 +++++----- eng/Version.Details.xml | 52 ++++++++++++++++++++--------------------- eng/Versions.props | 16 ++++++------- 3 files changed, 40 insertions(+), 40 deletions(-) diff --git a/NuGet.config b/NuGet.config index 85312fd26..385ebb02b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,17 +7,17 @@ - + - + - + @@ -41,14 +41,14 @@ - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3fe60cd12..49201afd1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 4e0adad7198e8509579e2dfedd445073fcf67fee - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9cfaa835e9d761a3433687d004c416e0f2b4f2a6 + cb5bcd2b394eaf9f079b67ab980e193e1d1ccadd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9cfaa835e9d761a3433687d004c416e0f2b4f2a6 + cb5bcd2b394eaf9f079b67ab980e193e1d1ccadd - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9cfaa835e9d761a3433687d004c416e0f2b4f2a6 + cb5bcd2b394eaf9f079b67ab980e193e1d1ccadd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9cfaa835e9d761a3433687d004c416e0f2b4f2a6 + cb5bcd2b394eaf9f079b67ab980e193e1d1ccadd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9cfaa835e9d761a3433687d004c416e0f2b4f2a6 + cb5bcd2b394eaf9f079b67ab980e193e1d1ccadd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9cfaa835e9d761a3433687d004c416e0f2b4f2a6 + cb5bcd2b394eaf9f079b67ab980e193e1d1ccadd @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 93cb36588ba69f140e92668e20a4d7bcc99ce84d + caada2338902a9524eb87fdab853eba77db52974 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 93cb36588ba69f140e92668e20a4d7bcc99ce84d + caada2338902a9524eb87fdab853eba77db52974 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 93cb36588ba69f140e92668e20a4d7bcc99ce84d + caada2338902a9524eb87fdab853eba77db52974 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 93cb36588ba69f140e92668e20a4d7bcc99ce84d + caada2338902a9524eb87fdab853eba77db52974 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 93cb36588ba69f140e92668e20a4d7bcc99ce84d + caada2338902a9524eb87fdab853eba77db52974 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 93cb36588ba69f140e92668e20a4d7bcc99ce84d + caada2338902a9524eb87fdab853eba77db52974 https://github.com/dotnet/test-templates @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 18c25846d4767a1e6bcbaef60027f3bcaaee748d + 80fe0b8c0791316cbdd89ce9827d2d2f0c7e9bb6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 18c25846d4767a1e6bcbaef60027f3bcaaee748d + 80fe0b8c0791316cbdd89ce9827d2d2f0c7e9bb6 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 18c25846d4767a1e6bcbaef60027f3bcaaee748d + 80fe0b8c0791316cbdd89ce9827d2d2f0c7e9bb6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9956bc35ded21a4fe8f85dde8d37e99ad1347139 + 355ccb561cf5c9121000499bef61c90003e1a9fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9956bc35ded21a4fe8f85dde8d37e99ad1347139 + 355ccb561cf5c9121000499bef61c90003e1a9fc diff --git a/eng/Versions.props b/eng/Versions.props index 167b5ae21..c9530bb7e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.24 6.0.24 - 6.0.24-servicing.23513.7 - 6.0.24-servicing.23513.7 - 6.0.24-servicing.23513.7 - 6.0.24-servicing.23513.7 + 6.0.24-servicing.23517.3 + 6.0.24-servicing.23517.3 + 6.0.24-servicing.23517.3 + 6.0.24-servicing.23517.3 0.2.0 - 6.0.124-servicing.23516.25 - 6.0.124-servicing.23516.25 + 6.0.124-servicing.23517.23 + 6.0.124-servicing.23517.23 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.24-servicing.23516.12 - 6.0.24-servicing.23516.12 + 6.0.24-servicing.23516.31 + 6.0.24-servicing.23516.31 6.0.24 6.0.24 6.0.24 From e1a3176c64e0ccfad779d27a7c3bb71f408544d8 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 17 Oct 2023 23:08:30 +0000 Subject: [PATCH 033/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231017.22 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.319-servicing.23516.23 -> To Version 6.0.319-servicing.23517.22 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.6.0,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 From Version 6.0.24-servicing.23516.12 -> To Version 6.0.24-servicing.23516.31 (parent: Microsoft.NET.Sdk --- NuGet.config | 12 +++++----- eng/Version.Details.xml | 52 ++++++++++++++++++++--------------------- eng/Versions.props | 16 ++++++------- 3 files changed, 40 insertions(+), 40 deletions(-) diff --git a/NuGet.config b/NuGet.config index 61c4019bf..a92c5c68c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,17 +7,17 @@ - + - + - + @@ -41,12 +41,12 @@ - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e65122205..c2a0aef57 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 4e0adad7198e8509579e2dfedd445073fcf67fee - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9cfaa835e9d761a3433687d004c416e0f2b4f2a6 + cb5bcd2b394eaf9f079b67ab980e193e1d1ccadd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9cfaa835e9d761a3433687d004c416e0f2b4f2a6 + cb5bcd2b394eaf9f079b67ab980e193e1d1ccadd - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9cfaa835e9d761a3433687d004c416e0f2b4f2a6 + cb5bcd2b394eaf9f079b67ab980e193e1d1ccadd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9cfaa835e9d761a3433687d004c416e0f2b4f2a6 + cb5bcd2b394eaf9f079b67ab980e193e1d1ccadd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9cfaa835e9d761a3433687d004c416e0f2b4f2a6 + cb5bcd2b394eaf9f079b67ab980e193e1d1ccadd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9cfaa835e9d761a3433687d004c416e0f2b4f2a6 + cb5bcd2b394eaf9f079b67ab980e193e1d1ccadd @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 93cb36588ba69f140e92668e20a4d7bcc99ce84d + caada2338902a9524eb87fdab853eba77db52974 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 93cb36588ba69f140e92668e20a4d7bcc99ce84d + caada2338902a9524eb87fdab853eba77db52974 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 93cb36588ba69f140e92668e20a4d7bcc99ce84d + caada2338902a9524eb87fdab853eba77db52974 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 93cb36588ba69f140e92668e20a4d7bcc99ce84d + caada2338902a9524eb87fdab853eba77db52974 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 93cb36588ba69f140e92668e20a4d7bcc99ce84d + caada2338902a9524eb87fdab853eba77db52974 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 93cb36588ba69f140e92668e20a4d7bcc99ce84d + caada2338902a9524eb87fdab853eba77db52974 https://github.com/dotnet/test-templates @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 1274cdd11e447b39169cfcb72042e7dd0bee7fc3 + 519f9badec1482e692fe0008611e4da847ad3b16 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 1274cdd11e447b39169cfcb72042e7dd0bee7fc3 + 519f9badec1482e692fe0008611e4da847ad3b16 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 1274cdd11e447b39169cfcb72042e7dd0bee7fc3 + 519f9badec1482e692fe0008611e4da847ad3b16 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e76a4b93ff235181ccf4ed1e52a256a16e2e576e + c11217ab79113ced4cab9bf694abd9abac5116d1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e76a4b93ff235181ccf4ed1e52a256a16e2e576e + c11217ab79113ced4cab9bf694abd9abac5116d1 diff --git a/eng/Versions.props b/eng/Versions.props index ddd5ddbd0..8427352b2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.24 6.0.24 - 6.0.24-servicing.23513.7 - 6.0.24-servicing.23513.7 - 6.0.24-servicing.23513.7 - 6.0.24-servicing.23513.7 + 6.0.24-servicing.23517.3 + 6.0.24-servicing.23517.3 + 6.0.24-servicing.23517.3 + 6.0.24-servicing.23517.3 0.2.0 - 6.0.319-servicing.23516.23 - 6.0.319-servicing.23516.23 + 6.0.319-servicing.23517.22 + 6.0.319-servicing.23517.22 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.24-servicing.23516.12 - 6.0.24-servicing.23516.12 + 6.0.24-servicing.23516.31 + 6.0.24-servicing.23516.31 6.0.24 6.0.24 6.0.24 From 74953cad9260d2bdc2732a314191c2b80d9fe0d3 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 17 Oct 2023 23:51:30 +0000 Subject: [PATCH 034/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231017.46 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.416-servicing.23516.24 -> To Version 6.0.416-servicing.23517.46 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,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,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 6.0.24 -> To Version 6.0.24 (parent: Microsoft.NET.Sdk --- NuGet.config | 16 ++++----- eng/Version.Details.xml | 72 ++++++++++++++++++++--------------------- eng/Versions.props | 24 +++++++------- 3 files changed, 56 insertions(+), 56 deletions(-) diff --git a/NuGet.config b/NuGet.config index 53591c247..135568420 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,20 +7,20 @@ - + - + - + - + @@ -41,16 +41,16 @@ - + - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6a1d0831c..bb6f487b8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,44 +3,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 4e0adad7198e8509579e2dfedd445073fcf67fee + 5a32973319c74b856f132afb513ac44837d2b2aa - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 4e0adad7198e8509579e2dfedd445073fcf67fee + 5a32973319c74b856f132afb513ac44837d2b2aa - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 4e0adad7198e8509579e2dfedd445073fcf67fee + 5a32973319c74b856f132afb513ac44837d2b2aa https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 4e0adad7198e8509579e2dfedd445073fcf67fee + 5a32973319c74b856f132afb513ac44837d2b2aa - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9cfaa835e9d761a3433687d004c416e0f2b4f2a6 + cb5bcd2b394eaf9f079b67ab980e193e1d1ccadd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9cfaa835e9d761a3433687d004c416e0f2b4f2a6 + cb5bcd2b394eaf9f079b67ab980e193e1d1ccadd - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9cfaa835e9d761a3433687d004c416e0f2b4f2a6 + cb5bcd2b394eaf9f079b67ab980e193e1d1ccadd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9cfaa835e9d761a3433687d004c416e0f2b4f2a6 + cb5bcd2b394eaf9f079b67ab980e193e1d1ccadd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9cfaa835e9d761a3433687d004c416e0f2b4f2a6 + cb5bcd2b394eaf9f079b67ab980e193e1d1ccadd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9cfaa835e9d761a3433687d004c416e0f2b4f2a6 + cb5bcd2b394eaf9f079b67ab980e193e1d1ccadd @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 93cb36588ba69f140e92668e20a4d7bcc99ce84d + caada2338902a9524eb87fdab853eba77db52974 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 93cb36588ba69f140e92668e20a4d7bcc99ce84d + caada2338902a9524eb87fdab853eba77db52974 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 93cb36588ba69f140e92668e20a4d7bcc99ce84d + caada2338902a9524eb87fdab853eba77db52974 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 93cb36588ba69f140e92668e20a4d7bcc99ce84d + caada2338902a9524eb87fdab853eba77db52974 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 93cb36588ba69f140e92668e20a4d7bcc99ce84d + caada2338902a9524eb87fdab853eba77db52974 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 93cb36588ba69f140e92668e20a4d7bcc99ce84d + caada2338902a9524eb87fdab853eba77db52974 https://github.com/dotnet/test-templates @@ -92,34 +92,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 520dd9c4ea44753c16fc626380009570ff53b278 + 478f4ae500a03931ddc0b0b6b20980a9cd1438a7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 520dd9c4ea44753c16fc626380009570ff53b278 + 478f4ae500a03931ddc0b0b6b20980a9cd1438a7 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 520dd9c4ea44753c16fc626380009570ff53b278 + 478f4ae500a03931ddc0b0b6b20980a9cd1438a7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4f02fd3d297b48ce03104a1b58e704a60a82c6c9 + 946bd1a99dfca001c7799ac1d54eb1011725459c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4f02fd3d297b48ce03104a1b58e704a60a82c6c9 + 946bd1a99dfca001c7799ac1d54eb1011725459c - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - a8ba4b39b59ca421254550010de48b33d7c7b57d + c1396d66ff3d595b912cd5f96d6f4651427ecfcd - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 2b6f0273734c631e1ecc8c503836d4fab840065b + 54f99d916b6630956d732099722d5e4dbfcd2825 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index a9cd00b3b..71976afad 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.23-servicing.23480.3 + 6.0.24-servicing.23513.4 - 6.0.23-servicing.23480.2 + 6.0.24-servicing.23516.7 @@ -46,18 +46,18 @@ 6.0.24 6.0.24 - 6.0.24-servicing.23513.7 - 6.0.24-servicing.23513.7 - 6.0.24-servicing.23513.7 - 6.0.24-servicing.23513.7 + 6.0.24-servicing.23517.3 + 6.0.24-servicing.23517.3 + 6.0.24-servicing.23517.3 + 6.0.24-servicing.23517.3 0.2.0 - 6.0.416-servicing.23516.24 - 6.0.416-servicing.23516.24 + 6.0.416-servicing.23517.46 + 6.0.416-servicing.23517.46 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.24-servicing.23516.12 - 6.0.24-servicing.23516.12 + 6.0.24-servicing.23516.31 + 6.0.24-servicing.23516.31 6.0.24 6.0.24 6.0.24 @@ -78,8 +78,8 @@ - 6.0.24-servicing.23513.4 - 6.0.24-servicing.23513.4 + 6.0.24-servicing.23517.3 + 6.0.24-servicing.23517.3 6.0.24 6.0.24 From 439fee6d75a9f843a66e4f3250f4b2b0ef53244d Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Wed, 18 Oct 2023 12:30:03 -0700 Subject: [PATCH 035/535] Update branding to 6.0.125 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index c3c5ea3c3..84a2b235b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 1 - 24 + 25 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From eea5af01f102809b4b972832fea50dfc14dac908 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 19 Oct 2023 00:40:24 +0000 Subject: [PATCH 036/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231018.28 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.416-servicing.23516.24 -> To Version 6.0.417-servicing.23518.28 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,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,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 6.0.24 -> To Version 6.0.24 (parent: Microsoft.NET.Sdk --- 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 bb6f487b8..32343ceae 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 478f4ae500a03931ddc0b0b6b20980a9cd1438a7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 946bd1a99dfca001c7799ac1d54eb1011725459c + d36f8a9539fc68ca3c9e0f4b706790fbbfd8fa46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 946bd1a99dfca001c7799ac1d54eb1011725459c + d36f8a9539fc68ca3c9e0f4b706790fbbfd8fa46 diff --git a/eng/Versions.props b/eng/Versions.props index 71976afad..1c73c1165 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.416-servicing.23517.46 - 6.0.416-servicing.23517.46 + 6.0.417-servicing.23518.28 + 6.0.417-servicing.23518.28 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 53738af03b2a53d77e128de5f502099e0fcbd660 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 19 Oct 2023 02:00:15 +0000 Subject: [PATCH 037/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231017.44 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.124-servicing.23517.23 -> To Version 6.0.124-servicing.23517.44 --- 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 49201afd1..4407fd025 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 80fe0b8c0791316cbdd89ce9827d2d2f0c7e9bb6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 355ccb561cf5c9121000499bef61c90003e1a9fc + f8753d8a7169a584a9d584d045d89150bfaf1328 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 355ccb561cf5c9121000499bef61c90003e1a9fc + f8753d8a7169a584a9d584d045d89150bfaf1328 diff --git a/eng/Versions.props b/eng/Versions.props index c9530bb7e..440ada2b3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.124-servicing.23517.23 - 6.0.124-servicing.23517.23 + 6.0.124-servicing.23517.44 + 6.0.124-servicing.23517.44 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 895162e6f48e6b3ed2f3db899af1888906b25f3f Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 19 Oct 2023 02:00:22 +0000 Subject: [PATCH 038/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231018.29 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.124-servicing.23517.44 -> To Version 6.0.125-servicing.23518.29 --- 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 4407fd025..08ea1bc74 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 80fe0b8c0791316cbdd89ce9827d2d2f0c7e9bb6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f8753d8a7169a584a9d584d045d89150bfaf1328 + 22921fb9b8e0bec351e9b63aef8182427d3ec7d1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f8753d8a7169a584a9d584d045d89150bfaf1328 + 22921fb9b8e0bec351e9b63aef8182427d3ec7d1 diff --git a/eng/Versions.props b/eng/Versions.props index 440ada2b3..1f7be443e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.124-servicing.23517.44 - 6.0.124-servicing.23517.44 + 6.0.125-servicing.23518.29 + 6.0.125-servicing.23518.29 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b65a25d85a120b4ab152f066b72aa42a9f96851f Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 19 Oct 2023 02:00:30 +0000 Subject: [PATCH 039/535] Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.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.24 -> To Version 6.0.24 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 8 ++++---- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index 385ebb02b..d7a6fab56 100644 --- a/NuGet.config +++ b/NuGet.config @@ -17,10 +17,10 @@ - + - + @@ -48,10 +48,10 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 08ea1bc74..a6c522fd2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 4e0adad7198e8509579e2dfedd445073fcf67fee + 5a32973319c74b856f132afb513ac44837d2b2aa - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 4e0adad7198e8509579e2dfedd445073fcf67fee + 5a32973319c74b856f132afb513ac44837d2b2aa - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 4e0adad7198e8509579e2dfedd445073fcf67fee + 5a32973319c74b856f132afb513ac44837d2b2aa https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 4e0adad7198e8509579e2dfedd445073fcf67fee + 5a32973319c74b856f132afb513ac44837d2b2aa https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -92,16 +92,16 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 80fe0b8c0791316cbdd89ce9827d2d2f0c7e9bb6 + 568bc4059aec754311fce7a2d8106ab29ec1c0b0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 80fe0b8c0791316cbdd89ce9827d2d2f0c7e9bb6 + 568bc4059aec754311fce7a2d8106ab29ec1c0b0 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 80fe0b8c0791316cbdd89ce9827d2d2f0c7e9bb6 + 568bc4059aec754311fce7a2d8106ab29ec1c0b0 https://dev.azure.com/dnceng/internal/_git/dotnet-sdk @@ -113,13 +113,13 @@ 22921fb9b8e0bec351e9b63aef8182427d3ec7d1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - a8ba4b39b59ca421254550010de48b33d7c7b57d + c1396d66ff3d595b912cd5f96d6f4651427ecfcd - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 2b6f0273734c631e1ecc8c503836d4fab840065b + 54f99d916b6630956d732099722d5e4dbfcd2825 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 1f7be443e..82237409c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.23-servicing.23480.3 + 6.0.24-servicing.23513.4 - 6.0.23-servicing.23480.2 + 6.0.24-servicing.23516.7 @@ -78,8 +78,8 @@ - 6.0.24-servicing.23513.4 - 6.0.24-servicing.23513.4 + 6.0.24-servicing.23517.3 + 6.0.24-servicing.23517.3 6.0.24 6.0.24 From 961033387a8f5eaab42005dfd4365904d1e99b37 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 19 Oct 2023 02:02:21 +0000 Subject: [PATCH 040/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231017.45 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.319-servicing.23517.22 -> To Version 6.0.319-servicing.23517.45 --- 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 c2a0aef57..1c8a6f1d4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 519f9badec1482e692fe0008611e4da847ad3b16 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c11217ab79113ced4cab9bf694abd9abac5116d1 + 4117aa6ac88d4890e3fe498c9f33896871c1c434 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c11217ab79113ced4cab9bf694abd9abac5116d1 + 4117aa6ac88d4890e3fe498c9f33896871c1c434 diff --git a/eng/Versions.props b/eng/Versions.props index b7277bccd..8b75d729f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.319-servicing.23517.22 - 6.0.319-servicing.23517.22 + 6.0.319-servicing.23517.45 + 6.0.319-servicing.23517.45 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 8cb7c225a30703ed688059c7e7faa2fcf9d8bc66 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 19 Oct 2023 02:02:28 +0000 Subject: [PATCH 041/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231018.27 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.319-servicing.23517.45 -> To Version 6.0.320-servicing.23518.27 --- 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 1c8a6f1d4..99c6385fb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 519f9badec1482e692fe0008611e4da847ad3b16 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4117aa6ac88d4890e3fe498c9f33896871c1c434 + 67fb1e64b6d4a7fe38735418cfd7fe068e986713 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4117aa6ac88d4890e3fe498c9f33896871c1c434 + 67fb1e64b6d4a7fe38735418cfd7fe068e986713 diff --git a/eng/Versions.props b/eng/Versions.props index 8b75d729f..916dd48be 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.319-servicing.23517.45 - 6.0.319-servicing.23517.45 + 6.0.320-servicing.23518.27 + 6.0.320-servicing.23518.27 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 7111d581d4a0b027e21af10147d50380602494d8 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 19 Oct 2023 02:02:36 +0000 Subject: [PATCH 042/535] Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.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.24 -> To Version 6.0.24 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 8 ++++---- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index a92c5c68c..b32124a20 100644 --- a/NuGet.config +++ b/NuGet.config @@ -17,10 +17,10 @@ - + - + @@ -46,10 +46,10 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 99c6385fb..41e09eacb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 4e0adad7198e8509579e2dfedd445073fcf67fee + 5a32973319c74b856f132afb513ac44837d2b2aa - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 4e0adad7198e8509579e2dfedd445073fcf67fee + 5a32973319c74b856f132afb513ac44837d2b2aa - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 4e0adad7198e8509579e2dfedd445073fcf67fee + 5a32973319c74b856f132afb513ac44837d2b2aa https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 4e0adad7198e8509579e2dfedd445073fcf67fee + 5a32973319c74b856f132afb513ac44837d2b2aa https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -92,16 +92,16 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 519f9badec1482e692fe0008611e4da847ad3b16 + fef6a134b76e2a2ff3633aa1816918a3498e15ce - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 519f9badec1482e692fe0008611e4da847ad3b16 + fef6a134b76e2a2ff3633aa1816918a3498e15ce https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 519f9badec1482e692fe0008611e4da847ad3b16 + fef6a134b76e2a2ff3633aa1816918a3498e15ce https://dev.azure.com/dnceng/internal/_git/dotnet-sdk @@ -113,13 +113,13 @@ 67fb1e64b6d4a7fe38735418cfd7fe068e986713 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - a8ba4b39b59ca421254550010de48b33d7c7b57d + c1396d66ff3d595b912cd5f96d6f4651427ecfcd - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 2b6f0273734c631e1ecc8c503836d4fab840065b + 54f99d916b6630956d732099722d5e4dbfcd2825 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 916dd48be..a5fcd6759 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.23-servicing.23480.3 + 6.0.24-servicing.23513.4 - 6.0.23-servicing.23480.2 + 6.0.24-servicing.23516.7 @@ -78,8 +78,8 @@ - 6.0.24-servicing.23513.4 - 6.0.24-servicing.23513.4 + 6.0.24-servicing.23517.3 + 6.0.24-servicing.23517.3 6.0.24 6.0.24 From d1fcad3746cde0e82979a28f98543c8848dcc8d3 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 19 Oct 2023 03:31:36 +0000 Subject: [PATCH 043/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231018.49 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.417-servicing.23518.28 -> To Version 6.0.417-servicing.23518.49 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,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,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 6.0.24 -> To Version 6.0.25 (parent: Microsoft.NET.Sdk --- NuGet.config | 16 ++++----- eng/Version.Details.xml | 80 ++++++++++++++++++++--------------------- eng/Versions.props | 32 ++++++++--------- 3 files changed, 64 insertions(+), 64 deletions(-) diff --git a/NuGet.config b/NuGet.config index 135568420..edf7a1141 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,20 +7,20 @@ - + - + - + - + @@ -41,16 +41,16 @@ - + - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 32343ceae..1b887c2ce 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5a32973319c74b856f132afb513ac44837d2b2aa + 88d6726a7d0f4b1ccf4e3ca3957dbf81677216c3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5a32973319c74b856f132afb513ac44837d2b2aa + 88d6726a7d0f4b1ccf4e3ca3957dbf81677216c3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5a32973319c74b856f132afb513ac44837d2b2aa + 88d6726a7d0f4b1ccf4e3ca3957dbf81677216c3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5a32973319c74b856f132afb513ac44837d2b2aa + 88d6726a7d0f4b1ccf4e3ca3957dbf81677216c3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cb5bcd2b394eaf9f079b67ab980e193e1d1ccadd + 5f9d5a6664bfe9bf832babe09b13a475b9e7f479 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cb5bcd2b394eaf9f079b67ab980e193e1d1ccadd + 5f9d5a6664bfe9bf832babe09b13a475b9e7f479 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cb5bcd2b394eaf9f079b67ab980e193e1d1ccadd + 5f9d5a6664bfe9bf832babe09b13a475b9e7f479 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cb5bcd2b394eaf9f079b67ab980e193e1d1ccadd + 5f9d5a6664bfe9bf832babe09b13a475b9e7f479 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cb5bcd2b394eaf9f079b67ab980e193e1d1ccadd + 5f9d5a6664bfe9bf832babe09b13a475b9e7f479 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cb5bcd2b394eaf9f079b67ab980e193e1d1ccadd + 5f9d5a6664bfe9bf832babe09b13a475b9e7f479 @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - caada2338902a9524eb87fdab853eba77db52974 + c81c53cd507ae3699ef60e6a02be0b1984d00452 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - caada2338902a9524eb87fdab853eba77db52974 + c81c53cd507ae3699ef60e6a02be0b1984d00452 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - caada2338902a9524eb87fdab853eba77db52974 + c81c53cd507ae3699ef60e6a02be0b1984d00452 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - caada2338902a9524eb87fdab853eba77db52974 + c81c53cd507ae3699ef60e6a02be0b1984d00452 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - caada2338902a9524eb87fdab853eba77db52974 + c81c53cd507ae3699ef60e6a02be0b1984d00452 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - caada2338902a9524eb87fdab853eba77db52974 + c81c53cd507ae3699ef60e6a02be0b1984d00452 https://github.com/dotnet/test-templates @@ -90,36 +90,36 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 478f4ae500a03931ddc0b0b6b20980a9cd1438a7 + 1f517c83fb26e346ded88c5f5a3efa04302b23d9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 478f4ae500a03931ddc0b0b6b20980a9cd1438a7 + 1f517c83fb26e346ded88c5f5a3efa04302b23d9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 478f4ae500a03931ddc0b0b6b20980a9cd1438a7 + 1f517c83fb26e346ded88c5f5a3efa04302b23d9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d36f8a9539fc68ca3c9e0f4b706790fbbfd8fa46 + 7786a00f8f7f7bb0bbccedcb8ee7c232e7df837c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d36f8a9539fc68ca3c9e0f4b706790fbbfd8fa46 + 7786a00f8f7f7bb0bbccedcb8ee7c232e7df837c - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - c1396d66ff3d595b912cd5f96d6f4651427ecfcd + f74130bc3ca3b606a18011ad64ac37a7ee77d514 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 54f99d916b6630956d732099722d5e4dbfcd2825 + e1722e80b8f688100d15b4b794f17e1a1779e286 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 4ef90d136..7c2f4761a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,15 +23,15 @@ - 6.0.24-servicing.23513.4 + 6.0.24-servicing.23516.5 - 6.0.24-servicing.23516.7 + 6.0.24-servicing.23517.2 - 6.0.416 + 6.0.417 @@ -46,18 +46,18 @@ 6.0.24 6.0.24 - 6.0.24-servicing.23517.3 - 6.0.24-servicing.23517.3 - 6.0.24-servicing.23517.3 - 6.0.24-servicing.23517.3 + 6.0.24-servicing.23517.11 + 6.0.24-servicing.23517.11 + 6.0.24-servicing.23517.11 + 6.0.24-servicing.23517.11 0.2.0 - 6.0.417-servicing.23518.28 - 6.0.417-servicing.23518.28 + 6.0.417-servicing.23518.49 + 6.0.417-servicing.23518.49 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.24-servicing.23516.31 - 6.0.24-servicing.23516.31 + 6.0.24-servicing.23517.17 + 6.0.24-servicing.23517.17 6.0.24 6.0.24 6.0.24 @@ -78,10 +78,10 @@ - 6.0.24-servicing.23517.3 - 6.0.24-servicing.23517.3 - 6.0.24 - 6.0.24 + 6.0.25-servicing.23518.6 + 6.0.25-servicing.23518.6 + 6.0.25 + 6.0.25 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.416 + 6.0.417 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) From 6a3feb228bafed59a73b095942b4135805aaa452 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 19 Oct 2023 18:41:03 +0000 Subject: [PATCH 044/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231018.48 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.320-servicing.23518.27 -> To Version 6.0.320-servicing.23518.48 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,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,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 6.0.24 -> To Version 6.0.25 (parent: Microsoft.NET.Sdk --- NuGet.config | 16 ++++----- eng/Version.Details.xml | 80 ++++++++++++++++++++--------------------- eng/Versions.props | 32 ++++++++--------- 3 files changed, 64 insertions(+), 64 deletions(-) diff --git a/NuGet.config b/NuGet.config index b32124a20..c12543dc7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,20 +7,20 @@ - + - + - + - + @@ -41,15 +41,15 @@ - + - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 41e09eacb..8b56c64bf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5a32973319c74b856f132afb513ac44837d2b2aa + 88d6726a7d0f4b1ccf4e3ca3957dbf81677216c3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5a32973319c74b856f132afb513ac44837d2b2aa + 88d6726a7d0f4b1ccf4e3ca3957dbf81677216c3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5a32973319c74b856f132afb513ac44837d2b2aa + 88d6726a7d0f4b1ccf4e3ca3957dbf81677216c3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5a32973319c74b856f132afb513ac44837d2b2aa + 88d6726a7d0f4b1ccf4e3ca3957dbf81677216c3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cb5bcd2b394eaf9f079b67ab980e193e1d1ccadd + 5f9d5a6664bfe9bf832babe09b13a475b9e7f479 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cb5bcd2b394eaf9f079b67ab980e193e1d1ccadd + 5f9d5a6664bfe9bf832babe09b13a475b9e7f479 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cb5bcd2b394eaf9f079b67ab980e193e1d1ccadd + 5f9d5a6664bfe9bf832babe09b13a475b9e7f479 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cb5bcd2b394eaf9f079b67ab980e193e1d1ccadd + 5f9d5a6664bfe9bf832babe09b13a475b9e7f479 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cb5bcd2b394eaf9f079b67ab980e193e1d1ccadd + 5f9d5a6664bfe9bf832babe09b13a475b9e7f479 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cb5bcd2b394eaf9f079b67ab980e193e1d1ccadd + 5f9d5a6664bfe9bf832babe09b13a475b9e7f479 @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - caada2338902a9524eb87fdab853eba77db52974 + c81c53cd507ae3699ef60e6a02be0b1984d00452 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - caada2338902a9524eb87fdab853eba77db52974 + c81c53cd507ae3699ef60e6a02be0b1984d00452 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - caada2338902a9524eb87fdab853eba77db52974 + c81c53cd507ae3699ef60e6a02be0b1984d00452 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - caada2338902a9524eb87fdab853eba77db52974 + c81c53cd507ae3699ef60e6a02be0b1984d00452 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - caada2338902a9524eb87fdab853eba77db52974 + c81c53cd507ae3699ef60e6a02be0b1984d00452 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - caada2338902a9524eb87fdab853eba77db52974 + c81c53cd507ae3699ef60e6a02be0b1984d00452 https://github.com/dotnet/test-templates @@ -90,36 +90,36 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - fef6a134b76e2a2ff3633aa1816918a3498e15ce + e92b5823af697ff169d8e4235c731dc87c84abbb - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - fef6a134b76e2a2ff3633aa1816918a3498e15ce + e92b5823af697ff169d8e4235c731dc87c84abbb - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - fef6a134b76e2a2ff3633aa1816918a3498e15ce + e92b5823af697ff169d8e4235c731dc87c84abbb - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 67fb1e64b6d4a7fe38735418cfd7fe068e986713 + 2866dbcb41a3d8ee6741cc7239cb46e8fd4b0c57 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 67fb1e64b6d4a7fe38735418cfd7fe068e986713 + 2866dbcb41a3d8ee6741cc7239cb46e8fd4b0c57 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - c1396d66ff3d595b912cd5f96d6f4651427ecfcd + f74130bc3ca3b606a18011ad64ac37a7ee77d514 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 54f99d916b6630956d732099722d5e4dbfcd2825 + e1722e80b8f688100d15b4b794f17e1a1779e286 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index a5fcd6759..38f74fd3a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,15 +23,15 @@ - 6.0.24-servicing.23513.4 + 6.0.24-servicing.23516.5 - 6.0.24-servicing.23516.7 + 6.0.24-servicing.23517.2 - 6.0.319 + 6.0.320 @@ -46,18 +46,18 @@ 6.0.24 6.0.24 - 6.0.24-servicing.23517.3 - 6.0.24-servicing.23517.3 - 6.0.24-servicing.23517.3 - 6.0.24-servicing.23517.3 + 6.0.24-servicing.23517.11 + 6.0.24-servicing.23517.11 + 6.0.24-servicing.23517.11 + 6.0.24-servicing.23517.11 0.2.0 - 6.0.320-servicing.23518.27 - 6.0.320-servicing.23518.27 + 6.0.320-servicing.23518.48 + 6.0.320-servicing.23518.48 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.24-servicing.23516.31 - 6.0.24-servicing.23516.31 + 6.0.24-servicing.23517.17 + 6.0.24-servicing.23517.17 6.0.24 6.0.24 6.0.24 @@ -78,10 +78,10 @@ - 6.0.24-servicing.23517.3 - 6.0.24-servicing.23517.3 - 6.0.24 - 6.0.24 + 6.0.25-servicing.23518.6 + 6.0.25-servicing.23518.6 + 6.0.25 + 6.0.25 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.319 + 6.0.320 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) From 06880423f1608828ccd53d01d1ccedae3117c7db Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 19 Oct 2023 18:45:19 +0000 Subject: [PATCH 045/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231018.47 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.125-servicing.23518.29 -> To Version 6.0.125-servicing.23518.47 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,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,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.6.0 From Version 6.0.24 -> To Version 6.0.25 (parent: Microsoft.NET.Sdk --- NuGet.config | 16 ++++----- eng/Version.Details.xml | 80 ++++++++++++++++++++--------------------- eng/Versions.props | 32 ++++++++--------- 3 files changed, 64 insertions(+), 64 deletions(-) diff --git a/NuGet.config b/NuGet.config index d7a6fab56..f271150ec 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,20 +7,20 @@ - + - + - + - + @@ -41,17 +41,17 @@ - + - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a6c522fd2..84c728770 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5a32973319c74b856f132afb513ac44837d2b2aa + 88d6726a7d0f4b1ccf4e3ca3957dbf81677216c3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5a32973319c74b856f132afb513ac44837d2b2aa + 88d6726a7d0f4b1ccf4e3ca3957dbf81677216c3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5a32973319c74b856f132afb513ac44837d2b2aa + 88d6726a7d0f4b1ccf4e3ca3957dbf81677216c3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5a32973319c74b856f132afb513ac44837d2b2aa + 88d6726a7d0f4b1ccf4e3ca3957dbf81677216c3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cb5bcd2b394eaf9f079b67ab980e193e1d1ccadd + 5f9d5a6664bfe9bf832babe09b13a475b9e7f479 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cb5bcd2b394eaf9f079b67ab980e193e1d1ccadd + 5f9d5a6664bfe9bf832babe09b13a475b9e7f479 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cb5bcd2b394eaf9f079b67ab980e193e1d1ccadd + 5f9d5a6664bfe9bf832babe09b13a475b9e7f479 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cb5bcd2b394eaf9f079b67ab980e193e1d1ccadd + 5f9d5a6664bfe9bf832babe09b13a475b9e7f479 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cb5bcd2b394eaf9f079b67ab980e193e1d1ccadd + 5f9d5a6664bfe9bf832babe09b13a475b9e7f479 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cb5bcd2b394eaf9f079b67ab980e193e1d1ccadd + 5f9d5a6664bfe9bf832babe09b13a475b9e7f479 @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - caada2338902a9524eb87fdab853eba77db52974 + c81c53cd507ae3699ef60e6a02be0b1984d00452 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - caada2338902a9524eb87fdab853eba77db52974 + c81c53cd507ae3699ef60e6a02be0b1984d00452 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - caada2338902a9524eb87fdab853eba77db52974 + c81c53cd507ae3699ef60e6a02be0b1984d00452 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - caada2338902a9524eb87fdab853eba77db52974 + c81c53cd507ae3699ef60e6a02be0b1984d00452 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - caada2338902a9524eb87fdab853eba77db52974 + c81c53cd507ae3699ef60e6a02be0b1984d00452 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - caada2338902a9524eb87fdab853eba77db52974 + c81c53cd507ae3699ef60e6a02be0b1984d00452 https://github.com/dotnet/test-templates @@ -90,36 +90,36 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 568bc4059aec754311fce7a2d8106ab29ec1c0b0 + e87581dd7461f50f79d0bbc907f455b58603df27 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 568bc4059aec754311fce7a2d8106ab29ec1c0b0 + e87581dd7461f50f79d0bbc907f455b58603df27 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 568bc4059aec754311fce7a2d8106ab29ec1c0b0 + e87581dd7461f50f79d0bbc907f455b58603df27 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 22921fb9b8e0bec351e9b63aef8182427d3ec7d1 + 0b0837a07e0fb11ee75c2508ef246ff36fde5c78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 22921fb9b8e0bec351e9b63aef8182427d3ec7d1 + 0b0837a07e0fb11ee75c2508ef246ff36fde5c78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - c1396d66ff3d595b912cd5f96d6f4651427ecfcd + f74130bc3ca3b606a18011ad64ac37a7ee77d514 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 54f99d916b6630956d732099722d5e4dbfcd2825 + e1722e80b8f688100d15b4b794f17e1a1779e286 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 82237409c..395dc30f4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,15 +23,15 @@ - 6.0.24-servicing.23513.4 + 6.0.24-servicing.23516.5 - 6.0.24-servicing.23516.7 + 6.0.24-servicing.23517.2 - 6.0.124 + 6.0.125 @@ -46,18 +46,18 @@ 6.0.24 6.0.24 - 6.0.24-servicing.23517.3 - 6.0.24-servicing.23517.3 - 6.0.24-servicing.23517.3 - 6.0.24-servicing.23517.3 + 6.0.24-servicing.23517.11 + 6.0.24-servicing.23517.11 + 6.0.24-servicing.23517.11 + 6.0.24-servicing.23517.11 0.2.0 - 6.0.125-servicing.23518.29 - 6.0.125-servicing.23518.29 + 6.0.125-servicing.23518.47 + 6.0.125-servicing.23518.47 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.24-servicing.23516.31 - 6.0.24-servicing.23516.31 + 6.0.24-servicing.23517.17 + 6.0.24-servicing.23517.17 6.0.24 6.0.24 6.0.24 @@ -78,10 +78,10 @@ - 6.0.24-servicing.23517.3 - 6.0.24-servicing.23517.3 - 6.0.24 - 6.0.24 + 6.0.25-servicing.23518.6 + 6.0.25-servicing.23518.6 + 6.0.25 + 6.0.25 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.124 + 6.0.125 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) From 787886101e731065e1cb46be597775f2d8e49c51 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 19 Oct 2023 19:32:14 +0000 Subject: [PATCH 046/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231019.21 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.417-servicing.23518.49 -> To Version 6.0.417-servicing.23519.21 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,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,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.25 (parent: Microsoft.NET.Sdk --- NuGet.config | 16 ++++----- eng/Version.Details.xml | 80 ++++++++++++++++++++--------------------- eng/Versions.props | 32 ++++++++--------- 3 files changed, 64 insertions(+), 64 deletions(-) diff --git a/NuGet.config b/NuGet.config index edf7a1141..611eb0d5d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,20 +7,20 @@ - + - + - + - + @@ -41,16 +41,16 @@ - + - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1b887c2ce..f4c97df55 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,44 +3,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 88d6726a7d0f4b1ccf4e3ca3957dbf81677216c3 + b9a0fd905cadfbe7c915f97f1a7ea1129c29d949 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 88d6726a7d0f4b1ccf4e3ca3957dbf81677216c3 + b9a0fd905cadfbe7c915f97f1a7ea1129c29d949 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 88d6726a7d0f4b1ccf4e3ca3957dbf81677216c3 + b9a0fd905cadfbe7c915f97f1a7ea1129c29d949 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 88d6726a7d0f4b1ccf4e3ca3957dbf81677216c3 + b9a0fd905cadfbe7c915f97f1a7ea1129c29d949 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5f9d5a6664bfe9bf832babe09b13a475b9e7f479 + d7b9518372d8e9988e62154d73453e7df508df2c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5f9d5a6664bfe9bf832babe09b13a475b9e7f479 + d7b9518372d8e9988e62154d73453e7df508df2c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5f9d5a6664bfe9bf832babe09b13a475b9e7f479 + d7b9518372d8e9988e62154d73453e7df508df2c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5f9d5a6664bfe9bf832babe09b13a475b9e7f479 + d7b9518372d8e9988e62154d73453e7df508df2c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5f9d5a6664bfe9bf832babe09b13a475b9e7f479 + d7b9518372d8e9988e62154d73453e7df508df2c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5f9d5a6664bfe9bf832babe09b13a475b9e7f479 + d7b9518372d8e9988e62154d73453e7df508df2c @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c81c53cd507ae3699ef60e6a02be0b1984d00452 + 9f5e433f881aea5968fc5a9acb2c5131f3956794 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c81c53cd507ae3699ef60e6a02be0b1984d00452 + 9f5e433f881aea5968fc5a9acb2c5131f3956794 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c81c53cd507ae3699ef60e6a02be0b1984d00452 + 9f5e433f881aea5968fc5a9acb2c5131f3956794 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c81c53cd507ae3699ef60e6a02be0b1984d00452 + 9f5e433f881aea5968fc5a9acb2c5131f3956794 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c81c53cd507ae3699ef60e6a02be0b1984d00452 + 9f5e433f881aea5968fc5a9acb2c5131f3956794 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c81c53cd507ae3699ef60e6a02be0b1984d00452 + 9f5e433f881aea5968fc5a9acb2c5131f3956794 https://github.com/dotnet/test-templates @@ -92,34 +92,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 1f517c83fb26e346ded88c5f5a3efa04302b23d9 + 8e4c93344f8dd182a2b71513c4cb5b6054606afe - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 1f517c83fb26e346ded88c5f5a3efa04302b23d9 + 8e4c93344f8dd182a2b71513c4cb5b6054606afe https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 1f517c83fb26e346ded88c5f5a3efa04302b23d9 + 8e4c93344f8dd182a2b71513c4cb5b6054606afe - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7786a00f8f7f7bb0bbccedcb8ee7c232e7df837c + 360b0f2714f315e8a84f3846f541385b119f52fb - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7786a00f8f7f7bb0bbccedcb8ee7c232e7df837c + 360b0f2714f315e8a84f3846f541385b119f52fb - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - f74130bc3ca3b606a18011ad64ac37a7ee77d514 + 36b5a159142e33ab521c9539cd0bc92667f4b936 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - e1722e80b8f688100d15b4b794f17e1a1779e286 + 38e9bcc8ba97ba9f230975df106754d27ad98401 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 7c2f4761a..adcbf236b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.24-servicing.23516.5 + 6.0.24-servicing.23517.8 - 6.0.24-servicing.23517.2 + 6.0.24-servicing.23517.5 @@ -46,18 +46,18 @@ 6.0.24 6.0.24 - 6.0.24-servicing.23517.11 - 6.0.24-servicing.23517.11 - 6.0.24-servicing.23517.11 - 6.0.24-servicing.23517.11 + 6.0.24-servicing.23518.18 + 6.0.24-servicing.23518.18 + 6.0.24-servicing.23518.18 + 6.0.24-servicing.23518.18 0.2.0 - 6.0.417-servicing.23518.49 - 6.0.417-servicing.23518.49 + 6.0.417-servicing.23519.21 + 6.0.417-servicing.23519.21 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,18 +68,18 @@ - 6.0.24-servicing.23517.17 - 6.0.24-servicing.23517.17 - 6.0.24 - 6.0.24 - 6.0.24 - 6.0.24 + 6.0.25-servicing.23518.22 + 6.0.25-servicing.23518.22 + 6.0.25 + 6.0.25 + 6.0.25 + 6.0.25 2.1.0 - 6.0.25-servicing.23518.6 - 6.0.25-servicing.23518.6 + 6.0.25-servicing.23518.9 + 6.0.25-servicing.23518.9 6.0.25 6.0.25 From 0790110b35b0761dc815f53f34d4737adc509048 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 19 Oct 2023 19:32:40 +0000 Subject: [PATCH 047/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231019.24 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.320-servicing.23518.48 -> To Version 6.0.320-servicing.23519.24 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,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,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.25 (parent: Microsoft.NET.Sdk --- NuGet.config | 16 ++++----- eng/Version.Details.xml | 80 ++++++++++++++++++++--------------------- eng/Versions.props | 32 ++++++++--------- 3 files changed, 64 insertions(+), 64 deletions(-) diff --git a/NuGet.config b/NuGet.config index c12543dc7..4be1091d2 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,20 +7,20 @@ - + - + - + - + @@ -41,15 +41,15 @@ - + - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8b56c64bf..3942ff9b2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,44 +3,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 88d6726a7d0f4b1ccf4e3ca3957dbf81677216c3 + b9a0fd905cadfbe7c915f97f1a7ea1129c29d949 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 88d6726a7d0f4b1ccf4e3ca3957dbf81677216c3 + b9a0fd905cadfbe7c915f97f1a7ea1129c29d949 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 88d6726a7d0f4b1ccf4e3ca3957dbf81677216c3 + b9a0fd905cadfbe7c915f97f1a7ea1129c29d949 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 88d6726a7d0f4b1ccf4e3ca3957dbf81677216c3 + b9a0fd905cadfbe7c915f97f1a7ea1129c29d949 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5f9d5a6664bfe9bf832babe09b13a475b9e7f479 + d7b9518372d8e9988e62154d73453e7df508df2c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5f9d5a6664bfe9bf832babe09b13a475b9e7f479 + d7b9518372d8e9988e62154d73453e7df508df2c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5f9d5a6664bfe9bf832babe09b13a475b9e7f479 + d7b9518372d8e9988e62154d73453e7df508df2c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5f9d5a6664bfe9bf832babe09b13a475b9e7f479 + d7b9518372d8e9988e62154d73453e7df508df2c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5f9d5a6664bfe9bf832babe09b13a475b9e7f479 + d7b9518372d8e9988e62154d73453e7df508df2c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5f9d5a6664bfe9bf832babe09b13a475b9e7f479 + d7b9518372d8e9988e62154d73453e7df508df2c @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c81c53cd507ae3699ef60e6a02be0b1984d00452 + 9f5e433f881aea5968fc5a9acb2c5131f3956794 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c81c53cd507ae3699ef60e6a02be0b1984d00452 + 9f5e433f881aea5968fc5a9acb2c5131f3956794 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c81c53cd507ae3699ef60e6a02be0b1984d00452 + 9f5e433f881aea5968fc5a9acb2c5131f3956794 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c81c53cd507ae3699ef60e6a02be0b1984d00452 + 9f5e433f881aea5968fc5a9acb2c5131f3956794 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c81c53cd507ae3699ef60e6a02be0b1984d00452 + 9f5e433f881aea5968fc5a9acb2c5131f3956794 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c81c53cd507ae3699ef60e6a02be0b1984d00452 + 9f5e433f881aea5968fc5a9acb2c5131f3956794 https://github.com/dotnet/test-templates @@ -92,34 +92,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - e92b5823af697ff169d8e4235c731dc87c84abbb + 0eaf582ac259a2a13774e0251aaebd2b28b24e29 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - e92b5823af697ff169d8e4235c731dc87c84abbb + 0eaf582ac259a2a13774e0251aaebd2b28b24e29 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - e92b5823af697ff169d8e4235c731dc87c84abbb + 0eaf582ac259a2a13774e0251aaebd2b28b24e29 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2866dbcb41a3d8ee6741cc7239cb46e8fd4b0c57 + c0fd03dbad7ac94bc2ce037617dacaffd2b2e353 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2866dbcb41a3d8ee6741cc7239cb46e8fd4b0c57 + c0fd03dbad7ac94bc2ce037617dacaffd2b2e353 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - f74130bc3ca3b606a18011ad64ac37a7ee77d514 + 36b5a159142e33ab521c9539cd0bc92667f4b936 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - e1722e80b8f688100d15b4b794f17e1a1779e286 + 38e9bcc8ba97ba9f230975df106754d27ad98401 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 38f74fd3a..7a7fc3dbd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.24-servicing.23516.5 + 6.0.24-servicing.23517.8 - 6.0.24-servicing.23517.2 + 6.0.24-servicing.23517.5 @@ -46,18 +46,18 @@ 6.0.24 6.0.24 - 6.0.24-servicing.23517.11 - 6.0.24-servicing.23517.11 - 6.0.24-servicing.23517.11 - 6.0.24-servicing.23517.11 + 6.0.24-servicing.23518.18 + 6.0.24-servicing.23518.18 + 6.0.24-servicing.23518.18 + 6.0.24-servicing.23518.18 0.2.0 - 6.0.320-servicing.23518.48 - 6.0.320-servicing.23518.48 + 6.0.320-servicing.23519.24 + 6.0.320-servicing.23519.24 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,18 +68,18 @@ - 6.0.24-servicing.23517.17 - 6.0.24-servicing.23517.17 - 6.0.24 - 6.0.24 - 6.0.24 - 6.0.24 + 6.0.25-servicing.23518.22 + 6.0.25-servicing.23518.22 + 6.0.25 + 6.0.25 + 6.0.25 + 6.0.25 2.1.0 - 6.0.25-servicing.23518.6 - 6.0.25-servicing.23518.6 + 6.0.25-servicing.23518.9 + 6.0.25-servicing.23518.9 6.0.25 6.0.25 From 1782d26b3d9c3c26826aca19ee5ec7463bff85c3 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 19 Oct 2023 22:49:11 +0000 Subject: [PATCH 048/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231019.52 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.417-servicing.23518.49 -> To Version 6.0.417-servicing.23519.52 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,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,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.25 (parent: Microsoft.NET.Sdk --- NuGet.config | 12 ++++----- eng/Version.Details.xml | 60 ++++++++++++++++++++--------------------- eng/Versions.props | 24 ++++++++--------- 3 files changed, 48 insertions(+), 48 deletions(-) diff --git a/NuGet.config b/NuGet.config index 611eb0d5d..c9f651954 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -17,10 +17,10 @@ - + - + @@ -41,16 +41,16 @@ - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f4c97df55..4693ec63f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - b9a0fd905cadfbe7c915f97f1a7ea1129c29d949 + 7a8ee66adb20d70b1403a3a5142ed305e8699f5e - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - b9a0fd905cadfbe7c915f97f1a7ea1129c29d949 + 7a8ee66adb20d70b1403a3a5142ed305e8699f5e - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - b9a0fd905cadfbe7c915f97f1a7ea1129c29d949 + 7a8ee66adb20d70b1403a3a5142ed305e8699f5e https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - b9a0fd905cadfbe7c915f97f1a7ea1129c29d949 + 7a8ee66adb20d70b1403a3a5142ed305e8699f5e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime a08d9ce2caf02455c0b825bcdc32974bdf769a80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9f5e433f881aea5968fc5a9acb2c5131f3956794 + 0fc7d670f4e51b903722a1a9d8e0bac0e1673d46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9f5e433f881aea5968fc5a9acb2c5131f3956794 + 0fc7d670f4e51b903722a1a9d8e0bac0e1673d46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9f5e433f881aea5968fc5a9acb2c5131f3956794 + 0fc7d670f4e51b903722a1a9d8e0bac0e1673d46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9f5e433f881aea5968fc5a9acb2c5131f3956794 + 0fc7d670f4e51b903722a1a9d8e0bac0e1673d46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9f5e433f881aea5968fc5a9acb2c5131f3956794 + 0fc7d670f4e51b903722a1a9d8e0bac0e1673d46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9f5e433f881aea5968fc5a9acb2c5131f3956794 + 0fc7d670f4e51b903722a1a9d8e0bac0e1673d46 https://github.com/dotnet/test-templates @@ -92,34 +92,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 8e4c93344f8dd182a2b71513c4cb5b6054606afe + ce18965fe0cdaaf3676d74620365f9c1fb124ffb - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 8e4c93344f8dd182a2b71513c4cb5b6054606afe + ce18965fe0cdaaf3676d74620365f9c1fb124ffb https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 8e4c93344f8dd182a2b71513c4cb5b6054606afe + ce18965fe0cdaaf3676d74620365f9c1fb124ffb - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 360b0f2714f315e8a84f3846f541385b119f52fb + c87879bb8ea4cb9022b61c3d919cd8ddc3eeef46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 360b0f2714f315e8a84f3846f541385b119f52fb + c87879bb8ea4cb9022b61c3d919cd8ddc3eeef46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 36b5a159142e33ab521c9539cd0bc92667f4b936 + 20b3a0a3c77fe77e6f8e1aaa5348fc78228693ab - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 38e9bcc8ba97ba9f230975df106754d27ad98401 + b0a02caf5d0dd6f56f073d6616d5a3501854f632 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index adcbf236b..32f07a80b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.24-servicing.23517.8 + 6.0.25-servicing.23518.2 - 6.0.24-servicing.23517.5 + 6.0.25-servicing.23518.13 @@ -44,20 +44,20 @@ - 6.0.24 - 6.0.24 - 6.0.24-servicing.23518.18 - 6.0.24-servicing.23518.18 - 6.0.24-servicing.23518.18 - 6.0.24-servicing.23518.18 + 6.0.25 + 6.0.25 + 6.0.25-servicing.23519.7 + 6.0.25-servicing.23519.7 + 6.0.25-servicing.23519.7 + 6.0.25-servicing.23519.7 0.2.0 - 6.0.417-servicing.23519.21 - 6.0.417-servicing.23519.21 + 6.0.417-servicing.23519.52 + 6.0.417-servicing.23519.52 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.25-servicing.23518.9 - 6.0.25-servicing.23518.9 + 6.0.25-servicing.23519.5 + 6.0.25-servicing.23519.5 6.0.25 6.0.25 From 7f11ce7011af0304ba33ba6151f36e0d219f7886 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 20 Oct 2023 04:53:25 +0000 Subject: [PATCH 049/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231019.53 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.320-servicing.23519.24 -> To Version 6.0.320-servicing.23519.53 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,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,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.25 (parent: Microsoft.NET.Sdk --- NuGet.config | 12 ++++----- eng/Version.Details.xml | 60 ++++++++++++++++++++--------------------- eng/Versions.props | 24 ++++++++--------- 3 files changed, 48 insertions(+), 48 deletions(-) diff --git a/NuGet.config b/NuGet.config index 4be1091d2..f3c2237e6 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -17,10 +17,10 @@ - + - + @@ -41,15 +41,15 @@ - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3942ff9b2..721d23658 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - b9a0fd905cadfbe7c915f97f1a7ea1129c29d949 + 7a8ee66adb20d70b1403a3a5142ed305e8699f5e - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - b9a0fd905cadfbe7c915f97f1a7ea1129c29d949 + 7a8ee66adb20d70b1403a3a5142ed305e8699f5e - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - b9a0fd905cadfbe7c915f97f1a7ea1129c29d949 + 7a8ee66adb20d70b1403a3a5142ed305e8699f5e https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - b9a0fd905cadfbe7c915f97f1a7ea1129c29d949 + 7a8ee66adb20d70b1403a3a5142ed305e8699f5e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime a08d9ce2caf02455c0b825bcdc32974bdf769a80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9f5e433f881aea5968fc5a9acb2c5131f3956794 + 0fc7d670f4e51b903722a1a9d8e0bac0e1673d46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9f5e433f881aea5968fc5a9acb2c5131f3956794 + 0fc7d670f4e51b903722a1a9d8e0bac0e1673d46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9f5e433f881aea5968fc5a9acb2c5131f3956794 + 0fc7d670f4e51b903722a1a9d8e0bac0e1673d46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9f5e433f881aea5968fc5a9acb2c5131f3956794 + 0fc7d670f4e51b903722a1a9d8e0bac0e1673d46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9f5e433f881aea5968fc5a9acb2c5131f3956794 + 0fc7d670f4e51b903722a1a9d8e0bac0e1673d46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9f5e433f881aea5968fc5a9acb2c5131f3956794 + 0fc7d670f4e51b903722a1a9d8e0bac0e1673d46 https://github.com/dotnet/test-templates @@ -92,34 +92,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 0eaf582ac259a2a13774e0251aaebd2b28b24e29 + e936b09bf9de0a8473a0e8964e43da4405bcc093 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 0eaf582ac259a2a13774e0251aaebd2b28b24e29 + e936b09bf9de0a8473a0e8964e43da4405bcc093 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 0eaf582ac259a2a13774e0251aaebd2b28b24e29 + e936b09bf9de0a8473a0e8964e43da4405bcc093 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c0fd03dbad7ac94bc2ce037617dacaffd2b2e353 + 26a6bc21dd600fcd10e9acccfaf332ae35efa381 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c0fd03dbad7ac94bc2ce037617dacaffd2b2e353 + 26a6bc21dd600fcd10e9acccfaf332ae35efa381 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 36b5a159142e33ab521c9539cd0bc92667f4b936 + 20b3a0a3c77fe77e6f8e1aaa5348fc78228693ab - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 38e9bcc8ba97ba9f230975df106754d27ad98401 + b0a02caf5d0dd6f56f073d6616d5a3501854f632 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 7a7fc3dbd..0743ece5d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.24-servicing.23517.8 + 6.0.25-servicing.23518.2 - 6.0.24-servicing.23517.5 + 6.0.25-servicing.23518.13 @@ -44,20 +44,20 @@ - 6.0.24 - 6.0.24 - 6.0.24-servicing.23518.18 - 6.0.24-servicing.23518.18 - 6.0.24-servicing.23518.18 - 6.0.24-servicing.23518.18 + 6.0.25 + 6.0.25 + 6.0.25-servicing.23519.7 + 6.0.25-servicing.23519.7 + 6.0.25-servicing.23519.7 + 6.0.25-servicing.23519.7 0.2.0 - 6.0.320-servicing.23519.24 - 6.0.320-servicing.23519.24 + 6.0.320-servicing.23519.53 + 6.0.320-servicing.23519.53 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.25-servicing.23518.9 - 6.0.25-servicing.23518.9 + 6.0.25-servicing.23519.5 + 6.0.25-servicing.23519.5 6.0.25 6.0.25 From 419d2b12feda101dbea40dd32d4e24644c0f5ef2 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 20 Oct 2023 04:55:40 +0000 Subject: [PATCH 050/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231019.26 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.125-servicing.23518.47 -> To Version 6.0.125-servicing.23519.26 --- 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 84c728770..09acedabf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating e87581dd7461f50f79d0bbc907f455b58603df27 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0b0837a07e0fb11ee75c2508ef246ff36fde5c78 + 0f2d779e483f3e73bf85dd997df11e2e9ba9e0d2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0b0837a07e0fb11ee75c2508ef246ff36fde5c78 + 0f2d779e483f3e73bf85dd997df11e2e9ba9e0d2 diff --git a/eng/Versions.props b/eng/Versions.props index 118b2ef92..3cd7363c2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.125-servicing.23518.47 - 6.0.125-servicing.23518.47 + 6.0.125-servicing.23519.26 + 6.0.125-servicing.23519.26 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From ccaa3858edc91bdbb2ccbb5fdcfcfc5a5007e019 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 20 Oct 2023 04:55:48 +0000 Subject: [PATCH 051/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231019.54 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.125-servicing.23519.26 -> To Version 6.0.125-servicing.23519.54 --- 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 09acedabf..d10b4f2d5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating e87581dd7461f50f79d0bbc907f455b58603df27 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0f2d779e483f3e73bf85dd997df11e2e9ba9e0d2 + 242714167d7ec659bf372fe545164214267489c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0f2d779e483f3e73bf85dd997df11e2e9ba9e0d2 + 242714167d7ec659bf372fe545164214267489c1 diff --git a/eng/Versions.props b/eng/Versions.props index 3cd7363c2..95d7d9fe8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.125-servicing.23519.26 - 6.0.125-servicing.23519.26 + 6.0.125-servicing.23519.54 + 6.0.125-servicing.23519.54 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 6bb0f11159c9fef115ca9646321aa333e0e673e6 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 20 Oct 2023 04:55:55 +0000 Subject: [PATCH 052/535] Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,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,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.6.0 From Version 6.0.25 -> To Version 6.0.25 (parent: Microsoft.NET.Sdk --- NuGet.config | 16 ++++----- eng/Version.Details.xml | 76 ++++++++++++++++++++--------------------- eng/Versions.props | 32 ++++++++--------- 3 files changed, 62 insertions(+), 62 deletions(-) diff --git a/NuGet.config b/NuGet.config index f271150ec..f5fd38f5b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,20 +7,20 @@ - + - + - + - + @@ -41,17 +41,17 @@ - + - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d10b4f2d5..e1fff280f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,44 +3,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 88d6726a7d0f4b1ccf4e3ca3957dbf81677216c3 + 7a8ee66adb20d70b1403a3a5142ed305e8699f5e - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 88d6726a7d0f4b1ccf4e3ca3957dbf81677216c3 + 7a8ee66adb20d70b1403a3a5142ed305e8699f5e - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 88d6726a7d0f4b1ccf4e3ca3957dbf81677216c3 + 7a8ee66adb20d70b1403a3a5142ed305e8699f5e https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 88d6726a7d0f4b1ccf4e3ca3957dbf81677216c3 + 7a8ee66adb20d70b1403a3a5142ed305e8699f5e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5f9d5a6664bfe9bf832babe09b13a475b9e7f479 + d7b9518372d8e9988e62154d73453e7df508df2c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5f9d5a6664bfe9bf832babe09b13a475b9e7f479 + d7b9518372d8e9988e62154d73453e7df508df2c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5f9d5a6664bfe9bf832babe09b13a475b9e7f479 + d7b9518372d8e9988e62154d73453e7df508df2c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5f9d5a6664bfe9bf832babe09b13a475b9e7f479 + d7b9518372d8e9988e62154d73453e7df508df2c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5f9d5a6664bfe9bf832babe09b13a475b9e7f479 + d7b9518372d8e9988e62154d73453e7df508df2c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5f9d5a6664bfe9bf832babe09b13a475b9e7f479 + d7b9518372d8e9988e62154d73453e7df508df2c @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime a08d9ce2caf02455c0b825bcdc32974bdf769a80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c81c53cd507ae3699ef60e6a02be0b1984d00452 + 0fc7d670f4e51b903722a1a9d8e0bac0e1673d46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c81c53cd507ae3699ef60e6a02be0b1984d00452 + 0fc7d670f4e51b903722a1a9d8e0bac0e1673d46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c81c53cd507ae3699ef60e6a02be0b1984d00452 + 0fc7d670f4e51b903722a1a9d8e0bac0e1673d46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c81c53cd507ae3699ef60e6a02be0b1984d00452 + 0fc7d670f4e51b903722a1a9d8e0bac0e1673d46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c81c53cd507ae3699ef60e6a02be0b1984d00452 + 0fc7d670f4e51b903722a1a9d8e0bac0e1673d46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c81c53cd507ae3699ef60e6a02be0b1984d00452 + 0fc7d670f4e51b903722a1a9d8e0bac0e1673d46 https://github.com/dotnet/test-templates @@ -92,16 +92,16 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - e87581dd7461f50f79d0bbc907f455b58603df27 + 09a2091e07d334d42f6b441ae845f854622326cc - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - e87581dd7461f50f79d0bbc907f455b58603df27 + 09a2091e07d334d42f6b441ae845f854622326cc https://dev.azure.com/dnceng/internal/_git/dotnet-templating - e87581dd7461f50f79d0bbc907f455b58603df27 + 09a2091e07d334d42f6b441ae845f854622326cc https://dev.azure.com/dnceng/internal/_git/dotnet-sdk @@ -113,13 +113,13 @@ 242714167d7ec659bf372fe545164214267489c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - f74130bc3ca3b606a18011ad64ac37a7ee77d514 + 20b3a0a3c77fe77e6f8e1aaa5348fc78228693ab - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - e1722e80b8f688100d15b4b794f17e1a1779e286 + b0a02caf5d0dd6f56f073d6616d5a3501854f632 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 95d7d9fe8..618f76dae 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.24-servicing.23516.5 + 6.0.25-servicing.23518.2 - 6.0.24-servicing.23517.2 + 6.0.25-servicing.23518.13 @@ -44,12 +44,12 @@ - 6.0.24 - 6.0.24 - 6.0.24-servicing.23517.11 - 6.0.24-servicing.23517.11 - 6.0.24-servicing.23517.11 - 6.0.24-servicing.23517.11 + 6.0.25 + 6.0.25 + 6.0.25-servicing.23519.7 + 6.0.25-servicing.23519.7 + 6.0.25-servicing.23519.7 + 6.0.25-servicing.23519.7 0.2.0 @@ -68,18 +68,18 @@ - 6.0.24-servicing.23517.17 - 6.0.24-servicing.23517.17 - 6.0.24 - 6.0.24 - 6.0.24 - 6.0.24 + 6.0.25-servicing.23518.22 + 6.0.25-servicing.23518.22 + 6.0.25 + 6.0.25 + 6.0.25 + 6.0.25 2.1.0 - 6.0.25-servicing.23518.6 - 6.0.25-servicing.23518.6 + 6.0.25-servicing.23519.5 + 6.0.25-servicing.23519.5 6.0.25 6.0.25 From f3deb351d704d35c301460804bdc195a5569aeca Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 20 Oct 2023 05:45:23 +0000 Subject: [PATCH 053/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231019.83 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.417-servicing.23519.52 -> To Version 6.0.417-servicing.23519.83 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.6.0,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 From Version 6.0.25-servicing.23518.22 -> To Version 6.0.25-servicing.23519.12 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 8 ++++---- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/NuGet.config b/NuGet.config index c9f651954..f8bae50c0 100644 --- a/NuGet.config +++ b/NuGet.config @@ -14,7 +14,7 @@ - + @@ -44,7 +44,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4693ec63f..55e842f9e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 7a8ee66adb20d70b1403a3a5142ed305e8699f5e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d7b9518372d8e9988e62154d73453e7df508df2c + 492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d7b9518372d8e9988e62154d73453e7df508df2c + 492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d7b9518372d8e9988e62154d73453e7df508df2c + 492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d7b9518372d8e9988e62154d73453e7df508df2c + 492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d7b9518372d8e9988e62154d73453e7df508df2c + 492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d7b9518372d8e9988e62154d73453e7df508df2c + 492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4 @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating ce18965fe0cdaaf3676d74620365f9c1fb124ffb - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c87879bb8ea4cb9022b61c3d919cd8ddc3eeef46 + bb537eda87a605857f5ae9eebe536aecbc98408a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c87879bb8ea4cb9022b61c3d919cd8ddc3eeef46 + bb537eda87a605857f5ae9eebe536aecbc98408a diff --git a/eng/Versions.props b/eng/Versions.props index 32f07a80b..ab439ad00 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.417-servicing.23519.52 - 6.0.417-servicing.23519.52 + 6.0.417-servicing.23519.83 + 6.0.417-servicing.23519.83 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.25-servicing.23518.22 - 6.0.25-servicing.23518.22 + 6.0.25-servicing.23519.12 + 6.0.25-servicing.23519.12 6.0.25 6.0.25 6.0.25 From 573cf82fb653ccda8633b5d60d039cb0d17abebe Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 20 Oct 2023 05:45:39 +0000 Subject: [PATCH 054/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231019.81 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.125-servicing.23519.54 -> To Version 6.0.125-servicing.23519.81 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,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NET.Workload.Emscripten.Manifest-6.0.100 From Version 6.0.25 -> To Version 6.0.25 (parent: Microsoft.NET.Sdk --- NuGet.config | 5 +++-- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 10 +++++----- 3 files changed, 22 insertions(+), 21 deletions(-) diff --git a/NuGet.config b/NuGet.config index f5fd38f5b..d92483f25 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,11 +10,12 @@ + - + @@ -46,7 +47,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e1fff280f..ac7f0a5c5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 7a8ee66adb20d70b1403a3a5142ed305e8699f5e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d7b9518372d8e9988e62154d73453e7df508df2c + 492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d7b9518372d8e9988e62154d73453e7df508df2c + 492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d7b9518372d8e9988e62154d73453e7df508df2c + 492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d7b9518372d8e9988e62154d73453e7df508df2c + 492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d7b9518372d8e9988e62154d73453e7df508df2c + 492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d7b9518372d8e9988e62154d73453e7df508df2c + 492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4 @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 09a2091e07d334d42f6b441ae845f854622326cc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 242714167d7ec659bf372fe545164214267489c1 + 4667ac66b721b1c1ea169c71a6b1c30abf11c969 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 242714167d7ec659bf372fe545164214267489c1 + 4667ac66b721b1c1ea169c71a6b1c30abf11c969 @@ -166,9 +166,9 @@ 698fdad58fa64a55f16cd9562c90224cc498ed02 - + https://github.com/dotnet/emsdk - 0b73b536f6e0d0a6143387439c3308db4db9fdfe + d8bc162ccf7ce14fdbec9c2c50d6e856a7063c91 https://github.com/dotnet/source-build diff --git a/eng/Versions.props b/eng/Versions.props index 618f76dae..2edcf0d1a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.125-servicing.23519.54 - 6.0.125-servicing.23519.54 + 6.0.125-servicing.23519.81 + 6.0.125-servicing.23519.81 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.25-servicing.23518.22 - 6.0.25-servicing.23518.22 + 6.0.25-servicing.23519.12 + 6.0.25-servicing.23519.12 6.0.25 6.0.25 6.0.25 @@ -185,7 +185,7 @@ 12.0.101-preview.9.31 15.0.101-preview.9.31 $(MicrosoftNETCoreAppRefPackageVersion) - 6.0.23 + 6.0.25 $(MicrosoftNETWorkloadEmscriptenManifest60100Version) From b1162036fbcfff63d9da8a2da50f628366707852 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 20 Oct 2023 05:46:02 +0000 Subject: [PATCH 055/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231019.82 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.320-servicing.23519.53 -> To Version 6.0.320-servicing.23519.82 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.6.0,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 From Version 6.0.25-servicing.23518.22 -> To Version 6.0.25-servicing.23519.12 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 8 ++++---- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/NuGet.config b/NuGet.config index f3c2237e6..fbb8744ae 100644 --- a/NuGet.config +++ b/NuGet.config @@ -14,7 +14,7 @@ - + @@ -44,7 +44,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 721d23658..03aca582f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 7a8ee66adb20d70b1403a3a5142ed305e8699f5e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d7b9518372d8e9988e62154d73453e7df508df2c + 492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d7b9518372d8e9988e62154d73453e7df508df2c + 492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d7b9518372d8e9988e62154d73453e7df508df2c + 492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d7b9518372d8e9988e62154d73453e7df508df2c + 492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d7b9518372d8e9988e62154d73453e7df508df2c + 492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d7b9518372d8e9988e62154d73453e7df508df2c + 492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4 @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating e936b09bf9de0a8473a0e8964e43da4405bcc093 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 26a6bc21dd600fcd10e9acccfaf332ae35efa381 + b7366aae088d555ab08fc57e69567ccea691b4e6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 26a6bc21dd600fcd10e9acccfaf332ae35efa381 + b7366aae088d555ab08fc57e69567ccea691b4e6 diff --git a/eng/Versions.props b/eng/Versions.props index 0743ece5d..b0ef76dee 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.320-servicing.23519.53 - 6.0.320-servicing.23519.53 + 6.0.320-servicing.23519.82 + 6.0.320-servicing.23519.82 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.25-servicing.23518.22 - 6.0.25-servicing.23518.22 + 6.0.25-servicing.23519.12 + 6.0.25-servicing.23519.12 6.0.25 6.0.25 6.0.25 From 72a161b24681354cf9513bd30f79bb412e127ec0 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 20 Oct 2023 06:34:52 +0000 Subject: [PATCH 056/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231019.91 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.417-servicing.23519.52 -> To Version 6.0.417-servicing.23519.91 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.6.0,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 From Version 6.0.25-servicing.23518.22 -> To Version 6.0.25-servicing.23519.12 (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 f8bae50c0..6559e9d6c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -41,7 +41,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 55e842f9e..e618f067f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0fc7d670f4e51b903722a1a9d8e0bac0e1673d46 + ad15e08a98e1d3697d4577631c6ffc1bfb07e904 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0fc7d670f4e51b903722a1a9d8e0bac0e1673d46 + ad15e08a98e1d3697d4577631c6ffc1bfb07e904 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0fc7d670f4e51b903722a1a9d8e0bac0e1673d46 + ad15e08a98e1d3697d4577631c6ffc1bfb07e904 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0fc7d670f4e51b903722a1a9d8e0bac0e1673d46 + ad15e08a98e1d3697d4577631c6ffc1bfb07e904 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0fc7d670f4e51b903722a1a9d8e0bac0e1673d46 + ad15e08a98e1d3697d4577631c6ffc1bfb07e904 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0fc7d670f4e51b903722a1a9d8e0bac0e1673d46 + ad15e08a98e1d3697d4577631c6ffc1bfb07e904 https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating ce18965fe0cdaaf3676d74620365f9c1fb124ffb - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - bb537eda87a605857f5ae9eebe536aecbc98408a + 052e58c70a5b81648817a701972795defff693ce - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - bb537eda87a605857f5ae9eebe536aecbc98408a + 052e58c70a5b81648817a701972795defff693ce diff --git a/eng/Versions.props b/eng/Versions.props index ab439ad00..1455eeeaf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.25 6.0.25 - 6.0.25-servicing.23519.7 - 6.0.25-servicing.23519.7 - 6.0.25-servicing.23519.7 - 6.0.25-servicing.23519.7 + 6.0.25-servicing.23519.17 + 6.0.25-servicing.23519.17 + 6.0.25-servicing.23519.17 + 6.0.25-servicing.23519.17 0.2.0 - 6.0.417-servicing.23519.83 - 6.0.417-servicing.23519.83 + 6.0.417-servicing.23519.91 + 6.0.417-servicing.23519.91 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 309221d4a91295eb09041df117055cc5ce544109 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 20 Oct 2023 06:36:27 +0000 Subject: [PATCH 057/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231019.93 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.320-servicing.23519.53 -> To Version 6.0.320-servicing.23519.93 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.6.0,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 From Version 6.0.25-servicing.23518.22 -> To Version 6.0.25-servicing.23519.12 (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 fbb8744ae..59107e7f3 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -41,7 +41,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 03aca582f..1e087399e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0fc7d670f4e51b903722a1a9d8e0bac0e1673d46 + ad15e08a98e1d3697d4577631c6ffc1bfb07e904 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0fc7d670f4e51b903722a1a9d8e0bac0e1673d46 + ad15e08a98e1d3697d4577631c6ffc1bfb07e904 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0fc7d670f4e51b903722a1a9d8e0bac0e1673d46 + ad15e08a98e1d3697d4577631c6ffc1bfb07e904 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0fc7d670f4e51b903722a1a9d8e0bac0e1673d46 + ad15e08a98e1d3697d4577631c6ffc1bfb07e904 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0fc7d670f4e51b903722a1a9d8e0bac0e1673d46 + ad15e08a98e1d3697d4577631c6ffc1bfb07e904 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0fc7d670f4e51b903722a1a9d8e0bac0e1673d46 + ad15e08a98e1d3697d4577631c6ffc1bfb07e904 https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating e936b09bf9de0a8473a0e8964e43da4405bcc093 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b7366aae088d555ab08fc57e69567ccea691b4e6 + 486d7ad115d528ebf6aeb5906050e85da5b58da8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b7366aae088d555ab08fc57e69567ccea691b4e6 + 486d7ad115d528ebf6aeb5906050e85da5b58da8 diff --git a/eng/Versions.props b/eng/Versions.props index b0ef76dee..5271a0ce5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.25 6.0.25 - 6.0.25-servicing.23519.7 - 6.0.25-servicing.23519.7 - 6.0.25-servicing.23519.7 - 6.0.25-servicing.23519.7 + 6.0.25-servicing.23519.17 + 6.0.25-servicing.23519.17 + 6.0.25-servicing.23519.17 + 6.0.25-servicing.23519.17 0.2.0 - 6.0.320-servicing.23519.82 - 6.0.320-servicing.23519.82 + 6.0.320-servicing.23519.93 + 6.0.320-servicing.23519.93 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 600e288ffe3cee206cc3d4f8c193c46d65626f6e Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 20 Oct 2023 06:46:46 +0000 Subject: [PATCH 058/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231019.92 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.125-servicing.23519.81 -> To Version 6.0.125-servicing.23519.92 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.25 -> To Version 6.0.25 (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 d92483f25..e0fe07940 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -42,7 +42,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ac7f0a5c5..2dd797935 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0fc7d670f4e51b903722a1a9d8e0bac0e1673d46 + ad15e08a98e1d3697d4577631c6ffc1bfb07e904 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0fc7d670f4e51b903722a1a9d8e0bac0e1673d46 + ad15e08a98e1d3697d4577631c6ffc1bfb07e904 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0fc7d670f4e51b903722a1a9d8e0bac0e1673d46 + ad15e08a98e1d3697d4577631c6ffc1bfb07e904 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0fc7d670f4e51b903722a1a9d8e0bac0e1673d46 + ad15e08a98e1d3697d4577631c6ffc1bfb07e904 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0fc7d670f4e51b903722a1a9d8e0bac0e1673d46 + ad15e08a98e1d3697d4577631c6ffc1bfb07e904 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0fc7d670f4e51b903722a1a9d8e0bac0e1673d46 + ad15e08a98e1d3697d4577631c6ffc1bfb07e904 https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 09a2091e07d334d42f6b441ae845f854622326cc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4667ac66b721b1c1ea169c71a6b1c30abf11c969 + 687313671a26d2a2b34c220a78b65a07dde4fd64 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4667ac66b721b1c1ea169c71a6b1c30abf11c969 + 687313671a26d2a2b34c220a78b65a07dde4fd64 diff --git a/eng/Versions.props b/eng/Versions.props index 2edcf0d1a..b27fe182f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.25 6.0.25 - 6.0.25-servicing.23519.7 - 6.0.25-servicing.23519.7 - 6.0.25-servicing.23519.7 - 6.0.25-servicing.23519.7 + 6.0.25-servicing.23519.17 + 6.0.25-servicing.23519.17 + 6.0.25-servicing.23519.17 + 6.0.25-servicing.23519.17 0.2.0 - 6.0.125-servicing.23519.81 - 6.0.125-servicing.23519.81 + 6.0.125-servicing.23519.92 + 6.0.125-servicing.23519.92 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 3105957ad59e6b4725d27132e32608bbcc005ae5 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 20 Oct 2023 20:05:15 +0000 Subject: [PATCH 059/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231020.19 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.417-servicing.23519.91 -> To Version 6.0.417-servicing.23520.19 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.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.25 (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 6559e9d6c..fd811c61d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -17,10 +17,10 @@ - + - + @@ -47,10 +47,10 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e618f067f..200fde590 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7a8ee66adb20d70b1403a3a5142ed305e8699f5e + a74946f8dae6d29fd18c8fc702e23f8fe77c729c - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7a8ee66adb20d70b1403a3a5142ed305e8699f5e + a74946f8dae6d29fd18c8fc702e23f8fe77c729c - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7a8ee66adb20d70b1403a3a5142ed305e8699f5e + a74946f8dae6d29fd18c8fc702e23f8fe77c729c https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7a8ee66adb20d70b1403a3a5142ed305e8699f5e + a74946f8dae6d29fd18c8fc702e23f8fe77c729c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -92,34 +92,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - ce18965fe0cdaaf3676d74620365f9c1fb124ffb + 42ab085a51763b862990e089c4b49e881d8b4e07 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - ce18965fe0cdaaf3676d74620365f9c1fb124ffb + 42ab085a51763b862990e089c4b49e881d8b4e07 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - ce18965fe0cdaaf3676d74620365f9c1fb124ffb + 42ab085a51763b862990e089c4b49e881d8b4e07 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 052e58c70a5b81648817a701972795defff693ce + f858ff1c05db3bd2b40d61c221ae2dc9c0fc8efe - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 052e58c70a5b81648817a701972795defff693ce + f858ff1c05db3bd2b40d61c221ae2dc9c0fc8efe - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 20b3a0a3c77fe77e6f8e1aaa5348fc78228693ab + d4ee94199afb6c67ed448c252a07c0747c089e41 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - b0a02caf5d0dd6f56f073d6616d5a3501854f632 + fcec4d8986bb8339964c429abd6e4651b968ff4f https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 1455eeeaf..e3574e768 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.25-servicing.23518.2 + 6.0.25-servicing.23519.16 - 6.0.25-servicing.23518.13 + 6.0.25-servicing.23519.18 @@ -56,8 +56,8 @@ - 6.0.417-servicing.23519.91 - 6.0.417-servicing.23519.91 + 6.0.417-servicing.23520.19 + 6.0.417-servicing.23520.19 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.25-servicing.23519.5 - 6.0.25-servicing.23519.5 + 6.0.25-servicing.23520.5 + 6.0.25-servicing.23520.5 6.0.25 6.0.25 From 52a05cf6bb4171d1c19cfd331edb15de7d55649a Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 20 Oct 2023 20:06:41 +0000 Subject: [PATCH 060/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231020.20 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.320-servicing.23519.93 -> To Version 6.0.320-servicing.23520.20 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.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.25 (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 59107e7f3..d23aa41a8 100644 --- a/NuGet.config +++ b/NuGet.config @@ -17,10 +17,10 @@ - + - + @@ -46,10 +46,10 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1e087399e..93185f7d6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7a8ee66adb20d70b1403a3a5142ed305e8699f5e + a74946f8dae6d29fd18c8fc702e23f8fe77c729c - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7a8ee66adb20d70b1403a3a5142ed305e8699f5e + a74946f8dae6d29fd18c8fc702e23f8fe77c729c - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7a8ee66adb20d70b1403a3a5142ed305e8699f5e + a74946f8dae6d29fd18c8fc702e23f8fe77c729c https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7a8ee66adb20d70b1403a3a5142ed305e8699f5e + a74946f8dae6d29fd18c8fc702e23f8fe77c729c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -92,34 +92,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - e936b09bf9de0a8473a0e8964e43da4405bcc093 + 6e525a642fe66413e4edf553f5bbc73ea5c866e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - e936b09bf9de0a8473a0e8964e43da4405bcc093 + 6e525a642fe66413e4edf553f5bbc73ea5c866e5 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - e936b09bf9de0a8473a0e8964e43da4405bcc093 + 6e525a642fe66413e4edf553f5bbc73ea5c866e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 486d7ad115d528ebf6aeb5906050e85da5b58da8 + aba9c2c28f7e7827da7f757669e823b3c3dc831c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 486d7ad115d528ebf6aeb5906050e85da5b58da8 + aba9c2c28f7e7827da7f757669e823b3c3dc831c - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 20b3a0a3c77fe77e6f8e1aaa5348fc78228693ab + d4ee94199afb6c67ed448c252a07c0747c089e41 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - b0a02caf5d0dd6f56f073d6616d5a3501854f632 + fcec4d8986bb8339964c429abd6e4651b968ff4f https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 5271a0ce5..3b06d84bb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.25-servicing.23518.2 + 6.0.25-servicing.23519.16 - 6.0.25-servicing.23518.13 + 6.0.25-servicing.23519.18 @@ -56,8 +56,8 @@ - 6.0.320-servicing.23519.93 - 6.0.320-servicing.23519.93 + 6.0.320-servicing.23520.20 + 6.0.320-servicing.23520.20 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.25-servicing.23519.5 - 6.0.25-servicing.23519.5 + 6.0.25-servicing.23520.5 + 6.0.25-servicing.23520.5 6.0.25 6.0.25 From 806583a1dac91c5d01c16351548f9fc1a66f8646 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 20 Oct 2023 20:07:53 +0000 Subject: [PATCH 061/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231020.21 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.125-servicing.23519.92 -> To Version 6.0.125-servicing.23520.21 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.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.25 (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 e0fe07940..049727a89 100644 --- a/NuGet.config +++ b/NuGet.config @@ -18,10 +18,10 @@ - + - + @@ -49,10 +49,10 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2dd797935..da95ff983 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7a8ee66adb20d70b1403a3a5142ed305e8699f5e + a74946f8dae6d29fd18c8fc702e23f8fe77c729c - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7a8ee66adb20d70b1403a3a5142ed305e8699f5e + a74946f8dae6d29fd18c8fc702e23f8fe77c729c - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7a8ee66adb20d70b1403a3a5142ed305e8699f5e + a74946f8dae6d29fd18c8fc702e23f8fe77c729c https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7a8ee66adb20d70b1403a3a5142ed305e8699f5e + a74946f8dae6d29fd18c8fc702e23f8fe77c729c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -92,34 +92,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 09a2091e07d334d42f6b441ae845f854622326cc + 7e5c0220b5ebe21277a6943f32ca92e666d30e37 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 09a2091e07d334d42f6b441ae845f854622326cc + 7e5c0220b5ebe21277a6943f32ca92e666d30e37 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 09a2091e07d334d42f6b441ae845f854622326cc + 7e5c0220b5ebe21277a6943f32ca92e666d30e37 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 687313671a26d2a2b34c220a78b65a07dde4fd64 + 1866438867ef81a3f0a32e78c0dee1d114a10a7e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 687313671a26d2a2b34c220a78b65a07dde4fd64 + 1866438867ef81a3f0a32e78c0dee1d114a10a7e - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 20b3a0a3c77fe77e6f8e1aaa5348fc78228693ab + d4ee94199afb6c67ed448c252a07c0747c089e41 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - b0a02caf5d0dd6f56f073d6616d5a3501854f632 + fcec4d8986bb8339964c429abd6e4651b968ff4f https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index b27fe182f..88f638af3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.25-servicing.23518.2 + 6.0.25-servicing.23519.16 - 6.0.25-servicing.23518.13 + 6.0.25-servicing.23519.18 @@ -56,8 +56,8 @@ - 6.0.125-servicing.23519.92 - 6.0.125-servicing.23519.92 + 6.0.125-servicing.23520.21 + 6.0.125-servicing.23520.21 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.25-servicing.23519.5 - 6.0.25-servicing.23519.5 + 6.0.25-servicing.23520.5 + 6.0.25-servicing.23520.5 6.0.25 6.0.25 From 58eb78b6a0629b7f860c1f1269a70e619bb6742a Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Mon, 23 Oct 2023 11:27:48 -0700 Subject: [PATCH 062/535] Add coherent dependency for emsdk on runtime and run an coherency update --- NuGet.config | 8 -------- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 4 ++-- 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index c8e5ee130..2cf5556c3 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,20 +7,16 @@ - - - - @@ -41,15 +37,11 @@ - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0c2c995c7..761812080 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -166,9 +166,9 @@ 698fdad58fa64a55f16cd9562c90224cc498ed02 - + https://github.com/dotnet/emsdk - 52e9452f82e26f9fcae791e84c082ae22f1ef66f + 3c754f28788fae642dc307a948479204e9f7dd5a https://github.com/dotnet/source-build diff --git a/eng/Versions.props b/eng/Versions.props index 709738fc7..b87703aab 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -185,8 +185,8 @@ 12.3.100-rc.1.125 15.4.100-rc.1.125 6.0.4 - 6.0.4 - $(MicrosoftNETWorkloadEmscriptenManifest60200Version) + 6.0.22 + $(MicrosoftNETWorkloadEmscriptenManifest60300Version) From 4e6318f73ab3bd391e96da68f2dea8fe8fa6f6f9 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Mon, 23 Oct 2023 11:53:20 -0700 Subject: [PATCH 063/535] Enable coherency dependency flow for emsdk --- NuGet.config | 24 ------------------------ eng/Version.Details.xml | 4 ++-- eng/Versions.props | 4 ++-- 3 files changed, 4 insertions(+), 28 deletions(-) diff --git a/NuGet.config b/NuGet.config index 9401b3f64..03d3587a6 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,22 +13,10 @@ - - - - - - - - - - - - @@ -51,22 +39,10 @@ - - - - - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 688060474..a9899d9f8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -166,9 +166,9 @@ 698fdad58fa64a55f16cd9562c90224cc498ed02 - + https://github.com/dotnet/emsdk - 52e9452f82e26f9fcae791e84c082ae22f1ef66f + 3c754f28788fae642dc307a948479204e9f7dd5a https://github.com/dotnet/source-build diff --git a/eng/Versions.props b/eng/Versions.props index dc111971f..c97437784 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -185,8 +185,8 @@ 12.3.303 15.4.303 6.0.5 - 6.0.4 - $(MicrosoftNETWorkloadEmscriptenManifest60200Version) + 6.0.22 + $(MicrosoftNETWorkloadEmscriptenManifest60400Version) From 61a27a32854c6b29d058095873ef0476ebbf46c5 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 24 Oct 2023 02:08:14 +0000 Subject: [PATCH 064/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231023.41 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.417-servicing.23520.19 -> To Version 6.0.417-servicing.23523.41 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.25 -> To Version 6.0.25 (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 fd811c61d..1f8067f09 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -41,7 +41,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 200fde590..e2ba4a8c9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ad15e08a98e1d3697d4577631c6ffc1bfb07e904 + 36be7ed6d6d56b7da0a2891e3de7ecc2aa48eecd - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ad15e08a98e1d3697d4577631c6ffc1bfb07e904 + 36be7ed6d6d56b7da0a2891e3de7ecc2aa48eecd https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ad15e08a98e1d3697d4577631c6ffc1bfb07e904 + 36be7ed6d6d56b7da0a2891e3de7ecc2aa48eecd - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ad15e08a98e1d3697d4577631c6ffc1bfb07e904 + 36be7ed6d6d56b7da0a2891e3de7ecc2aa48eecd - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ad15e08a98e1d3697d4577631c6ffc1bfb07e904 + 36be7ed6d6d56b7da0a2891e3de7ecc2aa48eecd - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ad15e08a98e1d3697d4577631c6ffc1bfb07e904 + 36be7ed6d6d56b7da0a2891e3de7ecc2aa48eecd https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 42ab085a51763b862990e089c4b49e881d8b4e07 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f858ff1c05db3bd2b40d61c221ae2dc9c0fc8efe + 964a8fda7fbf584c0301cffcde43c959e0ea0275 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f858ff1c05db3bd2b40d61c221ae2dc9c0fc8efe + 964a8fda7fbf584c0301cffcde43c959e0ea0275 diff --git a/eng/Versions.props b/eng/Versions.props index e3574e768..242fdbe89 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.25 6.0.25 - 6.0.25-servicing.23519.17 - 6.0.25-servicing.23519.17 - 6.0.25-servicing.23519.17 - 6.0.25-servicing.23519.17 + 6.0.25-servicing.23523.15 + 6.0.25-servicing.23523.15 + 6.0.25-servicing.23523.15 + 6.0.25-servicing.23523.15 0.2.0 - 6.0.417-servicing.23520.19 - 6.0.417-servicing.23520.19 + 6.0.417-servicing.23523.41 + 6.0.417-servicing.23523.41 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 40bbcfa2e2ab8bb71099070a057c0002d2af9925 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 24 Oct 2023 02:08:32 +0000 Subject: [PATCH 065/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231023.37 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.125-servicing.23520.21 -> To Version 6.0.125-servicing.23523.37 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.25 -> To Version 6.0.25 (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 049727a89..a735b4622 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -42,7 +42,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index da95ff983..d7af92d1e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ad15e08a98e1d3697d4577631c6ffc1bfb07e904 + 36be7ed6d6d56b7da0a2891e3de7ecc2aa48eecd - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ad15e08a98e1d3697d4577631c6ffc1bfb07e904 + 36be7ed6d6d56b7da0a2891e3de7ecc2aa48eecd https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ad15e08a98e1d3697d4577631c6ffc1bfb07e904 + 36be7ed6d6d56b7da0a2891e3de7ecc2aa48eecd - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ad15e08a98e1d3697d4577631c6ffc1bfb07e904 + 36be7ed6d6d56b7da0a2891e3de7ecc2aa48eecd - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ad15e08a98e1d3697d4577631c6ffc1bfb07e904 + 36be7ed6d6d56b7da0a2891e3de7ecc2aa48eecd - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ad15e08a98e1d3697d4577631c6ffc1bfb07e904 + 36be7ed6d6d56b7da0a2891e3de7ecc2aa48eecd https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 7e5c0220b5ebe21277a6943f32ca92e666d30e37 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1866438867ef81a3f0a32e78c0dee1d114a10a7e + a8b4ec801637f85c99edb62569b72d99c550da7e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1866438867ef81a3f0a32e78c0dee1d114a10a7e + a8b4ec801637f85c99edb62569b72d99c550da7e diff --git a/eng/Versions.props b/eng/Versions.props index 88f638af3..86ee689aa 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.25 6.0.25 - 6.0.25-servicing.23519.17 - 6.0.25-servicing.23519.17 - 6.0.25-servicing.23519.17 - 6.0.25-servicing.23519.17 + 6.0.25-servicing.23523.15 + 6.0.25-servicing.23523.15 + 6.0.25-servicing.23523.15 + 6.0.25-servicing.23523.15 0.2.0 - 6.0.125-servicing.23520.21 - 6.0.125-servicing.23520.21 + 6.0.125-servicing.23523.37 + 6.0.125-servicing.23523.37 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 763e59b735f8897681261d1dd917cc543a43e84a Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 24 Oct 2023 02:09:15 +0000 Subject: [PATCH 066/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231023.40 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.320-servicing.23520.20 -> To Version 6.0.320-servicing.23523.40 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.25 -> To Version 6.0.25 (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 d23aa41a8..df347d0f2 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -41,7 +41,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 93185f7d6..218fc77c7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ad15e08a98e1d3697d4577631c6ffc1bfb07e904 + 36be7ed6d6d56b7da0a2891e3de7ecc2aa48eecd - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ad15e08a98e1d3697d4577631c6ffc1bfb07e904 + 36be7ed6d6d56b7da0a2891e3de7ecc2aa48eecd https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ad15e08a98e1d3697d4577631c6ffc1bfb07e904 + 36be7ed6d6d56b7da0a2891e3de7ecc2aa48eecd - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ad15e08a98e1d3697d4577631c6ffc1bfb07e904 + 36be7ed6d6d56b7da0a2891e3de7ecc2aa48eecd - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ad15e08a98e1d3697d4577631c6ffc1bfb07e904 + 36be7ed6d6d56b7da0a2891e3de7ecc2aa48eecd - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ad15e08a98e1d3697d4577631c6ffc1bfb07e904 + 36be7ed6d6d56b7da0a2891e3de7ecc2aa48eecd https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 6e525a642fe66413e4edf553f5bbc73ea5c866e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - aba9c2c28f7e7827da7f757669e823b3c3dc831c + 733590df6146364699e0d3d8d465f2f8da15b063 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - aba9c2c28f7e7827da7f757669e823b3c3dc831c + 733590df6146364699e0d3d8d465f2f8da15b063 diff --git a/eng/Versions.props b/eng/Versions.props index 3b06d84bb..ffc00dd66 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.25 6.0.25 - 6.0.25-servicing.23519.17 - 6.0.25-servicing.23519.17 - 6.0.25-servicing.23519.17 - 6.0.25-servicing.23519.17 + 6.0.25-servicing.23523.15 + 6.0.25-servicing.23523.15 + 6.0.25-servicing.23523.15 + 6.0.25-servicing.23523.15 0.2.0 - 6.0.320-servicing.23520.20 - 6.0.320-servicing.23520.20 + 6.0.320-servicing.23523.40 + 6.0.320-servicing.23523.40 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 1b5e0e204956294804c290739a41e440d184d0af Mon Sep 17 00:00:00 2001 From: Nikola Milosavljevic Date: Tue, 24 Oct 2023 14:02:51 -0700 Subject: [PATCH 067/535] .NET Source-Build 6.0.124 October 2023 Updates (#17618) --- 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 84a2b235b..d7a82ec5d 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.123 + 6.0.124 diff --git a/src/SourceBuild/tarball/content/global.json b/src/SourceBuild/tarball/content/global.json index 20e7bdc4c..e64601b87 100644 --- a/src/SourceBuild/tarball/content/global.json +++ b/src/SourceBuild/tarball/content/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.123" + "dotnet": "6.0.124" }, "msbuild-sdks": { "Microsoft.Build.CentralPackageVersions": "2.0.1", From ec7d3cf9805f22616516f9007f2517a32a32534c Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 26 Oct 2023 20:36:03 +0000 Subject: [PATCH 068/535] Merged PR 34847: [internal/release/8.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.WindowsDesktop.App.Ref**: from 8.0.0-rtm.23524.1 to 8.0.0 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0**: from 8.0.0-rtm.23524.1 to 8.0.0-rtm.23526.4 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0**: from 8.0.0-rtm.23524.1 to 8.0.0-rtm.23526.4 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.8.0**: from 8.0.0-rtm.23523.12 to 8.0.0-rtm.23524.7 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 8.0.0 to 8.0.0 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.8.0**: from 8.0.0-rtm.23523.12 to 8.0.0-rtm.23524.7 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 8.0.0 to 8.0.0 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 8.0.0 to 8.0.0 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 8.0.0-rtm.23523.12 to 8.0.0-rtm.23524.7 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 8.0.0-rtm.23524.5 to 8.0.0-rtm.23524.15 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 8.0.0-rtm.23524.5 to 8.0.0-rtm.23524.15 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 8.0.0-rtm.23524.5 to 8.0.0-rtm.23524.15 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0**: from 8.0.0-rtm.23524.5 to 8.0.0-rtm.23524.15 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 8.0.0-rtm.23524.5 to 8.0.0-rtm.23524.15 (parent: Microsoft.NET.Sdk) - **dotnet-user-jwts**: from 8.0.0-rtm.23524.5 to 8.0.0-rtm.23524.15 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 8.0.0-rtm.23524.5 to 8.0.0-rtm.23524.15 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 8.0.0-rtm.23524.1 to 8.0.0 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 8.0.0-rtm.23524.1 to 8.0.0-rtm.23525.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 8.0.0-rtm.23524.1 to 8.0.0 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 8.0.0-rtm.23524.1 to 8.0.0-rtm.23526.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.NET.ILLink.Tasks**: from 8.0.0 to 8.0.0 (parent: Microsoft.NET.Sdk) - **Microsoft.Net.Compilers.Toolset**: from 4.8.0-3.23524.2... --- NuGet.config | 10 ++-- eng/Version.Details.xml | 112 ++++++++++++++++++++-------------------- eng/Versions.props | 38 +++++++------- 3 files changed, 82 insertions(+), 78 deletions(-) diff --git a/NuGet.config b/NuGet.config index fbfd3a625..83eab89c6 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,17 +10,19 @@ - - + - + + + + @@ -42,8 +44,10 @@ + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 783b33db9..87d4ae51c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,46 +5,46 @@ 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 - 544c2e622c03eef94355718e7e671b193b0102d9 + + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop + edccb53b0dec7b034b2252d4f5ed87181751fc5f - - https://github.com/dotnet/windowsdesktop - 544c2e622c03eef94355718e7e671b193b0102d9 + + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop + edccb53b0dec7b034b2252d4f5ed87181751fc5f - - https://github.com/dotnet/windowsdesktop - 544c2e622c03eef94355718e7e671b193b0102d9 + + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop + edccb53b0dec7b034b2252d4f5ed87181751fc5f - - https://github.com/dotnet/windowsdesktop - 544c2e622c03eef94355718e7e671b193b0102d9 + + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop + edccb53b0dec7b034b2252d4f5ed87181751fc5f - + https://github.com/dotnet/runtime - 488a8a3521610422e8fbe22d5cc66127f3dce3dc + 59edaad404d1b8e47080015ae8d0787f94c970df https://github.com/dotnet/runtime - 488a8a3521610422e8fbe22d5cc66127f3dce3dc + 59edaad404d1b8e47080015ae8d0787f94c970df - + https://github.com/dotnet/runtime - 488a8a3521610422e8fbe22d5cc66127f3dce3dc + 59edaad404d1b8e47080015ae8d0787f94c970df https://github.com/dotnet/runtime - 488a8a3521610422e8fbe22d5cc66127f3dce3dc + 59edaad404d1b8e47080015ae8d0787f94c970df https://github.com/dotnet/runtime - 488a8a3521610422e8fbe22d5cc66127f3dce3dc + 59edaad404d1b8e47080015ae8d0787f94c970df https://github.com/dotnet/runtime - 488a8a3521610422e8fbe22d5cc66127f3dce3dc + 59edaad404d1b8e47080015ae8d0787f94c970df @@ -52,55 +52,55 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 488a8a3521610422e8fbe22d5cc66127f3dce3dc + 59edaad404d1b8e47080015ae8d0787f94c970df - + https://github.com/dotnet/aspnetcore - b0c12dfb32e70e2c48b1e0a62e9ceb0f5c6a14e1 + 815eb281ecad13eb69cf50516ac7f534b947f2b0 - + https://github.com/dotnet/aspnetcore - b0c12dfb32e70e2c48b1e0a62e9ceb0f5c6a14e1 + 815eb281ecad13eb69cf50516ac7f534b947f2b0 - + https://github.com/dotnet/aspnetcore - b0c12dfb32e70e2c48b1e0a62e9ceb0f5c6a14e1 + 815eb281ecad13eb69cf50516ac7f534b947f2b0 - + https://github.com/dotnet/aspnetcore - b0c12dfb32e70e2c48b1e0a62e9ceb0f5c6a14e1 + 815eb281ecad13eb69cf50516ac7f534b947f2b0 - + https://github.com/dotnet/aspnetcore - b0c12dfb32e70e2c48b1e0a62e9ceb0f5c6a14e1 + 815eb281ecad13eb69cf50516ac7f534b947f2b0 - + https://github.com/dotnet/aspnetcore - b0c12dfb32e70e2c48b1e0a62e9ceb0f5c6a14e1 + 815eb281ecad13eb69cf50516ac7f534b947f2b0 - + https://github.com/dotnet/aspnetcore - b0c12dfb32e70e2c48b1e0a62e9ceb0f5c6a14e1 + 815eb281ecad13eb69cf50516ac7f534b947f2b0 - https://github.com/dotnet/sdk - a08f8900d1b7f4cef2a1077dc4ce90c56cb4ada5 + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk + 1ddf252cbda7f6d87624edc81c59b9863d761bc6 - - https://github.com/dotnet/sdk - a08f8900d1b7f4cef2a1077dc4ce90c56cb4ada5 + + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk + 1ddf252cbda7f6d87624edc81c59b9863d761bc6 - - https://github.com/dotnet/sdk - a08f8900d1b7f4cef2a1077dc4ce90c56cb4ada5 + + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk + 1ddf252cbda7f6d87624edc81c59b9863d761bc6 - - https://github.com/dotnet/sdk - a08f8900d1b7f4cef2a1077dc4ce90c56cb4ada5 + + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk + 1ddf252cbda7f6d87624edc81c59b9863d761bc6 https://github.com/dotnet/test-templates @@ -124,13 +124,13 @@ 1e5f3603af2277910aad946736ee23283e7f3e16 - - https://github.com/dotnet/winforms - d77ef3b1a253a99d0be23cec35e84d2fb3317ac5 + + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms + 44849e81b34d51fe9d6d2163bd4b1ab7a0ada387 - - https://github.com/dotnet/wpf - eb2c28846bd06cc11a0cd432d55639a850a829a3 + + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf + 7d1347568b78bfc41c92855aecb9a301e08590fb https://github.com/dotnet/fsharp @@ -148,11 +148,11 @@ https://github.com/dotnet/runtime - 488a8a3521610422e8fbe22d5cc66127f3dce3dc + 59edaad404d1b8e47080015ae8d0787f94c970df - + https://github.com/dotnet/roslyn - 12b11685a551e0a6a203dcecb584f610f4df1157 + f43cd10b737b6343956dee421cff8c50b602c788 diff --git a/eng/Versions.props b/eng/Versions.props index f08343dc9..b32b8b39d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,11 +48,11 @@ - 8.0.0-rtm.23524.1 + 8.0.0-rtm.23525.7 - 8.0.0-rtm.23524.1 + 8.0.0-rtm.23526.1 @@ -72,13 +72,13 @@ - 8.0.0-rtm.23524.5 - 8.0.0-rtm.23524.5 - 8.0.0-rtm.23524.5 - 8.0.0-rtm.23524.5 - 8.0.0-rtm.23524.5 - 8.0.0-rtm.23524.5 - 8.0.0-rtm.23524.5 + 8.0.0-rtm.23524.15 + 8.0.0-rtm.23524.15 + 8.0.0-rtm.23524.15 + 8.0.0-rtm.23524.15 + 8.0.0-rtm.23524.15 + 8.0.0-rtm.23524.15 + 8.0.0-rtm.23524.15 0.2.0 @@ -86,24 +86,24 @@ 8.0.100 - 8.0.100-rtm.23524.25 - 8.0.100-rtm.23524.25 + 8.0.100-rtm.23526.9 + 8.0.100-rtm.23526.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.8.0-3.23524.2 + 4.8.0-3.23524.11 - 8.0.0-rtm.23523.12 + 8.0.0-rtm.23524.7 - 8.0.0-rtm.23523.12 - 8.0.0-rtm.23523.12 + 8.0.0-rtm.23524.7 + 8.0.0-rtm.23524.7 8.0.0 8.0.0 8.0.0 @@ -112,10 +112,10 @@ - 8.0.0-rtm.23524.1 - 8.0.0-rtm.23524.1 - 8.0.0-rtm.23524.1 - 8.0.0-rtm.23524.1 + 8.0.0-rtm.23526.4 + 8.0.0-rtm.23526.4 + 8.0.0 + 8.0.0 From 4b3305b14d56d8e39157dddc4554b6d7763e2f76 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 26 Oct 2023 21:47:05 +0000 Subject: [PATCH 069/535] Merged PR 34852: [internal/release/8.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**: - **VS.Redist.Common.NetCore.SharedFramework.x64.8.0**: from 8.0.0-rtm.23524.7 to 8.0.0-rtm.23525.7 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 8.0.0 to 8.0.0 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.8.0**: from 8.0.0-rtm.23524.7 to 8.0.0-rtm.23525.7 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 8.0.0 to 8.0.0 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 8.0.0 to 8.0.0 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 8.0.0-rtm.23524.7 to 8.0.0-rtm.23525.7 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 8.0.0-rtm.23524.15 to 8.0.0 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 8.0.0-rtm.23524.15 to 8.0.0-rtm.23526.2 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 8.0.0-rtm.23524.15 to 8.0.0 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0**: from 8.0.0-rtm.23524.15 to 8.0.0-rtm.23526.2 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 8.0.0-rtm.23524.15 to 8.0.0-rtm.23526.2 (parent: Microsoft.NET.Sdk) - **dotnet-user-jwts**: from 8.0.0-rtm.23524.15 to 8.0.0-rtm.23526.2 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 8.0.0-rtm.23524.15 to 8.0.0-rtm.23526.2 (parent: Microsoft.NET.Sdk) - **Microsoft.NET.ILLink.Tasks**: from 8.0.0 to 8.0.0 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 8.0.0 to 8.0.0 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 8.0.0 to 8.0.0 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:5d2948e4-7f4b-4c9a-54a4-08dbd5a5c4be) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 5d2948e4-7f4b-4c9a-54a4-08dbd5a5c4be - **Build**: 20231026.11 - **Date Produced**: October 26, 2023 8:10:44 PM UTC - **Commit**: ad5c9dfff0ed7674a2196f138518daea5783f1f6 - **Branch**: refs/heads/internal/release/8.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 8.0.100 to 8.0.100][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 8.0.100-rtm.23526.9 to 8.0.100-rtm.23526.11][1] - **Microsoft.NET.Sdk**: [from 8.0.100-rtm.23526.9 to 8.0.100-rtm.23526.11][1] - **Microsoft.TemplateEngine.Cli**: [from 8.0.10... --- NuGet.config | 9 ++-- eng/Version.Details.xml | 94 ++++++++++++++++++++--------------------- eng/Versions.props | 24 +++++------ 3 files changed, 65 insertions(+), 62 deletions(-) diff --git a/NuGet.config b/NuGet.config index 83eab89c6..2fd162a38 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,15 +10,16 @@ + - + - + @@ -41,10 +42,12 @@ + + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 87d4ae51c..b856338be 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -21,30 +21,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop edccb53b0dec7b034b2252d4f5ed87181751fc5f - - https://github.com/dotnet/runtime - 59edaad404d1b8e47080015ae8d0787f94c970df + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 17ea9ab3f662320d4ac62d3a2b783b5054ad80bf - https://github.com/dotnet/runtime - 59edaad404d1b8e47080015ae8d0787f94c970df + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 17ea9ab3f662320d4ac62d3a2b783b5054ad80bf - - https://github.com/dotnet/runtime - 59edaad404d1b8e47080015ae8d0787f94c970df + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 17ea9ab3f662320d4ac62d3a2b783b5054ad80bf - https://github.com/dotnet/runtime - 59edaad404d1b8e47080015ae8d0787f94c970df + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 17ea9ab3f662320d4ac62d3a2b783b5054ad80bf - https://github.com/dotnet/runtime - 59edaad404d1b8e47080015ae8d0787f94c970df + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 17ea9ab3f662320d4ac62d3a2b783b5054ad80bf - https://github.com/dotnet/runtime - 59edaad404d1b8e47080015ae8d0787f94c970df + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 17ea9ab3f662320d4ac62d3a2b783b5054ad80bf @@ -52,55 +52,55 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - - https://github.com/dotnet/runtime - 59edaad404d1b8e47080015ae8d0787f94c970df + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 17ea9ab3f662320d4ac62d3a2b783b5054ad80bf - - https://github.com/dotnet/aspnetcore - 815eb281ecad13eb69cf50516ac7f534b947f2b0 + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + 757f469b66312ed15c563c8a0cc170159d571b94 - - https://github.com/dotnet/aspnetcore - 815eb281ecad13eb69cf50516ac7f534b947f2b0 + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + 757f469b66312ed15c563c8a0cc170159d571b94 - - https://github.com/dotnet/aspnetcore - 815eb281ecad13eb69cf50516ac7f534b947f2b0 + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + 757f469b66312ed15c563c8a0cc170159d571b94 - - https://github.com/dotnet/aspnetcore - 815eb281ecad13eb69cf50516ac7f534b947f2b0 + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + 757f469b66312ed15c563c8a0cc170159d571b94 - - https://github.com/dotnet/aspnetcore - 815eb281ecad13eb69cf50516ac7f534b947f2b0 + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + 757f469b66312ed15c563c8a0cc170159d571b94 - - https://github.com/dotnet/aspnetcore - 815eb281ecad13eb69cf50516ac7f534b947f2b0 + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + 757f469b66312ed15c563c8a0cc170159d571b94 - - https://github.com/dotnet/aspnetcore - 815eb281ecad13eb69cf50516ac7f534b947f2b0 + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + 757f469b66312ed15c563c8a0cc170159d571b94 https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1ddf252cbda7f6d87624edc81c59b9863d761bc6 + ad5c9dfff0ed7674a2196f138518daea5783f1f6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1ddf252cbda7f6d87624edc81c59b9863d761bc6 + ad5c9dfff0ed7674a2196f138518daea5783f1f6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1ddf252cbda7f6d87624edc81c59b9863d761bc6 + ad5c9dfff0ed7674a2196f138518daea5783f1f6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1ddf252cbda7f6d87624edc81c59b9863d761bc6 + ad5c9dfff0ed7674a2196f138518daea5783f1f6 https://github.com/dotnet/test-templates @@ -147,8 +147,8 @@ - https://github.com/dotnet/runtime - 59edaad404d1b8e47080015ae8d0787f94c970df + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 17ea9ab3f662320d4ac62d3a2b783b5054ad80bf https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index b32b8b39d..203e88179 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -72,13 +72,13 @@ - 8.0.0-rtm.23524.15 - 8.0.0-rtm.23524.15 - 8.0.0-rtm.23524.15 - 8.0.0-rtm.23524.15 - 8.0.0-rtm.23524.15 - 8.0.0-rtm.23524.15 - 8.0.0-rtm.23524.15 + 8.0.0 + 8.0.0 + 8.0.0-rtm.23526.2 + 8.0.0-rtm.23526.2 + 8.0.0-rtm.23526.2 + 8.0.0-rtm.23526.2 + 8.0.0-rtm.23526.2 0.2.0 @@ -86,8 +86,8 @@ 8.0.100 - 8.0.100-rtm.23526.9 - 8.0.100-rtm.23526.9 + 8.0.100-rtm.23526.11 + 8.0.100-rtm.23526.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -98,12 +98,12 @@ - 8.0.0-rtm.23524.7 + 8.0.0-rtm.23525.7 - 8.0.0-rtm.23524.7 - 8.0.0-rtm.23524.7 + 8.0.0-rtm.23525.7 + 8.0.0-rtm.23525.7 8.0.0 8.0.0 8.0.0 From 686b49618547dc30b335b83f64c59305d77dcb51 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 26 Oct 2023 22:59:11 +0000 Subject: [PATCH 070/535] Merged PR 34856: [internal/release/8.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 8.0.0 to 8.0.0 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 8.0.0-rtm.23526.2 to 8.0.0-rtm.23526.7 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 8.0.0 to 8.0.0 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0**: from 8.0.0-rtm.23526.2 to 8.0.0-rtm.23526.7 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 8.0.0-rtm.23526.2 to 8.0.0-rtm.23526.7 (parent: Microsoft.NET.Sdk) - **dotnet-user-jwts**: from 8.0.0-rtm.23526.2 to 8.0.0-rtm.23526.7 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 8.0.0-rtm.23526.2 to 8.0.0-rtm.23526.7 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:5d2948e4-7f4b-4c9a-54a4-08dbd5a5c4be) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 5d2948e4-7f4b-4c9a-54a4-08dbd5a5c4be - **Build**: 20231026.13 - **Date Produced**: October 26, 2023 9:33:59 PM UTC - **Commit**: fc894af5e747aec82e6581c7bec01aea120c7115 - **Branch**: refs/heads/internal/release/8.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 8.0.100 to 8.0.100][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 8.0.100-rtm.23526.11 to 8.0.100-rtm.23526.13][1] - **Microsoft.NET.Sdk**: [from 8.0.100-rtm.23526.11 to 8.0.100-rtm.23526.13][1] - **Microsoft.TemplateEngine.Cli**: [from 8.0.100-rtm.23526.11 to 8.0.100-rtm.23526.13][1] - **Microsoft.AspNetCore.App.Ref**: [from 8.0.0 to 8.0.0][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 8.0.0-rtm.23526.2 to 8.0.0-rtm.23526.7][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 8.0.0 to 8.0.0][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0**: [from 8.0.0-rtm.23526.2 to 8.0.0-rtm.23526.7][2] - **dotnet-dev-certs**: [from 8.0.0-rtm.23526.2 to 8.0.0-rtm.23526.7][2] - **dotnet-user-jwts**: [from 8.0.0-rtm.23526.2 to 8.0.0-rtm.23526.7][2] - **dotnet-user-secrets**: [from 8.0.0-rtm.23526.2 to 8.0.0-rtm.23526.7][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCad5c9dfff0&targetVersion=GCfc894af5e7&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GC757f469b66&targetVersion=GC9b5f201a55&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:5d... --- 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 2fd162a38..d46fe9208 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,7 +10,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -42,12 +42,12 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b856338be..767b3fbc1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -58,49 +58,49 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 757f469b66312ed15c563c8a0cc170159d571b94 + 9b5f201a559077cab447d022259cb9766b85b198 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 757f469b66312ed15c563c8a0cc170159d571b94 + 9b5f201a559077cab447d022259cb9766b85b198 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 757f469b66312ed15c563c8a0cc170159d571b94 + 9b5f201a559077cab447d022259cb9766b85b198 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 757f469b66312ed15c563c8a0cc170159d571b94 + 9b5f201a559077cab447d022259cb9766b85b198 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 757f469b66312ed15c563c8a0cc170159d571b94 + 9b5f201a559077cab447d022259cb9766b85b198 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 757f469b66312ed15c563c8a0cc170159d571b94 + 9b5f201a559077cab447d022259cb9766b85b198 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 757f469b66312ed15c563c8a0cc170159d571b94 + 9b5f201a559077cab447d022259cb9766b85b198 https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ad5c9dfff0ed7674a2196f138518daea5783f1f6 + fc894af5e747aec82e6581c7bec01aea120c7115 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ad5c9dfff0ed7674a2196f138518daea5783f1f6 + fc894af5e747aec82e6581c7bec01aea120c7115 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ad5c9dfff0ed7674a2196f138518daea5783f1f6 + fc894af5e747aec82e6581c7bec01aea120c7115 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ad5c9dfff0ed7674a2196f138518daea5783f1f6 + fc894af5e747aec82e6581c7bec01aea120c7115 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 203e88179..4bac039a2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -74,11 +74,11 @@ 8.0.0 8.0.0 - 8.0.0-rtm.23526.2 - 8.0.0-rtm.23526.2 - 8.0.0-rtm.23526.2 - 8.0.0-rtm.23526.2 - 8.0.0-rtm.23526.2 + 8.0.0-rtm.23526.7 + 8.0.0-rtm.23526.7 + 8.0.0-rtm.23526.7 + 8.0.0-rtm.23526.7 + 8.0.0-rtm.23526.7 0.2.0 @@ -86,8 +86,8 @@ 8.0.100 - 8.0.100-rtm.23526.11 - 8.0.100-rtm.23526.11 + 8.0.100-rtm.23526.13 + 8.0.100-rtm.23526.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 4d885f6071018dcfff672e74c12aac781b67f108 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 27 Oct 2023 12:44:23 +0000 Subject: [PATCH 071/535] [internal/release/8.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 8.0.0 to 8.0.0 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0: from 8.0.0-rtm.23526.4 to 8.0.0-rtm.23526.6 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0: from 8.0.0-rtm.23526.4 to 8.0.0-rtm.23526.6 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 8.0.0 to 8.0.0 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 8.0.0-rtm.23525.7 to 8.0.0-rtm.23526.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 8.0.0 to 8.0.0 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 8.0.0-rtm.23526.1 to 8.0.0-rtm.23526.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) --- 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 d46fe9208..2042de10f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,10 +19,10 @@ - + - + @@ -47,10 +47,10 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 767b3fbc1..6ac15ff81 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -7,19 +7,19 @@ --> https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - edccb53b0dec7b034b2252d4f5ed87181751fc5f + 4031260c723039152662ae5c8e70151f57794ae6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - edccb53b0dec7b034b2252d4f5ed87181751fc5f + 4031260c723039152662ae5c8e70151f57794ae6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - edccb53b0dec7b034b2252d4f5ed87181751fc5f + 4031260c723039152662ae5c8e70151f57794ae6 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - edccb53b0dec7b034b2252d4f5ed87181751fc5f + 4031260c723039152662ae5c8e70151f57794ae6 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fc894af5e747aec82e6581c7bec01aea120c7115 + 45e463695e4291b777812f0b7cc3130d83e9a003 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fc894af5e747aec82e6581c7bec01aea120c7115 + 45e463695e4291b777812f0b7cc3130d83e9a003 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fc894af5e747aec82e6581c7bec01aea120c7115 + 45e463695e4291b777812f0b7cc3130d83e9a003 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fc894af5e747aec82e6581c7bec01aea120c7115 + 45e463695e4291b777812f0b7cc3130d83e9a003 https://github.com/dotnet/test-templates @@ -124,13 +124,13 @@ 1e5f3603af2277910aad946736ee23283e7f3e16 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 44849e81b34d51fe9d6d2163bd4b1ab7a0ada387 + 718c6eea1a6aaef771fd2ab88168ec0de6c26929 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 7d1347568b78bfc41c92855aecb9a301e08590fb + 7dc2766592abf35c9ff0ae407fe1af20ab4be76b https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 4bac039a2..9a768c646 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,11 +48,11 @@ - 8.0.0-rtm.23525.7 + 8.0.0-rtm.23526.3 - 8.0.0-rtm.23526.1 + 8.0.0-rtm.23526.7 @@ -86,8 +86,8 @@ 8.0.100 - 8.0.100-rtm.23526.13 - 8.0.100-rtm.23526.13 + 8.0.100-rtm.23526.16 + 8.0.100-rtm.23526.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -112,8 +112,8 @@ - 8.0.0-rtm.23526.4 - 8.0.0-rtm.23526.4 + 8.0.0-rtm.23526.6 + 8.0.0-rtm.23526.6 8.0.0 8.0.0 From d591a48bc0e13fdc5a5846440912ce9b6659133e Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sat, 28 Oct 2023 00:25:36 +0000 Subject: [PATCH 072/535] Merged PR 34884: [internal/release/8.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 8.0.0 to 8.0.0 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 8.0.0-rtm.23526.7 to 8.0.0-rtm.23526.11 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 8.0.0 to 8.0.0 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0**: from 8.0.0-rtm.23526.7 to 8.0.0-rtm.23526.11 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 8.0.0-rtm.23526.7 to 8.0.0-rtm.23526.11 (parent: Microsoft.NET.Sdk) - **dotnet-user-jwts**: from 8.0.0-rtm.23526.7 to 8.0.0-rtm.23526.11 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 8.0.0-rtm.23526.7 to 8.0.0-rtm.23526.11 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:5d2948e4-7f4b-4c9a-54a4-08dbd5a5c4be) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 5d2948e4-7f4b-4c9a-54a4-08dbd5a5c4be - **Build**: 20231027.8 - **Date Produced**: October 27, 2023 4:25:06 PM UTC - **Commit**: f0039867c17ac82a01895261802e50a6da068d57 - **Branch**: refs/heads/internal/release/8.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 8.0.100 to 8.0.100][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 8.0.100-rtm.23526.16 to 8.0.100-rtm.23527.8][1] - **Microsoft.NET.Sdk**: [from 8.0.100-rtm.23526.16 to 8.0.100-rtm.23527.8][1] - **Microsoft.TemplateEngine.Cli**: [from 8.0.100-rtm.23526.16 to 8.0.100-rtm.23527.8][1] - **Microsoft.AspNetCore.App.Ref**: [from 8.0.0 to 8.0.0][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 8.0.0-rtm.23526.7 to 8.0.0-rtm.23526.11][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 8.0.0 to 8.0.0][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0**: [from 8.0.0-rtm.23526.7 to 8.0.0-rtm.23526.11][2] - **dotnet-dev-certs**: [from 8.0.0-rtm.23526.7 to 8.0.0-rtm.23526.11][2] - **dotnet-user-jwts**: [from 8.0.0-rtm.23526.7 to 8.0.0-rtm.23526.11][2] - **dotnet-user-secrets**: [from 8.0.0-rtm.23526.7 to 8.0.0-rtm.23526.11][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC45e463695e&targetVersion=GCf0039867c1&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GC9b5f201a55&targetVersion=GC31739e30e9&_a=files [DependencyUpdate]: <> (End) [marker]: <> (... --- NuGet.config | 13 +++++++++---- eng/Version.Details.xml | 38 +++++++++++++++++++------------------- eng/Versions.props | 14 +++++++------- 3 files changed, 35 insertions(+), 30 deletions(-) diff --git a/NuGet.config b/NuGet.config index 2042de10f..e52b883f9 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,21 +8,24 @@ + - + + - + + @@ -42,14 +45,16 @@ - + + - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6ac15ff81..471ff83c5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -58,49 +58,49 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9b5f201a559077cab447d022259cb9766b85b198 + 31739e30e9942dca71d02796ea339243893675f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9b5f201a559077cab447d022259cb9766b85b198 + 31739e30e9942dca71d02796ea339243893675f8 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9b5f201a559077cab447d022259cb9766b85b198 + 31739e30e9942dca71d02796ea339243893675f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9b5f201a559077cab447d022259cb9766b85b198 + 31739e30e9942dca71d02796ea339243893675f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9b5f201a559077cab447d022259cb9766b85b198 + 31739e30e9942dca71d02796ea339243893675f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9b5f201a559077cab447d022259cb9766b85b198 + 31739e30e9942dca71d02796ea339243893675f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9b5f201a559077cab447d022259cb9766b85b198 + 31739e30e9942dca71d02796ea339243893675f8 https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 45e463695e4291b777812f0b7cc3130d83e9a003 + f0039867c17ac82a01895261802e50a6da068d57 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 45e463695e4291b777812f0b7cc3130d83e9a003 + f0039867c17ac82a01895261802e50a6da068d57 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 45e463695e4291b777812f0b7cc3130d83e9a003 + f0039867c17ac82a01895261802e50a6da068d57 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 45e463695e4291b777812f0b7cc3130d83e9a003 + f0039867c17ac82a01895261802e50a6da068d57 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 9a768c646..5f91b4d36 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -74,11 +74,11 @@ 8.0.0 8.0.0 - 8.0.0-rtm.23526.7 - 8.0.0-rtm.23526.7 - 8.0.0-rtm.23526.7 - 8.0.0-rtm.23526.7 - 8.0.0-rtm.23526.7 + 8.0.0-rtm.23526.11 + 8.0.0-rtm.23526.11 + 8.0.0-rtm.23526.11 + 8.0.0-rtm.23526.11 + 8.0.0-rtm.23526.11 0.2.0 @@ -86,8 +86,8 @@ 8.0.100 - 8.0.100-rtm.23526.16 - 8.0.100-rtm.23526.16 + 8.0.100-rtm.23527.8 + 8.0.100-rtm.23527.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 57c71a1cfe4fe3bd238fce64213129316cc6e850 Mon Sep 17 00:00:00 2001 From: Jose Perez Rodriguez Date: Sat, 28 Oct 2023 02:40:58 +0000 Subject: [PATCH 073/535] Merged PR 34855: Updating the baseline manifest for Aspire @ @ @ @ Updating the baseline manifest for Aspire --- NuGet.config | 2 ++ eng/Versions.props | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/NuGet.config b/NuGet.config index e52b883f9..499a5fb52 100644 --- a/NuGet.config +++ b/NuGet.config @@ -41,6 +41,7 @@ + @@ -59,5 +60,6 @@ + diff --git a/eng/Versions.props b/eng/Versions.props index 5f91b4d36..013b09b06 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -237,8 +237,8 @@ - 8.0.100-rc.1 - 8.0.0-alpha.23471.13 + 8.0.100 + 8.0.0-preview.1.23526.4 8.0.100-rc.2 8.0.0-rc.2.9373 34.0.0-rc.2.468 From 2d2483a495929285f614f6ebb429017612973a04 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 31 Oct 2023 22:05:32 +0000 Subject: [PATCH 074/535] Merged PR 34930: [internal/release/8.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.WindowsDesktop.App.Ref**: from 8.0.0 to 8.0.0 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0**: from 8.0.0-rtm.23526.6 to 8.0.0-rtm.23531.3 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0**: from 8.0.0-rtm.23526.6 to 8.0.0-rtm.23531.3 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.8.0**: from 8.0.0-rtm.23525.7 to 8.0.0-rtm.23530.12 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 8.0.0 to 8.0.0 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.8.0**: from 8.0.0-rtm.23525.7 to 8.0.0-rtm.23530.12 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 8.0.0 to 8.0.0 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 8.0.0 to 8.0.0 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 8.0.0-rtm.23525.7 to 8.0.0-rtm.23530.12 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 8.0.0 to 8.0.0 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 8.0.0-rtm.23526.11 to 8.0.0-rtm.23531.1 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 8.0.0 to 8.0.0 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0**: from 8.0.0-rtm.23526.11 to 8.0.0-rtm.23531.1 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 8.0.0-rtm.23526.11 to 8.0.0-rtm.23531.1 (parent: Microsoft.NET.Sdk) - **dotnet-user-jwts**: from 8.0.0-rtm.23526.11 to 8.0.0-rtm.23531.1 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 8.0.0-rtm.23526.11 to 8.0.0-rtm.23531.1 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 8.0.0 to 8.0.0 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 8.0.0-rtm.23526.3 to 8.0.0-rtm.23531.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 8.0.0 to 8.0.0 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 8.0.0-rtm.23526.7 to 8.0.0-rtm.23531.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.NET.ILLink.Tasks**: from 8.0.0 to 8.0.0 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 8.0.0 to 8.0.0 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from... --- NuGet.config | 22 ++++++------ eng/Version.Details.xml | 80 ++++++++++++++++++++--------------------- eng/Versions.props | 28 +++++++-------- 3 files changed, 64 insertions(+), 66 deletions(-) diff --git a/NuGet.config b/NuGet.config index 499a5fb52..091c44301 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,24 +8,24 @@ + + - + - - + - + - - + @@ -46,17 +46,15 @@ - + - - + - + - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 471ff83c5..5b6a96d2b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -7,44 +7,44 @@ --> https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 4031260c723039152662ae5c8e70151f57794ae6 + a153f4ef85bc898976dd3adcd10d7a97a61e296a - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 4031260c723039152662ae5c8e70151f57794ae6 + a153f4ef85bc898976dd3adcd10d7a97a61e296a - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 4031260c723039152662ae5c8e70151f57794ae6 + a153f4ef85bc898976dd3adcd10d7a97a61e296a https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 4031260c723039152662ae5c8e70151f57794ae6 + a153f4ef85bc898976dd3adcd10d7a97a61e296a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 17ea9ab3f662320d4ac62d3a2b783b5054ad80bf + 0395649aa16820be8a669203b265b0a578e82843 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 17ea9ab3f662320d4ac62d3a2b783b5054ad80bf + 0395649aa16820be8a669203b265b0a578e82843 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 17ea9ab3f662320d4ac62d3a2b783b5054ad80bf + 0395649aa16820be8a669203b265b0a578e82843 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 17ea9ab3f662320d4ac62d3a2b783b5054ad80bf + 0395649aa16820be8a669203b265b0a578e82843 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 17ea9ab3f662320d4ac62d3a2b783b5054ad80bf + 0395649aa16820be8a669203b265b0a578e82843 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 17ea9ab3f662320d4ac62d3a2b783b5054ad80bf + 0395649aa16820be8a669203b265b0a578e82843 @@ -52,55 +52,55 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 17ea9ab3f662320d4ac62d3a2b783b5054ad80bf + 0395649aa16820be8a669203b265b0a578e82843 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 31739e30e9942dca71d02796ea339243893675f8 + c26c6ca0d01de61399517a98cdd0517c91e6f805 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 31739e30e9942dca71d02796ea339243893675f8 + c26c6ca0d01de61399517a98cdd0517c91e6f805 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 31739e30e9942dca71d02796ea339243893675f8 + c26c6ca0d01de61399517a98cdd0517c91e6f805 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 31739e30e9942dca71d02796ea339243893675f8 + c26c6ca0d01de61399517a98cdd0517c91e6f805 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 31739e30e9942dca71d02796ea339243893675f8 + c26c6ca0d01de61399517a98cdd0517c91e6f805 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 31739e30e9942dca71d02796ea339243893675f8 + c26c6ca0d01de61399517a98cdd0517c91e6f805 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 31739e30e9942dca71d02796ea339243893675f8 + c26c6ca0d01de61399517a98cdd0517c91e6f805 https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f0039867c17ac82a01895261802e50a6da068d57 + cf8eafe798f5c57fba862771d664ecf0b822a136 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f0039867c17ac82a01895261802e50a6da068d57 + cf8eafe798f5c57fba862771d664ecf0b822a136 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f0039867c17ac82a01895261802e50a6da068d57 + cf8eafe798f5c57fba862771d664ecf0b822a136 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f0039867c17ac82a01895261802e50a6da068d57 + cf8eafe798f5c57fba862771d664ecf0b822a136 https://github.com/dotnet/test-templates @@ -124,13 +124,13 @@ 1e5f3603af2277910aad946736ee23283e7f3e16 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 718c6eea1a6aaef771fd2ab88168ec0de6c26929 + 88d8522de318730859437bb17c116bb0ed015f5e - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 7dc2766592abf35c9ff0ae407fe1af20ab4be76b + a713d39da10c1a548c70e9024c180f0c1785f881 https://github.com/dotnet/fsharp @@ -148,7 +148,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 17ea9ab3f662320d4ac62d3a2b783b5054ad80bf + 0395649aa16820be8a669203b265b0a578e82843 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index f41e8abf8..27e9f5f5e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,11 +48,11 @@ - 8.0.0-rtm.23526.3 + 8.0.0-rtm.23531.1 - 8.0.0-rtm.23526.7 + 8.0.0-rtm.23531.2 @@ -74,11 +74,11 @@ 8.0.0 8.0.0 - 8.0.0-rtm.23526.11 - 8.0.0-rtm.23526.11 - 8.0.0-rtm.23526.11 - 8.0.0-rtm.23526.11 - 8.0.0-rtm.23526.11 + 8.0.0-rtm.23531.1 + 8.0.0-rtm.23531.1 + 8.0.0-rtm.23531.1 + 8.0.0-rtm.23531.1 + 8.0.0-rtm.23531.1 0.2.0 @@ -86,8 +86,8 @@ 8.0.100 - 8.0.100-rtm.23527.8 - 8.0.100-rtm.23527.8 + 8.0.100-rtm.23531.14 + 8.0.100-rtm.23531.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -98,12 +98,12 @@ - 8.0.0-rtm.23525.7 + 8.0.0-rtm.23530.12 - 8.0.0-rtm.23525.7 - 8.0.0-rtm.23525.7 + 8.0.0-rtm.23530.12 + 8.0.0-rtm.23530.12 8.0.0 8.0.0 8.0.0 @@ -112,8 +112,8 @@ - 8.0.0-rtm.23526.6 - 8.0.0-rtm.23526.6 + 8.0.0-rtm.23531.3 + 8.0.0-rtm.23531.3 8.0.0 8.0.0 From 59d2c2576042691507fee53e3d5852e321e31ac7 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 31 Oct 2023 23:36:35 +0000 Subject: [PATCH 075/535] Merged PR 34969: [internal/release/8.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**: - **VS.Redist.Common.NetCore.SharedFramework.x64.8.0**: from 8.0.0-rtm.23530.12 to 8.0.0-rtm.23531.3 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 8.0.0 to 8.0.0 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.8.0**: from 8.0.0-rtm.23530.12 to 8.0.0-rtm.23531.3 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 8.0.0 to 8.0.0 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 8.0.0 to 8.0.0 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 8.0.0-rtm.23530.12 to 8.0.0-rtm.23531.3 (parent: Microsoft.NET.Sdk) - **Microsoft.NET.ILLink.Tasks**: from 8.0.0 to 8.0.0 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 8.0.0 to 8.0.0 (parent: Microsoft.NET.Sdk) - **Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100**: from 8.0.0 to 8.0.0 (parent: Microsoft.NETCore.App.Runtime.win-x64) - **Microsoft.NETCore.App.Runtime.win-x64**: from 8.0.0 to 8.0.0 (parent: Microsoft.NET.Sdk) - **Microsoft.SourceBuild.Intermediate.emsdk**: from 8.0.0-rtm.23523.2 to 8.0.0-rtm.23530.2 (parent: Microsoft.NETCore.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:5d2948e4-7f4b-4c9a-54a4-08dbd5a5c4be) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 5d2948e4-7f4b-4c9a-54a4-08dbd5a5c4be - **Build**: 20231031.25 - **Date Produced**: October 31, 2023 10:48:17 PM UTC - **Commit**: cf8671d9b9f3f42c9c546a29d45eb43f8a380e13 - **Branch**: refs/heads/internal/release/8.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 8.0.100 to 8.0.100][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 8.0.100-rtm.23531.14 to 8.0.100-rtm.23531.25][1] - **Microsoft.NET.Sdk**: [from 8.0.100-rtm.23531.14 to 8.0.100-rtm.23531.25][1] - **Microsoft.TemplateEngine.Cli**: [from 8.0.100-rtm.23531.14 to 8.0.100-rtm.23531.25][1] - **VS.Redist.Common.NetCore.SharedFramework.x64.8.0**: [from 8.0.0-rtm.23530.12 to 8.0.0-rtm.23531.3][2] - **Microsoft.NETCore.App.Ref**: [from 8.0.0 to 8.0.0][2] - **VS.Redist.Common.NetCore.TargetingPack.x64.8.0**: [from 8.0.0-rtm.23530.12 to 8.0.0-rtm.23531.3][2] - **Microsoft.NETCore.App.Host.win-x64**: [from 8.0.0 to 8.0.0][2] - **Microsoft.NETCore.DotNetHostResolver**: [from 8.0.0 to 8.0.0][2] - **Microsoft.NETCor... --- NuGet.config | 13 +++++-------- eng/Version.Details.xml | 42 ++++++++++++++++++++--------------------- eng/Versions.props | 10 +++++----- 3 files changed, 31 insertions(+), 34 deletions(-) diff --git a/NuGet.config b/NuGet.config index 091c44301..b52179d7f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,10 +7,7 @@ - - - - + @@ -19,10 +16,10 @@ - + - + @@ -49,9 +46,9 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5b6a96d2b..edaa4c219 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -21,30 +21,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop a153f4ef85bc898976dd3adcd10d7a97a61e296a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0395649aa16820be8a669203b265b0a578e82843 + 5535e31a712343a63f5d7d796cd874e563e5ac14 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0395649aa16820be8a669203b265b0a578e82843 + 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0395649aa16820be8a669203b265b0a578e82843 + 5535e31a712343a63f5d7d796cd874e563e5ac14 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0395649aa16820be8a669203b265b0a578e82843 + 5535e31a712343a63f5d7d796cd874e563e5ac14 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0395649aa16820be8a669203b265b0a578e82843 + 5535e31a712343a63f5d7d796cd874e563e5ac14 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0395649aa16820be8a669203b265b0a578e82843 + 5535e31a712343a63f5d7d796cd874e563e5ac14 @@ -52,9 +52,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0395649aa16820be8a669203b265b0a578e82843 + 5535e31a712343a63f5d7d796cd874e563e5ac14 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - cf8eafe798f5c57fba862771d664ecf0b822a136 + cf8671d9b9f3f42c9c546a29d45eb43f8a380e13 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - cf8eafe798f5c57fba862771d664ecf0b822a136 + cf8671d9b9f3f42c9c546a29d45eb43f8a380e13 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - cf8eafe798f5c57fba862771d664ecf0b822a136 + cf8671d9b9f3f42c9c546a29d45eb43f8a380e13 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - cf8eafe798f5c57fba862771d664ecf0b822a136 + cf8671d9b9f3f42c9c546a29d45eb43f8a380e13 https://github.com/dotnet/test-templates @@ -148,7 +148,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0395649aa16820be8a669203b265b0a578e82843 + 5535e31a712343a63f5d7d796cd874e563e5ac14 https://github.com/dotnet/roslyn @@ -170,11 +170,11 @@ https://github.com/dotnet/emsdk - 51bf18a2e20024dfa89d63e20b0c3b695b5c1eed + 2406616d0e3a31d80b326e27c156955bfa41c791 - + https://github.com/dotnet/emsdk - 51bf18a2e20024dfa89d63e20b0c3b695b5c1eed + 2406616d0e3a31d80b326e27c156955bfa41c791 diff --git a/eng/Versions.props b/eng/Versions.props index 27e9f5f5e..8ee258095 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,8 +86,8 @@ 8.0.100 - 8.0.100-rtm.23531.14 - 8.0.100-rtm.23531.14 + 8.0.100-rtm.23531.25 + 8.0.100-rtm.23531.25 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -98,12 +98,12 @@ - 8.0.0-rtm.23530.12 + 8.0.0-rtm.23531.3 - 8.0.0-rtm.23530.12 - 8.0.0-rtm.23530.12 + 8.0.0-rtm.23531.3 + 8.0.0-rtm.23531.3 8.0.0 8.0.0 8.0.0 From 0f22c8fd4bb79262800187ce9a10aae0ea505b78 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 1 Nov 2023 12:45:07 +0000 Subject: [PATCH 076/535] Merged PR 34979: [internal/release/8.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.WindowsDesktop.App.Ref**: from 8.0.0 to 8.0.0 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0**: from 8.0.0-rtm.23531.3 to 8.0.0-rtm.23551.1 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0**: from 8.0.0-rtm.23531.3 to 8.0.0-rtm.23551.1 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 8.0.0 to 8.0.0 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 8.0.0-rtm.23531.1 to 8.0.0-rtm.23531.12 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 8.0.0 to 8.0.0 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0**: from 8.0.0-rtm.23531.1 to 8.0.0-rtm.23531.12 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 8.0.0-rtm.23531.1 to 8.0.0-rtm.23531.12 (parent: Microsoft.NET.Sdk) - **dotnet-user-jwts**: from 8.0.0-rtm.23531.1 to 8.0.0-rtm.23531.12 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 8.0.0-rtm.23531.1 to 8.0.0-rtm.23531.12 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 8.0.0 to 8.0.0 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 8.0.0-rtm.23531.1 to 8.0.0-rtm.23531.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 8.0.0 to 8.0.0 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 8.0.0-rtm.23531.2 to 8.0.0-rtm.23531.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:5d2948e4-7f4b-4c9a-54a4-08dbd5a5c4be) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 5d2948e4-7f4b-4c9a-54a4-08dbd5a5c4be - **Build**: 20231101.6 - **Date Produced**: November 1, 2023 11:48:28 AM UTC - **Commit**: e9d13cbe7e8c1d52ce276a8655f52a87e1017c46 - **Branch**: refs/heads/internal/release/8.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 8.0.100 to 8.0.100][9] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 8.0.100-rtm.23531.25 to 8.0.100-rtm.23551.6][9] - **Microsoft.NET.Sdk**: [from 8.0.100-rtm.23531.25 to 8.0.100-rtm.23551.6][9] - **Microsoft.TemplateEngine.Cli**: [from 8.0.100-rtm.23531.25 to 8.0.100-rtm.23551.6][9] - **Microsoft.WindowsD... --- 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 b52179d7f..fb4bef099 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,7 +10,7 @@ - + @@ -19,10 +19,10 @@ - + - + @@ -43,15 +43,15 @@ - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index edaa4c219..db87639b4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -7,19 +7,19 @@ --> https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a153f4ef85bc898976dd3adcd10d7a97a61e296a + c0170915ed6c164a594cd9d558d44aaf98fc6961 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a153f4ef85bc898976dd3adcd10d7a97a61e296a + c0170915ed6c164a594cd9d558d44aaf98fc6961 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a153f4ef85bc898976dd3adcd10d7a97a61e296a + c0170915ed6c164a594cd9d558d44aaf98fc6961 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a153f4ef85bc898976dd3adcd10d7a97a61e296a + c0170915ed6c164a594cd9d558d44aaf98fc6961 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -58,49 +58,49 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c26c6ca0d01de61399517a98cdd0517c91e6f805 + 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c26c6ca0d01de61399517a98cdd0517c91e6f805 + 3f1acb59718cadf111a0a796681e3d3509bb3381 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c26c6ca0d01de61399517a98cdd0517c91e6f805 + 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c26c6ca0d01de61399517a98cdd0517c91e6f805 + 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c26c6ca0d01de61399517a98cdd0517c91e6f805 + 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c26c6ca0d01de61399517a98cdd0517c91e6f805 + 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c26c6ca0d01de61399517a98cdd0517c91e6f805 + 3f1acb59718cadf111a0a796681e3d3509bb3381 https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - cf8671d9b9f3f42c9c546a29d45eb43f8a380e13 + e9d13cbe7e8c1d52ce276a8655f52a87e1017c46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - cf8671d9b9f3f42c9c546a29d45eb43f8a380e13 + e9d13cbe7e8c1d52ce276a8655f52a87e1017c46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - cf8671d9b9f3f42c9c546a29d45eb43f8a380e13 + e9d13cbe7e8c1d52ce276a8655f52a87e1017c46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - cf8671d9b9f3f42c9c546a29d45eb43f8a380e13 + e9d13cbe7e8c1d52ce276a8655f52a87e1017c46 https://github.com/dotnet/test-templates @@ -124,13 +124,13 @@ 1e5f3603af2277910aad946736ee23283e7f3e16 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 88d8522de318730859437bb17c116bb0ed015f5e + e4ede9b8979b9d2b1b1d4383f30a791414f0625b - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - a713d39da10c1a548c70e9024c180f0c1785f881 + 239f8da8fbf8cf2a6cd0c793f0d02679bf4ccf6a https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 8ee258095..02162e19f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,11 +48,11 @@ - 8.0.0-rtm.23531.1 + 8.0.0-rtm.23531.5 - 8.0.0-rtm.23531.2 + 8.0.0-rtm.23531.4 @@ -74,11 +74,11 @@ 8.0.0 8.0.0 - 8.0.0-rtm.23531.1 - 8.0.0-rtm.23531.1 - 8.0.0-rtm.23531.1 - 8.0.0-rtm.23531.1 - 8.0.0-rtm.23531.1 + 8.0.0-rtm.23531.12 + 8.0.0-rtm.23531.12 + 8.0.0-rtm.23531.12 + 8.0.0-rtm.23531.12 + 8.0.0-rtm.23531.12 0.2.0 @@ -86,8 +86,8 @@ 8.0.100 - 8.0.100-rtm.23531.25 - 8.0.100-rtm.23531.25 + 8.0.100-rtm.23551.6 + 8.0.100-rtm.23551.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -112,8 +112,8 @@ - 8.0.0-rtm.23531.3 - 8.0.0-rtm.23531.3 + 8.0.0-rtm.23551.1 + 8.0.0-rtm.23551.1 8.0.0 8.0.0 From 9d6e3d71808815da6f49c7681c35858214d59103 Mon Sep 17 00:00:00 2001 From: Jose Perez Rodriguez Date: Wed, 1 Nov 2023 14:24:19 +0000 Subject: [PATCH 077/535] Merged PR 34956: Adding Aspire repo into source-build Adding Aspire repo into source-build cc: @ @ @ --- eng/Version.Details.xml | 5 +++++ eng/Versions.props | 2 +- src/SourceBuild/content/repo-projects/aspire.proj | 13 +++++++++++++ src/SourceBuild/content/repo-projects/dotnet.proj | 1 + .../assets/baselines/licenses/Licenses.aspire.json | 3 +++ src/VirtualMonoRepo/source-mappings.json | 7 +++++++ src/redist/targets/BundledManifests.targets | 2 +- 7 files changed, 31 insertions(+), 2 deletions(-) create mode 100644 src/SourceBuild/content/repo-projects/aspire.proj create mode 100644 src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.aspire.json diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index db87639b4..1406f019d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -172,6 +172,11 @@ https://github.com/dotnet/emsdk 2406616d0e3a31d80b326e27c156955bfa41c791 + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspire + 276cc28b03c11e2850546e604c707e664339fc15 + + https://github.com/dotnet/emsdk 2406616d0e3a31d80b326e27c156955bfa41c791 diff --git a/eng/Versions.props b/eng/Versions.props index 02162e19f..e2c6743f4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -238,7 +238,7 @@ 8.0.100 - 8.0.0-preview.1.23526.4 + 8.0.0-preview.1.23531.6 8.0.100-rc.2 8.0.0-rc.2.9373 34.0.0-rc.2.468 diff --git a/src/SourceBuild/content/repo-projects/aspire.proj b/src/SourceBuild/content/repo-projects/aspire.proj new file mode 100644 index 000000000..7d41e5e5f --- /dev/null +++ b/src/SourceBuild/content/repo-projects/aspire.proj @@ -0,0 +1,13 @@ + + + + + $(StandardSourceBuildCommand) $(StandardSourceBuildArgs) + + + + + + + + \ No newline at end of file diff --git a/src/SourceBuild/content/repo-projects/dotnet.proj b/src/SourceBuild/content/repo-projects/dotnet.proj index 23c5d842a..26ce0941f 100644 --- a/src/SourceBuild/content/repo-projects/dotnet.proj +++ b/src/SourceBuild/content/repo-projects/dotnet.proj @@ -45,6 +45,7 @@ + diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.aspire.json b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.aspire.json new file mode 100644 index 000000000..6941fa698 --- /dev/null +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.aspire.json @@ -0,0 +1,3 @@ +{ + "files": [] +} \ No newline at end of file diff --git a/src/VirtualMonoRepo/source-mappings.json b/src/VirtualMonoRepo/source-mappings.json index 831fae959..7e6c1ccd5 100644 --- a/src/VirtualMonoRepo/source-mappings.json +++ b/src/VirtualMonoRepo/source-mappings.json @@ -60,6 +60,13 @@ "src/Microsoft.DotNet.SignTool.Tests/*.vsix" ] }, + { + "name": "aspire", + "defaultRemote": "https://github.com/dotnet/aspire", + "exclude": [ + "src/Aspire.Dashboard/**/*" + ] + }, { "name": "aspnetcore", "defaultRemote": "https://github.com/dotnet/aspnetcore", diff --git a/src/redist/targets/BundledManifests.targets b/src/redist/targets/BundledManifests.targets index d6db716b9..73402bced 100644 --- a/src/redist/targets/BundledManifests.targets +++ b/src/redist/targets/BundledManifests.targets @@ -4,7 +4,6 @@ - @@ -17,6 +16,7 @@ + From 01e8a441b4fd015580f50a8690becfb8bc6a98d1 Mon Sep 17 00:00:00 2001 From: Jose Perez Rodriguez Date: Wed, 1 Nov 2023 13:17:51 -0700 Subject: [PATCH 078/535] Update Aspire manifest inserted into installer --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1406f019d..a1cebfeed 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -172,9 +172,9 @@ https://github.com/dotnet/emsdk 2406616d0e3a31d80b326e27c156955bfa41c791 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspire - 276cc28b03c11e2850546e604c707e664339fc15 + 4b00c57d7ccf9a4c7e2aef211ab6bd8af3ee2324 diff --git a/eng/Versions.props b/eng/Versions.props index e2c6743f4..329ab4ece 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -238,7 +238,7 @@ 8.0.100 - 8.0.0-preview.1.23531.6 + 8.0.0-preview.1.23551.7 8.0.100-rc.2 8.0.0-rc.2.9373 34.0.0-rc.2.468 From 7905f1bbc8bb284f2bb5ea1857b5191768cd2880 Mon Sep 17 00:00:00 2001 From: Omair Majid Date: Tue, 7 Nov 2023 08:53:17 -0500 Subject: [PATCH 079/535] [release/6.0] Add alpine to CI for source-build (#13074) --- .../common/templates/job/source-build-build-tarball.yml | 9 +++++++-- .../templates/job/source-build-run-tarball-build.yml | 6 ++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml index 9ae170d1c..2c7900e09 100644 --- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml @@ -85,7 +85,7 @@ jobs: - ${{ if ne(parameters.excludeSdkContentTests, 'true') }}: - download: ${{ parameters.installerBuildResourceId }} artifact: BlobArtifacts - patterns: '**/dotnet-sdk-+([0-9]).+([0-9]).+([0-9])?(-@(preview|rc|rtm)*)-linux-${{ parameters.architecture }}.tar.gz' + patterns: '**/dotnet-sdk-+([0-9]).+([0-9]).+([0-9])?(-@(preview|rc|rtm)*)-linux*-${{ parameters.architecture }}.tar.gz' displayName: Download MSFT sdk Tarball - ${{ if eq(parameters.usePreviousArtifacts, 'true') }}: @@ -156,7 +156,12 @@ jobs: if [[ '${{ parameters.excludeSdkContentTests}}' != 'true' ]]; then dockerVolumeArgs+=" -v $(PIPELINE.WORKSPACE)/${{ parameters.installerBuildResourceId }}/BlobArtifacts/:/BlobArtifacts" - msftSdkTarballName=$(find "$(PIPELINE.WORKSPACE)/${{ parameters.installerBuildResourceId }}/BlobArtifacts/" -name "dotnet-sdk-*-linux-${{ parameters.architecture }}.tar.gz" -exec basename {} \;) + platform="linux" + docker run --rm $(_Container) /bin/sh -c "cat /etc/os-release | grep -q alpine" + if [[ $? == 0 ]]; then + platform="$platform-musl" + fi + msftSdkTarballName=$(find "$(PIPELINE.WORKSPACE)/${{ parameters.installerBuildResourceId }}/BlobArtifacts/" -name "dotnet-sdk-*-$platform-${{ parameters.architecture }}.tar.gz" -exec basename {} \;) dockerEnvArgs+=" -e SMOKE_TESTS_MSFT_SDK_TARBALL_PATH=/BlobArtifacts/$msftSdkTarballName" fi diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml index 1dc1503c5..e710e1250 100644 --- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml @@ -9,6 +9,7 @@ parameters: # The following parameters aren't expected to be passed in rather they are used for encapsulation # ----------------------------------------------------------------------------------------------- + alpine317Container: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.17 centOS7Container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-source-build-20210714125450-5d87b80 centOS8Container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-8-source-build-20211118190102-9355e7b centOSStream9Container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9-20220107135047-4cd394c @@ -37,6 +38,11 @@ jobs: excludeSdkContentTests: true installerBuildResourceId: ${{ parameters.installerBuildResourceId }} matrix: + Alpine317-Offline: + _BootstrapPrep: true + _Container: ${{ parameters.alpine317Container }} + _ExcludeOmniSharpTests: true + _RunOnline: false CentOS7-Online: _BootstrapPrep: false _Container: ${{ parameters.centOS7Container }} From a7d4f9cef5257390ac5f2dbe064f01e4a18bca4e Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Tue, 7 Nov 2023 09:27:14 -0600 Subject: [PATCH 080/535] [source build] Use floating tags for container image names (#17696) --- eng/common/templates/jobs/source-build.yml | 2 +- .../job/source-build-create-tarball.yml | 2 +- .../job/source-build-run-tarball-build.yml | 20 ++++-------- .../pipelines/security-partners-dotnet.yml | 31 ------------------- 4 files changed, 8 insertions(+), 47 deletions(-) delete mode 100644 src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml diff --git a/eng/common/templates/jobs/source-build.yml b/eng/common/templates/jobs/source-build.yml index 00aa98eb3..7c240e654 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-7-3e800f1-20190501005343' + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7' # 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/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml index ac6d73016..347f61cf8 100644 --- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml @@ -2,7 +2,7 @@ jobs: - job: Source_Build_Create_Tarball - container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-33-20210222183538-031e7d2 + container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-38 displayName: Source-Build Create Tarball pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml index e710e1250..bfea7becd 100644 --- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml @@ -10,13 +10,11 @@ parameters: # The following parameters aren't expected to be passed in rather they are used for encapsulation # ----------------------------------------------------------------------------------------------- alpine317Container: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.17 - centOS7Container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-source-build-20210714125450-5d87b80 - centOS8Container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-8-source-build-20211118190102-9355e7b + centOS7Container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-source-build centOSStream9Container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9-20220107135047-4cd394c - debian9Container: mcr.microsoft.com/dotnet-buildtools/prereqs:debian-stretch-20211001171226-047508b - debian9Arm64Container: mcr.microsoft.com/dotnet-buildtools/prereqs:debian-9-arm64v8-20220405201138-a251961 - fedora38Container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-38-20230609193134-47458d2 - ubuntu1804Container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-20210924170306-047508b + debian11Arm64Container: mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-arm64v8 + fedora38Container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-38 + ubuntu1804Container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04 poolInternalAmd64: name: NetCore1ESPool-Svc-Internal demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 @@ -56,12 +54,6 @@ jobs: _ExcludeOmniSharpTests: true _RunOnline: false ${{ if ne(variables['Build.Reason'], 'PullRequest') }}: - CentOS8-Offline: - _BootstrapPrep: false - _Container: ${{ parameters.centOS8Container }} - _EnablePoison: false - _ExcludeOmniSharpTests: false - _RunOnline: false CentOSStream9-Offline: _BootstrapPrep: false _Container: ${{ parameters.centOSStream9Container }} @@ -97,9 +89,9 @@ jobs: dependsOn: ${{ parameters.dependsOn }} installerBuildResourceId: ${{ parameters.installerBuildResourceId }} matrix: - Debian9-Offline: + Debian11-Offline: _BootstrapPrep: true - _Container: ${{ parameters.debian9Arm64Container }} + _Container: ${{ parameters.debian11Arm64Container }} _EnablePoison: false _ExcludeOmniSharpTests: false _RunOnline: false diff --git a/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml b/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml deleted file mode 100644 index 73dd514c5..000000000 --- a/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml +++ /dev/null @@ -1,31 +0,0 @@ -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-20210924170306-047508b - _EnablePoison: false - _ExcludeOmniSharpTests: false - _RunOnline: false - name: Build_Tarball_x64 - pool: - name: NetCore1ESPool-Svc-Internal - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 From 2485ef7607181a26ec84e356e4fad71f02bed5b9 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 7 Nov 2023 10:59:07 -0800 Subject: [PATCH 081/535] Update branding to 6.0.126 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index d7a82ec5d..cad7761d7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 1 - 25 + 26 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From f212d116e7444d461391ef131c3a553fb505e240 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 7 Nov 2023 10:59:11 -0800 Subject: [PATCH 082/535] Update branding to 6.0.321 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 709738fc7..19776745f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 3 - 20 + 21 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From c0dde1944c7364dfe4fa6f3642dea627f2a7ce88 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 7 Nov 2023 10:59:15 -0800 Subject: [PATCH 083/535] Update branding to 6.0.418 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index dc111971f..461f3a8cc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 4 - 17 + 18 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From 084c161943ff64e03cd3952ac635db4bf72d3f5f Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Wed, 8 Nov 2023 17:34:45 -0600 Subject: [PATCH 084/535] Remove redundant xml doc test (#17734) --- .../XmlDocTests.cs | 48 ----- .../assets/baselines/MissingXmlDoc.txt | 175 ------------------ 2 files changed, 223 deletions(-) delete mode 100644 src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/XmlDocTests.cs delete mode 100644 src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MissingXmlDoc.txt diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/XmlDocTests.cs b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/XmlDocTests.cs deleted file mode 100644 index f8f4f2c8b..000000000 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/XmlDocTests.cs +++ /dev/null @@ -1,48 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -using System.Collections.Generic; -using System.IO; -using System.Linq; -using Xunit; -using Xunit.Abstractions; - -namespace Microsoft.DotNet.SourceBuild.SmokeTests; - -public class XmlDocTests : SmokeTests -{ - public XmlDocTests(ITestOutputHelper outputHelper) : base(outputHelper) { } - - /// - /// Verifies every targeting pack assembly has a xml doc file. - /// There are exceptions which are specified in baselines/XmlDocIgnore.*.txt. - /// - // Re-enable when fixing https://github.com/dotnet/source-build/issues/3660 - //[Fact] - public void VerifyTargetingPacksHaveDoc() - { - List missingXmlDoc = new(); - - string targetingPacksDirectory = Path.Combine(Config.DotNetDirectory, "packs"); - foreach (string targetingPackAssembly in Directory.EnumerateFiles(targetingPacksDirectory, "*.dll", SearchOption.AllDirectories)) - { - if (targetingPackAssembly.EndsWith("resources.dll")) - { - continue; - } - - string xmlFile = Path.ChangeExtension(targetingPackAssembly, ".xml"); - if (!File.Exists(xmlFile)) - { - string pathWithoutPacksPrefix = xmlFile[(targetingPacksDirectory.Length + 1)..]; - string[] pathParts = pathWithoutPacksPrefix.Split(Path.DirectorySeparatorChar); - string pathWithoutVersion = string.Join(Path.DirectorySeparatorChar, pathParts.Take(1).Concat(pathParts.Skip(2))); - pathWithoutVersion = BaselineHelper.RemoveNetTfmPaths(pathWithoutVersion); - missingXmlDoc.Add(pathWithoutVersion); - } - } - - BaselineHelper.CompareEntries("MissingXmlDoc.txt", missingXmlDoc.OrderBy(entry => entry)); - } -} diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MissingXmlDoc.txt b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MissingXmlDoc.txt deleted file mode 100644 index 38f80e186..000000000 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MissingXmlDoc.txt +++ /dev/null @@ -1,175 +0,0 @@ -Microsoft.AspNetCore.App.Ref/analyzers/dotnet/cs/Microsoft.AspNetCore.App.Analyzers.xml -Microsoft.AspNetCore.App.Ref/analyzers/dotnet/cs/Microsoft.AspNetCore.App.CodeFixes.xml -Microsoft.AspNetCore.App.Ref/analyzers/dotnet/roslyn4.0/cs/Microsoft.Extensions.Logging.Generators.xml -Microsoft.NETCore.App.Ref/analyzers/dotnet/cs/System.Text.Json.SourceGeneration.xml -Microsoft.NETCore.App.Ref/ref/netx.y/Microsoft.VisualBasic.xml -Microsoft.NETCore.App.Ref/ref/netx.y/mscorlib.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.AppContext.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Buffers.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.ComponentModel.DataAnnotations.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Configuration.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Core.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Data.DataSetExtensions.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Data.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Diagnostics.Debug.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Diagnostics.Tools.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Drawing.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Dynamic.Runtime.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Globalization.Calendars.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Globalization.Extensions.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Globalization.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.IO.Compression.Brotli.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.IO.Compression.FileSystem.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.IO.FileSystem.Primitives.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.IO.FileSystem.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.IO.UnmanagedMemoryStream.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.IO.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Net.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Numerics.Vectors.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Numerics.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Reflection.Extensions.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Reflection.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Resources.Reader.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Resources.ResourceManager.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Runtime.Extensions.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Runtime.Handles.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Runtime.Serialization.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Security.Principal.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Security.SecureString.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Security.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.ServiceModel.Web.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.ServiceProcess.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Text.Encoding.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Threading.Tasks.Extensions.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Threading.Tasks.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Threading.Timer.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Transactions.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.ValueTuple.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Web.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Windows.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Xml.Linq.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Xml.Serialization.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Xml.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Xml.XmlDocument.xml -Microsoft.NETCore.App.Ref/ref/netx.y/WindowsBase.xml -NETStandard.Library.Ref/ref/netstandard2.1/Microsoft.Win32.Primitives.xml -NETStandard.Library.Ref/ref/netstandard2.1/mscorlib.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.AppContext.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Buffers.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Collections.Concurrent.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Collections.NonGeneric.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Collections.Specialized.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Collections.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.ComponentModel.Composition.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.ComponentModel.EventBasedAsync.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.ComponentModel.Primitives.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.ComponentModel.TypeConverter.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.ComponentModel.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Console.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Core.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Data.Common.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Data.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Diagnostics.Contracts.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Diagnostics.Debug.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Diagnostics.FileVersionInfo.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Diagnostics.Process.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Diagnostics.StackTrace.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Diagnostics.TextWriterTraceListener.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Diagnostics.Tools.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Diagnostics.TraceSource.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Diagnostics.Tracing.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Drawing.Primitives.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Drawing.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Dynamic.Runtime.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Globalization.Calendars.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Globalization.Extensions.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Globalization.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.IO.Compression.FileSystem.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.IO.Compression.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.IO.Compression.ZipFile.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.IO.FileSystem.DriveInfo.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.IO.FileSystem.Primitives.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.IO.FileSystem.Watcher.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.IO.FileSystem.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.IO.IsolatedStorage.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.IO.MemoryMappedFiles.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.IO.Pipes.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.IO.UnmanagedMemoryStream.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.IO.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Linq.Expressions.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Linq.Parallel.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Linq.Queryable.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Linq.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Memory.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Net.Http.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Net.NameResolution.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Net.NetworkInformation.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Net.Ping.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Net.Primitives.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Net.Requests.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Net.Security.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Net.Sockets.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Net.WebHeaderCollection.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Net.WebSockets.Client.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Net.WebSockets.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Net.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Numerics.Vectors.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Numerics.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.ObjectModel.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Reflection.DispatchProxy.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Reflection.Emit.ILGeneration.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Reflection.Emit.Lightweight.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Reflection.Emit.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Reflection.Extensions.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Reflection.Primitives.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Reflection.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Resources.Reader.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Resources.ResourceManager.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Resources.Writer.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Runtime.CompilerServices.VisualC.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Runtime.Extensions.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Runtime.Handles.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Runtime.InteropServices.RuntimeInformation.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Runtime.InteropServices.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Runtime.Numerics.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Runtime.Serialization.Formatters.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Runtime.Serialization.Json.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Runtime.Serialization.Primitives.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Runtime.Serialization.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Runtime.Serialization.Xml.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Runtime.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Security.Claims.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Security.Cryptography.Algorithms.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Security.Cryptography.Csp.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Security.Cryptography.Encoding.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Security.Cryptography.Primitives.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Security.Cryptography.X509Certificates.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Security.Principal.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Security.SecureString.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.ServiceModel.Web.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Text.Encoding.Extensions.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Text.Encoding.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Text.RegularExpressions.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Threading.Overlapped.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Threading.Tasks.Extensions.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Threading.Tasks.Parallel.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Threading.Tasks.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Threading.Thread.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Threading.ThreadPool.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Threading.Timer.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Threading.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Transactions.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.ValueTuple.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Web.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Windows.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Xml.Linq.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Xml.ReaderWriter.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Xml.Serialization.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Xml.XDocument.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Xml.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Xml.XmlDocument.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Xml.XmlSerializer.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Xml.XPath.XDocument.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Xml.XPath.xml From ee809e5f00f8ef518462f2fb6fa0be368896f38c Mon Sep 17 00:00:00 2001 From: NET Source-Build Bot <102560831+dotnet-sb-bot@users.noreply.github.com> Date: Wed, 15 Nov 2023 15:02:47 +0100 Subject: [PATCH 085/535] .NET Source-Build 6.0.125 November 2023 Updates (#17781) --- eng/Versions.props | 2 +- src/SourceBuild/tarball/content/global.json | 2 +- src/SourceBuild/tarball/content/prep.sh | 2 +- .../scripts/bootstrap/OverrideBootstrapVersions.props | 11 +++++++++++ .../bootstrap/buildBootstrapPreviouslySB.csproj | 1 + 5 files changed, 15 insertions(+), 3 deletions(-) create mode 100644 src/SourceBuild/tarball/content/scripts/bootstrap/OverrideBootstrapVersions.props diff --git a/eng/Versions.props b/eng/Versions.props index 517ffef7a..c858d3a61 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.124 + 6.0.125 diff --git a/src/SourceBuild/tarball/content/global.json b/src/SourceBuild/tarball/content/global.json index e64601b87..06cde48c2 100644 --- a/src/SourceBuild/tarball/content/global.json +++ b/src/SourceBuild/tarball/content/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.124" + "dotnet": "6.0.125" }, "msbuild-sdks": { "Microsoft.Build.CentralPackageVersions": "2.0.1", diff --git a/src/SourceBuild/tarball/content/prep.sh b/src/SourceBuild/tarball/content/prep.sh index 429173290..89e00b1bb 100755 --- a/src/SourceBuild/tarball/content/prep.sh +++ b/src/SourceBuild/tarball/content/prep.sh @@ -118,7 +118,7 @@ if [ "$buildBootstrap" == "true" ]; then fi # Run restore on project to initiate download of bootstrap packages - $DOTNET_SDK_PATH/dotnet restore $workingDir/buildBootstrapPreviouslySB.csproj /bl:artifacts/prep/bootstrap.binlog /fileLoggerParameters:LogFile=artifacts/prep/bootstrap.log /p:ArchiveDir="$SCRIPT_ROOT/packages/archive/" + $DOTNET_SDK_PATH/dotnet restore $workingDir/buildBootstrapPreviouslySB.csproj /bl:artifacts/prep/bootstrap.binlog /fileLoggerParameters:LogFile=artifacts/prep/bootstrap.log /p:ArchiveDir="$SCRIPT_ROOT/packages/archive/" /p:BootstrapOverrideVersionsProps="$SCRIPT_ROOT/scripts/bootstrap/OverrideBootstrapVersions.props" # Remove working directory rm -rf $workingDir diff --git a/src/SourceBuild/tarball/content/scripts/bootstrap/OverrideBootstrapVersions.props b/src/SourceBuild/tarball/content/scripts/bootstrap/OverrideBootstrapVersions.props new file mode 100644 index 000000000..234abd681 --- /dev/null +++ b/src/SourceBuild/tarball/content/scripts/bootstrap/OverrideBootstrapVersions.props @@ -0,0 +1,11 @@ + + + + 6.0.25-servicing.23520.6 + + $(NonshippingRuntimeVersionFor6_0_25) + $(NonshippingRuntimeVersionFor6_0_25) + $(NonshippingRuntimeVersionFor6_0_25) + + diff --git a/src/SourceBuild/tarball/content/scripts/bootstrap/buildBootstrapPreviouslySB.csproj b/src/SourceBuild/tarball/content/scripts/bootstrap/buildBootstrapPreviouslySB.csproj index 14921a48f..c11dfcb3e 100644 --- a/src/SourceBuild/tarball/content/scripts/bootstrap/buildBootstrapPreviouslySB.csproj +++ b/src/SourceBuild/tarball/content/scripts/bootstrap/buildBootstrapPreviouslySB.csproj @@ -2,6 +2,7 @@ + net6.0 From 2155c78d6236e33524fbfca4f2764a29626d0f80 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 17 Nov 2023 21:53:05 +0000 Subject: [PATCH 086/535] Merged PR 35302: [internal/release/8.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.FSharp.Compiler**: from 12.8.0-beta.23523.6 to 12.8.0-beta.23563.2 (parent: Microsoft.NET.Sdk) - **Microsoft.SourceBuild.Intermediate.fsharp**: from 8.0.100-beta.23523.6 to 8.0.101-beta.23563.2 (parent: Microsoft.NET.Sdk) - **Microsoft.NET.Test.Sdk**: from 17.8.0-release-23523-03 to 17.8.0-release-23553-01 (parent: Microsoft.NET.Sdk) - **Microsoft.Net.Compilers.Toolset**: from 4.8.0-3.23524.11 to 4.8.0-7.23566.2 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:5d2948e4-7f4b-4c9a-54a4-08dbd5a5c4be) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 5d2948e4-7f4b-4c9a-54a4-08dbd5a5c4be - **Build**: 20231117.10 - **Date Produced**: November 17, 2023 7:31:44 PM UTC - **Commit**: 896ac7319c1d96012fa40193a20d1aadc444c697 - **Branch**: refs/heads/internal/release/8.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 8.0.100 to 8.0.101][21] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 8.0.100-rtm.23551.6 to 8.0.101-servicing.23567.10][21] - **Microsoft.NET.Sdk**: [from 8.0.100-rtm.23551.6 to 8.0.101-servicing.23567.10][21] - **Microsoft.TemplateEngine.Cli**: [from 8.0.100-rtm.23551.6 to 8.0.101-servicing.23567.10][21] - **Microsoft.FSharp.Compiler**: [from 12.8.0-beta.23523.6 to 12.8.0-beta.23563.2][22] - **Microsoft.SourceBuild.Intermediate.fsharp**: [from 8.0.100-beta.23523.6 to 8.0.101-beta.23563.2][22] - **Microsoft.NET.Test.Sdk**: [from 17.8.0-release-23523-03 to 17.8.0-release-23553-01][23] - **Microsoft.Net.Compilers.Toolset**: [from 4.8.0-3.23524.11 to 4.8.0-7.23566.2][24] [21]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCe9d13cbe7e&targetVersion=GC896ac7319c&_a=files [22]: https://github.com/dotnet/fsharp/compare/f41fe153f6...424e4b7cff [23]: https://github.com/microsoft/vstest/compare/ae25c3b96f...ae25c3b96f [24]: https://github.com/dotnet/roslyn/compare/f43cd10b73...7b75981cf3 [DependencyUpdate]: <> (End) [marker]: <> (End:5d2948e4-7f4b-4c9a-54a4-08dbd5a5c4be) --- NuGet.config | 12 ++---------- eng/Version.Details.xml | 30 +++++++++++++++--------------- eng/Versions.props | 10 +++++----- 3 files changed, 22 insertions(+), 30 deletions(-) diff --git a/NuGet.config b/NuGet.config index fb4bef099..54a5d4357 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,22 +7,17 @@ - - - - - + - @@ -43,15 +38,12 @@ - - - + - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3c1fff170..9734c347f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e9d13cbe7e8c1d52ce276a8655f52a87e1017c46 + 896ac7319c1d96012fa40193a20d1aadc444c697 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e9d13cbe7e8c1d52ce276a8655f52a87e1017c46 + 896ac7319c1d96012fa40193a20d1aadc444c697 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e9d13cbe7e8c1d52ce276a8655f52a87e1017c46 + 896ac7319c1d96012fa40193a20d1aadc444c697 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e9d13cbe7e8c1d52ce276a8655f52a87e1017c46 + 896ac7319c1d96012fa40193a20d1aadc444c697 https://github.com/dotnet/test-templates @@ -132,16 +132,16 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 239f8da8fbf8cf2a6cd0c793f0d02679bf4ccf6a - + https://github.com/dotnet/fsharp - f41fe153f68dd6b20cf4f91de9ea1e55fc09bb20 + 424e4b7cffb7656efd63f7a905a2498e39011104 - + https://github.com/dotnet/fsharp - f41fe153f68dd6b20cf4f91de9ea1e55fc09bb20 + 424e4b7cffb7656efd63f7a905a2498e39011104 - + https://github.com/microsoft/vstest ae25c3b96fe433c60af70e3991ace49fcbf7e970 @@ -150,9 +150,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://github.com/dotnet/roslyn - f43cd10b737b6343956dee421cff8c50b602c788 + 7b75981cf3bd520b86ec4ed00ec156c8bc48e4eb diff --git a/eng/Versions.props b/eng/Versions.props index 49c0d5b04..bcfd8bdc8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,16 +85,16 @@ - 8.0.100 - 8.0.100-rtm.23551.6 - 8.0.100-rtm.23551.6 + 8.0.101 + 8.0.101-servicing.23567.10 + 8.0.101-servicing.23567.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.8.0-3.23524.11 + 4.8.0-7.23566.2 @@ -234,7 +234,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.8.0-release-23523-03 + 17.8.0-release-23553-01 8.0.0-alpha.1.22557.12 From 8aa023ba39689e98abec53397fc4c75128f200a3 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 18 Nov 2023 16:51:21 +0000 Subject: [PATCH 087/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231118.1 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.101 -> To Version 8.0.101 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets From Version 8.0.0 -> To Version 8.0.1 (parent: Microsoft.NET.Sdk --- NuGet.config | 6 ++++-- eng/Version.Details.xml | 42 ++++++++++++++++++++--------------------- eng/Versions.props | 18 +++++++++--------- 3 files changed, 34 insertions(+), 32 deletions(-) diff --git a/NuGet.config b/NuGet.config index 54a5d4357..28dd7e64f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,13 +9,14 @@ + - + @@ -38,10 +39,11 @@ + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9734c347f..491723294 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -56,51 +56,51 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3f1acb59718cadf111a0a796681e3d3509bb3381 + 9883767a166f54214c9aa9e91d8892e581ca2dae - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3f1acb59718cadf111a0a796681e3d3509bb3381 + 9883767a166f54214c9aa9e91d8892e581ca2dae - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3f1acb59718cadf111a0a796681e3d3509bb3381 + 9883767a166f54214c9aa9e91d8892e581ca2dae - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3f1acb59718cadf111a0a796681e3d3509bb3381 + 9883767a166f54214c9aa9e91d8892e581ca2dae - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3f1acb59718cadf111a0a796681e3d3509bb3381 + 9883767a166f54214c9aa9e91d8892e581ca2dae - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3f1acb59718cadf111a0a796681e3d3509bb3381 + 9883767a166f54214c9aa9e91d8892e581ca2dae - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3f1acb59718cadf111a0a796681e3d3509bb3381 + 9883767a166f54214c9aa9e91d8892e581ca2dae https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 896ac7319c1d96012fa40193a20d1aadc444c697 + 6b0808b122011cbf8867d9d1ee44132e941500a1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 896ac7319c1d96012fa40193a20d1aadc444c697 + 6b0808b122011cbf8867d9d1ee44132e941500a1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 896ac7319c1d96012fa40193a20d1aadc444c697 + 6b0808b122011cbf8867d9d1ee44132e941500a1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 896ac7319c1d96012fa40193a20d1aadc444c697 + 6b0808b122011cbf8867d9d1ee44132e941500a1 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index bcfd8bdc8..290334b57 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -72,13 +72,13 @@ - 8.0.0 - 8.0.0 - 8.0.0-rtm.23531.12 - 8.0.0-rtm.23531.12 - 8.0.0-rtm.23531.12 - 8.0.0-rtm.23531.12 - 8.0.0-rtm.23531.12 + 8.0.1 + 8.0.1 + 8.0.1-servicing.23567.12 + 8.0.1-servicing.23567.12 + 8.0.1-servicing.23567.12 + 8.0.1-servicing.23567.12 + 8.0.1-servicing.23567.12 0.2.0 @@ -86,8 +86,8 @@ 8.0.101 - 8.0.101-servicing.23567.10 - 8.0.101-servicing.23567.10 + 8.0.101-servicing.23568.1 + 8.0.101-servicing.23568.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 8cd4ffb4f255136aec7e4225180c17fd638b1ebe Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 20 Nov 2023 04:14:47 +0000 Subject: [PATCH 088/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231119.5 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.101 -> To Version 8.0.101 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets From Version 8.0.0 -> To Version 8.0.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 28dd7e64f..a31f74b17 100644 --- a/NuGet.config +++ b/NuGet.config @@ -16,7 +16,7 @@ - + @@ -43,7 +43,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 491723294..eb98ef1b3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6b0808b122011cbf8867d9d1ee44132e941500a1 + fe34d4d57b13fc2fddc80f1fce57a0fb1c85818a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6b0808b122011cbf8867d9d1ee44132e941500a1 + fe34d4d57b13fc2fddc80f1fce57a0fb1c85818a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6b0808b122011cbf8867d9d1ee44132e941500a1 + fe34d4d57b13fc2fddc80f1fce57a0fb1c85818a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6b0808b122011cbf8867d9d1ee44132e941500a1 + fe34d4d57b13fc2fddc80f1fce57a0fb1c85818a https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 290334b57..95a63eb5a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,8 +86,8 @@ 8.0.101 - 8.0.101-servicing.23568.1 - 8.0.101-servicing.23568.1 + 8.0.101-servicing.23569.5 + 8.0.101-servicing.23569.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 8837938895805299a1465ff22d250abc1783353a Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 20 Nov 2023 13:45:26 +0000 Subject: [PATCH 089/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231120.4 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.101 -> To Version 8.0.101 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets From Version 8.0.0 -> To Version 8.0.1 (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 a31f74b17..96942b246 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,14 +9,14 @@ - + - + @@ -39,11 +39,11 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index eb98ef1b3..b19fb48bc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -58,49 +58,49 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9883767a166f54214c9aa9e91d8892e581ca2dae + 709342899e770ba4ab6e674fc5d5d6d90ce67b73 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9883767a166f54214c9aa9e91d8892e581ca2dae + 709342899e770ba4ab6e674fc5d5d6d90ce67b73 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9883767a166f54214c9aa9e91d8892e581ca2dae + 709342899e770ba4ab6e674fc5d5d6d90ce67b73 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9883767a166f54214c9aa9e91d8892e581ca2dae + 709342899e770ba4ab6e674fc5d5d6d90ce67b73 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9883767a166f54214c9aa9e91d8892e581ca2dae + 709342899e770ba4ab6e674fc5d5d6d90ce67b73 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9883767a166f54214c9aa9e91d8892e581ca2dae + 709342899e770ba4ab6e674fc5d5d6d90ce67b73 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9883767a166f54214c9aa9e91d8892e581ca2dae + 709342899e770ba4ab6e674fc5d5d6d90ce67b73 https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fe34d4d57b13fc2fddc80f1fce57a0fb1c85818a + 8b7ae3cb97014931805bd593df41cf62acfa22db - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fe34d4d57b13fc2fddc80f1fce57a0fb1c85818a + 8b7ae3cb97014931805bd593df41cf62acfa22db - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fe34d4d57b13fc2fddc80f1fce57a0fb1c85818a + 8b7ae3cb97014931805bd593df41cf62acfa22db - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fe34d4d57b13fc2fddc80f1fce57a0fb1c85818a + 8b7ae3cb97014931805bd593df41cf62acfa22db https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 95a63eb5a..d82daf14c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -74,11 +74,11 @@ 8.0.1 8.0.1 - 8.0.1-servicing.23567.12 - 8.0.1-servicing.23567.12 - 8.0.1-servicing.23567.12 - 8.0.1-servicing.23567.12 - 8.0.1-servicing.23567.12 + 8.0.1-servicing.23569.3 + 8.0.1-servicing.23569.3 + 8.0.1-servicing.23569.3 + 8.0.1-servicing.23569.3 + 8.0.1-servicing.23569.3 0.2.0 @@ -86,8 +86,8 @@ 8.0.101 - 8.0.101-servicing.23569.5 - 8.0.101-servicing.23569.5 + 8.0.101-servicing.23570.4 + 8.0.101-servicing.23570.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b4278950db813e15258bea22c93bd74aff4564fd Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 20 Nov 2023 18:35:25 +0000 Subject: [PATCH 090/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231120.10 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.101 -> To Version 8.0.101 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 8.0.0 -> To Version 8.0.1 (parent: Microsoft.NET.Sdk --- NuGet.config | 6 ++++-- eng/Version.Details.xml | 38 +++++++++++++++++++------------------- eng/Versions.props | 16 ++++++++-------- 3 files changed, 31 insertions(+), 29 deletions(-) diff --git a/NuGet.config b/NuGet.config index 96942b246..3c082c7b4 100644 --- a/NuGet.config +++ b/NuGet.config @@ -16,9 +16,10 @@ - + + @@ -43,9 +44,10 @@ - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b19fb48bc..2e7141bfd 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://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c0170915ed6c164a594cd9d558d44aaf98fc6961 + beb23efbde5eea56cc527639b03f5e09ca9b1250 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c0170915ed6c164a594cd9d558d44aaf98fc6961 + beb23efbde5eea56cc527639b03f5e09ca9b1250 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c0170915ed6c164a594cd9d558d44aaf98fc6961 + beb23efbde5eea56cc527639b03f5e09ca9b1250 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c0170915ed6c164a594cd9d558d44aaf98fc6961 + beb23efbde5eea56cc527639b03f5e09ca9b1250 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8b7ae3cb97014931805bd593df41cf62acfa22db + b9cf8632e323118a6092f2b5cc1e965edd3c8e72 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8b7ae3cb97014931805bd593df41cf62acfa22db + b9cf8632e323118a6092f2b5cc1e965edd3c8e72 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8b7ae3cb97014931805bd593df41cf62acfa22db + b9cf8632e323118a6092f2b5cc1e965edd3c8e72 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8b7ae3cb97014931805bd593df41cf62acfa22db + b9cf8632e323118a6092f2b5cc1e965edd3c8e72 https://github.com/dotnet/test-templates @@ -124,13 +124,13 @@ 1e5f3603af2277910aad946736ee23283e7f3e16 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - e4ede9b8979b9d2b1b1d4383f30a791414f0625b + a223f121b4c906a72b2b0711fe24e6b8e0e0cf18 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 239f8da8fbf8cf2a6cd0c793f0d02679bf4ccf6a + 8a13cff12b600771ba62ef9ec9cfa491d37fa383 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index d82daf14c..8601d9739 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,11 +48,11 @@ - 8.0.0-rtm.23531.5 + 8.0.1-servicing.23567.3 - 8.0.0-rtm.23531.4 + 8.0.1-servicing.23570.2 @@ -86,8 +86,8 @@ 8.0.101 - 8.0.101-servicing.23570.4 - 8.0.101-servicing.23570.4 + 8.0.101-servicing.23570.10 + 8.0.101-servicing.23570.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -112,10 +112,10 @@ - 8.0.0-rtm.23551.1 - 8.0.0-rtm.23551.1 - 8.0.0 - 8.0.0 + 8.0.1-servicing.23570.2 + 8.0.1-servicing.23570.2 + 8.0.1 + 8.0.1 From 193aa8f1fbfcae43126620143761dc59fb74e8fd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 20 Nov 2023 19:18:28 +0000 Subject: [PATCH 091/535] Update dependencies from https://github.com/dotnet/arcade build 20231017.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 6.0.0-beta.23511.8 -> To Version 6.0.0-beta.23517.3 Dependency coherency updates Microsoft.NET.Workload.Emscripten.Manifest-6.0.400 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 | 16 ++++++++-------- eng/Versions.props | 4 ++-- eng/common/templates/jobs/source-build.yml | 2 +- global.json | 4 ++-- 5 files changed, 13 insertions(+), 21 deletions(-) diff --git a/NuGet.config b/NuGet.config index 1f8067f09..03d3587a6 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,20 +7,16 @@ - - - - @@ -41,16 +37,12 @@ - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 10158d645..492e94748 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -166,9 +166,9 @@ 698fdad58fa64a55f16cd9562c90224cc498ed02 - + https://github.com/dotnet/emsdk - 3c754f28788fae642dc307a948479204e9f7dd5a + d8bc162ccf7ce14fdbec9c2c50d6e856a7063c91 https://github.com/dotnet/source-build @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - 06ccd9430e2e3bd29a381a5b27e7976d11b0ed18 + 7c67805da0adbf4e72f2f4799b63efcf1cc8fe4c - + https://github.com/dotnet/arcade - 06ccd9430e2e3bd29a381a5b27e7976d11b0ed18 + 7c67805da0adbf4e72f2f4799b63efcf1cc8fe4c - + https://github.com/dotnet/arcade - 06ccd9430e2e3bd29a381a5b27e7976d11b0ed18 + 7c67805da0adbf4e72f2f4799b63efcf1cc8fe4c https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 7814defb1..6407cb843 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.23511.8 + 6.0.0-beta.23517.3 @@ -185,7 +185,7 @@ 12.3.303 15.4.303 6.0.5 - 6.0.22 + 6.0.25 $(MicrosoftNETWorkloadEmscriptenManifest60400Version) diff --git a/eng/common/templates/jobs/source-build.yml b/eng/common/templates/jobs/source-build.yml index 7c240e654..00aa98eb3 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-7' + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-3e800f1-20190501005343' # 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/global.json b/global.json index eeff7fa00..1410185dd 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23511.8", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.23511.8" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23517.3", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.23517.3" } } From 66c787891e4032897eb5df029c11ea97a5a4b89a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 20 Nov 2023 21:01:01 +0000 Subject: [PATCH 092/535] [release/6.0.1xx] Update dependencies from dotnet/arcade (#17517) [release/6.0.1xx] Update dependencies from dotnet/arcade - Merge branch 'release/6.0.1xx' of https://github.com/dotnet/installer into darc-release/6.0.1xx-25252fb3-bc5a-4401-85d9-c93e83346b2b - Merge branch 'release/6.0.1xx' into darc-release/6.0.1xx-25252fb3-bc5a-4401-85d9-c93e83346b2b --- NuGet.config | 9 ----- eng/Version.Details.xml | 12 +++--- eng/Versions.props | 2 +- eng/common/retain-build.ps1 | 45 +++++++++++++++++++++ eng/common/templates/jobs/source-build.yml | 2 +- eng/common/templates/steps/retain-build.yml | 28 +++++++++++++ global.json | 6 +-- 7 files changed, 84 insertions(+), 20 deletions(-) create mode 100644 eng/common/retain-build.ps1 create mode 100644 eng/common/templates/steps/retain-build.yml diff --git a/NuGet.config b/NuGet.config index a735b4622..dd632b04b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,21 +7,16 @@ - - - - - @@ -42,17 +37,13 @@ - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d7af92d1e..039431cba 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - 98fd22588fbb0f407faa6a74cb1aa79031306151 + 7c67805da0adbf4e72f2f4799b63efcf1cc8fe4c - + https://github.com/dotnet/arcade - 98fd22588fbb0f407faa6a74cb1aa79031306151 + 7c67805da0adbf4e72f2f4799b63efcf1cc8fe4c - + https://github.com/dotnet/arcade - 98fd22588fbb0f407faa6a74cb1aa79031306151 + 7c67805da0adbf4e72f2f4799b63efcf1cc8fe4c https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index c858d3a61..616f2592a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.23408.5 + 6.0.0-beta.23517.3 diff --git a/eng/common/retain-build.ps1 b/eng/common/retain-build.ps1 new file mode 100644 index 000000000..e7ba975ad --- /dev/null +++ b/eng/common/retain-build.ps1 @@ -0,0 +1,45 @@ + +Param( +[Parameter(Mandatory=$true)][int] $buildId, +[Parameter(Mandatory=$true)][string] $azdoOrgUri, +[Parameter(Mandatory=$true)][string] $azdoProject, +[Parameter(Mandatory=$true)][string] $token +) + +$ErrorActionPreference = 'Stop' +Set-StrictMode -Version 2.0 + +function Get-AzDOHeaders( + [string] $token) +{ + $base64AuthInfo = [Convert]::ToBase64String([Text.Encoding]::ASCII.GetBytes(":${token}")) + $headers = @{"Authorization"="Basic $base64AuthInfo"} + return $headers +} + +function Update-BuildRetention( + [string] $azdoOrgUri, + [string] $azdoProject, + [int] $buildId, + [string] $token) +{ + $headers = Get-AzDOHeaders -token $token + $requestBody = "{ + `"keepForever`": `"true`" + }" + + $requestUri = "${azdoOrgUri}/${azdoProject}/_apis/build/builds/${buildId}?api-version=6.0" + write-Host "Attempting to retain build using the following URI: ${requestUri} ..." + + try { + Invoke-RestMethod -Uri $requestUri -Method Patch -Body $requestBody -Header $headers -contentType "application/json" + Write-Host "Updated retention settings for build ${buildId}." + } + catch { + Write-Error "Failed to update retention settings for build: $_.Exception.Response.StatusDescription" + exit 1 + } +} + +Update-BuildRetention -azdoOrgUri $azdoOrgUri -azdoProject $azdoProject -buildId $buildId -token $token +exit 0 diff --git a/eng/common/templates/jobs/source-build.yml b/eng/common/templates/jobs/source-build.yml index 7c240e654..00aa98eb3 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-7' + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-3e800f1-20190501005343' # 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/steps/retain-build.yml b/eng/common/templates/steps/retain-build.yml new file mode 100644 index 000000000..83d97a26a --- /dev/null +++ b/eng/common/templates/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/global.json b/global.json index 327cfe027..1410185dd 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.121", + "dotnet": "6.0.123", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23408.5", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.23408.5" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23517.3", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.23517.3" } } From 06ddb6bd75a241a9ac6cf91e8721253d07c7d7a2 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 21 Nov 2023 03:28:47 +0000 Subject: [PATCH 093/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231120.47 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.101 -> To Version 8.0.101 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 8.0.0 -> To Version 8.0.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 3c082c7b4..0c00329dc 100644 --- a/NuGet.config +++ b/NuGet.config @@ -16,7 +16,7 @@ - + @@ -44,7 +44,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2e7141bfd..71361585a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b9cf8632e323118a6092f2b5cc1e965edd3c8e72 + 9ed4b916772f7feb0f6437d1990942c0c09923ec - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b9cf8632e323118a6092f2b5cc1e965edd3c8e72 + 9ed4b916772f7feb0f6437d1990942c0c09923ec - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b9cf8632e323118a6092f2b5cc1e965edd3c8e72 + 9ed4b916772f7feb0f6437d1990942c0c09923ec - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b9cf8632e323118a6092f2b5cc1e965edd3c8e72 + 9ed4b916772f7feb0f6437d1990942c0c09923ec https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 8601d9739..2fa09df46 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,8 +86,8 @@ 8.0.101 - 8.0.101-servicing.23570.10 - 8.0.101-servicing.23570.10 + 8.0.101-servicing.23570.47 + 8.0.101-servicing.23570.47 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 9362eef08d73ba2f355c09fa4473316cd41c0f18 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 21 Nov 2023 07:35:32 +0000 Subject: [PATCH 094/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231120.53 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.101 -> To Version 8.0.101 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 8.0.0 -> To Version 8.0.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 0c00329dc..25cc0e168 100644 --- a/NuGet.config +++ b/NuGet.config @@ -16,7 +16,7 @@ - + @@ -44,7 +44,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 71361585a..8a6fa524b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9ed4b916772f7feb0f6437d1990942c0c09923ec + 43a03ac3732763448ed3e6ac57358a6589923fcb - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9ed4b916772f7feb0f6437d1990942c0c09923ec + 43a03ac3732763448ed3e6ac57358a6589923fcb - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9ed4b916772f7feb0f6437d1990942c0c09923ec + 43a03ac3732763448ed3e6ac57358a6589923fcb - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9ed4b916772f7feb0f6437d1990942c0c09923ec + 43a03ac3732763448ed3e6ac57358a6589923fcb https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 2fa09df46..98223ad46 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,8 +86,8 @@ 8.0.101 - 8.0.101-servicing.23570.47 - 8.0.101-servicing.23570.47 + 8.0.101-servicing.23570.53 + 8.0.101-servicing.23570.53 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From ae38391508267e77f4c24f8eee9f82eaa4e3c5a4 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 21 Nov 2023 14:38:20 +0000 Subject: [PATCH 095/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231121.3 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.101 -> To Version 8.0.101 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.SourceBuild.Intermediate.emsdk From Version 8.0.0 -> To Version 8.0.1 (parent: Microsoft.NET.Sdk --- NuGet.config | 7 ++++-- eng/Version.Details.xml | 50 ++++++++++++++++++++--------------------- eng/Versions.props | 18 +++++++-------- 3 files changed, 39 insertions(+), 36 deletions(-) diff --git a/NuGet.config b/NuGet.config index 25cc0e168..cd0c3e9c4 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,6 +7,7 @@ + @@ -14,9 +15,10 @@ + - + @@ -43,8 +45,9 @@ + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8a6fa524b..1cac67efb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -21,30 +21,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop beb23efbde5eea56cc527639b03f5e09ca9b1250 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 + f83afe4ed0000ee202b2528bc5803a94130a0f4c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 + f83afe4ed0000ee202b2528bc5803a94130a0f4c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 + f83afe4ed0000ee202b2528bc5803a94130a0f4c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 + f83afe4ed0000ee202b2528bc5803a94130a0f4c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 + f83afe4ed0000ee202b2528bc5803a94130a0f4c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 + f83afe4ed0000ee202b2528bc5803a94130a0f4c @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 43a03ac3732763448ed3e6ac57358a6589923fcb + c793265732855639ab1abd311e61bcc014f16e40 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 43a03ac3732763448ed3e6ac57358a6589923fcb + c793265732855639ab1abd311e61bcc014f16e40 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 43a03ac3732763448ed3e6ac57358a6589923fcb + c793265732855639ab1abd311e61bcc014f16e40 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 43a03ac3732763448ed3e6ac57358a6589923fcb + c793265732855639ab1abd311e61bcc014f16e40 https://github.com/dotnet/test-templates @@ -146,9 +146,9 @@ ae25c3b96fe433c60af70e3991ace49fcbf7e970 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 + f83afe4ed0000ee202b2528bc5803a94130a0f4c https://github.com/dotnet/roslyn @@ -168,18 +168,18 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 2406616d0e3a31d80b326e27c156955bfa41c791 + d75f77cb8eb87322453288a22ce9b2d880bd1cb1 https://dev.azure.com/dnceng/internal/_git/dotnet-aspire 4b00c57d7ccf9a4c7e2aef211ab6bd8af3ee2324 - + https://github.com/dotnet/emsdk - 2406616d0e3a31d80b326e27c156955bfa41c791 + d75f77cb8eb87322453288a22ce9b2d880bd1cb1 diff --git a/eng/Versions.props b/eng/Versions.props index 98223ad46..1037734a7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,8 +86,8 @@ 8.0.101 - 8.0.101-servicing.23570.53 - 8.0.101-servicing.23570.53 + 8.0.101-servicing.23571.3 + 8.0.101-servicing.23571.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -102,12 +102,12 @@ - 8.0.0-rtm.23531.3 - 8.0.0-rtm.23531.3 - 8.0.0 - 8.0.0 - 8.0.0 - 8.0.0 + 8.0.1-servicing.23570.18 + 8.0.1-servicing.23570.18 + 8.0.1 + 8.0.1 + 8.0.1 + 8.0.1 2.1.0 @@ -249,7 +249,7 @@ 13.3.8968-net8-rc2 16.4.8968-net8-rc2 - 8.0.0 + 8.0.1 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100PackageVersion) 8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-rtm|-[A-z]*\.*\d*`)) From a9a2ed7803d91edbec7d6115258b65cab880dece Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 21 Nov 2023 15:32:16 +0000 Subject: [PATCH 096/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231121.5 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.101 -> To Version 8.0.101 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.SourceBuild.Intermediate.emsdk From Version 8.0.0 -> To Version 8.0.1 (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 cd0c3e9c4..bfe05ac58 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,7 +10,7 @@ - + @@ -18,7 +18,7 @@ - + @@ -42,12 +42,12 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1cac67efb..c6196825f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -58,49 +58,49 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 709342899e770ba4ab6e674fc5d5d6d90ce67b73 + 6f3114fd9c67c64ce1d35ddbdc8450fa465e216d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 709342899e770ba4ab6e674fc5d5d6d90ce67b73 + 6f3114fd9c67c64ce1d35ddbdc8450fa465e216d https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 709342899e770ba4ab6e674fc5d5d6d90ce67b73 + 6f3114fd9c67c64ce1d35ddbdc8450fa465e216d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 709342899e770ba4ab6e674fc5d5d6d90ce67b73 + 6f3114fd9c67c64ce1d35ddbdc8450fa465e216d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 709342899e770ba4ab6e674fc5d5d6d90ce67b73 + 6f3114fd9c67c64ce1d35ddbdc8450fa465e216d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 709342899e770ba4ab6e674fc5d5d6d90ce67b73 + 6f3114fd9c67c64ce1d35ddbdc8450fa465e216d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 709342899e770ba4ab6e674fc5d5d6d90ce67b73 + 6f3114fd9c67c64ce1d35ddbdc8450fa465e216d https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c793265732855639ab1abd311e61bcc014f16e40 + ddf91112f975f0d5329f37471d104779473d0f2c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c793265732855639ab1abd311e61bcc014f16e40 + ddf91112f975f0d5329f37471d104779473d0f2c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c793265732855639ab1abd311e61bcc014f16e40 + ddf91112f975f0d5329f37471d104779473d0f2c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c793265732855639ab1abd311e61bcc014f16e40 + ddf91112f975f0d5329f37471d104779473d0f2c https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 1037734a7..29d28c3c0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -74,11 +74,11 @@ 8.0.1 8.0.1 - 8.0.1-servicing.23569.3 - 8.0.1-servicing.23569.3 - 8.0.1-servicing.23569.3 - 8.0.1-servicing.23569.3 - 8.0.1-servicing.23569.3 + 8.0.1-servicing.23571.2 + 8.0.1-servicing.23571.2 + 8.0.1-servicing.23571.2 + 8.0.1-servicing.23571.2 + 8.0.1-servicing.23571.2 0.2.0 @@ -86,8 +86,8 @@ 8.0.101 - 8.0.101-servicing.23571.3 - 8.0.101-servicing.23571.3 + 8.0.101-servicing.23571.5 + 8.0.101-servicing.23571.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 7a2bfafa3be662f68487c9e9732bd5038ab9a192 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 21 Nov 2023 16:37:28 +0000 Subject: [PATCH 097/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231121.7 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.101 -> To Version 8.0.101 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.SourceBuild.Intermediate.emsdk From Version 8.0.0 -> To Version 8.0.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 bfe05ac58..4b5b45fbf 100644 --- a/NuGet.config +++ b/NuGet.config @@ -18,7 +18,7 @@ - + @@ -47,7 +47,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c6196825f..a83903216 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ddf91112f975f0d5329f37471d104779473d0f2c + e82b6c9b9772fdd18f58c730a9f1c87d14580d94 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ddf91112f975f0d5329f37471d104779473d0f2c + e82b6c9b9772fdd18f58c730a9f1c87d14580d94 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ddf91112f975f0d5329f37471d104779473d0f2c + e82b6c9b9772fdd18f58c730a9f1c87d14580d94 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ddf91112f975f0d5329f37471d104779473d0f2c + e82b6c9b9772fdd18f58c730a9f1c87d14580d94 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 29d28c3c0..9d6711610 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,8 +86,8 @@ 8.0.101 - 8.0.101-servicing.23571.5 - 8.0.101-servicing.23571.5 + 8.0.101-servicing.23571.7 + 8.0.101-servicing.23571.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From efa68fe107f1ddc841be508aed50bc996575aac4 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 21 Nov 2023 18:02:42 +0000 Subject: [PATCH 098/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231121.8 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.101 -> To Version 8.0.101 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.SourceBuild.Intermediate.emsdk From Version 8.0.0 -> To Version 8.0.1 (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 4b5b45fbf..69ea23a73 100644 --- a/NuGet.config +++ b/NuGet.config @@ -18,10 +18,10 @@ - + - + @@ -47,10 +47,10 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a83903216..8b2832208 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -7,19 +7,19 @@ --> https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - beb23efbde5eea56cc527639b03f5e09ca9b1250 + 94d6b586a05ef1d4b4234fb324fb95b9c1c73204 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - beb23efbde5eea56cc527639b03f5e09ca9b1250 + 94d6b586a05ef1d4b4234fb324fb95b9c1c73204 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - beb23efbde5eea56cc527639b03f5e09ca9b1250 + 94d6b586a05ef1d4b4234fb324fb95b9c1c73204 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - beb23efbde5eea56cc527639b03f5e09ca9b1250 + 94d6b586a05ef1d4b4234fb324fb95b9c1c73204 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e82b6c9b9772fdd18f58c730a9f1c87d14580d94 + 00bb9c8cc25fe393f280307a0a90b941271b9145 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e82b6c9b9772fdd18f58c730a9f1c87d14580d94 + 00bb9c8cc25fe393f280307a0a90b941271b9145 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e82b6c9b9772fdd18f58c730a9f1c87d14580d94 + 00bb9c8cc25fe393f280307a0a90b941271b9145 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e82b6c9b9772fdd18f58c730a9f1c87d14580d94 + 00bb9c8cc25fe393f280307a0a90b941271b9145 https://github.com/dotnet/test-templates @@ -124,13 +124,13 @@ 1e5f3603af2277910aad946736ee23283e7f3e16 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - a223f121b4c906a72b2b0711fe24e6b8e0e0cf18 + 642f51b02a34281044c2a1e07862b2bf2b71c155 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 8a13cff12b600771ba62ef9ec9cfa491d37fa383 + b871665f995218f1d89f071e87080bb481787364 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 9d6711610..845c697df 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,11 +48,11 @@ - 8.0.1-servicing.23567.3 + 8.0.1-servicing.23571.1 - 8.0.1-servicing.23570.2 + 8.0.1-servicing.23571.2 @@ -86,8 +86,8 @@ 8.0.101 - 8.0.101-servicing.23571.7 - 8.0.101-servicing.23571.7 + 8.0.101-servicing.23571.8 + 8.0.101-servicing.23571.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -112,8 +112,8 @@ - 8.0.1-servicing.23570.2 - 8.0.1-servicing.23570.2 + 8.0.1-servicing.23571.3 + 8.0.1-servicing.23571.3 8.0.1 8.0.1 From 2441b556600cd841022032a0f9abafe367ff0473 Mon Sep 17 00:00:00 2001 From: "Michael Simons (VISUAL STUDIO)" Date: Tue, 21 Nov 2023 20:48:14 +0000 Subject: [PATCH 099/535] Workaround arcade snupkg issue with building sourcelink in source build. --- src/SourceBuild/content/repo-projects/Directory.Build.props | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/SourceBuild/content/repo-projects/Directory.Build.props b/src/SourceBuild/content/repo-projects/Directory.Build.props index 165f87523..cdd195114 100644 --- a/src/SourceBuild/content/repo-projects/Directory.Build.props +++ b/src/SourceBuild/content/repo-projects/Directory.Build.props @@ -113,6 +113,9 @@ + + + From b6cdff23ee93a12e68ee43ad300b191c528ce76b Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 22 Nov 2023 01:32:02 +0000 Subject: [PATCH 100/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231121.17 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.101 -> To Version 8.0.101 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.SourceBuild.Intermediate.emsdk From Version 8.0.0 -> To Version 8.0.1 (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 69ea23a73..5ed76703b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,7 +10,7 @@ - + @@ -18,7 +18,7 @@ - + @@ -42,12 +42,12 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8b2832208..6ca04f845 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -58,49 +58,49 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6f3114fd9c67c64ce1d35ddbdc8450fa465e216d + 5275cc3be8088994b77003b54b5496264d9f3fe7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6f3114fd9c67c64ce1d35ddbdc8450fa465e216d + 5275cc3be8088994b77003b54b5496264d9f3fe7 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6f3114fd9c67c64ce1d35ddbdc8450fa465e216d + 5275cc3be8088994b77003b54b5496264d9f3fe7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6f3114fd9c67c64ce1d35ddbdc8450fa465e216d + 5275cc3be8088994b77003b54b5496264d9f3fe7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6f3114fd9c67c64ce1d35ddbdc8450fa465e216d + 5275cc3be8088994b77003b54b5496264d9f3fe7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6f3114fd9c67c64ce1d35ddbdc8450fa465e216d + 5275cc3be8088994b77003b54b5496264d9f3fe7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6f3114fd9c67c64ce1d35ddbdc8450fa465e216d + 5275cc3be8088994b77003b54b5496264d9f3fe7 https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 00bb9c8cc25fe393f280307a0a90b941271b9145 + 1fa870acd753755a12bc4547d7313a17b953a2e7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 00bb9c8cc25fe393f280307a0a90b941271b9145 + 1fa870acd753755a12bc4547d7313a17b953a2e7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 00bb9c8cc25fe393f280307a0a90b941271b9145 + 1fa870acd753755a12bc4547d7313a17b953a2e7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 00bb9c8cc25fe393f280307a0a90b941271b9145 + 1fa870acd753755a12bc4547d7313a17b953a2e7 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 845c697df..17e86845b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -74,11 +74,11 @@ 8.0.1 8.0.1 - 8.0.1-servicing.23571.2 - 8.0.1-servicing.23571.2 - 8.0.1-servicing.23571.2 - 8.0.1-servicing.23571.2 - 8.0.1-servicing.23571.2 + 8.0.1-servicing.23571.8 + 8.0.1-servicing.23571.8 + 8.0.1-servicing.23571.8 + 8.0.1-servicing.23571.8 + 8.0.1-servicing.23571.8 0.2.0 @@ -86,8 +86,8 @@ 8.0.101 - 8.0.101-servicing.23571.8 - 8.0.101-servicing.23571.8 + 8.0.101-servicing.23571.17 + 8.0.101-servicing.23571.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 2431c05824045be3485c47cc62368351e59b2864 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 22 Nov 2023 13:16:10 +0000 Subject: [PATCH 101/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231122.4 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.101 -> To Version 8.0.101 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.SourceBuild.Intermediate.emsdk From Version 8.0.0 -> To Version 8.0.1 (parent: Microsoft.NET.Sdk --- NuGet.config | 10 +++++----- eng/Version.Details.xml | 38 +++++++++++++++++++------------------- eng/Versions.props | 8 ++++---- 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/NuGet.config b/NuGet.config index 5ed76703b..6dc4ccdcf 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -15,10 +15,10 @@ - + - + @@ -45,9 +45,9 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6ca04f845..4273e2cc4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -21,30 +21,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 94d6b586a05ef1d4b4234fb324fb95b9c1c73204 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f83afe4ed0000ee202b2528bc5803a94130a0f4c + 21b90573de7d6e0c88acdd25dc116b6729fd65a7 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f83afe4ed0000ee202b2528bc5803a94130a0f4c + 21b90573de7d6e0c88acdd25dc116b6729fd65a7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f83afe4ed0000ee202b2528bc5803a94130a0f4c + 21b90573de7d6e0c88acdd25dc116b6729fd65a7 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f83afe4ed0000ee202b2528bc5803a94130a0f4c + 21b90573de7d6e0c88acdd25dc116b6729fd65a7 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f83afe4ed0000ee202b2528bc5803a94130a0f4c + 21b90573de7d6e0c88acdd25dc116b6729fd65a7 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f83afe4ed0000ee202b2528bc5803a94130a0f4c + 21b90573de7d6e0c88acdd25dc116b6729fd65a7 @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1fa870acd753755a12bc4547d7313a17b953a2e7 + 29fe4b324540ce8d4cb01df42ef0ebf1921ea4e0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1fa870acd753755a12bc4547d7313a17b953a2e7 + 29fe4b324540ce8d4cb01df42ef0ebf1921ea4e0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1fa870acd753755a12bc4547d7313a17b953a2e7 + 29fe4b324540ce8d4cb01df42ef0ebf1921ea4e0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1fa870acd753755a12bc4547d7313a17b953a2e7 + 29fe4b324540ce8d4cb01df42ef0ebf1921ea4e0 https://github.com/dotnet/test-templates @@ -148,7 +148,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f83afe4ed0000ee202b2528bc5803a94130a0f4c + 21b90573de7d6e0c88acdd25dc116b6729fd65a7 https://github.com/dotnet/roslyn @@ -170,16 +170,16 @@ https://github.com/dotnet/emsdk - d75f77cb8eb87322453288a22ce9b2d880bd1cb1 + 201f4dae9d1a1e105d8ba86d7ece61eed1f665e0 https://dev.azure.com/dnceng/internal/_git/dotnet-aspire 4b00c57d7ccf9a4c7e2aef211ab6bd8af3ee2324 - + https://github.com/dotnet/emsdk - d75f77cb8eb87322453288a22ce9b2d880bd1cb1 + 201f4dae9d1a1e105d8ba86d7ece61eed1f665e0 diff --git a/eng/Versions.props b/eng/Versions.props index 17e86845b..9a029e797 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,8 +86,8 @@ 8.0.101 - 8.0.101-servicing.23571.17 - 8.0.101-servicing.23571.17 + 8.0.101-servicing.23572.4 + 8.0.101-servicing.23572.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -102,8 +102,8 @@ - 8.0.1-servicing.23570.18 - 8.0.1-servicing.23570.18 + 8.0.1-servicing.23571.29 + 8.0.1-servicing.23571.29 8.0.1 8.0.1 8.0.1 From 8690b4168768b006c095522c64dec27cf579cec0 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 22 Nov 2023 20:14:23 +0000 Subject: [PATCH 102/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231122.19 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.101 -> To Version 8.0.101 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.SourceBuild.Intermediate.emsdk From Version 8.0.0 -> To Version 8.0.1 (parent: Microsoft.NET.Sdk --- 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 6dc4ccdcf..9e20ad59c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -18,7 +18,7 @@ - + @@ -47,7 +47,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4273e2cc4..c6c6cc87c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 29fe4b324540ce8d4cb01df42ef0ebf1921ea4e0 + 0c844b4316a751ba1a40ba13fb6974367acf791d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 29fe4b324540ce8d4cb01df42ef0ebf1921ea4e0 + 0c844b4316a751ba1a40ba13fb6974367acf791d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 29fe4b324540ce8d4cb01df42ef0ebf1921ea4e0 + 0c844b4316a751ba1a40ba13fb6974367acf791d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 29fe4b324540ce8d4cb01df42ef0ebf1921ea4e0 + 0c844b4316a751ba1a40ba13fb6974367acf791d https://github.com/dotnet/test-templates @@ -150,7 +150,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 21b90573de7d6e0c88acdd25dc116b6729fd65a7 - + https://github.com/dotnet/roslyn 7b75981cf3bd520b86ec4ed00ec156c8bc48e4eb diff --git a/eng/Versions.props b/eng/Versions.props index 9a029e797..621fc992d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,15 +86,15 @@ 8.0.101 - 8.0.101-servicing.23572.4 - 8.0.101-servicing.23572.4 + 8.0.101-servicing.23572.19 + 8.0.101-servicing.23572.19 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.8.0-7.23566.2 + 4.8.0-7.23572.1 From 6af34f16266eb99ba78e66dbe5a7dec756d72232 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 23 Nov 2023 14:01:59 +0000 Subject: [PATCH 103/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231123.14 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.311 -> To Version 7.0.312 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.14 -> To Version 7.0.15 (parent: Microsoft.NET.Sdk --- NuGet.config | 36 ++++----------- eng/Version.Details.xml | 100 ++++++++++++++++++++-------------------- eng/Versions.props | 48 +++++++++---------- 3 files changed, 83 insertions(+), 101 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6965e587b..25b3d1da7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,29 +10,19 @@ - - - + - - - + - - - + - - - + - - - + @@ -54,23 +44,15 @@ - - - + - - - + - - - + - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5a3d473a0..66d5805f9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 496fa854ae2f96619af99b5256fde77bc1a58f36 + ca95fcf7c597897f881e9c3df18a626d77ef7625 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 496fa854ae2f96619af99b5256fde77bc1a58f36 + ca95fcf7c597897f881e9c3df18a626d77ef7625 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 496fa854ae2f96619af99b5256fde77bc1a58f36 + ca95fcf7c597897f881e9c3df18a626d77ef7625 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 496fa854ae2f96619af99b5256fde77bc1a58f36 + ca95fcf7c597897f881e9c3df18a626d77ef7625 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 808851b07acfa1c5c94b0d4f9fb50debedb2df70 + 8f4568cdaa2f9654fd133a17cd2dcc55b5f42455 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 808851b07acfa1c5c94b0d4f9fb50debedb2df70 + 8f4568cdaa2f9654fd133a17cd2dcc55b5f42455 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 808851b07acfa1c5c94b0d4f9fb50debedb2df70 + 8f4568cdaa2f9654fd133a17cd2dcc55b5f42455 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 808851b07acfa1c5c94b0d4f9fb50debedb2df70 + 8f4568cdaa2f9654fd133a17cd2dcc55b5f42455 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 808851b07acfa1c5c94b0d4f9fb50debedb2df70 + 8f4568cdaa2f9654fd133a17cd2dcc55b5f42455 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 808851b07acfa1c5c94b0d4f9fb50debedb2df70 + 8f4568cdaa2f9654fd133a17cd2dcc55b5f42455 @@ -52,34 +52,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0a715692d8e2536c899faa0bb4f0cec2c2e33e36 + 9e3f7e4306c441dffcf9f3a8bf45a04a549f6ea3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0a715692d8e2536c899faa0bb4f0cec2c2e33e36 + 9e3f7e4306c441dffcf9f3a8bf45a04a549f6ea3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0a715692d8e2536c899faa0bb4f0cec2c2e33e36 + 9e3f7e4306c441dffcf9f3a8bf45a04a549f6ea3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0a715692d8e2536c899faa0bb4f0cec2c2e33e36 + 9e3f7e4306c441dffcf9f3a8bf45a04a549f6ea3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0a715692d8e2536c899faa0bb4f0cec2c2e33e36 + 9e3f7e4306c441dffcf9f3a8bf45a04a549f6ea3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0a715692d8e2536c899faa0bb4f0cec2c2e33e36 + 9e3f7e4306c441dffcf9f3a8bf45a04a549f6ea3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0a715692d8e2536c899faa0bb4f0cec2c2e33e36 + 9e3f7e4306c441dffcf9f3a8bf45a04a549f6ea3 https://github.com/dotnet/test-templates @@ -98,31 +98,31 @@ 45a41b353d078e4d1e5918246fddbacb452eb210 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c4047673ed10f28cc58ad806c54e25037b0469d8 + 53f8ac9623231a8c1ae976102f70d97e457a0378 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c4047673ed10f28cc58ad806c54e25037b0469d8 + 53f8ac9623231a8c1ae976102f70d97e457a0378 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c4047673ed10f28cc58ad806c54e25037b0469d8 + 53f8ac9623231a8c1ae976102f70d97e457a0378 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c4047673ed10f28cc58ad806c54e25037b0469d8 + 53f8ac9623231a8c1ae976102f70d97e457a0378 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - f1570f38b63db12bfd8714a942ec33de2275edf6 + ce000d354195dfb9e0f8039a74d303f61afcf9c9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 8784c26bc219f5b75f1315e1b6b7c1da924d5e32 + 226928a35528d63540ed0c8eb4f749d51c9667e9 https://github.com/dotnet/fsharp @@ -167,13 +167,13 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 942bfc8cb73e3cfea523cb0a2f08b415b2220358 + 33b038b591f6e19c32a390333d41292cbd86d93c - + https://github.com/dotnet/emsdk - 942bfc8cb73e3cfea523cb0a2f08b415b2220358 + 33b038b591f6e19c32a390333d41292cbd86d93c https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index 3012a3afa..19fce438b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.14-servicing.23520.9 + 7.0.15-servicing.23570.16 - 7.0.14-servicing.23520.2 + 7.0.15-servicing.23572.2 @@ -56,22 +56,22 @@ - 7.0.14 - 7.0.14 - 7.0.14-servicing.23523.16 - 7.0.14-servicing.23523.16 - 7.0.14-servicing.23523.16 - 7.0.14-servicing.23523.16 - 7.0.14-servicing.23523.16 + 7.0.15 + 7.0.15 + 7.0.15-servicing.23572.11 + 7.0.15-servicing.23572.11 + 7.0.15-servicing.23572.11 + 7.0.15-servicing.23572.11 + 7.0.15-servicing.23572.11 0.2.0 - 7.0.311 - 7.0.311-servicing.23523.38 - 7.0.311-servicing.23523.38 + 7.0.312 + 7.0.312-servicing.23573.14 + 7.0.312-servicing.23573.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -86,20 +86,20 @@ - 7.0.14-servicing.23519.10 - 7.0.14-servicing.23519.10 - 7.0.14 - 7.0.14 - 7.0.14 - 7.0.14 + 7.0.15-servicing.23572.26 + 7.0.15-servicing.23572.26 + 7.0.15 + 7.0.15 + 7.0.15 + 7.0.15 2.1.0 - 7.0.14-servicing.23520.7 - 7.0.14-servicing.23520.7 - 7.0.14 - 7.0.14 + 7.0.15-servicing.23572.3 + 7.0.15-servicing.23572.3 + 7.0.15 + 7.0.15 @@ -231,8 +231,8 @@ 12.3.2372 16.0.1478 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.14 - 7.0.14 + 7.0.15 + 7.0.15 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version) From 77472533fb771b4b44bc1828e830576b1b63b9ec Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 23 Nov 2023 14:04:27 +0000 Subject: [PATCH 104/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231123.15 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.404 -> To Version 7.0.405 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.14 -> To Version 7.0.15 (parent: Microsoft.NET.Sdk --- NuGet.config | 36 ++++---------- eng/Version.Details.xml | 108 ++++++++++++++++++++-------------------- eng/Versions.props | 48 +++++++++--------- 3 files changed, 87 insertions(+), 105 deletions(-) diff --git a/NuGet.config b/NuGet.config index 7b13934dc..39ef38a7d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,29 +10,19 @@ - - - + - - - + - - - + - - - + - - - + @@ -54,23 +44,15 @@ - - - + - - - + - - - + - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6ed02abb3..b6e30859f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 496fa854ae2f96619af99b5256fde77bc1a58f36 + ca95fcf7c597897f881e9c3df18a626d77ef7625 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 496fa854ae2f96619af99b5256fde77bc1a58f36 + ca95fcf7c597897f881e9c3df18a626d77ef7625 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 496fa854ae2f96619af99b5256fde77bc1a58f36 + ca95fcf7c597897f881e9c3df18a626d77ef7625 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 496fa854ae2f96619af99b5256fde77bc1a58f36 + ca95fcf7c597897f881e9c3df18a626d77ef7625 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 808851b07acfa1c5c94b0d4f9fb50debedb2df70 + 8f4568cdaa2f9654fd133a17cd2dcc55b5f42455 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 808851b07acfa1c5c94b0d4f9fb50debedb2df70 + 8f4568cdaa2f9654fd133a17cd2dcc55b5f42455 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 808851b07acfa1c5c94b0d4f9fb50debedb2df70 + 8f4568cdaa2f9654fd133a17cd2dcc55b5f42455 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 808851b07acfa1c5c94b0d4f9fb50debedb2df70 + 8f4568cdaa2f9654fd133a17cd2dcc55b5f42455 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 808851b07acfa1c5c94b0d4f9fb50debedb2df70 + 8f4568cdaa2f9654fd133a17cd2dcc55b5f42455 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 808851b07acfa1c5c94b0d4f9fb50debedb2df70 + 8f4568cdaa2f9654fd133a17cd2dcc55b5f42455 @@ -52,34 +52,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0a715692d8e2536c899faa0bb4f0cec2c2e33e36 + 9e3f7e4306c441dffcf9f3a8bf45a04a549f6ea3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0a715692d8e2536c899faa0bb4f0cec2c2e33e36 + 9e3f7e4306c441dffcf9f3a8bf45a04a549f6ea3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0a715692d8e2536c899faa0bb4f0cec2c2e33e36 + 9e3f7e4306c441dffcf9f3a8bf45a04a549f6ea3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0a715692d8e2536c899faa0bb4f0cec2c2e33e36 + 9e3f7e4306c441dffcf9f3a8bf45a04a549f6ea3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0a715692d8e2536c899faa0bb4f0cec2c2e33e36 + 9e3f7e4306c441dffcf9f3a8bf45a04a549f6ea3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0a715692d8e2536c899faa0bb4f0cec2c2e33e36 + 9e3f7e4306c441dffcf9f3a8bf45a04a549f6ea3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0a715692d8e2536c899faa0bb4f0cec2c2e33e36 + 9e3f7e4306c441dffcf9f3a8bf45a04a549f6ea3 https://github.com/dotnet/test-templates @@ -98,39 +98,39 @@ e1aecaf3a332e25fae8cc7aa09d524b5e7c4a47a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9c9a004b724e438d299dabbe3e202d03e5eb996b + 3385d5595bf14894370e86d69ce8d2c9c3772126 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9c9a004b724e438d299dabbe3e202d03e5eb996b + 3385d5595bf14894370e86d69ce8d2c9c3772126 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9c9a004b724e438d299dabbe3e202d03e5eb996b + 3385d5595bf14894370e86d69ce8d2c9c3772126 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9c9a004b724e438d299dabbe3e202d03e5eb996b + 3385d5595bf14894370e86d69ce8d2c9c3772126 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - f1570f38b63db12bfd8714a942ec33de2275edf6 + ce000d354195dfb9e0f8039a74d303f61afcf9c9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 8784c26bc219f5b75f1315e1b6b7c1da924d5e32 + 226928a35528d63540ed0c8eb4f749d51c9667e9 - + https://github.com/dotnet/fsharp - 67d3bb96b714d8f17d87876cc9f4afbe83afcf49 + 3916deb12ef7c99509217f5e5de4821b92db901a - + https://github.com/dotnet/fsharp - 67d3bb96b714d8f17d87876cc9f4afbe83afcf49 + 3916deb12ef7c99509217f5e5de4821b92db901a @@ -167,13 +167,13 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 942bfc8cb73e3cfea523cb0a2f08b415b2220358 + 33b038b591f6e19c32a390333d41292cbd86d93c - + https://github.com/dotnet/emsdk - 942bfc8cb73e3cfea523cb0a2f08b415b2220358 + 33b038b591f6e19c32a390333d41292cbd86d93c https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index 122ba126e..599f9cbde 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.14-servicing.23520.9 + 7.0.15-servicing.23570.16 - 7.0.14-servicing.23520.2 + 7.0.15-servicing.23572.2 @@ -56,22 +56,22 @@ - 7.0.14 - 7.0.14 - 7.0.14-servicing.23523.16 - 7.0.14-servicing.23523.16 - 7.0.14-servicing.23523.16 - 7.0.14-servicing.23523.16 - 7.0.14-servicing.23523.16 + 7.0.15 + 7.0.15 + 7.0.15-servicing.23572.11 + 7.0.15-servicing.23572.11 + 7.0.15-servicing.23572.11 + 7.0.15-servicing.23572.11 + 7.0.15-servicing.23572.11 0.2.0 - 7.0.404 - 7.0.404-servicing.23523.39 - 7.0.404-servicing.23523.39 + 7.0.405 + 7.0.405-servicing.23573.15 + 7.0.405-servicing.23573.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -86,20 +86,20 @@ - 7.0.14-servicing.23519.10 - 7.0.14-servicing.23519.10 - 7.0.14 - 7.0.14 - 7.0.14 - 7.0.14 + 7.0.15-servicing.23572.26 + 7.0.15-servicing.23572.26 + 7.0.15 + 7.0.15 + 7.0.15 + 7.0.15 2.1.0 - 7.0.14-servicing.23520.7 - 7.0.14-servicing.23520.7 - 7.0.14 - 7.0.14 + 7.0.15-servicing.23572.3 + 7.0.15-servicing.23572.3 + 7.0.15 + 7.0.15 @@ -233,8 +233,8 @@ 12.3.2372 16.0.1478 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.14 - 7.0.14 + 7.0.15 + 7.0.15 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version) From 9840fd11dbffdee6c797f8daec3a15c8186e2cc2 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 23 Nov 2023 17:45:14 +0000 Subject: [PATCH 105/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231123.32 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.311 -> To Version 7.0.312 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.14 -> To Version 7.0.15 (parent: Microsoft.NET.Sdk --- NuGet.config | 12 ++++----- eng/Version.Details.xml | 58 ++++++++++++++++++++--------------------- eng/Versions.props | 22 ++++++++-------- 3 files changed, 46 insertions(+), 46 deletions(-) diff --git a/NuGet.config b/NuGet.config index 25b3d1da7..65e2ee623 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,7 +10,7 @@ - + @@ -19,10 +19,10 @@ - + - + @@ -44,15 +44,15 @@ - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 66d5805f9..65785a115 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ca95fcf7c597897f881e9c3df18a626d77ef7625 + 85778644ee928ab3eb11aac4fef9176851dd9b21 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ca95fcf7c597897f881e9c3df18a626d77ef7625 + 85778644ee928ab3eb11aac4fef9176851dd9b21 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ca95fcf7c597897f881e9c3df18a626d77ef7625 + 85778644ee928ab3eb11aac4fef9176851dd9b21 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ca95fcf7c597897f881e9c3df18a626d77ef7625 + 85778644ee928ab3eb11aac4fef9176851dd9b21 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9e3f7e4306c441dffcf9f3a8bf45a04a549f6ea3 + ef956a2bd9f33b27eb983d339fa6dbb186db8247 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9e3f7e4306c441dffcf9f3a8bf45a04a549f6ea3 + ef956a2bd9f33b27eb983d339fa6dbb186db8247 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9e3f7e4306c441dffcf9f3a8bf45a04a549f6ea3 + ef956a2bd9f33b27eb983d339fa6dbb186db8247 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9e3f7e4306c441dffcf9f3a8bf45a04a549f6ea3 + ef956a2bd9f33b27eb983d339fa6dbb186db8247 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9e3f7e4306c441dffcf9f3a8bf45a04a549f6ea3 + ef956a2bd9f33b27eb983d339fa6dbb186db8247 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9e3f7e4306c441dffcf9f3a8bf45a04a549f6ea3 + ef956a2bd9f33b27eb983d339fa6dbb186db8247 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9e3f7e4306c441dffcf9f3a8bf45a04a549f6ea3 + ef956a2bd9f33b27eb983d339fa6dbb186db8247 https://github.com/dotnet/test-templates @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 53f8ac9623231a8c1ae976102f70d97e457a0378 + f48767b966f407a6a74953ea6cb0ac61f610b4dd - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 53f8ac9623231a8c1ae976102f70d97e457a0378 + f48767b966f407a6a74953ea6cb0ac61f610b4dd - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 53f8ac9623231a8c1ae976102f70d97e457a0378 + f48767b966f407a6a74953ea6cb0ac61f610b4dd - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 53f8ac9623231a8c1ae976102f70d97e457a0378 + f48767b966f407a6a74953ea6cb0ac61f610b4dd - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - ce000d354195dfb9e0f8039a74d303f61afcf9c9 + 1d272c1ef7277b7cc38148300732e6a72848bedc - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 226928a35528d63540ed0c8eb4f749d51c9667e9 + aed20729942488335ab21d7bb03a92d87afdb9b1 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 19fce438b..018a55ab1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.15-servicing.23570.16 + 7.0.15-servicing.23573.3 - 7.0.15-servicing.23572.2 + 7.0.15-servicing.23573.2 @@ -58,11 +58,11 @@ 7.0.15 7.0.15 - 7.0.15-servicing.23572.11 - 7.0.15-servicing.23572.11 - 7.0.15-servicing.23572.11 - 7.0.15-servicing.23572.11 - 7.0.15-servicing.23572.11 + 7.0.15-servicing.23573.7 + 7.0.15-servicing.23573.7 + 7.0.15-servicing.23573.7 + 7.0.15-servicing.23573.7 + 7.0.15-servicing.23573.7 0.2.0 @@ -70,8 +70,8 @@ 7.0.312 - 7.0.312-servicing.23573.14 - 7.0.312-servicing.23573.14 + 7.0.312-servicing.23573.32 + 7.0.312-servicing.23573.32 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -96,8 +96,8 @@ - 7.0.15-servicing.23572.3 - 7.0.15-servicing.23572.3 + 7.0.15-servicing.23573.2 + 7.0.15-servicing.23573.2 7.0.15 7.0.15 From 84bca2d0338e07d345d210de3272295e191fd0c9 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 24 Nov 2023 00:02:42 +0000 Subject: [PATCH 106/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231123.36 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.404 -> To Version 7.0.405 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.14 -> To Version 7.0.15 (parent: Microsoft.NET.Sdk --- NuGet.config | 12 ++++----- eng/Version.Details.xml | 58 ++++++++++++++++++++--------------------- eng/Versions.props | 22 ++++++++-------- 3 files changed, 46 insertions(+), 46 deletions(-) diff --git a/NuGet.config b/NuGet.config index 39ef38a7d..eb2810961 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,7 +10,7 @@ - + @@ -19,10 +19,10 @@ - + - + @@ -44,15 +44,15 @@ - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b6e30859f..c9a3cc6cd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ca95fcf7c597897f881e9c3df18a626d77ef7625 + 85778644ee928ab3eb11aac4fef9176851dd9b21 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ca95fcf7c597897f881e9c3df18a626d77ef7625 + 85778644ee928ab3eb11aac4fef9176851dd9b21 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ca95fcf7c597897f881e9c3df18a626d77ef7625 + 85778644ee928ab3eb11aac4fef9176851dd9b21 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ca95fcf7c597897f881e9c3df18a626d77ef7625 + 85778644ee928ab3eb11aac4fef9176851dd9b21 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9e3f7e4306c441dffcf9f3a8bf45a04a549f6ea3 + ef956a2bd9f33b27eb983d339fa6dbb186db8247 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9e3f7e4306c441dffcf9f3a8bf45a04a549f6ea3 + ef956a2bd9f33b27eb983d339fa6dbb186db8247 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9e3f7e4306c441dffcf9f3a8bf45a04a549f6ea3 + ef956a2bd9f33b27eb983d339fa6dbb186db8247 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9e3f7e4306c441dffcf9f3a8bf45a04a549f6ea3 + ef956a2bd9f33b27eb983d339fa6dbb186db8247 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9e3f7e4306c441dffcf9f3a8bf45a04a549f6ea3 + ef956a2bd9f33b27eb983d339fa6dbb186db8247 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9e3f7e4306c441dffcf9f3a8bf45a04a549f6ea3 + ef956a2bd9f33b27eb983d339fa6dbb186db8247 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9e3f7e4306c441dffcf9f3a8bf45a04a549f6ea3 + ef956a2bd9f33b27eb983d339fa6dbb186db8247 https://github.com/dotnet/test-templates @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3385d5595bf14894370e86d69ce8d2c9c3772126 + fffcfa569ab3e3a71f7f81264eec62ef152bdf51 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3385d5595bf14894370e86d69ce8d2c9c3772126 + fffcfa569ab3e3a71f7f81264eec62ef152bdf51 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3385d5595bf14894370e86d69ce8d2c9c3772126 + fffcfa569ab3e3a71f7f81264eec62ef152bdf51 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3385d5595bf14894370e86d69ce8d2c9c3772126 + fffcfa569ab3e3a71f7f81264eec62ef152bdf51 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - ce000d354195dfb9e0f8039a74d303f61afcf9c9 + 1d272c1ef7277b7cc38148300732e6a72848bedc - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 226928a35528d63540ed0c8eb4f749d51c9667e9 + aed20729942488335ab21d7bb03a92d87afdb9b1 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 599f9cbde..ec1a28869 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.15-servicing.23570.16 + 7.0.15-servicing.23573.3 - 7.0.15-servicing.23572.2 + 7.0.15-servicing.23573.2 @@ -58,11 +58,11 @@ 7.0.15 7.0.15 - 7.0.15-servicing.23572.11 - 7.0.15-servicing.23572.11 - 7.0.15-servicing.23572.11 - 7.0.15-servicing.23572.11 - 7.0.15-servicing.23572.11 + 7.0.15-servicing.23573.7 + 7.0.15-servicing.23573.7 + 7.0.15-servicing.23573.7 + 7.0.15-servicing.23573.7 + 7.0.15-servicing.23573.7 0.2.0 @@ -70,8 +70,8 @@ 7.0.405 - 7.0.405-servicing.23573.15 - 7.0.405-servicing.23573.15 + 7.0.405-servicing.23573.36 + 7.0.405-servicing.23573.36 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -96,8 +96,8 @@ - 7.0.15-servicing.23572.3 - 7.0.15-servicing.23572.3 + 7.0.15-servicing.23573.2 + 7.0.15-servicing.23573.2 7.0.15 7.0.15 From b5cff2c060b5b4427d69dc3941ce702de71f220d Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 24 Nov 2023 09:44:49 +0000 Subject: [PATCH 107/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231123.33 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.114 -> To Version 7.0.115 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.14 -> To Version 7.0.15 (parent: Microsoft.NET.Sdk --- NuGet.config | 30 ++++-------- eng/Version.Details.xml | 100 ++++++++++++++++++++-------------------- eng/Versions.props | 48 +++++++++---------- 3 files changed, 83 insertions(+), 95 deletions(-) diff --git a/NuGet.config b/NuGet.config index be7632bd2..529576f58 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,29 +7,22 @@ + - - - + - - - + - - - + - - - + @@ -51,20 +44,15 @@ + - - - + - - - + - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a464c3fa3..7cfc48c06 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 496fa854ae2f96619af99b5256fde77bc1a58f36 + 85778644ee928ab3eb11aac4fef9176851dd9b21 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 496fa854ae2f96619af99b5256fde77bc1a58f36 + 85778644ee928ab3eb11aac4fef9176851dd9b21 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 496fa854ae2f96619af99b5256fde77bc1a58f36 + 85778644ee928ab3eb11aac4fef9176851dd9b21 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 496fa854ae2f96619af99b5256fde77bc1a58f36 + 85778644ee928ab3eb11aac4fef9176851dd9b21 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 808851b07acfa1c5c94b0d4f9fb50debedb2df70 + 8f4568cdaa2f9654fd133a17cd2dcc55b5f42455 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 808851b07acfa1c5c94b0d4f9fb50debedb2df70 + 8f4568cdaa2f9654fd133a17cd2dcc55b5f42455 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 808851b07acfa1c5c94b0d4f9fb50debedb2df70 + 8f4568cdaa2f9654fd133a17cd2dcc55b5f42455 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 808851b07acfa1c5c94b0d4f9fb50debedb2df70 + 8f4568cdaa2f9654fd133a17cd2dcc55b5f42455 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 808851b07acfa1c5c94b0d4f9fb50debedb2df70 + 8f4568cdaa2f9654fd133a17cd2dcc55b5f42455 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 808851b07acfa1c5c94b0d4f9fb50debedb2df70 + 8f4568cdaa2f9654fd133a17cd2dcc55b5f42455 @@ -52,34 +52,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0a715692d8e2536c899faa0bb4f0cec2c2e33e36 + ef956a2bd9f33b27eb983d339fa6dbb186db8247 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0a715692d8e2536c899faa0bb4f0cec2c2e33e36 + ef956a2bd9f33b27eb983d339fa6dbb186db8247 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0a715692d8e2536c899faa0bb4f0cec2c2e33e36 + ef956a2bd9f33b27eb983d339fa6dbb186db8247 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0a715692d8e2536c899faa0bb4f0cec2c2e33e36 + ef956a2bd9f33b27eb983d339fa6dbb186db8247 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0a715692d8e2536c899faa0bb4f0cec2c2e33e36 + ef956a2bd9f33b27eb983d339fa6dbb186db8247 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0a715692d8e2536c899faa0bb4f0cec2c2e33e36 + ef956a2bd9f33b27eb983d339fa6dbb186db8247 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0a715692d8e2536c899faa0bb4f0cec2c2e33e36 + ef956a2bd9f33b27eb983d339fa6dbb186db8247 https://github.com/dotnet/test-templates @@ -98,31 +98,31 @@ aaaa0c1826f97a9dfcc67e94136bf01010b55f23 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5a4609a27acc779cb68107922b00418cc6b907a9 + fc561a76355e98597193f4c42b5649ead791f0c2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5a4609a27acc779cb68107922b00418cc6b907a9 + fc561a76355e98597193f4c42b5649ead791f0c2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5a4609a27acc779cb68107922b00418cc6b907a9 + fc561a76355e98597193f4c42b5649ead791f0c2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5a4609a27acc779cb68107922b00418cc6b907a9 + fc561a76355e98597193f4c42b5649ead791f0c2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - f1570f38b63db12bfd8714a942ec33de2275edf6 + 1d272c1ef7277b7cc38148300732e6a72848bedc - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 8784c26bc219f5b75f1315e1b6b7c1da924d5e32 + aed20729942488335ab21d7bb03a92d87afdb9b1 https://github.com/dotnet/fsharp @@ -163,13 +163,13 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 942bfc8cb73e3cfea523cb0a2f08b415b2220358 + 33b038b591f6e19c32a390333d41292cbd86d93c - + https://github.com/dotnet/emsdk - 942bfc8cb73e3cfea523cb0a2f08b415b2220358 + 33b038b591f6e19c32a390333d41292cbd86d93c https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index a42e5dcf5..90a2db59b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.14-servicing.23520.9 + 7.0.15-servicing.23573.3 - 7.0.14-servicing.23520.2 + 7.0.15-servicing.23573.2 @@ -56,22 +56,22 @@ - 7.0.14 - 7.0.14 - 7.0.14-servicing.23523.16 - 7.0.14-servicing.23523.16 - 7.0.14-servicing.23523.16 - 7.0.14-servicing.23523.16 - 7.0.14-servicing.23523.16 + 7.0.15 + 7.0.15 + 7.0.15-servicing.23573.7 + 7.0.15-servicing.23573.7 + 7.0.15-servicing.23573.7 + 7.0.15-servicing.23573.7 + 7.0.15-servicing.23573.7 0.2.0 - 7.0.114 - 7.0.114-servicing.23523.36 - 7.0.114-servicing.23523.36 + 7.0.115 + 7.0.115-servicing.23573.33 + 7.0.115-servicing.23573.33 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -82,20 +82,20 @@ - 7.0.14-servicing.23519.10 - 7.0.14-servicing.23519.10 - 7.0.14 - 7.0.14 - 7.0.14 - 7.0.14 + 7.0.15-servicing.23572.26 + 7.0.15-servicing.23572.26 + 7.0.15 + 7.0.15 + 7.0.15 + 7.0.15 2.1.0 - 7.0.14-servicing.23520.7 - 7.0.14-servicing.23520.7 - 7.0.14 - 7.0.14 + 7.0.15-servicing.23573.2 + 7.0.15-servicing.23573.2 + 7.0.15 + 7.0.15 @@ -228,8 +228,8 @@ 12.3.2372 16.0.1478 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.14 - 7.0.14 + 7.0.15 + 7.0.15 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version) From 6e81116e906f2cbf27e6c1d67068c05182c8a471 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 24 Nov 2023 11:26:33 +0000 Subject: [PATCH 108/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231121.10 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.114 -> To Version 7.0.115 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index 529576f58..d1253ca2d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,7 +19,7 @@ - + @@ -49,7 +49,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7cfc48c06..169f1cad1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fc561a76355e98597193f4c42b5649ead791f0c2 + 801716d201fabb3c3500c6734b0f8b855a36bae9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fc561a76355e98597193f4c42b5649ead791f0c2 + 801716d201fabb3c3500c6734b0f8b855a36bae9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fc561a76355e98597193f4c42b5649ead791f0c2 + 801716d201fabb3c3500c6734b0f8b855a36bae9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fc561a76355e98597193f4c42b5649ead791f0c2 + 801716d201fabb3c3500c6734b0f8b855a36bae9 diff --git a/eng/Versions.props b/eng/Versions.props index 90a2db59b..410f1b3f0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.115 - 7.0.115-servicing.23573.33 - 7.0.115-servicing.23573.33 + 7.0.115-servicing.23571.10 + 7.0.115-servicing.23571.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 777556879646f1dc25b82c0a5736ff4b6ca4162b Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 24 Nov 2023 11:26:41 +0000 Subject: [PATCH 109/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231123.11 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.115 -> To Version 7.0.115 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index d1253ca2d..07374752c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,7 +19,7 @@ - + @@ -49,7 +49,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 169f1cad1..a348c8fa1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 801716d201fabb3c3500c6734b0f8b855a36bae9 + 2db31ae526dc60b176641dde6422f68ae2fab31d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 801716d201fabb3c3500c6734b0f8b855a36bae9 + 2db31ae526dc60b176641dde6422f68ae2fab31d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 801716d201fabb3c3500c6734b0f8b855a36bae9 + 2db31ae526dc60b176641dde6422f68ae2fab31d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 801716d201fabb3c3500c6734b0f8b855a36bae9 + 2db31ae526dc60b176641dde6422f68ae2fab31d diff --git a/eng/Versions.props b/eng/Versions.props index 410f1b3f0..92a56de33 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.115 - 7.0.115-servicing.23571.10 - 7.0.115-servicing.23571.10 + 7.0.115-servicing.23573.11 + 7.0.115-servicing.23573.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 02b92181eb69e909194f7fe59b249e7436a6f0d8 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 24 Nov 2023 11:26:50 +0000 Subject: [PATCH 110/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231123.33 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.115 -> To Version 7.0.115 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index 07374752c..529576f58 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,7 +19,7 @@ - + @@ -49,7 +49,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a348c8fa1..7cfc48c06 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2db31ae526dc60b176641dde6422f68ae2fab31d + fc561a76355e98597193f4c42b5649ead791f0c2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2db31ae526dc60b176641dde6422f68ae2fab31d + fc561a76355e98597193f4c42b5649ead791f0c2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2db31ae526dc60b176641dde6422f68ae2fab31d + fc561a76355e98597193f4c42b5649ead791f0c2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2db31ae526dc60b176641dde6422f68ae2fab31d + fc561a76355e98597193f4c42b5649ead791f0c2 diff --git a/eng/Versions.props b/eng/Versions.props index 92a56de33..90a2db59b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.115 - 7.0.115-servicing.23573.11 - 7.0.115-servicing.23573.11 + 7.0.115-servicing.23573.33 + 7.0.115-servicing.23573.33 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 6f0a96cb187bf2263a492fa639c4c36509dc07dd Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 24 Nov 2023 11:26:59 +0000 Subject: [PATCH 111/535] 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 112/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231107.14 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.417-servicing.23523.41 -> To Version 6.0.418-servicing.23557.14 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 492e94748..458cbbf6f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 42ab085a51763b862990e089c4b49e881d8b4e07 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 964a8fda7fbf584c0301cffcde43c959e0ea0275 + 767666138f79eee134f51f242473ec7d49c2a805 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 964a8fda7fbf584c0301cffcde43c959e0ea0275 + 767666138f79eee134f51f242473ec7d49c2a805 diff --git a/eng/Versions.props b/eng/Versions.props index 6407cb843..bf0084a59 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.417-servicing.23523.41 - 6.0.417-servicing.23523.41 + 6.0.418-servicing.23557.14 + 6.0.418-servicing.23557.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 11c4b95c74f9cf0485929d204f9c4af6848ca322 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 24 Nov 2023 11:48:17 +0000 Subject: [PATCH 113/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231124.1 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.125-servicing.23523.37 -> To Version 6.0.126-servicing.23574.1 Dependency coherency updates Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,VS.Redist.Common.NetCore.SharedFramework.x64.6.0 From Version 6.0.25 -> To Version 6.0.26 (parent: Microsoft.NET.Sdk --- NuGet.config | 6 ++++ eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 32 +++++++++---------- 3 files changed, 56 insertions(+), 50 deletions(-) diff --git a/NuGet.config b/NuGet.config index dd632b04b..03f09e6af 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,14 +7,17 @@ + + + @@ -37,11 +40,14 @@ + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 039431cba..a891e9673 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop a74946f8dae6d29fd18c8fc702e23f8fe77c729c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4 + 965a793efc765ddbea3c43e43c13b8e956b61946 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4 + 965a793efc765ddbea3c43e43c13b8e956b61946 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4 + 965a793efc765ddbea3c43e43c13b8e956b61946 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4 + 965a793efc765ddbea3c43e43c13b8e956b61946 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4 + 965a793efc765ddbea3c43e43c13b8e956b61946 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4 + 965a793efc765ddbea3c43e43c13b8e956b61946 @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime a08d9ce2caf02455c0b825bcdc32974bdf769a80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 36be7ed6d6d56b7da0a2891e3de7ecc2aa48eecd + 2813f390b0d8ad577f32f27a1c57031e56f02f45 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 36be7ed6d6d56b7da0a2891e3de7ecc2aa48eecd + 2813f390b0d8ad577f32f27a1c57031e56f02f45 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 36be7ed6d6d56b7da0a2891e3de7ecc2aa48eecd + 2813f390b0d8ad577f32f27a1c57031e56f02f45 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 36be7ed6d6d56b7da0a2891e3de7ecc2aa48eecd + 2813f390b0d8ad577f32f27a1c57031e56f02f45 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 36be7ed6d6d56b7da0a2891e3de7ecc2aa48eecd + 2813f390b0d8ad577f32f27a1c57031e56f02f45 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 36be7ed6d6d56b7da0a2891e3de7ecc2aa48eecd + 2813f390b0d8ad577f32f27a1c57031e56f02f45 https://github.com/dotnet/test-templates @@ -90,27 +90,27 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 7e5c0220b5ebe21277a6943f32ca92e666d30e37 + 8f42eeeef2041f39db00cf87a08ad9e6eb3f613d - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 7e5c0220b5ebe21277a6943f32ca92e666d30e37 + 8f42eeeef2041f39db00cf87a08ad9e6eb3f613d - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 7e5c0220b5ebe21277a6943f32ca92e666d30e37 + 8f42eeeef2041f39db00cf87a08ad9e6eb3f613d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a8b4ec801637f85c99edb62569b72d99c550da7e + cb1f8762b907a48ebcb8f8d41151559940b8258a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a8b4ec801637f85c99edb62569b72d99c550da7e + cb1f8762b907a48ebcb8f8d41151559940b8258a diff --git a/eng/Versions.props b/eng/Versions.props index 616f2592a..c2386ebf9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.125 + 6.0.126 @@ -44,20 +44,20 @@ - 6.0.25 - 6.0.25 - 6.0.25-servicing.23523.15 - 6.0.25-servicing.23523.15 - 6.0.25-servicing.23523.15 - 6.0.25-servicing.23523.15 + 6.0.26 + 6.0.26 + 6.0.26-servicing.23573.6 + 6.0.26-servicing.23573.6 + 6.0.26-servicing.23573.6 + 6.0.26-servicing.23573.6 0.2.0 - 6.0.125-servicing.23523.37 - 6.0.125-servicing.23523.37 + 6.0.126-servicing.23574.1 + 6.0.126-servicing.23574.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,12 +68,12 @@ - 6.0.25-servicing.23519.12 - 6.0.25-servicing.23519.12 - 6.0.25 - 6.0.25 - 6.0.25 - 6.0.25 + 6.0.26-servicing.23572.29 + 6.0.26-servicing.23572.29 + 6.0.26 + 6.0.26 + 6.0.26 + 6.0.26 2.1.0 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.125 + 6.0.126 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) From 7bdadf6e35fb04aa05157fe13995de55b5c9af45 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 24 Nov 2023 11:48:37 +0000 Subject: [PATCH 114/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231124.3 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.417-servicing.23523.41 -> To Version 6.0.418-servicing.23574.3 Dependency coherency updates Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,VS.Redist.Common.NetCore.SharedFramework.x64.6.0 From Version 6.0.25 -> To Version 6.0.26 (parent: Microsoft.NET.Sdk --- NuGet.config | 6 ++++ eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 32 +++++++++---------- 3 files changed, 56 insertions(+), 50 deletions(-) diff --git a/NuGet.config b/NuGet.config index 03d3587a6..1aa3642f7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,14 +7,17 @@ + + + @@ -37,10 +40,13 @@ + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 458cbbf6f..e8bd7fbb3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop a74946f8dae6d29fd18c8fc702e23f8fe77c729c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4 + 965a793efc765ddbea3c43e43c13b8e956b61946 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4 + 965a793efc765ddbea3c43e43c13b8e956b61946 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4 + 965a793efc765ddbea3c43e43c13b8e956b61946 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4 + 965a793efc765ddbea3c43e43c13b8e956b61946 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4 + 965a793efc765ddbea3c43e43c13b8e956b61946 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4 + 965a793efc765ddbea3c43e43c13b8e956b61946 @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime a08d9ce2caf02455c0b825bcdc32974bdf769a80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 36be7ed6d6d56b7da0a2891e3de7ecc2aa48eecd + 2813f390b0d8ad577f32f27a1c57031e56f02f45 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 36be7ed6d6d56b7da0a2891e3de7ecc2aa48eecd + 2813f390b0d8ad577f32f27a1c57031e56f02f45 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 36be7ed6d6d56b7da0a2891e3de7ecc2aa48eecd + 2813f390b0d8ad577f32f27a1c57031e56f02f45 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 36be7ed6d6d56b7da0a2891e3de7ecc2aa48eecd + 2813f390b0d8ad577f32f27a1c57031e56f02f45 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 36be7ed6d6d56b7da0a2891e3de7ecc2aa48eecd + 2813f390b0d8ad577f32f27a1c57031e56f02f45 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 36be7ed6d6d56b7da0a2891e3de7ecc2aa48eecd + 2813f390b0d8ad577f32f27a1c57031e56f02f45 https://github.com/dotnet/test-templates @@ -90,27 +90,27 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 42ab085a51763b862990e089c4b49e881d8b4e07 + 04cc3e115c98a8aa1fde4b1b45218ed6331c45c5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 42ab085a51763b862990e089c4b49e881d8b4e07 + 04cc3e115c98a8aa1fde4b1b45218ed6331c45c5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 42ab085a51763b862990e089c4b49e881d8b4e07 + 04cc3e115c98a8aa1fde4b1b45218ed6331c45c5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 767666138f79eee134f51f242473ec7d49c2a805 + 08ded598c2a2b41b45413b7462da49bdcea3c5a0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 767666138f79eee134f51f242473ec7d49c2a805 + 08ded598c2a2b41b45413b7462da49bdcea3c5a0 diff --git a/eng/Versions.props b/eng/Versions.props index bf0084a59..775638704 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.417 + 6.0.418 @@ -44,20 +44,20 @@ - 6.0.25 - 6.0.25 - 6.0.25-servicing.23523.15 - 6.0.25-servicing.23523.15 - 6.0.25-servicing.23523.15 - 6.0.25-servicing.23523.15 + 6.0.26 + 6.0.26 + 6.0.26-servicing.23573.6 + 6.0.26-servicing.23573.6 + 6.0.26-servicing.23573.6 + 6.0.26-servicing.23573.6 0.2.0 - 6.0.418-servicing.23557.14 - 6.0.418-servicing.23557.14 + 6.0.418-servicing.23574.3 + 6.0.418-servicing.23574.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,12 +68,12 @@ - 6.0.25-servicing.23519.12 - 6.0.25-servicing.23519.12 - 6.0.25 - 6.0.25 - 6.0.25 - 6.0.25 + 6.0.26-servicing.23572.29 + 6.0.26-servicing.23572.29 + 6.0.26 + 6.0.26 + 6.0.26 + 6.0.26 2.1.0 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.417 + 6.0.418 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) From 7e88e103532bc6b8c82f1f56305f1ef2d3fdc4bb Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 24 Nov 2023 11:48:52 +0000 Subject: [PATCH 115/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231107.13 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.320-servicing.23523.40 -> To Version 6.0.321-servicing.23557.13 Dependency coherency updates Microsoft.NET.Workload.Emscripten.Manifest-6.0.300 From Version 6.0.22 -> To Version 6.0.25 (parent: VS.Redist.Common.NetCore.SharedFramework.x64.6.0 --- NuGet.config | 8 -------- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 3 files changed, 9 insertions(+), 17 deletions(-) diff --git a/NuGet.config b/NuGet.config index df347d0f2..2cf5556c3 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,20 +7,16 @@ - - - - @@ -41,15 +37,11 @@ - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d5513d3a8..8b5940b6c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 6e525a642fe66413e4edf553f5bbc73ea5c866e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 733590df6146364699e0d3d8d465f2f8da15b063 + c07a6a58ea26fce79dad801f5fb862989cf41d1a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 733590df6146364699e0d3d8d465f2f8da15b063 + c07a6a58ea26fce79dad801f5fb862989cf41d1a @@ -166,9 +166,9 @@ 698fdad58fa64a55f16cd9562c90224cc498ed02 - + https://github.com/dotnet/emsdk - 3c754f28788fae642dc307a948479204e9f7dd5a + d8bc162ccf7ce14fdbec9c2c50d6e856a7063c91 https://github.com/dotnet/source-build diff --git a/eng/Versions.props b/eng/Versions.props index c689826cd..24c27b260 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.320-servicing.23523.40 - 6.0.320-servicing.23523.40 + 6.0.321-servicing.23557.13 + 6.0.321-servicing.23557.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -185,7 +185,7 @@ 12.3.100-rc.1.125 15.4.100-rc.1.125 6.0.4 - 6.0.22 + 6.0.25 $(MicrosoftNETWorkloadEmscriptenManifest60300Version) From 0ca2699de54d6a13c02fca0d129d92c1fd3efa08 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 24 Nov 2023 15:00:25 +0000 Subject: [PATCH 116/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231124.2 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.321-servicing.23557.13 -> To Version 6.0.321-servicing.23574.2 Dependency coherency updates Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,VS.Redist.Common.NetCore.SharedFramework.x64.6.0 From Version 6.0.25 -> To Version 6.0.26 (parent: Microsoft.NET.Sdk --- NuGet.config | 6 ++++ eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 32 +++++++++---------- 3 files changed, 56 insertions(+), 50 deletions(-) diff --git a/NuGet.config b/NuGet.config index 2cf5556c3..88cf52afd 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,14 +7,17 @@ + + + @@ -37,9 +40,12 @@ + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8b5940b6c..a6ece6385 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop a74946f8dae6d29fd18c8fc702e23f8fe77c729c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4 + 965a793efc765ddbea3c43e43c13b8e956b61946 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4 + 965a793efc765ddbea3c43e43c13b8e956b61946 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4 + 965a793efc765ddbea3c43e43c13b8e956b61946 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4 + 965a793efc765ddbea3c43e43c13b8e956b61946 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4 + 965a793efc765ddbea3c43e43c13b8e956b61946 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4 + 965a793efc765ddbea3c43e43c13b8e956b61946 @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime a08d9ce2caf02455c0b825bcdc32974bdf769a80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 36be7ed6d6d56b7da0a2891e3de7ecc2aa48eecd + 2813f390b0d8ad577f32f27a1c57031e56f02f45 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 36be7ed6d6d56b7da0a2891e3de7ecc2aa48eecd + 2813f390b0d8ad577f32f27a1c57031e56f02f45 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 36be7ed6d6d56b7da0a2891e3de7ecc2aa48eecd + 2813f390b0d8ad577f32f27a1c57031e56f02f45 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 36be7ed6d6d56b7da0a2891e3de7ecc2aa48eecd + 2813f390b0d8ad577f32f27a1c57031e56f02f45 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 36be7ed6d6d56b7da0a2891e3de7ecc2aa48eecd + 2813f390b0d8ad577f32f27a1c57031e56f02f45 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 36be7ed6d6d56b7da0a2891e3de7ecc2aa48eecd + 2813f390b0d8ad577f32f27a1c57031e56f02f45 https://github.com/dotnet/test-templates @@ -90,27 +90,27 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 6e525a642fe66413e4edf553f5bbc73ea5c866e5 + 6b4fc213e731cb128ad8ed54befea55d9e1d3f6d - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 6e525a642fe66413e4edf553f5bbc73ea5c866e5 + 6b4fc213e731cb128ad8ed54befea55d9e1d3f6d - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 6e525a642fe66413e4edf553f5bbc73ea5c866e5 + 6b4fc213e731cb128ad8ed54befea55d9e1d3f6d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c07a6a58ea26fce79dad801f5fb862989cf41d1a + 99f231333f8e3d364f357315d99e36473238b694 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c07a6a58ea26fce79dad801f5fb862989cf41d1a + 99f231333f8e3d364f357315d99e36473238b694 diff --git a/eng/Versions.props b/eng/Versions.props index 24c27b260..cf7e6d2c7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.320 + 6.0.321 @@ -44,20 +44,20 @@ - 6.0.25 - 6.0.25 - 6.0.25-servicing.23523.15 - 6.0.25-servicing.23523.15 - 6.0.25-servicing.23523.15 - 6.0.25-servicing.23523.15 + 6.0.26 + 6.0.26 + 6.0.26-servicing.23573.6 + 6.0.26-servicing.23573.6 + 6.0.26-servicing.23573.6 + 6.0.26-servicing.23573.6 0.2.0 - 6.0.321-servicing.23557.13 - 6.0.321-servicing.23557.13 + 6.0.321-servicing.23574.2 + 6.0.321-servicing.23574.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,12 +68,12 @@ - 6.0.25-servicing.23519.12 - 6.0.25-servicing.23519.12 - 6.0.25 - 6.0.25 - 6.0.25 - 6.0.25 + 6.0.26-servicing.23572.29 + 6.0.26-servicing.23572.29 + 6.0.26 + 6.0.26 + 6.0.26 + 6.0.26 2.1.0 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.320 + 6.0.321 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) From 684d29ae26f5f29c697fb5dc1448b8f1cb4ec4b9 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 25 Nov 2023 00:34:40 +0000 Subject: [PATCH 117/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231124.7 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.101 -> To Version 8.0.101 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.SourceBuild.Intermediate.emsdk From Version 8.0.0 -> To Version 8.0.1 (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 9e20ad59c..e486010ef 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,7 +10,7 @@ - + @@ -18,7 +18,7 @@ - + @@ -42,12 +42,12 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c6c6cc87c..54d6dfbd8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -58,49 +58,49 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5275cc3be8088994b77003b54b5496264d9f3fe7 + 48e1ed99a1a0d1266a475549972202e32921815f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5275cc3be8088994b77003b54b5496264d9f3fe7 + 48e1ed99a1a0d1266a475549972202e32921815f https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5275cc3be8088994b77003b54b5496264d9f3fe7 + 48e1ed99a1a0d1266a475549972202e32921815f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5275cc3be8088994b77003b54b5496264d9f3fe7 + 48e1ed99a1a0d1266a475549972202e32921815f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5275cc3be8088994b77003b54b5496264d9f3fe7 + 48e1ed99a1a0d1266a475549972202e32921815f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5275cc3be8088994b77003b54b5496264d9f3fe7 + 48e1ed99a1a0d1266a475549972202e32921815f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5275cc3be8088994b77003b54b5496264d9f3fe7 + 48e1ed99a1a0d1266a475549972202e32921815f https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0c844b4316a751ba1a40ba13fb6974367acf791d + ba66f9fd732b9510291dcb2478d938c5934fda06 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0c844b4316a751ba1a40ba13fb6974367acf791d + ba66f9fd732b9510291dcb2478d938c5934fda06 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0c844b4316a751ba1a40ba13fb6974367acf791d + ba66f9fd732b9510291dcb2478d938c5934fda06 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0c844b4316a751ba1a40ba13fb6974367acf791d + ba66f9fd732b9510291dcb2478d938c5934fda06 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 621fc992d..a3da5a719 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -74,11 +74,11 @@ 8.0.1 8.0.1 - 8.0.1-servicing.23571.8 - 8.0.1-servicing.23571.8 - 8.0.1-servicing.23571.8 - 8.0.1-servicing.23571.8 - 8.0.1-servicing.23571.8 + 8.0.1-servicing.23573.12 + 8.0.1-servicing.23573.12 + 8.0.1-servicing.23573.12 + 8.0.1-servicing.23573.12 + 8.0.1-servicing.23573.12 0.2.0 @@ -86,8 +86,8 @@ 8.0.101 - 8.0.101-servicing.23572.19 - 8.0.101-servicing.23572.19 + 8.0.101-servicing.23574.7 + 8.0.101-servicing.23574.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b129b6e2ed37a5b7c5eaade5ee05a69742492127 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 27 Nov 2023 13:50:58 +0000 Subject: [PATCH 118/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231127.2 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.101 -> To Version 8.0.101 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.SourceBuild.Intermediate.emsdk From Version 8.0.0 -> To Version 8.0.1 (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 e486010ef..da071ea15 100644 --- a/NuGet.config +++ b/NuGet.config @@ -18,10 +18,10 @@ - + - + @@ -47,10 +47,10 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 54d6dfbd8..31e363e5a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -7,19 +7,19 @@ --> https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 94d6b586a05ef1d4b4234fb324fb95b9c1c73204 + 853bd14654e5a1979698018f70861dbe017c0d2a - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 94d6b586a05ef1d4b4234fb324fb95b9c1c73204 + 853bd14654e5a1979698018f70861dbe017c0d2a - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 94d6b586a05ef1d4b4234fb324fb95b9c1c73204 + 853bd14654e5a1979698018f70861dbe017c0d2a https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 94d6b586a05ef1d4b4234fb324fb95b9c1c73204 + 853bd14654e5a1979698018f70861dbe017c0d2a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ba66f9fd732b9510291dcb2478d938c5934fda06 + 70eaa4107a25f92db495aa80af72c7fe37a1ae96 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ba66f9fd732b9510291dcb2478d938c5934fda06 + 70eaa4107a25f92db495aa80af72c7fe37a1ae96 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ba66f9fd732b9510291dcb2478d938c5934fda06 + 70eaa4107a25f92db495aa80af72c7fe37a1ae96 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ba66f9fd732b9510291dcb2478d938c5934fda06 + 70eaa4107a25f92db495aa80af72c7fe37a1ae96 https://github.com/dotnet/test-templates @@ -124,13 +124,13 @@ 1e5f3603af2277910aad946736ee23283e7f3e16 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 642f51b02a34281044c2a1e07862b2bf2b71c155 + 330e1adc916cc03d60d340d04d666b829dcbb5d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - b871665f995218f1d89f071e87080bb481787364 + d24bf24661d5cb21899baf3e473bec7d552f0100 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index a3da5a719..ea45f16a5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,11 +48,11 @@ - 8.0.1-servicing.23571.1 + 8.0.1-servicing.23574.2 - 8.0.1-servicing.23571.2 + 8.0.1-servicing.23577.1 @@ -86,8 +86,8 @@ 8.0.101 - 8.0.101-servicing.23574.7 - 8.0.101-servicing.23574.7 + 8.0.101-servicing.23577.2 + 8.0.101-servicing.23577.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -112,8 +112,8 @@ - 8.0.1-servicing.23571.3 - 8.0.1-servicing.23571.3 + 8.0.1-servicing.23577.2 + 8.0.1-servicing.23577.2 8.0.1 8.0.1 From 61a7ec7347804b96e1f123bb87b1bb8f43363397 Mon Sep 17 00:00:00 2001 From: Ella Hathaway <67609881+ellahathaway@users.noreply.github.com> Date: Mon, 27 Nov 2023 11:27:55 -0800 Subject: [PATCH 119/535] Download and compare linux-musl-x64 MSFT sdk (#17823) --- .../common/templates/job/source-build-build-tarball.yml | 9 +++++++-- src/SourceBuild/tarball/content/Directory.Build.props | 1 + 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml index 9e67adb4d..c8756326e 100644 --- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml @@ -85,7 +85,7 @@ jobs: - ${{ if ne(parameters.excludeSdkContentTests, 'true') }}: - download: ${{ parameters.installerBuildResourceId }} artifact: BlobArtifacts - patterns: '**/dotnet-sdk-+([0-9]).+([0-9]).+([0-9])?(-@(preview|rc|rtm)*)-linux-${{ parameters.architecture }}.tar.gz' + patterns: '**/dotnet-sdk-+([0-9]).+([0-9]).+([0-9])?(-@(preview|rc|rtm)*)-linux*-${{ parameters.architecture }}.tar.gz' displayName: Download MSFT sdk Tarball - ${{ if eq(parameters.usePreviousArtifacts, 'true') }}: @@ -185,7 +185,12 @@ jobs: if [[ '${{ parameters.excludeSdkContentTests}}' != 'true' ]]; then dockerVolumeArgs+=" -v $(PIPELINE.WORKSPACE)/${{ parameters.installerBuildResourceId }}/BlobArtifacts/:/BlobArtifacts" - msftSdkTarballName=$(find "$(PIPELINE.WORKSPACE)/${{ parameters.installerBuildResourceId }}/BlobArtifacts/" -name "dotnet-sdk-*-linux-${{ parameters.architecture }}.tar.gz" -exec basename {} \;) + platform="linux" + docker run --rm $(_Container) /bin/sh -c "cat /etc/os-release | grep -q alpine" + if [[ $? == 0 ]]; then + platform="$platform-musl" + fi + msftSdkTarballName=$(find "$(PIPELINE.WORKSPACE)/${{ parameters.installerBuildResourceId }}/BlobArtifacts/" -name "dotnet-sdk-*-$platform-${{ parameters.architecture }}.tar.gz" -exec basename {} \;) dockerEnvArgs+=" -e SMOKE_TESTS_MSFT_SDK_TARBALL_PATH=/BlobArtifacts/$msftSdkTarballName" fi diff --git a/src/SourceBuild/tarball/content/Directory.Build.props b/src/SourceBuild/tarball/content/Directory.Build.props index 2f4a8ee71..0bd228850 100644 --- a/src/SourceBuild/tarball/content/Directory.Build.props +++ b/src/SourceBuild/tarball/content/Directory.Build.props @@ -174,6 +174,7 @@ freebsd-$(Platform) osx-$(Platform) linux-$(Platform) + linux-musl-$(Platform) win-$(Platform) $(PortableRid) From 8963282686d67a14f42fd53271df003b5f2cb7a8 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 28 Nov 2023 11:51:15 +0000 Subject: [PATCH 120/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231128.3 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.101 -> To Version 8.0.101 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.SourceBuild.Intermediate.emsdk From Version 8.0.0 -> To Version 8.0.1 (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 da071ea15..0f2043e51 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,7 +10,7 @@ - + @@ -18,7 +18,7 @@ - + @@ -42,12 +42,12 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 31e363e5a..e08f356c8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -58,49 +58,49 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 48e1ed99a1a0d1266a475549972202e32921815f + 548269ede06a5f70307a51c7738797779ef2747a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 48e1ed99a1a0d1266a475549972202e32921815f + 548269ede06a5f70307a51c7738797779ef2747a https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 48e1ed99a1a0d1266a475549972202e32921815f + 548269ede06a5f70307a51c7738797779ef2747a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 48e1ed99a1a0d1266a475549972202e32921815f + 548269ede06a5f70307a51c7738797779ef2747a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 48e1ed99a1a0d1266a475549972202e32921815f + 548269ede06a5f70307a51c7738797779ef2747a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 48e1ed99a1a0d1266a475549972202e32921815f + 548269ede06a5f70307a51c7738797779ef2747a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 48e1ed99a1a0d1266a475549972202e32921815f + 548269ede06a5f70307a51c7738797779ef2747a https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 70eaa4107a25f92db495aa80af72c7fe37a1ae96 + 064ff87b0ac8251ed49f4c905fab086773bca251 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 70eaa4107a25f92db495aa80af72c7fe37a1ae96 + 064ff87b0ac8251ed49f4c905fab086773bca251 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 70eaa4107a25f92db495aa80af72c7fe37a1ae96 + 064ff87b0ac8251ed49f4c905fab086773bca251 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 70eaa4107a25f92db495aa80af72c7fe37a1ae96 + 064ff87b0ac8251ed49f4c905fab086773bca251 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index ea45f16a5..fef54d7d1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -74,11 +74,11 @@ 8.0.1 8.0.1 - 8.0.1-servicing.23573.12 - 8.0.1-servicing.23573.12 - 8.0.1-servicing.23573.12 - 8.0.1-servicing.23573.12 - 8.0.1-servicing.23573.12 + 8.0.1-servicing.23577.34 + 8.0.1-servicing.23577.34 + 8.0.1-servicing.23577.34 + 8.0.1-servicing.23577.34 + 8.0.1-servicing.23577.34 0.2.0 @@ -86,8 +86,8 @@ 8.0.101 - 8.0.101-servicing.23577.2 - 8.0.101-servicing.23577.2 + 8.0.101-servicing.23578.3 + 8.0.101-servicing.23578.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 17da9de8d38bd26d596f3c7548e4b79cd5178412 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 28 Nov 2023 11:54:07 +0000 Subject: [PATCH 121/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231128.7 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.321-servicing.23574.2 -> To Version 6.0.321-servicing.23578.7 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets From Version 6.0.26 -> To Version 6.0.26 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index 88cf52afd..dcba8ce77 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -40,7 +40,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a6ece6385..1a40c404e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2813f390b0d8ad577f32f27a1c57031e56f02f45 + 00f7c0edf759ec4fa22094a1571b1b1530ffe183 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2813f390b0d8ad577f32f27a1c57031e56f02f45 + 00f7c0edf759ec4fa22094a1571b1b1530ffe183 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2813f390b0d8ad577f32f27a1c57031e56f02f45 + 00f7c0edf759ec4fa22094a1571b1b1530ffe183 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2813f390b0d8ad577f32f27a1c57031e56f02f45 + 00f7c0edf759ec4fa22094a1571b1b1530ffe183 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2813f390b0d8ad577f32f27a1c57031e56f02f45 + 00f7c0edf759ec4fa22094a1571b1b1530ffe183 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2813f390b0d8ad577f32f27a1c57031e56f02f45 + 00f7c0edf759ec4fa22094a1571b1b1530ffe183 https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 6b4fc213e731cb128ad8ed54befea55d9e1d3f6d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 99f231333f8e3d364f357315d99e36473238b694 + 948bfb9e66e38a2e16fd7f22acf011950671745e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 99f231333f8e3d364f357315d99e36473238b694 + 948bfb9e66e38a2e16fd7f22acf011950671745e diff --git a/eng/Versions.props b/eng/Versions.props index cf7e6d2c7..2d4d53542 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.26 6.0.26 - 6.0.26-servicing.23573.6 - 6.0.26-servicing.23573.6 - 6.0.26-servicing.23573.6 - 6.0.26-servicing.23573.6 + 6.0.26-servicing.23577.12 + 6.0.26-servicing.23577.12 + 6.0.26-servicing.23577.12 + 6.0.26-servicing.23577.12 0.2.0 - 6.0.321-servicing.23574.2 - 6.0.321-servicing.23574.2 + 6.0.321-servicing.23578.7 + 6.0.321-servicing.23578.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From fd7471c9072304c51021a2216c218af95959ca2e Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 28 Nov 2023 11:54:25 +0000 Subject: [PATCH 122/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231128.6 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.126-servicing.23574.1 -> To Version 6.0.126-servicing.23578.6 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets From Version 6.0.26 -> To Version 6.0.26 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index 03f09e6af..fe7817f00 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -40,7 +40,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a891e9673..7e5d919ef 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2813f390b0d8ad577f32f27a1c57031e56f02f45 + 00f7c0edf759ec4fa22094a1571b1b1530ffe183 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2813f390b0d8ad577f32f27a1c57031e56f02f45 + 00f7c0edf759ec4fa22094a1571b1b1530ffe183 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2813f390b0d8ad577f32f27a1c57031e56f02f45 + 00f7c0edf759ec4fa22094a1571b1b1530ffe183 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2813f390b0d8ad577f32f27a1c57031e56f02f45 + 00f7c0edf759ec4fa22094a1571b1b1530ffe183 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2813f390b0d8ad577f32f27a1c57031e56f02f45 + 00f7c0edf759ec4fa22094a1571b1b1530ffe183 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2813f390b0d8ad577f32f27a1c57031e56f02f45 + 00f7c0edf759ec4fa22094a1571b1b1530ffe183 https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 8f42eeeef2041f39db00cf87a08ad9e6eb3f613d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - cb1f8762b907a48ebcb8f8d41151559940b8258a + b3a797e95e70efc1a8360afc0ab845f0b5fc668a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - cb1f8762b907a48ebcb8f8d41151559940b8258a + b3a797e95e70efc1a8360afc0ab845f0b5fc668a diff --git a/eng/Versions.props b/eng/Versions.props index c2386ebf9..c68cdb0ad 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.26 6.0.26 - 6.0.26-servicing.23573.6 - 6.0.26-servicing.23573.6 - 6.0.26-servicing.23573.6 - 6.0.26-servicing.23573.6 + 6.0.26-servicing.23577.12 + 6.0.26-servicing.23577.12 + 6.0.26-servicing.23577.12 + 6.0.26-servicing.23577.12 0.2.0 - 6.0.126-servicing.23574.1 - 6.0.126-servicing.23574.1 + 6.0.126-servicing.23578.6 + 6.0.126-servicing.23578.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 5465d933ea269f8a784cdc7af14107f42ed026fe Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 28 Nov 2023 12:06:06 +0000 Subject: [PATCH 123/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231128.4 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.312 -> To Version 7.0.312 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets From Version 7.0.15 -> To Version 7.0.15 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 38 +++++++++++++++++++------------------- eng/Versions.props | 14 +++++++------- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/NuGet.config b/NuGet.config index 65e2ee623..24168537a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,7 +10,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -44,12 +44,12 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 65785a115..2b505f556 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ef956a2bd9f33b27eb983d339fa6dbb186db8247 + 360f1564385745dd9e9acc53e697f8e63ff41126 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ef956a2bd9f33b27eb983d339fa6dbb186db8247 + 360f1564385745dd9e9acc53e697f8e63ff41126 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ef956a2bd9f33b27eb983d339fa6dbb186db8247 + 360f1564385745dd9e9acc53e697f8e63ff41126 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ef956a2bd9f33b27eb983d339fa6dbb186db8247 + 360f1564385745dd9e9acc53e697f8e63ff41126 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ef956a2bd9f33b27eb983d339fa6dbb186db8247 + 360f1564385745dd9e9acc53e697f8e63ff41126 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ef956a2bd9f33b27eb983d339fa6dbb186db8247 + 360f1564385745dd9e9acc53e697f8e63ff41126 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ef956a2bd9f33b27eb983d339fa6dbb186db8247 + 360f1564385745dd9e9acc53e697f8e63ff41126 https://github.com/dotnet/test-templates @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f48767b966f407a6a74953ea6cb0ac61f610b4dd + 962ca34b2d008d76290894f0f4b56f8664e49bda - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f48767b966f407a6a74953ea6cb0ac61f610b4dd + 962ca34b2d008d76290894f0f4b56f8664e49bda - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f48767b966f407a6a74953ea6cb0ac61f610b4dd + 962ca34b2d008d76290894f0f4b56f8664e49bda - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f48767b966f407a6a74953ea6cb0ac61f610b4dd + 962ca34b2d008d76290894f0f4b56f8664e49bda diff --git a/eng/Versions.props b/eng/Versions.props index 018a55ab1..96257c41d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,11 +58,11 @@ 7.0.15 7.0.15 - 7.0.15-servicing.23573.7 - 7.0.15-servicing.23573.7 - 7.0.15-servicing.23573.7 - 7.0.15-servicing.23573.7 - 7.0.15-servicing.23573.7 + 7.0.15-servicing.23577.31 + 7.0.15-servicing.23577.31 + 7.0.15-servicing.23577.31 + 7.0.15-servicing.23577.31 + 7.0.15-servicing.23577.31 0.2.0 @@ -70,8 +70,8 @@ 7.0.312 - 7.0.312-servicing.23573.32 - 7.0.312-servicing.23573.32 + 7.0.312-servicing.23578.4 + 7.0.312-servicing.23578.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b78e462adb3c9734cad6f24bec1fe69cb73afac9 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 28 Nov 2023 12:06:47 +0000 Subject: [PATCH 124/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231128.5 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.115 -> To Version 7.0.115 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets From Version 7.0.15 -> To Version 7.0.15 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 38 +++++++++++++++++++------------------- eng/Versions.props | 14 +++++++------- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/NuGet.config b/NuGet.config index 529576f58..b3682484a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -44,12 +44,12 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7cfc48c06..3b6bc0be2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ef956a2bd9f33b27eb983d339fa6dbb186db8247 + 360f1564385745dd9e9acc53e697f8e63ff41126 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ef956a2bd9f33b27eb983d339fa6dbb186db8247 + 360f1564385745dd9e9acc53e697f8e63ff41126 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ef956a2bd9f33b27eb983d339fa6dbb186db8247 + 360f1564385745dd9e9acc53e697f8e63ff41126 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ef956a2bd9f33b27eb983d339fa6dbb186db8247 + 360f1564385745dd9e9acc53e697f8e63ff41126 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ef956a2bd9f33b27eb983d339fa6dbb186db8247 + 360f1564385745dd9e9acc53e697f8e63ff41126 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ef956a2bd9f33b27eb983d339fa6dbb186db8247 + 360f1564385745dd9e9acc53e697f8e63ff41126 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ef956a2bd9f33b27eb983d339fa6dbb186db8247 + 360f1564385745dd9e9acc53e697f8e63ff41126 https://github.com/dotnet/test-templates @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fc561a76355e98597193f4c42b5649ead791f0c2 + 96bb3b05678dde4da2164d4c1b13372855e610d8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fc561a76355e98597193f4c42b5649ead791f0c2 + 96bb3b05678dde4da2164d4c1b13372855e610d8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fc561a76355e98597193f4c42b5649ead791f0c2 + 96bb3b05678dde4da2164d4c1b13372855e610d8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fc561a76355e98597193f4c42b5649ead791f0c2 + 96bb3b05678dde4da2164d4c1b13372855e610d8 diff --git a/eng/Versions.props b/eng/Versions.props index 90a2db59b..e6bd74f8d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,11 +58,11 @@ 7.0.15 7.0.15 - 7.0.15-servicing.23573.7 - 7.0.15-servicing.23573.7 - 7.0.15-servicing.23573.7 - 7.0.15-servicing.23573.7 - 7.0.15-servicing.23573.7 + 7.0.15-servicing.23577.31 + 7.0.15-servicing.23577.31 + 7.0.15-servicing.23577.31 + 7.0.15-servicing.23577.31 + 7.0.15-servicing.23577.31 0.2.0 @@ -70,8 +70,8 @@ 7.0.115 - 7.0.115-servicing.23573.33 - 7.0.115-servicing.23573.33 + 7.0.115-servicing.23578.5 + 7.0.115-servicing.23578.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 11dd5cc449878857cfa0eba9f0958d8007edd3b1 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 28 Nov 2023 12:12:57 +0000 Subject: [PATCH 125/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231128.8 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.405 -> To Version 7.0.405 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets From Version 7.0.15 -> To Version 7.0.15 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 38 +++++++++++++++++++------------------- eng/Versions.props | 14 +++++++------- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/NuGet.config b/NuGet.config index eb2810961..beca76c42 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,7 +10,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -44,12 +44,12 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c9a3cc6cd..e780bcb10 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ef956a2bd9f33b27eb983d339fa6dbb186db8247 + 360f1564385745dd9e9acc53e697f8e63ff41126 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ef956a2bd9f33b27eb983d339fa6dbb186db8247 + 360f1564385745dd9e9acc53e697f8e63ff41126 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ef956a2bd9f33b27eb983d339fa6dbb186db8247 + 360f1564385745dd9e9acc53e697f8e63ff41126 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ef956a2bd9f33b27eb983d339fa6dbb186db8247 + 360f1564385745dd9e9acc53e697f8e63ff41126 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ef956a2bd9f33b27eb983d339fa6dbb186db8247 + 360f1564385745dd9e9acc53e697f8e63ff41126 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ef956a2bd9f33b27eb983d339fa6dbb186db8247 + 360f1564385745dd9e9acc53e697f8e63ff41126 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ef956a2bd9f33b27eb983d339fa6dbb186db8247 + 360f1564385745dd9e9acc53e697f8e63ff41126 https://github.com/dotnet/test-templates @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fffcfa569ab3e3a71f7f81264eec62ef152bdf51 + f4950be5e3cadff1e8db233ff34486020facc2b3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fffcfa569ab3e3a71f7f81264eec62ef152bdf51 + f4950be5e3cadff1e8db233ff34486020facc2b3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fffcfa569ab3e3a71f7f81264eec62ef152bdf51 + f4950be5e3cadff1e8db233ff34486020facc2b3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fffcfa569ab3e3a71f7f81264eec62ef152bdf51 + f4950be5e3cadff1e8db233ff34486020facc2b3 diff --git a/eng/Versions.props b/eng/Versions.props index ec1a28869..4f750003a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,11 +58,11 @@ 7.0.15 7.0.15 - 7.0.15-servicing.23573.7 - 7.0.15-servicing.23573.7 - 7.0.15-servicing.23573.7 - 7.0.15-servicing.23573.7 - 7.0.15-servicing.23573.7 + 7.0.15-servicing.23577.31 + 7.0.15-servicing.23577.31 + 7.0.15-servicing.23577.31 + 7.0.15-servicing.23577.31 + 7.0.15-servicing.23577.31 0.2.0 @@ -70,8 +70,8 @@ 7.0.405 - 7.0.405-servicing.23573.36 - 7.0.405-servicing.23573.36 + 7.0.405-servicing.23578.8 + 7.0.405-servicing.23578.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 0b69c3bc5b4574b62c6a21eeadb2342bece26639 Mon Sep 17 00:00:00 2001 From: "Matt Mitchell (.NET)" Date: Tue, 28 Nov 2023 09:24:13 -0800 Subject: [PATCH 126/535] Update source build externals --- 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 e08f356c8..ebf4b2006 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -193,9 +193,9 @@ 5957c5c5f85f17c145e7fab4ece37ad6aafcded9 - - https://github.com/dotnet/source-build-externals - 776b128c95ef681d125adc3eb69f12d480418bb5 + + https://dev.azure.com/dnceng/internal/_git/dotnet-source-build-externals + 0f0f1f0f33830f27ed0ff357145d2464b96b1a3e From 1bfbd543e06811b56f7b0b3e9b5e885d8f43dc4f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 28 Nov 2023 18:57:28 +0000 Subject: [PATCH 127/535] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20231128.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 7.0.0-alpha.1.23219.1 -> To Version 7.0.0-alpha.1.23578.1 --- NuGet.config | 27 --------------------------- eng/Version.Details.xml | 4 ++-- 2 files changed, 2 insertions(+), 29 deletions(-) diff --git a/NuGet.config b/NuGet.config index 7b13934dc..bdc3a6cb9 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,29 +10,14 @@ - - - - - - - - - - - - - - - @@ -54,23 +39,11 @@ - - - - - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6ed02abb3..661646f3a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -205,9 +205,9 @@ https://github.com/dotnet/arcade ca53a3149aaedb03e5d79ee0e259d31ac8719290 - + https://github.com/dotnet/source-build-reference-packages - 525b6c35cc5c5c9b80b47044be2e4e77858d505a + 6d5841c05f04d60eccf3358588b8c8968215d9e2 From e58facf1b23bbd3ba7850272765e2d9354ed480c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 28 Nov 2023 18:57:29 +0000 Subject: [PATCH 128/535] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20231128.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 7.0.0-alpha.1.23219.1 -> To Version 7.0.0-alpha.1.23578.1 --- NuGet.config | 27 --------------------------- eng/Version.Details.xml | 4 ++-- 2 files changed, 2 insertions(+), 29 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6965e587b..d288f50a2 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,29 +10,14 @@ - - - - - - - - - - - - - - - @@ -54,23 +39,11 @@ - - - - - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5a3d473a0..e86c9c4ef 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -205,9 +205,9 @@ https://github.com/dotnet/arcade ca53a3149aaedb03e5d79ee0e259d31ac8719290 - + https://github.com/dotnet/source-build-reference-packages - 525b6c35cc5c5c9b80b47044be2e4e77858d505a + 6d5841c05f04d60eccf3358588b8c8968215d9e2 From d60339e96f69c69153a754512fcb8683cbb64bd0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 28 Nov 2023 18:57:29 +0000 Subject: [PATCH 129/535] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20231128.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 7.0.0-alpha.1.23219.1 -> To Version 7.0.0-alpha.1.23578.1 --- NuGet.config | 21 --------------------- eng/Version.Details.xml | 4 ++-- 2 files changed, 2 insertions(+), 23 deletions(-) diff --git a/NuGet.config b/NuGet.config index be7632bd2..9c94cf60c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,27 +9,15 @@ - - - - - - - - - - - - @@ -53,18 +41,9 @@ - - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a464c3fa3..327438c20 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 - 525b6c35cc5c5c9b80b47044be2e4e77858d505a + 6d5841c05f04d60eccf3358588b8c8968215d9e2 From ba799f743b42240b5e154a0530e3cf96e57f5185 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 28 Nov 2023 20:24:06 +0000 Subject: [PATCH 130/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231128.17 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.418-servicing.23574.3 -> To Version 6.0.418-servicing.23578.17 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets From Version 6.0.26 -> To Version 6.0.26 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index 1aa3642f7..152173f2a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -40,7 +40,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e8bd7fbb3..3085be281 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2813f390b0d8ad577f32f27a1c57031e56f02f45 + 00f7c0edf759ec4fa22094a1571b1b1530ffe183 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2813f390b0d8ad577f32f27a1c57031e56f02f45 + 00f7c0edf759ec4fa22094a1571b1b1530ffe183 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2813f390b0d8ad577f32f27a1c57031e56f02f45 + 00f7c0edf759ec4fa22094a1571b1b1530ffe183 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2813f390b0d8ad577f32f27a1c57031e56f02f45 + 00f7c0edf759ec4fa22094a1571b1b1530ffe183 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2813f390b0d8ad577f32f27a1c57031e56f02f45 + 00f7c0edf759ec4fa22094a1571b1b1530ffe183 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2813f390b0d8ad577f32f27a1c57031e56f02f45 + 00f7c0edf759ec4fa22094a1571b1b1530ffe183 https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 04cc3e115c98a8aa1fde4b1b45218ed6331c45c5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 08ded598c2a2b41b45413b7462da49bdcea3c5a0 + 304d44c93d271c5cfebb7aedf39d8c605bb4fbfc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 08ded598c2a2b41b45413b7462da49bdcea3c5a0 + 304d44c93d271c5cfebb7aedf39d8c605bb4fbfc diff --git a/eng/Versions.props b/eng/Versions.props index 775638704..2da607528 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.26 6.0.26 - 6.0.26-servicing.23573.6 - 6.0.26-servicing.23573.6 - 6.0.26-servicing.23573.6 - 6.0.26-servicing.23573.6 + 6.0.26-servicing.23577.12 + 6.0.26-servicing.23577.12 + 6.0.26-servicing.23577.12 + 6.0.26-servicing.23577.12 0.2.0 - 6.0.418-servicing.23574.3 - 6.0.418-servicing.23574.3 + 6.0.418-servicing.23578.17 + 6.0.418-servicing.23578.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 2b898386936291e1c6a1a1b47df1e1726a933daa Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 28 Nov 2023 21:26:46 +0000 Subject: [PATCH 131/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231128.22 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.101 -> To Version 8.0.101 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.SourceBuild.Intermediate.emsdk From Version 8.0.0 -> To Version 8.0.1 (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 0f2043e51..b40ae4f9e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -18,7 +18,7 @@ - + @@ -47,7 +47,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ebf4b2006..a3cc3e2d3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 064ff87b0ac8251ed49f4c905fab086773bca251 + 56133a167a52bda600684dc83b868256db00d9d3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 064ff87b0ac8251ed49f4c905fab086773bca251 + 56133a167a52bda600684dc83b868256db00d9d3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 064ff87b0ac8251ed49f4c905fab086773bca251 + 56133a167a52bda600684dc83b868256db00d9d3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 064ff87b0ac8251ed49f4c905fab086773bca251 + 56133a167a52bda600684dc83b868256db00d9d3 https://github.com/dotnet/test-templates @@ -141,9 +141,9 @@ 424e4b7cffb7656efd63f7a905a2498e39011104 - + https://github.com/microsoft/vstest - ae25c3b96fe433c60af70e3991ace49fcbf7e970 + 3259862fadd5e784564e7d920a2d61a75f415a79 diff --git a/eng/Versions.props b/eng/Versions.props index fef54d7d1..b5bced75f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,8 +86,8 @@ 8.0.101 - 8.0.101-servicing.23578.3 - 8.0.101-servicing.23578.3 + 8.0.101-servicing.23578.22 + 8.0.101-servicing.23578.22 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -234,7 +234,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.8.0-release-23553-01 + 17.8.0-release-23578-02 8.0.0-alpha.1.22557.12 From 67b3fa5ba87ac794ff751ac6d612d993dd503929 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 28 Nov 2023 21:51:22 +0000 Subject: [PATCH 132/535] Updated .vsts-ci.yml Add PGO legs to dependencies for publish. --- .vsts-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index c6f583096..0b653655f 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -405,6 +405,8 @@ stages: - Darwin - Source_Build_Managed - Source_Build_Create_Tarball + - PGO_Linux + - PGO_Windows_NT publishUsingPipelines: true pool: ${{ if eq(variables['System.TeamProject'], 'internal') }}: From 250154ba132fdd28289b18823d8ac6b6a0f39f33 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 28 Nov 2023 22:25:06 +0000 Subject: [PATCH 133/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231128.23 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.101 -> To Version 8.0.101 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.SourceBuild.Intermediate.emsdk From Version 8.0.0 -> To Version 8.0.1 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 10 +++++----- 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/NuGet.config b/NuGet.config index b40ae4f9e..aba331a8e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -15,10 +15,10 @@ - + - + @@ -45,9 +45,9 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a3cc3e2d3..a445c991d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -21,30 +21,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 853bd14654e5a1979698018f70861dbe017c0d2a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 21b90573de7d6e0c88acdd25dc116b6729fd65a7 + d682195447d43c6840bf1e360a2e60a0afa60c41 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 21b90573de7d6e0c88acdd25dc116b6729fd65a7 + d682195447d43c6840bf1e360a2e60a0afa60c41 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 21b90573de7d6e0c88acdd25dc116b6729fd65a7 + d682195447d43c6840bf1e360a2e60a0afa60c41 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 21b90573de7d6e0c88acdd25dc116b6729fd65a7 + d682195447d43c6840bf1e360a2e60a0afa60c41 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 21b90573de7d6e0c88acdd25dc116b6729fd65a7 + d682195447d43c6840bf1e360a2e60a0afa60c41 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 21b90573de7d6e0c88acdd25dc116b6729fd65a7 + d682195447d43c6840bf1e360a2e60a0afa60c41 @@ -52,9 +52,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 + d682195447d43c6840bf1e360a2e60a0afa60c41 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 56133a167a52bda600684dc83b868256db00d9d3 + db2b846f819f1eb4fade84b21e5a0769a370d225 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 56133a167a52bda600684dc83b868256db00d9d3 + db2b846f819f1eb4fade84b21e5a0769a370d225 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 56133a167a52bda600684dc83b868256db00d9d3 + db2b846f819f1eb4fade84b21e5a0769a370d225 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 56133a167a52bda600684dc83b868256db00d9d3 + db2b846f819f1eb4fade84b21e5a0769a370d225 https://github.com/dotnet/test-templates @@ -148,7 +148,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 21b90573de7d6e0c88acdd25dc116b6729fd65a7 + d682195447d43c6840bf1e360a2e60a0afa60c41 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index b5bced75f..b0a942e98 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,8 +86,8 @@ 8.0.101 - 8.0.101-servicing.23578.22 - 8.0.101-servicing.23578.22 + 8.0.101-servicing.23578.23 + 8.0.101-servicing.23578.23 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -98,12 +98,12 @@ - 8.0.0-rtm.23531.3 + 8.0.1-servicing.23572.22 - 8.0.1-servicing.23571.29 - 8.0.1-servicing.23571.29 + 8.0.1-servicing.23572.22 + 8.0.1-servicing.23572.22 8.0.1 8.0.1 8.0.1 From bae74599d7033c05aaa1bb0958bd1b8ce628cdd2 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Wed, 29 Nov 2023 00:06:24 +0000 Subject: [PATCH 134/535] Updated Versions.props --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index b0a942e98..3e50af6ff 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,7 +40,7 @@ - 8.0.0-beta.23516.4 + 8.0.0-beta.23564.4 From de33cd6114f0fcdd55ce56ce311d7a1ecf37ca51 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 29 Nov 2023 00:31:12 +0000 Subject: [PATCH 135/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231128.33 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.418-servicing.23578.17 -> To Version 6.0.418-servicing.23578.33 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3085be281..a4e6877c5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 04cc3e115c98a8aa1fde4b1b45218ed6331c45c5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 304d44c93d271c5cfebb7aedf39d8c605bb4fbfc + 09d4e77361f1baf445376cd5fbec6a4c55a1d295 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 304d44c93d271c5cfebb7aedf39d8c605bb4fbfc + 09d4e77361f1baf445376cd5fbec6a4c55a1d295 diff --git a/eng/Versions.props b/eng/Versions.props index 2da607528..96d0d2e3a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.418-servicing.23578.17 - 6.0.418-servicing.23578.17 + 6.0.418-servicing.23578.33 + 6.0.418-servicing.23578.33 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 024e3b3f05e145a9fa0704455cc83fe59bd219b8 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 29 Nov 2023 00:41:31 +0000 Subject: [PATCH 136/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231128.27 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.405 -> To Version 7.0.405 Dependency coherency updates Microsoft.NET.Test.Sdk From Version 17.7.2-release-23423-01 -> To Version 17.7.2-release-23578-01 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 18 +++++++++--------- eng/Versions.props | 6 +++--- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/NuGet.config b/NuGet.config index beca76c42..7cbccbd8a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,7 +19,7 @@ - + @@ -49,7 +49,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 22e8aec0f..d6cc9da3c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f4950be5e3cadff1e8db233ff34486020facc2b3 + d456c2d4f3a4c6c4b89d00df45c35a799ae1da12 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f4950be5e3cadff1e8db233ff34486020facc2b3 + d456c2d4f3a4c6c4b89d00df45c35a799ae1da12 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f4950be5e3cadff1e8db233ff34486020facc2b3 + d456c2d4f3a4c6c4b89d00df45c35a799ae1da12 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f4950be5e3cadff1e8db233ff34486020facc2b3 + d456c2d4f3a4c6c4b89d00df45c35a799ae1da12 @@ -133,9 +133,9 @@ 3916deb12ef7c99509217f5e5de4821b92db901a - + https://github.com/microsoft/vstest - 604e7beeb3abe7e351a7bb5e507bea66d76a5888 + 1d2bc2d1e4fd27d9c4903838a31083467ced0475 diff --git a/eng/Versions.props b/eng/Versions.props index 4f750003a..264d5d2a0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.405 - 7.0.405-servicing.23578.8 - 7.0.405-servicing.23578.8 + 7.0.405-servicing.23578.27 + 7.0.405-servicing.23578.27 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -199,7 +199,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.7.2-release-23423-01 + 17.7.2-release-23578-01 From 38bbe013ade7b04eb12ac04f93ab4ca28c1c3648 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 29 Nov 2023 02:40:35 +0000 Subject: [PATCH 137/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231128.34 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.101 -> To Version 8.0.101 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.SourceBuild.Intermediate.emsdk From Version 8.0.0 -> To Version 8.0.1 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 10 +++++----- 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/NuGet.config b/NuGet.config index aba331a8e..c02296e93 100644 --- a/NuGet.config +++ b/NuGet.config @@ -15,10 +15,10 @@ - + - + @@ -45,9 +45,9 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c9bb3f44e..7452b6aed 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -21,30 +21,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 853bd14654e5a1979698018f70861dbe017c0d2a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d682195447d43c6840bf1e360a2e60a0afa60c41 + eddf880ac57b7f2c79a77592e3e6d24d1d02f112 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d682195447d43c6840bf1e360a2e60a0afa60c41 + eddf880ac57b7f2c79a77592e3e6d24d1d02f112 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d682195447d43c6840bf1e360a2e60a0afa60c41 + eddf880ac57b7f2c79a77592e3e6d24d1d02f112 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d682195447d43c6840bf1e360a2e60a0afa60c41 + eddf880ac57b7f2c79a77592e3e6d24d1d02f112 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d682195447d43c6840bf1e360a2e60a0afa60c41 + eddf880ac57b7f2c79a77592e3e6d24d1d02f112 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d682195447d43c6840bf1e360a2e60a0afa60c41 + eddf880ac57b7f2c79a77592e3e6d24d1d02f112 @@ -52,9 +52,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d682195447d43c6840bf1e360a2e60a0afa60c41 + eddf880ac57b7f2c79a77592e3e6d24d1d02f112 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - db2b846f819f1eb4fade84b21e5a0769a370d225 + 9586eabee30d98ae5004ab189375dc918fe2125a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - db2b846f819f1eb4fade84b21e5a0769a370d225 + 9586eabee30d98ae5004ab189375dc918fe2125a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - db2b846f819f1eb4fade84b21e5a0769a370d225 + 9586eabee30d98ae5004ab189375dc918fe2125a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - db2b846f819f1eb4fade84b21e5a0769a370d225 + 9586eabee30d98ae5004ab189375dc918fe2125a https://github.com/dotnet/test-templates @@ -148,7 +148,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d682195447d43c6840bf1e360a2e60a0afa60c41 + eddf880ac57b7f2c79a77592e3e6d24d1d02f112 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index bd0fe47bf..3d52ed096 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,8 +86,8 @@ 8.0.101 - 8.0.101-servicing.23578.23 - 8.0.101-servicing.23578.23 + 8.0.101-servicing.23578.34 + 8.0.101-servicing.23578.34 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -98,12 +98,12 @@ - 8.0.1-servicing.23572.22 + 8.0.1-servicing.23578.5 - 8.0.1-servicing.23572.22 - 8.0.1-servicing.23572.22 + 8.0.1-servicing.23578.5 + 8.0.1-servicing.23578.5 8.0.1 8.0.1 8.0.1 From a16bb964e8f4a55958dca3e55794637d1b430599 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 29 Nov 2023 03:45:24 +0000 Subject: [PATCH 138/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231128.41 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.101 -> To Version 8.0.101 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.SourceBuild.Intermediate.emsdk From Version 8.0.0 -> To Version 8.0.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 c02296e93..d0f902c30 100644 --- a/NuGet.config +++ b/NuGet.config @@ -18,7 +18,7 @@ - + @@ -47,7 +47,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7452b6aed..c2bc9ae89 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9586eabee30d98ae5004ab189375dc918fe2125a + 7f65004e42cbd086c048ea7215d35651098a330c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9586eabee30d98ae5004ab189375dc918fe2125a + 7f65004e42cbd086c048ea7215d35651098a330c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9586eabee30d98ae5004ab189375dc918fe2125a + 7f65004e42cbd086c048ea7215d35651098a330c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9586eabee30d98ae5004ab189375dc918fe2125a + 7f65004e42cbd086c048ea7215d35651098a330c https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 3d52ed096..259ae803a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,8 +86,8 @@ 8.0.101 - 8.0.101-servicing.23578.34 - 8.0.101-servicing.23578.34 + 8.0.101-servicing.23578.41 + 8.0.101-servicing.23578.41 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From cad53da73912f0f506f47dc87aeea51ec993aef2 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 29 Nov 2023 10:27:51 +0000 Subject: [PATCH 139/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231129.1 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.101 -> To Version 8.0.101 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.SourceBuild.Intermediate.emsdk From Version 8.0.0 -> To Version 8.0.1 (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 d0f902c30..1ade02914 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,7 +10,7 @@ - + @@ -18,7 +18,7 @@ - + @@ -42,12 +42,12 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c2bc9ae89..297c0d452 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -58,49 +58,49 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 548269ede06a5f70307a51c7738797779ef2747a + 02aeddda68390d089a8cdd32f5a25229cbe6daa3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 548269ede06a5f70307a51c7738797779ef2747a + 02aeddda68390d089a8cdd32f5a25229cbe6daa3 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 548269ede06a5f70307a51c7738797779ef2747a + 02aeddda68390d089a8cdd32f5a25229cbe6daa3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 548269ede06a5f70307a51c7738797779ef2747a + 02aeddda68390d089a8cdd32f5a25229cbe6daa3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 548269ede06a5f70307a51c7738797779ef2747a + 02aeddda68390d089a8cdd32f5a25229cbe6daa3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 548269ede06a5f70307a51c7738797779ef2747a + 02aeddda68390d089a8cdd32f5a25229cbe6daa3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 548269ede06a5f70307a51c7738797779ef2747a + 02aeddda68390d089a8cdd32f5a25229cbe6daa3 https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7f65004e42cbd086c048ea7215d35651098a330c + e258261c5d168879f670181e58ffe2ca46b71586 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7f65004e42cbd086c048ea7215d35651098a330c + e258261c5d168879f670181e58ffe2ca46b71586 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7f65004e42cbd086c048ea7215d35651098a330c + e258261c5d168879f670181e58ffe2ca46b71586 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7f65004e42cbd086c048ea7215d35651098a330c + e258261c5d168879f670181e58ffe2ca46b71586 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 259ae803a..fd9b79867 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -74,11 +74,11 @@ 8.0.1 8.0.1 - 8.0.1-servicing.23577.34 - 8.0.1-servicing.23577.34 - 8.0.1-servicing.23577.34 - 8.0.1-servicing.23577.34 - 8.0.1-servicing.23577.34 + 8.0.1-servicing.23578.9 + 8.0.1-servicing.23578.9 + 8.0.1-servicing.23578.9 + 8.0.1-servicing.23578.9 + 8.0.1-servicing.23578.9 0.2.0 @@ -86,8 +86,8 @@ 8.0.101 - 8.0.101-servicing.23578.41 - 8.0.101-servicing.23578.41 + 8.0.101-servicing.23579.1 + 8.0.101-servicing.23579.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 457428f24c32c1c656eeba0091515e83dc8e0378 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 29 Nov 2023 10:39:01 +0000 Subject: [PATCH 140/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231129.3 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.418-servicing.23578.17 -> To Version 6.0.418-servicing.23579.3 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets From Version 6.0.26 -> To Version 6.0.26 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index 152173f2a..26fdcf4ae 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -40,7 +40,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a4e6877c5..98c7340e2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 00f7c0edf759ec4fa22094a1571b1b1530ffe183 + ed655b45693cabc1de87e4d76d0785a3868396c2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 00f7c0edf759ec4fa22094a1571b1b1530ffe183 + ed655b45693cabc1de87e4d76d0785a3868396c2 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 00f7c0edf759ec4fa22094a1571b1b1530ffe183 + ed655b45693cabc1de87e4d76d0785a3868396c2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 00f7c0edf759ec4fa22094a1571b1b1530ffe183 + ed655b45693cabc1de87e4d76d0785a3868396c2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 00f7c0edf759ec4fa22094a1571b1b1530ffe183 + ed655b45693cabc1de87e4d76d0785a3868396c2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 00f7c0edf759ec4fa22094a1571b1b1530ffe183 + ed655b45693cabc1de87e4d76d0785a3868396c2 https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 04cc3e115c98a8aa1fde4b1b45218ed6331c45c5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 09d4e77361f1baf445376cd5fbec6a4c55a1d295 + a48336cad950691002015f4b411f77c4926c7edb - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 09d4e77361f1baf445376cd5fbec6a4c55a1d295 + a48336cad950691002015f4b411f77c4926c7edb diff --git a/eng/Versions.props b/eng/Versions.props index 96d0d2e3a..08c6b98d4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.26 6.0.26 - 6.0.26-servicing.23577.12 - 6.0.26-servicing.23577.12 - 6.0.26-servicing.23577.12 - 6.0.26-servicing.23577.12 + 6.0.26-servicing.23578.6 + 6.0.26-servicing.23578.6 + 6.0.26-servicing.23578.6 + 6.0.26-servicing.23578.6 0.2.0 - 6.0.418-servicing.23578.33 - 6.0.418-servicing.23578.33 + 6.0.418-servicing.23579.3 + 6.0.418-servicing.23579.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From aef743128cbc7065ce729367f2a6d454b0ed6f43 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 29 Nov 2023 12:30:26 +0000 Subject: [PATCH 141/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231129.2 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.126-servicing.23578.6 -> To Version 6.0.126-servicing.23579.2 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0 From Version 6.0.26 -> To Version 6.0.26 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 12 ++++++------ 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/NuGet.config b/NuGet.config index fe7817f00..4fab6601b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -17,7 +17,7 @@ - + @@ -40,14 +40,14 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7e5d919ef..a4bf66b6a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 00f7c0edf759ec4fa22094a1571b1b1530ffe183 + ed655b45693cabc1de87e4d76d0785a3868396c2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 00f7c0edf759ec4fa22094a1571b1b1530ffe183 + ed655b45693cabc1de87e4d76d0785a3868396c2 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 00f7c0edf759ec4fa22094a1571b1b1530ffe183 + ed655b45693cabc1de87e4d76d0785a3868396c2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 00f7c0edf759ec4fa22094a1571b1b1530ffe183 + ed655b45693cabc1de87e4d76d0785a3868396c2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 00f7c0edf759ec4fa22094a1571b1b1530ffe183 + ed655b45693cabc1de87e4d76d0785a3868396c2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 00f7c0edf759ec4fa22094a1571b1b1530ffe183 + ed655b45693cabc1de87e4d76d0785a3868396c2 https://github.com/dotnet/test-templates @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 8f42eeeef2041f39db00cf87a08ad9e6eb3f613d + e58a1e0535c781fc1c12a5bbbc81c5044260d3e0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 8f42eeeef2041f39db00cf87a08ad9e6eb3f613d + e58a1e0535c781fc1c12a5bbbc81c5044260d3e0 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 8f42eeeef2041f39db00cf87a08ad9e6eb3f613d + e58a1e0535c781fc1c12a5bbbc81c5044260d3e0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b3a797e95e70efc1a8360afc0ab845f0b5fc668a + bf47a20af74904ba30cc994c491f744e86545dd7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b3a797e95e70efc1a8360afc0ab845f0b5fc668a + bf47a20af74904ba30cc994c491f744e86545dd7 diff --git a/eng/Versions.props b/eng/Versions.props index c68cdb0ad..7731bf09c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.26 6.0.26 - 6.0.26-servicing.23577.12 - 6.0.26-servicing.23577.12 - 6.0.26-servicing.23577.12 - 6.0.26-servicing.23577.12 + 6.0.26-servicing.23578.6 + 6.0.26-servicing.23578.6 + 6.0.26-servicing.23578.6 + 6.0.26-servicing.23578.6 0.2.0 - 6.0.126-servicing.23578.6 - 6.0.126-servicing.23578.6 + 6.0.126-servicing.23579.2 + 6.0.126-servicing.23579.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f67edca3e3879fff6f1074109aa31d6208c59dbd Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 29 Nov 2023 12:31:51 +0000 Subject: [PATCH 142/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231128.32 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.321-servicing.23578.7 -> To Version 6.0.321-servicing.23578.32 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1a40c404e..92114992e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 6b4fc213e731cb128ad8ed54befea55d9e1d3f6d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 948bfb9e66e38a2e16fd7f22acf011950671745e + d6528f6c173ae76eb6584c31d14b3da885f8fc04 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 948bfb9e66e38a2e16fd7f22acf011950671745e + d6528f6c173ae76eb6584c31d14b3da885f8fc04 diff --git a/eng/Versions.props b/eng/Versions.props index 2d4d53542..3067e7c6d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.321-servicing.23578.7 - 6.0.321-servicing.23578.7 + 6.0.321-servicing.23578.32 + 6.0.321-servicing.23578.32 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 9bf37478b6ca1e4e7251f1c4d47a9cce103f170f Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 29 Nov 2023 12:58:43 +0000 Subject: [PATCH 143/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231129.10 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.312 -> To Version 7.0.312 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 7.0.15 -> To Version 7.0.15 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 30 +++++++++++++++--------------- eng/Versions.props | 10 +++++----- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/NuGet.config b/NuGet.config index 24168537a..529a9110e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,10 +19,10 @@ - + - + @@ -49,10 +49,10 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 59e1f894d..0dafb4b3c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 85778644ee928ab3eb11aac4fef9176851dd9b21 + acb200f3181da8cc111042a65f247bab519b9663 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 85778644ee928ab3eb11aac4fef9176851dd9b21 + acb200f3181da8cc111042a65f247bab519b9663 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 85778644ee928ab3eb11aac4fef9176851dd9b21 + acb200f3181da8cc111042a65f247bab519b9663 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 85778644ee928ab3eb11aac4fef9176851dd9b21 + acb200f3181da8cc111042a65f247bab519b9663 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 962ca34b2d008d76290894f0f4b56f8664e49bda + 4e72473553eb228156e7946886d68efcc004879f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 962ca34b2d008d76290894f0f4b56f8664e49bda + 4e72473553eb228156e7946886d68efcc004879f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 962ca34b2d008d76290894f0f4b56f8664e49bda + 4e72473553eb228156e7946886d68efcc004879f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 962ca34b2d008d76290894f0f4b56f8664e49bda + 4e72473553eb228156e7946886d68efcc004879f https://dev.azure.com/dnceng/internal/_git/dotnet-winforms 1d272c1ef7277b7cc38148300732e6a72848bedc - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - aed20729942488335ab21d7bb03a92d87afdb9b1 + 02d7f45dcacc192b40e725d6f6e77ec64e202c7a https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 96257c41d..b5858e711 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,7 +41,7 @@ - 7.0.15-servicing.23573.2 + 7.0.15-servicing.23578.3 @@ -70,8 +70,8 @@ 7.0.312 - 7.0.312-servicing.23578.4 - 7.0.312-servicing.23578.4 + 7.0.312-servicing.23579.10 + 7.0.312-servicing.23579.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -96,8 +96,8 @@ - 7.0.15-servicing.23573.2 - 7.0.15-servicing.23573.2 + 7.0.15-servicing.23579.2 + 7.0.15-servicing.23579.2 7.0.15 7.0.15 From 73698596c8dbaf63884a7069abcf017330564ac8 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 29 Nov 2023 13:03:11 +0000 Subject: [PATCH 144/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231129.8 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.101 -> To Version 8.0.101 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.SourceBuild.Intermediate.emsdk From Version 8.0.0 -> To Version 8.0.1 (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 1ade02914..5e7f2297d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -18,10 +18,10 @@ - + - + @@ -47,10 +47,10 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 297c0d452..58a198760 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -7,19 +7,19 @@ --> https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 853bd14654e5a1979698018f70861dbe017c0d2a + ce145d4ba15477a4d660db911d40b08b3040802e - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 853bd14654e5a1979698018f70861dbe017c0d2a + ce145d4ba15477a4d660db911d40b08b3040802e - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 853bd14654e5a1979698018f70861dbe017c0d2a + ce145d4ba15477a4d660db911d40b08b3040802e https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 853bd14654e5a1979698018f70861dbe017c0d2a + ce145d4ba15477a4d660db911d40b08b3040802e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e258261c5d168879f670181e58ffe2ca46b71586 + 6192aadb9e2257206a8328c41df7dc179fcc3197 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e258261c5d168879f670181e58ffe2ca46b71586 + 6192aadb9e2257206a8328c41df7dc179fcc3197 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e258261c5d168879f670181e58ffe2ca46b71586 + 6192aadb9e2257206a8328c41df7dc179fcc3197 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e258261c5d168879f670181e58ffe2ca46b71586 + 6192aadb9e2257206a8328c41df7dc179fcc3197 https://github.com/dotnet/test-templates @@ -124,13 +124,13 @@ 1e5f3603af2277910aad946736ee23283e7f3e16 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 330e1adc916cc03d60d340d04d666b829dcbb5d7 + e61cfa7d404cf0d4cb24b5d6e69bb44978a9b45a - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - d24bf24661d5cb21899baf3e473bec7d552f0100 + 32051d79682192306ba625d5ff0df24735953053 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index fd9b79867..f3a84a074 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,11 +48,11 @@ - 8.0.1-servicing.23574.2 + 8.0.1-servicing.23578.7 - 8.0.1-servicing.23577.1 + 8.0.1-servicing.23578.5 @@ -86,8 +86,8 @@ 8.0.101 - 8.0.101-servicing.23579.1 - 8.0.101-servicing.23579.1 + 8.0.101-servicing.23579.8 + 8.0.101-servicing.23579.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -112,8 +112,8 @@ - 8.0.1-servicing.23577.2 - 8.0.1-servicing.23577.2 + 8.0.1-servicing.23579.1 + 8.0.1-servicing.23579.1 8.0.1 8.0.1 From c5ba2d60898886b63e6bb657f25503d24680855f Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 29 Nov 2023 13:57:21 +0000 Subject: [PATCH 145/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231129.9 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.321-servicing.23578.32 -> To Version 6.0.321-servicing.23579.9 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets From Version 6.0.26 -> To Version 6.0.26 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index dcba8ce77..db5a4ec11 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -40,7 +40,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 92114992e..64d7e889e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 00f7c0edf759ec4fa22094a1571b1b1530ffe183 + ed655b45693cabc1de87e4d76d0785a3868396c2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 00f7c0edf759ec4fa22094a1571b1b1530ffe183 + ed655b45693cabc1de87e4d76d0785a3868396c2 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 00f7c0edf759ec4fa22094a1571b1b1530ffe183 + ed655b45693cabc1de87e4d76d0785a3868396c2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 00f7c0edf759ec4fa22094a1571b1b1530ffe183 + ed655b45693cabc1de87e4d76d0785a3868396c2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 00f7c0edf759ec4fa22094a1571b1b1530ffe183 + ed655b45693cabc1de87e4d76d0785a3868396c2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 00f7c0edf759ec4fa22094a1571b1b1530ffe183 + ed655b45693cabc1de87e4d76d0785a3868396c2 https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 6b4fc213e731cb128ad8ed54befea55d9e1d3f6d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d6528f6c173ae76eb6584c31d14b3da885f8fc04 + 176ba6c92b4d6c388a0117ae030d9b547f727c66 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d6528f6c173ae76eb6584c31d14b3da885f8fc04 + 176ba6c92b4d6c388a0117ae030d9b547f727c66 diff --git a/eng/Versions.props b/eng/Versions.props index 3067e7c6d..301d1a62b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.26 6.0.26 - 6.0.26-servicing.23577.12 - 6.0.26-servicing.23577.12 - 6.0.26-servicing.23577.12 - 6.0.26-servicing.23577.12 + 6.0.26-servicing.23578.6 + 6.0.26-servicing.23578.6 + 6.0.26-servicing.23578.6 + 6.0.26-servicing.23578.6 0.2.0 - 6.0.321-servicing.23578.32 - 6.0.321-servicing.23578.32 + 6.0.321-servicing.23579.9 + 6.0.321-servicing.23579.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 6638090396e9ea4f82447aee7b3cd4e914c76944 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 29 Nov 2023 14:13:38 +0000 Subject: [PATCH 146/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231129.11 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.405 -> To Version 7.0.405 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.Test.Sdk From Version 7.0.15 -> To Version 7.0.15 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 30 +++++++++++++++--------------- eng/Versions.props | 10 +++++----- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/NuGet.config b/NuGet.config index 7cbccbd8a..638069f5e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,10 +19,10 @@ - + - + @@ -49,10 +49,10 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d6cc9da3c..df8d69d38 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 85778644ee928ab3eb11aac4fef9176851dd9b21 + acb200f3181da8cc111042a65f247bab519b9663 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 85778644ee928ab3eb11aac4fef9176851dd9b21 + acb200f3181da8cc111042a65f247bab519b9663 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 85778644ee928ab3eb11aac4fef9176851dd9b21 + acb200f3181da8cc111042a65f247bab519b9663 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 85778644ee928ab3eb11aac4fef9176851dd9b21 + acb200f3181da8cc111042a65f247bab519b9663 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d456c2d4f3a4c6c4b89d00df45c35a799ae1da12 + 0273d7d615d7f27f31e0974ab2e7a49d75a7fc78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d456c2d4f3a4c6c4b89d00df45c35a799ae1da12 + 0273d7d615d7f27f31e0974ab2e7a49d75a7fc78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d456c2d4f3a4c6c4b89d00df45c35a799ae1da12 + 0273d7d615d7f27f31e0974ab2e7a49d75a7fc78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d456c2d4f3a4c6c4b89d00df45c35a799ae1da12 + 0273d7d615d7f27f31e0974ab2e7a49d75a7fc78 https://dev.azure.com/dnceng/internal/_git/dotnet-winforms 1d272c1ef7277b7cc38148300732e6a72848bedc - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - aed20729942488335ab21d7bb03a92d87afdb9b1 + 02d7f45dcacc192b40e725d6f6e77ec64e202c7a https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 264d5d2a0..a33fe3b2d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,7 +41,7 @@ - 7.0.15-servicing.23573.2 + 7.0.15-servicing.23578.3 @@ -70,8 +70,8 @@ 7.0.405 - 7.0.405-servicing.23578.27 - 7.0.405-servicing.23578.27 + 7.0.405-servicing.23579.11 + 7.0.405-servicing.23579.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -96,8 +96,8 @@ - 7.0.15-servicing.23573.2 - 7.0.15-servicing.23573.2 + 7.0.15-servicing.23579.2 + 7.0.15-servicing.23579.2 7.0.15 7.0.15 From 923551b0bef564e0d325066df6fe56e61b2cc63e Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 29 Nov 2023 14:59:42 +0000 Subject: [PATCH 147/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231129.12 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.115 -> To Version 7.0.115 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 7.0.15 -> To Version 7.0.15 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 30 +++++++++++++++--------------- eng/Versions.props | 10 +++++----- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/NuGet.config b/NuGet.config index b3682484a..e926b86a7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,10 +19,10 @@ - + - + @@ -49,10 +49,10 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 159d5de6d..2e9c5c1c7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 85778644ee928ab3eb11aac4fef9176851dd9b21 + acb200f3181da8cc111042a65f247bab519b9663 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 85778644ee928ab3eb11aac4fef9176851dd9b21 + acb200f3181da8cc111042a65f247bab519b9663 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 85778644ee928ab3eb11aac4fef9176851dd9b21 + acb200f3181da8cc111042a65f247bab519b9663 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 85778644ee928ab3eb11aac4fef9176851dd9b21 + acb200f3181da8cc111042a65f247bab519b9663 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 96bb3b05678dde4da2164d4c1b13372855e610d8 + 1d1af5d70029872ea1c9f0d2c18bf5cf4e24cd3e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 96bb3b05678dde4da2164d4c1b13372855e610d8 + 1d1af5d70029872ea1c9f0d2c18bf5cf4e24cd3e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 96bb3b05678dde4da2164d4c1b13372855e610d8 + 1d1af5d70029872ea1c9f0d2c18bf5cf4e24cd3e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 96bb3b05678dde4da2164d4c1b13372855e610d8 + 1d1af5d70029872ea1c9f0d2c18bf5cf4e24cd3e https://dev.azure.com/dnceng/internal/_git/dotnet-winforms 1d272c1ef7277b7cc38148300732e6a72848bedc - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - aed20729942488335ab21d7bb03a92d87afdb9b1 + 02d7f45dcacc192b40e725d6f6e77ec64e202c7a https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index e6bd74f8d..c4318dd50 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,7 +41,7 @@ - 7.0.15-servicing.23573.2 + 7.0.15-servicing.23578.3 @@ -70,8 +70,8 @@ 7.0.115 - 7.0.115-servicing.23578.5 - 7.0.115-servicing.23578.5 + 7.0.115-servicing.23579.12 + 7.0.115-servicing.23579.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -92,8 +92,8 @@ - 7.0.15-servicing.23573.2 - 7.0.15-servicing.23573.2 + 7.0.15-servicing.23579.2 + 7.0.15-servicing.23579.2 7.0.15 7.0.15 From 4366b12f01574e3e8f88a7922caa401c07b7f7b3 Mon Sep 17 00:00:00 2001 From: "Matt Mitchell (.NET)" Date: Wed, 29 Nov 2023 09:13:56 -0800 Subject: [PATCH 148/535] Update to source-build-externals 203140 --- eng/Version.Details.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2e9c5c1c7..1fcfa9e54 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -176,9 +176,9 @@ c3ad00ae84489071080a606f6a8e43c9a91a5cc2 - - https://github.com/dotnet/source-build-externals - c47ba6c19d50081f90008da8bc61b3ac20348f20 + + https://dev.azure.com/dnceng/internal/_git/dotnet-source-build-externals + 5e09d1706d8d7b6dadaf767c3a4373ca68a87a32 From 3c375371e94111e8ca72395e195c0b24f19e23fe Mon Sep 17 00:00:00 2001 From: "Matt Mitchell (.NET)" Date: Wed, 29 Nov 2023 09:16:27 -0800 Subject: [PATCH 149/535] Update to source-build-externals 203140 --- eng/Version.Details.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0dafb4b3c..d2b434cf4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -180,9 +180,9 @@ c3ad00ae84489071080a606f6a8e43c9a91a5cc2 - - https://github.com/dotnet/source-build-externals - c47ba6c19d50081f90008da8bc61b3ac20348f20 + + https://dev.azure.com/dnceng/internal/_git/dotnet-source-build-externals + 5e09d1706d8d7b6dadaf767c3a4373ca68a87a32 From 483a58380f013990987cd13bb585462439c41d04 Mon Sep 17 00:00:00 2001 From: "Matt Mitchell (.NET)" Date: Wed, 29 Nov 2023 09:17:49 -0800 Subject: [PATCH 150/535] Update to source-build-externals 203140 --- eng/Version.Details.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index df8d69d38..f751f7d5f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -180,9 +180,9 @@ c3ad00ae84489071080a606f6a8e43c9a91a5cc2 - - https://github.com/dotnet/source-build-externals - c47ba6c19d50081f90008da8bc61b3ac20348f20 + + https://dev.azure.com/dnceng/internal/_git/dotnet-source-build-externals + 5e09d1706d8d7b6dadaf767c3a4373ca68a87a32 From d7ebc6f15ed405fc7d86585b92db0df3afcfb28c Mon Sep 17 00:00:00 2001 From: "Matt Mitchell (.NET)" Date: Wed, 29 Nov 2023 10:38:00 -0800 Subject: [PATCH 151/535] Attempt to auth to submodule --- src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets index dc33e0a03..f2c4d2133 100644 --- a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets +++ b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets @@ -173,7 +173,7 @@ Condition="$(IsRootRepo) != 'true'" /> Date: Wed, 29 Nov 2023 10:42:21 -0800 Subject: [PATCH 152/535] Attempt to auth to submodule --- src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets index f2c4d2133..55d1c4ff9 100644 --- a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets +++ b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets @@ -173,7 +173,7 @@ Condition="$(IsRootRepo) != 'true'" /> Date: Wed, 29 Nov 2023 11:04:21 -0800 Subject: [PATCH 153/535] Make auth more general --- src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets index 55d1c4ff9..0a9a2ddc0 100644 --- a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets +++ b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets @@ -172,8 +172,9 @@ WorkingDirectory="$(TarballRepoSourceDir)" Condition="$(IsRootRepo) != 'true'" /> + Date: Wed, 29 Nov 2023 22:26:42 +0000 Subject: [PATCH 154/535] Merged PR 35685: Update source build externals and add internal submodule auth - Please add description for changes you are making. - If there is an issue related to this PR, please add the reference. --- eng/Version.Details.xml | 4 ++-- src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f751f7d5f..d7a8dca60 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -180,9 +180,9 @@ c3ad00ae84489071080a606f6a8e43c9a91a5cc2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-source-build-externals - 5e09d1706d8d7b6dadaf767c3a4373ca68a87a32 + badf0ef1064642a3047b9b720ddfec2113ffae99 diff --git a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets index dc33e0a03..0a9a2ddc0 100644 --- a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets +++ b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets @@ -172,8 +172,9 @@ WorkingDirectory="$(TarballRepoSourceDir)" Condition="$(IsRootRepo) != 'true'" /> + Date: Wed, 29 Nov 2023 22:28:51 +0000 Subject: [PATCH 155/535] Merged PR 35684: Update source build externals and add internal auth - Please add description for changes you are making. - If there is an issue related to this PR, please add the reference. --- eng/Version.Details.xml | 4 ++-- src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d2b434cf4..0fad8e220 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -180,9 +180,9 @@ c3ad00ae84489071080a606f6a8e43c9a91a5cc2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-source-build-externals - 5e09d1706d8d7b6dadaf767c3a4373ca68a87a32 + badf0ef1064642a3047b9b720ddfec2113ffae99 diff --git a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets index dc33e0a03..0a9a2ddc0 100644 --- a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets +++ b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets @@ -172,8 +172,9 @@ WorkingDirectory="$(TarballRepoSourceDir)" Condition="$(IsRootRepo) != 'true'" /> + Date: Wed, 29 Nov 2023 22:48:39 +0000 Subject: [PATCH 156/535] Merged PR 35683: Update source build externals --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1fcfa9e54..d4f781536 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -176,9 +176,9 @@ c3ad00ae84489071080a606f6a8e43c9a91a5cc2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-source-build-externals - 5e09d1706d8d7b6dadaf767c3a4373ca68a87a32 + badf0ef1064642a3047b9b720ddfec2113ffae99 From f3408134a4434bf293b704fdc7369aec172f9f6e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 30 Nov 2023 17:42:52 +0000 Subject: [PATCH 157/535] Update dependencies from https://github.com/dotnet/arcade build 20231130.4 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.23580.4 --- 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/publish-build-assets.yml | 2 +- eng/common/templates/jobs/source-build.yml | 2 +- eng/common/templates/post-build/common-variables.yml | 2 +- global.json | 4 ++-- 11 files changed, 17 insertions(+), 17 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e86c9c4ef..d2ead3a98 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - ca53a3149aaedb03e5d79ee0e259d31ac8719290 + 28c80dc37ad1f33e5b0cca62d6a962ee130a1d09 - + https://github.com/dotnet/arcade - ca53a3149aaedb03e5d79ee0e259d31ac8719290 + 28c80dc37ad1f33e5b0cca62d6a962ee130a1d09 - + https://github.com/dotnet/arcade - ca53a3149aaedb03e5d79ee0e259d31ac8719290 + 28c80dc37ad1f33e5b0cca62d6a962ee130a1d09 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 3012a3afa..b2a622e42 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.23564.5 + 7.0.0-beta.23580.4 diff --git a/eng/common/darc-init.ps1 b/eng/common/darc-init.ps1 index 435e76413..8fda30bdc 100644 --- a/eng/common/darc-init.ps1 +++ b/eng/common/darc-init.ps1 @@ -1,6 +1,6 @@ param ( $darcVersion = $null, - $versionEndpoint = 'https://maestro-prod.westus2.cloudapp.azure.com/api/assets/darc-version?api-version=2019-01-16', + $versionEndpoint = 'https://maestro.dot.net/api/assets/darc-version?api-version=2019-01-16', $verbosity = 'minimal', $toolpath = $null ) diff --git a/eng/common/darc-init.sh b/eng/common/darc-init.sh index 84c1d0cc2..c305ae6bd 100755 --- a/eng/common/darc-init.sh +++ b/eng/common/darc-init.sh @@ -2,7 +2,7 @@ source="${BASH_SOURCE[0]}" darcVersion='' -versionEndpoint='https://maestro-prod.westus2.cloudapp.azure.com/api/assets/darc-version?api-version=2019-01-16' +versionEndpoint='https://maestro.dot.net/api/assets/darc-version?api-version=2019-01-16' verbosity='minimal' while [[ $# > 0 ]]; do diff --git a/eng/common/post-build/add-build-to-channel.ps1 b/eng/common/post-build/add-build-to-channel.ps1 index de2d95792..49938f0c8 100644 --- a/eng/common/post-build/add-build-to-channel.ps1 +++ b/eng/common/post-build/add-build-to-channel.ps1 @@ -2,7 +2,7 @@ param( [Parameter(Mandatory=$true)][int] $BuildId, [Parameter(Mandatory=$true)][int] $ChannelId, [Parameter(Mandatory=$true)][string] $MaestroApiAccessToken, - [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro-prod.westus2.cloudapp.azure.com', + [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro.dot.net', [Parameter(Mandatory=$false)][string] $MaestroApiVersion = '2019-01-16' ) diff --git a/eng/common/post-build/publish-using-darc.ps1 b/eng/common/post-build/publish-using-darc.ps1 index 8508397d7..1e779fec4 100644 --- a/eng/common/post-build/publish-using-darc.ps1 +++ b/eng/common/post-build/publish-using-darc.ps1 @@ -3,7 +3,7 @@ param( [Parameter(Mandatory=$true)][int] $PublishingInfraVersion, [Parameter(Mandatory=$true)][string] $AzdoToken, [Parameter(Mandatory=$true)][string] $MaestroToken, - [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro-prod.westus2.cloudapp.azure.com', + [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro.dot.net', [Parameter(Mandatory=$true)][string] $WaitPublishingFinish, [Parameter(Mandatory=$false)][string] $ArtifactsPublishingAdditionalParameters, [Parameter(Mandatory=$false)][string] $SymbolPublishingAdditionalParameters diff --git a/eng/common/post-build/trigger-subscriptions.ps1 b/eng/common/post-build/trigger-subscriptions.ps1 index 55dea518a..ac9a95778 100644 --- a/eng/common/post-build/trigger-subscriptions.ps1 +++ b/eng/common/post-build/trigger-subscriptions.ps1 @@ -2,7 +2,7 @@ param( [Parameter(Mandatory=$true)][string] $SourceRepo, [Parameter(Mandatory=$true)][int] $ChannelId, [Parameter(Mandatory=$true)][string] $MaestroApiAccessToken, - [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro-prod.westus2.cloudapp.azure.com', + [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro.dot.net', [Parameter(Mandatory=$false)][string] $MaestroApiVersion = '2019-01-16' ) diff --git a/eng/common/templates/job/publish-build-assets.yml b/eng/common/templates/job/publish-build-assets.yml index c5fedd7f7..e8c6c2d09 100644 --- a/eng/common/templates/job/publish-build-assets.yml +++ b/eng/common/templates/job/publish-build-assets.yml @@ -87,7 +87,7 @@ jobs: arguments: -task PublishBuildAssets -restore -msbuildEngine dotnet /p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests' /p:BuildAssetRegistryToken=$(MaestroAccessToken) - /p:MaestroApiEndpoint=https://maestro-prod.westus2.cloudapp.azure.com + /p:MaestroApiEndpoint=https://maestro.dot.net /p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }} /p:OfficialBuildId=$(Build.BuildNumber) condition: ${{ parameters.condition }} diff --git a/eng/common/templates/jobs/source-build.yml b/eng/common/templates/jobs/source-build.yml index a15b07eb5..8dd2d355f 100644 --- a/eng/common/templates/jobs/source-build.yml +++ b/eng/common/templates/jobs/source-build.yml @@ -14,7 +14,7 @@ parameters: # This is the default platform provided by Arcade, intended for use by a managed-only repo. defaultManagedPlatform: name: 'Managed' - container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8' + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8-20220809204800-17a4aab' # Defines the platforms on which to run build jobs. One job is created for each platform, and the # object in this array is sent to the job template as 'platform'. If no platforms are specified, diff --git a/eng/common/templates/post-build/common-variables.yml b/eng/common/templates/post-build/common-variables.yml index 776bd9700..b504fe55c 100644 --- a/eng/common/templates/post-build/common-variables.yml +++ b/eng/common/templates/post-build/common-variables.yml @@ -10,7 +10,7 @@ variables: # Default Maestro++ API Endpoint and API Version - name: MaestroApiEndPoint - value: "https://maestro-prod.westus2.cloudapp.azure.com" + value: "https://maestro.dot.net" - name: MaestroApiAccessToken value: $(MaestroAccessToken) - name: MaestroApiVersion diff --git a/global.json b/global.json index 154f5f035..d3f802679 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.23564.5", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23564.5" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23580.4", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23580.4" } } From 5fd71536c8e684e82399e7f96edaadabd78412f4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 30 Nov 2023 17:42:52 +0000 Subject: [PATCH 158/535] Update dependencies from https://github.com/dotnet/arcade build 20231130.4 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.23580.4 --- 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/publish-build-assets.yml | 2 +- eng/common/templates/jobs/source-build.yml | 2 +- eng/common/templates/post-build/common-variables.yml | 2 +- global.json | 4 ++-- 11 files changed, 17 insertions(+), 17 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 661646f3a..5639ece9f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - ca53a3149aaedb03e5d79ee0e259d31ac8719290 + 28c80dc37ad1f33e5b0cca62d6a962ee130a1d09 - + https://github.com/dotnet/arcade - ca53a3149aaedb03e5d79ee0e259d31ac8719290 + 28c80dc37ad1f33e5b0cca62d6a962ee130a1d09 - + https://github.com/dotnet/arcade - ca53a3149aaedb03e5d79ee0e259d31ac8719290 + 28c80dc37ad1f33e5b0cca62d6a962ee130a1d09 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 122ba126e..9c86d8b84 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.23564.5 + 7.0.0-beta.23580.4 diff --git a/eng/common/darc-init.ps1 b/eng/common/darc-init.ps1 index 435e76413..8fda30bdc 100644 --- a/eng/common/darc-init.ps1 +++ b/eng/common/darc-init.ps1 @@ -1,6 +1,6 @@ param ( $darcVersion = $null, - $versionEndpoint = 'https://maestro-prod.westus2.cloudapp.azure.com/api/assets/darc-version?api-version=2019-01-16', + $versionEndpoint = 'https://maestro.dot.net/api/assets/darc-version?api-version=2019-01-16', $verbosity = 'minimal', $toolpath = $null ) diff --git a/eng/common/darc-init.sh b/eng/common/darc-init.sh index 84c1d0cc2..c305ae6bd 100755 --- a/eng/common/darc-init.sh +++ b/eng/common/darc-init.sh @@ -2,7 +2,7 @@ source="${BASH_SOURCE[0]}" darcVersion='' -versionEndpoint='https://maestro-prod.westus2.cloudapp.azure.com/api/assets/darc-version?api-version=2019-01-16' +versionEndpoint='https://maestro.dot.net/api/assets/darc-version?api-version=2019-01-16' verbosity='minimal' while [[ $# > 0 ]]; do diff --git a/eng/common/post-build/add-build-to-channel.ps1 b/eng/common/post-build/add-build-to-channel.ps1 index de2d95792..49938f0c8 100644 --- a/eng/common/post-build/add-build-to-channel.ps1 +++ b/eng/common/post-build/add-build-to-channel.ps1 @@ -2,7 +2,7 @@ param( [Parameter(Mandatory=$true)][int] $BuildId, [Parameter(Mandatory=$true)][int] $ChannelId, [Parameter(Mandatory=$true)][string] $MaestroApiAccessToken, - [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro-prod.westus2.cloudapp.azure.com', + [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro.dot.net', [Parameter(Mandatory=$false)][string] $MaestroApiVersion = '2019-01-16' ) diff --git a/eng/common/post-build/publish-using-darc.ps1 b/eng/common/post-build/publish-using-darc.ps1 index 8508397d7..1e779fec4 100644 --- a/eng/common/post-build/publish-using-darc.ps1 +++ b/eng/common/post-build/publish-using-darc.ps1 @@ -3,7 +3,7 @@ param( [Parameter(Mandatory=$true)][int] $PublishingInfraVersion, [Parameter(Mandatory=$true)][string] $AzdoToken, [Parameter(Mandatory=$true)][string] $MaestroToken, - [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro-prod.westus2.cloudapp.azure.com', + [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro.dot.net', [Parameter(Mandatory=$true)][string] $WaitPublishingFinish, [Parameter(Mandatory=$false)][string] $ArtifactsPublishingAdditionalParameters, [Parameter(Mandatory=$false)][string] $SymbolPublishingAdditionalParameters diff --git a/eng/common/post-build/trigger-subscriptions.ps1 b/eng/common/post-build/trigger-subscriptions.ps1 index 55dea518a..ac9a95778 100644 --- a/eng/common/post-build/trigger-subscriptions.ps1 +++ b/eng/common/post-build/trigger-subscriptions.ps1 @@ -2,7 +2,7 @@ param( [Parameter(Mandatory=$true)][string] $SourceRepo, [Parameter(Mandatory=$true)][int] $ChannelId, [Parameter(Mandatory=$true)][string] $MaestroApiAccessToken, - [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro-prod.westus2.cloudapp.azure.com', + [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro.dot.net', [Parameter(Mandatory=$false)][string] $MaestroApiVersion = '2019-01-16' ) diff --git a/eng/common/templates/job/publish-build-assets.yml b/eng/common/templates/job/publish-build-assets.yml index c5fedd7f7..e8c6c2d09 100644 --- a/eng/common/templates/job/publish-build-assets.yml +++ b/eng/common/templates/job/publish-build-assets.yml @@ -87,7 +87,7 @@ jobs: arguments: -task PublishBuildAssets -restore -msbuildEngine dotnet /p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests' /p:BuildAssetRegistryToken=$(MaestroAccessToken) - /p:MaestroApiEndpoint=https://maestro-prod.westus2.cloudapp.azure.com + /p:MaestroApiEndpoint=https://maestro.dot.net /p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }} /p:OfficialBuildId=$(Build.BuildNumber) condition: ${{ parameters.condition }} diff --git a/eng/common/templates/jobs/source-build.yml b/eng/common/templates/jobs/source-build.yml index a15b07eb5..8dd2d355f 100644 --- a/eng/common/templates/jobs/source-build.yml +++ b/eng/common/templates/jobs/source-build.yml @@ -14,7 +14,7 @@ parameters: # This is the default platform provided by Arcade, intended for use by a managed-only repo. defaultManagedPlatform: name: 'Managed' - container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8' + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8-20220809204800-17a4aab' # Defines the platforms on which to run build jobs. One job is created for each platform, and the # object in this array is sent to the job template as 'platform'. If no platforms are specified, diff --git a/eng/common/templates/post-build/common-variables.yml b/eng/common/templates/post-build/common-variables.yml index 776bd9700..b504fe55c 100644 --- a/eng/common/templates/post-build/common-variables.yml +++ b/eng/common/templates/post-build/common-variables.yml @@ -10,7 +10,7 @@ variables: # Default Maestro++ API Endpoint and API Version - name: MaestroApiEndPoint - value: "https://maestro-prod.westus2.cloudapp.azure.com" + value: "https://maestro.dot.net" - name: MaestroApiAccessToken value: $(MaestroAccessToken) - name: MaestroApiVersion diff --git a/global.json b/global.json index 154f5f035..d3f802679 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.23564.5", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23564.5" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23580.4", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23580.4" } } From e9a9fe67515838592a70f32fe46105bf7b70de3b Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 30 Nov 2023 18:01:13 +0000 Subject: [PATCH 159/535] Merged PR 35707: [internal/release/8.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**: - **VS.Redist.Common.NetCore.SharedFramework.x64.8.0**: from 8.0.1-servicing.23578.5 to 8.0.1-servicing.23580.1 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 8.0.1 to 8.0.1 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.8.0**: from 8.0.1-servicing.23578.5 to 8.0.1-servicing.23580.1 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 8.0.1 to 8.0.1 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 8.0.1 to 8.0.1 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 8.0.1-servicing.23578.5 to 8.0.1-servicing.23580.1 (parent: Microsoft.NET.Sdk) - **Microsoft.NET.ILLink.Tasks**: from 8.0.1 to 8.0.1 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 8.0.1 to 8.0.1 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 8.0.1 to 8.0.1 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:5d2948e4-7f4b-4c9a-54a4-08dbd5a5c4be) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 5d2948e4-7f4b-4c9a-54a4-08dbd5a5c4be - **Build**: 20231130.4 - **Date Produced**: November 30, 2023 3:04:42 PM UTC - **Commit**: c13aa6f5f37d295ebb20bc7620f32280409228df - **Branch**: refs/heads/internal/release/8.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 8.0.101 to 8.0.101][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 8.0.101-servicing.23579.8 to 8.0.101-servicing.23580.4][1] - **Microsoft.NET.Sdk**: [from 8.0.101-servicing.23579.8 to 8.0.101-servicing.23580.4][1] - **Microsoft.TemplateEngine.Cli**: [from 8.0.101-servicing.23579.8 to 8.0.101-servicing.23580.4][1] - **VS.Redist.Common.NetCore.SharedFramework.x64.8.0**: [from 8.0.1-servicing.23578.5 to 8.0.1-servicing.23580.1][2] - **Microsoft.NETCore.App.Ref**: [from 8.0.1 to 8.0.1][2] - **VS.Redist.Common.NetCore.TargetingPack.x64.8.0**: [from 8.0.1-servicing.23578.5 to 8.0.1-servicing.23580.1][2] - **Microsoft.NETCore.App.Host.win-x64**: [from 8.0.1 to 8.0.1][2] - **Microsoft.NETCore.DotNetHostResolver**: [from 8.0.1 to 8.0.1][2] - **Microsoft.NETCore.Platforms**: [from 8.0.1-servicing.23578.5 to 8.0.1-servicing.23580.1][2] - **Microsoft.NET.ILLink.Tasks**: [from 8.0.1 to 8.0.1][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 8.0.... --- NuGet.config | 13 +++++++++---- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 10 +++++----- 3 files changed, 32 insertions(+), 27 deletions(-) diff --git a/NuGet.config b/NuGet.config index 5e7f2297d..b81f0fb22 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,20 +8,23 @@ + + - + - + + @@ -42,14 +45,16 @@ + - + - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 58a198760..b20e89cda 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -21,30 +21,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop ce145d4ba15477a4d660db911d40b08b3040802e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - eddf880ac57b7f2c79a77592e3e6d24d1d02f112 + bf5e279d9239bfef5bb1b8d6212f1b971c434606 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - eddf880ac57b7f2c79a77592e3e6d24d1d02f112 + bf5e279d9239bfef5bb1b8d6212f1b971c434606 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - eddf880ac57b7f2c79a77592e3e6d24d1d02f112 + bf5e279d9239bfef5bb1b8d6212f1b971c434606 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - eddf880ac57b7f2c79a77592e3e6d24d1d02f112 + bf5e279d9239bfef5bb1b8d6212f1b971c434606 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - eddf880ac57b7f2c79a77592e3e6d24d1d02f112 + bf5e279d9239bfef5bb1b8d6212f1b971c434606 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - eddf880ac57b7f2c79a77592e3e6d24d1d02f112 + bf5e279d9239bfef5bb1b8d6212f1b971c434606 @@ -52,9 +52,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - eddf880ac57b7f2c79a77592e3e6d24d1d02f112 + bf5e279d9239bfef5bb1b8d6212f1b971c434606 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6192aadb9e2257206a8328c41df7dc179fcc3197 + c13aa6f5f37d295ebb20bc7620f32280409228df - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6192aadb9e2257206a8328c41df7dc179fcc3197 + c13aa6f5f37d295ebb20bc7620f32280409228df - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6192aadb9e2257206a8328c41df7dc179fcc3197 + c13aa6f5f37d295ebb20bc7620f32280409228df - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6192aadb9e2257206a8328c41df7dc179fcc3197 + c13aa6f5f37d295ebb20bc7620f32280409228df https://github.com/dotnet/test-templates @@ -148,7 +148,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - eddf880ac57b7f2c79a77592e3e6d24d1d02f112 + bf5e279d9239bfef5bb1b8d6212f1b971c434606 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index f3a84a074..4f74955c2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,8 +86,8 @@ 8.0.101 - 8.0.101-servicing.23579.8 - 8.0.101-servicing.23579.8 + 8.0.101-servicing.23580.4 + 8.0.101-servicing.23580.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -98,12 +98,12 @@ - 8.0.1-servicing.23578.5 + 8.0.1-servicing.23580.1 - 8.0.1-servicing.23578.5 - 8.0.1-servicing.23578.5 + 8.0.1-servicing.23580.1 + 8.0.1-servicing.23580.1 8.0.1 8.0.1 8.0.1 From b998a6b438eb350d6a399ddf3e2e766aae9de926 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 30 Nov 2023 20:10:04 +0000 Subject: [PATCH 160/535] Merged PR 35715: [internal/release/8.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 8.0.1 to 8.0.1 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 8.0.1-servicing.23578.9 to 8.0.1-servicing.23580.2 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 8.0.1 to 8.0.1 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0**: from 8.0.1-servicing.23578.9 to 8.0.1-servicing.23580.2 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 8.0.1-servicing.23578.9 to 8.0.1-servicing.23580.2 (parent: Microsoft.NET.Sdk) - **dotnet-user-jwts**: from 8.0.1-servicing.23578.9 to 8.0.1-servicing.23580.2 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 8.0.1-servicing.23578.9 to 8.0.1-servicing.23580.2 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:5d2948e4-7f4b-4c9a-54a4-08dbd5a5c4be) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 5d2948e4-7f4b-4c9a-54a4-08dbd5a5c4be - **Build**: 20231130.7 - **Date Produced**: November 30, 2023 6:52:30 PM UTC - **Commit**: 00fb97552b441808101347d532bf225ac753d017 - **Branch**: refs/heads/internal/release/8.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 8.0.101 to 8.0.101][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 8.0.101-servicing.23580.4 to 8.0.101-servicing.23580.7][1] - **Microsoft.NET.Sdk**: [from 8.0.101-servicing.23580.4 to 8.0.101-servicing.23580.7][1] - **Microsoft.TemplateEngine.Cli**: [from 8.0.101-servicing.23580.4 to 8.0.101-servicing.23580.7][1] - **Microsoft.AspNetCore.App.Ref**: [from 8.0.1 to 8.0.1][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 8.0.1-servicing.23578.9 to 8.0.1-servicing.23580.2][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 8.0.1 to 8.0.1][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0**: [from 8.0.1-servicing.23578.9 to 8.0.1-servicing.23580.2][2] - **dotnet-dev-certs**: [from 8.0.1-servicing.23578.9 to 8.0.1-servicing.23580.2][2] - **dotnet-user-jwts**: [from 8.0.1-servicing.23578.9 to 8.0.1-servicing.23580.2][2] - **dotnet-user-secrets**: [from 8.0.1-servicing.23578.9 to 8.0.1-servicing.23580.2][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCc13aa6f5f3&targetVersion=GC00fb97552b&_a=files [2]: https://dev.azure.com/dnceng/internal/... --- NuGet.config | 10 ++++------ eng/Version.Details.xml | 38 +++++++++++++++++++------------------- eng/Versions.props | 14 +++++++------- 3 files changed, 30 insertions(+), 32 deletions(-) diff --git a/NuGet.config b/NuGet.config index b81f0fb22..b38280d82 100644 --- a/NuGet.config +++ b/NuGet.config @@ -11,8 +11,7 @@ - - + @@ -20,7 +19,7 @@ - + @@ -45,13 +44,12 @@ - - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b20e89cda..19254d016 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -58,49 +58,49 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 02aeddda68390d089a8cdd32f5a25229cbe6daa3 + b7bb790a4b195c1903842b96cb409ed59d25d992 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 02aeddda68390d089a8cdd32f5a25229cbe6daa3 + b7bb790a4b195c1903842b96cb409ed59d25d992 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 02aeddda68390d089a8cdd32f5a25229cbe6daa3 + b7bb790a4b195c1903842b96cb409ed59d25d992 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 02aeddda68390d089a8cdd32f5a25229cbe6daa3 + b7bb790a4b195c1903842b96cb409ed59d25d992 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 02aeddda68390d089a8cdd32f5a25229cbe6daa3 + b7bb790a4b195c1903842b96cb409ed59d25d992 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 02aeddda68390d089a8cdd32f5a25229cbe6daa3 + b7bb790a4b195c1903842b96cb409ed59d25d992 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 02aeddda68390d089a8cdd32f5a25229cbe6daa3 + b7bb790a4b195c1903842b96cb409ed59d25d992 https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c13aa6f5f37d295ebb20bc7620f32280409228df + 00fb97552b441808101347d532bf225ac753d017 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c13aa6f5f37d295ebb20bc7620f32280409228df + 00fb97552b441808101347d532bf225ac753d017 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c13aa6f5f37d295ebb20bc7620f32280409228df + 00fb97552b441808101347d532bf225ac753d017 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c13aa6f5f37d295ebb20bc7620f32280409228df + 00fb97552b441808101347d532bf225ac753d017 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 4f74955c2..b226e16e6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -74,11 +74,11 @@ 8.0.1 8.0.1 - 8.0.1-servicing.23578.9 - 8.0.1-servicing.23578.9 - 8.0.1-servicing.23578.9 - 8.0.1-servicing.23578.9 - 8.0.1-servicing.23578.9 + 8.0.1-servicing.23580.2 + 8.0.1-servicing.23580.2 + 8.0.1-servicing.23580.2 + 8.0.1-servicing.23580.2 + 8.0.1-servicing.23580.2 0.2.0 @@ -86,8 +86,8 @@ 8.0.101 - 8.0.101-servicing.23580.4 - 8.0.101-servicing.23580.4 + 8.0.101-servicing.23580.7 + 8.0.101-servicing.23580.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 9d29df3aaf5c988e6f0cc6a53a83ea48cda3466a Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 30 Nov 2023 22:53:07 +0000 Subject: [PATCH 161/535] Merged PR 35718: [internal/release/8.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:5d2948e4-7f4b-4c9a-54a4-08dbd5a5c4be) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 5d2948e4-7f4b-4c9a-54a4-08dbd5a5c4be - **Build**: 20231130.15 - **Date Produced**: November 30, 2023 8:46:48 PM UTC - **Commit**: ba557d0de5a22ff497bc835c13112a0314419874 - **Branch**: refs/heads/internal/release/8.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 8.0.101 to 8.0.101][2] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 8.0.101-servicing.23580.7 to 8.0.101-servicing.23580.15][2] - **Microsoft.NET.Sdk**: [from 8.0.101-servicing.23580.7 to 8.0.101-servicing.23580.15][2] - **Microsoft.TemplateEngine.Cli**: [from 8.0.101-servicing.23580.7 to 8.0.101-servicing.23580.15][2] - **Microsoft.AspNetCore.App.Ref**: [from 8.0.1 to 8.0.1][3] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 8.0.1-servicing.23580.2 to 8.0.1-servicing.23580.6][3] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 8.0.1 to 8.0.1][3] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0**: [from 8.0.1-servicing.23580.2 to 8.0.1-servicing.23580.6][3] - **dotnet-dev-certs**: [from 8.0.1-servicing.23580.2 to 8.0.1-servicing.23580.6][3] - **dotnet-user-jwts**: [from 8.0.1-servicing.23580.2 to 8.0.1-servicing.23580.6][3] - **dotnet-user-secrets**: [from 8.0.1-servicing.23580.2 to 8.0.1-servicing.23580.6][3] [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC00fb97552b&targetVersion=GCba557d0de5&_a=files [3]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GCb7bb790a4b&targetVersion=GC580b6a8488&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:5d2948e4-7f4b-4c9a-54a4-08dbd5a5c4be) [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 8.0.1 to 8.0.1 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 8.0.1-servicing.23580.2 to 8.0.1-servicing.23580.6 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 8.0.1 to 8.0.1 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0**: from 8.0.1-servicing.23580.2 to 8.0.1-servicing.23580.6 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 8.0.1-servicing.23580.2 to 8.0.1-servicing.23580.6 (parent: Microsoft.NET.Sdk) - **dotnet-user-jwts**: from 8.0.1-servicing.23580.2 to 8.0.1-servicing.23580.6 (parent: Microsoft.NET... --- 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 b38280d82..0db0f6ddd 100644 --- a/NuGet.config +++ b/NuGet.config @@ -11,7 +11,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -44,12 +44,12 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 19254d016..fc7f790e6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -58,49 +58,49 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b7bb790a4b195c1903842b96cb409ed59d25d992 + 580b6a8488f6afd9340149ce0078bd4eee5a6349 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b7bb790a4b195c1903842b96cb409ed59d25d992 + 580b6a8488f6afd9340149ce0078bd4eee5a6349 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b7bb790a4b195c1903842b96cb409ed59d25d992 + 580b6a8488f6afd9340149ce0078bd4eee5a6349 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b7bb790a4b195c1903842b96cb409ed59d25d992 + 580b6a8488f6afd9340149ce0078bd4eee5a6349 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b7bb790a4b195c1903842b96cb409ed59d25d992 + 580b6a8488f6afd9340149ce0078bd4eee5a6349 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b7bb790a4b195c1903842b96cb409ed59d25d992 + 580b6a8488f6afd9340149ce0078bd4eee5a6349 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b7bb790a4b195c1903842b96cb409ed59d25d992 + 580b6a8488f6afd9340149ce0078bd4eee5a6349 https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 00fb97552b441808101347d532bf225ac753d017 + ba557d0de5a22ff497bc835c13112a0314419874 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 00fb97552b441808101347d532bf225ac753d017 + ba557d0de5a22ff497bc835c13112a0314419874 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 00fb97552b441808101347d532bf225ac753d017 + ba557d0de5a22ff497bc835c13112a0314419874 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 00fb97552b441808101347d532bf225ac753d017 + ba557d0de5a22ff497bc835c13112a0314419874 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index b226e16e6..549990af6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -74,11 +74,11 @@ 8.0.1 8.0.1 - 8.0.1-servicing.23580.2 - 8.0.1-servicing.23580.2 - 8.0.1-servicing.23580.2 - 8.0.1-servicing.23580.2 - 8.0.1-servicing.23580.2 + 8.0.1-servicing.23580.6 + 8.0.1-servicing.23580.6 + 8.0.1-servicing.23580.6 + 8.0.1-servicing.23580.6 + 8.0.1-servicing.23580.6 0.2.0 @@ -86,8 +86,8 @@ 8.0.101 - 8.0.101-servicing.23580.7 - 8.0.101-servicing.23580.7 + 8.0.101-servicing.23580.15 + 8.0.101-servicing.23580.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 6eceda187bfd6e063bc320a37e52aad7c77c3b5b Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 1 Dec 2023 03:50:55 +0000 Subject: [PATCH 162/535] Merged PR 35722: [internal/release/8.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.WindowsDesktop.App.Ref**: from 8.0.1 to 8.0.1 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0**: from 8.0.1-servicing.23579.1 to 8.0.1-servicing.23580.5 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0**: from 8.0.1-servicing.23579.1 to 8.0.1-servicing.23580.5 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 8.0.1 to 8.0.1 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 8.0.1-servicing.23580.6 to 8.0.1-servicing.23580.8 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 8.0.1 to 8.0.1 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0**: from 8.0.1-servicing.23580.6 to 8.0.1-servicing.23580.8 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 8.0.1-servicing.23580.6 to 8.0.1-servicing.23580.8 (parent: Microsoft.NET.Sdk) - **dotnet-user-jwts**: from 8.0.1-servicing.23580.6 to 8.0.1-servicing.23580.8 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 8.0.1-servicing.23580.6 to 8.0.1-servicing.23580.8 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 8.0.1 to 8.0.1 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 8.0.1-servicing.23578.7 to 8.0.1-servicing.23580.6 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 8.0.1 to 8.0.1 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 8.0.1-servicing.23578.5 to 8.0.1-servicing.23580.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:5d2948e4-7f4b-4c9a-54a4-08dbd5a5c4be) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 5d2948e4-7f4b-4c9a-54a4-08dbd5a5c4be - **Build**: 20231130.19 - **Date Produced**: November 30, 2023 11:46:50 PM UTC - **Commit**: 62602b4763b5eec1deb8d8542e9717134ef56aec - **Branch**: refs/heads/internal/release/8.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 8.0.101 to 8.0.101][5] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 8.0.101-servicing.23580.15 to 8.0.101-servicing.23580.19][5] - **Microsoft.NET.Sdk**: [from 8.0.101-servicing.23580.15 to 8.0.101-servicing.2358... --- NuGet.config | 14 +++++----- eng/Version.Details.xml | 58 ++++++++++++++++++++--------------------- eng/Versions.props | 22 ++++++++-------- 3 files changed, 46 insertions(+), 48 deletions(-) diff --git a/NuGet.config b/NuGet.config index 0db0f6ddd..e03fc8203 100644 --- a/NuGet.config +++ b/NuGet.config @@ -11,7 +11,7 @@ - + @@ -19,11 +19,10 @@ - + - - + @@ -44,16 +43,15 @@ - + - + - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fc7f790e6..983f88668 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -7,19 +7,19 @@ --> https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ce145d4ba15477a4d660db911d40b08b3040802e + a0e7b5d8673f28c41bcac6e2001b39ba2c8fab54 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ce145d4ba15477a4d660db911d40b08b3040802e + a0e7b5d8673f28c41bcac6e2001b39ba2c8fab54 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ce145d4ba15477a4d660db911d40b08b3040802e + a0e7b5d8673f28c41bcac6e2001b39ba2c8fab54 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ce145d4ba15477a4d660db911d40b08b3040802e + a0e7b5d8673f28c41bcac6e2001b39ba2c8fab54 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -58,49 +58,49 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 580b6a8488f6afd9340149ce0078bd4eee5a6349 + 8e941eb42f819adb116b881195158b3887a70a1c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 580b6a8488f6afd9340149ce0078bd4eee5a6349 + 8e941eb42f819adb116b881195158b3887a70a1c https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 580b6a8488f6afd9340149ce0078bd4eee5a6349 + 8e941eb42f819adb116b881195158b3887a70a1c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 580b6a8488f6afd9340149ce0078bd4eee5a6349 + 8e941eb42f819adb116b881195158b3887a70a1c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 580b6a8488f6afd9340149ce0078bd4eee5a6349 + 8e941eb42f819adb116b881195158b3887a70a1c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 580b6a8488f6afd9340149ce0078bd4eee5a6349 + 8e941eb42f819adb116b881195158b3887a70a1c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 580b6a8488f6afd9340149ce0078bd4eee5a6349 + 8e941eb42f819adb116b881195158b3887a70a1c https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ba557d0de5a22ff497bc835c13112a0314419874 + 08814442c7c94f8b059c818902b6883a69844860 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ba557d0de5a22ff497bc835c13112a0314419874 + 08814442c7c94f8b059c818902b6883a69844860 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ba557d0de5a22ff497bc835c13112a0314419874 + 08814442c7c94f8b059c818902b6883a69844860 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ba557d0de5a22ff497bc835c13112a0314419874 + 08814442c7c94f8b059c818902b6883a69844860 https://github.com/dotnet/test-templates @@ -124,13 +124,13 @@ 1e5f3603af2277910aad946736ee23283e7f3e16 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - e61cfa7d404cf0d4cb24b5d6e69bb44978a9b45a + 0b4028eb507aeb222f5bd1fc421876cc5e5e3fb8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 32051d79682192306ba625d5ff0df24735953053 + ac40bed7a33baf164d3984ca90c2aedba996a7b2 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 549990af6..3cc621de1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,11 +48,11 @@ - 8.0.1-servicing.23578.7 + 8.0.1-servicing.23580.6 - 8.0.1-servicing.23578.5 + 8.0.1-servicing.23580.5 @@ -74,11 +74,11 @@ 8.0.1 8.0.1 - 8.0.1-servicing.23580.6 - 8.0.1-servicing.23580.6 - 8.0.1-servicing.23580.6 - 8.0.1-servicing.23580.6 - 8.0.1-servicing.23580.6 + 8.0.1-servicing.23580.8 + 8.0.1-servicing.23580.8 + 8.0.1-servicing.23580.8 + 8.0.1-servicing.23580.8 + 8.0.1-servicing.23580.8 0.2.0 @@ -86,8 +86,8 @@ 8.0.101 - 8.0.101-servicing.23580.15 - 8.0.101-servicing.23580.15 + 8.0.101-servicing.23580.21 + 8.0.101-servicing.23580.21 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -112,8 +112,8 @@ - 8.0.1-servicing.23579.1 - 8.0.1-servicing.23579.1 + 8.0.1-servicing.23580.5 + 8.0.1-servicing.23580.5 8.0.1 8.0.1 From e85162be0bdaff7e63e10b12a3b3b15e5ffff6a8 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 1 Dec 2023 19:17:26 +0000 Subject: [PATCH 163/535] Merged PR 35717: [internal/release/7.0.4xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:42f6b899-0677-45e7-d6f8-08db826b460b) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 42f6b899-0677-45e7-d6f8-08db826b460b - **Build**: 20231130.13 - **Date Produced**: November 30, 2023 7:47:35 PM UTC - **Commit**: ea50b565a6416e9bd2039db0f1a685cbaf46caa2 - **Branch**: refs/heads/internal/release/7.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.405 to 7.0.405][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.405-servicing.23579.11 to 7.0.405-servicing.23580.13][1] - **Microsoft.NET.Sdk**: [from 7.0.405-servicing.23579.11 to 7.0.405-servicing.23580.13][1] - **Microsoft.TemplateEngine.Cli**: [from 7.0.405-servicing.23579.11 to 7.0.405-servicing.23580.13][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC0273d7d615&targetVersion=GCea50b565a6&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:42f6b899-0677-45e7-d6f8-08db826b460b) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index 638069f5e..a4af0c8cc 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,7 +19,7 @@ - + @@ -49,7 +49,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c3f292b1d..ce68b766a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0273d7d615d7f27f31e0974ab2e7a49d75a7fc78 + ea50b565a6416e9bd2039db0f1a685cbaf46caa2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0273d7d615d7f27f31e0974ab2e7a49d75a7fc78 + ea50b565a6416e9bd2039db0f1a685cbaf46caa2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0273d7d615d7f27f31e0974ab2e7a49d75a7fc78 + ea50b565a6416e9bd2039db0f1a685cbaf46caa2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0273d7d615d7f27f31e0974ab2e7a49d75a7fc78 + ea50b565a6416e9bd2039db0f1a685cbaf46caa2 diff --git a/eng/Versions.props b/eng/Versions.props index a4614ef18..a87b860dd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.405 - 7.0.405-servicing.23579.11 - 7.0.405-servicing.23579.11 + 7.0.405-servicing.23580.13 + 7.0.405-servicing.23580.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 74bce27a5926a4a430b802efe4aeccf187ef1c9e Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 1 Dec 2023 19:40:24 +0000 Subject: [PATCH 164/535] Merged PR 35744: [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.AspNetCore.App.Ref**: from 6.0.26 to 6.0.26 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.26-servicing.23578.6 to 6.0.26-servicing.23601.6 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.26 to 6.0.26 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.26-servicing.23578.6 to 6.0.26-servicing.23601.6 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.26-servicing.23578.6 to 6.0.26-servicing.23601.6 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.26-servicing.23578.6 to 6.0.26-servicing.23601.6 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698 - **Build**: 20231201.7 - **Date Produced**: December 1, 2023 7:13:07 PM UTC - **Commit**: 280895b0c4e22fe6995fa31637d14a8da840d8d0 - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.126-servicing.23579.2 to 6.0.126-servicing.23601.7][1] - **Microsoft.NET.Sdk**: [from 6.0.126-servicing.23579.2 to 6.0.126-servicing.23601.7][1] - **Microsoft.AspNetCore.App.Ref**: [from 6.0.26 to 6.0.26][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.26-servicing.23578.6 to 6.0.26-servicing.23601.6][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.26 to 6.0.26][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.26-servicing.23578.6 to 6.0.26-servicing.23601.6][2] - **dotnet-dev-certs**: [from 6.0.26-servicing.23578.6 to 6.0.26-servicing.23601.6][2] - **dotnet-user-secrets**: [from 6.0.26-servicing.23578.6 to 6.0.26-servicing.23601.6][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCbf47a20af7&targetVersion=GC280895b0c4&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GCed655b4569&targetVersion=GC4ed6b143f1&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a68e208b-7b40-4a19-af8d-08d961c59698) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index 4fab6601b..f22372130 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -40,7 +40,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a4bf66b6a..8c74919a0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ed655b45693cabc1de87e4d76d0785a3868396c2 + 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ed655b45693cabc1de87e4d76d0785a3868396c2 + 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ed655b45693cabc1de87e4d76d0785a3868396c2 + 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ed655b45693cabc1de87e4d76d0785a3868396c2 + 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ed655b45693cabc1de87e4d76d0785a3868396c2 + 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ed655b45693cabc1de87e4d76d0785a3868396c2 + 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating e58a1e0535c781fc1c12a5bbbc81c5044260d3e0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - bf47a20af74904ba30cc994c491f744e86545dd7 + 280895b0c4e22fe6995fa31637d14a8da840d8d0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - bf47a20af74904ba30cc994c491f744e86545dd7 + 280895b0c4e22fe6995fa31637d14a8da840d8d0 diff --git a/eng/Versions.props b/eng/Versions.props index 7731bf09c..be784a3b6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.26 6.0.26 - 6.0.26-servicing.23578.6 - 6.0.26-servicing.23578.6 - 6.0.26-servicing.23578.6 - 6.0.26-servicing.23578.6 + 6.0.26-servicing.23601.6 + 6.0.26-servicing.23601.6 + 6.0.26-servicing.23601.6 + 6.0.26-servicing.23601.6 0.2.0 - 6.0.126-servicing.23579.2 - 6.0.126-servicing.23579.2 + 6.0.126-servicing.23601.7 + 6.0.126-servicing.23601.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 4f752a3091c853a2eccf6afeae6d9053ada1e385 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 1 Dec 2023 19:40:30 +0000 Subject: [PATCH 165/535] Merged PR 35745: [internal/release/6.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.AspNetCore.App.Ref**: from 6.0.26 to 6.0.26 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.26-servicing.23578.6 to 6.0.26-servicing.23601.6 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.26 to 6.0.26 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.26-servicing.23578.6 to 6.0.26-servicing.23601.6 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.26-servicing.23578.6 to 6.0.26-servicing.23601.6 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.26-servicing.23578.6 to 6.0.26-servicing.23601.6 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:b5bca336-8d99-407e-c145-08d9d60066b9) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: b5bca336-8d99-407e-c145-08d9d60066b9 - **Build**: 20231201.8 - **Date Produced**: December 1, 2023 7:14:50 PM UTC - **Commit**: b8d95c56bfc86959c20083313656913cbaa6eabd - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.321-servicing.23579.9 to 6.0.321-servicing.23601.8][1] - **Microsoft.NET.Sdk**: [from 6.0.321-servicing.23579.9 to 6.0.321-servicing.23601.8][1] - **Microsoft.AspNetCore.App.Ref**: [from 6.0.26 to 6.0.26][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.26-servicing.23578.6 to 6.0.26-servicing.23601.6][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.26 to 6.0.26][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.26-servicing.23578.6 to 6.0.26-servicing.23601.6][2] - **dotnet-dev-certs**: [from 6.0.26-servicing.23578.6 to 6.0.26-servicing.23601.6][2] - **dotnet-user-secrets**: [from 6.0.26-servicing.23578.6 to 6.0.26-servicing.23601.6][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC176ba6c92b&targetVersion=GCb8d95c56bf&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GCed655b4569&targetVersion=GC4ed6b143f1&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:b5bca336-8d99-407e-c145-08d9d60066b9) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index db5a4ec11..e9eac60af 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -40,7 +40,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 64d7e889e..00511bda6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ed655b45693cabc1de87e4d76d0785a3868396c2 + 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ed655b45693cabc1de87e4d76d0785a3868396c2 + 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ed655b45693cabc1de87e4d76d0785a3868396c2 + 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ed655b45693cabc1de87e4d76d0785a3868396c2 + 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ed655b45693cabc1de87e4d76d0785a3868396c2 + 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ed655b45693cabc1de87e4d76d0785a3868396c2 + 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 6b4fc213e731cb128ad8ed54befea55d9e1d3f6d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 176ba6c92b4d6c388a0117ae030d9b547f727c66 + b8d95c56bfc86959c20083313656913cbaa6eabd - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 176ba6c92b4d6c388a0117ae030d9b547f727c66 + b8d95c56bfc86959c20083313656913cbaa6eabd diff --git a/eng/Versions.props b/eng/Versions.props index 301d1a62b..630f4c776 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.26 6.0.26 - 6.0.26-servicing.23578.6 - 6.0.26-servicing.23578.6 - 6.0.26-servicing.23578.6 - 6.0.26-servicing.23578.6 + 6.0.26-servicing.23601.6 + 6.0.26-servicing.23601.6 + 6.0.26-servicing.23601.6 + 6.0.26-servicing.23601.6 0.2.0 - 6.0.321-servicing.23579.9 - 6.0.321-servicing.23579.9 + 6.0.321-servicing.23601.8 + 6.0.321-servicing.23601.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 1d1a65cb827ab0575c62c629e9bac8f8d4e61f98 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 1 Dec 2023 19:40:36 +0000 Subject: [PATCH 166/535] Merged PR 35746: [internal/release/6.0.4xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.AspNetCore.App.Ref**: from 6.0.26 to 6.0.26 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.26-servicing.23578.6 to 6.0.26-servicing.23601.6 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.26 to 6.0.26 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.26-servicing.23578.6 to 6.0.26-servicing.23601.6 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.26-servicing.23578.6 to 6.0.26-servicing.23601.6 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.26-servicing.23578.6 to 6.0.26-servicing.23601.6 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20231201.9 - **Date Produced**: December 1, 2023 7:14:36 PM UTC - **Commit**: 6b027deb13b313456cf2408c0329fb74cf214223 - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.418-servicing.23579.3 to 6.0.418-servicing.23601.9][1] - **Microsoft.NET.Sdk**: [from 6.0.418-servicing.23579.3 to 6.0.418-servicing.23601.9][1] - **Microsoft.AspNetCore.App.Ref**: [from 6.0.26 to 6.0.26][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.26-servicing.23578.6 to 6.0.26-servicing.23601.6][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.26 to 6.0.26][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.26-servicing.23578.6 to 6.0.26-servicing.23601.6][2] - **dotnet-dev-certs**: [from 6.0.26-servicing.23578.6 to 6.0.26-servicing.23601.6][2] - **dotnet-user-secrets**: [from 6.0.26-servicing.23578.6 to 6.0.26-servicing.23601.6][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCa48336cad9&targetVersion=GC6b027deb13&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GCed655b4569&targetVersion=GC4ed6b143f1&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a27c2ce2-aedf-42b7-d31e-08da6571bd31) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index 26fdcf4ae..6b8d7ee77 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -40,7 +40,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 98c7340e2..48a8a8e7b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ed655b45693cabc1de87e4d76d0785a3868396c2 + 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ed655b45693cabc1de87e4d76d0785a3868396c2 + 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ed655b45693cabc1de87e4d76d0785a3868396c2 + 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ed655b45693cabc1de87e4d76d0785a3868396c2 + 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ed655b45693cabc1de87e4d76d0785a3868396c2 + 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ed655b45693cabc1de87e4d76d0785a3868396c2 + 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 04cc3e115c98a8aa1fde4b1b45218ed6331c45c5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a48336cad950691002015f4b411f77c4926c7edb + 6b027deb13b313456cf2408c0329fb74cf214223 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a48336cad950691002015f4b411f77c4926c7edb + 6b027deb13b313456cf2408c0329fb74cf214223 diff --git a/eng/Versions.props b/eng/Versions.props index 08c6b98d4..ee8d3732d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.26 6.0.26 - 6.0.26-servicing.23578.6 - 6.0.26-servicing.23578.6 - 6.0.26-servicing.23578.6 - 6.0.26-servicing.23578.6 + 6.0.26-servicing.23601.6 + 6.0.26-servicing.23601.6 + 6.0.26-servicing.23601.6 + 6.0.26-servicing.23601.6 0.2.0 - 6.0.418-servicing.23579.3 - 6.0.418-servicing.23579.3 + 6.0.418-servicing.23601.9 + 6.0.418-servicing.23601.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 2f13a3f01e350e2452bd746e0b5fe9849a860d43 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Fri, 1 Dec 2023 20:00:03 +0000 Subject: [PATCH 167/535] Merged PR 35747: Update SBE for IdentityModel 6.35.0 - Please add description for changes you are making. - If there is an issue related to this PR, please add the reference. Update SBE for IdentityModel 6.35.0 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d4f781536..0bb7129fd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -176,9 +176,9 @@ c3ad00ae84489071080a606f6a8e43c9a91a5cc2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-source-build-externals - badf0ef1064642a3047b9b720ddfec2113ffae99 + d6ad546c83ce94b3efb4662513bed71a3e6192ef From 50ea9382a0cc905af05d79527580dc2a602b3f40 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Fri, 1 Dec 2023 20:00:07 +0000 Subject: [PATCH 168/535] Merged PR 35748: Update SBE for IdentityModel 6.35.0 - Please add description for changes you are making. - If there is an issue related to this PR, please add the reference. Update SBE for IdentityModel 6.35.0 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 02e1c50cd..4c531da6e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -180,9 +180,9 @@ c3ad00ae84489071080a606f6a8e43c9a91a5cc2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-source-build-externals - badf0ef1064642a3047b9b720ddfec2113ffae99 + d6ad546c83ce94b3efb4662513bed71a3e6192ef From bb6a57945d9156c01a1731dfbff7185f8d124f95 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Fri, 1 Dec 2023 20:00:52 +0000 Subject: [PATCH 169/535] Merged PR 35749: Update SBE for IdentityModel 6.35.0 - Please add description for changes you are making. - If there is an issue related to this PR, please add the reference. Update SBE for IdentityModel 6.35.0 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ce68b766a..34d949132 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -180,9 +180,9 @@ c3ad00ae84489071080a606f6a8e43c9a91a5cc2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-source-build-externals - badf0ef1064642a3047b9b720ddfec2113ffae99 + d6ad546c83ce94b3efb4662513bed71a3e6192ef From de57e296c6d868343c7bb814ab2292fdd143da00 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 1 Dec 2023 20:22:51 +0000 Subject: [PATCH 170/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231201.15 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.126-servicing.23601.7 -> To Version 6.0.126-servicing.23601.15 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets From Version 6.0.26 -> To Version 6.0.26 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index f22372130..9a61de726 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -40,7 +40,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8c74919a0..c54327a2d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 + 3fcbb4e1ccc6d063f7fce7c9977698b809111758 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 + 3fcbb4e1ccc6d063f7fce7c9977698b809111758 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 + 3fcbb4e1ccc6d063f7fce7c9977698b809111758 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 + 3fcbb4e1ccc6d063f7fce7c9977698b809111758 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 + 3fcbb4e1ccc6d063f7fce7c9977698b809111758 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 + 3fcbb4e1ccc6d063f7fce7c9977698b809111758 https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating e58a1e0535c781fc1c12a5bbbc81c5044260d3e0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 280895b0c4e22fe6995fa31637d14a8da840d8d0 + 3652ba2a882726bbaed0dc2e906154197ded6811 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 280895b0c4e22fe6995fa31637d14a8da840d8d0 + 3652ba2a882726bbaed0dc2e906154197ded6811 diff --git a/eng/Versions.props b/eng/Versions.props index be784a3b6..4a187c317 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.26 6.0.26 - 6.0.26-servicing.23601.6 - 6.0.26-servicing.23601.6 - 6.0.26-servicing.23601.6 - 6.0.26-servicing.23601.6 + 6.0.26-servicing.23601.8 + 6.0.26-servicing.23601.8 + 6.0.26-servicing.23601.8 + 6.0.26-servicing.23601.8 0.2.0 - 6.0.126-servicing.23601.7 - 6.0.126-servicing.23601.7 + 6.0.126-servicing.23601.15 + 6.0.126-servicing.23601.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e366881c1d5148b133e00795877fbfaedf9f385e Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 1 Dec 2023 20:29:19 +0000 Subject: [PATCH 171/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231201.16 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.321-servicing.23601.8 -> To Version 6.0.321-servicing.23601.16 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets From Version 6.0.26 -> To Version 6.0.26 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index e9eac60af..98638b9ae 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -40,7 +40,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 00511bda6..62ffc36fd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 + 3fcbb4e1ccc6d063f7fce7c9977698b809111758 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 + 3fcbb4e1ccc6d063f7fce7c9977698b809111758 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 + 3fcbb4e1ccc6d063f7fce7c9977698b809111758 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 + 3fcbb4e1ccc6d063f7fce7c9977698b809111758 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 + 3fcbb4e1ccc6d063f7fce7c9977698b809111758 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 + 3fcbb4e1ccc6d063f7fce7c9977698b809111758 https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 6b4fc213e731cb128ad8ed54befea55d9e1d3f6d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b8d95c56bfc86959c20083313656913cbaa6eabd + 2e6fec4ea47386d9306a4a2180ba7c61a7994f26 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b8d95c56bfc86959c20083313656913cbaa6eabd + 2e6fec4ea47386d9306a4a2180ba7c61a7994f26 diff --git a/eng/Versions.props b/eng/Versions.props index 630f4c776..fef08b7bd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.26 6.0.26 - 6.0.26-servicing.23601.6 - 6.0.26-servicing.23601.6 - 6.0.26-servicing.23601.6 - 6.0.26-servicing.23601.6 + 6.0.26-servicing.23601.8 + 6.0.26-servicing.23601.8 + 6.0.26-servicing.23601.8 + 6.0.26-servicing.23601.8 0.2.0 - 6.0.321-servicing.23601.8 - 6.0.321-servicing.23601.8 + 6.0.321-servicing.23601.16 + 6.0.321-servicing.23601.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 51ed695efb19f8535fa8b793288af8877f64dba0 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 1 Dec 2023 20:30:10 +0000 Subject: [PATCH 172/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231201.17 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.418-servicing.23601.9 -> To Version 6.0.418-servicing.23601.17 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets From Version 6.0.26 -> To Version 6.0.26 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6b8d7ee77..44c201c8b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -40,7 +40,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 48a8a8e7b..7c00837f2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 + 3fcbb4e1ccc6d063f7fce7c9977698b809111758 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 + 3fcbb4e1ccc6d063f7fce7c9977698b809111758 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 + 3fcbb4e1ccc6d063f7fce7c9977698b809111758 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 + 3fcbb4e1ccc6d063f7fce7c9977698b809111758 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 + 3fcbb4e1ccc6d063f7fce7c9977698b809111758 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 + 3fcbb4e1ccc6d063f7fce7c9977698b809111758 https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 04cc3e115c98a8aa1fde4b1b45218ed6331c45c5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6b027deb13b313456cf2408c0329fb74cf214223 + 6c327a186a3c6fc3aa2a08d5900ecb1da772ee86 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6b027deb13b313456cf2408c0329fb74cf214223 + 6c327a186a3c6fc3aa2a08d5900ecb1da772ee86 diff --git a/eng/Versions.props b/eng/Versions.props index ee8d3732d..08cd886fc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.26 6.0.26 - 6.0.26-servicing.23601.6 - 6.0.26-servicing.23601.6 - 6.0.26-servicing.23601.6 - 6.0.26-servicing.23601.6 + 6.0.26-servicing.23601.8 + 6.0.26-servicing.23601.8 + 6.0.26-servicing.23601.8 + 6.0.26-servicing.23601.8 0.2.0 - 6.0.418-servicing.23601.9 - 6.0.418-servicing.23601.9 + 6.0.418-servicing.23601.17 + 6.0.418-servicing.23601.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From d0b4dae10e083ee6d27565f6473e5671bdafa21d Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 1 Dec 2023 21:52:36 +0000 Subject: [PATCH 173/535] Merged PR 35763: [internal/release/7.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.AspNetCore.App.Ref**: from 7.0.15 to 7.0.15 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 7.0.15-servicing.23577.31 to 7.0.15-servicing.23601.10 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 7.0.15 to 7.0.15 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: from 7.0.15-servicing.23577.31 to 7.0.15-servicing.23601.10 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 7.0.15-servicing.23577.31 to 7.0.15-servicing.23601.10 (parent: Microsoft.NET.Sdk) - **dotnet-user-jwts**: from 7.0.15-servicing.23577.31 to 7.0.15-servicing.23601.10 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 7.0.15-servicing.23577.31 to 7.0.15-servicing.23601.10 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:65272799-fe4d-4dbf-f0fe-08da7ef63651) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 65272799-fe4d-4dbf-f0fe-08da7ef63651 - **Build**: 20231201.25 - **Date Produced**: December 1, 2023 9:21:41 PM UTC - **Commit**: c0aa76c865eb72b183247119752dfabca811f17a - **Branch**: refs/heads/internal/release/7.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.115 to 7.0.115][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.115-servicing.23579.12 to 7.0.115-servicing.23601.25][1] - **Microsoft.NET.Sdk**: [from 7.0.115-servicing.23579.12 to 7.0.115-servicing.23601.25][1] - **Microsoft.TemplateEngine.Cli**: [from 7.0.115-servicing.23579.12 to 7.0.115-servicing.23601.25][1] - **Microsoft.AspNetCore.App.Ref**: [from 7.0.15 to 7.0.15][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 7.0.15-servicing.23577.31 to 7.0.15-servicing.23601.10][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 7.0.15 to 7.0.15][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: [from 7.0.15-servicing.23577.31 to 7.0.15-servicing.23601.10][2] - **dotnet-dev-certs**: [from 7.0.15-servicing.23577.31 to 7.0.15-servicing.23601.10][2] - **dotnet-user-jwts**: [from 7.0.15-servicing.23577.31 to 7.0.15-servicing.23601.10][2] - **dotnet-user-secrets**: [from 7.0.15-servicing.23577.31 to 7.0.15-servicing.23601.10][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC1d1af5d700&targetVersion=GCc0aa76c865... --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 38 +++++++++++++++++++------------------- eng/Versions.props | 14 +++++++------- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/NuGet.config b/NuGet.config index e926b86a7..637dd025e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -44,12 +44,12 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0bb7129fd..64be1c99d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 360f1564385745dd9e9acc53e697f8e63ff41126 + c49ccc8727c620ce1cb8fb431bb3fe8f2e747236 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 360f1564385745dd9e9acc53e697f8e63ff41126 + c49ccc8727c620ce1cb8fb431bb3fe8f2e747236 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 360f1564385745dd9e9acc53e697f8e63ff41126 + c49ccc8727c620ce1cb8fb431bb3fe8f2e747236 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 360f1564385745dd9e9acc53e697f8e63ff41126 + c49ccc8727c620ce1cb8fb431bb3fe8f2e747236 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 360f1564385745dd9e9acc53e697f8e63ff41126 + c49ccc8727c620ce1cb8fb431bb3fe8f2e747236 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 360f1564385745dd9e9acc53e697f8e63ff41126 + c49ccc8727c620ce1cb8fb431bb3fe8f2e747236 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 360f1564385745dd9e9acc53e697f8e63ff41126 + c49ccc8727c620ce1cb8fb431bb3fe8f2e747236 https://github.com/dotnet/test-templates @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1d1af5d70029872ea1c9f0d2c18bf5cf4e24cd3e + c0aa76c865eb72b183247119752dfabca811f17a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1d1af5d70029872ea1c9f0d2c18bf5cf4e24cd3e + c0aa76c865eb72b183247119752dfabca811f17a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1d1af5d70029872ea1c9f0d2c18bf5cf4e24cd3e + c0aa76c865eb72b183247119752dfabca811f17a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1d1af5d70029872ea1c9f0d2c18bf5cf4e24cd3e + c0aa76c865eb72b183247119752dfabca811f17a diff --git a/eng/Versions.props b/eng/Versions.props index c4318dd50..0173becfd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,11 +58,11 @@ 7.0.15 7.0.15 - 7.0.15-servicing.23577.31 - 7.0.15-servicing.23577.31 - 7.0.15-servicing.23577.31 - 7.0.15-servicing.23577.31 - 7.0.15-servicing.23577.31 + 7.0.15-servicing.23601.10 + 7.0.15-servicing.23601.10 + 7.0.15-servicing.23601.10 + 7.0.15-servicing.23601.10 + 7.0.15-servicing.23601.10 0.2.0 @@ -70,8 +70,8 @@ 7.0.115 - 7.0.115-servicing.23579.12 - 7.0.115-servicing.23579.12 + 7.0.115-servicing.23601.25 + 7.0.115-servicing.23601.25 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 059cd2aa3bb714bd4934b23f3eedc4564815ecce Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 1 Dec 2023 21:52:43 +0000 Subject: [PATCH 174/535] Merged PR 35764: [internal/release/7.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.AspNetCore.App.Ref**: from 7.0.15 to 7.0.15 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 7.0.15-servicing.23577.31 to 7.0.15-servicing.23601.10 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 7.0.15 to 7.0.15 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: from 7.0.15-servicing.23577.31 to 7.0.15-servicing.23601.10 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 7.0.15-servicing.23577.31 to 7.0.15-servicing.23601.10 (parent: Microsoft.NET.Sdk) - **dotnet-user-jwts**: from 7.0.15-servicing.23577.31 to 7.0.15-servicing.23601.10 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 7.0.15-servicing.23577.31 to 7.0.15-servicing.23601.10 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:ca5481e4-f667-4dcd-b176-08db3b93de76) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: ca5481e4-f667-4dcd-b176-08db3b93de76 - **Build**: 20231201.26 - **Date Produced**: December 1, 2023 9:22:43 PM UTC - **Commit**: a87e751ac0a46a6a69fb55a63a8f96a71ecace7c - **Branch**: refs/heads/internal/release/7.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.312 to 7.0.312][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.312-servicing.23579.10 to 7.0.312-servicing.23601.26][1] - **Microsoft.NET.Sdk**: [from 7.0.312-servicing.23579.10 to 7.0.312-servicing.23601.26][1] - **Microsoft.TemplateEngine.Cli**: [from 7.0.312-servicing.23579.10 to 7.0.312-servicing.23601.26][1] - **Microsoft.AspNetCore.App.Ref**: [from 7.0.15 to 7.0.15][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 7.0.15-servicing.23577.31 to 7.0.15-servicing.23601.10][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 7.0.15 to 7.0.15][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: [from 7.0.15-servicing.23577.31 to 7.0.15-servicing.23601.10][2] - **dotnet-dev-certs**: [from 7.0.15-servicing.23577.31 to 7.0.15-servicing.23601.10][2] - **dotnet-user-jwts**: [from 7.0.15-servicing.23577.31 to 7.0.15-servicing.23601.10][2] - **dotnet-user-secrets**: [from 7.0.15-servicing.23577.31 to 7.0.15-servicing.23601.10][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC4e72473553&targetVersion=GCa87e751ac0... --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 38 +++++++++++++++++++------------------- eng/Versions.props | 14 +++++++------- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/NuGet.config b/NuGet.config index 529a9110e..2102f9bcf 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,7 +10,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -44,12 +44,12 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4c531da6e..9a29a0c14 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 360f1564385745dd9e9acc53e697f8e63ff41126 + c49ccc8727c620ce1cb8fb431bb3fe8f2e747236 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 360f1564385745dd9e9acc53e697f8e63ff41126 + c49ccc8727c620ce1cb8fb431bb3fe8f2e747236 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 360f1564385745dd9e9acc53e697f8e63ff41126 + c49ccc8727c620ce1cb8fb431bb3fe8f2e747236 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 360f1564385745dd9e9acc53e697f8e63ff41126 + c49ccc8727c620ce1cb8fb431bb3fe8f2e747236 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 360f1564385745dd9e9acc53e697f8e63ff41126 + c49ccc8727c620ce1cb8fb431bb3fe8f2e747236 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 360f1564385745dd9e9acc53e697f8e63ff41126 + c49ccc8727c620ce1cb8fb431bb3fe8f2e747236 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 360f1564385745dd9e9acc53e697f8e63ff41126 + c49ccc8727c620ce1cb8fb431bb3fe8f2e747236 https://github.com/dotnet/test-templates @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4e72473553eb228156e7946886d68efcc004879f + a87e751ac0a46a6a69fb55a63a8f96a71ecace7c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4e72473553eb228156e7946886d68efcc004879f + a87e751ac0a46a6a69fb55a63a8f96a71ecace7c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4e72473553eb228156e7946886d68efcc004879f + a87e751ac0a46a6a69fb55a63a8f96a71ecace7c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4e72473553eb228156e7946886d68efcc004879f + a87e751ac0a46a6a69fb55a63a8f96a71ecace7c diff --git a/eng/Versions.props b/eng/Versions.props index aa9d370e1..2db776d1f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,11 +58,11 @@ 7.0.15 7.0.15 - 7.0.15-servicing.23577.31 - 7.0.15-servicing.23577.31 - 7.0.15-servicing.23577.31 - 7.0.15-servicing.23577.31 - 7.0.15-servicing.23577.31 + 7.0.15-servicing.23601.10 + 7.0.15-servicing.23601.10 + 7.0.15-servicing.23601.10 + 7.0.15-servicing.23601.10 + 7.0.15-servicing.23601.10 0.2.0 @@ -70,8 +70,8 @@ 7.0.312 - 7.0.312-servicing.23579.10 - 7.0.312-servicing.23579.10 + 7.0.312-servicing.23601.26 + 7.0.312-servicing.23601.26 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f97e13f2df79e966a44decbea4feea9a74d4d180 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 1 Dec 2023 22:07:40 +0000 Subject: [PATCH 175/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231201.27 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.405 -> To Version 7.0.405 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets From Version 7.0.15 -> To Version 7.0.15 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 38 +++++++++++++++++++------------------- eng/Versions.props | 14 +++++++------- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/NuGet.config b/NuGet.config index a4af0c8cc..34760f138 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,7 +10,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -44,12 +44,12 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 34d949132..b6f25ee4e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 360f1564385745dd9e9acc53e697f8e63ff41126 + c49ccc8727c620ce1cb8fb431bb3fe8f2e747236 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 360f1564385745dd9e9acc53e697f8e63ff41126 + c49ccc8727c620ce1cb8fb431bb3fe8f2e747236 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 360f1564385745dd9e9acc53e697f8e63ff41126 + c49ccc8727c620ce1cb8fb431bb3fe8f2e747236 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 360f1564385745dd9e9acc53e697f8e63ff41126 + c49ccc8727c620ce1cb8fb431bb3fe8f2e747236 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 360f1564385745dd9e9acc53e697f8e63ff41126 + c49ccc8727c620ce1cb8fb431bb3fe8f2e747236 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 360f1564385745dd9e9acc53e697f8e63ff41126 + c49ccc8727c620ce1cb8fb431bb3fe8f2e747236 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 360f1564385745dd9e9acc53e697f8e63ff41126 + c49ccc8727c620ce1cb8fb431bb3fe8f2e747236 https://github.com/dotnet/test-templates @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ea50b565a6416e9bd2039db0f1a685cbaf46caa2 + 6e7e4b10f05d98471ed979e481f515fa750c52ae - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ea50b565a6416e9bd2039db0f1a685cbaf46caa2 + 6e7e4b10f05d98471ed979e481f515fa750c52ae - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ea50b565a6416e9bd2039db0f1a685cbaf46caa2 + 6e7e4b10f05d98471ed979e481f515fa750c52ae - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ea50b565a6416e9bd2039db0f1a685cbaf46caa2 + 6e7e4b10f05d98471ed979e481f515fa750c52ae diff --git a/eng/Versions.props b/eng/Versions.props index a87b860dd..ca5ace3ec 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,11 +58,11 @@ 7.0.15 7.0.15 - 7.0.15-servicing.23577.31 - 7.0.15-servicing.23577.31 - 7.0.15-servicing.23577.31 - 7.0.15-servicing.23577.31 - 7.0.15-servicing.23577.31 + 7.0.15-servicing.23601.10 + 7.0.15-servicing.23601.10 + 7.0.15-servicing.23601.10 + 7.0.15-servicing.23601.10 + 7.0.15-servicing.23601.10 0.2.0 @@ -70,8 +70,8 @@ 7.0.405 - 7.0.405-servicing.23580.13 - 7.0.405-servicing.23580.13 + 7.0.405-servicing.23601.27 + 7.0.405-servicing.23601.27 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 05d232d7760c452688dc302e20b6f9da41105d9a Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 4 Dec 2023 19:27:46 +0000 Subject: [PATCH 176/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231204.13 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.321-servicing.23601.16 -> To Version 6.0.321-servicing.23604.13 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 6.0.25 -> To Version 6.0.26 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++++++ eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 3 files changed, 32 insertions(+), 24 deletions(-) diff --git a/NuGet.config b/NuGet.config index 98638b9ae..6b6abf24e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,6 +8,7 @@ + @@ -15,11 +16,14 @@ + + + @@ -40,14 +44,18 @@ + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 62ffc36fd..824d1e2fe 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a74946f8dae6d29fd18c8fc702e23f8fe77c729c + 456adb551c1878a5dcc44f0b6e7d69de4789cbdc - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a74946f8dae6d29fd18c8fc702e23f8fe77c729c + 456adb551c1878a5dcc44f0b6e7d69de4789cbdc - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a74946f8dae6d29fd18c8fc702e23f8fe77c729c + 456adb551c1878a5dcc44f0b6e7d69de4789cbdc - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a74946f8dae6d29fd18c8fc702e23f8fe77c729c + 456adb551c1878a5dcc44f0b6e7d69de4789cbdc https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 6b4fc213e731cb128ad8ed54befea55d9e1d3f6d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2e6fec4ea47386d9306a4a2180ba7c61a7994f26 + 1f85f2a52ec422c16c8991f6cd24124c084e87d1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2e6fec4ea47386d9306a4a2180ba7c61a7994f26 + 1f85f2a52ec422c16c8991f6cd24124c084e87d1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - d4ee94199afb6c67ed448c252a07c0747c089e41 + b4d268210a29a07ba7a3003360b2b037881880db - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - fcec4d8986bb8339964c429abd6e4651b968ff4f + 981ef8014ab994eb3fce88dd81b815fce930dfa5 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index fef08b7bd..c837eb641 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.25-servicing.23519.16 + 6.0.26-servicing.23573.4 - 6.0.25-servicing.23519.18 + 6.0.26-servicing.23573.8 @@ -56,8 +56,8 @@ - 6.0.321-servicing.23601.16 - 6.0.321-servicing.23601.16 + 6.0.321-servicing.23604.13 + 6.0.321-servicing.23604.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,10 +78,10 @@ - 6.0.25-servicing.23520.5 - 6.0.25-servicing.23520.5 - 6.0.25 - 6.0.25 + 6.0.26-servicing.23604.3 + 6.0.26-servicing.23604.3 + 6.0.26 + 6.0.26 From 66b691b8d07133664999b49112590f0ddeb6d949 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 4 Dec 2023 19:28:06 +0000 Subject: [PATCH 177/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231204.14 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.418-servicing.23601.17 -> To Version 6.0.418-servicing.23604.14 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 6.0.25 -> To Version 6.0.26 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++++++ eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 3 files changed, 32 insertions(+), 24 deletions(-) diff --git a/NuGet.config b/NuGet.config index 44c201c8b..d4d84aab1 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,6 +8,7 @@ + @@ -15,11 +16,14 @@ + + + @@ -40,15 +44,19 @@ + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7c00837f2..15d012f5a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a74946f8dae6d29fd18c8fc702e23f8fe77c729c + 456adb551c1878a5dcc44f0b6e7d69de4789cbdc - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a74946f8dae6d29fd18c8fc702e23f8fe77c729c + 456adb551c1878a5dcc44f0b6e7d69de4789cbdc - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a74946f8dae6d29fd18c8fc702e23f8fe77c729c + 456adb551c1878a5dcc44f0b6e7d69de4789cbdc - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a74946f8dae6d29fd18c8fc702e23f8fe77c729c + 456adb551c1878a5dcc44f0b6e7d69de4789cbdc https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 04cc3e115c98a8aa1fde4b1b45218ed6331c45c5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6c327a186a3c6fc3aa2a08d5900ecb1da772ee86 + 4513782981406737e4944e0c12ab85172bd2366f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6c327a186a3c6fc3aa2a08d5900ecb1da772ee86 + 4513782981406737e4944e0c12ab85172bd2366f - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - d4ee94199afb6c67ed448c252a07c0747c089e41 + b4d268210a29a07ba7a3003360b2b037881880db - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - fcec4d8986bb8339964c429abd6e4651b968ff4f + 981ef8014ab994eb3fce88dd81b815fce930dfa5 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 08cd886fc..9f1214fc0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.25-servicing.23519.16 + 6.0.26-servicing.23573.4 - 6.0.25-servicing.23519.18 + 6.0.26-servicing.23573.8 @@ -56,8 +56,8 @@ - 6.0.418-servicing.23601.17 - 6.0.418-servicing.23601.17 + 6.0.418-servicing.23604.14 + 6.0.418-servicing.23604.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,10 +78,10 @@ - 6.0.25-servicing.23520.5 - 6.0.25-servicing.23520.5 - 6.0.25 - 6.0.25 + 6.0.26-servicing.23604.3 + 6.0.26-servicing.23604.3 + 6.0.26 + 6.0.26 From 1f121863d4457763492b55e8fc8fa78ce0cbb589 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 4 Dec 2023 19:28:35 +0000 Subject: [PATCH 178/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231204.12 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.126-servicing.23601.15 -> To Version 6.0.126-servicing.23604.12 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 6.0.25 -> To Version 6.0.26 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++++++ eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 3 files changed, 32 insertions(+), 24 deletions(-) diff --git a/NuGet.config b/NuGet.config index 9a61de726..51d242180 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,6 +8,7 @@ + @@ -15,11 +16,14 @@ + + + @@ -40,16 +44,20 @@ + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c54327a2d..72d2cedbe 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a74946f8dae6d29fd18c8fc702e23f8fe77c729c + 456adb551c1878a5dcc44f0b6e7d69de4789cbdc - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a74946f8dae6d29fd18c8fc702e23f8fe77c729c + 456adb551c1878a5dcc44f0b6e7d69de4789cbdc - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a74946f8dae6d29fd18c8fc702e23f8fe77c729c + 456adb551c1878a5dcc44f0b6e7d69de4789cbdc - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a74946f8dae6d29fd18c8fc702e23f8fe77c729c + 456adb551c1878a5dcc44f0b6e7d69de4789cbdc https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating e58a1e0535c781fc1c12a5bbbc81c5044260d3e0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3652ba2a882726bbaed0dc2e906154197ded6811 + 493e67d12750dc460c159ff6a5c81fec6e525f46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3652ba2a882726bbaed0dc2e906154197ded6811 + 493e67d12750dc460c159ff6a5c81fec6e525f46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - d4ee94199afb6c67ed448c252a07c0747c089e41 + b4d268210a29a07ba7a3003360b2b037881880db - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - fcec4d8986bb8339964c429abd6e4651b968ff4f + 981ef8014ab994eb3fce88dd81b815fce930dfa5 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 4a187c317..061193e71 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.25-servicing.23519.16 + 6.0.26-servicing.23573.4 - 6.0.25-servicing.23519.18 + 6.0.26-servicing.23573.8 @@ -56,8 +56,8 @@ - 6.0.126-servicing.23601.15 - 6.0.126-servicing.23601.15 + 6.0.126-servicing.23604.12 + 6.0.126-servicing.23604.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,10 +78,10 @@ - 6.0.25-servicing.23520.5 - 6.0.25-servicing.23520.5 - 6.0.25 - 6.0.25 + 6.0.26-servicing.23604.3 + 6.0.26-servicing.23604.3 + 6.0.26 + 6.0.26 From b654f3e01bd56d01afd22663f05a63baf4c5eb22 Mon Sep 17 00:00:00 2001 From: Ella Hathaway <67609881+ellahathaway@users.noreply.github.com> Date: Tue, 5 Dec 2023 12:15:32 -0800 Subject: [PATCH 179/535] Enable open ssl sha 1 signatures for CentOS Stream 9 (#17889) --- .../templates/job/source-build-build-tarball.yml | 11 ++++++++--- .../templates/job/source-build-run-tarball-build.yml | 10 +++++++++- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml index 2c7900e09..f5569e26b 100644 --- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml @@ -123,19 +123,24 @@ jobs: set -x df -h - networkArgs= + customRunArgs= customBuildArgs= if [[ '$(_RunOnline)' == 'true' ]]; then customBuildArgs='--online' else - networkArgs='--network none' + customRunArgs='--network none' + fi + + # See https://github.com/dotnet/source-build/issues/3712 + if [[ '$(_OverrideDistroDisablingSha1)' == 'true' ]]; then + customRunArgs="$customRunArgs -e OPENSSL_ENABLE_SHA1_SIGNATURES=1" fi if [[ '$(_EnablePoison)' == 'true' ]]; then customBuildArgs="$customBuildArgs --poison" fi - docker run --rm -v $(tarballDir):/tarball -w /tarball ${networkArgs} $(_Container) ./build.sh --clean-while-building ${customBuildArgs} $(additionalBuildArgs) + docker run --rm -v $(tarballDir):/tarball -w /tarball ${customRunArgs} $(_Container) ./build.sh --clean-while-building ${customBuildArgs} $(additionalBuildArgs) displayName: Build Tarball - ${{ if ne(variables['System.TeamProject'], 'public') }}: diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml index bfea7becd..a4a18425a 100644 --- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml @@ -11,7 +11,7 @@ parameters: # ----------------------------------------------------------------------------------------------- alpine317Container: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.17 centOS7Container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-source-build - centOSStream9Container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9-20220107135047-4cd394c + centOSStream9Container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9 debian11Arm64Container: mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-arm64v8 fedora38Container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-38 ubuntu1804Container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04 @@ -40,18 +40,21 @@ jobs: _BootstrapPrep: true _Container: ${{ parameters.alpine317Container }} _ExcludeOmniSharpTests: true + _OverrideDistroDisablingSha1: false _RunOnline: false CentOS7-Online: _BootstrapPrep: false _Container: ${{ parameters.centOS7Container }} _EnablePoison: false _ExcludeOmniSharpTests: true + _OverrideDistroDisablingSha1: false _RunOnline: true CentOS7-Offline: _BootstrapPrep: false _Container: ${{ parameters.centOS7Container }} _EnablePoison: false _ExcludeOmniSharpTests: true + _OverrideDistroDisablingSha1: false _RunOnline: false ${{ if ne(variables['Build.Reason'], 'PullRequest') }}: CentOSStream9-Offline: @@ -59,18 +62,21 @@ jobs: _Container: ${{ parameters.centOSStream9Container }} _EnablePoison: false _ExcludeOmniSharpTests: false + _OverrideDistroDisablingSha1: true _RunOnline: false Fedora38-Offline: _BootstrapPrep: false _Container: ${{ parameters.fedora38Container }} _EnablePoison: true _ExcludeOmniSharpTests: false + _OverrideDistroDisablingSha1: false _RunOnline: false Ubuntu1804-Offline: _BootstrapPrep: false _Container: ${{ parameters.ubuntu1804Container }} _EnablePoison: false _ExcludeOmniSharpTests: false + _OverrideDistroDisablingSha1: false _RunOnline: false name: Build_Tarball_x64 pool: @@ -94,6 +100,7 @@ jobs: _Container: ${{ parameters.debian11Arm64Container }} _EnablePoison: false _ExcludeOmniSharpTests: false + _OverrideDistroDisablingSha1: false _RunOnline: false name: Build_Tarball_arm64 pool: ${{ parameters.poolInternalArm64 }} @@ -114,6 +121,7 @@ jobs: _Container: ${{ parameters.fedora38Container }} _EnablePoison: false _ExcludeOmniSharpTests: false + _OverrideDistroDisablingSha1: false _RunOnline: false name: Build_Tarball_x64_Using_Previous pool: From 5f19470397cdaf2c7dfc47f384e201fc90944ad2 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 5 Dec 2023 22:25:34 +0000 Subject: [PATCH 180/535] Merged PR 35828: [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.NETCore.App.Ref**: from 6.0.26 to 6.0.26 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.26-servicing.23572.29 to 6.0.26-servicing.23605.8 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.26 to 6.0.26 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.26 to 6.0.26 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.26 to 6.0.26 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.26-servicing.23572.29 to 6.0.26-servicing.23605.8 (parent: Microsoft.NET.Sdk) - **Microsoft.NET.Workload.Emscripten.Manifest-6.0.100**: from 6.0.25 to 6.0.26 (parent: VS.Redist.Common.NetCore.SharedFramework.x64.6.0) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698 - **Build**: 20231205.14 - **Date Produced**: December 5, 2023 10:05:04 PM UTC - **Commit**: 9b8cdd0062a889793bda0f84365492c6e21ff981 - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.126-servicing.23604.12 to 6.0.126-servicing.23605.14][1] - **Microsoft.NET.Sdk**: [from 6.0.126-servicing.23604.12 to 6.0.126-servicing.23605.14][1] - **Microsoft.NETCore.App.Ref**: [from 6.0.26 to 6.0.26][2] - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: [from 6.0.26-servicing.23572.29 to 6.0.26-servicing.23605.8][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.26 to 6.0.26][2] - **Microsoft.NETCore.App.Host.win-x64**: [from 6.0.26 to 6.0.26][2] - **Microsoft.NETCore.DotNetHostResolver**: [from 6.0.26 to 6.0.26][2] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.26-servicing.23572.29 to 6.0.26-servicing.23605.8][2] - **Microsoft.NET.Workload.Emscripten.Manifest-6.0.100**: [from 6.0.25 to 6.0.26][3] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC493e67d127&targetVersion=GC9b8cdd0062&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC965a793efc&targetVersion=GCdc45e96840&_a=files [3]: https://github.com/dotnet/emsdk/compare/d8bc162ccf...5ccc36f598 [DependencyUpdate]: <> (End)... --- NuGet.config | 7 +++---- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 10 +++++----- 3 files changed, 22 insertions(+), 23 deletions(-) diff --git a/NuGet.config b/NuGet.config index 51d242180..36c575133 100644 --- a/NuGet.config +++ b/NuGet.config @@ -11,12 +11,12 @@ + - - + @@ -50,8 +50,7 @@ - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 72d2cedbe..671fad883 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 456adb551c1878a5dcc44f0b6e7d69de4789cbdc - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 965a793efc765ddbea3c43e43c13b8e956b61946 + dc45e96840243b203b13e61952230e225d2aac52 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 965a793efc765ddbea3c43e43c13b8e956b61946 + dc45e96840243b203b13e61952230e225d2aac52 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 965a793efc765ddbea3c43e43c13b8e956b61946 + dc45e96840243b203b13e61952230e225d2aac52 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 965a793efc765ddbea3c43e43c13b8e956b61946 + dc45e96840243b203b13e61952230e225d2aac52 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 965a793efc765ddbea3c43e43c13b8e956b61946 + dc45e96840243b203b13e61952230e225d2aac52 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 965a793efc765ddbea3c43e43c13b8e956b61946 + dc45e96840243b203b13e61952230e225d2aac52 @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating e58a1e0535c781fc1c12a5bbbc81c5044260d3e0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 493e67d12750dc460c159ff6a5c81fec6e525f46 + 9b8cdd0062a889793bda0f84365492c6e21ff981 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 493e67d12750dc460c159ff6a5c81fec6e525f46 + 9b8cdd0062a889793bda0f84365492c6e21ff981 @@ -166,9 +166,9 @@ 698fdad58fa64a55f16cd9562c90224cc498ed02 - + https://github.com/dotnet/emsdk - d8bc162ccf7ce14fdbec9c2c50d6e856a7063c91 + 5ccc36f5985e2089f47c97a19c250e65ddefd0ba https://github.com/dotnet/source-build diff --git a/eng/Versions.props b/eng/Versions.props index 061193e71..e07ebd6dd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.126-servicing.23604.12 - 6.0.126-servicing.23604.12 + 6.0.126-servicing.23605.14 + 6.0.126-servicing.23605.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.26-servicing.23572.29 - 6.0.26-servicing.23572.29 + 6.0.26-servicing.23605.8 + 6.0.26-servicing.23605.8 6.0.26 6.0.26 6.0.26 @@ -185,7 +185,7 @@ 12.0.101-preview.9.31 15.0.101-preview.9.31 $(MicrosoftNETCoreAppRefPackageVersion) - 6.0.25 + 6.0.26 $(MicrosoftNETWorkloadEmscriptenManifest60100Version) From e370c6bd8c9bd9d2957be5a164eccc4f011e6d41 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 5 Dec 2023 22:26:10 +0000 Subject: [PATCH 181/535] Merged PR 35829: [internal/release/6.0.4xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.NETCore.App.Ref**: from 6.0.26 to 6.0.26 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.26-servicing.23572.29 to 6.0.26-servicing.23605.8 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.26 to 6.0.26 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.26 to 6.0.26 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.26 to 6.0.26 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.26-servicing.23572.29 to 6.0.26-servicing.23605.8 (parent: Microsoft.NET.Sdk) - **Microsoft.NET.Workload.Emscripten.Manifest-6.0.400**: from 6.0.25 to 6.0.26 (parent: VS.Redist.Common.NetCore.SharedFramework.x64.6.0) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20231205.16 - **Date Produced**: December 5, 2023 10:05:15 PM UTC - **Commit**: 416a14840c7d80cbf46dc518b027bad88c3e14bf - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.418-servicing.23604.14 to 6.0.418-servicing.23605.16][1] - **Microsoft.NET.Sdk**: [from 6.0.418-servicing.23604.14 to 6.0.418-servicing.23605.16][1] - **Microsoft.NETCore.App.Ref**: [from 6.0.26 to 6.0.26][2] - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: [from 6.0.26-servicing.23572.29 to 6.0.26-servicing.23605.8][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.26 to 6.0.26][2] - **Microsoft.NETCore.App.Host.win-x64**: [from 6.0.26 to 6.0.26][2] - **Microsoft.NETCore.DotNetHostResolver**: [from 6.0.26 to 6.0.26][2] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.26-servicing.23572.29 to 6.0.26-servicing.23605.8][2] - **Microsoft.NET.Workload.Emscripten.Manifest-6.0.400**: [from 6.0.25 to 6.0.26][3] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC4513782981&targetVersion=GC416a14840c&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC965a793efc&targetVersion=GCdc45e96840&_a=files [3]: https://github.com/dotnet/emsdk/compare/d8bc162ccf...5ccc36f598 [DependencyUpdate]: <> (End)... --- NuGet.config | 7 +++---- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 10 +++++----- 3 files changed, 22 insertions(+), 23 deletions(-) diff --git a/NuGet.config b/NuGet.config index d4d84aab1..0b41bf143 100644 --- a/NuGet.config +++ b/NuGet.config @@ -11,12 +11,12 @@ + - - + @@ -48,8 +48,7 @@ - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 15d012f5a..9cece73bc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 456adb551c1878a5dcc44f0b6e7d69de4789cbdc - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 965a793efc765ddbea3c43e43c13b8e956b61946 + dc45e96840243b203b13e61952230e225d2aac52 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 965a793efc765ddbea3c43e43c13b8e956b61946 + dc45e96840243b203b13e61952230e225d2aac52 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 965a793efc765ddbea3c43e43c13b8e956b61946 + dc45e96840243b203b13e61952230e225d2aac52 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 965a793efc765ddbea3c43e43c13b8e956b61946 + dc45e96840243b203b13e61952230e225d2aac52 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 965a793efc765ddbea3c43e43c13b8e956b61946 + dc45e96840243b203b13e61952230e225d2aac52 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 965a793efc765ddbea3c43e43c13b8e956b61946 + dc45e96840243b203b13e61952230e225d2aac52 @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 04cc3e115c98a8aa1fde4b1b45218ed6331c45c5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4513782981406737e4944e0c12ab85172bd2366f + 416a14840c7d80cbf46dc518b027bad88c3e14bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4513782981406737e4944e0c12ab85172bd2366f + 416a14840c7d80cbf46dc518b027bad88c3e14bf @@ -166,9 +166,9 @@ 698fdad58fa64a55f16cd9562c90224cc498ed02 - + https://github.com/dotnet/emsdk - d8bc162ccf7ce14fdbec9c2c50d6e856a7063c91 + 5ccc36f5985e2089f47c97a19c250e65ddefd0ba https://github.com/dotnet/source-build diff --git a/eng/Versions.props b/eng/Versions.props index 9f1214fc0..acba3cbf4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.418-servicing.23604.14 - 6.0.418-servicing.23604.14 + 6.0.418-servicing.23605.16 + 6.0.418-servicing.23605.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.26-servicing.23572.29 - 6.0.26-servicing.23572.29 + 6.0.26-servicing.23605.8 + 6.0.26-servicing.23605.8 6.0.26 6.0.26 6.0.26 @@ -185,7 +185,7 @@ 12.3.303 15.4.303 6.0.5 - 6.0.25 + 6.0.26 $(MicrosoftNETWorkloadEmscriptenManifest60400Version) From 151c083a87082989475106b8ebb08cfca977f3aa Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 5 Dec 2023 22:26:57 +0000 Subject: [PATCH 182/535] Merged PR 35830: [internal/release/6.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.NETCore.App.Ref**: from 6.0.26 to 6.0.26 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.26-servicing.23572.29 to 6.0.26-servicing.23605.8 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.26 to 6.0.26 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.26 to 6.0.26 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.26 to 6.0.26 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.26-servicing.23572.29 to 6.0.26-servicing.23605.8 (parent: Microsoft.NET.Sdk) - **Microsoft.NET.Workload.Emscripten.Manifest-6.0.300**: from 6.0.25 to 6.0.26 (parent: VS.Redist.Common.NetCore.SharedFramework.x64.6.0) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:b5bca336-8d99-407e-c145-08d9d60066b9) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: b5bca336-8d99-407e-c145-08d9d60066b9 - **Build**: 20231205.15 - **Date Produced**: December 5, 2023 10:05:22 PM UTC - **Commit**: c22a743f3adc2dafbf2bc9b4993e23ca15d0c828 - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.321-servicing.23604.13 to 6.0.321-servicing.23605.15][1] - **Microsoft.NET.Sdk**: [from 6.0.321-servicing.23604.13 to 6.0.321-servicing.23605.15][1] - **Microsoft.NETCore.App.Ref**: [from 6.0.26 to 6.0.26][2] - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: [from 6.0.26-servicing.23572.29 to 6.0.26-servicing.23605.8][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.26 to 6.0.26][2] - **Microsoft.NETCore.App.Host.win-x64**: [from 6.0.26 to 6.0.26][2] - **Microsoft.NETCore.DotNetHostResolver**: [from 6.0.26 to 6.0.26][2] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.26-servicing.23572.29 to 6.0.26-servicing.23605.8][2] - **Microsoft.NET.Workload.Emscripten.Manifest-6.0.300**: [from 6.0.25 to 6.0.26][3] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC1f85f2a52e&targetVersion=GCc22a743f3a&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC965a793efc&targetVersion=GCdc45e96840&_a=files [3]: https://github.com/dotnet/emsdk/compare/d8bc162ccf...5ccc36f598 [DependencyUpdate]: <> (End)... --- NuGet.config | 7 +++---- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 10 +++++----- 3 files changed, 22 insertions(+), 23 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6b6abf24e..575275834 100644 --- a/NuGet.config +++ b/NuGet.config @@ -11,12 +11,12 @@ + - - + @@ -48,8 +48,7 @@ - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 824d1e2fe..aea92804f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 456adb551c1878a5dcc44f0b6e7d69de4789cbdc - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 965a793efc765ddbea3c43e43c13b8e956b61946 + dc45e96840243b203b13e61952230e225d2aac52 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 965a793efc765ddbea3c43e43c13b8e956b61946 + dc45e96840243b203b13e61952230e225d2aac52 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 965a793efc765ddbea3c43e43c13b8e956b61946 + dc45e96840243b203b13e61952230e225d2aac52 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 965a793efc765ddbea3c43e43c13b8e956b61946 + dc45e96840243b203b13e61952230e225d2aac52 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 965a793efc765ddbea3c43e43c13b8e956b61946 + dc45e96840243b203b13e61952230e225d2aac52 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 965a793efc765ddbea3c43e43c13b8e956b61946 + dc45e96840243b203b13e61952230e225d2aac52 @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 6b4fc213e731cb128ad8ed54befea55d9e1d3f6d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1f85f2a52ec422c16c8991f6cd24124c084e87d1 + c22a743f3adc2dafbf2bc9b4993e23ca15d0c828 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1f85f2a52ec422c16c8991f6cd24124c084e87d1 + c22a743f3adc2dafbf2bc9b4993e23ca15d0c828 @@ -166,9 +166,9 @@ 698fdad58fa64a55f16cd9562c90224cc498ed02 - + https://github.com/dotnet/emsdk - d8bc162ccf7ce14fdbec9c2c50d6e856a7063c91 + 5ccc36f5985e2089f47c97a19c250e65ddefd0ba https://github.com/dotnet/source-build diff --git a/eng/Versions.props b/eng/Versions.props index c837eb641..da8399e55 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.321-servicing.23604.13 - 6.0.321-servicing.23604.13 + 6.0.321-servicing.23605.15 + 6.0.321-servicing.23605.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.26-servicing.23572.29 - 6.0.26-servicing.23572.29 + 6.0.26-servicing.23605.8 + 6.0.26-servicing.23605.8 6.0.26 6.0.26 6.0.26 @@ -185,7 +185,7 @@ 12.3.100-rc.1.125 15.4.100-rc.1.125 6.0.4 - 6.0.25 + 6.0.26 $(MicrosoftNETWorkloadEmscriptenManifest60300Version) From 1e2c0c0af5208112c081e6788a841f94be4c0bd5 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 5 Dec 2023 23:28:28 +0000 Subject: [PATCH 183/535] Merged PR 35838: [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.126 to 6.0.126 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.126-servicing.23578.2 to 6.0.126-servicing.23605.4 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.126 to 6.0.126 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698 - **Build**: 20231205.20 - **Date Produced**: December 5, 2023 11:06:57 PM UTC - **Commit**: 45302fdcb923ce0d0c28b9f34f7684443b980a62 - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.126-servicing.23605.14 to 6.0.126-servicing.23605.20][1] - **Microsoft.NET.Sdk**: [from 6.0.126-servicing.23605.14 to 6.0.126-servicing.23605.20][1] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.126 to 6.0.126][2] - **Microsoft.TemplateEngine.Cli**: [from 6.0.126-servicing.23578.2 to 6.0.126-servicing.23605.4][2] - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.126 to 6.0.126][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC9b8cdd0062&targetVersion=GC45302fdcb9&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-templating/branches?baseVersion=GCe58a1e0535&targetVersion=GC28656189e4&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a68e208b-7b40-4a19-af8d-08d961c59698) --- NuGet.config | 6 ++---- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/NuGet.config b/NuGet.config index 36c575133..e7470c4b2 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,8 +19,7 @@ - - + @@ -52,8 +51,7 @@ - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 671fad883..89d861c82 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - e58a1e0535c781fc1c12a5bbbc81c5044260d3e0 + 28656189e49c05368afda92b482da8c0049d5638 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - e58a1e0535c781fc1c12a5bbbc81c5044260d3e0 + 28656189e49c05368afda92b482da8c0049d5638 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - e58a1e0535c781fc1c12a5bbbc81c5044260d3e0 + 28656189e49c05368afda92b482da8c0049d5638 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9b8cdd0062a889793bda0f84365492c6e21ff981 + 45302fdcb923ce0d0c28b9f34f7684443b980a62 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9b8cdd0062a889793bda0f84365492c6e21ff981 + 45302fdcb923ce0d0c28b9f34f7684443b980a62 diff --git a/eng/Versions.props b/eng/Versions.props index e07ebd6dd..9d7973343 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.126-servicing.23605.14 - 6.0.126-servicing.23605.14 + 6.0.126-servicing.23605.20 + 6.0.126-servicing.23605.20 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From aa3e2f103a246defb8718640fa7b54643460f423 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 5 Dec 2023 23:33:27 +0000 Subject: [PATCH 184/535] Merged PR 35839: [internal/release/6.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.321 to 6.0.321 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.321-servicing.23573.13 to 6.0.321-servicing.23605.5 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.321 to 6.0.321 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:b5bca336-8d99-407e-c145-08d9d60066b9) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: b5bca336-8d99-407e-c145-08d9d60066b9 - **Build**: 20231205.22 - **Date Produced**: December 5, 2023 11:12:12 PM UTC - **Commit**: 96ce218210ee10662e18423d95be11527ff19222 - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.321-servicing.23605.15 to 6.0.321-servicing.23605.22][1] - **Microsoft.NET.Sdk**: [from 6.0.321-servicing.23605.15 to 6.0.321-servicing.23605.22][1] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.321 to 6.0.321][2] - **Microsoft.TemplateEngine.Cli**: [from 6.0.321-servicing.23573.13 to 6.0.321-servicing.23605.5][2] - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.321 to 6.0.321][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCc22a743f3a&targetVersion=GC96ce218210&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-templating/branches?baseVersion=GC6b4fc213e7&targetVersion=GC757b2e642e&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:b5bca336-8d99-407e-c145-08d9d60066b9) --- NuGet.config | 6 ++---- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/NuGet.config b/NuGet.config index 575275834..3eb49cca2 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,8 +19,7 @@ - - + @@ -50,8 +49,7 @@ - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index aea92804f..b1b71e0d7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 6b4fc213e731cb128ad8ed54befea55d9e1d3f6d + 757b2e642e3fb918bae9a87715c8c2fddbc9b3bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 6b4fc213e731cb128ad8ed54befea55d9e1d3f6d + 757b2e642e3fb918bae9a87715c8c2fddbc9b3bf https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 6b4fc213e731cb128ad8ed54befea55d9e1d3f6d + 757b2e642e3fb918bae9a87715c8c2fddbc9b3bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c22a743f3adc2dafbf2bc9b4993e23ca15d0c828 + 96ce218210ee10662e18423d95be11527ff19222 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c22a743f3adc2dafbf2bc9b4993e23ca15d0c828 + 96ce218210ee10662e18423d95be11527ff19222 diff --git a/eng/Versions.props b/eng/Versions.props index da8399e55..f4cd92209 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.321-servicing.23605.15 - 6.0.321-servicing.23605.15 + 6.0.321-servicing.23605.22 + 6.0.321-servicing.23605.22 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From ac7a1d300a624aee41943ff8b31d7831e3410487 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 5 Dec 2023 23:52:52 +0000 Subject: [PATCH 185/535] Merged PR 35840: [internal/release/6.0.4xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.418 to 6.0.418 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.418-rtm.23573.14 to 6.0.418-rtm.23605.6 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.418 to 6.0.418 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20231205.25 - **Date Produced**: December 5, 2023 11:22:43 PM UTC - **Commit**: d501a7b471f83b79814d1c385eecf21a14dfb67f - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.418-servicing.23605.16 to 6.0.418-servicing.23605.25][1] - **Microsoft.NET.Sdk**: [from 6.0.418-servicing.23605.16 to 6.0.418-servicing.23605.25][1] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.418 to 6.0.418][2] - **Microsoft.TemplateEngine.Cli**: [from 6.0.418-rtm.23573.14 to 6.0.418-rtm.23605.6][2] - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.418 to 6.0.418][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC416a14840c&targetVersion=GCd501a7b471&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-templating/branches?baseVersion=GC04cc3e115c&targetVersion=GC766ee832e4&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a27c2ce2-aedf-42b7-d31e-08da6571bd31) --- NuGet.config | 6 ++---- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/NuGet.config b/NuGet.config index 0b41bf143..3172c2731 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,8 +19,7 @@ - - + @@ -51,8 +50,7 @@ - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9cece73bc..22e725273 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 04cc3e115c98a8aa1fde4b1b45218ed6331c45c5 + 766ee832e4d9d2d685414fceae96dca3c4e4dcbc - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 04cc3e115c98a8aa1fde4b1b45218ed6331c45c5 + 766ee832e4d9d2d685414fceae96dca3c4e4dcbc https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 04cc3e115c98a8aa1fde4b1b45218ed6331c45c5 + 766ee832e4d9d2d685414fceae96dca3c4e4dcbc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 416a14840c7d80cbf46dc518b027bad88c3e14bf + d501a7b471f83b79814d1c385eecf21a14dfb67f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 416a14840c7d80cbf46dc518b027bad88c3e14bf + d501a7b471f83b79814d1c385eecf21a14dfb67f diff --git a/eng/Versions.props b/eng/Versions.props index acba3cbf4..5031c62ce 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.418-servicing.23605.16 - 6.0.418-servicing.23605.16 + 6.0.418-servicing.23605.25 + 6.0.418-servicing.23605.25 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From d9445f2ea5b7c1eaadd126545bf313f45a676696 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 6 Dec 2023 00:07:04 +0000 Subject: [PATCH 186/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231205.30 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.126-servicing.23605.20 -> To Version 6.0.126-servicing.23605.30 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets From Version 6.0.26 -> To Version 6.0.26 (parent: Microsoft.NET.Sdk --- NuGet.config | 6 ++---- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 22 insertions(+), 24 deletions(-) diff --git a/NuGet.config b/NuGet.config index e7470c4b2..fbf9c4902 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,8 +7,7 @@ - - + @@ -43,8 +42,7 @@ - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 89d861c82..6114908f0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fcbb4e1ccc6d063f7fce7c9977698b809111758 + d504a7b7dab277712646747e9f5cce0d9507245e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fcbb4e1ccc6d063f7fce7c9977698b809111758 + d504a7b7dab277712646747e9f5cce0d9507245e https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fcbb4e1ccc6d063f7fce7c9977698b809111758 + d504a7b7dab277712646747e9f5cce0d9507245e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fcbb4e1ccc6d063f7fce7c9977698b809111758 + d504a7b7dab277712646747e9f5cce0d9507245e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fcbb4e1ccc6d063f7fce7c9977698b809111758 + d504a7b7dab277712646747e9f5cce0d9507245e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fcbb4e1ccc6d063f7fce7c9977698b809111758 + d504a7b7dab277712646747e9f5cce0d9507245e https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 28656189e49c05368afda92b482da8c0049d5638 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 45302fdcb923ce0d0c28b9f34f7684443b980a62 + 3359fe0db5f3f0c33f81fd2c15ff44421512390f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 45302fdcb923ce0d0c28b9f34f7684443b980a62 + 3359fe0db5f3f0c33f81fd2c15ff44421512390f diff --git a/eng/Versions.props b/eng/Versions.props index 9d7973343..b326a0658 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.26 6.0.26 - 6.0.26-servicing.23601.8 - 6.0.26-servicing.23601.8 - 6.0.26-servicing.23601.8 - 6.0.26-servicing.23601.8 + 6.0.26-servicing.23605.6 + 6.0.26-servicing.23605.6 + 6.0.26-servicing.23605.6 + 6.0.26-servicing.23605.6 0.2.0 - 6.0.126-servicing.23605.20 - 6.0.126-servicing.23605.20 + 6.0.126-servicing.23605.30 + 6.0.126-servicing.23605.30 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From a71a77b9ff73eaa90537fade61a4d2af97f918a6 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 6 Dec 2023 00:21:22 +0000 Subject: [PATCH 187/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231205.31 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.321-servicing.23605.22 -> To Version 6.0.321-servicing.23605.31 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets From Version 6.0.26 -> To Version 6.0.26 (parent: Microsoft.NET.Sdk --- NuGet.config | 6 ++---- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 22 insertions(+), 24 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3eb49cca2..3371ee0f3 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,8 +7,7 @@ - - + @@ -43,8 +42,7 @@ - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b1b71e0d7..039f6a346 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fcbb4e1ccc6d063f7fce7c9977698b809111758 + d504a7b7dab277712646747e9f5cce0d9507245e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fcbb4e1ccc6d063f7fce7c9977698b809111758 + d504a7b7dab277712646747e9f5cce0d9507245e https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fcbb4e1ccc6d063f7fce7c9977698b809111758 + d504a7b7dab277712646747e9f5cce0d9507245e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fcbb4e1ccc6d063f7fce7c9977698b809111758 + d504a7b7dab277712646747e9f5cce0d9507245e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fcbb4e1ccc6d063f7fce7c9977698b809111758 + d504a7b7dab277712646747e9f5cce0d9507245e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fcbb4e1ccc6d063f7fce7c9977698b809111758 + d504a7b7dab277712646747e9f5cce0d9507245e https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 757b2e642e3fb918bae9a87715c8c2fddbc9b3bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 96ce218210ee10662e18423d95be11527ff19222 + b6662b12057b934f96c560cd077a7b15b0e0c156 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 96ce218210ee10662e18423d95be11527ff19222 + b6662b12057b934f96c560cd077a7b15b0e0c156 diff --git a/eng/Versions.props b/eng/Versions.props index f4cd92209..a6a9cf9a9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.26 6.0.26 - 6.0.26-servicing.23601.8 - 6.0.26-servicing.23601.8 - 6.0.26-servicing.23601.8 - 6.0.26-servicing.23601.8 + 6.0.26-servicing.23605.6 + 6.0.26-servicing.23605.6 + 6.0.26-servicing.23605.6 + 6.0.26-servicing.23605.6 0.2.0 - 6.0.321-servicing.23605.22 - 6.0.321-servicing.23605.22 + 6.0.321-servicing.23605.31 + 6.0.321-servicing.23605.31 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From aef6b390463d346d9480521368e04a78761fe8bd Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 6 Dec 2023 00:32:05 +0000 Subject: [PATCH 188/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231205.33 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.418-servicing.23605.25 -> To Version 6.0.418-servicing.23605.33 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets From Version 6.0.26 -> To Version 6.0.26 (parent: Microsoft.NET.Sdk --- NuGet.config | 6 ++---- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 22 insertions(+), 24 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3172c2731..136e28698 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,8 +7,7 @@ - - + @@ -43,8 +42,7 @@ - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 22e725273..06610174f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fcbb4e1ccc6d063f7fce7c9977698b809111758 + d504a7b7dab277712646747e9f5cce0d9507245e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fcbb4e1ccc6d063f7fce7c9977698b809111758 + d504a7b7dab277712646747e9f5cce0d9507245e https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fcbb4e1ccc6d063f7fce7c9977698b809111758 + d504a7b7dab277712646747e9f5cce0d9507245e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fcbb4e1ccc6d063f7fce7c9977698b809111758 + d504a7b7dab277712646747e9f5cce0d9507245e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fcbb4e1ccc6d063f7fce7c9977698b809111758 + d504a7b7dab277712646747e9f5cce0d9507245e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fcbb4e1ccc6d063f7fce7c9977698b809111758 + d504a7b7dab277712646747e9f5cce0d9507245e https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 766ee832e4d9d2d685414fceae96dca3c4e4dcbc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d501a7b471f83b79814d1c385eecf21a14dfb67f + d25cefa206ae17c16ec4746c3e7591db22e78f09 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d501a7b471f83b79814d1c385eecf21a14dfb67f + d25cefa206ae17c16ec4746c3e7591db22e78f09 diff --git a/eng/Versions.props b/eng/Versions.props index 5031c62ce..0cad5967e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.26 6.0.26 - 6.0.26-servicing.23601.8 - 6.0.26-servicing.23601.8 - 6.0.26-servicing.23601.8 - 6.0.26-servicing.23601.8 + 6.0.26-servicing.23605.6 + 6.0.26-servicing.23605.6 + 6.0.26-servicing.23605.6 + 6.0.26-servicing.23605.6 0.2.0 - 6.0.418-servicing.23605.25 - 6.0.418-servicing.23605.25 + 6.0.418-servicing.23605.33 + 6.0.418-servicing.23605.33 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From a706d50916a1dd757a838896dddbb6798fa2e748 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 6 Dec 2023 01:15:19 +0000 Subject: [PATCH 189/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231205.37 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.126-servicing.23605.30 -> To Version 6.0.126-servicing.23605.37 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 6.0.26 -> To Version 6.0.26 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index fbf9c4902..e97435cf7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -21,7 +21,7 @@ - + @@ -52,7 +52,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6114908f0..b750cf329 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 456adb551c1878a5dcc44f0b6e7d69de4789cbdc + 84ebced93b7a69ba3332fe6000354306d4eea9dd - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 456adb551c1878a5dcc44f0b6e7d69de4789cbdc + 84ebced93b7a69ba3332fe6000354306d4eea9dd - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 456adb551c1878a5dcc44f0b6e7d69de4789cbdc + 84ebced93b7a69ba3332fe6000354306d4eea9dd https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 456adb551c1878a5dcc44f0b6e7d69de4789cbdc + 84ebced93b7a69ba3332fe6000354306d4eea9dd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 28656189e49c05368afda92b482da8c0049d5638 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3359fe0db5f3f0c33f81fd2c15ff44421512390f + 3f5d0be2f51d49013230c45b5a9a6dad582f40f3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3359fe0db5f3f0c33f81fd2c15ff44421512390f + 3f5d0be2f51d49013230c45b5a9a6dad582f40f3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - b4d268210a29a07ba7a3003360b2b037881880db + c309ca06b81112f5e42cc9ca6f8bf0c4a772be6b - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 981ef8014ab994eb3fce88dd81b815fce930dfa5 + e5b72d0fb5a405d5443b571ba1d78f419bdbcdb7 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index b326a0658..1f643f677 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.26-servicing.23573.4 + 6.0.26-servicing.23605.5 - 6.0.26-servicing.23573.8 + 6.0.26-servicing.23605.3 @@ -56,8 +56,8 @@ - 6.0.126-servicing.23605.30 - 6.0.126-servicing.23605.30 + 6.0.126-servicing.23605.37 + 6.0.126-servicing.23605.37 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.26-servicing.23604.3 - 6.0.26-servicing.23604.3 + 6.0.26-servicing.23605.4 + 6.0.26-servicing.23605.4 6.0.26 6.0.26 From 8e5f7d62eb49b3bd82bfd818380559c9a5c7120b Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 6 Dec 2023 01:19:41 +0000 Subject: [PATCH 190/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231205.38 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.321-servicing.23605.31 -> To Version 6.0.321-servicing.23605.38 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 6.0.26 -> To Version 6.0.26 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3371ee0f3..78b63002e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -21,7 +21,7 @@ - + @@ -50,7 +50,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 039f6a346..1a2687e3e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 456adb551c1878a5dcc44f0b6e7d69de4789cbdc + 84ebced93b7a69ba3332fe6000354306d4eea9dd - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 456adb551c1878a5dcc44f0b6e7d69de4789cbdc + 84ebced93b7a69ba3332fe6000354306d4eea9dd - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 456adb551c1878a5dcc44f0b6e7d69de4789cbdc + 84ebced93b7a69ba3332fe6000354306d4eea9dd https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 456adb551c1878a5dcc44f0b6e7d69de4789cbdc + 84ebced93b7a69ba3332fe6000354306d4eea9dd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 757b2e642e3fb918bae9a87715c8c2fddbc9b3bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b6662b12057b934f96c560cd077a7b15b0e0c156 + 2f5d8604a65edf0c457ff3f600fad88b42568244 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b6662b12057b934f96c560cd077a7b15b0e0c156 + 2f5d8604a65edf0c457ff3f600fad88b42568244 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - b4d268210a29a07ba7a3003360b2b037881880db + c309ca06b81112f5e42cc9ca6f8bf0c4a772be6b - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 981ef8014ab994eb3fce88dd81b815fce930dfa5 + e5b72d0fb5a405d5443b571ba1d78f419bdbcdb7 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index a6a9cf9a9..13e0ab3db 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.26-servicing.23573.4 + 6.0.26-servicing.23605.5 - 6.0.26-servicing.23573.8 + 6.0.26-servicing.23605.3 @@ -56,8 +56,8 @@ - 6.0.321-servicing.23605.31 - 6.0.321-servicing.23605.31 + 6.0.321-servicing.23605.38 + 6.0.321-servicing.23605.38 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.26-servicing.23604.3 - 6.0.26-servicing.23604.3 + 6.0.26-servicing.23605.4 + 6.0.26-servicing.23605.4 6.0.26 6.0.26 From ae5a0f6777946b49c55782b6661338cc0a5420c3 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 6 Dec 2023 01:24:01 +0000 Subject: [PATCH 191/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231205.39 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.418-servicing.23605.33 -> To Version 6.0.418-servicing.23605.39 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 6.0.26 -> To Version 6.0.26 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index 136e28698..07d2ab1fe 100644 --- a/NuGet.config +++ b/NuGet.config @@ -21,7 +21,7 @@ - + @@ -51,7 +51,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 06610174f..5960f0e91 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 456adb551c1878a5dcc44f0b6e7d69de4789cbdc + 84ebced93b7a69ba3332fe6000354306d4eea9dd - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 456adb551c1878a5dcc44f0b6e7d69de4789cbdc + 84ebced93b7a69ba3332fe6000354306d4eea9dd - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 456adb551c1878a5dcc44f0b6e7d69de4789cbdc + 84ebced93b7a69ba3332fe6000354306d4eea9dd https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 456adb551c1878a5dcc44f0b6e7d69de4789cbdc + 84ebced93b7a69ba3332fe6000354306d4eea9dd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 766ee832e4d9d2d685414fceae96dca3c4e4dcbc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d25cefa206ae17c16ec4746c3e7591db22e78f09 + 1209a0007f12258907100d2ae06eaf8ef98c69e4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d25cefa206ae17c16ec4746c3e7591db22e78f09 + 1209a0007f12258907100d2ae06eaf8ef98c69e4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - b4d268210a29a07ba7a3003360b2b037881880db + c309ca06b81112f5e42cc9ca6f8bf0c4a772be6b - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 981ef8014ab994eb3fce88dd81b815fce930dfa5 + e5b72d0fb5a405d5443b571ba1d78f419bdbcdb7 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 0cad5967e..2f4872aa6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.26-servicing.23573.4 + 6.0.26-servicing.23605.5 - 6.0.26-servicing.23573.8 + 6.0.26-servicing.23605.3 @@ -56,8 +56,8 @@ - 6.0.418-servicing.23605.33 - 6.0.418-servicing.23605.33 + 6.0.418-servicing.23605.39 + 6.0.418-servicing.23605.39 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.26-servicing.23604.3 - 6.0.26-servicing.23604.3 + 6.0.26-servicing.23605.4 + 6.0.26-servicing.23605.4 6.0.26 6.0.26 From e67d66a029fdbee58170cce99ec9caee5b69763b Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 11 Dec 2023 15:43:39 +0000 Subject: [PATCH 192/535] [internal/release/8.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk --- NuGet.config | 11 +++++++++-- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 18 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index e03fc8203..adad3fa6c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,21 +8,25 @@ + + + - + + @@ -43,14 +47,17 @@ + + - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 983f88668..65eb038ed 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 08814442c7c94f8b059c818902b6883a69844860 + db838b3e994dca38ead37ce90b6ba13285ac687c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 08814442c7c94f8b059c818902b6883a69844860 + db838b3e994dca38ead37ce90b6ba13285ac687c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 08814442c7c94f8b059c818902b6883a69844860 + db838b3e994dca38ead37ce90b6ba13285ac687c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 08814442c7c94f8b059c818902b6883a69844860 + db838b3e994dca38ead37ce90b6ba13285ac687c https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 3cc621de1..8788362e8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,8 +86,8 @@ 8.0.101 - 8.0.101-servicing.23580.21 - 8.0.101-servicing.23580.21 + 8.0.101-servicing.23607.3 + 8.0.101-servicing.23607.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 8bb85379f184d5c4b49d5555dc18fa190f87463d Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 11 Dec 2023 16:06:00 +0000 Subject: [PATCH 193/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231211.6 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.418-servicing.23605.39 -> To Version 6.0.418-servicing.23611.6 --- NuGet.config | 18 ++++++++++++++++++ eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 24 insertions(+), 6 deletions(-) diff --git a/NuGet.config b/NuGet.config index 07d2ab1fe..d802adb8c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,20 +8,30 @@ + + + + + + + + + + @@ -42,15 +52,23 @@ + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5960f0e91..c66ea58ee 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 766ee832e4d9d2d685414fceae96dca3c4e4dcbc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1209a0007f12258907100d2ae06eaf8ef98c69e4 + 6786cd99de264e875529374067197c15c91767bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1209a0007f12258907100d2ae06eaf8ef98c69e4 + 6786cd99de264e875529374067197c15c91767bf diff --git a/eng/Versions.props b/eng/Versions.props index 2f4872aa6..11750c01a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.418-servicing.23605.39 - 6.0.418-servicing.23605.39 + 6.0.418-servicing.23611.6 + 6.0.418-servicing.23611.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 36653344131b4cf870ec2560b60510d1ee90b667 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 11 Dec 2023 16:13:18 +0000 Subject: [PATCH 194/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231211.9 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.101 -> To Version 8.0.101 --- NuGet.config | 11 +++++++++-- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 18 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index adad3fa6c..f2da76ce8 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,24 +8,28 @@ + + + - + + @@ -48,16 +52,19 @@ + + - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 65eb038ed..343052fde 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - db838b3e994dca38ead37ce90b6ba13285ac687c + 103bbf1895aaa1f6947ca50ee1b4aa7da10349b2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - db838b3e994dca38ead37ce90b6ba13285ac687c + 103bbf1895aaa1f6947ca50ee1b4aa7da10349b2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - db838b3e994dca38ead37ce90b6ba13285ac687c + 103bbf1895aaa1f6947ca50ee1b4aa7da10349b2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - db838b3e994dca38ead37ce90b6ba13285ac687c + 103bbf1895aaa1f6947ca50ee1b4aa7da10349b2 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 8788362e8..4ff881841 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,8 +86,8 @@ 8.0.101 - 8.0.101-servicing.23607.3 - 8.0.101-servicing.23607.3 + 8.0.101-servicing.23611.9 + 8.0.101-servicing.23611.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 9003cd429054f0cccd53643955a6c63023d184b7 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 11 Dec 2023 16:14:25 +0000 Subject: [PATCH 195/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231211.7 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.115 -> To Version 7.0.115 --- NuGet.config | 18 ++++++++++++++++-- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 25 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index 637dd025e..805cabdda 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,21 +8,29 @@ + + + + + + - + + + @@ -44,14 +52,20 @@ + + + + - + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 64be1c99d..572de4dc3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c0aa76c865eb72b183247119752dfabca811f17a + 1d26c769c9167ac9012c3e1fc0be86c9acffbde5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c0aa76c865eb72b183247119752dfabca811f17a + 1d26c769c9167ac9012c3e1fc0be86c9acffbde5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c0aa76c865eb72b183247119752dfabca811f17a + 1d26c769c9167ac9012c3e1fc0be86c9acffbde5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c0aa76c865eb72b183247119752dfabca811f17a + 1d26c769c9167ac9012c3e1fc0be86c9acffbde5 diff --git a/eng/Versions.props b/eng/Versions.props index 0173becfd..ad3fcc7dc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.115 - 7.0.115-servicing.23601.25 - 7.0.115-servicing.23601.25 + 7.0.115-servicing.23611.7 + 7.0.115-servicing.23611.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 1f2f8af63bde80943c8ec0232361ec7df29e4ce8 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 11 Dec 2023 16:16:16 +0000 Subject: [PATCH 196/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231211.8 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.405 -> To Version 7.0.405 --- NuGet.config | 18 ++++++++++++++++-- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 25 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index 34760f138..7dbbb3ffb 100644 --- a/NuGet.config +++ b/NuGet.config @@ -11,18 +11,26 @@ + + + + + + - + + + @@ -44,14 +52,20 @@ + + + + - + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b6f25ee4e..78af48631 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6e7e4b10f05d98471ed979e481f515fa750c52ae + 0870ab3583ae88850fb0249e7a8ec0c1a3911eec - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6e7e4b10f05d98471ed979e481f515fa750c52ae + 0870ab3583ae88850fb0249e7a8ec0c1a3911eec - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6e7e4b10f05d98471ed979e481f515fa750c52ae + 0870ab3583ae88850fb0249e7a8ec0c1a3911eec - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6e7e4b10f05d98471ed979e481f515fa750c52ae + 0870ab3583ae88850fb0249e7a8ec0c1a3911eec diff --git a/eng/Versions.props b/eng/Versions.props index ca5ace3ec..aeb17304b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.405 - 7.0.405-servicing.23601.27 - 7.0.405-servicing.23601.27 + 7.0.405-servicing.23611.8 + 7.0.405-servicing.23611.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 44d4ecfd328d54a6f867e3fd8fbae991e904eb8d Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Thu, 14 Dec 2023 11:13:37 -0600 Subject: [PATCH 197/535] Add back security-partners-dotnet pipeline (#17955) --- .../pipelines/security-partners-dotnet.yml | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml diff --git a/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml b/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml new file mode 100644 index 000000000..562530c96 --- /dev/null +++ b/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml @@ -0,0 +1,33 @@ +# DO NOT DELETE: This is used to validate PRs in the internal security-partners-dotnet repo + +trigger: none + +variables: +- name: cfsNPMWarnLevel + value: none + +- name: cfsNugetWarnLevel + value: none + +- name: myGetWarnLevel + value: none + +- name: NuGetSecurityAnalysisWarningLevel + value: none + +jobs: +- template: ../../src/installer/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml + parameters: + architecture: x64 + excludeSdkContentTests: true + matrix: + Ubuntu1804-Offline: + _BootstrapPrep: false + _Container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04 + _EnablePoison: false + _ExcludeOmniSharpTests: false + _RunOnline: false + name: Build_Tarball_x64 + pool: + name: NetCore1ESPool-Svc-Internal + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 From e488f0c8cf38a7baf3d67d553c001be76b63e84d Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Thu, 14 Dec 2023 11:13:41 -0600 Subject: [PATCH 198/535] Add back security-partners-dotnet pipeline (#17956) --- .../pipelines/security-partners-dotnet.yml | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml diff --git a/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml b/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml new file mode 100644 index 000000000..844f876f6 --- /dev/null +++ b/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml @@ -0,0 +1,32 @@ +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: + Ubuntu2004-Offline: + _BootstrapPrep: true + _Container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-20.04 + _EnablePoison: false + _ExcludeOmniSharpTests: false + _RunOnline: false + _WithPreviousSDK: false + name: Build_Tarball_x64 + pool: + name: NetCore1ESPool-Svc-Internal + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 From bb1198154e30c20daea4357adcc8b0a3eb6f9c7f Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 18 Dec 2023 06:42:41 +0000 Subject: [PATCH 199/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231217.7 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.101 -> To Version 8.0.101 Dependency coherency updates Microsoft.NET.Test.Sdk From Version 17.8.0-release-23578-02 -> To Version 17.8.0-release-23615-02 (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 f2da76ce8..632fa4e58 100644 --- a/NuGet.config +++ b/NuGet.config @@ -25,7 +25,7 @@ - + @@ -60,7 +60,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 343052fde..4dc8833e7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 103bbf1895aaa1f6947ca50ee1b4aa7da10349b2 + e4b8a55b3346166a4e12b1160b844914248b3b8a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 103bbf1895aaa1f6947ca50ee1b4aa7da10349b2 + e4b8a55b3346166a4e12b1160b844914248b3b8a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 103bbf1895aaa1f6947ca50ee1b4aa7da10349b2 + e4b8a55b3346166a4e12b1160b844914248b3b8a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 103bbf1895aaa1f6947ca50ee1b4aa7da10349b2 + e4b8a55b3346166a4e12b1160b844914248b3b8a https://github.com/dotnet/test-templates @@ -141,9 +141,9 @@ 424e4b7cffb7656efd63f7a905a2498e39011104 - + https://github.com/microsoft/vstest - 3259862fadd5e784564e7d920a2d61a75f415a79 + aa59400b11e1aeee2e8af48928dbd48748a8bef9 diff --git a/eng/Versions.props b/eng/Versions.props index 4ff881841..2b0d28ac5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,8 +86,8 @@ 8.0.101 - 8.0.101-servicing.23611.9 - 8.0.101-servicing.23611.9 + 8.0.101-servicing.23617.7 + 8.0.101-servicing.23617.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -234,7 +234,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.8.0-release-23578-02 + 17.8.0-release-23615-02 8.0.0-alpha.1.22557.12 From 4fbf19326dbefe6c1ff09d121a3e0c39e20dfa0f Mon Sep 17 00:00:00 2001 From: Oleksandr Didyk Date: Wed, 20 Dec 2023 13:49:01 +0000 Subject: [PATCH 200/535] Merged PR 36036: Merge public release/8.0.1xx into internal Manual merge from public due to conflicts discovered by https://dev.azure.com/dnceng/internal/_build/results?buildId=2335710&view=results Resolves: - https://github.com/dotnet/source-build/issues/3802 - https://github.com/dotnet/source-build/issues/3804 --- src/SourceBuild/content/prep.sh | 1 + .../content/repo-projects/Directory.Build.props | 3 --- .../assets/SdkFileDiffExclusions.txt | 1 - .../assets/baselines/MsftToSbSdkFiles.diff | 8 -------- 4 files changed, 1 insertion(+), 12 deletions(-) diff --git a/src/SourceBuild/content/prep.sh b/src/SourceBuild/content/prep.sh index 472c348ae..a842566b2 100755 --- a/src/SourceBuild/content/prep.sh +++ b/src/SourceBuild/content/prep.sh @@ -156,6 +156,7 @@ function BootstrapArtifacts { # Check for the version of dotnet to install if [ "$installDotnet" == true ]; then echo " Installing dotnet..." + use_installed_dotnet_cli=false (source ./eng/common/tools.sh && InitializeDotNetCli true) fi diff --git a/src/SourceBuild/content/repo-projects/Directory.Build.props b/src/SourceBuild/content/repo-projects/Directory.Build.props index cdd195114..29747eaa0 100644 --- a/src/SourceBuild/content/repo-projects/Directory.Build.props +++ b/src/SourceBuild/content/repo-projects/Directory.Build.props @@ -111,9 +111,6 @@ - - - diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/SdkFileDiffExclusions.txt b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/SdkFileDiffExclusions.txt index 3000c80e8..6cf694f75 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/SdkFileDiffExclusions.txt +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/SdkFileDiffExclusions.txt @@ -45,7 +45,6 @@ sb,./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/*? # missing workload manifests - https://github.com/dotnet/source-build/issues/3242 msft,./sdk-manifests/x.y.z/microsoft.net.sdk.android/* -msft,./sdk-manifests/x.y.z/microsoft.net.sdk.aspire/* msft,./sdk-manifests/x.y.z/microsoft.net.sdk.ios/* msft,./sdk-manifests/x.y.z/microsoft.net.sdk.maccatalyst/* msft,./sdk-manifests/x.y.z/microsoft.net.sdk.macos/* 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 434883537..4c2d7775b 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 @@ -44,14 +44,6 @@ index ------------ ./packs/Microsoft.NETCore.App.Ref/ ./packs/Microsoft.NETCore.App.Ref/x.y.z/ ./packs/Microsoft.NETCore.App.Ref/x.y.z/analyzers/ -@@ ------------ @@ - ./packs/NETStandard.Library.Ref/x.y.z/ref/netstandard2.1/System.Xml.XPath.XDocument.dll - ./sdk-manifests/ - ./sdk-manifests/x.y.z/ --./sdk-manifests/x.y.z/ - ./sdk-manifests/x.y.z/microsoft.net.workload.emscripten.current/ - ./sdk-manifests/x.y.z/microsoft.net.workload.emscripten.current/x.y.z/ - ./sdk-manifests/x.y.z/microsoft.net.workload.emscripten.current/x.y.z/WorkloadManifest.json @@ ------------ @@ ./sdk/x.y.z/.version ./sdk/x.y.z/AppHostTemplate/ From 46bc6576aa335ef994e03b0e4bceb5db741bda6a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 20 Dec 2023 17:39:50 +0000 Subject: [PATCH 201/535] [release/7.0.4xx] Update dependencies from dotnet/arcade (#18011) [release/7.0.4xx] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/templates/job/job.yml | 2 +- eng/common/templates/job/publish-build-assets.yml | 2 +- eng/common/templates/post-build/post-build.yml | 4 ++-- global.json | 4 ++-- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5639ece9f..b29928cb2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - 28c80dc37ad1f33e5b0cca62d6a962ee130a1d09 + ef97d6e7478f4ae77cf6e827ee40e8c41120093c - + https://github.com/dotnet/arcade - 28c80dc37ad1f33e5b0cca62d6a962ee130a1d09 + ef97d6e7478f4ae77cf6e827ee40e8c41120093c - + https://github.com/dotnet/arcade - 28c80dc37ad1f33e5b0cca62d6a962ee130a1d09 + ef97d6e7478f4ae77cf6e827ee40e8c41120093c https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 9c86d8b84..f1e52762b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.23580.4 + 7.0.0-beta.23620.3 diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index ef337eac5..11c345c58 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -124,7 +124,7 @@ jobs: condition: and(succeeded(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT')) - ${{ if and(eq(parameters.runAsPublic, 'false'), eq(variables['System.TeamProject'], 'internal')) }}: - - task: NuGetAuthenticate@0 + - task: NuGetAuthenticate@1 - ${{ if or(eq(parameters.artifacts.download, 'true'), ne(parameters.artifacts.download, '')) }}: - task: DownloadPipelineArtifact@2 diff --git a/eng/common/templates/job/publish-build-assets.yml b/eng/common/templates/job/publish-build-assets.yml index e8c6c2d09..4ff83a536 100644 --- a/eng/common/templates/job/publish-build-assets.yml +++ b/eng/common/templates/job/publish-build-assets.yml @@ -72,7 +72,7 @@ jobs: condition: ${{ parameters.condition }} continueOnError: ${{ parameters.continueOnError }} - - task: NuGetAuthenticate@0 + - task: NuGetAuthenticate@1 - task: PowerShell@2 displayName: Enable cross-org NuGet feed authentication diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index c051f1b65..7b989985b 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -169,7 +169,7 @@ stages: # This is necessary whenever we want to publish/restore to an AzDO private feed # Since sdk-task.ps1 tries to restore packages we need to do this authentication here # otherwise it'll complain about accessing a private feed. - - task: NuGetAuthenticate@0 + - task: NuGetAuthenticate@1 displayName: 'Authenticate to AzDO Feeds' - task: PowerShell@2 @@ -272,7 +272,7 @@ stages: BARBuildId: ${{ parameters.BARBuildId }} PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - - task: NuGetAuthenticate@0 + - task: NuGetAuthenticate@1 - task: PowerShell@2 displayName: Publish Using Darc diff --git a/global.json b/global.json index d3f802679..73ab36895 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.23580.4", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23580.4" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23620.3", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23620.3" } } From fe9a639fb4b4509617a59f0d44a384478c5638fc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 20 Dec 2023 17:39:53 +0000 Subject: [PATCH 202/535] [release/7.0.3xx] Update dependencies from dotnet/arcade (#18012) [release/7.0.3xx] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/templates/job/job.yml | 2 +- eng/common/templates/job/publish-build-assets.yml | 2 +- eng/common/templates/post-build/post-build.yml | 4 ++-- global.json | 4 ++-- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d2ead3a98..6cc0c1769 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - 28c80dc37ad1f33e5b0cca62d6a962ee130a1d09 + ef97d6e7478f4ae77cf6e827ee40e8c41120093c - + https://github.com/dotnet/arcade - 28c80dc37ad1f33e5b0cca62d6a962ee130a1d09 + ef97d6e7478f4ae77cf6e827ee40e8c41120093c - + https://github.com/dotnet/arcade - 28c80dc37ad1f33e5b0cca62d6a962ee130a1d09 + ef97d6e7478f4ae77cf6e827ee40e8c41120093c https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index b2a622e42..a82728ae8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.23580.4 + 7.0.0-beta.23620.3 diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index ef337eac5..11c345c58 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -124,7 +124,7 @@ jobs: condition: and(succeeded(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT')) - ${{ if and(eq(parameters.runAsPublic, 'false'), eq(variables['System.TeamProject'], 'internal')) }}: - - task: NuGetAuthenticate@0 + - task: NuGetAuthenticate@1 - ${{ if or(eq(parameters.artifacts.download, 'true'), ne(parameters.artifacts.download, '')) }}: - task: DownloadPipelineArtifact@2 diff --git a/eng/common/templates/job/publish-build-assets.yml b/eng/common/templates/job/publish-build-assets.yml index e8c6c2d09..4ff83a536 100644 --- a/eng/common/templates/job/publish-build-assets.yml +++ b/eng/common/templates/job/publish-build-assets.yml @@ -72,7 +72,7 @@ jobs: condition: ${{ parameters.condition }} continueOnError: ${{ parameters.continueOnError }} - - task: NuGetAuthenticate@0 + - task: NuGetAuthenticate@1 - task: PowerShell@2 displayName: Enable cross-org NuGet feed authentication diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index c051f1b65..7b989985b 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -169,7 +169,7 @@ stages: # This is necessary whenever we want to publish/restore to an AzDO private feed # Since sdk-task.ps1 tries to restore packages we need to do this authentication here # otherwise it'll complain about accessing a private feed. - - task: NuGetAuthenticate@0 + - task: NuGetAuthenticate@1 displayName: 'Authenticate to AzDO Feeds' - task: PowerShell@2 @@ -272,7 +272,7 @@ stages: BARBuildId: ${{ parameters.BARBuildId }} PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - - task: NuGetAuthenticate@0 + - task: NuGetAuthenticate@1 - task: PowerShell@2 displayName: Publish Using Darc diff --git a/global.json b/global.json index d3f802679..73ab36895 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.23580.4", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23580.4" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23620.3", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23620.3" } } From a5d29aa28d7b26c687b41c519aa2ddd907aae969 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Tue, 2 Jan 2024 09:28:29 -0600 Subject: [PATCH 203/535] Update OmniSharp version being targeted for smoke tests (#18065) --- .../Microsoft.DotNet.SourceBuild.SmokeTests/OmniSharpTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/OmniSharpTests.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/OmniSharpTests.cs index 416a1e1ca..e140df73b 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/OmniSharpTests.cs +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/OmniSharpTests.cs @@ -19,7 +19,7 @@ namespace Microsoft.DotNet.SourceBuild.SmokeTests; public class OmniSharpTests : SdkTests { // Update version as new releases become available: https://github.com/OmniSharp/omnisharp-roslyn/releases - private const string OmniSharpReleaseVersion = "1.39.10"; + private const string OmniSharpReleaseVersion = "1.39.11"; private string OmniSharpDirectory { get; } = Path.Combine(Directory.GetCurrentDirectory(), nameof(OmniSharpTests)); From fc65f1f49b76c9e0a4af1b23d0a516cd7576db7c Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 2 Jan 2024 13:57:46 -0800 Subject: [PATCH 204/535] Update branding to 6.0.127 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 616f2592a..eaeeefcc7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 1 - 26 + 27 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From b015286fbf1aa466c5ea93ddafb2641d4c6b6eac Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 2 Jan 2024 13:57:51 -0800 Subject: [PATCH 205/535] Update branding to 6.0.322 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index c689826cd..a0544d921 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 3 - 21 + 22 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From 9c3dc27baa46731dfe71d44ebd14dac55a98036d Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 2 Jan 2024 13:57:55 -0800 Subject: [PATCH 206/535] Update branding to 6.0.419 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 6407cb843..50201197d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 4 - 18 + 19 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From 377a557649f9237e02ee15dc150e07a3ba567c12 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 2 Jan 2024 13:57:59 -0800 Subject: [PATCH 207/535] Update branding to 7.0.116 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index a42e5dcf5..192f8e1a5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 7 0 1 - 15 + 16 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing From 9a55503c824a8bca5589fb75188cafc41b0d1961 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 2 Jan 2024 13:58:04 -0800 Subject: [PATCH 208/535] Update branding to 7.0.313 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index a82728ae8..95123c15c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 7 0 3 - 12 + 13 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing From dbd23ce32317989b0b9e88c6f4687fe44ec82023 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 2 Jan 2024 13:58:08 -0800 Subject: [PATCH 209/535] Update branding to 7.0.406 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index f1e52762b..c1b89b449 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 7 0 4 - 05 + 06 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing From 9d6cf72414e1b210d818d4ef971aac50a2586e8d Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 2 Jan 2024 13:58:12 -0800 Subject: [PATCH 210/535] Update branding to 8.0.102 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index b2c7f72dc..625530b63 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 8 0 1 - 01 + 02 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) $(VersionMajor).$(VersionMinor) $(MajorMinorVersion).$(VersionSDKMinor) From a00eb249abe78c03fea6233cb69816ef6d3b3eab Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 3 Jan 2024 02:06:11 +0000 Subject: [PATCH 211/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240102.14 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.405 -> To Version 7.0.406 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index 7dbbb3ffb..a6f72ad66 100644 --- a/NuGet.config +++ b/NuGet.config @@ -25,7 +25,7 @@ - + @@ -61,7 +61,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 78af48631..2d5d1c21b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ e1aecaf3a332e25fae8cc7aa09d524b5e7c4a47a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0870ab3583ae88850fb0249e7a8ec0c1a3911eec + 042b8c0a71f901e4c7b1a0553051a53ac8fff5af - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0870ab3583ae88850fb0249e7a8ec0c1a3911eec + 042b8c0a71f901e4c7b1a0553051a53ac8fff5af - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0870ab3583ae88850fb0249e7a8ec0c1a3911eec + 042b8c0a71f901e4c7b1a0553051a53ac8fff5af - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0870ab3583ae88850fb0249e7a8ec0c1a3911eec + 042b8c0a71f901e4c7b1a0553051a53ac8fff5af diff --git a/eng/Versions.props b/eng/Versions.props index aeb17304b..3b941202d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.405 - 7.0.405-servicing.23611.8 - 7.0.405-servicing.23611.8 + 7.0.406 + 7.0.406-servicing.24052.14 + 7.0.406-servicing.24052.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 84b18839efb9701623863821888e4a9bf03a1a25 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 3 Jan 2024 06:57:22 +0000 Subject: [PATCH 212/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240102.23 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.405 -> To Version 7.0.406 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index a6f72ad66..1efb5d67c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -25,7 +25,7 @@ - + @@ -61,7 +61,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2d5d1c21b..63da6d03c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 042b8c0a71f901e4c7b1a0553051a53ac8fff5af + 3c459a3b2c699010fe00fae97bc389a3a8313297 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 042b8c0a71f901e4c7b1a0553051a53ac8fff5af + 3c459a3b2c699010fe00fae97bc389a3a8313297 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 042b8c0a71f901e4c7b1a0553051a53ac8fff5af + 3c459a3b2c699010fe00fae97bc389a3a8313297 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 042b8c0a71f901e4c7b1a0553051a53ac8fff5af + 3c459a3b2c699010fe00fae97bc389a3a8313297 diff --git a/eng/Versions.props b/eng/Versions.props index 3b941202d..92d1f82ba 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.406 - 7.0.406-servicing.24052.14 - 7.0.406-servicing.24052.14 + 7.0.406-servicing.24052.23 + 7.0.406-servicing.24052.23 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 2dc18cb432cdba2270648e737b8a423fd4160be2 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 3 Jan 2024 08:01:26 +0000 Subject: [PATCH 213/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240102.27 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.405 -> To Version 7.0.406 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index 1efb5d67c..9d7105801 100644 --- a/NuGet.config +++ b/NuGet.config @@ -25,7 +25,7 @@ - + @@ -61,7 +61,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 63da6d03c..c5dd10675 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3c459a3b2c699010fe00fae97bc389a3a8313297 + 3a4813d9c1bae86c7997a26db324d29320d0c7f2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3c459a3b2c699010fe00fae97bc389a3a8313297 + 3a4813d9c1bae86c7997a26db324d29320d0c7f2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3c459a3b2c699010fe00fae97bc389a3a8313297 + 3a4813d9c1bae86c7997a26db324d29320d0c7f2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3c459a3b2c699010fe00fae97bc389a3a8313297 + 3a4813d9c1bae86c7997a26db324d29320d0c7f2 diff --git a/eng/Versions.props b/eng/Versions.props index 92d1f82ba..dd7b31f87 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.406 - 7.0.406-servicing.24052.23 - 7.0.406-servicing.24052.23 + 7.0.406-servicing.24052.27 + 7.0.406-servicing.24052.27 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b8afc58d3344fb54cbd673150f2f1e0a65887ad4 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 3 Jan 2024 18:20:09 +0000 Subject: [PATCH 214/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240103.9 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.418-servicing.23605.39 -> To Version 6.0.419-servicing.24053.9 --- 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 c66ea58ee..f3ca7d908 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 766ee832e4d9d2d685414fceae96dca3c4e4dcbc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6786cd99de264e875529374067197c15c91767bf + ba6e93d72c9e5dd2161bcaa97df6a2d2616606a6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6786cd99de264e875529374067197c15c91767bf + ba6e93d72c9e5dd2161bcaa97df6a2d2616606a6 diff --git a/eng/Versions.props b/eng/Versions.props index 11750c01a..eb4ddd237 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.418-servicing.23611.6 - 6.0.418-servicing.23611.6 + 6.0.419-servicing.24053.9 + 6.0.419-servicing.24053.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f450eb5f270a90aec4e0822c26f0599df579939f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 4 Jan 2024 20:05:02 +0000 Subject: [PATCH 215/535] Update dependencies from https://github.com/dotnet/source-build-externals build 20240104.1 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 8.0.0-alpha.1.23570.1 -> To Version 8.0.0-alpha.1.24054.1 --- NuGet.config | 9 --------- eng/Version.Details.xml | 4 ++-- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index 71b75cf38..31081bc89 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,21 +7,16 @@ - - - - - @@ -42,15 +37,11 @@ - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0a2d6ca92..bd4df2042 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -193,9 +193,9 @@ 5957c5c5f85f17c145e7fab4ece37ad6aafcded9 - + https://github.com/dotnet/source-build-externals - e844aa02a05b90d8cbe499676ec6ee0f19ec4980 + 6c9557fbf18398d6f226bfd16ce3876f1fe2e940 From 426d535488294b863cd8beb8b17e47ec4eb23612 Mon Sep 17 00:00:00 2001 From: Nikola Milosavljevic Date: Tue, 9 Jan 2024 11:06:50 -0800 Subject: [PATCH 216/535] [release/8.0.1xx] Use SHA256 for RPM digest (#18111) --- src/core-sdk-tasks/BuildFPMToolPreReqs.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/core-sdk-tasks/BuildFPMToolPreReqs.cs b/src/core-sdk-tasks/BuildFPMToolPreReqs.cs index ec43d0ae3..b24fbfd10 100644 --- a/src/core-sdk-tasks/BuildFPMToolPreReqs.cs +++ b/src/core-sdk-tasks/BuildFPMToolPreReqs.cs @@ -101,6 +101,7 @@ namespace Microsoft.DotNet.Build.Tasks // -a : architecture --JSON // -d : is for all dependent packages. This can be used multiple times to specify the dependencies of the package. --JSON // --rpm-os : the operating system to target this rpm --Static + // --rpm-digest : rpm digest algorithm --Static // --rpm-changelog : the changelog from FILEPATH contents --ARG // --rpm-summary : it is the RPM summary that shows in the Title --JSON // --description : it is the description for the package --JSON @@ -157,6 +158,7 @@ namespace Microsoft.DotNet.Build.Tasks } parameters.Add("--rpm-os linux"); + parameters.Add("--rpm-digest sha256"); parameters.Add(string.Concat("--rpm-changelog ", EscapeArg(Path.Combine(InputDir, "templates", "changelog")))); // Changelog File parameters.Add(string.Concat("--rpm-summary ", EscapeArg(configJson.Short_Description))); From a30a69fea1834bc988cedd1a5577e6773e0833c9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 9 Jan 2024 19:50:00 +0000 Subject: [PATCH 217/535] Update dependencies from https://github.com/dotnet/source-build-externals build 20240109.1 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 7.0.0-alpha.1.22505.1 -> To Version 7.0.0-alpha.1.24059.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 6cc0c1769..0c9f7c70d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -180,9 +180,9 @@ c3ad00ae84489071080a606f6a8e43c9a91a5cc2 - + https://github.com/dotnet/source-build-externals - c47ba6c19d50081f90008da8bc61b3ac20348f20 + d6ad546c83ce94b3efb4662513bed71a3e6192ef From 802d734f374f7ae1a95a741dc1f38ba09fda0d27 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 9 Jan 2024 19:50:04 +0000 Subject: [PATCH 218/535] Update dependencies from https://github.com/dotnet/source-build-externals build 20240109.1 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 7.0.0-alpha.1.22505.1 -> To Version 7.0.0-alpha.1.24059.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 b29928cb2..f07547d28 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -180,9 +180,9 @@ c3ad00ae84489071080a606f6a8e43c9a91a5cc2 - + https://github.com/dotnet/source-build-externals - c47ba6c19d50081f90008da8bc61b3ac20348f20 + d6ad546c83ce94b3efb4662513bed71a3e6192ef 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 219/535] .NET Source-Build 6.0.126 January 2024 Updates (#18155) --- eng/Versions.props | 2 +- src/SourceBuild/tarball/content/global.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index eaeeefcc7..cc3f8afd0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -174,7 +174,7 @@ or minor release, prebuilts may be needed. When the release is mature, prebuilts are not necessary, and this property is removed from the file. --> - 6.0.125 + 6.0.126 diff --git a/src/SourceBuild/tarball/content/global.json b/src/SourceBuild/tarball/content/global.json index 06cde48c2..d503a61b9 100644 --- a/src/SourceBuild/tarball/content/global.json +++ b/src/SourceBuild/tarball/content/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.125" + "dotnet": "6.0.126" }, "msbuild-sdks": { "Microsoft.Build.CentralPackageVersions": "2.0.1", From 3168133a01772e53f66b7748511b284b950df57d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 9 Jan 2024 20:42:39 +0000 Subject: [PATCH 220/535] 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 0c9f7c70d..e36277abf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -180,9 +180,9 @@ c3ad00ae84489071080a606f6a8e43c9a91a5cc2 - + https://github.com/dotnet/source-build-externals - d6ad546c83ce94b3efb4662513bed71a3e6192ef + 4bed7bdd937666fac4c4f351b9b02adddf8d035b From 5ecf815011b53316e2e0e7b8b2d30df67c16d8b2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 9 Jan 2024 20:42:40 +0000 Subject: [PATCH 221/535] 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 f07547d28..394548a19 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -180,9 +180,9 @@ c3ad00ae84489071080a606f6a8e43c9a91a5cc2 - + https://github.com/dotnet/source-build-externals - d6ad546c83ce94b3efb4662513bed71a3e6192ef + 4bed7bdd937666fac4c4f351b9b02adddf8d035b From 8ddedbc99d939c737cfe7a84de62a756859643d0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 9 Jan 2024 20:46:09 +0000 Subject: [PATCH 222/535] Update dependencies from https://github.com/dotnet/source-build-externals build 20240109.2 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 7.0.0-alpha.1.22505.1 -> To Version 7.0.0-alpha.1.24059.2 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 327438c20..27a00eeb3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -176,9 +176,9 @@ c3ad00ae84489071080a606f6a8e43c9a91a5cc2 - + https://github.com/dotnet/source-build-externals - c47ba6c19d50081f90008da8bc61b3ac20348f20 + 4bed7bdd937666fac4c4f351b9b02adddf8d035b From b21afd145f9273598c6f2bc5ef76ef0c9785d39d Mon Sep 17 00:00:00 2001 From: NET Source-Build Bot <102560831+dotnet-sb-bot@users.noreply.github.com> Date: Tue, 9 Jan 2024 23:13:24 +0100 Subject: [PATCH 223/535] .NET Source-Build 7.0.115 January 2024 Updates (#18170) --- eng/Versions.props | 4 ++-- src/SourceBuild/tarball/content/global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 192f8e1a5..f821f79fd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -215,8 +215,8 @@ or minor release, prebuilts may be needed. When the release is mature, prebuilts are not necessary, and this property is removed from the file. --> - 7.0.114 - 7.0.114 + 7.0.115 + 7.0.115 diff --git a/src/SourceBuild/tarball/content/global.json b/src/SourceBuild/tarball/content/global.json index d508adc5c..ff635fdbf 100644 --- a/src/SourceBuild/tarball/content/global.json +++ b/src/SourceBuild/tarball/content/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.114" + "dotnet": "7.0.115" }, "msbuild-sdks": { "Microsoft.Build.CentralPackageVersions": "2.0.1", From 8e1ac043f8b4472ab7d95491d72003f3427abb9f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 10 Jan 2024 01:29:19 +0000 Subject: [PATCH 224/535] 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 6cc0c1769..b9d31b0bd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -205,9 +205,9 @@ https://github.com/dotnet/arcade ef97d6e7478f4ae77cf6e827ee40e8c41120093c - + https://github.com/dotnet/source-build-reference-packages - 6d5841c05f04d60eccf3358588b8c8968215d9e2 + 727ef4887d561dae6069d6b9c035773013dad041 From 41d248a950569d308a3579d72d8dd1569748b9b2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 10 Jan 2024 01:29:19 +0000 Subject: [PATCH 225/535] 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 b29928cb2..5406651dc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -205,9 +205,9 @@ https://github.com/dotnet/arcade ef97d6e7478f4ae77cf6e827ee40e8c41120093c - + https://github.com/dotnet/source-build-reference-packages - 6d5841c05f04d60eccf3358588b8c8968215d9e2 + 727ef4887d561dae6069d6b9c035773013dad041 From 0af62b4a31696be95e6fe8372bef45b967c1015a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 10 Jan 2024 01:29:21 +0000 Subject: [PATCH 226/535] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20240109.2 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 7.0.0-alpha.1.23578.1 -> To Version 7.0.0-alpha.1.24059.2 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 327438c20..843ca034c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -207,9 +207,9 @@ https://github.com/dotnet/arcade ca53a3149aaedb03e5d79ee0e259d31ac8719290 - + https://github.com/dotnet/source-build-reference-packages - 6d5841c05f04d60eccf3358588b8c8968215d9e2 + 727ef4887d561dae6069d6b9c035773013dad041 From fc2e444798b24c8018e9dc6bab3d6b37a15e2d08 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 10 Jan 2024 01:30:15 +0000 Subject: [PATCH 227/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240109.22 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.405 -> To Version 7.0.406 --- NuGet.config | 10 ++-------- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 11 insertions(+), 17 deletions(-) diff --git a/NuGet.config b/NuGet.config index 9d7105801..eda0f484e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,9 +10,6 @@ - - - @@ -25,7 +22,7 @@ - + @@ -52,16 +49,13 @@ - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c5dd10675..897c079e6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3a4813d9c1bae86c7997a26db324d29320d0c7f2 + 36895744a55d4807fcffd915abe98295df454750 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3a4813d9c1bae86c7997a26db324d29320d0c7f2 + 36895744a55d4807fcffd915abe98295df454750 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3a4813d9c1bae86c7997a26db324d29320d0c7f2 + 36895744a55d4807fcffd915abe98295df454750 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3a4813d9c1bae86c7997a26db324d29320d0c7f2 + 36895744a55d4807fcffd915abe98295df454750 diff --git a/eng/Versions.props b/eng/Versions.props index dd7b31f87..9999f88f6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.406 - 7.0.406-servicing.24052.27 - 7.0.406-servicing.24052.27 + 7.0.406-servicing.24059.22 + 7.0.406-servicing.24059.22 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 5c2dd5b5cc5243d5d2ec1b31bcfb6314351c7845 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 10 Jan 2024 01:31:14 +0000 Subject: [PATCH 228/535] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20240109.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22580.2 -> To Version 6.0.0-servicing.24059.1 --- NuGet.config | 16 ++++++++++++++-- eng/Version.Details.xml | 4 ++-- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/NuGet.config b/NuGet.config index 07d2ab1fe..a286d7217 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,21 +7,28 @@ - + + + + + + + + @@ -42,15 +49,20 @@ - + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5960f0e91..0478bcbf1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade 7c67805da0adbf4e72f2f4799b63efcf1cc8fe4c - + https://github.com/dotnet/source-build-reference-packages - a93f0b1b98f48057457f9532aa3d76f1565b5182 + 6425c284100043ea5829deb255811d3487a91fb6 From 4c34f145ba150bdd52b89be6d820992b217c3894 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 10 Jan 2024 01:53:36 +0000 Subject: [PATCH 229/535] 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.23620.3 -> To Version 7.0.0-beta.24059.5 --- 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 b29928cb2..e8e0535a5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - ef97d6e7478f4ae77cf6e827ee40e8c41120093c + 02d5538bac1bacfd6fb310d92ab8914de08f3358 - + https://github.com/dotnet/arcade - ef97d6e7478f4ae77cf6e827ee40e8c41120093c + 02d5538bac1bacfd6fb310d92ab8914de08f3358 - + https://github.com/dotnet/arcade - ef97d6e7478f4ae77cf6e827ee40e8c41120093c + 02d5538bac1bacfd6fb310d92ab8914de08f3358 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index c1b89b449..828e9255a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.23620.3 + 7.0.0-beta.24059.5 diff --git a/global.json b/global.json index 73ab36895..fd9164f9a 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.113", + "dotnet": "7.0.115", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23620.3", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23620.3" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24059.5", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24059.5" } } From c5024f481376f38a4b480409e908feb600706b77 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 10 Jan 2024 01:53:37 +0000 Subject: [PATCH 230/535] 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.23620.3 -> To Version 7.0.0-beta.24059.5 --- 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 6cc0c1769..7a1d9e0d6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - ef97d6e7478f4ae77cf6e827ee40e8c41120093c + 02d5538bac1bacfd6fb310d92ab8914de08f3358 - + https://github.com/dotnet/arcade - ef97d6e7478f4ae77cf6e827ee40e8c41120093c + 02d5538bac1bacfd6fb310d92ab8914de08f3358 - + https://github.com/dotnet/arcade - ef97d6e7478f4ae77cf6e827ee40e8c41120093c + 02d5538bac1bacfd6fb310d92ab8914de08f3358 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 95123c15c..36c28d660 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.23620.3 + 7.0.0-beta.24059.5 diff --git a/global.json b/global.json index 73ab36895..fd9164f9a 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.113", + "dotnet": "7.0.115", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23620.3", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23620.3" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24059.5", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24059.5" } } From 84bf31e6b224b3d4b6b9dcdfb23395493077f6e3 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 10 Jan 2024 03:46:02 +0000 Subject: [PATCH 231/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240109.30 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.405 -> To Version 7.0.406 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index eda0f484e..756fb70f3 100644 --- a/NuGet.config +++ b/NuGet.config @@ -22,7 +22,7 @@ - + @@ -55,7 +55,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 897c079e6..36f7b9973 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 36895744a55d4807fcffd915abe98295df454750 + d403a7098a331d2a073f911e66bc3e614e5e44ed - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 36895744a55d4807fcffd915abe98295df454750 + d403a7098a331d2a073f911e66bc3e614e5e44ed - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 36895744a55d4807fcffd915abe98295df454750 + d403a7098a331d2a073f911e66bc3e614e5e44ed - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 36895744a55d4807fcffd915abe98295df454750 + d403a7098a331d2a073f911e66bc3e614e5e44ed diff --git a/eng/Versions.props b/eng/Versions.props index 9999f88f6..60843f738 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.406 - 7.0.406-servicing.24059.22 - 7.0.406-servicing.24059.22 + 7.0.406-servicing.24059.30 + 7.0.406-servicing.24059.30 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 48bba8fffc8e4d4fbdbe99094458fc16fdb41dc0 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 10 Jan 2024 06:42:22 +0000 Subject: [PATCH 232/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240109.36 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.418-servicing.23605.39 -> To Version 6.0.419-servicing.24059.36 --- NuGet.config | 6 ------ eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index d802adb8c..a286d7217 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,9 +7,6 @@ - - - @@ -52,9 +49,6 @@ - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f3ca7d908..1793e147b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 766ee832e4d9d2d685414fceae96dca3c4e4dcbc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ba6e93d72c9e5dd2161bcaa97df6a2d2616606a6 + 27f723cb002f38336f60be5644dbe9e59cb2678a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ba6e93d72c9e5dd2161bcaa97df6a2d2616606a6 + 27f723cb002f38336f60be5644dbe9e59cb2678a diff --git a/eng/Versions.props b/eng/Versions.props index eb4ddd237..569c70432 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.419-servicing.24053.9 - 6.0.419-servicing.24053.9 + 6.0.419-servicing.24059.36 + 6.0.419-servicing.24059.36 $(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 233/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240109.34 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.405 -> To Version 7.0.406 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index 756fb70f3..44b1245c7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -22,7 +22,7 @@ - + @@ -55,7 +55,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 36f7b9973..456dadda3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d403a7098a331d2a073f911e66bc3e614e5e44ed + f8a7ad732e54f6f2f248ba3d7877afe6e8e1ec8c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d403a7098a331d2a073f911e66bc3e614e5e44ed + f8a7ad732e54f6f2f248ba3d7877afe6e8e1ec8c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d403a7098a331d2a073f911e66bc3e614e5e44ed + f8a7ad732e54f6f2f248ba3d7877afe6e8e1ec8c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d403a7098a331d2a073f911e66bc3e614e5e44ed + f8a7ad732e54f6f2f248ba3d7877afe6e8e1ec8c diff --git a/eng/Versions.props b/eng/Versions.props index 60843f738..e6ee7ad3c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.406 - 7.0.406-servicing.24059.30 - 7.0.406-servicing.24059.30 + 7.0.406-servicing.24059.34 + 7.0.406-servicing.24059.34 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 351592c3af1ddf81e5452dbf14eaaf89aa09b57f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C5=99emek=20Vysok=C3=BD?= Date: Wed, 10 Jan 2024 10:45:00 +0100 Subject: [PATCH 234/535] [release/8.0.1xx] Move VMR component list into `Components.md` (#18061) --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- .../templates/steps/vmr-pull-updates.yml | 2 +- eng/vmr-sync.sh | 14 +++++++------- .../content/README.md} | 12 +----------- src/VirtualMonoRepo/Component.template.md | 15 +++++++++++++++ src/VirtualMonoRepo/InitializeVMR.proj | 2 +- .../Tasks/VirtualMonoRepo_Initialize.cs | 4 ++-- 9 files changed, 33 insertions(+), 28 deletions(-) rename src/{VirtualMonoRepo/README.template.md => SourceBuild/content/README.md} (94%) create mode 100644 src/VirtualMonoRepo/Component.template.md diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 9394fd31e..b8aebb8b0 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.23578.2", + "version": "1.1.0-beta.23621.3", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bd4df2042..c62315654 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -227,13 +227,13 @@ https://github.com/dotnet/arcade 0aaeafef60933f87b0b50350313bb2fd77defb5d - + https://github.com/dotnet/arcade-services - 5263b603d90991a0c200aca8b8892c3d7cfe4751 + 702f946f89ace6197fdca2ac309d32187c4bc1bd - + https://github.com/dotnet/arcade-services - 5263b603d90991a0c200aca8b8892c3d7cfe4751 + 702f946f89ace6197fdca2ac309d32187c4bc1bd https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 625530b63..4b17a6b0d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 1.1.0-beta.23578.2 + 1.1.0-beta.23621.3 diff --git a/eng/pipelines/templates/steps/vmr-pull-updates.yml b/eng/pipelines/templates/steps/vmr-pull-updates.yml index debe748e6..ceeb1981a 100644 --- a/eng/pipelines/templates/steps/vmr-pull-updates.yml +++ b/eng/pipelines/templates/steps/vmr-pull-updates.yml @@ -44,7 +44,7 @@ steps: --repository "installer:${{ parameters.targetRef }}" --recursive --remote "installer:$(pwd)" - --readme-template $(Agent.BuildDirectory)/installer/src/VirtualMonoRepo/README.template.md + --component-template $(Agent.BuildDirectory)/installer/src/VirtualMonoRepo/Component.template.md --tpn-template $(Agent.BuildDirectory)/installer/src/VirtualMonoRepo/THIRD-PARTY-NOTICES.template.txt --debug displayName: Synchronize dotnet/dotnet diff --git a/eng/vmr-sync.sh b/eng/vmr-sync.sh index db0f704e2..92f34d690 100755 --- a/eng/vmr-sync.sh +++ b/eng/vmr-sync.sh @@ -33,10 +33,10 @@ ### --debug ### Optional. Turns on the most verbose logging for the VMR tooling ### -### --readme-template -### Optional. Template for VMRs README.md used for regenerating the file to list the newest versions of +### --component-template +### Optional. Template for VMRs Component.md used for regenerating the file to list the newest versions of ### components. -### Defaults to src/VirtualMonoRepo/README.template.md +### Defaults to src/VirtualMonoRepo/Component.template.md ### ### --recursive ### Optional. Recursively synchronize all the source build dependencies (declared in Version.Details.xml) @@ -103,7 +103,7 @@ repository='' additional_remotes='' recursive=false verbosity=verbose -readme_template="$installer_dir/src/VirtualMonoRepo/README.template.md" +readme_template="$installer_dir/src/VirtualMonoRepo/Component.template.md" tpn_template="$installer_dir/src/VirtualMonoRepo/THIRD-PARTY-NOTICES.template.txt" azdev_pat='' @@ -138,8 +138,8 @@ while [[ $# -gt 0 ]]; do additional_remotes="$additional_remotes $2" shift ;; - --readme-template) - readme_template=$2 + --component-template) + component_template=$2 shift ;; --tpn-template) @@ -266,7 +266,7 @@ fi --$verbosity \ $recursive_arg \ $additional_remotes \ - --readme-template "$readme_template" \ + --component-template "$component_template" \ --tpn-template "$tpn_template" \ "$repository" diff --git a/src/VirtualMonoRepo/README.template.md b/src/SourceBuild/content/README.md similarity index 94% rename from src/VirtualMonoRepo/README.template.md rename to src/SourceBuild/content/README.md index f23b92645..c83ad9a6d 100644 --- a/src/VirtualMonoRepo/README.template.md +++ b/src/SourceBuild/content/README.md @@ -152,17 +152,7 @@ To do this, you can start a [dotnet/dotnet](https://github.com/dotnet/dotnet) Co ## List of components -To enable full offline source-building of the VMR, we have no other choice than to synchronize all the necessary code into the VMR. This also includes any code referenced via git submodules. More details on why and how this is done can be found here: -- [Strategy for managing external source dependencies](src/arcade/Documentation/UnifiedBuild/VMR-Strategy-For-External-Source.md) -- [Source Synchronization Process](src/arcade/Documentation/UnifiedBuild/VMR-Design-And-Operation.md#source-synchronization-process) - -### Detailed list - - - -> Auto-generated list of components will go here - - +The full list of components synchronized into the VMR is [here (Components.md)](./Components.md). The repository also contains a [JSON manifest](https://github.com/dotnet/dotnet/blob/main/src/source-manifest.json) listing all components in a machine-readable format. diff --git a/src/VirtualMonoRepo/Component.template.md b/src/VirtualMonoRepo/Component.template.md new file mode 100644 index 000000000..27b0f7893 --- /dev/null +++ b/src/VirtualMonoRepo/Component.template.md @@ -0,0 +1,15 @@ +# List of components + +To enable full offline source-building of the VMR, we have no other choice than to synchronize all the necessary code into the VMR. This also includes any code referenced via git submodules. More details on why and how this is done can be found here: +- [Strategy for managing external source dependencies](src/arcade/Documentation/UnifiedBuild/VMR-Strategy-For-External-Source.md) +- [Source Synchronization Process](src/arcade/Documentation/UnifiedBuild/VMR-Design-And-Operation.md#source-synchronization-process) + +## Detailed list + + + +> Auto-generated list of components will go here + + + +The repository also contains a [JSON manifest](https://github.com/dotnet/dotnet/blob/main/src/source-manifest.json) listing all components in a machine-readable format. diff --git a/src/VirtualMonoRepo/InitializeVMR.proj b/src/VirtualMonoRepo/InitializeVMR.proj index 09ab72b1c..e3d98fc3c 100644 --- a/src/VirtualMonoRepo/InitializeVMR.proj +++ b/src/VirtualMonoRepo/InitializeVMR.proj @@ -58,7 +58,7 @@ VmrPath="$(VmrDir)" TmpPath="$(TmpDir)" InstallerPath="$(RepoRoot)" - ReadmeTemplatePath="$(MSBuildThisFileDirectory)/README.template.md" + ComponentTemplatePath="$(MSBuildThisFileDirectory)/Component.template.md" TpnTemplatePath="$(MSBuildThisFileDirectory)/THIRD-PARTY-NOTICES.template.txt" SourceMappingsPath="$(MSBuildThisFileDirectory)/source-mappings.json" /> diff --git a/src/VirtualMonoRepo/Tasks/VirtualMonoRepo_Initialize.cs b/src/VirtualMonoRepo/Tasks/VirtualMonoRepo_Initialize.cs index 2a8c1d726..5ab294231 100644 --- a/src/VirtualMonoRepo/Tasks/VirtualMonoRepo_Initialize.cs +++ b/src/VirtualMonoRepo/Tasks/VirtualMonoRepo_Initialize.cs @@ -42,7 +42,7 @@ public class VirtualMonoRepo_Initialize : Build.Utilities.Task, ICancelableTask public string InstallerPath { get; set; } - public string ReadmeTemplatePath { get; set; } + public string ComponentTemplatePath { get; set; } public string TpnTemplatePath { get; set; } @@ -72,7 +72,7 @@ public class VirtualMonoRepo_Initialize : Build.Utilities.Task, ICancelableTask Recursive, new NativePath(SourceMappingsPath), additionalRemotes, - ReadmeTemplatePath, + ComponentTemplatePath, TpnTemplatePath, generateCodeowners: false, discardPatches: true, From 3513a14922a0b38eb3ec27e4e5a695d4231016ed Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Wed, 10 Jan 2024 08:45:25 -0600 Subject: [PATCH 235/535] Revert change for internal update --- src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets index 0a9a2ddc0..34dea7b25 100644 --- a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets +++ b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets @@ -174,7 +174,7 @@ Date: Wed, 10 Jan 2024 08:45:59 -0600 Subject: [PATCH 236/535] Remove extra line --- src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets | 1 - 1 file changed, 1 deletion(-) diff --git a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets index 34dea7b25..dc33e0a03 100644 --- a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets +++ b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets @@ -172,7 +172,6 @@ WorkingDirectory="$(TarballRepoSourceDir)" Condition="$(IsRootRepo) != 'true'" /> - From 48bc53793dab3cc1b9a911044ab90117d858a4ae Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Wed, 10 Jan 2024 08:47:54 -0600 Subject: [PATCH 237/535] Revert change for internal update --- src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets index 0a9a2ddc0..dc33e0a03 100644 --- a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets +++ b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets @@ -172,9 +172,8 @@ WorkingDirectory="$(TarballRepoSourceDir)" Condition="$(IsRootRepo) != 'true'" /> - Date: Wed, 10 Jan 2024 08:49:09 -0600 Subject: [PATCH 238/535] Revert change for internal update --- src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets index 0a9a2ddc0..dc33e0a03 100644 --- a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets +++ b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets @@ -172,9 +172,8 @@ WorkingDirectory="$(TarballRepoSourceDir)" Condition="$(IsRootRepo) != 'true'" /> - Date: Wed, 10 Jan 2024 17:10:50 +0000 Subject: [PATCH 239/535] Update dependencies from https://github.com/dotnet/arcade build 20240109.5 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.23564.5 -> To Version 7.0.0-beta.24059.5 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/darc-init.ps1 | 2 +- eng/common/darc-init.sh | 2 +- eng/common/post-build/add-build-to-channel.ps1 | 2 +- eng/common/post-build/publish-using-darc.ps1 | 2 +- eng/common/post-build/trigger-subscriptions.ps1 | 2 +- eng/common/templates/job/job.yml | 2 +- eng/common/templates/job/publish-build-assets.yml | 4 ++-- eng/common/templates/jobs/source-build.yml | 2 +- eng/common/templates/post-build/common-variables.yml | 2 +- eng/common/templates/post-build/post-build.yml | 4 ++-- global.json | 6 +++--- 13 files changed, 22 insertions(+), 22 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 518959be5..4b3cc0e38 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -194,18 +194,18 @@ - + https://github.com/dotnet/arcade - ca53a3149aaedb03e5d79ee0e259d31ac8719290 + 02d5538bac1bacfd6fb310d92ab8914de08f3358 - + https://github.com/dotnet/arcade - ca53a3149aaedb03e5d79ee0e259d31ac8719290 + 02d5538bac1bacfd6fb310d92ab8914de08f3358 - + https://github.com/dotnet/arcade - ca53a3149aaedb03e5d79ee0e259d31ac8719290 + 02d5538bac1bacfd6fb310d92ab8914de08f3358 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index f821f79fd..06dbfaa6d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.23564.5 + 7.0.0-beta.24059.5 diff --git a/eng/common/darc-init.ps1 b/eng/common/darc-init.ps1 index 435e76413..8fda30bdc 100644 --- a/eng/common/darc-init.ps1 +++ b/eng/common/darc-init.ps1 @@ -1,6 +1,6 @@ param ( $darcVersion = $null, - $versionEndpoint = 'https://maestro-prod.westus2.cloudapp.azure.com/api/assets/darc-version?api-version=2019-01-16', + $versionEndpoint = 'https://maestro.dot.net/api/assets/darc-version?api-version=2019-01-16', $verbosity = 'minimal', $toolpath = $null ) diff --git a/eng/common/darc-init.sh b/eng/common/darc-init.sh index 84c1d0cc2..c305ae6bd 100755 --- a/eng/common/darc-init.sh +++ b/eng/common/darc-init.sh @@ -2,7 +2,7 @@ source="${BASH_SOURCE[0]}" darcVersion='' -versionEndpoint='https://maestro-prod.westus2.cloudapp.azure.com/api/assets/darc-version?api-version=2019-01-16' +versionEndpoint='https://maestro.dot.net/api/assets/darc-version?api-version=2019-01-16' verbosity='minimal' while [[ $# > 0 ]]; do diff --git a/eng/common/post-build/add-build-to-channel.ps1 b/eng/common/post-build/add-build-to-channel.ps1 index de2d95792..49938f0c8 100644 --- a/eng/common/post-build/add-build-to-channel.ps1 +++ b/eng/common/post-build/add-build-to-channel.ps1 @@ -2,7 +2,7 @@ param( [Parameter(Mandatory=$true)][int] $BuildId, [Parameter(Mandatory=$true)][int] $ChannelId, [Parameter(Mandatory=$true)][string] $MaestroApiAccessToken, - [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro-prod.westus2.cloudapp.azure.com', + [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro.dot.net', [Parameter(Mandatory=$false)][string] $MaestroApiVersion = '2019-01-16' ) diff --git a/eng/common/post-build/publish-using-darc.ps1 b/eng/common/post-build/publish-using-darc.ps1 index 8508397d7..1e779fec4 100644 --- a/eng/common/post-build/publish-using-darc.ps1 +++ b/eng/common/post-build/publish-using-darc.ps1 @@ -3,7 +3,7 @@ param( [Parameter(Mandatory=$true)][int] $PublishingInfraVersion, [Parameter(Mandatory=$true)][string] $AzdoToken, [Parameter(Mandatory=$true)][string] $MaestroToken, - [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro-prod.westus2.cloudapp.azure.com', + [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro.dot.net', [Parameter(Mandatory=$true)][string] $WaitPublishingFinish, [Parameter(Mandatory=$false)][string] $ArtifactsPublishingAdditionalParameters, [Parameter(Mandatory=$false)][string] $SymbolPublishingAdditionalParameters diff --git a/eng/common/post-build/trigger-subscriptions.ps1 b/eng/common/post-build/trigger-subscriptions.ps1 index 55dea518a..ac9a95778 100644 --- a/eng/common/post-build/trigger-subscriptions.ps1 +++ b/eng/common/post-build/trigger-subscriptions.ps1 @@ -2,7 +2,7 @@ param( [Parameter(Mandatory=$true)][string] $SourceRepo, [Parameter(Mandatory=$true)][int] $ChannelId, [Parameter(Mandatory=$true)][string] $MaestroApiAccessToken, - [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro-prod.westus2.cloudapp.azure.com', + [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro.dot.net', [Parameter(Mandatory=$false)][string] $MaestroApiVersion = '2019-01-16' ) diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index ef337eac5..11c345c58 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -124,7 +124,7 @@ jobs: condition: and(succeeded(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT')) - ${{ if and(eq(parameters.runAsPublic, 'false'), eq(variables['System.TeamProject'], 'internal')) }}: - - task: NuGetAuthenticate@0 + - task: NuGetAuthenticate@1 - ${{ if or(eq(parameters.artifacts.download, 'true'), ne(parameters.artifacts.download, '')) }}: - task: DownloadPipelineArtifact@2 diff --git a/eng/common/templates/job/publish-build-assets.yml b/eng/common/templates/job/publish-build-assets.yml index c5fedd7f7..4ff83a536 100644 --- a/eng/common/templates/job/publish-build-assets.yml +++ b/eng/common/templates/job/publish-build-assets.yml @@ -72,7 +72,7 @@ jobs: condition: ${{ parameters.condition }} continueOnError: ${{ parameters.continueOnError }} - - task: NuGetAuthenticate@0 + - task: NuGetAuthenticate@1 - task: PowerShell@2 displayName: Enable cross-org NuGet feed authentication @@ -87,7 +87,7 @@ jobs: arguments: -task PublishBuildAssets -restore -msbuildEngine dotnet /p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests' /p:BuildAssetRegistryToken=$(MaestroAccessToken) - /p:MaestroApiEndpoint=https://maestro-prod.westus2.cloudapp.azure.com + /p:MaestroApiEndpoint=https://maestro.dot.net /p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }} /p:OfficialBuildId=$(Build.BuildNumber) condition: ${{ parameters.condition }} diff --git a/eng/common/templates/jobs/source-build.yml b/eng/common/templates/jobs/source-build.yml index a15b07eb5..8dd2d355f 100644 --- a/eng/common/templates/jobs/source-build.yml +++ b/eng/common/templates/jobs/source-build.yml @@ -14,7 +14,7 @@ parameters: # This is the default platform provided by Arcade, intended for use by a managed-only repo. defaultManagedPlatform: name: 'Managed' - container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8' + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8-20220809204800-17a4aab' # Defines the platforms on which to run build jobs. One job is created for each platform, and the # object in this array is sent to the job template as 'platform'. If no platforms are specified, diff --git a/eng/common/templates/post-build/common-variables.yml b/eng/common/templates/post-build/common-variables.yml index 776bd9700..b504fe55c 100644 --- a/eng/common/templates/post-build/common-variables.yml +++ b/eng/common/templates/post-build/common-variables.yml @@ -10,7 +10,7 @@ variables: # Default Maestro++ API Endpoint and API Version - name: MaestroApiEndPoint - value: "https://maestro-prod.westus2.cloudapp.azure.com" + value: "https://maestro.dot.net" - name: MaestroApiAccessToken value: $(MaestroAccessToken) - name: MaestroApiVersion diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index c051f1b65..7b989985b 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -169,7 +169,7 @@ stages: # This is necessary whenever we want to publish/restore to an AzDO private feed # Since sdk-task.ps1 tries to restore packages we need to do this authentication here # otherwise it'll complain about accessing a private feed. - - task: NuGetAuthenticate@0 + - task: NuGetAuthenticate@1 displayName: 'Authenticate to AzDO Feeds' - task: PowerShell@2 @@ -272,7 +272,7 @@ stages: BARBuildId: ${{ parameters.BARBuildId }} PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - - task: NuGetAuthenticate@0 + - task: NuGetAuthenticate@1 - task: PowerShell@2 displayName: Publish Using Darc diff --git a/global.json b/global.json index 154f5f035..fd9164f9a 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.113", + "dotnet": "7.0.115", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23564.5", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23564.5" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24059.5", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24059.5" } } From aeb5cae516262a7a3bd67804667e6fd6a8f8d0de Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 10 Jan 2024 11:46:22 -0800 Subject: [PATCH 240/535] [release/6.0.1xx] Update dependencies from dotnet/arcade (#18200) Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 16 ++++++++++++++-- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/darc-init.ps1 | 2 +- eng/common/darc-init.sh | 2 +- eng/common/post-build/add-build-to-channel.ps1 | 2 +- eng/common/post-build/publish-using-darc.ps1 | 2 +- eng/common/post-build/trigger-subscriptions.ps1 | 2 +- eng/common/templates/job/job.yml | 2 +- .../templates/job/publish-build-assets.yml | 4 ++-- .../templates/post-build/common-variables.yml | 2 +- eng/common/templates/post-build/post-build.yml | 2 +- global.json | 6 +++--- 13 files changed, 34 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index e97435cf7..1aadfd0ee 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,21 +7,28 @@ - + + + + + + + + @@ -42,16 +49,21 @@ - + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b750cf329..1292acafd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - 7c67805da0adbf4e72f2f4799b63efcf1cc8fe4c + e5e9a01e6d0dcde2e945624bc1ba1bc05d2c1fc2 - + https://github.com/dotnet/arcade - 7c67805da0adbf4e72f2f4799b63efcf1cc8fe4c + e5e9a01e6d0dcde2e945624bc1ba1bc05d2c1fc2 - + https://github.com/dotnet/arcade - 7c67805da0adbf4e72f2f4799b63efcf1cc8fe4c + e5e9a01e6d0dcde2e945624bc1ba1bc05d2c1fc2 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index f11f8a785..337516a40 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.23517.3 + 6.0.0-beta.24059.3 diff --git a/eng/common/darc-init.ps1 b/eng/common/darc-init.ps1 index 435e76413..8fda30bdc 100644 --- a/eng/common/darc-init.ps1 +++ b/eng/common/darc-init.ps1 @@ -1,6 +1,6 @@ param ( $darcVersion = $null, - $versionEndpoint = 'https://maestro-prod.westus2.cloudapp.azure.com/api/assets/darc-version?api-version=2019-01-16', + $versionEndpoint = 'https://maestro.dot.net/api/assets/darc-version?api-version=2019-01-16', $verbosity = 'minimal', $toolpath = $null ) diff --git a/eng/common/darc-init.sh b/eng/common/darc-init.sh index 39abdbecd..4e4116f1d 100755 --- a/eng/common/darc-init.sh +++ b/eng/common/darc-init.sh @@ -2,7 +2,7 @@ source="${BASH_SOURCE[0]}" darcVersion='' -versionEndpoint='https://maestro-prod.westus2.cloudapp.azure.com/api/assets/darc-version?api-version=2019-01-16' +versionEndpoint='https://maestro.dot.net/api/assets/darc-version?api-version=2019-01-16' verbosity='minimal' while [[ $# > 0 ]]; do diff --git a/eng/common/post-build/add-build-to-channel.ps1 b/eng/common/post-build/add-build-to-channel.ps1 index de2d95792..49938f0c8 100644 --- a/eng/common/post-build/add-build-to-channel.ps1 +++ b/eng/common/post-build/add-build-to-channel.ps1 @@ -2,7 +2,7 @@ param( [Parameter(Mandatory=$true)][int] $BuildId, [Parameter(Mandatory=$true)][int] $ChannelId, [Parameter(Mandatory=$true)][string] $MaestroApiAccessToken, - [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro-prod.westus2.cloudapp.azure.com', + [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro.dot.net', [Parameter(Mandatory=$false)][string] $MaestroApiVersion = '2019-01-16' ) diff --git a/eng/common/post-build/publish-using-darc.ps1 b/eng/common/post-build/publish-using-darc.ps1 index 8508397d7..1e779fec4 100644 --- a/eng/common/post-build/publish-using-darc.ps1 +++ b/eng/common/post-build/publish-using-darc.ps1 @@ -3,7 +3,7 @@ param( [Parameter(Mandatory=$true)][int] $PublishingInfraVersion, [Parameter(Mandatory=$true)][string] $AzdoToken, [Parameter(Mandatory=$true)][string] $MaestroToken, - [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro-prod.westus2.cloudapp.azure.com', + [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro.dot.net', [Parameter(Mandatory=$true)][string] $WaitPublishingFinish, [Parameter(Mandatory=$false)][string] $ArtifactsPublishingAdditionalParameters, [Parameter(Mandatory=$false)][string] $SymbolPublishingAdditionalParameters diff --git a/eng/common/post-build/trigger-subscriptions.ps1 b/eng/common/post-build/trigger-subscriptions.ps1 index 55dea518a..ac9a95778 100644 --- a/eng/common/post-build/trigger-subscriptions.ps1 +++ b/eng/common/post-build/trigger-subscriptions.ps1 @@ -2,7 +2,7 @@ param( [Parameter(Mandatory=$true)][string] $SourceRepo, [Parameter(Mandatory=$true)][int] $ChannelId, [Parameter(Mandatory=$true)][string] $MaestroApiAccessToken, - [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro-prod.westus2.cloudapp.azure.com', + [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro.dot.net', [Parameter(Mandatory=$false)][string] $MaestroApiVersion = '2019-01-16' ) diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index 0e10e7db6..01da2420d 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -123,7 +123,7 @@ jobs: continueOnError: ${{ parameters.continueOnError }} condition: and(succeeded(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT')) - - task: NuGetAuthenticate@0 + - task: NuGetAuthenticate@1 - ${{ if or(eq(parameters.artifacts.download, 'true'), ne(parameters.artifacts.download, '')) }}: - task: DownloadPipelineArtifact@2 diff --git a/eng/common/templates/job/publish-build-assets.yml b/eng/common/templates/job/publish-build-assets.yml index d91bf9147..239b17010 100644 --- a/eng/common/templates/job/publish-build-assets.yml +++ b/eng/common/templates/job/publish-build-assets.yml @@ -53,7 +53,7 @@ jobs: continueOnError: ${{ parameters.continueOnError }} - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - task: NuGetAuthenticate@0 + - task: NuGetAuthenticate@1 - task: PowerShell@2 displayName: Enable cross-org NuGet feed authentication @@ -68,7 +68,7 @@ jobs: arguments: -task PublishBuildAssets -restore -msbuildEngine dotnet /p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests' /p:BuildAssetRegistryToken=$(MaestroAccessToken) - /p:MaestroApiEndpoint=https://maestro-prod.westus2.cloudapp.azure.com + /p:MaestroApiEndpoint=https://maestro.dot.net /p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }} /p:Configuration=$(_BuildConfig) /p:OfficialBuildId=$(Build.BuildNumber) diff --git a/eng/common/templates/post-build/common-variables.yml b/eng/common/templates/post-build/common-variables.yml index 1ac7f49a4..fae340f4d 100644 --- a/eng/common/templates/post-build/common-variables.yml +++ b/eng/common/templates/post-build/common-variables.yml @@ -11,7 +11,7 @@ variables: # Default Maestro++ API Endpoint and API Version - name: MaestroApiEndPoint - value: "https://maestro-prod.westus2.cloudapp.azure.com" + value: "https://maestro.dot.net" - name: MaestroApiAccessToken value: $(MaestroAccessToken) - name: MaestroApiVersion diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index fc022ca9b..d49c6156b 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -162,7 +162,7 @@ stages: # This is necessary whenever we want to publish/restore to an AzDO private feed # Since sdk-task.ps1 tries to restore packages we need to do this authentication here # otherwise it'll complain about accessing a private feed. - - task: NuGetAuthenticate@0 + - task: NuGetAuthenticate@1 displayName: 'Authenticate to AzDO Feeds' - task: PowerShell@2 diff --git a/global.json b/global.json index 1410185dd..8bf2c6315 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.123", + "dotnet": "6.0.126", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23517.3", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.23517.3" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24059.3", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.24059.3" } } From 9bfe9ba33ea880945a44d06a23a54bec991f36f2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 10 Jan 2024 11:46:50 -0800 Subject: [PATCH 241/535] [release/6.0.4xx] Update dependencies from dotnet/arcade (#18198) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/darc-init.ps1 | 2 +- eng/common/darc-init.sh | 2 +- eng/common/post-build/add-build-to-channel.ps1 | 2 +- eng/common/post-build/publish-using-darc.ps1 | 2 +- eng/common/post-build/trigger-subscriptions.ps1 | 2 +- eng/common/templates/job/job.yml | 2 +- eng/common/templates/job/publish-build-assets.yml | 4 ++-- eng/common/templates/post-build/common-variables.yml | 2 +- eng/common/templates/post-build/post-build.yml | 2 +- global.json | 6 +++--- 12 files changed, 20 insertions(+), 20 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0478bcbf1..72a435584 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - 7c67805da0adbf4e72f2f4799b63efcf1cc8fe4c + e5e9a01e6d0dcde2e945624bc1ba1bc05d2c1fc2 - + https://github.com/dotnet/arcade - 7c67805da0adbf4e72f2f4799b63efcf1cc8fe4c + e5e9a01e6d0dcde2e945624bc1ba1bc05d2c1fc2 - + https://github.com/dotnet/arcade - 7c67805da0adbf4e72f2f4799b63efcf1cc8fe4c + e5e9a01e6d0dcde2e945624bc1ba1bc05d2c1fc2 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index c9fa2f63b..a3aef0fc8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.23517.3 + 6.0.0-beta.24059.3 diff --git a/eng/common/darc-init.ps1 b/eng/common/darc-init.ps1 index 435e76413..8fda30bdc 100644 --- a/eng/common/darc-init.ps1 +++ b/eng/common/darc-init.ps1 @@ -1,6 +1,6 @@ param ( $darcVersion = $null, - $versionEndpoint = 'https://maestro-prod.westus2.cloudapp.azure.com/api/assets/darc-version?api-version=2019-01-16', + $versionEndpoint = 'https://maestro.dot.net/api/assets/darc-version?api-version=2019-01-16', $verbosity = 'minimal', $toolpath = $null ) diff --git a/eng/common/darc-init.sh b/eng/common/darc-init.sh index 39abdbecd..4e4116f1d 100755 --- a/eng/common/darc-init.sh +++ b/eng/common/darc-init.sh @@ -2,7 +2,7 @@ source="${BASH_SOURCE[0]}" darcVersion='' -versionEndpoint='https://maestro-prod.westus2.cloudapp.azure.com/api/assets/darc-version?api-version=2019-01-16' +versionEndpoint='https://maestro.dot.net/api/assets/darc-version?api-version=2019-01-16' verbosity='minimal' while [[ $# > 0 ]]; do diff --git a/eng/common/post-build/add-build-to-channel.ps1 b/eng/common/post-build/add-build-to-channel.ps1 index de2d95792..49938f0c8 100644 --- a/eng/common/post-build/add-build-to-channel.ps1 +++ b/eng/common/post-build/add-build-to-channel.ps1 @@ -2,7 +2,7 @@ param( [Parameter(Mandatory=$true)][int] $BuildId, [Parameter(Mandatory=$true)][int] $ChannelId, [Parameter(Mandatory=$true)][string] $MaestroApiAccessToken, - [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro-prod.westus2.cloudapp.azure.com', + [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro.dot.net', [Parameter(Mandatory=$false)][string] $MaestroApiVersion = '2019-01-16' ) diff --git a/eng/common/post-build/publish-using-darc.ps1 b/eng/common/post-build/publish-using-darc.ps1 index 8508397d7..1e779fec4 100644 --- a/eng/common/post-build/publish-using-darc.ps1 +++ b/eng/common/post-build/publish-using-darc.ps1 @@ -3,7 +3,7 @@ param( [Parameter(Mandatory=$true)][int] $PublishingInfraVersion, [Parameter(Mandatory=$true)][string] $AzdoToken, [Parameter(Mandatory=$true)][string] $MaestroToken, - [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro-prod.westus2.cloudapp.azure.com', + [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro.dot.net', [Parameter(Mandatory=$true)][string] $WaitPublishingFinish, [Parameter(Mandatory=$false)][string] $ArtifactsPublishingAdditionalParameters, [Parameter(Mandatory=$false)][string] $SymbolPublishingAdditionalParameters diff --git a/eng/common/post-build/trigger-subscriptions.ps1 b/eng/common/post-build/trigger-subscriptions.ps1 index 55dea518a..ac9a95778 100644 --- a/eng/common/post-build/trigger-subscriptions.ps1 +++ b/eng/common/post-build/trigger-subscriptions.ps1 @@ -2,7 +2,7 @@ param( [Parameter(Mandatory=$true)][string] $SourceRepo, [Parameter(Mandatory=$true)][int] $ChannelId, [Parameter(Mandatory=$true)][string] $MaestroApiAccessToken, - [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro-prod.westus2.cloudapp.azure.com', + [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro.dot.net', [Parameter(Mandatory=$false)][string] $MaestroApiVersion = '2019-01-16' ) diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index 0e10e7db6..01da2420d 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -123,7 +123,7 @@ jobs: continueOnError: ${{ parameters.continueOnError }} condition: and(succeeded(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT')) - - task: NuGetAuthenticate@0 + - task: NuGetAuthenticate@1 - ${{ if or(eq(parameters.artifacts.download, 'true'), ne(parameters.artifacts.download, '')) }}: - task: DownloadPipelineArtifact@2 diff --git a/eng/common/templates/job/publish-build-assets.yml b/eng/common/templates/job/publish-build-assets.yml index d91bf9147..239b17010 100644 --- a/eng/common/templates/job/publish-build-assets.yml +++ b/eng/common/templates/job/publish-build-assets.yml @@ -53,7 +53,7 @@ jobs: continueOnError: ${{ parameters.continueOnError }} - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - task: NuGetAuthenticate@0 + - task: NuGetAuthenticate@1 - task: PowerShell@2 displayName: Enable cross-org NuGet feed authentication @@ -68,7 +68,7 @@ jobs: arguments: -task PublishBuildAssets -restore -msbuildEngine dotnet /p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests' /p:BuildAssetRegistryToken=$(MaestroAccessToken) - /p:MaestroApiEndpoint=https://maestro-prod.westus2.cloudapp.azure.com + /p:MaestroApiEndpoint=https://maestro.dot.net /p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }} /p:Configuration=$(_BuildConfig) /p:OfficialBuildId=$(Build.BuildNumber) diff --git a/eng/common/templates/post-build/common-variables.yml b/eng/common/templates/post-build/common-variables.yml index 1ac7f49a4..fae340f4d 100644 --- a/eng/common/templates/post-build/common-variables.yml +++ b/eng/common/templates/post-build/common-variables.yml @@ -11,7 +11,7 @@ variables: # Default Maestro++ API Endpoint and API Version - name: MaestroApiEndPoint - value: "https://maestro-prod.westus2.cloudapp.azure.com" + value: "https://maestro.dot.net" - name: MaestroApiAccessToken value: $(MaestroAccessToken) - name: MaestroApiVersion diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index fc022ca9b..d49c6156b 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -162,7 +162,7 @@ stages: # This is necessary whenever we want to publish/restore to an AzDO private feed # Since sdk-task.ps1 tries to restore packages we need to do this authentication here # otherwise it'll complain about accessing a private feed. - - task: NuGetAuthenticate@0 + - task: NuGetAuthenticate@1 displayName: 'Authenticate to AzDO Feeds' - task: PowerShell@2 diff --git a/global.json b/global.json index 1410185dd..8bf2c6315 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.123", + "dotnet": "6.0.126", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23517.3", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.23517.3" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24059.3", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.24059.3" } } From e6ae75cdf5d2f4ab0f16e17372e14d6e13658fcd 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:47:11 -0800 Subject: [PATCH 242/535] [release/8.0.1xx] Update dependencies from dotnet/arcade (#18197) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/templates/job/job.yml | 2 +- eng/common/templates/job/publish-build-assets.yml | 2 +- eng/common/templates/post-build/post-build.yml | 4 ++-- eng/common/tools.ps1 | 10 +++++++++- eng/common/tools.sh | 7 ++++++- global.json | 6 +++--- 8 files changed, 29 insertions(+), 16 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c62315654..bc4f89993 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -214,18 +214,18 @@ - + https://github.com/dotnet/arcade - 0aaeafef60933f87b0b50350313bb2fd77defb5d + 61ae141d2bf3534619265c8f691fd55dc3e75147 - + https://github.com/dotnet/arcade - 0aaeafef60933f87b0b50350313bb2fd77defb5d + 61ae141d2bf3534619265c8f691fd55dc3e75147 - + https://github.com/dotnet/arcade - 0aaeafef60933f87b0b50350313bb2fd77defb5d + 61ae141d2bf3534619265c8f691fd55dc3e75147 https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index 4b17a6b0d..483cf5b57 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,7 +40,7 @@ - 8.0.0-beta.23564.4 + 8.0.0-beta.24059.4 diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index e20ee3a98..e24ca2f46 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -136,7 +136,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 and(ne(parameters.artifacts.download, 'false'), 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 bb0d9f8b0..fa5446c09 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: Publish Build Assets diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index ef720f9d7..3f74abf7c 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' # Signing validation will optionally work with the buildmanifest file which is downloaded from @@ -266,7 +266,7 @@ stages: BARBuildId: ${{ parameters.BARBuildId }} PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - - task: NuGetAuthenticate@0 + - task: NuGetAuthenticate@1 - task: PowerShell@2 displayName: Publish Using Darc diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index fdd0cbb91..eb188cfda 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -601,7 +601,15 @@ function InitializeBuildTool() { ExitWithExitCode 1 } $dotnetPath = Join-Path $dotnetRoot (GetExecutableFileName 'dotnet') - $buildTool = @{ Path = $dotnetPath; Command = 'msbuild'; Tool = 'dotnet'; Framework = 'net8.0' } + + # Use override if it exists - commonly set by source-build + if ($null -eq $env:_OverrideArcadeInitializeBuildToolFramework) { + $initializeBuildToolFramework="net8.0" + } else { + $initializeBuildToolFramework=$env:_OverrideArcadeInitializeBuildToolFramework + } + + $buildTool = @{ Path = $dotnetPath; Command = 'msbuild'; Tool = 'dotnet'; Framework = $initializeBuildToolFramework } } elseif ($msbuildEngine -eq "vs") { try { $msbuildPath = InitializeVisualStudioMSBuild -install:$restore diff --git a/eng/common/tools.sh b/eng/common/tools.sh index e8d478943..3392e3a99 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -341,7 +341,12 @@ function InitializeBuildTool { # return values _InitializeBuildTool="$_InitializeDotNetCli/dotnet" _InitializeBuildToolCommand="msbuild" - _InitializeBuildToolFramework="net8.0" + # use override if it exists - commonly set by source-build + if [[ "${_OverrideArcadeInitializeBuildToolFramework:-x}" == "x" ]]; then + _InitializeBuildToolFramework="net8.0" + else + _InitializeBuildToolFramework="${_OverrideArcadeInitializeBuildToolFramework}" + fi } # Set RestoreNoCache as a workaround for https://github.com/NuGet/Home/issues/3116 diff --git a/global.json b/global.json index 88256e459..52a0f29ec 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "8.0.100", + "dotnet": "8.0.101", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23564.4", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23564.4" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24059.4", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24059.4" } } From e33a1900c70c8cedf44a8b6dc2427d807307ccc1 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 10 Jan 2024 21:46:09 +0000 Subject: [PATCH 243/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240102.13 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.115 -> To Version 7.0.116 --- NuGet.config | 10 ++-------- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 3 files changed, 13 insertions(+), 19 deletions(-) diff --git a/NuGet.config b/NuGet.config index 805cabdda..c540d5b6a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,9 +7,6 @@ - - - @@ -25,7 +22,7 @@ - + @@ -52,16 +49,13 @@ - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 69806ea23..986a7a319 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ aaaa0c1826f97a9dfcc67e94136bf01010b55f23 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1d26c769c9167ac9012c3e1fc0be86c9acffbde5 + 86cfebd55c61090f03b1dbc23726f223780f6277 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1d26c769c9167ac9012c3e1fc0be86c9acffbde5 + 86cfebd55c61090f03b1dbc23726f223780f6277 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1d26c769c9167ac9012c3e1fc0be86c9acffbde5 + 86cfebd55c61090f03b1dbc23726f223780f6277 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1d26c769c9167ac9012c3e1fc0be86c9acffbde5 + 86cfebd55c61090f03b1dbc23726f223780f6277 diff --git a/eng/Versions.props b/eng/Versions.props index aa6ecfe70..b065f63a8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.115 - 7.0.115-servicing.23611.7 - 7.0.115-servicing.23611.7 + 7.0.116 + 7.0.116-servicing.24052.13 + 7.0.116-servicing.24052.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e6b3619857a42c31572cec730efa103ddca4e406 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 10 Jan 2024 21:46:26 +0000 Subject: [PATCH 244/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240109.23 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.116 -> To Version 7.0.116 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index c540d5b6a..76a1552bc 100644 --- a/NuGet.config +++ b/NuGet.config @@ -22,7 +22,7 @@ - + @@ -55,7 +55,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 986a7a319..252b3b23b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 86cfebd55c61090f03b1dbc23726f223780f6277 + 91cd67046410b063fc65d3ef8e9ec816019e6b87 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 86cfebd55c61090f03b1dbc23726f223780f6277 + 91cd67046410b063fc65d3ef8e9ec816019e6b87 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 86cfebd55c61090f03b1dbc23726f223780f6277 + 91cd67046410b063fc65d3ef8e9ec816019e6b87 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 86cfebd55c61090f03b1dbc23726f223780f6277 + 91cd67046410b063fc65d3ef8e9ec816019e6b87 diff --git a/eng/Versions.props b/eng/Versions.props index b065f63a8..163cdd2e5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.116 - 7.0.116-servicing.24052.13 - 7.0.116-servicing.24052.13 + 7.0.116-servicing.24059.23 + 7.0.116-servicing.24059.23 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From abee5165c426305371352152fe74c4b976a8af4e Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 10 Jan 2024 21:46:29 +0000 Subject: [PATCH 245/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240102.15 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.101 -> To Version 8.0.102 --- 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 632fa4e58..3a72278bc 100644 --- a/NuGet.config +++ b/NuGet.config @@ -25,7 +25,7 @@ - + @@ -60,7 +60,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4dc8833e7..8e6889225 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 8e941eb42f819adb116b881195158b3887a70a1c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e4b8a55b3346166a4e12b1160b844914248b3b8a + cc7a22e2b6321235c518b476bb6cea5785bbfd92 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e4b8a55b3346166a4e12b1160b844914248b3b8a + cc7a22e2b6321235c518b476bb6cea5785bbfd92 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e4b8a55b3346166a4e12b1160b844914248b3b8a + cc7a22e2b6321235c518b476bb6cea5785bbfd92 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e4b8a55b3346166a4e12b1160b844914248b3b8a + cc7a22e2b6321235c518b476bb6cea5785bbfd92 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 2b0d28ac5..b9ccc95b9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.101 - 8.0.101-servicing.23617.7 - 8.0.101-servicing.23617.7 + 8.0.102 + 8.0.102-servicing.24052.15 + 8.0.102-servicing.24052.15 $(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 246/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240110.20 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.116 -> To Version 7.0.116 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index 76a1552bc..cddbc2bcf 100644 --- a/NuGet.config +++ b/NuGet.config @@ -22,7 +22,7 @@ - + @@ -55,7 +55,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 252b3b23b..38e81f8dc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 91cd67046410b063fc65d3ef8e9ec816019e6b87 + 9d7476029043125e1f2acb5477c99b1d2710f12c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 91cd67046410b063fc65d3ef8e9ec816019e6b87 + 9d7476029043125e1f2acb5477c99b1d2710f12c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 91cd67046410b063fc65d3ef8e9ec816019e6b87 + 9d7476029043125e1f2acb5477c99b1d2710f12c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 91cd67046410b063fc65d3ef8e9ec816019e6b87 + 9d7476029043125e1f2acb5477c99b1d2710f12c diff --git a/eng/Versions.props b/eng/Versions.props index 163cdd2e5..fdf41eb71 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.116 - 7.0.116-servicing.24059.23 - 7.0.116-servicing.24059.23 + 7.0.116-servicing.24060.20 + 7.0.116-servicing.24060.20 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 207f9ee61dbe6da4a76107614e10cd35a068b926 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 10 Jan 2024 21:46:48 +0000 Subject: [PATCH 247/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240102.22 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.102 -> To Version 8.0.102 --- 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 3a72278bc..896e19cb2 100644 --- a/NuGet.config +++ b/NuGet.config @@ -25,7 +25,7 @@ - + @@ -60,7 +60,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8e6889225..6febbcc43 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - cc7a22e2b6321235c518b476bb6cea5785bbfd92 + b5c6ffe329d3e20d36fac395cc2263c955539248 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - cc7a22e2b6321235c518b476bb6cea5785bbfd92 + b5c6ffe329d3e20d36fac395cc2263c955539248 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - cc7a22e2b6321235c518b476bb6cea5785bbfd92 + b5c6ffe329d3e20d36fac395cc2263c955539248 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - cc7a22e2b6321235c518b476bb6cea5785bbfd92 + b5c6ffe329d3e20d36fac395cc2263c955539248 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index b9ccc95b9..055e0e230 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,8 +86,8 @@ 8.0.102 - 8.0.102-servicing.24052.15 - 8.0.102-servicing.24052.15 + 8.0.102-servicing.24052.22 + 8.0.102-servicing.24052.22 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From d0308b1908d7bc994582b332b56c95d8cb9db06b Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 10 Jan 2024 21:47:04 +0000 Subject: [PATCH 248/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240102.29 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.102 -> To Version 8.0.102 --- 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 896e19cb2..8c63555ef 100644 --- a/NuGet.config +++ b/NuGet.config @@ -25,7 +25,7 @@ - + @@ -60,7 +60,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6febbcc43..92a83d983 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b5c6ffe329d3e20d36fac395cc2263c955539248 + 58f59ea5e2d7ba348875bdc9e292dd951cb90327 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b5c6ffe329d3e20d36fac395cc2263c955539248 + 58f59ea5e2d7ba348875bdc9e292dd951cb90327 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b5c6ffe329d3e20d36fac395cc2263c955539248 + 58f59ea5e2d7ba348875bdc9e292dd951cb90327 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b5c6ffe329d3e20d36fac395cc2263c955539248 + 58f59ea5e2d7ba348875bdc9e292dd951cb90327 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 055e0e230..f9975fc62 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,8 +86,8 @@ 8.0.102 - 8.0.102-servicing.24052.22 - 8.0.102-servicing.24052.22 + 8.0.102-servicing.24052.29 + 8.0.102-servicing.24052.29 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 3db030fa398e5fb8e9395f91f608cdaae7c537af Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 10 Jan 2024 21:47:05 +0000 Subject: [PATCH 249/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240110.21 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.126-servicing.23605.37 -> To Version 6.0.127-servicing.24060.21 --- 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 1292acafd..016d79342 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 28656189e49c05368afda92b482da8c0049d5638 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3f5d0be2f51d49013230c45b5a9a6dad582f40f3 + bb8963805b9468dfefbfc6b9b44748ff9aad8d03 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3f5d0be2f51d49013230c45b5a9a6dad582f40f3 + bb8963805b9468dfefbfc6b9b44748ff9aad8d03 diff --git a/eng/Versions.props b/eng/Versions.props index 337516a40..f562370a2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.126-servicing.23605.37 - 6.0.126-servicing.23605.37 + 6.0.127-servicing.24060.21 + 6.0.127-servicing.24060.21 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 68e5684c924d8b57df247a9e0c4dd107cccedf3d Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 10 Jan 2024 21:47:20 +0000 Subject: [PATCH 250/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240103.2 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.102 -> To Version 8.0.102 --- 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 8c63555ef..8f402fdfd 100644 --- a/NuGet.config +++ b/NuGet.config @@ -25,7 +25,7 @@ - + @@ -60,7 +60,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 92a83d983..35bef5a4e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 58f59ea5e2d7ba348875bdc9e292dd951cb90327 + e5e126bc57e3e8bb4724b8ad6dc3d3dbaef0c2bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 58f59ea5e2d7ba348875bdc9e292dd951cb90327 + e5e126bc57e3e8bb4724b8ad6dc3d3dbaef0c2bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 58f59ea5e2d7ba348875bdc9e292dd951cb90327 + e5e126bc57e3e8bb4724b8ad6dc3d3dbaef0c2bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 58f59ea5e2d7ba348875bdc9e292dd951cb90327 + e5e126bc57e3e8bb4724b8ad6dc3d3dbaef0c2bc https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index f9975fc62..0f0ce3df1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,8 +86,8 @@ 8.0.102 - 8.0.102-servicing.24052.29 - 8.0.102-servicing.24052.29 + 8.0.102-servicing.24053.2 + 8.0.102-servicing.24053.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 2217b1761fa0c3bed4163fe5697984d24d94c62f Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 10 Jan 2024 21:47:35 +0000 Subject: [PATCH 251/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240103.4 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.102 -> To Version 8.0.102 --- 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 8f402fdfd..b3c64dfd6 100644 --- a/NuGet.config +++ b/NuGet.config @@ -25,7 +25,7 @@ - + @@ -60,7 +60,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 35bef5a4e..35b52785c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e5e126bc57e3e8bb4724b8ad6dc3d3dbaef0c2bc + ed511c173192c2f00706c3b4092ff61109c8b771 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e5e126bc57e3e8bb4724b8ad6dc3d3dbaef0c2bc + ed511c173192c2f00706c3b4092ff61109c8b771 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e5e126bc57e3e8bb4724b8ad6dc3d3dbaef0c2bc + ed511c173192c2f00706c3b4092ff61109c8b771 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e5e126bc57e3e8bb4724b8ad6dc3d3dbaef0c2bc + ed511c173192c2f00706c3b4092ff61109c8b771 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 0f0ce3df1..ec7b8ceef 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,8 +86,8 @@ 8.0.102 - 8.0.102-servicing.24053.2 - 8.0.102-servicing.24053.2 + 8.0.102-servicing.24053.4 + 8.0.102-servicing.24053.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From c0dc125d9aa718b047c2ed692bb17181c78d1e0a Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 10 Jan 2024 21:47:52 +0000 Subject: [PATCH 252/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240103.10 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.102 -> To Version 8.0.102 --- 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 b3c64dfd6..0d1719189 100644 --- a/NuGet.config +++ b/NuGet.config @@ -25,7 +25,7 @@ - + @@ -60,7 +60,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 35b52785c..b0da3878a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ed511c173192c2f00706c3b4092ff61109c8b771 + ede7bad9e690140d85c88fbd1a56b4e1d8cd8655 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ed511c173192c2f00706c3b4092ff61109c8b771 + ede7bad9e690140d85c88fbd1a56b4e1d8cd8655 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ed511c173192c2f00706c3b4092ff61109c8b771 + ede7bad9e690140d85c88fbd1a56b4e1d8cd8655 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ed511c173192c2f00706c3b4092ff61109c8b771 + ede7bad9e690140d85c88fbd1a56b4e1d8cd8655 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index ec7b8ceef..fa74adaf7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,8 +86,8 @@ 8.0.102 - 8.0.102-servicing.24053.4 - 8.0.102-servicing.24053.4 + 8.0.102-servicing.24053.10 + 8.0.102-servicing.24053.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From d17f5ffab93d9bd9d7643dcf29cd31f26f5ca675 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 10 Jan 2024 21:48:08 +0000 Subject: [PATCH 253/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240103.21 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.102 -> To Version 8.0.102 --- 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 0d1719189..47062c382 100644 --- a/NuGet.config +++ b/NuGet.config @@ -25,7 +25,7 @@ - + @@ -60,7 +60,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b0da3878a..666a8d255 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ede7bad9e690140d85c88fbd1a56b4e1d8cd8655 + 340df7f5ce204cbd77179c9c24635ab4ec93481d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ede7bad9e690140d85c88fbd1a56b4e1d8cd8655 + 340df7f5ce204cbd77179c9c24635ab4ec93481d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ede7bad9e690140d85c88fbd1a56b4e1d8cd8655 + 340df7f5ce204cbd77179c9c24635ab4ec93481d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ede7bad9e690140d85c88fbd1a56b4e1d8cd8655 + 340df7f5ce204cbd77179c9c24635ab4ec93481d https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index fa74adaf7..dc47fa00a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,8 +86,8 @@ 8.0.102 - 8.0.102-servicing.24053.10 - 8.0.102-servicing.24053.10 + 8.0.102-servicing.24053.21 + 8.0.102-servicing.24053.21 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b9d63771bfd03effbfdaec74ccbb66dcc4d3ca23 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 10 Jan 2024 21:48:24 +0000 Subject: [PATCH 254/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240104.3 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.102 -> To Version 8.0.102 --- 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 47062c382..f942037e7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -25,7 +25,7 @@ - + @@ -60,7 +60,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 666a8d255..92eb91372 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 340df7f5ce204cbd77179c9c24635ab4ec93481d + 9f65f51670cc48363c855498f273b87b9265354d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 340df7f5ce204cbd77179c9c24635ab4ec93481d + 9f65f51670cc48363c855498f273b87b9265354d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 340df7f5ce204cbd77179c9c24635ab4ec93481d + 9f65f51670cc48363c855498f273b87b9265354d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 340df7f5ce204cbd77179c9c24635ab4ec93481d + 9f65f51670cc48363c855498f273b87b9265354d https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index dc47fa00a..34aae4fad 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,8 +86,8 @@ 8.0.102 - 8.0.102-servicing.24053.21 - 8.0.102-servicing.24053.21 + 8.0.102-servicing.24054.3 + 8.0.102-servicing.24054.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 66d539aea19b31d9701b56bb2143a2f2b2f71f50 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 10 Jan 2024 21:48:41 +0000 Subject: [PATCH 255/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240104.10 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.102 -> To Version 8.0.102 --- 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 f942037e7..01f4cd7e0 100644 --- a/NuGet.config +++ b/NuGet.config @@ -25,7 +25,7 @@ - + @@ -60,7 +60,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 92eb91372..057080d1f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9f65f51670cc48363c855498f273b87b9265354d + 685fc77b50a2fad6a48b3ba7a053d6f7317c51b0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9f65f51670cc48363c855498f273b87b9265354d + 685fc77b50a2fad6a48b3ba7a053d6f7317c51b0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9f65f51670cc48363c855498f273b87b9265354d + 685fc77b50a2fad6a48b3ba7a053d6f7317c51b0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9f65f51670cc48363c855498f273b87b9265354d + 685fc77b50a2fad6a48b3ba7a053d6f7317c51b0 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 34aae4fad..456223eaa 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,8 +86,8 @@ 8.0.102 - 8.0.102-servicing.24054.3 - 8.0.102-servicing.24054.3 + 8.0.102-servicing.24054.10 + 8.0.102-servicing.24054.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 2794f20befbc1c6c11946879ef671c3b95ba19f2 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 10 Jan 2024 21:48:57 +0000 Subject: [PATCH 256/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240104.14 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.102 -> To Version 8.0.102 --- 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 01f4cd7e0..62531dc86 100644 --- a/NuGet.config +++ b/NuGet.config @@ -25,7 +25,7 @@ - + @@ -60,7 +60,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 057080d1f..7bc7ce916 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 685fc77b50a2fad6a48b3ba7a053d6f7317c51b0 + bcfdc768a4d4398333f08728f5af560d08296742 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 685fc77b50a2fad6a48b3ba7a053d6f7317c51b0 + bcfdc768a4d4398333f08728f5af560d08296742 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 685fc77b50a2fad6a48b3ba7a053d6f7317c51b0 + bcfdc768a4d4398333f08728f5af560d08296742 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 685fc77b50a2fad6a48b3ba7a053d6f7317c51b0 + bcfdc768a4d4398333f08728f5af560d08296742 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 456223eaa..54e4c6a87 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,8 +86,8 @@ 8.0.102 - 8.0.102-servicing.24054.10 - 8.0.102-servicing.24054.10 + 8.0.102-servicing.24054.14 + 8.0.102-servicing.24054.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From afadbc3cccd259250e274a3c9cbeba53178b291b Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 10 Jan 2024 21:49:13 +0000 Subject: [PATCH 257/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240105.6 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.102 -> To Version 8.0.102 --- 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 62531dc86..802c388d8 100644 --- a/NuGet.config +++ b/NuGet.config @@ -25,7 +25,7 @@ - + @@ -60,7 +60,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7bc7ce916..29c2dfe69 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - bcfdc768a4d4398333f08728f5af560d08296742 + 294fdccdfa10843812465462e8b8417327ab6e0d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - bcfdc768a4d4398333f08728f5af560d08296742 + 294fdccdfa10843812465462e8b8417327ab6e0d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - bcfdc768a4d4398333f08728f5af560d08296742 + 294fdccdfa10843812465462e8b8417327ab6e0d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - bcfdc768a4d4398333f08728f5af560d08296742 + 294fdccdfa10843812465462e8b8417327ab6e0d https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 54e4c6a87..63e2ca72b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,8 +86,8 @@ 8.0.102 - 8.0.102-servicing.24054.14 - 8.0.102-servicing.24054.14 + 8.0.102-servicing.24055.6 + 8.0.102-servicing.24055.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From dca8a067c277ad192cb0f865804325a635d313b2 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 10 Jan 2024 21:49:29 +0000 Subject: [PATCH 258/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240107.7 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.102 -> To Version 8.0.102 --- 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 802c388d8..904425e2a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -25,7 +25,7 @@ - + @@ -60,7 +60,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 29c2dfe69..735bc8f0f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 294fdccdfa10843812465462e8b8417327ab6e0d + e01968108ab0bd911ddaf4af21c05bb8bf61e04f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 294fdccdfa10843812465462e8b8417327ab6e0d + e01968108ab0bd911ddaf4af21c05bb8bf61e04f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 294fdccdfa10843812465462e8b8417327ab6e0d + e01968108ab0bd911ddaf4af21c05bb8bf61e04f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 294fdccdfa10843812465462e8b8417327ab6e0d + e01968108ab0bd911ddaf4af21c05bb8bf61e04f https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 63e2ca72b..a89653f66 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,8 +86,8 @@ 8.0.102 - 8.0.102-servicing.24055.6 - 8.0.102-servicing.24055.6 + 8.0.102-servicing.24057.7 + 8.0.102-servicing.24057.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 2e669e9d544b14a18947e78808028b8af27e2371 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 10 Jan 2024 21:49:49 +0000 Subject: [PATCH 259/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240108.12 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.102 -> To Version 8.0.102 --- 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 904425e2a..92d689d85 100644 --- a/NuGet.config +++ b/NuGet.config @@ -25,7 +25,7 @@ - + @@ -60,7 +60,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 735bc8f0f..86a7e44ce 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e01968108ab0bd911ddaf4af21c05bb8bf61e04f + 95abf7f9da3a0afa4410ed0cd477d8870a923cc8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e01968108ab0bd911ddaf4af21c05bb8bf61e04f + 95abf7f9da3a0afa4410ed0cd477d8870a923cc8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e01968108ab0bd911ddaf4af21c05bb8bf61e04f + 95abf7f9da3a0afa4410ed0cd477d8870a923cc8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e01968108ab0bd911ddaf4af21c05bb8bf61e04f + 95abf7f9da3a0afa4410ed0cd477d8870a923cc8 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index a89653f66..710f0280b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,8 +86,8 @@ 8.0.102 - 8.0.102-servicing.24057.7 - 8.0.102-servicing.24057.7 + 8.0.102-servicing.24058.12 + 8.0.102-servicing.24058.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 9180eebc61b39192993a2c37fcae43606d988214 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 10 Jan 2024 21:50:05 +0000 Subject: [PATCH 260/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240109.33 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.102 -> To Version 8.0.102 --- 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 92d689d85..df3abfa11 100644 --- a/NuGet.config +++ b/NuGet.config @@ -25,7 +25,7 @@ - + @@ -60,7 +60,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 86a7e44ce..1924407ba 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 95abf7f9da3a0afa4410ed0cd477d8870a923cc8 + adcfca3faae1c2d3de26117c0ec8edfcd0ac5e8a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 95abf7f9da3a0afa4410ed0cd477d8870a923cc8 + adcfca3faae1c2d3de26117c0ec8edfcd0ac5e8a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 95abf7f9da3a0afa4410ed0cd477d8870a923cc8 + adcfca3faae1c2d3de26117c0ec8edfcd0ac5e8a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 95abf7f9da3a0afa4410ed0cd477d8870a923cc8 + adcfca3faae1c2d3de26117c0ec8edfcd0ac5e8a https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 710f0280b..537753d6b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,8 +86,8 @@ 8.0.102 - 8.0.102-servicing.24058.12 - 8.0.102-servicing.24058.12 + 8.0.102-servicing.24059.33 + 8.0.102-servicing.24059.33 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 025137ea96d63f5f295d5f6c8c790768c108b2ad Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 10 Jan 2024 21:50:23 +0000 Subject: [PATCH 261/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240110.4 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.102 -> To Version 8.0.102 --- 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 df3abfa11..71ffa55ee 100644 --- a/NuGet.config +++ b/NuGet.config @@ -25,7 +25,7 @@ - + @@ -60,7 +60,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1924407ba..09320f8ea 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - adcfca3faae1c2d3de26117c0ec8edfcd0ac5e8a + a33b15f12c30157310c4b8d9cc19da7cc4f012c0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - adcfca3faae1c2d3de26117c0ec8edfcd0ac5e8a + a33b15f12c30157310c4b8d9cc19da7cc4f012c0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - adcfca3faae1c2d3de26117c0ec8edfcd0ac5e8a + a33b15f12c30157310c4b8d9cc19da7cc4f012c0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - adcfca3faae1c2d3de26117c0ec8edfcd0ac5e8a + a33b15f12c30157310c4b8d9cc19da7cc4f012c0 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 537753d6b..06d7c46f2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,8 +86,8 @@ 8.0.102 - 8.0.102-servicing.24059.33 - 8.0.102-servicing.24059.33 + 8.0.102-servicing.24060.4 + 8.0.102-servicing.24060.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e12ee35f0fe49a9225133050d35fb09cc3861434 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 10 Jan 2024 21:50:39 +0000 Subject: [PATCH 262/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240110.23 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.102 -> To Version 8.0.102 --- 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 71ffa55ee..1f77a21a5 100644 --- a/NuGet.config +++ b/NuGet.config @@ -25,7 +25,7 @@ - + @@ -60,7 +60,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 09320f8ea..094a8e63c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a33b15f12c30157310c4b8d9cc19da7cc4f012c0 + 8533fc688e9b1ee8c8c47c1737effd3de13fbca0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a33b15f12c30157310c4b8d9cc19da7cc4f012c0 + 8533fc688e9b1ee8c8c47c1737effd3de13fbca0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a33b15f12c30157310c4b8d9cc19da7cc4f012c0 + 8533fc688e9b1ee8c8c47c1737effd3de13fbca0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a33b15f12c30157310c4b8d9cc19da7cc4f012c0 + 8533fc688e9b1ee8c8c47c1737effd3de13fbca0 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 06d7c46f2..032e9da59 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,8 +86,8 @@ 8.0.102 - 8.0.102-servicing.24060.4 - 8.0.102-servicing.24060.4 + 8.0.102-servicing.24060.23 + 8.0.102-servicing.24060.23 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 4ae5d7e51c3731bac7c8c3ee87f04295920501fa Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 10 Jan 2024 21:50:55 +0000 Subject: [PATCH 263/535] Dependency coherency updates Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 4.8.0-7.23572.1 -> To Version 4.8.0-7.23614.11 (parent: Microsoft.NET.Sdk --- NuGet.config | 1 + eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/NuGet.config b/NuGet.config index 1f77a21a5..5967b3500 100644 --- a/NuGet.config +++ b/NuGet.config @@ -18,6 +18,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 094a8e63c..697d93b41 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -150,14 +150,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime bf5e279d9239bfef5bb1b8d6212f1b971c434606 - + https://github.com/dotnet/roslyn - 7b75981cf3bd520b86ec4ed00ec156c8bc48e4eb + 82a29fc43b3e0a9c53d6cc2be950e43765682170 - + https://github.com/dotnet/msbuild - 195e7f5a3a8e51c37d83cd9e54cb99dc3fc69c22 + b5265ef370a651f8c3458110b804e5cbf869eeb5 https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index 032e9da59..9541be7ca 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -94,7 +94,7 @@ - 4.8.0-7.23572.1 + 4.8.0-7.23614.11 From 6f22dc86d812dd33b093aeca629626587d1d6a1f Mon Sep 17 00:00:00 2001 From: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Date: Wed, 10 Jan 2024 14:18:47 -0800 Subject: [PATCH 264/535] Merging internal commits for release/8.0.1xx (#18164) --- NuGet.config | 10 ++ eng/Version.Details.xml | 128 +++++++++--------- eng/Versions.props | 61 +++++---- .../repo-projects/Directory.Build.props | 3 + 4 files changed, 112 insertions(+), 90 deletions(-) diff --git a/NuGet.config b/NuGet.config index 31081bc89..e03fc8203 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,16 +7,22 @@ + + + + + + @@ -37,11 +43,15 @@ + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bc4f89993..4f21ade59 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,46 +5,46 @@ 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://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c0170915ed6c164a594cd9d558d44aaf98fc6961 + a0e7b5d8673f28c41bcac6e2001b39ba2c8fab54 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c0170915ed6c164a594cd9d558d44aaf98fc6961 + a0e7b5d8673f28c41bcac6e2001b39ba2c8fab54 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c0170915ed6c164a594cd9d558d44aaf98fc6961 + a0e7b5d8673f28c41bcac6e2001b39ba2c8fab54 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c0170915ed6c164a594cd9d558d44aaf98fc6961 + a0e7b5d8673f28c41bcac6e2001b39ba2c8fab54 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 + bf5e279d9239bfef5bb1b8d6212f1b971c434606 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 + bf5e279d9239bfef5bb1b8d6212f1b971c434606 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 + bf5e279d9239bfef5bb1b8d6212f1b971c434606 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 + bf5e279d9239bfef5bb1b8d6212f1b971c434606 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 + bf5e279d9239bfef5bb1b8d6212f1b971c434606 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 + bf5e279d9239bfef5bb1b8d6212f1b971c434606 @@ -52,55 +52,55 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 + bf5e279d9239bfef5bb1b8d6212f1b971c434606 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3f1acb59718cadf111a0a796681e3d3509bb3381 + 8e941eb42f819adb116b881195158b3887a70a1c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3f1acb59718cadf111a0a796681e3d3509bb3381 + 8e941eb42f819adb116b881195158b3887a70a1c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3f1acb59718cadf111a0a796681e3d3509bb3381 + 8e941eb42f819adb116b881195158b3887a70a1c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3f1acb59718cadf111a0a796681e3d3509bb3381 + 8e941eb42f819adb116b881195158b3887a70a1c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3f1acb59718cadf111a0a796681e3d3509bb3381 + 8e941eb42f819adb116b881195158b3887a70a1c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3f1acb59718cadf111a0a796681e3d3509bb3381 + 8e941eb42f819adb116b881195158b3887a70a1c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3f1acb59718cadf111a0a796681e3d3509bb3381 + 8e941eb42f819adb116b881195158b3887a70a1c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e9d13cbe7e8c1d52ce276a8655f52a87e1017c46 + 08814442c7c94f8b059c818902b6883a69844860 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e9d13cbe7e8c1d52ce276a8655f52a87e1017c46 + 08814442c7c94f8b059c818902b6883a69844860 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e9d13cbe7e8c1d52ce276a8655f52a87e1017c46 + 08814442c7c94f8b059c818902b6883a69844860 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e9d13cbe7e8c1d52ce276a8655f52a87e1017c46 + 08814442c7c94f8b059c818902b6883a69844860 https://github.com/dotnet/test-templates @@ -124,35 +124,35 @@ 1e5f3603af2277910aad946736ee23283e7f3e16 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - e4ede9b8979b9d2b1b1d4383f30a791414f0625b + 0b4028eb507aeb222f5bd1fc421876cc5e5e3fb8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 239f8da8fbf8cf2a6cd0c793f0d02679bf4ccf6a + ac40bed7a33baf164d3984ca90c2aedba996a7b2 - + https://github.com/dotnet/fsharp - f41fe153f68dd6b20cf4f91de9ea1e55fc09bb20 + 424e4b7cffb7656efd63f7a905a2498e39011104 - + https://github.com/dotnet/fsharp - f41fe153f68dd6b20cf4f91de9ea1e55fc09bb20 + 424e4b7cffb7656efd63f7a905a2498e39011104 - + https://github.com/microsoft/vstest - ae25c3b96fe433c60af70e3991ace49fcbf7e970 + 3259862fadd5e784564e7d920a2d61a75f415a79 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 + bf5e279d9239bfef5bb1b8d6212f1b971c434606 - + https://github.com/dotnet/roslyn - f43cd10b737b6343956dee421cff8c50b602c788 + 7b75981cf3bd520b86ec4ed00ec156c8bc48e4eb @@ -168,18 +168,18 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 2406616d0e3a31d80b326e27c156955bfa41c791 + 201f4dae9d1a1e105d8ba86d7ece61eed1f665e0 https://dev.azure.com/dnceng/internal/_git/dotnet-aspire 48e42f59d64d84b404e904996a9ed61f2a17a569 - + https://github.com/dotnet/emsdk - 2406616d0e3a31d80b326e27c156955bfa41c791 + 201f4dae9d1a1e105d8ba86d7ece61eed1f665e0 @@ -193,9 +193,9 @@ 5957c5c5f85f17c145e7fab4ece37ad6aafcded9 - + https://github.com/dotnet/source-build-externals - 6c9557fbf18398d6f226bfd16ce3876f1fe2e940 + 7134e53b6b1210a1ce8838b12b8f6071e0a3433b diff --git a/eng/Versions.props b/eng/Versions.props index 483cf5b57..77453e103 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,11 +48,11 @@ - 8.0.0-rtm.23531.5 + 8.0.1-servicing.23580.6 - 8.0.0-rtm.23531.4 + 8.0.1-servicing.23580.5 @@ -72,50 +72,50 @@ - 8.0.0 - 8.0.0 - 8.0.0-rtm.23531.12 - 8.0.0-rtm.23531.12 - 8.0.0-rtm.23531.12 - 8.0.0-rtm.23531.12 - 8.0.0-rtm.23531.12 + 8.0.1 + 8.0.1 + 8.0.1-servicing.23580.8 + 8.0.1-servicing.23580.8 + 8.0.1-servicing.23580.8 + 8.0.1-servicing.23580.8 + 8.0.1-servicing.23580.8 0.2.0 - 8.0.100 - 8.0.100-rtm.23551.6 - 8.0.100-rtm.23551.6 + 8.0.101 + 8.0.101-servicing.23580.21 + 8.0.101-servicing.23580.21 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.8.0-3.23524.11 + 4.8.0-7.23572.1 - 8.0.0-rtm.23531.3 + 8.0.1-servicing.23580.1 - 8.0.0-rtm.23531.3 - 8.0.0-rtm.23531.3 - 8.0.0 - 8.0.0 - 8.0.0 - 8.0.0 + 8.0.1-servicing.23580.1 + 8.0.1-servicing.23580.1 + 8.0.1 + 8.0.1 + 8.0.1 + 8.0.1 2.1.0 - 8.0.0-rtm.23551.1 - 8.0.0-rtm.23551.1 - 8.0.0 - 8.0.0 + 8.0.1-servicing.23580.5 + 8.0.1-servicing.23580.5 + 8.0.1 + 8.0.1 @@ -234,11 +234,20 @@ 2.2.0-beta.19072.10 2.0.0 - 17.8.0-release-23523-03 + 17.8.0-release-23578-02 8.0.0-alpha.1.22557.12 + 8.0.100 + 8.0.0-preview.1.23551.7 + 8.0.100-rc.2 + 8.0.0-rc.2.9373 + 34.0.0-rc.2.468 + 16.4.8968-net8-rc2 + 16.4.8968-net8-rc2 + 13.3.8968-net8-rc2 + 16.4.8968-net8-rc2 8.0.100 8.0.0-preview.1.23557.2 8.0.100 @@ -249,7 +258,7 @@ 14.0.8478 17.0.8478 - 8.0.0 + 8.0.1 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100PackageVersion) 8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-rtm|-[A-z]*\.*\d*`)) diff --git a/src/SourceBuild/content/repo-projects/Directory.Build.props b/src/SourceBuild/content/repo-projects/Directory.Build.props index 4b2215bd4..29747eaa0 100644 --- a/src/SourceBuild/content/repo-projects/Directory.Build.props +++ b/src/SourceBuild/content/repo-projects/Directory.Build.props @@ -110,6 +110,9 @@ + + + From 3914d2dfc52bb44c1418c9f2399d0e274facd096 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 10 Jan 2024 23:06:47 +0000 Subject: [PATCH 265/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240109.21 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.127-servicing.24060.21 -> To Version 6.0.127-servicing.24059.21 --- 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 016d79342..4192607dd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 28656189e49c05368afda92b482da8c0049d5638 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - bb8963805b9468dfefbfc6b9b44748ff9aad8d03 + 33376dfb3af6145a05c6f33567a7064b928a135f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - bb8963805b9468dfefbfc6b9b44748ff9aad8d03 + 33376dfb3af6145a05c6f33567a7064b928a135f diff --git a/eng/Versions.props b/eng/Versions.props index f562370a2..166049dcd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.127-servicing.24060.21 - 6.0.127-servicing.24060.21 + 6.0.127-servicing.24059.21 + 6.0.127-servicing.24059.21 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b4bcafac91c45ed6d41e00ad1bb4994b238e8f03 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 10 Jan 2024 23:07:04 +0000 Subject: [PATCH 266/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240110.21 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.127-servicing.24059.21 -> To Version 6.0.127-servicing.24060.21 --- 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 4192607dd..016d79342 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 28656189e49c05368afda92b482da8c0049d5638 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 33376dfb3af6145a05c6f33567a7064b928a135f + bb8963805b9468dfefbfc6b9b44748ff9aad8d03 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 33376dfb3af6145a05c6f33567a7064b928a135f + bb8963805b9468dfefbfc6b9b44748ff9aad8d03 diff --git a/eng/Versions.props b/eng/Versions.props index 166049dcd..f562370a2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.127-servicing.24059.21 - 6.0.127-servicing.24059.21 + 6.0.127-servicing.24060.21 + 6.0.127-servicing.24060.21 $(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 267/535] Update MsftToSbSdk.diff baseline (#18205) --- .../assets/baselines/MsftToSbSdk.diff | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff index 71ae3f0b9..dfeb1a2f8 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff @@ -14,7 +14,20 @@ index ------------ ./packs/Microsoft.AspNetCore.App.Ref/ ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ @@ ------------ @@ + ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/Microsoft.JSInterop.xml + ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/Microsoft.Net.Http.Headers.dll + ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/Microsoft.Net.Http.Headers.xml ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.DiagnosticSource.dll ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.DiagnosticSource.xml + ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.EventLog.dll + ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.EventLog.xml ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Formats.Asn1.dll ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Formats.Asn1.xml + ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.IO.Pipelines.dll ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.IO.Pipelines.xml ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Runtime.CompilerServices.Unsafe.dll ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.AccessControl.dll ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.AccessControl.xml ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.Cryptography.Xml.dll ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.Cryptography.Xml.xml -./packs/Microsoft.NETCore.App.Host.portable-rid/ @@ -29,6 +42,10 @@ index ------------ -./packs/Microsoft.NETCore.App.Host.portable-rid/x.y.z/runtimes/portable-rid/native/libnethost.so -./packs/Microsoft.NETCore.App.Host.portable-rid/x.y.z/runtimes/portable-rid/native/nethost.h -./packs/Microsoft.NETCore.App.Host.portable-rid/x.y.z/runtimes/portable-rid/native/singlefilehost ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Encodings.Web.dll ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Encodings.Web.xml ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Json.dll ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Json.xml +./packs/Microsoft.NETCore.App.Host.banana-rid/ +./packs/Microsoft.NETCore.App.Host.banana-rid/x.y.z/ +./packs/Microsoft.NETCore.App.Host.banana-rid/x.y.z/runtimes/ From 5e12b89c162aeca1ee3244be8ede3b3109938d17 Mon Sep 17 00:00:00 2001 From: NET Source-Build Bot <102560831+dotnet-sb-bot@users.noreply.github.com> Date: Thu, 11 Jan 2024 01:08:01 +0100 Subject: [PATCH 268/535] .NET Source-Build 8.0.101 January 2024 Updates (#18156) --- src/SourceBuild/content/eng/Versions.props | 4 ++-- src/SourceBuild/content/global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/SourceBuild/content/eng/Versions.props b/src/SourceBuild/content/eng/Versions.props index 9f5666494..bb8227558 100644 --- a/src/SourceBuild/content/eng/Versions.props +++ b/src/SourceBuild/content/eng/Versions.props @@ -30,7 +30,7 @@ These URLs can't be composed from their base URL and version as we read them from the prep.sh and pipeline scripts, outside of MSBuild. --> - https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.8.0.100-rtm.23551.1.centos.8-x64.tar.gz - https://dotnetcli.azureedge.net/source-built-artifacts/sdks/dotnet-sdk-8.0.100-centos.8-x64.tar.gz + https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.8.0.101-servicing.23601.1.centos.8-x64.tar.gz + https://dotnetcli.azureedge.net/source-built-artifacts/sdks/dotnet-sdk-8.0.101-centos.8-x64.tar.gz diff --git a/src/SourceBuild/content/global.json b/src/SourceBuild/content/global.json index d16655873..c8e9324a4 100644 --- a/src/SourceBuild/content/global.json +++ b/src/SourceBuild/content/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "8.0.100" + "dotnet": "8.0.101" }, "msbuild-sdks": { "Microsoft.Build.CentralPackageVersions": "2.0.1", From d637fd7421b586d12d3745f93c9bb021db62260b Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 11 Jan 2024 03:17:33 +0000 Subject: [PATCH 269/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240110.59 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.102 -> To Version 8.0.102 --- 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 5967b3500..8da61d39a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -26,7 +26,7 @@ - + @@ -61,7 +61,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 697d93b41..b720704d7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8533fc688e9b1ee8c8c47c1737effd3de13fbca0 + 160944937e0649dcfaae6cae543d5867c827c925 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8533fc688e9b1ee8c8c47c1737effd3de13fbca0 + 160944937e0649dcfaae6cae543d5867c827c925 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8533fc688e9b1ee8c8c47c1737effd3de13fbca0 + 160944937e0649dcfaae6cae543d5867c827c925 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8533fc688e9b1ee8c8c47c1737effd3de13fbca0 + 160944937e0649dcfaae6cae543d5867c827c925 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 9541be7ca..07400ad0f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,8 +86,8 @@ 8.0.102 - 8.0.102-servicing.24060.23 - 8.0.102-servicing.24060.23 + 8.0.102-servicing.24060.59 + 8.0.102-servicing.24060.59 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From fe0bfacae41a94ac0e02368501c42e284a2f81b7 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 11 Jan 2024 06:58:07 +0000 Subject: [PATCH 270/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240110.68 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.102 -> To Version 8.0.102 --- 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 8da61d39a..184554a39 100644 --- a/NuGet.config +++ b/NuGet.config @@ -26,7 +26,7 @@ - + @@ -61,7 +61,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b720704d7..6eae310ee 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 160944937e0649dcfaae6cae543d5867c827c925 + 8ce92eea9bcc0d4f60ff57719b679600751310a9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 160944937e0649dcfaae6cae543d5867c827c925 + 8ce92eea9bcc0d4f60ff57719b679600751310a9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 160944937e0649dcfaae6cae543d5867c827c925 + 8ce92eea9bcc0d4f60ff57719b679600751310a9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 160944937e0649dcfaae6cae543d5867c827c925 + 8ce92eea9bcc0d4f60ff57719b679600751310a9 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 07400ad0f..d6c37a5c2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,8 +86,8 @@ 8.0.102 - 8.0.102-servicing.24060.59 - 8.0.102-servicing.24060.59 + 8.0.102-servicing.24060.68 + 8.0.102-servicing.24060.68 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From bfa637a450634166b38a080a8377d3894ef62ca5 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 11 Jan 2024 09:44:22 +0000 Subject: [PATCH 271/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240111.4 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.406 -> To Version 7.0.406 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index 44b1245c7..bd3ba0a76 100644 --- a/NuGet.config +++ b/NuGet.config @@ -22,7 +22,7 @@ - + @@ -55,7 +55,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2df6a4485..47202d2a7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f8a7ad732e54f6f2f248ba3d7877afe6e8e1ec8c + b0c4f89a12a96383f763852b14707378f810b666 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f8a7ad732e54f6f2f248ba3d7877afe6e8e1ec8c + b0c4f89a12a96383f763852b14707378f810b666 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f8a7ad732e54f6f2f248ba3d7877afe6e8e1ec8c + b0c4f89a12a96383f763852b14707378f810b666 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f8a7ad732e54f6f2f248ba3d7877afe6e8e1ec8c + b0c4f89a12a96383f763852b14707378f810b666 diff --git a/eng/Versions.props b/eng/Versions.props index 710a92310..f503f25a2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.406 - 7.0.406-servicing.24059.34 - 7.0.406-servicing.24059.34 + 7.0.406-servicing.24061.4 + 7.0.406-servicing.24061.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e5dda827c7ba124521c21fc54d8182d32d5d085c Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 11 Jan 2024 09:53:08 +0000 Subject: [PATCH 272/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240111.5 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.102 -> To Version 8.0.102 --- 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 184554a39..6bc1254c1 100644 --- a/NuGet.config +++ b/NuGet.config @@ -26,7 +26,7 @@ - + @@ -61,7 +61,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6eae310ee..d666b87e7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8ce92eea9bcc0d4f60ff57719b679600751310a9 + bc75900f92e2baa279f2ec2081216d3dc58d02ab - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8ce92eea9bcc0d4f60ff57719b679600751310a9 + bc75900f92e2baa279f2ec2081216d3dc58d02ab - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8ce92eea9bcc0d4f60ff57719b679600751310a9 + bc75900f92e2baa279f2ec2081216d3dc58d02ab - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8ce92eea9bcc0d4f60ff57719b679600751310a9 + bc75900f92e2baa279f2ec2081216d3dc58d02ab https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index d6c37a5c2..e12d1ad2a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,8 +86,8 @@ 8.0.102 - 8.0.102-servicing.24060.68 - 8.0.102-servicing.24060.68 + 8.0.102-servicing.24061.5 + 8.0.102-servicing.24061.5 $(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 273/535] Update MsftToSbSdk.diff (#18210) --- .../assets/baselines/MsftToSbSdk.diff | 101 +++++++++++++++++- 1 file changed, 96 insertions(+), 5 deletions(-) diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff index bd443698c..4d662a3c3 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff @@ -14,7 +14,23 @@ index ------------ ./packs/Microsoft.AspNetCore.App.Ref/ ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ @@ ------------ @@ + ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/Microsoft.JSInterop.xml + ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/Microsoft.Net.Http.Headers.dll + ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/Microsoft.Net.Http.Headers.xml ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.DiagnosticSource.dll ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.DiagnosticSource.xml + ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.EventLog.dll + ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.EventLog.xml ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Formats.Asn1.dll ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Formats.Asn1.xml + ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.IO.Pipelines.dll + ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.IO.Pipelines.xml + ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.Cryptography.Xml.dll ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.Cryptography.Xml.xml ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Encodings.Web.dll ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Encodings.Web.xml ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Json.dll ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Json.xml ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Threading.RateLimiting.dll ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Threading.RateLimiting.xml -./packs/Microsoft.NETCore.App.Host.portable-rid/ @@ -109,6 +125,35 @@ index ------------ ./sdk/x.y.z/DotnetTools/dotnet-format/tr/ ./sdk/x.y.z/DotnetTools/dotnet-format/tr/dotnet-format.resources.dll ./sdk/x.y.z/DotnetTools/dotnet-format/tr/Microsoft.CodeAnalysis.CSharp.Features.resources.dll +@@ ------------ @@ + ./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/Microsoft.IdentityModel.JsonWebTokens.dll + ./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/Microsoft.IdentityModel.Logging.dll + ./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/Microsoft.IdentityModel.Tokens.dll ++./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/runtimes/ ++./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/runtimes/browser/ ++./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/runtimes/browser/lib/ ++./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/runtimes/browser/lib/netx.y/ ++./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/runtimes/browser/lib/netx.y/System.Text.Encodings.Web.dll + ./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/System.IdentityModel.Tokens.Jwt.dll ++./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/System.Text.Encodings.Web.dll ++./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/System.Text.Json.dll + ./sdk/x.y.z/DotnetTools/dotnet-user-secrets/ + ./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/ + ./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/ +@@ ------------ @@ + ./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Microsoft.Extensions.FileSystemGlobbing.dll + ./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Microsoft.Extensions.Primitives.dll + ./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Newtonsoft.Json.dll ++./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/runtimes/ ++./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/runtimes/browser/ ++./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/runtimes/browser/lib/ ++./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/runtimes/browser/lib/netx.y/ ++./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/runtimes/browser/lib/netx.y/System.Text.Encodings.Web.dll ++./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/System.Text.Encodings.Web.dll ++./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/System.Text.Json.dll + ./sdk/x.y.z/DotnetTools/dotnet-watch/ + ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/ + ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/ @@ ------------ @@ ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/Microsoft.CodeAnalysis.CSharp.Features.dll ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/Microsoft.CodeAnalysis.CSharp.Workspaces.dll @@ -124,21 +169,26 @@ index ------------ ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/middleware/Microsoft.AspNetCore.Watch.BrowserRefresh.dll ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/pl/ @@ ------------ @@ - ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/ru/Microsoft.CodeAnalysis.Workspaces.MSBuild.resources.dll ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/ru/Microsoft.CodeAnalysis.Workspaces.resources.dll ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/ru/System.CommandLine.resources.dll --./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/ + ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/ -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/unix/ -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/unix/lib/ -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/unix/lib/netx.y/ -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/unix/lib/netx.y/System.Drawing.Common.dll --./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/ --./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/ --./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/ ++./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/browser/ ++./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/browser/lib/ ++./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/browser/lib/netx.y/ ++./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/browser/lib/netx.y/System.Text.Encodings.Web.dll + ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/ + ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/ + ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/ -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/Microsoft.Win32.SystemEvents.dll -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/System.Drawing.Common.dll -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/System.Security.Cryptography.ProtectedData.dll -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/System.Windows.Extensions.dll ++./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/System.Text.Encoding.CodePages.dll ++./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Collections.Immutable.dll ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.CommandLine.dll ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Composition.AttributedModel.dll ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Composition.Convention.dll @@ -150,6 +200,10 @@ index ------------ -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Security.Cryptography.ProtectedData.dll -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Security.Permissions.dll -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Windows.Extensions.dll ++./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Reflection.Metadata.dll ++./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Text.Encoding.CodePages.dll ++./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Text.Encodings.Web.dll ++./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Text.Json.dll ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/tr/ ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/tr/dotnet-watch.resources.dll ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/tr/Microsoft.CodeAnalysis.CSharp.Features.resources.dll @@ -205,11 +259,21 @@ index ------------ -./sdk/x.y.z/FSharp/runtimes/win/lib/netx.y/System.Security.Cryptography.ProtectedData.dll ./sdk/x.y.z/FSharp/runtimes/win/lib/netx.y/System.Windows.Extensions.dll ./sdk/x.y.z/FSharp/System.CodeDom.dll ++./sdk/x.y.z/FSharp/System.Collections.Immutable.dll ./sdk/x.y.z/FSharp/System.Configuration.ConfigurationManager.dll +./sdk/x.y.z/FSharp/System.Diagnostics.EventLog.dll ./sdk/x.y.z/FSharp/System.Drawing.Common.dll ++./sdk/x.y.z/FSharp/System.Formats.Asn1.dll ++./sdk/x.y.z/FSharp/System.Reflection.Metadata.dll ./sdk/x.y.z/FSharp/System.Resources.Extensions.dll ./sdk/x.y.z/FSharp/System.Security.Cryptography.Pkcs.dll + ./sdk/x.y.z/FSharp/System.Security.Cryptography.ProtectedData.dll + ./sdk/x.y.z/FSharp/System.Security.Cryptography.Xml.dll + ./sdk/x.y.z/FSharp/System.Security.Permissions.dll ++./sdk/x.y.z/FSharp/System.Threading.Tasks.Dataflow.dll + ./sdk/x.y.z/FSharp/System.Windows.Extensions.dll + ./sdk/x.y.z/FSharp/tr/ + ./sdk/x.y.z/FSharp/tr/FSharp.Build.resources.dll @@ ------------ @@ ./sdk/x.y.z/Microsoft.Build.NuGetSdkResolver.dll ./sdk/x.y.z/Microsoft.Build.Tasks.Core.dll @@ -265,6 +329,13 @@ index ------------ ./sdk/x.y.z/runtimes/win/lib/netx.y/Microsoft.Win32.SystemEvents.dll ./sdk/x.y.z/runtimes/win/lib/netx.y/System.Diagnostics.EventLog.dll ./sdk/x.y.z/runtimes/win/lib/netx.y/System.Diagnostics.EventLog.Messages.dll + ./sdk/x.y.z/runtimes/win/lib/netx.y/System.Drawing.Common.dll + ./sdk/x.y.z/runtimes/win/lib/netx.y/System.Security.Cryptography.Pkcs.dll + ./sdk/x.y.z/runtimes/win/lib/netx.y/System.ServiceProcess.ServiceController.dll ++./sdk/x.y.z/runtimes/win/lib/netx.y/System.Text.Encoding.CodePages.dll + ./sdk/x.y.z/runtimes/win/lib/netx.y/System.Windows.Extensions.dll + ./sdk/x.y.z/SDKPrecomputedAssemblyReferences.cache + ./sdk/x.y.z/SdkResolvers/ @@ ------------ @@ ./sdk/x.y.z/Sdks/Microsoft.NET.ILLink.Tasks/tools/net472/System.Buffers.dll ./sdk/x.y.z/Sdks/Microsoft.NET.ILLink.Tasks/tools/net472/System.Collections.Immutable.dll @@ -289,6 +360,16 @@ index ------------ ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tasks/net472/System.Reflection.Metadata.dll ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tasks/net472/System.Runtime.CompilerServices.Unsafe.dll ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tasks/net472/System.Text.Encodings.Web.dll +@@ ------------ @@ + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tools/rzc.deps.json + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tools/rzc.dll + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tools/rzc.runtimeconfig.json ++./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tools/System.Collections.Immutable.dll ++./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tools/System.Reflection.Metadata.dll ++./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tools/System.Text.Encoding.CodePages.dll + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Web.ProjectSystem/ + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Web.ProjectSystem/Sdk/ + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Web.ProjectSystem/Sdk/Sdk.props @@ ------------ @@ ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Web/tools/net472/Microsoft.NET.Sdk.Web.Tasks.dll ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Web/tools/netx.y/ @@ -306,18 +387,28 @@ index ------------ ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk/tools/net472/System.Runtime.CompilerServices.Unsafe.dll ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk/tools/net472/System.Text.Encodings.Web.dll @@ ------------ @@ + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk/tools/netx.y/zh-Hant/Microsoft.NET.Build.Tasks.resources.dll ./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/ ./sdk/x.y.z/System.CodeDom.dll ++./sdk/x.y.z/System.Collections.Immutable.dll ./sdk/x.y.z/System.CommandLine.dll -./sdk/x.y.z/System.ComponentModel.Composition.dll ./sdk/x.y.z/System.Configuration.ConfigurationManager.dll ./sdk/x.y.z/System.Diagnostics.EventLog.dll ./sdk/x.y.z/System.Drawing.Common.dll ++./sdk/x.y.z/System.Formats.Asn1.dll ++./sdk/x.y.z/System.Reflection.Metadata.dll + ./sdk/x.y.z/System.Reflection.MetadataLoadContext.dll + ./sdk/x.y.z/System.Resources.Extensions.dll + ./sdk/x.y.z/System.Security.Cryptography.Pkcs.dll @@ ------------ @@ ./sdk/x.y.z/System.Security.Cryptography.Xml.dll ./sdk/x.y.z/System.Security.Permissions.dll ./sdk/x.y.z/System.ServiceProcess.ServiceController.dll ++./sdk/x.y.z/System.Text.Encoding.CodePages.dll +./sdk/x.y.z/System.Text.Encodings.Web.dll ++./sdk/x.y.z/System.Text.Json.dll ++./sdk/x.y.z/System.Threading.Tasks.Dataflow.dll ./sdk/x.y.z/System.Windows.Extensions.dll -./sdk/x.y.z/testhost-1.0.runtimeconfig.json -./sdk/x.y.z/testhost-1.1.runtimeconfig.json From 79cfea2c03ab0bf14dccc668aa3c41a5fef5119f Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Thu, 11 Jan 2024 11:42:51 -0600 Subject: [PATCH 274/535] Remove source-build sourcelink snupkg workaround (#18215) --- src/SourceBuild/content/repo-projects/Directory.Build.props | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/SourceBuild/content/repo-projects/Directory.Build.props b/src/SourceBuild/content/repo-projects/Directory.Build.props index 29747eaa0..4b2215bd4 100644 --- a/src/SourceBuild/content/repo-projects/Directory.Build.props +++ b/src/SourceBuild/content/repo-projects/Directory.Build.props @@ -110,9 +110,6 @@ - - - From cad5caf868a0918de122693b3d390d0c6fc5c5c0 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 11 Jan 2024 20:09:26 +0000 Subject: [PATCH 275/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240111.15 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.127-servicing.24060.21 -> To Version 6.0.127-servicing.24061.15 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,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,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 6.0.26 -> To Version 6.0.27 (parent: Microsoft.NET.Sdk --- NuGet.config | 19 +++++------- eng/Version.Details.xml | 64 ++++++++++++++++++++--------------------- eng/Versions.props | 30 +++++++++---------- 3 files changed, 54 insertions(+), 59 deletions(-) diff --git a/NuGet.config b/NuGet.config index 1aadfd0ee..cecbee116 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,9 +7,11 @@ + + @@ -21,14 +23,10 @@ - - - + - - - + @@ -49,6 +47,7 @@ + @@ -57,14 +56,10 @@ - - - + - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 016d79342..24b46084e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 84ebced93b7a69ba3332fe6000354306d4eea9dd + 63f1b2eb2d5be182cd764445d3b76a1b7cbe1c77 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 84ebced93b7a69ba3332fe6000354306d4eea9dd + 63f1b2eb2d5be182cd764445d3b76a1b7cbe1c77 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 84ebced93b7a69ba3332fe6000354306d4eea9dd + 63f1b2eb2d5be182cd764445d3b76a1b7cbe1c77 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 84ebced93b7a69ba3332fe6000354306d4eea9dd + 63f1b2eb2d5be182cd764445d3b76a1b7cbe1c77 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime a08d9ce2caf02455c0b825bcdc32974bdf769a80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d504a7b7dab277712646747e9f5cce0d9507245e + c231018f479fc8f65afcd0dcd3b9de26026b4655 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d504a7b7dab277712646747e9f5cce0d9507245e + c231018f479fc8f65afcd0dcd3b9de26026b4655 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d504a7b7dab277712646747e9f5cce0d9507245e + c231018f479fc8f65afcd0dcd3b9de26026b4655 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d504a7b7dab277712646747e9f5cce0d9507245e + c231018f479fc8f65afcd0dcd3b9de26026b4655 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d504a7b7dab277712646747e9f5cce0d9507245e + c231018f479fc8f65afcd0dcd3b9de26026b4655 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d504a7b7dab277712646747e9f5cce0d9507245e + c231018f479fc8f65afcd0dcd3b9de26026b4655 https://github.com/dotnet/test-templates @@ -90,36 +90,36 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 28656189e49c05368afda92b482da8c0049d5638 + f88db578fa807fdab408d8267dc1b1f736fd8dca - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 28656189e49c05368afda92b482da8c0049d5638 + f88db578fa807fdab408d8267dc1b1f736fd8dca - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 28656189e49c05368afda92b482da8c0049d5638 + f88db578fa807fdab408d8267dc1b1f736fd8dca - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - bb8963805b9468dfefbfc6b9b44748ff9aad8d03 + 48588050013d6553358d9a50a8bd934ebdac1aab - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - bb8963805b9468dfefbfc6b9b44748ff9aad8d03 + 48588050013d6553358d9a50a8bd934ebdac1aab https://dev.azure.com/dnceng/internal/_git/dotnet-winforms c309ca06b81112f5e42cc9ca6f8bf0c4a772be6b - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - e5b72d0fb5a405d5443b571ba1d78f419bdbcdb7 + 2f8a4024340668c8e8a5e55a9c601f7a62be7c05 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index f562370a2..09cbe922d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,11 +27,11 @@ - 6.0.26-servicing.23605.3 + 6.0.27-servicing.24060.11 - 6.0.126 + 6.0.127 @@ -44,20 +44,20 @@ - 6.0.26 - 6.0.26 - 6.0.26-servicing.23605.6 - 6.0.26-servicing.23605.6 - 6.0.26-servicing.23605.6 - 6.0.26-servicing.23605.6 + 6.0.27 + 6.0.27 + 6.0.27-servicing.24060.17 + 6.0.27-servicing.24060.17 + 6.0.27-servicing.24060.17 + 6.0.27-servicing.24060.17 0.2.0 - 6.0.127-servicing.24060.21 - 6.0.127-servicing.24060.21 + 6.0.127-servicing.24061.15 + 6.0.127-servicing.24061.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,10 +78,10 @@ - 6.0.26-servicing.23605.4 - 6.0.26-servicing.23605.4 - 6.0.26 - 6.0.26 + 6.0.27-servicing.24060.12 + 6.0.27-servicing.24060.12 + 6.0.27 + 6.0.27 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.126 + 6.0.127 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) From 091ea132a1641b97185da8bea3b3dab9c59f0543 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 11 Jan 2024 20:13:26 +0000 Subject: [PATCH 276/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240111.11 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.102 -> To Version 8.0.102 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 8.0.1 -> To Version 8.0.2 (parent: Microsoft.NET.Sdk --- NuGet.config | 12 ++++-------- eng/Version.Details.xml | 34 +++++++++++++++++----------------- eng/Versions.props | 14 +++++++------- 3 files changed, 28 insertions(+), 32 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6bc1254c1..2dccf8439 100644 --- a/NuGet.config +++ b/NuGet.config @@ -26,12 +26,10 @@ - + - - - + @@ -61,12 +59,10 @@ - + - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d666b87e7..be9295fac 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://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a0e7b5d8673f28c41bcac6e2001b39ba2c8fab54 + f195aa9c97a34be19c176a512bd10d36914931cb - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a0e7b5d8673f28c41bcac6e2001b39ba2c8fab54 + f195aa9c97a34be19c176a512bd10d36914931cb - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a0e7b5d8673f28c41bcac6e2001b39ba2c8fab54 + f195aa9c97a34be19c176a512bd10d36914931cb - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a0e7b5d8673f28c41bcac6e2001b39ba2c8fab54 + f195aa9c97a34be19c176a512bd10d36914931cb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - bc75900f92e2baa279f2ec2081216d3dc58d02ab + c156e4feae5e45c934d00ed95b47b7504418fb4d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - bc75900f92e2baa279f2ec2081216d3dc58d02ab + c156e4feae5e45c934d00ed95b47b7504418fb4d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - bc75900f92e2baa279f2ec2081216d3dc58d02ab + c156e4feae5e45c934d00ed95b47b7504418fb4d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - bc75900f92e2baa279f2ec2081216d3dc58d02ab + c156e4feae5e45c934d00ed95b47b7504418fb4d https://github.com/dotnet/test-templates @@ -128,9 +128,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-winforms 0b4028eb507aeb222f5bd1fc421876cc5e5e3fb8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - ac40bed7a33baf164d3984ca90c2aedba996a7b2 + 0ede9037ff59dc76c37ec87659a641cfbccd6e30 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index e12d1ad2a..9a1ba33a2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,7 +52,7 @@ - 8.0.1-servicing.23580.5 + 8.0.2-servicing.24060.10 @@ -86,8 +86,8 @@ 8.0.102 - 8.0.102-servicing.24061.5 - 8.0.102-servicing.24061.5 + 8.0.102-servicing.24061.11 + 8.0.102-servicing.24061.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -112,10 +112,10 @@ - 8.0.1-servicing.23580.5 - 8.0.1-servicing.23580.5 - 8.0.1 - 8.0.1 + 8.0.2-servicing.24060.14 + 8.0.2-servicing.24060.14 + 8.0.2 + 8.0.2 From 10b2130b4d30de802d3e117159130417f813ee23 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 11 Jan 2024 20:16:26 +0000 Subject: [PATCH 277/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240111.12 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.116 -> To Version 7.0.116 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 7.0.15 -> To Version 7.0.16 (parent: Microsoft.NET.Sdk --- NuGet.config | 14 ++++------ eng/Version.Details.xml | 62 ++++++++++++++++++++--------------------- eng/Versions.props | 28 +++++++++---------- 3 files changed, 51 insertions(+), 53 deletions(-) diff --git a/NuGet.config b/NuGet.config index cddbc2bcf..e9a2fa634 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,6 +7,7 @@ + @@ -22,12 +23,10 @@ - + - - - + @@ -49,18 +48,17 @@ + - + - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fa311536b..713af0f51 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - acb200f3181da8cc111042a65f247bab519b9663 + d62704f831ab66265d54c5d09b24a82bff2deac2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - acb200f3181da8cc111042a65f247bab519b9663 + d62704f831ab66265d54c5d09b24a82bff2deac2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - acb200f3181da8cc111042a65f247bab519b9663 + d62704f831ab66265d54c5d09b24a82bff2deac2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - acb200f3181da8cc111042a65f247bab519b9663 + d62704f831ab66265d54c5d09b24a82bff2deac2 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -52,34 +52,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c49ccc8727c620ce1cb8fb431bb3fe8f2e747236 + ecd58f375010a7fac5165a1ff584f8e336c9e044 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c49ccc8727c620ce1cb8fb431bb3fe8f2e747236 + ecd58f375010a7fac5165a1ff584f8e336c9e044 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c49ccc8727c620ce1cb8fb431bb3fe8f2e747236 + ecd58f375010a7fac5165a1ff584f8e336c9e044 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c49ccc8727c620ce1cb8fb431bb3fe8f2e747236 + ecd58f375010a7fac5165a1ff584f8e336c9e044 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c49ccc8727c620ce1cb8fb431bb3fe8f2e747236 + ecd58f375010a7fac5165a1ff584f8e336c9e044 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c49ccc8727c620ce1cb8fb431bb3fe8f2e747236 + ecd58f375010a7fac5165a1ff584f8e336c9e044 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c49ccc8727c620ce1cb8fb431bb3fe8f2e747236 + ecd58f375010a7fac5165a1ff584f8e336c9e044 https://github.com/dotnet/test-templates @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9d7476029043125e1f2acb5477c99b1d2710f12c + 383d1cee7ce36156a4adf5d0779c1eb94bf85357 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9d7476029043125e1f2acb5477c99b1d2710f12c + 383d1cee7ce36156a4adf5d0779c1eb94bf85357 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9d7476029043125e1f2acb5477c99b1d2710f12c + 383d1cee7ce36156a4adf5d0779c1eb94bf85357 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9d7476029043125e1f2acb5477c99b1d2710f12c + 383d1cee7ce36156a4adf5d0779c1eb94bf85357 https://dev.azure.com/dnceng/internal/_git/dotnet-winforms 1d272c1ef7277b7cc38148300732e6a72848bedc - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 02d7f45dcacc192b40e725d6f6e77ec64e202c7a + 963a6a55dd6f72f604651fff7c1515dadcd37a39 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 4bb45da0f..eab48d207 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,7 +41,7 @@ - 7.0.15-servicing.23578.3 + 7.0.16-servicing.24060.7 @@ -56,13 +56,13 @@ - 7.0.15 - 7.0.15 - 7.0.15-servicing.23601.10 - 7.0.15-servicing.23601.10 - 7.0.15-servicing.23601.10 - 7.0.15-servicing.23601.10 - 7.0.15-servicing.23601.10 + 7.0.16 + 7.0.16 + 7.0.16-servicing.24061.3 + 7.0.16-servicing.24061.3 + 7.0.16-servicing.24061.3 + 7.0.16-servicing.24061.3 + 7.0.16-servicing.24061.3 0.2.0 @@ -70,8 +70,8 @@ 7.0.116 - 7.0.116-servicing.24060.20 - 7.0.116-servicing.24060.20 + 7.0.116-servicing.24061.12 + 7.0.116-servicing.24061.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -92,10 +92,10 @@ - 7.0.15-servicing.23579.2 - 7.0.15-servicing.23579.2 - 7.0.15 - 7.0.15 + 7.0.16-servicing.24060.13 + 7.0.16-servicing.24060.13 + 7.0.16 + 7.0.16 From 6811cdf123d8a9cc9836b18ebf42fdfd96fde951 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 11 Jan 2024 20:17:01 +0000 Subject: [PATCH 278/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240111.13 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.312 -> To Version 7.0.313 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 7.0.15 -> To Version 7.0.16 (parent: Microsoft.NET.Sdk --- NuGet.config | 18 ++++++++---- eng/Version.Details.xml | 64 ++++++++++++++++++++--------------------- eng/Versions.props | 30 +++++++++---------- 3 files changed, 59 insertions(+), 53 deletions(-) diff --git a/NuGet.config b/NuGet.config index 2102f9bcf..fb6caa493 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,19 +10,23 @@ - + + + + + - + - + @@ -44,15 +48,17 @@ - + + + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b80909b84..408592dd6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - acb200f3181da8cc111042a65f247bab519b9663 + d62704f831ab66265d54c5d09b24a82bff2deac2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - acb200f3181da8cc111042a65f247bab519b9663 + d62704f831ab66265d54c5d09b24a82bff2deac2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - acb200f3181da8cc111042a65f247bab519b9663 + d62704f831ab66265d54c5d09b24a82bff2deac2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - acb200f3181da8cc111042a65f247bab519b9663 + d62704f831ab66265d54c5d09b24a82bff2deac2 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -52,34 +52,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c49ccc8727c620ce1cb8fb431bb3fe8f2e747236 + ecd58f375010a7fac5165a1ff584f8e336c9e044 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c49ccc8727c620ce1cb8fb431bb3fe8f2e747236 + ecd58f375010a7fac5165a1ff584f8e336c9e044 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c49ccc8727c620ce1cb8fb431bb3fe8f2e747236 + ecd58f375010a7fac5165a1ff584f8e336c9e044 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c49ccc8727c620ce1cb8fb431bb3fe8f2e747236 + ecd58f375010a7fac5165a1ff584f8e336c9e044 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c49ccc8727c620ce1cb8fb431bb3fe8f2e747236 + ecd58f375010a7fac5165a1ff584f8e336c9e044 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c49ccc8727c620ce1cb8fb431bb3fe8f2e747236 + ecd58f375010a7fac5165a1ff584f8e336c9e044 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c49ccc8727c620ce1cb8fb431bb3fe8f2e747236 + ecd58f375010a7fac5165a1ff584f8e336c9e044 https://github.com/dotnet/test-templates @@ -98,31 +98,31 @@ 45a41b353d078e4d1e5918246fddbacb452eb210 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a87e751ac0a46a6a69fb55a63a8f96a71ecace7c + 18d8a2987501c4439ddadf2501a80760f4f87de3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a87e751ac0a46a6a69fb55a63a8f96a71ecace7c + 18d8a2987501c4439ddadf2501a80760f4f87de3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a87e751ac0a46a6a69fb55a63a8f96a71ecace7c + 18d8a2987501c4439ddadf2501a80760f4f87de3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a87e751ac0a46a6a69fb55a63a8f96a71ecace7c + 18d8a2987501c4439ddadf2501a80760f4f87de3 https://dev.azure.com/dnceng/internal/_git/dotnet-winforms 1d272c1ef7277b7cc38148300732e6a72848bedc - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 02d7f45dcacc192b40e725d6f6e77ec64e202c7a + 963a6a55dd6f72f604651fff7c1515dadcd37a39 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index e2302f9ba..e6fe2f142 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,7 +41,7 @@ - 7.0.15-servicing.23578.3 + 7.0.16-servicing.24060.7 @@ -56,22 +56,22 @@ - 7.0.15 - 7.0.15 - 7.0.15-servicing.23601.10 - 7.0.15-servicing.23601.10 - 7.0.15-servicing.23601.10 - 7.0.15-servicing.23601.10 - 7.0.15-servicing.23601.10 + 7.0.16 + 7.0.16 + 7.0.16-servicing.24061.3 + 7.0.16-servicing.24061.3 + 7.0.16-servicing.24061.3 + 7.0.16-servicing.24061.3 + 7.0.16-servicing.24061.3 0.2.0 - 7.0.312 - 7.0.312-servicing.23601.26 - 7.0.312-servicing.23601.26 + 7.0.313 + 7.0.313-servicing.24061.13 + 7.0.313-servicing.24061.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -96,10 +96,10 @@ - 7.0.15-servicing.23579.2 - 7.0.15-servicing.23579.2 - 7.0.15 - 7.0.15 + 7.0.16-servicing.24060.13 + 7.0.16-servicing.24060.13 + 7.0.16 + 7.0.16 From 316a491c2b6b0d70eee0392c1f165c030324134b Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 11 Jan 2024 20:21:19 +0000 Subject: [PATCH 279/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240111.14 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.406 -> To Version 7.0.406 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 7.0.15 -> To Version 7.0.16 (parent: Microsoft.NET.Sdk --- NuGet.config | 14 ++++------ eng/Version.Details.xml | 62 ++++++++++++++++++++--------------------- eng/Versions.props | 28 +++++++++---------- 3 files changed, 51 insertions(+), 53 deletions(-) diff --git a/NuGet.config b/NuGet.config index bd3ba0a76..e0771b288 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,6 +10,7 @@ + @@ -22,12 +23,10 @@ - + - - - + @@ -49,18 +48,17 @@ + - + - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 47202d2a7..315caf81b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - acb200f3181da8cc111042a65f247bab519b9663 + d62704f831ab66265d54c5d09b24a82bff2deac2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - acb200f3181da8cc111042a65f247bab519b9663 + d62704f831ab66265d54c5d09b24a82bff2deac2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - acb200f3181da8cc111042a65f247bab519b9663 + d62704f831ab66265d54c5d09b24a82bff2deac2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - acb200f3181da8cc111042a65f247bab519b9663 + d62704f831ab66265d54c5d09b24a82bff2deac2 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -52,34 +52,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c49ccc8727c620ce1cb8fb431bb3fe8f2e747236 + ecd58f375010a7fac5165a1ff584f8e336c9e044 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c49ccc8727c620ce1cb8fb431bb3fe8f2e747236 + ecd58f375010a7fac5165a1ff584f8e336c9e044 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c49ccc8727c620ce1cb8fb431bb3fe8f2e747236 + ecd58f375010a7fac5165a1ff584f8e336c9e044 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c49ccc8727c620ce1cb8fb431bb3fe8f2e747236 + ecd58f375010a7fac5165a1ff584f8e336c9e044 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c49ccc8727c620ce1cb8fb431bb3fe8f2e747236 + ecd58f375010a7fac5165a1ff584f8e336c9e044 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c49ccc8727c620ce1cb8fb431bb3fe8f2e747236 + ecd58f375010a7fac5165a1ff584f8e336c9e044 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c49ccc8727c620ce1cb8fb431bb3fe8f2e747236 + ecd58f375010a7fac5165a1ff584f8e336c9e044 https://github.com/dotnet/test-templates @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b0c4f89a12a96383f763852b14707378f810b666 + b42e612282cfa3fe86419f63091a56b35d915baf - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b0c4f89a12a96383f763852b14707378f810b666 + b42e612282cfa3fe86419f63091a56b35d915baf - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b0c4f89a12a96383f763852b14707378f810b666 + b42e612282cfa3fe86419f63091a56b35d915baf - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b0c4f89a12a96383f763852b14707378f810b666 + b42e612282cfa3fe86419f63091a56b35d915baf https://dev.azure.com/dnceng/internal/_git/dotnet-winforms 1d272c1ef7277b7cc38148300732e6a72848bedc - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 02d7f45dcacc192b40e725d6f6e77ec64e202c7a + 963a6a55dd6f72f604651fff7c1515dadcd37a39 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index f503f25a2..34f29b1d4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,7 +41,7 @@ - 7.0.15-servicing.23578.3 + 7.0.16-servicing.24060.7 @@ -56,13 +56,13 @@ - 7.0.15 - 7.0.15 - 7.0.15-servicing.23601.10 - 7.0.15-servicing.23601.10 - 7.0.15-servicing.23601.10 - 7.0.15-servicing.23601.10 - 7.0.15-servicing.23601.10 + 7.0.16 + 7.0.16 + 7.0.16-servicing.24061.3 + 7.0.16-servicing.24061.3 + 7.0.16-servicing.24061.3 + 7.0.16-servicing.24061.3 + 7.0.16-servicing.24061.3 0.2.0 @@ -70,8 +70,8 @@ 7.0.406 - 7.0.406-servicing.24061.4 - 7.0.406-servicing.24061.4 + 7.0.406-servicing.24061.14 + 7.0.406-servicing.24061.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -96,10 +96,10 @@ - 7.0.15-servicing.23579.2 - 7.0.15-servicing.23579.2 - 7.0.15 - 7.0.15 + 7.0.16-servicing.24060.13 + 7.0.16-servicing.24060.13 + 7.0.16 + 7.0.16 From fe5615852fd139d06ef3a3813e0e3d818e2a2e62 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 11 Jan 2024 16:03:46 -0800 Subject: [PATCH 280/535] [release/7.0.3xx] Update dependencies from dotnet/arcade (#18218) Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 16 ++++++++++++++-- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 4 ++-- 4 files changed, 23 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index 2102f9bcf..280601a1f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,19 +10,26 @@ - + + + + + + + + @@ -44,14 +51,19 @@ - + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b80909b84..bdd15b788 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - 02d5538bac1bacfd6fb310d92ab8914de08f3358 + d6372b3e4dcd568d7412ab1e60003fa1083aaa5f - + https://github.com/dotnet/arcade - 02d5538bac1bacfd6fb310d92ab8914de08f3358 + d6372b3e4dcd568d7412ab1e60003fa1083aaa5f - + https://github.com/dotnet/arcade - 02d5538bac1bacfd6fb310d92ab8914de08f3358 + d6372b3e4dcd568d7412ab1e60003fa1083aaa5f https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index e2302f9ba..fea881a17 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.24059.5 + 7.0.0-beta.24061.2 diff --git a/global.json b/global.json index fd9164f9a..45f2ad15f 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24059.5", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24059.5" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24061.2", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24061.2" } } From ee1d3986c27465e48e7c7f9efdfc17ca177a54c3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 11 Jan 2024 16:04:05 -0800 Subject: [PATCH 281/535] [release/7.0.4xx] Update dependencies from dotnet/arcade (#18217) Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 16 ++++++++++++++-- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 4 ++-- 4 files changed, 23 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index 34760f138..f1fe9ed1c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,19 +10,26 @@ - + + + + + + + + @@ -44,14 +51,19 @@ - + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bb3641411..6d5ac1690 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - 02d5538bac1bacfd6fb310d92ab8914de08f3358 + d6372b3e4dcd568d7412ab1e60003fa1083aaa5f - + https://github.com/dotnet/arcade - 02d5538bac1bacfd6fb310d92ab8914de08f3358 + d6372b3e4dcd568d7412ab1e60003fa1083aaa5f - + https://github.com/dotnet/arcade - 02d5538bac1bacfd6fb310d92ab8914de08f3358 + d6372b3e4dcd568d7412ab1e60003fa1083aaa5f https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 89aaec6b4..69a22d60d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.24059.5 + 7.0.0-beta.24061.2 diff --git a/global.json b/global.json index fd9164f9a..45f2ad15f 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24059.5", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24059.5" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24061.2", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24061.2" } } From 7e1c638384bde85353dc26e9cdd9003e737d1eb4 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Thu, 11 Jan 2024 16:07:57 -0800 Subject: [PATCH 282/535] Fix the duplicate properties added in the internal to public merge The internal to public duplicated all the maui and aspire workload properties for some reason. Deleted the duplicates. --- eng/Versions.props | 9 --------- 1 file changed, 9 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 77453e103..1415afd27 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -239,15 +239,6 @@ - 8.0.100 - 8.0.0-preview.1.23551.7 - 8.0.100-rc.2 - 8.0.0-rc.2.9373 - 34.0.0-rc.2.468 - 16.4.8968-net8-rc2 - 16.4.8968-net8-rc2 - 13.3.8968-net8-rc2 - 16.4.8968-net8-rc2 8.0.100 8.0.0-preview.1.23557.2 8.0.100 From 002ea121406e72a848c105cfc12337a21355fbff Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 12 Jan 2024 13:55:04 +0000 Subject: [PATCH 283/535] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20240111.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.23565.1 -> To Version 8.0.0-alpha.1.24061.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 e03fc8203..9f19ee9e9 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,21 +8,28 @@ + + - + + + + + + @@ -43,14 +50,19 @@ - + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4f21ade59..f4eb83c12 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -239,9 +239,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - 95f83e27806330fec09edd96e06bba3acabe3f35 + 453a37ef7ae6c335cd49b3b9ab7713c87faeb265 From 0bf95ed6be8aaecc3d22d63e9b3db5efa00e2b2b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 12 Jan 2024 19:01:37 +0000 Subject: [PATCH 284/535] [release/8.0.1xx] Fix VMR build tagging (#18233) --- eng/pipelines/templates/jobs/sdk-diff-tests.yml | 2 +- .../content/eng/pipelines/templates/stages/vmr-scan.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/pipelines/templates/jobs/sdk-diff-tests.yml b/eng/pipelines/templates/jobs/sdk-diff-tests.yml index 1102f74ac..d7ed9a81a 100644 --- a/eng/pipelines/templates/jobs/sdk-diff-tests.yml +++ b/eng/pipelines/templates/jobs/sdk-diff-tests.yml @@ -34,7 +34,7 @@ jobs: echo "Dotnet-dotnet build: https://dev.azure.com/dnceng/internal/_build/results?buildId=$dotnet_dotnet_build&view=results" - installer_sha=$(az pipelines build tag list --organization '$(AZDO_ORG)' --project '$(AZDO_PROJECT)' --build-id $dotnet_dotnet_build --output tsv | sed "s,installer-,,g") + installer_sha=$(az pipelines build tag list --organization '$(AZDO_ORG)' --project '$(AZDO_PROJECT)' --build-id $dotnet_dotnet_build --output tsv | sed "s,installer ,,g") installer_build=$(az pipelines runs list --organization '$(AZDO_ORG)' --project '$(AZDO_PROJECT)' --pipeline-ids '$(INSTALLER_OFFICIAL_CI_PIPELINE_ID)' --query "[?sourceVersion == '$installer_sha'].id" --output tsv) if [[ -z "$installer_build" ]]; then echo "Could not find a build of installer for commit '$installer_sha'" diff --git a/src/SourceBuild/content/eng/pipelines/templates/stages/vmr-scan.yml b/src/SourceBuild/content/eng/pipelines/templates/stages/vmr-scan.yml index 99a34658f..6024ce182 100644 --- a/src/SourceBuild/content/eng/pipelines/templates/stages/vmr-scan.yml +++ b/src/SourceBuild/content/eng/pipelines/templates/stages/vmr-scan.yml @@ -28,7 +28,7 @@ stages: - script: | set -e sha=`./.dotnet/dotnet darc vmr get-version --vmr "$(Build.SourcesDirectory)" installer` - echo "##vso[build.addbuildtag]installer-$sha" + echo "##vso[build.addbuildtag]$sha" displayName: Tag the build workingDirectory: $(Build.SourcesDirectory)/src/installer From d3bfe4a31a8b1d5422e928b643e21a109fc1da04 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 13 Jan 2024 13:58:52 +0000 Subject: [PATCH 285/535] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20240111.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.23565.1 -> To Version 8.0.0-alpha.1.24061.1 --- NuGet.config | 6 ------ 1 file changed, 6 deletions(-) diff --git a/NuGet.config b/NuGet.config index 9f19ee9e9..6ee261624 100644 --- a/NuGet.config +++ b/NuGet.config @@ -17,9 +17,6 @@ - - - @@ -52,9 +49,6 @@ - - - From 776d577b21742a1c98bb730dd2d0b9e45a8b99f8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 14 Jan 2024 13:50:46 +0000 Subject: [PATCH 286/535] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20240111.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.23565.1 -> To Version 8.0.0-alpha.1.24061.1 --- NuGet.config | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6ee261624..a52c961da 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,14 +19,8 @@ - - - - - - @@ -50,14 +44,8 @@ - - - - - - From a8524c037847cb3ccf9770ab2c48a16d806a615c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 15 Jan 2024 15:16:43 +0000 Subject: [PATCH 287/535] Update dependencies from https://github.com/dotnet/source-build-externals build 20240115.1 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 8.0.0-alpha.1.24059.4 -> To Version 8.0.0-alpha.1.24065.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 f4eb83c12..81e8a49c7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -193,9 +193,9 @@ 5957c5c5f85f17c145e7fab4ece37ad6aafcded9 - + https://github.com/dotnet/source-build-externals - 7134e53b6b1210a1ce8838b12b8f6071e0a3433b + 83274d94c7e2ff21081b0d75ecbec2da2241f831 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 288/535] [release/7.0.4xx] Update dependencies from dotnet/arcade (#18261) [release/7.0.4xx] Update dependencies from dotnet/arcade --- NuGet.config | 21 --------------------- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/native/init-compiler.sh | 2 +- global.json | 4 ++-- 5 files changed, 10 insertions(+), 31 deletions(-) diff --git a/NuGet.config b/NuGet.config index f1fe9ed1c..bdc3a6cb9 100644 --- a/NuGet.config +++ b/NuGet.config @@ -12,24 +12,12 @@ - - - - - - - - - - - - @@ -53,18 +41,9 @@ - - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6d5ac1690..6526e84d8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - d6372b3e4dcd568d7412ab1e60003fa1083aaa5f + feda715e3fb6d511eaa39071bb9d77351cf4d943 - + https://github.com/dotnet/arcade - d6372b3e4dcd568d7412ab1e60003fa1083aaa5f + feda715e3fb6d511eaa39071bb9d77351cf4d943 - + https://github.com/dotnet/arcade - d6372b3e4dcd568d7412ab1e60003fa1083aaa5f + feda715e3fb6d511eaa39071bb9d77351cf4d943 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 69a22d60d..549b11314 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.24061.2 + 7.0.0-beta.24065.4 diff --git a/eng/common/native/init-compiler.sh b/eng/common/native/init-compiler.sh index f13b74080..81ea06151 100644 --- a/eng/common/native/init-compiler.sh +++ b/eng/common/native/init-compiler.sh @@ -71,7 +71,7 @@ if [[ -z "$CLR_CC" ]]; then # Set default versions if [[ -z "$majorVersion" ]]; then # note: gcc (all versions) and clang versions higher than 6 do not have minor version in file name, if it is zero. - if [[ "$compiler" == "clang" ]]; then versions=( 16 15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5 ) + if [[ "$compiler" == "clang" ]]; then versions=( 17 16 15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5 ) elif [[ "$compiler" == "gcc" ]]; then versions=( 12 11 10 9 8 7 6 5 4.9 ); fi for version in "${versions[@]}"; do diff --git a/global.json b/global.json index 45f2ad15f..30aff2051 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24061.2", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24061.2" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24065.4", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24065.4" } } From 91c1a15716e1184388fa121e6473cd501dee0487 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 16 Jan 2024 22:33:06 +0000 Subject: [PATCH 289/535] [release/7.0.3xx] Update dependencies from dotnet/arcade (#18262) [release/7.0.3xx] Update dependencies from dotnet/arcade --- NuGet.config | 21 --------------------- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/native/init-compiler.sh | 2 +- global.json | 4 ++-- 5 files changed, 10 insertions(+), 31 deletions(-) diff --git a/NuGet.config b/NuGet.config index 280601a1f..d288f50a2 100644 --- a/NuGet.config +++ b/NuGet.config @@ -12,24 +12,12 @@ - - - - - - - - - - - - @@ -53,18 +41,9 @@ - - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bdd15b788..73ed55f61 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - d6372b3e4dcd568d7412ab1e60003fa1083aaa5f + feda715e3fb6d511eaa39071bb9d77351cf4d943 - + https://github.com/dotnet/arcade - d6372b3e4dcd568d7412ab1e60003fa1083aaa5f + feda715e3fb6d511eaa39071bb9d77351cf4d943 - + https://github.com/dotnet/arcade - d6372b3e4dcd568d7412ab1e60003fa1083aaa5f + feda715e3fb6d511eaa39071bb9d77351cf4d943 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index fea881a17..099155591 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.24061.2 + 7.0.0-beta.24065.4 diff --git a/eng/common/native/init-compiler.sh b/eng/common/native/init-compiler.sh index f13b74080..81ea06151 100644 --- a/eng/common/native/init-compiler.sh +++ b/eng/common/native/init-compiler.sh @@ -71,7 +71,7 @@ if [[ -z "$CLR_CC" ]]; then # Set default versions if [[ -z "$majorVersion" ]]; then # note: gcc (all versions) and clang versions higher than 6 do not have minor version in file name, if it is zero. - if [[ "$compiler" == "clang" ]]; then versions=( 16 15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5 ) + if [[ "$compiler" == "clang" ]]; then versions=( 17 16 15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5 ) elif [[ "$compiler" == "gcc" ]]; then versions=( 12 11 10 9 8 7 6 5 4.9 ); fi for version in "${versions[@]}"; do diff --git a/global.json b/global.json index 45f2ad15f..30aff2051 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24061.2", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24061.2" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24065.4", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24065.4" } } From c99b7cbaecc983f7f32f52dd2f10441615e6f3e6 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 18 Jan 2024 18:16:53 +0000 Subject: [PATCH 290/535] Merged PR 36614: [internal/release/7.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:65272799-fe4d-4dbf-f0fe-08da7ef63651) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 65272799-fe4d-4dbf-f0fe-08da7ef63651 - **Build**: 20240117.58 - **Date Produced**: January 18, 2024 7:27:50 AM UTC - **Commit**: d833c87a5bda1313c0ab48d5c8dca96c675b9906 - **Branch**: refs/heads/internal/release/7.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.116 to 7.0.116][3] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.116-servicing.24066.29 to 7.0.116-servicing.24067.58][3] - **Microsoft.NET.Sdk**: [from 7.0.116-servicing.24066.29 to 7.0.116-servicing.24067.58][3] - **Microsoft.TemplateEngine.Cli**: [from 7.0.116-servicing.24066.29 to 7.0.116-servicing.24067.58][3] [3]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC26033f320535f652724e744bd4758ca0bf0a6495&targetVersion=GCd833c87a5bda1313c0ab48d5c8dca96c675b9906&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:65272799-fe4d-4dbf-f0fe-08da7ef63651) [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.WindowsDesktop.App.Ref**: from 7.0.16 to 7.0.16 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: from 7.0.16-servicing.24060.13 to 7.0.16-servicing.24061.3 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: from 7.0.16-servicing.24060.13 to 7.0.16-servicing.24061.3 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 7.0.15 to 7.0.16 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.7.0**: from 7.0.15-servicing.23572.26 to 7.0.16-servicing.24066.29 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 7.0.15 to 7.0.16 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 7.0.15 to 7.0.16 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 7.0.15 to 7.0.16 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 7.0.16 to 7.0.16 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 7.0.16-servicing.24061.3 to 7.0.16-servicing.24067.14 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 7.0.16 to 7.0.16 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: from 7.0.16-servicing.24061.3 to 7.0.16-servicing.24067.14 (parent: Microsoft.NET.S... --- NuGet.config | 24 ++++------- eng/Version.Details.xml | 94 ++++++++++++++++++++--------------------- eng/Versions.props | 38 ++++++++--------- 3 files changed, 75 insertions(+), 81 deletions(-) diff --git a/NuGet.config b/NuGet.config index e9a2fa634..7f6b1aab0 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,26 +7,22 @@ - + - - - + - - - + - + - + @@ -48,17 +44,15 @@ - + - - - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 713af0f51..9eb2b1689 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,44 +3,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d62704f831ab66265d54c5d09b24a82bff2deac2 + 01e02684374c6bf4541b7507ce041409ae410f63 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d62704f831ab66265d54c5d09b24a82bff2deac2 + 01e02684374c6bf4541b7507ce041409ae410f63 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d62704f831ab66265d54c5d09b24a82bff2deac2 + 01e02684374c6bf4541b7507ce041409ae410f63 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d62704f831ab66265d54c5d09b24a82bff2deac2 + 01e02684374c6bf4541b7507ce041409ae410f63 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8f4568cdaa2f9654fd133a17cd2dcc55b5f42455 + 567edafe6106e6b769c64f6a2ed876190baa642a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8f4568cdaa2f9654fd133a17cd2dcc55b5f42455 + 567edafe6106e6b769c64f6a2ed876190baa642a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8f4568cdaa2f9654fd133a17cd2dcc55b5f42455 + 567edafe6106e6b769c64f6a2ed876190baa642a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8f4568cdaa2f9654fd133a17cd2dcc55b5f42455 + 567edafe6106e6b769c64f6a2ed876190baa642a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8f4568cdaa2f9654fd133a17cd2dcc55b5f42455 + 567edafe6106e6b769c64f6a2ed876190baa642a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8f4568cdaa2f9654fd133a17cd2dcc55b5f42455 + 567edafe6106e6b769c64f6a2ed876190baa642a @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ecd58f375010a7fac5165a1ff584f8e336c9e044 + 15564036208e2608d636de11fc8161ca437e022a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ecd58f375010a7fac5165a1ff584f8e336c9e044 + 15564036208e2608d636de11fc8161ca437e022a https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ecd58f375010a7fac5165a1ff584f8e336c9e044 + 15564036208e2608d636de11fc8161ca437e022a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ecd58f375010a7fac5165a1ff584f8e336c9e044 + 15564036208e2608d636de11fc8161ca437e022a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ecd58f375010a7fac5165a1ff584f8e336c9e044 + 15564036208e2608d636de11fc8161ca437e022a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ecd58f375010a7fac5165a1ff584f8e336c9e044 + 15564036208e2608d636de11fc8161ca437e022a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ecd58f375010a7fac5165a1ff584f8e336c9e044 + 15564036208e2608d636de11fc8161ca437e022a https://github.com/dotnet/test-templates @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 383d1cee7ce36156a4adf5d0779c1eb94bf85357 + d833c87a5bda1313c0ab48d5c8dca96c675b9906 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 383d1cee7ce36156a4adf5d0779c1eb94bf85357 + d833c87a5bda1313c0ab48d5c8dca96c675b9906 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 383d1cee7ce36156a4adf5d0779c1eb94bf85357 + d833c87a5bda1313c0ab48d5c8dca96c675b9906 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 383d1cee7ce36156a4adf5d0779c1eb94bf85357 + d833c87a5bda1313c0ab48d5c8dca96c675b9906 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 1d272c1ef7277b7cc38148300732e6a72848bedc + b7fa724c93e65ac40bef3e8ab05bc1a63f62b0f6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 963a6a55dd6f72f604651fff7c1515dadcd37a39 + b05bc3d0cf33b94b37f8dec5d6b2829d508209eb https://github.com/dotnet/fsharp @@ -154,22 +154,22 @@ 6918b863aa37ad0699f98482fbab9f7a52e65a92 - + https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted - 24f8150c97f9d26a7b5d77e983938e18d48e7d9f + 1653cf17925473602f5460c5e4682a0dab4c4d22 https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 33b038b591f6e19c32a390333d41292cbd86d93c + ca510604d1667f32b4fa4653e3d3b64be8136bdc - + https://github.com/dotnet/emsdk - 33b038b591f6e19c32a390333d41292cbd86d93c + ca510604d1667f32b4fa4653e3d3b64be8136bdc https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index eab48d207..4c6e3217f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.15-servicing.23573.3 + 7.0.16-servicing.24060.7 - 7.0.16-servicing.24060.7 + 7.0.16-servicing.24060.16 @@ -58,11 +58,11 @@ 7.0.16 7.0.16 - 7.0.16-servicing.24061.3 - 7.0.16-servicing.24061.3 - 7.0.16-servicing.24061.3 - 7.0.16-servicing.24061.3 - 7.0.16-servicing.24061.3 + 7.0.16-servicing.24067.14 + 7.0.16-servicing.24067.14 + 7.0.16-servicing.24067.14 + 7.0.16-servicing.24067.14 + 7.0.16-servicing.24067.14 0.2.0 @@ -70,8 +70,8 @@ 7.0.116 - 7.0.116-servicing.24061.12 - 7.0.116-servicing.24061.12 + 7.0.116-servicing.24067.58 + 7.0.116-servicing.24067.58 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -82,18 +82,18 @@ - 7.0.15-servicing.23572.26 - 7.0.15-servicing.23572.26 - 7.0.15 - 7.0.15 - 7.0.15 - 7.0.15 + 7.0.16-servicing.24066.29 + 7.0.16-servicing.24066.29 + 7.0.16 + 7.0.16 + 7.0.16 + 7.0.16 2.1.0 - 7.0.16-servicing.24060.13 - 7.0.16-servicing.24060.13 + 7.0.16-servicing.24061.3 + 7.0.16-servicing.24061.3 7.0.16 7.0.16 @@ -228,8 +228,8 @@ 12.3.2372 16.0.1478 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.15 - 7.0.15 + 7.0.16 + 7.0.16 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version) From bf3fa709ed1fe2ddce71e1cc04e844d6a042b86a Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 18 Jan 2024 18:17:09 +0000 Subject: [PATCH 291/535] Merged PR 36615: [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.WindowsDesktop.App.Ref**: from 6.0.27 to 6.0.27 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.27-servicing.24060.12 to 6.0.27-servicing.24067.4 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.27-servicing.24060.12 to 6.0.27-servicing.24067.4 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.26 to 6.0.27 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.26-servicing.23605.8 to 6.0.27-servicing.24066.28 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.26 to 6.0.27 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.26 to 6.0.27 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.26 to 6.0.27 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.27 to 6.0.27 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.27-servicing.24060.17 to 6.0.27-servicing.24067.9 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.27 to 6.0.27 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.27-servicing.24060.17 to 6.0.27-servicing.24067.9 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.27-servicing.24060.17 to 6.0.27-servicing.24067.9 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.27-servicing.24060.17 to 6.0.27-servicing.24067.9 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.127 to 6.0.127 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.127-servicing.24060.8 to 6.0.127-servicing.24067.3 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.127 to 6.0.127 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.27 to 6.0.27 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.26-servicing.23605.5 to 6.0.27-servicing.24067.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.27 to 6.0.27 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.27-servicing.24060.11 to 6.0.27-servicing.24067.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)... --- NuGet.config | 24 ++++-------- eng/Version.Details.xml | 84 ++++++++++++++++++++--------------------- eng/Versions.props | 32 ++++++++-------- 3 files changed, 66 insertions(+), 74 deletions(-) diff --git a/NuGet.config b/NuGet.config index cecbee116..a7df86bdf 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,26 +7,20 @@ - + - - - - - - - + - + - + @@ -47,19 +41,17 @@ - + - - - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 24b46084e..6ffa8aa04 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,44 +3,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 63f1b2eb2d5be182cd764445d3b76a1b7cbe1c77 + 3ecb49d3797e77df68db6c267a2c3a6d12dd7e83 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 63f1b2eb2d5be182cd764445d3b76a1b7cbe1c77 + 3ecb49d3797e77df68db6c267a2c3a6d12dd7e83 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 63f1b2eb2d5be182cd764445d3b76a1b7cbe1c77 + 3ecb49d3797e77df68db6c267a2c3a6d12dd7e83 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 63f1b2eb2d5be182cd764445d3b76a1b7cbe1c77 + 3ecb49d3797e77df68db6c267a2c3a6d12dd7e83 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - dc45e96840243b203b13e61952230e225d2aac52 + 32bc9e9e11138e57ee329f06cc1e870075eda725 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - dc45e96840243b203b13e61952230e225d2aac52 + 32bc9e9e11138e57ee329f06cc1e870075eda725 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - dc45e96840243b203b13e61952230e225d2aac52 + 32bc9e9e11138e57ee329f06cc1e870075eda725 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - dc45e96840243b203b13e61952230e225d2aac52 + 32bc9e9e11138e57ee329f06cc1e870075eda725 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - dc45e96840243b203b13e61952230e225d2aac52 + 32bc9e9e11138e57ee329f06cc1e870075eda725 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - dc45e96840243b203b13e61952230e225d2aac52 + 32bc9e9e11138e57ee329f06cc1e870075eda725 @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c231018f479fc8f65afcd0dcd3b9de26026b4655 + 8feb4df7955281c07a246c08ec70d6f0da3530e1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c231018f479fc8f65afcd0dcd3b9de26026b4655 + 8feb4df7955281c07a246c08ec70d6f0da3530e1 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c231018f479fc8f65afcd0dcd3b9de26026b4655 + 8feb4df7955281c07a246c08ec70d6f0da3530e1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c231018f479fc8f65afcd0dcd3b9de26026b4655 + 8feb4df7955281c07a246c08ec70d6f0da3530e1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c231018f479fc8f65afcd0dcd3b9de26026b4655 + 8feb4df7955281c07a246c08ec70d6f0da3530e1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c231018f479fc8f65afcd0dcd3b9de26026b4655 + 8feb4df7955281c07a246c08ec70d6f0da3530e1 https://github.com/dotnet/test-templates @@ -92,34 +92,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - f88db578fa807fdab408d8267dc1b1f736fd8dca + 6edfc94a8d69756c30a4741684d245ecae42e8a1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - f88db578fa807fdab408d8267dc1b1f736fd8dca + 6edfc94a8d69756c30a4741684d245ecae42e8a1 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - f88db578fa807fdab408d8267dc1b1f736fd8dca + 6edfc94a8d69756c30a4741684d245ecae42e8a1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 48588050013d6553358d9a50a8bd934ebdac1aab + 8c2cdb52b59151206e411a78ec7b279302ceee30 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 48588050013d6553358d9a50a8bd934ebdac1aab + 8c2cdb52b59151206e411a78ec7b279302ceee30 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - c309ca06b81112f5e42cc9ca6f8bf0c4a772be6b + c92bca031b633bb527ac58a44e8f0127ab8984ac - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 2f8a4024340668c8e8a5e55a9c601f7a62be7c05 + c259e4173d70ad05737b7d838235c015fa25258b https://github.com/dotnet/fsharp @@ -151,7 +151,7 @@ b177f8fa703370c80b2e56469208c2bb099efba0 - + https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted 7fe6b814c901490292f02d8ea12749505fbb959a @@ -168,7 +168,7 @@ https://github.com/dotnet/emsdk - 5ccc36f5985e2089f47c97a19c250e65ddefd0ba + 5460e2cb3721954528c452d9d32474e4c32b7141 https://github.com/dotnet/source-build diff --git a/eng/Versions.props b/eng/Versions.props index 09cbe922d..2e2875f31 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.26-servicing.23605.5 + 6.0.27-servicing.24067.5 - 6.0.27-servicing.24060.11 + 6.0.27-servicing.24067.2 @@ -46,18 +46,18 @@ 6.0.27 6.0.27 - 6.0.27-servicing.24060.17 - 6.0.27-servicing.24060.17 - 6.0.27-servicing.24060.17 - 6.0.27-servicing.24060.17 + 6.0.27-servicing.24067.9 + 6.0.27-servicing.24067.9 + 6.0.27-servicing.24067.9 + 6.0.27-servicing.24067.9 0.2.0 - 6.0.127-servicing.24061.15 - 6.0.127-servicing.24061.15 + 6.0.127-servicing.24068.21 + 6.0.127-servicing.24068.21 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,18 +68,18 @@ - 6.0.26-servicing.23605.8 - 6.0.26-servicing.23605.8 - 6.0.26 - 6.0.26 - 6.0.26 - 6.0.26 + 6.0.27-servicing.24066.28 + 6.0.27-servicing.24066.28 + 6.0.27 + 6.0.27 + 6.0.27 + 6.0.27 2.1.0 - 6.0.27-servicing.24060.12 - 6.0.27-servicing.24060.12 + 6.0.27-servicing.24067.4 + 6.0.27-servicing.24067.4 6.0.27 6.0.27 From 6405b4c3bded73455ca03f6f103b274411f19895 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 18 Jan 2024 18:20:27 +0000 Subject: [PATCH 292/535] Merged PR 36616: [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.WindowsDesktop.App.Ref**: from 6.0.26 to 6.0.27 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.26-servicing.23605.4 to 6.0.27-servicing.24067.4 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.26-servicing.23605.4 to 6.0.27-servicing.24067.4 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.26 to 6.0.27 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.26-servicing.23605.8 to 6.0.27-servicing.24066.28 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.26 to 6.0.27 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.26 to 6.0.27 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.26 to 6.0.27 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.26 to 6.0.27 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.26-servicing.23605.6 to 6.0.27-servicing.24067.9 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.26 to 6.0.27 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.26-servicing.23605.6 to 6.0.27-servicing.24067.9 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.26-servicing.23605.6 to 6.0.27-servicing.24067.9 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.26-servicing.23605.6 to 6.0.27-servicing.24067.9 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.418 to 6.0.419 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.418-rtm.23605.6 to 6.0.419-rtm.24067.1 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.418 to 6.0.419 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.26 to 6.0.27 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.26-servicing.23605.5 to 6.0.27-servicing.24067.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.26 to 6.0.27 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.26-servicing.23605.3 to 6.0.27-servicing.24067.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **VS.Redist.C... --- NuGet.config | 29 ++++--------- eng/Version.Details.xml | 94 ++++++++++++++++++++--------------------- eng/Versions.props | 44 +++++++++---------- 3 files changed, 77 insertions(+), 90 deletions(-) diff --git a/NuGet.config b/NuGet.config index a286d7217..0e13fbfe7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,28 +7,20 @@ + - - - - - - + - - - + - - - + @@ -49,21 +41,16 @@ + - - - + - - - + - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3a9fb7cf5..2d13d9cb0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 84ebced93b7a69ba3332fe6000354306d4eea9dd + 3ecb49d3797e77df68db6c267a2c3a6d12dd7e83 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 84ebced93b7a69ba3332fe6000354306d4eea9dd + 3ecb49d3797e77df68db6c267a2c3a6d12dd7e83 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 84ebced93b7a69ba3332fe6000354306d4eea9dd + 3ecb49d3797e77df68db6c267a2c3a6d12dd7e83 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 84ebced93b7a69ba3332fe6000354306d4eea9dd + 3ecb49d3797e77df68db6c267a2c3a6d12dd7e83 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - dc45e96840243b203b13e61952230e225d2aac52 + 32bc9e9e11138e57ee329f06cc1e870075eda725 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - dc45e96840243b203b13e61952230e225d2aac52 + 32bc9e9e11138e57ee329f06cc1e870075eda725 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - dc45e96840243b203b13e61952230e225d2aac52 + 32bc9e9e11138e57ee329f06cc1e870075eda725 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - dc45e96840243b203b13e61952230e225d2aac52 + 32bc9e9e11138e57ee329f06cc1e870075eda725 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - dc45e96840243b203b13e61952230e225d2aac52 + 32bc9e9e11138e57ee329f06cc1e870075eda725 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - dc45e96840243b203b13e61952230e225d2aac52 + 32bc9e9e11138e57ee329f06cc1e870075eda725 @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime a08d9ce2caf02455c0b825bcdc32974bdf769a80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d504a7b7dab277712646747e9f5cce0d9507245e + 8feb4df7955281c07a246c08ec70d6f0da3530e1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d504a7b7dab277712646747e9f5cce0d9507245e + 8feb4df7955281c07a246c08ec70d6f0da3530e1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d504a7b7dab277712646747e9f5cce0d9507245e + 8feb4df7955281c07a246c08ec70d6f0da3530e1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d504a7b7dab277712646747e9f5cce0d9507245e + 8feb4df7955281c07a246c08ec70d6f0da3530e1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d504a7b7dab277712646747e9f5cce0d9507245e + 8feb4df7955281c07a246c08ec70d6f0da3530e1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d504a7b7dab277712646747e9f5cce0d9507245e + 8feb4df7955281c07a246c08ec70d6f0da3530e1 https://github.com/dotnet/test-templates @@ -90,36 +90,36 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 766ee832e4d9d2d685414fceae96dca3c4e4dcbc + 27362cdf91a189f091cd343b92b147b871dc6181 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 766ee832e4d9d2d685414fceae96dca3c4e4dcbc + 27362cdf91a189f091cd343b92b147b871dc6181 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 766ee832e4d9d2d685414fceae96dca3c4e4dcbc + 27362cdf91a189f091cd343b92b147b871dc6181 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 27f723cb002f38336f60be5644dbe9e59cb2678a + ac40f93a6256add2d43ac56332518b82ac8726a4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 27f723cb002f38336f60be5644dbe9e59cb2678a + ac40f93a6256add2d43ac56332518b82ac8726a4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - c309ca06b81112f5e42cc9ca6f8bf0c4a772be6b + c92bca031b633bb527ac58a44e8f0127ab8984ac - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - e5b72d0fb5a405d5443b571ba1d78f419bdbcdb7 + c259e4173d70ad05737b7d838235c015fa25258b https://github.com/dotnet/fsharp @@ -168,7 +168,7 @@ https://github.com/dotnet/emsdk - 5ccc36f5985e2089f47c97a19c250e65ddefd0ba + 5460e2cb3721954528c452d9d32474e4c32b7141 https://github.com/dotnet/source-build diff --git a/eng/Versions.props b/eng/Versions.props index f8c424ff5..3a742389e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,15 +23,15 @@ - 6.0.26-servicing.23605.5 + 6.0.27-servicing.24067.5 - 6.0.26-servicing.23605.3 + 6.0.27-servicing.24067.2 - 6.0.418 + 6.0.419 @@ -44,20 +44,20 @@ - 6.0.26 - 6.0.26 - 6.0.26-servicing.23605.6 - 6.0.26-servicing.23605.6 - 6.0.26-servicing.23605.6 - 6.0.26-servicing.23605.6 + 6.0.27 + 6.0.27 + 6.0.27-servicing.24067.9 + 6.0.27-servicing.24067.9 + 6.0.27-servicing.24067.9 + 6.0.27-servicing.24067.9 0.2.0 - 6.0.419-servicing.24059.36 - 6.0.419-servicing.24059.36 + 6.0.419-servicing.24068.22 + 6.0.419-servicing.24068.22 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,20 +68,20 @@ - 6.0.26-servicing.23605.8 - 6.0.26-servicing.23605.8 - 6.0.26 - 6.0.26 - 6.0.26 - 6.0.26 + 6.0.27-servicing.24066.28 + 6.0.27-servicing.24066.28 + 6.0.27 + 6.0.27 + 6.0.27 + 6.0.27 2.1.0 - 6.0.26-servicing.23605.4 - 6.0.26-servicing.23605.4 - 6.0.26 - 6.0.26 + 6.0.27-servicing.24067.4 + 6.0.27-servicing.24067.4 + 6.0.27 + 6.0.27 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.418 + 6.0.419 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) From 2be7dd302ff34bed93f143d48960b8f564790228 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 18 Jan 2024 18:23:34 +0000 Subject: [PATCH 293/535] Merged PR 36618: [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698 - **Build**: 20240118.21 - **Date Produced**: January 18, 2024 5:52:22 PM UTC - **Commit**: 8c2cdb52b59151206e411a78ec7b279302ceee30 - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.127-servicing.24067.36 to 6.0.127-servicing.24068.21][5] - **Microsoft.NET.Sdk**: [from 6.0.127-servicing.24067.36 to 6.0.127-servicing.24068.21][5] [5]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC0666b67593f4c6c3da4d9280251c0cc99751e19c&targetVersion=GC8c2cdb52b59151206e411a78ec7b279302ceee30&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a68e208b-7b40-4a19-af8d-08d961c59698) From fa2462ce4ee7d7715b27b7280d7639d8b4081654 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 18 Jan 2024 18:23:38 +0000 Subject: [PATCH 294/535] Merged PR 36620: [internal/release/7.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.WindowsDesktop.App.Ref**: from 7.0.16 to 7.0.16 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: from 7.0.16-servicing.24060.13 to 7.0.16-servicing.24061.3 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: from 7.0.16-servicing.24060.13 to 7.0.16-servicing.24061.3 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 7.0.15 to 7.0.16 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.7.0**: from 7.0.15-servicing.23572.26 to 7.0.16-servicing.24066.29 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 7.0.15 to 7.0.16 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 7.0.15 to 7.0.16 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 7.0.15 to 7.0.16 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 7.0.16 to 7.0.16 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 7.0.16-servicing.24061.3 to 7.0.16-servicing.24067.19 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 7.0.16 to 7.0.16 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: from 7.0.16-servicing.24061.3 to 7.0.16-servicing.24067.19 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 7.0.16-servicing.24061.3 to 7.0.16-servicing.24067.19 (parent: Microsoft.NET.Sdk) - **dotnet-user-jwts**: from 7.0.16-servicing.24061.3 to 7.0.16-servicing.24067.19 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 7.0.16-servicing.24061.3 to 7.0.16-servicing.24067.19 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.16 to 7.0.16 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 7.0.15-servicing.23573.3 to 7.0.16-servicing.24060.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.16 to 7.0.16 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 7.0.16-servicing.24060.7 to 7.0.16-servicing.24060.16 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **NuGet.Build.Tasks**: from 6.6.0-rc.66 to 6.6.2-rc.1 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: from 7.0.15-servicing.23572.26 to 7.0.16-servicing.24066.29 (parent: Mic... --- NuGet.config | 24 ++++------- eng/Version.Details.xml | 94 ++++++++++++++++++++--------------------- eng/Versions.props | 38 ++++++++--------- 3 files changed, 75 insertions(+), 81 deletions(-) diff --git a/NuGet.config b/NuGet.config index fb6caa493..6f5b3eb00 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,23 +10,19 @@ - + - - - + - - - + - + - + @@ -48,17 +44,15 @@ - + - - - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 408592dd6..4743d6d1f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,44 +3,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d62704f831ab66265d54c5d09b24a82bff2deac2 + 01e02684374c6bf4541b7507ce041409ae410f63 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d62704f831ab66265d54c5d09b24a82bff2deac2 + 01e02684374c6bf4541b7507ce041409ae410f63 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d62704f831ab66265d54c5d09b24a82bff2deac2 + 01e02684374c6bf4541b7507ce041409ae410f63 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d62704f831ab66265d54c5d09b24a82bff2deac2 + 01e02684374c6bf4541b7507ce041409ae410f63 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8f4568cdaa2f9654fd133a17cd2dcc55b5f42455 + 567edafe6106e6b769c64f6a2ed876190baa642a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8f4568cdaa2f9654fd133a17cd2dcc55b5f42455 + 567edafe6106e6b769c64f6a2ed876190baa642a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8f4568cdaa2f9654fd133a17cd2dcc55b5f42455 + 567edafe6106e6b769c64f6a2ed876190baa642a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8f4568cdaa2f9654fd133a17cd2dcc55b5f42455 + 567edafe6106e6b769c64f6a2ed876190baa642a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8f4568cdaa2f9654fd133a17cd2dcc55b5f42455 + 567edafe6106e6b769c64f6a2ed876190baa642a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8f4568cdaa2f9654fd133a17cd2dcc55b5f42455 + 567edafe6106e6b769c64f6a2ed876190baa642a @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ecd58f375010a7fac5165a1ff584f8e336c9e044 + ba2ce5819947cc6aa7724dbc54201d5c6596de0c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ecd58f375010a7fac5165a1ff584f8e336c9e044 + ba2ce5819947cc6aa7724dbc54201d5c6596de0c https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ecd58f375010a7fac5165a1ff584f8e336c9e044 + ba2ce5819947cc6aa7724dbc54201d5c6596de0c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ecd58f375010a7fac5165a1ff584f8e336c9e044 + ba2ce5819947cc6aa7724dbc54201d5c6596de0c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ecd58f375010a7fac5165a1ff584f8e336c9e044 + ba2ce5819947cc6aa7724dbc54201d5c6596de0c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ecd58f375010a7fac5165a1ff584f8e336c9e044 + ba2ce5819947cc6aa7724dbc54201d5c6596de0c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ecd58f375010a7fac5165a1ff584f8e336c9e044 + ba2ce5819947cc6aa7724dbc54201d5c6596de0c https://github.com/dotnet/test-templates @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 18d8a2987501c4439ddadf2501a80760f4f87de3 + 62ea411d627ffda407db98c1cf655d5a3590b03e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 18d8a2987501c4439ddadf2501a80760f4f87de3 + 62ea411d627ffda407db98c1cf655d5a3590b03e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 18d8a2987501c4439ddadf2501a80760f4f87de3 + 62ea411d627ffda407db98c1cf655d5a3590b03e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 18d8a2987501c4439ddadf2501a80760f4f87de3 + 62ea411d627ffda407db98c1cf655d5a3590b03e - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 1d272c1ef7277b7cc38148300732e6a72848bedc + b7fa724c93e65ac40bef3e8ab05bc1a63f62b0f6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 963a6a55dd6f72f604651fff7c1515dadcd37a39 + b05bc3d0cf33b94b37f8dec5d6b2829d508209eb https://github.com/dotnet/fsharp @@ -158,22 +158,22 @@ 2679cf5a9cbd13e6833ca8a59553716f3f2f2afa - + https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted - a36edf3a2bf891d6aabfc83cc0b21d24a870ea1a + 07cf447d8f8b3d6b9e7bf641ab8ec7de966b1254 https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 33b038b591f6e19c32a390333d41292cbd86d93c + ca510604d1667f32b4fa4653e3d3b64be8136bdc - + https://github.com/dotnet/emsdk - 33b038b591f6e19c32a390333d41292cbd86d93c + ca510604d1667f32b4fa4653e3d3b64be8136bdc https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index e6fe2f142..0d5bcdc87 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.15-servicing.23573.3 + 7.0.16-servicing.24060.7 - 7.0.16-servicing.24060.7 + 7.0.16-servicing.24060.16 @@ -58,11 +58,11 @@ 7.0.16 7.0.16 - 7.0.16-servicing.24061.3 - 7.0.16-servicing.24061.3 - 7.0.16-servicing.24061.3 - 7.0.16-servicing.24061.3 - 7.0.16-servicing.24061.3 + 7.0.16-servicing.24067.19 + 7.0.16-servicing.24067.19 + 7.0.16-servicing.24067.19 + 7.0.16-servicing.24067.19 + 7.0.16-servicing.24067.19 0.2.0 @@ -70,8 +70,8 @@ 7.0.313 - 7.0.313-servicing.24061.13 - 7.0.313-servicing.24061.13 + 7.0.313-servicing.24068.18 + 7.0.313-servicing.24068.18 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -86,18 +86,18 @@ - 7.0.15-servicing.23572.26 - 7.0.15-servicing.23572.26 - 7.0.15 - 7.0.15 - 7.0.15 - 7.0.15 + 7.0.16-servicing.24066.29 + 7.0.16-servicing.24066.29 + 7.0.16 + 7.0.16 + 7.0.16 + 7.0.16 2.1.0 - 7.0.16-servicing.24060.13 - 7.0.16-servicing.24060.13 + 7.0.16-servicing.24061.3 + 7.0.16-servicing.24061.3 7.0.16 7.0.16 @@ -231,8 +231,8 @@ 12.3.2372 16.0.1478 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.15 - 7.0.15 + 7.0.16 + 7.0.16 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version) From bbc374d7eb4e40d296696d4e9bba4e4c8a90eaff Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 18 Jan 2024 18:23:42 +0000 Subject: [PATCH 295/535] Merged PR 36621: [internal/release/7.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.AspNetCore.App.Ref**: from 7.0.16 to 7.0.16 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 7.0.16-servicing.24067.14 to 7.0.16-servicing.24067.19 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 7.0.16 to 7.0.16 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: from 7.0.16-servicing.24067.14 to 7.0.16-servicing.24067.19 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 7.0.16-servicing.24067.14 to 7.0.16-servicing.24067.19 (parent: Microsoft.NET.Sdk) - **dotnet-user-jwts**: from 7.0.16-servicing.24067.14 to 7.0.16-servicing.24067.19 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 7.0.16-servicing.24067.14 to 7.0.16-servicing.24067.19 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:65272799-fe4d-4dbf-f0fe-08da7ef63651) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 65272799-fe4d-4dbf-f0fe-08da7ef63651 - **Build**: 20240118.19 - **Date Produced**: January 18, 2024 6:07:10 PM UTC - **Commit**: 7be026ba4909ce67a2ecc4043d0380f8b309b4ca - **Branch**: refs/heads/internal/release/7.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.116 to 7.0.116][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.116-servicing.24067.58 to 7.0.116-servicing.24068.19][1] - **Microsoft.NET.Sdk**: [from 7.0.116-servicing.24067.58 to 7.0.116-servicing.24068.19][1] - **Microsoft.TemplateEngine.Cli**: [from 7.0.116-servicing.24067.58 to 7.0.116-servicing.24068.19][1] - **Microsoft.AspNetCore.App.Ref**: [from 7.0.16 to 7.0.16][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 7.0.16-servicing.24067.14 to 7.0.16-servicing.24067.19][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 7.0.16 to 7.0.16][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: [from 7.0.16-servicing.24067.14 to 7.0.16-servicing.24067.19][2] - **dotnet-dev-certs**: [from 7.0.16-servicing.24067.14 to 7.0.16-servicing.24067.19][2] - **dotnet-user-jwts**: [from 7.0.16-servicing.24067.14 to 7.0.16-servicing.24067.19][2] - **dotnet-user-secrets**: [from 7.0.16-servicing.24067.14 to 7.0.16-servicing.24067.19][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCd833c87a5bda1313c0ab48d5c8dca96c675b9... --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 38 +++++++++++++++++++------------------- eng/Versions.props | 14 +++++++------- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/NuGet.config b/NuGet.config index 7f6b1aab0..8e9c45524 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -44,12 +44,12 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9eb2b1689..0075e31bd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 15564036208e2608d636de11fc8161ca437e022a + ba2ce5819947cc6aa7724dbc54201d5c6596de0c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 15564036208e2608d636de11fc8161ca437e022a + ba2ce5819947cc6aa7724dbc54201d5c6596de0c https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 15564036208e2608d636de11fc8161ca437e022a + ba2ce5819947cc6aa7724dbc54201d5c6596de0c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 15564036208e2608d636de11fc8161ca437e022a + ba2ce5819947cc6aa7724dbc54201d5c6596de0c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 15564036208e2608d636de11fc8161ca437e022a + ba2ce5819947cc6aa7724dbc54201d5c6596de0c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 15564036208e2608d636de11fc8161ca437e022a + ba2ce5819947cc6aa7724dbc54201d5c6596de0c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 15564036208e2608d636de11fc8161ca437e022a + ba2ce5819947cc6aa7724dbc54201d5c6596de0c https://github.com/dotnet/test-templates @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d833c87a5bda1313c0ab48d5c8dca96c675b9906 + 7be026ba4909ce67a2ecc4043d0380f8b309b4ca - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d833c87a5bda1313c0ab48d5c8dca96c675b9906 + 7be026ba4909ce67a2ecc4043d0380f8b309b4ca - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d833c87a5bda1313c0ab48d5c8dca96c675b9906 + 7be026ba4909ce67a2ecc4043d0380f8b309b4ca - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d833c87a5bda1313c0ab48d5c8dca96c675b9906 + 7be026ba4909ce67a2ecc4043d0380f8b309b4ca diff --git a/eng/Versions.props b/eng/Versions.props index 4c6e3217f..9a441a7db 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,11 +58,11 @@ 7.0.16 7.0.16 - 7.0.16-servicing.24067.14 - 7.0.16-servicing.24067.14 - 7.0.16-servicing.24067.14 - 7.0.16-servicing.24067.14 - 7.0.16-servicing.24067.14 + 7.0.16-servicing.24067.19 + 7.0.16-servicing.24067.19 + 7.0.16-servicing.24067.19 + 7.0.16-servicing.24067.19 + 7.0.16-servicing.24067.19 0.2.0 @@ -70,8 +70,8 @@ 7.0.116 - 7.0.116-servicing.24067.58 - 7.0.116-servicing.24067.58 + 7.0.116-servicing.24068.19 + 7.0.116-servicing.24068.19 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 5dbe778528a3149d10e7b9e192eb8931a348682c Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 18 Jan 2024 20:35:23 +0000 Subject: [PATCH 296/535] Merged PR 36623: [internal/release/8.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.WindowsDesktop.App.Ref**: from 8.0.2 to 8.0.2 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0**: from 8.0.2-servicing.24060.14 to 8.0.2-servicing.24061.2 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0**: from 8.0.2-servicing.24060.14 to 8.0.2-servicing.24061.2 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.8.0**: from 8.0.1-servicing.23580.1 to 8.0.2-servicing.24067.11 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 8.0.1 to 8.0.2 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.8.0**: from 8.0.1-servicing.23580.1 to 8.0.2-servicing.24067.11 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 8.0.1 to 8.0.2 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 8.0.1 to 8.0.2 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 8.0.1-servicing.23580.1 to 8.0.2-servicing.24067.11 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 8.0.1 to 8.0.2 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 8.0.1-servicing.23580.8 to 8.0.2-servicing.24068.4 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 8.0.1 to 8.0.2 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0**: from 8.0.1-servicing.23580.8 to 8.0.2-servicing.24068.4 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 8.0.1-servicing.23580.8 to 8.0.2-servicing.24068.4 (parent: Microsoft.NET.Sdk) - **dotnet-user-jwts**: from 8.0.1-servicing.23580.8 to 8.0.2-servicing.24068.4 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 8.0.1-servicing.23580.8 to 8.0.2-servicing.24068.4 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 8.0.2 to 8.0.2 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 8.0.1-servicing.23580.6 to 8.0.2-servicing.24060.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 8.0.2 to 8.0.2 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 8.0.2-servicing.24060.10 to 8.0.2-servicing.24060.15 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.NET.ILLink.Tasks**: from 8.0.1 to 8.0.2 (parent: Microsoft.NET.Sdk) - ... --- NuGet.config | 29 ++++-------- eng/Version.Details.xml | 102 ++++++++++++++++++++-------------------- eng/Versions.props | 42 ++++++++--------- 3 files changed, 81 insertions(+), 92 deletions(-) diff --git a/NuGet.config b/NuGet.config index 2dccf8439..6c3231a2b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,29 +7,22 @@ - - - - + - - - + - - - + - + - + @@ -50,19 +43,15 @@ - - - + - - - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index be9295fac..e27dd2082 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -7,44 +7,44 @@ --> https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f195aa9c97a34be19c176a512bd10d36914931cb + d409ddaf7da38b20f30f260f5b84ffdadb5626c8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f195aa9c97a34be19c176a512bd10d36914931cb + d409ddaf7da38b20f30f260f5b84ffdadb5626c8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f195aa9c97a34be19c176a512bd10d36914931cb + d409ddaf7da38b20f30f260f5b84ffdadb5626c8 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f195aa9c97a34be19c176a512bd10d36914931cb + d409ddaf7da38b20f30f260f5b84ffdadb5626c8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bf5e279d9239bfef5bb1b8d6212f1b971c434606 + 1381d5ebd2ab1f292848d5b19b80cf71ac332508 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bf5e279d9239bfef5bb1b8d6212f1b971c434606 + 1381d5ebd2ab1f292848d5b19b80cf71ac332508 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bf5e279d9239bfef5bb1b8d6212f1b971c434606 + 1381d5ebd2ab1f292848d5b19b80cf71ac332508 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bf5e279d9239bfef5bb1b8d6212f1b971c434606 + 1381d5ebd2ab1f292848d5b19b80cf71ac332508 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bf5e279d9239bfef5bb1b8d6212f1b971c434606 + 1381d5ebd2ab1f292848d5b19b80cf71ac332508 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bf5e279d9239bfef5bb1b8d6212f1b971c434606 + 1381d5ebd2ab1f292848d5b19b80cf71ac332508 @@ -52,55 +52,55 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bf5e279d9239bfef5bb1b8d6212f1b971c434606 + 1381d5ebd2ab1f292848d5b19b80cf71ac332508 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8e941eb42f819adb116b881195158b3887a70a1c + da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8e941eb42f819adb116b881195158b3887a70a1c + da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8e941eb42f819adb116b881195158b3887a70a1c + da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8e941eb42f819adb116b881195158b3887a70a1c + da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8e941eb42f819adb116b881195158b3887a70a1c + da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8e941eb42f819adb116b881195158b3887a70a1c + da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8e941eb42f819adb116b881195158b3887a70a1c + da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c156e4feae5e45c934d00ed95b47b7504418fb4d + 2151f8c8adebcfa82512ee7d5d63a35e468b36b1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c156e4feae5e45c934d00ed95b47b7504418fb4d + 2151f8c8adebcfa82512ee7d5d63a35e468b36b1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c156e4feae5e45c934d00ed95b47b7504418fb4d + 2151f8c8adebcfa82512ee7d5d63a35e468b36b1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c156e4feae5e45c934d00ed95b47b7504418fb4d + 2151f8c8adebcfa82512ee7d5d63a35e468b36b1 https://github.com/dotnet/test-templates @@ -124,13 +124,13 @@ 1e5f3603af2277910aad946736ee23283e7f3e16 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 0b4028eb507aeb222f5bd1fc421876cc5e5e3fb8 + 35307d0f7a7381a850bde13723241862ba824b3f - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 0ede9037ff59dc76c37ec87659a641cfbccd6e30 + 4c5c25180f2937b7c0691483dc892169fc13ddb3 https://github.com/dotnet/fsharp @@ -146,9 +146,9 @@ aa59400b11e1aeee2e8af48928dbd48748a8bef9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bf5e279d9239bfef5bb1b8d6212f1b971c434606 + 1381d5ebd2ab1f292848d5b19b80cf71ac332508 https://github.com/dotnet/roslyn @@ -168,18 +168,18 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 201f4dae9d1a1e105d8ba86d7ece61eed1f665e0 + 2fc2ffd960930318f33fcaa690cbdbc55d72f52d https://dev.azure.com/dnceng/internal/_git/dotnet-aspire 48e42f59d64d84b404e904996a9ed61f2a17a569 - + https://github.com/dotnet/emsdk - 201f4dae9d1a1e105d8ba86d7ece61eed1f665e0 + 2fc2ffd960930318f33fcaa690cbdbc55d72f52d diff --git a/eng/Versions.props b/eng/Versions.props index d21121587..9acc7c575 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,11 +48,11 @@ - 8.0.1-servicing.23580.6 + 8.0.2-servicing.24060.4 - 8.0.2-servicing.24060.10 + 8.0.2-servicing.24060.15 @@ -72,13 +72,13 @@ - 8.0.1 - 8.0.1 - 8.0.1-servicing.23580.8 - 8.0.1-servicing.23580.8 - 8.0.1-servicing.23580.8 - 8.0.1-servicing.23580.8 - 8.0.1-servicing.23580.8 + 8.0.2 + 8.0.2 + 8.0.2-servicing.24068.4 + 8.0.2-servicing.24068.4 + 8.0.2-servicing.24068.4 + 8.0.2-servicing.24068.4 + 8.0.2-servicing.24068.4 0.2.0 @@ -86,8 +86,8 @@ 8.0.102 - 8.0.102-servicing.24061.11 - 8.0.102-servicing.24061.11 + 8.0.102-servicing.24068.26 + 8.0.102-servicing.24068.26 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -98,22 +98,22 @@ - 8.0.1-servicing.23580.1 + 8.0.2-servicing.24067.11 - 8.0.1-servicing.23580.1 - 8.0.1-servicing.23580.1 - 8.0.1 - 8.0.1 - 8.0.1 - 8.0.1 + 8.0.2-servicing.24067.11 + 8.0.2-servicing.24067.11 + 8.0.2 + 8.0.2 + 8.0.2 + 8.0.2 2.1.0 - 8.0.2-servicing.24060.14 - 8.0.2-servicing.24060.14 + 8.0.2-servicing.24061.2 + 8.0.2-servicing.24061.2 8.0.2 8.0.2 @@ -258,7 +258,7 @@ 14.0.8478 17.0.8478 - 8.0.1 + 8.0.2 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100PackageVersion) 8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-rtm|-[A-z]*\.*\d*`)) From 5b6c31e57b7bb0c4ef87bdc9ad6d33ddbf11bd72 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 18 Jan 2024 20:35:25 +0000 Subject: [PATCH 297/535] Merged PR 36622: [internal/release/7.0.4xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.WindowsDesktop.App.Ref**: from 7.0.16 to 7.0.16 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: from 7.0.16-servicing.24060.13 to 7.0.16-servicing.24061.3 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: from 7.0.16-servicing.24060.13 to 7.0.16-servicing.24061.3 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 7.0.15 to 7.0.16 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.7.0**: from 7.0.15-servicing.23572.26 to 7.0.16-servicing.24066.29 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 7.0.15 to 7.0.16 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 7.0.15 to 7.0.16 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 7.0.15 to 7.0.16 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 7.0.16 to 7.0.16 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 7.0.16-servicing.24061.3 to 7.0.16-servicing.24067.19 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 7.0.16 to 7.0.16 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: from 7.0.16-servicing.24061.3 to 7.0.16-servicing.24067.19 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 7.0.16-servicing.24061.3 to 7.0.16-servicing.24067.19 (parent: Microsoft.NET.Sdk) - **dotnet-user-jwts**: from 7.0.16-servicing.24061.3 to 7.0.16-servicing.24067.19 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 7.0.16-servicing.24061.3 to 7.0.16-servicing.24067.19 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.16 to 7.0.16 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 7.0.15-servicing.23573.3 to 7.0.16-servicing.24060.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.16 to 7.0.16 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 7.0.16-servicing.24060.7 to 7.0.16-servicing.24060.16 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: from 7.0.15-servicing.23572.26 to 7.0.16-servicing.24066.29 (parent: Microsoft.NET.Sdk) - **Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100**: from ... --- NuGet.config | 24 +++++------ eng/Version.Details.xml | 90 ++++++++++++++++++++--------------------- eng/Versions.props | 38 ++++++++--------- 3 files changed, 73 insertions(+), 79 deletions(-) diff --git a/NuGet.config b/NuGet.config index e0771b288..306ae011b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,23 +10,19 @@ - + - - - + - - - + - + - + @@ -48,17 +44,15 @@ - + - - - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 315caf81b..5c1d37ca2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,44 +3,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d62704f831ab66265d54c5d09b24a82bff2deac2 + 01e02684374c6bf4541b7507ce041409ae410f63 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d62704f831ab66265d54c5d09b24a82bff2deac2 + 01e02684374c6bf4541b7507ce041409ae410f63 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d62704f831ab66265d54c5d09b24a82bff2deac2 + 01e02684374c6bf4541b7507ce041409ae410f63 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d62704f831ab66265d54c5d09b24a82bff2deac2 + 01e02684374c6bf4541b7507ce041409ae410f63 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8f4568cdaa2f9654fd133a17cd2dcc55b5f42455 + 567edafe6106e6b769c64f6a2ed876190baa642a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8f4568cdaa2f9654fd133a17cd2dcc55b5f42455 + 567edafe6106e6b769c64f6a2ed876190baa642a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8f4568cdaa2f9654fd133a17cd2dcc55b5f42455 + 567edafe6106e6b769c64f6a2ed876190baa642a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8f4568cdaa2f9654fd133a17cd2dcc55b5f42455 + 567edafe6106e6b769c64f6a2ed876190baa642a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8f4568cdaa2f9654fd133a17cd2dcc55b5f42455 + 567edafe6106e6b769c64f6a2ed876190baa642a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8f4568cdaa2f9654fd133a17cd2dcc55b5f42455 + 567edafe6106e6b769c64f6a2ed876190baa642a @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ecd58f375010a7fac5165a1ff584f8e336c9e044 + ba2ce5819947cc6aa7724dbc54201d5c6596de0c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ecd58f375010a7fac5165a1ff584f8e336c9e044 + ba2ce5819947cc6aa7724dbc54201d5c6596de0c https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ecd58f375010a7fac5165a1ff584f8e336c9e044 + ba2ce5819947cc6aa7724dbc54201d5c6596de0c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ecd58f375010a7fac5165a1ff584f8e336c9e044 + ba2ce5819947cc6aa7724dbc54201d5c6596de0c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ecd58f375010a7fac5165a1ff584f8e336c9e044 + ba2ce5819947cc6aa7724dbc54201d5c6596de0c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ecd58f375010a7fac5165a1ff584f8e336c9e044 + ba2ce5819947cc6aa7724dbc54201d5c6596de0c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ecd58f375010a7fac5165a1ff584f8e336c9e044 + ba2ce5819947cc6aa7724dbc54201d5c6596de0c https://github.com/dotnet/test-templates @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b42e612282cfa3fe86419f63091a56b35d915baf + 1929e84111240c9d653cb5f6eee7c6593cd6b834 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b42e612282cfa3fe86419f63091a56b35d915baf + 1929e84111240c9d653cb5f6eee7c6593cd6b834 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b42e612282cfa3fe86419f63091a56b35d915baf + 1929e84111240c9d653cb5f6eee7c6593cd6b834 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b42e612282cfa3fe86419f63091a56b35d915baf + 1929e84111240c9d653cb5f6eee7c6593cd6b834 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 1d272c1ef7277b7cc38148300732e6a72848bedc + b7fa724c93e65ac40bef3e8ab05bc1a63f62b0f6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 963a6a55dd6f72f604651fff7c1515dadcd37a39 + b05bc3d0cf33b94b37f8dec5d6b2829d508209eb https://github.com/dotnet/fsharp @@ -167,13 +167,13 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 33b038b591f6e19c32a390333d41292cbd86d93c + ca510604d1667f32b4fa4653e3d3b64be8136bdc - + https://github.com/dotnet/emsdk - 33b038b591f6e19c32a390333d41292cbd86d93c + ca510604d1667f32b4fa4653e3d3b64be8136bdc https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index 34f29b1d4..373448cce 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.15-servicing.23573.3 + 7.0.16-servicing.24060.7 - 7.0.16-servicing.24060.7 + 7.0.16-servicing.24060.16 @@ -58,11 +58,11 @@ 7.0.16 7.0.16 - 7.0.16-servicing.24061.3 - 7.0.16-servicing.24061.3 - 7.0.16-servicing.24061.3 - 7.0.16-servicing.24061.3 - 7.0.16-servicing.24061.3 + 7.0.16-servicing.24067.19 + 7.0.16-servicing.24067.19 + 7.0.16-servicing.24067.19 + 7.0.16-servicing.24067.19 + 7.0.16-servicing.24067.19 0.2.0 @@ -70,8 +70,8 @@ 7.0.406 - 7.0.406-servicing.24061.14 - 7.0.406-servicing.24061.14 + 7.0.406-servicing.24068.20 + 7.0.406-servicing.24068.20 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -86,18 +86,18 @@ - 7.0.15-servicing.23572.26 - 7.0.15-servicing.23572.26 - 7.0.15 - 7.0.15 - 7.0.15 - 7.0.15 + 7.0.16-servicing.24066.29 + 7.0.16-servicing.24066.29 + 7.0.16 + 7.0.16 + 7.0.16 + 7.0.16 2.1.0 - 7.0.16-servicing.24060.13 - 7.0.16-servicing.24060.13 + 7.0.16-servicing.24061.3 + 7.0.16-servicing.24061.3 7.0.16 7.0.16 @@ -233,8 +233,8 @@ 12.3.2372 16.0.1478 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.15 - 7.0.15 + 7.0.16 + 7.0.16 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version) From bb8ba04c3ad31b4c205f5702db4928777300d032 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 18 Jan 2024 22:29:27 +0000 Subject: [PATCH 298/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240118.34 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.102 -> To Version 8.0.102 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.8.0-7.23614.11 -> To Version 4.8.0-7.24067.24 (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 6c3231a2b..7884b5c75 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,7 +19,7 @@ - + @@ -48,7 +48,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e27dd2082..7d50b3269 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2151f8c8adebcfa82512ee7d5d63a35e468b36b1 + 85d178c4897d2ca9cc86f5958577ebce06e3ab5e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2151f8c8adebcfa82512ee7d5d63a35e468b36b1 + 85d178c4897d2ca9cc86f5958577ebce06e3ab5e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2151f8c8adebcfa82512ee7d5d63a35e468b36b1 + 85d178c4897d2ca9cc86f5958577ebce06e3ab5e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2151f8c8adebcfa82512ee7d5d63a35e468b36b1 + 85d178c4897d2ca9cc86f5958577ebce06e3ab5e 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 - 82a29fc43b3e0a9c53d6cc2be950e43765682170 + 263571123fc3dc4a638e071234ac9fbf91913962 diff --git a/eng/Versions.props b/eng/Versions.props index d4d1d7828..19cf9c9a3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,15 +86,15 @@ 8.0.102 - 8.0.102-servicing.24068.26 - 8.0.102-servicing.24068.26 + 8.0.102-servicing.24068.34 + 8.0.102-servicing.24068.34 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.8.0-7.23614.11 + 4.8.0-7.24067.24 From 14db8a0c7da573e8e9f47ceab93550b157b08965 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 18 Jan 2024 23:34:10 +0000 Subject: [PATCH 299/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240118.43 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.406 -> To Version 7.0.406 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 7.0.16 -> To Version 7.0.16 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 34 +++++++++++++++++----------------- eng/Versions.props | 12 ++++++------ 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/NuGet.config b/NuGet.config index 306ae011b..12644acf4 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,10 +19,10 @@ - + - + @@ -49,10 +49,10 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5c1d37ca2..102d77399 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 01e02684374c6bf4541b7507ce041409ae410f63 + f58ad2d644bb52baf49e85be027bf2db3fced446 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 01e02684374c6bf4541b7507ce041409ae410f63 + f58ad2d644bb52baf49e85be027bf2db3fced446 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 01e02684374c6bf4541b7507ce041409ae410f63 + f58ad2d644bb52baf49e85be027bf2db3fced446 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 01e02684374c6bf4541b7507ce041409ae410f63 + f58ad2d644bb52baf49e85be027bf2db3fced446 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1929e84111240c9d653cb5f6eee7c6593cd6b834 + addec31d7de75b6ef03ff885418cea38e354faee - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1929e84111240c9d653cb5f6eee7c6593cd6b834 + addec31d7de75b6ef03ff885418cea38e354faee - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1929e84111240c9d653cb5f6eee7c6593cd6b834 + addec31d7de75b6ef03ff885418cea38e354faee - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1929e84111240c9d653cb5f6eee7c6593cd6b834 + addec31d7de75b6ef03ff885418cea38e354faee - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - b7fa724c93e65ac40bef3e8ab05bc1a63f62b0f6 + 3d504675f930028236a0f09e47c900ad48bd3d6e - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - b05bc3d0cf33b94b37f8dec5d6b2829d508209eb + 4a6accdbfd70e66399781c75b0c0a179f4b7e7eb https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 373448cce..0da17b0e0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.16-servicing.24060.7 + 7.0.16-servicing.24067.11 - 7.0.16-servicing.24060.16 + 7.0.16-servicing.24068.4 @@ -70,8 +70,8 @@ 7.0.406 - 7.0.406-servicing.24068.20 - 7.0.406-servicing.24068.20 + 7.0.406-servicing.24068.43 + 7.0.406-servicing.24068.43 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -96,8 +96,8 @@ - 7.0.16-servicing.24061.3 - 7.0.16-servicing.24061.3 + 7.0.16-servicing.24068.4 + 7.0.16-servicing.24068.4 7.0.16 7.0.16 From f43cfe985a1c2db5a5dfc14942d87f56db0e4ff4 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 18 Jan 2024 23:39:54 +0000 Subject: [PATCH 300/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240118.45 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.116 -> To Version 7.0.116 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 7.0.16 -> To Version 7.0.16 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 34 +++++++++++++++++----------------- eng/Versions.props | 12 ++++++------ 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/NuGet.config b/NuGet.config index 8e9c45524..392ad1905 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,10 +19,10 @@ - + - + @@ -49,10 +49,10 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0075e31bd..fdc738d3d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 01e02684374c6bf4541b7507ce041409ae410f63 + f58ad2d644bb52baf49e85be027bf2db3fced446 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 01e02684374c6bf4541b7507ce041409ae410f63 + f58ad2d644bb52baf49e85be027bf2db3fced446 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 01e02684374c6bf4541b7507ce041409ae410f63 + f58ad2d644bb52baf49e85be027bf2db3fced446 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 01e02684374c6bf4541b7507ce041409ae410f63 + f58ad2d644bb52baf49e85be027bf2db3fced446 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7be026ba4909ce67a2ecc4043d0380f8b309b4ca + 78d5754b2fc94c74d13a077881f2f949794af51c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7be026ba4909ce67a2ecc4043d0380f8b309b4ca + 78d5754b2fc94c74d13a077881f2f949794af51c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7be026ba4909ce67a2ecc4043d0380f8b309b4ca + 78d5754b2fc94c74d13a077881f2f949794af51c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7be026ba4909ce67a2ecc4043d0380f8b309b4ca + 78d5754b2fc94c74d13a077881f2f949794af51c - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - b7fa724c93e65ac40bef3e8ab05bc1a63f62b0f6 + 3d504675f930028236a0f09e47c900ad48bd3d6e - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - b05bc3d0cf33b94b37f8dec5d6b2829d508209eb + 4a6accdbfd70e66399781c75b0c0a179f4b7e7eb https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 9a441a7db..4c53265d4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.16-servicing.24060.7 + 7.0.16-servicing.24067.11 - 7.0.16-servicing.24060.16 + 7.0.16-servicing.24068.4 @@ -70,8 +70,8 @@ 7.0.116 - 7.0.116-servicing.24068.19 - 7.0.116-servicing.24068.19 + 7.0.116-servicing.24068.45 + 7.0.116-servicing.24068.45 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -92,8 +92,8 @@ - 7.0.16-servicing.24061.3 - 7.0.16-servicing.24061.3 + 7.0.16-servicing.24068.4 + 7.0.16-servicing.24068.4 7.0.16 7.0.16 From 0567446bee7ababba20744e3e1fa473c5c474762 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 18 Jan 2024 23:41:02 +0000 Subject: [PATCH 301/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240118.44 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.313 -> To Version 7.0.313 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 7.0.16 -> To Version 7.0.16 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 34 +++++++++++++++++----------------- eng/Versions.props | 12 ++++++------ 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6f5b3eb00..07444b91d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,10 +19,10 @@ - + - + @@ -49,10 +49,10 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4743d6d1f..38a0c4a79 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 01e02684374c6bf4541b7507ce041409ae410f63 + f58ad2d644bb52baf49e85be027bf2db3fced446 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 01e02684374c6bf4541b7507ce041409ae410f63 + f58ad2d644bb52baf49e85be027bf2db3fced446 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 01e02684374c6bf4541b7507ce041409ae410f63 + f58ad2d644bb52baf49e85be027bf2db3fced446 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 01e02684374c6bf4541b7507ce041409ae410f63 + f58ad2d644bb52baf49e85be027bf2db3fced446 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 62ea411d627ffda407db98c1cf655d5a3590b03e + c9fbcd1e5682e75d1fb95f5a3360856f56786685 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 62ea411d627ffda407db98c1cf655d5a3590b03e + c9fbcd1e5682e75d1fb95f5a3360856f56786685 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 62ea411d627ffda407db98c1cf655d5a3590b03e + c9fbcd1e5682e75d1fb95f5a3360856f56786685 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 62ea411d627ffda407db98c1cf655d5a3590b03e + c9fbcd1e5682e75d1fb95f5a3360856f56786685 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - b7fa724c93e65ac40bef3e8ab05bc1a63f62b0f6 + 3d504675f930028236a0f09e47c900ad48bd3d6e - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - b05bc3d0cf33b94b37f8dec5d6b2829d508209eb + 4a6accdbfd70e66399781c75b0c0a179f4b7e7eb https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 0d5bcdc87..82de004e9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.16-servicing.24060.7 + 7.0.16-servicing.24067.11 - 7.0.16-servicing.24060.16 + 7.0.16-servicing.24068.4 @@ -70,8 +70,8 @@ 7.0.313 - 7.0.313-servicing.24068.18 - 7.0.313-servicing.24068.18 + 7.0.313-servicing.24068.44 + 7.0.313-servicing.24068.44 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -96,8 +96,8 @@ - 7.0.16-servicing.24061.3 - 7.0.16-servicing.24061.3 + 7.0.16-servicing.24068.4 + 7.0.16-servicing.24068.4 7.0.16 7.0.16 From a8ad891aa53eee8619d81cd336e29448fc8b4659 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 19 Jan 2024 00:32:44 +0000 Subject: [PATCH 302/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240118.51 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.406 -> To Version 7.0.406 Dependency coherency updates NuGet.Build.Tasks From Version 6.7.0-rc.127 -> To Version 6.7.1-rc.1 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 4 ++-- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/NuGet.config b/NuGet.config index 12644acf4..36196e88e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,7 +19,7 @@ - + @@ -49,7 +49,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 102d77399..7e6a995ea 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - addec31d7de75b6ef03ff885418cea38e354faee + 68d4f4e10f1ad08758322c7185e3f51d94b2e2ff - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - addec31d7de75b6ef03ff885418cea38e354faee + 68d4f4e10f1ad08758322c7185e3f51d94b2e2ff - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - addec31d7de75b6ef03ff885418cea38e354faee + 68d4f4e10f1ad08758322c7185e3f51d94b2e2ff - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - addec31d7de75b6ef03ff885418cea38e354faee + 68d4f4e10f1ad08758322c7185e3f51d94b2e2ff @@ -158,9 +158,9 @@ 3ebbd7c4982d7df340366ef499e7bc5d85ef817e - - https://github.com/nuget/nuget.client - b46f5f64159a81d930ac8cdfde96e76f90796c62 + + https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted + c7d3516cb6a70dd988e16fea8f4a32b459222ee1 diff --git a/eng/Versions.props b/eng/Versions.props index 0da17b0e0..ab6f5be97 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.406 - 7.0.406-servicing.24068.43 - 7.0.406-servicing.24068.43 + 7.0.406-servicing.24068.51 + 7.0.406-servicing.24068.51 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 2afd97a62d728b2d2f5b3792e5dd6c87be983dc9 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 19 Jan 2024 00:52:52 +0000 Subject: [PATCH 303/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240118.56 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.116 -> To Version 7.0.116 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index 392ad1905..a1d045602 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,7 +19,7 @@ - + @@ -49,7 +49,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fdc738d3d..fb2cc75ba 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 78d5754b2fc94c74d13a077881f2f949794af51c + 0277d57f52677a9a9a5575c2fada5a90b39a5ec5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 78d5754b2fc94c74d13a077881f2f949794af51c + 0277d57f52677a9a9a5575c2fada5a90b39a5ec5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 78d5754b2fc94c74d13a077881f2f949794af51c + 0277d57f52677a9a9a5575c2fada5a90b39a5ec5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 78d5754b2fc94c74d13a077881f2f949794af51c + 0277d57f52677a9a9a5575c2fada5a90b39a5ec5 diff --git a/eng/Versions.props b/eng/Versions.props index 4c53265d4..cc58440f1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.116 - 7.0.116-servicing.24068.45 - 7.0.116-servicing.24068.45 + 7.0.116-servicing.24068.56 + 7.0.116-servicing.24068.56 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From aafd26d9342b610ed99f87862ab48c9b262c05de Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 19 Jan 2024 00:59:05 +0000 Subject: [PATCH 304/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240118.55 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.102 -> To Version 8.0.102 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 8.0.2 -> To Version 8.0.2 (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 7884b5c75..f937ff002 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,10 +19,10 @@ - + - + @@ -48,10 +48,10 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7d50b3269..a74e8b6b3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -7,19 +7,19 @@ --> https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d409ddaf7da38b20f30f260f5b84ffdadb5626c8 + 593444ad8328a5a933c006c6564469666f45ad2e - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d409ddaf7da38b20f30f260f5b84ffdadb5626c8 + 593444ad8328a5a933c006c6564469666f45ad2e - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d409ddaf7da38b20f30f260f5b84ffdadb5626c8 + 593444ad8328a5a933c006c6564469666f45ad2e https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d409ddaf7da38b20f30f260f5b84ffdadb5626c8 + 593444ad8328a5a933c006c6564469666f45ad2e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 85d178c4897d2ca9cc86f5958577ebce06e3ab5e + 3206ce37b3af707a6bca134c14b396af9036f974 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 85d178c4897d2ca9cc86f5958577ebce06e3ab5e + 3206ce37b3af707a6bca134c14b396af9036f974 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 85d178c4897d2ca9cc86f5958577ebce06e3ab5e + 3206ce37b3af707a6bca134c14b396af9036f974 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 85d178c4897d2ca9cc86f5958577ebce06e3ab5e + 3206ce37b3af707a6bca134c14b396af9036f974 https://github.com/dotnet/test-templates @@ -124,13 +124,13 @@ 1e5f3603af2277910aad946736ee23283e7f3e16 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 35307d0f7a7381a850bde13723241862ba824b3f + c58fa00bd16b92aab1d7fb2b93e71af6a7768139 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 4c5c25180f2937b7c0691483dc892169fc13ddb3 + 472140dd926227876848e48f41cfc9acb9275492 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 19cf9c9a3..794efa738 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,11 +48,11 @@ - 8.0.2-servicing.24060.4 + 8.0.2-servicing.24068.3 - 8.0.2-servicing.24060.15 + 8.0.2-servicing.24068.6 @@ -86,8 +86,8 @@ 8.0.102 - 8.0.102-servicing.24068.34 - 8.0.102-servicing.24068.34 + 8.0.102-servicing.24068.55 + 8.0.102-servicing.24068.55 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -112,8 +112,8 @@ - 8.0.2-servicing.24061.2 - 8.0.2-servicing.24061.2 + 8.0.2-servicing.24068.6 + 8.0.2-servicing.24068.6 8.0.2 8.0.2 From 3bd45e79833ff0f4a17dad1295fb7dd036f55a94 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 19 Jan 2024 01:37:57 +0000 Subject: [PATCH 305/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240118.58 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.313 -> To Version 7.0.313 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index 07444b91d..50c222de8 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,7 +19,7 @@ - + @@ -49,7 +49,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 38a0c4a79..4496a1dc6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c9fbcd1e5682e75d1fb95f5a3360856f56786685 + 4134f29a2fe73e76e8b031618b758b914c6c8984 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c9fbcd1e5682e75d1fb95f5a3360856f56786685 + 4134f29a2fe73e76e8b031618b758b914c6c8984 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c9fbcd1e5682e75d1fb95f5a3360856f56786685 + 4134f29a2fe73e76e8b031618b758b914c6c8984 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c9fbcd1e5682e75d1fb95f5a3360856f56786685 + 4134f29a2fe73e76e8b031618b758b914c6c8984 diff --git a/eng/Versions.props b/eng/Versions.props index 82de004e9..bbf9116cc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.313 - 7.0.313-servicing.24068.44 - 7.0.313-servicing.24068.44 + 7.0.313-servicing.24068.58 + 7.0.313-servicing.24068.58 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From bf5a5f0114199b97f8f82e295c8a3a0ba5cbfe71 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 19 Jan 2024 02:53:04 +0000 Subject: [PATCH 306/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240118.63 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.406 -> To Version 7.0.406 Dependency coherency updates NuGet.Build.Tasks From Version 6.7.0-rc.127 -> To Version 6.7.1-rc.1 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index 36196e88e..449e0aad8 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,7 +19,7 @@ - + @@ -49,7 +49,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7e6a995ea..c8d8e523f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 68d4f4e10f1ad08758322c7185e3f51d94b2e2ff + a537404e0e29590402a7d3be677507541ce07e38 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 68d4f4e10f1ad08758322c7185e3f51d94b2e2ff + a537404e0e29590402a7d3be677507541ce07e38 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 68d4f4e10f1ad08758322c7185e3f51d94b2e2ff + a537404e0e29590402a7d3be677507541ce07e38 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 68d4f4e10f1ad08758322c7185e3f51d94b2e2ff + a537404e0e29590402a7d3be677507541ce07e38 diff --git a/eng/Versions.props b/eng/Versions.props index ab6f5be97..78c6b7875 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.406 - 7.0.406-servicing.24068.51 - 7.0.406-servicing.24068.51 + 7.0.406-servicing.24068.63 + 7.0.406-servicing.24068.63 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From da8e258b32b9c95aaf26f3f212b1a617d9929475 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 19 Jan 2024 02:55:00 +0000 Subject: [PATCH 307/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240118.62 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.313 -> To Version 7.0.313 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index 50c222de8..5549476fc 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,7 +19,7 @@ - + @@ -49,7 +49,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4496a1dc6..e150f5306 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4134f29a2fe73e76e8b031618b758b914c6c8984 + 1f3b71634ebe0f75164461f73d6305d1aeb4403d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4134f29a2fe73e76e8b031618b758b914c6c8984 + 1f3b71634ebe0f75164461f73d6305d1aeb4403d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4134f29a2fe73e76e8b031618b758b914c6c8984 + 1f3b71634ebe0f75164461f73d6305d1aeb4403d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4134f29a2fe73e76e8b031618b758b914c6c8984 + 1f3b71634ebe0f75164461f73d6305d1aeb4403d diff --git a/eng/Versions.props b/eng/Versions.props index bbf9116cc..057dc7835 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.313 - 7.0.313-servicing.24068.58 - 7.0.313-servicing.24068.58 + 7.0.313-servicing.24068.62 + 7.0.313-servicing.24068.62 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 458ed4e5643b479852d2dce322c2239026e9115a Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 19 Jan 2024 03:14:21 +0000 Subject: [PATCH 308/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240118.64 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.102 -> To Version 8.0.102 Dependency coherency updates NuGet.Build.Tasks From Version 6.8.0-rc.122 -> To Version 6.8.1-rc.2 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/NuGet.config b/NuGet.config index f937ff002..17887a0f1 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,7 +19,7 @@ - + @@ -48,7 +48,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a74e8b6b3..ff453392b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3206ce37b3af707a6bca134c14b396af9036f974 + 8620930cbd1d700272374cee43770f1d16d830f6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3206ce37b3af707a6bca134c14b396af9036f974 + 8620930cbd1d700272374cee43770f1d16d830f6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3206ce37b3af707a6bca134c14b396af9036f974 + 8620930cbd1d700272374cee43770f1d16d830f6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3206ce37b3af707a6bca134c14b396af9036f974 + 8620930cbd1d700272374cee43770f1d16d830f6 https://github.com/dotnet/test-templates @@ -159,9 +159,9 @@ https://github.com/dotnet/msbuild b5265ef370a651f8c3458110b804e5cbf869eeb5 - - https://github.com/nuget/nuget.client - 0dd5a1ea536201af94725353e4bc711d7560b246 + + https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted + 550277e0616e549446f03fda35d3e23dff75dc01 diff --git a/eng/Versions.props b/eng/Versions.props index 794efa738..97a2925ec 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,8 +86,8 @@ 8.0.102 - 8.0.102-servicing.24068.55 - 8.0.102-servicing.24068.55 + 8.0.102-servicing.24068.64 + 8.0.102-servicing.24068.64 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -127,7 +127,7 @@ - 6.8.0-rc.122 + 6.8.1-rc.2 From 7cd79ed9517dcf2970054f6d7a9a78e3dedfc482 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 19 Jan 2024 06:09:06 +0000 Subject: [PATCH 309/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240118.70 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.419-servicing.24068.22 -> To Version 6.0.419-servicing.24068.70 Dependency coherency updates NuGet.Build.Tasks From Version 6.3.3-rc.3 -> To Version 6.3.4-rc.2 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 10 +++++----- eng/Versions.props | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2d13d9cb0..1cddf0418 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 27362cdf91a189f091cd343b92b147b871dc6181 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ac40f93a6256add2d43ac56332518b82ac8726a4 + 73488a9d44f28afcde25d918c914d796be481792 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ac40f93a6256add2d43ac56332518b82ac8726a4 + 73488a9d44f28afcde25d918c914d796be481792 @@ -151,7 +151,7 @@ 561848881bab01749e6d8b03be2869a18ca944f7 - + https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted 5e444458a8c4a2dac9806fc1d387b7f157669540 diff --git a/eng/Versions.props b/eng/Versions.props index 3a742389e..f224d3144 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.419-servicing.24068.22 - 6.0.419-servicing.24068.22 + 6.0.419-servicing.24068.70 + 6.0.419-servicing.24068.70 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From d943d115f3773b479e60d2cb2b557c558398158a Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 19 Jan 2024 07:49:14 +0000 Subject: [PATCH 310/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240118.73 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.127-servicing.24068.21 -> To Version 6.0.127-servicing.24068.73 --- 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 6ffa8aa04..10de62ba3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 6edfc94a8d69756c30a4741684d245ecae42e8a1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8c2cdb52b59151206e411a78ec7b279302ceee30 + c2a5ce10218b257757dd338b666fb71d2aed0dbb - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8c2cdb52b59151206e411a78ec7b279302ceee30 + c2a5ce10218b257757dd338b666fb71d2aed0dbb diff --git a/eng/Versions.props b/eng/Versions.props index 2e2875f31..f8fa641cc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.127-servicing.24068.21 - 6.0.127-servicing.24068.21 + 6.0.127-servicing.24068.73 + 6.0.127-servicing.24068.73 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b2020f7fd5b0eb9431c321592c285842a0a47c84 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 19 Jan 2024 11:05:56 +0000 Subject: [PATCH 311/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240119.3 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.102 -> To Version 8.0.102 Dependency coherency updates NuGet.Build.Tasks From Version 6.8.0-rc.122 -> To Version 6.8.1-rc.2 (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 17887a0f1..3b8efbf2b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,7 +19,7 @@ - + @@ -48,7 +48,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ff453392b..3fc235046 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8620930cbd1d700272374cee43770f1d16d830f6 + 98a877d340b68d426b8be3c084375cd864f7b58b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8620930cbd1d700272374cee43770f1d16d830f6 + 98a877d340b68d426b8be3c084375cd864f7b58b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8620930cbd1d700272374cee43770f1d16d830f6 + 98a877d340b68d426b8be3c084375cd864f7b58b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8620930cbd1d700272374cee43770f1d16d830f6 + 98a877d340b68d426b8be3c084375cd864f7b58b https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 97a2925ec..46278deb9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,8 +86,8 @@ 8.0.102 - 8.0.102-servicing.24068.64 - 8.0.102-servicing.24068.64 + 8.0.102-servicing.24069.3 + 8.0.102-servicing.24069.3 $(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 312/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240119.8 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.116 -> To Version 7.0.116 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets From Version 7.0.16 -> To Version 7.0.16 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 38 +++++++++++++++++++------------------- eng/Versions.props | 14 +++++++------- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/NuGet.config b/NuGet.config index a1d045602..99d9d34a8 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -44,12 +44,12 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fb2cc75ba..592f18792 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ba2ce5819947cc6aa7724dbc54201d5c6596de0c + 610fe433e07b32ed451ed99d07df63be47c29050 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ba2ce5819947cc6aa7724dbc54201d5c6596de0c + 610fe433e07b32ed451ed99d07df63be47c29050 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ba2ce5819947cc6aa7724dbc54201d5c6596de0c + 610fe433e07b32ed451ed99d07df63be47c29050 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ba2ce5819947cc6aa7724dbc54201d5c6596de0c + 610fe433e07b32ed451ed99d07df63be47c29050 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ba2ce5819947cc6aa7724dbc54201d5c6596de0c + 610fe433e07b32ed451ed99d07df63be47c29050 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ba2ce5819947cc6aa7724dbc54201d5c6596de0c + 610fe433e07b32ed451ed99d07df63be47c29050 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ba2ce5819947cc6aa7724dbc54201d5c6596de0c + 610fe433e07b32ed451ed99d07df63be47c29050 https://github.com/dotnet/test-templates @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0277d57f52677a9a9a5575c2fada5a90b39a5ec5 + a73e6ff24023ae17e8d5882a8f40545b20bf3428 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0277d57f52677a9a9a5575c2fada5a90b39a5ec5 + a73e6ff24023ae17e8d5882a8f40545b20bf3428 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0277d57f52677a9a9a5575c2fada5a90b39a5ec5 + a73e6ff24023ae17e8d5882a8f40545b20bf3428 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0277d57f52677a9a9a5575c2fada5a90b39a5ec5 + a73e6ff24023ae17e8d5882a8f40545b20bf3428 diff --git a/eng/Versions.props b/eng/Versions.props index cc58440f1..94b2f770f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,11 +58,11 @@ 7.0.16 7.0.16 - 7.0.16-servicing.24067.19 - 7.0.16-servicing.24067.19 - 7.0.16-servicing.24067.19 - 7.0.16-servicing.24067.19 - 7.0.16-servicing.24067.19 + 7.0.16-servicing.24068.15 + 7.0.16-servicing.24068.15 + 7.0.16-servicing.24068.15 + 7.0.16-servicing.24068.15 + 7.0.16-servicing.24068.15 0.2.0 @@ -70,8 +70,8 @@ 7.0.116 - 7.0.116-servicing.24068.56 - 7.0.116-servicing.24068.56 + 7.0.116-servicing.24069.8 + 7.0.116-servicing.24069.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From bef5262c3df302978e0ac0df80ff10693f43e736 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 19 Jan 2024 18:31:32 +0000 Subject: [PATCH 313/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240119.9 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.406 -> To Version 7.0.406 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets From Version 7.0.16 -> To Version 7.0.16 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 38 +++++++++++++++++++------------------- eng/Versions.props | 14 +++++++------- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/NuGet.config b/NuGet.config index 449e0aad8..e3a1c275a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,7 +10,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -44,12 +44,12 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 60be0f885..610156f32 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ba2ce5819947cc6aa7724dbc54201d5c6596de0c + 610fe433e07b32ed451ed99d07df63be47c29050 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ba2ce5819947cc6aa7724dbc54201d5c6596de0c + 610fe433e07b32ed451ed99d07df63be47c29050 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ba2ce5819947cc6aa7724dbc54201d5c6596de0c + 610fe433e07b32ed451ed99d07df63be47c29050 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ba2ce5819947cc6aa7724dbc54201d5c6596de0c + 610fe433e07b32ed451ed99d07df63be47c29050 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ba2ce5819947cc6aa7724dbc54201d5c6596de0c + 610fe433e07b32ed451ed99d07df63be47c29050 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ba2ce5819947cc6aa7724dbc54201d5c6596de0c + 610fe433e07b32ed451ed99d07df63be47c29050 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ba2ce5819947cc6aa7724dbc54201d5c6596de0c + 610fe433e07b32ed451ed99d07df63be47c29050 https://github.com/dotnet/test-templates @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a537404e0e29590402a7d3be677507541ce07e38 + 1c116bc27e66738427df5f153c2514c606a85b3a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a537404e0e29590402a7d3be677507541ce07e38 + 1c116bc27e66738427df5f153c2514c606a85b3a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a537404e0e29590402a7d3be677507541ce07e38 + 1c116bc27e66738427df5f153c2514c606a85b3a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a537404e0e29590402a7d3be677507541ce07e38 + 1c116bc27e66738427df5f153c2514c606a85b3a diff --git a/eng/Versions.props b/eng/Versions.props index 6fbb52f47..c95e832f0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,11 +58,11 @@ 7.0.16 7.0.16 - 7.0.16-servicing.24067.19 - 7.0.16-servicing.24067.19 - 7.0.16-servicing.24067.19 - 7.0.16-servicing.24067.19 - 7.0.16-servicing.24067.19 + 7.0.16-servicing.24068.15 + 7.0.16-servicing.24068.15 + 7.0.16-servicing.24068.15 + 7.0.16-servicing.24068.15 + 7.0.16-servicing.24068.15 0.2.0 @@ -70,8 +70,8 @@ 7.0.406 - 7.0.406-servicing.24068.63 - 7.0.406-servicing.24068.63 + 7.0.406-servicing.24069.9 + 7.0.406-servicing.24069.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From dd89f67b3269985002ccd1a77cc92c6638843478 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 19 Jan 2024 18:36:49 +0000 Subject: [PATCH 314/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240119.10 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.313 -> To Version 7.0.313 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets From Version 7.0.16 -> To Version 7.0.16 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 38 +++++++++++++++++++------------------- eng/Versions.props | 14 +++++++------- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/NuGet.config b/NuGet.config index 5549476fc..1b1c47835 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,7 +10,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -44,12 +44,12 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 23e106392..335b739c9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ba2ce5819947cc6aa7724dbc54201d5c6596de0c + 610fe433e07b32ed451ed99d07df63be47c29050 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ba2ce5819947cc6aa7724dbc54201d5c6596de0c + 610fe433e07b32ed451ed99d07df63be47c29050 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ba2ce5819947cc6aa7724dbc54201d5c6596de0c + 610fe433e07b32ed451ed99d07df63be47c29050 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ba2ce5819947cc6aa7724dbc54201d5c6596de0c + 610fe433e07b32ed451ed99d07df63be47c29050 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ba2ce5819947cc6aa7724dbc54201d5c6596de0c + 610fe433e07b32ed451ed99d07df63be47c29050 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ba2ce5819947cc6aa7724dbc54201d5c6596de0c + 610fe433e07b32ed451ed99d07df63be47c29050 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ba2ce5819947cc6aa7724dbc54201d5c6596de0c + 610fe433e07b32ed451ed99d07df63be47c29050 https://github.com/dotnet/test-templates @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1f3b71634ebe0f75164461f73d6305d1aeb4403d + e526ba29cdfac238c7dc40905b855b2ddc7d9d77 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1f3b71634ebe0f75164461f73d6305d1aeb4403d + e526ba29cdfac238c7dc40905b855b2ddc7d9d77 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1f3b71634ebe0f75164461f73d6305d1aeb4403d + e526ba29cdfac238c7dc40905b855b2ddc7d9d77 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1f3b71634ebe0f75164461f73d6305d1aeb4403d + e526ba29cdfac238c7dc40905b855b2ddc7d9d77 diff --git a/eng/Versions.props b/eng/Versions.props index 25873eb66..8c83c5c71 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,11 +58,11 @@ 7.0.16 7.0.16 - 7.0.16-servicing.24067.19 - 7.0.16-servicing.24067.19 - 7.0.16-servicing.24067.19 - 7.0.16-servicing.24067.19 - 7.0.16-servicing.24067.19 + 7.0.16-servicing.24068.15 + 7.0.16-servicing.24068.15 + 7.0.16-servicing.24068.15 + 7.0.16-servicing.24068.15 + 7.0.16-servicing.24068.15 0.2.0 @@ -70,8 +70,8 @@ 7.0.313 - 7.0.313-servicing.24068.62 - 7.0.313-servicing.24068.62 + 7.0.313-servicing.24069.10 + 7.0.313-servicing.24069.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From a064661260b27f7bf026125bbca453845ee72696 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 19 Jan 2024 20:21:50 +0000 Subject: [PATCH 315/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240119.16 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.102 -> To Version 8.0.102 --- 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 3b8efbf2b..4518ca310 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,7 +19,7 @@ - + @@ -48,7 +48,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3fc235046..41b5fcf1a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 98a877d340b68d426b8be3c084375cd864f7b58b + 4dc36050406554319d333a791a3e1dd8262cfd1b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 98a877d340b68d426b8be3c084375cd864f7b58b + 4dc36050406554319d333a791a3e1dd8262cfd1b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 98a877d340b68d426b8be3c084375cd864f7b58b + 4dc36050406554319d333a791a3e1dd8262cfd1b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 98a877d340b68d426b8be3c084375cd864f7b58b + 4dc36050406554319d333a791a3e1dd8262cfd1b https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 46278deb9..1eaea4d3e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,8 +86,8 @@ 8.0.102 - 8.0.102-servicing.24069.3 - 8.0.102-servicing.24069.3 + 8.0.102-servicing.24069.16 + 8.0.102-servicing.24069.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 8670626962c90bb2528f994c43382bc498d089fd 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:47:11 -0800 Subject: [PATCH 316/535] [release/8.0.1xx] Update dependencies from dotnet/arcade (#18197) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 41b5fcf1a..a0154ce45 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -214,18 +214,18 @@ - + https://github.com/dotnet/arcade - 0aaeafef60933f87b0b50350313bb2fd77defb5d + 61ae141d2bf3534619265c8f691fd55dc3e75147 - + https://github.com/dotnet/arcade - 0aaeafef60933f87b0b50350313bb2fd77defb5d + 61ae141d2bf3534619265c8f691fd55dc3e75147 - + https://github.com/dotnet/arcade - 0aaeafef60933f87b0b50350313bb2fd77defb5d + 61ae141d2bf3534619265c8f691fd55dc3e75147 https://github.com/dotnet/arcade-services From 2dae3fec70c788deec3f9ac96d42e335dda8522e Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sun, 21 Jan 2024 17:44:38 +0000 Subject: [PATCH 317/535] Merged PR 36689: [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.WindowsDesktop.App.Ref**: from 6.0.27 to 6.0.27 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.27-servicing.24067.4 to 6.0.27-servicing.24070.4 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.27-servicing.24067.4 to 6.0.27-servicing.24070.4 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.27 to 6.0.27 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.27-servicing.24066.28 to 6.0.27-servicing.24069.12 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.27 to 6.0.27 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.27 to 6.0.27 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.27 to 6.0.27 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.27 to 6.0.27 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.27-servicing.24067.9 to 6.0.27-servicing.24070.2 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.27 to 6.0.27 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.27-servicing.24067.9 to 6.0.27-servicing.24070.2 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.27-servicing.24067.9 to 6.0.27-servicing.24070.2 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.27-servicing.24067.9 to 6.0.27-servicing.24070.2 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.419 to 6.0.419 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.419-rtm.24067.1 to 6.0.419-rtm.24070.2 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.419 to 6.0.419 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.27 to 6.0.27 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.27-servicing.24067.5 to 6.0.27-servicing.24070.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.27 to 6.0.27 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.27-servicing.24067.2 to 6.0.27-servicing.24070.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **VS.Redist.... --- NuGet.config | 17 ++++----- eng/Version.Details.xml | 76 ++++++++++++++++++++--------------------- eng/Versions.props | 26 +++++++------- 3 files changed, 60 insertions(+), 59 deletions(-) diff --git a/NuGet.config b/NuGet.config index 0e13fbfe7..da7974fae 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,20 +7,21 @@ - + + - + - + - + @@ -41,16 +42,16 @@ - + - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1cddf0418..cf9f76f91 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,44 +3,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 3ecb49d3797e77df68db6c267a2c3a6d12dd7e83 + 752aa75c68aad44ea864a65c034e27555e5f3333 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 3ecb49d3797e77df68db6c267a2c3a6d12dd7e83 + 752aa75c68aad44ea864a65c034e27555e5f3333 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 3ecb49d3797e77df68db6c267a2c3a6d12dd7e83 + 752aa75c68aad44ea864a65c034e27555e5f3333 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 3ecb49d3797e77df68db6c267a2c3a6d12dd7e83 + 752aa75c68aad44ea864a65c034e27555e5f3333 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 32bc9e9e11138e57ee329f06cc1e870075eda725 + 80de56dadb3864aec7e8edd3ae32a23aeda08285 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 32bc9e9e11138e57ee329f06cc1e870075eda725 + 80de56dadb3864aec7e8edd3ae32a23aeda08285 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 32bc9e9e11138e57ee329f06cc1e870075eda725 + 80de56dadb3864aec7e8edd3ae32a23aeda08285 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 32bc9e9e11138e57ee329f06cc1e870075eda725 + 80de56dadb3864aec7e8edd3ae32a23aeda08285 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 32bc9e9e11138e57ee329f06cc1e870075eda725 + 80de56dadb3864aec7e8edd3ae32a23aeda08285 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 32bc9e9e11138e57ee329f06cc1e870075eda725 + 80de56dadb3864aec7e8edd3ae32a23aeda08285 @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8feb4df7955281c07a246c08ec70d6f0da3530e1 + 417d650029c720dbd2138bcafbb78e2e4ff31bff - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8feb4df7955281c07a246c08ec70d6f0da3530e1 + 417d650029c720dbd2138bcafbb78e2e4ff31bff https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8feb4df7955281c07a246c08ec70d6f0da3530e1 + 417d650029c720dbd2138bcafbb78e2e4ff31bff - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8feb4df7955281c07a246c08ec70d6f0da3530e1 + 417d650029c720dbd2138bcafbb78e2e4ff31bff - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8feb4df7955281c07a246c08ec70d6f0da3530e1 + 417d650029c720dbd2138bcafbb78e2e4ff31bff - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8feb4df7955281c07a246c08ec70d6f0da3530e1 + 417d650029c720dbd2138bcafbb78e2e4ff31bff https://github.com/dotnet/test-templates @@ -92,34 +92,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 27362cdf91a189f091cd343b92b147b871dc6181 + 00aa120ee558ecef9e6343f7eab1811139a22463 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 27362cdf91a189f091cd343b92b147b871dc6181 + 00aa120ee558ecef9e6343f7eab1811139a22463 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 27362cdf91a189f091cd343b92b147b871dc6181 + 00aa120ee558ecef9e6343f7eab1811139a22463 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 73488a9d44f28afcde25d918c914d796be481792 + de27019bd5bfbe9e4c0ba2303c7dc224c210a1a0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 73488a9d44f28afcde25d918c914d796be481792 + de27019bd5bfbe9e4c0ba2303c7dc224c210a1a0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - c92bca031b633bb527ac58a44e8f0127ab8984ac + 98b10b3aea4e37eed5ad4875cd251cc94c854c1e - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - c259e4173d70ad05737b7d838235c015fa25258b + 12a1b47c5b9b55841e0aa39bb36c15ac05d4ce8a https://github.com/dotnet/fsharp @@ -166,9 +166,9 @@ 698fdad58fa64a55f16cd9562c90224cc498ed02 - + https://github.com/dotnet/emsdk - 5460e2cb3721954528c452d9d32474e4c32b7141 + a9f209f82fadb1f694ae6932f92c32918e407ded https://github.com/dotnet/source-build diff --git a/eng/Versions.props b/eng/Versions.props index f224d3144..671ee90b8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.27-servicing.24067.5 + 6.0.27-servicing.24070.1 - 6.0.27-servicing.24067.2 + 6.0.27-servicing.24070.3 @@ -46,18 +46,18 @@ 6.0.27 6.0.27 - 6.0.27-servicing.24067.9 - 6.0.27-servicing.24067.9 - 6.0.27-servicing.24067.9 - 6.0.27-servicing.24067.9 + 6.0.27-servicing.24070.2 + 6.0.27-servicing.24070.2 + 6.0.27-servicing.24070.2 + 6.0.27-servicing.24070.2 0.2.0 - 6.0.419-servicing.24068.70 - 6.0.419-servicing.24068.70 + 6.0.419-servicing.24070.9 + 6.0.419-servicing.24070.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.27-servicing.24066.28 - 6.0.27-servicing.24066.28 + 6.0.27-servicing.24069.12 + 6.0.27-servicing.24069.12 6.0.27 6.0.27 6.0.27 @@ -78,8 +78,8 @@ - 6.0.27-servicing.24067.4 - 6.0.27-servicing.24067.4 + 6.0.27-servicing.24070.4 + 6.0.27-servicing.24070.4 6.0.27 6.0.27 @@ -185,7 +185,7 @@ 12.3.303 15.4.303 6.0.5 - 6.0.26 + 6.0.27 $(MicrosoftNETWorkloadEmscriptenManifest60400Version) From d761c25068115f91ba88cdeb5d72271757d0d0f0 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sun, 21 Jan 2024 17:44:58 +0000 Subject: [PATCH 318/535] Merged PR 36690: [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.WindowsDesktop.App.Ref**: from 6.0.27 to 6.0.27 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.27-servicing.24067.4 to 6.0.27-servicing.24070.4 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.27-servicing.24067.4 to 6.0.27-servicing.24070.4 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.27 to 6.0.27 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.27-servicing.24066.28 to 6.0.27-servicing.24069.12 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.27 to 6.0.27 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.27 to 6.0.27 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.27 to 6.0.27 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.27 to 6.0.27 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.27-servicing.24067.9 to 6.0.27-servicing.24070.2 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.27 to 6.0.27 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.27-servicing.24067.9 to 6.0.27-servicing.24070.2 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.27-servicing.24067.9 to 6.0.27-servicing.24070.2 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.27-servicing.24067.9 to 6.0.27-servicing.24070.2 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.127 to 6.0.127 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.127-servicing.24067.3 to 6.0.127-servicing.24070.3 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.127 to 6.0.127 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.27 to 6.0.27 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.27-servicing.24067.5 to 6.0.27-servicing.24070.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.27 to 6.0.27 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.27-servicing.24067.2 to 6.0.27-servicing.24070.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - ... --- NuGet.config | 17 ++++----- eng/Version.Details.xml | 76 ++++++++++++++++++++--------------------- eng/Versions.props | 26 +++++++------- 3 files changed, 60 insertions(+), 59 deletions(-) diff --git a/NuGet.config b/NuGet.config index a7df86bdf..65b1fe47e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,20 +7,21 @@ - + + - + - + - + @@ -41,17 +42,17 @@ - + - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 10de62ba3..816b9b949 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,44 +3,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 3ecb49d3797e77df68db6c267a2c3a6d12dd7e83 + 752aa75c68aad44ea864a65c034e27555e5f3333 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 3ecb49d3797e77df68db6c267a2c3a6d12dd7e83 + 752aa75c68aad44ea864a65c034e27555e5f3333 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 3ecb49d3797e77df68db6c267a2c3a6d12dd7e83 + 752aa75c68aad44ea864a65c034e27555e5f3333 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 3ecb49d3797e77df68db6c267a2c3a6d12dd7e83 + 752aa75c68aad44ea864a65c034e27555e5f3333 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 32bc9e9e11138e57ee329f06cc1e870075eda725 + 80de56dadb3864aec7e8edd3ae32a23aeda08285 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 32bc9e9e11138e57ee329f06cc1e870075eda725 + 80de56dadb3864aec7e8edd3ae32a23aeda08285 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 32bc9e9e11138e57ee329f06cc1e870075eda725 + 80de56dadb3864aec7e8edd3ae32a23aeda08285 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 32bc9e9e11138e57ee329f06cc1e870075eda725 + 80de56dadb3864aec7e8edd3ae32a23aeda08285 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 32bc9e9e11138e57ee329f06cc1e870075eda725 + 80de56dadb3864aec7e8edd3ae32a23aeda08285 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 32bc9e9e11138e57ee329f06cc1e870075eda725 + 80de56dadb3864aec7e8edd3ae32a23aeda08285 @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8feb4df7955281c07a246c08ec70d6f0da3530e1 + 417d650029c720dbd2138bcafbb78e2e4ff31bff - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8feb4df7955281c07a246c08ec70d6f0da3530e1 + 417d650029c720dbd2138bcafbb78e2e4ff31bff https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8feb4df7955281c07a246c08ec70d6f0da3530e1 + 417d650029c720dbd2138bcafbb78e2e4ff31bff - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8feb4df7955281c07a246c08ec70d6f0da3530e1 + 417d650029c720dbd2138bcafbb78e2e4ff31bff - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8feb4df7955281c07a246c08ec70d6f0da3530e1 + 417d650029c720dbd2138bcafbb78e2e4ff31bff - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8feb4df7955281c07a246c08ec70d6f0da3530e1 + 417d650029c720dbd2138bcafbb78e2e4ff31bff https://github.com/dotnet/test-templates @@ -92,34 +92,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 6edfc94a8d69756c30a4741684d245ecae42e8a1 + 01f9cb6e48d29a58c248ec2faeaafe0372b69b77 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 6edfc94a8d69756c30a4741684d245ecae42e8a1 + 01f9cb6e48d29a58c248ec2faeaafe0372b69b77 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 6edfc94a8d69756c30a4741684d245ecae42e8a1 + 01f9cb6e48d29a58c248ec2faeaafe0372b69b77 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c2a5ce10218b257757dd338b666fb71d2aed0dbb + 77fc6a3fac5d8d43a71b9379320c0b12012966a1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c2a5ce10218b257757dd338b666fb71d2aed0dbb + 77fc6a3fac5d8d43a71b9379320c0b12012966a1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - c92bca031b633bb527ac58a44e8f0127ab8984ac + 98b10b3aea4e37eed5ad4875cd251cc94c854c1e - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - c259e4173d70ad05737b7d838235c015fa25258b + 12a1b47c5b9b55841e0aa39bb36c15ac05d4ce8a https://github.com/dotnet/fsharp @@ -166,9 +166,9 @@ 698fdad58fa64a55f16cd9562c90224cc498ed02 - + https://github.com/dotnet/emsdk - 5460e2cb3721954528c452d9d32474e4c32b7141 + a9f209f82fadb1f694ae6932f92c32918e407ded https://github.com/dotnet/source-build diff --git a/eng/Versions.props b/eng/Versions.props index f8fa641cc..d9617fae6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.27-servicing.24067.5 + 6.0.27-servicing.24070.1 - 6.0.27-servicing.24067.2 + 6.0.27-servicing.24070.3 @@ -46,18 +46,18 @@ 6.0.27 6.0.27 - 6.0.27-servicing.24067.9 - 6.0.27-servicing.24067.9 - 6.0.27-servicing.24067.9 - 6.0.27-servicing.24067.9 + 6.0.27-servicing.24070.2 + 6.0.27-servicing.24070.2 + 6.0.27-servicing.24070.2 + 6.0.27-servicing.24070.2 0.2.0 - 6.0.127-servicing.24068.73 - 6.0.127-servicing.24068.73 + 6.0.127-servicing.24070.10 + 6.0.127-servicing.24070.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.27-servicing.24066.28 - 6.0.27-servicing.24066.28 + 6.0.27-servicing.24069.12 + 6.0.27-servicing.24069.12 6.0.27 6.0.27 6.0.27 @@ -78,8 +78,8 @@ - 6.0.27-servicing.24067.4 - 6.0.27-servicing.24067.4 + 6.0.27-servicing.24070.4 + 6.0.27-servicing.24070.4 6.0.27 6.0.27 @@ -185,7 +185,7 @@ 12.0.101-preview.9.31 15.0.101-preview.9.31 $(MicrosoftNETCoreAppRefPackageVersion) - 6.0.26 + 6.0.27 $(MicrosoftNETWorkloadEmscriptenManifest60100Version) From 4f555ddc9d404fafd5ee8addbfce21e0fc2fd5c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C5=99emek=20Vysok=C3=BD?= Date: Mon, 22 Jan 2024 15:41:51 +0100 Subject: [PATCH 319/535] [release/8.0.1xx] Use PAT to pull from non-dnceng AzDO orgs (#18316) --- eng/pipelines/templates/jobs/vmr-synchronization.yml | 1 + eng/pipelines/templates/steps/vmr-pull-updates.yml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/eng/pipelines/templates/jobs/vmr-synchronization.yml b/eng/pipelines/templates/jobs/vmr-synchronization.yml index 7849b23e0..713deea20 100644 --- a/eng/pipelines/templates/jobs/vmr-synchronization.yml +++ b/eng/pipelines/templates/jobs/vmr-synchronization.yml @@ -32,6 +32,7 @@ jobs: - name: vmrPublicUrl value: https://github.com/dotnet/dotnet - ${{ if and( eq(variables['System.TeamProject'], 'internal'), startswith(variables['Build.SourceBranch'], 'refs/heads/internal/release/')) }}: + # https://dev.azure.com/dnceng/internal/_library?itemType=VariableGroups&view=VariableGroupView&variableGroupId=172&path=DotNetBot-AzDO-PAT - group: DotNetBot-AzDO-PAT - name: vmrInternalUrl value: https://dnceng@dev.azure.com/dnceng/internal/_git/dotnet-dotnet diff --git a/eng/pipelines/templates/steps/vmr-pull-updates.yml b/eng/pipelines/templates/steps/vmr-pull-updates.yml index ceeb1981a..4d68b2a03 100644 --- a/eng/pipelines/templates/steps/vmr-pull-updates.yml +++ b/eng/pipelines/templates/steps/vmr-pull-updates.yml @@ -39,7 +39,7 @@ steps: ./eng/vmr-sync.sh --vmr ${{ parameters.vmrPath }} --tmp $(Agent.TempDirectory) - --azdev-pat '$(System.AccessToken)' + --azdev-pat '$(dn-bot-all-orgs-code-r)' --branch ${{ parameters.vmrBranch }} --repository "installer:${{ parameters.targetRef }}" --recursive From afd16eda2596624d8611e944923cec4cf883ce63 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 23 Jan 2024 08:29:22 -0600 Subject: [PATCH 320/535] [release/8.0.1xx] Run sdk pipeline 3 hours after dotnet-dotnet pipeline (#18323) Co-authored-by: Ella Hathaway --- eng/pipelines/source-build-sdk-diff-tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/pipelines/source-build-sdk-diff-tests.yml b/eng/pipelines/source-build-sdk-diff-tests.yml index 187c4a5cf..47d1c4c89 100644 --- a/eng/pipelines/source-build-sdk-diff-tests.yml +++ b/eng/pipelines/source-build-sdk-diff-tests.yml @@ -1,6 +1,6 @@ schedules: -- cron: "0 7 * * 1-5" - displayName: Run on weekdays at 7am UTC +- cron: "0 11 * * 1-5" + displayName: Run on weekdays at 11am UTC branches: include: - main From 7732f41b2e8465ec8e67069ffa18908c79c354bd Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Fri, 2 Feb 2024 08:41:08 -0600 Subject: [PATCH 321/535] Delete security-partner-dotnet pipeline (#18496) --- .../pipelines/security-partners-dotnet.yml | 32 ------------------- 1 file changed, 32 deletions(-) delete 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 deleted file mode 100644 index 844f876f6..000000000 --- a/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml +++ /dev/null @@ -1,32 +0,0 @@ -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: - Ubuntu2004-Offline: - _BootstrapPrep: true - _Container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-20.04 - _EnablePoison: false - _ExcludeOmniSharpTests: false - _RunOnline: false - _WithPreviousSDK: false - name: Build_Tarball_x64 - pool: - name: NetCore1ESPool-Svc-Internal - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 From f32ea3eca6d54c98c43e68c4b738dd7d8ea0cfd9 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 6 Feb 2024 12:11:27 -0800 Subject: [PATCH 322/535] Update branding to 6.0.128 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 337516a40..98b098d16 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 1 - 27 + 28 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From e48235738dc3cb908c268829c5d2a0baa128c92b Mon Sep 17 00:00:00 2001 From: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Date: Tue, 6 Feb 2024 14:22:47 -0800 Subject: [PATCH 323/535] Update branding to 8.0.103 (#18532) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 1415afd27..31a838654 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 8 0 1 - 02 + 03 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) $(VersionMajor).$(VersionMinor) $(MajorMinorVersion).$(VersionSDKMinor) 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 324/535] Update branding to 7.0.407 (#18531) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index b60a2863e..6b0a73c43 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 7 0 4 - 06 + 07 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing From a6060b24f354d352343c704e3118c0ad3000d1a7 Mon Sep 17 00:00:00 2001 From: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Date: Tue, 6 Feb 2024 14:22:53 -0800 Subject: [PATCH 325/535] Update branding to 7.0.314 (#18530) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index e2e98877f..e5f1dc724 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 7 0 3 - 13 + 14 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing From 40f96df29636c32c9650b95534627f16d8fd36a8 Mon Sep 17 00:00:00 2001 From: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Date: Tue, 6 Feb 2024 14:22:57 -0800 Subject: [PATCH 326/535] Update branding to 7.0.117 (#18529) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index d1809b7c2..9ed96ff17 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 7 0 1 - 16 + 17 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing From a9611179dbf184d9f0c59284cf236356cd91afae Mon Sep 17 00:00:00 2001 From: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Date: Tue, 6 Feb 2024 14:23:02 -0800 Subject: [PATCH 327/535] Update branding to 6.0.420 (#18528) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index a3aef0fc8..e6d73f51f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 4 - 19 + 20 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From 692942e649a8d69988eccbe7d676689978080a32 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 6 Feb 2024 23:12:57 +0000 Subject: [PATCH 328/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240206.14 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.102 -> To Version 8.0.103 --- NuGet.config | 31 +++++++++++++++++++++++++++++-- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 3 files changed, 40 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index 4518ca310..5b8f6ab85 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,21 +8,36 @@ + + + + + + + + + + + - + + + + + @@ -43,14 +58,26 @@ + + + + + + + + - + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a0154ce45..035b3e597 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://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4dc36050406554319d333a791a3e1dd8262cfd1b + b042eec40ce7a7684d91899a26e501b63c96ffda - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4dc36050406554319d333a791a3e1dd8262cfd1b + b042eec40ce7a7684d91899a26e501b63c96ffda - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4dc36050406554319d333a791a3e1dd8262cfd1b + b042eec40ce7a7684d91899a26e501b63c96ffda - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4dc36050406554319d333a791a3e1dd8262cfd1b + b042eec40ce7a7684d91899a26e501b63c96ffda https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index deb537428..627b5657a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.102 - 8.0.102-servicing.24069.16 - 8.0.102-servicing.24069.16 + 8.0.103 + 8.0.103-servicing.24106.14 + 8.0.103-servicing.24106.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 8ed51e2c1922eae6c54254d7197525bb812bd3c7 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 6 Feb 2024 23:17:03 +0000 Subject: [PATCH 329/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240206.15 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.313 -> To Version 7.0.314 --- NuGet.config | 18 ++++++++++++++++-- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 3 files changed, 27 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index 1b1c47835..759fbe1dd 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 335b739c9..f9f1381c6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 45a41b353d078e4d1e5918246fddbacb452eb210 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e526ba29cdfac238c7dc40905b855b2ddc7d9d77 + 5eda55dac9fcd53b1d99206e801e44a1a2fe72f2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e526ba29cdfac238c7dc40905b855b2ddc7d9d77 + 5eda55dac9fcd53b1d99206e801e44a1a2fe72f2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e526ba29cdfac238c7dc40905b855b2ddc7d9d77 + 5eda55dac9fcd53b1d99206e801e44a1a2fe72f2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e526ba29cdfac238c7dc40905b855b2ddc7d9d77 + 5eda55dac9fcd53b1d99206e801e44a1a2fe72f2 diff --git a/eng/Versions.props b/eng/Versions.props index fbfc34844..8a2f1854b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.313 - 7.0.313-servicing.24069.10 - 7.0.313-servicing.24069.10 + 7.0.314 + 7.0.314-servicing.24106.15 + 7.0.314-servicing.24106.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From fc3950b1773294fa01b2d95743699652648c6fe1 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 7 Feb 2024 03:16:02 +0000 Subject: [PATCH 330/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240206.26 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.406 -> To Version 7.0.407 --- NuGet.config | 18 ++++++++++++++++-- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 3 files changed, 27 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index e3a1c275a..6acb2b9e7 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 610156f32..64a394776 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 - 1c116bc27e66738427df5f153c2514c606a85b3a + fc1baf7747d439f5f7dd0aebd6acba6950e3edbc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1c116bc27e66738427df5f153c2514c606a85b3a + fc1baf7747d439f5f7dd0aebd6acba6950e3edbc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1c116bc27e66738427df5f153c2514c606a85b3a + fc1baf7747d439f5f7dd0aebd6acba6950e3edbc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1c116bc27e66738427df5f153c2514c606a85b3a + fc1baf7747d439f5f7dd0aebd6acba6950e3edbc diff --git a/eng/Versions.props b/eng/Versions.props index 5d53ab6bc..a808d29f8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.406 - 7.0.406-servicing.24069.9 - 7.0.406-servicing.24069.9 + 7.0.407 + 7.0.407-servicing.24106.26 + 7.0.407-servicing.24106.26 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 8c14fb9bdb10ccabbdc6a2c4a9a46f6e33437b5c Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 7 Feb 2024 03:26:17 +0000 Subject: [PATCH 331/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240206.32 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.102 -> To Version 8.0.103 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp From Version 12.8.0-beta.23563.2 -> To Version 12.8.102-beta.24081.2 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 22 +++++++++++----------- eng/Versions.props | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/NuGet.config b/NuGet.config index 5b8f6ab85..a011200c1 100644 --- a/NuGet.config +++ b/NuGet.config @@ -30,7 +30,7 @@ - + @@ -71,7 +71,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 035b3e597..c0457f063 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b042eec40ce7a7684d91899a26e501b63c96ffda + 04cb0f05363a8c813e223984b963bc6e129e7aa1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b042eec40ce7a7684d91899a26e501b63c96ffda + 04cb0f05363a8c813e223984b963bc6e129e7aa1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b042eec40ce7a7684d91899a26e501b63c96ffda + 04cb0f05363a8c813e223984b963bc6e129e7aa1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b042eec40ce7a7684d91899a26e501b63c96ffda + 04cb0f05363a8c813e223984b963bc6e129e7aa1 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 - 424e4b7cffb7656efd63f7a905a2498e39011104 + fc5e9eda234e2b69aa479f4f83faddc31fdd4da7 - + https://github.com/dotnet/fsharp - 424e4b7cffb7656efd63f7a905a2498e39011104 + fc5e9eda234e2b69aa479f4f83faddc31fdd4da7 diff --git a/eng/Versions.props b/eng/Versions.props index 627b5657a..575b14a0d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,8 +86,8 @@ 8.0.103 - 8.0.103-servicing.24106.14 - 8.0.103-servicing.24106.14 + 8.0.103-servicing.24106.32 + 8.0.103-servicing.24106.32 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f7f55356b3ba70107e079405017d4313a6f5460a Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 7 Feb 2024 06:52:51 +0000 Subject: [PATCH 332/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240206.50 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.313 -> To Version 7.0.314 --- 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 759fbe1dd..5dcb94172 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 f9f1381c6..8b2e6c813 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5eda55dac9fcd53b1d99206e801e44a1a2fe72f2 + 1c59c729a144b86e3e781bef41d7e8b33f24caeb - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5eda55dac9fcd53b1d99206e801e44a1a2fe72f2 + 1c59c729a144b86e3e781bef41d7e8b33f24caeb - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5eda55dac9fcd53b1d99206e801e44a1a2fe72f2 + 1c59c729a144b86e3e781bef41d7e8b33f24caeb - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5eda55dac9fcd53b1d99206e801e44a1a2fe72f2 + 1c59c729a144b86e3e781bef41d7e8b33f24caeb diff --git a/eng/Versions.props b/eng/Versions.props index 8a2f1854b..734b8376e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.314 - 7.0.314-servicing.24106.15 - 7.0.314-servicing.24106.15 + 7.0.314-servicing.24106.50 + 7.0.314-servicing.24106.50 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 095c321b70be1977b97b7ef5d0538c133012b2b4 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 7 Feb 2024 07:51:49 +0000 Subject: [PATCH 333/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240206.57 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.102 -> To Version 8.0.103 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp From Version 12.8.0-beta.23563.2 -> To Version 12.8.102-beta.24081.2 (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 a011200c1..a5fe9fc09 100644 --- a/NuGet.config +++ b/NuGet.config @@ -30,7 +30,7 @@ - + @@ -71,7 +71,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c0457f063..a6243703f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 04cb0f05363a8c813e223984b963bc6e129e7aa1 + b15a913fa4b2fa2940fe656daeed0f1eef36c20a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 04cb0f05363a8c813e223984b963bc6e129e7aa1 + b15a913fa4b2fa2940fe656daeed0f1eef36c20a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 04cb0f05363a8c813e223984b963bc6e129e7aa1 + b15a913fa4b2fa2940fe656daeed0f1eef36c20a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 04cb0f05363a8c813e223984b963bc6e129e7aa1 + b15a913fa4b2fa2940fe656daeed0f1eef36c20a https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 575b14a0d..010b5af48 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,8 +86,8 @@ 8.0.103 - 8.0.103-servicing.24106.32 - 8.0.103-servicing.24106.32 + 8.0.103-servicing.24106.57 + 8.0.103-servicing.24106.57 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 42099ec2aac48daa523e3808751e710941668bed Mon Sep 17 00:00:00 2001 From: Ella Hathaway <67609881+ellahathaway@users.noreply.github.com> Date: Wed, 7 Feb 2024 11:18:46 -0800 Subject: [PATCH 334/535] Cloak Aspire samples for SSCA fix (#18524) --- src/VirtualMonoRepo/source-mappings.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/VirtualMonoRepo/source-mappings.json b/src/VirtualMonoRepo/source-mappings.json index 7e6c1ccd5..f6b36a7eb 100644 --- a/src/VirtualMonoRepo/source-mappings.json +++ b/src/VirtualMonoRepo/source-mappings.json @@ -64,7 +64,8 @@ "name": "aspire", "defaultRemote": "https://github.com/dotnet/aspire", "exclude": [ - "src/Aspire.Dashboard/**/*" + "src/Aspire.Dashboard/**/*", + "playground/**/*" ] }, { From 3b81b4672358d3a5375cff3bed3db0ea5b8bc803 Mon Sep 17 00:00:00 2001 From: Ella Hathaway <67609881+ellahathaway@users.noreply.github.com> Date: Wed, 7 Feb 2024 12:26:18 -0800 Subject: [PATCH 335/535] Cloak Aspire samples directory in 8.0 (#18556) --- src/VirtualMonoRepo/source-mappings.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/VirtualMonoRepo/source-mappings.json b/src/VirtualMonoRepo/source-mappings.json index f6b36a7eb..2afa3189d 100644 --- a/src/VirtualMonoRepo/source-mappings.json +++ b/src/VirtualMonoRepo/source-mappings.json @@ -65,7 +65,7 @@ "defaultRemote": "https://github.com/dotnet/aspire", "exclude": [ "src/Aspire.Dashboard/**/*", - "playground/**/*" + "samples/**/*" ] }, { From 49e0811f5be1f6bd93da6ca45f6e56f75fba9edb Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 7 Feb 2024 22:46:41 +0000 Subject: [PATCH 336/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240207.11 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.102 -> To Version 8.0.103 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp From Version 12.8.0-beta.23563.2 -> To Version 12.8.102-beta.24081.2 (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 a5fe9fc09..eb1471169 100644 --- a/NuGet.config +++ b/NuGet.config @@ -30,7 +30,7 @@ - + @@ -71,7 +71,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a6243703f..bf36db41e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b15a913fa4b2fa2940fe656daeed0f1eef36c20a + 1fa8a5a541f772c4b9b1cd502066414491afa943 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b15a913fa4b2fa2940fe656daeed0f1eef36c20a + 1fa8a5a541f772c4b9b1cd502066414491afa943 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b15a913fa4b2fa2940fe656daeed0f1eef36c20a + 1fa8a5a541f772c4b9b1cd502066414491afa943 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b15a913fa4b2fa2940fe656daeed0f1eef36c20a + 1fa8a5a541f772c4b9b1cd502066414491afa943 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 010b5af48..2df569f5a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,8 +86,8 @@ 8.0.103 - 8.0.103-servicing.24106.57 - 8.0.103-servicing.24106.57 + 8.0.103-servicing.24107.11 + 8.0.103-servicing.24107.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e6d4e6bbaa7977ddf3c407906624b933cf2972a2 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 8 Feb 2024 03:55:55 +0000 Subject: [PATCH 337/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240207.16 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.102 -> To Version 8.0.103 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp From Version 12.8.0-beta.23563.2 -> To Version 12.8.102-beta.24081.2 (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 eb1471169..b4d126c8e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -30,7 +30,7 @@ - + @@ -71,7 +71,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bf36db41e..22750f2d4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1fa8a5a541f772c4b9b1cd502066414491afa943 + 5f35d115d3b01ae2d8eaa72d0b3c8394918cb002 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1fa8a5a541f772c4b9b1cd502066414491afa943 + 5f35d115d3b01ae2d8eaa72d0b3c8394918cb002 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1fa8a5a541f772c4b9b1cd502066414491afa943 + 5f35d115d3b01ae2d8eaa72d0b3c8394918cb002 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1fa8a5a541f772c4b9b1cd502066414491afa943 + 5f35d115d3b01ae2d8eaa72d0b3c8394918cb002 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 2df569f5a..0825d251b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,8 +86,8 @@ 8.0.103 - 8.0.103-servicing.24107.11 - 8.0.103-servicing.24107.11 + 8.0.103-servicing.24107.16 + 8.0.103-servicing.24107.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 34ceb5eeb4c8cf1cb42ed943798fd92c643ab7c4 Mon Sep 17 00:00:00 2001 From: Jacques Eloff Date: Thu, 8 Feb 2024 11:19:10 -0800 Subject: [PATCH 338/535] Add install state cleanup to finalizer (#18266) --- src/finalizer/CMakeLists.txt | 1 + src/finalizer/finalizer.cpp | 64 ++++++++++++++++++++++++++++++++++-- src/finalizer/precomp.h | 6 ++++ 3 files changed, 68 insertions(+), 3 deletions(-) diff --git a/src/finalizer/CMakeLists.txt b/src/finalizer/CMakeLists.txt index aac5c20b3..80c5be98d 100644 --- a/src/finalizer/CMakeLists.txt +++ b/src/finalizer/CMakeLists.txt @@ -55,6 +55,7 @@ target_link_libraries(Finalizer shell32.lib) target_link_libraries(Finalizer advapi32.lib) target_link_libraries(Finalizer version.lib) target_link_libraries(Finalizer msi.lib) +target_link_libraries(Finalizer shlwapi.lib) # Add WiX libraries target_link_libraries(Finalizer wcautil.lib) diff --git a/src/finalizer/finalizer.cpp b/src/finalizer/finalizer.cpp index d68418b9b..03a1213ba 100644 --- a/src/finalizer/finalizer.cpp +++ b/src/finalizer/finalizer.cpp @@ -492,12 +492,64 @@ LExit: return hr; } +void RemoveInstallStateFile(LPWSTR sczSdkFeatureBandVersion, LPWSTR sczPlatform) +{ + HRESULT hr = S_OK; + LPWSTR sczProgramData = NULL; + LPWSTR sczInstallStatePath = NULL; + LPWSTR sczPath = NULL; + + hr = ShelGetFolder(&sczProgramData, CSIDL_COMMON_APPDATA); + ExitOnFailure(hr, "Failed to get shell folder."); + + hr = PathConcat(sczProgramData, L"dotnet", &sczInstallStatePath); + ExitOnFailure(hr, "Failed to concat dotnet to install state path."); + + hr = PathConcat(sczInstallStatePath, L"workloads", &sczInstallStatePath); + ExitOnFailure(hr, "Failed to concat workloads to install state path."); + + hr = PathConcat(sczInstallStatePath, sczPlatform, &sczInstallStatePath); + ExitOnFailure(hr, "Failed to concat platform (%ls) to install state path.", sczPlatform); + + hr = PathConcat(sczInstallStatePath, sczSdkFeatureBandVersion, &sczInstallStatePath); + ExitOnFailure(hr, "Failed to concat feature band (%ls) to install state path.", sczSdkFeatureBandVersion); + + hr = PathConcat(sczInstallStatePath, L"installstate", &sczInstallStatePath); + ExitOnFailure(hr, "Failed to concat installstate to install state path."); + + hr = PathConcat(sczInstallStatePath, L"default.json", &sczInstallStatePath); + ExitOnFailure(hr, "Failed to concat default.json to install state path."); + + if (FileExistsEx(sczInstallStatePath, NULL)) + { + LogStringLine(REPORT_STANDARD, "Deleting install state file: %ls", sczInstallStatePath); + hr = FileEnsureDelete(sczInstallStatePath); + ExitOnFailure(hr, "Failed to delete install state file: %ls", sczInstallStatePath); + + hr = PathGetParentPath(sczInstallStatePath, &sczPath); + ExitOnFailure(hr, "Failed to get parent path of install state file."); + + LogStringLine(REPORT_STANDARD, "Cleaning up empty workload folders."); + DirDeleteEmptyDirectoriesToRoot(sczPath, 0); + } + else + { + LogStringLine(REPORT_STANDARD, "Install state file does not exist: %ls", sczInstallStatePath); + } + +LExit: + ReleaseStr(sczPath); + ReleaseStr(sczInstallStatePath) + ReleaseStr(sczProgramData); +} + int wmain(int argc, wchar_t* argv[]) { HRESULT hr = S_OK; DWORD dwExitCode = 0; LPWSTR sczDependent = NULL; LPWSTR sczFeatureBandVersion = NULL; + LPWSTR sczPlatform = NULL; BOOL bRestartRequired = FALSE; BOOL bSdkFeatureBandInstalled = FALSE; int iMajor = 0; @@ -507,16 +559,19 @@ int wmain(int argc, wchar_t* argv[]) hr = ::Initialize(argc, argv); ExitOnFailure(hr, "Failed to initialize."); + hr = StrAllocString(&sczPlatform, argv[3], 0); + ExitOnFailure(hr, "Failed to copy platform argument."); + // Convert the full SDK version to a feature band version hr = ParseSdkVersion(argv[2], &sczFeatureBandVersion); ExitOnFailure(hr, "Failed to parse version, %ls.", argv[2]); // Create the dependent value, e.g., Microsoft.NET.Sdk,6.0.300,arm64 - hr = StrAllocFormatted(&sczDependent, L"Microsoft.NET.Sdk,%ls,%ls", sczFeatureBandVersion, argv[3]); + hr = StrAllocFormatted(&sczDependent, L"Microsoft.NET.Sdk,%ls,%ls", sczFeatureBandVersion, sczPlatform); ExitOnFailure(hr, "Failed to create dependent."); LogStringLine(REPORT_STANDARD, "Setting target dependent to %ls.", sczDependent); - hr = ::DetectSdk(sczFeatureBandVersion, argv[3], &bSdkFeatureBandInstalled); + hr = ::DetectSdk(sczFeatureBandVersion, sczPlatform, &bSdkFeatureBandInstalled); ExitOnFailure(hr, "Failed to detect installed SDKs."); // If the feature band is still present, do not remove workloads. @@ -529,7 +584,7 @@ int wmain(int argc, wchar_t* argv[]) hr = ::RemoveDependent(sczDependent, &bRestartRequired); ExitOnFailure(hr, "Failed to remove dependent \"%ls\".", sczDependent); - hr = ::DeleteWorkloadRecords(sczFeatureBandVersion, argv[3]); + hr = ::DeleteWorkloadRecords(sczFeatureBandVersion, sczPlatform); ExitOnFailure(hr, "Failed to remove workload records."); if (bRestartRequired) @@ -537,9 +592,12 @@ int wmain(int argc, wchar_t* argv[]) dwExitCode = ERROR_SUCCESS_REBOOT_REQUIRED; } + RemoveInstallStateFile(sczFeatureBandVersion, sczPlatform); + LExit: ReleaseStr(sczDependent); ReleaseStr(sczFeatureBandVersion); + ReleaseStr(sczPlatform); LogUninitialize(TRUE); RegUninitialize(); WiuUninitialize(); diff --git a/src/finalizer/precomp.h b/src/finalizer/precomp.h index 1a6cd5df0..97bc60b13 100644 --- a/src/finalizer/precomp.h +++ b/src/finalizer/precomp.h @@ -12,6 +12,8 @@ #include #include #include +#include +#include // Configure some logging parameters for WiX #define ExitTrace LogErrorString @@ -26,3 +28,7 @@ #include "pathutil.h" #include "strutil.h" #include "wiutil.h" +#include "dirutil.h" +#include "fileutil.h" +#include "shelutil.h" + From 43e7082a34d849cc77e5e3f760b0aca82e281639 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:00 -0800 Subject: [PATCH 339/535] [release/8.0.1xx] Update WiX to latest release (#18603) 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 31a838654..91639a7c8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -178,7 +178,8 @@ $(MicrosoftNETCoreAppRuntimePackageVersion) - 1.0.0-v3.14.0.5722 + + 3.14.0.8606 diff --git a/src/finalizer_shim/finalizer_shim.csproj b/src/finalizer_shim/finalizer_shim.csproj index ad9af2548..e6cd301f7 100644 --- a/src/finalizer_shim/finalizer_shim.csproj +++ b/src/finalizer_shim/finalizer_shim.csproj @@ -12,7 +12,8 @@ - + + diff --git a/src/redist/targets/GenerateMSIs.targets b/src/redist/targets/GenerateMSIs.targets index 5acc61c19..41d2c7820 100644 --- a/src/redist/targets/GenerateMSIs.targets +++ b/src/redist/targets/GenerateMSIs.targets @@ -3,7 +3,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 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 340/535] [release/7.0.4xx] Update WiX to latest release (#18602) Co-authored-by: Jacques Eloff --- eng/Versions.props | 3 ++- src/finalizer_shim/finalizer_shim.csproj | 3 ++- src/redist/targets/GenerateMSIs.targets | 1 - 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 6b0a73c43..76e4258e3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -147,7 +147,8 @@ $(MicrosoftNETCoreAppRuntimePackageVersion) - 1.0.0-v3.14.0.5722 + + 3.14.0.8606 diff --git a/src/finalizer_shim/finalizer_shim.csproj b/src/finalizer_shim/finalizer_shim.csproj index ad9af2548..e6cd301f7 100644 --- a/src/finalizer_shim/finalizer_shim.csproj +++ b/src/finalizer_shim/finalizer_shim.csproj @@ -12,7 +12,8 @@ - + + diff --git a/src/redist/targets/GenerateMSIs.targets b/src/redist/targets/GenerateMSIs.targets index 1f8682d3a..3e7be6bec 100644 --- a/src/redist/targets/GenerateMSIs.targets +++ b/src/redist/targets/GenerateMSIs.targets @@ -11,7 +11,6 @@ - $(WixPackageVersion) https://netcorenativeassets.blob.core.windows.net/resource-packages/external/windows/wix/Microsoft.Signed.Wix-$(WixVersion).zip $(ArtifactsDir)Tools/WixTools/$(WixVersion) $(WixRoot)/WixTools.$(WixVersion).zip From 331c3a1909fa9415b023b44626bd5f7d4f0575f6 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 12 Feb 2024 09:43:10 -0800 Subject: [PATCH 341/535] [release/7.0.3xx] Update WiX to latest release (#18601) Co-authored-by: Jacques Eloff --- eng/Versions.props | 3 ++- src/finalizer_shim/finalizer_shim.csproj | 3 ++- src/redist/targets/GenerateMSIs.targets | 1 - 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index e5f1dc724..d40ea3bdc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -145,7 +145,8 @@ $(MicrosoftNETCoreAppRuntimePackageVersion) - 1.0.0-v3.14.0.5722 + + 3.14.0.8606 diff --git a/src/finalizer_shim/finalizer_shim.csproj b/src/finalizer_shim/finalizer_shim.csproj index ad9af2548..e6cd301f7 100644 --- a/src/finalizer_shim/finalizer_shim.csproj +++ b/src/finalizer_shim/finalizer_shim.csproj @@ -12,7 +12,8 @@ - + + diff --git a/src/redist/targets/GenerateMSIs.targets b/src/redist/targets/GenerateMSIs.targets index 527bc988c..495a51be3 100644 --- a/src/redist/targets/GenerateMSIs.targets +++ b/src/redist/targets/GenerateMSIs.targets @@ -11,7 +11,6 @@ - $(WixPackageVersion) https://netcorenativeassets.blob.core.windows.net/resource-packages/external/windows/wix/Microsoft.Signed.Wix-$(WixVersion).zip $(ArtifactsDir)Tools/WixTools/$(WixVersion) $(WixRoot)/WixTools.$(WixVersion).zip From b30ddf54fe2452915f30c18db00c8cf22cd1b6ff 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:14 -0800 Subject: [PATCH 342/535] [release/6.0.4xx] Update to latest WiX version (#18607) Co-authored-by: Jacques Eloff --- eng/Versions.props | 5 ++++- src/redist/targets/GenerateMSIs.targets | 1 - 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 2c93bf532..14bcc4e95 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -107,7 +107,10 @@ $(MicrosoftNETCoreAppRuntimePackageVersion) - 1.0.0-v3.14.0.5722 + + 3.14.0.8606 + + 3.14.0-8606.20240208.1 diff --git a/src/redist/targets/GenerateMSIs.targets b/src/redist/targets/GenerateMSIs.targets index d306f311e..47aac67a4 100644 --- a/src/redist/targets/GenerateMSIs.targets +++ b/src/redist/targets/GenerateMSIs.targets @@ -13,7 +13,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 055887842a12dd2a6303af0acf615ef173473ca9 Mon Sep 17 00:00:00 2001 From: Jacques Eloff Date: Mon, 12 Feb 2024 09:43:24 -0800 Subject: [PATCH 343/535] Update to latest WiX version (#18606) --- eng/Versions.props | 5 ++++- src/redist/targets/GenerateMSIs.targets | 1 - 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 98b098d16..6acb430d0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -107,7 +107,10 @@ $(MicrosoftNETCoreAppRuntimePackageVersion) - 1.0.0-v3.14.0.5722 + + 3.14.0.8606 + + 3.14.0-8606.20240208.1 diff --git a/src/redist/targets/GenerateMSIs.targets b/src/redist/targets/GenerateMSIs.targets index 483730f3a..3300b2e28 100644 --- a/src/redist/targets/GenerateMSIs.targets +++ b/src/redist/targets/GenerateMSIs.targets @@ -13,7 +13,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 344/535] Update WiX to latest release (#18599) --- eng/Versions.props | 3 ++- src/finalizer_shim/finalizer_shim.csproj | 3 ++- src/redist/targets/GenerateMSIs.targets | 1 - 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 9ed96ff17..ab4ea83b2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -141,7 +141,8 @@ $(MicrosoftNETCoreAppRuntimePackageVersion) - 1.0.0-v3.14.0.5722 + + 3.14.0.8606 diff --git a/src/finalizer_shim/finalizer_shim.csproj b/src/finalizer_shim/finalizer_shim.csproj index ad9af2548..e6cd301f7 100644 --- a/src/finalizer_shim/finalizer_shim.csproj +++ b/src/finalizer_shim/finalizer_shim.csproj @@ -12,7 +12,8 @@ - + + diff --git a/src/redist/targets/GenerateMSIs.targets b/src/redist/targets/GenerateMSIs.targets index 527bc988c..495a51be3 100644 --- a/src/redist/targets/GenerateMSIs.targets +++ b/src/redist/targets/GenerateMSIs.targets @@ -11,7 +11,6 @@ - $(WixPackageVersion) https://netcorenativeassets.blob.core.windows.net/resource-packages/external/windows/wix/Microsoft.Signed.Wix-$(WixVersion).zip $(ArtifactsDir)Tools/WixTools/$(WixVersion) $(WixRoot)/WixTools.$(WixVersion).zip From d3036c5d9900ad034d17531a5fa61a4678894c5b 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:11:47 +0100 Subject: [PATCH 345/535] .NET Source-Build 6.0.127 February 2024 Updates (#18652) --- 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 6acb430d0..42863af1a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -177,7 +177,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.126 + 6.0.127 diff --git a/src/SourceBuild/tarball/content/global.json b/src/SourceBuild/tarball/content/global.json index d503a61b9..a478949a8 100644 --- a/src/SourceBuild/tarball/content/global.json +++ b/src/SourceBuild/tarball/content/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.126" + "dotnet": "6.0.127" }, "msbuild-sdks": { "Microsoft.Build.CentralPackageVersions": "2.0.1", 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 346/535] .NET Source-Build 7.0.116 February 2024 Updates (#18653) --- eng/Versions.props | 4 ++-- src/SourceBuild/tarball/content/global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index ab4ea83b2..0e762a39b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -216,8 +216,8 @@ or minor release, prebuilts may be needed. When the release is mature, prebuilts are not necessary, and this property is removed from the file. --> - 7.0.115 - 7.0.115 + 7.0.116 + 7.0.116 diff --git a/src/SourceBuild/tarball/content/global.json b/src/SourceBuild/tarball/content/global.json index ff635fdbf..68bdc9ac8 100644 --- a/src/SourceBuild/tarball/content/global.json +++ b/src/SourceBuild/tarball/content/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.115" + "dotnet": "7.0.116" }, "msbuild-sdks": { "Microsoft.Build.CentralPackageVersions": "2.0.1", From 0ae32cff84ca9a3d051014a92c3f0e01e1cd7e2b Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 14 Feb 2024 03:22:07 +0000 Subject: [PATCH 347/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240213.36 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.102 -> To Version 8.0.103 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp From Version 12.8.0-beta.23563.2 -> To Version 12.8.102-beta.24081.2 (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 b4d126c8e..fa0c56570 100644 --- a/NuGet.config +++ b/NuGet.config @@ -30,7 +30,7 @@ - + @@ -71,7 +71,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 22750f2d4..f394097e7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5f35d115d3b01ae2d8eaa72d0b3c8394918cb002 + a209a255c6aecd6899b43d28b19603bb23f22cae - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5f35d115d3b01ae2d8eaa72d0b3c8394918cb002 + a209a255c6aecd6899b43d28b19603bb23f22cae - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5f35d115d3b01ae2d8eaa72d0b3c8394918cb002 + a209a255c6aecd6899b43d28b19603bb23f22cae - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5f35d115d3b01ae2d8eaa72d0b3c8394918cb002 + a209a255c6aecd6899b43d28b19603bb23f22cae https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 0825d251b..8d1933423 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,8 +86,8 @@ 8.0.103 - 8.0.103-servicing.24107.16 - 8.0.103-servicing.24107.16 + 8.0.103-servicing.24113.36 + 8.0.103-servicing.24113.36 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 9e0cfaf15367ba19e2579209f39b98053d9e2094 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 14 Feb 2024 19:30:22 +0000 Subject: [PATCH 348/535] Update dependencies from https://github.com/dotnet/arcade build 20240213.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.24059.4 -> To Version 8.0.0-beta.24113.2 --- NuGet.config | 4 ---- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/post-build/publish-using-darc.ps1 | 4 ++-- .../templates/job/publish-build-assets.yml | 14 +++++++------- eng/common/templates/post-build/post-build.yml | 16 ++++++++-------- .../templates/variables/pool-providers.yml | 12 ++++++------ global.json | 4 ++-- 8 files changed, 32 insertions(+), 36 deletions(-) diff --git a/NuGet.config b/NuGet.config index a52c961da..31081bc89 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,10 +7,6 @@ - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 81e8a49c7..58b710151 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -214,18 +214,18 @@ - + https://github.com/dotnet/arcade - 61ae141d2bf3534619265c8f691fd55dc3e75147 + da98edc4c3ea539f109ea320672136ceb32591a7 - + https://github.com/dotnet/arcade - 61ae141d2bf3534619265c8f691fd55dc3e75147 + da98edc4c3ea539f109ea320672136ceb32591a7 - + https://github.com/dotnet/arcade - 61ae141d2bf3534619265c8f691fd55dc3e75147 + da98edc4c3ea539f109ea320672136ceb32591a7 https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index 91639a7c8..f1b7ca78b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,7 +40,7 @@ - 8.0.0-beta.24059.4 + 8.0.0-beta.24113.2 diff --git a/eng/common/post-build/publish-using-darc.ps1 b/eng/common/post-build/publish-using-darc.ps1 index 1e779fec4..5a3a32ea8 100644 --- a/eng/common/post-build/publish-using-darc.ps1 +++ b/eng/common/post-build/publish-using-darc.ps1 @@ -12,7 +12,7 @@ param( try { . $PSScriptRoot\post-build-utils.ps1 - $darc = Get-Darc + $darc = Get-Darc $optionalParams = [System.Collections.ArrayList]::new() @@ -46,7 +46,7 @@ try { } Write-Host 'done.' -} +} catch { Write-Host $_ Write-PipelineTelemetryError -Category 'PromoteBuild' -Message "There was an error while trying to publish build '$BuildId' to default channels." diff --git a/eng/common/templates/job/publish-build-assets.yml b/eng/common/templates/job/publish-build-assets.yml index fa5446c09..8ec0151de 100644 --- a/eng/common/templates/job/publish-build-assets.yml +++ b/eng/common/templates/job/publish-build-assets.yml @@ -58,7 +58,7 @@ jobs: demands: Cmd # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: - name: $(DncEngInternalBuildPool) + name: NetCore1ESPool-Publishing-Internal demands: ImageOverride -equals windows.vs2019.amd64 steps: @@ -71,7 +71,7 @@ jobs: checkDownloadedFiles: true condition: ${{ parameters.condition }} continueOnError: ${{ parameters.continueOnError }} - + - task: NuGetAuthenticate@1 - task: PowerShell@2 @@ -86,7 +86,7 @@ jobs: /p:OfficialBuildId=$(Build.BuildNumber) condition: ${{ parameters.condition }} continueOnError: ${{ parameters.continueOnError }} - + - task: powershell@2 displayName: Create ReleaseConfigs Artifact inputs: @@ -95,7 +95,7 @@ jobs: 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: PublishBuildArtifacts@1 displayName: Publish ReleaseConfigs Artifact inputs: @@ -121,7 +121,7 @@ jobs: - task: PublishBuildArtifacts@1 displayName: Publish SymbolPublishingExclusionsFile Artifact - condition: eq(variables['SymbolExclusionFile'], 'true') + condition: eq(variables['SymbolExclusionFile'], 'true') inputs: PathtoPublish: '$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt' PublishLocation: Container @@ -137,7 +137,7 @@ jobs: displayName: Publish Using Darc inputs: filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 - arguments: -BuildId $(BARBuildId) + arguments: -BuildId $(BARBuildId) -PublishingInfraVersion 3 -AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)' -MaestroToken '$(MaestroApiAccessToken)' @@ -148,4 +148,4 @@ jobs: - ${{ if eq(parameters.enablePublishBuildArtifacts, 'true') }}: - template: /eng/common/templates/steps/publish-logs.yml parameters: - JobLabel: 'Publish_Artifacts_Logs' + JobLabel: 'Publish_Artifacts_Logs' diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index 3f74abf7c..aba44a25a 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -39,7 +39,7 @@ parameters: displayName: Enable NuGet validation type: boolean default: true - + - name: publishInstallersAndChecksums displayName: Publish installers and checksums type: boolean @@ -131,8 +131,8 @@ stages: displayName: Validate inputs: filePath: $(Build.SourcesDirectory)/eng/common/post-build/nuget-validation.ps1 - arguments: -PackagesPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ - -ToolDestinationPath $(Agent.BuildDirectory)/Extract/ + arguments: -PackagesPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ + -ToolDestinationPath $(Agent.BuildDirectory)/Extract/ - job: displayName: Signing Validation @@ -221,9 +221,9 @@ stages: 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) + arguments: -InputPath $(Build.ArtifactStagingDirectory)/BlobArtifacts/ + -ExtractPath $(Agent.BuildDirectory)/Extract/ + -GHRepoName $(Build.Repository.Name) -GHCommit $(Build.SourceVersion) -SourcelinkCliVersion $(SourceLinkCLIVersion) continueOnError: true @@ -258,7 +258,7 @@ stages: demands: Cmd # If it's not devdiv, it's dnceng ${{ else }}: - name: $(DncEngInternalBuildPool) + name: NetCore1ESPool-Publishing-Internal demands: ImageOverride -equals windows.vs2019.amd64 steps: - template: setup-maestro-vars.yml @@ -272,7 +272,7 @@ stages: displayName: Publish Using Darc inputs: filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 - arguments: -BuildId $(BARBuildId) + arguments: -BuildId $(BARBuildId) -PublishingInfraVersion ${{ parameters.publishingInfraVersion }} -AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)' -MaestroToken '$(MaestroApiAccessToken)' diff --git a/eng/common/templates/variables/pool-providers.yml b/eng/common/templates/variables/pool-providers.yml index 9cc5c550d..d236f9fdb 100644 --- a/eng/common/templates/variables/pool-providers.yml +++ b/eng/common/templates/variables/pool-providers.yml @@ -1,15 +1,15 @@ -# Select a pool provider based off branch name. Anything with branch name containing 'release' must go into an -Svc pool, +# 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: +# 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 +# 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: +# 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. # @@ -54,4 +54,4 @@ variables: False, 'NetCore1ESPool-Internal' ) - ] \ No newline at end of file + ] diff --git a/global.json b/global.json index 52a0f29ec..e46bfeda9 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.24059.4", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24059.4" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24113.2", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24113.2" } } From 37fb25fbf78529d3bb6d03793bd20b7eb26e7611 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 14 Feb 2024 22:05:03 +0000 Subject: [PATCH 349/535] Update dependencies from https://github.com/dotnet/arcade build 20240214.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.24065.4 -> To Version 7.0.0-beta.24114.2 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6526e84d8..1001e9b1f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - feda715e3fb6d511eaa39071bb9d77351cf4d943 + 5fd1dbf1679abc625e9e74614d9d7a28d151d675 - + https://github.com/dotnet/arcade - feda715e3fb6d511eaa39071bb9d77351cf4d943 + 5fd1dbf1679abc625e9e74614d9d7a28d151d675 - + https://github.com/dotnet/arcade - feda715e3fb6d511eaa39071bb9d77351cf4d943 + 5fd1dbf1679abc625e9e74614d9d7a28d151d675 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 76e4258e3..033f84632 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.24065.4 + 7.0.0-beta.24114.2 diff --git a/global.json b/global.json index 30aff2051..126e99650 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.115", + "dotnet": "7.0.116", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24065.4", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24065.4" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24114.2", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24114.2" } } From cb33239406eead37662f9901566f10eb0bc856df Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 14 Feb 2024 22:05:05 +0000 Subject: [PATCH 350/535] Update dependencies from https://github.com/dotnet/arcade build 20240214.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.24065.4 -> To Version 7.0.0-beta.24114.2 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 73ed55f61..66894993a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - feda715e3fb6d511eaa39071bb9d77351cf4d943 + 5fd1dbf1679abc625e9e74614d9d7a28d151d675 - + https://github.com/dotnet/arcade - feda715e3fb6d511eaa39071bb9d77351cf4d943 + 5fd1dbf1679abc625e9e74614d9d7a28d151d675 - + https://github.com/dotnet/arcade - feda715e3fb6d511eaa39071bb9d77351cf4d943 + 5fd1dbf1679abc625e9e74614d9d7a28d151d675 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index d40ea3bdc..3ed4b96cf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.24065.4 + 7.0.0-beta.24114.2 diff --git a/global.json b/global.json index 30aff2051..126e99650 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.115", + "dotnet": "7.0.116", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24065.4", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24065.4" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24114.2", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24114.2" } } From 5f3a79178154a4a4348333c7fa38053edca8c6fc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 14 Feb 2024 22:07:13 +0000 Subject: [PATCH 351/535] 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 352/535] 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 c92f4231d32acb922db4870732803a0ef1113e44 Mon Sep 17 00:00:00 2001 From: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Date: Thu, 15 Feb 2024 05:39:04 -0800 Subject: [PATCH 353/535] Merging internal commits for release/8.0.1xx (#18650) --- NuGet.config | 10 ++ eng/Version.Details.xml | 136 +++++++++--------- eng/Versions.props | 54 +++---- .../repo-projects/Directory.Build.props | 1 + test/EndToEnd/ProjectBuildTests.cs | 2 +- 5 files changed, 107 insertions(+), 96 deletions(-) diff --git a/NuGet.config b/NuGet.config index 31081bc89..4518ca310 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,16 +7,22 @@ + + + + + + @@ -37,11 +43,15 @@ + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 58b710151..9da0e138d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,46 +5,46 @@ 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://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a0e7b5d8673f28c41bcac6e2001b39ba2c8fab54 + 593444ad8328a5a933c006c6564469666f45ad2e - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a0e7b5d8673f28c41bcac6e2001b39ba2c8fab54 + 593444ad8328a5a933c006c6564469666f45ad2e - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a0e7b5d8673f28c41bcac6e2001b39ba2c8fab54 + 593444ad8328a5a933c006c6564469666f45ad2e - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a0e7b5d8673f28c41bcac6e2001b39ba2c8fab54 + 593444ad8328a5a933c006c6564469666f45ad2e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bf5e279d9239bfef5bb1b8d6212f1b971c434606 + 1381d5ebd2ab1f292848d5b19b80cf71ac332508 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bf5e279d9239bfef5bb1b8d6212f1b971c434606 + 1381d5ebd2ab1f292848d5b19b80cf71ac332508 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bf5e279d9239bfef5bb1b8d6212f1b971c434606 + 1381d5ebd2ab1f292848d5b19b80cf71ac332508 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bf5e279d9239bfef5bb1b8d6212f1b971c434606 + 1381d5ebd2ab1f292848d5b19b80cf71ac332508 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bf5e279d9239bfef5bb1b8d6212f1b971c434606 + 1381d5ebd2ab1f292848d5b19b80cf71ac332508 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bf5e279d9239bfef5bb1b8d6212f1b971c434606 + 1381d5ebd2ab1f292848d5b19b80cf71ac332508 @@ -52,55 +52,55 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bf5e279d9239bfef5bb1b8d6212f1b971c434606 + 1381d5ebd2ab1f292848d5b19b80cf71ac332508 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8e941eb42f819adb116b881195158b3887a70a1c + da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8e941eb42f819adb116b881195158b3887a70a1c + da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8e941eb42f819adb116b881195158b3887a70a1c + da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8e941eb42f819adb116b881195158b3887a70a1c + da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8e941eb42f819adb116b881195158b3887a70a1c + da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8e941eb42f819adb116b881195158b3887a70a1c + da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8e941eb42f819adb116b881195158b3887a70a1c + da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 08814442c7c94f8b059c818902b6883a69844860 + 4dc36050406554319d333a791a3e1dd8262cfd1b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 08814442c7c94f8b059c818902b6883a69844860 + 4dc36050406554319d333a791a3e1dd8262cfd1b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 08814442c7c94f8b059c818902b6883a69844860 + 4dc36050406554319d333a791a3e1dd8262cfd1b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 08814442c7c94f8b059c818902b6883a69844860 + 4dc36050406554319d333a791a3e1dd8262cfd1b https://github.com/dotnet/test-templates @@ -124,13 +124,13 @@ 1e5f3603af2277910aad946736ee23283e7f3e16 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 0b4028eb507aeb222f5bd1fc421876cc5e5e3fb8 + c58fa00bd16b92aab1d7fb2b93e71af6a7768139 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - ac40bed7a33baf164d3984ca90c2aedba996a7b2 + 472140dd926227876848e48f41cfc9acb9275492 https://github.com/dotnet/fsharp @@ -141,45 +141,45 @@ 424e4b7cffb7656efd63f7a905a2498e39011104 - + https://github.com/microsoft/vstest - 3259862fadd5e784564e7d920a2d61a75f415a79 + aa59400b11e1aeee2e8af48928dbd48748a8bef9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bf5e279d9239bfef5bb1b8d6212f1b971c434606 + 1381d5ebd2ab1f292848d5b19b80cf71ac332508 - + https://github.com/dotnet/roslyn - 7b75981cf3bd520b86ec4ed00ec156c8bc48e4eb + 263571123fc3dc4a638e071234ac9fbf91913962 - + https://github.com/dotnet/msbuild - 195e7f5a3a8e51c37d83cd9e54cb99dc3fc69c22 + b5265ef370a651f8c3458110b804e5cbf869eeb5 - + https://github.com/nuget/nuget.client - 0dd5a1ea536201af94725353e4bc711d7560b246 + 550277e0616e549446f03fda35d3e23dff75dc01 https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 201f4dae9d1a1e105d8ba86d7ece61eed1f665e0 + 2fc2ffd960930318f33fcaa690cbdbc55d72f52d https://dev.azure.com/dnceng/internal/_git/dotnet-aspire 48e42f59d64d84b404e904996a9ed61f2a17a569 - + https://github.com/dotnet/emsdk - 201f4dae9d1a1e105d8ba86d7ece61eed1f665e0 + 2fc2ffd960930318f33fcaa690cbdbc55d72f52d @@ -227,21 +227,21 @@ https://github.com/dotnet/arcade da98edc4c3ea539f109ea320672136ceb32591a7 - + https://github.com/dotnet/arcade-services - 702f946f89ace6197fdca2ac309d32187c4bc1bd + 5263b603d90991a0c200aca8b8892c3d7cfe4751 - + https://github.com/dotnet/arcade-services - 702f946f89ace6197fdca2ac309d32187c4bc1bd + 5263b603d90991a0c200aca8b8892c3d7cfe4751 https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - 453a37ef7ae6c335cd49b3b9ab7713c87faeb265 + 95f83e27806330fec09edd96e06bba3acabe3f35 diff --git a/eng/Versions.props b/eng/Versions.props index f1b7ca78b..114d2f500 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,11 +48,11 @@ - 8.0.1-servicing.23580.6 + 8.0.2-servicing.24068.3 - 8.0.1-servicing.23580.5 + 8.0.2-servicing.24068.6 @@ -72,50 +72,50 @@ - 8.0.1 - 8.0.1 - 8.0.1-servicing.23580.8 - 8.0.1-servicing.23580.8 - 8.0.1-servicing.23580.8 - 8.0.1-servicing.23580.8 - 8.0.1-servicing.23580.8 + 8.0.2 + 8.0.2 + 8.0.2-servicing.24068.4 + 8.0.2-servicing.24068.4 + 8.0.2-servicing.24068.4 + 8.0.2-servicing.24068.4 + 8.0.2-servicing.24068.4 0.2.0 - 8.0.101 - 8.0.101-servicing.23580.21 - 8.0.101-servicing.23580.21 + 8.0.102 + 8.0.102-servicing.24069.16 + 8.0.102-servicing.24069.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.8.0-7.23572.1 + 4.8.0-7.24067.24 - 8.0.1-servicing.23580.1 + 8.0.2-servicing.24067.11 - 8.0.1-servicing.23580.1 - 8.0.1-servicing.23580.1 - 8.0.1 - 8.0.1 - 8.0.1 - 8.0.1 + 8.0.2-servicing.24067.11 + 8.0.2-servicing.24067.11 + 8.0.2 + 8.0.2 + 8.0.2 + 8.0.2 2.1.0 - 8.0.1-servicing.23580.5 - 8.0.1-servicing.23580.5 - 8.0.1 - 8.0.1 + 8.0.2-servicing.24068.6 + 8.0.2-servicing.24068.6 + 8.0.2 + 8.0.2 @@ -127,7 +127,7 @@ - 6.8.0-rc.122 + 6.8.1-rc.2 @@ -235,7 +235,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.8.0-release-23578-02 + 17.8.0-release-23615-02 8.0.0-alpha.1.22557.12 @@ -250,7 +250,7 @@ 14.0.8478 17.0.8478 - 8.0.1 + 8.0.2 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100PackageVersion) 8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-rtm|-[A-z]*\.*\d*`)) diff --git a/src/SourceBuild/content/repo-projects/Directory.Build.props b/src/SourceBuild/content/repo-projects/Directory.Build.props index 4b2215bd4..2d04469ea 100644 --- a/src/SourceBuild/content/repo-projects/Directory.Build.props +++ b/src/SourceBuild/content/repo-projects/Directory.Build.props @@ -110,6 +110,7 @@ + diff --git a/test/EndToEnd/ProjectBuildTests.cs b/test/EndToEnd/ProjectBuildTests.cs index 01925eb5f..fa7350c16 100644 --- a/test/EndToEnd/ProjectBuildTests.cs +++ b/test/EndToEnd/ProjectBuildTests.cs @@ -202,7 +202,7 @@ namespace EndToEnd.Tests string expectedOutput = @"[\-\s]+ -[\w \.\(\)]+webapp,razor\s+\[C#\][\w\ \/]+ +[\w \.\(\)]+blazor\s+\[C#\][\w\ \/]+ [\w \.\(\)]+classlib\s+\[C#\],F#,VB[\w\ \/]+ [\w \.\(\)]+console\s+\[C#\],F#,VB[\w\ \/]+ "; From 124c9f84352a3f8950f69e0661c4983ec55be350 Mon Sep 17 00:00:00 2001 From: NET Source-Build Bot <102560831+dotnet-sb-bot@users.noreply.github.com> Date: Thu, 15 Feb 2024 15:45:17 +0100 Subject: [PATCH 354/535] .NET Source-Build 8.0.102 February 2024 Updates (#18655) --- src/SourceBuild/content/eng/Versions.props | 4 ++-- src/SourceBuild/content/global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/SourceBuild/content/eng/Versions.props b/src/SourceBuild/content/eng/Versions.props index bb8227558..54b507d2d 100644 --- a/src/SourceBuild/content/eng/Versions.props +++ b/src/SourceBuild/content/eng/Versions.props @@ -30,7 +30,7 @@ These URLs can't be composed from their base URL and version as we read them from the prep.sh and pipeline scripts, outside of MSBuild. --> - https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.8.0.101-servicing.23601.1.centos.8-x64.tar.gz - https://dotnetcli.azureedge.net/source-built-artifacts/sdks/dotnet-sdk-8.0.101-centos.8-x64.tar.gz + https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.8.0.102-servicing.24073.1.centos.8-x64.tar.gz + https://dotnetcli.azureedge.net/source-built-artifacts/sdks/dotnet-sdk-8.0.102-centos.8-x64.tar.gz diff --git a/src/SourceBuild/content/global.json b/src/SourceBuild/content/global.json index c8e9324a4..bda4e743d 100644 --- a/src/SourceBuild/content/global.json +++ b/src/SourceBuild/content/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "8.0.101" + "dotnet": "8.0.102" }, "msbuild-sdks": { "Microsoft.Build.CentralPackageVersions": "2.0.1", From 932aab20dc43cd2437c36cb8c5c5fc957a7c06ce Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 15 Feb 2024 15:59:14 +0000 Subject: [PATCH 355/535] Update dependencies from https://github.com/dotnet/arcade build 20240214.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.24065.4 -> To Version 7.0.0-beta.24114.4 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 66894993a..a34794467 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - 5fd1dbf1679abc625e9e74614d9d7a28d151d675 + c9bbc4b7606b46f6121a2758d2555dfc6322ed88 - + https://github.com/dotnet/arcade - 5fd1dbf1679abc625e9e74614d9d7a28d151d675 + c9bbc4b7606b46f6121a2758d2555dfc6322ed88 - + https://github.com/dotnet/arcade - 5fd1dbf1679abc625e9e74614d9d7a28d151d675 + c9bbc4b7606b46f6121a2758d2555dfc6322ed88 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 3ed4b96cf..551034699 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.24114.2 + 7.0.0-beta.24114.4 diff --git a/global.json b/global.json index 126e99650..5d42d1e74 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24114.2", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24114.2" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24114.4", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24114.4" } } From 1e00c4cd394e56e02c31d532e56dff9e360293bb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 15 Feb 2024 15:59:14 +0000 Subject: [PATCH 356/535] Update dependencies from https://github.com/dotnet/arcade build 20240214.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.24065.4 -> To Version 7.0.0-beta.24114.4 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1001e9b1f..6b33d934c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - 5fd1dbf1679abc625e9e74614d9d7a28d151d675 + c9bbc4b7606b46f6121a2758d2555dfc6322ed88 - + https://github.com/dotnet/arcade - 5fd1dbf1679abc625e9e74614d9d7a28d151d675 + c9bbc4b7606b46f6121a2758d2555dfc6322ed88 - + https://github.com/dotnet/arcade - 5fd1dbf1679abc625e9e74614d9d7a28d151d675 + c9bbc4b7606b46f6121a2758d2555dfc6322ed88 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 033f84632..4695a1be8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.24114.2 + 7.0.0-beta.24114.4 diff --git a/global.json b/global.json index 126e99650..5d42d1e74 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24114.2", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24114.2" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24114.4", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24114.4" } } From bf88ec8a077abe4ded4f98f4b24e26704fd8e404 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 15 Feb 2024 17:00:13 +0000 Subject: [PATCH 357/535] 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 358/535] 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 1ecb3871ba6f61b40fa55d9fd499fb4efca0938b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 15 Feb 2024 17:28:46 +0000 Subject: [PATCH 359/535] Update dependencies from https://github.com/dotnet/arcade build 20240213.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 6.0.0-beta.24059.3 -> To Version 6.0.0-beta.24113.1 --- NuGet.config | 16 +++++++++++++-- eng/Version.Details.xml | 12 +++++------ eng/Versions.props | 2 +- eng/common/post-build/publish-using-darc.ps1 | 4 ++-- .../templates/job/publish-build-assets.yml | 10 +++++----- eng/common/templates/jobs/jobs.yml | 10 +++++----- .../templates/post-build/post-build.yml | 20 +++++++++---------- global.json | 4 ++-- 8 files changed, 45 insertions(+), 33 deletions(-) diff --git a/NuGet.config b/NuGet.config index 65b1fe47e..0e7995f83 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 816b9b949..4dd5d2c48 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - e5e9a01e6d0dcde2e945624bc1ba1bc05d2c1fc2 + 96facbceaca1e4eb498055c005088764d3b38dff - + https://github.com/dotnet/arcade - e5e9a01e6d0dcde2e945624bc1ba1bc05d2c1fc2 + 96facbceaca1e4eb498055c005088764d3b38dff - + https://github.com/dotnet/arcade - e5e9a01e6d0dcde2e945624bc1ba1bc05d2c1fc2 + 96facbceaca1e4eb498055c005088764d3b38dff https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index ac84c27ca..c78738260 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.24059.3 + 6.0.0-beta.24113.1 diff --git a/eng/common/post-build/publish-using-darc.ps1 b/eng/common/post-build/publish-using-darc.ps1 index 1e779fec4..5a3a32ea8 100644 --- a/eng/common/post-build/publish-using-darc.ps1 +++ b/eng/common/post-build/publish-using-darc.ps1 @@ -12,7 +12,7 @@ param( try { . $PSScriptRoot\post-build-utils.ps1 - $darc = Get-Darc + $darc = Get-Darc $optionalParams = [System.Collections.ArrayList]::new() @@ -46,7 +46,7 @@ try { } Write-Host 'done.' -} +} catch { Write-Host $_ Write-PipelineTelemetryError -Category 'PromoteBuild' -Message "There was an error while trying to publish build '$BuildId' to default channels." diff --git a/eng/common/templates/job/publish-build-assets.yml b/eng/common/templates/job/publish-build-assets.yml index 239b17010..bd3d54b76 100644 --- a/eng/common/templates/job/publish-build-assets.yml +++ b/eng/common/templates/job/publish-build-assets.yml @@ -51,7 +51,7 @@ jobs: checkDownloadedFiles: true condition: ${{ parameters.condition }} continueOnError: ${{ parameters.continueOnError }} - + - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - task: NuGetAuthenticate@1 @@ -74,7 +74,7 @@ jobs: /p:OfficialBuildId=$(Build.BuildNumber) condition: ${{ parameters.condition }} continueOnError: ${{ parameters.continueOnError }} - + - task: powershell@2 displayName: Create ReleaseConfigs Artifact inputs: @@ -83,7 +83,7 @@ jobs: 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: PublishBuildArtifacts@1 displayName: Publish ReleaseConfigs Artifact inputs: @@ -109,7 +109,7 @@ jobs: - task: PublishBuildArtifacts@1 displayName: Publish SymbolPublishingExclusionsFile Artifact - condition: eq(variables['SymbolExclusionFile'], 'true') + condition: eq(variables['SymbolExclusionFile'], 'true') inputs: PathtoPublish: '$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt' PublishLocation: Container @@ -118,4 +118,4 @@ jobs: - ${{ if eq(parameters.enablePublishBuildArtifacts, 'true') }}: - template: /eng/common/templates/steps/publish-logs.yml parameters: - JobLabel: 'Publish_Artifacts_Logs' + JobLabel: 'Publish_Artifacts_Logs' diff --git a/eng/common/templates/jobs/jobs.yml b/eng/common/templates/jobs/jobs.yml index 9c4becbc8..f70826518 100644 --- a/eng/common/templates/jobs/jobs.yml +++ b/eng/common/templates/jobs/jobs.yml @@ -20,7 +20,7 @@ parameters: 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: [] @@ -40,7 +40,7 @@ parameters: jobs: - ${{ each job in parameters.jobs }}: - template: ../job/job.yml - parameters: + parameters: # pass along parameters ${{ each parameter in parameters }}: ${{ if ne(parameter.key, 'jobs') }}: @@ -68,7 +68,7 @@ jobs: ${{ 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: @@ -88,8 +88,8 @@ jobs: name: VSEngSS-MicroBuild2022-1ES demands: Cmd # If it's not devdiv, it's dnceng - ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: - name: NetCore1ESPool-Svc-Internal + ${{ else }}: + name: NetCore1ESPool-Publishing-Internal demands: ImageOverride -equals windows.vs2019.amd64 runAsPublic: ${{ parameters.runAsPublic }} diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index d49c6156b..5a0bb8d96 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -39,7 +39,7 @@ parameters: displayName: Enable NuGet validation type: boolean default: true - + - name: publishInstallersAndChecksums displayName: Publish installers and checksums type: boolean @@ -124,8 +124,8 @@ stages: displayName: Validate inputs: filePath: $(Build.SourcesDirectory)/eng/common/post-build/nuget-validation.ps1 - arguments: -PackagesPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ - -ToolDestinationPath $(Agent.BuildDirectory)/Extract/ + arguments: -PackagesPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ + -ToolDestinationPath $(Agent.BuildDirectory)/Extract/ - job: displayName: Signing Validation @@ -220,9 +220,9 @@ stages: 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) + arguments: -InputPath $(Build.ArtifactStagingDirectory)/BlobArtifacts/ + -ExtractPath $(Agent.BuildDirectory)/Extract/ + -GHRepoName $(Build.Repository.Name) -GHCommit $(Build.SourceVersion) -SourcelinkCliVersion $(SourceLinkCLIVersion) continueOnError: true @@ -253,8 +253,8 @@ stages: name: VSEngSS-MicroBuild2022-1ES demands: Cmd # If it's not devdiv, it's dnceng - ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: - name: NetCore1ESPool-Svc-Internal + ${{ else }}: + name: NetCore1ESPool-Publishing-Internal demands: ImageOverride -equals windows.vs2019.amd64 steps: - template: setup-maestro-vars.yml @@ -266,10 +266,10 @@ stages: displayName: Publish Using Darc inputs: filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 - arguments: -BuildId $(BARBuildId) + arguments: -BuildId $(BARBuildId) -PublishingInfraVersion ${{ parameters.publishingInfraVersion }} -AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)' -MaestroToken '$(MaestroApiAccessToken)' -WaitPublishingFinish true -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}' - -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' \ No newline at end of file + -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' diff --git a/global.json b/global.json index 8bf2c6315..73265b36f 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24059.3", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.24059.3" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24113.1", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.24113.1" } } From e44eb502e47d80c8d90d8339b9f2c28546bf41a6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 15 Feb 2024 17:29:14 +0000 Subject: [PATCH 360/535] Update dependencies from https://github.com/dotnet/arcade build 20240214.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.24059.5 -> To Version 7.0.0-beta.24114.4 --- NuGet.config | 16 ++++++++++++++-- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/native/init-compiler.sh | 2 +- global.json | 6 +++--- 5 files changed, 25 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index 99d9d34a8..3fddfa878 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,22 +7,29 @@ - + + + + + + + + @@ -44,14 +51,19 @@ - + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 592f18792..351bf8ed3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -194,18 +194,18 @@ - + https://github.com/dotnet/arcade - 02d5538bac1bacfd6fb310d92ab8914de08f3358 + c9bbc4b7606b46f6121a2758d2555dfc6322ed88 - + https://github.com/dotnet/arcade - 02d5538bac1bacfd6fb310d92ab8914de08f3358 + c9bbc4b7606b46f6121a2758d2555dfc6322ed88 - + https://github.com/dotnet/arcade - 02d5538bac1bacfd6fb310d92ab8914de08f3358 + c9bbc4b7606b46f6121a2758d2555dfc6322ed88 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 024ad8546..a1ed9ad1c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.24059.5 + 7.0.0-beta.24114.4 diff --git a/eng/common/native/init-compiler.sh b/eng/common/native/init-compiler.sh index f13b74080..81ea06151 100644 --- a/eng/common/native/init-compiler.sh +++ b/eng/common/native/init-compiler.sh @@ -71,7 +71,7 @@ if [[ -z "$CLR_CC" ]]; then # Set default versions if [[ -z "$majorVersion" ]]; then # note: gcc (all versions) and clang versions higher than 6 do not have minor version in file name, if it is zero. - if [[ "$compiler" == "clang" ]]; then versions=( 16 15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5 ) + if [[ "$compiler" == "clang" ]]; then versions=( 17 16 15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5 ) elif [[ "$compiler" == "gcc" ]]; then versions=( 12 11 10 9 8 7 6 5 4.9 ); fi for version in "${versions[@]}"; do diff --git a/global.json b/global.json index fd9164f9a..5d42d1e74 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.115", + "dotnet": "7.0.116", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24059.5", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24059.5" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24114.4", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24114.4" } } From 3f9af86fa7fa5f579ba812650e94a82a55005286 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 15 Feb 2024 19:14:47 +0000 Subject: [PATCH 361/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240215.25 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.102 -> To Version 8.0.103 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.SourceBuild.Intermediate.emsdk From Version 8.0.2-servicing.24067.11 -> To Version 8.0.3-servicing.24114.5 (parent: Microsoft.NET.Sdk --- NuGet.config | 31 ++++------------------- eng/Version.Details.xml | 54 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++-------- 3 files changed, 42 insertions(+), 63 deletions(-) diff --git a/NuGet.config b/NuGet.config index fa0c56570..01dea53a2 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,30 +7,18 @@ - - - - + - - - - - - - - - - + - + @@ -58,20 +46,11 @@ - - - - - - - - - - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f394097e7..2ba7cad47 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -21,30 +21,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 593444ad8328a5a933c006c6564469666f45ad2e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1381d5ebd2ab1f292848d5b19b80cf71ac332508 + 0c7efec09666babeebea1f608c91757b8faccca0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1381d5ebd2ab1f292848d5b19b80cf71ac332508 + 0c7efec09666babeebea1f608c91757b8faccca0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1381d5ebd2ab1f292848d5b19b80cf71ac332508 + 0c7efec09666babeebea1f608c91757b8faccca0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1381d5ebd2ab1f292848d5b19b80cf71ac332508 + 0c7efec09666babeebea1f608c91757b8faccca0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1381d5ebd2ab1f292848d5b19b80cf71ac332508 + 0c7efec09666babeebea1f608c91757b8faccca0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1381d5ebd2ab1f292848d5b19b80cf71ac332508 + 0c7efec09666babeebea1f608c91757b8faccca0 @@ -52,9 +52,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1381d5ebd2ab1f292848d5b19b80cf71ac332508 + 0c7efec09666babeebea1f608c91757b8faccca0 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a209a255c6aecd6899b43d28b19603bb23f22cae + 636742df9101ffe1177d1c301041d544b2c052b8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a209a255c6aecd6899b43d28b19603bb23f22cae + 636742df9101ffe1177d1c301041d544b2c052b8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a209a255c6aecd6899b43d28b19603bb23f22cae + 636742df9101ffe1177d1c301041d544b2c052b8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a209a255c6aecd6899b43d28b19603bb23f22cae + 636742df9101ffe1177d1c301041d544b2c052b8 https://github.com/dotnet/test-templates @@ -146,9 +146,9 @@ aa59400b11e1aeee2e8af48928dbd48748a8bef9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1381d5ebd2ab1f292848d5b19b80cf71ac332508 + 0c7efec09666babeebea1f608c91757b8faccca0 https://github.com/dotnet/roslyn @@ -168,18 +168,18 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 2fc2ffd960930318f33fcaa690cbdbc55d72f52d + 9a29abdd764a4de0f253ed368871877a47725247 https://dev.azure.com/dnceng/internal/_git/dotnet-aspire 48e42f59d64d84b404e904996a9ed61f2a17a569 - + https://github.com/dotnet/emsdk - 2fc2ffd960930318f33fcaa690cbdbc55d72f52d + 9a29abdd764a4de0f253ed368871877a47725247 diff --git a/eng/Versions.props b/eng/Versions.props index 8d1933423..1d4b434a3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,8 +86,8 @@ 8.0.103 - 8.0.103-servicing.24113.36 - 8.0.103-servicing.24113.36 + 8.0.103-servicing.24115.25 + 8.0.103-servicing.24115.25 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -98,16 +98,16 @@ - 8.0.2-servicing.24067.11 + 8.0.3-servicing.24114.5 - 8.0.2-servicing.24067.11 - 8.0.2-servicing.24067.11 - 8.0.2 - 8.0.2 - 8.0.2 - 8.0.2 + 8.0.3-servicing.24114.5 + 8.0.3-servicing.24114.5 + 8.0.3 + 8.0.3 + 8.0.3 + 8.0.3 2.1.0 @@ -249,7 +249,7 @@ 14.0.8478 17.0.8478 - 8.0.2 + 8.0.3 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100PackageVersion) 8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-rtm|-[A-z]*\.*\d*`)) From 25f8bbf23092ef115872f11099598860d31064c3 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 15 Feb 2024 19:28:47 +0000 Subject: [PATCH 362/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240215.27 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.313 -> To Version 7.0.314 Dependency coherency updates Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,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,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.16 -> To Version 7.0.17 (parent: Microsoft.NET.Sdk --- NuGet.config | 24 ++++--------- eng/Version.Details.xml | 74 ++++++++++++++++++++--------------------- eng/Versions.props | 34 +++++++++---------- 3 files changed, 61 insertions(+), 71 deletions(-) diff --git a/NuGet.config b/NuGet.config index 5dcb94172..65a0c72c2 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,22 +10,16 @@ - - - + - - - + - - - + - + @@ -52,16 +46,12 @@ - - - + - - - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8b2e6c813..9886560b2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop f58ad2d644bb52baf49e85be027bf2db3fced446 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 567edafe6106e6b769c64f6a2ed876190baa642a + 2aef67c5b99de279b9acbcddd89310515b4f8eff - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 567edafe6106e6b769c64f6a2ed876190baa642a + 2aef67c5b99de279b9acbcddd89310515b4f8eff - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 567edafe6106e6b769c64f6a2ed876190baa642a + 2aef67c5b99de279b9acbcddd89310515b4f8eff - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 567edafe6106e6b769c64f6a2ed876190baa642a + 2aef67c5b99de279b9acbcddd89310515b4f8eff - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 567edafe6106e6b769c64f6a2ed876190baa642a + 2aef67c5b99de279b9acbcddd89310515b4f8eff - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 567edafe6106e6b769c64f6a2ed876190baa642a + 2aef67c5b99de279b9acbcddd89310515b4f8eff @@ -52,34 +52,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 610fe433e07b32ed451ed99d07df63be47c29050 + 1fe4cc0a785efc50422ea03d8b762a856fee4298 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 610fe433e07b32ed451ed99d07df63be47c29050 + 1fe4cc0a785efc50422ea03d8b762a856fee4298 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 610fe433e07b32ed451ed99d07df63be47c29050 + 1fe4cc0a785efc50422ea03d8b762a856fee4298 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 610fe433e07b32ed451ed99d07df63be47c29050 + 1fe4cc0a785efc50422ea03d8b762a856fee4298 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 610fe433e07b32ed451ed99d07df63be47c29050 + 1fe4cc0a785efc50422ea03d8b762a856fee4298 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 610fe433e07b32ed451ed99d07df63be47c29050 + 1fe4cc0a785efc50422ea03d8b762a856fee4298 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 610fe433e07b32ed451ed99d07df63be47c29050 + 1fe4cc0a785efc50422ea03d8b762a856fee4298 https://github.com/dotnet/test-templates @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1c59c729a144b86e3e781bef41d7e8b33f24caeb + 3c97a213ba0920a5dcb277d4c0482564d9ee7783 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1c59c729a144b86e3e781bef41d7e8b33f24caeb + 3c97a213ba0920a5dcb277d4c0482564d9ee7783 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1c59c729a144b86e3e781bef41d7e8b33f24caeb + 3c97a213ba0920a5dcb277d4c0482564d9ee7783 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1c59c729a144b86e3e781bef41d7e8b33f24caeb + 3c97a213ba0920a5dcb277d4c0482564d9ee7783 @@ -167,13 +167,13 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - ca510604d1667f32b4fa4653e3d3b64be8136bdc + ec6dc98ec8a69a8eed65d46fda484669a963626d - + https://github.com/dotnet/emsdk - ca510604d1667f32b4fa4653e3d3b64be8136bdc + ec6dc98ec8a69a8eed65d46fda484669a963626d https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index 734b8376e..4e6dca7e8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,13 +56,13 @@ - 7.0.16 - 7.0.16 - 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 + 7.0.17 + 7.0.17 + 7.0.17-servicing.24113.13 + 7.0.17-servicing.24113.13 + 7.0.17-servicing.24113.13 + 7.0.17-servicing.24113.13 + 7.0.17-servicing.24113.13 0.2.0 @@ -70,8 +70,8 @@ 7.0.314 - 7.0.314-servicing.24106.50 - 7.0.314-servicing.24106.50 + 7.0.314-servicing.24115.27 + 7.0.314-servicing.24115.27 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -86,12 +86,12 @@ - 7.0.16-servicing.24066.29 - 7.0.16-servicing.24066.29 - 7.0.16 - 7.0.16 - 7.0.16 - 7.0.16 + 7.0.17-servicing.24114.21 + 7.0.17-servicing.24114.21 + 7.0.17 + 7.0.17 + 7.0.17 + 7.0.17 2.1.0 @@ -231,8 +231,8 @@ 12.3.2372 16.0.1478 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.16 - 7.0.16 + 7.0.17 + 7.0.17 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version) From 9c496e94dedbc4d7949381ec4fc5b2fb7e9628ed Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 15 Feb 2024 20:05:23 +0000 Subject: [PATCH 363/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240215.21 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.406 -> To Version 7.0.407 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.WindowsDesktop.App.Runtime.win-x64,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.16 -> To Version 7.0.17 (parent: Microsoft.NET.Sdk --- NuGet.config | 32 +++++---------- eng/Version.Details.xml | 90 ++++++++++++++++++++--------------------- eng/Versions.props | 42 +++++++++---------- 3 files changed, 75 insertions(+), 89 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6acb2b9e7..dce8eea5b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,27 +10,19 @@ - - - + - - - + - - - + - + - - - + @@ -52,21 +44,15 @@ - - - + - - - + - + - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 64a394776..6d92e6b42 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f58ad2d644bb52baf49e85be027bf2db3fced446 + ffc51078b47f8e5175a83f25c6288491511ce3c2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f58ad2d644bb52baf49e85be027bf2db3fced446 + ffc51078b47f8e5175a83f25c6288491511ce3c2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f58ad2d644bb52baf49e85be027bf2db3fced446 + ffc51078b47f8e5175a83f25c6288491511ce3c2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f58ad2d644bb52baf49e85be027bf2db3fced446 + ffc51078b47f8e5175a83f25c6288491511ce3c2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 567edafe6106e6b769c64f6a2ed876190baa642a + 2aef67c5b99de279b9acbcddd89310515b4f8eff - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 567edafe6106e6b769c64f6a2ed876190baa642a + 2aef67c5b99de279b9acbcddd89310515b4f8eff - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 567edafe6106e6b769c64f6a2ed876190baa642a + 2aef67c5b99de279b9acbcddd89310515b4f8eff - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 567edafe6106e6b769c64f6a2ed876190baa642a + 2aef67c5b99de279b9acbcddd89310515b4f8eff - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 567edafe6106e6b769c64f6a2ed876190baa642a + 2aef67c5b99de279b9acbcddd89310515b4f8eff - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 567edafe6106e6b769c64f6a2ed876190baa642a + 2aef67c5b99de279b9acbcddd89310515b4f8eff @@ -52,34 +52,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 610fe433e07b32ed451ed99d07df63be47c29050 + 1fe4cc0a785efc50422ea03d8b762a856fee4298 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 610fe433e07b32ed451ed99d07df63be47c29050 + 1fe4cc0a785efc50422ea03d8b762a856fee4298 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 610fe433e07b32ed451ed99d07df63be47c29050 + 1fe4cc0a785efc50422ea03d8b762a856fee4298 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 610fe433e07b32ed451ed99d07df63be47c29050 + 1fe4cc0a785efc50422ea03d8b762a856fee4298 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 610fe433e07b32ed451ed99d07df63be47c29050 + 1fe4cc0a785efc50422ea03d8b762a856fee4298 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 610fe433e07b32ed451ed99d07df63be47c29050 + 1fe4cc0a785efc50422ea03d8b762a856fee4298 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 610fe433e07b32ed451ed99d07df63be47c29050 + 1fe4cc0a785efc50422ea03d8b762a856fee4298 https://github.com/dotnet/test-templates @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fc1baf7747d439f5f7dd0aebd6acba6950e3edbc + 0c4daf01caf9b492ee8dfc096fd309aa8638fc72 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fc1baf7747d439f5f7dd0aebd6acba6950e3edbc + 0c4daf01caf9b492ee8dfc096fd309aa8638fc72 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fc1baf7747d439f5f7dd0aebd6acba6950e3edbc + 0c4daf01caf9b492ee8dfc096fd309aa8638fc72 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fc1baf7747d439f5f7dd0aebd6acba6950e3edbc + 0c4daf01caf9b492ee8dfc096fd309aa8638fc72 @@ -167,13 +167,13 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - ca510604d1667f32b4fa4653e3d3b64be8136bdc + ec6dc98ec8a69a8eed65d46fda484669a963626d - + https://github.com/dotnet/emsdk - ca510604d1667f32b4fa4653e3d3b64be8136bdc + ec6dc98ec8a69a8eed65d46fda484669a963626d https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index a808d29f8..9b83c3748 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,13 +56,13 @@ - 7.0.16 - 7.0.16 - 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 + 7.0.17 + 7.0.17 + 7.0.17-servicing.24113.13 + 7.0.17-servicing.24113.13 + 7.0.17-servicing.24113.13 + 7.0.17-servicing.24113.13 + 7.0.17-servicing.24113.13 0.2.0 @@ -70,8 +70,8 @@ 7.0.407 - 7.0.407-servicing.24106.26 - 7.0.407-servicing.24106.26 + 7.0.407-servicing.24115.21 + 7.0.407-servicing.24115.21 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -86,20 +86,20 @@ - 7.0.16-servicing.24066.29 - 7.0.16-servicing.24066.29 - 7.0.16 - 7.0.16 - 7.0.16 - 7.0.16 + 7.0.17-servicing.24114.21 + 7.0.17-servicing.24114.21 + 7.0.17 + 7.0.17 + 7.0.17 + 7.0.17 2.1.0 - 7.0.16-servicing.24068.4 - 7.0.16-servicing.24068.4 - 7.0.16 - 7.0.16 + 7.0.17-servicing.24114.7 + 7.0.17-servicing.24114.7 + 7.0.17 + 7.0.17 @@ -233,8 +233,8 @@ 12.3.2372 16.0.1478 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.16 - 7.0.16 + 7.0.17 + 7.0.17 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version) From 683f2541f58634bd5912c0055ba1da0c663483dc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 15 Feb 2024 21:23:12 +0000 Subject: [PATCH 364/535] Update dependencies from https://github.com/dotnet/arcade build 20240213.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 6.0.0-beta.24059.3 -> To Version 6.0.0-beta.24113.1 --- NuGet.config | 16 +++++++++++++-- eng/Version.Details.xml | 12 +++++------ eng/Versions.props | 2 +- eng/common/post-build/publish-using-darc.ps1 | 4 ++-- .../templates/job/publish-build-assets.yml | 10 +++++----- eng/common/templates/jobs/jobs.yml | 10 +++++----- .../templates/post-build/post-build.yml | 20 +++++++++---------- global.json | 4 ++-- 8 files changed, 45 insertions(+), 33 deletions(-) diff --git a/NuGet.config b/NuGet.config index da7974fae..b2706717a 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 cf9f76f91..0a205dc59 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - e5e9a01e6d0dcde2e945624bc1ba1bc05d2c1fc2 + 96facbceaca1e4eb498055c005088764d3b38dff - + https://github.com/dotnet/arcade - e5e9a01e6d0dcde2e945624bc1ba1bc05d2c1fc2 + 96facbceaca1e4eb498055c005088764d3b38dff - + https://github.com/dotnet/arcade - e5e9a01e6d0dcde2e945624bc1ba1bc05d2c1fc2 + 96facbceaca1e4eb498055c005088764d3b38dff https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index d5db6dd5d..4bf47577d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.24059.3 + 6.0.0-beta.24113.1 diff --git a/eng/common/post-build/publish-using-darc.ps1 b/eng/common/post-build/publish-using-darc.ps1 index 1e779fec4..5a3a32ea8 100644 --- a/eng/common/post-build/publish-using-darc.ps1 +++ b/eng/common/post-build/publish-using-darc.ps1 @@ -12,7 +12,7 @@ param( try { . $PSScriptRoot\post-build-utils.ps1 - $darc = Get-Darc + $darc = Get-Darc $optionalParams = [System.Collections.ArrayList]::new() @@ -46,7 +46,7 @@ try { } Write-Host 'done.' -} +} catch { Write-Host $_ Write-PipelineTelemetryError -Category 'PromoteBuild' -Message "There was an error while trying to publish build '$BuildId' to default channels." diff --git a/eng/common/templates/job/publish-build-assets.yml b/eng/common/templates/job/publish-build-assets.yml index 239b17010..bd3d54b76 100644 --- a/eng/common/templates/job/publish-build-assets.yml +++ b/eng/common/templates/job/publish-build-assets.yml @@ -51,7 +51,7 @@ jobs: checkDownloadedFiles: true condition: ${{ parameters.condition }} continueOnError: ${{ parameters.continueOnError }} - + - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - task: NuGetAuthenticate@1 @@ -74,7 +74,7 @@ jobs: /p:OfficialBuildId=$(Build.BuildNumber) condition: ${{ parameters.condition }} continueOnError: ${{ parameters.continueOnError }} - + - task: powershell@2 displayName: Create ReleaseConfigs Artifact inputs: @@ -83,7 +83,7 @@ jobs: 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: PublishBuildArtifacts@1 displayName: Publish ReleaseConfigs Artifact inputs: @@ -109,7 +109,7 @@ jobs: - task: PublishBuildArtifacts@1 displayName: Publish SymbolPublishingExclusionsFile Artifact - condition: eq(variables['SymbolExclusionFile'], 'true') + condition: eq(variables['SymbolExclusionFile'], 'true') inputs: PathtoPublish: '$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt' PublishLocation: Container @@ -118,4 +118,4 @@ jobs: - ${{ if eq(parameters.enablePublishBuildArtifacts, 'true') }}: - template: /eng/common/templates/steps/publish-logs.yml parameters: - JobLabel: 'Publish_Artifacts_Logs' + JobLabel: 'Publish_Artifacts_Logs' diff --git a/eng/common/templates/jobs/jobs.yml b/eng/common/templates/jobs/jobs.yml index 9c4becbc8..f70826518 100644 --- a/eng/common/templates/jobs/jobs.yml +++ b/eng/common/templates/jobs/jobs.yml @@ -20,7 +20,7 @@ parameters: 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: [] @@ -40,7 +40,7 @@ parameters: jobs: - ${{ each job in parameters.jobs }}: - template: ../job/job.yml - parameters: + parameters: # pass along parameters ${{ each parameter in parameters }}: ${{ if ne(parameter.key, 'jobs') }}: @@ -68,7 +68,7 @@ jobs: ${{ 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: @@ -88,8 +88,8 @@ jobs: name: VSEngSS-MicroBuild2022-1ES demands: Cmd # If it's not devdiv, it's dnceng - ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: - name: NetCore1ESPool-Svc-Internal + ${{ else }}: + name: NetCore1ESPool-Publishing-Internal demands: ImageOverride -equals windows.vs2019.amd64 runAsPublic: ${{ parameters.runAsPublic }} diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index d49c6156b..5a0bb8d96 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -39,7 +39,7 @@ parameters: displayName: Enable NuGet validation type: boolean default: true - + - name: publishInstallersAndChecksums displayName: Publish installers and checksums type: boolean @@ -124,8 +124,8 @@ stages: displayName: Validate inputs: filePath: $(Build.SourcesDirectory)/eng/common/post-build/nuget-validation.ps1 - arguments: -PackagesPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ - -ToolDestinationPath $(Agent.BuildDirectory)/Extract/ + arguments: -PackagesPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ + -ToolDestinationPath $(Agent.BuildDirectory)/Extract/ - job: displayName: Signing Validation @@ -220,9 +220,9 @@ stages: 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) + arguments: -InputPath $(Build.ArtifactStagingDirectory)/BlobArtifacts/ + -ExtractPath $(Agent.BuildDirectory)/Extract/ + -GHRepoName $(Build.Repository.Name) -GHCommit $(Build.SourceVersion) -SourcelinkCliVersion $(SourceLinkCLIVersion) continueOnError: true @@ -253,8 +253,8 @@ stages: name: VSEngSS-MicroBuild2022-1ES demands: Cmd # If it's not devdiv, it's dnceng - ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: - name: NetCore1ESPool-Svc-Internal + ${{ else }}: + name: NetCore1ESPool-Publishing-Internal demands: ImageOverride -equals windows.vs2019.amd64 steps: - template: setup-maestro-vars.yml @@ -266,10 +266,10 @@ stages: displayName: Publish Using Darc inputs: filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 - arguments: -BuildId $(BARBuildId) + arguments: -BuildId $(BARBuildId) -PublishingInfraVersion ${{ parameters.publishingInfraVersion }} -AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)' -MaestroToken '$(MaestroApiAccessToken)' -WaitPublishingFinish true -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}' - -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' \ No newline at end of file + -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' diff --git a/global.json b/global.json index 8bf2c6315..73265b36f 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24059.3", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.24059.3" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24113.1", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.24113.1" } } From 498860c3467dd98db937e2f141ab2608a3fc0201 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 16 Feb 2024 04:31:50 +0000 Subject: [PATCH 365/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240215.62 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.313 -> To Version 7.0.314 Dependency coherency updates Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,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,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.16 -> To Version 7.0.17 (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 65a0c72c2..2b3efcde7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,7 +19,7 @@ - + @@ -51,7 +51,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9886560b2..a7e4ff451 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3c97a213ba0920a5dcb277d4c0482564d9ee7783 + 8abbc186d03b1f1d96a40e4410f4d45744421e23 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3c97a213ba0920a5dcb277d4c0482564d9ee7783 + 8abbc186d03b1f1d96a40e4410f4d45744421e23 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3c97a213ba0920a5dcb277d4c0482564d9ee7783 + 8abbc186d03b1f1d96a40e4410f4d45744421e23 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3c97a213ba0920a5dcb277d4c0482564d9ee7783 + 8abbc186d03b1f1d96a40e4410f4d45744421e23 diff --git a/eng/Versions.props b/eng/Versions.props index 4e6dca7e8..a4de145f0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.314 - 7.0.314-servicing.24115.27 - 7.0.314-servicing.24115.27 + 7.0.314-servicing.24115.62 + 7.0.314-servicing.24115.62 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 0adc333c9fc3483fe518a08b106c5d3f9d697b60 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 16 Feb 2024 06:29:35 +0000 Subject: [PATCH 366/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240215.71 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.406 -> To Version 7.0.407 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.WindowsDesktop.App.Runtime.win-x64,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.16 -> To Version 7.0.17 (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 dce8eea5b..0a99eed77 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 6d92e6b42..8ad1e3529 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0c4daf01caf9b492ee8dfc096fd309aa8638fc72 + 59722ba58f5cd744a57921098d8af0a8bb22db0b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0c4daf01caf9b492ee8dfc096fd309aa8638fc72 + 59722ba58f5cd744a57921098d8af0a8bb22db0b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0c4daf01caf9b492ee8dfc096fd309aa8638fc72 + 59722ba58f5cd744a57921098d8af0a8bb22db0b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0c4daf01caf9b492ee8dfc096fd309aa8638fc72 + 59722ba58f5cd744a57921098d8af0a8bb22db0b diff --git a/eng/Versions.props b/eng/Versions.props index 9b83c3748..19f72966f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.407 - 7.0.407-servicing.24115.21 - 7.0.407-servicing.24115.21 + 7.0.407-servicing.24115.71 + 7.0.407-servicing.24115.71 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 7c652174c7610385e724c4adac1c4f7e12d55958 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 16 Feb 2024 06:30:08 +0000 Subject: [PATCH 367/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240215.72 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.102 -> To Version 8.0.103 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.SourceBuild.Intermediate.emsdk From Version 8.0.2-servicing.24067.11 -> To Version 8.0.3-servicing.24114.5 (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 01dea53a2..b52fae2e9 100644 --- a/NuGet.config +++ b/NuGet.config @@ -18,7 +18,7 @@ - + @@ -50,7 +50,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2ba7cad47..7c2cc140f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 636742df9101ffe1177d1c301041d544b2c052b8 + 966da5ac65a705c9f56489616bd3d2eee81723ca - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 636742df9101ffe1177d1c301041d544b2c052b8 + 966da5ac65a705c9f56489616bd3d2eee81723ca - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 636742df9101ffe1177d1c301041d544b2c052b8 + 966da5ac65a705c9f56489616bd3d2eee81723ca - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 636742df9101ffe1177d1c301041d544b2c052b8 + 966da5ac65a705c9f56489616bd3d2eee81723ca https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 1d4b434a3..5c764c7fc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,8 +86,8 @@ 8.0.103 - 8.0.103-servicing.24115.25 - 8.0.103-servicing.24115.25 + 8.0.103-servicing.24115.72 + 8.0.103-servicing.24115.72 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 3772ddc3aa828452a9503b01d95218f98aa61dbc Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 16 Feb 2024 06:38:43 +0000 Subject: [PATCH 368/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240215.73 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.313 -> To Version 7.0.314 Dependency coherency updates Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,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,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.16 -> To Version 7.0.17 (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 2b3efcde7..13ed5dc24 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,7 +19,7 @@ - + @@ -51,7 +51,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a7e4ff451..dec7d7a4d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8abbc186d03b1f1d96a40e4410f4d45744421e23 + 1b8dad6090439c845af7b824a639776d8cb6ebe0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8abbc186d03b1f1d96a40e4410f4d45744421e23 + 1b8dad6090439c845af7b824a639776d8cb6ebe0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8abbc186d03b1f1d96a40e4410f4d45744421e23 + 1b8dad6090439c845af7b824a639776d8cb6ebe0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8abbc186d03b1f1d96a40e4410f4d45744421e23 + 1b8dad6090439c845af7b824a639776d8cb6ebe0 diff --git a/eng/Versions.props b/eng/Versions.props index a4de145f0..774d72a74 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.314 - 7.0.314-servicing.24115.62 - 7.0.314-servicing.24115.62 + 7.0.314-servicing.24115.73 + 7.0.314-servicing.24115.73 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 9cc16e7d17b219fe19d7b0378174a318a4718ad3 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 16 Feb 2024 07:08:24 +0000 Subject: [PATCH 369/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240215.76 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.102 -> To Version 8.0.103 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.SourceBuild.Intermediate.emsdk From Version 8.0.2-servicing.24067.11 -> To Version 8.0.3-servicing.24114.5 (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 b52fae2e9..0aa1cb2b8 100644 --- a/NuGet.config +++ b/NuGet.config @@ -18,7 +18,7 @@ - + @@ -50,7 +50,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7c2cc140f..62d4590be 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 966da5ac65a705c9f56489616bd3d2eee81723ca + ac6ac4f1cb97a3718d474fe9c3010869f6efab76 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 966da5ac65a705c9f56489616bd3d2eee81723ca + ac6ac4f1cb97a3718d474fe9c3010869f6efab76 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 966da5ac65a705c9f56489616bd3d2eee81723ca + ac6ac4f1cb97a3718d474fe9c3010869f6efab76 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 966da5ac65a705c9f56489616bd3d2eee81723ca + ac6ac4f1cb97a3718d474fe9c3010869f6efab76 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 5c764c7fc..9e68ea0c5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,8 +86,8 @@ 8.0.103 - 8.0.103-servicing.24115.72 - 8.0.103-servicing.24115.72 + 8.0.103-servicing.24115.76 + 8.0.103-servicing.24115.76 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 999373878f7efc81bdc2dc589fef5d2b09f459a4 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 16 Feb 2024 07:32:39 +0000 Subject: [PATCH 370/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240215.78 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.406 -> To Version 7.0.407 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.WindowsDesktop.App.Runtime.win-x64,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.16 -> To Version 7.0.17 (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 0a99eed77..10559228c 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 8ad1e3529..7044a0c02 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 59722ba58f5cd744a57921098d8af0a8bb22db0b + c7252b613858c58968d7b7ceac1f31342dd98e80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 59722ba58f5cd744a57921098d8af0a8bb22db0b + c7252b613858c58968d7b7ceac1f31342dd98e80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 59722ba58f5cd744a57921098d8af0a8bb22db0b + c7252b613858c58968d7b7ceac1f31342dd98e80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 59722ba58f5cd744a57921098d8af0a8bb22db0b + c7252b613858c58968d7b7ceac1f31342dd98e80 diff --git a/eng/Versions.props b/eng/Versions.props index 19f72966f..afe6e53c9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.407 - 7.0.407-servicing.24115.71 - 7.0.407-servicing.24115.71 + 7.0.407-servicing.24115.78 + 7.0.407-servicing.24115.78 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 60a78318e6361a5012cd67014014af17941f8247 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 16 Feb 2024 19:41:10 +0000 Subject: [PATCH 371/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240216.12 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.419-servicing.24070.9 -> To Version 6.0.420-servicing.24116.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.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.NETCore.Platforms,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,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NET.Workload.Emscripten.Manifest-6.0.400 From Version 6.0.27 -> To Version 6.0.28 (parent: Microsoft.NET.Sdk --- NuGet.config | 30 ++++---------- eng/Version.Details.xml | 92 ++++++++++++++++++++--------------------- eng/Versions.props | 44 ++++++++++---------- 3 files changed, 77 insertions(+), 89 deletions(-) diff --git a/NuGet.config b/NuGet.config index b2706717a..02ae05121 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,28 +7,21 @@ + - - - + - - - + - - - + - - - + @@ -49,21 +42,16 @@ + - - - + - - - + - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0a205dc59..3a589d218 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 752aa75c68aad44ea864a65c034e27555e5f3333 + 4c0f7dc35580c286a77d992688e924117cb24c05 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 752aa75c68aad44ea864a65c034e27555e5f3333 + 4c0f7dc35580c286a77d992688e924117cb24c05 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 752aa75c68aad44ea864a65c034e27555e5f3333 + 4c0f7dc35580c286a77d992688e924117cb24c05 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 752aa75c68aad44ea864a65c034e27555e5f3333 + 4c0f7dc35580c286a77d992688e924117cb24c05 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80de56dadb3864aec7e8edd3ae32a23aeda08285 + 2b3cfc799de1c1e629f2194b67e1dbd610ea51c9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80de56dadb3864aec7e8edd3ae32a23aeda08285 + 2b3cfc799de1c1e629f2194b67e1dbd610ea51c9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80de56dadb3864aec7e8edd3ae32a23aeda08285 + 2b3cfc799de1c1e629f2194b67e1dbd610ea51c9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80de56dadb3864aec7e8edd3ae32a23aeda08285 + 2b3cfc799de1c1e629f2194b67e1dbd610ea51c9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80de56dadb3864aec7e8edd3ae32a23aeda08285 + 2b3cfc799de1c1e629f2194b67e1dbd610ea51c9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80de56dadb3864aec7e8edd3ae32a23aeda08285 + 2b3cfc799de1c1e629f2194b67e1dbd610ea51c9 @@ -48,34 +48,34 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a08d9ce2caf02455c0b825bcdc32974bdf769a80 + 2b3cfc799de1c1e629f2194b67e1dbd610ea51c9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 417d650029c720dbd2138bcafbb78e2e4ff31bff + 364d4a968b15639648dbd2a6388a780da1ff65cc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 417d650029c720dbd2138bcafbb78e2e4ff31bff + 364d4a968b15639648dbd2a6388a780da1ff65cc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 417d650029c720dbd2138bcafbb78e2e4ff31bff + 364d4a968b15639648dbd2a6388a780da1ff65cc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 417d650029c720dbd2138bcafbb78e2e4ff31bff + 364d4a968b15639648dbd2a6388a780da1ff65cc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 417d650029c720dbd2138bcafbb78e2e4ff31bff + 364d4a968b15639648dbd2a6388a780da1ff65cc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 417d650029c720dbd2138bcafbb78e2e4ff31bff + 364d4a968b15639648dbd2a6388a780da1ff65cc https://github.com/dotnet/test-templates @@ -90,27 +90,27 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 00aa120ee558ecef9e6343f7eab1811139a22463 + 96b2386852cd27690ca3737fe9320a764329a55a - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 00aa120ee558ecef9e6343f7eab1811139a22463 + 96b2386852cd27690ca3737fe9320a764329a55a - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 00aa120ee558ecef9e6343f7eab1811139a22463 + 96b2386852cd27690ca3737fe9320a764329a55a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - de27019bd5bfbe9e4c0ba2303c7dc224c210a1a0 + bc3278cbf587ce04b8ae4efd1f2c6b8ed498939c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - de27019bd5bfbe9e4c0ba2303c7dc224c210a1a0 + bc3278cbf587ce04b8ae4efd1f2c6b8ed498939c @@ -166,9 +166,9 @@ 698fdad58fa64a55f16cd9562c90224cc498ed02 - + https://github.com/dotnet/emsdk - a9f209f82fadb1f694ae6932f92c32918e407ded + 925c59b436d60b9cd6b5df54c3f9be13a9512c95 https://github.com/dotnet/source-build diff --git a/eng/Versions.props b/eng/Versions.props index f695c3266..f80527120 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.419 + 6.0.420 @@ -44,44 +44,44 @@ - 6.0.27 - 6.0.27 - 6.0.27-servicing.24070.2 - 6.0.27-servicing.24070.2 - 6.0.27-servicing.24070.2 - 6.0.27-servicing.24070.2 + 6.0.28 + 6.0.28 + 6.0.28-servicing.24115.9 + 6.0.28-servicing.24115.9 + 6.0.28-servicing.24115.9 + 6.0.28-servicing.24115.9 0.2.0 - 6.0.419-servicing.24070.9 - 6.0.419-servicing.24070.9 + 6.0.420-servicing.24116.12 + 6.0.420-servicing.24116.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 6.0.11 + 6.0.12 - 6.0.27-servicing.24069.12 - 6.0.27-servicing.24069.12 - 6.0.27 - 6.0.27 - 6.0.27 - 6.0.27 + 6.0.28-servicing.24114.25 + 6.0.28-servicing.24114.25 + 6.0.28 + 6.0.28 + 6.0.28 + 6.0.28 2.1.0 - 6.0.27-servicing.24070.4 - 6.0.27-servicing.24070.4 - 6.0.27 - 6.0.27 + 6.0.28-servicing.24114.9 + 6.0.28-servicing.24114.9 + 6.0.28 + 6.0.28 @@ -118,7 +118,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.419 + 6.0.420 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) @@ -188,7 +188,7 @@ 12.3.303 15.4.303 6.0.5 - 6.0.27 + 6.0.28 $(MicrosoftNETWorkloadEmscriptenManifest60400Version) From 628156cfe0588dcb1139c7cba389e7743a730714 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 16 Feb 2024 19:44:05 +0000 Subject: [PATCH 372/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240216.17 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.103 -> To Version 8.0.103 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.3-servicing.24114.5 -> To Version 8.0.3-servicing.24114.23 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 10 +++++----- 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/NuGet.config b/NuGet.config index 0aa1cb2b8..ca7355f29 100644 --- a/NuGet.config +++ b/NuGet.config @@ -15,10 +15,10 @@ - + - + @@ -48,9 +48,9 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 65f20f424..8c390a60c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -21,30 +21,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 593444ad8328a5a933c006c6564469666f45ad2e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0c7efec09666babeebea1f608c91757b8faccca0 + 9f4b1f5d664afdfc80e1508ab7ed099dff210fbd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0c7efec09666babeebea1f608c91757b8faccca0 + 9f4b1f5d664afdfc80e1508ab7ed099dff210fbd - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0c7efec09666babeebea1f608c91757b8faccca0 + 9f4b1f5d664afdfc80e1508ab7ed099dff210fbd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0c7efec09666babeebea1f608c91757b8faccca0 + 9f4b1f5d664afdfc80e1508ab7ed099dff210fbd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0c7efec09666babeebea1f608c91757b8faccca0 + 9f4b1f5d664afdfc80e1508ab7ed099dff210fbd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0c7efec09666babeebea1f608c91757b8faccca0 + 9f4b1f5d664afdfc80e1508ab7ed099dff210fbd @@ -52,9 +52,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0c7efec09666babeebea1f608c91757b8faccca0 + 9f4b1f5d664afdfc80e1508ab7ed099dff210fbd https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ac6ac4f1cb97a3718d474fe9c3010869f6efab76 + 5ef403fa24817626b5aa93d656e3c9a99815c4cb - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ac6ac4f1cb97a3718d474fe9c3010869f6efab76 + 5ef403fa24817626b5aa93d656e3c9a99815c4cb - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ac6ac4f1cb97a3718d474fe9c3010869f6efab76 + 5ef403fa24817626b5aa93d656e3c9a99815c4cb - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ac6ac4f1cb97a3718d474fe9c3010869f6efab76 + 5ef403fa24817626b5aa93d656e3c9a99815c4cb https://github.com/dotnet/test-templates @@ -148,7 +148,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0c7efec09666babeebea1f608c91757b8faccca0 + 9f4b1f5d664afdfc80e1508ab7ed099dff210fbd https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 16bf494ab..894f81a3e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,8 +86,8 @@ 8.0.103 - 8.0.103-servicing.24115.76 - 8.0.103-servicing.24115.76 + 8.0.103-servicing.24116.17 + 8.0.103-servicing.24116.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -98,12 +98,12 @@ - 8.0.3-servicing.24114.5 + 8.0.3-servicing.24114.23 - 8.0.3-servicing.24114.5 - 8.0.3-servicing.24114.5 + 8.0.3-servicing.24114.23 + 8.0.3-servicing.24114.23 8.0.3 8.0.3 8.0.3 From 9536f4f4fcb6f4810fe7d1422d8f5eef9ee63bad Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 16 Feb 2024 19:45:49 +0000 Subject: [PATCH 373/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240216.14 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.407 -> To Version 7.0.407 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,VS.Redist.Common.NetCore.SharedFramework.x64.7.0 From Version 7.0.17 -> To Version 7.0.17 (parent: Microsoft.NET.Sdk --- NuGet.config | 16 ++++----- eng/Version.Details.xml | 74 ++++++++++++++++++++--------------------- eng/Versions.props | 26 +++++++-------- 3 files changed, 58 insertions(+), 58 deletions(-) diff --git a/NuGet.config b/NuGet.config index 10559228c..2c2530bc7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,19 +10,19 @@ - + - + - + - + @@ -44,15 +44,15 @@ - + - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d90e05a1b..f59bdedcc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,44 +3,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ffc51078b47f8e5175a83f25c6288491511ce3c2 + c2fca339644c5d9626c72ceac378cf728dd0d56a - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ffc51078b47f8e5175a83f25c6288491511ce3c2 + c2fca339644c5d9626c72ceac378cf728dd0d56a - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ffc51078b47f8e5175a83f25c6288491511ce3c2 + c2fca339644c5d9626c72ceac378cf728dd0d56a https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ffc51078b47f8e5175a83f25c6288491511ce3c2 + c2fca339644c5d9626c72ceac378cf728dd0d56a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2aef67c5b99de279b9acbcddd89310515b4f8eff + dff486f2d78d3f932d0f9bfa38043f85e358fb8c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2aef67c5b99de279b9acbcddd89310515b4f8eff + dff486f2d78d3f932d0f9bfa38043f85e358fb8c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2aef67c5b99de279b9acbcddd89310515b4f8eff + dff486f2d78d3f932d0f9bfa38043f85e358fb8c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2aef67c5b99de279b9acbcddd89310515b4f8eff + dff486f2d78d3f932d0f9bfa38043f85e358fb8c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2aef67c5b99de279b9acbcddd89310515b4f8eff + dff486f2d78d3f932d0f9bfa38043f85e358fb8c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2aef67c5b99de279b9acbcddd89310515b4f8eff + dff486f2d78d3f932d0f9bfa38043f85e358fb8c @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1fe4cc0a785efc50422ea03d8b762a856fee4298 + 92c510e77b344db7085a4f6a4eb83ca821a78572 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1fe4cc0a785efc50422ea03d8b762a856fee4298 + 92c510e77b344db7085a4f6a4eb83ca821a78572 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1fe4cc0a785efc50422ea03d8b762a856fee4298 + 92c510e77b344db7085a4f6a4eb83ca821a78572 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1fe4cc0a785efc50422ea03d8b762a856fee4298 + 92c510e77b344db7085a4f6a4eb83ca821a78572 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1fe4cc0a785efc50422ea03d8b762a856fee4298 + 92c510e77b344db7085a4f6a4eb83ca821a78572 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1fe4cc0a785efc50422ea03d8b762a856fee4298 + 92c510e77b344db7085a4f6a4eb83ca821a78572 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1fe4cc0a785efc50422ea03d8b762a856fee4298 + 92c510e77b344db7085a4f6a4eb83ca821a78572 https://github.com/dotnet/test-templates @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c7252b613858c58968d7b7ceac1f31342dd98e80 + ced4d212d02b6892c6e1a28bcb032d222c84bce0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c7252b613858c58968d7b7ceac1f31342dd98e80 + ced4d212d02b6892c6e1a28bcb032d222c84bce0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c7252b613858c58968d7b7ceac1f31342dd98e80 + ced4d212d02b6892c6e1a28bcb032d222c84bce0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c7252b613858c58968d7b7ceac1f31342dd98e80 + ced4d212d02b6892c6e1a28bcb032d222c84bce0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 3d504675f930028236a0f09e47c900ad48bd3d6e + fcbb04f265a8923c27ad55eaa51b1913b5db732e - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 4a6accdbfd70e66399781c75b0c0a179f4b7e7eb + 0b58a4b68b566568e74d51a6999f71108ff71f05 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 47eeb2ee6..47d0bb040 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.16-servicing.24067.11 + 7.0.17-servicing.24115.10 - 7.0.16-servicing.24068.4 + 7.0.17-servicing.24115.3 @@ -58,11 +58,11 @@ 7.0.17 7.0.17 - 7.0.17-servicing.24113.13 - 7.0.17-servicing.24113.13 - 7.0.17-servicing.24113.13 - 7.0.17-servicing.24113.13 - 7.0.17-servicing.24113.13 + 7.0.17-servicing.24115.2 + 7.0.17-servicing.24115.2 + 7.0.17-servicing.24115.2 + 7.0.17-servicing.24115.2 + 7.0.17-servicing.24115.2 0.2.0 @@ -70,8 +70,8 @@ 7.0.407 - 7.0.407-servicing.24115.78 - 7.0.407-servicing.24115.78 + 7.0.407-servicing.24116.14 + 7.0.407-servicing.24116.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -86,8 +86,8 @@ - 7.0.17-servicing.24114.21 - 7.0.17-servicing.24114.21 + 7.0.17-servicing.24115.8 + 7.0.17-servicing.24115.8 7.0.17 7.0.17 7.0.17 @@ -96,8 +96,8 @@ - 7.0.17-servicing.24114.7 - 7.0.17-servicing.24114.7 + 7.0.17-servicing.24115.4 + 7.0.17-servicing.24115.4 7.0.17 7.0.17 From 728212525f56b62e79402f8ff9dac1d64608e5bb Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 16 Feb 2024 19:56:47 +0000 Subject: [PATCH 374/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240216.16 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.116 -> To Version 7.0.117 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.16 -> To Version 7.0.17 (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 3fddfa878..229d9e9e6 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 351bf8ed3..1b4ea62e8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f58ad2d644bb52baf49e85be027bf2db3fced446 + c2fca339644c5d9626c72ceac378cf728dd0d56a - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f58ad2d644bb52baf49e85be027bf2db3fced446 + c2fca339644c5d9626c72ceac378cf728dd0d56a - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f58ad2d644bb52baf49e85be027bf2db3fced446 + c2fca339644c5d9626c72ceac378cf728dd0d56a - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f58ad2d644bb52baf49e85be027bf2db3fced446 + c2fca339644c5d9626c72ceac378cf728dd0d56a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 567edafe6106e6b769c64f6a2ed876190baa642a + dff486f2d78d3f932d0f9bfa38043f85e358fb8c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 567edafe6106e6b769c64f6a2ed876190baa642a + dff486f2d78d3f932d0f9bfa38043f85e358fb8c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 567edafe6106e6b769c64f6a2ed876190baa642a + dff486f2d78d3f932d0f9bfa38043f85e358fb8c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 567edafe6106e6b769c64f6a2ed876190baa642a + dff486f2d78d3f932d0f9bfa38043f85e358fb8c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 567edafe6106e6b769c64f6a2ed876190baa642a + dff486f2d78d3f932d0f9bfa38043f85e358fb8c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 567edafe6106e6b769c64f6a2ed876190baa642a + dff486f2d78d3f932d0f9bfa38043f85e358fb8c @@ -52,34 +52,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 610fe433e07b32ed451ed99d07df63be47c29050 + 92c510e77b344db7085a4f6a4eb83ca821a78572 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 610fe433e07b32ed451ed99d07df63be47c29050 + 92c510e77b344db7085a4f6a4eb83ca821a78572 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 610fe433e07b32ed451ed99d07df63be47c29050 + 92c510e77b344db7085a4f6a4eb83ca821a78572 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 610fe433e07b32ed451ed99d07df63be47c29050 + 92c510e77b344db7085a4f6a4eb83ca821a78572 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 610fe433e07b32ed451ed99d07df63be47c29050 + 92c510e77b344db7085a4f6a4eb83ca821a78572 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 610fe433e07b32ed451ed99d07df63be47c29050 + 92c510e77b344db7085a4f6a4eb83ca821a78572 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 610fe433e07b32ed451ed99d07df63be47c29050 + 92c510e77b344db7085a4f6a4eb83ca821a78572 https://github.com/dotnet/test-templates @@ -98,31 +98,31 @@ aaaa0c1826f97a9dfcc67e94136bf01010b55f23 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a73e6ff24023ae17e8d5882a8f40545b20bf3428 + 937b442da08fbbfd22085eeff8a7cb01295c2ea6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a73e6ff24023ae17e8d5882a8f40545b20bf3428 + 937b442da08fbbfd22085eeff8a7cb01295c2ea6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a73e6ff24023ae17e8d5882a8f40545b20bf3428 + 937b442da08fbbfd22085eeff8a7cb01295c2ea6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a73e6ff24023ae17e8d5882a8f40545b20bf3428 + 937b442da08fbbfd22085eeff8a7cb01295c2ea6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 3d504675f930028236a0f09e47c900ad48bd3d6e + fcbb04f265a8923c27ad55eaa51b1913b5db732e - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 4a6accdbfd70e66399781c75b0c0a179f4b7e7eb + 0b58a4b68b566568e74d51a6999f71108ff71f05 https://github.com/dotnet/fsharp @@ -163,13 +163,13 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - ca510604d1667f32b4fa4653e3d3b64be8136bdc + ec6dc98ec8a69a8eed65d46fda484669a963626d - + https://github.com/dotnet/emsdk - ca510604d1667f32b4fa4653e3d3b64be8136bdc + ec6dc98ec8a69a8eed65d46fda484669a963626d https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index a1ed9ad1c..7b8737c3f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.16-servicing.24067.11 + 7.0.17-servicing.24115.10 - 7.0.16-servicing.24068.4 + 7.0.17-servicing.24115.3 @@ -56,22 +56,22 @@ - 7.0.16 - 7.0.16 - 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 + 7.0.17 + 7.0.17 + 7.0.17-servicing.24115.2 + 7.0.17-servicing.24115.2 + 7.0.17-servicing.24115.2 + 7.0.17-servicing.24115.2 + 7.0.17-servicing.24115.2 0.2.0 - 7.0.116 - 7.0.116-servicing.24069.8 - 7.0.116-servicing.24069.8 + 7.0.117 + 7.0.117-servicing.24116.16 + 7.0.117-servicing.24116.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -82,20 +82,20 @@ - 7.0.16-servicing.24066.29 - 7.0.16-servicing.24066.29 - 7.0.16 - 7.0.16 - 7.0.16 - 7.0.16 + 7.0.17-servicing.24115.8 + 7.0.17-servicing.24115.8 + 7.0.17 + 7.0.17 + 7.0.17 + 7.0.17 2.1.0 - 7.0.16-servicing.24068.4 - 7.0.16-servicing.24068.4 - 7.0.16 - 7.0.16 + 7.0.17-servicing.24115.4 + 7.0.17-servicing.24115.4 + 7.0.17 + 7.0.17 @@ -229,8 +229,8 @@ 12.3.2372 16.0.1478 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.16 - 7.0.16 + 7.0.17 + 7.0.17 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version) From 2b39998aead28fe77e4ddef17d194fe153eb3c51 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 16 Feb 2024 20:12:22 +0000 Subject: [PATCH 375/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240216.15 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.314 -> To Version 7.0.314 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,VS.Redist.Common.NetCore.SharedFramework.x64.7.0 From Version 7.0.16 -> To Version 7.0.17 (parent: Microsoft.NET.Sdk --- NuGet.config | 20 +++++------ eng/Version.Details.xml | 78 ++++++++++++++++++++--------------------- eng/Versions.props | 30 ++++++++-------- 3 files changed, 62 insertions(+), 66 deletions(-) diff --git a/NuGet.config b/NuGet.config index 13ed5dc24..dbf1bdff6 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,21 +10,19 @@ - + - + - + - - - + @@ -46,17 +44,15 @@ - + - + - + - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d05fd7abf..bb07d940e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f58ad2d644bb52baf49e85be027bf2db3fced446 + c2fca339644c5d9626c72ceac378cf728dd0d56a - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f58ad2d644bb52baf49e85be027bf2db3fced446 + c2fca339644c5d9626c72ceac378cf728dd0d56a - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f58ad2d644bb52baf49e85be027bf2db3fced446 + c2fca339644c5d9626c72ceac378cf728dd0d56a - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f58ad2d644bb52baf49e85be027bf2db3fced446 + c2fca339644c5d9626c72ceac378cf728dd0d56a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2aef67c5b99de279b9acbcddd89310515b4f8eff + dff486f2d78d3f932d0f9bfa38043f85e358fb8c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2aef67c5b99de279b9acbcddd89310515b4f8eff + dff486f2d78d3f932d0f9bfa38043f85e358fb8c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2aef67c5b99de279b9acbcddd89310515b4f8eff + dff486f2d78d3f932d0f9bfa38043f85e358fb8c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2aef67c5b99de279b9acbcddd89310515b4f8eff + dff486f2d78d3f932d0f9bfa38043f85e358fb8c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2aef67c5b99de279b9acbcddd89310515b4f8eff + dff486f2d78d3f932d0f9bfa38043f85e358fb8c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2aef67c5b99de279b9acbcddd89310515b4f8eff + dff486f2d78d3f932d0f9bfa38043f85e358fb8c @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1fe4cc0a785efc50422ea03d8b762a856fee4298 + 92c510e77b344db7085a4f6a4eb83ca821a78572 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1fe4cc0a785efc50422ea03d8b762a856fee4298 + 92c510e77b344db7085a4f6a4eb83ca821a78572 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1fe4cc0a785efc50422ea03d8b762a856fee4298 + 92c510e77b344db7085a4f6a4eb83ca821a78572 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1fe4cc0a785efc50422ea03d8b762a856fee4298 + 92c510e77b344db7085a4f6a4eb83ca821a78572 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1fe4cc0a785efc50422ea03d8b762a856fee4298 + 92c510e77b344db7085a4f6a4eb83ca821a78572 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1fe4cc0a785efc50422ea03d8b762a856fee4298 + 92c510e77b344db7085a4f6a4eb83ca821a78572 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1fe4cc0a785efc50422ea03d8b762a856fee4298 + 92c510e77b344db7085a4f6a4eb83ca821a78572 https://github.com/dotnet/test-templates @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1b8dad6090439c845af7b824a639776d8cb6ebe0 + 38ea0239126356c96ddea4a29cb6dce03c6c8749 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1b8dad6090439c845af7b824a639776d8cb6ebe0 + 38ea0239126356c96ddea4a29cb6dce03c6c8749 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1b8dad6090439c845af7b824a639776d8cb6ebe0 + 38ea0239126356c96ddea4a29cb6dce03c6c8749 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1b8dad6090439c845af7b824a639776d8cb6ebe0 + 38ea0239126356c96ddea4a29cb6dce03c6c8749 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 3d504675f930028236a0f09e47c900ad48bd3d6e + fcbb04f265a8923c27ad55eaa51b1913b5db732e - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 4a6accdbfd70e66399781c75b0c0a179f4b7e7eb + 0b58a4b68b566568e74d51a6999f71108ff71f05 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index e55b66af3..2981ec960 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.16-servicing.24067.11 + 7.0.17-servicing.24115.10 - 7.0.16-servicing.24068.4 + 7.0.17-servicing.24115.3 @@ -58,11 +58,11 @@ 7.0.17 7.0.17 - 7.0.17-servicing.24113.13 - 7.0.17-servicing.24113.13 - 7.0.17-servicing.24113.13 - 7.0.17-servicing.24113.13 - 7.0.17-servicing.24113.13 + 7.0.17-servicing.24115.2 + 7.0.17-servicing.24115.2 + 7.0.17-servicing.24115.2 + 7.0.17-servicing.24115.2 + 7.0.17-servicing.24115.2 0.2.0 @@ -70,8 +70,8 @@ 7.0.314 - 7.0.314-servicing.24115.73 - 7.0.314-servicing.24115.73 + 7.0.314-servicing.24116.15 + 7.0.314-servicing.24116.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -86,8 +86,8 @@ - 7.0.17-servicing.24114.21 - 7.0.17-servicing.24114.21 + 7.0.17-servicing.24115.8 + 7.0.17-servicing.24115.8 7.0.17 7.0.17 7.0.17 @@ -96,10 +96,10 @@ - 7.0.16-servicing.24068.4 - 7.0.16-servicing.24068.4 - 7.0.16 - 7.0.16 + 7.0.17-servicing.24115.4 + 7.0.17-servicing.24115.4 + 7.0.17 + 7.0.17 From c06ccfbf00526dc51793ac9801377698ee895723 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 16 Feb 2024 21:33:09 +0000 Subject: [PATCH 376/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240216.29 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.103 -> To Version 8.0.103 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.3-servicing.24114.5 -> To Version 8.0.3-servicing.24114.23 (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 ca7355f29..3ddd0c6b2 100644 --- a/NuGet.config +++ b/NuGet.config @@ -18,7 +18,7 @@ - + @@ -50,7 +50,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8c390a60c..af7e419f7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5ef403fa24817626b5aa93d656e3c9a99815c4cb + 5e0154f6ab1a1cf576bc524b9d97753413997046 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5ef403fa24817626b5aa93d656e3c9a99815c4cb + 5e0154f6ab1a1cf576bc524b9d97753413997046 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5ef403fa24817626b5aa93d656e3c9a99815c4cb + 5e0154f6ab1a1cf576bc524b9d97753413997046 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5ef403fa24817626b5aa93d656e3c9a99815c4cb + 5e0154f6ab1a1cf576bc524b9d97753413997046 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 894f81a3e..fddc0cccc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,8 +86,8 @@ 8.0.103 - 8.0.103-servicing.24116.17 - 8.0.103-servicing.24116.17 + 8.0.103-servicing.24116.29 + 8.0.103-servicing.24116.29 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From faed4ed636dfad9965607f62dcae46ca0067eacc Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 16 Feb 2024 22:16:50 +0000 Subject: [PATCH 377/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240216.44 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.419-servicing.24070.9 -> To Version 6.0.420-servicing.24116.44 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,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.NETCore.Platforms,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,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NET.Workload.Emscripten.Manifest-6.0.400 From Version 6.0.27 -> To Version 6.0.28 (parent: Microsoft.NET.Sdk --- 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 3a589d218..5589d8aa0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 96b2386852cd27690ca3737fe9320a764329a55a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - bc3278cbf587ce04b8ae4efd1f2c6b8ed498939c + 68e5ea09e3a88316c3bd693c3963230a27606ac3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - bc3278cbf587ce04b8ae4efd1f2c6b8ed498939c + 68e5ea09e3a88316c3bd693c3963230a27606ac3 diff --git a/eng/Versions.props b/eng/Versions.props index f80527120..b3e8e7b2d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.420-servicing.24116.12 - 6.0.420-servicing.24116.12 + 6.0.420-servicing.24116.44 + 6.0.420-servicing.24116.44 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 1cb3cc5096490ba730e6509695d2d93e6b03912e Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 16 Feb 2024 22:30:50 +0000 Subject: [PATCH 378/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240216.51 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.103 -> To Version 8.0.103 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.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 8.0.2 -> To Version 8.0.3 (parent: Microsoft.NET.Sdk --- NuGet.config | 18 ++++-------- eng/Version.Details.xml | 62 ++++++++++++++++++++--------------------- eng/Versions.props | 28 +++++++++---------- 3 files changed, 51 insertions(+), 57 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3ddd0c6b2..0853e356b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,6 +10,7 @@ + @@ -18,14 +19,10 @@ - + - - - - - + @@ -46,18 +43,15 @@ + - + - - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index af7e419f7..ca56c5479 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://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 593444ad8328a5a933c006c6564469666f45ad2e + c8530fb858574c520a4a7000b6f9fa51e4022840 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 593444ad8328a5a933c006c6564469666f45ad2e + c8530fb858574c520a4a7000b6f9fa51e4022840 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 593444ad8328a5a933c006c6564469666f45ad2e + c8530fb858574c520a4a7000b6f9fa51e4022840 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 593444ad8328a5a933c006c6564469666f45ad2e + c8530fb858574c520a4a7000b6f9fa51e4022840 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -56,51 +56,51 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 9f4b1f5d664afdfc80e1508ab7ed099dff210fbd - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 + cb8a5f3f2d7f060b50c27541a29c3f30777b7f9b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 + cb8a5f3f2d7f060b50c27541a29c3f30777b7f9b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 + cb8a5f3f2d7f060b50c27541a29c3f30777b7f9b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 + cb8a5f3f2d7f060b50c27541a29c3f30777b7f9b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 + cb8a5f3f2d7f060b50c27541a29c3f30777b7f9b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 + cb8a5f3f2d7f060b50c27541a29c3f30777b7f9b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 + cb8a5f3f2d7f060b50c27541a29c3f30777b7f9b https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5e0154f6ab1a1cf576bc524b9d97753413997046 + 628f3a7ff0668efb79b1650013093e56e40d8545 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5e0154f6ab1a1cf576bc524b9d97753413997046 + 628f3a7ff0668efb79b1650013093e56e40d8545 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5e0154f6ab1a1cf576bc524b9d97753413997046 + 628f3a7ff0668efb79b1650013093e56e40d8545 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5e0154f6ab1a1cf576bc524b9d97753413997046 + 628f3a7ff0668efb79b1650013093e56e40d8545 https://github.com/dotnet/test-templates @@ -128,9 +128,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-winforms c58fa00bd16b92aab1d7fb2b93e71af6a7768139 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 472140dd926227876848e48f41cfc9acb9275492 + 65e7d26b59594d892d8c1084440eecab4bfbbf6f https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index fddc0cccc..f48ad3ab2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,7 +52,7 @@ - 8.0.2-servicing.24068.6 + 8.0.3-servicing.24114.6 @@ -72,13 +72,13 @@ - 8.0.2 - 8.0.2 - 8.0.2-servicing.24068.4 - 8.0.2-servicing.24068.4 - 8.0.2-servicing.24068.4 - 8.0.2-servicing.24068.4 - 8.0.2-servicing.24068.4 + 8.0.3 + 8.0.3 + 8.0.3-servicing.24116.5 + 8.0.3-servicing.24116.5 + 8.0.3-servicing.24116.5 + 8.0.3-servicing.24116.5 + 8.0.3-servicing.24116.5 0.2.0 @@ -86,8 +86,8 @@ 8.0.103 - 8.0.103-servicing.24116.29 - 8.0.103-servicing.24116.29 + 8.0.103-servicing.24116.51 + 8.0.103-servicing.24116.51 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -112,10 +112,10 @@ - 8.0.2-servicing.24068.6 - 8.0.2-servicing.24068.6 - 8.0.2 - 8.0.2 + 8.0.3-servicing.24116.3 + 8.0.3-servicing.24116.3 + 8.0.3 + 8.0.3 From 1dc393c598f0fd10db0da9ca1e7789ce179165de Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 16 Feb 2024 22:40:09 +0000 Subject: [PATCH 379/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240216.49 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.407 -> To Version 7.0.407 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.17 -> To Version 7.0.17 (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 2c2530bc7..f14b05c5a 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 f59bdedcc..cf95753cc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 92c510e77b344db7085a4f6a4eb83ca821a78572 + 96cbc87b920c0937bef069e7561477919ddc520f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 92c510e77b344db7085a4f6a4eb83ca821a78572 + 96cbc87b920c0937bef069e7561477919ddc520f https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 92c510e77b344db7085a4f6a4eb83ca821a78572 + 96cbc87b920c0937bef069e7561477919ddc520f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 92c510e77b344db7085a4f6a4eb83ca821a78572 + 96cbc87b920c0937bef069e7561477919ddc520f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 92c510e77b344db7085a4f6a4eb83ca821a78572 + 96cbc87b920c0937bef069e7561477919ddc520f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 92c510e77b344db7085a4f6a4eb83ca821a78572 + 96cbc87b920c0937bef069e7561477919ddc520f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 92c510e77b344db7085a4f6a4eb83ca821a78572 + 96cbc87b920c0937bef069e7561477919ddc520f https://github.com/dotnet/test-templates @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ced4d212d02b6892c6e1a28bcb032d222c84bce0 + 2e0b6aa9a147ca88fb568d1b2cd82cf579ddd96f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ced4d212d02b6892c6e1a28bcb032d222c84bce0 + 2e0b6aa9a147ca88fb568d1b2cd82cf579ddd96f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ced4d212d02b6892c6e1a28bcb032d222c84bce0 + 2e0b6aa9a147ca88fb568d1b2cd82cf579ddd96f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ced4d212d02b6892c6e1a28bcb032d222c84bce0 + 2e0b6aa9a147ca88fb568d1b2cd82cf579ddd96f diff --git a/eng/Versions.props b/eng/Versions.props index 47d0bb040..b33528d1c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,11 +58,11 @@ 7.0.17 7.0.17 - 7.0.17-servicing.24115.2 - 7.0.17-servicing.24115.2 - 7.0.17-servicing.24115.2 - 7.0.17-servicing.24115.2 - 7.0.17-servicing.24115.2 + 7.0.17-servicing.24116.6 + 7.0.17-servicing.24116.6 + 7.0.17-servicing.24116.6 + 7.0.17-servicing.24116.6 + 7.0.17-servicing.24116.6 0.2.0 @@ -70,8 +70,8 @@ 7.0.407 - 7.0.407-servicing.24116.14 - 7.0.407-servicing.24116.14 + 7.0.407-servicing.24116.49 + 7.0.407-servicing.24116.49 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 1a8e33984f500c5fd3c193d1ead5e6663ed2fd72 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 16 Feb 2024 22:40:49 +0000 Subject: [PATCH 380/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240216.52 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.314 -> To Version 7.0.314 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.17 -> To Version 7.0.17 (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 dbf1bdff6..74b26ceb3 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 bb07d940e..c9e046c4b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 92c510e77b344db7085a4f6a4eb83ca821a78572 + 96cbc87b920c0937bef069e7561477919ddc520f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 92c510e77b344db7085a4f6a4eb83ca821a78572 + 96cbc87b920c0937bef069e7561477919ddc520f https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 92c510e77b344db7085a4f6a4eb83ca821a78572 + 96cbc87b920c0937bef069e7561477919ddc520f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 92c510e77b344db7085a4f6a4eb83ca821a78572 + 96cbc87b920c0937bef069e7561477919ddc520f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 92c510e77b344db7085a4f6a4eb83ca821a78572 + 96cbc87b920c0937bef069e7561477919ddc520f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 92c510e77b344db7085a4f6a4eb83ca821a78572 + 96cbc87b920c0937bef069e7561477919ddc520f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 92c510e77b344db7085a4f6a4eb83ca821a78572 + 96cbc87b920c0937bef069e7561477919ddc520f https://github.com/dotnet/test-templates @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 38ea0239126356c96ddea4a29cb6dce03c6c8749 + c64d882fd227728e4e4dfc2fcd6d0d26d4a29040 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 38ea0239126356c96ddea4a29cb6dce03c6c8749 + c64d882fd227728e4e4dfc2fcd6d0d26d4a29040 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 38ea0239126356c96ddea4a29cb6dce03c6c8749 + c64d882fd227728e4e4dfc2fcd6d0d26d4a29040 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 38ea0239126356c96ddea4a29cb6dce03c6c8749 + c64d882fd227728e4e4dfc2fcd6d0d26d4a29040 diff --git a/eng/Versions.props b/eng/Versions.props index 2981ec960..440507fea 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,11 +58,11 @@ 7.0.17 7.0.17 - 7.0.17-servicing.24115.2 - 7.0.17-servicing.24115.2 - 7.0.17-servicing.24115.2 - 7.0.17-servicing.24115.2 - 7.0.17-servicing.24115.2 + 7.0.17-servicing.24116.6 + 7.0.17-servicing.24116.6 + 7.0.17-servicing.24116.6 + 7.0.17-servicing.24116.6 + 7.0.17-servicing.24116.6 0.2.0 @@ -70,8 +70,8 @@ 7.0.314 - 7.0.314-servicing.24116.15 - 7.0.314-servicing.24116.15 + 7.0.314-servicing.24116.52 + 7.0.314-servicing.24116.52 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From c073ccc9441e5e15febed575ec01ef79d8fe03d3 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 16 Feb 2024 23:03:56 +0000 Subject: [PATCH 381/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240216.55 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.420-servicing.24116.44 -> To Version 6.0.420-servicing.24116.55 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0 From Version 6.0.420 -> To Version 6.0.420 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index 02ae05121..9414253e5 100644 --- a/NuGet.config +++ b/NuGet.config @@ -18,7 +18,7 @@ - + @@ -48,7 +48,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5589d8aa0..0be9135be 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 96b2386852cd27690ca3737fe9320a764329a55a + da00162921df1124e2f17a6504b15a309bf35460 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 96b2386852cd27690ca3737fe9320a764329a55a + da00162921df1124e2f17a6504b15a309bf35460 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 96b2386852cd27690ca3737fe9320a764329a55a + da00162921df1124e2f17a6504b15a309bf35460 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 68e5ea09e3a88316c3bd693c3963230a27606ac3 + 83b7402a7241ed0380d5076394d1025ea33788c3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 68e5ea09e3a88316c3bd693c3963230a27606ac3 + 83b7402a7241ed0380d5076394d1025ea33788c3 diff --git a/eng/Versions.props b/eng/Versions.props index b3e8e7b2d..98cc76c84 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.420-servicing.24116.44 - 6.0.420-servicing.24116.44 + 6.0.420-servicing.24116.55 + 6.0.420-servicing.24116.55 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 83ba947f1177b92fc813d72f7da46beda0c8a782 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 16 Feb 2024 23:26:15 +0000 Subject: [PATCH 382/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240216.58 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.117 -> To Version 7.0.117 --- 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 229d9e9e6..d7f14bc97 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 1b4ea62e8..7d35d485c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 937b442da08fbbfd22085eeff8a7cb01295c2ea6 + 3c2e9fb27878e1d522becef4cdbc868158d94db0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 937b442da08fbbfd22085eeff8a7cb01295c2ea6 + 3c2e9fb27878e1d522becef4cdbc868158d94db0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 937b442da08fbbfd22085eeff8a7cb01295c2ea6 + 3c2e9fb27878e1d522becef4cdbc868158d94db0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 937b442da08fbbfd22085eeff8a7cb01295c2ea6 + 3c2e9fb27878e1d522becef4cdbc868158d94db0 diff --git a/eng/Versions.props b/eng/Versions.props index 7b8737c3f..fbe049837 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.117 - 7.0.117-servicing.24116.16 - 7.0.117-servicing.24116.16 + 7.0.117-servicing.24116.58 + 7.0.117-servicing.24116.58 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 65df1a97b0616aad3eac8015d1faf90e139290cf Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 17 Feb 2024 00:01:27 +0000 Subject: [PATCH 383/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240216.67 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.420-servicing.24116.44 -> To Version 6.0.420-servicing.24116.67 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.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.28 -> To Version 6.0.28 (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 9414253e5..f46fe8506 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 0be9135be..f63d5f834 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 4c0f7dc35580c286a77d992688e924117cb24c05 + 574a4a77eef72d4b0ed4007e8e82e17e95a266d3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 4c0f7dc35580c286a77d992688e924117cb24c05 + 574a4a77eef72d4b0ed4007e8e82e17e95a266d3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 4c0f7dc35580c286a77d992688e924117cb24c05 + 574a4a77eef72d4b0ed4007e8e82e17e95a266d3 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 4c0f7dc35580c286a77d992688e924117cb24c05 + 574a4a77eef72d4b0ed4007e8e82e17e95a266d3 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating da00162921df1124e2f17a6504b15a309bf35460 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 83b7402a7241ed0380d5076394d1025ea33788c3 + 25b33c598e608f8cfc718ed83f69b0b7ad573195 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 83b7402a7241ed0380d5076394d1025ea33788c3 + 25b33c598e608f8cfc718ed83f69b0b7ad573195 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 98b10b3aea4e37eed5ad4875cd251cc94c854c1e + d84b22e24fc7da1157057093e978186f9f1cabee - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 12a1b47c5b9b55841e0aa39bb36c15ac05d4ce8a + b55e6d18ab0ec864273891a6f0741301253aa848 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 98cc76c84..2d3771c46 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.27-servicing.24070.1 + 6.0.28-servicing.24115.14 - 6.0.27-servicing.24070.3 + 6.0.28-servicing.24116.8 @@ -56,8 +56,8 @@ - 6.0.420-servicing.24116.55 - 6.0.420-servicing.24116.55 + 6.0.420-servicing.24116.67 + 6.0.420-servicing.24116.67 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.28-servicing.24114.9 - 6.0.28-servicing.24114.9 + 6.0.28-servicing.24116.10 + 6.0.28-servicing.24116.10 6.0.28 6.0.28 From d53fe45915b4379f175c06ed75ecb41134dd7322 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 17 Feb 2024 00:08:37 +0000 Subject: [PATCH 384/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240216.65 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.103 -> To Version 8.0.103 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 8.0.2 -> To Version 8.0.3 (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 0853e356b..ee7299b3b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,10 +19,10 @@ - + - + @@ -48,10 +48,10 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ca56c5479..b7bed5280 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -7,19 +7,19 @@ --> https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c8530fb858574c520a4a7000b6f9fa51e4022840 + baf3c0df45e13d065884f7e84260f645295f219e - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c8530fb858574c520a4a7000b6f9fa51e4022840 + baf3c0df45e13d065884f7e84260f645295f219e - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c8530fb858574c520a4a7000b6f9fa51e4022840 + baf3c0df45e13d065884f7e84260f645295f219e https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c8530fb858574c520a4a7000b6f9fa51e4022840 + baf3c0df45e13d065884f7e84260f645295f219e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 628f3a7ff0668efb79b1650013093e56e40d8545 + b14880317cd86797155254f29c420e2f8964c2d2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 628f3a7ff0668efb79b1650013093e56e40d8545 + b14880317cd86797155254f29c420e2f8964c2d2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 628f3a7ff0668efb79b1650013093e56e40d8545 + b14880317cd86797155254f29c420e2f8964c2d2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 628f3a7ff0668efb79b1650013093e56e40d8545 + b14880317cd86797155254f29c420e2f8964c2d2 https://github.com/dotnet/test-templates @@ -124,13 +124,13 @@ 1e5f3603af2277910aad946736ee23283e7f3e16 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - c58fa00bd16b92aab1d7fb2b93e71af6a7768139 + bd280bbb5c9699bb93097206f076ad2f330ea8e1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 65e7d26b59594d892d8c1084440eecab4bfbbf6f + 46fb08cfa8160d0885b74c7f28a7b187ab86efed https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index f48ad3ab2..b64620122 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,11 +48,11 @@ - 8.0.2-servicing.24068.3 + 8.0.3-servicing.24116.3 - 8.0.3-servicing.24114.6 + 8.0.3-servicing.24116.6 @@ -86,8 +86,8 @@ 8.0.103 - 8.0.103-servicing.24116.51 - 8.0.103-servicing.24116.51 + 8.0.103-servicing.24116.65 + 8.0.103-servicing.24116.65 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -112,8 +112,8 @@ - 8.0.3-servicing.24116.3 - 8.0.3-servicing.24116.3 + 8.0.3-servicing.24116.9 + 8.0.3-servicing.24116.9 8.0.3 8.0.3 From 7892638bf945fa3b54531477c03d57e830f5c9ef Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 17 Feb 2024 00:36:12 +0000 Subject: [PATCH 385/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240216.76 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.407 -> To Version 7.0.407 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 7.0.17 -> To Version 7.0.17 (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 f14b05c5a..3152b2fe6 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 cf95753cc..90563cc5b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c2fca339644c5d9626c72ceac378cf728dd0d56a + 8e24710202fffe3656e6d26d6a03e53b3de83484 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c2fca339644c5d9626c72ceac378cf728dd0d56a + 8e24710202fffe3656e6d26d6a03e53b3de83484 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c2fca339644c5d9626c72ceac378cf728dd0d56a + 8e24710202fffe3656e6d26d6a03e53b3de83484 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c2fca339644c5d9626c72ceac378cf728dd0d56a + 8e24710202fffe3656e6d26d6a03e53b3de83484 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2e0b6aa9a147ca88fb568d1b2cd82cf579ddd96f + c33ed262876fcbae195d8e812da8d9002f4a92b2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2e0b6aa9a147ca88fb568d1b2cd82cf579ddd96f + c33ed262876fcbae195d8e812da8d9002f4a92b2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2e0b6aa9a147ca88fb568d1b2cd82cf579ddd96f + c33ed262876fcbae195d8e812da8d9002f4a92b2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2e0b6aa9a147ca88fb568d1b2cd82cf579ddd96f + c33ed262876fcbae195d8e812da8d9002f4a92b2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - fcbb04f265a8923c27ad55eaa51b1913b5db732e + a21b74e7f5e96ccb8d95dcde605669feb30f6c5b - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 0b58a4b68b566568e74d51a6999f71108ff71f05 + 6b9b816bff16a1b507019fe6313b6baecb83b580 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index b33528d1c..edf35a2a4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.17-servicing.24115.10 + 7.0.17-servicing.24116.2 - 7.0.17-servicing.24115.3 + 7.0.17-servicing.24116.10 @@ -70,8 +70,8 @@ 7.0.407 - 7.0.407-servicing.24116.49 - 7.0.407-servicing.24116.49 + 7.0.407-servicing.24116.76 + 7.0.407-servicing.24116.76 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -96,8 +96,8 @@ - 7.0.17-servicing.24115.4 - 7.0.17-servicing.24115.4 + 7.0.17-servicing.24116.11 + 7.0.17-servicing.24116.11 7.0.17 7.0.17 From f837228db5a86e6390968fb854793a4a89728419 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 17 Feb 2024 00:39:11 +0000 Subject: [PATCH 386/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240216.74 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.117 -> To Version 7.0.117 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.17 -> To Version 7.0.17 (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 d7f14bc97..c8b00d0aa 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 7d35d485c..a47e01646 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c2fca339644c5d9626c72ceac378cf728dd0d56a + 8e24710202fffe3656e6d26d6a03e53b3de83484 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c2fca339644c5d9626c72ceac378cf728dd0d56a + 8e24710202fffe3656e6d26d6a03e53b3de83484 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c2fca339644c5d9626c72ceac378cf728dd0d56a + 8e24710202fffe3656e6d26d6a03e53b3de83484 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c2fca339644c5d9626c72ceac378cf728dd0d56a + 8e24710202fffe3656e6d26d6a03e53b3de83484 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3c2e9fb27878e1d522becef4cdbc868158d94db0 + 4b35fcb31340c9f9c457e3c4a17858109d49e0fe - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3c2e9fb27878e1d522becef4cdbc868158d94db0 + 4b35fcb31340c9f9c457e3c4a17858109d49e0fe - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3c2e9fb27878e1d522becef4cdbc868158d94db0 + 4b35fcb31340c9f9c457e3c4a17858109d49e0fe - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3c2e9fb27878e1d522becef4cdbc868158d94db0 + 4b35fcb31340c9f9c457e3c4a17858109d49e0fe - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - fcbb04f265a8923c27ad55eaa51b1913b5db732e + a21b74e7f5e96ccb8d95dcde605669feb30f6c5b - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 0b58a4b68b566568e74d51a6999f71108ff71f05 + 6b9b816bff16a1b507019fe6313b6baecb83b580 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index fbe049837..7e7b7c8d4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.17-servicing.24115.10 + 7.0.17-servicing.24116.2 - 7.0.17-servicing.24115.3 + 7.0.17-servicing.24116.10 @@ -70,8 +70,8 @@ 7.0.117 - 7.0.117-servicing.24116.58 - 7.0.117-servicing.24116.58 + 7.0.117-servicing.24116.74 + 7.0.117-servicing.24116.74 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -92,8 +92,8 @@ - 7.0.17-servicing.24115.4 - 7.0.17-servicing.24115.4 + 7.0.17-servicing.24116.11 + 7.0.17-servicing.24116.11 7.0.17 7.0.17 From cd7b91bc6a921f7273b6d9bba76829d9f81180a1 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 17 Feb 2024 00:41:57 +0000 Subject: [PATCH 387/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240216.82 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.420-servicing.24116.44 -> To Version 6.0.420-servicing.24116.82 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,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,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 6.0.28 -> To Version 6.0.28 (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 f46fe8506..ef85cf3d4 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -42,7 +42,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f63d5f834..8d8995314 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 364d4a968b15639648dbd2a6388a780da1ff65cc + ce993c8c6ca3d5af8133d66d7df91056d44d5788 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 364d4a968b15639648dbd2a6388a780da1ff65cc + ce993c8c6ca3d5af8133d66d7df91056d44d5788 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 364d4a968b15639648dbd2a6388a780da1ff65cc + ce993c8c6ca3d5af8133d66d7df91056d44d5788 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 364d4a968b15639648dbd2a6388a780da1ff65cc + ce993c8c6ca3d5af8133d66d7df91056d44d5788 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 364d4a968b15639648dbd2a6388a780da1ff65cc + ce993c8c6ca3d5af8133d66d7df91056d44d5788 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 364d4a968b15639648dbd2a6388a780da1ff65cc + ce993c8c6ca3d5af8133d66d7df91056d44d5788 https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating da00162921df1124e2f17a6504b15a309bf35460 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 25b33c598e608f8cfc718ed83f69b0b7ad573195 + f9b62cc6d721f1a522f930234f5658f32a7bc09f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 25b33c598e608f8cfc718ed83f69b0b7ad573195 + f9b62cc6d721f1a522f930234f5658f32a7bc09f diff --git a/eng/Versions.props b/eng/Versions.props index 2d3771c46..3a0200311 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.28 6.0.28 - 6.0.28-servicing.24115.9 - 6.0.28-servicing.24115.9 - 6.0.28-servicing.24115.9 - 6.0.28-servicing.24115.9 + 6.0.28-servicing.24116.17 + 6.0.28-servicing.24116.17 + 6.0.28-servicing.24116.17 + 6.0.28-servicing.24116.17 0.2.0 - 6.0.420-servicing.24116.67 - 6.0.420-servicing.24116.67 + 6.0.420-servicing.24116.82 + 6.0.420-servicing.24116.82 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e8f7dba2626884fe02e61767c6401805a8f19ab8 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 17 Feb 2024 00:42:36 +0000 Subject: [PATCH 388/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240216.75 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.314 -> To Version 7.0.314 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 7.0.17 -> To Version 7.0.17 (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 74b26ceb3..5583964f5 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 c9e046c4b..2301d1b57 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c2fca339644c5d9626c72ceac378cf728dd0d56a + 8e24710202fffe3656e6d26d6a03e53b3de83484 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c2fca339644c5d9626c72ceac378cf728dd0d56a + 8e24710202fffe3656e6d26d6a03e53b3de83484 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c2fca339644c5d9626c72ceac378cf728dd0d56a + 8e24710202fffe3656e6d26d6a03e53b3de83484 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c2fca339644c5d9626c72ceac378cf728dd0d56a + 8e24710202fffe3656e6d26d6a03e53b3de83484 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c64d882fd227728e4e4dfc2fcd6d0d26d4a29040 + 2a68379878acca145d5ad15e6624604f7d71df0e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c64d882fd227728e4e4dfc2fcd6d0d26d4a29040 + 2a68379878acca145d5ad15e6624604f7d71df0e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c64d882fd227728e4e4dfc2fcd6d0d26d4a29040 + 2a68379878acca145d5ad15e6624604f7d71df0e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c64d882fd227728e4e4dfc2fcd6d0d26d4a29040 + 2a68379878acca145d5ad15e6624604f7d71df0e - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - fcbb04f265a8923c27ad55eaa51b1913b5db732e + a21b74e7f5e96ccb8d95dcde605669feb30f6c5b - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 0b58a4b68b566568e74d51a6999f71108ff71f05 + 6b9b816bff16a1b507019fe6313b6baecb83b580 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 440507fea..579355226 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.17-servicing.24115.10 + 7.0.17-servicing.24116.2 - 7.0.17-servicing.24115.3 + 7.0.17-servicing.24116.10 @@ -70,8 +70,8 @@ 7.0.314 - 7.0.314-servicing.24116.52 - 7.0.314-servicing.24116.52 + 7.0.314-servicing.24116.75 + 7.0.314-servicing.24116.75 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -96,8 +96,8 @@ - 7.0.17-servicing.24115.4 - 7.0.17-servicing.24115.4 + 7.0.17-servicing.24116.11 + 7.0.17-servicing.24116.11 7.0.17 7.0.17 From c8409929ea78f48391c491719c7cf2c7d3b38c8b Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 17 Feb 2024 00:45:00 +0000 Subject: [PATCH 389/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240216.86 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.103 -> To Version 8.0.103 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 8.0.2 -> To Version 8.0.3 (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 ee7299b3b..cef841a23 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,7 +10,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -43,12 +43,12 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b7bed5280..000a25171 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -58,49 +58,49 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cb8a5f3f2d7f060b50c27541a29c3f30777b7f9b + 88ec3bc3f37e76fbcc932a25f9f0c1c29fe2b343 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cb8a5f3f2d7f060b50c27541a29c3f30777b7f9b + 88ec3bc3f37e76fbcc932a25f9f0c1c29fe2b343 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cb8a5f3f2d7f060b50c27541a29c3f30777b7f9b + 88ec3bc3f37e76fbcc932a25f9f0c1c29fe2b343 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cb8a5f3f2d7f060b50c27541a29c3f30777b7f9b + 88ec3bc3f37e76fbcc932a25f9f0c1c29fe2b343 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cb8a5f3f2d7f060b50c27541a29c3f30777b7f9b + 88ec3bc3f37e76fbcc932a25f9f0c1c29fe2b343 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cb8a5f3f2d7f060b50c27541a29c3f30777b7f9b + 88ec3bc3f37e76fbcc932a25f9f0c1c29fe2b343 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cb8a5f3f2d7f060b50c27541a29c3f30777b7f9b + 88ec3bc3f37e76fbcc932a25f9f0c1c29fe2b343 https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b14880317cd86797155254f29c420e2f8964c2d2 + 413c870a447075a90b8827353acb28ed37bab9dc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b14880317cd86797155254f29c420e2f8964c2d2 + 413c870a447075a90b8827353acb28ed37bab9dc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b14880317cd86797155254f29c420e2f8964c2d2 + 413c870a447075a90b8827353acb28ed37bab9dc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b14880317cd86797155254f29c420e2f8964c2d2 + 413c870a447075a90b8827353acb28ed37bab9dc https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index b64620122..db2a50d14 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -74,11 +74,11 @@ 8.0.3 8.0.3 - 8.0.3-servicing.24116.5 - 8.0.3-servicing.24116.5 - 8.0.3-servicing.24116.5 - 8.0.3-servicing.24116.5 - 8.0.3-servicing.24116.5 + 8.0.3-servicing.24116.15 + 8.0.3-servicing.24116.15 + 8.0.3-servicing.24116.15 + 8.0.3-servicing.24116.15 + 8.0.3-servicing.24116.15 0.2.0 @@ -86,8 +86,8 @@ 8.0.103 - 8.0.103-servicing.24116.65 - 8.0.103-servicing.24116.65 + 8.0.103-servicing.24116.86 + 8.0.103-servicing.24116.86 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 70763aae4d33bbbb5ce2b01c2cb64229adb2acb2 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 17 Feb 2024 01:27:57 +0000 Subject: [PATCH 390/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240216.91 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.420-servicing.24116.82 -> To Version 6.0.420-servicing.24116.91 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.28 -> To Version 6.0.28 (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 ef85cf3d4..86ae017d6 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 8d8995314..7ed9892a0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 574a4a77eef72d4b0ed4007e8e82e17e95a266d3 + ef9b1726104aebb05c22498486cd6f4c1c3313b7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 574a4a77eef72d4b0ed4007e8e82e17e95a266d3 + ef9b1726104aebb05c22498486cd6f4c1c3313b7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 574a4a77eef72d4b0ed4007e8e82e17e95a266d3 + ef9b1726104aebb05c22498486cd6f4c1c3313b7 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 574a4a77eef72d4b0ed4007e8e82e17e95a266d3 + ef9b1726104aebb05c22498486cd6f4c1c3313b7 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating da00162921df1124e2f17a6504b15a309bf35460 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f9b62cc6d721f1a522f930234f5658f32a7bc09f + 2248f8cfdce54f62fde2b9bcf56fe690af7ae5a2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f9b62cc6d721f1a522f930234f5658f32a7bc09f + 2248f8cfdce54f62fde2b9bcf56fe690af7ae5a2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - d84b22e24fc7da1157057093e978186f9f1cabee + 418b2633a2b67a2a1a61b1481a79f53eaa60a237 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - b55e6d18ab0ec864273891a6f0741301253aa848 + 51556c9bd2c6057c7bd3a5999e20c4012aa253df https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 3a0200311..4123f6202 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.28-servicing.24115.14 + 6.0.28-servicing.24116.7 - 6.0.28-servicing.24116.8 + 6.0.28-servicing.24116.14 @@ -56,8 +56,8 @@ - 6.0.420-servicing.24116.82 - 6.0.420-servicing.24116.82 + 6.0.420-servicing.24116.91 + 6.0.420-servicing.24116.91 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.28-servicing.24116.10 - 6.0.28-servicing.24116.10 + 6.0.28-servicing.24116.13 + 6.0.28-servicing.24116.13 6.0.28 6.0.28 From d795d05759cbd4c7d53011704aecb369f69b2302 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 17 Feb 2024 01:40:44 +0000 Subject: [PATCH 391/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240216.89 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.407 -> To Version 7.0.407 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.17 -> To Version 7.0.17 (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 3152b2fe6..b05560e29 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 90563cc5b..bee510625 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 96cbc87b920c0937bef069e7561477919ddc520f + d0ca5a8d20ac50a33d5451e998a5d411a810c8d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 96cbc87b920c0937bef069e7561477919ddc520f + d0ca5a8d20ac50a33d5451e998a5d411a810c8d7 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 96cbc87b920c0937bef069e7561477919ddc520f + d0ca5a8d20ac50a33d5451e998a5d411a810c8d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 96cbc87b920c0937bef069e7561477919ddc520f + d0ca5a8d20ac50a33d5451e998a5d411a810c8d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 96cbc87b920c0937bef069e7561477919ddc520f + d0ca5a8d20ac50a33d5451e998a5d411a810c8d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 96cbc87b920c0937bef069e7561477919ddc520f + d0ca5a8d20ac50a33d5451e998a5d411a810c8d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 96cbc87b920c0937bef069e7561477919ddc520f + d0ca5a8d20ac50a33d5451e998a5d411a810c8d7 https://github.com/dotnet/test-templates @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c33ed262876fcbae195d8e812da8d9002f4a92b2 + 2b14eab8f8fe3fcf40457dc7def499c3745f1c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c33ed262876fcbae195d8e812da8d9002f4a92b2 + 2b14eab8f8fe3fcf40457dc7def499c3745f1c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c33ed262876fcbae195d8e812da8d9002f4a92b2 + 2b14eab8f8fe3fcf40457dc7def499c3745f1c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c33ed262876fcbae195d8e812da8d9002f4a92b2 + 2b14eab8f8fe3fcf40457dc7def499c3745f1c01 diff --git a/eng/Versions.props b/eng/Versions.props index edf35a2a4..daf1521c0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,11 +58,11 @@ 7.0.17 7.0.17 - 7.0.17-servicing.24116.6 - 7.0.17-servicing.24116.6 - 7.0.17-servicing.24116.6 - 7.0.17-servicing.24116.6 - 7.0.17-servicing.24116.6 + 7.0.17-servicing.24116.13 + 7.0.17-servicing.24116.13 + 7.0.17-servicing.24116.13 + 7.0.17-servicing.24116.13 + 7.0.17-servicing.24116.13 0.2.0 @@ -70,8 +70,8 @@ 7.0.407 - 7.0.407-servicing.24116.76 - 7.0.407-servicing.24116.76 + 7.0.407-servicing.24116.89 + 7.0.407-servicing.24116.89 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 20666fac28d631439089023fbc94699e2f4cc82a Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 17 Feb 2024 01:47:47 +0000 Subject: [PATCH 392/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240216.88 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.117 -> To Version 7.0.117 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.17 -> To Version 7.0.17 (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 c8b00d0aa..b5a2563ce 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 a47e01646..795ead903 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 92c510e77b344db7085a4f6a4eb83ca821a78572 + d0ca5a8d20ac50a33d5451e998a5d411a810c8d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 92c510e77b344db7085a4f6a4eb83ca821a78572 + d0ca5a8d20ac50a33d5451e998a5d411a810c8d7 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 92c510e77b344db7085a4f6a4eb83ca821a78572 + d0ca5a8d20ac50a33d5451e998a5d411a810c8d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 92c510e77b344db7085a4f6a4eb83ca821a78572 + d0ca5a8d20ac50a33d5451e998a5d411a810c8d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 92c510e77b344db7085a4f6a4eb83ca821a78572 + d0ca5a8d20ac50a33d5451e998a5d411a810c8d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 92c510e77b344db7085a4f6a4eb83ca821a78572 + d0ca5a8d20ac50a33d5451e998a5d411a810c8d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 92c510e77b344db7085a4f6a4eb83ca821a78572 + d0ca5a8d20ac50a33d5451e998a5d411a810c8d7 https://github.com/dotnet/test-templates @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4b35fcb31340c9f9c457e3c4a17858109d49e0fe + db7d0ce81917cecead7e0097923d4c1f84753293 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4b35fcb31340c9f9c457e3c4a17858109d49e0fe + db7d0ce81917cecead7e0097923d4c1f84753293 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4b35fcb31340c9f9c457e3c4a17858109d49e0fe + db7d0ce81917cecead7e0097923d4c1f84753293 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4b35fcb31340c9f9c457e3c4a17858109d49e0fe + db7d0ce81917cecead7e0097923d4c1f84753293 diff --git a/eng/Versions.props b/eng/Versions.props index 7e7b7c8d4..cb0fcd1d2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,11 +58,11 @@ 7.0.17 7.0.17 - 7.0.17-servicing.24115.2 - 7.0.17-servicing.24115.2 - 7.0.17-servicing.24115.2 - 7.0.17-servicing.24115.2 - 7.0.17-servicing.24115.2 + 7.0.17-servicing.24116.13 + 7.0.17-servicing.24116.13 + 7.0.17-servicing.24116.13 + 7.0.17-servicing.24116.13 + 7.0.17-servicing.24116.13 0.2.0 @@ -70,8 +70,8 @@ 7.0.117 - 7.0.117-servicing.24116.74 - 7.0.117-servicing.24116.74 + 7.0.117-servicing.24116.88 + 7.0.117-servicing.24116.88 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 3698cb9b014d3e5b53bec3bd2ffcfc29955f6d33 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 17 Feb 2024 01:50:54 +0000 Subject: [PATCH 393/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240216.90 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.314 -> To Version 7.0.314 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.17 -> To Version 7.0.17 (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 5583964f5..b8a810353 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 2301d1b57..fb72029e8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 96cbc87b920c0937bef069e7561477919ddc520f + d0ca5a8d20ac50a33d5451e998a5d411a810c8d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 96cbc87b920c0937bef069e7561477919ddc520f + d0ca5a8d20ac50a33d5451e998a5d411a810c8d7 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 96cbc87b920c0937bef069e7561477919ddc520f + d0ca5a8d20ac50a33d5451e998a5d411a810c8d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 96cbc87b920c0937bef069e7561477919ddc520f + d0ca5a8d20ac50a33d5451e998a5d411a810c8d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 96cbc87b920c0937bef069e7561477919ddc520f + d0ca5a8d20ac50a33d5451e998a5d411a810c8d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 96cbc87b920c0937bef069e7561477919ddc520f + d0ca5a8d20ac50a33d5451e998a5d411a810c8d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 96cbc87b920c0937bef069e7561477919ddc520f + d0ca5a8d20ac50a33d5451e998a5d411a810c8d7 https://github.com/dotnet/test-templates @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2a68379878acca145d5ad15e6624604f7d71df0e + 29d5d9072f662512c5d5a76f6595ea559846aa7c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2a68379878acca145d5ad15e6624604f7d71df0e + 29d5d9072f662512c5d5a76f6595ea559846aa7c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2a68379878acca145d5ad15e6624604f7d71df0e + 29d5d9072f662512c5d5a76f6595ea559846aa7c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2a68379878acca145d5ad15e6624604f7d71df0e + 29d5d9072f662512c5d5a76f6595ea559846aa7c diff --git a/eng/Versions.props b/eng/Versions.props index 579355226..8e2578fbf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,11 +58,11 @@ 7.0.17 7.0.17 - 7.0.17-servicing.24116.6 - 7.0.17-servicing.24116.6 - 7.0.17-servicing.24116.6 - 7.0.17-servicing.24116.6 - 7.0.17-servicing.24116.6 + 7.0.17-servicing.24116.13 + 7.0.17-servicing.24116.13 + 7.0.17-servicing.24116.13 + 7.0.17-servicing.24116.13 + 7.0.17-servicing.24116.13 0.2.0 @@ -70,8 +70,8 @@ 7.0.314 - 7.0.314-servicing.24116.75 - 7.0.314-servicing.24116.75 + 7.0.314-servicing.24116.90 + 7.0.314-servicing.24116.90 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 723427fa6b1d977a869523fca1f22fed23ade3c5 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Sat, 17 Feb 2024 08:10:10 -0600 Subject: [PATCH 394/535] Update SDK diff baseline (#18706) --- .../assets/baselines/MsftToSbSdk.diff | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff index 0f16c9546..4d662a3c3 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff @@ -25,9 +25,6 @@ index ------------ +./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Formats.Asn1.xml ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.IO.Pipelines.dll ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.IO.Pipelines.xml -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Runtime.CompilerServices.Unsafe.dll -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.AccessControl.dll -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.AccessControl.xml ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.Cryptography.Xml.dll ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.Cryptography.Xml.xml +./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Encodings.Web.dll @@ -48,10 +45,6 @@ index ------------ -./packs/Microsoft.NETCore.App.Host.portable-rid/x.y.z/runtimes/portable-rid/native/libnethost.so -./packs/Microsoft.NETCore.App.Host.portable-rid/x.y.z/runtimes/portable-rid/native/nethost.h -./packs/Microsoft.NETCore.App.Host.portable-rid/x.y.z/runtimes/portable-rid/native/singlefilehost -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Encodings.Web.dll -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Encodings.Web.xml -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Json.dll -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Json.xml +./packs/Microsoft.NETCore.App.Host.banana-rid/ +./packs/Microsoft.NETCore.App.Host.banana-rid/x.y.z/ +./packs/Microsoft.NETCore.App.Host.banana-rid/x.y.z/runtimes/ From f10228391844c7ba77af4afa2128bc14b77532b4 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 21 Feb 2024 02:00:49 +0000 Subject: [PATCH 395/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240220.17 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.420-servicing.24116.91 -> To Version 6.0.420-servicing.24120.17 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.NETCore.Platforms,VS.Redist.Common.NetCore.SharedFramework.x64.6.0 From Version 6.0.28 -> To Version 6.0.28 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 26 +++++++++++++------------- eng/Versions.props | 8 ++++---- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/NuGet.config b/NuGet.config index 86ae017d6..269ad17f9 100644 --- a/NuGet.config +++ b/NuGet.config @@ -15,7 +15,7 @@ - + @@ -45,7 +45,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7ed9892a0..7e3ef61e3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop ef9b1726104aebb05c22498486cd6f4c1c3313b7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2b3cfc799de1c1e629f2194b67e1dbd610ea51c9 + 34a109148c7d8a2c8e6431e83e4bce5712dd8083 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2b3cfc799de1c1e629f2194b67e1dbd610ea51c9 + 34a109148c7d8a2c8e6431e83e4bce5712dd8083 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2b3cfc799de1c1e629f2194b67e1dbd610ea51c9 + 34a109148c7d8a2c8e6431e83e4bce5712dd8083 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2b3cfc799de1c1e629f2194b67e1dbd610ea51c9 + 34a109148c7d8a2c8e6431e83e4bce5712dd8083 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2b3cfc799de1c1e629f2194b67e1dbd610ea51c9 + 34a109148c7d8a2c8e6431e83e4bce5712dd8083 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2b3cfc799de1c1e629f2194b67e1dbd610ea51c9 + 34a109148c7d8a2c8e6431e83e4bce5712dd8083 @@ -50,7 +50,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2b3cfc799de1c1e629f2194b67e1dbd610ea51c9 + 34a109148c7d8a2c8e6431e83e4bce5712dd8083 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating da00162921df1124e2f17a6504b15a309bf35460 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2248f8cfdce54f62fde2b9bcf56fe690af7ae5a2 + 6ccd32f12db9321477c4b8658eaa3a44681b6740 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2248f8cfdce54f62fde2b9bcf56fe690af7ae5a2 + 6ccd32f12db9321477c4b8658eaa3a44681b6740 diff --git a/eng/Versions.props b/eng/Versions.props index 4123f6202..0670abf06 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.420-servicing.24116.91 - 6.0.420-servicing.24116.91 + 6.0.420-servicing.24120.17 + 6.0.420-servicing.24120.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.28-servicing.24114.25 - 6.0.28-servicing.24114.25 + 6.0.28-servicing.24120.7 + 6.0.28-servicing.24120.7 6.0.28 6.0.28 6.0.28 From 9a74022e76c010cbee659a41947e1d068e238ea6 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 21 Feb 2024 05:09:44 +0000 Subject: [PATCH 396/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240220.26 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.420-servicing.24120.17 -> To Version 6.0.420-servicing.24120.26 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.28 -> To Version 6.0.28 (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 269ad17f9..38ac022d2 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -18,7 +18,7 @@ - + @@ -42,13 +42,13 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7e3ef61e3..27a065ab7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ce993c8c6ca3d5af8133d66d7df91056d44d5788 + 3b519aa7d1a1b66e1d329d694f814e1d8228dc8c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ce993c8c6ca3d5af8133d66d7df91056d44d5788 + 3b519aa7d1a1b66e1d329d694f814e1d8228dc8c https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ce993c8c6ca3d5af8133d66d7df91056d44d5788 + 3b519aa7d1a1b66e1d329d694f814e1d8228dc8c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ce993c8c6ca3d5af8133d66d7df91056d44d5788 + 3b519aa7d1a1b66e1d329d694f814e1d8228dc8c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ce993c8c6ca3d5af8133d66d7df91056d44d5788 + 3b519aa7d1a1b66e1d329d694f814e1d8228dc8c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ce993c8c6ca3d5af8133d66d7df91056d44d5788 + 3b519aa7d1a1b66e1d329d694f814e1d8228dc8c https://github.com/dotnet/test-templates @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - da00162921df1124e2f17a6504b15a309bf35460 + d6969baea023232e2739e505f3723228f949d8fa - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - da00162921df1124e2f17a6504b15a309bf35460 + d6969baea023232e2739e505f3723228f949d8fa https://dev.azure.com/dnceng/internal/_git/dotnet-templating - da00162921df1124e2f17a6504b15a309bf35460 + d6969baea023232e2739e505f3723228f949d8fa - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6ccd32f12db9321477c4b8658eaa3a44681b6740 + 7392200c7ca1a316b5ae7e98263ba6c26be4f833 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6ccd32f12db9321477c4b8658eaa3a44681b6740 + 7392200c7ca1a316b5ae7e98263ba6c26be4f833 diff --git a/eng/Versions.props b/eng/Versions.props index 0670abf06..66d734f30 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.28 6.0.28 - 6.0.28-servicing.24116.17 - 6.0.28-servicing.24116.17 - 6.0.28-servicing.24116.17 - 6.0.28-servicing.24116.17 + 6.0.28-servicing.24120.5 + 6.0.28-servicing.24120.5 + 6.0.28-servicing.24120.5 + 6.0.28-servicing.24120.5 0.2.0 - 6.0.420-servicing.24120.17 - 6.0.420-servicing.24120.17 + 6.0.420-servicing.24120.26 + 6.0.420-servicing.24120.26 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 61ea15f7ce1e1bbdc55d17e5e088434bd8a1647c Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 21 Feb 2024 07:49:44 +0000 Subject: [PATCH 397/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240220.33 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.420-servicing.24120.26 -> To Version 6.0.420-servicing.24120.33 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.28 -> To Version 6.0.28 (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 38ac022d2..facaf96b0 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 27a065ab7..d6f61a051 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ef9b1726104aebb05c22498486cd6f4c1c3313b7 + c4a33f22341aa4c3945a3f4ee13d9b3d3a873273 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ef9b1726104aebb05c22498486cd6f4c1c3313b7 + c4a33f22341aa4c3945a3f4ee13d9b3d3a873273 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ef9b1726104aebb05c22498486cd6f4c1c3313b7 + c4a33f22341aa4c3945a3f4ee13d9b3d3a873273 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ef9b1726104aebb05c22498486cd6f4c1c3313b7 + c4a33f22341aa4c3945a3f4ee13d9b3d3a873273 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating d6969baea023232e2739e505f3723228f949d8fa - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7392200c7ca1a316b5ae7e98263ba6c26be4f833 + c1d600871abca733031eac0a17821179193da113 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7392200c7ca1a316b5ae7e98263ba6c26be4f833 + c1d600871abca733031eac0a17821179193da113 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 418b2633a2b67a2a1a61b1481a79f53eaa60a237 + 9de94bff9795bb0644835098b91e81edccfaa367 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 51556c9bd2c6057c7bd3a5999e20c4012aa253df + 4bb3a1d8ec37eda521bbf94605c43b035d2718b1 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 66d734f30..c25059d2c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.28-servicing.24116.7 + 6.0.28-servicing.24120.4 - 6.0.28-servicing.24116.14 + 6.0.28-servicing.24120.2 @@ -56,8 +56,8 @@ - 6.0.420-servicing.24120.26 - 6.0.420-servicing.24120.26 + 6.0.420-servicing.24120.33 + 6.0.420-servicing.24120.33 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.28-servicing.24116.13 - 6.0.28-servicing.24116.13 + 6.0.28-servicing.24120.3 + 6.0.28-servicing.24120.3 6.0.28 6.0.28 From a84a23f57f580ca0876021ec5e6c840e9355f845 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 21 Feb 2024 13:45:10 -0600 Subject: [PATCH 398/535] [release/6.0.1xx] Update dependencies from dotnet/source-build-reference-packages (#18737) Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 21 --------------------- eng/Version.Details.xml | 4 ++-- 2 files changed, 2 insertions(+), 23 deletions(-) diff --git a/NuGet.config b/NuGet.config index 0e7995f83..dd632b04b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,26 +9,14 @@ - - - - - - - - - - - - @@ -53,18 +41,9 @@ - - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4dd5d2c48..cae76778c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade 96facbceaca1e4eb498055c005088764d3b38dff - + https://github.com/dotnet/source-build-reference-packages - 38385bc8b19cebe7ae7d20771646158785ee5bdc + 2e6cb1a0008be982effb0c5d9e96a4ff138352d4 From 4c11f5ca0982ad4f759b35092dd2a15c2bf8d216 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 21 Feb 2024 13:46:01 -0600 Subject: [PATCH 399/535] [release/7.0.1xx] Update dependencies from dotnet/source-build-reference-packages (#18736) Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 21 --------------------- eng/Version.Details.xml | 4 ++-- 2 files changed, 2 insertions(+), 23 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3fddfa878..9c94cf60c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,27 +9,15 @@ - - - - - - - - - - - - @@ -53,18 +41,9 @@ - - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 351bf8ed3..4d6a6df81 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -207,9 +207,9 @@ https://github.com/dotnet/arcade c9bbc4b7606b46f6121a2758d2555dfc6322ed88 - + https://github.com/dotnet/source-build-reference-packages - 727ef4887d561dae6069d6b9c035773013dad041 + c74756071d00a51bcd35510900719148b4182f34 From 750746885ecf84ab8d11bf625a5883d7289df39b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 21 Feb 2024 13:56:21 -0600 Subject: [PATCH 400/535] [release/7.0.4xx] Update dependencies from dotnet/source-build-reference-packages (#18735) Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 9 --------- eng/Version.Details.xml | 4 ++-- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index e3a1c275a..bdc3a6cb9 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,19 +10,14 @@ - - - - - @@ -44,15 +39,11 @@ - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 468f1e9d6..7cbb5ab6d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -205,9 +205,9 @@ https://github.com/dotnet/arcade c9bbc4b7606b46f6121a2758d2555dfc6322ed88 - + https://github.com/dotnet/source-build-reference-packages - 727ef4887d561dae6069d6b9c035773013dad041 + c74756071d00a51bcd35510900719148b4182f34 From f33042e2676e1a4c0e469694351ce84592991e09 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 21 Feb 2024 13:56:40 -0600 Subject: [PATCH 401/535] [release/7.0.3xx] Update dependencies from dotnet/source-build-reference-packages (#18734) Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 9 --------- eng/Version.Details.xml | 4 ++-- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index 1b1c47835..d288f50a2 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,19 +10,14 @@ - - - - - @@ -44,15 +39,11 @@ - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 57c1640f8..f3987a3c4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -205,9 +205,9 @@ https://github.com/dotnet/arcade c9bbc4b7606b46f6121a2758d2555dfc6322ed88 - + https://github.com/dotnet/source-build-reference-packages - 727ef4887d561dae6069d6b9c035773013dad041 + c74756071d00a51bcd35510900719148b4182f34 From c5f74545cae64c7f55de19867f98bfd45e84daff Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 21 Feb 2024 13:56:58 -0600 Subject: [PATCH 402/535] [release/6.0.4xx] Update dependencies from dotnet/source-build-reference-packages (#18733) Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 21 --------------------- eng/Version.Details.xml | 4 ++-- 2 files changed, 2 insertions(+), 23 deletions(-) diff --git a/NuGet.config b/NuGet.config index b2706717a..03d3587a6 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,26 +9,14 @@ - - - - - - - - - - - - @@ -51,19 +39,10 @@ - - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0a205dc59..bc6caff49 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade 96facbceaca1e4eb498055c005088764d3b38dff - + https://github.com/dotnet/source-build-reference-packages - 6425c284100043ea5829deb255811d3487a91fb6 + 2e6cb1a0008be982effb0c5d9e96a4ff138352d4 From 387338af6975edafc4998f914337c753058b0301 Mon Sep 17 00:00:00 2001 From: Ella Hathaway <67609881+ellahathaway@users.noreply.github.com> Date: Mon, 26 Feb 2024 11:19:42 -0800 Subject: [PATCH 403/535] Update 7.0 SDK diff baseline (#18781) --- .../assets/baselines/MsftToSbSdk.diff | 101 +----------------- 1 file changed, 5 insertions(+), 96 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 4d662a3c3..bd443698c 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,23 +14,7 @@ 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/ @@ -125,35 +109,6 @@ 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 @@ -169,26 +124,21 @@ 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/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/ +-./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 @@ -200,10 +150,6 @@ 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 @@ -259,21 +205,11 @@ 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 @@ -329,13 +265,6 @@ 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 @@ -360,16 +289,6 @@ 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/ @@ -387,28 +306,18 @@ 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 fc93fb378ea0b7ffd7e21c732fc10a084a3c2cce Mon Sep 17 00:00:00 2001 From: Ella Hathaway <67609881+ellahathaway@users.noreply.github.com> Date: Mon, 26 Feb 2024 11:23:50 -0800 Subject: [PATCH 404/535] Update 6.0 SDK diff baseline (#18780) --- .../assets/baselines/MsftToSbSdk.diff | 17 ----------------- 1 file changed, 17 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 dfeb1a2f8..71ae3f0b9 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,20 +14,7 @@ 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/ @@ -42,10 +29,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 c1f7a59167588078960fa21e91ad5f148f327949 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 1 Mar 2024 02:44:30 +0000 Subject: [PATCH 405/535] Update dependencies from https://github.com/dotnet/arcade build 20240229.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.24114.4 -> To Version 7.0.0-beta.24129.3 --- 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 7cbb5ab6d..73631342d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - c9bbc4b7606b46f6121a2758d2555dfc6322ed88 + 0f007628f5e56efc6282db8fd60a3d231771d390 - + https://github.com/dotnet/arcade - c9bbc4b7606b46f6121a2758d2555dfc6322ed88 + 0f007628f5e56efc6282db8fd60a3d231771d390 - + https://github.com/dotnet/arcade - c9bbc4b7606b46f6121a2758d2555dfc6322ed88 + 0f007628f5e56efc6282db8fd60a3d231771d390 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 8c90692dd..97bf7052c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.24114.4 + 7.0.0-beta.24129.3 diff --git a/global.json b/global.json index 5d42d1e74..562fedb86 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.4", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24114.4" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24129.3", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24129.3" } } From 4283e1fa5eff58f56b8899bc334ece0fcb372fd6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 1 Mar 2024 02:44:31 +0000 Subject: [PATCH 406/535] Update dependencies from https://github.com/dotnet/arcade build 20240229.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.24114.4 -> To Version 7.0.0-beta.24129.3 --- 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 f3987a3c4..447a02b4e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - c9bbc4b7606b46f6121a2758d2555dfc6322ed88 + 0f007628f5e56efc6282db8fd60a3d231771d390 - + https://github.com/dotnet/arcade - c9bbc4b7606b46f6121a2758d2555dfc6322ed88 + 0f007628f5e56efc6282db8fd60a3d231771d390 - + https://github.com/dotnet/arcade - c9bbc4b7606b46f6121a2758d2555dfc6322ed88 + 0f007628f5e56efc6282db8fd60a3d231771d390 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index cec0d27c6..4adb975b7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.24114.4 + 7.0.0-beta.24129.3 diff --git a/global.json b/global.json index 5d42d1e74..562fedb86 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.4", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24114.4" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24129.3", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24129.3" } } From f08697a21d4fdf886f3104009e942d6894d7fb4e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 1 Mar 2024 17:14:02 +0000 Subject: [PATCH 407/535] Update dependencies from https://github.com/dotnet/arcade build 20240229.5 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.24114.4 -> To Version 7.0.0-beta.24129.5 --- 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 447a02b4e..afe963cbf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - 0f007628f5e56efc6282db8fd60a3d231771d390 + 50beddb53d462dbd9d8579725a3d368e03cc08fd - + https://github.com/dotnet/arcade - 0f007628f5e56efc6282db8fd60a3d231771d390 + 50beddb53d462dbd9d8579725a3d368e03cc08fd - + https://github.com/dotnet/arcade - 0f007628f5e56efc6282db8fd60a3d231771d390 + 50beddb53d462dbd9d8579725a3d368e03cc08fd https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 4adb975b7..82d00e4a7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.24129.3 + 7.0.0-beta.24129.5 diff --git a/global.json b/global.json index 562fedb86..13804ed82 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.24129.3", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24129.3" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24129.5", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24129.5" } } From 63953ff6b74b888c1e6000ce92be95f293edde0f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 1 Mar 2024 17:14:02 +0000 Subject: [PATCH 408/535] Update dependencies from https://github.com/dotnet/arcade build 20240229.5 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.24114.4 -> To Version 7.0.0-beta.24129.5 --- 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 73631342d..7de69c4c4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - 0f007628f5e56efc6282db8fd60a3d231771d390 + 50beddb53d462dbd9d8579725a3d368e03cc08fd - + https://github.com/dotnet/arcade - 0f007628f5e56efc6282db8fd60a3d231771d390 + 50beddb53d462dbd9d8579725a3d368e03cc08fd - + https://github.com/dotnet/arcade - 0f007628f5e56efc6282db8fd60a3d231771d390 + 50beddb53d462dbd9d8579725a3d368e03cc08fd https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 97bf7052c..fc708eb9b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.24129.3 + 7.0.0-beta.24129.5 diff --git a/global.json b/global.json index 562fedb86..13804ed82 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.24129.3", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24129.3" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24129.5", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24129.5" } } 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 409/535] Update Assembly Exclusions (#18859) --- .../assets/SdkAssemblyVersionDiffExclusions.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/SdkAssemblyVersionDiffExclusions.txt b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/SdkAssemblyVersionDiffExclusions.txt index 50fac905d..e5b4aa4e7 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/SdkAssemblyVersionDiffExclusions.txt +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/SdkAssemblyVersionDiffExclusions.txt @@ -26,6 +26,8 @@ ./sdk/x.y.z/System.Security.Cryptography.Xml.dll # These assemblies are lifted to a higher version naturally via SB +./sdk/x.y.z/DotnetTools/dotnet-format/dotnet-format.dll +./sdk/x.y.z/DotnetTools/dotnet-format/*/dotnet-format.resources.dll ./sdk/x.y.z/DotnetTools/dotnet-format/*/Microsoft.CodeAnalysis.* ./sdk/x.y.z/DotnetTools/dotnet-format/Humanizer.dll ./sdk/x.y.z/DotnetTools/dotnet-format/Microsoft.Build.Locator.dll From 1fd59c4a4323eaa5f6664f8684591bf913a79dde Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 5 Mar 2024 10:59:06 -0800 Subject: [PATCH 410/535] Update branding to 6.0.129 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index c78738260..73175be3b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 1 - 28 + 29 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From 0fd3c1e80cc4458d064d1a05f2eef0d1021ad86c Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 5 Mar 2024 10:59:10 -0800 Subject: [PATCH 411/535] Update branding to 6.0.421 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index f695c3266..b3f94eb3d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 4 - 20 + 21 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From 599edfd2e90520bf3890aee80fc2d0b4f0be3322 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 5 Mar 2024 10:59:15 -0800 Subject: [PATCH 412/535] Update branding to 7.0.118 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index a1ed9ad1c..93814ecf5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 7 0 1 - 17 + 18 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing From f6ef7ba8a7501f4f55e601d60bb50c6888ee3433 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 5 Mar 2024 10:59:19 -0800 Subject: [PATCH 413/535] Update branding to 7.0.315 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index cec0d27c6..244192310 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 7 0 3 - 14 + 15 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing From 53ba675d23b54d6c468b7667346849a033165c40 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 5 Mar 2024 10:59:23 -0800 Subject: [PATCH 414/535] Update branding to 7.0.408 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 8c90692dd..fe64f9e5f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 7 0 4 - 07 + 08 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing From 818879e9fc0019c781689adf3b1b08073714ac37 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 5 Mar 2024 10:59:27 -0800 Subject: [PATCH 415/535] Update branding to 8.0.104 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 114d2f500..dd5670c9b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 8 0 1 - 03 + 04 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) $(VersionMajor).$(VersionMinor) $(MajorMinorVersion).$(VersionSDKMinor) From eb3b53bb68533e8f6313ff28664b265818981d31 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 6 Mar 2024 22:39:07 +0000 Subject: [PATCH 416/535] Update dependencies from https://github.com/dotnet/arcade build 20240305.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.24129.5 -> To Version 7.0.0-beta.24155.3 --- 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 afe963cbf..e0f598088 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - 50beddb53d462dbd9d8579725a3d368e03cc08fd + 57d97c22303813c8b0a8d70a24f312cace5dba99 - + https://github.com/dotnet/arcade - 50beddb53d462dbd9d8579725a3d368e03cc08fd + 57d97c22303813c8b0a8d70a24f312cace5dba99 - + https://github.com/dotnet/arcade - 50beddb53d462dbd9d8579725a3d368e03cc08fd + 57d97c22303813c8b0a8d70a24f312cace5dba99 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 9fdfae5e8..373df2b74 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.24129.5 + 7.0.0-beta.24155.3 diff --git a/global.json b/global.json index 13804ed82..3d1e691f2 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.24129.5", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24129.5" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24155.3", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24155.3" } } From 94ab7b0ee582848f7388d78f7898bc9afa1b77a7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 6 Mar 2024 22:39:07 +0000 Subject: [PATCH 417/535] Update dependencies from https://github.com/dotnet/arcade build 20240305.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.24129.5 -> To Version 7.0.0-beta.24155.3 --- 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 7de69c4c4..02733e5f6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - 50beddb53d462dbd9d8579725a3d368e03cc08fd + 57d97c22303813c8b0a8d70a24f312cace5dba99 - + https://github.com/dotnet/arcade - 50beddb53d462dbd9d8579725a3d368e03cc08fd + 57d97c22303813c8b0a8d70a24f312cace5dba99 - + https://github.com/dotnet/arcade - 50beddb53d462dbd9d8579725a3d368e03cc08fd + 57d97c22303813c8b0a8d70a24f312cace5dba99 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 3fd98b2dd..c42880865 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.24129.5 + 7.0.0-beta.24155.3 diff --git a/global.json b/global.json index 13804ed82..3d1e691f2 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.24129.5", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24129.5" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24155.3", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24155.3" } } From e0cdfd56dec447be2014db6835841e95f0f43fd7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 8 Mar 2024 23:18:12 +0000 Subject: [PATCH 418/535] Update dependencies from https://github.com/dotnet/source-build-externals build 20240308.3 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 8.0.0-alpha.1.24065.1 -> To Version 8.0.0-alpha.1.24158.3 Dependency coherency updates NuGet.Build.Tasks From Version 6.8.1-rc.2 -> To Version 6.8.1-rc.2 (parent: Microsoft.NET.Sdk --- NuGet.config | 9 --------- eng/Version.Details.xml | 6 +++--- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index 4518ca310..959b7d1df 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,22 +7,17 @@ - - - - - @@ -43,15 +38,11 @@ - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9da0e138d..728b2c591 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -160,7 +160,7 @@ b5265ef370a651f8c3458110b804e5cbf869eeb5 - https://github.com/nuget/nuget.client + https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted 550277e0616e549446f03fda35d3e23dff75dc01 @@ -193,9 +193,9 @@ 5957c5c5f85f17c145e7fab4ece37ad6aafcded9 - + https://github.com/dotnet/source-build-externals - 83274d94c7e2ff21081b0d75ecbec2da2241f831 + 7a9b99e457a2b9792a3c17ccaf95d80038725108 From 4d50dca68fce99097266478c0c1c24b7cf489020 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 8 Mar 2024 23:18:49 +0000 Subject: [PATCH 419/535] Update dependencies from https://github.com/dotnet/source-build-externals build 20240308.4 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 7.0.0-alpha.1.24059.2 -> To Version 7.0.0-alpha.1.24158.4 --- 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 e0f598088..aea7d5d3c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -180,9 +180,9 @@ c3ad00ae84489071080a606f6a8e43c9a91a5cc2 - + https://github.com/dotnet/source-build-externals - 4bed7bdd937666fac4c4f351b9b02adddf8d035b + beb06e4f3aa045bddf4082111fcf005f80ca9fa6 From d48ec7c91d9e3740df6e796a60187fbb88e65c4d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 8 Mar 2024 23:18:52 +0000 Subject: [PATCH 420/535] Update dependencies from https://github.com/dotnet/source-build-externals build 20240308.4 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 7.0.0-alpha.1.24059.2 -> To Version 7.0.0-alpha.1.24158.4 --- 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 02733e5f6..877d7b0e1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -180,9 +180,9 @@ c3ad00ae84489071080a606f6a8e43c9a91a5cc2 - + https://github.com/dotnet/source-build-externals - 4bed7bdd937666fac4c4f351b9b02adddf8d035b + beb06e4f3aa045bddf4082111fcf005f80ca9fa6 From 36e3ca070808aab9a594798d1f26b41bdff07fe9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 9 Mar 2024 13:35:15 +0000 Subject: [PATCH 421/535] Update dependencies from https://github.com/dotnet/source-build-externals build 20240308.4 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 7.0.0-alpha.1.24059.2 -> To Version 7.0.0-alpha.1.24158.4 --- 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 4d6a6df81..35f34f12c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -176,9 +176,9 @@ c3ad00ae84489071080a606f6a8e43c9a91a5cc2 - + https://github.com/dotnet/source-build-externals - 4bed7bdd937666fac4c4f351b9b02adddf8d035b + beb06e4f3aa045bddf4082111fcf005f80ca9fa6 From 0c257f30af09adac828ea189a1594341309469d7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 10 Mar 2024 12:32:58 +0000 Subject: [PATCH 422/535] Update dependencies from https://github.com/dotnet/source-build-externals build 20240308.4 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 7.0.0-alpha.1.24059.2 -> To Version 7.0.0-alpha.1.24158.4 From 44583e7face27afbec31cf74ea6aed3c075fc40e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 11 Mar 2024 01:36:33 +0000 Subject: [PATCH 423/535] Update dependencies from https://github.com/dotnet/arcade build 20240310.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.24155.3 -> To Version 7.0.0-beta.24160.1 --- 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 e0f598088..b5487d42c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - 57d97c22303813c8b0a8d70a24f312cace5dba99 + aa22ad6cceb0fcb802ed542360827c191024649e - + https://github.com/dotnet/arcade - 57d97c22303813c8b0a8d70a24f312cace5dba99 + aa22ad6cceb0fcb802ed542360827c191024649e - + https://github.com/dotnet/arcade - 57d97c22303813c8b0a8d70a24f312cace5dba99 + aa22ad6cceb0fcb802ed542360827c191024649e https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 373df2b74..3cd2b7e73 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.24155.3 + 7.0.0-beta.24160.1 diff --git a/global.json b/global.json index 3d1e691f2..58e631be4 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.24155.3", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24155.3" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24160.1", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24160.1" } } From c17ef2ce9b17801dc14b49d4acca5317737d38eb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 11 Mar 2024 01:36:34 +0000 Subject: [PATCH 424/535] Update dependencies from https://github.com/dotnet/arcade build 20240310.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.24155.3 -> To Version 7.0.0-beta.24160.1 --- 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 02733e5f6..1eb34c8ee 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - 57d97c22303813c8b0a8d70a24f312cace5dba99 + aa22ad6cceb0fcb802ed542360827c191024649e - + https://github.com/dotnet/arcade - 57d97c22303813c8b0a8d70a24f312cace5dba99 + aa22ad6cceb0fcb802ed542360827c191024649e - + https://github.com/dotnet/arcade - 57d97c22303813c8b0a8d70a24f312cace5dba99 + aa22ad6cceb0fcb802ed542360827c191024649e https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index c42880865..1c2cf4220 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.24155.3 + 7.0.0-beta.24160.1 diff --git a/global.json b/global.json index 3d1e691f2..58e631be4 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.24155.3", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24155.3" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24160.1", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24160.1" } } From ca47aa74e9fb8975398bd1dc3a13846bd9d5accf Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Mon, 11 Mar 2024 02:15:24 -0700 Subject: [PATCH 425/535] [release/6.0.4xx] Add -pr version of pipeline --- .vsts-pr.yml | 437 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 437 insertions(+) create mode 100644 .vsts-pr.yml diff --git a/.vsts-pr.yml b/.vsts-pr.yml new file mode 100644 index 000000000..0b653655f --- /dev/null +++ b/.vsts-pr.yml @@ -0,0 +1,437 @@ +trigger: + batch: true + branches: + include: + - main + - master + - release/* + - internal/release/3.* + - internal/release/5.* + - internal/release/6.* + +variables: +- name: _PublishUsingPipelines + value: false +- 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 + +# Default to running tests in PRs and public CI, but not in official builds +- name: _WindowsTestArg + value: '-test' +- name: _NonWindowsTestArg + value: '--test' +- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - name: _WindowsTestArg + value: '' + - name: _NonWindowsTestArg + value: '' + +- 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) + +stages: +- stage: build + jobs: + - job: Publish_Build_Configuration + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + name: NetCore-Svc-Public + demands: ImageOverride -equals windows.vs2019.amd64.open + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: NetCore1ESPool-Svc-Internal + demands: ImageOverride -equals windows.vs2019.amd64 + steps: + - publish: $(Build.SourcesDirectory)\eng\BuildConfiguration + artifact: BuildConfiguration + displayName: Publish Build Config + - template: /eng/build.yml + parameters: + agentOs: Windows_NT + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + name: NetCore-Svc-Public + demands: ImageOverride -equals windows.vs2019.amd64.open + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: NetCore1ESPool-Svc-Internal + demands: ImageOverride -equals windows.vs2019.amd64 + timeoutInMinutes: 180 + strategy: + matrix: + # Public-only builds + ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: + Build_Debug_x86: + _BuildConfig: Debug + _BuildArchitecture: x86 + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '' + _TestArg: $(_WindowsTestArg) + Build_ES_Debug_x64: + _BuildConfig: Debug + _BuildArchitecture: x64 + _DOTNET_CLI_UI_LANGUAGE: es + _AdditionalBuildParameters: '' + _TestArg: '' + # Internal-only builds + ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + Build_Release_x86: + _BuildConfig: Release + _BuildArchitecture: x86 + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '' + _TestArg: $(_WindowsTestArg) + # Always run builds + Build_Release_x64: + _BuildConfig: Release + _BuildArchitecture: x64 + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '/p:PublishInternalAsset=true' + _TestArg: $(_WindowsTestArg) + Build_Release_arm: + _BuildConfig: Release + _BuildArchitecture: arm + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '' + # Never run tests on arm64 + _TestArg: '' + Build_Release_arm64: + _BuildConfig: Release + _BuildArchitecture: arm64 + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '' + # Never run tests on arm64 + _TestArg: '' + + - template: /eng/build.yml + parameters: + agentOs: Windows_NT + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + name: NetCore-Svc-Public + demands: ImageOverride -equals windows.vs2019.amd64.open + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: NetCore1ESPool-Svc-Internal + demands: ImageOverride -equals windows.vs2019.amd64 + timeoutInMinutes: 180 + strategy: + matrix: + # Always run builds + Build_Release_x64: + _BuildConfig: Release + _BuildArchitecture: x64 + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '/p:PublishInternalAsset=true' + # Never run tests on PGO bits + _TestArg: '' + Build_Release_x86: + _BuildConfig: Release + _BuildArchitecture: x86 + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '' + _TestArg: '' + pgoInstrument: true + + - template: /eng/build.yml + parameters: + agentOs: Linux + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + name: NetCore-Svc-Public + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: NetCore1ESPool-Svc-Internal + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 + timeoutInMinutes: 180 + strategy: + matrix: + ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: + Build_Ubuntu_18_04_Debug_x64: + _BuildConfig: Debug + _DockerParameter: '--docker ubuntu.18.04' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _TestArg: $(_NonWindowsTestArg) + Build_Fedora_29_Debug_x64: + _BuildConfig: Debug + _DockerParameter: '--docker fedora.29' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _TestArg: $(_NonWindowsTestArg) + Build_CentOS_7_1_Debug_x64: + _BuildConfig: Debug + _DockerParameter: '--docker centos' + _LinuxPortable: '' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _TestArg: $(_NonWindowsTestArg) + Build_Debian_11_Debug_x64: + _BuildConfig: Debug + _DockerParameter: '--docker debian' + _LinuxPortable: '' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _AdditionalBuildParameters: '/p:BuildSdkDeb=true' + _TestArg: $(_NonWindowsTestArg) + Build_Rhel_7_2_Release_x64: + _BuildConfig: Release + _DockerParameter: '--docker rhel' + _LinuxPortable: '' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _TestArg: $(_NonWindowsTestArg) + Build_Rhel_7_2_Release_Arm64: + _BuildConfig: Release + _DockerParameter: '--docker rhel' + _LinuxPortable: '' + _RuntimeIdentifier: '--runtime-id linux-arm64' + _BuildArchitecture: 'arm64' + # Never run tests on arm + _TestArg: '' + _AdditionalBuildParameters: '/p:CLIBUILD_SKIP_TESTS=true' + Build_Arm_Debug: + _BuildConfig: Debug + _DockerParameter: '' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '--runtime-id linux-arm' + _BuildArchitecture: 'arm' + # Never run tests on arm + _TestArg: '' + Build_Arm64_Debug: + _BuildConfig: Debug + _DockerParameter: '' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '--runtime-id linux-arm64' + _BuildArchitecture: 'arm64' + # Never run tests on arm64 + _TestArg: '' + Build_Linux_musl_Debug_arm: + _BuildConfig: Debug + # linux-musl-arm cross gen depends on glibc 2.27 (this OS has it) + _DockerParameter: '--docker ubuntu.18.04' + _LinuxPortable: '' + _RuntimeIdentifier: '--runtime-id linux-musl-arm' + _BuildArchitecture: 'arm' + _AdditionalBuildParameters: '/p:OSName="linux-musl"' + # Never run tests on arm + _TestArg: '' + Build_Linux_musl_Debug_arm64: + _BuildConfig: Debug + _DockerParameter: '' + _LinuxPortable: '' + _RuntimeIdentifier: '--runtime-id linux-musl-arm64' + _BuildArchitecture: 'arm64' + _AdditionalBuildParameters: '/p:OSName="linux-musl"' + # Never run tests on arm64 + _TestArg: '' + Build_Linux_musl_Debug_x64: + _BuildConfig: Debug + _DockerParameter: '--docker alpine.3.15' + _LinuxPortable: '' + _RuntimeIdentifier: '--runtime-id linux-musl-x64' + _BuildArchitecture: 'x64' + # Pass in HostOSName when running on alpine + _AdditionalBuildParameters: '/p:HostOSName="linux-musl"' + _TestArg: $(_NonWindowsTestArg) + ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + Build_Arm_Release: + _BuildConfig: Release + _DockerParameter: '' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '--runtime-id linux-arm' + _BuildArchitecture: 'arm' + # Never run tests on arm + _TestArg: '' + Build_Arm64_Release: + _BuildConfig: Release + _DockerParameter: '' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '--runtime-id linux-arm64' + _BuildArchitecture: 'arm64' + # Never run tests on arm64 + _TestArg: '' + Build_Linux_musl_Release_arm: + _BuildConfig: Release + # linux-musl-arm cross gen depends on glibc 2.27 (this OS has it) + _DockerParameter: '--docker ubuntu.18.04' + _LinuxPortable: '' + _RuntimeIdentifier: '--runtime-id linux-musl-arm' + _BuildArchitecture: 'arm' + _AdditionalBuildParameters: '/p:OSName="linux-musl"' + # Never run tests on arm + _TestArg: '' + Build_Linux_musl_Release_arm64: + _BuildConfig: Release + _DockerParameter: '' + _LinuxPortable: '' + _RuntimeIdentifier: '--runtime-id linux-musl-arm64' + _BuildArchitecture: 'arm64' + _AdditionalBuildParameters: '/p:OSName="linux-musl"' + # Never run tests on arm64 + _TestArg: '' + Build_Linux_musl_Release_x64: + _BuildConfig: Release + _DockerParameter: '--docker alpine.3.15' + _LinuxPortable: '' + _RuntimeIdentifier: '--runtime-id linux-musl-x64' + _BuildArchitecture: 'x64' + # Pass in HostOSName when running on alpine + _AdditionalBuildParameters: '/p:HostOSName="linux-musl"' + Build_Linux_Portable_Deb_Release_x64: + _BuildConfig: Release + _DockerParameter: '--docker ubuntu.18.04' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '' + _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' + _TestArg: $(_NonWindowsTestArg) + Build_Linux_Portable_Rpm_Release_x64: + _BuildConfig: Release + _DockerParameter: '--docker rhel' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + # Do not publish zips and tarballs. The linux-x64 binaries are + # already published by Build_LinuxPortable_Release_x64 + _AdditionalBuildParameters: '/p:PublishBinariesAndBadge=false' + _TestArg: $(_NonWindowsTestArg) + Build_Linux_Portable_Rpm_Release_Arm64: + _BuildConfig: Release + _DockerParameter: '--docker rhel' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '--runtime-id linux-arm64' + _BuildArchitecture: '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' + # Never run tests on arm64 + _TestArg: '' + Build_LinuxPortable_Release_x64: + _BuildConfig: Release + _DockerParameter: '' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _TestArg: $(_NonWindowsTestArg) + + - template: /eng/build.yml + parameters: + agentOs: Linux + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + name: NetCore-Svc-Public + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: NetCore1ESPool-Svc-Internal + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 + timeoutInMinutes: 180 + strategy: + matrix: + # Always run builds + Build_LinuxPortable_Release_x64: + _BuildConfig: Release + _DockerParameter: '' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _TestArg: '' + pgoInstrument: true + + - template: /eng/build.yml + parameters: + agentOs: Darwin + pool: + vmImage: 'macOS-latest' + timeoutInMinutes: 180 + strategy: + matrix: + Build_Release_x64: + _BuildConfig: Release + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _TestArg: $(_NonWindowsTestArg) + Build_Release_arm64: + _BuildConfig: Release + _RuntimeIdentifier: '--runtime-id osx-arm64' + _BuildArchitecture: 'arm64' + # Never run tests on arm64 + _TestArg: '' + + - template: /eng/common/templates/jobs/source-build.yml + + - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml + + # For .NET 6.0, source-build only supports 6.0.1xx. Disable tarball build validation in all other branches. + # - ${{ if in(variables['Build.Reason'], 'PullRequest') }}: + # - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml + # parameters: + # dependsOn: Source_Build_Create_Tarball + + # https://github.com/dotnet/core-sdk/issues/248 + # - template: /eng/build.yml + # parameters: + # agentOs: FreeBSD + # queue: + # name: dnceng-freebsd-internal + # timeoutInMinutes: 180 + # matrix: + # Build_Release: + # _BuildConfig: Release + # _BuildArchitecture: 'x64' + # _AdditionalBuildParameters: '/p:DisableSourceLink=true /p:DISABLE_CROSSGEN=true' + + - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - template: /eng/common/templates/job/publish-build-assets.yml + parameters: + dependsOn: + - Windows_NT + - Linux + - Darwin + - Source_Build_Managed + - Source_Build_Create_Tarball + - PGO_Linux + - PGO_Windows_NT + publishUsingPipelines: true + pool: + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: NetCore1ESPool-Svc-Internal + demands: ImageOverride -equals windows.vs2017.amd64 + + +- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - template: eng\common\templates\post-build\post-build.yml + parameters: + publishingInfraVersion: 3 + enableSymbolValidation: false + enableSigningValidation: false + enableNugetValidation: false + enableSourceLinkValidation: false + publishInstallersAndChecksums: true + SDLValidationParameters: + enable: false + params: ' -SourceToolsList @("policheck","credscan") + -TsaInstanceURL $(_TsaInstanceURL) + -TsaProjectName $(_TsaProjectName) + -TsaNotificationEmail $(_TsaNotificationEmail) + -TsaCodebaseAdmin $(_TsaCodebaseAdmin) + -TsaBugAreaPath $(_TsaBugAreaPath) + -TsaIterationPath $(_TsaIterationPath) + -TsaRepositoryName "dotnet-installer" + -TsaCodebaseName "dotnet-installer" + -TsaPublish $True' From 0d96200a8edac42323f6c461f9ae21973a38456e Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Mon, 11 Mar 2024 02:18:09 -0700 Subject: [PATCH 426/535] [release/7.0.1xx] Add -pr version of pipeline --- .vsts-pr.yml | 393 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 393 insertions(+) create mode 100644 .vsts-pr.yml diff --git a/.vsts-pr.yml b/.vsts-pr.yml new file mode 100644 index 000000000..b28494424 --- /dev/null +++ b/.vsts-pr.yml @@ -0,0 +1,393 @@ +trigger: + batch: true + branches: + include: + - main + - master + - release/* + - internal/release/3.* + - internal/release/5.* + - internal/release/6.* + - internal/release/7.* + +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 + +# Default to running tests in PRs and public CI, but not in official builds +- name: _WindowsTestArg + value: '-test' +- name: _NonWindowsTestArg + value: '--test' +- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - name: _WindowsTestArg + value: '' + - name: _NonWindowsTestArg + value: '' + +- 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) + +stages: +- stage: build + jobs: + - job: Publish_Build_Configuration + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + name: NetCore-Svc-Public + demands: ImageOverride -equals windows.vs2019.amd64.open + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: NetCore1ESPool-Svc-Internal + demands: ImageOverride -equals windows.vs2019.amd64 + steps: + - publish: $(Build.SourcesDirectory)\eng\BuildConfiguration + artifact: BuildConfiguration + displayName: Publish Build Config + - template: /eng/build.yml + parameters: + agentOs: Windows_NT + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + name: NetCore-Svc-Public + demands: ImageOverride -equals windows.vs2019.amd64.open + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: NetCore1ESPool-Svc-Internal + demands: ImageOverride -equals windows.vs2019.amd64 + timeoutInMinutes: 180 + strategy: + matrix: + # Public-only builds + ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: + Build_Release_x64: + _BuildConfig: Debug + _BuildArchitecture: x64 + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '/p:PublishInternalAsset=true' + _TestArg: $(_WindowsTestArg) + # Internal-only builds + ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + Build_Release_x64: + _BuildConfig: Release + _BuildArchitecture: x64 + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '/p:PublishInternalAsset=true' + _TestArg: $(_WindowsTestArg) + Build_Release_x86: + _BuildConfig: Release + _BuildArchitecture: x86 + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '' + _TestArg: $(_WindowsTestArg) + Build_Release_arm64: + _BuildConfig: Release + _BuildArchitecture: arm64 + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '' + # Never run tests on arm64 + _TestArg: '' + + - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - template: /eng/build.yml + parameters: + agentOs: Windows_NT + pool: + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: NetCore1ESPool-Svc-Internal + demands: ImageOverride -equals windows.vs2019.amd64 + timeoutInMinutes: 180 + strategy: + matrix: + Build_Release_x64: + _BuildConfig: Release + _BuildArchitecture: x64 + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '/p:PublishInternalAsset=true' + # Never run tests on PGO bits + _TestArg: '' + Build_Release_x86: + _BuildConfig: Release + _BuildArchitecture: x86 + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '' + _TestArg: '' + Build_Release_arm64: + _BuildConfig: Release + _BuildArchitecture: arm64 + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '' + # Never run tests on arm64 + _TestArg: '' + pgoInstrument: true + + - template: /eng/build.yml + parameters: + agentOs: Linux + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + name: NetCore-Svc-Public + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: NetCore1ESPool-Svc-Internal + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 + timeoutInMinutes: 180 + strategy: + matrix: + ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: + Build_Ubuntu_18_04_Debug_x64: + _BuildConfig: Debug + _DockerParameter: '--docker ubuntu.18.04' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _TestArg: $(_NonWindowsTestArg) + Build_Fedora_36_Debug_x64: + _BuildConfig: Debug + _DockerParameter: '--docker fedora.36' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _TestArg: $(_NonWindowsTestArg) + Build_CentOS_7_Debug_x64: + _BuildConfig: Debug + _DockerParameter: '--docker centos' + _LinuxPortable: '' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _TestArg: $(_NonWindowsTestArg) + Build_Debian_11_Debug_x64: + _BuildConfig: Debug + _DockerParameter: '--docker debian' + _LinuxPortable: '' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _AdditionalBuildParameters: '/p:BuildSdkDeb=true' + _TestArg: $(_NonWindowsTestArg) + Build_Arm64_Debug: + _BuildConfig: Debug + _DockerParameter: '' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '--runtime-id linux-arm64' + _BuildArchitecture: 'arm64' + # Never run tests on arm64 + _TestArg: '' + Build_Linux_musl_Debug_x64: + _BuildConfig: Debug + _DockerParameter: '--docker alpine.3.15' + _LinuxPortable: '' + _RuntimeIdentifier: '--runtime-id linux-musl-x64' + _BuildArchitecture: 'x64' + # Pass in HostOSName when running on alpine + _AdditionalBuildParameters: '/p:HostOSName="linux-musl"' + _TestArg: $(_NonWindowsTestArg) + ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + Build_Arm_Release: + _BuildConfig: Release + _DockerParameter: '' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '--runtime-id linux-arm' + _BuildArchitecture: 'arm' + # Never run tests on arm + _TestArg: '' + Build_Arm64_Release: + _BuildConfig: Release + _DockerParameter: '' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '--runtime-id linux-arm64' + _BuildArchitecture: 'arm64' + # Never run tests on arm64 + _TestArg: '' + Build_Linux_musl_Release_arm: + _BuildConfig: Release + # linux-musl-arm cross gen depends on glibc 2.27 (this OS has it) + _DockerParameter: '--docker ubuntu.18.04' + _LinuxPortable: '' + _RuntimeIdentifier: '--runtime-id linux-musl-arm' + _BuildArchitecture: 'arm' + _AdditionalBuildParameters: '/p:OSName="linux-musl"' + # Never run tests on arm + _TestArg: '' + Build_Linux_musl_Release_arm64: + _BuildConfig: Release + _DockerParameter: '' + _LinuxPortable: '' + _RuntimeIdentifier: '--runtime-id linux-musl-arm64' + _BuildArchitecture: 'arm64' + _AdditionalBuildParameters: '/p:OSName="linux-musl"' + # Never run tests on arm64 + _TestArg: '' + Build_Linux_musl_Release_x64: + _BuildConfig: Release + _DockerParameter: '--docker alpine.3.15' + _LinuxPortable: '' + _RuntimeIdentifier: '--runtime-id linux-musl-x64' + _BuildArchitecture: 'x64' + # Pass in HostOSName when running on alpine + _AdditionalBuildParameters: '/p:HostOSName="linux-musl"' + Build_Linux_Portable_Deb_Release_x64: + _BuildConfig: Release + _DockerParameter: '--docker ubuntu.18.04' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '' + _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' + _TestArg: $(_NonWindowsTestArg) + Build_Linux_Portable_Rpm_Release_x64: + _BuildConfig: Release + _DockerParameter: '--docker centos' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + # Do not publish zips and tarballs. The linux-x64 binaries are + # already published by Build_LinuxPortable_Release_x64 + _AdditionalBuildParameters: '/p:PublishBinariesAndBadge=false' + _TestArg: $(_NonWindowsTestArg) + Build_Linux_Portable_Rpm_Release_Arm64: + _BuildConfig: Release + _DockerParameter: '--docker centos' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '--runtime-id linux-arm64' + _BuildArchitecture: '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' + # Never run tests on arm64 + _TestArg: '' + Build_LinuxPortable_Release_x64: + _BuildConfig: Release + _DockerParameter: '' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _TestArg: $(_NonWindowsTestArg) + + - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - template: /eng/build.yml + parameters: + agentOs: Linux + pool: + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: NetCore1ESPool-Svc-Internal + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 + timeoutInMinutes: 180 + strategy: + matrix: + Build_LinuxPortable_Release_x64: + _BuildConfig: Release + _DockerParameter: '' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _TestArg: '' + Build_Release_arm64: + _BuildConfig: Release + _BuildArchitecture: arm64 + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '' + # Never run tests on arm64 + _TestArg: '' + pgoInstrument: true + + - template: /eng/build.yml + parameters: + agentOs: Darwin + pool: + vmImage: 'macOS-latest' + timeoutInMinutes: 180 + strategy: + matrix: + Build_Release_x64: + _BuildConfig: Release + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _TestArg: $(_NonWindowsTestArg) + ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + Build_Release_arm64: + _BuildConfig: Release + _RuntimeIdentifier: '--runtime-id osx-arm64' + _BuildArchitecture: 'arm64' + # Never run tests on arm64 + _TestArg: '' + + - template: /eng/common/templates/jobs/source-build.yml + + - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml + + - ${{ if in(variables['Build.Reason'], 'PullRequest') }}: + - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml + parameters: + dependsOn: Source_Build_Create_Tarball + + # https://github.com/dotnet/core-sdk/issues/248 + # - template: /eng/build.yml + # parameters: + # agentOs: FreeBSD + # queue: + # name: dnceng-freebsd-internal + # timeoutInMinutes: 180 + # matrix: + # Build_Release: + # _BuildConfig: Release + # _BuildArchitecture: 'x64' + # _AdditionalBuildParameters: '/p:DisableSourceLink=true /p:DISABLE_CROSSGEN=true' + + - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - template: /eng/common/templates/job/publish-build-assets.yml + parameters: + dependsOn: + - Windows_NT + - Linux + - Darwin + - Source_Build_Managed + - Source_Build_Create_Tarball + - PGO_Linux + - PGO_Windows_NT + publishUsingPipelines: true + pool: + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: NetCore1ESPool-Svc-Internal + demands: ImageOverride -equals windows.vs2017.amd64 + + +- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - template: eng\common\templates\post-build\post-build.yml + parameters: + publishingInfraVersion: 3 + enableSymbolValidation: false + enableSigningValidation: false + enableNugetValidation: false + enableSourceLinkValidation: false + publishInstallersAndChecksums: true + SDLValidationParameters: + enable: false + params: ' -SourceToolsList @("policheck","credscan") + -TsaInstanceURL $(_TsaInstanceURL) + -TsaProjectName $(_TsaProjectName) + -TsaNotificationEmail $(_TsaNotificationEmail) + -TsaCodebaseAdmin $(_TsaCodebaseAdmin) + -TsaBugAreaPath $(_TsaBugAreaPath) + -TsaIterationPath $(_TsaIterationPath) + -TsaRepositoryName "dotnet-installer" + -TsaCodebaseName "dotnet-installer" + -TsaPublish $True' From 279ee7d5041ecc467272815ff8dbeae50930d1b8 Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Mon, 11 Mar 2024 02:19:06 -0700 Subject: [PATCH 427/535] [release/7.0.3xx] Add -pr version of pipeline --- .vsts-pr.yml | 394 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 394 insertions(+) create mode 100644 .vsts-pr.yml diff --git a/.vsts-pr.yml b/.vsts-pr.yml new file mode 100644 index 000000000..5e2cdc745 --- /dev/null +++ b/.vsts-pr.yml @@ -0,0 +1,394 @@ +trigger: + batch: true + branches: + include: + - main + - master + - release/* + - internal/release/3.* + - internal/release/5.* + - internal/release/6.* + - internal/release/7.* + +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 + +# Default to running tests in PRs and public CI, but not in official builds +- name: _WindowsTestArg + value: '-test' +- name: _NonWindowsTestArg + value: '--test' +- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - name: _WindowsTestArg + value: '' + - name: _NonWindowsTestArg + value: '' + +- 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) + +stages: +- stage: build + jobs: + - job: Publish_Build_Configuration + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + name: NetCore-Svc-Public + demands: ImageOverride -equals windows.vs2019.amd64.open + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: NetCore1ESPool-Svc-Internal + demands: ImageOverride -equals windows.vs2019.amd64 + steps: + - publish: $(Build.SourcesDirectory)\eng\BuildConfiguration + artifact: BuildConfiguration + displayName: Publish Build Config + - template: /eng/build.yml + parameters: + agentOs: Windows_NT + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + name: NetCore-Svc-Public + demands: ImageOverride -equals windows.vs2019.amd64.open + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: NetCore1ESPool-Svc-Internal + demands: ImageOverride -equals windows.vs2019.amd64 + timeoutInMinutes: 180 + strategy: + matrix: + # Public-only builds + ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: + Build_Release_x64: + _BuildConfig: Debug + _BuildArchitecture: x64 + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '/p:PublishInternalAsset=true' + _TestArg: $(_WindowsTestArg) + # Internal-only builds + ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + Build_Release_x64: + _BuildConfig: Release + _BuildArchitecture: x64 + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '/p:PublishInternalAsset=true' + _TestArg: $(_WindowsTestArg) + Build_Release_x86: + _BuildConfig: Release + _BuildArchitecture: x86 + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '' + _TestArg: $(_WindowsTestArg) + Build_Release_arm64: + _BuildConfig: Release + _BuildArchitecture: arm64 + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '' + # Never run tests on arm64 + _TestArg: '' + + - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - template: /eng/build.yml + parameters: + agentOs: Windows_NT + pool: + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: NetCore1ESPool-Svc-Internal + demands: ImageOverride -equals windows.vs2019.amd64 + timeoutInMinutes: 180 + strategy: + matrix: + Build_Release_x64: + _BuildConfig: Release + _BuildArchitecture: x64 + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '/p:PublishInternalAsset=true' + # Never run tests on PGO bits + _TestArg: '' + Build_Release_x86: + _BuildConfig: Release + _BuildArchitecture: x86 + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '' + _TestArg: '' + Build_Release_arm64: + _BuildConfig: Release + _BuildArchitecture: arm64 + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '' + # Never run tests on arm64 + _TestArg: '' + pgoInstrument: true + + - template: /eng/build.yml + parameters: + agentOs: Linux + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + name: NetCore-Svc-Public + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: NetCore1ESPool-Svc-Internal + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 + timeoutInMinutes: 180 + strategy: + matrix: + ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: + Build_Ubuntu_18_04_Debug_x64: + _BuildConfig: Debug + _DockerParameter: '--docker ubuntu.18.04' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _TestArg: $(_NonWindowsTestArg) + Build_Fedora_36_Debug_x64: + _BuildConfig: Debug + _DockerParameter: '--docker fedora.36' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _TestArg: $(_NonWindowsTestArg) + Build_CentOS_7_Debug_x64: + _BuildConfig: Debug + _DockerParameter: '--docker centos' + _LinuxPortable: '' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _TestArg: $(_NonWindowsTestArg) + Build_Debian_11_Debug_x64: + _BuildConfig: Debug + _DockerParameter: '--docker debian' + _LinuxPortable: '' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _AdditionalBuildParameters: '/p:BuildSdkDeb=true' + _TestArg: $(_NonWindowsTestArg) + Build_Arm64_Debug: + _BuildConfig: Debug + _DockerParameter: '' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '--runtime-id linux-arm64' + _BuildArchitecture: 'arm64' + # Never run tests on arm64 + _TestArg: '' + Build_Linux_musl_Debug_x64: + _BuildConfig: Debug + _DockerParameter: '--docker alpine.3.15' + _LinuxPortable: '' + _RuntimeIdentifier: '--runtime-id linux-musl-x64' + _BuildArchitecture: 'x64' + # Pass in HostOSName when running on alpine + _AdditionalBuildParameters: '/p:HostOSName="linux-musl"' + _TestArg: $(_NonWindowsTestArg) + ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + Build_Arm_Release: + _BuildConfig: Release + _DockerParameter: '' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '--runtime-id linux-arm' + _BuildArchitecture: 'arm' + # Never run tests on arm + _TestArg: '' + Build_Arm64_Release: + _BuildConfig: Release + _DockerParameter: '' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '--runtime-id linux-arm64' + _BuildArchitecture: 'arm64' + # Never run tests on arm64 + _TestArg: '' + Build_Linux_musl_Release_arm: + _BuildConfig: Release + # linux-musl-arm cross gen depends on glibc 2.27 (this OS has it) + _DockerParameter: '--docker ubuntu.18.04' + _LinuxPortable: '' + _RuntimeIdentifier: '--runtime-id linux-musl-arm' + _BuildArchitecture: 'arm' + _AdditionalBuildParameters: '/p:OSName="linux-musl"' + # Never run tests on arm + _TestArg: '' + Build_Linux_musl_Release_arm64: + _BuildConfig: Release + _DockerParameter: '' + _LinuxPortable: '' + _RuntimeIdentifier: '--runtime-id linux-musl-arm64' + _BuildArchitecture: 'arm64' + _AdditionalBuildParameters: '/p:OSName="linux-musl"' + # Never run tests on arm64 + _TestArg: '' + Build_Linux_musl_Release_x64: + _BuildConfig: Release + _DockerParameter: '--docker alpine.3.15' + _LinuxPortable: '' + _RuntimeIdentifier: '--runtime-id linux-musl-x64' + _BuildArchitecture: 'x64' + # Pass in HostOSName when running on alpine + _AdditionalBuildParameters: '/p:HostOSName="linux-musl"' + Build_Linux_Portable_Deb_Release_x64: + _BuildConfig: Release + _DockerParameter: '--docker ubuntu.18.04' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '' + _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' + _TestArg: $(_NonWindowsTestArg) + Build_Linux_Portable_Rpm_Release_x64: + _BuildConfig: Release + _DockerParameter: '--docker centos' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + # Do not publish zips and tarballs. The linux-x64 binaries are + # already published by Build_LinuxPortable_Release_x64 + _AdditionalBuildParameters: '/p:PublishBinariesAndBadge=false' + _TestArg: $(_NonWindowsTestArg) + Build_Linux_Portable_Rpm_Release_Arm64: + _BuildConfig: Release + _DockerParameter: '--docker centos' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '--runtime-id linux-arm64' + _BuildArchitecture: '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' + # Never run tests on arm64 + _TestArg: '' + Build_LinuxPortable_Release_x64: + _BuildConfig: Release + _DockerParameter: '' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _TestArg: $(_NonWindowsTestArg) + + - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - template: /eng/build.yml + parameters: + agentOs: Linux + pool: + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: NetCore1ESPool-Svc-Internal + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 + timeoutInMinutes: 180 + strategy: + matrix: + Build_LinuxPortable_Release_x64: + _BuildConfig: Release + _DockerParameter: '' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _TestArg: '' + Build_Release_arm64: + _BuildConfig: Release + _BuildArchitecture: arm64 + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '' + # Never run tests on arm64 + _TestArg: '' + pgoInstrument: true + + - template: /eng/build.yml + parameters: + agentOs: Darwin + pool: + vmImage: 'macOS-latest' + timeoutInMinutes: 180 + strategy: + matrix: + Build_Release_x64: + _BuildConfig: Release + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _TestArg: $(_NonWindowsTestArg) + ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + Build_Release_arm64: + _BuildConfig: Release + _RuntimeIdentifier: '--runtime-id osx-arm64' + _BuildArchitecture: 'arm64' + # Never run tests on arm64 + _TestArg: '' + + - template: /eng/common/templates/jobs/source-build.yml + + - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml + + # For .NET 7.0, source-build currently supports 7.0.1xx. Disable tarball build validation in all other branches. + # - ${{ if in(variables['Build.Reason'], 'PullRequest') }}: + # - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml + # parameters: + # dependsOn: Source_Build_Create_Tarball + + # https://github.com/dotnet/core-sdk/issues/248 + # - template: /eng/build.yml + # parameters: + # agentOs: FreeBSD + # queue: + # name: dnceng-freebsd-internal + # timeoutInMinutes: 180 + # matrix: + # Build_Release: + # _BuildConfig: Release + # _BuildArchitecture: 'x64' + # _AdditionalBuildParameters: '/p:DisableSourceLink=true /p:DISABLE_CROSSGEN=true' + + - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - template: /eng/common/templates/job/publish-build-assets.yml + parameters: + dependsOn: + - Windows_NT + - Linux + - Darwin + - Source_Build_Managed + - Source_Build_Create_Tarball + - PGO_Linux + - PGO_Windows_NT + publishUsingPipelines: true + pool: + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: NetCore1ESPool-Svc-Internal + demands: ImageOverride -equals windows.vs2017.amd64 + + +- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - template: eng\common\templates\post-build\post-build.yml + parameters: + publishingInfraVersion: 3 + enableSymbolValidation: false + enableSigningValidation: false + enableNugetValidation: false + enableSourceLinkValidation: false + publishInstallersAndChecksums: true + SDLValidationParameters: + enable: false + params: ' -SourceToolsList @("policheck","credscan") + -TsaInstanceURL $(_TsaInstanceURL) + -TsaProjectName $(_TsaProjectName) + -TsaNotificationEmail $(_TsaNotificationEmail) + -TsaCodebaseAdmin $(_TsaCodebaseAdmin) + -TsaBugAreaPath $(_TsaBugAreaPath) + -TsaIterationPath $(_TsaIterationPath) + -TsaRepositoryName "dotnet-installer" + -TsaCodebaseName "dotnet-installer" + -TsaPublish $True' From 65623709969280ad5928b1c8df8a292b663dadcc Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Mon, 11 Mar 2024 02:20:32 -0700 Subject: [PATCH 428/535] [release/7.0.4xx] Add -pr version of pipeline --- .vsts-pr.yml | 394 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 394 insertions(+) create mode 100644 .vsts-pr.yml diff --git a/.vsts-pr.yml b/.vsts-pr.yml new file mode 100644 index 000000000..5e2cdc745 --- /dev/null +++ b/.vsts-pr.yml @@ -0,0 +1,394 @@ +trigger: + batch: true + branches: + include: + - main + - master + - release/* + - internal/release/3.* + - internal/release/5.* + - internal/release/6.* + - internal/release/7.* + +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 + +# Default to running tests in PRs and public CI, but not in official builds +- name: _WindowsTestArg + value: '-test' +- name: _NonWindowsTestArg + value: '--test' +- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - name: _WindowsTestArg + value: '' + - name: _NonWindowsTestArg + value: '' + +- 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) + +stages: +- stage: build + jobs: + - job: Publish_Build_Configuration + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + name: NetCore-Svc-Public + demands: ImageOverride -equals windows.vs2019.amd64.open + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: NetCore1ESPool-Svc-Internal + demands: ImageOverride -equals windows.vs2019.amd64 + steps: + - publish: $(Build.SourcesDirectory)\eng\BuildConfiguration + artifact: BuildConfiguration + displayName: Publish Build Config + - template: /eng/build.yml + parameters: + agentOs: Windows_NT + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + name: NetCore-Svc-Public + demands: ImageOverride -equals windows.vs2019.amd64.open + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: NetCore1ESPool-Svc-Internal + demands: ImageOverride -equals windows.vs2019.amd64 + timeoutInMinutes: 180 + strategy: + matrix: + # Public-only builds + ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: + Build_Release_x64: + _BuildConfig: Debug + _BuildArchitecture: x64 + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '/p:PublishInternalAsset=true' + _TestArg: $(_WindowsTestArg) + # Internal-only builds + ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + Build_Release_x64: + _BuildConfig: Release + _BuildArchitecture: x64 + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '/p:PublishInternalAsset=true' + _TestArg: $(_WindowsTestArg) + Build_Release_x86: + _BuildConfig: Release + _BuildArchitecture: x86 + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '' + _TestArg: $(_WindowsTestArg) + Build_Release_arm64: + _BuildConfig: Release + _BuildArchitecture: arm64 + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '' + # Never run tests on arm64 + _TestArg: '' + + - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - template: /eng/build.yml + parameters: + agentOs: Windows_NT + pool: + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: NetCore1ESPool-Svc-Internal + demands: ImageOverride -equals windows.vs2019.amd64 + timeoutInMinutes: 180 + strategy: + matrix: + Build_Release_x64: + _BuildConfig: Release + _BuildArchitecture: x64 + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '/p:PublishInternalAsset=true' + # Never run tests on PGO bits + _TestArg: '' + Build_Release_x86: + _BuildConfig: Release + _BuildArchitecture: x86 + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '' + _TestArg: '' + Build_Release_arm64: + _BuildConfig: Release + _BuildArchitecture: arm64 + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '' + # Never run tests on arm64 + _TestArg: '' + pgoInstrument: true + + - template: /eng/build.yml + parameters: + agentOs: Linux + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + name: NetCore-Svc-Public + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: NetCore1ESPool-Svc-Internal + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 + timeoutInMinutes: 180 + strategy: + matrix: + ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: + Build_Ubuntu_18_04_Debug_x64: + _BuildConfig: Debug + _DockerParameter: '--docker ubuntu.18.04' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _TestArg: $(_NonWindowsTestArg) + Build_Fedora_36_Debug_x64: + _BuildConfig: Debug + _DockerParameter: '--docker fedora.36' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _TestArg: $(_NonWindowsTestArg) + Build_CentOS_7_Debug_x64: + _BuildConfig: Debug + _DockerParameter: '--docker centos' + _LinuxPortable: '' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _TestArg: $(_NonWindowsTestArg) + Build_Debian_11_Debug_x64: + _BuildConfig: Debug + _DockerParameter: '--docker debian' + _LinuxPortable: '' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _AdditionalBuildParameters: '/p:BuildSdkDeb=true' + _TestArg: $(_NonWindowsTestArg) + Build_Arm64_Debug: + _BuildConfig: Debug + _DockerParameter: '' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '--runtime-id linux-arm64' + _BuildArchitecture: 'arm64' + # Never run tests on arm64 + _TestArg: '' + Build_Linux_musl_Debug_x64: + _BuildConfig: Debug + _DockerParameter: '--docker alpine.3.15' + _LinuxPortable: '' + _RuntimeIdentifier: '--runtime-id linux-musl-x64' + _BuildArchitecture: 'x64' + # Pass in HostOSName when running on alpine + _AdditionalBuildParameters: '/p:HostOSName="linux-musl"' + _TestArg: $(_NonWindowsTestArg) + ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + Build_Arm_Release: + _BuildConfig: Release + _DockerParameter: '' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '--runtime-id linux-arm' + _BuildArchitecture: 'arm' + # Never run tests on arm + _TestArg: '' + Build_Arm64_Release: + _BuildConfig: Release + _DockerParameter: '' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '--runtime-id linux-arm64' + _BuildArchitecture: 'arm64' + # Never run tests on arm64 + _TestArg: '' + Build_Linux_musl_Release_arm: + _BuildConfig: Release + # linux-musl-arm cross gen depends on glibc 2.27 (this OS has it) + _DockerParameter: '--docker ubuntu.18.04' + _LinuxPortable: '' + _RuntimeIdentifier: '--runtime-id linux-musl-arm' + _BuildArchitecture: 'arm' + _AdditionalBuildParameters: '/p:OSName="linux-musl"' + # Never run tests on arm + _TestArg: '' + Build_Linux_musl_Release_arm64: + _BuildConfig: Release + _DockerParameter: '' + _LinuxPortable: '' + _RuntimeIdentifier: '--runtime-id linux-musl-arm64' + _BuildArchitecture: 'arm64' + _AdditionalBuildParameters: '/p:OSName="linux-musl"' + # Never run tests on arm64 + _TestArg: '' + Build_Linux_musl_Release_x64: + _BuildConfig: Release + _DockerParameter: '--docker alpine.3.15' + _LinuxPortable: '' + _RuntimeIdentifier: '--runtime-id linux-musl-x64' + _BuildArchitecture: 'x64' + # Pass in HostOSName when running on alpine + _AdditionalBuildParameters: '/p:HostOSName="linux-musl"' + Build_Linux_Portable_Deb_Release_x64: + _BuildConfig: Release + _DockerParameter: '--docker ubuntu.18.04' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '' + _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' + _TestArg: $(_NonWindowsTestArg) + Build_Linux_Portable_Rpm_Release_x64: + _BuildConfig: Release + _DockerParameter: '--docker centos' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + # Do not publish zips and tarballs. The linux-x64 binaries are + # already published by Build_LinuxPortable_Release_x64 + _AdditionalBuildParameters: '/p:PublishBinariesAndBadge=false' + _TestArg: $(_NonWindowsTestArg) + Build_Linux_Portable_Rpm_Release_Arm64: + _BuildConfig: Release + _DockerParameter: '--docker centos' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '--runtime-id linux-arm64' + _BuildArchitecture: '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' + # Never run tests on arm64 + _TestArg: '' + Build_LinuxPortable_Release_x64: + _BuildConfig: Release + _DockerParameter: '' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _TestArg: $(_NonWindowsTestArg) + + - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - template: /eng/build.yml + parameters: + agentOs: Linux + pool: + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: NetCore1ESPool-Svc-Internal + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 + timeoutInMinutes: 180 + strategy: + matrix: + Build_LinuxPortable_Release_x64: + _BuildConfig: Release + _DockerParameter: '' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _TestArg: '' + Build_Release_arm64: + _BuildConfig: Release + _BuildArchitecture: arm64 + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '' + # Never run tests on arm64 + _TestArg: '' + pgoInstrument: true + + - template: /eng/build.yml + parameters: + agentOs: Darwin + pool: + vmImage: 'macOS-latest' + timeoutInMinutes: 180 + strategy: + matrix: + Build_Release_x64: + _BuildConfig: Release + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _TestArg: $(_NonWindowsTestArg) + ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + Build_Release_arm64: + _BuildConfig: Release + _RuntimeIdentifier: '--runtime-id osx-arm64' + _BuildArchitecture: 'arm64' + # Never run tests on arm64 + _TestArg: '' + + - template: /eng/common/templates/jobs/source-build.yml + + - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml + + # For .NET 7.0, source-build currently supports 7.0.1xx. Disable tarball build validation in all other branches. + # - ${{ if in(variables['Build.Reason'], 'PullRequest') }}: + # - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml + # parameters: + # dependsOn: Source_Build_Create_Tarball + + # https://github.com/dotnet/core-sdk/issues/248 + # - template: /eng/build.yml + # parameters: + # agentOs: FreeBSD + # queue: + # name: dnceng-freebsd-internal + # timeoutInMinutes: 180 + # matrix: + # Build_Release: + # _BuildConfig: Release + # _BuildArchitecture: 'x64' + # _AdditionalBuildParameters: '/p:DisableSourceLink=true /p:DISABLE_CROSSGEN=true' + + - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - template: /eng/common/templates/job/publish-build-assets.yml + parameters: + dependsOn: + - Windows_NT + - Linux + - Darwin + - Source_Build_Managed + - Source_Build_Create_Tarball + - PGO_Linux + - PGO_Windows_NT + publishUsingPipelines: true + pool: + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: NetCore1ESPool-Svc-Internal + demands: ImageOverride -equals windows.vs2017.amd64 + + +- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - template: eng\common\templates\post-build\post-build.yml + parameters: + publishingInfraVersion: 3 + enableSymbolValidation: false + enableSigningValidation: false + enableNugetValidation: false + enableSourceLinkValidation: false + publishInstallersAndChecksums: true + SDLValidationParameters: + enable: false + params: ' -SourceToolsList @("policheck","credscan") + -TsaInstanceURL $(_TsaInstanceURL) + -TsaProjectName $(_TsaProjectName) + -TsaNotificationEmail $(_TsaNotificationEmail) + -TsaCodebaseAdmin $(_TsaCodebaseAdmin) + -TsaBugAreaPath $(_TsaBugAreaPath) + -TsaIterationPath $(_TsaIterationPath) + -TsaRepositoryName "dotnet-installer" + -TsaCodebaseName "dotnet-installer" + -TsaPublish $True' From a86a2615ead1eaa7c2fa0f0051145b22072f7fad Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Mon, 11 Mar 2024 02:21:35 -0700 Subject: [PATCH 429/535] [release/8.0.1xx] 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 000000000..d14d1293e --- /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_36_Debug_x64 + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-36' + 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_Stretch_Debug_x64 + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:debian-stretch' + 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.15-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-18.04-cross' + 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.15-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 e4bf76d2c73f1c998384817201712f8285eeb834 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 11 Mar 2024 14:39:00 +0000 Subject: [PATCH 430/535] Update dependencies from https://github.com/dotnet/source-build-externals build 20240311.1 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 8.0.0-alpha.1.24158.3 -> To Version 8.0.0-alpha.1.24161.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 728b2c591..8b2225244 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -193,9 +193,9 @@ 5957c5c5f85f17c145e7fab4ece37ad6aafcded9 - + https://github.com/dotnet/source-build-externals - 7a9b99e457a2b9792a3c17ccaf95d80038725108 + 00fb7841c80b44262646e57bcfbe90a1b7bc3151 From ea08eb4e485146d60b4a83fdf61253e4ba4a09b0 Mon Sep 17 00:00:00 2001 From: Nikola Milosavljevic Date: Mon, 11 Mar 2024 12:06:58 -0700 Subject: [PATCH 431/535] [release/6.0.1xx] Use SHA256 for RPM digest (#18112) --- src/core-sdk-tasks/BuildFPMToolPreReqs.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/core-sdk-tasks/BuildFPMToolPreReqs.cs b/src/core-sdk-tasks/BuildFPMToolPreReqs.cs index ec43d0ae3..b24fbfd10 100644 --- a/src/core-sdk-tasks/BuildFPMToolPreReqs.cs +++ b/src/core-sdk-tasks/BuildFPMToolPreReqs.cs @@ -101,6 +101,7 @@ namespace Microsoft.DotNet.Build.Tasks // -a : architecture --JSON // -d : is for all dependent packages. This can be used multiple times to specify the dependencies of the package. --JSON // --rpm-os : the operating system to target this rpm --Static + // --rpm-digest : rpm digest algorithm --Static // --rpm-changelog : the changelog from FILEPATH contents --ARG // --rpm-summary : it is the RPM summary that shows in the Title --JSON // --description : it is the description for the package --JSON @@ -157,6 +158,7 @@ namespace Microsoft.DotNet.Build.Tasks } parameters.Add("--rpm-os linux"); + parameters.Add("--rpm-digest sha256"); parameters.Add(string.Concat("--rpm-changelog ", EscapeArg(Path.Combine(InputDir, "templates", "changelog")))); // Changelog File parameters.Add(string.Concat("--rpm-summary ", EscapeArg(configJson.Short_Description))); From 1267eea058f9b9ef2d2913aa2abfe83731630557 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 12 Mar 2024 15:56:12 +0000 Subject: [PATCH 432/535] Update dependencies from https://github.com/dotnet/source-build-externals build 20240312.2 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 7.0.0-alpha.1.24158.4 -> To Version 7.0.0-alpha.1.24162.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 4d4f1da15..d5ae4cda8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -180,9 +180,9 @@ c3ad00ae84489071080a606f6a8e43c9a91a5cc2 - + https://github.com/dotnet/source-build-externals - beb06e4f3aa045bddf4082111fcf005f80ca9fa6 + 936411dd5d047cef6674b47872104a3a59cf5754 From 82fb0dc47419f386a12500fc973a471b87c3ab29 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 12 Mar 2024 15:56:15 +0000 Subject: [PATCH 433/535] Update dependencies from https://github.com/dotnet/source-build-externals build 20240312.2 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 7.0.0-alpha.1.24158.4 -> To Version 7.0.0-alpha.1.24162.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 5bd747d0b..b133817c8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -180,9 +180,9 @@ c3ad00ae84489071080a606f6a8e43c9a91a5cc2 - + https://github.com/dotnet/source-build-externals - beb06e4f3aa045bddf4082111fcf005f80ca9fa6 + 936411dd5d047cef6674b47872104a3a59cf5754 From 54c244e049234576ff6d4b6b8775e84b125be5f5 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 12 Mar 2024 09:51:06 -0700 Subject: [PATCH 434/535] Update the nuget and msbuild ref versions for the installer tasks to the matching version we ship --- eng/Versions.props | 7 ++++++- src/core-sdk-tasks/core-sdk-tasks.csproj | 6 +++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index b3f94eb3d..54fa8e28d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -93,7 +93,12 @@ - 5.8.0 + 6.0.6-rc.4 + $(NuGetBuildTasksPackageVersion) + + + + 17.0.1 diff --git a/src/core-sdk-tasks/core-sdk-tasks.csproj b/src/core-sdk-tasks/core-sdk-tasks.csproj index 5ad1f11af..f92da6189 100644 --- a/src/core-sdk-tasks/core-sdk-tasks.csproj +++ b/src/core-sdk-tasks/core-sdk-tasks.csproj @@ -9,12 +9,12 @@ - - + + - + From 0178176a36e6016f046ab9529945f4789ac6bb51 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 12 Mar 2024 09:54:04 -0700 Subject: [PATCH 435/535] Update to the 6.0.4xx version --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 54fa8e28d..55355afce 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -93,12 +93,12 @@ - 6.0.6-rc.4 + 6.3.4-rc.2 $(NuGetBuildTasksPackageVersion) - 17.0.1 + 17.3.2 From 32965a6b7c3d408bee9f34fcf482951c74d76ab5 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 12 Mar 2024 11:38:45 -0700 Subject: [PATCH 436/535] Update the SRM version to match the version coming from msbuild --- src/core-sdk-tasks/core-sdk-tasks.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core-sdk-tasks/core-sdk-tasks.csproj b/src/core-sdk-tasks/core-sdk-tasks.csproj index f92da6189..5fc33672a 100644 --- a/src/core-sdk-tasks/core-sdk-tasks.csproj +++ b/src/core-sdk-tasks/core-sdk-tasks.csproj @@ -14,7 +14,7 @@ - + From 977b3bce63a0a5537ea18982cf4432523c8491ab Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 12 Mar 2024 09:51:06 -0700 Subject: [PATCH 437/535] Update the nuget and msbuild ref versions for the installer tasks to the matching version we ship --- eng/Versions.props | 7 ++++++- src/core-sdk-tasks/core-sdk-tasks.csproj | 6 +++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 93814ecf5..c6dcff420 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -107,7 +107,12 @@ - 5.8.0 + 6.0.6-rc.4 + $(NuGetBuildTasksPackageVersion) + + + + 17.0.1 diff --git a/src/core-sdk-tasks/core-sdk-tasks.csproj b/src/core-sdk-tasks/core-sdk-tasks.csproj index 5ad1f11af..f92da6189 100644 --- a/src/core-sdk-tasks/core-sdk-tasks.csproj +++ b/src/core-sdk-tasks/core-sdk-tasks.csproj @@ -9,12 +9,12 @@ - - + + - + From 6e0da5d6f222309d36bc3c32181e8b3e948e60c8 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 12 Mar 2024 12:37:40 -0700 Subject: [PATCH 438/535] Update to the 7.0.1xx versions --- eng/Versions.props | 4 ++-- src/core-sdk-tasks/core-sdk-tasks.csproj | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index c6dcff420..125075af6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -107,12 +107,12 @@ - 6.0.6-rc.4 + 6.4.3-rc.1 $(NuGetBuildTasksPackageVersion) - 17.0.1 + 17.4.8 diff --git a/src/core-sdk-tasks/core-sdk-tasks.csproj b/src/core-sdk-tasks/core-sdk-tasks.csproj index f92da6189..5fc33672a 100644 --- a/src/core-sdk-tasks/core-sdk-tasks.csproj +++ b/src/core-sdk-tasks/core-sdk-tasks.csproj @@ -14,7 +14,7 @@ - + From 1fbb0569de463849d7131206953e33fccdd46790 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 12 Mar 2024 09:51:06 -0700 Subject: [PATCH 439/535] Update the nuget and msbuild ref versions for the installer tasks to the matching version we ship --- eng/Versions.props | 7 ++++++- src/core-sdk-tasks/core-sdk-tasks.csproj | 6 +++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 3cd2b7e73..d82100764 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -111,7 +111,12 @@ - 5.8.0 + 6.0.6-rc.4 + $(NuGetBuildTasksPackageVersion) + + + + 17.0.1 diff --git a/src/core-sdk-tasks/core-sdk-tasks.csproj b/src/core-sdk-tasks/core-sdk-tasks.csproj index 5ad1f11af..f92da6189 100644 --- a/src/core-sdk-tasks/core-sdk-tasks.csproj +++ b/src/core-sdk-tasks/core-sdk-tasks.csproj @@ -9,12 +9,12 @@ - - + + - + From bd48163a324ebbd8cf1b2843e89cd63435a50522 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 12 Mar 2024 12:49:25 -0700 Subject: [PATCH 440/535] Update to the 7.0.3xx versions --- eng/Versions.props | 4 ++-- src/core-sdk-tasks/core-sdk-tasks.csproj | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index d82100764..66d18ca2b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -111,12 +111,12 @@ - 6.0.6-rc.4 + 6.6.2-rc.1 $(NuGetBuildTasksPackageVersion) - 17.0.1 + 17.6.10 diff --git a/src/core-sdk-tasks/core-sdk-tasks.csproj b/src/core-sdk-tasks/core-sdk-tasks.csproj index f92da6189..d9cdc0381 100644 --- a/src/core-sdk-tasks/core-sdk-tasks.csproj +++ b/src/core-sdk-tasks/core-sdk-tasks.csproj @@ -14,7 +14,7 @@ - + From 8e5bd09ba0a7ed5286a5a7a78518955f81270f7e Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 12 Mar 2024 09:51:06 -0700 Subject: [PATCH 441/535] Update the nuget and msbuild ref versions for the installer tasks to the matching version we ship --- eng/Versions.props | 7 ++++++- src/core-sdk-tasks/core-sdk-tasks.csproj | 6 +++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 1c2cf4220..35145bde9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -111,7 +111,12 @@ - 5.8.0 + 6.0.6-rc.4 + $(NuGetBuildTasksPackageVersion) + + + + 17.0.1 diff --git a/src/core-sdk-tasks/core-sdk-tasks.csproj b/src/core-sdk-tasks/core-sdk-tasks.csproj index 5ad1f11af..f92da6189 100644 --- a/src/core-sdk-tasks/core-sdk-tasks.csproj +++ b/src/core-sdk-tasks/core-sdk-tasks.csproj @@ -9,12 +9,12 @@ - - + + - + From 51480eb1bba3851603e912ccd15e0786a2266250 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 12 Mar 2024 12:55:15 -0700 Subject: [PATCH 442/535] Update to 7.0.4xx versions --- eng/Versions.props | 4 ++-- src/core-sdk-tasks/core-sdk-tasks.csproj | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 35145bde9..e97055a2e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -111,12 +111,12 @@ - 6.0.6-rc.4 + 6.7.1-rc.1 $(NuGetBuildTasksPackageVersion) - 17.0.1 + 17.7.4 diff --git a/src/core-sdk-tasks/core-sdk-tasks.csproj b/src/core-sdk-tasks/core-sdk-tasks.csproj index f92da6189..d9cdc0381 100644 --- a/src/core-sdk-tasks/core-sdk-tasks.csproj +++ b/src/core-sdk-tasks/core-sdk-tasks.csproj @@ -14,7 +14,7 @@ - + From 016e1e4c01ace7253095f672fd718e5d3cf8cea1 Mon Sep 17 00:00:00 2001 From: NET Source-Build Bot <102560831+dotnet-sb-bot@users.noreply.github.com> Date: Tue, 12 Mar 2024 21:46:04 +0100 Subject: [PATCH 443/535] .NET Source-Build 7.0.117 March 2024 Updates (#19005) --- 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 93814ecf5..d6abe5a3a 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.116 - 7.0.116 + 7.0.117 + 7.0.117 diff --git a/src/SourceBuild/tarball/content/global.json b/src/SourceBuild/tarball/content/global.json index 68bdc9ac8..7025b6303 100644 --- a/src/SourceBuild/tarball/content/global.json +++ b/src/SourceBuild/tarball/content/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.116" + "dotnet": "7.0.117" }, "msbuild-sdks": { "Microsoft.Build.CentralPackageVersions": "2.0.1", From 83f3cc20f40d7c72e4e9c3c2cb01ba708c13ddd3 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 12 Mar 2024 16:13:30 -0700 Subject: [PATCH 444/535] source build needs the 7.0 version it looks like. Let's see if that works. --- src/core-sdk-tasks/core-sdk-tasks.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core-sdk-tasks/core-sdk-tasks.csproj b/src/core-sdk-tasks/core-sdk-tasks.csproj index 5fc33672a..d9cdc0381 100644 --- a/src/core-sdk-tasks/core-sdk-tasks.csproj +++ b/src/core-sdk-tasks/core-sdk-tasks.csproj @@ -14,7 +14,7 @@ - + From 19ba28f7636c28f90dbfeb373c55b1eec744b3bb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 13 Mar 2024 12:22:34 +0000 Subject: [PATCH 445/535] Update dependencies from https://github.com/dotnet/source-build-externals build Microsoft.SourceBuild.Intermediate.source-build-externals From Version 7.0.0-alpha.1.24158.4 -> To Version 7.0.0-alpha.1.24162.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 35f34f12c..61545cf77 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -176,9 +176,9 @@ c3ad00ae84489071080a606f6a8e43c9a91a5cc2 - + https://github.com/dotnet/source-build-externals - beb06e4f3aa045bddf4082111fcf005f80ca9fa6 + 936411dd5d047cef6674b47872104a3a59cf5754 From 7766c8b36fb170c95449a625f063ccecd34b6142 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 13 Mar 2024 12:29:47 +0000 Subject: [PATCH 446/535] Update dependencies from https://github.com/dotnet/source-build-reference-packages build Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.23565.1 -> To Version 8.0.0-alpha.1.24162.3 --- 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 8b2225244..a5640bb4f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -239,9 +239,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - 95f83e27806330fec09edd96e06bba3acabe3f35 + c08ec59adcf8b56cd1b4de2090c320496566b5c6 From 7e397bfe9b6521dd821f7b34467a4182621a6762 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 13 Mar 2024 15:10:49 +0000 Subject: [PATCH 447/535] Update dependencies from https://github.com/dotnet/arcade build Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 6.0.0-beta.24113.1 -> To Version 6.0.0-beta.24162.4 --- eng/Version.Details.xml | 12 +- eng/Versions.props | 2 +- eng/common/SetupNugetSources.ps1 | 26 +- eng/common/templates-official/job/job.yml | 276 +++++++++++++++++ .../templates-official/job/onelocbuild.yml | 109 +++++++ .../job/publish-build-assets.yml | 121 ++++++++ .../templates-official/job/source-build.yml | 64 ++++ .../job/source-index-stage1.yml | 59 ++++ .../templates-official/jobs/codeql-build.yml | 31 ++ eng/common/templates-official/jobs/jobs.yml | 100 +++++++ .../templates-official/jobs/source-build.yml | 46 +++ .../post-build/common-variables.yml | 26 ++ .../post-build/post-build.yml | 277 ++++++++++++++++++ .../post-build/setup-maestro-vars.yml | 70 +++++ .../post-build/trigger-subscription.yml | 13 + .../steps/add-build-to-channel.yml | 13 + .../steps/component-governance.yml | 10 + .../steps/execute-codeql.yml | 32 ++ .../steps/generate-sbom.yml | 44 +++ .../templates-official/steps/publish-logs.yml | 23 ++ .../templates-official/steps/retain-build.yml | 28 ++ .../steps/send-to-helix.yml | 94 ++++++ .../templates-official/steps/source-build.yml | 108 +++++++ .../variables/sdl-variables.yml | 7 + global.json | 6 +- 25 files changed, 1574 insertions(+), 23 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/component-governance.yml create mode 100644 eng/common/templates-official/steps/execute-codeql.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/sdl-variables.yml diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bc6caff49..e19d8eb63 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - 96facbceaca1e4eb498055c005088764d3b38dff + c80f6c7bcfdd0e62a3012f9a97ab52be477c7d75 - + https://github.com/dotnet/arcade - 96facbceaca1e4eb498055c005088764d3b38dff + c80f6c7bcfdd0e62a3012f9a97ab52be477c7d75 - + https://github.com/dotnet/arcade - 96facbceaca1e4eb498055c005088764d3b38dff + c80f6c7bcfdd0e62a3012f9a97ab52be477c7d75 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index b3f94eb3d..78e95c0ee 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.24113.1 + 6.0.0-beta.24162.4 diff --git a/eng/common/SetupNugetSources.ps1 b/eng/common/SetupNugetSources.ps1 index 18823840b..0182856ed 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) @@ -49,11 +49,11 @@ function AddPackageSource($sources, $SourceName, $SourceEndPoint, $creds, $Usern Write-Host "Package source $SourceName already present." } - AddCredential -Creds $creds -Source $SourceName -Username $Username -Password $Password + AddCredential -Creds $creds -Source $SourceName -Username $Username -Password $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 +82,17 @@ 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,24 +144,24 @@ 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 $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 } $dotnet5Source = $sources.SelectSingleNode("add[@key='dotnet5']") if ($dotnet5Source -ne $null) { - AddPackageSource -Sources $sources -SourceName "dotnet5-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet5-internal/nuget/v2" -Creds $creds -Username $userName -Password $Password - AddPackageSource -Sources $sources -SourceName "dotnet5-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet5-internal-transport/nuget/v2" -Creds $creds -Username $userName -Password $Password + AddPackageSource -Sources $sources -SourceName "dotnet5-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet5-internal/nuget/v2" -Creds $creds -Username $userName -pwd $Password + AddPackageSource -Sources $sources -SourceName "dotnet5-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet5-internal-transport/nuget/v2" -Creds $creds -Username $userName -pwd $Password } $dotnet6Source = $sources.SelectSingleNode("add[@key='dotnet6']") if ($dotnet6Source -ne $null) { - AddPackageSource -Sources $sources -SourceName "dotnet6-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet6-internal/nuget/v2" -Creds $creds -Username $userName -Password $Password - AddPackageSource -Sources $sources -SourceName "dotnet6-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet6-internal-transport/nuget/v2" -Creds $creds -Username $userName -Password $Password + AddPackageSource -Sources $sources -SourceName "dotnet6-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet6-internal/nuget/v2" -Creds $creds -Username $userName -pwd $Password + AddPackageSource -Sources $sources -SourceName "dotnet6-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet6-internal-transport/nuget/v2" -Creds $creds -Username $userName -pwd $Password } $doc.Save($filename) diff --git a/eng/common/templates-official/job/job.yml b/eng/common/templates-official/job/job.yml new file mode 100644 index 000000000..616bfc386 --- /dev/null +++ b/eng/common/templates-official/job/job.yml @@ -0,0 +1,276 @@ +# 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: '' + templateContext: '' + +# 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 + disableComponentGovernance: '' + mergeTestResults: false + testRunTitle: '' + testResultsFormat: '' + name: '' + preSteps: [] + runAsPublic: false +# Sbom related params + enableSbom: true + PackageVersion: 6.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 }} + + ${{ if ne(parameters.templateContext, '') }}: + templateContext: ${{ parameters.templateContext }} + + 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 key-value variable syntax. + # example: + # - [key]: [value] + - ${{ if and(eq(variable.name, ''), eq(variable.group, '')) }}: + - ${{ 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')) + + - task: NuGetAuthenticate@1 + + - ${{ if or(eq(parameters.artifacts.download, 'true'), 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 + 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 }} + + - ${{ 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 or(eq(parameters.artifacts.publish.artifacts, 'true'), 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 or(eq(parameters.artifacts.publish.logs, 'true'), ne(parameters.artifacts.publish.logs, '')) }}: + - task: 1ES.PublishPipelineArtifact@1 + inputs: + targetPath: 'artifacts/log' + artifactName: ${{ coalesce(parameters.artifacts.publish.logs.name, 'Logs_Build_$(Agent.Os)_$(_BuildConfig)') }} + displayName: 'Publish logs' + continueOnError: true + condition: always() + + - ${{ if or(eq(parameters.artifacts.publish.manifests, 'true'), ne(parameters.artifacts.publish.manifests, '')) }}: + - ${{ if and(ne(parameters.enablePublishUsingPipelines, 'true'), eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - task: CopyFiles@2 + displayName: Gather Asset Manifests + inputs: + SourceFolder: '$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)/AssetManifest' + TargetFolder: '$(Build.ArtifactStagingDirectory)/AssetManifests' + continueOnError: ${{ parameters.continueOnError }} + condition: and(succeeded(), eq(variables['_DotNetPublishToBlobFeed'], 'true')) + + - task: 1ES.PublishBuildArtifacts@1 + displayName: Push Asset Manifests + inputs: + PathtoPublish: '$(Build.ArtifactStagingDirectory)/AssetManifests' + PublishLocation: Container + ArtifactName: AssetManifests + continueOnError: ${{ parameters.continueOnError }} + condition: and(succeeded(), eq(variables['_DotNetPublishToBlobFeed'], 'true')) + + - ${{ 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.enablePublishBuildAssets, true), ne(parameters.enablePublishUsingPipelines, 'true'), eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - task: CopyFiles@2 + displayName: Gather Asset Manifests + inputs: + SourceFolder: '$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)/AssetManifest' + TargetFolder: '$(Build.StagingDirectory)/AssetManifests' + continueOnError: ${{ parameters.continueOnError }} + condition: and(succeeded(), eq(variables['_DotNetPublishToBlobFeed'], 'true')) + + - task: 1ES.PublishBuildArtifacts@1 + displayName: Push Asset Manifests + inputs: + PathtoPublish: '$(Build.StagingDirectory)/AssetManifests' + PublishLocation: Container + ArtifactName: AssetManifests + continueOnError: ${{ parameters.continueOnError }} + condition: and(succeeded(), eq(variables['_DotNetPublishToBlobFeed'], 'true')) + + - ${{ 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 }} diff --git a/eng/common/templates-official/job/onelocbuild.yml b/eng/common/templates-official/job/onelocbuild.yml new file mode 100644 index 000000000..e0e9a4bc5 --- /dev/null +++ b/eng/common/templates-official/job/onelocbuild.yml @@ -0,0 +1,109 @@ +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 + LanguageSet: VS_Main_Languages + LclSource: lclFilesInRepo + LclPackageId: '' + RepoType: gitHub + GitHubOrg: dotnet + MirrorRepo: '' + MirrorBranch: main + condition: '' + +jobs: +- job: OneLocBuild + + dependsOn: ${{ parameters.dependsOn }} + + displayName: OneLocBuild + + ${{ 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: NetCore1ESPool-Svc-Internal + image: 1es-windows-2022-pt + os: windows + + 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 + + + steps: + - 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 }} + ${{ if eq(parameters.CreatePr, true) }}: + isAutoCompletePrSelected: ${{ parameters.AutoCompletePr }} + 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 000000000..9498aa412 --- /dev/null +++ b/eng/common/templates-official/job/publish-build-assets.yml @@ -0,0 +1,121 @@ +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 + +jobs: +- job: Asset_Registry_Publish + + dependsOn: ${{ parameters.dependsOn }} + + displayName: Publish to Build Asset Registry + + pool: ${{ parameters.pool }} + + variables: + - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - name: _BuildConfig + value: ${{ parameters.configuration }} + - group: Publish-Build-Assets + - group: AzureDevOps-Artifact-Feeds-Pats + - name: runCodesignValidationInjection + value: false + + 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 }} + + - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - task: NuGetAuthenticate@1 + + - task: PowerShell@2 + displayName: Enable cross-org NuGet feed authentication + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/enable-cross-org-publishing.ps1 + arguments: -token $(dn-bot-all-orgs-artifact-feeds-rw) + + - 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.dot.net + /p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }} + /p:Configuration=$(_BuildConfig) + /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.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 000000000..96be5e6e1 --- /dev/null +++ b/eng/common/templates-official/job/source-build.yml @@ -0,0 +1,64 @@ +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. + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + name: NetCore-Svc-Public + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: NetCore1ESPool-Svc-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 000000000..3d8b0b966 --- /dev/null +++ b/eng/common/templates-official/job/source-index-stage1.yml @@ -0,0 +1,59 @@ +parameters: + runAsPublic: false + sourceIndexPackageVersion: 1.0.1-20210614.1 + 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 + pool: + name: NetCore1ESPool-Svc-Internal + image: 1es-windows-2022-pt + os: windows + condition: '' + dependsOn: '' + +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 + + pool: ${{ parameters.pool }} + steps: + - ${{ each preStep in parameters.preSteps }}: + - ${{ preStep }} + + - task: UseDotNet@2 + displayName: Use .NET Core sdk 3.1 + inputs: + packageType: sdk + version: 3.1.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 000000000..0bf7ee29f --- /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.110.1 + - 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 000000000..669ccd48f --- /dev/null +++ b/eng/common/templates-official/jobs/jobs.yml @@ -0,0 +1,100 @@ +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: 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 + 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: NetCore1ESPool-Svc-Internal + image: 1es-windows-2022-pt + os: windows + + runAsPublic: ${{ parameters.runAsPublic }} + publishUsingPipelines: ${{ parameters.enablePublishUsingPipelines }} + enablePublishBuildArtifacts: ${{ parameters.enablePublishBuildArtifacts }} 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 000000000..2159009dc --- /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-7-3e800f1-20190501005343' + + # 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 000000000..fae340f4d --- /dev/null +++ b/eng/common/templates-official/post-build/common-variables.yml @@ -0,0 +1,26 @@ +variables: + - group: AzureDevOps-Artifact-Feeds-Pats + - group: DotNet-Blob-Feed + - group: DotNet-DotNetCli-Storage + - group: DotNet-MSRC-Storage + - 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.dot.net" + - 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 000000000..80bfa4946 --- /dev/null +++ b/eng/common/templates-official/post-build/post-build.yml @@ -0,0 +1,277 @@ +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 + 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 + +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 + jobs: + - job: + displayName: NuGet Validation + condition: 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 + ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: + name: NetCore1ESPool-Svc-Internal + 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 + demands: Cmd + os: windows + # If it's not devdiv, it's dnceng + ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: + name: NetCore1ESPool-Svc-Internal + 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' + + - task: PowerShell@2 + displayName: Enable cross-org publishing + inputs: + filePath: eng\common\enable-cross-org-publishing.ps1 + arguments: -token $(dn-bot-dnceng-artifact-feeds-rw) + + # 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' + + - 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 + ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: + name: NetCore1ESPool-Svc-Internal + 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 + +- 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 }} + ${{ if and(ne(parameters.enableNugetValidation, 'true'), ne(parameters.enableSigningValidation, 'true'), ne(parameters.enableSourceLinkValidation, 'true'), ne(parameters.SDLValidationParameters.enable, 'true')) }}: + dependsOn: ${{ parameters.validateDependsOn }} + displayName: Publish using Darc + variables: + - template: common-variables.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 + demands: Cmd + os: windows + # If it's not devdiv, it's dnceng + ${{ else }}: + name: NetCore1ESPool-Svc-Internal + image: 1es-windows-2022-pt + os: windows + steps: + - template: 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 ${{ 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 000000000..0c87f149a --- /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 000000000..da669030d --- /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 000000000..f67a210d6 --- /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/component-governance.yml b/eng/common/templates-official/steps/component-governance.yml new file mode 100644 index 000000000..babc2757d --- /dev/null +++ b/eng/common/templates-official/steps/component-governance.yml @@ -0,0 +1,10 @@ +parameters: + disableComponentGovernance: false + +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 \ 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 000000000..9b4a5ffa3 --- /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/generate-sbom.yml b/eng/common/templates-official/steps/generate-sbom.yml new file mode 100644 index 000000000..7fc4f3580 --- /dev/null +++ b/eng/common/templates-official/steps/generate-sbom.yml @@ -0,0 +1,44 @@ +# 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 + +parameters: + PackageVersion: 6.0.0 + BuildDropPath: '$(Build.SourcesDirectory)/artifacts' + PackageName: '.NET' + ManifestDirPath: $(Build.ArtifactStagingDirectory)/sbom + 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 }} + +- 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 000000000..04012fed1 --- /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 000000000..83d97a26a --- /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 000000000..cd02ae160 --- /dev/null +++ b/eng/common/templates-official/steps/send-to-helix.yml @@ -0,0 +1,94 @@ +# 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 + EnableXUnitReporter: false # optional -- true enables XUnit result reporting to Mission Control + 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 int) + 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 /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 }} + EnableXUnitReporter: ${{ parameters.EnableXUnitReporter }} + 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 /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 }} + EnableXUnitReporter: ${{ parameters.EnableXUnitReporter }} + 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 000000000..9eb7e5145 --- /dev/null +++ b/eng/common/templates-official/steps/source-build.yml @@ -0,0 +1,108 @@ +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 + + publishArgs= + if [ '${{ parameters.platform.skipPublishValidation }}' != 'true' ]; then + publishArgs='--publish' + fi + + ${{ coalesce(parameters.platform.buildScript, './build.sh') }} --ci \ + --configuration $buildConfig \ + --restore --build --pack $publishArgs -bl \ + $officialBuildArgs \ + $internalRuntimeDownloadArgs \ + $internalRestoreArgs \ + $targetRidArgs \ + $runtimeOsArgs \ + /p:SourceBuildNonPortable=${{ parameters.platform.nonPortable }} \ + /p:ArcadeBuildFromSource=true + 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() 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 000000000..1a860bd04 --- /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.110.1 +- 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 73265b36f..e1f0ec366 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.126", + "dotnet": "6.0.127", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24113.1", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.24113.1" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24162.4", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.24162.4" } } From a941a6af239f2df5e924812cce0f0e8fa964791f Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Wed, 13 Mar 2024 14:49:39 -0500 Subject: [PATCH 448/535] Update 7.0 SDK diff baseline (#19038) --- .../assets/baselines/MsftToSbSdk.diff | 101 +++++++++++++++++- 1 file changed, 96 insertions(+), 5 deletions(-) diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff index bd443698c..4d662a3c3 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff @@ -14,7 +14,23 @@ index ------------ ./packs/Microsoft.AspNetCore.App.Ref/ ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ @@ ------------ @@ + ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/Microsoft.JSInterop.xml + ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/Microsoft.Net.Http.Headers.dll + ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/Microsoft.Net.Http.Headers.xml ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.DiagnosticSource.dll ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.DiagnosticSource.xml + ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.EventLog.dll + ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.EventLog.xml ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Formats.Asn1.dll ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Formats.Asn1.xml + ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.IO.Pipelines.dll + ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.IO.Pipelines.xml + ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.Cryptography.Xml.dll ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.Cryptography.Xml.xml ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Encodings.Web.dll ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Encodings.Web.xml ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Json.dll ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Json.xml ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Threading.RateLimiting.dll ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Threading.RateLimiting.xml -./packs/Microsoft.NETCore.App.Host.portable-rid/ @@ -109,6 +125,35 @@ index ------------ ./sdk/x.y.z/DotnetTools/dotnet-format/tr/ ./sdk/x.y.z/DotnetTools/dotnet-format/tr/dotnet-format.resources.dll ./sdk/x.y.z/DotnetTools/dotnet-format/tr/Microsoft.CodeAnalysis.CSharp.Features.resources.dll +@@ ------------ @@ + ./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/Microsoft.IdentityModel.JsonWebTokens.dll + ./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/Microsoft.IdentityModel.Logging.dll + ./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/Microsoft.IdentityModel.Tokens.dll ++./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/runtimes/ ++./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/runtimes/browser/ ++./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/runtimes/browser/lib/ ++./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/runtimes/browser/lib/netx.y/ ++./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/runtimes/browser/lib/netx.y/System.Text.Encodings.Web.dll + ./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/System.IdentityModel.Tokens.Jwt.dll ++./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/System.Text.Encodings.Web.dll ++./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/System.Text.Json.dll + ./sdk/x.y.z/DotnetTools/dotnet-user-secrets/ + ./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/ + ./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/ +@@ ------------ @@ + ./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Microsoft.Extensions.FileSystemGlobbing.dll + ./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Microsoft.Extensions.Primitives.dll + ./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Newtonsoft.Json.dll ++./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/runtimes/ ++./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/runtimes/browser/ ++./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/runtimes/browser/lib/ ++./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/runtimes/browser/lib/netx.y/ ++./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/runtimes/browser/lib/netx.y/System.Text.Encodings.Web.dll ++./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/System.Text.Encodings.Web.dll ++./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/System.Text.Json.dll + ./sdk/x.y.z/DotnetTools/dotnet-watch/ + ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/ + ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/ @@ ------------ @@ ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/Microsoft.CodeAnalysis.CSharp.Features.dll ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/Microsoft.CodeAnalysis.CSharp.Workspaces.dll @@ -124,21 +169,26 @@ index ------------ ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/middleware/Microsoft.AspNetCore.Watch.BrowserRefresh.dll ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/pl/ @@ ------------ @@ - ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/ru/Microsoft.CodeAnalysis.Workspaces.MSBuild.resources.dll ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/ru/Microsoft.CodeAnalysis.Workspaces.resources.dll ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/ru/System.CommandLine.resources.dll --./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/ + ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/ -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/unix/ -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/unix/lib/ -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/unix/lib/netx.y/ -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/unix/lib/netx.y/System.Drawing.Common.dll --./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/ --./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/ --./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/ ++./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/browser/ ++./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/browser/lib/ ++./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/browser/lib/netx.y/ ++./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/browser/lib/netx.y/System.Text.Encodings.Web.dll + ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/ + ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/ + ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/ -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/Microsoft.Win32.SystemEvents.dll -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/System.Drawing.Common.dll -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/System.Security.Cryptography.ProtectedData.dll -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/System.Windows.Extensions.dll ++./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/System.Text.Encoding.CodePages.dll ++./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Collections.Immutable.dll ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.CommandLine.dll ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Composition.AttributedModel.dll ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Composition.Convention.dll @@ -150,6 +200,10 @@ index ------------ -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Security.Cryptography.ProtectedData.dll -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Security.Permissions.dll -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Windows.Extensions.dll ++./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Reflection.Metadata.dll ++./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Text.Encoding.CodePages.dll ++./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Text.Encodings.Web.dll ++./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Text.Json.dll ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/tr/ ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/tr/dotnet-watch.resources.dll ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/tr/Microsoft.CodeAnalysis.CSharp.Features.resources.dll @@ -205,11 +259,21 @@ index ------------ -./sdk/x.y.z/FSharp/runtimes/win/lib/netx.y/System.Security.Cryptography.ProtectedData.dll ./sdk/x.y.z/FSharp/runtimes/win/lib/netx.y/System.Windows.Extensions.dll ./sdk/x.y.z/FSharp/System.CodeDom.dll ++./sdk/x.y.z/FSharp/System.Collections.Immutable.dll ./sdk/x.y.z/FSharp/System.Configuration.ConfigurationManager.dll +./sdk/x.y.z/FSharp/System.Diagnostics.EventLog.dll ./sdk/x.y.z/FSharp/System.Drawing.Common.dll ++./sdk/x.y.z/FSharp/System.Formats.Asn1.dll ++./sdk/x.y.z/FSharp/System.Reflection.Metadata.dll ./sdk/x.y.z/FSharp/System.Resources.Extensions.dll ./sdk/x.y.z/FSharp/System.Security.Cryptography.Pkcs.dll + ./sdk/x.y.z/FSharp/System.Security.Cryptography.ProtectedData.dll + ./sdk/x.y.z/FSharp/System.Security.Cryptography.Xml.dll + ./sdk/x.y.z/FSharp/System.Security.Permissions.dll ++./sdk/x.y.z/FSharp/System.Threading.Tasks.Dataflow.dll + ./sdk/x.y.z/FSharp/System.Windows.Extensions.dll + ./sdk/x.y.z/FSharp/tr/ + ./sdk/x.y.z/FSharp/tr/FSharp.Build.resources.dll @@ ------------ @@ ./sdk/x.y.z/Microsoft.Build.NuGetSdkResolver.dll ./sdk/x.y.z/Microsoft.Build.Tasks.Core.dll @@ -265,6 +329,13 @@ index ------------ ./sdk/x.y.z/runtimes/win/lib/netx.y/Microsoft.Win32.SystemEvents.dll ./sdk/x.y.z/runtimes/win/lib/netx.y/System.Diagnostics.EventLog.dll ./sdk/x.y.z/runtimes/win/lib/netx.y/System.Diagnostics.EventLog.Messages.dll + ./sdk/x.y.z/runtimes/win/lib/netx.y/System.Drawing.Common.dll + ./sdk/x.y.z/runtimes/win/lib/netx.y/System.Security.Cryptography.Pkcs.dll + ./sdk/x.y.z/runtimes/win/lib/netx.y/System.ServiceProcess.ServiceController.dll ++./sdk/x.y.z/runtimes/win/lib/netx.y/System.Text.Encoding.CodePages.dll + ./sdk/x.y.z/runtimes/win/lib/netx.y/System.Windows.Extensions.dll + ./sdk/x.y.z/SDKPrecomputedAssemblyReferences.cache + ./sdk/x.y.z/SdkResolvers/ @@ ------------ @@ ./sdk/x.y.z/Sdks/Microsoft.NET.ILLink.Tasks/tools/net472/System.Buffers.dll ./sdk/x.y.z/Sdks/Microsoft.NET.ILLink.Tasks/tools/net472/System.Collections.Immutable.dll @@ -289,6 +360,16 @@ index ------------ ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tasks/net472/System.Reflection.Metadata.dll ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tasks/net472/System.Runtime.CompilerServices.Unsafe.dll ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tasks/net472/System.Text.Encodings.Web.dll +@@ ------------ @@ + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tools/rzc.deps.json + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tools/rzc.dll + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tools/rzc.runtimeconfig.json ++./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tools/System.Collections.Immutable.dll ++./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tools/System.Reflection.Metadata.dll ++./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tools/System.Text.Encoding.CodePages.dll + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Web.ProjectSystem/ + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Web.ProjectSystem/Sdk/ + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Web.ProjectSystem/Sdk/Sdk.props @@ ------------ @@ ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Web/tools/net472/Microsoft.NET.Sdk.Web.Tasks.dll ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Web/tools/netx.y/ @@ -306,18 +387,28 @@ index ------------ ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk/tools/net472/System.Runtime.CompilerServices.Unsafe.dll ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk/tools/net472/System.Text.Encodings.Web.dll @@ ------------ @@ + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk/tools/netx.y/zh-Hant/Microsoft.NET.Build.Tasks.resources.dll ./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/ ./sdk/x.y.z/System.CodeDom.dll ++./sdk/x.y.z/System.Collections.Immutable.dll ./sdk/x.y.z/System.CommandLine.dll -./sdk/x.y.z/System.ComponentModel.Composition.dll ./sdk/x.y.z/System.Configuration.ConfigurationManager.dll ./sdk/x.y.z/System.Diagnostics.EventLog.dll ./sdk/x.y.z/System.Drawing.Common.dll ++./sdk/x.y.z/System.Formats.Asn1.dll ++./sdk/x.y.z/System.Reflection.Metadata.dll + ./sdk/x.y.z/System.Reflection.MetadataLoadContext.dll + ./sdk/x.y.z/System.Resources.Extensions.dll + ./sdk/x.y.z/System.Security.Cryptography.Pkcs.dll @@ ------------ @@ ./sdk/x.y.z/System.Security.Cryptography.Xml.dll ./sdk/x.y.z/System.Security.Permissions.dll ./sdk/x.y.z/System.ServiceProcess.ServiceController.dll ++./sdk/x.y.z/System.Text.Encoding.CodePages.dll +./sdk/x.y.z/System.Text.Encodings.Web.dll ++./sdk/x.y.z/System.Text.Json.dll ++./sdk/x.y.z/System.Threading.Tasks.Dataflow.dll ./sdk/x.y.z/System.Windows.Extensions.dll -./sdk/x.y.z/testhost-1.0.runtimeconfig.json -./sdk/x.y.z/testhost-1.1.runtimeconfig.json From 6c6471e5019bf5bd79a240173a66355317d02596 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 13 Mar 2024 23:16:09 +0000 Subject: [PATCH 449/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.103 -> To Version 8.0.104 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.SourceBuild.Intermediate.emsdk From Version 8.0.3-servicing.24114.23 -> To Version 8.0.4-servicing.24162.12 (parent: Microsoft.NET.Sdk --- NuGet.config | 16 ++++++------ eng/Version.Details.xml | 56 ++++++++++++++++++++--------------------- eng/Versions.props | 22 ++++++++-------- 3 files changed, 48 insertions(+), 46 deletions(-) diff --git a/NuGet.config b/NuGet.config index cef841a23..252c67119 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,22 +7,23 @@ - + - - + - + + + @@ -43,14 +44,15 @@ - - + - + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f5bdb0a3c..2e797a772 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -21,30 +21,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop baf3c0df45e13d065884f7e84260f645295f219e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9f4b1f5d664afdfc80e1508ab7ed099dff210fbd + 5cff8b8eb04adfca21ccdec7e88b9ee7b3952fee - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9f4b1f5d664afdfc80e1508ab7ed099dff210fbd + 5cff8b8eb04adfca21ccdec7e88b9ee7b3952fee - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9f4b1f5d664afdfc80e1508ab7ed099dff210fbd + 5cff8b8eb04adfca21ccdec7e88b9ee7b3952fee - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9f4b1f5d664afdfc80e1508ab7ed099dff210fbd + 5cff8b8eb04adfca21ccdec7e88b9ee7b3952fee - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9f4b1f5d664afdfc80e1508ab7ed099dff210fbd + 5cff8b8eb04adfca21ccdec7e88b9ee7b3952fee - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9f4b1f5d664afdfc80e1508ab7ed099dff210fbd + 5cff8b8eb04adfca21ccdec7e88b9ee7b3952fee @@ -52,9 +52,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9f4b1f5d664afdfc80e1508ab7ed099dff210fbd + 5cff8b8eb04adfca21ccdec7e88b9ee7b3952fee https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 88ec3bc3f37e76fbcc932a25f9f0c1c29fe2b343 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 413c870a447075a90b8827353acb28ed37bab9dc + 74504ca4d4b7896de13475677be80013d33cb571 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 413c870a447075a90b8827353acb28ed37bab9dc + 74504ca4d4b7896de13475677be80013d33cb571 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 413c870a447075a90b8827353acb28ed37bab9dc + 74504ca4d4b7896de13475677be80013d33cb571 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 413c870a447075a90b8827353acb28ed37bab9dc + 74504ca4d4b7896de13475677be80013d33cb571 https://github.com/dotnet/test-templates @@ -146,9 +146,9 @@ aa59400b11e1aeee2e8af48928dbd48748a8bef9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9f4b1f5d664afdfc80e1508ab7ed099dff210fbd + 5cff8b8eb04adfca21ccdec7e88b9ee7b3952fee https://github.com/dotnet/roslyn @@ -168,18 +168,18 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 9a29abdd764a4de0f253ed368871877a47725247 + 1639670c6547454278f51afc5c74e20f8acc7abd https://dev.azure.com/dnceng/internal/_git/dotnet-aspire 48e42f59d64d84b404e904996a9ed61f2a17a569 - + https://github.com/dotnet/emsdk - 9a29abdd764a4de0f253ed368871877a47725247 + 1639670c6547454278f51afc5c74e20f8acc7abd diff --git a/eng/Versions.props b/eng/Versions.props index 7ace14de4..c9949aa35 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.103 - 8.0.103-servicing.24116.86 - 8.0.103-servicing.24116.86 + 8.0.104 + 8.0.104-servicing.24163.28 + 8.0.104-servicing.24163.28 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -98,16 +98,16 @@ - 8.0.3-servicing.24114.23 + 8.0.4-servicing.24162.12 - 8.0.3-servicing.24114.23 - 8.0.3-servicing.24114.23 - 8.0.3 - 8.0.3 - 8.0.3 - 8.0.3 + 8.0.4-servicing.24162.12 + 8.0.4-servicing.24162.12 + 8.0.4 + 8.0.4 + 8.0.4 + 8.0.4 2.1.0 @@ -250,7 +250,7 @@ 14.0.8478 17.0.8478 - 8.0.3 + 8.0.4 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100PackageVersion) 8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-rtm|-[A-z]*\.*\d*`)) From c71ee0cb633ce96ff85996738d0b20619fd00374 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 14 Mar 2024 00:09:45 +0000 Subject: [PATCH 450/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.103 -> To Version 8.0.104 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.SourceBuild.Intermediate.emsdk From Version 8.0.3-servicing.24114.23 -> To Version 8.0.4-servicing.24162.12 (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 252c67119..4e5e418b8 100644 --- a/NuGet.config +++ b/NuGet.config @@ -18,7 +18,7 @@ - + @@ -48,7 +48,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2e797a772..8c659ff4d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 74504ca4d4b7896de13475677be80013d33cb571 + 2f4164c25cc5777023364dc8d86f4271d1fb92b6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 74504ca4d4b7896de13475677be80013d33cb571 + 2f4164c25cc5777023364dc8d86f4271d1fb92b6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 74504ca4d4b7896de13475677be80013d33cb571 + 2f4164c25cc5777023364dc8d86f4271d1fb92b6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 74504ca4d4b7896de13475677be80013d33cb571 + 2f4164c25cc5777023364dc8d86f4271d1fb92b6 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index c9949aa35..96cb3f6f9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,8 +86,8 @@ 8.0.104 - 8.0.104-servicing.24163.28 - 8.0.104-servicing.24163.28 + 8.0.104-servicing.24163.30 + 8.0.104-servicing.24163.30 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 5b7dc90e6ba1d092c39959953b4f8471fdf220c3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 14 Mar 2024 05:58:34 +0000 Subject: [PATCH 451/535] Update dependencies from https://github.com/dotnet/arcade build Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.24160.1 -> To Version 7.0.0-beta.24163.12 --- eng/Version.Details.xml | 12 ++++----- eng/Versions.props | 2 +- eng/common/SetupNugetSources.ps1 | 26 +++++++++---------- eng/common/post-build/publish-using-darc.ps1 | 4 +-- .../templates/job/publish-build-assets.yml | 8 +++--- eng/common/templates/jobs/jobs.yml | 4 +-- .../templates/post-build/post-build.yml | 12 ++++----- global.json | 6 ++--- 8 files changed, 37 insertions(+), 37 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b133817c8..51ffd4c5e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - aa22ad6cceb0fcb802ed542360827c191024649e + bbc75d8a5897763eaf6945c263759930e02dd32b - + https://github.com/dotnet/arcade - aa22ad6cceb0fcb802ed542360827c191024649e + bbc75d8a5897763eaf6945c263759930e02dd32b - + https://github.com/dotnet/arcade - aa22ad6cceb0fcb802ed542360827c191024649e + bbc75d8a5897763eaf6945c263759930e02dd32b https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 5f92e512a..3213c3f28 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.24160.1 + 7.0.0-beta.24163.12 diff --git a/eng/common/SetupNugetSources.ps1 b/eng/common/SetupNugetSources.ps1 index 6e9972394..f3dc39a12 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') @@ -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/post-build/publish-using-darc.ps1 b/eng/common/post-build/publish-using-darc.ps1 index 5a3a32ea8..1e779fec4 100644 --- a/eng/common/post-build/publish-using-darc.ps1 +++ b/eng/common/post-build/publish-using-darc.ps1 @@ -12,7 +12,7 @@ param( try { . $PSScriptRoot\post-build-utils.ps1 - $darc = Get-Darc + $darc = Get-Darc $optionalParams = [System.Collections.ArrayList]::new() @@ -46,7 +46,7 @@ try { } Write-Host 'done.' -} +} catch { Write-Host $_ Write-PipelineTelemetryError -Category 'PromoteBuild' -Message "There was an error while trying to publish build '$BuildId' to default channels." diff --git a/eng/common/templates/job/publish-build-assets.yml b/eng/common/templates/job/publish-build-assets.yml index 127948252..4ff83a536 100644 --- a/eng/common/templates/job/publish-build-assets.yml +++ b/eng/common/templates/job/publish-build-assets.yml @@ -92,7 +92,7 @@ jobs: /p:OfficialBuildId=$(Build.BuildNumber) condition: ${{ parameters.condition }} continueOnError: ${{ parameters.continueOnError }} - + - task: powershell@2 displayName: Create ReleaseConfigs Artifact inputs: @@ -101,7 +101,7 @@ jobs: 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: PublishBuildArtifacts@1 displayName: Publish ReleaseConfigs Artifact inputs: @@ -127,7 +127,7 @@ jobs: - task: PublishBuildArtifacts@1 displayName: Publish SymbolPublishingExclusionsFile Artifact - condition: eq(variables['SymbolExclusionFile'], 'true') + condition: eq(variables['SymbolExclusionFile'], 'true') inputs: PathtoPublish: '$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt' PublishLocation: Container @@ -154,4 +154,4 @@ jobs: - ${{ if eq(parameters.enablePublishBuildArtifacts, 'true') }}: - template: /eng/common/templates/steps/publish-logs.yml parameters: - JobLabel: 'Publish_Artifacts_Logs' + JobLabel: 'Publish_Artifacts_Logs' diff --git a/eng/common/templates/jobs/jobs.yml b/eng/common/templates/jobs/jobs.yml index 67a2e2c74..289bb2396 100644 --- a/eng/common/templates/jobs/jobs.yml +++ b/eng/common/templates/jobs/jobs.yml @@ -20,7 +20,7 @@ parameters: 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: [] @@ -47,7 +47,7 @@ parameters: jobs: - ${{ each job in parameters.jobs }}: - template: ../job/job.yml - parameters: + parameters: # pass along parameters ${{ each parameter in parameters }}: ${{ if ne(parameter.key, 'jobs') }}: diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index 37bca799a..7b989985b 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -39,7 +39,7 @@ parameters: displayName: Enable NuGet validation type: boolean default: true - + - name: publishInstallersAndChecksums displayName: Publish installers and checksums type: boolean @@ -131,8 +131,8 @@ stages: displayName: Validate inputs: filePath: $(Build.SourcesDirectory)/eng/common/post-build/nuget-validation.ps1 - arguments: -PackagesPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ - -ToolDestinationPath $(Agent.BuildDirectory)/Extract/ + arguments: -PackagesPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ + -ToolDestinationPath $(Agent.BuildDirectory)/Extract/ - job: displayName: Signing Validation @@ -227,9 +227,9 @@ stages: 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) + arguments: -InputPath $(Build.ArtifactStagingDirectory)/BlobArtifacts/ + -ExtractPath $(Agent.BuildDirectory)/Extract/ + -GHRepoName $(Build.Repository.Name) -GHCommit $(Build.SourceVersion) -SourcelinkCliVersion $(SourceLinkCLIVersion) continueOnError: true diff --git a/global.json b/global.json index 58e631be4..f6f1f44a5 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.116", + "dotnet": "7.0.117", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24160.1", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24160.1" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24163.12", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24163.12" } } From 030c98d9e1af80c4fedc5d7969919993704bc34d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 14 Mar 2024 05:58:34 +0000 Subject: [PATCH 452/535] Update dependencies from https://github.com/dotnet/arcade build Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.24160.1 -> To Version 7.0.0-beta.24163.12 --- eng/Version.Details.xml | 12 ++++----- eng/Versions.props | 2 +- eng/common/SetupNugetSources.ps1 | 26 +++++++++---------- eng/common/post-build/publish-using-darc.ps1 | 4 +-- .../templates/job/publish-build-assets.yml | 8 +++--- eng/common/templates/jobs/jobs.yml | 4 +-- .../templates/post-build/post-build.yml | 12 ++++----- global.json | 6 ++--- 8 files changed, 37 insertions(+), 37 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d5ae4cda8..0cd3a95c6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - aa22ad6cceb0fcb802ed542360827c191024649e + bbc75d8a5897763eaf6945c263759930e02dd32b - + https://github.com/dotnet/arcade - aa22ad6cceb0fcb802ed542360827c191024649e + bbc75d8a5897763eaf6945c263759930e02dd32b - + https://github.com/dotnet/arcade - aa22ad6cceb0fcb802ed542360827c191024649e + bbc75d8a5897763eaf6945c263759930e02dd32b https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 8d7060124..176f1fb7b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.24160.1 + 7.0.0-beta.24163.12 diff --git a/eng/common/SetupNugetSources.ps1 b/eng/common/SetupNugetSources.ps1 index 6e9972394..f3dc39a12 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') @@ -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/post-build/publish-using-darc.ps1 b/eng/common/post-build/publish-using-darc.ps1 index 5a3a32ea8..1e779fec4 100644 --- a/eng/common/post-build/publish-using-darc.ps1 +++ b/eng/common/post-build/publish-using-darc.ps1 @@ -12,7 +12,7 @@ param( try { . $PSScriptRoot\post-build-utils.ps1 - $darc = Get-Darc + $darc = Get-Darc $optionalParams = [System.Collections.ArrayList]::new() @@ -46,7 +46,7 @@ try { } Write-Host 'done.' -} +} catch { Write-Host $_ Write-PipelineTelemetryError -Category 'PromoteBuild' -Message "There was an error while trying to publish build '$BuildId' to default channels." diff --git a/eng/common/templates/job/publish-build-assets.yml b/eng/common/templates/job/publish-build-assets.yml index 127948252..4ff83a536 100644 --- a/eng/common/templates/job/publish-build-assets.yml +++ b/eng/common/templates/job/publish-build-assets.yml @@ -92,7 +92,7 @@ jobs: /p:OfficialBuildId=$(Build.BuildNumber) condition: ${{ parameters.condition }} continueOnError: ${{ parameters.continueOnError }} - + - task: powershell@2 displayName: Create ReleaseConfigs Artifact inputs: @@ -101,7 +101,7 @@ jobs: 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: PublishBuildArtifacts@1 displayName: Publish ReleaseConfigs Artifact inputs: @@ -127,7 +127,7 @@ jobs: - task: PublishBuildArtifacts@1 displayName: Publish SymbolPublishingExclusionsFile Artifact - condition: eq(variables['SymbolExclusionFile'], 'true') + condition: eq(variables['SymbolExclusionFile'], 'true') inputs: PathtoPublish: '$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt' PublishLocation: Container @@ -154,4 +154,4 @@ jobs: - ${{ if eq(parameters.enablePublishBuildArtifacts, 'true') }}: - template: /eng/common/templates/steps/publish-logs.yml parameters: - JobLabel: 'Publish_Artifacts_Logs' + JobLabel: 'Publish_Artifacts_Logs' diff --git a/eng/common/templates/jobs/jobs.yml b/eng/common/templates/jobs/jobs.yml index 67a2e2c74..289bb2396 100644 --- a/eng/common/templates/jobs/jobs.yml +++ b/eng/common/templates/jobs/jobs.yml @@ -20,7 +20,7 @@ parameters: 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: [] @@ -47,7 +47,7 @@ parameters: jobs: - ${{ each job in parameters.jobs }}: - template: ../job/job.yml - parameters: + parameters: # pass along parameters ${{ each parameter in parameters }}: ${{ if ne(parameter.key, 'jobs') }}: diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index 37bca799a..7b989985b 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -39,7 +39,7 @@ parameters: displayName: Enable NuGet validation type: boolean default: true - + - name: publishInstallersAndChecksums displayName: Publish installers and checksums type: boolean @@ -131,8 +131,8 @@ stages: displayName: Validate inputs: filePath: $(Build.SourcesDirectory)/eng/common/post-build/nuget-validation.ps1 - arguments: -PackagesPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ - -ToolDestinationPath $(Agent.BuildDirectory)/Extract/ + arguments: -PackagesPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ + -ToolDestinationPath $(Agent.BuildDirectory)/Extract/ - job: displayName: Signing Validation @@ -227,9 +227,9 @@ stages: 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) + arguments: -InputPath $(Build.ArtifactStagingDirectory)/BlobArtifacts/ + -ExtractPath $(Agent.BuildDirectory)/Extract/ + -GHRepoName $(Build.Repository.Name) -GHCommit $(Build.SourceVersion) -SourcelinkCliVersion $(SourceLinkCLIVersion) continueOnError: true diff --git a/global.json b/global.json index 58e631be4..f6f1f44a5 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.116", + "dotnet": "7.0.117", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24160.1", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24160.1" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24163.12", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24163.12" } } From 18450eadd5333021a0b164a089f8fafe5a925fd1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 14 Mar 2024 12:29:33 +0000 Subject: [PATCH 453/535] Update dependencies from https://github.com/dotnet/source-build-reference-packages build Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.24162.3 -> To Version 8.0.0-alpha.1.24163.3 --- 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 a5640bb4f..e3447532f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -239,9 +239,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - c08ec59adcf8b56cd1b4de2090c320496566b5c6 + 79827eed138fd2575a8b24820b4f385ee4ffb6e6 From 74dff0ad2104bf50694dd7d28507845d9b53e905 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Thu, 14 Mar 2024 07:37:20 -0500 Subject: [PATCH 454/535] Update Version.Details.xml --- 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 000a25171..bd2479dce 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -193,9 +193,9 @@ 5957c5c5f85f17c145e7fab4ece37ad6aafcded9 - - https://dev.azure.com/dnceng/internal/_git/dotnet-source-build-externals - 0f0f1f0f33830f27ed0ff357145d2464b96b1a3e + + https://github.com/dotnet/source-build-externals + 00fb7841c80b44262646e57bcfbe90a1b7bc3151 From f1480346bb2481e939f5cbaa3f185dff2ace4ad8 Mon Sep 17 00:00:00 2001 From: NET Source-Build Bot <102560831+dotnet-sb-bot@users.noreply.github.com> Date: Thu, 14 Mar 2024 15:45:47 +0100 Subject: [PATCH 455/535] .NET Source-Build 8.0.103 March 2024 Updates (#19007) --- src/SourceBuild/content/eng/Versions.props | 4 ++-- src/SourceBuild/content/global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/SourceBuild/content/eng/Versions.props b/src/SourceBuild/content/eng/Versions.props index 54b507d2d..dbd256551 100644 --- a/src/SourceBuild/content/eng/Versions.props +++ b/src/SourceBuild/content/eng/Versions.props @@ -30,7 +30,7 @@ These URLs can't be composed from their base URL and version as we read them from the prep.sh and pipeline scripts, outside of MSBuild. --> - https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.8.0.102-servicing.24073.1.centos.8-x64.tar.gz - https://dotnetcli.azureedge.net/source-built-artifacts/sdks/dotnet-sdk-8.0.102-centos.8-x64.tar.gz + https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.8.0.103-servicing.24117.1.centos.8-x64.tar.gz + https://dotnetcli.azureedge.net/source-built-artifacts/sdks/dotnet-sdk-8.0.103-centos.8-x64.tar.gz diff --git a/src/SourceBuild/content/global.json b/src/SourceBuild/content/global.json index bda4e743d..54e2f96b7 100644 --- a/src/SourceBuild/content/global.json +++ b/src/SourceBuild/content/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "8.0.102" + "dotnet": "8.0.103" }, "msbuild-sdks": { "Microsoft.Build.CentralPackageVersions": "2.0.1", From 898e1b0f09bb454b3444271b7c9ce106a0bc6617 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 14 Mar 2024 18:21:58 +0000 Subject: [PATCH 456/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.104 -> To Version 8.0.104 --- NuGet.config | 8 ++++++-- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index 4e5e418b8..771df48473 100644 --- a/NuGet.config +++ b/NuGet.config @@ -18,10 +18,12 @@ - + + + @@ -48,11 +50,13 @@ - + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8c659ff4d..7479edb91 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2f4164c25cc5777023364dc8d86f4271d1fb92b6 + 3e8fc39274c03c6a4bf5fd6602350c66d183928b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2f4164c25cc5777023364dc8d86f4271d1fb92b6 + 3e8fc39274c03c6a4bf5fd6602350c66d183928b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2f4164c25cc5777023364dc8d86f4271d1fb92b6 + 3e8fc39274c03c6a4bf5fd6602350c66d183928b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2f4164c25cc5777023364dc8d86f4271d1fb92b6 + 3e8fc39274c03c6a4bf5fd6602350c66d183928b https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 96cb3f6f9..b67af49bf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,8 +86,8 @@ 8.0.104 - 8.0.104-servicing.24163.30 - 8.0.104-servicing.24163.30 + 8.0.104-servicing.24164.10 + 8.0.104-servicing.24164.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 1e75785c1a129fae165e1d6420a165661de3f21f Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 14 Mar 2024 19:25:13 +0000 Subject: [PATCH 457/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.104 -> To Version 8.0.104 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.SourceBuild.Intermediate.emsdk From Version 8.0.4-servicing.24162.12 -> To Version 8.0.4-servicing.24163.26 (parent: Microsoft.NET.Sdk --- NuGet.config | 10 +++++----- eng/Version.Details.xml | 42 ++++++++++++++++++++--------------------- eng/Versions.props | 10 +++++----- 3 files changed, 31 insertions(+), 31 deletions(-) diff --git a/NuGet.config b/NuGet.config index 771df48473..edaf58f8a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -15,10 +15,10 @@ - + - + @@ -48,9 +48,9 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7479edb91..cd906ff37 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -21,30 +21,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop baf3c0df45e13d065884f7e84260f645295f219e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5cff8b8eb04adfca21ccdec7e88b9ee7b3952fee + 38f2042434044be9a09065b23b7ef342a313a498 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5cff8b8eb04adfca21ccdec7e88b9ee7b3952fee + 38f2042434044be9a09065b23b7ef342a313a498 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5cff8b8eb04adfca21ccdec7e88b9ee7b3952fee + 38f2042434044be9a09065b23b7ef342a313a498 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5cff8b8eb04adfca21ccdec7e88b9ee7b3952fee + 38f2042434044be9a09065b23b7ef342a313a498 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5cff8b8eb04adfca21ccdec7e88b9ee7b3952fee + 38f2042434044be9a09065b23b7ef342a313a498 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5cff8b8eb04adfca21ccdec7e88b9ee7b3952fee + 38f2042434044be9a09065b23b7ef342a313a498 @@ -52,9 +52,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5cff8b8eb04adfca21ccdec7e88b9ee7b3952fee + 38f2042434044be9a09065b23b7ef342a313a498 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3e8fc39274c03c6a4bf5fd6602350c66d183928b + d2323acf9ef535e2f939bdd8cd1c085d5ea0a625 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3e8fc39274c03c6a4bf5fd6602350c66d183928b + d2323acf9ef535e2f939bdd8cd1c085d5ea0a625 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3e8fc39274c03c6a4bf5fd6602350c66d183928b + d2323acf9ef535e2f939bdd8cd1c085d5ea0a625 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3e8fc39274c03c6a4bf5fd6602350c66d183928b + d2323acf9ef535e2f939bdd8cd1c085d5ea0a625 https://github.com/dotnet/test-templates @@ -148,7 +148,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5cff8b8eb04adfca21ccdec7e88b9ee7b3952fee + 38f2042434044be9a09065b23b7ef342a313a498 https://github.com/dotnet/roslyn @@ -170,16 +170,16 @@ https://github.com/dotnet/emsdk - 1639670c6547454278f51afc5c74e20f8acc7abd + 08a90ca2c88b17f1b5d081318354a41db0882cff https://dev.azure.com/dnceng/internal/_git/dotnet-aspire 48e42f59d64d84b404e904996a9ed61f2a17a569 - + https://github.com/dotnet/emsdk - 1639670c6547454278f51afc5c74e20f8acc7abd + 08a90ca2c88b17f1b5d081318354a41db0882cff diff --git a/eng/Versions.props b/eng/Versions.props index b67af49bf..a7c4aeb95 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,8 +86,8 @@ 8.0.104 - 8.0.104-servicing.24164.10 - 8.0.104-servicing.24164.10 + 8.0.104-servicing.24164.11 + 8.0.104-servicing.24164.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -98,12 +98,12 @@ - 8.0.4-servicing.24162.12 + 8.0.4-servicing.24163.26 - 8.0.4-servicing.24162.12 - 8.0.4-servicing.24162.12 + 8.0.4-servicing.24163.26 + 8.0.4-servicing.24163.26 8.0.4 8.0.4 8.0.4 From 614fd28fba617752580b594613aa7f5cba4da65e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 14 Mar 2024 14:43:34 -0700 Subject: [PATCH 458/535] [release/6.0.4xx] Update dependencies from dotnet/arcade (#19058) Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 16 ++++++++++++++-- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/SetupNugetSources.ps1 | 2 +- global.json | 6 +++--- 5 files changed, 25 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index facaf96b0..047b2c714 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 86a3926e9..955dc44a4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - c80f6c7bcfdd0e62a3012f9a97ab52be477c7d75 + 100394106fe203c112ab72bcc1576fb3753f7910 - + https://github.com/dotnet/arcade - c80f6c7bcfdd0e62a3012f9a97ab52be477c7d75 + 100394106fe203c112ab72bcc1576fb3753f7910 - + https://github.com/dotnet/arcade - c80f6c7bcfdd0e62a3012f9a97ab52be477c7d75 + 100394106fe203c112ab72bcc1576fb3753f7910 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 02fc49bcd..006e5ba63 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.24162.4 + 6.0.0-beta.24163.13 diff --git a/eng/common/SetupNugetSources.ps1 b/eng/common/SetupNugetSources.ps1 index 0182856ed..4ed5c54e7 100644 --- a/eng/common/SetupNugetSources.ps1 +++ b/eng/common/SetupNugetSources.ps1 @@ -49,7 +49,7 @@ function AddPackageSource($sources, $SourceName, $SourceEndPoint, $creds, $Usern Write-Host "Package source $SourceName already present." } - AddCredential -Creds $creds -Source $SourceName -Username $Username -Password $pwd + AddCredential -Creds $creds -Source $SourceName -Username $Username -pwd $pwd } # Add a credential node for the specified source diff --git a/global.json b/global.json index e1f0ec366..fd055d417 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.127", + "dotnet": "6.0.128", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24162.4", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.24162.4" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24163.13", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.24163.13" } } From e0a140efa0c34020bfc76003cdd0331dd614db73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C5=99emek=20Vysok=C3=BD?= Date: Fri, 15 Mar 2024 14:55:27 +0100 Subject: [PATCH 459/535] [release/8.0.1xx] Add PR version of VMR pipelines (#19064) --- eng/pipelines/vmr-build-pr.yml | 56 ++++++++++++++++++++ src/SourceBuild/content/eng/pipelines/pr.yml | 18 +++++++ 2 files changed, 74 insertions(+) create mode 100644 eng/pipelines/vmr-build-pr.yml create mode 100644 src/SourceBuild/content/eng/pipelines/pr.yml diff --git a/eng/pipelines/vmr-build-pr.yml b/eng/pipelines/vmr-build-pr.yml new file mode 100644 index 000000000..3c51dfe6e --- /dev/null +++ b/eng/pipelines/vmr-build-pr.yml @@ -0,0 +1,56 @@ +# This is the non-1ES PR pipeline source-building the VMR used in installer PRs +# https://dev.azure.com/dnceng-public/public/_build?definitionId=233 + +trigger: none +pr: + branches: + include: + - main + - release/* + +parameters: +- name: vmrBranch + displayName: dotnet/dotnet branch to push to + type: string + default: ' ' + +- name: disableVmrBuild + displayName: Skip source-building the VMR + type: boolean + default: false + +variables: +- ${{ if ne(parameters.vmrBranch, ' ') }}: + - name: VmrBranch + value: ${{ replace(parameters.vmrBranch, ' ', '') }} +- ${{ else }}: + - name: VmrBranch + value: release/8.0.1xx + +resources: + repositories: + - repository: vmr + type: github + name: dotnet/dotnet + endpoint: dotnet + ref: $(VmrBranch) + +stages: +# You can temporarily disable the VMR Build stage by setting the disableVmrBuild variable +- ${{ if not(parameters.disableVmrBuild) }}: + - template: templates/stages/vmr-build.yml + parameters: + vmrBranch: ${{ variables.VmrBranch }} + isBuiltFromVmr: false + +# In case the VMR Build stage is temporarily disabled, the VMR synchronization step is run to validate +# that the PR can be merged and later synchronized into the VMR without problems. +- ${{ else }}: + - stage: Synchronize_VMR + displayName: Synchronize VMR + dependsOn: [] + jobs: + - template: templates/jobs/vmr-synchronization.yml + parameters: + vmrBranch: ${{ variables.VmrBranch }} + noPush: true diff --git a/src/SourceBuild/content/eng/pipelines/pr.yml b/src/SourceBuild/content/eng/pipelines/pr.yml new file mode 100644 index 000000000..dcebbcf54 --- /dev/null +++ b/src/SourceBuild/content/eng/pipelines/pr.yml @@ -0,0 +1,18 @@ +# This is the non-1ES PR pipeline for dotnet/dotnet +# https://dev.azure.com/dnceng-public/public/_build?definitionId=240 + +trigger: none +pr: + branches: + include: + - main + - release/* + - internal/release/* + +stages: +- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - template: templates/stages/vmr-scan.yml + +- template: /src/installer/eng/pipelines/templates/stages/vmr-build.yml + parameters: + isBuiltFromVmr: true From c0f1085ad0affd258abc3b2221250bbaa1348c8c Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 15 Mar 2024 17:11:40 +0000 Subject: [PATCH 460/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.104 -> To Version 8.0.104 --- 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 edaf58f8a..ba8a543ca 100644 --- a/NuGet.config +++ b/NuGet.config @@ -18,7 +18,7 @@ - + @@ -50,7 +50,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7b47542bc..832b3d8d0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d2323acf9ef535e2f939bdd8cd1c085d5ea0a625 + 4e79d82d46cce3daaea31b006deb3c8653b0c937 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d2323acf9ef535e2f939bdd8cd1c085d5ea0a625 + 4e79d82d46cce3daaea31b006deb3c8653b0c937 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d2323acf9ef535e2f939bdd8cd1c085d5ea0a625 + 4e79d82d46cce3daaea31b006deb3c8653b0c937 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d2323acf9ef535e2f939bdd8cd1c085d5ea0a625 + 4e79d82d46cce3daaea31b006deb3c8653b0c937 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index a7c4aeb95..d2e0a8da2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,8 +86,8 @@ 8.0.104 - 8.0.104-servicing.24164.11 - 8.0.104-servicing.24164.11 + 8.0.104-servicing.24165.6 + 8.0.104-servicing.24165.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From ab1e9bc6c249b344d7dbd4640e33aee18a39a125 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 18 Mar 2024 14:00:43 +0000 Subject: [PATCH 461/535] Update dependencies from https://github.com/dotnet/source-build-externals build Microsoft.SourceBuild.Intermediate.source-build-externals From Version 8.0.0-alpha.1.24161.1 -> To Version 8.0.0-alpha.1.24168.1 --- NuGet.config | 9 --------- eng/Version.Details.xml | 4 ++-- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index cef841a23..959b7d1df 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,22 +7,17 @@ - - - - - @@ -43,15 +38,11 @@ - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b7fe4a98c..e25819ecb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -193,9 +193,9 @@ 5957c5c5f85f17c145e7fab4ece37ad6aafcded9 - + https://github.com/dotnet/source-build-externals - 00fb7841c80b44262646e57bcfbe90a1b7bc3151 + 629dfe34c35a9399849a85c591f8794d0ecd373c From 561164e30b279caeb2470ec1bdc0224ea1e6b793 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 18 Mar 2024 15:00:37 +0000 Subject: [PATCH 462/535] Update dependencies from https://github.com/dotnet/source-build-externals build Microsoft.SourceBuild.Intermediate.source-build-externals From Version 8.0.0-alpha.1.24161.1 -> To Version 8.0.0-alpha.1.24168.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 e25819ecb..21d736e81 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -193,9 +193,9 @@ 5957c5c5f85f17c145e7fab4ece37ad6aafcded9 - + https://github.com/dotnet/source-build-externals - 629dfe34c35a9399849a85c591f8794d0ecd373c + 0fac378047750fa8bd850a98b159560f9f7627c3 From a4974be33ff93e533a61c506f13b8f742687224f Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 19 Mar 2024 00:44:43 +0000 Subject: [PATCH 463/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.104 -> To Version 8.0.104 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.4-servicing.24163.26 -> To Version 8.0.4-servicing.24168.10 (parent: Microsoft.NET.Sdk --- NuGet.config | 18 ++++-------------- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 10 +++++----- 3 files changed, 27 insertions(+), 37 deletions(-) diff --git a/NuGet.config b/NuGet.config index ba8a543ca..6c1d59999 100644 --- a/NuGet.config +++ b/NuGet.config @@ -15,17 +15,12 @@ - + - + - - - - - @@ -48,16 +43,11 @@ - + - + - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 832b3d8d0..de04998f8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -21,30 +21,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop baf3c0df45e13d065884f7e84260f645295f219e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 38f2042434044be9a09065b23b7ef342a313a498 + a1a9440b48374c6d400287abbb56a4ac54d9b02f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 38f2042434044be9a09065b23b7ef342a313a498 + a1a9440b48374c6d400287abbb56a4ac54d9b02f - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 38f2042434044be9a09065b23b7ef342a313a498 + a1a9440b48374c6d400287abbb56a4ac54d9b02f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 38f2042434044be9a09065b23b7ef342a313a498 + a1a9440b48374c6d400287abbb56a4ac54d9b02f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 38f2042434044be9a09065b23b7ef342a313a498 + a1a9440b48374c6d400287abbb56a4ac54d9b02f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 38f2042434044be9a09065b23b7ef342a313a498 + a1a9440b48374c6d400287abbb56a4ac54d9b02f @@ -52,9 +52,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 38f2042434044be9a09065b23b7ef342a313a498 + a1a9440b48374c6d400287abbb56a4ac54d9b02f https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4e79d82d46cce3daaea31b006deb3c8653b0c937 + bc3399f3c28ee2e3983d76a2592159705dd73925 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4e79d82d46cce3daaea31b006deb3c8653b0c937 + bc3399f3c28ee2e3983d76a2592159705dd73925 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4e79d82d46cce3daaea31b006deb3c8653b0c937 + bc3399f3c28ee2e3983d76a2592159705dd73925 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4e79d82d46cce3daaea31b006deb3c8653b0c937 + bc3399f3c28ee2e3983d76a2592159705dd73925 https://github.com/dotnet/test-templates @@ -148,7 +148,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 38f2042434044be9a09065b23b7ef342a313a498 + a1a9440b48374c6d400287abbb56a4ac54d9b02f https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index d2e0a8da2..fb7fc7f52 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,8 +86,8 @@ 8.0.104 - 8.0.104-servicing.24165.6 - 8.0.104-servicing.24165.6 + 8.0.104-servicing.24168.12 + 8.0.104-servicing.24168.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -98,12 +98,12 @@ - 8.0.4-servicing.24163.26 + 8.0.4-servicing.24168.10 - 8.0.4-servicing.24163.26 - 8.0.4-servicing.24163.26 + 8.0.4-servicing.24168.10 + 8.0.4-servicing.24168.10 8.0.4 8.0.4 8.0.4 From bd400ad985cf6950b5e0a730de4cf7c9cc983579 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 19 Mar 2024 20:58:22 +0000 Subject: [PATCH 464/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.104 -> To Version 8.0.104 --- 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 6c1d59999..c7509dabe 100644 --- a/NuGet.config +++ b/NuGet.config @@ -18,7 +18,7 @@ - + @@ -45,7 +45,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 39ea4d787..efbd87826 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - bc3399f3c28ee2e3983d76a2592159705dd73925 + db1e55ad761c8d416cbd3c26b083734bfd55ea89 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - bc3399f3c28ee2e3983d76a2592159705dd73925 + db1e55ad761c8d416cbd3c26b083734bfd55ea89 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - bc3399f3c28ee2e3983d76a2592159705dd73925 + db1e55ad761c8d416cbd3c26b083734bfd55ea89 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - bc3399f3c28ee2e3983d76a2592159705dd73925 + db1e55ad761c8d416cbd3c26b083734bfd55ea89 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index fb7fc7f52..9730799d5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,8 +86,8 @@ 8.0.104 - 8.0.104-servicing.24168.12 - 8.0.104-servicing.24168.12 + 8.0.104-servicing.24169.7 + 8.0.104-servicing.24169.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 179278e0a8e2272d16e9efbeb6b61a842f4cf3fb Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 19 Mar 2024 21:55:15 +0000 Subject: [PATCH 465/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.104 -> To Version 8.0.104 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets From Version 8.0.3 -> To Version 8.0.4 (parent: Microsoft.NET.Sdk --- NuGet.config | 6 ++++-- eng/Version.Details.xml | 42 ++++++++++++++++++++--------------------- eng/Versions.props | 18 +++++++++--------- 3 files changed, 34 insertions(+), 32 deletions(-) diff --git a/NuGet.config b/NuGet.config index c7509dabe..356e4cd79 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,6 +10,7 @@ + @@ -18,7 +19,7 @@ - + @@ -41,11 +42,12 @@ + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index efbd87826..a0f4060a2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -56,51 +56,51 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime a1a9440b48374c6d400287abbb56a4ac54d9b02f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 88ec3bc3f37e76fbcc932a25f9f0c1c29fe2b343 + 497c82b842ba5f2bcee747393c166210f62ec45f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 88ec3bc3f37e76fbcc932a25f9f0c1c29fe2b343 + 497c82b842ba5f2bcee747393c166210f62ec45f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 88ec3bc3f37e76fbcc932a25f9f0c1c29fe2b343 + 497c82b842ba5f2bcee747393c166210f62ec45f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 88ec3bc3f37e76fbcc932a25f9f0c1c29fe2b343 + 497c82b842ba5f2bcee747393c166210f62ec45f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 88ec3bc3f37e76fbcc932a25f9f0c1c29fe2b343 + 497c82b842ba5f2bcee747393c166210f62ec45f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 88ec3bc3f37e76fbcc932a25f9f0c1c29fe2b343 + 497c82b842ba5f2bcee747393c166210f62ec45f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 88ec3bc3f37e76fbcc932a25f9f0c1c29fe2b343 + 497c82b842ba5f2bcee747393c166210f62ec45f https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - db1e55ad761c8d416cbd3c26b083734bfd55ea89 + 4273e07e6e6d63a076ca37d05889c6627087abb2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - db1e55ad761c8d416cbd3c26b083734bfd55ea89 + 4273e07e6e6d63a076ca37d05889c6627087abb2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - db1e55ad761c8d416cbd3c26b083734bfd55ea89 + 4273e07e6e6d63a076ca37d05889c6627087abb2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - db1e55ad761c8d416cbd3c26b083734bfd55ea89 + 4273e07e6e6d63a076ca37d05889c6627087abb2 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 9730799d5..774c7f860 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -72,13 +72,13 @@ - 8.0.3 - 8.0.3 - 8.0.3-servicing.24116.15 - 8.0.3-servicing.24116.15 - 8.0.3-servicing.24116.15 - 8.0.3-servicing.24116.15 - 8.0.3-servicing.24116.15 + 8.0.4 + 8.0.4 + 8.0.4-servicing.24164.2 + 8.0.4-servicing.24164.2 + 8.0.4-servicing.24164.2 + 8.0.4-servicing.24164.2 + 8.0.4-servicing.24164.2 0.2.0 @@ -86,8 +86,8 @@ 8.0.104 - 8.0.104-servicing.24169.7 - 8.0.104-servicing.24169.7 + 8.0.104-servicing.24169.28 + 8.0.104-servicing.24169.28 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From c744d2e81c24d544b106f688937d3513aee0077e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 19 Mar 2024 22:53:04 +0000 Subject: [PATCH 466/535] Update dependencies from https://github.com/dotnet/arcade build 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.24165.4 --- eng/Version.Details.xml | 12 +- eng/Versions.props | 2 +- eng/common/SetupNugetSources.ps1 | 26 +- eng/common/templates-official/job/job.yml | 263 ++++++++++++++++ .../templates-official/job/onelocbuild.yml | 112 +++++++ .../job/publish-build-assets.yml | 155 ++++++++++ .../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 + eng/common/templates/job/job.yml | 4 + eng/common/templates/jobs/jobs.yml | 4 +- eng/common/templates/steps/generate-sbom.yml | 2 +- global.json | 4 +- 31 files changed, 1787 insertions(+), 25 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 21d736e81..943031ee6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -214,18 +214,18 @@ - + https://github.com/dotnet/arcade - da98edc4c3ea539f109ea320672136ceb32591a7 + f311667e0587f19c3fa9553a909975662107a351 - + https://github.com/dotnet/arcade - da98edc4c3ea539f109ea320672136ceb32591a7 + f311667e0587f19c3fa9553a909975662107a351 - + https://github.com/dotnet/arcade - da98edc4c3ea539f109ea320672136ceb32591a7 + f311667e0587f19c3fa9553a909975662107a351 https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index 7ace14de4..5651fd274 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,7 +40,7 @@ - 8.0.0-beta.24113.2 + 8.0.0-beta.24165.4 diff --git a/eng/common/SetupNugetSources.ps1 b/eng/common/SetupNugetSources.ps1 index 6c65e8192..efa2fd72b 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/job.yml b/eng/common/templates-official/job/job.yml new file mode 100644 index 000000000..a2709d105 --- /dev/null +++ b/eng/common/templates-official/job/job.yml @@ -0,0 +1,263 @@ +# 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: '' + templateContext: '' + +# 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 }} + + ${{ if ne(parameters.templateContext, '') }}: + templateContext: ${{ parameters.templateContext }} + + 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, '')) }}: + - task: 1ES.PublishPipelineArtifact@1 + inputs: + targetPath: 'artifacts/log' + artifactName: ${{ 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') }}: + - task: 1ES.PublishPipelineArtifact@1 + inputs: + targetPath: '$(Build.SourcesDirectory)\eng\common\BuildConfiguration' + artifactName: 'BuildConfiguration' + displayName: 'Publish build retry configuration' + continueOnError: true \ No newline at end of file diff --git a/eng/common/templates-official/job/onelocbuild.yml b/eng/common/templates-official/job/onelocbuild.yml new file mode 100644 index 000000000..ba9ba4930 --- /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 000000000..53138622f --- /dev/null +++ b/eng/common/templates-official/job/publish-build-assets.yml @@ -0,0 +1,155 @@ +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: | + New-Item -Path "$(Build.StagingDirectory)/ReleaseConfigs" -ItemType Directory -Force + $filePath = "$(Build.StagingDirectory)/ReleaseConfigs/ReleaseConfigs.txt" + Add-Content -Path $filePath -Value $(BARBuildId) + Add-Content -Path $filePath -Value "$(DefaultChannels)" + Add-Content -Path $filePath -Value $(IsStableBuild) + + - task: 1ES.PublishBuildArtifacts@1 + displayName: Publish ReleaseConfigs Artifact + inputs: + PathtoPublish: '$(Build.StagingDirectory)/ReleaseConfigs' + 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 000000000..8aba3b44b --- /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 000000000..4b6337391 --- /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 000000000..b68d3c2f3 --- /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 000000000..857a0f8ba --- /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 000000000..08e5db9bb --- /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 000000000..c24193acf --- /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 000000000..5c98fe1c0 --- /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 000000000..0c87f149a --- /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 000000000..da669030d --- /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 000000000..f67a210d6 --- /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 000000000..eba58109b --- /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 000000000..0ecec47b0 --- /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 000000000..9b4a5ffa3 --- /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 000000000..07426fde0 --- /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 000000000..1bf43bf80 --- /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 000000000..04012fed1 --- /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 000000000..83d97a26a --- /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 000000000..3eb7e2d5f --- /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 000000000..829f17c34 --- /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 000000000..beab7d1bf --- /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 000000000..dbdd66d4a --- /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/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index e24ca2f46..8ec5c4f2d 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/eng/common/templates/jobs/jobs.yml b/eng/common/templates/jobs/jobs.yml index 67a2e2c74..289bb2396 100644 --- a/eng/common/templates/jobs/jobs.yml +++ b/eng/common/templates/jobs/jobs.yml @@ -20,7 +20,7 @@ parameters: 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: [] @@ -47,7 +47,7 @@ parameters: jobs: - ${{ each job in parameters.jobs }}: - template: ../job/job.yml - parameters: + parameters: # pass along parameters ${{ each parameter in parameters }}: ${{ if ne(parameter.key, 'jobs') }}: diff --git a/eng/common/templates/steps/generate-sbom.yml b/eng/common/templates/steps/generate-sbom.yml index a06373f38..2b21eae42 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 e46bfeda9..b967bd08e 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.24165.4", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24165.4" } } From bd9d50d2577581c5a2fd3b94ec9ae3d1c6313927 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 19 Mar 2024 23:51:15 +0000 Subject: [PATCH 467/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.104 -> To Version 8.0.104 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 8.0.3 -> To Version 8.0.4 (parent: Microsoft.NET.Sdk --- NuGet.config | 6 ++++-- eng/Version.Details.xml | 38 +++++++++++++++++++------------------- eng/Versions.props | 16 ++++++++-------- 3 files changed, 31 insertions(+), 29 deletions(-) diff --git a/NuGet.config b/NuGet.config index 356e4cd79..d9f4a1396 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,9 +19,10 @@ - + + @@ -47,9 +48,10 @@ - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a0f4060a2..2ef28140c 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://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - baf3c0df45e13d065884f7e84260f645295f219e + 46b32935e3cfb625735564f8db5719df3186daa2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - baf3c0df45e13d065884f7e84260f645295f219e + 46b32935e3cfb625735564f8db5719df3186daa2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - baf3c0df45e13d065884f7e84260f645295f219e + 46b32935e3cfb625735564f8db5719df3186daa2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - baf3c0df45e13d065884f7e84260f645295f219e + 46b32935e3cfb625735564f8db5719df3186daa2 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4273e07e6e6d63a076ca37d05889c6627087abb2 + 77f6d12b1163c2b0b9fac2b4c3794e971c2d47cc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4273e07e6e6d63a076ca37d05889c6627087abb2 + 77f6d12b1163c2b0b9fac2b4c3794e971c2d47cc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4273e07e6e6d63a076ca37d05889c6627087abb2 + 77f6d12b1163c2b0b9fac2b4c3794e971c2d47cc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4273e07e6e6d63a076ca37d05889c6627087abb2 + 77f6d12b1163c2b0b9fac2b4c3794e971c2d47cc https://github.com/dotnet/test-templates @@ -124,13 +124,13 @@ 1e5f3603af2277910aad946736ee23283e7f3e16 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - bd280bbb5c9699bb93097206f076ad2f330ea8e1 + f37bd9d71f3baa2b2f47389aa2d2fa17324d714b - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 46fb08cfa8160d0885b74c7f28a7b187ab86efed + 3e809dd609fe55ed129b89efaec03baa86ff539d https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 774c7f860..c805f4464 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,11 +48,11 @@ - 8.0.3-servicing.24116.3 + 8.0.4-servicing.24164.3 - 8.0.3-servicing.24116.6 + 8.0.4-servicing.24168.11 @@ -86,8 +86,8 @@ 8.0.104 - 8.0.104-servicing.24169.28 - 8.0.104-servicing.24169.28 + 8.0.104-servicing.24169.44 + 8.0.104-servicing.24169.44 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -112,10 +112,10 @@ - 8.0.3-servicing.24116.9 - 8.0.3-servicing.24116.9 - 8.0.3 - 8.0.3 + 8.0.4-servicing.24169.14 + 8.0.4-servicing.24169.14 + 8.0.4 + 8.0.4 From 0e88b87c1a54928354e6e7ed5162ad11ea559e3a Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 20 Mar 2024 00:44:12 +0000 Subject: [PATCH 468/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.104 -> To Version 8.0.104 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.4-servicing.24168.10 -> To Version 8.0.4-servicing.24169.9 (parent: Microsoft.NET.Sdk --- NuGet.config | 12 ++++----- eng/Version.Details.xml | 60 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++------- 3 files changed, 46 insertions(+), 46 deletions(-) diff --git a/NuGet.config b/NuGet.config index d9f4a1396..17e848efc 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,16 +10,16 @@ - + - + - + @@ -43,12 +43,12 @@ - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2ef28140c..54b00188a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -21,30 +21,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 46b32935e3cfb625735564f8db5719df3186daa2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a1a9440b48374c6d400287abbb56a4ac54d9b02f + 2d7eea252964e69be94cb9c847b371b23e4dd470 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a1a9440b48374c6d400287abbb56a4ac54d9b02f + 2d7eea252964e69be94cb9c847b371b23e4dd470 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a1a9440b48374c6d400287abbb56a4ac54d9b02f + 2d7eea252964e69be94cb9c847b371b23e4dd470 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a1a9440b48374c6d400287abbb56a4ac54d9b02f + 2d7eea252964e69be94cb9c847b371b23e4dd470 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a1a9440b48374c6d400287abbb56a4ac54d9b02f + 2d7eea252964e69be94cb9c847b371b23e4dd470 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a1a9440b48374c6d400287abbb56a4ac54d9b02f + 2d7eea252964e69be94cb9c847b371b23e4dd470 @@ -52,55 +52,55 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a1a9440b48374c6d400287abbb56a4ac54d9b02f + 2d7eea252964e69be94cb9c847b371b23e4dd470 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 497c82b842ba5f2bcee747393c166210f62ec45f + e3fa4f53ccf34d5a3dc5c1a86df3968348cca633 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 497c82b842ba5f2bcee747393c166210f62ec45f + e3fa4f53ccf34d5a3dc5c1a86df3968348cca633 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 497c82b842ba5f2bcee747393c166210f62ec45f + e3fa4f53ccf34d5a3dc5c1a86df3968348cca633 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 497c82b842ba5f2bcee747393c166210f62ec45f + e3fa4f53ccf34d5a3dc5c1a86df3968348cca633 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 497c82b842ba5f2bcee747393c166210f62ec45f + e3fa4f53ccf34d5a3dc5c1a86df3968348cca633 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 497c82b842ba5f2bcee747393c166210f62ec45f + e3fa4f53ccf34d5a3dc5c1a86df3968348cca633 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 497c82b842ba5f2bcee747393c166210f62ec45f + e3fa4f53ccf34d5a3dc5c1a86df3968348cca633 https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 77f6d12b1163c2b0b9fac2b4c3794e971c2d47cc + 436431ae3914f53a98e9740c9eb05b2b7f42a800 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 77f6d12b1163c2b0b9fac2b4c3794e971c2d47cc + 436431ae3914f53a98e9740c9eb05b2b7f42a800 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 77f6d12b1163c2b0b9fac2b4c3794e971c2d47cc + 436431ae3914f53a98e9740c9eb05b2b7f42a800 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 77f6d12b1163c2b0b9fac2b4c3794e971c2d47cc + 436431ae3914f53a98e9740c9eb05b2b7f42a800 https://github.com/dotnet/test-templates @@ -148,7 +148,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a1a9440b48374c6d400287abbb56a4ac54d9b02f + 2d7eea252964e69be94cb9c847b371b23e4dd470 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index c805f4464..5c3941231 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -74,11 +74,11 @@ 8.0.4 8.0.4 - 8.0.4-servicing.24164.2 - 8.0.4-servicing.24164.2 - 8.0.4-servicing.24164.2 - 8.0.4-servicing.24164.2 - 8.0.4-servicing.24164.2 + 8.0.4-servicing.24169.10 + 8.0.4-servicing.24169.10 + 8.0.4-servicing.24169.10 + 8.0.4-servicing.24169.10 + 8.0.4-servicing.24169.10 0.2.0 @@ -86,8 +86,8 @@ 8.0.104 - 8.0.104-servicing.24169.44 - 8.0.104-servicing.24169.44 + 8.0.104-servicing.24169.53 + 8.0.104-servicing.24169.53 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -98,12 +98,12 @@ - 8.0.4-servicing.24168.10 + 8.0.4-servicing.24169.9 - 8.0.4-servicing.24168.10 - 8.0.4-servicing.24168.10 + 8.0.4-servicing.24169.9 + 8.0.4-servicing.24169.9 8.0.4 8.0.4 8.0.4 From 5e3b71a6e64ec7d0c2259613d4bb0730b093eb43 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 20 Mar 2024 03:30:45 +0000 Subject: [PATCH 469/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.104 -> To Version 8.0.104 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.4-servicing.24168.10 -> To Version 8.0.4-servicing.24169.9 (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 17e848efc..8762a7838 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,7 +19,7 @@ - + @@ -48,7 +48,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 54b00188a..898d0b94d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 436431ae3914f53a98e9740c9eb05b2b7f42a800 + 3c9f8a3b7c29750c8388aab83f982c4bb358d366 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 436431ae3914f53a98e9740c9eb05b2b7f42a800 + 3c9f8a3b7c29750c8388aab83f982c4bb358d366 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 436431ae3914f53a98e9740c9eb05b2b7f42a800 + 3c9f8a3b7c29750c8388aab83f982c4bb358d366 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 436431ae3914f53a98e9740c9eb05b2b7f42a800 + 3c9f8a3b7c29750c8388aab83f982c4bb358d366 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 5c3941231..4f7624cb8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,8 +86,8 @@ 8.0.104 - 8.0.104-servicing.24169.53 - 8.0.104-servicing.24169.53 + 8.0.104-servicing.24169.70 + 8.0.104-servicing.24169.70 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 4b7a7b717d470b1b964bb3067495ca3f48501ffe Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 20 Mar 2024 04:55:48 +0000 Subject: [PATCH 470/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.104 -> To Version 8.0.104 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 8.0.4 -> To Version 8.0.4 (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 8762a7838..521244a79 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,10 +19,10 @@ - + - + @@ -48,10 +48,10 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7ee6e4c74..4ba53723c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -7,19 +7,19 @@ --> https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 46b32935e3cfb625735564f8db5719df3186daa2 + 161450e0bd8de91351085bf794ef73018105b2bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 46b32935e3cfb625735564f8db5719df3186daa2 + 161450e0bd8de91351085bf794ef73018105b2bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 46b32935e3cfb625735564f8db5719df3186daa2 + 161450e0bd8de91351085bf794ef73018105b2bc https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 46b32935e3cfb625735564f8db5719df3186daa2 + 161450e0bd8de91351085bf794ef73018105b2bc https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3c9f8a3b7c29750c8388aab83f982c4bb358d366 + bfd542d3f97a3ad64bb9a8c74f2243dc7563798e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3c9f8a3b7c29750c8388aab83f982c4bb358d366 + bfd542d3f97a3ad64bb9a8c74f2243dc7563798e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3c9f8a3b7c29750c8388aab83f982c4bb358d366 + bfd542d3f97a3ad64bb9a8c74f2243dc7563798e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3c9f8a3b7c29750c8388aab83f982c4bb358d366 + bfd542d3f97a3ad64bb9a8c74f2243dc7563798e https://github.com/dotnet/test-templates @@ -124,13 +124,13 @@ 1e5f3603af2277910aad946736ee23283e7f3e16 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - f37bd9d71f3baa2b2f47389aa2d2fa17324d714b + 1575d7056e8952d90f592553e9f00661bc94e81a - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 3e809dd609fe55ed129b89efaec03baa86ff539d + 29ccbeca12c26d35acfea8fd4033168fdc2edcb8 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 801eeec21..0875f86e1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,11 +48,11 @@ - 8.0.4-servicing.24164.3 + 8.0.4-servicing.24169.7 - 8.0.4-servicing.24168.11 + 8.0.4-servicing.24169.8 @@ -86,8 +86,8 @@ 8.0.104 - 8.0.104-servicing.24169.70 - 8.0.104-servicing.24169.70 + 8.0.104-servicing.24169.84 + 8.0.104-servicing.24169.84 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -112,8 +112,8 @@ - 8.0.4-servicing.24169.14 - 8.0.4-servicing.24169.14 + 8.0.4-servicing.24169.21 + 8.0.4-servicing.24169.21 8.0.4 8.0.4 From c1cf386f3cfc2df9781f2ecb5516e1872570be2b Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 20 Mar 2024 05:39:34 +0000 Subject: [PATCH 471/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.104 -> To Version 8.0.104 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets From Version 8.0.4 -> To Version 8.0.4 (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 521244a79..413636fef 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,7 +10,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -43,12 +43,12 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4ba53723c..a4e2ee8d6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -58,49 +58,49 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e3fa4f53ccf34d5a3dc5c1a86df3968348cca633 + e58e9f9e30b4729c06a7af05889cc7f2fb276192 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e3fa4f53ccf34d5a3dc5c1a86df3968348cca633 + e58e9f9e30b4729c06a7af05889cc7f2fb276192 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e3fa4f53ccf34d5a3dc5c1a86df3968348cca633 + e58e9f9e30b4729c06a7af05889cc7f2fb276192 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e3fa4f53ccf34d5a3dc5c1a86df3968348cca633 + e58e9f9e30b4729c06a7af05889cc7f2fb276192 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e3fa4f53ccf34d5a3dc5c1a86df3968348cca633 + e58e9f9e30b4729c06a7af05889cc7f2fb276192 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e3fa4f53ccf34d5a3dc5c1a86df3968348cca633 + e58e9f9e30b4729c06a7af05889cc7f2fb276192 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e3fa4f53ccf34d5a3dc5c1a86df3968348cca633 + e58e9f9e30b4729c06a7af05889cc7f2fb276192 https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - bfd542d3f97a3ad64bb9a8c74f2243dc7563798e + 68ccc9e588b5069851e81f320ba6d68e28c75ee1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - bfd542d3f97a3ad64bb9a8c74f2243dc7563798e + 68ccc9e588b5069851e81f320ba6d68e28c75ee1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - bfd542d3f97a3ad64bb9a8c74f2243dc7563798e + 68ccc9e588b5069851e81f320ba6d68e28c75ee1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - bfd542d3f97a3ad64bb9a8c74f2243dc7563798e + 68ccc9e588b5069851e81f320ba6d68e28c75ee1 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 0875f86e1..3797b104b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -74,11 +74,11 @@ 8.0.4 8.0.4 - 8.0.4-servicing.24169.10 - 8.0.4-servicing.24169.10 - 8.0.4-servicing.24169.10 - 8.0.4-servicing.24169.10 - 8.0.4-servicing.24169.10 + 8.0.4-servicing.24169.15 + 8.0.4-servicing.24169.15 + 8.0.4-servicing.24169.15 + 8.0.4-servicing.24169.15 + 8.0.4-servicing.24169.15 0.2.0 @@ -86,8 +86,8 @@ 8.0.104 - 8.0.104-servicing.24169.84 - 8.0.104-servicing.24169.84 + 8.0.104-servicing.24169.93 + 8.0.104-servicing.24169.93 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 0e8678206cc69c1523fb2106c1c66e8c90495168 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 20 Mar 2024 06:27:22 +0000 Subject: [PATCH 472/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.104 -> To Version 8.0.104 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 8.0.4 -> To Version 8.0.4 (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 413636fef..1fcf36550 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,10 +19,10 @@ - + - + @@ -48,10 +48,10 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a4e2ee8d6..00ae57990 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -7,19 +7,19 @@ --> https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 161450e0bd8de91351085bf794ef73018105b2bc + 04094d116496e0bd1d376fd346397ec7900141f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 161450e0bd8de91351085bf794ef73018105b2bc + 04094d116496e0bd1d376fd346397ec7900141f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 161450e0bd8de91351085bf794ef73018105b2bc + 04094d116496e0bd1d376fd346397ec7900141f8 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 161450e0bd8de91351085bf794ef73018105b2bc + 04094d116496e0bd1d376fd346397ec7900141f8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 68ccc9e588b5069851e81f320ba6d68e28c75ee1 + b07b2e223ff28a987ed4182bc9488bd7008f60a2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 68ccc9e588b5069851e81f320ba6d68e28c75ee1 + b07b2e223ff28a987ed4182bc9488bd7008f60a2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 68ccc9e588b5069851e81f320ba6d68e28c75ee1 + b07b2e223ff28a987ed4182bc9488bd7008f60a2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 68ccc9e588b5069851e81f320ba6d68e28c75ee1 + b07b2e223ff28a987ed4182bc9488bd7008f60a2 https://github.com/dotnet/test-templates @@ -124,13 +124,13 @@ 1e5f3603af2277910aad946736ee23283e7f3e16 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 1575d7056e8952d90f592553e9f00661bc94e81a + 41a4bd690229661e3ec74276ce3f93863b22435b - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 29ccbeca12c26d35acfea8fd4033168fdc2edcb8 + ebbf01f54996755566db36e2e962ba6364da2ecc https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 3797b104b..b89e1d6b2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,11 +48,11 @@ - 8.0.4-servicing.24169.7 + 8.0.4-servicing.24169.11 - 8.0.4-servicing.24169.8 + 8.0.4-servicing.24169.10 @@ -86,8 +86,8 @@ 8.0.104 - 8.0.104-servicing.24169.93 - 8.0.104-servicing.24169.93 + 8.0.104-servicing.24169.97 + 8.0.104-servicing.24169.97 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -112,8 +112,8 @@ - 8.0.4-servicing.24169.21 - 8.0.4-servicing.24169.21 + 8.0.4-servicing.24169.24 + 8.0.4-servicing.24169.24 8.0.4 8.0.4 From ea960a5f5f8060cfad889ab7c04d00a332225faf Mon Sep 17 00:00:00 2001 From: Ella Hathaway <67609881+ellahathaway@users.noreply.github.com> Date: Wed, 20 Mar 2024 16:09:58 -0700 Subject: [PATCH 473/535] Update MsftToSbSdk.diff baseline (#19117) --- .../assets/baselines/MsftToSbSdk.diff | 101 +----------------- 1 file changed, 5 insertions(+), 96 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 4d662a3c3..bd443698c 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,23 +14,7 @@ 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/ @@ -125,35 +109,6 @@ 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 @@ -169,26 +124,21 @@ 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/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/ +-./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 @@ -200,10 +150,6 @@ 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 @@ -259,21 +205,11 @@ 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 @@ -329,13 +265,6 @@ 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 @@ -360,16 +289,6 @@ 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/ @@ -387,28 +306,18 @@ 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 e4e8770e3f72eedc8d44981039e92c895b47b930 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 21 Mar 2024 02:03:06 +0000 Subject: [PATCH 474/535] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.104 -> To Version 8.0.104 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets From Version 8.0.4 -> To Version 8.0.4 (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 1fcf36550..da45fdba4 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,7 +10,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -43,12 +43,12 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 00ae57990..dc18073b4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -58,49 +58,49 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e58e9f9e30b4729c06a7af05889cc7f2fb276192 + 8486d31e24f30e3fa1809a95699a0adc16f448d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e58e9f9e30b4729c06a7af05889cc7f2fb276192 + 8486d31e24f30e3fa1809a95699a0adc16f448d7 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e58e9f9e30b4729c06a7af05889cc7f2fb276192 + 8486d31e24f30e3fa1809a95699a0adc16f448d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e58e9f9e30b4729c06a7af05889cc7f2fb276192 + 8486d31e24f30e3fa1809a95699a0adc16f448d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e58e9f9e30b4729c06a7af05889cc7f2fb276192 + 8486d31e24f30e3fa1809a95699a0adc16f448d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e58e9f9e30b4729c06a7af05889cc7f2fb276192 + 8486d31e24f30e3fa1809a95699a0adc16f448d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e58e9f9e30b4729c06a7af05889cc7f2fb276192 + 8486d31e24f30e3fa1809a95699a0adc16f448d7 https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b07b2e223ff28a987ed4182bc9488bd7008f60a2 + 88e8f6129d6e8bb551a121f7969a5e0f33eb6881 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b07b2e223ff28a987ed4182bc9488bd7008f60a2 + 88e8f6129d6e8bb551a121f7969a5e0f33eb6881 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b07b2e223ff28a987ed4182bc9488bd7008f60a2 + 88e8f6129d6e8bb551a121f7969a5e0f33eb6881 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b07b2e223ff28a987ed4182bc9488bd7008f60a2 + 88e8f6129d6e8bb551a121f7969a5e0f33eb6881 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index b89e1d6b2..4232ed8b6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -74,11 +74,11 @@ 8.0.4 8.0.4 - 8.0.4-servicing.24169.15 - 8.0.4-servicing.24169.15 - 8.0.4-servicing.24169.15 - 8.0.4-servicing.24169.15 - 8.0.4-servicing.24169.15 + 8.0.4-servicing.24170.14 + 8.0.4-servicing.24170.14 + 8.0.4-servicing.24170.14 + 8.0.4-servicing.24170.14 + 8.0.4-servicing.24170.14 0.2.0 @@ -86,8 +86,8 @@ 8.0.104 - 8.0.104-servicing.24169.97 - 8.0.104-servicing.24169.97 + 8.0.104-servicing.24170.24 + 8.0.104-servicing.24170.24 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 6c6625a740207e95cae113adbd5de147a0f374f1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 21 Mar 2024 22:36:07 +0000 Subject: [PATCH 475/535] Update dependencies from https://github.com/dotnet/arcade build Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.24163.12 -> To Version 7.0.0-beta.24171.2 --- NuGet.config | 9 - eng/Version.Details.xml | 12 +- eng/Versions.props | 2 +- eng/common/templates-official/job/job.yml | 276 +++++++++++++++++ .../templates-official/job/onelocbuild.yml | 112 +++++++ .../job/publish-build-assets.yml | 162 ++++++++++ .../templates-official/job/source-build.yml | 64 ++++ .../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 | 25 ++ .../post-build/post-build.yml | 290 ++++++++++++++++++ .../post-build/setup-maestro-vars.yml | 70 +++++ .../post-build/trigger-subscription.yml | 13 + .../steps/add-build-to-channel.yml | 13 + .../steps/component-governance.yml | 10 + .../steps/execute-codeql.yml | 32 ++ .../steps/generate-sbom.yml | 44 +++ .../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 | 108 +++++++ .../variables/sdl-variables.yml | 7 + global.json | 4 +- 25 files changed, 1619 insertions(+), 18 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/component-governance.yml create mode 100644 eng/common/templates-official/steps/execute-codeql.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/sdl-variables.yml diff --git a/NuGet.config b/NuGet.config index b05560e29..bdc3a6cb9 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,19 +10,14 @@ - - - - - @@ -44,15 +39,11 @@ - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3e09d1c59..f623ff164 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - bbc75d8a5897763eaf6945c263759930e02dd32b + bc35747acd136d5aca170df4ec527c346db76c8e - + https://github.com/dotnet/arcade - bbc75d8a5897763eaf6945c263759930e02dd32b + bc35747acd136d5aca170df4ec527c346db76c8e - + https://github.com/dotnet/arcade - bbc75d8a5897763eaf6945c263759930e02dd32b + bc35747acd136d5aca170df4ec527c346db76c8e https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index dc5488682..f330e2057 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.24163.12 + 7.0.0-beta.24171.2 diff --git a/eng/common/templates-official/job/job.yml b/eng/common/templates-official/job/job.yml new file mode 100644 index 000000000..a1bb79c43 --- /dev/null +++ b/eng/common/templates-official/job/job.yml @@ -0,0 +1,276 @@ +# 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: '' + templateContext: '' + +# 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 + disableComponentGovernance: '' + 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 }} + + ${{ if ne(parameters.templateContext, '') }}: + templateContext: ${{ parameters.templateContext }} + + 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 key-value variable syntax. + # example: + # - [key]: [value] + - ${{ if and(eq(variable.name, ''), eq(variable.group, '')) }}: + - ${{ 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')) + + - task: NuGetAuthenticate@1 + + - ${{ if or(eq(parameters.artifacts.download, 'true'), 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 + 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 }} + + - ${{ 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 or(eq(parameters.artifacts.publish.artifacts, 'true'), 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 or(eq(parameters.artifacts.publish.logs, 'true'), ne(parameters.artifacts.publish.logs, '')) }}: + - task: 1ES.PublishPipelineArtifact@1 + inputs: + targetPath: 'artifacts/log' + artifactName: ${{ coalesce(parameters.artifacts.publish.logs.name, 'Logs_Build_$(Agent.Os)_$(_BuildConfig)') }} + displayName: 'Publish logs' + continueOnError: true + condition: always() + + - ${{ if or(eq(parameters.artifacts.publish.manifests, 'true'), ne(parameters.artifacts.publish.manifests, '')) }}: + - ${{ if and(ne(parameters.enablePublishUsingPipelines, 'true'), eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - task: CopyFiles@2 + displayName: Gather Asset Manifests + inputs: + SourceFolder: '$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)/AssetManifest' + TargetFolder: '$(Build.ArtifactStagingDirectory)/AssetManifests' + continueOnError: ${{ parameters.continueOnError }} + condition: and(succeeded(), eq(variables['_DotNetPublishToBlobFeed'], 'true')) + + - task: 1ES.PublishBuildArtifacts@1 + displayName: Push Asset Manifests + inputs: + PathtoPublish: '$(Build.ArtifactStagingDirectory)/AssetManifests' + PublishLocation: Container + ArtifactName: AssetManifests + continueOnError: ${{ parameters.continueOnError }} + condition: and(succeeded(), eq(variables['_DotNetPublishToBlobFeed'], 'true')) + + - ${{ 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.enablePublishBuildAssets, true), ne(parameters.enablePublishUsingPipelines, 'true'), eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - task: CopyFiles@2 + displayName: Gather Asset Manifests + inputs: + SourceFolder: '$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)/AssetManifest' + TargetFolder: '$(Build.StagingDirectory)/AssetManifests' + continueOnError: ${{ parameters.continueOnError }} + condition: and(succeeded(), eq(variables['_DotNetPublishToBlobFeed'], 'true')) + + - task: 1ES.PublishBuildArtifacts@1 + displayName: Push Asset Manifests + inputs: + PathtoPublish: '$(Build.StagingDirectory)/AssetManifests' + PublishLocation: Container + ArtifactName: AssetManifests + continueOnError: ${{ parameters.continueOnError }} + condition: and(succeeded(), eq(variables['_DotNetPublishToBlobFeed'], 'true')) + + - ${{ 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 }} diff --git a/eng/common/templates-official/job/onelocbuild.yml b/eng/common/templates-official/job/onelocbuild.yml new file mode 100644 index 000000000..52b4d05d3 --- /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 + 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 000000000..d0073ea8a --- /dev/null +++ b/eng/common/templates-official/job/publish-build-assets.yml @@ -0,0 +1,162 @@ +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 + 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: Enable cross-org NuGet feed authentication + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/enable-cross-org-publishing.ps1 + arguments: -token $(dn-bot-all-orgs-artifact-feeds-rw) + + - 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.dot.net + /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: | + New-Item -Path "$(Build.StagingDirectory)/ReleaseConfigs" -ItemType Directory -Force + $filePath = "$(Build.StagingDirectory)/ReleaseConfigs/ReleaseConfigs.txt" + Add-Content -Path $filePath -Value $(BARBuildId) + Add-Content -Path $filePath -Value "$(DefaultChannels)" + Add-Content -Path $filePath -Value $(IsStableBuild) + + - task: 1ES.PublishBuildArtifacts@1 + displayName: Publish ReleaseConfigs Artifact + inputs: + PathtoPublish: '$(Build.StagingDirectory)/ReleaseConfigs' + 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 000000000..f5fa09f41 --- /dev/null +++ b/eng/common/templates-official/job/source-build.yml @@ -0,0 +1,64 @@ +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. + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + name: NetCore-Svc-Public + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: NetCore1ESPool-Svc-Internal + image: 1es-mariner-2 + 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 000000000..73bf386ed --- /dev/null +++ b/eng/common/templates-official/job/source-index-stage1.yml @@ -0,0 +1,68 @@ +parameters: + runAsPublic: false + sourceIndexPackageVersion: 1.0.1-20220804.1 + 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 + os: windows + + steps: + - ${{ each preStep in parameters.preSteps }}: + - ${{ preStep }} + + - task: UseDotNet@2 + displayName: Use .NET Core sdk 3.1 + inputs: + packageType: sdk + version: 3.1.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 000000000..b68d3c2f3 --- /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 000000000..857a0f8ba --- /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 000000000..a5168eb35 --- /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-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, + # 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 000000000..b504fe55c --- /dev/null +++ b/eng/common/templates-official/post-build/common-variables.yml @@ -0,0 +1,25 @@ +variables: + - group: AzureDevOps-Artifact-Feeds-Pats + - group: DotNet-DotNetCli-Storage + - group: DotNet-MSRC-Storage + - 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.dot.net" + - 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 000000000..35976adb7 --- /dev/null +++ b/eng/common/templates-official/post-build/post-build.yml @@ -0,0 +1,290 @@ +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: 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 + 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 + 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' + + - task: PowerShell@2 + displayName: Enable cross-org publishing + inputs: + filePath: eng\common\enable-cross-org-publishing.ps1 + arguments: -token $(dn-bot-dnceng-artifact-feeds-rw) + + # 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' + + - 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 + 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 + 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 000000000..0c87f149a --- /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 000000000..da669030d --- /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 000000000..f67a210d6 --- /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/component-governance.yml b/eng/common/templates-official/steps/component-governance.yml new file mode 100644 index 000000000..babc2757d --- /dev/null +++ b/eng/common/templates-official/steps/component-governance.yml @@ -0,0 +1,10 @@ +parameters: + disableComponentGovernance: false + +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 \ 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 000000000..9b4a5ffa3 --- /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/generate-sbom.yml b/eng/common/templates-official/steps/generate-sbom.yml new file mode 100644 index 000000000..f98fe1d2f --- /dev/null +++ b/eng/common/templates-official/steps/generate-sbom.yml @@ -0,0 +1,44 @@ +# 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 + +parameters: + PackageVersion: 7.0.0 + BuildDropPath: '$(Build.SourcesDirectory)/artifacts' + PackageName: '.NET' + ManifestDirPath: $(Build.ArtifactStagingDirectory)/sbom + 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 }} + +- 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 000000000..04012fed1 --- /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 000000000..83d97a26a --- /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 000000000..2f51ef5b9 --- /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 }} \ No newline at end of file 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 000000000..a7f27ce8e --- /dev/null +++ b/eng/common/templates-official/steps/source-build.yml @@ -0,0 +1,108 @@ +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 + + publishArgs= + if [ '${{ parameters.platform.skipPublishValidation }}' != 'true' ]; then + publishArgs='--publish' + fi + + ${{ coalesce(parameters.platform.buildScript, './build.sh') }} --ci \ + --configuration $buildConfig \ + --restore --build --pack $publishArgs -bl \ + $officialBuildArgs \ + $internalRuntimeDownloadArgs \ + $internalRestoreArgs \ + $targetRidArgs \ + $runtimeOsArgs \ + /p:SourceBuildNonPortable=${{ parameters.platform.nonPortable }} \ + /p:ArcadeBuildFromSource=true + 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() 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 000000000..dbdd66d4a --- /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 f6f1f44a5..c79633e8a 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.24163.12", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24163.12" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24171.2", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24171.2" } } From 6405cddfd4775c91de99c75901ac6b43fd360fc9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 21 Mar 2024 22:36:08 +0000 Subject: [PATCH 476/535] Update dependencies from https://github.com/dotnet/arcade build Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.24163.12 -> To Version 7.0.0-beta.24171.2 --- NuGet.config | 9 - eng/Version.Details.xml | 12 +- eng/Versions.props | 2 +- eng/common/templates-official/job/job.yml | 276 +++++++++++++++++ .../templates-official/job/onelocbuild.yml | 112 +++++++ .../job/publish-build-assets.yml | 162 ++++++++++ .../templates-official/job/source-build.yml | 64 ++++ .../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 | 25 ++ .../post-build/post-build.yml | 290 ++++++++++++++++++ .../post-build/setup-maestro-vars.yml | 70 +++++ .../post-build/trigger-subscription.yml | 13 + .../steps/add-build-to-channel.yml | 13 + .../steps/component-governance.yml | 10 + .../steps/execute-codeql.yml | 32 ++ .../steps/generate-sbom.yml | 44 +++ .../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 | 108 +++++++ .../variables/sdl-variables.yml | 7 + global.json | 4 +- 25 files changed, 1619 insertions(+), 18 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/component-governance.yml create mode 100644 eng/common/templates-official/steps/execute-codeql.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/sdl-variables.yml diff --git a/NuGet.config b/NuGet.config index b8a810353..d288f50a2 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,19 +10,14 @@ - - - - - @@ -44,15 +39,11 @@ - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 187dfbfe1..0a670fbd7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - bbc75d8a5897763eaf6945c263759930e02dd32b + bc35747acd136d5aca170df4ec527c346db76c8e - + https://github.com/dotnet/arcade - bbc75d8a5897763eaf6945c263759930e02dd32b + bc35747acd136d5aca170df4ec527c346db76c8e - + https://github.com/dotnet/arcade - bbc75d8a5897763eaf6945c263759930e02dd32b + bc35747acd136d5aca170df4ec527c346db76c8e https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index bcedf3fbd..9f8344700 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.24163.12 + 7.0.0-beta.24171.2 diff --git a/eng/common/templates-official/job/job.yml b/eng/common/templates-official/job/job.yml new file mode 100644 index 000000000..a1bb79c43 --- /dev/null +++ b/eng/common/templates-official/job/job.yml @@ -0,0 +1,276 @@ +# 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: '' + templateContext: '' + +# 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 + disableComponentGovernance: '' + 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 }} + + ${{ if ne(parameters.templateContext, '') }}: + templateContext: ${{ parameters.templateContext }} + + 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 key-value variable syntax. + # example: + # - [key]: [value] + - ${{ if and(eq(variable.name, ''), eq(variable.group, '')) }}: + - ${{ 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')) + + - task: NuGetAuthenticate@1 + + - ${{ if or(eq(parameters.artifacts.download, 'true'), 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 + 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 }} + + - ${{ 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 or(eq(parameters.artifacts.publish.artifacts, 'true'), 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 or(eq(parameters.artifacts.publish.logs, 'true'), ne(parameters.artifacts.publish.logs, '')) }}: + - task: 1ES.PublishPipelineArtifact@1 + inputs: + targetPath: 'artifacts/log' + artifactName: ${{ coalesce(parameters.artifacts.publish.logs.name, 'Logs_Build_$(Agent.Os)_$(_BuildConfig)') }} + displayName: 'Publish logs' + continueOnError: true + condition: always() + + - ${{ if or(eq(parameters.artifacts.publish.manifests, 'true'), ne(parameters.artifacts.publish.manifests, '')) }}: + - ${{ if and(ne(parameters.enablePublishUsingPipelines, 'true'), eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - task: CopyFiles@2 + displayName: Gather Asset Manifests + inputs: + SourceFolder: '$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)/AssetManifest' + TargetFolder: '$(Build.ArtifactStagingDirectory)/AssetManifests' + continueOnError: ${{ parameters.continueOnError }} + condition: and(succeeded(), eq(variables['_DotNetPublishToBlobFeed'], 'true')) + + - task: 1ES.PublishBuildArtifacts@1 + displayName: Push Asset Manifests + inputs: + PathtoPublish: '$(Build.ArtifactStagingDirectory)/AssetManifests' + PublishLocation: Container + ArtifactName: AssetManifests + continueOnError: ${{ parameters.continueOnError }} + condition: and(succeeded(), eq(variables['_DotNetPublishToBlobFeed'], 'true')) + + - ${{ 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.enablePublishBuildAssets, true), ne(parameters.enablePublishUsingPipelines, 'true'), eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - task: CopyFiles@2 + displayName: Gather Asset Manifests + inputs: + SourceFolder: '$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)/AssetManifest' + TargetFolder: '$(Build.StagingDirectory)/AssetManifests' + continueOnError: ${{ parameters.continueOnError }} + condition: and(succeeded(), eq(variables['_DotNetPublishToBlobFeed'], 'true')) + + - task: 1ES.PublishBuildArtifacts@1 + displayName: Push Asset Manifests + inputs: + PathtoPublish: '$(Build.StagingDirectory)/AssetManifests' + PublishLocation: Container + ArtifactName: AssetManifests + continueOnError: ${{ parameters.continueOnError }} + condition: and(succeeded(), eq(variables['_DotNetPublishToBlobFeed'], 'true')) + + - ${{ 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 }} diff --git a/eng/common/templates-official/job/onelocbuild.yml b/eng/common/templates-official/job/onelocbuild.yml new file mode 100644 index 000000000..52b4d05d3 --- /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 + 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 000000000..d0073ea8a --- /dev/null +++ b/eng/common/templates-official/job/publish-build-assets.yml @@ -0,0 +1,162 @@ +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 + 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: Enable cross-org NuGet feed authentication + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/enable-cross-org-publishing.ps1 + arguments: -token $(dn-bot-all-orgs-artifact-feeds-rw) + + - 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.dot.net + /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: | + New-Item -Path "$(Build.StagingDirectory)/ReleaseConfigs" -ItemType Directory -Force + $filePath = "$(Build.StagingDirectory)/ReleaseConfigs/ReleaseConfigs.txt" + Add-Content -Path $filePath -Value $(BARBuildId) + Add-Content -Path $filePath -Value "$(DefaultChannels)" + Add-Content -Path $filePath -Value $(IsStableBuild) + + - task: 1ES.PublishBuildArtifacts@1 + displayName: Publish ReleaseConfigs Artifact + inputs: + PathtoPublish: '$(Build.StagingDirectory)/ReleaseConfigs' + 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 000000000..f5fa09f41 --- /dev/null +++ b/eng/common/templates-official/job/source-build.yml @@ -0,0 +1,64 @@ +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. + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + name: NetCore-Svc-Public + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: NetCore1ESPool-Svc-Internal + image: 1es-mariner-2 + 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 000000000..73bf386ed --- /dev/null +++ b/eng/common/templates-official/job/source-index-stage1.yml @@ -0,0 +1,68 @@ +parameters: + runAsPublic: false + sourceIndexPackageVersion: 1.0.1-20220804.1 + 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 + os: windows + + steps: + - ${{ each preStep in parameters.preSteps }}: + - ${{ preStep }} + + - task: UseDotNet@2 + displayName: Use .NET Core sdk 3.1 + inputs: + packageType: sdk + version: 3.1.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 000000000..b68d3c2f3 --- /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 000000000..857a0f8ba --- /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 000000000..a5168eb35 --- /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-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, + # 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 000000000..b504fe55c --- /dev/null +++ b/eng/common/templates-official/post-build/common-variables.yml @@ -0,0 +1,25 @@ +variables: + - group: AzureDevOps-Artifact-Feeds-Pats + - group: DotNet-DotNetCli-Storage + - group: DotNet-MSRC-Storage + - 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.dot.net" + - 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 000000000..35976adb7 --- /dev/null +++ b/eng/common/templates-official/post-build/post-build.yml @@ -0,0 +1,290 @@ +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: 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 + 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 + 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' + + - task: PowerShell@2 + displayName: Enable cross-org publishing + inputs: + filePath: eng\common\enable-cross-org-publishing.ps1 + arguments: -token $(dn-bot-dnceng-artifact-feeds-rw) + + # 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' + + - 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 + 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 + 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 000000000..0c87f149a --- /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 000000000..da669030d --- /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 000000000..f67a210d6 --- /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/component-governance.yml b/eng/common/templates-official/steps/component-governance.yml new file mode 100644 index 000000000..babc2757d --- /dev/null +++ b/eng/common/templates-official/steps/component-governance.yml @@ -0,0 +1,10 @@ +parameters: + disableComponentGovernance: false + +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 \ 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 000000000..9b4a5ffa3 --- /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/generate-sbom.yml b/eng/common/templates-official/steps/generate-sbom.yml new file mode 100644 index 000000000..f98fe1d2f --- /dev/null +++ b/eng/common/templates-official/steps/generate-sbom.yml @@ -0,0 +1,44 @@ +# 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 + +parameters: + PackageVersion: 7.0.0 + BuildDropPath: '$(Build.SourcesDirectory)/artifacts' + PackageName: '.NET' + ManifestDirPath: $(Build.ArtifactStagingDirectory)/sbom + 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 }} + +- 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 000000000..04012fed1 --- /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 000000000..83d97a26a --- /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 000000000..2f51ef5b9 --- /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 }} \ No newline at end of file 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 000000000..a7f27ce8e --- /dev/null +++ b/eng/common/templates-official/steps/source-build.yml @@ -0,0 +1,108 @@ +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 + + publishArgs= + if [ '${{ parameters.platform.skipPublishValidation }}' != 'true' ]; then + publishArgs='--publish' + fi + + ${{ coalesce(parameters.platform.buildScript, './build.sh') }} --ci \ + --configuration $buildConfig \ + --restore --build --pack $publishArgs -bl \ + $officialBuildArgs \ + $internalRuntimeDownloadArgs \ + $internalRestoreArgs \ + $targetRidArgs \ + $runtimeOsArgs \ + /p:SourceBuildNonPortable=${{ parameters.platform.nonPortable }} \ + /p:ArcadeBuildFromSource=true + 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() 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 000000000..dbdd66d4a --- /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 f6f1f44a5..c79633e8a 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.24163.12", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24163.12" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24171.2", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24171.2" } } From 32becbf8c1f6a48c24f7a8832b86d57e8603ce13 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 21 Mar 2024 22:37:28 +0000 Subject: [PATCH 477/535] Update dependencies from https://github.com/dotnet/arcade build Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.24114.4 -> To Version 7.0.0-beta.24171.2 --- NuGet.config | 9 - eng/Version.Details.xml | 12 +- eng/Versions.props | 2 +- eng/common/SetupNugetSources.ps1 | 26 +- eng/common/post-build/publish-using-darc.ps1 | 4 +- eng/common/templates-official/job/job.yml | 276 +++++++++++++++++ .../templates-official/job/onelocbuild.yml | 112 +++++++ .../job/publish-build-assets.yml | 162 ++++++++++ .../templates-official/job/source-build.yml | 64 ++++ .../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 | 25 ++ .../post-build/post-build.yml | 290 ++++++++++++++++++ .../post-build/setup-maestro-vars.yml | 70 +++++ .../post-build/trigger-subscription.yml | 13 + .../steps/add-build-to-channel.yml | 13 + .../steps/component-governance.yml | 10 + .../steps/execute-codeql.yml | 32 ++ .../steps/generate-sbom.yml | 44 +++ .../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 | 108 +++++++ .../variables/sdl-variables.yml | 7 + .../templates/job/publish-build-assets.yml | 8 +- eng/common/templates/jobs/jobs.yml | 4 +- .../templates/post-build/post-build.yml | 12 +- global.json | 6 +- 30 files changed, 1647 insertions(+), 46 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/component-governance.yml create mode 100644 eng/common/templates-official/steps/execute-codeql.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/sdl-variables.yml diff --git a/NuGet.config b/NuGet.config index b5a2563ce..9c94cf60c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,22 +7,17 @@ - - - - - @@ -44,15 +39,11 @@ - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 039f5a564..cc8d8bef2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -194,18 +194,18 @@ - + https://github.com/dotnet/arcade - c9bbc4b7606b46f6121a2758d2555dfc6322ed88 + bc35747acd136d5aca170df4ec527c346db76c8e - + https://github.com/dotnet/arcade - c9bbc4b7606b46f6121a2758d2555dfc6322ed88 + bc35747acd136d5aca170df4ec527c346db76c8e - + https://github.com/dotnet/arcade - c9bbc4b7606b46f6121a2758d2555dfc6322ed88 + bc35747acd136d5aca170df4ec527c346db76c8e https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index db67e6d66..9573ff76e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.24114.4 + 7.0.0-beta.24171.2 diff --git a/eng/common/SetupNugetSources.ps1 b/eng/common/SetupNugetSources.ps1 index 6e9972394..f3dc39a12 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') @@ -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/post-build/publish-using-darc.ps1 b/eng/common/post-build/publish-using-darc.ps1 index 5a3a32ea8..1e779fec4 100644 --- a/eng/common/post-build/publish-using-darc.ps1 +++ b/eng/common/post-build/publish-using-darc.ps1 @@ -12,7 +12,7 @@ param( try { . $PSScriptRoot\post-build-utils.ps1 - $darc = Get-Darc + $darc = Get-Darc $optionalParams = [System.Collections.ArrayList]::new() @@ -46,7 +46,7 @@ try { } Write-Host 'done.' -} +} catch { Write-Host $_ Write-PipelineTelemetryError -Category 'PromoteBuild' -Message "There was an error while trying to publish build '$BuildId' to default channels." diff --git a/eng/common/templates-official/job/job.yml b/eng/common/templates-official/job/job.yml new file mode 100644 index 000000000..a1bb79c43 --- /dev/null +++ b/eng/common/templates-official/job/job.yml @@ -0,0 +1,276 @@ +# 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: '' + templateContext: '' + +# 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 + disableComponentGovernance: '' + 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 }} + + ${{ if ne(parameters.templateContext, '') }}: + templateContext: ${{ parameters.templateContext }} + + 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 key-value variable syntax. + # example: + # - [key]: [value] + - ${{ if and(eq(variable.name, ''), eq(variable.group, '')) }}: + - ${{ 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')) + + - task: NuGetAuthenticate@1 + + - ${{ if or(eq(parameters.artifacts.download, 'true'), 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 + 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 }} + + - ${{ 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 or(eq(parameters.artifacts.publish.artifacts, 'true'), 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 or(eq(parameters.artifacts.publish.logs, 'true'), ne(parameters.artifacts.publish.logs, '')) }}: + - task: 1ES.PublishPipelineArtifact@1 + inputs: + targetPath: 'artifacts/log' + artifactName: ${{ coalesce(parameters.artifacts.publish.logs.name, 'Logs_Build_$(Agent.Os)_$(_BuildConfig)') }} + displayName: 'Publish logs' + continueOnError: true + condition: always() + + - ${{ if or(eq(parameters.artifacts.publish.manifests, 'true'), ne(parameters.artifacts.publish.manifests, '')) }}: + - ${{ if and(ne(parameters.enablePublishUsingPipelines, 'true'), eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - task: CopyFiles@2 + displayName: Gather Asset Manifests + inputs: + SourceFolder: '$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)/AssetManifest' + TargetFolder: '$(Build.ArtifactStagingDirectory)/AssetManifests' + continueOnError: ${{ parameters.continueOnError }} + condition: and(succeeded(), eq(variables['_DotNetPublishToBlobFeed'], 'true')) + + - task: 1ES.PublishBuildArtifacts@1 + displayName: Push Asset Manifests + inputs: + PathtoPublish: '$(Build.ArtifactStagingDirectory)/AssetManifests' + PublishLocation: Container + ArtifactName: AssetManifests + continueOnError: ${{ parameters.continueOnError }} + condition: and(succeeded(), eq(variables['_DotNetPublishToBlobFeed'], 'true')) + + - ${{ 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.enablePublishBuildAssets, true), ne(parameters.enablePublishUsingPipelines, 'true'), eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - task: CopyFiles@2 + displayName: Gather Asset Manifests + inputs: + SourceFolder: '$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)/AssetManifest' + TargetFolder: '$(Build.StagingDirectory)/AssetManifests' + continueOnError: ${{ parameters.continueOnError }} + condition: and(succeeded(), eq(variables['_DotNetPublishToBlobFeed'], 'true')) + + - task: 1ES.PublishBuildArtifacts@1 + displayName: Push Asset Manifests + inputs: + PathtoPublish: '$(Build.StagingDirectory)/AssetManifests' + PublishLocation: Container + ArtifactName: AssetManifests + continueOnError: ${{ parameters.continueOnError }} + condition: and(succeeded(), eq(variables['_DotNetPublishToBlobFeed'], 'true')) + + - ${{ 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 }} diff --git a/eng/common/templates-official/job/onelocbuild.yml b/eng/common/templates-official/job/onelocbuild.yml new file mode 100644 index 000000000..52b4d05d3 --- /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 + 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 000000000..d0073ea8a --- /dev/null +++ b/eng/common/templates-official/job/publish-build-assets.yml @@ -0,0 +1,162 @@ +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 + 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: Enable cross-org NuGet feed authentication + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/enable-cross-org-publishing.ps1 + arguments: -token $(dn-bot-all-orgs-artifact-feeds-rw) + + - 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.dot.net + /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: | + New-Item -Path "$(Build.StagingDirectory)/ReleaseConfigs" -ItemType Directory -Force + $filePath = "$(Build.StagingDirectory)/ReleaseConfigs/ReleaseConfigs.txt" + Add-Content -Path $filePath -Value $(BARBuildId) + Add-Content -Path $filePath -Value "$(DefaultChannels)" + Add-Content -Path $filePath -Value $(IsStableBuild) + + - task: 1ES.PublishBuildArtifacts@1 + displayName: Publish ReleaseConfigs Artifact + inputs: + PathtoPublish: '$(Build.StagingDirectory)/ReleaseConfigs' + 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 000000000..f5fa09f41 --- /dev/null +++ b/eng/common/templates-official/job/source-build.yml @@ -0,0 +1,64 @@ +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. + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + name: NetCore-Svc-Public + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: NetCore1ESPool-Svc-Internal + image: 1es-mariner-2 + 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 000000000..73bf386ed --- /dev/null +++ b/eng/common/templates-official/job/source-index-stage1.yml @@ -0,0 +1,68 @@ +parameters: + runAsPublic: false + sourceIndexPackageVersion: 1.0.1-20220804.1 + 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 + os: windows + + steps: + - ${{ each preStep in parameters.preSteps }}: + - ${{ preStep }} + + - task: UseDotNet@2 + displayName: Use .NET Core sdk 3.1 + inputs: + packageType: sdk + version: 3.1.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 000000000..b68d3c2f3 --- /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 000000000..857a0f8ba --- /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 000000000..a5168eb35 --- /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-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, + # 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 000000000..b504fe55c --- /dev/null +++ b/eng/common/templates-official/post-build/common-variables.yml @@ -0,0 +1,25 @@ +variables: + - group: AzureDevOps-Artifact-Feeds-Pats + - group: DotNet-DotNetCli-Storage + - group: DotNet-MSRC-Storage + - 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.dot.net" + - 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 000000000..35976adb7 --- /dev/null +++ b/eng/common/templates-official/post-build/post-build.yml @@ -0,0 +1,290 @@ +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: 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 + 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 + 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' + + - task: PowerShell@2 + displayName: Enable cross-org publishing + inputs: + filePath: eng\common\enable-cross-org-publishing.ps1 + arguments: -token $(dn-bot-dnceng-artifact-feeds-rw) + + # 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' + + - 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 + 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 + 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 000000000..0c87f149a --- /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 000000000..da669030d --- /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 000000000..f67a210d6 --- /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/component-governance.yml b/eng/common/templates-official/steps/component-governance.yml new file mode 100644 index 000000000..babc2757d --- /dev/null +++ b/eng/common/templates-official/steps/component-governance.yml @@ -0,0 +1,10 @@ +parameters: + disableComponentGovernance: false + +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 \ 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 000000000..9b4a5ffa3 --- /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/generate-sbom.yml b/eng/common/templates-official/steps/generate-sbom.yml new file mode 100644 index 000000000..f98fe1d2f --- /dev/null +++ b/eng/common/templates-official/steps/generate-sbom.yml @@ -0,0 +1,44 @@ +# 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 + +parameters: + PackageVersion: 7.0.0 + BuildDropPath: '$(Build.SourcesDirectory)/artifacts' + PackageName: '.NET' + ManifestDirPath: $(Build.ArtifactStagingDirectory)/sbom + 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 }} + +- 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 000000000..04012fed1 --- /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 000000000..83d97a26a --- /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 000000000..2f51ef5b9 --- /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 }} \ No newline at end of file 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 000000000..a7f27ce8e --- /dev/null +++ b/eng/common/templates-official/steps/source-build.yml @@ -0,0 +1,108 @@ +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 + + publishArgs= + if [ '${{ parameters.platform.skipPublishValidation }}' != 'true' ]; then + publishArgs='--publish' + fi + + ${{ coalesce(parameters.platform.buildScript, './build.sh') }} --ci \ + --configuration $buildConfig \ + --restore --build --pack $publishArgs -bl \ + $officialBuildArgs \ + $internalRuntimeDownloadArgs \ + $internalRestoreArgs \ + $targetRidArgs \ + $runtimeOsArgs \ + /p:SourceBuildNonPortable=${{ parameters.platform.nonPortable }} \ + /p:ArcadeBuildFromSource=true + 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() 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 000000000..dbdd66d4a --- /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/eng/common/templates/job/publish-build-assets.yml b/eng/common/templates/job/publish-build-assets.yml index 127948252..4ff83a536 100644 --- a/eng/common/templates/job/publish-build-assets.yml +++ b/eng/common/templates/job/publish-build-assets.yml @@ -92,7 +92,7 @@ jobs: /p:OfficialBuildId=$(Build.BuildNumber) condition: ${{ parameters.condition }} continueOnError: ${{ parameters.continueOnError }} - + - task: powershell@2 displayName: Create ReleaseConfigs Artifact inputs: @@ -101,7 +101,7 @@ jobs: 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: PublishBuildArtifacts@1 displayName: Publish ReleaseConfigs Artifact inputs: @@ -127,7 +127,7 @@ jobs: - task: PublishBuildArtifacts@1 displayName: Publish SymbolPublishingExclusionsFile Artifact - condition: eq(variables['SymbolExclusionFile'], 'true') + condition: eq(variables['SymbolExclusionFile'], 'true') inputs: PathtoPublish: '$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt' PublishLocation: Container @@ -154,4 +154,4 @@ jobs: - ${{ if eq(parameters.enablePublishBuildArtifacts, 'true') }}: - template: /eng/common/templates/steps/publish-logs.yml parameters: - JobLabel: 'Publish_Artifacts_Logs' + JobLabel: 'Publish_Artifacts_Logs' diff --git a/eng/common/templates/jobs/jobs.yml b/eng/common/templates/jobs/jobs.yml index 67a2e2c74..289bb2396 100644 --- a/eng/common/templates/jobs/jobs.yml +++ b/eng/common/templates/jobs/jobs.yml @@ -20,7 +20,7 @@ parameters: 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: [] @@ -47,7 +47,7 @@ parameters: jobs: - ${{ each job in parameters.jobs }}: - template: ../job/job.yml - parameters: + parameters: # pass along parameters ${{ each parameter in parameters }}: ${{ if ne(parameter.key, 'jobs') }}: diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index 37bca799a..7b989985b 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -39,7 +39,7 @@ parameters: displayName: Enable NuGet validation type: boolean default: true - + - name: publishInstallersAndChecksums displayName: Publish installers and checksums type: boolean @@ -131,8 +131,8 @@ stages: displayName: Validate inputs: filePath: $(Build.SourcesDirectory)/eng/common/post-build/nuget-validation.ps1 - arguments: -PackagesPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ - -ToolDestinationPath $(Agent.BuildDirectory)/Extract/ + arguments: -PackagesPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ + -ToolDestinationPath $(Agent.BuildDirectory)/Extract/ - job: displayName: Signing Validation @@ -227,9 +227,9 @@ stages: 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) + arguments: -InputPath $(Build.ArtifactStagingDirectory)/BlobArtifacts/ + -ExtractPath $(Agent.BuildDirectory)/Extract/ + -GHRepoName $(Build.Repository.Name) -GHCommit $(Build.SourceVersion) -SourcelinkCliVersion $(SourceLinkCLIVersion) continueOnError: true diff --git a/global.json b/global.json index 5d42d1e74..c79633e8a 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.116", + "dotnet": "7.0.117", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24114.4", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24114.4" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24171.2", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24171.2" } } From f924bc41bc7364bf9e3266e750add54be629f87f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 21 Mar 2024 22:40:50 +0000 Subject: [PATCH 478/535] Update dependencies from https://github.com/dotnet/arcade build Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.24163.12 -> To Version 7.0.0-beta.24171.2 From 25bc12bceac2851cd7dce459fc0ec485a31809a3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 21 Mar 2024 22:42:35 +0000 Subject: [PATCH 479/535] Update dependencies from https://github.com/dotnet/arcade build Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.24163.12 -> To Version 7.0.0-beta.24171.2 From ae48308ac54859c94d4c5335770c099f62cddbe4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 22 Mar 2024 03:40:43 +0000 Subject: [PATCH 480/535] Update dependencies from https://github.com/dotnet/arcade build Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.24163.12 -> To Version 7.0.0-beta.24171.6 --- eng/Version.Details.xml | 12 ++--- eng/Versions.props | 2 +- .../variables/pool-providers.yml | 45 +++++++++++++++++++ global.json | 4 +- 4 files changed, 54 insertions(+), 9 deletions(-) create mode 100644 eng/common/templates-official/variables/pool-providers.yml diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f623ff164..99043cbdf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - bc35747acd136d5aca170df4ec527c346db76c8e + 834d09f0c963da37c88aed7ba3a83acafe582948 - + https://github.com/dotnet/arcade - bc35747acd136d5aca170df4ec527c346db76c8e + 834d09f0c963da37c88aed7ba3a83acafe582948 - + https://github.com/dotnet/arcade - bc35747acd136d5aca170df4ec527c346db76c8e + 834d09f0c963da37c88aed7ba3a83acafe582948 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index f330e2057..a573984c8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.24171.2 + 7.0.0-beta.24171.6 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 000000000..beab7d1bf --- /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/global.json b/global.json index c79633e8a..6eb189856 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.24171.2", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24171.2" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24171.6", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24171.6" } } From 46811d24893e2f8281a0b1f9143f1e7b5c78c98e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 22 Mar 2024 03:40:45 +0000 Subject: [PATCH 481/535] Update dependencies from https://github.com/dotnet/arcade build Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.24163.12 -> To Version 7.0.0-beta.24171.6 --- eng/Version.Details.xml | 12 ++--- eng/Versions.props | 2 +- .../variables/pool-providers.yml | 45 +++++++++++++++++++ global.json | 4 +- 4 files changed, 54 insertions(+), 9 deletions(-) create mode 100644 eng/common/templates-official/variables/pool-providers.yml diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0a670fbd7..71562c711 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - bc35747acd136d5aca170df4ec527c346db76c8e + 834d09f0c963da37c88aed7ba3a83acafe582948 - + https://github.com/dotnet/arcade - bc35747acd136d5aca170df4ec527c346db76c8e + 834d09f0c963da37c88aed7ba3a83acafe582948 - + https://github.com/dotnet/arcade - bc35747acd136d5aca170df4ec527c346db76c8e + 834d09f0c963da37c88aed7ba3a83acafe582948 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 9f8344700..d8ac2a195 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.24171.2 + 7.0.0-beta.24171.6 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 000000000..beab7d1bf --- /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/global.json b/global.json index c79633e8a..6eb189856 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.24171.2", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24171.2" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24171.6", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24171.6" } } From c752048aa24d4bff00fbfd90b7e01849ab1fbe81 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 22 Mar 2024 03:42:09 +0000 Subject: [PATCH 482/535] Update dependencies from https://github.com/dotnet/arcade build Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.24114.4 -> To Version 7.0.0-beta.24171.6 --- eng/Version.Details.xml | 12 ++--- eng/Versions.props | 2 +- .../variables/pool-providers.yml | 45 +++++++++++++++++++ global.json | 4 +- 4 files changed, 54 insertions(+), 9 deletions(-) create mode 100644 eng/common/templates-official/variables/pool-providers.yml diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cc8d8bef2..6a787823f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -194,18 +194,18 @@ - + https://github.com/dotnet/arcade - bc35747acd136d5aca170df4ec527c346db76c8e + 834d09f0c963da37c88aed7ba3a83acafe582948 - + https://github.com/dotnet/arcade - bc35747acd136d5aca170df4ec527c346db76c8e + 834d09f0c963da37c88aed7ba3a83acafe582948 - + https://github.com/dotnet/arcade - bc35747acd136d5aca170df4ec527c346db76c8e + 834d09f0c963da37c88aed7ba3a83acafe582948 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 9573ff76e..edbf626d6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.24171.2 + 7.0.0-beta.24171.6 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 000000000..beab7d1bf --- /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/global.json b/global.json index c79633e8a..6eb189856 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.24171.2", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24171.2" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24171.6", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24171.6" } } From 5ae0d7486c6c97a197b370c41715272ba698b499 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 22 Mar 2024 03:45:11 +0000 Subject: [PATCH 483/535] Update dependencies from https://github.com/dotnet/arcade build Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.24163.12 -> To Version 7.0.0-beta.24171.6 From 9921f6d0da6955934d6e1c2ce3fa3366a1750101 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 22 Mar 2024 03:46:51 +0000 Subject: [PATCH 484/535] Update dependencies from https://github.com/dotnet/arcade build Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.24163.12 -> To Version 7.0.0-beta.24171.6 From a37cd044ef9440367ad9a2d6d72573e20d307200 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 25 Mar 2024 12:31:55 +0000 Subject: [PATCH 485/535] Update dependencies from https://github.com/dotnet/arcade build Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.24163.12 -> To Version 7.0.0-beta.24172.6 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/templates-official/job/job.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 99043cbdf..96738143e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - 834d09f0c963da37c88aed7ba3a83acafe582948 + a14feb9f4edafbe99fc870b306615b639af6ae43 - + https://github.com/dotnet/arcade - 834d09f0c963da37c88aed7ba3a83acafe582948 + a14feb9f4edafbe99fc870b306615b639af6ae43 - + https://github.com/dotnet/arcade - 834d09f0c963da37c88aed7ba3a83acafe582948 + a14feb9f4edafbe99fc870b306615b639af6ae43 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index a573984c8..06975b7c1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.24171.6 + 7.0.0-beta.24172.6 diff --git a/eng/common/templates-official/job/job.yml b/eng/common/templates-official/job/job.yml index a1bb79c43..cd21848f4 100644 --- a/eng/common/templates-official/job/job.yml +++ b/eng/common/templates-official/job/job.yml @@ -116,7 +116,7 @@ jobs: - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - ${{ if eq(parameters.enableMicrobuild, 'true') }}: - - task: MicroBuildSigningPlugin@3 + - task: MicroBuildSigningPlugin@4 displayName: Install MicroBuild plugin inputs: signType: $(_SignType) diff --git a/global.json b/global.json index 6eb189856..9d1d64240 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.24171.6", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24171.6" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24172.6", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24172.6" } } From 5547d2b40ab852f288740ad684c26d7bb643738b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 25 Mar 2024 12:31:55 +0000 Subject: [PATCH 486/535] Update dependencies from https://github.com/dotnet/arcade build Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.24163.12 -> To Version 7.0.0-beta.24172.6 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/templates-official/job/job.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 71562c711..03d0369cb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - 834d09f0c963da37c88aed7ba3a83acafe582948 + a14feb9f4edafbe99fc870b306615b639af6ae43 - + https://github.com/dotnet/arcade - 834d09f0c963da37c88aed7ba3a83acafe582948 + a14feb9f4edafbe99fc870b306615b639af6ae43 - + https://github.com/dotnet/arcade - 834d09f0c963da37c88aed7ba3a83acafe582948 + a14feb9f4edafbe99fc870b306615b639af6ae43 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index d8ac2a195..9f386d099 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.24171.6 + 7.0.0-beta.24172.6 diff --git a/eng/common/templates-official/job/job.yml b/eng/common/templates-official/job/job.yml index a1bb79c43..cd21848f4 100644 --- a/eng/common/templates-official/job/job.yml +++ b/eng/common/templates-official/job/job.yml @@ -116,7 +116,7 @@ jobs: - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - ${{ if eq(parameters.enableMicrobuild, 'true') }}: - - task: MicroBuildSigningPlugin@3 + - task: MicroBuildSigningPlugin@4 displayName: Install MicroBuild plugin inputs: signType: $(_SignType) diff --git a/global.json b/global.json index 6eb189856..9d1d64240 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.24171.6", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24171.6" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24172.6", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24172.6" } } From c1c9491532aade836a20b5e8935dcb65c7db3c75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C5=99emek=20Vysok=C3=BD?= Date: Tue, 26 Mar 2024 14:18:33 +0100 Subject: [PATCH 487/535] [release/8.0.1xx] Migrate VMR synchronization to 1ES PT (#19190) --- .../templates/jobs/vmr-synchronization.yml | 21 +++++----- eng/pipelines/vmr-sync-internal.yml | 37 +++++++++++++++--- eng/pipelines/vmr-sync.yml | 39 +++++++++++++++---- 3 files changed, 74 insertions(+), 23 deletions(-) diff --git a/eng/pipelines/templates/jobs/vmr-synchronization.yml b/eng/pipelines/templates/jobs/vmr-synchronization.yml index 713deea20..ae950fd34 100644 --- a/eng/pipelines/templates/jobs/vmr-synchronization.yml +++ b/eng/pipelines/templates/jobs/vmr-synchronization.yml @@ -19,10 +19,13 @@ parameters: jobs: - job: Synchronize_VMR - displayName: Synchronize dotnet/dotnet + displayName: Synchronize VMR's ${{ parameters.vmrBranch }} timeoutInMinutes: 120 variables: - - template: /eng/common/templates/variables/pool-providers.yml + - ${{ if eq(variables['System.TeamProject'], 'public') }}: + - template: /eng/common/templates/variables/pool-providers.yml + - ${{ else }}: + - template: /eng/common/templates-official/variables/pool-providers.yml - name: vmrPath value: $(Agent.BuildDirectory)/vmr - ${{ if not(parameters.noPush) }}: @@ -36,20 +39,21 @@ jobs: - group: DotNetBot-AzDO-PAT - name: vmrInternalUrl value: https://dnceng@dev.azure.com/dnceng/internal/_git/dotnet-dotnet - + pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: name: $(DncEngPublicBuildPool) - demands: ImageOverride -equals Build.Ubuntu.2004.Amd64.Open - ${{ if eq(variables['System.TeamProject'], 'internal') }}: + image: 1es-ubuntu-2004-open + os: linux + ${{ else }}: name: $(DncEngInternalBuildPool) - demands: ImageOverride -equals Build.Ubuntu.2004.Amd64 + demands: ImageOverride -equals 1es-ubuntu-2004 + os: linux steps: - template: ../steps/vmr-prepare.yml parameters: vmrBranch: ${{ parameters.vmrBranch }} - isBuiltFromVmr: false - template: ../steps/vmr-pull-updates.yml parameters: @@ -57,7 +61,6 @@ jobs: vmrBranch: ${{ parameters.vmrBranch }} targetRef: ${{ parameters.targetRef }} - - ${{ if and(not(parameters.noPush), not(in(variables['Build.Reason'], 'PullRequest')), eq(variables['System.TeamProject'], 'internal')) }}: # Push main and release branches to the public VMR - ${{ if or(eq(parameters.vmrBranch, 'main'), startsWith(parameters.vmrBranch, 'release/')) }}: @@ -83,4 +86,4 @@ jobs: --azdev-pat '$(dn-bot-dnceng-build-rw-code-rw)' --verbose displayName: Push changes to dotnet-dotnet (internal) - workingDirectory: $(Agent.BuildDirectory)/installer \ No newline at end of file + workingDirectory: $(Agent.BuildDirectory)/installer diff --git a/eng/pipelines/vmr-sync-internal.yml b/eng/pipelines/vmr-sync-internal.yml index 0a10a518e..02d474907 100644 --- a/eng/pipelines/vmr-sync-internal.yml +++ b/eng/pipelines/vmr-sync-internal.yml @@ -17,21 +17,46 @@ resources: name: dotnet-dotnet ref: $(Build.SourceBranch) + - repository: 1ESPipelineTemplates + type: git + name: 1ESPipelineTemplates/1ESPipelineTemplates + ref: refs/tags/release + parameters: - name: vmrBranch displayName: dotnet-dotnet branch to push to type: string default: ' ' -variables: +variables: - ${{ if ne(parameters.vmrBranch, ' ') }}: - name: VmrBranch value: ${{ replace(parameters.vmrBranch, ' ', '') }} - ${{ else }}: - name: VmrBranch value: ${{ replace(replace(variables['Build.SourceBranch'], 'refs/heads/', ''), 'refs/pull/', '') }} - -jobs: - - template: templates/jobs/vmr-synchronization.yml - parameters: - vmrBranch: ${{ variables.VmrBranch }} \ No newline at end of file + +extends: + template: v1/1ES.Official.PipelineTemplate.yml@1ESPipelineTemplates + parameters: + sdl: + sourceAnalysisPool: + name: $(DncEngInternalBuildPool) + image: 1es-windows-2022 + os: windows + + sourceRepositoriesToScan: + exclude: + - repository: vmr + + componentgovernance: + sourceScanPath: $(Agent.BuildDirectory)/vmr + ignoreDirectories: $(Agent.BuildDirectory)/vmr/src + + stages: + - stage: VMRSynchronization + displayName: VMR Synchronization + jobs: + - template: /eng/pipelines/templates/jobs/vmr-synchronization.yml@self + parameters: + vmrBranch: ${{ variables.VmrBranch }} \ No newline at end of file diff --git a/eng/pipelines/vmr-sync.yml b/eng/pipelines/vmr-sync.yml index 6659887f1..7cdab71f3 100644 --- a/eng/pipelines/vmr-sync.yml +++ b/eng/pipelines/vmr-sync.yml @@ -19,23 +19,46 @@ resources: endpoint: dotnet ref: $(Build.SourceBranch) + - repository: 1ESPipelineTemplates + type: git + name: 1ESPipelineTemplates/1ESPipelineTemplates + ref: refs/tags/release + parameters: - name: vmrBranch displayName: dotnet/dotnet branch to push to type: string default: ' ' -variables: +variables: - ${{ if ne(parameters.vmrBranch, ' ') }}: - name: VmrBranch value: ${{ replace(parameters.vmrBranch, ' ', '') }} - ${{ else }}: - name: VmrBranch value: ${{ replace(replace(variables['Build.SourceBranch'], 'refs/heads/', ''), 'refs/pull/', '') }} - -jobs: - - template: /eng/pipelines/templates/jobs/vmr-synchronization.yml - parameters: - vmrBranch: ${{ variables.VmrBranch }} - - \ No newline at end of file + +extends: + template: v1/1ES.Official.PipelineTemplate.yml@1ESPipelineTemplates + parameters: + sdl: + sourceAnalysisPool: + name: $(DncEngInternalBuildPool) + image: 1es-windows-2022 + os: windows + + sourceRepositoriesToScan: + exclude: + - repository: vmr + + componentgovernance: + sourceScanPath: $(Agent.BuildDirectory)/vmr + ignoreDirectories: $(Agent.BuildDirectory)/vmr/src + + stages: + - stage: VMRSynchronization + displayName: VMR Synchronization + jobs: + - template: /eng/pipelines/templates/jobs/vmr-synchronization.yml@self + parameters: + vmrBranch: ${{ variables.VmrBranch }} From 08a32c51333b6de780b65de19071f1f5d36006ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C5=99emek=20Vysok=C3=BD?= Date: Tue, 26 Mar 2024 15:30:02 +0100 Subject: [PATCH 488/535] [release/8.0.1xx] Fix missing parameter in VMR sync (#19196) --- eng/pipelines/templates/jobs/vmr-synchronization.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/eng/pipelines/templates/jobs/vmr-synchronization.yml b/eng/pipelines/templates/jobs/vmr-synchronization.yml index ae950fd34..e3f20ce7b 100644 --- a/eng/pipelines/templates/jobs/vmr-synchronization.yml +++ b/eng/pipelines/templates/jobs/vmr-synchronization.yml @@ -54,6 +54,7 @@ jobs: - template: ../steps/vmr-prepare.yml parameters: vmrBranch: ${{ parameters.vmrBranch }} + isBuiltFromVmr: false - template: ../steps/vmr-pull-updates.yml parameters: From 86bc81fb459d0c49e028b1eee419389a96157597 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C5=99emek=20Vysok=C3=BD?= Date: Tue, 26 Mar 2024 16:43:46 +0100 Subject: [PATCH 489/535] [release/8.0.1xx] Fix 1ES SDL pool in VMR sync (#19198) --- eng/pipelines/vmr-sync-internal.yml | 2 ++ eng/pipelines/vmr-sync.yml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/eng/pipelines/vmr-sync-internal.yml b/eng/pipelines/vmr-sync-internal.yml index 02d474907..cb0877ea2 100644 --- a/eng/pipelines/vmr-sync-internal.yml +++ b/eng/pipelines/vmr-sync-internal.yml @@ -29,6 +29,8 @@ parameters: default: ' ' variables: +- template: /eng/common/templates-official/variables/pool-providers.yml@self + - ${{ if ne(parameters.vmrBranch, ' ') }}: - name: VmrBranch value: ${{ replace(parameters.vmrBranch, ' ', '') }} diff --git a/eng/pipelines/vmr-sync.yml b/eng/pipelines/vmr-sync.yml index 7cdab71f3..7de3ef614 100644 --- a/eng/pipelines/vmr-sync.yml +++ b/eng/pipelines/vmr-sync.yml @@ -31,6 +31,8 @@ parameters: default: ' ' variables: +- template: /eng/common/templates-official/variables/pool-providers.yml@self + - ${{ if ne(parameters.vmrBranch, ' ') }}: - name: VmrBranch value: ${{ replace(parameters.vmrBranch, ' ', '') }} From 03d64e7eed8b8e1a2cb1dcfb9d50e6065077642a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 26 Mar 2024 15:48:03 +0000 Subject: [PATCH 490/535] Update dependencies from https://github.com/dotnet/arcade build Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.24163.12 -> To Version 7.0.0-beta.24175.1 --- 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 96738143e..fec4995ed 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - a14feb9f4edafbe99fc870b306615b639af6ae43 + 84988fee39220970768c4f82c545d7b352274e02 - + https://github.com/dotnet/arcade - a14feb9f4edafbe99fc870b306615b639af6ae43 + 84988fee39220970768c4f82c545d7b352274e02 - + https://github.com/dotnet/arcade - a14feb9f4edafbe99fc870b306615b639af6ae43 + 84988fee39220970768c4f82c545d7b352274e02 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 06975b7c1..7e460055a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.24172.6 + 7.0.0-beta.24175.1 diff --git a/global.json b/global.json index 9d1d64240..d0480ff21 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.24172.6", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24172.6" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24175.1", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24175.1" } } From c6738c96b9ce07a817b9b2903cf2db95a88a64c5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 26 Mar 2024 15:48:04 +0000 Subject: [PATCH 491/535] Update dependencies from https://github.com/dotnet/arcade build Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.24163.12 -> To Version 7.0.0-beta.24175.1 --- 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 03d0369cb..344f7f58a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - a14feb9f4edafbe99fc870b306615b639af6ae43 + 84988fee39220970768c4f82c545d7b352274e02 - + https://github.com/dotnet/arcade - a14feb9f4edafbe99fc870b306615b639af6ae43 + 84988fee39220970768c4f82c545d7b352274e02 - + https://github.com/dotnet/arcade - a14feb9f4edafbe99fc870b306615b639af6ae43 + 84988fee39220970768c4f82c545d7b352274e02 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 9f386d099..e7bdf09cd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.24172.6 + 7.0.0-beta.24175.1 diff --git a/global.json b/global.json index 9d1d64240..d0480ff21 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.24172.6", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24172.6" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24175.1", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24175.1" } } From 77440109307c6b46e5a2e68c19aec52504d46444 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 27 Mar 2024 02:06:39 +0000 Subject: [PATCH 492/535] Update dependencies from https://github.com/dotnet/arcade build Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.24163.12 -> To Version 7.0.0-beta.24176.7 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/templates-official/job/job.yml | 1 + global.json | 4 ++-- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fec4995ed..83a2585ec 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - 84988fee39220970768c4f82c545d7b352274e02 + ea5ae5b4a608862561d02a158dfaac443fbaaff1 - + https://github.com/dotnet/arcade - 84988fee39220970768c4f82c545d7b352274e02 + ea5ae5b4a608862561d02a158dfaac443fbaaff1 - + https://github.com/dotnet/arcade - 84988fee39220970768c4f82c545d7b352274e02 + ea5ae5b4a608862561d02a158dfaac443fbaaff1 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 7e460055a..9088839b6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.24175.1 + 7.0.0-beta.24176.7 diff --git a/eng/common/templates-official/job/job.yml b/eng/common/templates-official/job/job.yml index cd21848f4..ecaa096b8 100644 --- a/eng/common/templates-official/job/job.yml +++ b/eng/common/templates-official/job/job.yml @@ -124,6 +124,7 @@ jobs: feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json env: TeamName: $(_TeamName) + MicroBuildOutputFolderOverride: '$(Agent.TempDirectory)' continueOnError: ${{ parameters.continueOnError }} condition: and(succeeded(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT')) diff --git a/global.json b/global.json index d0480ff21..86cac79b9 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.24175.1", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24175.1" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24176.7", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24176.7" } } From 8d71d7bdadc05cb3e570dd2dae560af5ae2c3e60 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 27 Mar 2024 02:06:40 +0000 Subject: [PATCH 493/535] Update dependencies from https://github.com/dotnet/arcade build Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.24163.12 -> To Version 7.0.0-beta.24176.7 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/templates-official/job/job.yml | 1 + global.json | 4 ++-- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 344f7f58a..c963c49c7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - 84988fee39220970768c4f82c545d7b352274e02 + ea5ae5b4a608862561d02a158dfaac443fbaaff1 - + https://github.com/dotnet/arcade - 84988fee39220970768c4f82c545d7b352274e02 + ea5ae5b4a608862561d02a158dfaac443fbaaff1 - + https://github.com/dotnet/arcade - 84988fee39220970768c4f82c545d7b352274e02 + ea5ae5b4a608862561d02a158dfaac443fbaaff1 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index e7bdf09cd..489cfa9a4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.24175.1 + 7.0.0-beta.24176.7 diff --git a/eng/common/templates-official/job/job.yml b/eng/common/templates-official/job/job.yml index cd21848f4..ecaa096b8 100644 --- a/eng/common/templates-official/job/job.yml +++ b/eng/common/templates-official/job/job.yml @@ -124,6 +124,7 @@ jobs: feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json env: TeamName: $(_TeamName) + MicroBuildOutputFolderOverride: '$(Agent.TempDirectory)' continueOnError: ${{ parameters.continueOnError }} condition: and(succeeded(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT')) diff --git a/global.json b/global.json index d0480ff21..86cac79b9 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.24175.1", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24175.1" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24176.7", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24176.7" } } From 2ffd0887ae038ab26f511b5a1cb0e16be744690c Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Fri, 29 Mar 2024 10:22:54 -0500 Subject: [PATCH 494/535] [release/8.0.1xx] Migrate VMR pipeline to 1ES templates (#19073) --- eng/pipelines/templates/jobs/vmr-build.yml | 35 ++-- eng/pipelines/templates/stages/vmr-build.yml | 157 ++++++++---------- .../templates/variables/vmr-build.yml | 24 +++ src/SourceBuild/content/eng/pipelines/ci.yml | 28 +++- .../pipelines/templates/stages/vmr-scan.yml | 11 +- 5 files changed, 145 insertions(+), 110 deletions(-) create mode 100644 eng/pipelines/templates/variables/vmr-build.yml diff --git a/eng/pipelines/templates/jobs/vmr-build.yml b/eng/pipelines/templates/jobs/vmr-build.yml index 9c5e58dbe..bc986e9f4 100644 --- a/eng/pipelines/templates/jobs/vmr-build.yml +++ b/eng/pipelines/templates/jobs/vmr-build.yml @@ -67,7 +67,10 @@ jobs: condition: succeededOrFailed() dependsOn: ${{ parameters.reuseBuildArtifactsFrom }}_${{ parameters.architecture }} variables: - - template: /eng/common/templates/variables/pool-providers.yml + - ${{ if eq(variables['System.TeamProject'], 'public') }}: + - template: /eng/common/templates/variables/pool-providers.yml + - ${{ else }}: + - template: /eng/common/templates-official/variables/pool-providers.yml - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - group: AzureDevOps-Artifact-Feeds-Pats - ${{ if and(not(parameters.isBuiltFromVmr), eq(variables['System.TeamProject'], 'internal'), not(startswith(parameters.vmrBranch, 'internal/release/')), not(eq(variables['Build.Reason'], 'PullRequest'))) }}: @@ -87,8 +90,21 @@ jobs: - name: sourcesPath value: ${{ parameters.vmrPath }} + templateContext: + outputs: + - output: pipelineArtifact + displayName: 'Publish BuildLogs' + condition: succeededOrFailed() + targetPath: '$(Build.StagingDirectory)/BuildLogs' + artifactName: $(Agent.JobName)_BuildLogs_Attempt$(System.JobAttempt) + - output: pipelineArtifact + displayName: 'Publish Artifacts' + condition: succeededOrFailed() + targetPath: '${{ variables.sourcesPath }}/artifacts/${{ parameters.architecture }}/Release/' + artifactName: $(Agent.JobName)_Artifacts + steps: - - template: ../steps/vmr-prepare.yml + - template: ../steps/vmr-prepare.yml@self parameters: ${{ if eq(variables['Build.Reason'], 'PullRequest') }}: vmrBranch: $(System.PullRequest.TargetBranch) @@ -99,7 +115,7 @@ jobs: # Synchronize new content in the VMR during PRs (we expect this to come - ${{ if and(not(parameters.isBuiltFromVmr), eq(variables['Build.Reason'], 'PullRequest')) }}: - - template: ../steps/vmr-pull-updates.yml + - template: ../steps/vmr-pull-updates.yml@self parameters: vmrPath: ${{ parameters.vmrPath }} vmrBranch: ${{ parameters.vmrBranch }} @@ -250,13 +266,6 @@ jobs: displayName: Prepare BuildLogs staging directory continueOnError: true condition: succeededOrFailed() - - - publish: '$(Build.StagingDirectory)/BuildLogs' - artifact: $(Agent.JobName)_BuildLogs_Attempt$(System.JobAttempt) - displayName: Publish BuildLogs - continueOnError: true - condition: succeededOrFailed() - - task: PublishTestResults@2 displayName: Publish Test Results condition: succeededOrFailed() @@ -268,9 +277,3 @@ jobs: mergeTestResults: true publishRunAttachments: true testRunTitle: SourceBuild_SmokeTests_$(Agent.JobName) - - - publish: '${{ variables.sourcesPath }}/artifacts/${{ parameters.architecture }}/Release/' - artifact: $(Agent.JobName)_Artifacts - displayName: Publish Artifacts - condition: succeededOrFailed() - continueOnError: true diff --git a/eng/pipelines/templates/stages/vmr-build.yml b/eng/pipelines/templates/stages/vmr-build.yml index 43f0c8633..2f9692f22 100644 --- a/eng/pipelines/templates/stages/vmr-build.yml +++ b/eng/pipelines/templates/stages/vmr-build.yml @@ -2,38 +2,61 @@ ### If run in a PR, new changes are applied to a local copy of the VMR, then it is source-built and tested parameters: - dependsOn: [] - condition: always() +- name: dependsOn + type: object + default: [] +- name: condition + type: string + default: always() # Branch of the VMR to use (to push to for internal builds) - vmrBranch: $(Build.SourceBranch) +- name: vmrBranch + type: string + default: $(Build.SourceBranch) # True when build is running from dotnet/dotnet directly - isBuiltFromVmr: +- name: isBuiltFromVmr + type: boolean + default: false # The following parameters aren't expected to be passed in rather they are used for encapsulation # ----------------------------------------------------------------------------------------------- - alpine317Container: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.17 - centOSStream8Container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8 - centOSStream9Container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9 - fedora38Container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-38 - ubuntu2204Container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04 - ubuntu2204ArmContainer: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-arm64 +- name: alpine317Container + type: string + default: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.17 +- name: centOSStream8Container + type: string + default: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8 +- name: centOSStream9Container + type: string + default: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9 +- name: fedora38Container + type: string + default: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-38 +- name: ubuntu2204Container + type: string + default: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04 +- name: ubuntu2204ArmContainer + type: string + default: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-arm64 - # Internal builds - poolInternalAmd64: - name: NetCore1ESPool-Svc-Internal - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 - poolInternalAmd64PR: - name: NetCore1ESPool-Internal-XL - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 - poolInternalArm64: - name: Docker-Linux-Arm-Internal +# These are not expected to be passed it but rather just object variables reused below +- name: pool_Linux + type: object + default: + name: $(defaultPoolName) + image: $(poolImage_Linux) + demands: ImageOverride -equals $(poolImage_Linux) + os: linux - # Public builds / PRs - poolPublicAmd64: - name: NetCore-Public-XL - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open +- name: pool_LinuxArm64 + type: object + default: + name: $(poolName_LinuxArm64) + image: $(poolImage_LinuxArm64) + demands: ImageOverride -equals $(poolImage_Linux) + hostArchitecture: Arm64 + os: linux stages: - stage: VMR_Source_Build @@ -41,23 +64,7 @@ stages: dependsOn: ${{ parameters.dependsOn }} condition: ${{ parameters.condition }} variables: - - ${{ if eq(variables['System.TeamProject'], 'public') }}: - - name: defaultPoolName - value: ${{ parameters.poolPublicAmd64.name }} - - name: defaultPoolDemands - value: ${{ parameters.poolPublicAmd64.demands }} - - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - - ${{ if in(variables['Build.Reason'], 'PullRequest') }}: - - name: defaultPoolName - value: ${{ parameters.poolInternalAmd64PR.name }} - - name: defaultPoolDemands - value: ${{ parameters.poolInternalAmd64PR.demands }} - - ${{ else }}: - - name: defaultPoolName - value: ${{ parameters.poolInternalAmd64.name }} - - name: defaultPoolDemands - value: ${{ parameters.poolInternalAmd64.demands }} - + - template: ../variables/vmr-build.yml@self - ${{ if ne(parameters.vmrBranch, '') }}: - name: VmrBranch value: ${{ parameters.vmrBranch }} @@ -69,16 +76,14 @@ stages: # PR and CI legs ------------------------------------ - - template: ../jobs/vmr-build.yml + - template: ../jobs/vmr-build.yml@self parameters: # Changing the build name requires updating the referenced name in the source-build-sdk-diff-tests.yml pipeline buildName: CentOSStream8_Online_MsftSdk isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }} vmrBranch: ${{ variables.VmrBranch }} architecture: x64 - pool: - name: ${{ variables.defaultPoolName }} - demands: ${{ variables.defaultPoolDemands }} + pool: ${{ parameters.pool_Linux }} container: ${{ parameters.centOSStream8Container }} buildFromArchive: false # 🚫 enablePoison: false # 🚫 @@ -87,16 +92,14 @@ stages: useMonoRuntime: false # 🚫 withPreviousSDK: false # 🚫 - - template: ../jobs/vmr-build.yml + - template: ../jobs/vmr-build.yml@self parameters: # Changing the build name requires updating the referenced name in the source-build-sdk-diff-tests.yml pipeline buildName: CentOSStream8_Offline_MsftSdk isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }} vmrBranch: ${{ variables.VmrBranch }} architecture: x64 - pool: - name: ${{ variables.defaultPoolName }} - demands: ${{ variables.defaultPoolDemands }} + pool: ${{ parameters.pool_Linux }} container: ${{ parameters.centOSStream8Container }} buildFromArchive: true # ✅ enablePoison: false # 🚫 @@ -109,16 +112,14 @@ stages: # CI - Stage 1 x64 legs ------------------------------------ - - template: ../jobs/vmr-build.yml + - template: ../jobs/vmr-build.yml@self parameters: # Changing the build name requires updating the referenced name in the source-build-sdk-diff-tests.yml pipeline buildName: Alpine317_Offline_MsftSdk isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }} vmrBranch: ${{ variables.VmrBranch }} architecture: x64 - pool: - name: ${{ variables.defaultPoolName }} - demands: ${{ variables.defaultPoolDemands }} + pool: ${{ parameters.pool_Linux }} container: ${{ parameters.alpine317Container }} buildFromArchive: false # ✅ enablePoison: false # 🚫 @@ -127,16 +128,14 @@ stages: useMonoRuntime: false # 🚫 withPreviousSDK: false # 🚫 - - template: ../jobs/vmr-build.yml + - template: ../jobs/vmr-build.yml@self parameters: # Changing the build name requires updating the referenced name in the source-build-sdk-diff-tests.yml pipeline buildName: CentOSStream8_Online_PreviousSourceBuiltSdk isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }} vmrBranch: ${{ variables.VmrBranch }} architecture: x64 - pool: - name: ${{ variables.defaultPoolName }} - demands: ${{ variables.defaultPoolDemands }} + pool: ${{ parameters.pool_Linux }} container: ${{ parameters.centOSStream8Container }} buildFromArchive: false # 🚫 enablePoison: false # 🚫 @@ -145,16 +144,14 @@ stages: useMonoRuntime: false # 🚫 withPreviousSDK: true # ✅ - - template: ../jobs/vmr-build.yml + - template: ../jobs/vmr-build.yml@self parameters: # Changing the build name requires updating the referenced name in the source-build-sdk-diff-tests.yml pipeline buildName: CentOSStream8_Offline_PreviousSourceBuiltSdk isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }} vmrBranch: ${{ variables.VmrBranch }} architecture: x64 - pool: - name: ${{ variables.defaultPoolName }} - demands: ${{ variables.defaultPoolDemands }} + pool: ${{ parameters.pool_Linux }} container: ${{ parameters.centOSStream8Container }} buildFromArchive: false # 🚫 enablePoison: false # 🚫 @@ -163,16 +160,14 @@ stages: useMonoRuntime: false # 🚫 withPreviousSDK: true # ✅ - - template: ../jobs/vmr-build.yml + - template: ../jobs/vmr-build.yml@self parameters: # Changing the build name requires updating the referenced name in the source-build-sdk-diff-tests.yml pipeline buildName: CentOSStream8_Mono_Offline_MsftSdk isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }} vmrBranch: ${{ variables.VmrBranch }} architecture: x64 - pool: - name: ${{ variables.defaultPoolName }} - demands: ${{ variables.defaultPoolDemands }} + pool: ${{ parameters.pool_Linux }} container: ${{ parameters.centOSStream8Container }} buildFromArchive: true # ✅ enablePoison: false # 🚫 @@ -181,16 +176,14 @@ stages: useMonoRuntime: true # ✅ withPreviousSDK: false # 🚫 - - template: ../jobs/vmr-build.yml + - template: ../jobs/vmr-build.yml@self parameters: # Changing the build name requires updating the referenced name in the source-build-sdk-diff-tests.yml pipeline buildName: CentOSStream9_Offline_MsftSdk isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }} vmrBranch: ${{ variables.VmrBranch }} architecture: x64 - pool: - name: ${{ variables.defaultPoolName }} - demands: ${{ variables.defaultPoolDemands }} + pool: ${{ parameters.pool_Linux }} container: ${{ parameters.centOSStream9Container }} buildFromArchive: true # ✅ enablePoison: false # 🚫 @@ -199,16 +192,14 @@ stages: useMonoRuntime: false # 🚫 withPreviousSDK: false # 🚫 - - template: ../jobs/vmr-build.yml + - template: ../jobs/vmr-build.yml@self parameters: # Changing the build name requires updating the referenced name in the source-build-sdk-diff-tests.yml pipeline buildName: Fedora38_Offline_MsftSdk isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }} vmrBranch: ${{ variables.VmrBranch }} architecture: x64 - pool: - name: ${{ variables.defaultPoolName }} - demands: ${{ variables.defaultPoolDemands }} + pool: ${{ parameters.pool_Linux }} container: ${{ parameters.fedora38Container }} buildFromArchive: true # ✅ enablePoison: true # ✅ @@ -217,16 +208,14 @@ stages: useMonoRuntime: false # 🚫 withPreviousSDK: false # 🚫 - - template: ../jobs/vmr-build.yml + - template: ../jobs/vmr-build.yml@self parameters: # Changing the build name requires updating the referenced name in the source-build-sdk-diff-tests.yml pipeline buildName: Ubuntu2204_Offline_MsftSdk isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }} vmrBranch: ${{ variables.VmrBranch }} architecture: x64 - pool: - name: ${{ variables.defaultPoolName }} - demands: ${{ variables.defaultPoolDemands }} + pool: ${{ parameters.pool_Linux }} container: ${{ parameters.ubuntu2204Container }} buildFromArchive: false # 🚫 enablePoison: false # 🚫 @@ -237,14 +226,14 @@ stages: # CI - Stage 1 arm64 Legs ------------------------------------ - - template: ../jobs/vmr-build.yml + - template: ../jobs/vmr-build.yml@self parameters: # Changing the build name requires updating the referenced name in the source-build-sdk-diff-tests.yml pipeline buildName: Ubuntu2204Arm64_Offline_MsftSdk isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }} vmrBranch: ${{ variables.VmrBranch }} architecture: arm64 - pool: ${{ parameters.poolInternalArm64 }} + pool: ${{ parameters.pool_LinuxArm64 }} container: ${{ parameters.ubuntu2204ArmContainer }} buildFromArchive: false # 🚫 enablePoison: false # 🚫 @@ -255,16 +244,14 @@ stages: # CI - Stage 2 x64 Legs ------------------------------------ - - template: ../jobs/vmr-build.yml + - template: ../jobs/vmr-build.yml@self parameters: # Changing the build name requires updating the referenced name in the source-build-sdk-diff-tests.yml pipeline buildName: CentOSStream8_Online_CurrentSourceBuiltSdk isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }} vmrBranch: ${{ variables.VmrBranch }} architecture: x64 - pool: - name: ${{ variables.defaultPoolName }} - demands: ${{ variables.defaultPoolDemands }} + pool: ${{ parameters.pool_Linux }} container: ${{ parameters.centOSStream8Container }} buildFromArchive: false # 🚫 enablePoison: false # 🚫 @@ -274,16 +261,14 @@ stages: withPreviousSDK: false # 🚫 reuseBuildArtifactsFrom: CentOSStream8_Online_MsftSdk - - template: ../jobs/vmr-build.yml + - template: ../jobs/vmr-build.yml@self parameters: # Changing the build name requires updating the referenced name in the source-build-sdk-diff-tests.yml pipeline buildName: Fedora38_Offline_CurrentSourceBuiltSdk isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }} vmrBranch: ${{ variables.VmrBranch }} architecture: x64 - pool: - name: ${{ variables.defaultPoolName }} - demands: ${{ variables.defaultPoolDemands }} + pool: ${{ parameters.pool_Linux }} container: ${{ parameters.fedora38Container }} buildFromArchive: false # 🚫 enablePoison: false # 🚫 diff --git a/eng/pipelines/templates/variables/vmr-build.yml b/eng/pipelines/templates/variables/vmr-build.yml new file mode 100644 index 000000000..04873069a --- /dev/null +++ b/eng/pipelines/templates/variables/vmr-build.yml @@ -0,0 +1,24 @@ +variables: + +- ${{ if eq(variables['System.TeamProject'], 'public') }}: + - name: defaultPoolName + value: NetCore-Public-XL + - name: poolImage_Linux + value: 1es-ubuntu-2004-open + - name: poolImage_LinuxArm64 + value: Mariner-2-Docker-ARM64 + - name: poolName_LinuxArm64 + value: Docker-Linux-Arm-Public +- ${{ else }}: + - ${{ if in(variables['Build.Reason'], 'PullRequest') }}: + - name: defaultPoolName + value: NetCore1ESPool-Internal-XL + - ${{ else }}: + - name: defaultPoolName + value: $(DncEngInternalBuildPool) + - name: poolImage_Linux + value: 1es-ubuntu-2204 + - name: poolImage_LinuxArm64 + value: Mariner-2-Docker-ARM64 + - name: poolName_LinuxArm64 + value: Docker-Linux-Arm-Internal diff --git a/src/SourceBuild/content/eng/pipelines/ci.yml b/src/SourceBuild/content/eng/pipelines/ci.yml index 55b6a212d..883ea980f 100644 --- a/src/SourceBuild/content/eng/pipelines/ci.yml +++ b/src/SourceBuild/content/eng/pipelines/ci.yml @@ -15,10 +15,28 @@ pr: - release/* - internal/release/* -stages: -- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - template: templates/stages/vmr-scan.yml +resources: + repositories: + - repository: 1ESPipelineTemplates + type: git + name: 1ESPipelineTemplates/1ESPipelineTemplates + ref: refs/tags/release -- template: /src/installer/eng/pipelines/templates/stages/vmr-build.yml +extends: + template: v1/1ES.Official.PipelineTemplate.yml@1ESPipelineTemplates parameters: - isBuiltFromVmr: true + sdl: + sourceAnalysisPool: + name: NetCore1ESPool-Internal + image: 1es-windows-2022 + os: windows + + customBuildTags: + - ES365AIMigrationTooling + + stages: + - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - template: /eng/pipelines/templates/stages/vmr-scan.yml@self + - template: /src/installer/eng/pipelines/templates/stages/vmr-build.yml@self + parameters: + isBuiltFromVmr: true diff --git a/src/SourceBuild/content/eng/pipelines/templates/stages/vmr-scan.yml b/src/SourceBuild/content/eng/pipelines/templates/stages/vmr-scan.yml index 6024ce182..28541d572 100644 --- a/src/SourceBuild/content/eng/pipelines/templates/stages/vmr-scan.yml +++ b/src/SourceBuild/content/eng/pipelines/templates/stages/vmr-scan.yml @@ -3,17 +3,22 @@ stages: displayName: Tag & Scan dependsOn: [] variables: - - template: /eng/common/templates/variables/pool-providers.yml + - ${{ if eq(variables['System.TeamProject'], 'public') }}: + - template: /eng/common/templates/variables/pool-providers.yml + - ${{ else }}: + - template: /eng/common/templates-official/variables/pool-providers.yml jobs: - job: Tag_n_Scan displayName: Tag & Scan pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: name: $(DncEngPublicBuildPool) - demands: ImageOverride -equals Build.Ubuntu.2004.Amd64.Open + image: 1es-ubuntu-2004-open + os: linux ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: $(DncEngInternalBuildPool) - demands: ImageOverride -equals Build.Ubuntu.2004.Amd64 + image: 1es-ubuntu-2004 + os: linux steps: - checkout: self From a7765578076fc097bb66d605e22d3990474e5892 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 1 Apr 2024 22:18:58 +0000 Subject: [PATCH 495/535] Update dependencies from https://github.com/dotnet/arcade build 20240329.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.24165.4 -> To Version 8.0.0-beta.24179.4 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/native/init-compiler.sh | 2 +- eng/common/templates-official/job/job.yml | 3 ++- eng/common/templates-official/job/onelocbuild.yml | 2 +- .../templates-official/job/publish-build-assets.yml | 4 ++-- eng/common/templates-official/job/source-build.yml | 2 +- .../templates-official/job/source-index-stage1.yml | 2 +- .../templates-official/post-build/post-build.yml | 10 +++++----- .../templates-official/variables/pool-providers.yml | 2 +- global.json | 4 ++-- 11 files changed, 23 insertions(+), 22 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 943031ee6..bb4bf3543 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -214,18 +214,18 @@ - + https://github.com/dotnet/arcade - f311667e0587f19c3fa9553a909975662107a351 + fc2b7849b25c4a21457feb6da5fc7c9806a80976 - + https://github.com/dotnet/arcade - f311667e0587f19c3fa9553a909975662107a351 + fc2b7849b25c4a21457feb6da5fc7c9806a80976 - + https://github.com/dotnet/arcade - f311667e0587f19c3fa9553a909975662107a351 + fc2b7849b25c4a21457feb6da5fc7c9806a80976 https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index 5651fd274..6b29fcb29 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,7 +40,7 @@ - 8.0.0-beta.24165.4 + 8.0.0-beta.24179.4 diff --git a/eng/common/native/init-compiler.sh b/eng/common/native/init-compiler.sh index f5c1ec7ea..2d5660642 100644 --- a/eng/common/native/init-compiler.sh +++ b/eng/common/native/init-compiler.sh @@ -63,7 +63,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="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" + if [ "$compiler" = "clang" ]; then versions="18 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="13 12 11 10 9 8 7 6 5 4.9"; fi for version in $versions; do diff --git a/eng/common/templates-official/job/job.yml b/eng/common/templates-official/job/job.yml index a2709d105..1f035fee7 100644 --- a/eng/common/templates-official/job/job.yml +++ b/eng/common/templates-official/job/job.yml @@ -128,7 +128,7 @@ jobs: - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - ${{ if eq(parameters.enableMicrobuild, 'true') }}: - - task: MicroBuildSigningPlugin@3 + - task: MicroBuildSigningPlugin@4 displayName: Install MicroBuild plugin inputs: signType: $(_SignType) @@ -136,6 +136,7 @@ jobs: feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json env: TeamName: $(_TeamName) + MicroBuildOutputFolderOverride: '$(Agent.TempDirectory)' continueOnError: ${{ parameters.continueOnError }} condition: and(succeeded(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT')) diff --git a/eng/common/templates-official/job/onelocbuild.yml b/eng/common/templates-official/job/onelocbuild.yml index ba9ba4930..52b4d05d3 100644 --- a/eng/common/templates-official/job/onelocbuild.yml +++ b/eng/common/templates-official/job/onelocbuild.yml @@ -56,7 +56,7 @@ jobs: # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: name: $(DncEngInternalBuildPool) - image: 1es-windows-2022-pt + image: 1es-windows-2022 os: windows steps: diff --git a/eng/common/templates-official/job/publish-build-assets.yml b/eng/common/templates-official/job/publish-build-assets.yml index 53138622f..589ac80a1 100644 --- a/eng/common/templates-official/job/publish-build-assets.yml +++ b/eng/common/templates-official/job/publish-build-assets.yml @@ -60,8 +60,8 @@ jobs: os: windows # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: - name: $(DncEngInternalBuildPool) - image: 1es-windows-2022-pt + name: NetCore1ESPool-Publishing-Internal + image: windows.vs2019.amd64 os: windows steps: - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: diff --git a/eng/common/templates-official/job/source-build.yml b/eng/common/templates-official/job/source-build.yml index 8aba3b44b..f193dfbe2 100644 --- a/eng/common/templates-official/job/source-build.yml +++ b/eng/common/templates-official/job/source-build.yml @@ -52,7 +52,7 @@ jobs: ${{ 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 + image: 1es-mariner-2 os: linux ${{ if ne(parameters.platform.pool, '') }}: diff --git a/eng/common/templates-official/job/source-index-stage1.yml b/eng/common/templates-official/job/source-index-stage1.yml index 4b6337391..f0513aee5 100644 --- a/eng/common/templates-official/job/source-index-stage1.yml +++ b/eng/common/templates-official/job/source-index-stage1.yml @@ -33,7 +33,7 @@ jobs: demands: ImageOverride -equals windows.vs2019.amd64.open ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: $(DncEngInternalBuildPool) - image: 1es-windows-2022-pt + image: windows.vs2022.amd64 os: windows steps: diff --git a/eng/common/templates-official/post-build/post-build.yml b/eng/common/templates-official/post-build/post-build.yml index 5c98fe1c0..da1f40958 100644 --- a/eng/common/templates-official/post-build/post-build.yml +++ b/eng/common/templates-official/post-build/post-build.yml @@ -110,7 +110,7 @@ stages: # If it's not devdiv, it's dnceng ${{ else }}: name: $(DncEngInternalBuildPool) - image: 1es-windows-2022-pt + image: 1es-windows-2022 os: windows steps: @@ -150,7 +150,7 @@ stages: # If it's not devdiv, it's dnceng ${{ else }}: name: $(DncEngInternalBuildPool) - image: 1es-windows-2022-pt + image: 1es-windows-2022 os: windows steps: - template: setup-maestro-vars.yml @@ -208,7 +208,7 @@ stages: # If it's not devdiv, it's dnceng ${{ else }}: name: $(DncEngInternalBuildPool) - image: 1es-windows-2022-pt + image: 1es-windows-2022 os: windows steps: - template: setup-maestro-vars.yml @@ -261,8 +261,8 @@ stages: os: windows # If it's not devdiv, it's dnceng ${{ else }}: - name: $(DncEngInternalBuildPool) - image: 1es-windows-2022-pt + name: NetCore1ESPool-Publishing-Internal + image: windows.vs2019.amd64 os: windows steps: - template: setup-maestro-vars.yml diff --git a/eng/common/templates-official/variables/pool-providers.yml b/eng/common/templates-official/variables/pool-providers.yml index beab7d1bf..1f308b24e 100644 --- a/eng/common/templates-official/variables/pool-providers.yml +++ b/eng/common/templates-official/variables/pool-providers.yml @@ -23,7 +23,7 @@ # # pool: # name: $(DncEngInternalBuildPool) -# image: 1es-windows-2022-pt +# image: 1es-windows-2022 variables: # Coalesce the target and source branches so we know when a PR targets a release branch diff --git a/global.json b/global.json index b967bd08e..31d5f24b1 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.24165.4", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24165.4" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24179.4", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24179.4" } } From e7c3e52404d48baf6fb6069aead6e0be410b38b7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 1 Apr 2024 22:19:03 +0000 Subject: [PATCH 496/535] Update dependencies from https://github.com/dotnet/arcade build 20240326.7 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.24114.4 -> To Version 7.0.0-beta.24176.7 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/templates-official/job/job.yml | 3 ++- global.json | 4 ++-- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6a787823f..827a1c6ef 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -194,18 +194,18 @@ - + https://github.com/dotnet/arcade - 834d09f0c963da37c88aed7ba3a83acafe582948 + ea5ae5b4a608862561d02a158dfaac443fbaaff1 - + https://github.com/dotnet/arcade - 834d09f0c963da37c88aed7ba3a83acafe582948 + ea5ae5b4a608862561d02a158dfaac443fbaaff1 - + https://github.com/dotnet/arcade - 834d09f0c963da37c88aed7ba3a83acafe582948 + ea5ae5b4a608862561d02a158dfaac443fbaaff1 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index edbf626d6..ea47a8e08 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.24171.6 + 7.0.0-beta.24176.7 diff --git a/eng/common/templates-official/job/job.yml b/eng/common/templates-official/job/job.yml index a1bb79c43..ecaa096b8 100644 --- a/eng/common/templates-official/job/job.yml +++ b/eng/common/templates-official/job/job.yml @@ -116,7 +116,7 @@ jobs: - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - ${{ if eq(parameters.enableMicrobuild, 'true') }}: - - task: MicroBuildSigningPlugin@3 + - task: MicroBuildSigningPlugin@4 displayName: Install MicroBuild plugin inputs: signType: $(_SignType) @@ -124,6 +124,7 @@ jobs: feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json env: TeamName: $(_TeamName) + MicroBuildOutputFolderOverride: '$(Agent.TempDirectory)' continueOnError: ${{ parameters.continueOnError }} condition: and(succeeded(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT')) diff --git a/global.json b/global.json index 6eb189856..86cac79b9 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.24171.6", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24171.6" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24176.7", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24176.7" } } From a07cb5e274dd3a9026cbdf47139c0fe2268505ba Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 1 Apr 2024 22:19:05 +0000 Subject: [PATCH 497/535] Update dependencies from https://github.com/dotnet/arcade build 20240326.9 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 6.0.0-beta.24163.13 -> To Version 6.0.0-beta.24176.9 --- NuGet.config | 21 ------------------- eng/Version.Details.xml | 12 +++++------ eng/Versions.props | 2 +- eng/common/templates-official/job/job.yml | 3 ++- .../job/publish-build-assets.yml | 10 +++++---- .../post-build/post-build.yml | 2 ++ global.json | 4 ++-- 7 files changed, 19 insertions(+), 35 deletions(-) diff --git a/NuGet.config b/NuGet.config index 047b2c714..03d3587a6 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,26 +9,14 @@ - - - - - - - - - - - - @@ -51,19 +39,10 @@ - - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 955dc44a4..1c6a86d36 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - 100394106fe203c112ab72bcc1576fb3753f7910 + e438144bbffb29ed5d7c113dc4947b51650344dc - + https://github.com/dotnet/arcade - 100394106fe203c112ab72bcc1576fb3753f7910 + e438144bbffb29ed5d7c113dc4947b51650344dc - + https://github.com/dotnet/arcade - 100394106fe203c112ab72bcc1576fb3753f7910 + e438144bbffb29ed5d7c113dc4947b51650344dc https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 006e5ba63..d049c73c2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.24163.13 + 6.0.0-beta.24176.9 diff --git a/eng/common/templates-official/job/job.yml b/eng/common/templates-official/job/job.yml index 616bfc386..21945ebdc 100644 --- a/eng/common/templates-official/job/job.yml +++ b/eng/common/templates-official/job/job.yml @@ -116,7 +116,7 @@ jobs: - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - ${{ if eq(parameters.enableMicrobuild, 'true') }}: - - task: MicroBuildSigningPlugin@3 + - task: MicroBuildSigningPlugin@4 displayName: Install MicroBuild plugin inputs: signType: $(_SignType) @@ -124,6 +124,7 @@ jobs: feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json env: TeamName: $(_TeamName) + MicroBuildOutputFolderOverride: '$(Agent.TempDirectory)' continueOnError: ${{ parameters.continueOnError }} condition: and(succeeded(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT')) diff --git a/eng/common/templates-official/job/publish-build-assets.yml b/eng/common/templates-official/job/publish-build-assets.yml index 9498aa412..1d84eb301 100644 --- a/eng/common/templates-official/job/publish-build-assets.yml +++ b/eng/common/templates-official/job/publish-build-assets.yml @@ -80,14 +80,16 @@ jobs: 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) + New-Item -Path "$(Build.StagingDirectory)/ReleaseConfigs" -ItemType Directory -Force + $filePath = "$(Build.StagingDirectory)/ReleaseConfigs/ReleaseConfigs.txt" + Add-Content -Path $filePath -Value $(BARBuildId) + Add-Content -Path $filePath -Value "$(DefaultChannels)" + Add-Content -Path $filePath -Value $(IsStableBuild) - task: 1ES.PublishBuildArtifacts@1 displayName: Publish ReleaseConfigs Artifact inputs: - PathtoPublish: '$(Build.StagingDirectory)/ReleaseConfigs.txt' + PathtoPublish: '$(Build.StagingDirectory)/ReleaseConfigs' PublishLocation: Container ArtifactName: ReleaseConfigs diff --git a/eng/common/templates-official/post-build/post-build.yml b/eng/common/templates-official/post-build/post-build.yml index 80bfa4946..96048b1ba 100644 --- a/eng/common/templates-official/post-build/post-build.yml +++ b/eng/common/templates-official/post-build/post-build.yml @@ -137,6 +137,7 @@ stages: # 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 @@ -251,6 +252,7 @@ stages: # 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 diff --git a/global.json b/global.json index fd055d417..dd968ea93 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24163.13", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.24163.13" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24176.9", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.24176.9" } } From 8aafe8445af71d9501075a05d521bc55f1ea0b1f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 2 Apr 2024 00:30:17 +0000 Subject: [PATCH 498/535] Update dependencies from https://github.com/dotnet/arcade build 20240329.7 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.24163.12 -> To Version 7.0.0-beta.24179.7 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- .../templates-official/variables/pool-providers.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 83a2585ec..ffa952599 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - ea5ae5b4a608862561d02a158dfaac443fbaaff1 + d0ab6f8c61222a6383dc2109d039b437ba9afa92 - + https://github.com/dotnet/arcade - ea5ae5b4a608862561d02a158dfaac443fbaaff1 + d0ab6f8c61222a6383dc2109d039b437ba9afa92 - + https://github.com/dotnet/arcade - ea5ae5b4a608862561d02a158dfaac443fbaaff1 + d0ab6f8c61222a6383dc2109d039b437ba9afa92 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 9088839b6..99fc9615f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.24176.7 + 7.0.0-beta.24179.7 diff --git a/eng/common/templates-official/variables/pool-providers.yml b/eng/common/templates-official/variables/pool-providers.yml index beab7d1bf..1f308b24e 100644 --- a/eng/common/templates-official/variables/pool-providers.yml +++ b/eng/common/templates-official/variables/pool-providers.yml @@ -23,7 +23,7 @@ # # pool: # name: $(DncEngInternalBuildPool) -# image: 1es-windows-2022-pt +# image: 1es-windows-2022 variables: # Coalesce the target and source branches so we know when a PR targets a release branch diff --git a/global.json b/global.json index 86cac79b9..f1d52ca39 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.24176.7", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24176.7" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24179.7", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24179.7" } } From ce1d0177b70c5e5f101106cc1ae33316d8d8ddeb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 2 Apr 2024 00:30:18 +0000 Subject: [PATCH 499/535] Update dependencies from https://github.com/dotnet/arcade build 20240329.7 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.24163.12 -> To Version 7.0.0-beta.24179.7 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- .../templates-official/variables/pool-providers.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 c963c49c7..22077ded2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - ea5ae5b4a608862561d02a158dfaac443fbaaff1 + d0ab6f8c61222a6383dc2109d039b437ba9afa92 - + https://github.com/dotnet/arcade - ea5ae5b4a608862561d02a158dfaac443fbaaff1 + d0ab6f8c61222a6383dc2109d039b437ba9afa92 - + https://github.com/dotnet/arcade - ea5ae5b4a608862561d02a158dfaac443fbaaff1 + d0ab6f8c61222a6383dc2109d039b437ba9afa92 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 489cfa9a4..115d0b587 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.24176.7 + 7.0.0-beta.24179.7 diff --git a/eng/common/templates-official/variables/pool-providers.yml b/eng/common/templates-official/variables/pool-providers.yml index beab7d1bf..1f308b24e 100644 --- a/eng/common/templates-official/variables/pool-providers.yml +++ b/eng/common/templates-official/variables/pool-providers.yml @@ -23,7 +23,7 @@ # # pool: # name: $(DncEngInternalBuildPool) -# image: 1es-windows-2022-pt +# image: 1es-windows-2022 variables: # Coalesce the target and source branches so we know when a PR targets a release branch diff --git a/global.json b/global.json index 86cac79b9..f1d52ca39 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.24176.7", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24176.7" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24179.7", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24179.7" } } From 71acbd380f661305366160b334773f88fefd8e26 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 2 Apr 2024 11:55:40 -0700 Subject: [PATCH 500/535] Update branding to 6.0.422 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 006e5ba63..f4c5b9579 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 4 - 21 + 22 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From 06b037aefbae817e96b45b0906cd5e6222865f81 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 2 Apr 2024 11:55:45 -0700 Subject: [PATCH 501/535] Update branding to 7.0.119 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index db67e6d66..ebe92578e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 7 0 1 - 18 + 19 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing From fd522ffc7f49d2be0708b0c6ba153efd74ae0317 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 2 Apr 2024 11:55:49 -0700 Subject: [PATCH 502/535] Update branding to 7.0.316 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index bcedf3fbd..9e8958149 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 7 0 3 - 15 + 16 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing From 87f0d06094169c032ecb942084948d41d092aefe Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 2 Apr 2024 11:55:54 -0700 Subject: [PATCH 503/535] Update branding to 7.0.409 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index dc5488682..9964d7e0b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 7 0 4 - 08 + 09 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing From a3da092c97dbb4b61249431c9d7c5c66a136ab47 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 2 Apr 2024 11:56:00 -0700 Subject: [PATCH 504/535] Update branding to 8.0.105 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 5651fd274..d3c91cdbf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 8 0 1 - 04 + 05 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) $(VersionMajor).$(VersionMinor) $(MajorMinorVersion).$(VersionSDKMinor) From 35da4c7dc0ecabab76bdf60b5eef1837a9023ebd Mon Sep 17 00:00:00 2001 From: Michael Yanni Date: Tue, 2 Apr 2024 15:02:38 -0700 Subject: [PATCH 505/535] [7.0.4xx] Migrate to 1ES templates for internal builds (#19202) Co-authored-by: dotnet-maestro[bot] --- .vsts-ci.yml | 690 +++++++++--------- .vsts-pr.yml | 35 +- eng/build-pr.yml | 156 ++++ eng/build.yml | 14 +- eng/source-build-tarball-build-official.yml | 26 +- eng/source-build-tarball-build.yml | 14 - .../job/source-build-build-tarball-pr.yml | 252 +++++++ .../job/source-build-build-tarball.yml | 14 +- .../job/source-build-create-tarball-pr.yml | 85 +++ .../job/source-build-create-tarball.yml | 20 +- .../job/source-build-run-tarball-build-pr.yml | 147 ++++ .../job/source-build-run-tarball-build.yml | 14 +- 12 files changed, 1057 insertions(+), 410 deletions(-) create mode 100644 eng/build-pr.yml delete mode 100644 eng/source-build-tarball-build.yml create mode 100644 src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball-pr.yml create mode 100644 src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball-pr.yml create mode 100644 src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build-pr.yml diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 5e2cdc745..d53d48105 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -1,3 +1,5 @@ +# Pipeline: https://dnceng.visualstudio.com/internal/_build?definitionId=286 + trigger: batch: true branches: @@ -26,7 +28,6 @@ variables: - group: DotNet-Installer-SDLValidation-Params - name: _PublishUsingPipelines value: true - # Default to running tests in PRs and public CI, but not in official builds - name: _WindowsTestArg value: '-test' @@ -37,358 +38,375 @@ variables: value: '' - name: _NonWindowsTestArg value: '' - - 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) +- name: DncEngPublicBuildPool + value: NetCore-Svc-Public +- name: DncEngInternalBuildPool + value: NetCore1ESPool-Svc-Internal +# Set the MicroBuild plugin installation directory to the agent temp directory to avoid SDL tool scanning. +- name: MicroBuildOutputFolderOverride + value: $(Agent.TempDirectory) -stages: -- stage: build - jobs: - - job: Publish_Build_Configuration - pool: - ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: NetCore-Svc-Public - demands: ImageOverride -equals windows.vs2019.amd64.open - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - name: NetCore1ESPool-Svc-Internal - demands: ImageOverride -equals windows.vs2019.amd64 - steps: - - publish: $(Build.SourcesDirectory)\eng\BuildConfiguration - artifact: BuildConfiguration - displayName: Publish Build Config - - template: /eng/build.yml - parameters: - agentOs: Windows_NT - pool: - ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: NetCore-Svc-Public - demands: ImageOverride -equals windows.vs2019.amd64.open - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - name: NetCore1ESPool-Svc-Internal - demands: ImageOverride -equals windows.vs2019.amd64 - timeoutInMinutes: 180 - strategy: - matrix: - # Public-only builds - ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: - Build_Release_x64: - _BuildConfig: Debug - _BuildArchitecture: x64 - _DOTNET_CLI_UI_LANGUAGE: '' - _AdditionalBuildParameters: '/p:PublishInternalAsset=true' - _TestArg: $(_WindowsTestArg) - # Internal-only builds - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - Build_Release_x64: - _BuildConfig: Release - _BuildArchitecture: x64 - _DOTNET_CLI_UI_LANGUAGE: '' - _AdditionalBuildParameters: '/p:PublishInternalAsset=true' - _TestArg: $(_WindowsTestArg) - Build_Release_x86: - _BuildConfig: Release - _BuildArchitecture: x86 - _DOTNET_CLI_UI_LANGUAGE: '' - _AdditionalBuildParameters: '' - _TestArg: $(_WindowsTestArg) - Build_Release_arm64: - _BuildConfig: Release - _BuildArchitecture: arm64 - _DOTNET_CLI_UI_LANGUAGE: '' - _AdditionalBuildParameters: '' - # Never run tests on arm64 - _TestArg: '' +resources: + repositories: + - repository: 1esPipelines + type: git + name: 1ESPipelineTemplates/1ESPipelineTemplates + ref: refs/tags/release - - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - template: /eng/build.yml - parameters: - agentOs: Windows_NT +extends: + ${{ if notin(variables['Build.Reason'], 'PullRequest') }}: + template: v1/1ES.Official.PipelineTemplate.yml@1esPipelines + ${{ else }}: + template: v1/1ES.Unofficial.PipelineTemplate.yml@1esPipelines + parameters: + containers: + fedora38: + image: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-38 + sdl: + sourceAnalysisPool: + name: $(DncEngInternalBuildPool) + image: 1es-windows-2019 + os: windows + stages: + - stage: build + jobs: + # Build Retry Configuration + - job: Publish_Build_Configuration pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + name: $(DncEngPublicBuildPool) + image: 1es-windows-2019-open + os: windows ${{ if eq(variables['System.TeamProject'], 'internal') }}: - name: NetCore1ESPool-Svc-Internal - demands: ImageOverride -equals windows.vs2019.amd64 - timeoutInMinutes: 180 - strategy: - matrix: - Build_Release_x64: - _BuildConfig: Release - _BuildArchitecture: x64 - _DOTNET_CLI_UI_LANGUAGE: '' - _AdditionalBuildParameters: '/p:PublishInternalAsset=true' - # Never run tests on PGO bits - _TestArg: '' - Build_Release_x86: - _BuildConfig: Release - _BuildArchitecture: x86 - _DOTNET_CLI_UI_LANGUAGE: '' - _AdditionalBuildParameters: '' - _TestArg: '' - Build_Release_arm64: - _BuildConfig: Release - _BuildArchitecture: arm64 - _DOTNET_CLI_UI_LANGUAGE: '' - _AdditionalBuildParameters: '' - # Never run tests on arm64 - _TestArg: '' - pgoInstrument: true + name: $(DncEngInternalBuildPool) + image: 1es-windows-2019 + os: windows + steps: + - task: 1ES.PublishPipelineArtifact@1 + displayName: Publish Build Config + inputs: + targetPath: $(Build.SourcesDirectory)\eng\BuildConfiguration + artifactName: BuildConfiguration + - template: /eng/build.yml@self + parameters: + agentOs: Windows_NT + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + name: $(DncEngPublicBuildPool) + image: 1es-windows-2019-open + os: windows + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: $(DncEngInternalBuildPool) + image: 1es-windows-2019 + os: windows + timeoutInMinutes: 180 + strategy: + matrix: + # Public-only builds + ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: + Build_Release_x64: + _BuildConfig: Debug + _BuildArchitecture: x64 + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '/p:PublishInternalAsset=true' + _TestArg: $(_WindowsTestArg) + # Internal-only builds + ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + Build_Release_x64: + _BuildConfig: Release + _BuildArchitecture: x64 + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '/p:PublishInternalAsset=true' + _TestArg: $(_WindowsTestArg) + Build_Release_x86: + _BuildConfig: Release + _BuildArchitecture: x86 + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '' + _TestArg: $(_WindowsTestArg) + Build_Release_arm64: + _BuildConfig: Release + _BuildArchitecture: arm64 + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '' + # Never run tests on arm64 + _TestArg: '' - - template: /eng/build.yml - parameters: - agentOs: Linux - pool: - ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: NetCore-Svc-Public - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - name: NetCore1ESPool-Svc-Internal - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 - timeoutInMinutes: 180 - strategy: - matrix: - ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: - Build_Ubuntu_18_04_Debug_x64: - _BuildConfig: Debug - _DockerParameter: '--docker ubuntu.18.04' - _LinuxPortable: '--linux-portable' - _RuntimeIdentifier: '' - _BuildArchitecture: 'x64' - _TestArg: $(_NonWindowsTestArg) - Build_Fedora_36_Debug_x64: - _BuildConfig: Debug - _DockerParameter: '--docker fedora.36' - _LinuxPortable: '--linux-portable' - _RuntimeIdentifier: '' - _BuildArchitecture: 'x64' - _TestArg: $(_NonWindowsTestArg) - Build_CentOS_7_Debug_x64: - _BuildConfig: Debug - _DockerParameter: '--docker centos' - _LinuxPortable: '' - _RuntimeIdentifier: '' - _BuildArchitecture: 'x64' - _TestArg: $(_NonWindowsTestArg) - Build_Debian_11_Debug_x64: - _BuildConfig: Debug - _DockerParameter: '--docker debian' - _LinuxPortable: '' - _RuntimeIdentifier: '' - _BuildArchitecture: 'x64' - _AdditionalBuildParameters: '/p:BuildSdkDeb=true' - _TestArg: $(_NonWindowsTestArg) - Build_Arm64_Debug: - _BuildConfig: Debug - _DockerParameter: '' - _LinuxPortable: '--linux-portable' - _RuntimeIdentifier: '--runtime-id linux-arm64' - _BuildArchitecture: 'arm64' - # Never run tests on arm64 - _TestArg: '' - Build_Linux_musl_Debug_x64: - _BuildConfig: Debug - _DockerParameter: '--docker alpine.3.15' - _LinuxPortable: '' - _RuntimeIdentifier: '--runtime-id linux-musl-x64' - _BuildArchitecture: 'x64' - # Pass in HostOSName when running on alpine - _AdditionalBuildParameters: '/p:HostOSName="linux-musl"' - _TestArg: $(_NonWindowsTestArg) - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - Build_Arm_Release: - _BuildConfig: Release - _DockerParameter: '' - _LinuxPortable: '--linux-portable' - _RuntimeIdentifier: '--runtime-id linux-arm' - _BuildArchitecture: 'arm' - # Never run tests on arm - _TestArg: '' - Build_Arm64_Release: - _BuildConfig: Release - _DockerParameter: '' - _LinuxPortable: '--linux-portable' - _RuntimeIdentifier: '--runtime-id linux-arm64' - _BuildArchitecture: 'arm64' - # Never run tests on arm64 - _TestArg: '' - Build_Linux_musl_Release_arm: - _BuildConfig: Release - # linux-musl-arm cross gen depends on glibc 2.27 (this OS has it) - _DockerParameter: '--docker ubuntu.18.04' - _LinuxPortable: '' - _RuntimeIdentifier: '--runtime-id linux-musl-arm' - _BuildArchitecture: 'arm' - _AdditionalBuildParameters: '/p:OSName="linux-musl"' - # Never run tests on arm - _TestArg: '' - Build_Linux_musl_Release_arm64: - _BuildConfig: Release - _DockerParameter: '' - _LinuxPortable: '' - _RuntimeIdentifier: '--runtime-id linux-musl-arm64' - _BuildArchitecture: 'arm64' - _AdditionalBuildParameters: '/p:OSName="linux-musl"' - # Never run tests on arm64 - _TestArg: '' - Build_Linux_musl_Release_x64: - _BuildConfig: Release - _DockerParameter: '--docker alpine.3.15' - _LinuxPortable: '' - _RuntimeIdentifier: '--runtime-id linux-musl-x64' - _BuildArchitecture: 'x64' - # Pass in HostOSName when running on alpine - _AdditionalBuildParameters: '/p:HostOSName="linux-musl"' - Build_Linux_Portable_Deb_Release_x64: - _BuildConfig: Release - _DockerParameter: '--docker ubuntu.18.04' - _LinuxPortable: '--linux-portable' - _RuntimeIdentifier: '' - _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' - _TestArg: $(_NonWindowsTestArg) - Build_Linux_Portable_Rpm_Release_x64: - _BuildConfig: Release - _DockerParameter: '--docker centos' - _LinuxPortable: '--linux-portable' - _RuntimeIdentifier: '' - _BuildArchitecture: 'x64' - # Do not publish zips and tarballs. The linux-x64 binaries are - # already published by Build_LinuxPortable_Release_x64 - _AdditionalBuildParameters: '/p:PublishBinariesAndBadge=false' - _TestArg: $(_NonWindowsTestArg) - Build_Linux_Portable_Rpm_Release_Arm64: - _BuildConfig: Release - _DockerParameter: '--docker centos' - _LinuxPortable: '--linux-portable' - _RuntimeIdentifier: '--runtime-id linux-arm64' - _BuildArchitecture: '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' - # Never run tests on arm64 - _TestArg: '' - Build_LinuxPortable_Release_x64: - _BuildConfig: Release - _DockerParameter: '' - _LinuxPortable: '--linux-portable' - _RuntimeIdentifier: '' - _BuildArchitecture: 'x64' - _TestArg: $(_NonWindowsTestArg) + - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - template: /eng/build.yml@self + parameters: + agentOs: Windows_NT + pool: + name: $(DncEngInternalBuildPool) + image: 1es-windows-2019 + os: windows + timeoutInMinutes: 180 + strategy: + matrix: + Build_Release_x64: + _BuildConfig: Release + _BuildArchitecture: x64 + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '/p:PublishInternalAsset=true' + # Never run tests on PGO bits + _TestArg: '' + Build_Release_x86: + _BuildConfig: Release + _BuildArchitecture: x86 + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '' + _TestArg: '' + Build_Release_arm64: + _BuildConfig: Release + _BuildArchitecture: arm64 + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '' + # Never run tests on arm64 + _TestArg: '' + pgoInstrument: true - - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - template: /eng/build.yml - parameters: - agentOs: Linux - pool: - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - name: NetCore1ESPool-Svc-Internal - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 - timeoutInMinutes: 180 - strategy: - matrix: - Build_LinuxPortable_Release_x64: - _BuildConfig: Release - _DockerParameter: '' - _LinuxPortable: '--linux-portable' - _RuntimeIdentifier: '' - _BuildArchitecture: 'x64' - _TestArg: '' - Build_Release_arm64: - _BuildConfig: Release - _BuildArchitecture: arm64 - _DOTNET_CLI_UI_LANGUAGE: '' - _AdditionalBuildParameters: '' - # Never run tests on arm64 - _TestArg: '' - pgoInstrument: true + - template: /eng/build.yml@self + parameters: + agentOs: Linux + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + name: $(DncEngPublicBuildPool) + image: 1es-ubuntu-2004-open + os: linux + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: $(DncEngInternalBuildPool) + image: 1es-ubuntu-2004 + os: linux + timeoutInMinutes: 180 + strategy: + matrix: + ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: + Build_Ubuntu_18_04_Debug_x64: + _BuildConfig: Debug + _DockerParameter: '--docker ubuntu.18.04' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _TestArg: $(_NonWindowsTestArg) + Build_Fedora_36_Debug_x64: + _BuildConfig: Debug + _DockerParameter: '--docker fedora.36' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _TestArg: $(_NonWindowsTestArg) + Build_CentOS_7_Debug_x64: + _BuildConfig: Debug + _DockerParameter: '--docker centos' + _LinuxPortable: '' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _TestArg: $(_NonWindowsTestArg) + Build_Debian_11_Debug_x64: + _BuildConfig: Debug + _DockerParameter: '--docker debian' + _LinuxPortable: '' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _AdditionalBuildParameters: '/p:BuildSdkDeb=true' + _TestArg: $(_NonWindowsTestArg) + Build_Arm64_Debug: + _BuildConfig: Debug + _DockerParameter: '' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '--runtime-id linux-arm64' + _BuildArchitecture: 'arm64' + # Never run tests on arm64 + _TestArg: '' + Build_Linux_musl_Debug_x64: + _BuildConfig: Debug + _DockerParameter: '--docker alpine.3.15' + _LinuxPortable: '' + _RuntimeIdentifier: '--runtime-id linux-musl-x64' + _BuildArchitecture: 'x64' + # Pass in HostOSName when running on alpine + _AdditionalBuildParameters: '/p:HostOSName="linux-musl"' + _TestArg: $(_NonWindowsTestArg) + ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + Build_Arm_Release: + _BuildConfig: Release + _DockerParameter: '' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '--runtime-id linux-arm' + _BuildArchitecture: 'arm' + # Never run tests on arm + _TestArg: '' + Build_Arm64_Release: + _BuildConfig: Release + _DockerParameter: '' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '--runtime-id linux-arm64' + _BuildArchitecture: 'arm64' + # Never run tests on arm64 + _TestArg: '' + Build_Linux_musl_Release_arm: + _BuildConfig: Release + # linux-musl-arm cross gen depends on glibc 2.27 (this OS has it) + _DockerParameter: '--docker ubuntu.18.04' + _LinuxPortable: '' + _RuntimeIdentifier: '--runtime-id linux-musl-arm' + _BuildArchitecture: 'arm' + _AdditionalBuildParameters: '/p:OSName="linux-musl"' + # Never run tests on arm + _TestArg: '' + Build_Linux_musl_Release_arm64: + _BuildConfig: Release + _DockerParameter: '' + _LinuxPortable: '' + _RuntimeIdentifier: '--runtime-id linux-musl-arm64' + _BuildArchitecture: 'arm64' + _AdditionalBuildParameters: '/p:OSName="linux-musl"' + # Never run tests on arm64 + _TestArg: '' + Build_Linux_musl_Release_x64: + _BuildConfig: Release + _DockerParameter: '--docker alpine.3.15' + _LinuxPortable: '' + _RuntimeIdentifier: '--runtime-id linux-musl-x64' + _BuildArchitecture: 'x64' + # Pass in HostOSName when running on alpine + _AdditionalBuildParameters: '/p:HostOSName="linux-musl"' + Build_Linux_Portable_Deb_Release_x64: + _BuildConfig: Release + _DockerParameter: '--docker ubuntu.18.04' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '' + _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' + _TestArg: $(_NonWindowsTestArg) + Build_Linux_Portable_Rpm_Release_x64: + _BuildConfig: Release + _DockerParameter: '--docker centos' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + # Do not publish zips and tarballs. The linux-x64 binaries are + # already published by Build_LinuxPortable_Release_x64 + _AdditionalBuildParameters: '/p:PublishBinariesAndBadge=false' + _TestArg: $(_NonWindowsTestArg) + Build_Linux_Portable_Rpm_Release_Arm64: + _BuildConfig: Release + _DockerParameter: '--docker centos' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '--runtime-id linux-arm64' + _BuildArchitecture: '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' + # Never run tests on arm64 + _TestArg: '' + Build_LinuxPortable_Release_x64: + _BuildConfig: Release + _DockerParameter: '' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _TestArg: $(_NonWindowsTestArg) - - template: /eng/build.yml - parameters: - agentOs: Darwin - pool: - vmImage: 'macOS-latest' - timeoutInMinutes: 180 - strategy: - matrix: - Build_Release_x64: - _BuildConfig: Release - _RuntimeIdentifier: '' - _BuildArchitecture: 'x64' - _TestArg: $(_NonWindowsTestArg) - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - Build_Release_arm64: - _BuildConfig: Release - _RuntimeIdentifier: '--runtime-id osx-arm64' - _BuildArchitecture: 'arm64' - # Never run tests on arm64 - _TestArg: '' + - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - template: /eng/build.yml@self + parameters: + agentOs: Linux + pool: + name: $(DncEngInternalBuildPool) + image: 1es-ubuntu-2004 + os: linux + timeoutInMinutes: 180 + strategy: + matrix: + Build_LinuxPortable_Release_x64: + _BuildConfig: Release + _DockerParameter: '' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _TestArg: '' + Build_Release_arm64: + _BuildConfig: Release + _BuildArchitecture: arm64 + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '' + # Never run tests on arm64 + _TestArg: '' + pgoInstrument: true - - template: /eng/common/templates/jobs/source-build.yml + - template: /eng/build.yml@self + parameters: + agentOs: Darwin + pool: + name: Azure Pipelines + image: macOS-latest + os: macOS + timeoutInMinutes: 180 + strategy: + matrix: + Build_Release_x64: + _BuildConfig: Release + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _TestArg: $(_NonWindowsTestArg) + ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + Build_Release_arm64: + _BuildConfig: Release + _RuntimeIdentifier: '--runtime-id osx-arm64' + _BuildArchitecture: 'arm64' + # Never run tests on arm64 + _TestArg: '' - - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml + - template: /eng/common/templates-official/jobs/source-build.yml@self - # For .NET 7.0, source-build currently supports 7.0.1xx. Disable tarball build validation in all other branches. - # - ${{ if in(variables['Build.Reason'], 'PullRequest') }}: - # - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml - # parameters: - # dependsOn: Source_Build_Create_Tarball + - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml@self - # https://github.com/dotnet/core-sdk/issues/248 - # - template: /eng/build.yml - # parameters: - # agentOs: FreeBSD - # queue: - # name: dnceng-freebsd-internal - # timeoutInMinutes: 180 - # matrix: - # Build_Release: - # _BuildConfig: Release - # _BuildArchitecture: 'x64' - # _AdditionalBuildParameters: '/p:DisableSourceLink=true /p:DISABLE_CROSSGEN=true' + - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - template: /eng/common/templates-official/job/publish-build-assets.yml@self + parameters: + dependsOn: + - Windows_NT + - Linux + - Darwin + - Source_Build_Managed + - Source_Build_Create_Tarball + - PGO_Linux + - PGO_Windows_NT + publishUsingPipelines: true + pool: + name: $(DncEngInternalBuildPool) + image: 1es-windows-2019 + os: windows - - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - template: /eng/common/templates/job/publish-build-assets.yml - parameters: - dependsOn: - - Windows_NT - - Linux - - Darwin - - Source_Build_Managed - - Source_Build_Create_Tarball - - PGO_Linux - - PGO_Windows_NT - publishUsingPipelines: true - pool: - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - name: NetCore1ESPool-Svc-Internal - demands: ImageOverride -equals windows.vs2017.amd64 - - -- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - template: eng\common\templates\post-build\post-build.yml - parameters: - publishingInfraVersion: 3 - enableSymbolValidation: false - enableSigningValidation: false - enableNugetValidation: false - enableSourceLinkValidation: false - publishInstallersAndChecksums: true - SDLValidationParameters: - enable: false - params: ' -SourceToolsList @("policheck","credscan") - -TsaInstanceURL $(_TsaInstanceURL) - -TsaProjectName $(_TsaProjectName) - -TsaNotificationEmail $(_TsaNotificationEmail) - -TsaCodebaseAdmin $(_TsaCodebaseAdmin) - -TsaBugAreaPath $(_TsaBugAreaPath) - -TsaIterationPath $(_TsaIterationPath) - -TsaRepositoryName "dotnet-installer" - -TsaCodebaseName "dotnet-installer" - -TsaPublish $True' + - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - template: /eng/common/templates-official/post-build/post-build.yml@self + parameters: + publishingInfraVersion: 3 + enableSymbolValidation: false + enableSigningValidation: false + enableNugetValidation: false + enableSourceLinkValidation: false + publishInstallersAndChecksums: true + SDLValidationParameters: + enable: false + params: ' -SourceToolsList @("policheck","credscan") + -TsaInstanceURL $(_TsaInstanceURL) + -TsaProjectName $(_TsaProjectName) + -TsaNotificationEmail $(_TsaNotificationEmail) + -TsaCodebaseAdmin $(_TsaCodebaseAdmin) + -TsaBugAreaPath $(_TsaBugAreaPath) + -TsaIterationPath $(_TsaIterationPath) + -TsaRepositoryName "dotnet-installer" + -TsaCodebaseName "dotnet-installer" + -TsaPublish $True' diff --git a/.vsts-pr.yml b/.vsts-pr.yml index 5e2cdc745..2f14d2054 100644 --- a/.vsts-pr.yml +++ b/.vsts-pr.yml @@ -26,7 +26,6 @@ variables: - group: DotNet-Installer-SDLValidation-Params - name: _PublishUsingPipelines value: true - # Default to running tests in PRs and public CI, but not in official builds - name: _WindowsTestArg value: '-test' @@ -37,10 +36,8 @@ variables: value: '' - name: _NonWindowsTestArg value: '' - - name: _InternalRuntimeDownloadArgs value: '' - - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - group: DotNetBuilds storage account read tokens - name: _InternalRuntimeDownloadArgs @@ -63,7 +60,7 @@ stages: - publish: $(Build.SourcesDirectory)\eng\BuildConfiguration artifact: BuildConfiguration displayName: Publish Build Config - - template: /eng/build.yml + - template: /eng/build-pr.yml parameters: agentOs: Windows_NT pool: @@ -107,7 +104,7 @@ stages: _TestArg: '' - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - template: /eng/build.yml + - template: /eng/build-pr.yml parameters: agentOs: Windows_NT pool: @@ -139,7 +136,7 @@ stages: _TestArg: '' pgoInstrument: true - - template: /eng/build.yml + - template: /eng/build-pr.yml parameters: agentOs: Linux pool: @@ -283,7 +280,7 @@ stages: _TestArg: $(_NonWindowsTestArg) - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - template: /eng/build.yml + - template: /eng/build-pr.yml parameters: agentOs: Linux pool: @@ -309,7 +306,7 @@ stages: _TestArg: '' pgoInstrument: true - - template: /eng/build.yml + - template: /eng/build-pr.yml parameters: agentOs: Darwin pool: @@ -332,26 +329,7 @@ stages: - template: /eng/common/templates/jobs/source-build.yml - - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml - - # For .NET 7.0, source-build currently supports 7.0.1xx. Disable tarball build validation in all other branches. - # - ${{ if in(variables['Build.Reason'], 'PullRequest') }}: - # - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml - # parameters: - # dependsOn: Source_Build_Create_Tarball - - # https://github.com/dotnet/core-sdk/issues/248 - # - template: /eng/build.yml - # parameters: - # agentOs: FreeBSD - # queue: - # name: dnceng-freebsd-internal - # timeoutInMinutes: 180 - # matrix: - # Build_Release: - # _BuildConfig: Release - # _BuildArchitecture: 'x64' - # _AdditionalBuildParameters: '/p:DisableSourceLink=true /p:DISABLE_CROSSGEN=true' + - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball-pr.yml - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - template: /eng/common/templates/job/publish-build-assets.yml @@ -370,7 +348,6 @@ stages: name: NetCore1ESPool-Svc-Internal demands: ImageOverride -equals windows.vs2017.amd64 - - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - template: eng\common\templates\post-build\post-build.yml parameters: diff --git a/eng/build-pr.yml b/eng/build-pr.yml new file mode 100644 index 000000000..69d1e3f0f --- /dev/null +++ b/eng/build-pr.yml @@ -0,0 +1,156 @@ +parameters: + # Agent OS identifier and used as job name + agentOs: '' + + # Agent pool + pool: {} + + # Additional variables + variables: {} + + # Build strategy - matrix + strategy: {} + + # Job timeout + timeoutInMinutes: 180 + + # Publish using pipelines + enablePublishUsingPipelines: true + +phases: +- template: /eng/common/templates/job/job.yml + parameters: + ${{ if parameters.pgoInstrument }}: + name: PGO_${{ parameters.agentOs }} + ${{ if not(parameters.pgoInstrument) }}: + name: ${{ parameters.agentOs }} + timeoutInMinutes: ${{ parameters.timeoutInMinutes }} + ${{ if eq(parameters.agentOs, 'Windows_NT') }}: + enableMicrobuild: true + enablePublishBuildAssets: true + enablePublishUsingPipelines: ${{parameters.enablePublishUsingPipelines}} + enableTelemetry: true + helixRepo: dotnet/installer + pool: ${{ parameters.pool }} + ${{ if ne(parameters.strategy, '') }}: + strategy: ${{ parameters.strategy }} + workspace: + clean: all + + variables: + - _PgoInstrument: '' + - ${{ if eq(parameters.agentOs, 'Windows_NT') }}: + - _PackArg: '-pack' + - ${{ if ne(parameters.agentOs, 'Windows_NT') }}: + - _PackArg: '--pack' + - ${{ if parameters.pgoInstrument }}: + - _PgoInstrument: '/p:PgoInstrument=true' + - _PackArg: '' + - _AgentOSName: ${{ parameters.agentOs }} + - _TeamName: Roslyn-Project-System + - _SignType: test + - _BuildArgs: '/p:DotNetSignType=$(_SignType) $(_PgoInstrument)' + - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - group: DotNet-Symbol-Server-PATs + - group: DotNet-HelixApi-Access + - group: DotNet-Blob-Feed + - _DotNetPublishToBlobFeed: true + - _PushToVSFeed: true + - _SignType: real + - _BuildArgs: /p:OfficialBuildId=$(BUILD.BUILDNUMBER) + /p:DotNetSignType=$(_SignType) + /p:TeamName=$(_TeamName) + /p:DotNetPublishUsingPipelines=$(_PublishUsingPipelines) + $(_PgoInstrument) + + steps: + - checkout: self + clean: true + - ${{ if eq(parameters.agentOs, 'Windows_NT') }}: + - ${{ if ne(variables['System.TeamProject'], 'public') }}: + - task: PowerShell@2 + displayName: Setup Private Feeds Credentials + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1 + arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token + env: + Token: $(dn-bot-dnceng-artifact-feeds-rw) + - script: build.cmd + $(_TestArg) $(_PackArg) + -publish -ci -sign + -Configuration $(_BuildConfig) + -Architecture $(_BuildArchitecture) + $(_BuildArgs) + $(_AdditionalBuildParameters) + $(_InternalRuntimeDownloadArgs) + displayName: Build + env: + DOTNET_CLI_UI_LANGUAGE: $(_DOTNET_CLI_UI_LANGUAGE) + + - ${{ if ne(parameters.agentOs, 'Windows_NT') }}: + - ${{ if ne(variables['System.TeamProject'], 'public') }}: + - task: Bash@3 + displayName: Setup Private Feeds Credentials + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh + arguments: $(Build.SourcesDirectory)/NuGet.config $Token + env: + Token: $(dn-bot-dnceng-artifact-feeds-rw) + + - ${{ if eq(parameters.agentOs, 'Linux') }}: + - script: ./build.sh + $(_TestArg) $(_PackArg) + --publish --ci + --noprettyprint + --configuration $(_BuildConfig) + $(_DockerParameter) + --architecture $(_BuildArchitecture) + $(_LinuxPortable) + $(_RuntimeIdentifier) + $(_BuildArgs) + $(_AdditionalBuildParameters) + $(_InternalRuntimeDownloadArgs) + displayName: Build + + - ${{ if or(eq(parameters.agentOs, 'Darwin'), eq(parameters.agentOs, 'FreeBSD')) }}: + - script: ./build.sh + $(_TestArg) + --pack --publish --ci + --noprettyprint + --configuration $(_BuildConfig) + --architecture $(_BuildArchitecture) + $(_RuntimeIdentifier) + $(_BuildArgs) + $(_AdditionalBuildParameters) + $(_InternalRuntimeDownloadArgs) + displayName: Build + + - task: PublishTestResults@2 + displayName: Publish Test Results + inputs: + testRunner: XUnit + testResultsFiles: 'artifacts/TestResults/$(_BuildConfig)/*.xml' + testRunTitle: '$(_AgentOSName)_$(Agent.JobName)' + platform: '$(BuildPlatform)' + configuration: '$(_BuildConfig)' + condition: ne(variables['_TestArg'], '') + + - task: CopyFiles@2 + displayName: Gather Logs + inputs: + SourceFolder: '$(Build.SourcesDirectory)/artifacts' + Contents: | + log/$(_BuildConfig)/**/* + TestResults/$(_BuildConfig)/**/* + TargetFolder: '$(Build.ArtifactStagingDirectory)' + continueOnError: true + condition: always() + + - task: PublishBuildArtifacts@1 + displayName: Publish Logs to VSTS + inputs: + PathtoPublish: '$(Build.ArtifactStagingDirectory)' + ArtifactName: '$(_AgentOSName)_$(Agent.JobName)_$(Build.BuildNumber)' + publishLocation: Container + continueOnError: true + condition: always() diff --git a/eng/build.yml b/eng/build.yml index 35c829867..d486c47ec 100644 --- a/eng/build.yml +++ b/eng/build.yml @@ -18,7 +18,7 @@ parameters: enablePublishUsingPipelines: true phases: -- template: /eng/common/templates/job/job.yml +- template: /eng/common/templates-official/job/job.yml parameters: ${{ if parameters.pgoInstrument }}: name: PGO_${{ parameters.agentOs }} @@ -28,9 +28,6 @@ phases: ${{ if eq(parameters.agentOs, 'Windows_NT') }}: enableMicrobuild: true enablePublishBuildAssets: true - # Don't use built-in arcade logic for publishing artifacts and test results, as we manually do this and give better names - #enablePublishBuildArtifacts: true - #enablePublishTestResults: true enablePublishUsingPipelines: ${{parameters.enablePublishUsingPipelines}} enableTelemetry: true helixRepo: dotnet/installer @@ -49,12 +46,10 @@ phases: - ${{ if parameters.pgoInstrument }}: - _PgoInstrument: '/p:PgoInstrument=true' - _PackArg: '' - - _AgentOSName: ${{ parameters.agentOs }} - _TeamName: Roslyn-Project-System - _SignType: test - _BuildArgs: '/p:DotNetSignType=$(_SignType) $(_PgoInstrument)' - - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - group: DotNet-Symbol-Server-PATs - group: DotNet-HelixApi-Access @@ -101,6 +96,7 @@ phases: arguments: $(Build.SourcesDirectory)/NuGet.config $Token env: Token: $(dn-bot-dnceng-artifact-feeds-rw) + - ${{ if eq(parameters.agentOs, 'Linux') }}: - script: ./build.sh $(_TestArg) $(_PackArg) @@ -144,13 +140,13 @@ phases: inputs: SourceFolder: '$(Build.SourcesDirectory)/artifacts' Contents: | - log/$(_BuildConfig)/**/* - TestResults/$(_BuildConfig)/**/* + log/$(_BuildConfig)/**/* + TestResults/$(_BuildConfig)/**/* TargetFolder: '$(Build.ArtifactStagingDirectory)' continueOnError: true condition: always() - - task: PublishBuildArtifacts@1 + - task: 1ES.PublishBuildArtifacts@1 displayName: Publish Logs to VSTS inputs: PathtoPublish: '$(Build.ArtifactStagingDirectory)' diff --git a/eng/source-build-tarball-build-official.yml b/eng/source-build-tarball-build-official.yml index aa1de43eb..f93d87fef 100644 --- a/eng/source-build-tarball-build-official.yml +++ b/eng/source-build-tarball-build-official.yml @@ -1,5 +1,6 @@ trigger: none pr: none + resources: pipelines: - pipeline: installer-build-resource @@ -19,10 +20,23 @@ resources: - internal/release/7.0.4xx stages: - build + repositories: + - repository: 1ESPipelineTemplates + type: git + name: 1ESPipelineTemplates/1ESPipelineTemplates + ref: refs/tags/release -stages: -- stage: build - jobs: - - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml - parameters: - installerBuildResourceId: installer-build-resource +extends: + template: v1/1ES.Official.PipelineTemplate.yml@1ESPipelineTemplates + parameters: + sdl: + sourceAnalysisPool: + name: NetCore1ESPool-Svc-Internal + image: 1es-windows-2022 + os: windows + stages: + - stage: build + jobs: + - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml@self + parameters: + installerBuildResourceId: installer-build-resource diff --git a/eng/source-build-tarball-build.yml b/eng/source-build-tarball-build.yml deleted file mode 100644 index da87d93cf..000000000 --- a/eng/source-build-tarball-build.yml +++ /dev/null @@ -1,14 +0,0 @@ -trigger: none -pr: none -resources: - pipelines: - - pipeline: installer-build-resource - source: installer - trigger: none - -stages: -- stage: build - jobs: - - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml - parameters: - installerBuildResourceId: installer-build-resource diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball-pr.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball-pr.yml new file mode 100644 index 000000000..abb9035fd --- /dev/null +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball-pr.yml @@ -0,0 +1,252 @@ +# Builds a source-build tarball + +parameters: + # Architecture to build + architecture: + + # Custom condition to apply to the job + condition: + + # Dependent jobs that must be completed before this job will run + dependsOn: + + # Skip running the SDK content smoke-tests + excludeSdkContentTests: false + + # Resource id of the installer build to retrieve source/product tarball's from + installerBuildResourceId: + + # Matrix to run jobs over + matrix: + + # Job name + name: + + # Agent pool to use + pool: + + # Build using the previous source-build artifacts + usePreviousArtifacts: false + +jobs: +- job: ${{ parameters.name }} + condition: ${{ parameters.condition }} + dependsOn: ${{ parameters.dependsOn }} + pool: ${{ parameters.pool }} + strategy: + matrix: ${{ parameters.matrix }} + timeoutInMinutes: 300 + variables: + - ${{ if ne(variables['System.TeamProject'], 'public') }}: + - group: AzureDevOps-Artifact-Feeds-Pats + - ${{ if eq(parameters.usePreviousArtifacts, 'true') }}: + - name: additionalBuildArgs + value: --with-sdk /tarball/.dotnet + - name: tarballDir + ${{ if eq(parameters.installerBuildResourceId, '') }}: + value: $(Build.SourcesDirectory) + ${{ else }}: + value: $(Build.StagingDirectory)/tarball + - name: installerSrcDir + ${{ if eq(parameters.installerBuildResourceId, '') }}: + value: $(Build.SourcesDirectory)/src/installer + ${{ else }}: + value: $(Build.SourcesDirectory) + workspace: + clean: all + + steps: + - checkout: self + clean: true + + - ${{ if ne(parameters.installerBuildResourceId, '') }}: + - download: ${{ parameters.installerBuildResourceId }} + artifact: BlobArtifacts + patterns: '**/dotnet-sdk-source*.tar.gz' + displayName: Download Source Tarball + + - script: | + set -x + + resourceIdPathSegment= + if [[ '${{ parameters.installerBuildResourceId }}' != 'current' ]]; then + resourceIdPathSegment='${{ parameters.installerBuildResourceId }}/' + fi + + mkdir -p "$(tarballDir)" + tarballFilePath="$(PIPELINE.WORKSPACE)/${resourceIdPathSegment}BlobArtifacts/dotnet-sdk-source*.tar.gz" + eval tar -ozxf "$tarballFilePath" -C "$(tarballDir)" + eval rm -f "$tarballFilePath" + displayName: Extract Tarball + + - script: cp $(installerSrcDir)/NuGet.config $(tarballDir)/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/online.NuGet.Config + displayName: Copy Test NuGet Config + + - ${{ if ne(parameters.excludeSdkContentTests, 'true') }}: + - download: ${{ parameters.installerBuildResourceId }} + artifact: BlobArtifacts + patterns: '**/dotnet-sdk-+([0-9]).+([0-9]).+([0-9])?(-@(preview|rc|rtm)*)-linux*-${{ parameters.architecture }}.tar.gz' + displayName: Download MSFT sdk Tarball + + - ${{ if eq(parameters.usePreviousArtifacts, 'true') }}: + - download: current + artifact: $(_PreviousSourceBuildArtifact) + patterns: '*.tar.gz' + displayName: Download Previous Source Build Artifacts + + - task: CopyFiles@2 + displayName: Copy Previous Source Build Artifacts + inputs: + SourceFolder: $(PIPELINE.WORKSPACE)/$(_PreviousSourceBuildArtifact) + Contents: '*.tar.gz' + TargetFolder: $(tarballDir)/packages/archive/ + + - script: | + set -euo pipefail + + sourceBuiltSDKUrl="https://dotnetcli.azureedge.net/source-built-artifacts/sdks/" + packageVersionsPath="$(Build.SourcesDirectory)/eng/Versions.props" + notFoundMessage="No source-built SDK found to download..." + + echo "Looking for source-built SDK to download..." + archiveVersionLine=`grep -m 1 "" "$packageVersionsPath" || :` + versionPattern="(.*)" + + if [[ $archiveVersionLine =~ $versionPattern ]]; then + filename="dotnet-sdk-${BASH_REMATCH[1]}-centos.8-x64.tar.gz" + archiveUrl="${sourceBuiltSDKUrl}${filename}" + downloadDir=$(mktemp -d) + (cd $downloadDir && curl --retry 5 -O $archiveUrl) + + mkdir $(tarballDir)/.dotnet + tar -xzf $downloadDir/$filename -C $(tarballDir)/.dotnet + rm -rf $downloadDir + else + echo "$notFoundMessage" + exit 1 + fi + + echo "##vso[task.setvariable variable=additionalBuildArgs]--with-sdk /tarball/.dotnet" + displayName: Setup Previously Source-Built SDK + condition: eq(variables._WithPreviousSDK, 'true') + + - script: | + set -x + + if [[ '${{ parameters.usePreviousArtifacts }}' != 'true' ]]; then + customPrepArgs= + if [[ '$(_BootstrapPrep)' == 'true' ]]; then + customPrepArgs='--bootstrap' + fi + + docker run --rm -v $(tarballDir):/tarball -w /tarball $(_Container) ./prep.sh ${customPrepArgs} + else + mkdir $(tarballDir)/.dotnet + tarballFilePath="$(tarballDir)/packages/archive/dotnet-sdk-*.tar.gz" + eval tar -ozxf "$tarballFilePath" -C "$(tarballDir)/.dotnet" + eval rm -f "$tarballFilePath" + fi + displayName: Prep Tarball + + - script: | + set -x + df -h + + customRunArgs= + customBuildArgs= + if [[ '$(_RunOnline)' == 'true' ]]; then + customBuildArgs='--online' + else + customRunArgs='--network none' + fi + + # See https://github.com/dotnet/source-build/issues/3712 + if [[ '$(_OverrideDistroDisablingSha1)' == 'true' ]]; then + customRunArgs="$customRunArgs -e OPENSSL_ENABLE_SHA1_SIGNATURES=1" + fi + + if [[ '$(_EnablePoison)' == 'true' ]]; then + customBuildArgs="$customBuildArgs --poison" + fi + + docker run --rm -v $(tarballDir):/tarball -w /tarball ${customRunArgs} $(_Container) ./build.sh --clean-while-building ${customBuildArgs} $(additionalBuildArgs) + displayName: Build Tarball + + - ${{ if ne(variables['System.TeamProject'], 'public') }}: + - task: Bash@3 + displayName: Setup Private Feeds Credentials + inputs: + filePath: $(installerSrcDir)/eng/common/SetupNugetSources.sh + arguments: $(tarballDir)/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/online.NuGet.Config $Token + env: + Token: $(dn-bot-dnceng-artifact-feeds-rw) + + - script: | + set -x + + dockerVolumeArgs="-v $(tarballDir):/tarball" + dockerEnvArgs="-e SMOKE_TESTS_EXCLUDE_OMNISHARP=$(_ExcludeOmniSharpTests) -e SMOKE_TESTS_WARN_SDK_CONTENT_DIFFS=true" + poisonArg='' + + if [[ '${{ parameters.excludeSdkContentTests}}' != 'true' ]]; then + dockerVolumeArgs+=" -v $(PIPELINE.WORKSPACE)/${{ parameters.installerBuildResourceId }}/BlobArtifacts/:/BlobArtifacts" + platform="linux" + docker run --rm $(_Container) /bin/sh -c "cat /etc/os-release | grep -q alpine" + if [[ $? == 0 ]]; then + platform="$platform-musl" + fi + msftSdkTarballName=$(find "$(PIPELINE.WORKSPACE)/${{ parameters.installerBuildResourceId }}/BlobArtifacts/" -name "dotnet-sdk-*-$platform-${{ parameters.architecture }}.tar.gz" -exec basename {} \;) + dockerEnvArgs+=" -e SMOKE_TESTS_MSFT_SDK_TARBALL_PATH=/BlobArtifacts/$msftSdkTarballName" + fi + + if [[ '$(_EnablePoison)' == 'true' ]]; then + poisonArg='--poison' + dockerEnvArgs+=" -e SMOKE_TESTS_WARN_POISON_DIFFS=true" + fi + + docker run --rm $dockerVolumeArgs -w /tarball $dockerEnvArgs $(_Container) ./build.sh $poisonArg --run-smoke-test $(additionalBuildArgs) -- /p:SmokeTestConsoleVerbosity=detailed + displayName: Run Tests + + # Don't use CopyFiles@2 as it encounters permissions issues because it indexes all files in the source directory graph. + - script: | + set -x + + targetFolder=$(Build.StagingDirectory)/BuildLogs/ + mkdir -p ${targetFolder} + + cd "$(tarballDir)" + find artifacts/ -type f -name "*.binlog" -exec cp {} --parents -t ${targetFolder} \; + find artifacts/ -type f -name "*.log" -exec cp {} --parents -t ${targetFolder} \; + find artifacts/prebuilt-report/ -exec cp {} --parents -t ${targetFolder} \; + find src/ -type f -name "*.binlog" -exec cp {} --parents -t ${targetFolder} \; + find src/ -type f -name "*.log" -exec cp {} --parents -t ${targetFolder} \; + find test/ -type f -name "*.binlog" -exec cp {} --parents -t ${targetFolder} \; + find test/ -type f -name "Updated*.diff" -exec cp {} --parents -t ${targetFolder} \; + find test/ -type f -name "Updated*.txt" -exec cp {} --parents -t ${targetFolder} \; + displayName: Prepare BuildLogs staging directory + continueOnError: true + condition: succeededOrFailed() + + - publish: '$(Build.StagingDirectory)/BuildLogs' + artifact: $(Agent.JobName)_BuildLogs_Attempt$(System.JobAttempt) + displayName: Publish BuildLogs + continueOnError: true + condition: succeededOrFailed() + + - task: PublishTestResults@2 + displayName: Publish Test Results + condition: succeededOrFailed() + continueOnError: true + inputs: + testRunner: vSTest + testResultsFiles: 'test/**/*.trx' + searchFolder: $(tarballDir) + mergeTestResults: true + publishRunAttachments: true + testRunTitle: SourceBuild_SmokeTests_$(Agent.JobName) + + - publish: '$(tarballDir)/artifacts/${{ parameters.architecture}}/Release/' + artifact: $(Agent.JobName)_Artifacts + displayName: Publish Artifacts + condition: succeededOrFailed() + continueOnError: true diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml index abb9035fd..aa3cf6b96 100644 --- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml @@ -227,9 +227,11 @@ jobs: continueOnError: true condition: succeededOrFailed() - - publish: '$(Build.StagingDirectory)/BuildLogs' - artifact: $(Agent.JobName)_BuildLogs_Attempt$(System.JobAttempt) + - task: 1ES.PublishPipelineArtifact@1 displayName: Publish BuildLogs + inputs: + targetPath: $(Build.StagingDirectory)/BuildLogs + artifactName: $(Agent.JobName)_BuildLogs_Attempt$(System.JobAttempt) continueOnError: true condition: succeededOrFailed() @@ -245,8 +247,10 @@ jobs: publishRunAttachments: true testRunTitle: SourceBuild_SmokeTests_$(Agent.JobName) - - publish: '$(tarballDir)/artifacts/${{ parameters.architecture}}/Release/' - artifact: $(Agent.JobName)_Artifacts + - task: 1ES.PublishPipelineArtifact@1 displayName: Publish Artifacts - condition: succeededOrFailed() + inputs: + targetPath: $(tarballDir)/artifacts/${{ parameters.architecture}}/Release/ + artifactName: $(Agent.JobName)_Artifacts continueOnError: true + condition: succeededOrFailed() diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball-pr.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball-pr.yml new file mode 100644 index 000000000..347f61cf8 --- /dev/null +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball-pr.yml @@ -0,0 +1,85 @@ +# Creates a source-build tarball + +jobs: +- job: Source_Build_Create_Tarball + container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-38 + displayName: Source-Build Create Tarball + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + ${{ if in(variables['Build.Reason'], 'PullRequest') }}: + name: NetCore-Public-XL + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open + ${{ else }}: + name: NetCore-Svc-Public + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + ${{ if in(variables['Build.Reason'], 'PullRequest') }}: + name: NetCore1ESPool-Internal-XL + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 + ${{ else }}: + name: NetCore1ESPool-Svc-Internal + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 + + variables: + - name: _BuildConfig + value: Release + + - ${{ if eq(variables['System.TeamProject'], 'internal') }}: + - group: DotNet-Source-Build-All-Orgs-Source-Access + workspace: + clean: all + + steps: + - ${{ if ne(variables['System.TeamProject'], 'public') }}: + - task: Bash@3 + displayName: Setup Private Feeds Credentials + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh + arguments: $(Build.SourcesDirectory)/NuGet.config $Token + env: + Token: $(dn-bot-dnceng-artifact-feeds-rw) + - script: | + set -x + df -h + + officialBuildArgs= + if [ '${{ and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}' = 'True' ]; then + officialBuildArgs='/p:OfficialBuildId=$(BUILD.BUILDNUMBER)' + 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 + + ./build.sh \ + --ci \ + --configuration $(_BuildConfig) \ + --publish \ + -bl \ + $officialBuildArgs \ + $internalRuntimeDownloadArgs \ + /p:DotNetPublishUsingPipelines=true \ + /p:ArcadeBuildTarball=true \ + /p:AzDoPat=$(dn-bot-all-orgs-build-rw-code-rw) + displayName: Create Tarball + + - task: CopyFiles@2 + displayName: Prepare BuildLogs staging directory + inputs: + Contents: | + **/*.log + **/*.binlog + TargetFolder: '$(Build.StagingDirectory)/BuildLogs' + CleanTargetFolder: true + continueOnError: true + condition: succeededOrFailed() + + - publish: '$(Build.StagingDirectory)/BuildLogs' + artifact: $(Agent.JobName)_BuildLogs_Attempt$(System.JobAttempt) + displayName: Publish BuildLogs + continueOnError: true + condition: succeededOrFailed() diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml index 347f61cf8..7cba0c4ea 100644 --- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml @@ -2,23 +2,27 @@ jobs: - job: Source_Build_Create_Tarball - container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-38 + container: fedora38 displayName: Source-Build Create Tarball pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: ${{ if in(variables['Build.Reason'], 'PullRequest') }}: name: NetCore-Public-XL - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open + image: 1es-ubuntu-2004-open + os: linux ${{ else }}: name: NetCore-Svc-Public - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open + image: 1es-ubuntu-2004-open + os: linux ${{ if eq(variables['System.TeamProject'], 'internal') }}: ${{ if in(variables['Build.Reason'], 'PullRequest') }}: name: NetCore1ESPool-Internal-XL - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 + image: 1es-ubuntu-2004 + os: linux ${{ else }}: name: NetCore1ESPool-Svc-Internal - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 + image: 1es-ubuntu-2004 + os: linux variables: - name: _BuildConfig @@ -78,8 +82,10 @@ jobs: continueOnError: true condition: succeededOrFailed() - - publish: '$(Build.StagingDirectory)/BuildLogs' - artifact: $(Agent.JobName)_BuildLogs_Attempt$(System.JobAttempt) + - task: 1ES.PublishPipelineArtifact@1 displayName: Publish BuildLogs + inputs: + targetPath: $(Build.StagingDirectory)/BuildLogs + artifactName: $(Agent.JobName)_BuildLogs_Attempt$(System.JobAttempt) continueOnError: true condition: succeededOrFailed() diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build-pr.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build-pr.yml new file mode 100644 index 000000000..6e9c404c5 --- /dev/null +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build-pr.yml @@ -0,0 +1,147 @@ +# Builds a source-build tarball + +parameters: + # Dependent jobs that must be completed before this job will run + dependsOn: + + # Resource id of the installer build to retrieve source/product tarball's from + installerBuildResourceId: current + + # The following parameters aren't expected to be passed in rather they are used for encapsulation + # ----------------------------------------------------------------------------------------------- + alpine317Container: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.17 + centOSStream8Container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8 + centOSStream9Container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9 + debian11Arm64Container: mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-arm64v8 + fedora38Container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-38 + ubuntu2004Container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-20.04 + poolInternalAmd64: + name: NetCore1ESPool-Svc-Internal + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 + poolInternalAmd64PR: + name: NetCore1ESPool-Internal-XL + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 + poolInternalArm64: + name: Docker-Linux-Arm-Internal + poolPublicAmd64: + name: NetCore-Public-XL + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open + +jobs: +- template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball-pr.yml + parameters: + architecture: x64 + dependsOn: ${{ parameters.dependsOn }} + ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: + excludeSdkContentTests: true + installerBuildResourceId: ${{ parameters.installerBuildResourceId }} + matrix: + CentOSStream8-Online: + _BootstrapPrep: true + _Container: ${{ parameters.centOSStream8Container }} + _EnablePoison: false + _ExcludeOmniSharpTests: true + _OverrideDistroDisablingSha1: false + _RunOnline: true + _WithPreviousSDK: false + CentOSStream8-Offline: + _BootstrapPrep: true + _Container: ${{ parameters.centOSStream8Container }} + _EnablePoison: false + _ExcludeOmniSharpTests: true + _RunOnline: false + _WithPreviousSDK: false + ${{ if ne(variables['Build.Reason'], 'PullRequest') }}: + Alpine317-Offline: + _BootstrapPrep: true + _Container: ${{ parameters.alpine317Container }} + _EnablePoison: false + _ExcludeOmniSharpTests: true + _OverrideDistroDisablingSha1: false + _RunOnline: false + _WithPreviousSDK: false + CentOSStream8-WithPreviousSDK: + _BootstrapPrep: false + _Container: ${{ parameters.centOSStream8Container }} + _EnablePoison: false + _ExcludeOmniSharpTests: true + _RunOnline: false + _WithPreviousSDK: true + CentOSStream9-Offline: + _BootstrapPrep: true + _Container: ${{ parameters.centOSStream9Container }} + _EnablePoison: false + _ExcludeOmniSharpTests: false + _OverrideDistroDisablingSha1: true + _RunOnline: false + _WithPreviousSDK: false + Fedora38-Offline: + _BootstrapPrep: true + _Container: ${{ parameters.fedora38Container }} + _EnablePoison: true + _ExcludeOmniSharpTests: false + _OverrideDistroDisablingSha1: false + _RunOnline: false + _WithPreviousSDK: false + Ubuntu2004-Offline: + _BootstrapPrep: true + _Container: ${{ parameters.ubuntu2004Container }} + _EnablePoison: false + _ExcludeOmniSharpTests: false + _OverrideDistroDisablingSha1: false + _RunOnline: false + _WithPreviousSDK: false + name: Build_Tarball_x64 + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + ${{ parameters.poolPublicAmd64 }} + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + ${{ if in(variables['Build.Reason'], 'PullRequest') }}: + ${{ parameters.poolInternalAmd64PR }} + ${{ else }}: + ${{ parameters.poolInternalAmd64 }} + +- ${{ if and(eq(variables['System.TeamProject'], 'internal'), ne(variables['Build.Reason'], 'PullRequest')) }}: + - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball-pr.yml + parameters: + architecture: arm64 + dependsOn: ${{ parameters.dependsOn }} + installerBuildResourceId: ${{ parameters.installerBuildResourceId }} + matrix: + Debian11-Offline: + _BootstrapPrep: true + _Container: ${{ parameters.debian11Arm64Container }} + _EnablePoison: false + _ExcludeOmniSharpTests: false + _OverrideDistroDisablingSha1: false + _RunOnline: false + _WithPreviousSDK: false + name: Build_Tarball_arm64 + pool: ${{ parameters.poolInternalArm64 }} + +- ${{ if ne(variables['Build.Reason'], 'PullRequest') }}: + - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball-pr.yml + parameters: + architecture: x64 + # Always attempt to run the bootstrap leg (e.g. even when stage 1 tests fail) in order to get a complete assessment of the build status. + # The bootstrap build will shortcut if the stage 1 build failed. + condition: succeededOrFailed() + dependsOn: Build_Tarball_x64 + excludeSdkContentTests: true + installerBuildResourceId: ${{ parameters.installerBuildResourceId }} + matrix: + Fedora38-Offline: + _PreviousSourceBuildArtifact: Build_Tarball_x64 Fedora38-Offline_Artifacts + _Container: ${{ parameters.fedora38Container }} + _EnablePoison: false + _ExcludeOmniSharpTests: false + _OverrideDistroDisablingSha1: false + _RunOnline: false + _WithPreviousSDK: false + name: Build_Tarball_x64_Using_Previous + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + ${{ parameters.poolPublicAmd64 }} + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + ${{ parameters.poolInternalAmd64 }} + usePreviousArtifacts: true diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml index 307cb7307..f7f9cdb48 100644 --- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml @@ -17,15 +17,21 @@ parameters: ubuntu2004Container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-20.04 poolInternalAmd64: name: NetCore1ESPool-Svc-Internal - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 + image: 1es-ubuntu-2004 + os: linux poolInternalAmd64PR: name: NetCore1ESPool-Internal-XL - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 + image: 1es-ubuntu-2004 + os: linux poolInternalArm64: name: Docker-Linux-Arm-Internal + image: Mariner-2-Docker-ARM64 + os: linux + hostArchitecture: Arm64 poolPublicAmd64: name: NetCore-Public-XL - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open + image: 1es-ubuntu-2004-open + os: linux jobs: - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml @@ -123,7 +129,7 @@ jobs: - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml parameters: architecture: x64 - # Always attempt to run the bootstrap leg (e.g. even when stage 1 tests fail) in order to get a complete accessment of the build status. + # Always attempt to run the bootstrap leg (e.g. even when stage 1 tests fail) in order to get a complete assessment of the build status. # The bootstrap build will shortcut if the stage 1 build failed. condition: succeededOrFailed() dependsOn: Build_Tarball_x64 From 2e08b0bc5049ca64cae671a1ed79c3eddf758c44 Mon Sep 17 00:00:00 2001 From: Michael Yanni Date: Tue, 2 Apr 2024 15:02:56 -0700 Subject: [PATCH 506/535] [7.0.3xx] Migrate to 1ES templates for internal builds (#19200) Co-authored-by: dotnet-maestro[bot] --- .vsts-ci.yml | 690 +++++++++--------- .vsts-pr.yml | 35 +- eng/build-pr.yml | 156 ++++ eng/build.yml | 14 +- eng/source-build-tarball-build-official.yml | 26 +- eng/source-build-tarball-build.yml | 14 - .../job/source-build-build-tarball-pr.yml | 252 +++++++ .../job/source-build-build-tarball.yml | 14 +- .../job/source-build-create-tarball-pr.yml | 85 +++ .../job/source-build-create-tarball.yml | 20 +- .../job/source-build-run-tarball-build-pr.yml | 147 ++++ .../job/source-build-run-tarball-build.yml | 14 +- 12 files changed, 1057 insertions(+), 410 deletions(-) create mode 100644 eng/build-pr.yml delete mode 100644 eng/source-build-tarball-build.yml create mode 100644 src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball-pr.yml create mode 100644 src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball-pr.yml create mode 100644 src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build-pr.yml diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 5e2cdc745..d53d48105 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -1,3 +1,5 @@ +# Pipeline: https://dnceng.visualstudio.com/internal/_build?definitionId=286 + trigger: batch: true branches: @@ -26,7 +28,6 @@ variables: - group: DotNet-Installer-SDLValidation-Params - name: _PublishUsingPipelines value: true - # Default to running tests in PRs and public CI, but not in official builds - name: _WindowsTestArg value: '-test' @@ -37,358 +38,375 @@ variables: value: '' - name: _NonWindowsTestArg value: '' - - 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) +- name: DncEngPublicBuildPool + value: NetCore-Svc-Public +- name: DncEngInternalBuildPool + value: NetCore1ESPool-Svc-Internal +# Set the MicroBuild plugin installation directory to the agent temp directory to avoid SDL tool scanning. +- name: MicroBuildOutputFolderOverride + value: $(Agent.TempDirectory) -stages: -- stage: build - jobs: - - job: Publish_Build_Configuration - pool: - ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: NetCore-Svc-Public - demands: ImageOverride -equals windows.vs2019.amd64.open - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - name: NetCore1ESPool-Svc-Internal - demands: ImageOverride -equals windows.vs2019.amd64 - steps: - - publish: $(Build.SourcesDirectory)\eng\BuildConfiguration - artifact: BuildConfiguration - displayName: Publish Build Config - - template: /eng/build.yml - parameters: - agentOs: Windows_NT - pool: - ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: NetCore-Svc-Public - demands: ImageOverride -equals windows.vs2019.amd64.open - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - name: NetCore1ESPool-Svc-Internal - demands: ImageOverride -equals windows.vs2019.amd64 - timeoutInMinutes: 180 - strategy: - matrix: - # Public-only builds - ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: - Build_Release_x64: - _BuildConfig: Debug - _BuildArchitecture: x64 - _DOTNET_CLI_UI_LANGUAGE: '' - _AdditionalBuildParameters: '/p:PublishInternalAsset=true' - _TestArg: $(_WindowsTestArg) - # Internal-only builds - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - Build_Release_x64: - _BuildConfig: Release - _BuildArchitecture: x64 - _DOTNET_CLI_UI_LANGUAGE: '' - _AdditionalBuildParameters: '/p:PublishInternalAsset=true' - _TestArg: $(_WindowsTestArg) - Build_Release_x86: - _BuildConfig: Release - _BuildArchitecture: x86 - _DOTNET_CLI_UI_LANGUAGE: '' - _AdditionalBuildParameters: '' - _TestArg: $(_WindowsTestArg) - Build_Release_arm64: - _BuildConfig: Release - _BuildArchitecture: arm64 - _DOTNET_CLI_UI_LANGUAGE: '' - _AdditionalBuildParameters: '' - # Never run tests on arm64 - _TestArg: '' +resources: + repositories: + - repository: 1esPipelines + type: git + name: 1ESPipelineTemplates/1ESPipelineTemplates + ref: refs/tags/release - - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - template: /eng/build.yml - parameters: - agentOs: Windows_NT +extends: + ${{ if notin(variables['Build.Reason'], 'PullRequest') }}: + template: v1/1ES.Official.PipelineTemplate.yml@1esPipelines + ${{ else }}: + template: v1/1ES.Unofficial.PipelineTemplate.yml@1esPipelines + parameters: + containers: + fedora38: + image: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-38 + sdl: + sourceAnalysisPool: + name: $(DncEngInternalBuildPool) + image: 1es-windows-2019 + os: windows + stages: + - stage: build + jobs: + # Build Retry Configuration + - job: Publish_Build_Configuration pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + name: $(DncEngPublicBuildPool) + image: 1es-windows-2019-open + os: windows ${{ if eq(variables['System.TeamProject'], 'internal') }}: - name: NetCore1ESPool-Svc-Internal - demands: ImageOverride -equals windows.vs2019.amd64 - timeoutInMinutes: 180 - strategy: - matrix: - Build_Release_x64: - _BuildConfig: Release - _BuildArchitecture: x64 - _DOTNET_CLI_UI_LANGUAGE: '' - _AdditionalBuildParameters: '/p:PublishInternalAsset=true' - # Never run tests on PGO bits - _TestArg: '' - Build_Release_x86: - _BuildConfig: Release - _BuildArchitecture: x86 - _DOTNET_CLI_UI_LANGUAGE: '' - _AdditionalBuildParameters: '' - _TestArg: '' - Build_Release_arm64: - _BuildConfig: Release - _BuildArchitecture: arm64 - _DOTNET_CLI_UI_LANGUAGE: '' - _AdditionalBuildParameters: '' - # Never run tests on arm64 - _TestArg: '' - pgoInstrument: true + name: $(DncEngInternalBuildPool) + image: 1es-windows-2019 + os: windows + steps: + - task: 1ES.PublishPipelineArtifact@1 + displayName: Publish Build Config + inputs: + targetPath: $(Build.SourcesDirectory)\eng\BuildConfiguration + artifactName: BuildConfiguration + - template: /eng/build.yml@self + parameters: + agentOs: Windows_NT + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + name: $(DncEngPublicBuildPool) + image: 1es-windows-2019-open + os: windows + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: $(DncEngInternalBuildPool) + image: 1es-windows-2019 + os: windows + timeoutInMinutes: 180 + strategy: + matrix: + # Public-only builds + ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: + Build_Release_x64: + _BuildConfig: Debug + _BuildArchitecture: x64 + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '/p:PublishInternalAsset=true' + _TestArg: $(_WindowsTestArg) + # Internal-only builds + ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + Build_Release_x64: + _BuildConfig: Release + _BuildArchitecture: x64 + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '/p:PublishInternalAsset=true' + _TestArg: $(_WindowsTestArg) + Build_Release_x86: + _BuildConfig: Release + _BuildArchitecture: x86 + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '' + _TestArg: $(_WindowsTestArg) + Build_Release_arm64: + _BuildConfig: Release + _BuildArchitecture: arm64 + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '' + # Never run tests on arm64 + _TestArg: '' - - template: /eng/build.yml - parameters: - agentOs: Linux - pool: - ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: NetCore-Svc-Public - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - name: NetCore1ESPool-Svc-Internal - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 - timeoutInMinutes: 180 - strategy: - matrix: - ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: - Build_Ubuntu_18_04_Debug_x64: - _BuildConfig: Debug - _DockerParameter: '--docker ubuntu.18.04' - _LinuxPortable: '--linux-portable' - _RuntimeIdentifier: '' - _BuildArchitecture: 'x64' - _TestArg: $(_NonWindowsTestArg) - Build_Fedora_36_Debug_x64: - _BuildConfig: Debug - _DockerParameter: '--docker fedora.36' - _LinuxPortable: '--linux-portable' - _RuntimeIdentifier: '' - _BuildArchitecture: 'x64' - _TestArg: $(_NonWindowsTestArg) - Build_CentOS_7_Debug_x64: - _BuildConfig: Debug - _DockerParameter: '--docker centos' - _LinuxPortable: '' - _RuntimeIdentifier: '' - _BuildArchitecture: 'x64' - _TestArg: $(_NonWindowsTestArg) - Build_Debian_11_Debug_x64: - _BuildConfig: Debug - _DockerParameter: '--docker debian' - _LinuxPortable: '' - _RuntimeIdentifier: '' - _BuildArchitecture: 'x64' - _AdditionalBuildParameters: '/p:BuildSdkDeb=true' - _TestArg: $(_NonWindowsTestArg) - Build_Arm64_Debug: - _BuildConfig: Debug - _DockerParameter: '' - _LinuxPortable: '--linux-portable' - _RuntimeIdentifier: '--runtime-id linux-arm64' - _BuildArchitecture: 'arm64' - # Never run tests on arm64 - _TestArg: '' - Build_Linux_musl_Debug_x64: - _BuildConfig: Debug - _DockerParameter: '--docker alpine.3.15' - _LinuxPortable: '' - _RuntimeIdentifier: '--runtime-id linux-musl-x64' - _BuildArchitecture: 'x64' - # Pass in HostOSName when running on alpine - _AdditionalBuildParameters: '/p:HostOSName="linux-musl"' - _TestArg: $(_NonWindowsTestArg) - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - Build_Arm_Release: - _BuildConfig: Release - _DockerParameter: '' - _LinuxPortable: '--linux-portable' - _RuntimeIdentifier: '--runtime-id linux-arm' - _BuildArchitecture: 'arm' - # Never run tests on arm - _TestArg: '' - Build_Arm64_Release: - _BuildConfig: Release - _DockerParameter: '' - _LinuxPortable: '--linux-portable' - _RuntimeIdentifier: '--runtime-id linux-arm64' - _BuildArchitecture: 'arm64' - # Never run tests on arm64 - _TestArg: '' - Build_Linux_musl_Release_arm: - _BuildConfig: Release - # linux-musl-arm cross gen depends on glibc 2.27 (this OS has it) - _DockerParameter: '--docker ubuntu.18.04' - _LinuxPortable: '' - _RuntimeIdentifier: '--runtime-id linux-musl-arm' - _BuildArchitecture: 'arm' - _AdditionalBuildParameters: '/p:OSName="linux-musl"' - # Never run tests on arm - _TestArg: '' - Build_Linux_musl_Release_arm64: - _BuildConfig: Release - _DockerParameter: '' - _LinuxPortable: '' - _RuntimeIdentifier: '--runtime-id linux-musl-arm64' - _BuildArchitecture: 'arm64' - _AdditionalBuildParameters: '/p:OSName="linux-musl"' - # Never run tests on arm64 - _TestArg: '' - Build_Linux_musl_Release_x64: - _BuildConfig: Release - _DockerParameter: '--docker alpine.3.15' - _LinuxPortable: '' - _RuntimeIdentifier: '--runtime-id linux-musl-x64' - _BuildArchitecture: 'x64' - # Pass in HostOSName when running on alpine - _AdditionalBuildParameters: '/p:HostOSName="linux-musl"' - Build_Linux_Portable_Deb_Release_x64: - _BuildConfig: Release - _DockerParameter: '--docker ubuntu.18.04' - _LinuxPortable: '--linux-portable' - _RuntimeIdentifier: '' - _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' - _TestArg: $(_NonWindowsTestArg) - Build_Linux_Portable_Rpm_Release_x64: - _BuildConfig: Release - _DockerParameter: '--docker centos' - _LinuxPortable: '--linux-portable' - _RuntimeIdentifier: '' - _BuildArchitecture: 'x64' - # Do not publish zips and tarballs. The linux-x64 binaries are - # already published by Build_LinuxPortable_Release_x64 - _AdditionalBuildParameters: '/p:PublishBinariesAndBadge=false' - _TestArg: $(_NonWindowsTestArg) - Build_Linux_Portable_Rpm_Release_Arm64: - _BuildConfig: Release - _DockerParameter: '--docker centos' - _LinuxPortable: '--linux-portable' - _RuntimeIdentifier: '--runtime-id linux-arm64' - _BuildArchitecture: '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' - # Never run tests on arm64 - _TestArg: '' - Build_LinuxPortable_Release_x64: - _BuildConfig: Release - _DockerParameter: '' - _LinuxPortable: '--linux-portable' - _RuntimeIdentifier: '' - _BuildArchitecture: 'x64' - _TestArg: $(_NonWindowsTestArg) + - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - template: /eng/build.yml@self + parameters: + agentOs: Windows_NT + pool: + name: $(DncEngInternalBuildPool) + image: 1es-windows-2019 + os: windows + timeoutInMinutes: 180 + strategy: + matrix: + Build_Release_x64: + _BuildConfig: Release + _BuildArchitecture: x64 + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '/p:PublishInternalAsset=true' + # Never run tests on PGO bits + _TestArg: '' + Build_Release_x86: + _BuildConfig: Release + _BuildArchitecture: x86 + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '' + _TestArg: '' + Build_Release_arm64: + _BuildConfig: Release + _BuildArchitecture: arm64 + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '' + # Never run tests on arm64 + _TestArg: '' + pgoInstrument: true - - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - template: /eng/build.yml - parameters: - agentOs: Linux - pool: - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - name: NetCore1ESPool-Svc-Internal - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 - timeoutInMinutes: 180 - strategy: - matrix: - Build_LinuxPortable_Release_x64: - _BuildConfig: Release - _DockerParameter: '' - _LinuxPortable: '--linux-portable' - _RuntimeIdentifier: '' - _BuildArchitecture: 'x64' - _TestArg: '' - Build_Release_arm64: - _BuildConfig: Release - _BuildArchitecture: arm64 - _DOTNET_CLI_UI_LANGUAGE: '' - _AdditionalBuildParameters: '' - # Never run tests on arm64 - _TestArg: '' - pgoInstrument: true + - template: /eng/build.yml@self + parameters: + agentOs: Linux + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + name: $(DncEngPublicBuildPool) + image: 1es-ubuntu-2004-open + os: linux + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: $(DncEngInternalBuildPool) + image: 1es-ubuntu-2004 + os: linux + timeoutInMinutes: 180 + strategy: + matrix: + ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: + Build_Ubuntu_18_04_Debug_x64: + _BuildConfig: Debug + _DockerParameter: '--docker ubuntu.18.04' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _TestArg: $(_NonWindowsTestArg) + Build_Fedora_36_Debug_x64: + _BuildConfig: Debug + _DockerParameter: '--docker fedora.36' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _TestArg: $(_NonWindowsTestArg) + Build_CentOS_7_Debug_x64: + _BuildConfig: Debug + _DockerParameter: '--docker centos' + _LinuxPortable: '' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _TestArg: $(_NonWindowsTestArg) + Build_Debian_11_Debug_x64: + _BuildConfig: Debug + _DockerParameter: '--docker debian' + _LinuxPortable: '' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _AdditionalBuildParameters: '/p:BuildSdkDeb=true' + _TestArg: $(_NonWindowsTestArg) + Build_Arm64_Debug: + _BuildConfig: Debug + _DockerParameter: '' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '--runtime-id linux-arm64' + _BuildArchitecture: 'arm64' + # Never run tests on arm64 + _TestArg: '' + Build_Linux_musl_Debug_x64: + _BuildConfig: Debug + _DockerParameter: '--docker alpine.3.15' + _LinuxPortable: '' + _RuntimeIdentifier: '--runtime-id linux-musl-x64' + _BuildArchitecture: 'x64' + # Pass in HostOSName when running on alpine + _AdditionalBuildParameters: '/p:HostOSName="linux-musl"' + _TestArg: $(_NonWindowsTestArg) + ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + Build_Arm_Release: + _BuildConfig: Release + _DockerParameter: '' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '--runtime-id linux-arm' + _BuildArchitecture: 'arm' + # Never run tests on arm + _TestArg: '' + Build_Arm64_Release: + _BuildConfig: Release + _DockerParameter: '' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '--runtime-id linux-arm64' + _BuildArchitecture: 'arm64' + # Never run tests on arm64 + _TestArg: '' + Build_Linux_musl_Release_arm: + _BuildConfig: Release + # linux-musl-arm cross gen depends on glibc 2.27 (this OS has it) + _DockerParameter: '--docker ubuntu.18.04' + _LinuxPortable: '' + _RuntimeIdentifier: '--runtime-id linux-musl-arm' + _BuildArchitecture: 'arm' + _AdditionalBuildParameters: '/p:OSName="linux-musl"' + # Never run tests on arm + _TestArg: '' + Build_Linux_musl_Release_arm64: + _BuildConfig: Release + _DockerParameter: '' + _LinuxPortable: '' + _RuntimeIdentifier: '--runtime-id linux-musl-arm64' + _BuildArchitecture: 'arm64' + _AdditionalBuildParameters: '/p:OSName="linux-musl"' + # Never run tests on arm64 + _TestArg: '' + Build_Linux_musl_Release_x64: + _BuildConfig: Release + _DockerParameter: '--docker alpine.3.15' + _LinuxPortable: '' + _RuntimeIdentifier: '--runtime-id linux-musl-x64' + _BuildArchitecture: 'x64' + # Pass in HostOSName when running on alpine + _AdditionalBuildParameters: '/p:HostOSName="linux-musl"' + Build_Linux_Portable_Deb_Release_x64: + _BuildConfig: Release + _DockerParameter: '--docker ubuntu.18.04' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '' + _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' + _TestArg: $(_NonWindowsTestArg) + Build_Linux_Portable_Rpm_Release_x64: + _BuildConfig: Release + _DockerParameter: '--docker centos' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + # Do not publish zips and tarballs. The linux-x64 binaries are + # already published by Build_LinuxPortable_Release_x64 + _AdditionalBuildParameters: '/p:PublishBinariesAndBadge=false' + _TestArg: $(_NonWindowsTestArg) + Build_Linux_Portable_Rpm_Release_Arm64: + _BuildConfig: Release + _DockerParameter: '--docker centos' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '--runtime-id linux-arm64' + _BuildArchitecture: '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' + # Never run tests on arm64 + _TestArg: '' + Build_LinuxPortable_Release_x64: + _BuildConfig: Release + _DockerParameter: '' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _TestArg: $(_NonWindowsTestArg) - - template: /eng/build.yml - parameters: - agentOs: Darwin - pool: - vmImage: 'macOS-latest' - timeoutInMinutes: 180 - strategy: - matrix: - Build_Release_x64: - _BuildConfig: Release - _RuntimeIdentifier: '' - _BuildArchitecture: 'x64' - _TestArg: $(_NonWindowsTestArg) - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - Build_Release_arm64: - _BuildConfig: Release - _RuntimeIdentifier: '--runtime-id osx-arm64' - _BuildArchitecture: 'arm64' - # Never run tests on arm64 - _TestArg: '' + - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - template: /eng/build.yml@self + parameters: + agentOs: Linux + pool: + name: $(DncEngInternalBuildPool) + image: 1es-ubuntu-2004 + os: linux + timeoutInMinutes: 180 + strategy: + matrix: + Build_LinuxPortable_Release_x64: + _BuildConfig: Release + _DockerParameter: '' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _TestArg: '' + Build_Release_arm64: + _BuildConfig: Release + _BuildArchitecture: arm64 + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '' + # Never run tests on arm64 + _TestArg: '' + pgoInstrument: true - - template: /eng/common/templates/jobs/source-build.yml + - template: /eng/build.yml@self + parameters: + agentOs: Darwin + pool: + name: Azure Pipelines + image: macOS-latest + os: macOS + timeoutInMinutes: 180 + strategy: + matrix: + Build_Release_x64: + _BuildConfig: Release + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _TestArg: $(_NonWindowsTestArg) + ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + Build_Release_arm64: + _BuildConfig: Release + _RuntimeIdentifier: '--runtime-id osx-arm64' + _BuildArchitecture: 'arm64' + # Never run tests on arm64 + _TestArg: '' - - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml + - template: /eng/common/templates-official/jobs/source-build.yml@self - # For .NET 7.0, source-build currently supports 7.0.1xx. Disable tarball build validation in all other branches. - # - ${{ if in(variables['Build.Reason'], 'PullRequest') }}: - # - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml - # parameters: - # dependsOn: Source_Build_Create_Tarball + - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml@self - # https://github.com/dotnet/core-sdk/issues/248 - # - template: /eng/build.yml - # parameters: - # agentOs: FreeBSD - # queue: - # name: dnceng-freebsd-internal - # timeoutInMinutes: 180 - # matrix: - # Build_Release: - # _BuildConfig: Release - # _BuildArchitecture: 'x64' - # _AdditionalBuildParameters: '/p:DisableSourceLink=true /p:DISABLE_CROSSGEN=true' + - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - template: /eng/common/templates-official/job/publish-build-assets.yml@self + parameters: + dependsOn: + - Windows_NT + - Linux + - Darwin + - Source_Build_Managed + - Source_Build_Create_Tarball + - PGO_Linux + - PGO_Windows_NT + publishUsingPipelines: true + pool: + name: $(DncEngInternalBuildPool) + image: 1es-windows-2019 + os: windows - - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - template: /eng/common/templates/job/publish-build-assets.yml - parameters: - dependsOn: - - Windows_NT - - Linux - - Darwin - - Source_Build_Managed - - Source_Build_Create_Tarball - - PGO_Linux - - PGO_Windows_NT - publishUsingPipelines: true - pool: - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - name: NetCore1ESPool-Svc-Internal - demands: ImageOverride -equals windows.vs2017.amd64 - - -- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - template: eng\common\templates\post-build\post-build.yml - parameters: - publishingInfraVersion: 3 - enableSymbolValidation: false - enableSigningValidation: false - enableNugetValidation: false - enableSourceLinkValidation: false - publishInstallersAndChecksums: true - SDLValidationParameters: - enable: false - params: ' -SourceToolsList @("policheck","credscan") - -TsaInstanceURL $(_TsaInstanceURL) - -TsaProjectName $(_TsaProjectName) - -TsaNotificationEmail $(_TsaNotificationEmail) - -TsaCodebaseAdmin $(_TsaCodebaseAdmin) - -TsaBugAreaPath $(_TsaBugAreaPath) - -TsaIterationPath $(_TsaIterationPath) - -TsaRepositoryName "dotnet-installer" - -TsaCodebaseName "dotnet-installer" - -TsaPublish $True' + - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - template: /eng/common/templates-official/post-build/post-build.yml@self + parameters: + publishingInfraVersion: 3 + enableSymbolValidation: false + enableSigningValidation: false + enableNugetValidation: false + enableSourceLinkValidation: false + publishInstallersAndChecksums: true + SDLValidationParameters: + enable: false + params: ' -SourceToolsList @("policheck","credscan") + -TsaInstanceURL $(_TsaInstanceURL) + -TsaProjectName $(_TsaProjectName) + -TsaNotificationEmail $(_TsaNotificationEmail) + -TsaCodebaseAdmin $(_TsaCodebaseAdmin) + -TsaBugAreaPath $(_TsaBugAreaPath) + -TsaIterationPath $(_TsaIterationPath) + -TsaRepositoryName "dotnet-installer" + -TsaCodebaseName "dotnet-installer" + -TsaPublish $True' diff --git a/.vsts-pr.yml b/.vsts-pr.yml index 5e2cdc745..2f14d2054 100644 --- a/.vsts-pr.yml +++ b/.vsts-pr.yml @@ -26,7 +26,6 @@ variables: - group: DotNet-Installer-SDLValidation-Params - name: _PublishUsingPipelines value: true - # Default to running tests in PRs and public CI, but not in official builds - name: _WindowsTestArg value: '-test' @@ -37,10 +36,8 @@ variables: value: '' - name: _NonWindowsTestArg value: '' - - name: _InternalRuntimeDownloadArgs value: '' - - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - group: DotNetBuilds storage account read tokens - name: _InternalRuntimeDownloadArgs @@ -63,7 +60,7 @@ stages: - publish: $(Build.SourcesDirectory)\eng\BuildConfiguration artifact: BuildConfiguration displayName: Publish Build Config - - template: /eng/build.yml + - template: /eng/build-pr.yml parameters: agentOs: Windows_NT pool: @@ -107,7 +104,7 @@ stages: _TestArg: '' - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - template: /eng/build.yml + - template: /eng/build-pr.yml parameters: agentOs: Windows_NT pool: @@ -139,7 +136,7 @@ stages: _TestArg: '' pgoInstrument: true - - template: /eng/build.yml + - template: /eng/build-pr.yml parameters: agentOs: Linux pool: @@ -283,7 +280,7 @@ stages: _TestArg: $(_NonWindowsTestArg) - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - template: /eng/build.yml + - template: /eng/build-pr.yml parameters: agentOs: Linux pool: @@ -309,7 +306,7 @@ stages: _TestArg: '' pgoInstrument: true - - template: /eng/build.yml + - template: /eng/build-pr.yml parameters: agentOs: Darwin pool: @@ -332,26 +329,7 @@ stages: - template: /eng/common/templates/jobs/source-build.yml - - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml - - # For .NET 7.0, source-build currently supports 7.0.1xx. Disable tarball build validation in all other branches. - # - ${{ if in(variables['Build.Reason'], 'PullRequest') }}: - # - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml - # parameters: - # dependsOn: Source_Build_Create_Tarball - - # https://github.com/dotnet/core-sdk/issues/248 - # - template: /eng/build.yml - # parameters: - # agentOs: FreeBSD - # queue: - # name: dnceng-freebsd-internal - # timeoutInMinutes: 180 - # matrix: - # Build_Release: - # _BuildConfig: Release - # _BuildArchitecture: 'x64' - # _AdditionalBuildParameters: '/p:DisableSourceLink=true /p:DISABLE_CROSSGEN=true' + - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball-pr.yml - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - template: /eng/common/templates/job/publish-build-assets.yml @@ -370,7 +348,6 @@ stages: name: NetCore1ESPool-Svc-Internal demands: ImageOverride -equals windows.vs2017.amd64 - - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - template: eng\common\templates\post-build\post-build.yml parameters: diff --git a/eng/build-pr.yml b/eng/build-pr.yml new file mode 100644 index 000000000..69d1e3f0f --- /dev/null +++ b/eng/build-pr.yml @@ -0,0 +1,156 @@ +parameters: + # Agent OS identifier and used as job name + agentOs: '' + + # Agent pool + pool: {} + + # Additional variables + variables: {} + + # Build strategy - matrix + strategy: {} + + # Job timeout + timeoutInMinutes: 180 + + # Publish using pipelines + enablePublishUsingPipelines: true + +phases: +- template: /eng/common/templates/job/job.yml + parameters: + ${{ if parameters.pgoInstrument }}: + name: PGO_${{ parameters.agentOs }} + ${{ if not(parameters.pgoInstrument) }}: + name: ${{ parameters.agentOs }} + timeoutInMinutes: ${{ parameters.timeoutInMinutes }} + ${{ if eq(parameters.agentOs, 'Windows_NT') }}: + enableMicrobuild: true + enablePublishBuildAssets: true + enablePublishUsingPipelines: ${{parameters.enablePublishUsingPipelines}} + enableTelemetry: true + helixRepo: dotnet/installer + pool: ${{ parameters.pool }} + ${{ if ne(parameters.strategy, '') }}: + strategy: ${{ parameters.strategy }} + workspace: + clean: all + + variables: + - _PgoInstrument: '' + - ${{ if eq(parameters.agentOs, 'Windows_NT') }}: + - _PackArg: '-pack' + - ${{ if ne(parameters.agentOs, 'Windows_NT') }}: + - _PackArg: '--pack' + - ${{ if parameters.pgoInstrument }}: + - _PgoInstrument: '/p:PgoInstrument=true' + - _PackArg: '' + - _AgentOSName: ${{ parameters.agentOs }} + - _TeamName: Roslyn-Project-System + - _SignType: test + - _BuildArgs: '/p:DotNetSignType=$(_SignType) $(_PgoInstrument)' + - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - group: DotNet-Symbol-Server-PATs + - group: DotNet-HelixApi-Access + - group: DotNet-Blob-Feed + - _DotNetPublishToBlobFeed: true + - _PushToVSFeed: true + - _SignType: real + - _BuildArgs: /p:OfficialBuildId=$(BUILD.BUILDNUMBER) + /p:DotNetSignType=$(_SignType) + /p:TeamName=$(_TeamName) + /p:DotNetPublishUsingPipelines=$(_PublishUsingPipelines) + $(_PgoInstrument) + + steps: + - checkout: self + clean: true + - ${{ if eq(parameters.agentOs, 'Windows_NT') }}: + - ${{ if ne(variables['System.TeamProject'], 'public') }}: + - task: PowerShell@2 + displayName: Setup Private Feeds Credentials + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1 + arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token + env: + Token: $(dn-bot-dnceng-artifact-feeds-rw) + - script: build.cmd + $(_TestArg) $(_PackArg) + -publish -ci -sign + -Configuration $(_BuildConfig) + -Architecture $(_BuildArchitecture) + $(_BuildArgs) + $(_AdditionalBuildParameters) + $(_InternalRuntimeDownloadArgs) + displayName: Build + env: + DOTNET_CLI_UI_LANGUAGE: $(_DOTNET_CLI_UI_LANGUAGE) + + - ${{ if ne(parameters.agentOs, 'Windows_NT') }}: + - ${{ if ne(variables['System.TeamProject'], 'public') }}: + - task: Bash@3 + displayName: Setup Private Feeds Credentials + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh + arguments: $(Build.SourcesDirectory)/NuGet.config $Token + env: + Token: $(dn-bot-dnceng-artifact-feeds-rw) + + - ${{ if eq(parameters.agentOs, 'Linux') }}: + - script: ./build.sh + $(_TestArg) $(_PackArg) + --publish --ci + --noprettyprint + --configuration $(_BuildConfig) + $(_DockerParameter) + --architecture $(_BuildArchitecture) + $(_LinuxPortable) + $(_RuntimeIdentifier) + $(_BuildArgs) + $(_AdditionalBuildParameters) + $(_InternalRuntimeDownloadArgs) + displayName: Build + + - ${{ if or(eq(parameters.agentOs, 'Darwin'), eq(parameters.agentOs, 'FreeBSD')) }}: + - script: ./build.sh + $(_TestArg) + --pack --publish --ci + --noprettyprint + --configuration $(_BuildConfig) + --architecture $(_BuildArchitecture) + $(_RuntimeIdentifier) + $(_BuildArgs) + $(_AdditionalBuildParameters) + $(_InternalRuntimeDownloadArgs) + displayName: Build + + - task: PublishTestResults@2 + displayName: Publish Test Results + inputs: + testRunner: XUnit + testResultsFiles: 'artifacts/TestResults/$(_BuildConfig)/*.xml' + testRunTitle: '$(_AgentOSName)_$(Agent.JobName)' + platform: '$(BuildPlatform)' + configuration: '$(_BuildConfig)' + condition: ne(variables['_TestArg'], '') + + - task: CopyFiles@2 + displayName: Gather Logs + inputs: + SourceFolder: '$(Build.SourcesDirectory)/artifacts' + Contents: | + log/$(_BuildConfig)/**/* + TestResults/$(_BuildConfig)/**/* + TargetFolder: '$(Build.ArtifactStagingDirectory)' + continueOnError: true + condition: always() + + - task: PublishBuildArtifacts@1 + displayName: Publish Logs to VSTS + inputs: + PathtoPublish: '$(Build.ArtifactStagingDirectory)' + ArtifactName: '$(_AgentOSName)_$(Agent.JobName)_$(Build.BuildNumber)' + publishLocation: Container + continueOnError: true + condition: always() diff --git a/eng/build.yml b/eng/build.yml index 35c829867..d486c47ec 100644 --- a/eng/build.yml +++ b/eng/build.yml @@ -18,7 +18,7 @@ parameters: enablePublishUsingPipelines: true phases: -- template: /eng/common/templates/job/job.yml +- template: /eng/common/templates-official/job/job.yml parameters: ${{ if parameters.pgoInstrument }}: name: PGO_${{ parameters.agentOs }} @@ -28,9 +28,6 @@ phases: ${{ if eq(parameters.agentOs, 'Windows_NT') }}: enableMicrobuild: true enablePublishBuildAssets: true - # Don't use built-in arcade logic for publishing artifacts and test results, as we manually do this and give better names - #enablePublishBuildArtifacts: true - #enablePublishTestResults: true enablePublishUsingPipelines: ${{parameters.enablePublishUsingPipelines}} enableTelemetry: true helixRepo: dotnet/installer @@ -49,12 +46,10 @@ phases: - ${{ if parameters.pgoInstrument }}: - _PgoInstrument: '/p:PgoInstrument=true' - _PackArg: '' - - _AgentOSName: ${{ parameters.agentOs }} - _TeamName: Roslyn-Project-System - _SignType: test - _BuildArgs: '/p:DotNetSignType=$(_SignType) $(_PgoInstrument)' - - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - group: DotNet-Symbol-Server-PATs - group: DotNet-HelixApi-Access @@ -101,6 +96,7 @@ phases: arguments: $(Build.SourcesDirectory)/NuGet.config $Token env: Token: $(dn-bot-dnceng-artifact-feeds-rw) + - ${{ if eq(parameters.agentOs, 'Linux') }}: - script: ./build.sh $(_TestArg) $(_PackArg) @@ -144,13 +140,13 @@ phases: inputs: SourceFolder: '$(Build.SourcesDirectory)/artifacts' Contents: | - log/$(_BuildConfig)/**/* - TestResults/$(_BuildConfig)/**/* + log/$(_BuildConfig)/**/* + TestResults/$(_BuildConfig)/**/* TargetFolder: '$(Build.ArtifactStagingDirectory)' continueOnError: true condition: always() - - task: PublishBuildArtifacts@1 + - task: 1ES.PublishBuildArtifacts@1 displayName: Publish Logs to VSTS inputs: PathtoPublish: '$(Build.ArtifactStagingDirectory)' diff --git a/eng/source-build-tarball-build-official.yml b/eng/source-build-tarball-build-official.yml index aa1de43eb..f93d87fef 100644 --- a/eng/source-build-tarball-build-official.yml +++ b/eng/source-build-tarball-build-official.yml @@ -1,5 +1,6 @@ trigger: none pr: none + resources: pipelines: - pipeline: installer-build-resource @@ -19,10 +20,23 @@ resources: - internal/release/7.0.4xx stages: - build + repositories: + - repository: 1ESPipelineTemplates + type: git + name: 1ESPipelineTemplates/1ESPipelineTemplates + ref: refs/tags/release -stages: -- stage: build - jobs: - - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml - parameters: - installerBuildResourceId: installer-build-resource +extends: + template: v1/1ES.Official.PipelineTemplate.yml@1ESPipelineTemplates + parameters: + sdl: + sourceAnalysisPool: + name: NetCore1ESPool-Svc-Internal + image: 1es-windows-2022 + os: windows + stages: + - stage: build + jobs: + - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml@self + parameters: + installerBuildResourceId: installer-build-resource diff --git a/eng/source-build-tarball-build.yml b/eng/source-build-tarball-build.yml deleted file mode 100644 index da87d93cf..000000000 --- a/eng/source-build-tarball-build.yml +++ /dev/null @@ -1,14 +0,0 @@ -trigger: none -pr: none -resources: - pipelines: - - pipeline: installer-build-resource - source: installer - trigger: none - -stages: -- stage: build - jobs: - - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml - parameters: - installerBuildResourceId: installer-build-resource diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball-pr.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball-pr.yml new file mode 100644 index 000000000..abb9035fd --- /dev/null +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball-pr.yml @@ -0,0 +1,252 @@ +# Builds a source-build tarball + +parameters: + # Architecture to build + architecture: + + # Custom condition to apply to the job + condition: + + # Dependent jobs that must be completed before this job will run + dependsOn: + + # Skip running the SDK content smoke-tests + excludeSdkContentTests: false + + # Resource id of the installer build to retrieve source/product tarball's from + installerBuildResourceId: + + # Matrix to run jobs over + matrix: + + # Job name + name: + + # Agent pool to use + pool: + + # Build using the previous source-build artifacts + usePreviousArtifacts: false + +jobs: +- job: ${{ parameters.name }} + condition: ${{ parameters.condition }} + dependsOn: ${{ parameters.dependsOn }} + pool: ${{ parameters.pool }} + strategy: + matrix: ${{ parameters.matrix }} + timeoutInMinutes: 300 + variables: + - ${{ if ne(variables['System.TeamProject'], 'public') }}: + - group: AzureDevOps-Artifact-Feeds-Pats + - ${{ if eq(parameters.usePreviousArtifacts, 'true') }}: + - name: additionalBuildArgs + value: --with-sdk /tarball/.dotnet + - name: tarballDir + ${{ if eq(parameters.installerBuildResourceId, '') }}: + value: $(Build.SourcesDirectory) + ${{ else }}: + value: $(Build.StagingDirectory)/tarball + - name: installerSrcDir + ${{ if eq(parameters.installerBuildResourceId, '') }}: + value: $(Build.SourcesDirectory)/src/installer + ${{ else }}: + value: $(Build.SourcesDirectory) + workspace: + clean: all + + steps: + - checkout: self + clean: true + + - ${{ if ne(parameters.installerBuildResourceId, '') }}: + - download: ${{ parameters.installerBuildResourceId }} + artifact: BlobArtifacts + patterns: '**/dotnet-sdk-source*.tar.gz' + displayName: Download Source Tarball + + - script: | + set -x + + resourceIdPathSegment= + if [[ '${{ parameters.installerBuildResourceId }}' != 'current' ]]; then + resourceIdPathSegment='${{ parameters.installerBuildResourceId }}/' + fi + + mkdir -p "$(tarballDir)" + tarballFilePath="$(PIPELINE.WORKSPACE)/${resourceIdPathSegment}BlobArtifacts/dotnet-sdk-source*.tar.gz" + eval tar -ozxf "$tarballFilePath" -C "$(tarballDir)" + eval rm -f "$tarballFilePath" + displayName: Extract Tarball + + - script: cp $(installerSrcDir)/NuGet.config $(tarballDir)/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/online.NuGet.Config + displayName: Copy Test NuGet Config + + - ${{ if ne(parameters.excludeSdkContentTests, 'true') }}: + - download: ${{ parameters.installerBuildResourceId }} + artifact: BlobArtifacts + patterns: '**/dotnet-sdk-+([0-9]).+([0-9]).+([0-9])?(-@(preview|rc|rtm)*)-linux*-${{ parameters.architecture }}.tar.gz' + displayName: Download MSFT sdk Tarball + + - ${{ if eq(parameters.usePreviousArtifacts, 'true') }}: + - download: current + artifact: $(_PreviousSourceBuildArtifact) + patterns: '*.tar.gz' + displayName: Download Previous Source Build Artifacts + + - task: CopyFiles@2 + displayName: Copy Previous Source Build Artifacts + inputs: + SourceFolder: $(PIPELINE.WORKSPACE)/$(_PreviousSourceBuildArtifact) + Contents: '*.tar.gz' + TargetFolder: $(tarballDir)/packages/archive/ + + - script: | + set -euo pipefail + + sourceBuiltSDKUrl="https://dotnetcli.azureedge.net/source-built-artifacts/sdks/" + packageVersionsPath="$(Build.SourcesDirectory)/eng/Versions.props" + notFoundMessage="No source-built SDK found to download..." + + echo "Looking for source-built SDK to download..." + archiveVersionLine=`grep -m 1 "" "$packageVersionsPath" || :` + versionPattern="(.*)" + + if [[ $archiveVersionLine =~ $versionPattern ]]; then + filename="dotnet-sdk-${BASH_REMATCH[1]}-centos.8-x64.tar.gz" + archiveUrl="${sourceBuiltSDKUrl}${filename}" + downloadDir=$(mktemp -d) + (cd $downloadDir && curl --retry 5 -O $archiveUrl) + + mkdir $(tarballDir)/.dotnet + tar -xzf $downloadDir/$filename -C $(tarballDir)/.dotnet + rm -rf $downloadDir + else + echo "$notFoundMessage" + exit 1 + fi + + echo "##vso[task.setvariable variable=additionalBuildArgs]--with-sdk /tarball/.dotnet" + displayName: Setup Previously Source-Built SDK + condition: eq(variables._WithPreviousSDK, 'true') + + - script: | + set -x + + if [[ '${{ parameters.usePreviousArtifacts }}' != 'true' ]]; then + customPrepArgs= + if [[ '$(_BootstrapPrep)' == 'true' ]]; then + customPrepArgs='--bootstrap' + fi + + docker run --rm -v $(tarballDir):/tarball -w /tarball $(_Container) ./prep.sh ${customPrepArgs} + else + mkdir $(tarballDir)/.dotnet + tarballFilePath="$(tarballDir)/packages/archive/dotnet-sdk-*.tar.gz" + eval tar -ozxf "$tarballFilePath" -C "$(tarballDir)/.dotnet" + eval rm -f "$tarballFilePath" + fi + displayName: Prep Tarball + + - script: | + set -x + df -h + + customRunArgs= + customBuildArgs= + if [[ '$(_RunOnline)' == 'true' ]]; then + customBuildArgs='--online' + else + customRunArgs='--network none' + fi + + # See https://github.com/dotnet/source-build/issues/3712 + if [[ '$(_OverrideDistroDisablingSha1)' == 'true' ]]; then + customRunArgs="$customRunArgs -e OPENSSL_ENABLE_SHA1_SIGNATURES=1" + fi + + if [[ '$(_EnablePoison)' == 'true' ]]; then + customBuildArgs="$customBuildArgs --poison" + fi + + docker run --rm -v $(tarballDir):/tarball -w /tarball ${customRunArgs} $(_Container) ./build.sh --clean-while-building ${customBuildArgs} $(additionalBuildArgs) + displayName: Build Tarball + + - ${{ if ne(variables['System.TeamProject'], 'public') }}: + - task: Bash@3 + displayName: Setup Private Feeds Credentials + inputs: + filePath: $(installerSrcDir)/eng/common/SetupNugetSources.sh + arguments: $(tarballDir)/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/online.NuGet.Config $Token + env: + Token: $(dn-bot-dnceng-artifact-feeds-rw) + + - script: | + set -x + + dockerVolumeArgs="-v $(tarballDir):/tarball" + dockerEnvArgs="-e SMOKE_TESTS_EXCLUDE_OMNISHARP=$(_ExcludeOmniSharpTests) -e SMOKE_TESTS_WARN_SDK_CONTENT_DIFFS=true" + poisonArg='' + + if [[ '${{ parameters.excludeSdkContentTests}}' != 'true' ]]; then + dockerVolumeArgs+=" -v $(PIPELINE.WORKSPACE)/${{ parameters.installerBuildResourceId }}/BlobArtifacts/:/BlobArtifacts" + platform="linux" + docker run --rm $(_Container) /bin/sh -c "cat /etc/os-release | grep -q alpine" + if [[ $? == 0 ]]; then + platform="$platform-musl" + fi + msftSdkTarballName=$(find "$(PIPELINE.WORKSPACE)/${{ parameters.installerBuildResourceId }}/BlobArtifacts/" -name "dotnet-sdk-*-$platform-${{ parameters.architecture }}.tar.gz" -exec basename {} \;) + dockerEnvArgs+=" -e SMOKE_TESTS_MSFT_SDK_TARBALL_PATH=/BlobArtifacts/$msftSdkTarballName" + fi + + if [[ '$(_EnablePoison)' == 'true' ]]; then + poisonArg='--poison' + dockerEnvArgs+=" -e SMOKE_TESTS_WARN_POISON_DIFFS=true" + fi + + docker run --rm $dockerVolumeArgs -w /tarball $dockerEnvArgs $(_Container) ./build.sh $poisonArg --run-smoke-test $(additionalBuildArgs) -- /p:SmokeTestConsoleVerbosity=detailed + displayName: Run Tests + + # Don't use CopyFiles@2 as it encounters permissions issues because it indexes all files in the source directory graph. + - script: | + set -x + + targetFolder=$(Build.StagingDirectory)/BuildLogs/ + mkdir -p ${targetFolder} + + cd "$(tarballDir)" + find artifacts/ -type f -name "*.binlog" -exec cp {} --parents -t ${targetFolder} \; + find artifacts/ -type f -name "*.log" -exec cp {} --parents -t ${targetFolder} \; + find artifacts/prebuilt-report/ -exec cp {} --parents -t ${targetFolder} \; + find src/ -type f -name "*.binlog" -exec cp {} --parents -t ${targetFolder} \; + find src/ -type f -name "*.log" -exec cp {} --parents -t ${targetFolder} \; + find test/ -type f -name "*.binlog" -exec cp {} --parents -t ${targetFolder} \; + find test/ -type f -name "Updated*.diff" -exec cp {} --parents -t ${targetFolder} \; + find test/ -type f -name "Updated*.txt" -exec cp {} --parents -t ${targetFolder} \; + displayName: Prepare BuildLogs staging directory + continueOnError: true + condition: succeededOrFailed() + + - publish: '$(Build.StagingDirectory)/BuildLogs' + artifact: $(Agent.JobName)_BuildLogs_Attempt$(System.JobAttempt) + displayName: Publish BuildLogs + continueOnError: true + condition: succeededOrFailed() + + - task: PublishTestResults@2 + displayName: Publish Test Results + condition: succeededOrFailed() + continueOnError: true + inputs: + testRunner: vSTest + testResultsFiles: 'test/**/*.trx' + searchFolder: $(tarballDir) + mergeTestResults: true + publishRunAttachments: true + testRunTitle: SourceBuild_SmokeTests_$(Agent.JobName) + + - publish: '$(tarballDir)/artifacts/${{ parameters.architecture}}/Release/' + artifact: $(Agent.JobName)_Artifacts + displayName: Publish Artifacts + condition: succeededOrFailed() + continueOnError: true diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml index abb9035fd..aa3cf6b96 100644 --- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml @@ -227,9 +227,11 @@ jobs: continueOnError: true condition: succeededOrFailed() - - publish: '$(Build.StagingDirectory)/BuildLogs' - artifact: $(Agent.JobName)_BuildLogs_Attempt$(System.JobAttempt) + - task: 1ES.PublishPipelineArtifact@1 displayName: Publish BuildLogs + inputs: + targetPath: $(Build.StagingDirectory)/BuildLogs + artifactName: $(Agent.JobName)_BuildLogs_Attempt$(System.JobAttempt) continueOnError: true condition: succeededOrFailed() @@ -245,8 +247,10 @@ jobs: publishRunAttachments: true testRunTitle: SourceBuild_SmokeTests_$(Agent.JobName) - - publish: '$(tarballDir)/artifacts/${{ parameters.architecture}}/Release/' - artifact: $(Agent.JobName)_Artifacts + - task: 1ES.PublishPipelineArtifact@1 displayName: Publish Artifacts - condition: succeededOrFailed() + inputs: + targetPath: $(tarballDir)/artifacts/${{ parameters.architecture}}/Release/ + artifactName: $(Agent.JobName)_Artifacts continueOnError: true + condition: succeededOrFailed() diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball-pr.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball-pr.yml new file mode 100644 index 000000000..347f61cf8 --- /dev/null +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball-pr.yml @@ -0,0 +1,85 @@ +# Creates a source-build tarball + +jobs: +- job: Source_Build_Create_Tarball + container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-38 + displayName: Source-Build Create Tarball + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + ${{ if in(variables['Build.Reason'], 'PullRequest') }}: + name: NetCore-Public-XL + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open + ${{ else }}: + name: NetCore-Svc-Public + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + ${{ if in(variables['Build.Reason'], 'PullRequest') }}: + name: NetCore1ESPool-Internal-XL + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 + ${{ else }}: + name: NetCore1ESPool-Svc-Internal + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 + + variables: + - name: _BuildConfig + value: Release + + - ${{ if eq(variables['System.TeamProject'], 'internal') }}: + - group: DotNet-Source-Build-All-Orgs-Source-Access + workspace: + clean: all + + steps: + - ${{ if ne(variables['System.TeamProject'], 'public') }}: + - task: Bash@3 + displayName: Setup Private Feeds Credentials + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh + arguments: $(Build.SourcesDirectory)/NuGet.config $Token + env: + Token: $(dn-bot-dnceng-artifact-feeds-rw) + - script: | + set -x + df -h + + officialBuildArgs= + if [ '${{ and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}' = 'True' ]; then + officialBuildArgs='/p:OfficialBuildId=$(BUILD.BUILDNUMBER)' + 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 + + ./build.sh \ + --ci \ + --configuration $(_BuildConfig) \ + --publish \ + -bl \ + $officialBuildArgs \ + $internalRuntimeDownloadArgs \ + /p:DotNetPublishUsingPipelines=true \ + /p:ArcadeBuildTarball=true \ + /p:AzDoPat=$(dn-bot-all-orgs-build-rw-code-rw) + displayName: Create Tarball + + - task: CopyFiles@2 + displayName: Prepare BuildLogs staging directory + inputs: + Contents: | + **/*.log + **/*.binlog + TargetFolder: '$(Build.StagingDirectory)/BuildLogs' + CleanTargetFolder: true + continueOnError: true + condition: succeededOrFailed() + + - publish: '$(Build.StagingDirectory)/BuildLogs' + artifact: $(Agent.JobName)_BuildLogs_Attempt$(System.JobAttempt) + displayName: Publish BuildLogs + continueOnError: true + condition: succeededOrFailed() diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml index 347f61cf8..7cba0c4ea 100644 --- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml @@ -2,23 +2,27 @@ jobs: - job: Source_Build_Create_Tarball - container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-38 + container: fedora38 displayName: Source-Build Create Tarball pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: ${{ if in(variables['Build.Reason'], 'PullRequest') }}: name: NetCore-Public-XL - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open + image: 1es-ubuntu-2004-open + os: linux ${{ else }}: name: NetCore-Svc-Public - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open + image: 1es-ubuntu-2004-open + os: linux ${{ if eq(variables['System.TeamProject'], 'internal') }}: ${{ if in(variables['Build.Reason'], 'PullRequest') }}: name: NetCore1ESPool-Internal-XL - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 + image: 1es-ubuntu-2004 + os: linux ${{ else }}: name: NetCore1ESPool-Svc-Internal - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 + image: 1es-ubuntu-2004 + os: linux variables: - name: _BuildConfig @@ -78,8 +82,10 @@ jobs: continueOnError: true condition: succeededOrFailed() - - publish: '$(Build.StagingDirectory)/BuildLogs' - artifact: $(Agent.JobName)_BuildLogs_Attempt$(System.JobAttempt) + - task: 1ES.PublishPipelineArtifact@1 displayName: Publish BuildLogs + inputs: + targetPath: $(Build.StagingDirectory)/BuildLogs + artifactName: $(Agent.JobName)_BuildLogs_Attempt$(System.JobAttempt) continueOnError: true condition: succeededOrFailed() diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build-pr.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build-pr.yml new file mode 100644 index 000000000..6e9c404c5 --- /dev/null +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build-pr.yml @@ -0,0 +1,147 @@ +# Builds a source-build tarball + +parameters: + # Dependent jobs that must be completed before this job will run + dependsOn: + + # Resource id of the installer build to retrieve source/product tarball's from + installerBuildResourceId: current + + # The following parameters aren't expected to be passed in rather they are used for encapsulation + # ----------------------------------------------------------------------------------------------- + alpine317Container: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.17 + centOSStream8Container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8 + centOSStream9Container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9 + debian11Arm64Container: mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-arm64v8 + fedora38Container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-38 + ubuntu2004Container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-20.04 + poolInternalAmd64: + name: NetCore1ESPool-Svc-Internal + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 + poolInternalAmd64PR: + name: NetCore1ESPool-Internal-XL + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 + poolInternalArm64: + name: Docker-Linux-Arm-Internal + poolPublicAmd64: + name: NetCore-Public-XL + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open + +jobs: +- template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball-pr.yml + parameters: + architecture: x64 + dependsOn: ${{ parameters.dependsOn }} + ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: + excludeSdkContentTests: true + installerBuildResourceId: ${{ parameters.installerBuildResourceId }} + matrix: + CentOSStream8-Online: + _BootstrapPrep: true + _Container: ${{ parameters.centOSStream8Container }} + _EnablePoison: false + _ExcludeOmniSharpTests: true + _OverrideDistroDisablingSha1: false + _RunOnline: true + _WithPreviousSDK: false + CentOSStream8-Offline: + _BootstrapPrep: true + _Container: ${{ parameters.centOSStream8Container }} + _EnablePoison: false + _ExcludeOmniSharpTests: true + _RunOnline: false + _WithPreviousSDK: false + ${{ if ne(variables['Build.Reason'], 'PullRequest') }}: + Alpine317-Offline: + _BootstrapPrep: true + _Container: ${{ parameters.alpine317Container }} + _EnablePoison: false + _ExcludeOmniSharpTests: true + _OverrideDistroDisablingSha1: false + _RunOnline: false + _WithPreviousSDK: false + CentOSStream8-WithPreviousSDK: + _BootstrapPrep: false + _Container: ${{ parameters.centOSStream8Container }} + _EnablePoison: false + _ExcludeOmniSharpTests: true + _RunOnline: false + _WithPreviousSDK: true + CentOSStream9-Offline: + _BootstrapPrep: true + _Container: ${{ parameters.centOSStream9Container }} + _EnablePoison: false + _ExcludeOmniSharpTests: false + _OverrideDistroDisablingSha1: true + _RunOnline: false + _WithPreviousSDK: false + Fedora38-Offline: + _BootstrapPrep: true + _Container: ${{ parameters.fedora38Container }} + _EnablePoison: true + _ExcludeOmniSharpTests: false + _OverrideDistroDisablingSha1: false + _RunOnline: false + _WithPreviousSDK: false + Ubuntu2004-Offline: + _BootstrapPrep: true + _Container: ${{ parameters.ubuntu2004Container }} + _EnablePoison: false + _ExcludeOmniSharpTests: false + _OverrideDistroDisablingSha1: false + _RunOnline: false + _WithPreviousSDK: false + name: Build_Tarball_x64 + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + ${{ parameters.poolPublicAmd64 }} + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + ${{ if in(variables['Build.Reason'], 'PullRequest') }}: + ${{ parameters.poolInternalAmd64PR }} + ${{ else }}: + ${{ parameters.poolInternalAmd64 }} + +- ${{ if and(eq(variables['System.TeamProject'], 'internal'), ne(variables['Build.Reason'], 'PullRequest')) }}: + - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball-pr.yml + parameters: + architecture: arm64 + dependsOn: ${{ parameters.dependsOn }} + installerBuildResourceId: ${{ parameters.installerBuildResourceId }} + matrix: + Debian11-Offline: + _BootstrapPrep: true + _Container: ${{ parameters.debian11Arm64Container }} + _EnablePoison: false + _ExcludeOmniSharpTests: false + _OverrideDistroDisablingSha1: false + _RunOnline: false + _WithPreviousSDK: false + name: Build_Tarball_arm64 + pool: ${{ parameters.poolInternalArm64 }} + +- ${{ if ne(variables['Build.Reason'], 'PullRequest') }}: + - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball-pr.yml + parameters: + architecture: x64 + # Always attempt to run the bootstrap leg (e.g. even when stage 1 tests fail) in order to get a complete assessment of the build status. + # The bootstrap build will shortcut if the stage 1 build failed. + condition: succeededOrFailed() + dependsOn: Build_Tarball_x64 + excludeSdkContentTests: true + installerBuildResourceId: ${{ parameters.installerBuildResourceId }} + matrix: + Fedora38-Offline: + _PreviousSourceBuildArtifact: Build_Tarball_x64 Fedora38-Offline_Artifacts + _Container: ${{ parameters.fedora38Container }} + _EnablePoison: false + _ExcludeOmniSharpTests: false + _OverrideDistroDisablingSha1: false + _RunOnline: false + _WithPreviousSDK: false + name: Build_Tarball_x64_Using_Previous + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + ${{ parameters.poolPublicAmd64 }} + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + ${{ parameters.poolInternalAmd64 }} + usePreviousArtifacts: true diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml index 307cb7307..f7f9cdb48 100644 --- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml @@ -17,15 +17,21 @@ parameters: ubuntu2004Container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-20.04 poolInternalAmd64: name: NetCore1ESPool-Svc-Internal - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 + image: 1es-ubuntu-2004 + os: linux poolInternalAmd64PR: name: NetCore1ESPool-Internal-XL - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 + image: 1es-ubuntu-2004 + os: linux poolInternalArm64: name: Docker-Linux-Arm-Internal + image: Mariner-2-Docker-ARM64 + os: linux + hostArchitecture: Arm64 poolPublicAmd64: name: NetCore-Public-XL - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open + image: 1es-ubuntu-2004-open + os: linux jobs: - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml @@ -123,7 +129,7 @@ jobs: - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml parameters: architecture: x64 - # Always attempt to run the bootstrap leg (e.g. even when stage 1 tests fail) in order to get a complete accessment of the build status. + # Always attempt to run the bootstrap leg (e.g. even when stage 1 tests fail) in order to get a complete assessment of the build status. # The bootstrap build will shortcut if the stage 1 build failed. condition: succeededOrFailed() dependsOn: Build_Tarball_x64 From 689d2d70212aae586d680a1fdeaa6fc084366220 Mon Sep 17 00:00:00 2001 From: Michael Yanni Date: Tue, 2 Apr 2024 15:03:19 -0700 Subject: [PATCH 507/535] [7.0.1xx] Migrate to 1ES templates for internal builds (#19188) Co-authored-by: dotnet-maestro[bot] Co-authored-by: Matt Thalman --- .vsts-ci.yml | 692 +++++++++--------- .vsts-pr.yml | 31 +- eng/build-pr.yml | 156 ++++ eng/build.yml | 14 +- eng/source-build-tarball-build-official.yml | 28 +- eng/source-build-tarball-build.yml | 14 - .../job/source-build-build-tarball-pr.yml | 252 +++++++ .../job/source-build-build-tarball.yml | 14 +- .../job/source-build-create-tarball-pr.yml | 85 +++ .../job/source-build-create-tarball.yml | 20 +- .../job/source-build-run-tarball-build-pr.yml | 147 ++++ .../job/source-build-run-tarball-build.yml | 14 +- 12 files changed, 1064 insertions(+), 403 deletions(-) create mode 100644 eng/build-pr.yml delete mode 100644 eng/source-build-tarball-build.yml create mode 100644 src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball-pr.yml create mode 100644 src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball-pr.yml create mode 100644 src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build-pr.yml diff --git a/.vsts-ci.yml b/.vsts-ci.yml index b28494424..3e729955e 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -1,3 +1,5 @@ +# Pipeline: https://dnceng.visualstudio.com/internal/_build?definitionId=286 + trigger: batch: true branches: @@ -26,7 +28,6 @@ variables: - group: DotNet-Installer-SDLValidation-Params - name: _PublishUsingPipelines value: true - # Default to running tests in PRs and public CI, but not in official builds - name: _WindowsTestArg value: '-test' @@ -37,357 +38,380 @@ variables: value: '' - name: _NonWindowsTestArg value: '' - - 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) +- name: DncEngPublicBuildPool + value: NetCore-Svc-Public +- name: DncEngInternalBuildPool + value: NetCore1ESPool-Svc-Internal +# Set the MicroBuild plugin installation directory to the agent temp directory to avoid SDL tool scanning. +- name: MicroBuildOutputFolderOverride + value: $(Agent.TempDirectory) -stages: -- stage: build - jobs: - - job: Publish_Build_Configuration - pool: - ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: NetCore-Svc-Public - demands: ImageOverride -equals windows.vs2019.amd64.open - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - name: NetCore1ESPool-Svc-Internal - demands: ImageOverride -equals windows.vs2019.amd64 - steps: - - publish: $(Build.SourcesDirectory)\eng\BuildConfiguration - artifact: BuildConfiguration - displayName: Publish Build Config - - template: /eng/build.yml - parameters: - agentOs: Windows_NT - pool: - ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: NetCore-Svc-Public - demands: ImageOverride -equals windows.vs2019.amd64.open - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - name: NetCore1ESPool-Svc-Internal - demands: ImageOverride -equals windows.vs2019.amd64 - timeoutInMinutes: 180 - strategy: - matrix: - # Public-only builds - ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: - Build_Release_x64: - _BuildConfig: Debug - _BuildArchitecture: x64 - _DOTNET_CLI_UI_LANGUAGE: '' - _AdditionalBuildParameters: '/p:PublishInternalAsset=true' - _TestArg: $(_WindowsTestArg) - # Internal-only builds - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - Build_Release_x64: - _BuildConfig: Release - _BuildArchitecture: x64 - _DOTNET_CLI_UI_LANGUAGE: '' - _AdditionalBuildParameters: '/p:PublishInternalAsset=true' - _TestArg: $(_WindowsTestArg) - Build_Release_x86: - _BuildConfig: Release - _BuildArchitecture: x86 - _DOTNET_CLI_UI_LANGUAGE: '' - _AdditionalBuildParameters: '' - _TestArg: $(_WindowsTestArg) - Build_Release_arm64: - _BuildConfig: Release - _BuildArchitecture: arm64 - _DOTNET_CLI_UI_LANGUAGE: '' - _AdditionalBuildParameters: '' - # Never run tests on arm64 - _TestArg: '' +resources: + repositories: + - repository: 1esPipelines + type: git + name: 1ESPipelineTemplates/1ESPipelineTemplates + ref: refs/tags/release - - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - template: /eng/build.yml - parameters: - agentOs: Windows_NT +extends: + ${{ if notin(variables['Build.Reason'], 'PullRequest') }}: + template: v1/1ES.Official.PipelineTemplate.yml@1esPipelines + ${{ else }}: + template: v1/1ES.Unofficial.PipelineTemplate.yml@1esPipelines + parameters: + containers: + fedora38: + image: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-38 + sdl: + sourceAnalysisPool: + name: $(DncEngInternalBuildPool) + image: 1es-windows-2019 + os: windows + stages: + - stage: build + jobs: + # Build Retry Configuration + - job: Publish_Build_Configuration pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + name: $(DncEngPublicBuildPool) + image: 1es-windows-2019-open + os: windows ${{ if eq(variables['System.TeamProject'], 'internal') }}: - name: NetCore1ESPool-Svc-Internal - demands: ImageOverride -equals windows.vs2019.amd64 - timeoutInMinutes: 180 - strategy: - matrix: - Build_Release_x64: - _BuildConfig: Release - _BuildArchitecture: x64 - _DOTNET_CLI_UI_LANGUAGE: '' - _AdditionalBuildParameters: '/p:PublishInternalAsset=true' - # Never run tests on PGO bits - _TestArg: '' - Build_Release_x86: - _BuildConfig: Release - _BuildArchitecture: x86 - _DOTNET_CLI_UI_LANGUAGE: '' - _AdditionalBuildParameters: '' - _TestArg: '' - Build_Release_arm64: - _BuildConfig: Release - _BuildArchitecture: arm64 - _DOTNET_CLI_UI_LANGUAGE: '' - _AdditionalBuildParameters: '' - # Never run tests on arm64 - _TestArg: '' - pgoInstrument: true + name: $(DncEngInternalBuildPool) + image: 1es-windows-2019 + os: windows + steps: + - task: 1ES.PublishPipelineArtifact@1 + displayName: Publish Build Config + inputs: + targetPath: $(Build.SourcesDirectory)\eng\BuildConfiguration + artifactName: BuildConfiguration + - template: /eng/build.yml@self + parameters: + agentOs: Windows_NT + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + name: $(DncEngPublicBuildPool) + image: 1es-windows-2019-open + os: windows + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: $(DncEngInternalBuildPool) + image: 1es-windows-2019 + os: windows + timeoutInMinutes: 180 + strategy: + matrix: + # Public-only builds + ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: + Build_Release_x64: + _BuildConfig: Debug + _BuildArchitecture: x64 + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '/p:PublishInternalAsset=true' + _TestArg: $(_WindowsTestArg) + # Internal-only builds + ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + Build_Release_x64: + _BuildConfig: Release + _BuildArchitecture: x64 + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '/p:PublishInternalAsset=true' + _TestArg: $(_WindowsTestArg) + Build_Release_x86: + _BuildConfig: Release + _BuildArchitecture: x86 + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '' + _TestArg: $(_WindowsTestArg) + Build_Release_arm64: + _BuildConfig: Release + _BuildArchitecture: arm64 + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '' + # Never run tests on arm64 + _TestArg: '' - - template: /eng/build.yml - parameters: - agentOs: Linux - pool: - ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: NetCore-Svc-Public - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - name: NetCore1ESPool-Svc-Internal - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 - timeoutInMinutes: 180 - strategy: - matrix: - ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: - Build_Ubuntu_18_04_Debug_x64: - _BuildConfig: Debug - _DockerParameter: '--docker ubuntu.18.04' - _LinuxPortable: '--linux-portable' - _RuntimeIdentifier: '' - _BuildArchitecture: 'x64' - _TestArg: $(_NonWindowsTestArg) - Build_Fedora_36_Debug_x64: - _BuildConfig: Debug - _DockerParameter: '--docker fedora.36' - _LinuxPortable: '--linux-portable' - _RuntimeIdentifier: '' - _BuildArchitecture: 'x64' - _TestArg: $(_NonWindowsTestArg) - Build_CentOS_7_Debug_x64: - _BuildConfig: Debug - _DockerParameter: '--docker centos' - _LinuxPortable: '' - _RuntimeIdentifier: '' - _BuildArchitecture: 'x64' - _TestArg: $(_NonWindowsTestArg) - Build_Debian_11_Debug_x64: - _BuildConfig: Debug - _DockerParameter: '--docker debian' - _LinuxPortable: '' - _RuntimeIdentifier: '' - _BuildArchitecture: 'x64' - _AdditionalBuildParameters: '/p:BuildSdkDeb=true' - _TestArg: $(_NonWindowsTestArg) - Build_Arm64_Debug: - _BuildConfig: Debug - _DockerParameter: '' - _LinuxPortable: '--linux-portable' - _RuntimeIdentifier: '--runtime-id linux-arm64' - _BuildArchitecture: 'arm64' - # Never run tests on arm64 - _TestArg: '' - Build_Linux_musl_Debug_x64: - _BuildConfig: Debug - _DockerParameter: '--docker alpine.3.15' - _LinuxPortable: '' - _RuntimeIdentifier: '--runtime-id linux-musl-x64' - _BuildArchitecture: 'x64' - # Pass in HostOSName when running on alpine - _AdditionalBuildParameters: '/p:HostOSName="linux-musl"' - _TestArg: $(_NonWindowsTestArg) - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - Build_Arm_Release: - _BuildConfig: Release - _DockerParameter: '' - _LinuxPortable: '--linux-portable' - _RuntimeIdentifier: '--runtime-id linux-arm' - _BuildArchitecture: 'arm' - # Never run tests on arm - _TestArg: '' - Build_Arm64_Release: - _BuildConfig: Release - _DockerParameter: '' - _LinuxPortable: '--linux-portable' - _RuntimeIdentifier: '--runtime-id linux-arm64' - _BuildArchitecture: 'arm64' - # Never run tests on arm64 - _TestArg: '' - Build_Linux_musl_Release_arm: - _BuildConfig: Release - # linux-musl-arm cross gen depends on glibc 2.27 (this OS has it) - _DockerParameter: '--docker ubuntu.18.04' - _LinuxPortable: '' - _RuntimeIdentifier: '--runtime-id linux-musl-arm' - _BuildArchitecture: 'arm' - _AdditionalBuildParameters: '/p:OSName="linux-musl"' - # Never run tests on arm - _TestArg: '' - Build_Linux_musl_Release_arm64: - _BuildConfig: Release - _DockerParameter: '' - _LinuxPortable: '' - _RuntimeIdentifier: '--runtime-id linux-musl-arm64' - _BuildArchitecture: 'arm64' - _AdditionalBuildParameters: '/p:OSName="linux-musl"' - # Never run tests on arm64 - _TestArg: '' - Build_Linux_musl_Release_x64: - _BuildConfig: Release - _DockerParameter: '--docker alpine.3.15' - _LinuxPortable: '' - _RuntimeIdentifier: '--runtime-id linux-musl-x64' - _BuildArchitecture: 'x64' - # Pass in HostOSName when running on alpine - _AdditionalBuildParameters: '/p:HostOSName="linux-musl"' - Build_Linux_Portable_Deb_Release_x64: - _BuildConfig: Release - _DockerParameter: '--docker ubuntu.18.04' - _LinuxPortable: '--linux-portable' - _RuntimeIdentifier: '' - _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' - _TestArg: $(_NonWindowsTestArg) - Build_Linux_Portable_Rpm_Release_x64: - _BuildConfig: Release - _DockerParameter: '--docker centos' - _LinuxPortable: '--linux-portable' - _RuntimeIdentifier: '' - _BuildArchitecture: 'x64' - # Do not publish zips and tarballs. The linux-x64 binaries are - # already published by Build_LinuxPortable_Release_x64 - _AdditionalBuildParameters: '/p:PublishBinariesAndBadge=false' - _TestArg: $(_NonWindowsTestArg) - Build_Linux_Portable_Rpm_Release_Arm64: - _BuildConfig: Release - _DockerParameter: '--docker centos' - _LinuxPortable: '--linux-portable' - _RuntimeIdentifier: '--runtime-id linux-arm64' - _BuildArchitecture: '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' - # Never run tests on arm64 - _TestArg: '' - Build_LinuxPortable_Release_x64: - _BuildConfig: Release - _DockerParameter: '' - _LinuxPortable: '--linux-portable' - _RuntimeIdentifier: '' - _BuildArchitecture: 'x64' - _TestArg: $(_NonWindowsTestArg) + - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - template: /eng/build.yml@self + parameters: + agentOs: Windows_NT + pool: + name: $(DncEngInternalBuildPool) + image: 1es-windows-2019 + os: windows + timeoutInMinutes: 180 + strategy: + matrix: + Build_Release_x64: + _BuildConfig: Release + _BuildArchitecture: x64 + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '/p:PublishInternalAsset=true' + # Never run tests on PGO bits + _TestArg: '' + Build_Release_x86: + _BuildConfig: Release + _BuildArchitecture: x86 + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '' + _TestArg: '' + Build_Release_arm64: + _BuildConfig: Release + _BuildArchitecture: arm64 + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '' + # Never run tests on arm64 + _TestArg: '' + pgoInstrument: true - - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - template: /eng/build.yml - parameters: - agentOs: Linux - pool: - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - name: NetCore1ESPool-Svc-Internal - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 - timeoutInMinutes: 180 - strategy: - matrix: - Build_LinuxPortable_Release_x64: - _BuildConfig: Release - _DockerParameter: '' - _LinuxPortable: '--linux-portable' - _RuntimeIdentifier: '' - _BuildArchitecture: 'x64' - _TestArg: '' - Build_Release_arm64: - _BuildConfig: Release - _BuildArchitecture: arm64 - _DOTNET_CLI_UI_LANGUAGE: '' - _AdditionalBuildParameters: '' - # Never run tests on arm64 - _TestArg: '' - pgoInstrument: true + - template: /eng/build.yml@self + parameters: + agentOs: Linux + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + name: $(DncEngPublicBuildPool) + image: 1es-ubuntu-2004-open + os: linux + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: $(DncEngInternalBuildPool) + image: 1es-ubuntu-2004 + os: linux + timeoutInMinutes: 180 + strategy: + matrix: + ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: + Build_Ubuntu_18_04_Debug_x64: + _BuildConfig: Debug + _DockerParameter: '--docker ubuntu.18.04' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _TestArg: $(_NonWindowsTestArg) + Build_Fedora_36_Debug_x64: + _BuildConfig: Debug + _DockerParameter: '--docker fedora.36' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _TestArg: $(_NonWindowsTestArg) + Build_CentOS_7_Debug_x64: + _BuildConfig: Debug + _DockerParameter: '--docker centos' + _LinuxPortable: '' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _TestArg: $(_NonWindowsTestArg) + Build_Debian_11_Debug_x64: + _BuildConfig: Debug + _DockerParameter: '--docker debian' + _LinuxPortable: '' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _AdditionalBuildParameters: '/p:BuildSdkDeb=true' + _TestArg: $(_NonWindowsTestArg) + Build_Arm64_Debug: + _BuildConfig: Debug + _DockerParameter: '' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '--runtime-id linux-arm64' + _BuildArchitecture: 'arm64' + # Never run tests on arm64 + _TestArg: '' + Build_Linux_musl_Debug_x64: + _BuildConfig: Debug + _DockerParameter: '--docker alpine.3.15' + _LinuxPortable: '' + _RuntimeIdentifier: '--runtime-id linux-musl-x64' + _BuildArchitecture: 'x64' + # Pass in HostOSName when running on alpine + _AdditionalBuildParameters: '/p:HostOSName="linux-musl"' + _TestArg: $(_NonWindowsTestArg) + ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + Build_Arm_Release: + _BuildConfig: Release + _DockerParameter: '' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '--runtime-id linux-arm' + _BuildArchitecture: 'arm' + # Never run tests on arm + _TestArg: '' + Build_Arm64_Release: + _BuildConfig: Release + _DockerParameter: '' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '--runtime-id linux-arm64' + _BuildArchitecture: 'arm64' + # Never run tests on arm64 + _TestArg: '' + Build_Linux_musl_Release_arm: + _BuildConfig: Release + # linux-musl-arm cross gen depends on glibc 2.27 (this OS has it) + _DockerParameter: '--docker ubuntu.18.04' + _LinuxPortable: '' + _RuntimeIdentifier: '--runtime-id linux-musl-arm' + _BuildArchitecture: 'arm' + _AdditionalBuildParameters: '/p:OSName="linux-musl"' + # Never run tests on arm + _TestArg: '' + Build_Linux_musl_Release_arm64: + _BuildConfig: Release + _DockerParameter: '' + _LinuxPortable: '' + _RuntimeIdentifier: '--runtime-id linux-musl-arm64' + _BuildArchitecture: 'arm64' + _AdditionalBuildParameters: '/p:OSName="linux-musl"' + # Never run tests on arm64 + _TestArg: '' + Build_Linux_musl_Release_x64: + _BuildConfig: Release + _DockerParameter: '--docker alpine.3.15' + _LinuxPortable: '' + _RuntimeIdentifier: '--runtime-id linux-musl-x64' + _BuildArchitecture: 'x64' + # Pass in HostOSName when running on alpine + _AdditionalBuildParameters: '/p:HostOSName="linux-musl"' + Build_Linux_Portable_Deb_Release_x64: + _BuildConfig: Release + _DockerParameter: '--docker ubuntu.18.04' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '' + _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' + _TestArg: $(_NonWindowsTestArg) + Build_Linux_Portable_Rpm_Release_x64: + _BuildConfig: Release + _DockerParameter: '--docker centos' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + # Do not publish zips and tarballs. The linux-x64 binaries are + # already published by Build_LinuxPortable_Release_x64 + _AdditionalBuildParameters: '/p:PublishBinariesAndBadge=false' + _TestArg: $(_NonWindowsTestArg) + Build_Linux_Portable_Rpm_Release_Arm64: + _BuildConfig: Release + _DockerParameter: '--docker centos' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '--runtime-id linux-arm64' + _BuildArchitecture: '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' + # Never run tests on arm64 + _TestArg: '' + Build_LinuxPortable_Release_x64: + _BuildConfig: Release + _DockerParameter: '' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _TestArg: $(_NonWindowsTestArg) - - template: /eng/build.yml - parameters: - agentOs: Darwin - pool: - vmImage: 'macOS-latest' - timeoutInMinutes: 180 - strategy: - matrix: - Build_Release_x64: - _BuildConfig: Release - _RuntimeIdentifier: '' - _BuildArchitecture: 'x64' - _TestArg: $(_NonWindowsTestArg) - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - Build_Release_arm64: - _BuildConfig: Release - _RuntimeIdentifier: '--runtime-id osx-arm64' - _BuildArchitecture: 'arm64' - # Never run tests on arm64 - _TestArg: '' + - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - template: /eng/build.yml@self + parameters: + agentOs: Linux + pool: + name: $(DncEngInternalBuildPool) + image: 1es-ubuntu-2004 + os: linux + timeoutInMinutes: 180 + strategy: + matrix: + Build_LinuxPortable_Release_x64: + _BuildConfig: Release + _DockerParameter: '' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _TestArg: '' + Build_Release_arm64: + _BuildConfig: Release + _BuildArchitecture: arm64 + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '' + # Never run tests on arm64 + _TestArg: '' + pgoInstrument: true - - template: /eng/common/templates/jobs/source-build.yml + - template: /eng/build.yml@self + parameters: + agentOs: Darwin + pool: + name: Azure Pipelines + image: macOS-latest + os: macOS + timeoutInMinutes: 180 + strategy: + matrix: + Build_Release_x64: + _BuildConfig: Release + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _TestArg: $(_NonWindowsTestArg) + ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + Build_Release_arm64: + _BuildConfig: Release + _RuntimeIdentifier: '--runtime-id osx-arm64' + _BuildArchitecture: 'arm64' + # Never run tests on arm64 + _TestArg: '' - - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml + - template: /eng/common/templates-official/jobs/source-build.yml@self - - ${{ if in(variables['Build.Reason'], 'PullRequest') }}: - - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml - parameters: - dependsOn: Source_Build_Create_Tarball + - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml@self - # https://github.com/dotnet/core-sdk/issues/248 - # - template: /eng/build.yml - # parameters: - # agentOs: FreeBSD - # queue: - # name: dnceng-freebsd-internal - # timeoutInMinutes: 180 - # matrix: - # Build_Release: - # _BuildConfig: Release - # _BuildArchitecture: 'x64' - # _AdditionalBuildParameters: '/p:DisableSourceLink=true /p:DISABLE_CROSSGEN=true' + - ${{ if in(variables['Build.Reason'], 'PullRequest') }}: + - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml@self + parameters: + dependsOn: Source_Build_Create_Tarball - - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - template: /eng/common/templates/job/publish-build-assets.yml - parameters: - dependsOn: - - Windows_NT - - Linux - - Darwin - - Source_Build_Managed - - Source_Build_Create_Tarball - - PGO_Linux - - PGO_Windows_NT - publishUsingPipelines: true - pool: - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - name: NetCore1ESPool-Svc-Internal - demands: ImageOverride -equals windows.vs2017.amd64 + - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - template: /eng/common/templates-official/job/publish-build-assets.yml@self + parameters: + dependsOn: + - Windows_NT + - Linux + - Darwin + - Source_Build_Managed + - Source_Build_Create_Tarball + - PGO_Linux + - PGO_Windows_NT + publishUsingPipelines: true + pool: + name: $(DncEngInternalBuildPool) + image: 1es-windows-2019 + os: windows - -- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - template: eng\common\templates\post-build\post-build.yml - parameters: - publishingInfraVersion: 3 - enableSymbolValidation: false - enableSigningValidation: false - enableNugetValidation: false - enableSourceLinkValidation: false - publishInstallersAndChecksums: true - SDLValidationParameters: - enable: false - params: ' -SourceToolsList @("policheck","credscan") - -TsaInstanceURL $(_TsaInstanceURL) - -TsaProjectName $(_TsaProjectName) - -TsaNotificationEmail $(_TsaNotificationEmail) - -TsaCodebaseAdmin $(_TsaCodebaseAdmin) - -TsaBugAreaPath $(_TsaBugAreaPath) - -TsaIterationPath $(_TsaIterationPath) - -TsaRepositoryName "dotnet-installer" - -TsaCodebaseName "dotnet-installer" - -TsaPublish $True' + - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - template: /eng/common/templates-official/post-build/post-build.yml@self + parameters: + publishingInfraVersion: 3 + enableSymbolValidation: false + enableSigningValidation: false + enableNugetValidation: false + enableSourceLinkValidation: false + publishInstallersAndChecksums: true + SDLValidationParameters: + enable: false + params: ' -SourceToolsList @("policheck","credscan") + -TsaInstanceURL $(_TsaInstanceURL) + -TsaProjectName $(_TsaProjectName) + -TsaNotificationEmail $(_TsaNotificationEmail) + -TsaCodebaseAdmin $(_TsaCodebaseAdmin) + -TsaBugAreaPath $(_TsaBugAreaPath) + -TsaIterationPath $(_TsaIterationPath) + -TsaRepositoryName "dotnet-installer" + -TsaCodebaseName "dotnet-installer" + -TsaPublish $True' diff --git a/.vsts-pr.yml b/.vsts-pr.yml index b28494424..e77ca881e 100644 --- a/.vsts-pr.yml +++ b/.vsts-pr.yml @@ -26,7 +26,6 @@ variables: - group: DotNet-Installer-SDLValidation-Params - name: _PublishUsingPipelines value: true - # Default to running tests in PRs and public CI, but not in official builds - name: _WindowsTestArg value: '-test' @@ -37,10 +36,8 @@ variables: value: '' - name: _NonWindowsTestArg value: '' - - name: _InternalRuntimeDownloadArgs value: '' - - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - group: DotNetBuilds storage account read tokens - name: _InternalRuntimeDownloadArgs @@ -63,7 +60,7 @@ stages: - publish: $(Build.SourcesDirectory)\eng\BuildConfiguration artifact: BuildConfiguration displayName: Publish Build Config - - template: /eng/build.yml + - template: /eng/build-pr.yml parameters: agentOs: Windows_NT pool: @@ -107,7 +104,7 @@ stages: _TestArg: '' - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - template: /eng/build.yml + - template: /eng/build-pr.yml parameters: agentOs: Windows_NT pool: @@ -139,7 +136,7 @@ stages: _TestArg: '' pgoInstrument: true - - template: /eng/build.yml + - template: /eng/build-pr.yml parameters: agentOs: Linux pool: @@ -283,7 +280,7 @@ stages: _TestArg: $(_NonWindowsTestArg) - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - template: /eng/build.yml + - template: /eng/build-pr.yml parameters: agentOs: Linux pool: @@ -309,7 +306,7 @@ stages: _TestArg: '' pgoInstrument: true - - template: /eng/build.yml + - template: /eng/build-pr.yml parameters: agentOs: Darwin pool: @@ -332,26 +329,13 @@ stages: - template: /eng/common/templates/jobs/source-build.yml - - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml + - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball-pr.yml - ${{ if in(variables['Build.Reason'], 'PullRequest') }}: - - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml + - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build-pr.yml parameters: dependsOn: Source_Build_Create_Tarball - # https://github.com/dotnet/core-sdk/issues/248 - # - template: /eng/build.yml - # parameters: - # agentOs: FreeBSD - # queue: - # name: dnceng-freebsd-internal - # timeoutInMinutes: 180 - # matrix: - # Build_Release: - # _BuildConfig: Release - # _BuildArchitecture: 'x64' - # _AdditionalBuildParameters: '/p:DisableSourceLink=true /p:DISABLE_CROSSGEN=true' - - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - template: /eng/common/templates/job/publish-build-assets.yml parameters: @@ -369,7 +353,6 @@ stages: name: NetCore1ESPool-Svc-Internal demands: ImageOverride -equals windows.vs2017.amd64 - - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - template: eng\common\templates\post-build\post-build.yml parameters: diff --git a/eng/build-pr.yml b/eng/build-pr.yml new file mode 100644 index 000000000..69d1e3f0f --- /dev/null +++ b/eng/build-pr.yml @@ -0,0 +1,156 @@ +parameters: + # Agent OS identifier and used as job name + agentOs: '' + + # Agent pool + pool: {} + + # Additional variables + variables: {} + + # Build strategy - matrix + strategy: {} + + # Job timeout + timeoutInMinutes: 180 + + # Publish using pipelines + enablePublishUsingPipelines: true + +phases: +- template: /eng/common/templates/job/job.yml + parameters: + ${{ if parameters.pgoInstrument }}: + name: PGO_${{ parameters.agentOs }} + ${{ if not(parameters.pgoInstrument) }}: + name: ${{ parameters.agentOs }} + timeoutInMinutes: ${{ parameters.timeoutInMinutes }} + ${{ if eq(parameters.agentOs, 'Windows_NT') }}: + enableMicrobuild: true + enablePublishBuildAssets: true + enablePublishUsingPipelines: ${{parameters.enablePublishUsingPipelines}} + enableTelemetry: true + helixRepo: dotnet/installer + pool: ${{ parameters.pool }} + ${{ if ne(parameters.strategy, '') }}: + strategy: ${{ parameters.strategy }} + workspace: + clean: all + + variables: + - _PgoInstrument: '' + - ${{ if eq(parameters.agentOs, 'Windows_NT') }}: + - _PackArg: '-pack' + - ${{ if ne(parameters.agentOs, 'Windows_NT') }}: + - _PackArg: '--pack' + - ${{ if parameters.pgoInstrument }}: + - _PgoInstrument: '/p:PgoInstrument=true' + - _PackArg: '' + - _AgentOSName: ${{ parameters.agentOs }} + - _TeamName: Roslyn-Project-System + - _SignType: test + - _BuildArgs: '/p:DotNetSignType=$(_SignType) $(_PgoInstrument)' + - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - group: DotNet-Symbol-Server-PATs + - group: DotNet-HelixApi-Access + - group: DotNet-Blob-Feed + - _DotNetPublishToBlobFeed: true + - _PushToVSFeed: true + - _SignType: real + - _BuildArgs: /p:OfficialBuildId=$(BUILD.BUILDNUMBER) + /p:DotNetSignType=$(_SignType) + /p:TeamName=$(_TeamName) + /p:DotNetPublishUsingPipelines=$(_PublishUsingPipelines) + $(_PgoInstrument) + + steps: + - checkout: self + clean: true + - ${{ if eq(parameters.agentOs, 'Windows_NT') }}: + - ${{ if ne(variables['System.TeamProject'], 'public') }}: + - task: PowerShell@2 + displayName: Setup Private Feeds Credentials + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1 + arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token + env: + Token: $(dn-bot-dnceng-artifact-feeds-rw) + - script: build.cmd + $(_TestArg) $(_PackArg) + -publish -ci -sign + -Configuration $(_BuildConfig) + -Architecture $(_BuildArchitecture) + $(_BuildArgs) + $(_AdditionalBuildParameters) + $(_InternalRuntimeDownloadArgs) + displayName: Build + env: + DOTNET_CLI_UI_LANGUAGE: $(_DOTNET_CLI_UI_LANGUAGE) + + - ${{ if ne(parameters.agentOs, 'Windows_NT') }}: + - ${{ if ne(variables['System.TeamProject'], 'public') }}: + - task: Bash@3 + displayName: Setup Private Feeds Credentials + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh + arguments: $(Build.SourcesDirectory)/NuGet.config $Token + env: + Token: $(dn-bot-dnceng-artifact-feeds-rw) + + - ${{ if eq(parameters.agentOs, 'Linux') }}: + - script: ./build.sh + $(_TestArg) $(_PackArg) + --publish --ci + --noprettyprint + --configuration $(_BuildConfig) + $(_DockerParameter) + --architecture $(_BuildArchitecture) + $(_LinuxPortable) + $(_RuntimeIdentifier) + $(_BuildArgs) + $(_AdditionalBuildParameters) + $(_InternalRuntimeDownloadArgs) + displayName: Build + + - ${{ if or(eq(parameters.agentOs, 'Darwin'), eq(parameters.agentOs, 'FreeBSD')) }}: + - script: ./build.sh + $(_TestArg) + --pack --publish --ci + --noprettyprint + --configuration $(_BuildConfig) + --architecture $(_BuildArchitecture) + $(_RuntimeIdentifier) + $(_BuildArgs) + $(_AdditionalBuildParameters) + $(_InternalRuntimeDownloadArgs) + displayName: Build + + - task: PublishTestResults@2 + displayName: Publish Test Results + inputs: + testRunner: XUnit + testResultsFiles: 'artifacts/TestResults/$(_BuildConfig)/*.xml' + testRunTitle: '$(_AgentOSName)_$(Agent.JobName)' + platform: '$(BuildPlatform)' + configuration: '$(_BuildConfig)' + condition: ne(variables['_TestArg'], '') + + - task: CopyFiles@2 + displayName: Gather Logs + inputs: + SourceFolder: '$(Build.SourcesDirectory)/artifacts' + Contents: | + log/$(_BuildConfig)/**/* + TestResults/$(_BuildConfig)/**/* + TargetFolder: '$(Build.ArtifactStagingDirectory)' + continueOnError: true + condition: always() + + - task: PublishBuildArtifacts@1 + displayName: Publish Logs to VSTS + inputs: + PathtoPublish: '$(Build.ArtifactStagingDirectory)' + ArtifactName: '$(_AgentOSName)_$(Agent.JobName)_$(Build.BuildNumber)' + publishLocation: Container + continueOnError: true + condition: always() diff --git a/eng/build.yml b/eng/build.yml index 35c829867..d486c47ec 100644 --- a/eng/build.yml +++ b/eng/build.yml @@ -18,7 +18,7 @@ parameters: enablePublishUsingPipelines: true phases: -- template: /eng/common/templates/job/job.yml +- template: /eng/common/templates-official/job/job.yml parameters: ${{ if parameters.pgoInstrument }}: name: PGO_${{ parameters.agentOs }} @@ -28,9 +28,6 @@ phases: ${{ if eq(parameters.agentOs, 'Windows_NT') }}: enableMicrobuild: true enablePublishBuildAssets: true - # Don't use built-in arcade logic for publishing artifacts and test results, as we manually do this and give better names - #enablePublishBuildArtifacts: true - #enablePublishTestResults: true enablePublishUsingPipelines: ${{parameters.enablePublishUsingPipelines}} enableTelemetry: true helixRepo: dotnet/installer @@ -49,12 +46,10 @@ phases: - ${{ if parameters.pgoInstrument }}: - _PgoInstrument: '/p:PgoInstrument=true' - _PackArg: '' - - _AgentOSName: ${{ parameters.agentOs }} - _TeamName: Roslyn-Project-System - _SignType: test - _BuildArgs: '/p:DotNetSignType=$(_SignType) $(_PgoInstrument)' - - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - group: DotNet-Symbol-Server-PATs - group: DotNet-HelixApi-Access @@ -101,6 +96,7 @@ phases: arguments: $(Build.SourcesDirectory)/NuGet.config $Token env: Token: $(dn-bot-dnceng-artifact-feeds-rw) + - ${{ if eq(parameters.agentOs, 'Linux') }}: - script: ./build.sh $(_TestArg) $(_PackArg) @@ -144,13 +140,13 @@ phases: inputs: SourceFolder: '$(Build.SourcesDirectory)/artifacts' Contents: | - log/$(_BuildConfig)/**/* - TestResults/$(_BuildConfig)/**/* + log/$(_BuildConfig)/**/* + TestResults/$(_BuildConfig)/**/* TargetFolder: '$(Build.ArtifactStagingDirectory)' continueOnError: true condition: always() - - task: PublishBuildArtifacts@1 + - task: 1ES.PublishBuildArtifacts@1 displayName: Publish Logs to VSTS inputs: PathtoPublish: '$(Build.ArtifactStagingDirectory)' diff --git a/eng/source-build-tarball-build-official.yml b/eng/source-build-tarball-build-official.yml index eb47706f8..7579bd547 100644 --- a/eng/source-build-tarball-build-official.yml +++ b/eng/source-build-tarball-build-official.yml @@ -1,5 +1,6 @@ trigger: none pr: none + resources: pipelines: - pipeline: installer-build-resource @@ -15,10 +16,25 @@ resources: - internal/release/*/7.0.1xx* stages: - build + repositories: + - repository: 1ESPipelineTemplates + type: git + name: 1ESPipelineTemplates/1ESPipelineTemplates + ref: refs/tags/release -stages: -- stage: build - jobs: - - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml - parameters: - installerBuildResourceId: installer-build-resource +extends: + template: v1/1ES.Official.PipelineTemplate.yml@1ESPipelineTemplates + parameters: + sdl: + sourceAnalysisPool: + name: NetCore1ESPool-Svc-Internal + image: 1es-windows-2022 + os: windows + customBuildTags: + - ES365AIMigrationTooling + stages: + - stage: build + jobs: + - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml@self + parameters: + installerBuildResourceId: installer-build-resource diff --git a/eng/source-build-tarball-build.yml b/eng/source-build-tarball-build.yml deleted file mode 100644 index da87d93cf..000000000 --- a/eng/source-build-tarball-build.yml +++ /dev/null @@ -1,14 +0,0 @@ -trigger: none -pr: none -resources: - pipelines: - - pipeline: installer-build-resource - source: installer - trigger: none - -stages: -- stage: build - jobs: - - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml - parameters: - installerBuildResourceId: installer-build-resource diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball-pr.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball-pr.yml new file mode 100644 index 000000000..abb9035fd --- /dev/null +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball-pr.yml @@ -0,0 +1,252 @@ +# Builds a source-build tarball + +parameters: + # Architecture to build + architecture: + + # Custom condition to apply to the job + condition: + + # Dependent jobs that must be completed before this job will run + dependsOn: + + # Skip running the SDK content smoke-tests + excludeSdkContentTests: false + + # Resource id of the installer build to retrieve source/product tarball's from + installerBuildResourceId: + + # Matrix to run jobs over + matrix: + + # Job name + name: + + # Agent pool to use + pool: + + # Build using the previous source-build artifacts + usePreviousArtifacts: false + +jobs: +- job: ${{ parameters.name }} + condition: ${{ parameters.condition }} + dependsOn: ${{ parameters.dependsOn }} + pool: ${{ parameters.pool }} + strategy: + matrix: ${{ parameters.matrix }} + timeoutInMinutes: 300 + variables: + - ${{ if ne(variables['System.TeamProject'], 'public') }}: + - group: AzureDevOps-Artifact-Feeds-Pats + - ${{ if eq(parameters.usePreviousArtifacts, 'true') }}: + - name: additionalBuildArgs + value: --with-sdk /tarball/.dotnet + - name: tarballDir + ${{ if eq(parameters.installerBuildResourceId, '') }}: + value: $(Build.SourcesDirectory) + ${{ else }}: + value: $(Build.StagingDirectory)/tarball + - name: installerSrcDir + ${{ if eq(parameters.installerBuildResourceId, '') }}: + value: $(Build.SourcesDirectory)/src/installer + ${{ else }}: + value: $(Build.SourcesDirectory) + workspace: + clean: all + + steps: + - checkout: self + clean: true + + - ${{ if ne(parameters.installerBuildResourceId, '') }}: + - download: ${{ parameters.installerBuildResourceId }} + artifact: BlobArtifacts + patterns: '**/dotnet-sdk-source*.tar.gz' + displayName: Download Source Tarball + + - script: | + set -x + + resourceIdPathSegment= + if [[ '${{ parameters.installerBuildResourceId }}' != 'current' ]]; then + resourceIdPathSegment='${{ parameters.installerBuildResourceId }}/' + fi + + mkdir -p "$(tarballDir)" + tarballFilePath="$(PIPELINE.WORKSPACE)/${resourceIdPathSegment}BlobArtifacts/dotnet-sdk-source*.tar.gz" + eval tar -ozxf "$tarballFilePath" -C "$(tarballDir)" + eval rm -f "$tarballFilePath" + displayName: Extract Tarball + + - script: cp $(installerSrcDir)/NuGet.config $(tarballDir)/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/online.NuGet.Config + displayName: Copy Test NuGet Config + + - ${{ if ne(parameters.excludeSdkContentTests, 'true') }}: + - download: ${{ parameters.installerBuildResourceId }} + artifact: BlobArtifacts + patterns: '**/dotnet-sdk-+([0-9]).+([0-9]).+([0-9])?(-@(preview|rc|rtm)*)-linux*-${{ parameters.architecture }}.tar.gz' + displayName: Download MSFT sdk Tarball + + - ${{ if eq(parameters.usePreviousArtifacts, 'true') }}: + - download: current + artifact: $(_PreviousSourceBuildArtifact) + patterns: '*.tar.gz' + displayName: Download Previous Source Build Artifacts + + - task: CopyFiles@2 + displayName: Copy Previous Source Build Artifacts + inputs: + SourceFolder: $(PIPELINE.WORKSPACE)/$(_PreviousSourceBuildArtifact) + Contents: '*.tar.gz' + TargetFolder: $(tarballDir)/packages/archive/ + + - script: | + set -euo pipefail + + sourceBuiltSDKUrl="https://dotnetcli.azureedge.net/source-built-artifacts/sdks/" + packageVersionsPath="$(Build.SourcesDirectory)/eng/Versions.props" + notFoundMessage="No source-built SDK found to download..." + + echo "Looking for source-built SDK to download..." + archiveVersionLine=`grep -m 1 "" "$packageVersionsPath" || :` + versionPattern="(.*)" + + if [[ $archiveVersionLine =~ $versionPattern ]]; then + filename="dotnet-sdk-${BASH_REMATCH[1]}-centos.8-x64.tar.gz" + archiveUrl="${sourceBuiltSDKUrl}${filename}" + downloadDir=$(mktemp -d) + (cd $downloadDir && curl --retry 5 -O $archiveUrl) + + mkdir $(tarballDir)/.dotnet + tar -xzf $downloadDir/$filename -C $(tarballDir)/.dotnet + rm -rf $downloadDir + else + echo "$notFoundMessage" + exit 1 + fi + + echo "##vso[task.setvariable variable=additionalBuildArgs]--with-sdk /tarball/.dotnet" + displayName: Setup Previously Source-Built SDK + condition: eq(variables._WithPreviousSDK, 'true') + + - script: | + set -x + + if [[ '${{ parameters.usePreviousArtifacts }}' != 'true' ]]; then + customPrepArgs= + if [[ '$(_BootstrapPrep)' == 'true' ]]; then + customPrepArgs='--bootstrap' + fi + + docker run --rm -v $(tarballDir):/tarball -w /tarball $(_Container) ./prep.sh ${customPrepArgs} + else + mkdir $(tarballDir)/.dotnet + tarballFilePath="$(tarballDir)/packages/archive/dotnet-sdk-*.tar.gz" + eval tar -ozxf "$tarballFilePath" -C "$(tarballDir)/.dotnet" + eval rm -f "$tarballFilePath" + fi + displayName: Prep Tarball + + - script: | + set -x + df -h + + customRunArgs= + customBuildArgs= + if [[ '$(_RunOnline)' == 'true' ]]; then + customBuildArgs='--online' + else + customRunArgs='--network none' + fi + + # See https://github.com/dotnet/source-build/issues/3712 + if [[ '$(_OverrideDistroDisablingSha1)' == 'true' ]]; then + customRunArgs="$customRunArgs -e OPENSSL_ENABLE_SHA1_SIGNATURES=1" + fi + + if [[ '$(_EnablePoison)' == 'true' ]]; then + customBuildArgs="$customBuildArgs --poison" + fi + + docker run --rm -v $(tarballDir):/tarball -w /tarball ${customRunArgs} $(_Container) ./build.sh --clean-while-building ${customBuildArgs} $(additionalBuildArgs) + displayName: Build Tarball + + - ${{ if ne(variables['System.TeamProject'], 'public') }}: + - task: Bash@3 + displayName: Setup Private Feeds Credentials + inputs: + filePath: $(installerSrcDir)/eng/common/SetupNugetSources.sh + arguments: $(tarballDir)/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/online.NuGet.Config $Token + env: + Token: $(dn-bot-dnceng-artifact-feeds-rw) + + - script: | + set -x + + dockerVolumeArgs="-v $(tarballDir):/tarball" + dockerEnvArgs="-e SMOKE_TESTS_EXCLUDE_OMNISHARP=$(_ExcludeOmniSharpTests) -e SMOKE_TESTS_WARN_SDK_CONTENT_DIFFS=true" + poisonArg='' + + if [[ '${{ parameters.excludeSdkContentTests}}' != 'true' ]]; then + dockerVolumeArgs+=" -v $(PIPELINE.WORKSPACE)/${{ parameters.installerBuildResourceId }}/BlobArtifacts/:/BlobArtifacts" + platform="linux" + docker run --rm $(_Container) /bin/sh -c "cat /etc/os-release | grep -q alpine" + if [[ $? == 0 ]]; then + platform="$platform-musl" + fi + msftSdkTarballName=$(find "$(PIPELINE.WORKSPACE)/${{ parameters.installerBuildResourceId }}/BlobArtifacts/" -name "dotnet-sdk-*-$platform-${{ parameters.architecture }}.tar.gz" -exec basename {} \;) + dockerEnvArgs+=" -e SMOKE_TESTS_MSFT_SDK_TARBALL_PATH=/BlobArtifacts/$msftSdkTarballName" + fi + + if [[ '$(_EnablePoison)' == 'true' ]]; then + poisonArg='--poison' + dockerEnvArgs+=" -e SMOKE_TESTS_WARN_POISON_DIFFS=true" + fi + + docker run --rm $dockerVolumeArgs -w /tarball $dockerEnvArgs $(_Container) ./build.sh $poisonArg --run-smoke-test $(additionalBuildArgs) -- /p:SmokeTestConsoleVerbosity=detailed + displayName: Run Tests + + # Don't use CopyFiles@2 as it encounters permissions issues because it indexes all files in the source directory graph. + - script: | + set -x + + targetFolder=$(Build.StagingDirectory)/BuildLogs/ + mkdir -p ${targetFolder} + + cd "$(tarballDir)" + find artifacts/ -type f -name "*.binlog" -exec cp {} --parents -t ${targetFolder} \; + find artifacts/ -type f -name "*.log" -exec cp {} --parents -t ${targetFolder} \; + find artifacts/prebuilt-report/ -exec cp {} --parents -t ${targetFolder} \; + find src/ -type f -name "*.binlog" -exec cp {} --parents -t ${targetFolder} \; + find src/ -type f -name "*.log" -exec cp {} --parents -t ${targetFolder} \; + find test/ -type f -name "*.binlog" -exec cp {} --parents -t ${targetFolder} \; + find test/ -type f -name "Updated*.diff" -exec cp {} --parents -t ${targetFolder} \; + find test/ -type f -name "Updated*.txt" -exec cp {} --parents -t ${targetFolder} \; + displayName: Prepare BuildLogs staging directory + continueOnError: true + condition: succeededOrFailed() + + - publish: '$(Build.StagingDirectory)/BuildLogs' + artifact: $(Agent.JobName)_BuildLogs_Attempt$(System.JobAttempt) + displayName: Publish BuildLogs + continueOnError: true + condition: succeededOrFailed() + + - task: PublishTestResults@2 + displayName: Publish Test Results + condition: succeededOrFailed() + continueOnError: true + inputs: + testRunner: vSTest + testResultsFiles: 'test/**/*.trx' + searchFolder: $(tarballDir) + mergeTestResults: true + publishRunAttachments: true + testRunTitle: SourceBuild_SmokeTests_$(Agent.JobName) + + - publish: '$(tarballDir)/artifacts/${{ parameters.architecture}}/Release/' + artifact: $(Agent.JobName)_Artifacts + displayName: Publish Artifacts + condition: succeededOrFailed() + continueOnError: true diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml index abb9035fd..aa3cf6b96 100644 --- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml @@ -227,9 +227,11 @@ jobs: continueOnError: true condition: succeededOrFailed() - - publish: '$(Build.StagingDirectory)/BuildLogs' - artifact: $(Agent.JobName)_BuildLogs_Attempt$(System.JobAttempt) + - task: 1ES.PublishPipelineArtifact@1 displayName: Publish BuildLogs + inputs: + targetPath: $(Build.StagingDirectory)/BuildLogs + artifactName: $(Agent.JobName)_BuildLogs_Attempt$(System.JobAttempt) continueOnError: true condition: succeededOrFailed() @@ -245,8 +247,10 @@ jobs: publishRunAttachments: true testRunTitle: SourceBuild_SmokeTests_$(Agent.JobName) - - publish: '$(tarballDir)/artifacts/${{ parameters.architecture}}/Release/' - artifact: $(Agent.JobName)_Artifacts + - task: 1ES.PublishPipelineArtifact@1 displayName: Publish Artifacts - condition: succeededOrFailed() + inputs: + targetPath: $(tarballDir)/artifacts/${{ parameters.architecture}}/Release/ + artifactName: $(Agent.JobName)_Artifacts continueOnError: true + condition: succeededOrFailed() diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball-pr.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball-pr.yml new file mode 100644 index 000000000..347f61cf8 --- /dev/null +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball-pr.yml @@ -0,0 +1,85 @@ +# Creates a source-build tarball + +jobs: +- job: Source_Build_Create_Tarball + container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-38 + displayName: Source-Build Create Tarball + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + ${{ if in(variables['Build.Reason'], 'PullRequest') }}: + name: NetCore-Public-XL + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open + ${{ else }}: + name: NetCore-Svc-Public + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + ${{ if in(variables['Build.Reason'], 'PullRequest') }}: + name: NetCore1ESPool-Internal-XL + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 + ${{ else }}: + name: NetCore1ESPool-Svc-Internal + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 + + variables: + - name: _BuildConfig + value: Release + + - ${{ if eq(variables['System.TeamProject'], 'internal') }}: + - group: DotNet-Source-Build-All-Orgs-Source-Access + workspace: + clean: all + + steps: + - ${{ if ne(variables['System.TeamProject'], 'public') }}: + - task: Bash@3 + displayName: Setup Private Feeds Credentials + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh + arguments: $(Build.SourcesDirectory)/NuGet.config $Token + env: + Token: $(dn-bot-dnceng-artifact-feeds-rw) + - script: | + set -x + df -h + + officialBuildArgs= + if [ '${{ and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}' = 'True' ]; then + officialBuildArgs='/p:OfficialBuildId=$(BUILD.BUILDNUMBER)' + 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 + + ./build.sh \ + --ci \ + --configuration $(_BuildConfig) \ + --publish \ + -bl \ + $officialBuildArgs \ + $internalRuntimeDownloadArgs \ + /p:DotNetPublishUsingPipelines=true \ + /p:ArcadeBuildTarball=true \ + /p:AzDoPat=$(dn-bot-all-orgs-build-rw-code-rw) + displayName: Create Tarball + + - task: CopyFiles@2 + displayName: Prepare BuildLogs staging directory + inputs: + Contents: | + **/*.log + **/*.binlog + TargetFolder: '$(Build.StagingDirectory)/BuildLogs' + CleanTargetFolder: true + continueOnError: true + condition: succeededOrFailed() + + - publish: '$(Build.StagingDirectory)/BuildLogs' + artifact: $(Agent.JobName)_BuildLogs_Attempt$(System.JobAttempt) + displayName: Publish BuildLogs + continueOnError: true + condition: succeededOrFailed() diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml index 347f61cf8..7cba0c4ea 100644 --- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml @@ -2,23 +2,27 @@ jobs: - job: Source_Build_Create_Tarball - container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-38 + container: fedora38 displayName: Source-Build Create Tarball pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: ${{ if in(variables['Build.Reason'], 'PullRequest') }}: name: NetCore-Public-XL - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open + image: 1es-ubuntu-2004-open + os: linux ${{ else }}: name: NetCore-Svc-Public - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open + image: 1es-ubuntu-2004-open + os: linux ${{ if eq(variables['System.TeamProject'], 'internal') }}: ${{ if in(variables['Build.Reason'], 'PullRequest') }}: name: NetCore1ESPool-Internal-XL - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 + image: 1es-ubuntu-2004 + os: linux ${{ else }}: name: NetCore1ESPool-Svc-Internal - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 + image: 1es-ubuntu-2004 + os: linux variables: - name: _BuildConfig @@ -78,8 +82,10 @@ jobs: continueOnError: true condition: succeededOrFailed() - - publish: '$(Build.StagingDirectory)/BuildLogs' - artifact: $(Agent.JobName)_BuildLogs_Attempt$(System.JobAttempt) + - task: 1ES.PublishPipelineArtifact@1 displayName: Publish BuildLogs + inputs: + targetPath: $(Build.StagingDirectory)/BuildLogs + artifactName: $(Agent.JobName)_BuildLogs_Attempt$(System.JobAttempt) continueOnError: true condition: succeededOrFailed() diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build-pr.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build-pr.yml new file mode 100644 index 000000000..6e9c404c5 --- /dev/null +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build-pr.yml @@ -0,0 +1,147 @@ +# Builds a source-build tarball + +parameters: + # Dependent jobs that must be completed before this job will run + dependsOn: + + # Resource id of the installer build to retrieve source/product tarball's from + installerBuildResourceId: current + + # The following parameters aren't expected to be passed in rather they are used for encapsulation + # ----------------------------------------------------------------------------------------------- + alpine317Container: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.17 + centOSStream8Container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8 + centOSStream9Container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9 + debian11Arm64Container: mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-arm64v8 + fedora38Container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-38 + ubuntu2004Container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-20.04 + poolInternalAmd64: + name: NetCore1ESPool-Svc-Internal + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 + poolInternalAmd64PR: + name: NetCore1ESPool-Internal-XL + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 + poolInternalArm64: + name: Docker-Linux-Arm-Internal + poolPublicAmd64: + name: NetCore-Public-XL + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open + +jobs: +- template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball-pr.yml + parameters: + architecture: x64 + dependsOn: ${{ parameters.dependsOn }} + ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: + excludeSdkContentTests: true + installerBuildResourceId: ${{ parameters.installerBuildResourceId }} + matrix: + CentOSStream8-Online: + _BootstrapPrep: true + _Container: ${{ parameters.centOSStream8Container }} + _EnablePoison: false + _ExcludeOmniSharpTests: true + _OverrideDistroDisablingSha1: false + _RunOnline: true + _WithPreviousSDK: false + CentOSStream8-Offline: + _BootstrapPrep: true + _Container: ${{ parameters.centOSStream8Container }} + _EnablePoison: false + _ExcludeOmniSharpTests: true + _RunOnline: false + _WithPreviousSDK: false + ${{ if ne(variables['Build.Reason'], 'PullRequest') }}: + Alpine317-Offline: + _BootstrapPrep: true + _Container: ${{ parameters.alpine317Container }} + _EnablePoison: false + _ExcludeOmniSharpTests: true + _OverrideDistroDisablingSha1: false + _RunOnline: false + _WithPreviousSDK: false + CentOSStream8-WithPreviousSDK: + _BootstrapPrep: false + _Container: ${{ parameters.centOSStream8Container }} + _EnablePoison: false + _ExcludeOmniSharpTests: true + _RunOnline: false + _WithPreviousSDK: true + CentOSStream9-Offline: + _BootstrapPrep: true + _Container: ${{ parameters.centOSStream9Container }} + _EnablePoison: false + _ExcludeOmniSharpTests: false + _OverrideDistroDisablingSha1: true + _RunOnline: false + _WithPreviousSDK: false + Fedora38-Offline: + _BootstrapPrep: true + _Container: ${{ parameters.fedora38Container }} + _EnablePoison: true + _ExcludeOmniSharpTests: false + _OverrideDistroDisablingSha1: false + _RunOnline: false + _WithPreviousSDK: false + Ubuntu2004-Offline: + _BootstrapPrep: true + _Container: ${{ parameters.ubuntu2004Container }} + _EnablePoison: false + _ExcludeOmniSharpTests: false + _OverrideDistroDisablingSha1: false + _RunOnline: false + _WithPreviousSDK: false + name: Build_Tarball_x64 + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + ${{ parameters.poolPublicAmd64 }} + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + ${{ if in(variables['Build.Reason'], 'PullRequest') }}: + ${{ parameters.poolInternalAmd64PR }} + ${{ else }}: + ${{ parameters.poolInternalAmd64 }} + +- ${{ if and(eq(variables['System.TeamProject'], 'internal'), ne(variables['Build.Reason'], 'PullRequest')) }}: + - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball-pr.yml + parameters: + architecture: arm64 + dependsOn: ${{ parameters.dependsOn }} + installerBuildResourceId: ${{ parameters.installerBuildResourceId }} + matrix: + Debian11-Offline: + _BootstrapPrep: true + _Container: ${{ parameters.debian11Arm64Container }} + _EnablePoison: false + _ExcludeOmniSharpTests: false + _OverrideDistroDisablingSha1: false + _RunOnline: false + _WithPreviousSDK: false + name: Build_Tarball_arm64 + pool: ${{ parameters.poolInternalArm64 }} + +- ${{ if ne(variables['Build.Reason'], 'PullRequest') }}: + - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball-pr.yml + parameters: + architecture: x64 + # Always attempt to run the bootstrap leg (e.g. even when stage 1 tests fail) in order to get a complete assessment of the build status. + # The bootstrap build will shortcut if the stage 1 build failed. + condition: succeededOrFailed() + dependsOn: Build_Tarball_x64 + excludeSdkContentTests: true + installerBuildResourceId: ${{ parameters.installerBuildResourceId }} + matrix: + Fedora38-Offline: + _PreviousSourceBuildArtifact: Build_Tarball_x64 Fedora38-Offline_Artifacts + _Container: ${{ parameters.fedora38Container }} + _EnablePoison: false + _ExcludeOmniSharpTests: false + _OverrideDistroDisablingSha1: false + _RunOnline: false + _WithPreviousSDK: false + name: Build_Tarball_x64_Using_Previous + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + ${{ parameters.poolPublicAmd64 }} + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + ${{ parameters.poolInternalAmd64 }} + usePreviousArtifacts: true diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml index 307cb7307..f7f9cdb48 100644 --- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml @@ -17,15 +17,21 @@ parameters: ubuntu2004Container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-20.04 poolInternalAmd64: name: NetCore1ESPool-Svc-Internal - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 + image: 1es-ubuntu-2004 + os: linux poolInternalAmd64PR: name: NetCore1ESPool-Internal-XL - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 + image: 1es-ubuntu-2004 + os: linux poolInternalArm64: name: Docker-Linux-Arm-Internal + image: Mariner-2-Docker-ARM64 + os: linux + hostArchitecture: Arm64 poolPublicAmd64: name: NetCore-Public-XL - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open + image: 1es-ubuntu-2004-open + os: linux jobs: - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml @@ -123,7 +129,7 @@ jobs: - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml parameters: architecture: x64 - # Always attempt to run the bootstrap leg (e.g. even when stage 1 tests fail) in order to get a complete accessment of the build status. + # Always attempt to run the bootstrap leg (e.g. even when stage 1 tests fail) in order to get a complete assessment of the build status. # The bootstrap build will shortcut if the stage 1 build failed. condition: succeededOrFailed() dependsOn: Build_Tarball_x64 From 7696697e0dd4b0a8fb58ede94b53bb5592d02da7 Mon Sep 17 00:00:00 2001 From: Michael Yanni Date: Tue, 2 Apr 2024 15:03:37 -0700 Subject: [PATCH 508/535] [6.0.4xx] Migrate to 1ES templates for internal builds (#19187) Co-authored-by: Matt Thalman --- .vsts-ci.yml | 802 +++++++++--------- .vsts-pr.yml | 35 +- eng/build-pr.yml | 166 ++++ eng/build.yml | 17 +- eng/source-build-tarball-build-official.yml | 28 +- eng/source-build-tarball-build.yml | 14 - .../job/source-build-build-tarball-pr.yml | 223 +++++ .../job/source-build-build-tarball.yml | 14 +- .../job/source-build-create-tarball-pr.yml | 85 ++ .../job/source-build-create-tarball.yml | 20 +- .../job/source-build-run-tarball-build-pr.yml | 132 +++ .../job/source-build-run-tarball-build.yml | 14 +- 12 files changed, 1084 insertions(+), 466 deletions(-) create mode 100644 eng/build-pr.yml delete mode 100644 eng/source-build-tarball-build.yml create mode 100644 src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball-pr.yml create mode 100644 src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball-pr.yml create mode 100644 src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build-pr.yml diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 0b653655f..9d7eb72c8 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -1,3 +1,5 @@ +# Pipeline: https://dnceng.visualstudio.com/internal/_build?definitionId=286 + trigger: batch: true branches: @@ -21,7 +23,6 @@ variables: - group: DotNet-Installer-SDLValidation-Params - name: _PublishUsingPipelines value: true - # Default to running tests in PRs and public CI, but not in official builds - name: _WindowsTestArg value: '-test' @@ -32,406 +33,427 @@ variables: value: '' - name: _NonWindowsTestArg value: '' - - 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) +- name: DncEngPublicBuildPool + value: NetCore-Svc-Public +- name: DncEngInternalBuildPool + value: NetCore1ESPool-Svc-Internal +# Set the MicroBuild plugin installation directory to the agent temp directory to avoid SDL tool scanning. +- name: MicroBuildOutputFolderOverride + value: $(Agent.TempDirectory) -stages: -- stage: build - jobs: - - job: Publish_Build_Configuration - pool: - ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: NetCore-Svc-Public - demands: ImageOverride -equals windows.vs2019.amd64.open - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - name: NetCore1ESPool-Svc-Internal - demands: ImageOverride -equals windows.vs2019.amd64 - steps: - - publish: $(Build.SourcesDirectory)\eng\BuildConfiguration - artifact: BuildConfiguration - displayName: Publish Build Config - - template: /eng/build.yml - parameters: - agentOs: Windows_NT - pool: - ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: NetCore-Svc-Public - demands: ImageOverride -equals windows.vs2019.amd64.open - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - name: NetCore1ESPool-Svc-Internal - demands: ImageOverride -equals windows.vs2019.amd64 - timeoutInMinutes: 180 - strategy: - matrix: - # Public-only builds - ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: - Build_Debug_x86: - _BuildConfig: Debug - _BuildArchitecture: x86 - _DOTNET_CLI_UI_LANGUAGE: '' - _AdditionalBuildParameters: '' - _TestArg: $(_WindowsTestArg) - Build_ES_Debug_x64: - _BuildConfig: Debug - _BuildArchitecture: x64 - _DOTNET_CLI_UI_LANGUAGE: es - _AdditionalBuildParameters: '' - _TestArg: '' - # Internal-only builds - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - Build_Release_x86: - _BuildConfig: Release - _BuildArchitecture: x86 - _DOTNET_CLI_UI_LANGUAGE: '' - _AdditionalBuildParameters: '' - _TestArg: $(_WindowsTestArg) - # Always run builds - Build_Release_x64: - _BuildConfig: Release - _BuildArchitecture: x64 - _DOTNET_CLI_UI_LANGUAGE: '' - _AdditionalBuildParameters: '/p:PublishInternalAsset=true' - _TestArg: $(_WindowsTestArg) - Build_Release_arm: - _BuildConfig: Release - _BuildArchitecture: arm - _DOTNET_CLI_UI_LANGUAGE: '' - _AdditionalBuildParameters: '' - # Never run tests on arm64 - _TestArg: '' - Build_Release_arm64: - _BuildConfig: Release - _BuildArchitecture: arm64 - _DOTNET_CLI_UI_LANGUAGE: '' - _AdditionalBuildParameters: '' - # Never run tests on arm64 - _TestArg: '' +resources: + repositories: + - repository: 1esPipelines + type: git + name: 1ESPipelineTemplates/1ESPipelineTemplates + ref: refs/tags/release - - template: /eng/build.yml - parameters: - agentOs: Windows_NT - pool: - ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: NetCore-Svc-Public - demands: ImageOverride -equals windows.vs2019.amd64.open - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - name: NetCore1ESPool-Svc-Internal - demands: ImageOverride -equals windows.vs2019.amd64 - timeoutInMinutes: 180 - strategy: - matrix: - # Always run builds - Build_Release_x64: - _BuildConfig: Release - _BuildArchitecture: x64 - _DOTNET_CLI_UI_LANGUAGE: '' - _AdditionalBuildParameters: '/p:PublishInternalAsset=true' - # Never run tests on PGO bits - _TestArg: '' - Build_Release_x86: - _BuildConfig: Release - _BuildArchitecture: x86 - _DOTNET_CLI_UI_LANGUAGE: '' - _AdditionalBuildParameters: '' - _TestArg: '' - pgoInstrument: true - - - template: /eng/build.yml - parameters: - agentOs: Linux - pool: - ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: NetCore-Svc-Public - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - name: NetCore1ESPool-Svc-Internal - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 - timeoutInMinutes: 180 - strategy: - matrix: - ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: - Build_Ubuntu_18_04_Debug_x64: - _BuildConfig: Debug - _DockerParameter: '--docker ubuntu.18.04' - _LinuxPortable: '--linux-portable' - _RuntimeIdentifier: '' - _BuildArchitecture: 'x64' - _TestArg: $(_NonWindowsTestArg) - Build_Fedora_29_Debug_x64: - _BuildConfig: Debug - _DockerParameter: '--docker fedora.29' - _LinuxPortable: '--linux-portable' - _RuntimeIdentifier: '' - _BuildArchitecture: 'x64' - _TestArg: $(_NonWindowsTestArg) - Build_CentOS_7_1_Debug_x64: - _BuildConfig: Debug - _DockerParameter: '--docker centos' - _LinuxPortable: '' - _RuntimeIdentifier: '' - _BuildArchitecture: 'x64' - _TestArg: $(_NonWindowsTestArg) - Build_Debian_11_Debug_x64: - _BuildConfig: Debug - _DockerParameter: '--docker debian' - _LinuxPortable: '' - _RuntimeIdentifier: '' - _BuildArchitecture: 'x64' - _AdditionalBuildParameters: '/p:BuildSdkDeb=true' - _TestArg: $(_NonWindowsTestArg) - Build_Rhel_7_2_Release_x64: - _BuildConfig: Release - _DockerParameter: '--docker rhel' - _LinuxPortable: '' - _RuntimeIdentifier: '' - _BuildArchitecture: 'x64' - _TestArg: $(_NonWindowsTestArg) - Build_Rhel_7_2_Release_Arm64: - _BuildConfig: Release - _DockerParameter: '--docker rhel' - _LinuxPortable: '' - _RuntimeIdentifier: '--runtime-id linux-arm64' - _BuildArchitecture: 'arm64' - # Never run tests on arm - _TestArg: '' - _AdditionalBuildParameters: '/p:CLIBUILD_SKIP_TESTS=true' - Build_Arm_Debug: - _BuildConfig: Debug - _DockerParameter: '' - _LinuxPortable: '--linux-portable' - _RuntimeIdentifier: '--runtime-id linux-arm' - _BuildArchitecture: 'arm' - # Never run tests on arm - _TestArg: '' - Build_Arm64_Debug: - _BuildConfig: Debug - _DockerParameter: '' - _LinuxPortable: '--linux-portable' - _RuntimeIdentifier: '--runtime-id linux-arm64' - _BuildArchitecture: 'arm64' - # Never run tests on arm64 - _TestArg: '' - Build_Linux_musl_Debug_arm: - _BuildConfig: Debug - # linux-musl-arm cross gen depends on glibc 2.27 (this OS has it) - _DockerParameter: '--docker ubuntu.18.04' - _LinuxPortable: '' - _RuntimeIdentifier: '--runtime-id linux-musl-arm' - _BuildArchitecture: 'arm' - _AdditionalBuildParameters: '/p:OSName="linux-musl"' - # Never run tests on arm - _TestArg: '' - Build_Linux_musl_Debug_arm64: - _BuildConfig: Debug - _DockerParameter: '' - _LinuxPortable: '' - _RuntimeIdentifier: '--runtime-id linux-musl-arm64' - _BuildArchitecture: 'arm64' - _AdditionalBuildParameters: '/p:OSName="linux-musl"' - # Never run tests on arm64 - _TestArg: '' - Build_Linux_musl_Debug_x64: - _BuildConfig: Debug - _DockerParameter: '--docker alpine.3.15' - _LinuxPortable: '' - _RuntimeIdentifier: '--runtime-id linux-musl-x64' - _BuildArchitecture: 'x64' - # Pass in HostOSName when running on alpine - _AdditionalBuildParameters: '/p:HostOSName="linux-musl"' - _TestArg: $(_NonWindowsTestArg) - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - Build_Arm_Release: - _BuildConfig: Release - _DockerParameter: '' - _LinuxPortable: '--linux-portable' - _RuntimeIdentifier: '--runtime-id linux-arm' - _BuildArchitecture: 'arm' - # Never run tests on arm - _TestArg: '' - Build_Arm64_Release: - _BuildConfig: Release - _DockerParameter: '' - _LinuxPortable: '--linux-portable' - _RuntimeIdentifier: '--runtime-id linux-arm64' - _BuildArchitecture: 'arm64' - # Never run tests on arm64 - _TestArg: '' - Build_Linux_musl_Release_arm: - _BuildConfig: Release - # linux-musl-arm cross gen depends on glibc 2.27 (this OS has it) - _DockerParameter: '--docker ubuntu.18.04' - _LinuxPortable: '' - _RuntimeIdentifier: '--runtime-id linux-musl-arm' - _BuildArchitecture: 'arm' - _AdditionalBuildParameters: '/p:OSName="linux-musl"' - # Never run tests on arm - _TestArg: '' - Build_Linux_musl_Release_arm64: - _BuildConfig: Release - _DockerParameter: '' - _LinuxPortable: '' - _RuntimeIdentifier: '--runtime-id linux-musl-arm64' - _BuildArchitecture: 'arm64' - _AdditionalBuildParameters: '/p:OSName="linux-musl"' - # Never run tests on arm64 - _TestArg: '' - Build_Linux_musl_Release_x64: - _BuildConfig: Release - _DockerParameter: '--docker alpine.3.15' - _LinuxPortable: '' - _RuntimeIdentifier: '--runtime-id linux-musl-x64' - _BuildArchitecture: 'x64' - # Pass in HostOSName when running on alpine - _AdditionalBuildParameters: '/p:HostOSName="linux-musl"' - Build_Linux_Portable_Deb_Release_x64: - _BuildConfig: Release - _DockerParameter: '--docker ubuntu.18.04' - _LinuxPortable: '--linux-portable' - _RuntimeIdentifier: '' - _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' - _TestArg: $(_NonWindowsTestArg) - Build_Linux_Portable_Rpm_Release_x64: - _BuildConfig: Release - _DockerParameter: '--docker rhel' - _LinuxPortable: '--linux-portable' - _RuntimeIdentifier: '' - _BuildArchitecture: 'x64' - # Do not publish zips and tarballs. The linux-x64 binaries are - # already published by Build_LinuxPortable_Release_x64 - _AdditionalBuildParameters: '/p:PublishBinariesAndBadge=false' - _TestArg: $(_NonWindowsTestArg) - Build_Linux_Portable_Rpm_Release_Arm64: - _BuildConfig: Release - _DockerParameter: '--docker rhel' - _LinuxPortable: '--linux-portable' - _RuntimeIdentifier: '--runtime-id linux-arm64' - _BuildArchitecture: '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' - # Never run tests on arm64 - _TestArg: '' - Build_LinuxPortable_Release_x64: - _BuildConfig: Release - _DockerParameter: '' - _LinuxPortable: '--linux-portable' - _RuntimeIdentifier: '' - _BuildArchitecture: 'x64' - _TestArg: $(_NonWindowsTestArg) - - - template: /eng/build.yml - parameters: - agentOs: Linux - pool: - ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: NetCore-Svc-Public - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - name: NetCore1ESPool-Svc-Internal - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 - timeoutInMinutes: 180 - strategy: - matrix: - # Always run builds - Build_LinuxPortable_Release_x64: - _BuildConfig: Release - _DockerParameter: '' - _LinuxPortable: '--linux-portable' - _RuntimeIdentifier: '' - _BuildArchitecture: 'x64' - _TestArg: '' - pgoInstrument: true - - - template: /eng/build.yml - parameters: - agentOs: Darwin - pool: - vmImage: 'macOS-latest' - timeoutInMinutes: 180 - strategy: - matrix: - Build_Release_x64: - _BuildConfig: Release - _RuntimeIdentifier: '' - _BuildArchitecture: 'x64' - _TestArg: $(_NonWindowsTestArg) - Build_Release_arm64: - _BuildConfig: Release - _RuntimeIdentifier: '--runtime-id osx-arm64' - _BuildArchitecture: 'arm64' - # Never run tests on arm64 - _TestArg: '' - - - template: /eng/common/templates/jobs/source-build.yml - - - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml - - # For .NET 6.0, source-build only supports 6.0.1xx. Disable tarball build validation in all other branches. - # - ${{ if in(variables['Build.Reason'], 'PullRequest') }}: - # - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml - # parameters: - # dependsOn: Source_Build_Create_Tarball - - # https://github.com/dotnet/core-sdk/issues/248 - # - template: /eng/build.yml - # parameters: - # agentOs: FreeBSD - # queue: - # name: dnceng-freebsd-internal - # timeoutInMinutes: 180 - # matrix: - # Build_Release: - # _BuildConfig: Release - # _BuildArchitecture: 'x64' - # _AdditionalBuildParameters: '/p:DisableSourceLink=true /p:DISABLE_CROSSGEN=true' - - - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - template: /eng/common/templates/job/publish-build-assets.yml - parameters: - dependsOn: - - Windows_NT - - Linux - - Darwin - - Source_Build_Managed - - Source_Build_Create_Tarball - - PGO_Linux - - PGO_Windows_NT - publishUsingPipelines: true +extends: + ${{ if notin(variables['Build.Reason'], 'PullRequest') }}: + template: v1/1ES.Official.PipelineTemplate.yml@1esPipelines + ${{ else }}: + template: v1/1ES.Unofficial.PipelineTemplate.yml@1esPipelines + parameters: + containers: + fedora38: + image: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-38 + sdl: + sourceAnalysisPool: + name: $(DncEngInternalBuildPool) + image: 1es-windows-2019 + os: windows + stages: + - stage: build + jobs: + # Build Retry Configuration + - job: Publish_Build_Configuration pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + name: $(DncEngPublicBuildPool) + image: 1es-windows-2019-open + os: windows ${{ if eq(variables['System.TeamProject'], 'internal') }}: - name: NetCore1ESPool-Svc-Internal - demands: ImageOverride -equals windows.vs2017.amd64 + name: $(DncEngInternalBuildPool) + image: 1es-windows-2019 + os: windows + steps: + - task: 1ES.PublishPipelineArtifact@1 + displayName: Publish Build Config + inputs: + targetPath: $(Build.SourcesDirectory)\eng\BuildConfiguration + artifactName: BuildConfiguration + - template: /eng/build.yml@self + parameters: + agentOs: Windows_NT + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + name: $(DncEngPublicBuildPool) + image: 1es-windows-2019-open + os: windows + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: $(DncEngInternalBuildPool) + image: 1es-windows-2019 + os: windows + timeoutInMinutes: 180 + strategy: + matrix: + # Public-only builds + ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: + Build_Debug_x86: + _BuildConfig: Debug + _BuildArchitecture: x86 + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '' + _TestArg: $(_WindowsTestArg) + Build_ES_Debug_x64: + _BuildConfig: Debug + _BuildArchitecture: x64 + _DOTNET_CLI_UI_LANGUAGE: es + _AdditionalBuildParameters: '' + _TestArg: '' + # Internal-only builds + ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + Build_Release_x86: + _BuildConfig: Release + _BuildArchitecture: x86 + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '' + _TestArg: $(_WindowsTestArg) + # Always run builds + Build_Release_x64: + _BuildConfig: Release + _BuildArchitecture: x64 + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '/p:PublishInternalAsset=true' + _TestArg: $(_WindowsTestArg) + Build_Release_arm: + _BuildConfig: Release + _BuildArchitecture: arm + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '' + # Never run tests on arm64 + _TestArg: '' + Build_Release_arm64: + _BuildConfig: Release + _BuildArchitecture: arm64 + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '' + # Never run tests on arm64 + _TestArg: '' + - template: /eng/build.yml@self + parameters: + agentOs: Windows_NT + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + name: $(DncEngPublicBuildPool) + image: 1es-windows-2019-open + os: windows + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: $(DncEngInternalBuildPool) + image: 1es-windows-2019 + os: windows + timeoutInMinutes: 180 + strategy: + matrix: + # Always run builds + Build_Release_x64: + _BuildConfig: Release + _BuildArchitecture: x64 + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '/p:PublishInternalAsset=true' + # Never run tests on PGO bits + _TestArg: '' + Build_Release_x86: + _BuildConfig: Release + _BuildArchitecture: x86 + _DOTNET_CLI_UI_LANGUAGE: '' + _AdditionalBuildParameters: '' + _TestArg: '' + pgoInstrument: true -- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - template: eng\common\templates\post-build\post-build.yml - parameters: - publishingInfraVersion: 3 - enableSymbolValidation: false - enableSigningValidation: false - enableNugetValidation: false - enableSourceLinkValidation: false - publishInstallersAndChecksums: true - SDLValidationParameters: - enable: false - params: ' -SourceToolsList @("policheck","credscan") - -TsaInstanceURL $(_TsaInstanceURL) - -TsaProjectName $(_TsaProjectName) - -TsaNotificationEmail $(_TsaNotificationEmail) - -TsaCodebaseAdmin $(_TsaCodebaseAdmin) - -TsaBugAreaPath $(_TsaBugAreaPath) - -TsaIterationPath $(_TsaIterationPath) - -TsaRepositoryName "dotnet-installer" - -TsaCodebaseName "dotnet-installer" - -TsaPublish $True' + - template: /eng/build.yml@self + parameters: + agentOs: Linux + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + name: $(DncEngPublicBuildPool) + image: 1es-ubuntu-2004-open + os: linux + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: $(DncEngInternalBuildPool) + image: 1es-ubuntu-2004 + os: linux + timeoutInMinutes: 180 + strategy: + matrix: + ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: + Build_Ubuntu_18_04_Debug_x64: + _BuildConfig: Debug + _DockerParameter: '--docker ubuntu.18.04' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _TestArg: $(_NonWindowsTestArg) + Build_Fedora_29_Debug_x64: + _BuildConfig: Debug + _DockerParameter: '--docker fedora.29' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _TestArg: $(_NonWindowsTestArg) + Build_CentOS_7_1_Debug_x64: + _BuildConfig: Debug + _DockerParameter: '--docker centos' + _LinuxPortable: '' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _TestArg: $(_NonWindowsTestArg) + Build_Debian_11_Debug_x64: + _BuildConfig: Debug + _DockerParameter: '--docker debian' + _LinuxPortable: '' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _AdditionalBuildParameters: '/p:BuildSdkDeb=true' + _TestArg: $(_NonWindowsTestArg) + Build_Rhel_7_2_Release_x64: + _BuildConfig: Release + _DockerParameter: '--docker rhel' + _LinuxPortable: '' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _TestArg: $(_NonWindowsTestArg) + Build_Rhel_7_2_Release_Arm64: + _BuildConfig: Release + _DockerParameter: '--docker rhel' + _LinuxPortable: '' + _RuntimeIdentifier: '--runtime-id linux-arm64' + _BuildArchitecture: 'arm64' + # Never run tests on arm + _TestArg: '' + _AdditionalBuildParameters: '/p:CLIBUILD_SKIP_TESTS=true' + Build_Arm_Debug: + _BuildConfig: Debug + _DockerParameter: '' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '--runtime-id linux-arm' + _BuildArchitecture: 'arm' + # Never run tests on arm + _TestArg: '' + Build_Arm64_Debug: + _BuildConfig: Debug + _DockerParameter: '' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '--runtime-id linux-arm64' + _BuildArchitecture: 'arm64' + # Never run tests on arm64 + _TestArg: '' + Build_Linux_musl_Debug_arm: + _BuildConfig: Debug + # linux-musl-arm cross gen depends on glibc 2.27 (this OS has it) + _DockerParameter: '--docker ubuntu.18.04' + _LinuxPortable: '' + _RuntimeIdentifier: '--runtime-id linux-musl-arm' + _BuildArchitecture: 'arm' + _AdditionalBuildParameters: '/p:OSName="linux-musl"' + # Never run tests on arm + _TestArg: '' + Build_Linux_musl_Debug_arm64: + _BuildConfig: Debug + _DockerParameter: '' + _LinuxPortable: '' + _RuntimeIdentifier: '--runtime-id linux-musl-arm64' + _BuildArchitecture: 'arm64' + _AdditionalBuildParameters: '/p:OSName="linux-musl"' + # Never run tests on arm64 + _TestArg: '' + Build_Linux_musl_Debug_x64: + _BuildConfig: Debug + _DockerParameter: '--docker alpine.3.15' + _LinuxPortable: '' + _RuntimeIdentifier: '--runtime-id linux-musl-x64' + _BuildArchitecture: 'x64' + # Pass in HostOSName when running on alpine + _AdditionalBuildParameters: '/p:HostOSName="linux-musl"' + _TestArg: $(_NonWindowsTestArg) + ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + Build_Arm_Release: + _BuildConfig: Release + _DockerParameter: '' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '--runtime-id linux-arm' + _BuildArchitecture: 'arm' + # Never run tests on arm + _TestArg: '' + Build_Arm64_Release: + _BuildConfig: Release + _DockerParameter: '' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '--runtime-id linux-arm64' + _BuildArchitecture: 'arm64' + # Never run tests on arm64 + _TestArg: '' + Build_Linux_musl_Release_arm: + _BuildConfig: Release + # linux-musl-arm cross gen depends on glibc 2.27 (this OS has it) + _DockerParameter: '--docker ubuntu.18.04' + _LinuxPortable: '' + _RuntimeIdentifier: '--runtime-id linux-musl-arm' + _BuildArchitecture: 'arm' + _AdditionalBuildParameters: '/p:OSName="linux-musl"' + # Never run tests on arm + _TestArg: '' + Build_Linux_musl_Release_arm64: + _BuildConfig: Release + _DockerParameter: '' + _LinuxPortable: '' + _RuntimeIdentifier: '--runtime-id linux-musl-arm64' + _BuildArchitecture: 'arm64' + _AdditionalBuildParameters: '/p:OSName="linux-musl"' + # Never run tests on arm64 + _TestArg: '' + Build_Linux_musl_Release_x64: + _BuildConfig: Release + _DockerParameter: '--docker alpine.3.15' + _LinuxPortable: '' + _RuntimeIdentifier: '--runtime-id linux-musl-x64' + _BuildArchitecture: 'x64' + # Pass in HostOSName when running on alpine + _AdditionalBuildParameters: '/p:HostOSName="linux-musl"' + Build_Linux_Portable_Deb_Release_x64: + _BuildConfig: Release + _DockerParameter: '--docker ubuntu.18.04' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '' + _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' + _TestArg: $(_NonWindowsTestArg) + Build_Linux_Portable_Rpm_Release_x64: + _BuildConfig: Release + _DockerParameter: '--docker rhel' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + # Do not publish zips and tarballs. The linux-x64 binaries are + # already published by Build_LinuxPortable_Release_x64 + _AdditionalBuildParameters: '/p:PublishBinariesAndBadge=false' + _TestArg: $(_NonWindowsTestArg) + Build_Linux_Portable_Rpm_Release_Arm64: + _BuildConfig: Release + _DockerParameter: '--docker rhel' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '--runtime-id linux-arm64' + _BuildArchitecture: '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' + # Never run tests on arm64 + _TestArg: '' + Build_LinuxPortable_Release_x64: + _BuildConfig: Release + _DockerParameter: '' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _TestArg: $(_NonWindowsTestArg) + + - template: /eng/build.yml@self + parameters: + agentOs: Linux + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + name: $(DncEngPublicBuildPool) + image: 1es-ubuntu-2004-open + os: linux + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: $(DncEngInternalBuildPool) + image: 1es-ubuntu-2004 + os: linux + timeoutInMinutes: 180 + strategy: + matrix: + # Always run builds + Build_LinuxPortable_Release_x64: + _BuildConfig: Release + _DockerParameter: '' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _TestArg: '' + pgoInstrument: true + + - template: /eng/build.yml@self + parameters: + agentOs: Darwin + pool: + name: Azure Pipelines + image: macOS-latest + os: macOS + timeoutInMinutes: 180 + strategy: + matrix: + Build_Release_x64: + _BuildConfig: Release + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _TestArg: $(_NonWindowsTestArg) + Build_Release_arm64: + _BuildConfig: Release + _RuntimeIdentifier: '--runtime-id osx-arm64' + _BuildArchitecture: 'arm64' + # Never run tests on arm64 + _TestArg: '' + + - template: /eng/common/templates-official/jobs/source-build.yml@self + + - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml@self + + - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - template: /eng/common/templates-official/job/publish-build-assets.yml@self + parameters: + dependsOn: + - Windows_NT + - Linux + - Darwin + - Source_Build_Managed + - Source_Build_Create_Tarball + - PGO_Linux + - PGO_Windows_NT + publishUsingPipelines: true + pool: + name: $(DncEngInternalBuildPool) + image: 1es-windows-2019 + os: windows + + - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - template: /eng/common/templates-official/post-build/post-build.yml@self + parameters: + publishingInfraVersion: 3 + enableSymbolValidation: false + enableSigningValidation: false + enableNugetValidation: false + enableSourceLinkValidation: false + publishInstallersAndChecksums: true + SDLValidationParameters: + enable: false + params: ' -SourceToolsList @("policheck","credscan") + -TsaInstanceURL $(_TsaInstanceURL) + -TsaProjectName $(_TsaProjectName) + -TsaNotificationEmail $(_TsaNotificationEmail) + -TsaCodebaseAdmin $(_TsaCodebaseAdmin) + -TsaBugAreaPath $(_TsaBugAreaPath) + -TsaIterationPath $(_TsaIterationPath) + -TsaRepositoryName "dotnet-installer" + -TsaCodebaseName "dotnet-installer" + -TsaPublish $True' diff --git a/.vsts-pr.yml b/.vsts-pr.yml index 0b653655f..42ca67ae9 100644 --- a/.vsts-pr.yml +++ b/.vsts-pr.yml @@ -21,7 +21,6 @@ variables: - group: DotNet-Installer-SDLValidation-Params - name: _PublishUsingPipelines value: true - # Default to running tests in PRs and public CI, but not in official builds - name: _WindowsTestArg value: '-test' @@ -32,10 +31,8 @@ variables: value: '' - name: _NonWindowsTestArg value: '' - - name: _InternalRuntimeDownloadArgs value: '' - - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - group: DotNetBuilds storage account read tokens - name: _InternalRuntimeDownloadArgs @@ -58,7 +55,7 @@ stages: - publish: $(Build.SourcesDirectory)\eng\BuildConfiguration artifact: BuildConfiguration displayName: Publish Build Config - - template: /eng/build.yml + - template: /eng/build-pr.yml parameters: agentOs: Windows_NT pool: @@ -115,7 +112,7 @@ stages: # Never run tests on arm64 _TestArg: '' - - template: /eng/build.yml + - template: /eng/build-pr.yml parameters: agentOs: Windows_NT pool: @@ -144,7 +141,7 @@ stages: _TestArg: '' pgoInstrument: true - - template: /eng/build.yml + - template: /eng/build-pr.yml parameters: agentOs: Linux pool: @@ -330,7 +327,7 @@ stages: _BuildArchitecture: 'x64' _TestArg: $(_NonWindowsTestArg) - - template: /eng/build.yml + - template: /eng/build-pr.yml parameters: agentOs: Linux pool: @@ -353,7 +350,7 @@ stages: _TestArg: '' pgoInstrument: true - - template: /eng/build.yml + - template: /eng/build-pr.yml parameters: agentOs: Darwin pool: @@ -375,26 +372,7 @@ stages: - template: /eng/common/templates/jobs/source-build.yml - - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml - - # For .NET 6.0, source-build only supports 6.0.1xx. Disable tarball build validation in all other branches. - # - ${{ if in(variables['Build.Reason'], 'PullRequest') }}: - # - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml - # parameters: - # dependsOn: Source_Build_Create_Tarball - - # https://github.com/dotnet/core-sdk/issues/248 - # - template: /eng/build.yml - # parameters: - # agentOs: FreeBSD - # queue: - # name: dnceng-freebsd-internal - # timeoutInMinutes: 180 - # matrix: - # Build_Release: - # _BuildConfig: Release - # _BuildArchitecture: 'x64' - # _AdditionalBuildParameters: '/p:DisableSourceLink=true /p:DISABLE_CROSSGEN=true' + - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball-pr.yml - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - template: /eng/common/templates/job/publish-build-assets.yml @@ -413,7 +391,6 @@ stages: name: NetCore1ESPool-Svc-Internal demands: ImageOverride -equals windows.vs2017.amd64 - - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - template: eng\common\templates\post-build\post-build.yml parameters: diff --git a/eng/build-pr.yml b/eng/build-pr.yml new file mode 100644 index 000000000..f05d66fa6 --- /dev/null +++ b/eng/build-pr.yml @@ -0,0 +1,166 @@ +parameters: + # Agent OS identifier and used as job name + agentOs: '' + + # Agent pool + pool: {} + + # Additional variables + variables: {} + + # Build strategy - matrix + strategy: {} + + # Job timeout + timeoutInMinutes: 180 + + # Publish using pipelines + enablePublishUsingPipelines: true + +phases: +- template: /eng/common/templates/job/job.yml + parameters: + ${{ if parameters.pgoInstrument }}: + name: PGO_${{ parameters.agentOs }} + ${{ if not(parameters.pgoInstrument) }}: + name: ${{ parameters.agentOs }} + timeoutInMinutes: ${{ parameters.timeoutInMinutes }} + ${{ if eq(parameters.agentOs, 'Windows_NT') }}: + enableMicrobuild: true + enablePublishBuildAssets: true + enablePublishUsingPipelines: ${{parameters.enablePublishUsingPipelines}} + enableTelemetry: true + helixRepo: dotnet/installer + pool: ${{ parameters.pool }} + ${{ if ne(parameters.strategy, '') }}: + strategy: ${{ parameters.strategy }} + workspace: + clean: all + + variables: + - _PgoInstrument: '' + - ${{ if eq(parameters.agentOs, 'Windows_NT') }}: + - _PackArg: '-pack' + - ${{ if ne(parameters.agentOs, 'Windows_NT') }}: + - _PackArg: '--pack' + - ${{ if parameters.pgoInstrument }}: + - _PgoInstrument: '/p:PgoInstrument=true' + - _PackArg: '' + - _AgentOSName: ${{ parameters.agentOs }} + - _TeamName: Roslyn-Project-System + - _SignType: test + - _BuildArgs: '/p:DotNetSignType=$(_SignType) $(_PgoInstrument)' + - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - group: DotNet-Symbol-Server-PATs + - group: DotNet-HelixApi-Access + - group: DotNet-Blob-Feed + - _DotNetPublishToBlobFeed: true + - _PushToVSFeed: true + - _SignType: real + - _BuildArgs: /p:OfficialBuildId=$(BUILD.BUILDNUMBER) + /p:DotNetSignType=$(_SignType) + /p:TeamName=$(_TeamName) + /p:DotNetPublishUsingPipelines=$(_PublishUsingPipelines) + $(_PgoInstrument) + + steps: + - checkout: self + clean: true + - ${{ if eq(parameters.agentOs, 'Windows_NT') }}: + - ${{ if ne(variables['System.TeamProject'], 'public') }}: + - task: PowerShell@2 + displayName: Setup Private Feeds Credentials + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1 + arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token + env: + Token: $(dn-bot-dnceng-artifact-feeds-rw) + - script: build.cmd + $(_TestArg) $(_PackArg) + -publish -ci -sign + -Configuration $(_BuildConfig) + -Architecture $(_BuildArchitecture) + $(_BuildArgs) + $(_AdditionalBuildParameters) + $(_InternalRuntimeDownloadArgs) + displayName: Build + env: + DOTNET_CLI_UI_LANGUAGE: $(_DOTNET_CLI_UI_LANGUAGE) + + - ${{ if ne(parameters.agentOs, 'Windows_NT') }}: + - ${{ if ne(variables['System.TeamProject'], 'public') }}: + - task: Bash@3 + displayName: Setup Private Feeds Credentials + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh + arguments: $(Build.SourcesDirectory)/NuGet.config $Token + env: + Token: $(dn-bot-dnceng-artifact-feeds-rw) + + - ${{ if eq(parameters.agentOs, 'Linux') }}: + - script: ./build.sh + $(_TestArg) $(_PackArg) + --publish --ci + --noprettyprint + --configuration $(_BuildConfig) + $(_DockerParameter) + --architecture $(_BuildArchitecture) + $(_LinuxPortable) + $(_RuntimeIdentifier) + $(_BuildArgs) + $(_AdditionalBuildParameters) + $(_InternalRuntimeDownloadArgs) + displayName: Build + + - ${{ if or(eq(parameters.agentOs, 'Darwin'), eq(parameters.agentOs, 'FreeBSD')) }}: + - script: ./build.sh + $(_TestArg) + --pack --publish --ci + --noprettyprint + --configuration $(_BuildConfig) + --architecture $(_BuildArchitecture) + $(_RuntimeIdentifier) + $(_BuildArgs) + $(_AdditionalBuildParameters) + $(_InternalRuntimeDownloadArgs) + displayName: Build + + - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.agentOs, 'Windows_NT'), ne(variables['PostBuildSign'], 'true')) }}: + - task: NuGetCommand@2 + displayName: Push Visual Studio NuPkgs + inputs: + command: push + packagesToPush: '$(Build.SourcesDirectory)/artifacts/packages/$(_BuildConfig)/NonShipping/VS.*.nupkg' + nuGetFeedType: external + publishFeedCredentials: 'DevDiv - VS package feed' + condition: and(succeeded(), ne(variables['PostBuildSign'], true), eq(variables['_PushToVSFeed'], 'true'), eq(variables['_DotNetPublishToBlobFeed'], 'true'), or(eq(variables['_BuildArchitecture'], 'x64'), eq(variables['_BuildArchitecture'], 'x86'))) + + - task: PublishTestResults@2 + displayName: Publish Test Results + inputs: + testRunner: XUnit + testResultsFiles: 'artifacts/TestResults/$(_BuildConfig)/*.xml' + testRunTitle: '$(_AgentOSName)_$(Agent.JobName)' + platform: '$(BuildPlatform)' + configuration: '$(_BuildConfig)' + condition: ne(variables['_TestArg'], '') + + - task: CopyFiles@2 + displayName: Gather Logs + inputs: + SourceFolder: '$(Build.SourcesDirectory)/artifacts' + Contents: | + log/$(_BuildConfig)/**/* + TestResults/$(_BuildConfig)/**/* + TargetFolder: '$(Build.ArtifactStagingDirectory)' + continueOnError: true + condition: always() + + - task: PublishBuildArtifacts@1 + displayName: Publish Logs to VSTS + inputs: + PathtoPublish: '$(Build.ArtifactStagingDirectory)' + ArtifactName: '$(_AgentOSName)_$(Agent.JobName)_$(Build.BuildNumber)' + publishLocation: Container + continueOnError: true + condition: always() diff --git a/eng/build.yml b/eng/build.yml index c23bbb11b..2ce873c3d 100644 --- a/eng/build.yml +++ b/eng/build.yml @@ -18,7 +18,7 @@ parameters: enablePublishUsingPipelines: true phases: -- template: /eng/common/templates/job/job.yml +- template: /eng/common/templates-official/job/job.yml parameters: ${{ if parameters.pgoInstrument }}: name: PGO_${{ parameters.agentOs }} @@ -28,9 +28,6 @@ phases: ${{ if eq(parameters.agentOs, 'Windows_NT') }}: enableMicrobuild: true enablePublishBuildAssets: true - # Don't use built-in arcade logic for publishing artifacts and test results, as we manually do this and give better names - #enablePublishBuildArtifacts: true - #enablePublishTestResults: true enablePublishUsingPipelines: ${{parameters.enablePublishUsingPipelines}} enableTelemetry: true helixRepo: dotnet/installer @@ -49,12 +46,10 @@ phases: - ${{ if parameters.pgoInstrument }}: - _PgoInstrument: '/p:PgoInstrument=true' - _PackArg: '' - - _AgentOSName: ${{ parameters.agentOs }} - _TeamName: Roslyn-Project-System - _SignType: test - _BuildArgs: '/p:DotNetSignType=$(_SignType) $(_PgoInstrument)' - - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - group: DotNet-Symbol-Server-PATs - group: DotNet-HelixApi-Access @@ -101,6 +96,7 @@ phases: arguments: $(Build.SourcesDirectory)/NuGet.config $Token env: Token: $(dn-bot-dnceng-artifact-feeds-rw) + - ${{ if eq(parameters.agentOs, 'Linux') }}: - script: ./build.sh $(_TestArg) $(_PackArg) @@ -130,10 +126,9 @@ phases: displayName: Build - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.agentOs, 'Windows_NT'), ne(variables['PostBuildSign'], 'true')) }}: - - task: NuGetCommand@2 + - task: 1ES.PublishNuget@1 displayName: Push Visual Studio NuPkgs inputs: - command: push packagesToPush: '$(Build.SourcesDirectory)/artifacts/packages/$(_BuildConfig)/NonShipping/VS.*.nupkg' nuGetFeedType: external publishFeedCredentials: 'DevDiv - VS package feed' @@ -154,13 +149,13 @@ phases: inputs: SourceFolder: '$(Build.SourcesDirectory)/artifacts' Contents: | - log/$(_BuildConfig)/**/* - TestResults/$(_BuildConfig)/**/* + log/$(_BuildConfig)/**/* + TestResults/$(_BuildConfig)/**/* TargetFolder: '$(Build.ArtifactStagingDirectory)' continueOnError: true condition: always() - - task: PublishBuildArtifacts@1 + - task: 1ES.PublishBuildArtifacts@1 displayName: Publish Logs to VSTS inputs: PathtoPublish: '$(Build.ArtifactStagingDirectory)' diff --git a/eng/source-build-tarball-build-official.yml b/eng/source-build-tarball-build-official.yml index 5d396baab..bef9853c4 100644 --- a/eng/source-build-tarball-build-official.yml +++ b/eng/source-build-tarball-build-official.yml @@ -1,5 +1,6 @@ trigger: none pr: none + resources: pipelines: - pipeline: installer-build-resource @@ -17,10 +18,25 @@ resources: - internal/release/6.0.4xx stages: - build + repositories: + - repository: 1ESPipelineTemplates + type: git + name: 1ESPipelineTemplates/1ESPipelineTemplates + ref: refs/tags/release -stages: -- stage: build - jobs: - - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml - parameters: - installerBuildResourceId: installer-build-resource +extends: + template: v1/1ES.Official.PipelineTemplate.yml@1ESPipelineTemplates + parameters: + sdl: + sourceAnalysisPool: + name: NetCore1ESPool-Svc-Internal + image: 1es-windows-2022 + os: windows + customBuildTags: + - ES365AIMigrationTooling + stages: + - stage: build + jobs: + - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml@self + parameters: + installerBuildResourceId: installer-build-resource diff --git a/eng/source-build-tarball-build.yml b/eng/source-build-tarball-build.yml deleted file mode 100644 index da87d93cf..000000000 --- a/eng/source-build-tarball-build.yml +++ /dev/null @@ -1,14 +0,0 @@ -trigger: none -pr: none -resources: - pipelines: - - pipeline: installer-build-resource - source: installer - trigger: none - -stages: -- stage: build - jobs: - - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml - parameters: - installerBuildResourceId: installer-build-resource diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball-pr.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball-pr.yml new file mode 100644 index 000000000..f5569e26b --- /dev/null +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball-pr.yml @@ -0,0 +1,223 @@ +# Builds a source-build tarball + +parameters: + # Architecture to build + architecture: + + # Custom condition to apply to the job + condition: + + # Dependent jobs that must be completed before this job will run + dependsOn: + + # Skip running the SDK content smoke-tests + excludeSdkContentTests: false + + # Resource id of the installer build to retrieve source/product tarball's from + installerBuildResourceId: + + # Matrix to run jobs over + matrix: + + # Job name + name: + + # Agent pool to use + pool: + + # Build using the previous source-build artifacts + usePreviousArtifacts: false + +jobs: +- job: ${{ parameters.name }} + condition: ${{ parameters.condition }} + dependsOn: ${{ parameters.dependsOn }} + pool: ${{ parameters.pool }} + strategy: + matrix: ${{ parameters.matrix }} + timeoutInMinutes: 300 + variables: + - ${{ if ne(variables['System.TeamProject'], 'public') }}: + - group: AzureDevOps-Artifact-Feeds-Pats + - ${{ if eq(parameters.usePreviousArtifacts, 'true') }}: + - name: additionalBuildArgs + value: --with-sdk /tarball/.dotnet + - name: tarballDir + ${{ if eq(parameters.installerBuildResourceId, '') }}: + value: $(Build.SourcesDirectory) + ${{ else }}: + value: $(Build.StagingDirectory)/tarball + - name: installerSrcDir + ${{ if eq(parameters.installerBuildResourceId, '') }}: + value: $(Build.SourcesDirectory)/src/installer + ${{ else }}: + value: $(Build.SourcesDirectory) + workspace: + clean: all + + steps: + - checkout: self + clean: true + + - ${{ if ne(parameters.installerBuildResourceId, '') }}: + - download: ${{ parameters.installerBuildResourceId }} + artifact: BlobArtifacts + patterns: '**/dotnet-sdk-source*.tar.gz' + displayName: Download Source Tarball + + - script: | + set -x + + resourceIdPathSegment= + if [[ '${{ parameters.installerBuildResourceId }}' != 'current' ]]; then + resourceIdPathSegment='${{ parameters.installerBuildResourceId }}/' + fi + + mkdir -p "$(tarballDir)" + tarballFilePath="$(PIPELINE.WORKSPACE)/${resourceIdPathSegment}BlobArtifacts/dotnet-sdk-source*.tar.gz" + eval tar -ozxf "$tarballFilePath" -C "$(tarballDir)" + eval rm -f "$tarballFilePath" + displayName: Extract Tarball + + - script: cp $(installerSrcDir)/NuGet.config $(tarballDir)/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/online.NuGet.Config + displayName: Copy Test NuGet Config + + - ${{ if ne(parameters.excludeSdkContentTests, 'true') }}: + - download: ${{ parameters.installerBuildResourceId }} + artifact: BlobArtifacts + patterns: '**/dotnet-sdk-+([0-9]).+([0-9]).+([0-9])?(-@(preview|rc|rtm)*)-linux*-${{ parameters.architecture }}.tar.gz' + displayName: Download MSFT sdk Tarball + + - ${{ if eq(parameters.usePreviousArtifacts, 'true') }}: + - download: current + artifact: $(_PreviousSourceBuildArtifact) + patterns: '*.tar.gz' + displayName: Download Previous Source Build Artifacts + + - task: CopyFiles@2 + displayName: Copy Previous Source Build Artifacts + inputs: + SourceFolder: $(PIPELINE.WORKSPACE)/$(_PreviousSourceBuildArtifact) + Contents: '*.tar.gz' + TargetFolder: $(tarballDir)/packages/archive/ + + - script: | + set -x + + if [[ '${{ parameters.usePreviousArtifacts }}' != 'true' ]]; then + customPrepArgs= + if [[ '$(_BootstrapPrep)' == 'true' ]]; then + customPrepArgs='--bootstrap' + fi + + docker run --rm -v $(tarballDir):/tarball -w /tarball $(_Container) ./prep.sh ${customPrepArgs} + else + mkdir $(tarballDir)/.dotnet + tarballFilePath="$(tarballDir)/packages/archive/dotnet-sdk-*.tar.gz" + eval tar -ozxf "$tarballFilePath" -C "$(tarballDir)/.dotnet" + eval rm -f "$tarballFilePath" + fi + displayName: Prep Tarball + + - script: | + set -x + df -h + + customRunArgs= + customBuildArgs= + if [[ '$(_RunOnline)' == 'true' ]]; then + customBuildArgs='--online' + else + customRunArgs='--network none' + fi + + # See https://github.com/dotnet/source-build/issues/3712 + if [[ '$(_OverrideDistroDisablingSha1)' == 'true' ]]; then + customRunArgs="$customRunArgs -e OPENSSL_ENABLE_SHA1_SIGNATURES=1" + fi + + if [[ '$(_EnablePoison)' == 'true' ]]; then + customBuildArgs="$customBuildArgs --poison" + fi + + docker run --rm -v $(tarballDir):/tarball -w /tarball ${customRunArgs} $(_Container) ./build.sh --clean-while-building ${customBuildArgs} $(additionalBuildArgs) + displayName: Build Tarball + + - ${{ if ne(variables['System.TeamProject'], 'public') }}: + - task: Bash@3 + displayName: Setup Private Feeds Credentials + inputs: + filePath: $(installerSrcDir)/eng/common/SetupNugetSources.sh + arguments: $(tarballDir)/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/online.NuGet.Config $Token + env: + Token: $(dn-bot-dnceng-artifact-feeds-rw) + + - script: | + set -x + + dockerVolumeArgs="-v $(tarballDir):/tarball" + dockerEnvArgs="-e SMOKE_TESTS_EXCLUDE_OMNISHARP=$(_ExcludeOmniSharpTests) -e SMOKE_TESTS_WARN_SDK_CONTENT_DIFFS=true" + poisonArg='' + + if [[ '${{ parameters.excludeSdkContentTests}}' != 'true' ]]; then + dockerVolumeArgs+=" -v $(PIPELINE.WORKSPACE)/${{ parameters.installerBuildResourceId }}/BlobArtifacts/:/BlobArtifacts" + platform="linux" + docker run --rm $(_Container) /bin/sh -c "cat /etc/os-release | grep -q alpine" + if [[ $? == 0 ]]; then + platform="$platform-musl" + fi + msftSdkTarballName=$(find "$(PIPELINE.WORKSPACE)/${{ parameters.installerBuildResourceId }}/BlobArtifacts/" -name "dotnet-sdk-*-$platform-${{ parameters.architecture }}.tar.gz" -exec basename {} \;) + dockerEnvArgs+=" -e SMOKE_TESTS_MSFT_SDK_TARBALL_PATH=/BlobArtifacts/$msftSdkTarballName" + fi + + if [[ '$(_EnablePoison)' == 'true' ]]; then + poisonArg='--poison' + dockerEnvArgs+=" -e SMOKE_TESTS_WARN_POISON_DIFFS=true" + fi + + docker run --rm $dockerVolumeArgs -w /tarball $dockerEnvArgs $(_Container) ./build.sh $poisonArg --run-smoke-test $(additionalBuildArgs) -- /p:SmokeTestConsoleVerbosity=detailed + displayName: Run Tests + + # Don't use CopyFiles@2 as it encounters permissions issues because it indexes all files in the source directory graph. + - script: | + set -x + + targetFolder=$(Build.StagingDirectory)/BuildLogs/ + mkdir -p ${targetFolder} + + cd "$(tarballDir)" + find artifacts/ -type f -name "*.binlog" -exec cp {} --parents -t ${targetFolder} \; + find artifacts/ -type f -name "*.log" -exec cp {} --parents -t ${targetFolder} \; + find artifacts/prebuilt-report/ -exec cp {} --parents -t ${targetFolder} \; + find src/ -type f -name "*.binlog" -exec cp {} --parents -t ${targetFolder} \; + find src/ -type f -name "*.log" -exec cp {} --parents -t ${targetFolder} \; + find test/ -type f -name "*.binlog" -exec cp {} --parents -t ${targetFolder} \; + find test/ -type f -name "Updated*.diff" -exec cp {} --parents -t ${targetFolder} \; + find test/ -type f -name "Updated*.txt" -exec cp {} --parents -t ${targetFolder} \; + displayName: Prepare BuildLogs staging directory + continueOnError: true + condition: succeededOrFailed() + + - publish: '$(Build.StagingDirectory)/BuildLogs' + artifact: $(Agent.JobName)_BuildLogs_Attempt$(System.JobAttempt) + displayName: Publish BuildLogs + continueOnError: true + condition: succeededOrFailed() + + - task: PublishTestResults@2 + displayName: Publish Test Results + condition: succeededOrFailed() + continueOnError: true + inputs: + testRunner: vSTest + testResultsFiles: 'test/**/*.trx' + searchFolder: $(tarballDir) + mergeTestResults: true + publishRunAttachments: true + testRunTitle: SourceBuild_SmokeTests_$(Agent.JobName) + + - publish: '$(tarballDir)/artifacts/${{ parameters.architecture}}/Release/' + artifact: $(Agent.JobName)_Artifacts + displayName: Publish Artifacts + condition: succeededOrFailed() + continueOnError: true diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml index f5569e26b..f13e9193b 100644 --- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml @@ -198,9 +198,11 @@ jobs: continueOnError: true condition: succeededOrFailed() - - publish: '$(Build.StagingDirectory)/BuildLogs' - artifact: $(Agent.JobName)_BuildLogs_Attempt$(System.JobAttempt) + - task: 1ES.PublishPipelineArtifact@1 displayName: Publish BuildLogs + inputs: + targetPath: $(Build.StagingDirectory)/BuildLogs + artifactName: $(Agent.JobName)_BuildLogs_Attempt$(System.JobAttempt) continueOnError: true condition: succeededOrFailed() @@ -216,8 +218,10 @@ jobs: publishRunAttachments: true testRunTitle: SourceBuild_SmokeTests_$(Agent.JobName) - - publish: '$(tarballDir)/artifacts/${{ parameters.architecture}}/Release/' - artifact: $(Agent.JobName)_Artifacts + - task: 1ES.PublishPipelineArtifact@1 displayName: Publish Artifacts - condition: succeededOrFailed() + inputs: + targetPath: $(tarballDir)/artifacts/${{ parameters.architecture}}/Release/ + artifactName: $(Agent.JobName)_Artifacts continueOnError: true + condition: succeededOrFailed() diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball-pr.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball-pr.yml new file mode 100644 index 000000000..347f61cf8 --- /dev/null +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball-pr.yml @@ -0,0 +1,85 @@ +# Creates a source-build tarball + +jobs: +- job: Source_Build_Create_Tarball + container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-38 + displayName: Source-Build Create Tarball + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + ${{ if in(variables['Build.Reason'], 'PullRequest') }}: + name: NetCore-Public-XL + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open + ${{ else }}: + name: NetCore-Svc-Public + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + ${{ if in(variables['Build.Reason'], 'PullRequest') }}: + name: NetCore1ESPool-Internal-XL + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 + ${{ else }}: + name: NetCore1ESPool-Svc-Internal + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 + + variables: + - name: _BuildConfig + value: Release + + - ${{ if eq(variables['System.TeamProject'], 'internal') }}: + - group: DotNet-Source-Build-All-Orgs-Source-Access + workspace: + clean: all + + steps: + - ${{ if ne(variables['System.TeamProject'], 'public') }}: + - task: Bash@3 + displayName: Setup Private Feeds Credentials + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh + arguments: $(Build.SourcesDirectory)/NuGet.config $Token + env: + Token: $(dn-bot-dnceng-artifact-feeds-rw) + - script: | + set -x + df -h + + officialBuildArgs= + if [ '${{ and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}' = 'True' ]; then + officialBuildArgs='/p:OfficialBuildId=$(BUILD.BUILDNUMBER)' + 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 + + ./build.sh \ + --ci \ + --configuration $(_BuildConfig) \ + --publish \ + -bl \ + $officialBuildArgs \ + $internalRuntimeDownloadArgs \ + /p:DotNetPublishUsingPipelines=true \ + /p:ArcadeBuildTarball=true \ + /p:AzDoPat=$(dn-bot-all-orgs-build-rw-code-rw) + displayName: Create Tarball + + - task: CopyFiles@2 + displayName: Prepare BuildLogs staging directory + inputs: + Contents: | + **/*.log + **/*.binlog + TargetFolder: '$(Build.StagingDirectory)/BuildLogs' + CleanTargetFolder: true + continueOnError: true + condition: succeededOrFailed() + + - publish: '$(Build.StagingDirectory)/BuildLogs' + artifact: $(Agent.JobName)_BuildLogs_Attempt$(System.JobAttempt) + displayName: Publish BuildLogs + continueOnError: true + condition: succeededOrFailed() diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml index 347f61cf8..7cba0c4ea 100644 --- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml @@ -2,23 +2,27 @@ jobs: - job: Source_Build_Create_Tarball - container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-38 + container: fedora38 displayName: Source-Build Create Tarball pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: ${{ if in(variables['Build.Reason'], 'PullRequest') }}: name: NetCore-Public-XL - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open + image: 1es-ubuntu-2004-open + os: linux ${{ else }}: name: NetCore-Svc-Public - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open + image: 1es-ubuntu-2004-open + os: linux ${{ if eq(variables['System.TeamProject'], 'internal') }}: ${{ if in(variables['Build.Reason'], 'PullRequest') }}: name: NetCore1ESPool-Internal-XL - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 + image: 1es-ubuntu-2004 + os: linux ${{ else }}: name: NetCore1ESPool-Svc-Internal - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 + image: 1es-ubuntu-2004 + os: linux variables: - name: _BuildConfig @@ -78,8 +82,10 @@ jobs: continueOnError: true condition: succeededOrFailed() - - publish: '$(Build.StagingDirectory)/BuildLogs' - artifact: $(Agent.JobName)_BuildLogs_Attempt$(System.JobAttempt) + - task: 1ES.PublishPipelineArtifact@1 displayName: Publish BuildLogs + inputs: + targetPath: $(Build.StagingDirectory)/BuildLogs + artifactName: $(Agent.JobName)_BuildLogs_Attempt$(System.JobAttempt) continueOnError: true condition: succeededOrFailed() diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build-pr.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build-pr.yml new file mode 100644 index 000000000..1474bec5f --- /dev/null +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build-pr.yml @@ -0,0 +1,132 @@ +# Builds a source-build tarball + +parameters: + # Dependent jobs that must be completed before this job will run + dependsOn: + + # Resource id of the installer build to retrieve source/product tarball's from + installerBuildResourceId: current + + # The following parameters aren't expected to be passed in rather they are used for encapsulation + # ----------------------------------------------------------------------------------------------- + alpine317Container: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.17 + centOS7Container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-source-build + centOSStream9Container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9 + debian11Arm64Container: mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-arm64v8 + fedora38Container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-38 + ubuntu1804Container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04 + poolInternalAmd64: + name: NetCore1ESPool-Svc-Internal + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 + poolInternalAmd64PR: + name: NetCore1ESPool-Internal-XL + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 + poolInternalArm64: + name: Docker-Linux-Arm-Internal + poolPublicAmd64: + name: NetCore-Public-XL + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open + +jobs: +- template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball-pr.yml + parameters: + architecture: x64 + dependsOn: ${{ parameters.dependsOn }} + ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: + excludeSdkContentTests: true + installerBuildResourceId: ${{ parameters.installerBuildResourceId }} + matrix: + Alpine317-Offline: + _BootstrapPrep: true + _Container: ${{ parameters.alpine317Container }} + _ExcludeOmniSharpTests: true + _OverrideDistroDisablingSha1: false + _RunOnline: false + CentOS7-Online: + _BootstrapPrep: false + _Container: ${{ parameters.centOS7Container }} + _EnablePoison: false + _ExcludeOmniSharpTests: true + _OverrideDistroDisablingSha1: false + _RunOnline: true + ${{ if ne(variables['Build.Reason'], 'PullRequest') }}: + CentOS7-Offline: + _BootstrapPrep: false + _Container: ${{ parameters.centOS7Container }} + _EnablePoison: false + _ExcludeOmniSharpTests: true + _OverrideDistroDisablingSha1: false + _RunOnline: false + CentOSStream9-Offline: + _BootstrapPrep: false + _Container: ${{ parameters.centOSStream9Container }} + _EnablePoison: false + _ExcludeOmniSharpTests: false + _OverrideDistroDisablingSha1: true + _RunOnline: false + Fedora38-Offline: + _BootstrapPrep: false + _Container: ${{ parameters.fedora38Container }} + _EnablePoison: true + _ExcludeOmniSharpTests: false + _OverrideDistroDisablingSha1: false + _RunOnline: false + Ubuntu1804-Offline: + _BootstrapPrep: false + _Container: ${{ parameters.ubuntu1804Container }} + _EnablePoison: false + _ExcludeOmniSharpTests: false + _OverrideDistroDisablingSha1: false + _RunOnline: false + name: Build_Tarball_x64 + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + ${{ parameters.poolPublicAmd64 }} + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + ${{ if in(variables['Build.Reason'], 'PullRequest') }}: + ${{ parameters.poolInternalAmd64PR }} + ${{ else }}: + ${{ parameters.poolInternalAmd64 }} + +- ${{ if and(eq(variables['System.TeamProject'], 'internal'), ne(variables['Build.Reason'], 'PullRequest')) }}: + - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball-pr.yml + parameters: + architecture: arm64 + dependsOn: ${{ parameters.dependsOn }} + installerBuildResourceId: ${{ parameters.installerBuildResourceId }} + matrix: + Debian11-Offline: + _BootstrapPrep: true + _Container: ${{ parameters.debian11Arm64Container }} + _EnablePoison: false + _ExcludeOmniSharpTests: false + _OverrideDistroDisablingSha1: false + _RunOnline: false + name: Build_Tarball_arm64 + pool: ${{ parameters.poolInternalArm64 }} + +- ${{ if ne(variables['Build.Reason'], 'PullRequest') }}: + - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball-pr.yml + parameters: + architecture: x64 + # Always attempt to run the bootstrap leg (e.g. even when stage 1 tests fail) in order to get a complete assessment of the build status. + # The bootstrap build will shortcut if the stage 1 build failed. + condition: succeededOrFailed() + dependsOn: Build_Tarball_x64 + excludeSdkContentTests: true + installerBuildResourceId: ${{ parameters.installerBuildResourceId }} + matrix: + Fedora38-Offline: + _PreviousSourceBuildArtifact: Build_Tarball_x64 Fedora38-Offline_Artifacts + _Container: ${{ parameters.fedora38Container }} + _EnablePoison: false + _ExcludeOmniSharpTests: false + _OverrideDistroDisablingSha1: false + _RunOnline: false + name: Build_Tarball_x64_Using_Previous + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + ${{ parameters.poolPublicAmd64 }} + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + ${{ parameters.poolInternalAmd64 }} + usePreviousArtifacts: true diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml index 86f14f677..78cde5475 100644 --- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml @@ -17,15 +17,21 @@ parameters: ubuntu1804Container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04 poolInternalAmd64: name: NetCore1ESPool-Svc-Internal - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 + image: 1es-ubuntu-2004 + os: linux poolInternalAmd64PR: name: NetCore1ESPool-Internal-XL - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 + image: 1es-ubuntu-2004 + os: linux poolInternalArm64: name: Docker-Linux-Arm-Internal + image: Mariner-2-Docker-ARM64 + os: linux + hostArchitecture: Arm64 poolPublicAmd64: name: NetCore-Public-XL - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open + image: 1es-ubuntu-2004-open + os: linux jobs: - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml @@ -109,7 +115,7 @@ jobs: - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml parameters: architecture: x64 - # Always attempt to run the bootstrap leg (e.g. even when stage 1 tests fail) in order to get a complete accessment of the build status. + # Always attempt to run the bootstrap leg (e.g. even when stage 1 tests fail) in order to get a complete assessment of the build status. # The bootstrap build will shortcut if the stage 1 build failed. condition: succeededOrFailed() dependsOn: Build_Tarball_x64 From a44b29d87b58c69c9ec06c25c840128957adc568 Mon Sep 17 00:00:00 2001 From: v-wuzhai <46013274+v-wuzhai@users.noreply.github.com> Date: Tue, 2 Apr 2024 15:03:50 -0700 Subject: [PATCH 509/535] [release/8.0.1xx] Remove 2.1-5.0 templates (#19238) --- NuGet.config | 1 - eng/Signing.props | 6 --- eng/Versions.props | 37 --------------- src/redist/targets/BundledTemplates.targets | 50 --------------------- 4 files changed, 94 deletions(-) diff --git a/NuGet.config b/NuGet.config index 959b7d1df..c8bd4d7c7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -23,7 +23,6 @@ - diff --git a/eng/Signing.props b/eng/Signing.props index 0d49f78d1..852eea4b0 100644 --- a/eng/Signing.props +++ b/eng/Signing.props @@ -39,12 +39,6 @@ - - - - - - - - 1.0.2-beta4.22406.1 - 1.0.2-beta4.22406.1 - 1.1.0-rc.22558.1 - 1.1.0-rc.23410.2 1.1.0-rc.23410.2 1.1.0-rc.23410.2 1.1.0-rc.23410.2 @@ -160,14 +154,10 @@ - 5.0.403 6.0.302 7.0.100 - 5.0.17 6.0.14 7.0.3 - 5.0.17-servicing.22215.4 - 5.0.17-servicing.22218.2 6.0.7-servicing.22322.3 6.0.7-servicing.22322.2 7.0.0-rtm.22518.7 @@ -203,33 +193,6 @@ $(MicrosoftDotNetCommonItemTemplates60PackageVersion) $(MicrosoftDotNetCommonItemTemplates60PackageVersion) 6.0.$(AspNetCoreTemplateFeature60) - - $(MicrosoftWinFormsProjectTemplates50PackageVersion) - $(MicrosoftWPFProjectTemplates50PackageVersion) - $(NUnit3DotNetNewTemplatePackageVersion) - $(MicrosoftDotNetCommonItemTemplates50PackageVersion) - $(MicrosoftDotNetCommonItemTemplates50PackageVersion) - 5.0.17 - - 4.8.1-servicing.19605.5 - 3.1.2-servicing.20066.4 - 1.7.2 - 3.1.27 - $(MicrosoftDotNetCommonItemTemplates31PackageVersion) - 3.1.32 - 3.2.1 - - 4.8.0-rc2.19462.10 - 3.0.0 - 1.6.5 - 2.0.0-preview8.19373.1 - $(MicrosoftDotNetCommonItemTemplates30PackageVersion) - 3.0.3 - - 1.5.3 - 1.0.2-beta3 - $(MicrosoftDotNetCommonItemTemplates21PackageVersion) - 2.1.34 diff --git a/src/redist/targets/BundledTemplates.targets b/src/redist/targets/BundledTemplates.targets index 4ab2c37a7..fab8b99fa 100644 --- a/src/redist/targets/BundledTemplates.targets +++ b/src/redist/targets/BundledTemplates.targets @@ -58,52 +58,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -111,10 +65,6 @@ - - - - From cded9907f2bb683508223dee98ec4f8f54d6aa99 Mon Sep 17 00:00:00 2001 From: v-wuzhai <46013274+v-wuzhai@users.noreply.github.com> Date: Tue, 2 Apr 2024 15:03:59 -0700 Subject: [PATCH 510/535] [release/7.0.1xx] Remove 2.1-5.0 templates (#19237) --- eng/Signing.props | 6 --- eng/Versions.props | 35 --------------- src/redist/targets/BundledTemplates.targets | 50 --------------------- 3 files changed, 91 deletions(-) diff --git a/eng/Signing.props b/eng/Signing.props index 0d49f78d1..852eea4b0 100644 --- a/eng/Signing.props +++ b/eng/Signing.props @@ -39,12 +39,6 @@ - - - - - - - 1.0.2-beta4.22406.1 - 1.0.2-beta4.22503.2 1.0.2-beta4.22503.2 1.0.2-beta4.22503.2 @@ -134,10 +132,7 @@ - 5.0.403 6.0.302 - 5.0.17-servicing.22215.4 - 5.0.17-servicing.22218.2 6.0.7-servicing.22322.3 6.0.7-servicing.22322.2 @@ -164,36 +159,6 @@ $(MicrosoftDotNetCommonItemTemplates60PackageVersion) $(MicrosoftDotNetCommonItemTemplates60PackageVersion) 6.0.$(AspNetCoreTemplateFeature60) - - $(MicrosoftWinFormsProjectTemplates50PackageVersion) - $(MicrosoftWPFProjectTemplates50PackageVersion) - $(NUnit3DotNetNewTemplatePackageVersion) - $(MicrosoftDotNetCommonItemTemplates50PackageVersion) - $(MicrosoftDotNetCommonItemTemplates50PackageVersion) - 5.0.17 - - 4.8.1-servicing.19605.5 - 3.1.2-servicing.20066.4 - 1.7.2 - 3.1.27 - $(MicrosoftDotNetCommonItemTemplates31PackageVersion) - $(MicrosoftDotNetTestProjectTemplates50PackageVersion) - 3.1.32 - 3.2.1 - - 4.8.0-rc2.19462.10 - 3.0.0 - 1.6.5 - 2.0.0-preview8.19373.1 - $(MicrosoftDotNetCommonItemTemplates30PackageVersion) - $(MicrosoftDotNetTestProjectTemplates30PackageVersion) - 3.0.3 - - 1.5.3 - 1.0.2-beta3 - $(MicrosoftDotNetCommonItemTemplates21PackageVersion) - $(MicrosoftDotNetTestProjectTemplates30PackageVersion) - 2.1.34 diff --git a/src/redist/targets/BundledTemplates.targets b/src/redist/targets/BundledTemplates.targets index 4c5a7e252..f544c57fb 100644 --- a/src/redist/targets/BundledTemplates.targets +++ b/src/redist/targets/BundledTemplates.targets @@ -47,62 +47,12 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From d8d99de386aeabd1c639b47ccecc0976ae255e38 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 2 Apr 2024 15:04:32 -0700 Subject: [PATCH 511/535] [release/7.0.1xx] Update dependencies from dotnet/source-build-reference-packages (#19153) Co-authored-by: dotnet-maestro[bot] --- 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 827a1c6ef..3a63f5c94 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -207,9 +207,9 @@ https://github.com/dotnet/arcade ea5ae5b4a608862561d02a158dfaac443fbaaff1 - + https://github.com/dotnet/source-build-reference-packages - c74756071d00a51bcd35510900719148b4182f34 + 61fe34f8b2f37ae69875ba7206628df11d6abfe2 From e1319525e8cd58724e24ca9830935361e659832b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 2 Apr 2024 15:04:49 -0700 Subject: [PATCH 512/535] [release/8.0.1xx] Update dependencies from dotnet/source-build-externals (#19180) Co-authored-by: dotnet-maestro[bot] --- 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 bb4bf3543..9b2aaae08 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -193,9 +193,9 @@ 5957c5c5f85f17c145e7fab4ece37ad6aafcded9 - + https://github.com/dotnet/source-build-externals - 0fac378047750fa8bd850a98b159560f9f7627c3 + 300e99190e6ae1983681694dbdd5f75f0c692081 From 57723c39e7e2d1ba4ffe09e0653089da15fa15fa Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 2 Apr 2024 15:05:06 -0700 Subject: [PATCH 513/535] [release/7.0.3xx] Update dependencies from dotnet/source-build-reference-packages (#19152) Co-authored-by: dotnet-maestro[bot] --- 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 22077ded2..ee7ffb5e7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -205,9 +205,9 @@ https://github.com/dotnet/arcade d0ab6f8c61222a6383dc2109d039b437ba9afa92 - + https://github.com/dotnet/source-build-reference-packages - c74756071d00a51bcd35510900719148b4182f34 + 61fe34f8b2f37ae69875ba7206628df11d6abfe2 From d1541e60a0d48b4610d4c11ef0654615b1288b1e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 2 Apr 2024 15:05:22 -0700 Subject: [PATCH 514/535] [release/7.0.4xx] Update dependencies from dotnet/source-build-reference-packages (#19151) Co-authored-by: dotnet-maestro[bot] --- 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 ffa952599..077478d6a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -205,9 +205,9 @@ https://github.com/dotnet/arcade d0ab6f8c61222a6383dc2109d039b437ba9afa92 - + https://github.com/dotnet/source-build-reference-packages - c74756071d00a51bcd35510900719148b4182f34 + 61fe34f8b2f37ae69875ba7206628df11d6abfe2 From cd1c90380632b7944b687234da83f39ff46bf928 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 2 Apr 2024 15:05:48 -0700 Subject: [PATCH 515/535] [release/7.0.1xx] Update dependencies from dotnet/source-build-externals (#19162) Co-authored-by: dotnet-maestro[bot] --- 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 3a63f5c94..20b0488c9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -176,9 +176,9 @@ c3ad00ae84489071080a606f6a8e43c9a91a5cc2 - + https://github.com/dotnet/source-build-externals - 936411dd5d047cef6674b47872104a3a59cf5754 + 3099976c92865c40a0edd6ff80926dc85acd7b13 From 59b9f4ee0831664e3d073b3107d402b218f9a75a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 2 Apr 2024 15:06:58 -0700 Subject: [PATCH 516/535] [release/6.0.4xx] Update dependencies from dotnet/source-build-reference-packages (#19149) Co-authored-by: dotnet-maestro[bot] --- 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 1c6a86d36..6b2e68d83 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade e438144bbffb29ed5d7c113dc4947b51650344dc - + https://github.com/dotnet/source-build-reference-packages - 2e6cb1a0008be982effb0c5d9e96a4ff138352d4 + 7ce77af2d76bb40b32e483b5050df50ea07b8984 From 9a2551a0e5881cd227138f171e09de4287c722bf Mon Sep 17 00:00:00 2001 From: Michael Yanni Date: Tue, 2 Apr 2024 15:07:59 -0700 Subject: [PATCH 517/535] [8.0.1xx] Migrate to 1ES templates for internal builds (#19126) --- .vsts-ci.yml | 677 +++++++++++++++++++++++++---------------------- .vsts-pr.yml | 56 ++-- eng/build-pr.yml | 261 ++++++++++++++++++ eng/build.yml | 38 +-- 4 files changed, 666 insertions(+), 366 deletions(-) create mode 100644 eng/build-pr.yml diff --git a/.vsts-ci.yml b/.vsts-ci.yml index d14d1293e..4c70535d7 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -1,3 +1,5 @@ +# Pipeline: https://dnceng.visualstudio.com/internal/_build?definitionId=286 + trigger: batch: true branches: @@ -23,339 +25,370 @@ variables: - 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 +# Set the MicroBuild plugin installation directory to the agent temp directory to avoid SDL tool scanning. +- name: MicroBuildOutputFolderOverride + value: $(Agent.TempDirectory) -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') }}: +resources: + repositories: + - repository: 1esPipelines + type: git + name: 1ESPipelineTemplates/1ESPipelineTemplates + ref: refs/tags/release + +extends: + ${{ if notin(variables['Build.Reason'], 'PullRequest') }}: + template: v1/1ES.Official.PipelineTemplate.yml@1esPipelines + ${{ else }}: + template: v1/1ES.Unofficial.PipelineTemplate.yml@1esPipelines + parameters: + containers: + alpine315WithNode: + image: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.15-WithNode + cblMariner20Fpm: + image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-fpm + centosStream8: + image: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8 + debianStretch: + image: mcr.microsoft.com/dotnet-buildtools/prereqs:debian-stretch + fedora36: + image: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-36 + ubuntu2204: + image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04 + ubuntu1804Cross: + image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-cross + ubuntu2204DebPkg: + image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-debpkg + sdl: + sourceAnalysisPool: 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_36_Debug_x64 - container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-36' - 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_Stretch_Debug_x64 - container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:debian-stretch' - 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.15-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-18.04-cross' - 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.15-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 + image: 1es-windows-2022 + os: windows + # Temporary to workaround MicroBuild issues. + credscan: + enabled: false + justificationForDisabling: 'CredScan is failing on the MicroBuild signing plugin. "MicroBuild/Plugins/nuget.config" has changing content and thus cannot be baselined.' + stages: + - stage: Build + jobs: + # Build Retry Configuration + - job: Publish_Build_Configuration pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + name: $(DncEngPublicBuildPool) + image: 1es-windows-2022-open + os: windows ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: $(DncEngInternalBuildPool) - demands: ImageOverride -equals windows.vs2022.amd64 + image: 1es-windows-2022 + os: windows + steps: + - task: 1ES.PublishPipelineArtifact@1 + displayName: Publish Build Config + inputs: + targetPath: $(Build.SourcesDirectory)\eng\buildConfiguration + artifactName: buildConfiguration + + # PR-only jobs + - ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: + # Windows + - template: eng/build.yml@self + parameters: + agentOs: Windows_NT + jobName: Build_Debug_x64 + buildConfiguration: Debug + buildArchitecture: x64 + additionalBuildParameters: '/p:PublishInternalAsset=true' + runTests: true + + # Linux + - template: eng/build.yml@self + parameters: + agentOs: Linux + jobName: Build_Ubuntu_22_04_Debug_x64 + container: ubuntu2204 + buildConfiguration: Debug + buildArchitecture: x64 + linuxPortable: true + runTests: true + - template: eng/build.yml@self + parameters: + agentOs: Linux + jobName: Build_Fedora_36_Debug_x64 + container: fedora36 + buildConfiguration: Debug + buildArchitecture: x64 + linuxPortable: true + runTests: true + - template: eng/build.yml@self + parameters: + agentOs: Linux + jobName: Build_CentOS_8_Stream_Debug_x64 + container: centosStream8 + buildConfiguration: Debug + buildArchitecture: x64 + linuxPortable: false + runTests: true + - template: eng/build.yml@self + parameters: + agentOs: Linux + jobName: Build_Debian_Stretch_Debug_x64 + container: debianStretch + buildConfiguration: Debug + buildArchitecture: x64 + additionalBuildParameters: '/p:BuildSdkDeb=true' + linuxPortable: false + runTests: true + - template: eng/build.yml@self + 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@self + parameters: + agentOs: Linux + jobName: Build_Linux_musl_Debug_x64 + container: alpine315WithNode + 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@self + parameters: + agentOs: Linux + jobName: Build_LinuxPortable_Release_x64 + buildConfiguration: Release + buildArchitecture: x64 + linuxPortable: true + runTests: true + + # MacOS + - template: eng/build.yml@self + 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@self + parameters: + agentOs: Windows_NT + jobName: Build_Release_x64 + buildConfiguration: Release + buildArchitecture: x64 + additionalBuildParameters: '/p:PublishInternalAsset=true' + runTests: false + - template: eng/build.yml@self + parameters: + agentOs: Windows_NT + jobName: Build_Release_x86 + buildConfiguration: Release + buildArchitecture: x86 + runTests: false + - template: eng/build.yml@self + parameters: + agentOs: Windows_NT + jobName: Build_Release_arm64 + buildConfiguration: Release + buildArchitecture: arm64 + runTests: false + + # Linux + - template: eng/build.yml@self + parameters: + agentOs: Linux + jobName: Build_Arm_Release + buildConfiguration: Release + buildArchitecture: arm + runtimeIdentifier: 'linux-arm' + linuxPortable: true + runTests: false + - template: eng/build.yml@self + parameters: + agentOs: Linux + jobName: Build_Arm64_Release + buildConfiguration: Release + buildArchitecture: arm64 + runtimeIdentifier: 'linux-arm64' + linuxPortable: true + runTests: false + - template: eng/build.yml@self + parameters: + agentOs: Linux + jobName: Build_Linux_musl_Release_arm + container: ubuntu1804Cross + buildConfiguration: Release + buildArchitecture: arm + runtimeIdentifier: 'linux-musl-arm' + additionalBuildParameters: '/p:OSName="linux-musl"' + linuxPortable: false + runTests: false + - template: eng/build.yml@self + 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@self + parameters: + agentOs: Linux + jobName: Build_Linux_musl_Release_x64 + container: alpine315WithNode + 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@self + parameters: + agentOs: Linux + jobName: Build_Linux_Portable_Deb_Release_x64 + container: ubuntu2204DebPkg + 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@self + parameters: + agentOs: Linux + jobName: Build_Linux_Portable_Rpm_Release_x64 + container: cblMariner20Fpm + 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@self + parameters: + agentOs: Linux + jobName: Build_Linux_Portable_Rpm_Release_Arm64 + container: cblMariner20Fpm + 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@self + parameters: + agentOs: Linux + jobName: Build_LinuxPortable_Release_x64 + buildConfiguration: Release + buildArchitecture: x64 + linuxPortable: true + runTests: false + + # MacOS + - template: eng/build.yml@self + parameters: + agentOs: Darwin + jobName: Build_Release_x64 + buildConfiguration: Release + buildArchitecture: x64 + runTests: false + - template: eng/build.yml@self + parameters: + agentOs: Darwin + jobName: Build_Release_arm64 + runtimeIdentifier: 'osx-arm64' + buildConfiguration: Release + buildArchitecture: arm64 + runTests: false + + # Windows PGO Instrumentation builds + - template: eng/build.yml@self + parameters: + agentOs: Windows_NT + pgoInstrument: true + jobName: Build_Release_x64 + buildConfiguration: Release + buildArchitecture: x64 + additionalBuildParameters: '/p:PublishInternalAsset=true' + runTests: false + - template: eng/build.yml@self + parameters: + agentOs: Windows_NT + pgoInstrument: true + jobName: Build_Release_x86 + buildConfiguration: Release + buildArchitecture: x86 + runTests: false + - template: eng/build.yml@self + parameters: + agentOs: Windows_NT + pgoInstrument: true + jobName: Build_Release_arm64 + buildConfiguration: Release + buildArchitecture: arm64 + runTests: false + + # Linux PGO Instrumentation builds + - template: eng/build.yml@self + parameters: + agentOs: Linux + pgoInstrument: true + jobName: Build_LinuxPortable_Release_x64 + buildConfiguration: Release + buildArchitecture: x64 + linuxPortable: true + runTests: false + - template: eng/build.yml@self + parameters: + agentOs: Linux + pgoInstrument: true + jobName: Build_Release_arm64 + buildConfiguration: Release + buildArchitecture: arm64 + linuxPortable: true + runTests: false + + # Source Build + - template: /eng/common/templates-official/jobs/source-build.yml@self + + - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - stage: Publish + dependsOn: + - Build + jobs: + - template: /eng/common/templates-official/job/publish-build-assets.yml@self + parameters: + publishUsingPipelines: true + publishAssetsImmediately: true + pool: + name: $(DncEngInternalBuildPool) + image: 1es-windows-2022 + os: windows diff --git a/.vsts-pr.yml b/.vsts-pr.yml index d14d1293e..f5c697bab 100644 --- a/.vsts-pr.yml +++ b/.vsts-pr.yml @@ -59,7 +59,7 @@ stages: ## Windows - - template: eng/build.yml + - template: eng/build-pr.yml parameters: agentOs: Windows_NT jobName: Build_Debug_x64 @@ -70,7 +70,7 @@ stages: ## Linux - - template: eng/build.yml + - template: eng/build-pr.yml parameters: agentOs: Linux jobName: Build_Ubuntu_22_04_Debug_x64 @@ -79,7 +79,7 @@ stages: buildArchitecture: x64 linuxPortable: true runTests: true - - template: eng/build.yml + - template: eng/build-pr.yml parameters: agentOs: Linux jobName: Build_Fedora_36_Debug_x64 @@ -88,7 +88,7 @@ stages: buildArchitecture: x64 linuxPortable: true runTests: true - - template: eng/build.yml + - template: eng/build-pr.yml parameters: agentOs: Linux jobName: Build_CentOS_8_Stream_Debug_x64 @@ -97,7 +97,7 @@ stages: buildArchitecture: x64 linuxPortable: false runTests: true - - template: eng/build.yml + - template: eng/build-pr.yml parameters: agentOs: Linux jobName: Build_Debian_Stretch_Debug_x64 @@ -107,7 +107,7 @@ stages: additionalBuildParameters: '/p:BuildSdkDeb=true' linuxPortable: false runTests: true - - template: eng/build.yml + - template: eng/build-pr.yml parameters: agentOs: Linux jobName: Build_Arm64_Debug @@ -117,7 +117,7 @@ stages: linuxPortable: true # Never run tests on arm64 runTests: false - - template: eng/build.yml + - template: eng/build-pr.yml parameters: agentOs: Linux jobName: Build_Linux_musl_Debug_x64 @@ -129,7 +129,7 @@ stages: additionalBuildParameters: '/p:HostOSName="linux-musl"' linuxPortable: false runTests: true - - template: eng/build.yml + - template: eng/build-pr.yml parameters: agentOs: Linux jobName: Build_LinuxPortable_Release_x64 @@ -140,7 +140,7 @@ stages: # MacOS - - template: eng/build.yml + - template: eng/build-pr.yml parameters: agentOs: Darwin jobName: Build_Release_x64 @@ -154,7 +154,7 @@ stages: ## Windows - - template: eng/build.yml + - template: eng/build-pr.yml parameters: agentOs: Windows_NT jobName: Build_Release_x64 @@ -162,14 +162,14 @@ stages: buildArchitecture: x64 additionalBuildParameters: '/p:PublishInternalAsset=true' runTests: false - - template: eng/build.yml + - template: eng/build-pr.yml parameters: agentOs: Windows_NT jobName: Build_Release_x86 buildConfiguration: Release buildArchitecture: x86 runTests: false - - template: eng/build.yml + - template: eng/build-pr.yml parameters: agentOs: Windows_NT jobName: Build_Release_arm64 @@ -179,7 +179,7 @@ stages: ## Linux - - template: eng/build.yml + - template: eng/build-pr.yml parameters: agentOs: Linux jobName: Build_Arm_Release @@ -188,7 +188,7 @@ stages: runtimeIdentifier: 'linux-arm' linuxPortable: true runTests: false - - template: eng/build.yml + - template: eng/build-pr.yml parameters: agentOs: Linux jobName: Build_Arm64_Release @@ -197,7 +197,7 @@ stages: runtimeIdentifier: 'linux-arm64' linuxPortable: true runTests: false - - template: eng/build.yml + - template: eng/build-pr.yml parameters: agentOs: Linux jobName: Build_Linux_musl_Release_arm @@ -208,7 +208,7 @@ stages: additionalBuildParameters: '/p:OSName="linux-musl"' linuxPortable: false runTests: false - - template: eng/build.yml + - template: eng/build-pr.yml parameters: agentOs: Linux jobName: Build_Linux_musl_Release_arm64 @@ -218,7 +218,7 @@ stages: additionalBuildParameters: '/p:OSName="linux-musl"' linuxPortable: false runTests: false - - template: eng/build.yml + - template: eng/build-pr.yml parameters: agentOs: Linux jobName: Build_Linux_musl_Release_x64 @@ -230,7 +230,7 @@ stages: additionalBuildParameters: '/p:HostOSName="linux-musl"' linuxPortable: false runTests: false - - template: eng/build.yml + - template: eng/build-pr.yml parameters: agentOs: Linux jobName: Build_Linux_Portable_Deb_Release_x64 @@ -242,7 +242,7 @@ stages: additionalBuildParameters: '/p:PublishBinariesAndBadge=false /p:BuildSdkDeb=true' linuxPortable: true runTests: false - - template: eng/build.yml + - template: eng/build-pr.yml parameters: agentOs: Linux jobName: Build_Linux_Portable_Rpm_Release_x64 @@ -254,7 +254,7 @@ stages: additionalBuildParameters: '/p:PublishBinariesAndBadge=false /p:IsRPMBasedDistro=true' linuxPortable: true runTests: false - - template: eng/build.yml + - template: eng/build-pr.yml parameters: agentOs: Linux jobName: Build_Linux_Portable_Rpm_Release_Arm64 @@ -267,7 +267,7 @@ stages: additionalBuildParameters: '/p:PublishBinariesAndBadge=false /p:CLIBUILD_SKIP_TESTS=true /p:IsRPMBasedDistro=true' linuxPortable: true runTests: false - - template: eng/build.yml + - template: eng/build-pr.yml parameters: agentOs: Linux jobName: Build_LinuxPortable_Release_x64 @@ -278,14 +278,14 @@ stages: # MacOS - - template: eng/build.yml + - template: eng/build-pr.yml parameters: agentOs: Darwin jobName: Build_Release_x64 buildConfiguration: Release buildArchitecture: x64 runTests: false - - template: eng/build.yml + - template: eng/build-pr.yml parameters: agentOs: Darwin jobName: Build_Release_arm64 @@ -296,7 +296,7 @@ stages: ## Windows PGO Instrumentation builds - - template: eng/build.yml + - template: eng/build-pr.yml parameters: agentOs: Windows_NT pgoInstrument: true @@ -305,7 +305,7 @@ stages: buildArchitecture: x64 additionalBuildParameters: '/p:PublishInternalAsset=true' runTests: false - - template: eng/build.yml + - template: eng/build-pr.yml parameters: agentOs: Windows_NT pgoInstrument: true @@ -313,7 +313,7 @@ stages: buildConfiguration: Release buildArchitecture: x86 runTests: false - - template: eng/build.yml + - template: eng/build-pr.yml parameters: agentOs: Windows_NT pgoInstrument: true @@ -324,7 +324,7 @@ stages: ## Linux PGO Instrumentation builds - - template: eng/build.yml + - template: eng/build-pr.yml parameters: agentOs: Linux pgoInstrument: true @@ -334,7 +334,7 @@ stages: linuxPortable: true runTests: false - - template: eng/build.yml + - template: eng/build-pr.yml parameters: agentOs: Linux pgoInstrument: true diff --git a/eng/build-pr.yml b/eng/build-pr.yml new file mode 100644 index 000000000..831d96781 --- /dev/null +++ b/eng/build-pr.yml @@ -0,0 +1,261 @@ +parameters: +# Agent OS identifier and used as job name +- name: agentOs + type: string + +# Job name +- name: jobName + type: string + +# Container to run the build in, if any +- name: container + type: string + default: '' + +# Job timeout +- name: timeoutInMinutes + type: number + default: 180 + +# Build configuration (Debug, Release) +- name: buildConfiguration + type: string + values: + - Debug + - Release + +# Build architecture +- name: buildArchitecture + type: string + values: + - arm + - arm64 + - x64 + - x86 + +# Linux portable. If true, passes portable switch to build +- name: linuxPortable + type: boolean + default: false + +# Runtime Identifier +- name: runtimeIdentifier + type: string + default: '' + +# UI lang +- name: dotnetCLIUILanguage + type: string + default: '' + +# Additional parameters +- name: additionalBuildParameters + type: string + default: '' + +# Run tests +- name: runTests + type: boolean + default: true + +# PGO instrumentation jobs +- name: pgoInstrument + type: boolean + default: false + +- name: isBuiltFromVmr + displayName: True when build is running from dotnet/dotnet + type: boolean + default: false + +jobs: +- template: common/templates/job/job.yml + parameters: + # Set up the name of the job. + ${{ if parameters.pgoInstrument }}: + name: PGO_${{ parameters.agentOs }}_${{ parameters.jobName }} + ${{ if not(parameters.pgoInstrument) }}: + name: ${{ parameters.agentOs }}_${{ parameters.jobName }} + + # Set up the pool/machine info to be used based on the Agent OS + ${{ if eq(parameters.agentOs, 'Windows_NT') }}: + enableMicrobuild: true + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + name: $(DncEngPublicBuildPool) + demands: ImageOverride -equals windows.vs2019.amd64.open + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: $(DncEngInternalBuildPool) + demands: ImageOverride -equals windows.vs2019.amd64 + ${{ if eq(parameters.agentOs, 'Linux') }}: + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + name: $(DncEngPublicBuildPool) + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: $(DncEngInternalBuildPool) + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 + container: ${{ parameters.container }} + ${{ if eq(parameters.agentOs, 'Darwin') }}: + pool: + vmImage: 'macOS-latest' + + timeoutInMinutes: ${{ parameters.timeoutInMinutes }} + ${{ if parameters.isBuiltFromVmr }}: + enableSbom: false + ${{ else }}: + enablePublishBuildAssets: true + enablePublishUsingPipelines: true + enableTelemetry: true + helixRepo: dotnet/installer + workspace: + clean: all + + variables: + # Test variables + - ${{ if eq(parameters.agentOs, 'Windows_NT') }}: + - _PackArg: '-pack' + - ${{ if parameters.runTests }}: + - _TestArg: '-test' + - ${{ else }}: + - _TestArg: '' + - ${{ if ne(parameters.agentOs, 'Windows_NT') }}: + - _PackArg: '--pack' + - ${{ if parameters.runTests }}: + - _TestArg: '--test' + - ${{ else }}: + - _TestArg: '' + + - ${{ if parameters.pgoInstrument }}: + - _PgoInstrument: '/p:PgoInstrument=true' + - _PackArg: '' + - ${{ else }}: + - _PgoInstrument: '' + + - ${{ if parameters.linuxPortable }}: + - _LinuxPortable: '--linux-portable' + - ${{ else }}: + - _LinuxPortable: '' + + - ${{ if ne(parameters.runtimeIdentifier, '') }}: + - _RuntimeIdentifier: '--runtime-id ${{ parameters.runtimeIdentifier }}' + - ${{ else }}: + - _RuntimeIdentifier: '' + + - _AgentOSName: ${{ parameters.agentOs }} + - _TeamName: Roslyn-Project-System + - _SignType: test + - _BuildArgs: '/p:DotNetSignType=$(_SignType) $(_PgoInstrument)' + + - ${{ if parameters.isBuiltFromVmr }}: + - installerRoot: '$(Build.SourcesDirectory)/src/installer' + - _SignType: test + - _PushToVSFeed: false + - _BuildArgs: /p:OfficialBuildId=$(BUILD.BUILDNUMBER) + /p:TeamName=$(_TeamName) + /p:DotNetPublishUsingPipelines=true + /p:PublishToSymbolServer=false + $(_PgoInstrument) + - ${{ else }}: + - installerRoot: '$(Build.SourcesDirectory)' + - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - group: DotNet-HelixApi-Access + - _PushToVSFeed: true + - _SignType: real + - _BuildArgs: /p:OfficialBuildId=$(BUILD.BUILDNUMBER) + /p:DotNetSignType=$(_SignType) + /p:TeamName=$(_TeamName) + /p:DotNetPublishUsingPipelines=$(_PublishUsingPipelines) + $(_PgoInstrument) + + - template: /eng/common/templates/variables/pool-providers.yml + + steps: + - checkout: self + clean: true + - ${{ if eq(parameters.agentOs, 'Windows_NT') }}: + - ${{ if and(not(parameters.isBuiltFromVmr), ne(variables['System.TeamProject'], 'public')) }}: + - task: PowerShell@2 + displayName: Setup Private Feeds Credentials + inputs: + filePath: $(installerRoot)/eng/common/SetupNugetSources.ps1 + arguments: -ConfigFile $(installerRoot)/NuGet.config -Password $Env:Token + env: + Token: $(dn-bot-dnceng-artifact-feeds-rw) + - script: $(installerRoot)/build.cmd + $(_TestArg) $(_PackArg) + -publish -ci -sign + -Configuration ${{ parameters.buildConfiguration }} + -Architecture ${{ parameters.buildArchitecture }} + $(_BuildArgs) + ${{ parameters.additionalBuildParameters }} + $(_InternalRuntimeDownloadArgs) + displayName: Build + env: + DOTNET_CLI_UI_LANGUAGE: ${{ parameters.dotnetCLIUILanguage }} + + - ${{ if ne(parameters.agentOs, 'Windows_NT') }}: + - ${{ if and(not(parameters.isBuiltFromVmr), ne(variables['System.TeamProject'], 'public')) }}: + - task: Bash@3 + displayName: Setup Private Feeds Credentials + inputs: + filePath: $(installerRoot)/eng/common/SetupNugetSources.sh + arguments: $(installerRoot)/NuGet.config $Token + env: + Token: $(dn-bot-dnceng-artifact-feeds-rw) + - ${{ if eq(parameters.agentOs, 'Linux') }}: + - script: $(installerRoot)/build.sh + $(_TestArg) $(_PackArg) + --publish --ci + --noprettyprint + --configuration ${{ parameters.buildConfiguration }} + --architecture ${{ parameters.buildArchitecture }} + $(_LinuxPortable) + $(_RuntimeIdentifier) + $(_BuildArgs) + ${{ parameters.additionalBuildParameters }} + $(_InternalRuntimeDownloadArgs) + displayName: Build + + - ${{ if or(eq(parameters.agentOs, 'Darwin'), eq(parameters.agentOs, 'FreeBSD')) }}: + - script: $(installerRoot)/build.sh + $(_TestArg) + --pack --publish --ci + --noprettyprint + --configuration ${{ parameters.buildConfiguration }} + --architecture ${{ parameters.buildArchitecture }} + $(_RuntimeIdentifier) + $(_BuildArgs) + ${{ parameters.additionalBuildParameters }} + $(_InternalRuntimeDownloadArgs) + displayName: Build + + - task: PublishTestResults@2 + displayName: Publish Test Results + inputs: + testRunner: XUnit + testResultsFiles: 'artifacts/TestResults/${{ parameters.buildConfiguration }}/*.xml' + testRunTitle: '$(_AgentOSName)_$(Agent.JobName)' + platform: '$(BuildPlatform)' + configuration: '${{ parameters.buildConfiguration }}' + condition: ne(variables['_TestArg'], '') + + - task: CopyFiles@2 + displayName: Gather Logs + inputs: + SourceFolder: '$(installerRoot)/artifacts' + Contents: | + log/${{ parameters.buildConfiguration }}/**/* + TestResults/${{ parameters.buildConfiguration }}/**/* + TargetFolder: '$(Build.ArtifactStagingDirectory)' + continueOnError: true + condition: always() + + - task: PublishBuildArtifacts@1 + displayName: Publish Logs to VSTS + inputs: + PathtoPublish: '$(Build.ArtifactStagingDirectory)' + ArtifactName: '$(_AgentOSName)_$(Agent.JobName)_$(Build.BuildNumber)' + publishLocation: Container + continueOnError: true + condition: always() diff --git a/eng/build.yml b/eng/build.yml index ea389797c..4f947ea8f 100644 --- a/eng/build.yml +++ b/eng/build.yml @@ -1,9 +1,9 @@ parameters: - # Agent OS identifier and used as job name +# Agent OS identifier and used as job name - name: agentOs type: string - # Job name +# Job name - name: jobName type: string @@ -12,7 +12,7 @@ parameters: type: string default: '' - # Job timeout +# Job timeout - name: timeoutInMinutes type: number default: 180 @@ -69,36 +69,42 @@ parameters: default: false jobs: -- template: common/templates/job/job.yml +- template: common/templates-official/job/job.yml parameters: # Set up the name of the job. ${{ if parameters.pgoInstrument }}: name: PGO_${{ parameters.agentOs }}_${{ parameters.jobName }} ${{ if not(parameters.pgoInstrument) }}: name: ${{ parameters.agentOs }}_${{ parameters.jobName }} - - ## Set up the pool/machine info to be used based on the Agent OS + + # Set up the pool/machine info to be used based on the Agent OS ${{ if eq(parameters.agentOs, 'Windows_NT') }}: enableMicrobuild: true pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: name: $(DncEngPublicBuildPool) - demands: ImageOverride -equals windows.vs2019.amd64.open + image: 1es-windows-2019-open + os: windows ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: $(DncEngInternalBuildPool) - demands: ImageOverride -equals windows.vs2019.amd64 + image: 1es-windows-2019 + os: windows ${{ if eq(parameters.agentOs, 'Linux') }}: pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: name: $(DncEngPublicBuildPool) - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open + image: 1es-ubuntu-2004-open + os: linux ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: $(DncEngInternalBuildPool) - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 + image: 1es-ubuntu-2004 + os: linux container: ${{ parameters.container }} ${{ if eq(parameters.agentOs, 'Darwin') }}: pool: - vmImage: 'macOS-latest' + name: Azure Pipelines + image: macOS-latest + os: macOS timeoutInMinutes: ${{ parameters.timeoutInMinutes }} ${{ if parameters.isBuiltFromVmr }}: @@ -111,8 +117,8 @@ jobs: workspace: clean: all -# Test parameters variables: + # Test variables - ${{ if eq(parameters.agentOs, 'Windows_NT') }}: - _PackArg: '-pack' - ${{ if parameters.runTests }}: @@ -168,7 +174,7 @@ jobs: /p:DotNetPublishUsingPipelines=$(_PublishUsingPipelines) $(_PgoInstrument) - - template: /eng/common/templates/variables/pool-providers.yml + - template: /eng/common/templates-official/variables/pool-providers.yml steps: - checkout: self @@ -245,13 +251,13 @@ jobs: inputs: SourceFolder: '$(installerRoot)/artifacts' Contents: | - log/${{ parameters.buildConfiguration }}/**/* - TestResults/${{ parameters.buildConfiguration }}/**/* + log/${{ parameters.buildConfiguration }}/**/* + TestResults/${{ parameters.buildConfiguration }}/**/* TargetFolder: '$(Build.ArtifactStagingDirectory)' continueOnError: true condition: always() - - task: PublishBuildArtifacts@1 + - task: 1ES.PublishBuildArtifacts@1 displayName: Publish Logs to VSTS inputs: PathtoPublish: '$(Build.ArtifactStagingDirectory)' From 227eecbdda6b6d5862ed02ffe994169cf48e255e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 2 Apr 2024 15:11:36 -0700 Subject: [PATCH 518/535] [release/7.0.3xx] Update dependencies from dotnet/source-build-externals (#19147) Co-authored-by: dotnet-maestro[bot] --- 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 ee7ffb5e7..c0a094e02 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -180,9 +180,9 @@ c3ad00ae84489071080a606f6a8e43c9a91a5cc2 - + https://github.com/dotnet/source-build-externals - 936411dd5d047cef6674b47872104a3a59cf5754 + 3099976c92865c40a0edd6ff80926dc85acd7b13 From fd15bcd6896f7691b5e023ab5943ca547147b57c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 2 Apr 2024 15:11:57 -0700 Subject: [PATCH 519/535] [release/7.0.4xx] Update dependencies from dotnet/source-build-externals (#19148) Co-authored-by: dotnet-maestro[bot] --- 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 077478d6a..0fdfc9a7d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -180,9 +180,9 @@ c3ad00ae84489071080a606f6a8e43c9a91a5cc2 - + https://github.com/dotnet/source-build-externals - 936411dd5d047cef6674b47872104a3a59cf5754 + 3099976c92865c40a0edd6ff80926dc85acd7b13 From 82f918399ac47ac3dac3e1d6f44ceee11ed31dee Mon Sep 17 00:00:00 2001 From: "Oleksandr.Didyk" Date: Thu, 28 Mar 2024 14:18:50 +0100 Subject: [PATCH 520/535] fixup parsing installer sha from vmr build tag --- eng/pipelines/templates/jobs/sdk-diff-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/templates/jobs/sdk-diff-tests.yml b/eng/pipelines/templates/jobs/sdk-diff-tests.yml index d7ed9a81a..40971fbdb 100644 --- a/eng/pipelines/templates/jobs/sdk-diff-tests.yml +++ b/eng/pipelines/templates/jobs/sdk-diff-tests.yml @@ -34,7 +34,7 @@ jobs: echo "Dotnet-dotnet build: https://dev.azure.com/dnceng/internal/_build/results?buildId=$dotnet_dotnet_build&view=results" - installer_sha=$(az pipelines build tag list --organization '$(AZDO_ORG)' --project '$(AZDO_PROJECT)' --build-id $dotnet_dotnet_build --output tsv | sed "s,installer ,,g") + installer_sha=$(az pipelines build tag list --organization '$(AZDO_ORG)' --project '$(AZDO_PROJECT)' --build-id $dotnet_dotnet_build --query "[?contains(@, 'installer')]" --output tsv | sed "s,installer ,,g") installer_build=$(az pipelines runs list --organization '$(AZDO_ORG)' --project '$(AZDO_PROJECT)' --pipeline-ids '$(INSTALLER_OFFICIAL_CI_PIPELINE_ID)' --query "[?sourceVersion == '$installer_sha'].id" --output tsv) if [[ -z "$installer_build" ]]; then echo "Could not find a build of installer for commit '$installer_sha'" From 4443f5ed881f294a00546d2c8b78d14b02609af6 Mon Sep 17 00:00:00 2001 From: "Oleksandr.Didyk" Date: Thu, 4 Apr 2024 16:36:08 +0200 Subject: [PATCH 521/535] move source-build pipelines to sb context folder --- .../content/eng}/pipelines/source-build-license-scan.yml | 0 .../content/eng}/pipelines/source-build-sdk-diff-tests.yml | 0 .../content/eng}/pipelines/templates/jobs/sdk-diff-tests.yml | 0 .../content/eng}/pipelines/templates/variables/pipelines.yml | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename {eng => src/SourceBuild/content/eng}/pipelines/source-build-license-scan.yml (100%) rename {eng => src/SourceBuild/content/eng}/pipelines/source-build-sdk-diff-tests.yml (100%) rename {eng => src/SourceBuild/content/eng}/pipelines/templates/jobs/sdk-diff-tests.yml (100%) rename {eng => src/SourceBuild/content/eng}/pipelines/templates/variables/pipelines.yml (100%) diff --git a/eng/pipelines/source-build-license-scan.yml b/src/SourceBuild/content/eng/pipelines/source-build-license-scan.yml similarity index 100% rename from eng/pipelines/source-build-license-scan.yml rename to src/SourceBuild/content/eng/pipelines/source-build-license-scan.yml diff --git a/eng/pipelines/source-build-sdk-diff-tests.yml b/src/SourceBuild/content/eng/pipelines/source-build-sdk-diff-tests.yml similarity index 100% rename from eng/pipelines/source-build-sdk-diff-tests.yml rename to src/SourceBuild/content/eng/pipelines/source-build-sdk-diff-tests.yml diff --git a/eng/pipelines/templates/jobs/sdk-diff-tests.yml b/src/SourceBuild/content/eng/pipelines/templates/jobs/sdk-diff-tests.yml similarity index 100% rename from eng/pipelines/templates/jobs/sdk-diff-tests.yml rename to src/SourceBuild/content/eng/pipelines/templates/jobs/sdk-diff-tests.yml diff --git a/eng/pipelines/templates/variables/pipelines.yml b/src/SourceBuild/content/eng/pipelines/templates/variables/pipelines.yml similarity index 100% rename from eng/pipelines/templates/variables/pipelines.yml rename to src/SourceBuild/content/eng/pipelines/templates/variables/pipelines.yml From c1fd9241db8e6495761f690896b8bb59a802680c Mon Sep 17 00:00:00 2001 From: "Oleksandr.Didyk" Date: Thu, 4 Apr 2024 16:45:21 +0200 Subject: [PATCH 522/535] fixup paths --- .../eng/pipelines/templates/jobs/sdk-diff-tests.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/SourceBuild/content/eng/pipelines/templates/jobs/sdk-diff-tests.yml b/src/SourceBuild/content/eng/pipelines/templates/jobs/sdk-diff-tests.yml index 40971fbdb..52435dbc0 100644 --- a/src/SourceBuild/content/eng/pipelines/templates/jobs/sdk-diff-tests.yml +++ b/src/SourceBuild/content/eng/pipelines/templates/jobs/sdk-diff-tests.yml @@ -100,7 +100,7 @@ jobs: exit 1 fi - eng/common/build.sh -bl --projects $(Build.SourcesDirectory)/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Microsoft.DotNet.SourceBuild.SmokeTests.csproj --restore + eng/common/build.sh -bl --projects $(Build.SourcesDirectory)/test/Microsoft.DotNet.SourceBuild.SmokeTests/Microsoft.DotNet.SourceBuild.SmokeTests.csproj --restore echo "##vso[task.setvariable variable=Platform]$platform" echo "##vso[task.setvariable variable=MsftSdkTarballPath]$(Pipeline.Workspace)/Artifacts/$msft_sdk_tarball_name" @@ -110,7 +110,7 @@ jobs: - script: > .dotnet/dotnet test - $(Build.SourcesDirectory)/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Microsoft.DotNet.SourceBuild.SmokeTests.csproj + $(Build.SourcesDirectory)/test/Microsoft.DotNet.SourceBuild.SmokeTests/Microsoft.DotNet.SourceBuild.SmokeTests.csproj --filter "Category=SdkContent" --logger:'trx;LogFileName=$(Agent.JobName)_SDKDiffTests.trx' --logger:'console;verbosity=detailed' @@ -137,7 +137,6 @@ jobs: find artifacts/ -type f -name "BuildTests*.binlog" -exec cp {} --parents -t ${targetFolder} \; find artifacts/ -type f -name "BuildTests*.log" -exec cp {} --parents -t ${targetFolder} \; find artifacts/ -type f -name "Build.binlog" -exec cp {} --parents -t ${targetFolder} \; - cd "$(Build.SourcesDirectory)/src/SourceBuild/content" find test/ -type f -name "*.binlog" -exec cp {} --parents -t ${targetFolder} \; find test/ -type f -name "Updated*.diff" -exec cp {} --parents -t ${targetFolder} \; find test/ -type f -name "Updated*.txt" -exec cp {} --parents -t ${targetFolder} \; @@ -158,7 +157,7 @@ jobs: inputs: testRunner: vSTest testResultsFiles: '*.trx' - searchFolder: $(Build.SourcesDirectory)/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/TestResults + searchFolder: $(Build.SourcesDirectory)/test/Microsoft.DotNet.SourceBuild.SmokeTests/TestResults mergeTestResults: true publishRunAttachments: true testRunTitle: $(Agent.JobName) From a2d809957911ea8ddfae91ab807b786174b79f5f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 5 Apr 2024 16:10:01 +0000 Subject: [PATCH 523/535] Update dependencies from https://github.com/dotnet/arcade build 20240404.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.24179.7 -> To Version 7.0.0-beta.24204.2 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- .../steps/component-governance.yml | 2 +- eng/common/templates/steps/component-governance.yml | 2 +- global.json | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0fdfc9a7d..bdcb44c95 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - d0ab6f8c61222a6383dc2109d039b437ba9afa92 + 31d070a59ea56ea0c25736318e4287bdd883d05f - + https://github.com/dotnet/arcade - d0ab6f8c61222a6383dc2109d039b437ba9afa92 + 31d070a59ea56ea0c25736318e4287bdd883d05f - + https://github.com/dotnet/arcade - d0ab6f8c61222a6383dc2109d039b437ba9afa92 + 31d070a59ea56ea0c25736318e4287bdd883d05f https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 8c00b95ad..1219afb10 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.24179.7 + 7.0.0-beta.24204.2 diff --git a/eng/common/templates-official/steps/component-governance.yml b/eng/common/templates-official/steps/component-governance.yml index babc2757d..12527b80e 100644 --- a/eng/common/templates-official/steps/component-governance.yml +++ b/eng/common/templates-official/steps/component-governance.yml @@ -3,7 +3,7 @@ parameters: steps: - ${{ if eq(parameters.disableComponentGovernance, 'true') }}: - - script: "echo ##vso[task.setvariable variable=skipComponentGovernanceDetection]true" + - script: echo "##vso[task.setvariable variable=skipComponentGovernanceDetection]true" displayName: Set skipComponentGovernanceDetection variable - ${{ if ne(parameters.disableComponentGovernance, 'true') }}: - task: ComponentGovernanceComponentDetection@0 diff --git a/eng/common/templates/steps/component-governance.yml b/eng/common/templates/steps/component-governance.yml index babc2757d..12527b80e 100644 --- a/eng/common/templates/steps/component-governance.yml +++ b/eng/common/templates/steps/component-governance.yml @@ -3,7 +3,7 @@ parameters: steps: - ${{ if eq(parameters.disableComponentGovernance, 'true') }}: - - script: "echo ##vso[task.setvariable variable=skipComponentGovernanceDetection]true" + - script: echo "##vso[task.setvariable variable=skipComponentGovernanceDetection]true" displayName: Set skipComponentGovernanceDetection variable - ${{ if ne(parameters.disableComponentGovernance, 'true') }}: - task: ComponentGovernanceComponentDetection@0 diff --git a/global.json b/global.json index f1d52ca39..5bc0b5e47 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.24179.7", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24179.7" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24204.2", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24204.2" } } From a31b115900bc9c85b21ec44ea3cc35bd638c6efb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 5 Apr 2024 16:10:03 +0000 Subject: [PATCH 524/535] Update dependencies from https://github.com/dotnet/arcade build 20240404.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.24179.7 -> To Version 7.0.0-beta.24204.2 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- .../steps/component-governance.yml | 2 +- eng/common/templates/steps/component-governance.yml | 2 +- global.json | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c0a094e02..eca40dfb1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - d0ab6f8c61222a6383dc2109d039b437ba9afa92 + 31d070a59ea56ea0c25736318e4287bdd883d05f - + https://github.com/dotnet/arcade - d0ab6f8c61222a6383dc2109d039b437ba9afa92 + 31d070a59ea56ea0c25736318e4287bdd883d05f - + https://github.com/dotnet/arcade - d0ab6f8c61222a6383dc2109d039b437ba9afa92 + 31d070a59ea56ea0c25736318e4287bdd883d05f https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index b55f0b7c9..3bf13e08c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.24179.7 + 7.0.0-beta.24204.2 diff --git a/eng/common/templates-official/steps/component-governance.yml b/eng/common/templates-official/steps/component-governance.yml index babc2757d..12527b80e 100644 --- a/eng/common/templates-official/steps/component-governance.yml +++ b/eng/common/templates-official/steps/component-governance.yml @@ -3,7 +3,7 @@ parameters: steps: - ${{ if eq(parameters.disableComponentGovernance, 'true') }}: - - script: "echo ##vso[task.setvariable variable=skipComponentGovernanceDetection]true" + - script: echo "##vso[task.setvariable variable=skipComponentGovernanceDetection]true" displayName: Set skipComponentGovernanceDetection variable - ${{ if ne(parameters.disableComponentGovernance, 'true') }}: - task: ComponentGovernanceComponentDetection@0 diff --git a/eng/common/templates/steps/component-governance.yml b/eng/common/templates/steps/component-governance.yml index babc2757d..12527b80e 100644 --- a/eng/common/templates/steps/component-governance.yml +++ b/eng/common/templates/steps/component-governance.yml @@ -3,7 +3,7 @@ parameters: steps: - ${{ if eq(parameters.disableComponentGovernance, 'true') }}: - - script: "echo ##vso[task.setvariable variable=skipComponentGovernanceDetection]true" + - script: echo "##vso[task.setvariable variable=skipComponentGovernanceDetection]true" displayName: Set skipComponentGovernanceDetection variable - ${{ if ne(parameters.disableComponentGovernance, 'true') }}: - task: ComponentGovernanceComponentDetection@0 diff --git a/global.json b/global.json index f1d52ca39..5bc0b5e47 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.24179.7", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24179.7" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24204.2", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24204.2" } } From b6e59e6bd1d852db4c08801d5f8806b85e5ffb4e Mon Sep 17 00:00:00 2001 From: "Oleksandr.Didyk" Date: Mon, 8 Apr 2024 10:46:37 +0200 Subject: [PATCH 525/535] add trigger to sdk diff tests from vmr for release branches --- .../eng/pipelines/source-build-sdk-diff-tests.yml | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/SourceBuild/content/eng/pipelines/source-build-sdk-diff-tests.yml b/src/SourceBuild/content/eng/pipelines/source-build-sdk-diff-tests.yml index 47d1c4c89..36eed8cbd 100644 --- a/src/SourceBuild/content/eng/pipelines/source-build-sdk-diff-tests.yml +++ b/src/SourceBuild/content/eng/pipelines/source-build-sdk-diff-tests.yml @@ -4,8 +4,18 @@ schedules: branches: include: - main - - release/*.0.1xx* - - internal/release/*.0.1xx* + +# Relies on dotnet-source-build being in the same repo as this pipeline +# https://learn.microsoft.com/en-us/azure/devops/pipelines/process/pipeline-triggers?view=azure-devops#branch-considerations +resources: + pipelines: + - pipeline: dotnet-source-build + source: dotnet-source-build + trigger: + branches: + include: + - release/*.0.1xx* + - internal/release/*.0.1xx* pr: none trigger: none From 1f755295b51aeb0e517e52e17b2138d096926364 Mon Sep 17 00:00:00 2001 From: Ella Hathaway <67609881+ellahathaway@users.noreply.github.com> Date: Mon, 8 Apr 2024 11:57:20 -0700 Subject: [PATCH 526/535] [8.0.1xx] Update scancode to 32.1.0 (#19357) --- eng/install-scancode.sh | 2 +- .../LicenseScanTests.cs | 2 ++ .../assets/LicenseExclusions.txt | 6 +++--- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/eng/install-scancode.sh b/eng/install-scancode.sh index cec368af9..049b749c2 100755 --- a/eng/install-scancode.sh +++ b/eng/install-scancode.sh @@ -5,7 +5,7 @@ set -euo pipefail # Install instructions: https://scancode-toolkit.readthedocs.io/en/latest/getting-started/install.html#installation-as-a-library-via-pip # See latest release at https://github.com/nexB/scancode-toolkit/releases -SCANCODE_VERSION="32.0.8" +SCANCODE_VERSION="32.1.0" pyEnvPath="/tmp/scancode-env" python3 -m venv $pyEnvPath diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/LicenseScanTests.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/LicenseScanTests.cs index 8a088ba4d..72d71ef07 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/LicenseScanTests.cs +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/LicenseScanTests.cs @@ -61,6 +61,7 @@ public class LicenseScanTests : TestBase "cc-by-sa-3.0", // https://creativecommons.org/licenses/by-sa/3.0/legalcode "cc-by-sa-4.0", // https://creativecommons.org/licenses/by-sa/4.0/legalcode "cc-pd", // https://creativecommons.org/publicdomain/mark/1.0/ + "cc-sa-1.0", // https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/cc-sa-1.0.LICENSE "epl-1.0", // https://opensource.org/license/epl-1-0/ "generic-cla", // https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/generic-cla.LICENSE "gpl-1.0-plus", // https://opensource.org/license/gpl-1-0/ @@ -76,6 +77,7 @@ public class LicenseScanTests : TestBase "lzma-sdk-9.22", // https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/lzma-sdk-9.22.LICENSE "mit", // https://opensource.org/license/mit/ "mit-addition", // https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/mit-addition.LICENSE + "mit-testregex", // https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/mit-testregex.LICENSE "ms-patent-promise", // https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/ms-patent-promise.LICENSE "ms-lpl", // https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/ms-lpl.LICENSE "ms-pl", // https://opensource.org/license/ms-pl-html/ diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/LicenseExclusions.txt b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/LicenseExclusions.txt index 9bcfbafc2..4c044d907 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/LicenseExclusions.txt +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/LicenseExclusions.txt @@ -222,11 +222,11 @@ src/source-build-externals/patches/application-insights/0002-Remove-WebGrease-fr # False positive src/source-build-reference-packages/src/targetPacks/ILsrc/microsoft.netcore.app.ref/3.*/THIRD-PARTY-NOTICES.TXT|codesourcery-2004 -src/source-build-reference-packages/src/targetPacks/ILsrc/netstandard.library/1.6.1/ThirdPartyNotices.txt|unknown -src/source-build-reference-packages/src/targetPacks/ILsrc/netstandard.library/2.0.*/THIRD-PARTY-NOTICES.TXT|unknown +src/source-build-reference-packages/src/targetPacks/ILsrc/netstandard.library/1.6.1/ThirdPartyNotices.txt|unknown-license-reference +src/source-build-reference-packages/src/targetPacks/ILsrc/netstandard.library/2.0.*/THIRD-PARTY-NOTICES.TXT|unknown-license-reference src/source-build-reference-packages/src/targetPacks/ILsrc/netstandard.library.ref/2.1.0/THIRD-PARTY-NOTICES.TXT|codesourcery-2004 src/source-build-reference-packages/src/textOnlyPackages/src/microsoft.codeanalysis.collections/4.2.0-1.22102.8/ThirdPartyNotices.rtf|json -src/source-build-reference-packages/src/textOnlyPackages/src/microsoft.netcore.*/1.*/ThirdPartyNotices.txt|unknown +src/source-build-reference-packages/src/textOnlyPackages/src/microsoft.netcore.*/1.*/ThirdPartyNotices.txt|unknown-license-reference src/source-build-reference-packages/src/textOnlyPackages/src/microsoft.private.intellisense/8.0.*/IntellisenseFiles/*/1033/System.Security.Permissions.xml|unknown-license-reference # Contains references to licenses which are not applicable to the source From 96b43b4156b751cffee4e32101ee8fff9563a4f1 Mon Sep 17 00:00:00 2001 From: dotnet-sb-bot Date: Tue, 9 Apr 2024 20:03:10 +0000 Subject: [PATCH 527/535] update global.json and Versions.props for .NET SDK 8.0.104 --- src/SourceBuild/content/eng/Versions.props | 4 ++-- src/SourceBuild/content/global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/SourceBuild/content/eng/Versions.props b/src/SourceBuild/content/eng/Versions.props index dbd256551..384c27bc6 100644 --- a/src/SourceBuild/content/eng/Versions.props +++ b/src/SourceBuild/content/eng/Versions.props @@ -30,7 +30,7 @@ These URLs can't be composed from their base URL and version as we read them from the prep.sh and pipeline scripts, outside of MSBuild. --> - https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.8.0.103-servicing.24117.1.centos.8-x64.tar.gz - https://dotnetcli.azureedge.net/source-built-artifacts/sdks/dotnet-sdk-8.0.103-centos.8-x64.tar.gz + https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.8.0.104-servicing.24171.1.centos.8-x64.tar.gz + https://dotnetcli.azureedge.net/source-built-artifacts/sdks/dotnet-sdk-8.0.104-centos.8-x64.tar.gz diff --git a/src/SourceBuild/content/global.json b/src/SourceBuild/content/global.json index 54e2f96b7..99d15d703 100644 --- a/src/SourceBuild/content/global.json +++ b/src/SourceBuild/content/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "8.0.103" + "dotnet": "8.0.104" }, "msbuild-sdks": { "Microsoft.Build.CentralPackageVersions": "2.0.1", From b978fe71537e7e09167c3f6e85accdd726189f2f Mon Sep 17 00:00:00 2001 From: Ella Hathaway <67609881+ellahathaway@users.noreply.github.com> Date: Wed, 10 Apr 2024 10:37:25 -0700 Subject: [PATCH 528/535] Add 1ES PT baseline for VMR (#19336) --- .../content/.config/guardian/.gdnbaselines | 1315 +++++++++++++++++ src/SourceBuild/content/eng/pipelines/ci.yml | 3 + 2 files changed, 1318 insertions(+) create mode 100644 src/SourceBuild/content/.config/guardian/.gdnbaselines diff --git a/src/SourceBuild/content/.config/guardian/.gdnbaselines b/src/SourceBuild/content/.config/guardian/.gdnbaselines new file mode 100644 index 000000000..ce7a029cc --- /dev/null +++ b/src/SourceBuild/content/.config/guardian/.gdnbaselines @@ -0,0 +1,1315 @@ +{ + "hydrated": false, + "properties": { + "helpUri": "https://eng.ms/docs/microsoft-security/security/azure-security/cloudai-security-fundamentals-engineering/security-integration/guardian-wiki/microsoft-guardian/general/baselines", + "hydrationStatus": "This file does not contain identifying data. It is safe to check into your repo. To hydrate this file with identifying data, run `guardian hydrate --help` and follow the guidance." + }, + "version": "1.0.0", + "baselines": { + "default": { + "name": "default", + "createdDate": "2024-04-03 14:41:43Z", + "lastUpdatedDate": "2024-04-03 14:41:43Z" + } + }, + "results": { + "5f3b52e23f96eb01bcfd73ead3cbaa2e1430de0006e5103109dd39bf9f292165": { + "signature": "5f3b52e23f96eb01bcfd73ead3cbaa2e1430de0006e5103109dd39bf9f292165", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "72b28f655eadc78b21ab36a7f572708315d8d909d1b460162511e37086288e30": { + "signature": "72b28f655eadc78b21ab36a7f572708315d8d909d1b460162511e37086288e30", + "alternativeSignatures": [ + "60efb04c6e0431e477e792a96d32b30b3a309b4ee19fad084a015e2946985459" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "08dcdf31a316917a50c97d16d8d4eca5dbd7528b8cfe8c9bd8b29fdd4dc3eb85": { + "signature": "08dcdf31a316917a50c97d16d8d4eca5dbd7528b8cfe8c9bd8b29fdd4dc3eb85", + "alternativeSignatures": [ + "c6b795bd087762188cd476b81ccdb474a25495b86b8080e1ab15c5592628b8af" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "62e5fe288e1e21307317edab5d08f047ecdd01eac5c19660bab6c9ae96f8c8b5": { + "signature": "62e5fe288e1e21307317edab5d08f047ecdd01eac5c19660bab6c9ae96f8c8b5", + "alternativeSignatures": [ + "631ff94fe085c9754b83bd9fc2a15dccccccd067392cea1f520398874266248a" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "6d4429751838adeb1f1b097b6b974a6a47d744871980ee54faeb7a4536183597": { + "signature": "6d4429751838adeb1f1b097b6b974a6a47d744871980ee54faeb7a4536183597", + "alternativeSignatures": [ + "c4538b540d00c41b9828ade572431cfd476ae40ebd4c6cfc635d06ac185972e3" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "93735e0dba704ad832d7b3fdabfcda2875dee9adb24e3cd676fce3b612d116c3": { + "signature": "93735e0dba704ad832d7b3fdabfcda2875dee9adb24e3cd676fce3b612d116c3", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "a5142e7bafbf664fdcb2d4d7071ca8427c7da0c8ba66cc7706c9c07b816f1201": { + "signature": "a5142e7bafbf664fdcb2d4d7071ca8427c7da0c8ba66cc7706c9c07b816f1201", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "1ee555192f99f2751398509614249023216a98d148e57de41317ec60715374b0": { + "signature": "1ee555192f99f2751398509614249023216a98d148e57de41317ec60715374b0", + "alternativeSignatures": [ + "5d82fd3437c708ec3bfe674016099e5465194ebc53f7dd72061b98d7257a951f" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "be4c5e062093fa08fe93f0753c3090b63af74dc4af4c04d781fddf9ec41db0d4": { + "signature": "be4c5e062093fa08fe93f0753c3090b63af74dc4af4c04d781fddf9ec41db0d4", + "alternativeSignatures": [ + "bafe4e1a197b7af8b8cfda4cafd8250a4a66a0ca18b82817e12d5a4d17350589" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "c704b27a3590a23b240e9c261dc93c8f3c7871e4d471b5688c3609880396f672": { + "signature": "c704b27a3590a23b240e9c261dc93c8f3c7871e4d471b5688c3609880396f672", + "alternativeSignatures": [ + "0880869d43948d2f7050955aeb76733bc12ab82839563cbabff0dd36d0880a39" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "b6aecc1d8697beab291f9925633b5ec3e37a088033efc7e93928fd9cac96cda4": { + "signature": "b6aecc1d8697beab291f9925633b5ec3e37a088033efc7e93928fd9cac96cda4", + "alternativeSignatures": [ + "985838b2d1518f507c85ae0f635951bad92dde58eb24c252d7e56fb6ccda6191" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "ed7c9f876d0784c23991b9ce1abc7c0df6229e7eed8cda08e56315b5fdeb5fa0": { + "signature": "ed7c9f876d0784c23991b9ce1abc7c0df6229e7eed8cda08e56315b5fdeb5fa0", + "alternativeSignatures": [ + "d2f6b006ae6b54ff39886db273b9ffc9ba23f0a84861bbe028aa54343fb5c55b" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "ae448b96e62d898485a9df57a24a920740c5504d4854e85e8060a1ba94752dbb": { + "signature": "ae448b96e62d898485a9df57a24a920740c5504d4854e85e8060a1ba94752dbb", + "alternativeSignatures": [ + "6590282ea3895180725cbb97a9e565571bb27b596bb6a6d1087b62078ed1d683" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "2e86a1d345364972a25bfe0a38237afa382766115808bb86bac8ca03e4cca304": { + "signature": "2e86a1d345364972a25bfe0a38237afa382766115808bb86bac8ca03e4cca304", + "alternativeSignatures": [ + "c079fd753fcba1568d79c4bef9fd6200b494f1552bedc1e91902ec8f01081fd7" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "5c349e8f183364d99cde545c6da7549c9d6227957c820fcde8e8beb2b40de39c": { + "signature": "5c349e8f183364d99cde545c6da7549c9d6227957c820fcde8e8beb2b40de39c", + "alternativeSignatures": [ + "8546393d391f4010c04ed43788c36626f870b02028937cf390014c660f657f7b" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "a9e7b46f71cc21fd96e3bbb1c30a7beb36470f0a4c857794b4444856e54ffc2b": { + "signature": "a9e7b46f71cc21fd96e3bbb1c30a7beb36470f0a4c857794b4444856e54ffc2b", + "alternativeSignatures": [ + "34597b8dc5d2e482d7178a50440f3b8815c44e510906dd92a4d31d434c87053b" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "3df69ea15defeb820ba0823dc80513e75a79b049dee023b51dee4419cd1d2276": { + "signature": "3df69ea15defeb820ba0823dc80513e75a79b049dee023b51dee4419cd1d2276", + "alternativeSignatures": [ + "deb5cfe250ae8f9c1bbcdf230c425dc071067ee26cc7b3d41b9fc078782febfc" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "c2b86ae10a9ad117f56bf792ae0a8a99bfbe1945254d156dd685e41dc74dd5ed": { + "signature": "c2b86ae10a9ad117f56bf792ae0a8a99bfbe1945254d156dd685e41dc74dd5ed", + "alternativeSignatures": [ + "7c13381c5c5bf98666c53e6497f0d6c8b2463fd2d7e0a0084edce348edb2a98b" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "7ec5369cb17143314826ef4e433320ab257e00485568fed9ca59d6ddf1ad166a": { + "signature": "7ec5369cb17143314826ef4e433320ab257e00485568fed9ca59d6ddf1ad166a", + "alternativeSignatures": [ + "7e1528556c5286830d73b23164ea8c99103c6344228bb91390c9943cb6090ff3" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "e71596904ef990bac717b0973b8fd3e36d52b3a45713bf8babb88f1ab0493360": { + "signature": "e71596904ef990bac717b0973b8fd3e36d52b3a45713bf8babb88f1ab0493360", + "alternativeSignatures": [ + "ff25e34637fb05921a126d3143eef03b8006f580e993ef5a7d2e27ec5178ee9a" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "32eb952e8561b331092ec83b626102388202071d192f9eb22c233b06ea90d2a1": { + "signature": "32eb952e8561b331092ec83b626102388202071d192f9eb22c233b06ea90d2a1", + "alternativeSignatures": [ + "cce04b0a7c54b775c1464a32d85804de7d1777ac2a6d21da8b080c29ac46162c" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "7d3c27b6bd42f58e624890a1669c188c6afee080e6330673942d364641876d52": { + "signature": "7d3c27b6bd42f58e624890a1669c188c6afee080e6330673942d364641876d52", + "alternativeSignatures": [ + "29d9fec9e2b10d721512bb68a68759baa33b6bbc0683a2d3d5cdcb74894917ee" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "42c9ee2033a50a53e2fcc83cb08b3a8c38a5c9e2230414ae0590d3c8f45a9a8d": { + "signature": "42c9ee2033a50a53e2fcc83cb08b3a8c38a5c9e2230414ae0590d3c8f45a9a8d", + "alternativeSignatures": [ + "44e2cd3b2773d63b155f2093202415744b74f8b5c47612ad92f2ffee3939cb2f" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "ea00dd596b6f25ad7fb56f8433aa4889808c48a9d753eeb896438d871f1bbadf": { + "signature": "ea00dd596b6f25ad7fb56f8433aa4889808c48a9d753eeb896438d871f1bbadf", + "alternativeSignatures": [ + "e6e7be75b6234262188b18265bdef3aca61e7ad4b9e0712b34ad9af2605ff5bf" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "b4e3d369cd32329e640bc7984528cdda54a9bdea2b52a5c3ed026fc57be64afd": { + "signature": "b4e3d369cd32329e640bc7984528cdda54a9bdea2b52a5c3ed026fc57be64afd", + "alternativeSignatures": [ + "8f19b3c3b99054f4c34e62dbb042d4505190bae61f7c815659e825e1e3f6585d" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "869eabde635eff83abaf3ceae639a4dfe5b6e1fc2be56bde177999b341ee7fa7": { + "signature": "869eabde635eff83abaf3ceae639a4dfe5b6e1fc2be56bde177999b341ee7fa7", + "alternativeSignatures": [ + "879cee54b1ce34bf674d7bea56317d5e606a8a6d1909e28831a801c3c760547c" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "c30ea658de240cc77f43da72a2ae66a8300716df1a36e5aad2ccf0041405512b": { + "signature": "c30ea658de240cc77f43da72a2ae66a8300716df1a36e5aad2ccf0041405512b", + "alternativeSignatures": [ + "f9010fdbf887fec3fb12dc784714ae4993cfbb0c279ceb32de179be14113851c" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "29a080743f4448e5fb1c2556f824a2f4950ec05ae1d5baa76157bc6425e08a1e": { + "signature": "29a080743f4448e5fb1c2556f824a2f4950ec05ae1d5baa76157bc6425e08a1e", + "alternativeSignatures": [ + "f6f78c526c85382e749badcc83d5d3e81976879e727417fef1b81b83faec67f0" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "5c1de06651f26dcbfaa7256b674dc725934d1892a58ab1655fed98c7d062c84c": { + "signature": "5c1de06651f26dcbfaa7256b674dc725934d1892a58ab1655fed98c7d062c84c", + "alternativeSignatures": [ + "6435a356edc13cd3ae7609656ff1920116c1f944e1d63b2ceec921d4e3f6464d" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "dd15f0a91faa86197e2bc286d99e9b0e5e625930ad53a5fae4e0a8c2b80b91ee": { + "signature": "dd15f0a91faa86197e2bc286d99e9b0e5e625930ad53a5fae4e0a8c2b80b91ee", + "alternativeSignatures": [ + "6252f589ff1cb3d68f758c8f081fd3e59d8cc56bfaa29441b9e26b1cd5726faa" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "3db9957bb879335816149b88a3fed78468210e7480dd31db37845b97d28078ad": { + "signature": "3db9957bb879335816149b88a3fed78468210e7480dd31db37845b97d28078ad", + "alternativeSignatures": [ + "4c6e2de131da98d97f9f4ab9a07fb90f6ca478f578d0bd4da7a7551683c886d7" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "cda6b64f47374712a1488b1ca527f54310e135ceb7e4611e75f28aed7f4edd43": { + "signature": "cda6b64f47374712a1488b1ca527f54310e135ceb7e4611e75f28aed7f4edd43", + "alternativeSignatures": [ + "c7c9b966693a21385b7c2f4a36c5c3c6a410cda29716d1c10537f6463cb852af" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "61eab78163233a43bc21bf8a2a762496cd63758852ed1afcfe73d4ebd90532e9": { + "signature": "61eab78163233a43bc21bf8a2a762496cd63758852ed1afcfe73d4ebd90532e9", + "alternativeSignatures": [ + "2584c057a56958edc47e8f9ed26ed2e4b2fbee706d4a5fe6793d42044754f016" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "201a1737b9cd0a61c986dc37678141a290fe56e518c4d7401443d83f89635758": { + "signature": "201a1737b9cd0a61c986dc37678141a290fe56e518c4d7401443d83f89635758", + "alternativeSignatures": [ + "3b2032f4ca90c12c9b5ea35ac6e85ba10a32f7d018b39369e044ae4d039e000b" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "bcb0788172282f0f5ab22907ec5070573092309654c8eb07dc92fb4e676ded80": { + "signature": "bcb0788172282f0f5ab22907ec5070573092309654c8eb07dc92fb4e676ded80", + "alternativeSignatures": [ + "8c37a63c016612477d48726a77b74eb798e45c09e6c2212fbd57ca10aa88dd59" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "5dc266c64bff96e86a1a3907386531e16f0dcf38f5b1bcdba22f45e7965c6bf7": { + "signature": "5dc266c64bff96e86a1a3907386531e16f0dcf38f5b1bcdba22f45e7965c6bf7", + "alternativeSignatures": [ + "ad996650f8e2b17aeddcea222c0861f9cb257aee49f31e01a4de573d23e1b0fb" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "845ca607828540eafa4053b4f9368b97c23258b9b47ceecbcec8bd7e5aa59302": { + "signature": "845ca607828540eafa4053b4f9368b97c23258b9b47ceecbcec8bd7e5aa59302", + "alternativeSignatures": [ + "c2cb1a24bf7f267ad949c325feaf69f29f60dd019f1b3879391f85f7d5316800" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "89bed4bb6776c3155318e4ff38e5062f655834cebcdf6f65b08cbd2312ac75f8": { + "signature": "89bed4bb6776c3155318e4ff38e5062f655834cebcdf6f65b08cbd2312ac75f8", + "alternativeSignatures": [ + "c805484f8267753ac6867fe334b6ecfa42d2430b21488501a926b9d49a679bb1" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "c2496232c1468a250e567517e0a7a71632e3ed60330784450511cef2a1164af0": { + "signature": "c2496232c1468a250e567517e0a7a71632e3ed60330784450511cef2a1164af0", + "alternativeSignatures": [ + "723a97522d855b779b011a0a6f84ea1ee7cf77d05f2b4808ffdbd521e655e6e3" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "e75c5f821dc59179ed407ca3da917756cd0cff7aac1755df7ef0ef6bf087f80c": { + "signature": "e75c5f821dc59179ed407ca3da917756cd0cff7aac1755df7ef0ef6bf087f80c", + "alternativeSignatures": [ + "420deccac3e08a232a59caa2178b503d310d2645f847150b564dc8e02b28fbee" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "ad85fce8c033defdd63db5aa4ec2b2197bbf9310b506241e88bcd48b5a3b41da": { + "signature": "ad85fce8c033defdd63db5aa4ec2b2197bbf9310b506241e88bcd48b5a3b41da", + "alternativeSignatures": [ + "784f946934a1f42d820c8a61ac865a094d735d0cfcca4c88fe10482306abf958" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "316329783213340b7da3052b8177bd48e10a05bf242da08dc6f9785361be2389": { + "signature": "316329783213340b7da3052b8177bd48e10a05bf242da08dc6f9785361be2389", + "alternativeSignatures": [ + "2f83c91b8c20ef743240ee45997e2af37d73a0dd99d2ea345794960d775b567d" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "2db32a47c814adc0ee80e257e1cb878a9054b92e6809cd9231690856066bcb33": { + "signature": "2db32a47c814adc0ee80e257e1cb878a9054b92e6809cd9231690856066bcb33", + "alternativeSignatures": [ + "249d66492a4d48df01ea2c04aa25e302ad17daf74d130194bec5a90405111da4" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "d2e9bf6a7e357eb1b1d594a06ed00bdf9fa193110f08e45f8e748427a370bfba": { + "signature": "d2e9bf6a7e357eb1b1d594a06ed00bdf9fa193110f08e45f8e748427a370bfba", + "alternativeSignatures": [ + "41a0e4c2bbd23190b2ebaf6163c0a9471f126cd6c2144e8377d9cb1bf0a391ef" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "c1e109d2139e82ef8545bb12a0431f4d25f2a805c9b5f71523515dbbb0be9fc3": { + "signature": "c1e109d2139e82ef8545bb12a0431f4d25f2a805c9b5f71523515dbbb0be9fc3", + "alternativeSignatures": [ + "69b330936de5c13b57fd7f0f7590a7e66efa3dba98715b5f07d8953662df5025" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "ec60cc4e84b44896c9f5a516e705340feebdaa61be024c82b07b546d3ad0c276": { + "signature": "ec60cc4e84b44896c9f5a516e705340feebdaa61be024c82b07b546d3ad0c276", + "alternativeSignatures": [ + "f9c44b75edceaeaae9611fd772b6774ce086227bb3b758dd3844c57511fb2e7a" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "5184980ee9ace427259fcaa3ee796a48efb25a7141fc16426c08dbc8903dbca9": { + "signature": "5184980ee9ace427259fcaa3ee796a48efb25a7141fc16426c08dbc8903dbca9", + "alternativeSignatures": [ + "0610a76e8ba9f8fef499d2364bac7db02436cc8f89cee26eac4c6c2c6cab952c" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "148a534bb099170811f8dcc0d51c1caa399488739a5ee98fb12bee51c7a9244d": { + "signature": "148a534bb099170811f8dcc0d51c1caa399488739a5ee98fb12bee51c7a9244d", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "1d9de8cd0e3cf1749dc40ad234b9d84e263f241dbcd8b35320808c8381840c3a": { + "signature": "1d9de8cd0e3cf1749dc40ad234b9d84e263f241dbcd8b35320808c8381840c3a", + "alternativeSignatures": [ + "8af561a51ebf9394b93708f512784edbbaa8c13872c2f56da4c5b418f71ad34d" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "d71d8881e3ad39939ff9894639cdc0012d968b48038b872ca7eba15ba93cbfe9": { + "signature": "d71d8881e3ad39939ff9894639cdc0012d968b48038b872ca7eba15ba93cbfe9", + "alternativeSignatures": [ + "bea919b0d9a2e6c38a6de6300616becf31809eaa49616e63ab90118b5ec331eb" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "4dbb69e7a5bbcaf97ee14aa268f0cc4b375111db79d91bc48b438f15e7f29859": { + "signature": "4dbb69e7a5bbcaf97ee14aa268f0cc4b375111db79d91bc48b438f15e7f29859", + "alternativeSignatures": [ + "52e95c355d30e2e33b6ad0cf11af5c31db038107a89dd120854c94857aa2298b" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "2960b8fc6b1f6665b5988544f1d44a05dfe83b9b39a14efef5e042d7a78e4e19": { + "signature": "2960b8fc6b1f6665b5988544f1d44a05dfe83b9b39a14efef5e042d7a78e4e19", + "alternativeSignatures": [ + "b4177488d7a45f4a54472adf8bb97026f0799e61e10f580ea52fbbd74cf08f10" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "c1c411bf7b80d684d2c444ed611f333f08f1073fbaaf4c6bd0238c16ffccbe4d": { + "signature": "c1c411bf7b80d684d2c444ed611f333f08f1073fbaaf4c6bd0238c16ffccbe4d", + "alternativeSignatures": [ + "8ca9e6612eb3802d5c1fd93ce0f1de61c2559512966fc97dcbeb017d1942c0fe" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "a0437af80b26a79fc6c7e101114a0a455bd0bc7a4e9ccea1fa3b355aaac07390": { + "signature": "a0437af80b26a79fc6c7e101114a0a455bd0bc7a4e9ccea1fa3b355aaac07390", + "alternativeSignatures": [ + "495012003aa9faede4c4ad115a12784f6a8f549e1ebe976537b021d6e5296da9" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "0df8574205ace03dd154be3c3a221b36feae675ac237c8fea3b994f48df75fb8": { + "signature": "0df8574205ace03dd154be3c3a221b36feae675ac237c8fea3b994f48df75fb8", + "alternativeSignatures": [ + "15f5632806a855b11f25dc0c899f5f3982b9f92340841b85b35f9f5666c36921" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "851935ee9fe368011d0d65b595a839000849d57904224cd947664078ba46874d": { + "signature": "851935ee9fe368011d0d65b595a839000849d57904224cd947664078ba46874d", + "alternativeSignatures": [ + "c8aefc4c57da1e828bfa02df6e1abc444cc98f2e9ba3f1b0bb4a4f0c04d1fab0" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "ba2a917a447947c7e8598dc49f18f6a918548051ed56fb0f38d801f52ebdaef0": { + "signature": "ba2a917a447947c7e8598dc49f18f6a918548051ed56fb0f38d801f52ebdaef0", + "alternativeSignatures": [ + "0460e5c64d667a95521ca05da96915a79178a361764141acf4bf7c4a75c3e47e" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "91b70c20fca1cd70bc4d7a34ba446f9a79d78c3c73ed708750062fe49a55324e": { + "signature": "91b70c20fca1cd70bc4d7a34ba446f9a79d78c3c73ed708750062fe49a55324e", + "alternativeSignatures": [ + "c884dc16288b0bfa8d5e7f06638c7c61a16bc42328f5a32c43f1d39c38da31f8" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "519f950c7bea3463674233b674b3093990f25167389e2d1ea82cfdf5b0ad0abf": { + "signature": "519f950c7bea3463674233b674b3093990f25167389e2d1ea82cfdf5b0ad0abf", + "alternativeSignatures": [ + "e3af28a3737f3eda0c96f52925a36770b7ccc6f3238b4ea855ce4b1d0e6e8f4b" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "192073ddefc720c7b9af682598676a54d54492be32707bf4bef8b3233e8aa1bb": { + "signature": "192073ddefc720c7b9af682598676a54d54492be32707bf4bef8b3233e8aa1bb", + "alternativeSignatures": [ + "795fa0e8fdbd60d899b1372eb853ec5b0b9b32c2f9117364c2f63856b7b17763" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "85c9f67cf21f805e1e507792f3b78c20703a374e04a7a50a071250d75a3a34c5": { + "signature": "85c9f67cf21f805e1e507792f3b78c20703a374e04a7a50a071250d75a3a34c5", + "alternativeSignatures": [ + "e387a1c8ec270a1be5c6048f2759118f30d2f43efceec3fae2aa37c892352391" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "000bea6b6816c3cf71200ceeccd187ac5d43172eb225d70b53f27cf94e4e0091": { + "signature": "000bea6b6816c3cf71200ceeccd187ac5d43172eb225d70b53f27cf94e4e0091", + "alternativeSignatures": [ + "977df07ec18dc533ce706b09124ec76a13719ca51a7e101762a0fb49c99b6985" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "cc40ef86620baaad1faea5a6f3f6b19268b9e8f2fe7169c37dd9d1b1216225b5": { + "signature": "cc40ef86620baaad1faea5a6f3f6b19268b9e8f2fe7169c37dd9d1b1216225b5", + "alternativeSignatures": [ + "154f374516f141697b001546e7871a8f6377f3da5d8a42565fc035fcacbc9d22" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "f4c4a77a4a11940d05fa6484e202593866f3cc943f0679506a6dfbf3e2e3f254": { + "signature": "f4c4a77a4a11940d05fa6484e202593866f3cc943f0679506a6dfbf3e2e3f254", + "alternativeSignatures": [ + "70e7d79088b1beda828977ecbbfd908e56848a3f7b0963dcbabb087c49ad650c" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "7918a138214555e83a85a32519dd6fc31971b28aa956f66583194530de8b009c": { + "signature": "7918a138214555e83a85a32519dd6fc31971b28aa956f66583194530de8b009c", + "alternativeSignatures": [ + "479b344b41e42fb75f1205d3643792af4211d89a7881dfac007fd6c7c5358e09" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "fa7347c7f64562b9d7e0be884bcc9d60232f6995b2139a052bf4b8cfcc3d424a": { + "signature": "fa7347c7f64562b9d7e0be884bcc9d60232f6995b2139a052bf4b8cfcc3d424a", + "alternativeSignatures": [ + "8926b16a96043571d926ccc99741a5844bb54b1215ccc929568d2dc528da9e40" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "3c494c3cdc3d2ab897a96f5b498fbf1731ba2c6dcc73e49399083635bc084e8a": { + "signature": "3c494c3cdc3d2ab897a96f5b498fbf1731ba2c6dcc73e49399083635bc084e8a", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "8bb20ad2a210dc906e39ceb48b0a6a39b240878688ad6854161240ae3a597c87": { + "signature": "8bb20ad2a210dc906e39ceb48b0a6a39b240878688ad6854161240ae3a597c87", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "486f45a6c6f00cc927a87f4b7b122829bee893d6f523fed279e7e2deda450aff": { + "signature": "486f45a6c6f00cc927a87f4b7b122829bee893d6f523fed279e7e2deda450aff", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "643ded93447723ad1faad1de45b19108d986db08e488174a5422f3f1f7f0f7a3": { + "signature": "643ded93447723ad1faad1de45b19108d986db08e488174a5422f3f1f7f0f7a3", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "51d877cdee6cab498e1a0fd4c4dd2702b3e5da9eb308e0a631d2104e2d3d2a8c": { + "signature": "51d877cdee6cab498e1a0fd4c4dd2702b3e5da9eb308e0a631d2104e2d3d2a8c", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "849b1bea0ba2f8d1c24a58896b9d230ca317e8cff7e9540f73d578dd1aba12cb": { + "signature": "849b1bea0ba2f8d1c24a58896b9d230ca317e8cff7e9540f73d578dd1aba12cb", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "c535332f090c89ae22a79aac4b9d344333c5479b891b79d72d252611c9364450": { + "signature": "c535332f090c89ae22a79aac4b9d344333c5479b891b79d72d252611c9364450", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "bc8ce9f1fd92dd123db1b6f8c33d15123bc8f3c4cb4fd42c54b4a2c5210bb158": { + "signature": "bc8ce9f1fd92dd123db1b6f8c33d15123bc8f3c4cb4fd42c54b4a2c5210bb158", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "9507f913c4445bebb9bdd471960011afa198c1e42d19c45d44aea58af61a137d": { + "signature": "9507f913c4445bebb9bdd471960011afa198c1e42d19c45d44aea58af61a137d", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "9ac9e0a5efc7c0d1e6d89422ca8e70e913eaba647ef42650f0bbc50da080a556": { + "signature": "9ac9e0a5efc7c0d1e6d89422ca8e70e913eaba647ef42650f0bbc50da080a556", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "5d49433b67f4a2f1b6b323c498722d16aeda2d8781dafe9fcb9faaf9db4ee3e1": { + "signature": "5d49433b67f4a2f1b6b323c498722d16aeda2d8781dafe9fcb9faaf9db4ee3e1", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "71ee57f56c77339e4a0cb3f5bdfd05d15191136fc8ad887cef26fe1488522529": { + "signature": "71ee57f56c77339e4a0cb3f5bdfd05d15191136fc8ad887cef26fe1488522529", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "74b8ab85959da39f4da6710c6375080c44c8929d6b68f59a06dede355aeffacc": { + "signature": "74b8ab85959da39f4da6710c6375080c44c8929d6b68f59a06dede355aeffacc", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "ca37e6fb6eb26bdec92893b3f6b08f8f41e6241f573a1b8e14d4e4d4ff1d2c7a": { + "signature": "ca37e6fb6eb26bdec92893b3f6b08f8f41e6241f573a1b8e14d4e4d4ff1d2c7a", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "d7657bb2e0603e7b353f7b1e1d884306fe44f116c7665192fd6b33003333ef7a": { + "signature": "d7657bb2e0603e7b353f7b1e1d884306fe44f116c7665192fd6b33003333ef7a", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "90b7e7a132c8df4864a9ee49670cbaec9cbc5f5c53bf009eba5a583e0934a24f": { + "signature": "90b7e7a132c8df4864a9ee49670cbaec9cbc5f5c53bf009eba5a583e0934a24f", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "8a5003e2db05146eaba3a7fc7aba715f51a5506b741a6ac2662e47e39c6165aa": { + "signature": "8a5003e2db05146eaba3a7fc7aba715f51a5506b741a6ac2662e47e39c6165aa", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "02590eb0efbb241f09bae58f60907c6dee5b33507519a4be87e168a458c2b9cb": { + "signature": "02590eb0efbb241f09bae58f60907c6dee5b33507519a4be87e168a458c2b9cb", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "df250772236d85876a9d789cca90b48e5eb79ad6cb13782465c8c88366c5d845": { + "signature": "df250772236d85876a9d789cca90b48e5eb79ad6cb13782465c8c88366c5d845", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "3cd8e3eb9b94b01c93591c685406ea91d9d31b16aace0f109734e4bacb3838f2": { + "signature": "3cd8e3eb9b94b01c93591c685406ea91d9d31b16aace0f109734e4bacb3838f2", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "e91e45a96bf36327f551eadf27d9598b3d058fc051b0f9f0f1da9420410dc79a": { + "signature": "e91e45a96bf36327f551eadf27d9598b3d058fc051b0f9f0f1da9420410dc79a", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "1c8a3d52bb83c1fbd1208b94663769b6452e73988540113dff20bfb4df4ca010": { + "signature": "1c8a3d52bb83c1fbd1208b94663769b6452e73988540113dff20bfb4df4ca010", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "8839c1c5ab6e962faf123ad7b79a584170d6491855f69555664986a425984a36": { + "signature": "8839c1c5ab6e962faf123ad7b79a584170d6491855f69555664986a425984a36", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "d2df996be35f179b45a3bdc28fcd9d5254a924ab52d2ca14b068bfea35e65284": { + "signature": "d2df996be35f179b45a3bdc28fcd9d5254a924ab52d2ca14b068bfea35e65284", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "7a20b01096651f581c51904be7cd1281150c40efc61352b70aabbca3c40ea177": { + "signature": "7a20b01096651f581c51904be7cd1281150c40efc61352b70aabbca3c40ea177", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "ef394eaa05e6eb5af1f5e523fd01f4e970f36cb2c7eacb3d363b47c9f70b0fec": { + "signature": "ef394eaa05e6eb5af1f5e523fd01f4e970f36cb2c7eacb3d363b47c9f70b0fec", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "cb83a69b59f2de3fa1d049750ddeb855030d5662c43a1c5fea6b95f01e21547f": { + "signature": "cb83a69b59f2de3fa1d049750ddeb855030d5662c43a1c5fea6b95f01e21547f", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "d08376cdfec80b5c0884a8b85f18c8b34ffee19f1395d12aef1ffc2821120f03": { + "signature": "d08376cdfec80b5c0884a8b85f18c8b34ffee19f1395d12aef1ffc2821120f03", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "ef471993ee9839701feba16b5b56a926545a165bf95224130d6c8a2bdafdd451": { + "signature": "ef471993ee9839701feba16b5b56a926545a165bf95224130d6c8a2bdafdd451", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "d742600df5b4b6b71f65cf0079b09ec36a5d58bb4b8b07923b13ab8458f68a15": { + "signature": "d742600df5b4b6b71f65cf0079b09ec36a5d58bb4b8b07923b13ab8458f68a15", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "fd9536ec348269dbb12b813270403b7410fc13575d1cbb7770604dcf54ee776b": { + "signature": "fd9536ec348269dbb12b813270403b7410fc13575d1cbb7770604dcf54ee776b", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "1614f1f0821f8900c7c8d2cb3a784272518ef6b86fb82070bda88b4bac9dbda8": { + "signature": "1614f1f0821f8900c7c8d2cb3a784272518ef6b86fb82070bda88b4bac9dbda8", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "3479973e9ab00c84264e70c5d7290a5bfda506aafdb08c3277cb1df5db688ab9": { + "signature": "3479973e9ab00c84264e70c5d7290a5bfda506aafdb08c3277cb1df5db688ab9", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "e5bd231f55be121ed2579da9651c4ec0e661a386991ef8463facf3588c306a06": { + "signature": "e5bd231f55be121ed2579da9651c4ec0e661a386991ef8463facf3588c306a06", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "19661fe89c5e1f59089cdec06cbdf6bdda2439b52731dfd630b50ff5885d6223": { + "signature": "19661fe89c5e1f59089cdec06cbdf6bdda2439b52731dfd630b50ff5885d6223", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "3bf81d57b0872ef6c8ac7878513cb8f58044e07238883f71f24b09542a8d1a07": { + "signature": "3bf81d57b0872ef6c8ac7878513cb8f58044e07238883f71f24b09542a8d1a07", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "2e07fdf491a04fc8a6cc50ae299f8345a81798499bda961a118e974970bb71a8": { + "signature": "2e07fdf491a04fc8a6cc50ae299f8345a81798499bda961a118e974970bb71a8", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "560fdab2979120fa3cfd2d9865d1ce2c0ba164982cc086cdc871b7e16fd12466": { + "signature": "560fdab2979120fa3cfd2d9865d1ce2c0ba164982cc086cdc871b7e16fd12466", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "489c5d92c47b3c961db0d5c32426a4d5fb48311e46ae49791be0f6ef03ddfc6e": { + "signature": "489c5d92c47b3c961db0d5c32426a4d5fb48311e46ae49791be0f6ef03ddfc6e", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "5890ec8b0f533c8186a824f1b46b2d99c2d54e7ed09917e5fedcdaea19b34706": { + "signature": "5890ec8b0f533c8186a824f1b46b2d99c2d54e7ed09917e5fedcdaea19b34706", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "70a8cd9f176fa02a78470ae78c285f56b617060ec339f0c8dfda095a5b0fc6c9": { + "signature": "70a8cd9f176fa02a78470ae78c285f56b617060ec339f0c8dfda095a5b0fc6c9", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "7afd296a74705d2e561497c0ab8c3750179c1eff425f496297d3b877ff718526": { + "signature": "7afd296a74705d2e561497c0ab8c3750179c1eff425f496297d3b877ff718526", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "6ffd69e0724ed3b57e926224932b0aeeed7a834ee5dc1ad24c3262deb49172d7": { + "signature": "6ffd69e0724ed3b57e926224932b0aeeed7a834ee5dc1ad24c3262deb49172d7", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "ca298b6b96ebfae8f14e29993264310b89fd738b365c2e7ca04e7af1a5cd67b7": { + "signature": "ca298b6b96ebfae8f14e29993264310b89fd738b365c2e7ca04e7af1a5cd67b7", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "8764975fced41745e1a9c844144b2aacd30d3fcd77a8c4b1067adc5f2cd8b990": { + "signature": "8764975fced41745e1a9c844144b2aacd30d3fcd77a8c4b1067adc5f2cd8b990", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "7cc3b3782554547d94e0f2e8817dbf823a84de8a95b6b358bdd29067bcff64c3": { + "signature": "7cc3b3782554547d94e0f2e8817dbf823a84de8a95b6b358bdd29067bcff64c3", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "db15b8200219494e427c3943404a81e931bf17af175823bc51da9b85b63a6831": { + "signature": "db15b8200219494e427c3943404a81e931bf17af175823bc51da9b85b63a6831", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "979582e68b87ec6e4cd7d90df4e05f01a6f9150ed07a0abc205112a241f0c16f": { + "signature": "979582e68b87ec6e4cd7d90df4e05f01a6f9150ed07a0abc205112a241f0c16f", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "56b251ecea166720fac682142922d79e01699a8cc576683b6d8944dfd3158de2": { + "signature": "56b251ecea166720fac682142922d79e01699a8cc576683b6d8944dfd3158de2", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "cbcd76cbd2a6b0a8028fd6c3d1d11ee2e211519af2420396399c3c111a4da667": { + "signature": "cbcd76cbd2a6b0a8028fd6c3d1d11ee2e211519af2420396399c3c111a4da667", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "8060e90601237ded928ae57570ef982dd3a57e7bffbec010fcd37e0bda518f10": { + "signature": "8060e90601237ded928ae57570ef982dd3a57e7bffbec010fcd37e0bda518f10", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "bc4b0a2231b13e5472e1548250ef4d7174d130daf559bca81f5d3c2c0c169690": { + "signature": "bc4b0a2231b13e5472e1548250ef4d7174d130daf559bca81f5d3c2c0c169690", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "91f0752674a19d0db604c50e23950746ff4d231cc76e40a7fa0f53dd5e855f4d": { + "signature": "91f0752674a19d0db604c50e23950746ff4d231cc76e40a7fa0f53dd5e855f4d", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "889e33f8e52ecb1d2b98d28772c572c2a10f0dc0c22fcc03b1da03df008d5f91": { + "signature": "889e33f8e52ecb1d2b98d28772c572c2a10f0dc0c22fcc03b1da03df008d5f91", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "6969ae787ed7e1caef670545de569929814479666e60a227abcb36395c3d3f60": { + "signature": "6969ae787ed7e1caef670545de569929814479666e60a227abcb36395c3d3f60", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "81adfccafd8eb134b75b59de6d4d0d8198c4639a3972d8072b61c67c9e1a104d": { + "signature": "81adfccafd8eb134b75b59de6d4d0d8198c4639a3972d8072b61c67c9e1a104d", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "cf0223227addcd8b17bc89e4e5f0ee9174bca83c9ffc5b5493ef74940b33b58c": { + "signature": "cf0223227addcd8b17bc89e4e5f0ee9174bca83c9ffc5b5493ef74940b33b58c", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "fc000248c70e613f381ee770fb96dfd28e26766fa9627d28e5b9eb5fb314a3c8": { + "signature": "fc000248c70e613f381ee770fb96dfd28e26766fa9627d28e5b9eb5fb314a3c8", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "2987ea627ea4f2effb417244c4aac8f554bf42136d6ebe0fef1df440410be09c": { + "signature": "2987ea627ea4f2effb417244c4aac8f554bf42136d6ebe0fef1df440410be09c", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "4c2880cbace8da677942b80be039a982e356c18c827ebeddab265175c9640427": { + "signature": "4c2880cbace8da677942b80be039a982e356c18c827ebeddab265175c9640427", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "849ea2c1bdff1b36df8848a7f8898f11e981c3ba8f9b033abd9d1e8b1a03c8ca": { + "signature": "849ea2c1bdff1b36df8848a7f8898f11e981c3ba8f9b033abd9d1e8b1a03c8ca", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "1706aea6ec9bfbbe540cfab3713db9b1a9ebc7f475b49f2348860e3ee6d8e682": { + "signature": "1706aea6ec9bfbbe540cfab3713db9b1a9ebc7f475b49f2348860e3ee6d8e682", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "8369054f43a96d4f463976b23773b2d22f8081d95f715161f019ceb58296d64a": { + "signature": "8369054f43a96d4f463976b23773b2d22f8081d95f715161f019ceb58296d64a", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "4ab520e2ed77b36c88f9eeeb5473205fd7f8f0a761eacee4cbbff389368dad8f": { + "signature": "4ab520e2ed77b36c88f9eeeb5473205fd7f8f0a761eacee4cbbff389368dad8f", + "alternativeSignatures": [ + "7ad51ffeb7d5438f15781162de5183c58d5db2d195f96e8c3527451adeb4e02c" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "96ab8bbaf30065be77880d679174d028a151c0fc888fca38a79038d341710563": { + "signature": "96ab8bbaf30065be77880d679174d028a151c0fc888fca38a79038d341710563", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "7bda7ae4037698bbdf188b4d3fb8a82e99063a8df2dcfe5f66ef747e3bd3f1a0": { + "signature": "7bda7ae4037698bbdf188b4d3fb8a82e99063a8df2dcfe5f66ef747e3bd3f1a0", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "a2dcb4a5d7e266049f9f865b27e69af19447e94f63ec9de8290763ddf901c756": { + "signature": "a2dcb4a5d7e266049f9f865b27e69af19447e94f63ec9de8290763ddf901c756", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "3aaf66a9a1f5bfba3b78eb7964ce8bf4dcabf7132465a31e219c6961f53dec56": { + "signature": "3aaf66a9a1f5bfba3b78eb7964ce8bf4dcabf7132465a31e219c6961f53dec56", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "c6ed8bf76382b72621892d895d0659eb8ed66ef400f5d38506a3b62129b0f60e": { + "signature": "c6ed8bf76382b72621892d895d0659eb8ed66ef400f5d38506a3b62129b0f60e", + "alternativeSignatures": [ + "07873a6bbdd04caf121ed279cd4c24e55fb79ae3e86083c413b839d8d5e81cba" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "c511a0f0c15b79748a62ee0198689e7a0c8c2af102730c337823f6cd52b3ec66": { + "signature": "c511a0f0c15b79748a62ee0198689e7a0c8c2af102730c337823f6cd52b3ec66", + "alternativeSignatures": [ + "7142b2e2126a0c0e5bf2ad08e9e56d405620fbb9f12dfcd3f90a9dfcc30f8bf5" + ], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "bfe258b52e19062b9009a68549bff3b2c99a6105f493cbf14332b3366691d446": { + "signature": "bfe258b52e19062b9009a68549bff3b2c99a6105f493cbf14332b3366691d446", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "52364f6839cf4bc824f1c82a31f3c7ee1cfb228383b3bee476ef7442526c0de8": { + "signature": "52364f6839cf4bc824f1c82a31f3c7ee1cfb228383b3bee476ef7442526c0de8", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "cef12040ed2c91d3bd7eba717e6c4bff8e547cb6d2b40363f1d859b02c873276": { + "signature": "cef12040ed2c91d3bd7eba717e6c4bff8e547cb6d2b40363f1d859b02c873276", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "ab290d190fa6582f2826c9b8524a4013ea67380f65328bc39c31dbcba59ec63c": { + "signature": "ab290d190fa6582f2826c9b8524a4013ea67380f65328bc39c31dbcba59ec63c", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "710963884a4d1e73d1ff4da0db7e1c8e1eeae25fe4a9e3c1de8b5019bb5d9d74": { + "signature": "710963884a4d1e73d1ff4da0db7e1c8e1eeae25fe4a9e3c1de8b5019bb5d9d74", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "db276fb1ea2a8e74e7ab80522362b8f402d361652ca823d7cab59465d038eb82": { + "signature": "db276fb1ea2a8e74e7ab80522362b8f402d361652ca823d7cab59465d038eb82", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "807277ed6647bcdc3eab2e24d8fbcaca0a6506d2ed455248b0497ceb42831e30": { + "signature": "807277ed6647bcdc3eab2e24d8fbcaca0a6506d2ed455248b0497ceb42831e30", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "685288ad132baddbcdf7a2201960f6d48805151f1aef2e094c4dbc16841b3e54": { + "signature": "685288ad132baddbcdf7a2201960f6d48805151f1aef2e094c4dbc16841b3e54", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "e972eb97ea7ea4a9524820036a42557f13a48240b6083c7baa0d465c00adfdee": { + "signature": "e972eb97ea7ea4a9524820036a42557f13a48240b6083c7baa0d465c00adfdee", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + }, + "1b2c907630acaff5b6e62eb4895043c82e93d885331f1f46296812634fd30abe": { + "signature": "1b2c907630acaff5b6e62eb4895043c82e93d885331f1f46296812634fd30abe", + "alternativeSignatures": [], + "memberOf": [ + "default" + ], + "createdDate": "2024-04-03 14:41:43Z" + } + } +} \ No newline at end of file diff --git a/src/SourceBuild/content/eng/pipelines/ci.yml b/src/SourceBuild/content/eng/pipelines/ci.yml index 883ea980f..0bf7fda81 100644 --- a/src/SourceBuild/content/eng/pipelines/ci.yml +++ b/src/SourceBuild/content/eng/pipelines/ci.yml @@ -30,6 +30,9 @@ extends: name: NetCore1ESPool-Internal image: 1es-windows-2022 os: windows + + baseline: + baselineFile: $(Build.SourcesDirectory)\.config\guardian\.gdnbaselines customBuildTags: - ES365AIMigrationTooling From 413d203d59f5903a918a71bda91552f8ace1d02d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 10 Apr 2024 17:50:12 +0000 Subject: [PATCH 529/535] Update dependencies from https://github.com/dotnet/arcade build 20240404.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.24179.4 -> To Version 8.0.0-beta.24204.3 --- NuGet.config | 16 ++++++++++++++-- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- .../steps/component-governance.yml | 2 +- .../templates/steps/component-governance.yml | 2 +- global.json | 4 ++-- 6 files changed, 25 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index 341157ce4..8bdc3ffd2 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,21 +8,28 @@ + + + + - + + + + @@ -42,14 +49,19 @@ + + - + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c069fcbf6..9715e91d6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -214,18 +214,18 @@ - + https://github.com/dotnet/arcade - fc2b7849b25c4a21457feb6da5fc7c9806a80976 + 188340e12c0a372b1681ad6a5e72c608021efdba - + https://github.com/dotnet/arcade - fc2b7849b25c4a21457feb6da5fc7c9806a80976 + 188340e12c0a372b1681ad6a5e72c608021efdba - + https://github.com/dotnet/arcade - fc2b7849b25c4a21457feb6da5fc7c9806a80976 + 188340e12c0a372b1681ad6a5e72c608021efdba https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index cdf8b59df..b0bfb11a9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,7 +40,7 @@ - 8.0.0-beta.24179.4 + 8.0.0-beta.24204.3 diff --git a/eng/common/templates-official/steps/component-governance.yml b/eng/common/templates-official/steps/component-governance.yml index 0ecec47b0..cbba05967 100644 --- a/eng/common/templates-official/steps/component-governance.yml +++ b/eng/common/templates-official/steps/component-governance.yml @@ -4,7 +4,7 @@ parameters: steps: - ${{ if eq(parameters.disableComponentGovernance, 'true') }}: - - script: "echo ##vso[task.setvariable variable=skipComponentGovernanceDetection]true" + - script: echo "##vso[task.setvariable variable=skipComponentGovernanceDetection]true" displayName: Set skipComponentGovernanceDetection variable - ${{ if ne(parameters.disableComponentGovernance, 'true') }}: - task: ComponentGovernanceComponentDetection@0 diff --git a/eng/common/templates/steps/component-governance.yml b/eng/common/templates/steps/component-governance.yml index 0ecec47b0..cbba05967 100644 --- a/eng/common/templates/steps/component-governance.yml +++ b/eng/common/templates/steps/component-governance.yml @@ -4,7 +4,7 @@ parameters: steps: - ${{ if eq(parameters.disableComponentGovernance, 'true') }}: - - script: "echo ##vso[task.setvariable variable=skipComponentGovernanceDetection]true" + - script: echo "##vso[task.setvariable variable=skipComponentGovernanceDetection]true" displayName: Set skipComponentGovernanceDetection variable - ${{ if ne(parameters.disableComponentGovernance, 'true') }}: - task: ComponentGovernanceComponentDetection@0 diff --git a/global.json b/global.json index 31d5f24b1..f4af7d9ef 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.24179.4", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24179.4" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24204.3", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24204.3" } } From 3224d04c107288e97c75022e7e6104748b6745d3 Mon Sep 17 00:00:00 2001 From: Jacques Eloff Date: Fri, 12 Apr 2024 10:15:33 -0700 Subject: [PATCH 530/535] Update WiX to 3.14.1.8722 (#19415) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index b0bfb11a9..d77955771 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -169,7 +169,7 @@ - 3.14.0.8606 + 3.14.1.8722 From 61a252dfbcbfa6dc52f09bbc9ed681c9160e3156 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 16 Apr 2024 18:44:05 +0000 Subject: [PATCH 531/535] Update dependencies from https://github.com/dotnet/source-build-externals build 20240416.1 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 8.0.0-alpha.1.24175.3 -> To Version 8.0.0-alpha.1.24216.1 --- NuGet.config | 21 --------------------- eng/Version.Details.xml | 4 ++-- 2 files changed, 2 insertions(+), 23 deletions(-) diff --git a/NuGet.config b/NuGet.config index 8bdc3ffd2..c8bd4d7c7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,14 +7,8 @@ - - - - - - @@ -22,14 +16,8 @@ - - - - - - @@ -49,20 +37,11 @@ - - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9715e91d6..c7bf8f808 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -193,9 +193,9 @@ 5957c5c5f85f17c145e7fab4ece37ad6aafcded9 - + https://github.com/dotnet/source-build-externals - 300e99190e6ae1983681694dbdd5f75f0c692081 + 908177a58a41532b3302c17f1e1a8cf1c1234545 From 903e15eef9f13b981188168050ea89d53fbff26c Mon Sep 17 00:00:00 2001 From: Rich Lander Date: Wed, 17 Apr 2024 13:54:08 -0700 Subject: [PATCH 532/535] Update-eol-versions-8.0.1xx (#19318) Co-authored-by: Michael Simons --- .vsts-ci.yml | 22 +++++++++---------- .vsts-pr.yml | 10 ++++----- eng/pipelines/templates/stages/vmr-build.yml | 6 ++--- .../pipelines/source-build-sdk-diff-tests.yml | 8 +++---- 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 4c70535d7..892fd8c7b 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -52,20 +52,20 @@ extends: template: v1/1ES.Unofficial.PipelineTemplate.yml@1esPipelines parameters: containers: - alpine315WithNode: - image: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.15-WithNode + alpine319WithNode: + image: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.19-WithNode cblMariner20Fpm: image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-fpm centosStream8: image: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8 - debianStretch: - image: mcr.microsoft.com/dotnet-buildtools/prereqs:debian-stretch + debian11: + image: mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-amd64 fedora36: image: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-36 ubuntu2204: image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04 - ubuntu1804Cross: - image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-cross + mariner20CrossArm: + image: mcr.microsoft.com/dotnet-buildtools/prereqs:mariner-2.0-cross-arm ubuntu2204DebPkg: image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-debpkg sdl: @@ -141,8 +141,8 @@ extends: - template: eng/build.yml@self parameters: agentOs: Linux - jobName: Build_Debian_Stretch_Debug_x64 - container: debianStretch + jobName: Build_Debian_11_Debug_x64 + container: debian11 buildConfiguration: Debug buildArchitecture: x64 additionalBuildParameters: '/p:BuildSdkDeb=true' @@ -162,7 +162,7 @@ extends: parameters: agentOs: Linux jobName: Build_Linux_musl_Debug_x64 - container: alpine315WithNode + container: alpine319WithNode buildConfiguration: Debug buildArchitecture: x64 runtimeIdentifier: 'linux-musl-x64' @@ -237,7 +237,7 @@ extends: parameters: agentOs: Linux jobName: Build_Linux_musl_Release_arm - container: ubuntu1804Cross + container: mariner20CrossArm buildConfiguration: Release buildArchitecture: arm runtimeIdentifier: 'linux-musl-arm' @@ -258,7 +258,7 @@ extends: parameters: agentOs: Linux jobName: Build_Linux_musl_Release_x64 - container: alpine315WithNode + container: alpine319WithNode buildConfiguration: Release buildArchitecture: x64 runtimeIdentifier: 'linux-musl-x64' diff --git a/.vsts-pr.yml b/.vsts-pr.yml index f5c697bab..94d0f59ce 100644 --- a/.vsts-pr.yml +++ b/.vsts-pr.yml @@ -100,8 +100,8 @@ stages: - template: eng/build-pr.yml parameters: agentOs: Linux - jobName: Build_Debian_Stretch_Debug_x64 - container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:debian-stretch' + jobName: Build_Debian_11_Debug_x64 + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-amd64' buildConfiguration: Debug buildArchitecture: x64 additionalBuildParameters: '/p:BuildSdkDeb=true' @@ -121,7 +121,7 @@ stages: parameters: agentOs: Linux jobName: Build_Linux_musl_Debug_x64 - container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.15-WithNode' + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.19-WithNode' buildConfiguration: Debug buildArchitecture: x64 runtimeIdentifier: 'linux-musl-x64' @@ -201,7 +201,7 @@ stages: parameters: agentOs: Linux jobName: Build_Linux_musl_Release_arm - container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-cross' + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:mariner-2.0-cross-arm' buildConfiguration: Release buildArchitecture: arm runtimeIdentifier: 'linux-musl-arm' @@ -222,7 +222,7 @@ stages: parameters: agentOs: Linux jobName: Build_Linux_musl_Release_x64 - container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.15-WithNode' + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.19-WithNode' buildConfiguration: Release buildArchitecture: x64 runtimeIdentifier: 'linux-musl-x64' diff --git a/eng/pipelines/templates/stages/vmr-build.yml b/eng/pipelines/templates/stages/vmr-build.yml index 2f9692f22..38451ade2 100644 --- a/eng/pipelines/templates/stages/vmr-build.yml +++ b/eng/pipelines/templates/stages/vmr-build.yml @@ -21,9 +21,9 @@ parameters: # The following parameters aren't expected to be passed in rather they are used for encapsulation # ----------------------------------------------------------------------------------------------- -- name: alpine317Container +- name: alpine319Container type: string - default: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.17 + default: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.19 - name: centOSStream8Container type: string default: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8 @@ -120,7 +120,7 @@ stages: vmrBranch: ${{ variables.VmrBranch }} architecture: x64 pool: ${{ parameters.pool_Linux }} - container: ${{ parameters.alpine317Container }} + container: ${{ parameters.alpine319Container }} buildFromArchive: false # ✅ enablePoison: false # 🚫 excludeOmniSharpTests: true # ✅ diff --git a/src/SourceBuild/content/eng/pipelines/source-build-sdk-diff-tests.yml b/src/SourceBuild/content/eng/pipelines/source-build-sdk-diff-tests.yml index 36eed8cbd..4e49c7fa8 100644 --- a/src/SourceBuild/content/eng/pipelines/source-build-sdk-diff-tests.yml +++ b/src/SourceBuild/content/eng/pipelines/source-build-sdk-diff-tests.yml @@ -1,6 +1,6 @@ schedules: -- cron: "0 11 * * 1-5" - displayName: Run on weekdays at 11am UTC +- cron: "0 11 * * 1-5" + displayName: Run on weekdays at 11am UTC branches: include: - main @@ -47,8 +47,8 @@ jobs: - template: templates/jobs/sdk-diff-tests.yml parameters: - buildName: Alpine317_Offline_MsftSdk - targetRid: alpine.3.17-x64 + buildName: Alpine319_Offline_MsftSdk + targetRid: alpine.3.19-x64 architecture: x64 dotnetDotnetRunId: ${{ parameters.dotnetDotnetRunId }} From ceb2adce4f0a4ac3d815e629bd6fcf13b27b89fa Mon Sep 17 00:00:00 2001 From: Ella Hathaway <67609881+ellahathaway@users.noreply.github.com> Date: Fri, 19 Apr 2024 06:22:44 -0700 Subject: [PATCH 533/535] [8.0.1xx] Use correct image name for Arm pool (#19531) --- eng/pipelines/templates/stages/vmr-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/templates/stages/vmr-build.yml b/eng/pipelines/templates/stages/vmr-build.yml index 38451ade2..8c48d95dd 100644 --- a/eng/pipelines/templates/stages/vmr-build.yml +++ b/eng/pipelines/templates/stages/vmr-build.yml @@ -54,7 +54,7 @@ parameters: default: name: $(poolName_LinuxArm64) image: $(poolImage_LinuxArm64) - demands: ImageOverride -equals $(poolImage_Linux) + demands: ImageOverride -equals $(poolImage_LinuxArm64) hostArchitecture: Arm64 os: linux From 46532a34a8267f7a5aea214563138c2cac7ff4af Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Fri, 19 Apr 2024 09:44:31 -0500 Subject: [PATCH 534/535] Rename out of date alpine CI leg (#19542) --- eng/pipelines/templates/stages/vmr-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/templates/stages/vmr-build.yml b/eng/pipelines/templates/stages/vmr-build.yml index 8c48d95dd..fdf3180c9 100644 --- a/eng/pipelines/templates/stages/vmr-build.yml +++ b/eng/pipelines/templates/stages/vmr-build.yml @@ -115,7 +115,7 @@ stages: - template: ../jobs/vmr-build.yml@self parameters: # Changing the build name requires updating the referenced name in the source-build-sdk-diff-tests.yml pipeline - buildName: Alpine317_Offline_MsftSdk + buildName: Alpine319_Offline_MsftSdk isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }} vmrBranch: ${{ variables.VmrBranch }} architecture: x64 From 05ce03283e97259a8d9cac235bc0d3c1ce249713 Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Fri, 19 Apr 2024 12:10:36 -0700 Subject: [PATCH 535/535] [release/8.0.1xx] Source-build dotnet/runtime patch: crashinfo.cpp/crasinfounix.cpp: use off_t instead of off64_t (#19544) Co-authored-by: Michael Simons --- ...ashinfo-use-off_t-instead-of-off64_t.patch | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 src/SourceBuild/patches/runtime/0001-crashinfo-use-off_t-instead-of-off64_t.patch diff --git a/src/SourceBuild/patches/runtime/0001-crashinfo-use-off_t-instead-of-off64_t.patch b/src/SourceBuild/patches/runtime/0001-crashinfo-use-off_t-instead-of-off64_t.patch new file mode 100644 index 000000000..6569164b8 --- /dev/null +++ b/src/SourceBuild/patches/runtime/0001-crashinfo-use-off_t-instead-of-off64_t.patch @@ -0,0 +1,38 @@ +From 05ad51a9be428012328a1ee199a4edaff20b5efe Mon Sep 17 00:00:00 2001 +From: Antoine Martin +Date: Tue, 12 Sep 2023 18:55:46 -0400 +Subject: [PATCH] crashinfo.cpp/crasinfounix.cpp: use off_t instead of off64_t + +Backport: https://github.com/dotnet/runtime/pull/101272 + +--- + src/coreclr/debug/createdump/crashinfo.cpp | 2 +- + src/coreclr/debug/createdump/crashinfounix.cpp | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/coreclr/debug/createdump/crashinfo.cpp b/src/coreclr/debug/createdump/crashinfo.cpp +index 996f3a81935d..d1d1b0ea0218 100644 +--- a/src/coreclr/debug/createdump/crashinfo.cpp ++++ b/src/coreclr/debug/createdump/crashinfo.cpp +@@ -803,7 +803,7 @@ CrashInfo::PageMappedToPhysicalMemory(uint64_t start) + } + + uint64_t pagemapOffset = (start / PAGE_SIZE) * sizeof(uint64_t); +- uint64_t seekResult = lseek64(m_fdPagemap, (off64_t) pagemapOffset, SEEK_SET); ++ uint64_t seekResult = lseek(m_fdPagemap, (off_t) pagemapOffset, SEEK_SET); + if (seekResult != pagemapOffset) + { + int seekErrno = errno; +diff --git a/src/coreclr/debug/createdump/crashinfounix.cpp b/src/coreclr/debug/createdump/crashinfounix.cpp +index 24b975e3d655..2f4ea079de3b 100644 +--- a/src/coreclr/debug/createdump/crashinfounix.cpp ++++ b/src/coreclr/debug/createdump/crashinfounix.cpp +@@ -516,7 +516,7 @@ CrashInfo::ReadProcessMemory(void* address, void* buffer, size_t size, size_t* r + // performance optimization. + m_canUseProcVmReadSyscall = false; + assert(m_fdMem != -1); +- *read = pread64(m_fdMem, buffer, size, (off64_t)address); ++ *read = pread(m_fdMem, buffer, size, (off_t)address); + } + + if (*read == (size_t)-1)