From 4b1d5fa6516788ff4bf6faf26592f3b7c07b11f7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 20 Mar 2024 06:32:33 +0000 Subject: [PATCH 01/29] Update dependencies from https://github.com/dotnet/sdk build Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24169.27 -> To Version 8.0.300-preview.24169.98 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset From Version 12.8.300-beta.24165.2 -> To Version 12.8.300-beta.24168.9 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 8 ++++---- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index edde09e2f..930a85a98 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - 5a9a5a3e863a2357c6aa9b888c50dd2e44ea76ee + 516f4356d420569c38e6bccd6c651d7b80165bf1 - + https://github.com/dotnet/sdk - 5a9a5a3e863a2357c6aa9b888c50dd2e44ea76ee + 516f4356d420569c38e6bccd6c651d7b80165bf1 - + https://github.com/dotnet/sdk - 5a9a5a3e863a2357c6aa9b888c50dd2e44ea76ee + 516f4356d420569c38e6bccd6c651d7b80165bf1 - + https://github.com/dotnet/sdk - 5a9a5a3e863a2357c6aa9b888c50dd2e44ea76ee + 516f4356d420569c38e6bccd6c651d7b80165bf1 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 - a0081443628b0c582abe66f83944519378d2a5dd + e18404fcaf90b0ee9bbf588ec32d07f466f16fe7 - + https://github.com/dotnet/fsharp - a0081443628b0c582abe66f83944519378d2a5dd + e18404fcaf90b0ee9bbf588ec32d07f466f16fe7 @@ -150,9 +150,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 1381d5ebd2ab1f292848d5b19b80cf71ac332508 - + https://github.com/dotnet/roslyn - 2348a50bb566b39305c474793b43edb5635db6f4 + 134bc2e6f0edbe13c7cc465d97592d75f9d1a197 diff --git a/eng/Versions.props b/eng/Versions.props index 76b47f06d..02e031bda 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -80,16 +80,16 @@ - 8.0.300-preview.24169.27 - 8.0.300-preview.24169.27 - 8.0.300-preview.24169.27 + 8.0.300-preview.24169.98 + 8.0.300-preview.24169.98 + 8.0.300-preview.24169.98 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.10.0-3.24168.1 + 4.10.0-3.24168.9 From 4304228b0bac6adb9b462d28350eceb0c13d3849 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 20 Mar 2024 12:53:41 +0000 Subject: [PATCH 02/29] Update dependencies from https://github.com/dotnet/arcade-services build Microsoft.DotNet.Darc , Microsoft.DotNet.DarcLib From Version 1.1.0-beta.24168.5 -> To Version 1.1.0-beta.24170.1 --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 0cd5b7816..1e0f09827 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.24168.5", + "version": "1.1.0-beta.24170.1", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 930a85a98..2311d776f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -227,13 +227,13 @@ https://github.com/dotnet/arcade f311667e0587f19c3fa9553a909975662107a351 - + https://github.com/dotnet/arcade-services - 55716bbf779395f1c33ea1eb1f688b5081223d49 + 55e81b518005f98514643c16abc090c60937f2cd - + https://github.com/dotnet/arcade-services - 55716bbf779395f1c33ea1eb1f688b5081223d49 + 55e81b518005f98514643c16abc090c60937f2cd https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 02e031bda..41c4a12dd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 1.1.0-beta.24168.5 + 1.1.0-beta.24170.1 From 4c8fb55b04712a5d7800d9ad6f46be8e2b24a819 Mon Sep 17 00:00:00 2001 From: Ladi Prosek Date: Wed, 20 Mar 2024 16:34:57 +0100 Subject: [PATCH 03/29] Revert "[release/8.0.2xx] NGEN Microsoft.DotNet.MSBuildSdkResolver.dll and its dependencies (#17750)" (#19112) This reverts commit f0c4e4e14ca748d9c489562cfc32f29e8d5b0afe. Fixes [AB#1994786](https://devdiv.visualstudio.com/DevDiv/_workitems/edit/1994786/) The MSBuild change which took advantage of this was reverted in 17.9 because it introduced issues in installations that don't have the .NET SDK component installed. We are fixing the bug in 9.0 by making changes to the dependencies of `Microsoft.DotNet.MSBuildSdkResolver` (see https://github.com/dotnet/sdk/pull/39573) so this should stay in main. I am reverting it only in 8.0.3xx / 17.10 to fix the `Build_Ngen_InvalidAssemblyCount` counter which was flagged as a regression by PerfDDRITs. --- .../GenerateMSBuildExtensionsSWR.cs | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/src/core-sdk-tasks/GenerateMSBuildExtensionsSWR.cs b/src/core-sdk-tasks/GenerateMSBuildExtensionsSWR.cs index 81f3943d2..eab79f2b7 100644 --- a/src/core-sdk-tasks/GenerateMSBuildExtensionsSWR.cs +++ b/src/core-sdk-tasks/GenerateMSBuildExtensionsSWR.cs @@ -24,8 +24,7 @@ namespace Microsoft.DotNet.Cli.Build AddFolder(sb, @"MSBuildSdkResolver", - @"MSBuild\Current\Bin\SdkResolvers\Microsoft.DotNet.MSBuildSdkResolver", - ngenAssemblies: true); + @"MSBuild\Current\Bin\SdkResolvers\Microsoft.DotNet.MSBuildSdkResolver"); AddFolder(sb, @"msbuildExtensions", @@ -40,7 +39,7 @@ namespace Microsoft.DotNet.Cli.Build return true; } - private void AddFolder(StringBuilder sb, string relativeSourcePath, string swrInstallDir, bool ngenAssemblies = false) + private void AddFolder(StringBuilder sb, string relativeSourcePath, string swrInstallDir) { string sourceFolder = Path.Combine(MSBuildExtensionsLayoutDirectory, relativeSourcePath); var files = Directory.GetFiles(sourceFolder) @@ -56,16 +55,7 @@ namespace Microsoft.DotNet.Cli.Build { sb.Append(@" file source=""$(PkgVS_Redist_Common_Net_Core_SDK_MSBuildExtensions)\"); sb.Append(Path.Combine(relativeSourcePath, Path.GetFileName(file))); - sb.Append('"'); - - if (ngenAssemblies && file.EndsWith(".dll", StringComparison.OrdinalIgnoreCase)) - { - sb.Append(@" vs.file.ngenApplications=""[installDir]\Common7\IDE\vsn.exe"""); - sb.Append(@" vs.file.ngenApplications=""[installDir]\MSBuild\Current\Bin\MSBuild.exe"""); - sb.Append(" vs.file.ngenArchitecture=all"); - } - - sb.AppendLine(); + sb.AppendLine("\""); } sb.AppendLine(); @@ -77,7 +67,6 @@ namespace Microsoft.DotNet.Cli.Build string newRelativeSourcePath = Path.Combine(relativeSourcePath, subfolderName); string newSwrInstallDir = Path.Combine(swrInstallDir, subfolderName); - // Don't propagate ngenAssemblies to subdirectories. AddFolder(sb, newRelativeSourcePath, newSwrInstallDir); } } From f4fdbfe1a11cf234c39b2e82182c4e2b382aab8a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 21 Mar 2024 03:43:59 +0000 Subject: [PATCH 04/29] Update dependencies from https://github.com/dotnet/sdk build Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24169.98 -> To Version 8.0.300-preview.24170.28 Dependency coherency updates Microsoft.NET.Test.Sdk From Version 17.10.0-preview-24163-01 -> To Version 17.10.0-preview-24169-03 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2311d776f..00e4b6fb6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - 516f4356d420569c38e6bccd6c651d7b80165bf1 + b4d072aeabb46d8126f6716db40a6df31a3df227 - + https://github.com/dotnet/sdk - 516f4356d420569c38e6bccd6c651d7b80165bf1 + b4d072aeabb46d8126f6716db40a6df31a3df227 - + https://github.com/dotnet/sdk - 516f4356d420569c38e6bccd6c651d7b80165bf1 + b4d072aeabb46d8126f6716db40a6df31a3df227 - + https://github.com/dotnet/sdk - 516f4356d420569c38e6bccd6c651d7b80165bf1 + b4d072aeabb46d8126f6716db40a6df31a3df227 https://github.com/dotnet/test-templates @@ -141,9 +141,9 @@ e18404fcaf90b0ee9bbf588ec32d07f466f16fe7 - + https://github.com/microsoft/vstest - c609e2c022b0087b227436a4debf45525eed00e9 + fb859a78be3d76ee38d5630ad86a17ab124ebbcf diff --git a/eng/Versions.props b/eng/Versions.props index 41c4a12dd..98c50f946 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -80,9 +80,9 @@ - 8.0.300-preview.24169.98 - 8.0.300-preview.24169.98 - 8.0.300-preview.24169.98 + 8.0.300-preview.24170.28 + 8.0.300-preview.24170.28 + 8.0.300-preview.24170.28 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -199,7 +199,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.10.0-preview-24163-01 + 17.10.0-preview-24169-03 8.0.0-alpha.1.22557.12 From 7ac1ee98a53ce13dafc3cc50cb72c5b8e942ef7a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 21 Mar 2024 12:49:57 +0000 Subject: [PATCH 05/29] Update dependencies from https://github.com/dotnet/arcade-services build Microsoft.DotNet.Darc , Microsoft.DotNet.DarcLib From Version 1.1.0-beta.24170.1 -> To Version 1.1.0-beta.24170.2 --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 1e0f09827..37d8783e6 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.24170.1", + "version": "1.1.0-beta.24170.2", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 00e4b6fb6..29497a303 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -227,13 +227,13 @@ https://github.com/dotnet/arcade f311667e0587f19c3fa9553a909975662107a351 - + https://github.com/dotnet/arcade-services - 55e81b518005f98514643c16abc090c60937f2cd + 965d0ab5145b11952f3fd725735a273be45a47b5 - + https://github.com/dotnet/arcade-services - 55e81b518005f98514643c16abc090c60937f2cd + 965d0ab5145b11952f3fd725735a273be45a47b5 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 98c50f946..230e84521 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 1.1.0-beta.24170.1 + 1.1.0-beta.24170.2 From 1394de7931dd028632439760f0fa4bbd8fc751ec Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 22 Mar 2024 05:06:57 +0000 Subject: [PATCH 06/29] Update dependencies from https://github.com/dotnet/sdk build Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24170.28 -> To Version 8.0.300-preview.24171.18 Dependency coherency updates Microsoft.NET.Test.Sdk From Version 17.10.0-preview-24169-03 -> To Version 17.10.0-preview-24170-01 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 29497a303..2d4d9097f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - b4d072aeabb46d8126f6716db40a6df31a3df227 + 0f4c6e5e90d450fc38b08c6674a59db3c4a6d6bb - + https://github.com/dotnet/sdk - b4d072aeabb46d8126f6716db40a6df31a3df227 + 0f4c6e5e90d450fc38b08c6674a59db3c4a6d6bb - + https://github.com/dotnet/sdk - b4d072aeabb46d8126f6716db40a6df31a3df227 + 0f4c6e5e90d450fc38b08c6674a59db3c4a6d6bb - + https://github.com/dotnet/sdk - b4d072aeabb46d8126f6716db40a6df31a3df227 + 0f4c6e5e90d450fc38b08c6674a59db3c4a6d6bb https://github.com/dotnet/test-templates @@ -141,9 +141,9 @@ e18404fcaf90b0ee9bbf588ec32d07f466f16fe7 - + https://github.com/microsoft/vstest - fb859a78be3d76ee38d5630ad86a17ab124ebbcf + 6957756d70d6ade74e239a38ad709db5cb39fe0d diff --git a/eng/Versions.props b/eng/Versions.props index 230e84521..607e4eac5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -80,9 +80,9 @@ - 8.0.300-preview.24170.28 - 8.0.300-preview.24170.28 - 8.0.300-preview.24170.28 + 8.0.300-preview.24171.18 + 8.0.300-preview.24171.18 + 8.0.300-preview.24171.18 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -199,7 +199,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.10.0-preview-24169-03 + 17.10.0-preview-24170-01 8.0.0-alpha.1.22557.12 From 65eecbb634733e5713c1c46f7b41b37d01827ee5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 22 Mar 2024 09:50:08 +0000 Subject: [PATCH 07/29] [release/8.0.3xx] Update dependencies from dotnet/sdk (#19138) [release/8.0.3xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Net.Compilers.Toolset: from 4.10.0-3.24168.9 to 4.10.0-3.24171.1 (parent: Microsoft.NET.Sdk) - Microsoft.Build: from 17.10.0-preview-24162-02 to 17.10.0-preview-24171-01 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 8 ++++---- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2d4d9097f..833e05be6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - 0f4c6e5e90d450fc38b08c6674a59db3c4a6d6bb + fcede4935686478b9ff1a6d66c99768fa04ad225 - + https://github.com/dotnet/sdk - 0f4c6e5e90d450fc38b08c6674a59db3c4a6d6bb + fcede4935686478b9ff1a6d66c99768fa04ad225 - + https://github.com/dotnet/sdk - 0f4c6e5e90d450fc38b08c6674a59db3c4a6d6bb + fcede4935686478b9ff1a6d66c99768fa04ad225 - + https://github.com/dotnet/sdk - 0f4c6e5e90d450fc38b08c6674a59db3c4a6d6bb + fcede4935686478b9ff1a6d66c99768fa04ad225 https://github.com/dotnet/test-templates @@ -150,14 +150,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 1381d5ebd2ab1f292848d5b19b80cf71ac332508 - + https://github.com/dotnet/roslyn - 134bc2e6f0edbe13c7cc465d97592d75f9d1a197 + c8dd474b73167a0f1b07514082d162c7febdf33f - + https://github.com/dotnet/msbuild - 0326fd7c9e131c4c26bac3c0f72a43ef9fd2812c + de776177f6d540e656e6b0c6d5bb07f2ff518c19 https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index 607e4eac5..6d0601dff 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -80,16 +80,16 @@ - 8.0.300-preview.24171.18 - 8.0.300-preview.24171.18 - 8.0.300-preview.24171.18 + 8.0.300-preview.24172.7 + 8.0.300-preview.24172.7 + 8.0.300-preview.24172.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.10.0-3.24168.9 + 4.10.0-3.24171.1 From 3d274caac34ec5b9f28a9eb70ba1ed719f8788f6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 22 Mar 2024 12:58:55 +0000 Subject: [PATCH 08/29] 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.24165.4 -> To Version 8.0.0-beta.24170.6 --- 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 833e05be6..da932bd2d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -214,18 +214,18 @@ - + https://github.com/dotnet/arcade - f311667e0587f19c3fa9553a909975662107a351 + 8e3e00a76f467cc262dc14f6466ab884b2c4eb96 - + https://github.com/dotnet/arcade - f311667e0587f19c3fa9553a909975662107a351 + 8e3e00a76f467cc262dc14f6466ab884b2c4eb96 - + https://github.com/dotnet/arcade - f311667e0587f19c3fa9553a909975662107a351 + 8e3e00a76f467cc262dc14f6466ab884b2c4eb96 https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index 6d0601dff..fb2ec4394 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,7 +40,7 @@ - 8.0.0-beta.24165.4 + 8.0.0-beta.24170.6 diff --git a/global.json b/global.json index b967bd08e..421a15a16 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.24170.6", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24170.6" } } From f1314e05546a5162cc3fd83dd3fbc4e223dfd5da Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 22 Mar 2024 13:04:22 +0000 Subject: [PATCH 09/29] Update dependencies from https://github.com/dotnet/arcade-services build Microsoft.DotNet.Darc , Microsoft.DotNet.DarcLib From Version 1.1.0-beta.24170.2 -> To Version 1.1.0-beta.24171.1 --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 37d8783e6..e068b7ff4 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.24170.2", + "version": "1.1.0-beta.24171.1", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 833e05be6..19aa26021 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -227,13 +227,13 @@ https://github.com/dotnet/arcade f311667e0587f19c3fa9553a909975662107a351 - + https://github.com/dotnet/arcade-services - 965d0ab5145b11952f3fd725735a273be45a47b5 + 925452cfdeaf03801bc9b2d096420853d3ba991c - + https://github.com/dotnet/arcade-services - 965d0ab5145b11952f3fd725735a273be45a47b5 + 925452cfdeaf03801bc9b2d096420853d3ba991c https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 6d0601dff..5c2f659f0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 1.1.0-beta.24170.2 + 1.1.0-beta.24171.1 From fd45c75781cdaae445ec82bfeaa1cffc9bf30278 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 22 Mar 2024 18:01:55 +0000 Subject: [PATCH 10/29] Update dependencies from https://github.com/dotnet/sdk build Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24172.7 -> To Version 8.0.300-preview.24172.17 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp From Version 12.8.300-beta.24168.9 -> To Version 12.8.300-beta.24171.7 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c2b2351f9..c5bf1d221 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - fcede4935686478b9ff1a6d66c99768fa04ad225 + 6b5f92d3761f994edfb954524f3745422465ee22 - + https://github.com/dotnet/sdk - fcede4935686478b9ff1a6d66c99768fa04ad225 + 6b5f92d3761f994edfb954524f3745422465ee22 - + https://github.com/dotnet/sdk - fcede4935686478b9ff1a6d66c99768fa04ad225 + 6b5f92d3761f994edfb954524f3745422465ee22 - + https://github.com/dotnet/sdk - fcede4935686478b9ff1a6d66c99768fa04ad225 + 6b5f92d3761f994edfb954524f3745422465ee22 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 - e18404fcaf90b0ee9bbf588ec32d07f466f16fe7 + 891a53ae87f77e25d42d4abe7f26822024f18bb4 - + https://github.com/dotnet/fsharp - e18404fcaf90b0ee9bbf588ec32d07f466f16fe7 + 891a53ae87f77e25d42d4abe7f26822024f18bb4 diff --git a/eng/Versions.props b/eng/Versions.props index fd94652bf..37192a7be 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -80,9 +80,9 @@ - 8.0.300-preview.24172.7 - 8.0.300-preview.24172.7 - 8.0.300-preview.24172.7 + 8.0.300-preview.24172.17 + 8.0.300-preview.24172.17 + 8.0.300-preview.24172.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f827ff4b7e9422d5be60f08c7c61433ca7a3bdfc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 23 Mar 2024 12:57:03 +0000 Subject: [PATCH 11/29] Update dependencies from https://github.com/dotnet/arcade-services build Microsoft.DotNet.Darc , Microsoft.DotNet.DarcLib From Version 1.1.0-beta.24171.1 -> To Version 1.1.0-beta.24172.2 --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index e068b7ff4..373bd69b0 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.24171.1", + "version": "1.1.0-beta.24172.2", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c2b2351f9..5dd719170 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -227,13 +227,13 @@ https://github.com/dotnet/arcade 8e3e00a76f467cc262dc14f6466ab884b2c4eb96 - + https://github.com/dotnet/arcade-services - 925452cfdeaf03801bc9b2d096420853d3ba991c + 0542b0f13dc8ec39cb864564ba08a33b4af7035d - + https://github.com/dotnet/arcade-services - 925452cfdeaf03801bc9b2d096420853d3ba991c + 0542b0f13dc8ec39cb864564ba08a33b4af7035d https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index fd94652bf..d985ca005 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 1.1.0-beta.24171.1 + 1.1.0-beta.24172.2 From 79c1c4cc9aaddaad1688b6d2d18ae50dc5036cbd Mon Sep 17 00:00:00 2001 From: Chet Husk Date: Fri, 22 Mar 2024 11:43:18 -0500 Subject: [PATCH 12/29] Generate a props file that can be used to detect MSBuild version mismatches. We know the minimum and 'bundled' MSbuild versions, but users may build a project with newer SDKs than we expected (specifically when full-framework MSBuild is starting the build of an SDK-style project). When this occurs, we'd like to automatically condition the use of PackageReferences meant to ensure compatibility of the Roslyn toolchain, so we need to know if we are in this mismatched situation. A fast and simple way to do this is to 'stamp' the 'expected' version of MSBuild during product construction and compare that to the 'current' version being used during the actual build. --- .../targets/GenerateBundledVersions.targets | 48 ++++++++++++++++++- 1 file changed, 47 insertions(+), 1 deletion(-) diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index 299a76d5e..958d3a97d 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -2,7 +2,7 @@ + DependsOnTargets="GenerateBundledVersionsProps;GenerateBundledCliToolsProps;GenerateBundledMSBuildProps" > + + + Microsoft.NETCoreSdk.BundledMSBuildInformation.props + %(SDKInternalFiles.Identity) + $(MSBuildVersion) + + + + + + + + <_BundledMSBuildVersionMajorMinor>$([System.Version]::Parse('$(BundledMSBuildVersion)').ToString(2)) + + + + + + + + $(MinimumMSBuildVersion) + $(BundledMSBuildVersion) + <_MSBuildVersionMajorMinor>%24([System.Version]::Parse('%24(MSBuildVersion)').ToString(2)) + <_IsDisjointMSBuildVersion>%24([MSBuild]::VersionGreaterThan('%24(_MSBuildVersionMajorMinor)', '$(_BundledMSBuildVersionMajorMinor)')) + + +]]> + + + + + + From ee91cb14ff4e3cf7d4a355d4cee7356216dcda7e Mon Sep 17 00:00:00 2001 From: Chet Husk Date: Fri, 22 Mar 2024 13:22:46 -0500 Subject: [PATCH 13/29] Fix reading of minimum MSBuild version --- src/redist/targets/GenerateBundledVersions.targets | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index 958d3a97d..8dc085a42 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -1207,11 +1207,13 @@ Copyright (c) .NET Foundation. All rights reserved. + $(RedistLayoutPath)sdk/$(Version)/minimumMSBuildVersion Microsoft.NETCoreSdk.BundledMSBuildInformation.props - %(SDKInternalFiles.Identity) $(MSBuildVersion) + + From e53f57d99c17ae6e84ce4676e88f9a77889c2062 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 24 Mar 2024 12:49:21 +0000 Subject: [PATCH 14/29] Update dependencies from https://github.com/dotnet/arcade-services build Microsoft.DotNet.Darc , Microsoft.DotNet.DarcLib From Version 1.1.0-beta.24171.1 -> To Version 1.1.0-beta.24172.2 From 4fb1686c2a3fe7c778b6169bbea251a409b57309 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 25 Mar 2024 03:23:13 +0000 Subject: [PATCH 15/29] Update dependencies from https://github.com/dotnet/sdk build Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24172.17 -> To Version 8.0.300-preview.24174.2 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 312b7bd69..5b6efcbeb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - 6b5f92d3761f994edfb954524f3745422465ee22 + c7630919267d4acf40d249468aa2b548708d2ab8 - + https://github.com/dotnet/sdk - 6b5f92d3761f994edfb954524f3745422465ee22 + c7630919267d4acf40d249468aa2b548708d2ab8 - + https://github.com/dotnet/sdk - 6b5f92d3761f994edfb954524f3745422465ee22 + c7630919267d4acf40d249468aa2b548708d2ab8 - + https://github.com/dotnet/sdk - 6b5f92d3761f994edfb954524f3745422465ee22 + c7630919267d4acf40d249468aa2b548708d2ab8 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index d2a240e87..c6696af60 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -80,9 +80,9 @@ - 8.0.300-preview.24172.17 - 8.0.300-preview.24172.17 - 8.0.300-preview.24172.17 + 8.0.300-preview.24174.2 + 8.0.300-preview.24174.2 + 8.0.300-preview.24174.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 2c943af61ca33a202e5f61ac904be3a2e4c748af Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 25 Mar 2024 06:25:29 +0000 Subject: [PATCH 16/29] Update dependencies from https://github.com/dotnet/sdk build Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24174.2 -> To Version 8.0.300-preview.24174.6 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp From Version 12.8.300-beta.24171.7 -> To Version 12.8.300-beta.24172.5 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5b6efcbeb..9e38a6912 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - c7630919267d4acf40d249468aa2b548708d2ab8 + b0a41e210b495e22b8f54e97f3643848fc89ae72 - + https://github.com/dotnet/sdk - c7630919267d4acf40d249468aa2b548708d2ab8 + b0a41e210b495e22b8f54e97f3643848fc89ae72 - + https://github.com/dotnet/sdk - c7630919267d4acf40d249468aa2b548708d2ab8 + b0a41e210b495e22b8f54e97f3643848fc89ae72 - + https://github.com/dotnet/sdk - c7630919267d4acf40d249468aa2b548708d2ab8 + b0a41e210b495e22b8f54e97f3643848fc89ae72 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 - 891a53ae87f77e25d42d4abe7f26822024f18bb4 + 8d852e43d35fdac96b1ba52e3bd4b35350035914 - + https://github.com/dotnet/fsharp - 891a53ae87f77e25d42d4abe7f26822024f18bb4 + 8d852e43d35fdac96b1ba52e3bd4b35350035914 diff --git a/eng/Versions.props b/eng/Versions.props index c6696af60..1d6eac7d2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -80,9 +80,9 @@ - 8.0.300-preview.24174.2 - 8.0.300-preview.24174.2 - 8.0.300-preview.24174.2 + 8.0.300-preview.24174.6 + 8.0.300-preview.24174.6 + 8.0.300-preview.24174.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 15f3a065502952e8a6e3352124df6be4839232d3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 25 Mar 2024 20:32:32 +0000 Subject: [PATCH 17/29] [release/8.0.3xx] Update dependencies from dotnet/arcade (#19176) [release/8.0.3xx] Update dependencies from dotnet/arcade --- 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 9e38a6912..b470e3c4c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -214,18 +214,18 @@ - + https://github.com/dotnet/arcade - 8e3e00a76f467cc262dc14f6466ab884b2c4eb96 + ceb071c1060b8e6de404c065b4045442570caa18 - + https://github.com/dotnet/arcade - 8e3e00a76f467cc262dc14f6466ab884b2c4eb96 + ceb071c1060b8e6de404c065b4045442570caa18 - + https://github.com/dotnet/arcade - 8e3e00a76f467cc262dc14f6466ab884b2c4eb96 + ceb071c1060b8e6de404c065b4045442570caa18 https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index 1d6eac7d2..32c34bccc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,7 +40,7 @@ - 8.0.0-beta.24170.6 + 8.0.0-beta.24172.5 diff --git a/eng/common/templates-official/job/job.yml b/eng/common/templates-official/job/job.yml index a2709d105..0604277a2 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) diff --git a/global.json b/global.json index 421a15a16..82ca05959 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.24170.6", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24170.6" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24172.5", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24172.5" } } From cfc4dae37e8b2b6b08d51ff933843e762579fd8d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 26 Mar 2024 03:40:28 +0000 Subject: [PATCH 18/29] Update dependencies from https://github.com/dotnet/sdk build Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24174.6 -> To Version 8.0.300-preview.24175.21 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b470e3c4c..f89fe0a82 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - b0a41e210b495e22b8f54e97f3643848fc89ae72 + c28f2a19d56ee38d358560e3d0b02f574146c5d0 - + https://github.com/dotnet/sdk - b0a41e210b495e22b8f54e97f3643848fc89ae72 + c28f2a19d56ee38d358560e3d0b02f574146c5d0 - + https://github.com/dotnet/sdk - b0a41e210b495e22b8f54e97f3643848fc89ae72 + c28f2a19d56ee38d358560e3d0b02f574146c5d0 - + https://github.com/dotnet/sdk - b0a41e210b495e22b8f54e97f3643848fc89ae72 + c28f2a19d56ee38d358560e3d0b02f574146c5d0 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 32c34bccc..3dd9688be 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -80,9 +80,9 @@ - 8.0.300-preview.24174.6 - 8.0.300-preview.24174.6 - 8.0.300-preview.24174.6 + 8.0.300-preview.24175.21 + 8.0.300-preview.24175.21 + 8.0.300-preview.24175.21 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 24f1a04c6cca5de78047727e347e98de0c977157 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 26 Mar 2024 21:06:32 +0000 Subject: [PATCH 19/29] Update dependencies from https://github.com/dotnet/sdk build Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24175.21 -> To Version 8.0.300-preview.24176.4 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f89fe0a82..e64a096ed 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - c28f2a19d56ee38d358560e3d0b02f574146c5d0 + 5157609e360b5c2dd41ac1c1f08250a9641485a0 - + https://github.com/dotnet/sdk - c28f2a19d56ee38d358560e3d0b02f574146c5d0 + 5157609e360b5c2dd41ac1c1f08250a9641485a0 - + https://github.com/dotnet/sdk - c28f2a19d56ee38d358560e3d0b02f574146c5d0 + 5157609e360b5c2dd41ac1c1f08250a9641485a0 - + https://github.com/dotnet/sdk - c28f2a19d56ee38d358560e3d0b02f574146c5d0 + 5157609e360b5c2dd41ac1c1f08250a9641485a0 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 3dd9688be..7cdb15be6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -80,9 +80,9 @@ - 8.0.300-preview.24175.21 - 8.0.300-preview.24175.21 - 8.0.300-preview.24175.21 + 8.0.300-preview.24176.4 + 8.0.300-preview.24176.4 + 8.0.300-preview.24176.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 479f0b85231b23811afee4a9285f2ec1d4a3a95e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 26 Mar 2024 21:47:34 +0000 Subject: [PATCH 20/29] Update dependencies from https://github.com/dotnet/sdk build Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24175.21 -> To Version 8.0.300-preview.24176.6 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e64a096ed..a533b0540 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - 5157609e360b5c2dd41ac1c1f08250a9641485a0 + e0b5b445062fd2c45385daa0e4d9c6c251966d7c - + https://github.com/dotnet/sdk - 5157609e360b5c2dd41ac1c1f08250a9641485a0 + e0b5b445062fd2c45385daa0e4d9c6c251966d7c - + https://github.com/dotnet/sdk - 5157609e360b5c2dd41ac1c1f08250a9641485a0 + e0b5b445062fd2c45385daa0e4d9c6c251966d7c - + https://github.com/dotnet/sdk - 5157609e360b5c2dd41ac1c1f08250a9641485a0 + e0b5b445062fd2c45385daa0e4d9c6c251966d7c https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 7cdb15be6..303e99b3f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -80,9 +80,9 @@ - 8.0.300-preview.24176.4 - 8.0.300-preview.24176.4 - 8.0.300-preview.24176.4 + 8.0.300-preview.24176.6 + 8.0.300-preview.24176.6 + 8.0.300-preview.24176.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From fdfdd66f383b8669fc4839e8c760fdf4490a0eb5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 26 Mar 2024 22:57:31 +0000 Subject: [PATCH 21/29] Update dependencies from https://github.com/dotnet/sdk build Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24175.21 -> To Version 8.0.300-preview.24176.8 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a533b0540..eb41c0952 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - e0b5b445062fd2c45385daa0e4d9c6c251966d7c + f2f59be833e7e2ab508f649ddeb6e39d64255660 - + https://github.com/dotnet/sdk - e0b5b445062fd2c45385daa0e4d9c6c251966d7c + f2f59be833e7e2ab508f649ddeb6e39d64255660 - + https://github.com/dotnet/sdk - e0b5b445062fd2c45385daa0e4d9c6c251966d7c + f2f59be833e7e2ab508f649ddeb6e39d64255660 - + https://github.com/dotnet/sdk - e0b5b445062fd2c45385daa0e4d9c6c251966d7c + f2f59be833e7e2ab508f649ddeb6e39d64255660 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 303e99b3f..d5cea1574 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -80,9 +80,9 @@ - 8.0.300-preview.24176.6 - 8.0.300-preview.24176.6 - 8.0.300-preview.24176.6 + 8.0.300-preview.24176.8 + 8.0.300-preview.24176.8 + 8.0.300-preview.24176.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 4f8590b0c9ad82ab52285dacd62d12391dabc536 Mon Sep 17 00:00:00 2001 From: "Oleksandr.Didyk" Date: Thu, 28 Mar 2024 15:26:42 +0100 Subject: [PATCH 22/29] add missing using statement --- .../MarkAndCatalogPackages.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/MarkAndCatalogPackages.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/MarkAndCatalogPackages.cs index 32abcae71..3f98cedae 100644 --- a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/MarkAndCatalogPackages.cs +++ b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/MarkAndCatalogPackages.cs @@ -4,6 +4,7 @@ using Microsoft.Build.Framework; using Microsoft.Build.Utilities; +using Microsoft.DotNet.UnifiedBuild.Tasks; using System; using System.Collections.Generic; using System.IO; From f6819adf5fdbfe23fab9da8040debbc88e24454e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C5=99emek=20Vysok=C3=BD?= Date: Thu, 28 Mar 2024 16:23:55 +0100 Subject: [PATCH 23/29] Increase the timeout for Windows builds (#19228) --- eng/pipelines/templates/jobs/vmr-build.yml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/eng/pipelines/templates/jobs/vmr-build.yml b/eng/pipelines/templates/jobs/vmr-build.yml index d396d75b0..6e884c1dc 100644 --- a/eng/pipelines/templates/jobs/vmr-build.yml +++ b/eng/pipelines/templates/jobs/vmr-build.yml @@ -93,8 +93,15 @@ parameters: jobs: - job: ${{ parameters.buildName }}_${{ parameters.architecture }} - timeoutInMinutes: 150 pool: ${{ parameters.pool }} + + # Currently, CodeQL slows the build down too much + # https://github.com/dotnet/source-build/issues/4276 + ${{ if and(parameters.isBuiltFromVmr, startswith(parameters.buildName, 'Windows'), eq(variables['System.TeamProject'], 'internal'), ne(variables['Build.Reason'], 'PullRequest')) }}: + timeoutInMinutes: 360 + ${{ else }}: + timeoutInMinutes: 150 + ${{ if ne(parameters.reuseBuildArtifactsFrom, '') }}: # 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. # The build shortcuts when stage 1 build fails and doesn't produce the SDK. @@ -103,7 +110,7 @@ jobs: variables: - ${{ 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'))) }}: + - ${{ if and(not(parameters.isBuiltFromVmr), eq(variables['System.TeamProject'], 'internal'), not(startswith(parameters.vmrBranch, 'internal/release/')), ne(variables['Build.Reason'], 'PullRequest')) }}: - group: DotNetBot-GitHub - ${{ else }}: - name: BotAccount-dotnet-bot-repo-PAT From 984cec4926a84e53d0801b9cd3305fc787de5431 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 28 Mar 2024 16:28:51 +0000 Subject: [PATCH 24/29] [main] Update dependencies from dotnet/sdk (#19221) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 140 ++++++++++++++++++++-------------------- eng/Versions.props | 48 +++++++------- 2 files changed, 94 insertions(+), 94 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6e962a714..d6d251b94 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,41 +5,41 @@ Source-build uses transitive dependency resolution to determine correct build SHA of all product contributing repos. The order of dependencies is important and should not be modified without approval from dotnet/source-build-internal. --> - + https://github.com/dotnet/windowsdesktop - e9216a8057d1837fc2344fa36703ae8f9b49cc24 + 64bd47b77584245e3fef1d50e7df26391ed1c43c - + https://github.com/dotnet/windowsdesktop - e9216a8057d1837fc2344fa36703ae8f9b49cc24 + 64bd47b77584245e3fef1d50e7df26391ed1c43c - + https://github.com/dotnet/windowsdesktop - e9216a8057d1837fc2344fa36703ae8f9b49cc24 + 64bd47b77584245e3fef1d50e7df26391ed1c43c - + https://github.com/dotnet/windowsdesktop - e9216a8057d1837fc2344fa36703ae8f9b49cc24 + 64bd47b77584245e3fef1d50e7df26391ed1c43c - + https://github.com/dotnet/runtime - c46410f099b6358461d2de89f81393c91d2b40f7 + d7c4f0292dc9840c033c82ec3fa36af57dc3d8f6 - + https://github.com/dotnet/runtime - c46410f099b6358461d2de89f81393c91d2b40f7 + d7c4f0292dc9840c033c82ec3fa36af57dc3d8f6 - + https://github.com/dotnet/runtime - c46410f099b6358461d2de89f81393c91d2b40f7 + d7c4f0292dc9840c033c82ec3fa36af57dc3d8f6 - + https://github.com/dotnet/runtime - c46410f099b6358461d2de89f81393c91d2b40f7 + d7c4f0292dc9840c033c82ec3fa36af57dc3d8f6 - + https://github.com/dotnet/runtime - c46410f099b6358461d2de89f81393c91d2b40f7 + d7c4f0292dc9840c033c82ec3fa36af57dc3d8f6 @@ -47,70 +47,70 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - c46410f099b6358461d2de89f81393c91d2b40f7 + d7c4f0292dc9840c033c82ec3fa36af57dc3d8f6 - + https://github.com/dotnet/runtime - c46410f099b6358461d2de89f81393c91d2b40f7 + d7c4f0292dc9840c033c82ec3fa36af57dc3d8f6 - + https://github.com/dotnet/aspnetcore - 63c8031b6a6af5009b3c5bb4291fcc4c32b06b10 + 1c8f20be1fc4e97044d7ca93edae3af528bc3521 - + https://github.com/dotnet/aspnetcore - 63c8031b6a6af5009b3c5bb4291fcc4c32b06b10 + 1c8f20be1fc4e97044d7ca93edae3af528bc3521 - + https://github.com/dotnet/aspnetcore - 63c8031b6a6af5009b3c5bb4291fcc4c32b06b10 + 1c8f20be1fc4e97044d7ca93edae3af528bc3521 - + https://github.com/dotnet/aspnetcore - 63c8031b6a6af5009b3c5bb4291fcc4c32b06b10 + 1c8f20be1fc4e97044d7ca93edae3af528bc3521 - + https://github.com/dotnet/aspnetcore - 63c8031b6a6af5009b3c5bb4291fcc4c32b06b10 + 1c8f20be1fc4e97044d7ca93edae3af528bc3521 - + https://github.com/dotnet/aspnetcore - 63c8031b6a6af5009b3c5bb4291fcc4c32b06b10 + 1c8f20be1fc4e97044d7ca93edae3af528bc3521 - + https://github.com/dotnet/aspnetcore - 63c8031b6a6af5009b3c5bb4291fcc4c32b06b10 + 1c8f20be1fc4e97044d7ca93edae3af528bc3521 - + https://github.com/dotnet/aspnetcore - 63c8031b6a6af5009b3c5bb4291fcc4c32b06b10 + 1c8f20be1fc4e97044d7ca93edae3af528bc3521 - + https://github.com/dotnet/sdk - f4c11814251c66b510761dee510b9b16c956fe50 + a0f30b2d4330bba73c9ea83adeb5c4552288a893 - + https://github.com/dotnet/sdk - f4c11814251c66b510761dee510b9b16c956fe50 + a0f30b2d4330bba73c9ea83adeb5c4552288a893 - + https://github.com/dotnet/sdk - f4c11814251c66b510761dee510b9b16c956fe50 + a0f30b2d4330bba73c9ea83adeb5c4552288a893 - + https://github.com/dotnet/sdk - f4c11814251c66b510761dee510b9b16c956fe50 + a0f30b2d4330bba73c9ea83adeb5c4552288a893 - + https://github.com/dotnet/sdk - f4c11814251c66b510761dee510b9b16c956fe50 + a0f30b2d4330bba73c9ea83adeb5c4552288a893 @@ -144,22 +144,22 @@ - + https://github.com/dotnet/winforms - 9c9b2e06a998f65638053fdd32cbd65c4cd1a64f + bd0e29875b819a0467427cb9dc6f27852d5635a6 - + https://github.com/dotnet/wpf - 9ef9cfb01e493f617202fd47a09c3403327933a4 + 3c8f486a72db65d2574fedbc2617c9d9d21abefc - + https://github.com/dotnet/fsharp - 4a394198efadc455334ae272954ece372aea4de2 + 483e55164135bd7360df637de12c803fd9e861a5 - + https://github.com/dotnet/fsharp - 4a394198efadc455334ae272954ece372aea4de2 + 483e55164135bd7360df637de12c803fd9e861a5 @@ -172,28 +172,28 @@ 6957756d70d6ade74e239a38ad709db5cb39fe0d - + https://github.com/dotnet/runtime - c46410f099b6358461d2de89f81393c91d2b40f7 + d7c4f0292dc9840c033c82ec3fa36af57dc3d8f6 - + https://github.com/dotnet/roslyn - 919d4dbfb0dffb35a702417e28ceea652d248bc6 + 70c173446a3b354fb586e51301fc79aa809fafb4 - + https://github.com/dotnet/roslyn - 919d4dbfb0dffb35a702417e28ceea652d248bc6 + 70c173446a3b354fb586e51301fc79aa809fafb4 - + https://github.com/dotnet/msbuild - bf82a1313390df2692c23206e0846b205398188b + 6064d9c8fe7beb06ffc10f8ff27ce967039a2c0d - + https://github.com/dotnet/msbuild - bf82a1313390df2692c23206e0846b205398188b + 6064d9c8fe7beb06ffc10f8ff27ce967039a2c0d @@ -205,14 +205,14 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - e4c6eabba09c9d8c4d1bfb40511cb9d494fb0626 + 5b7beea1daa64d283d62d52a0027b13ee9484ff6 - + https://github.com/dotnet/emsdk - e4c6eabba09c9d8c4d1bfb40511cb9d494fb0626 + 5b7beea1daa64d283d62d52a0027b13ee9484ff6 diff --git a/eng/Versions.props b/eng/Versions.props index 0f5e03034..ad7cd3e33 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,11 +47,11 @@ - 9.0.0-preview.4.24176.1 + 9.0.0-preview.4.24177.1 - 9.0.0-preview.4.24177.1 + 9.0.0-preview.4.24177.4 @@ -67,49 +67,49 @@ - 9.0.0-preview.4.24176.7 - 9.0.0-preview.4.24176.7 - 9.0.0-preview.4.24176.7 - 9.0.0-preview.4.24176.7 - 9.0.0-preview.4.24176.7 - 9.0.0-preview.4.24176.7 - 9.0.0-preview.4.24176.7 + 9.0.0-preview.4.24177.3 + 9.0.0-preview.4.24177.3 + 9.0.0-preview.4.24177.3 + 9.0.0-preview.4.24177.3 + 9.0.0-preview.4.24177.3 + 9.0.0-preview.4.24177.3 + 9.0.0-preview.4.24177.3 0.2.0 - 9.0.100-preview.4.24177.10 - 9.0.100-preview.4.24177.10 - 9.0.100-preview.4.24177.10 + 9.0.100-preview.4.24178.20 + 9.0.100-preview.4.24178.20 + 9.0.100-preview.4.24178.20 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.10.0-3.24175.2 + 4.11.0-1.24177.10 - 9.0.0-preview.4.24176.12 + 9.0.0-preview.4.24177.12 - 9.0.0-preview.4.24176.12 - 9.0.0-preview.4.24176.12 - 9.0.0-preview.4.24176.12 - 9.0.0-preview.4.24176.12 - 9.0.0-preview.4.24176.12 + 9.0.0-preview.4.24177.12 + 9.0.0-preview.4.24177.12 + 9.0.0-preview.4.24177.12 + 9.0.0-preview.4.24177.12 + 9.0.0-preview.4.24177.12 2.1.0 - 9.0.0-preview.4.24177.1 - 9.0.0-preview.4.24177.1 - 9.0.0-preview.4.24177.1 - 9.0.0-preview.4.24177.1 + 9.0.0-preview.4.24177.3 + 9.0.0-preview.4.24177.3 + 9.0.0-preview.4.24177.3 + 9.0.0-preview.4.24177.3 @@ -226,7 +226,7 @@ 14.2.9088-net9-p1 17.2.9088-net9-p1 - 9.0.0-preview.4.24176.1 + 9.0.0-preview.4.24176.2 $(MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportPackageVersion) 9.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-[A-z]*[\.]*\d*`)) From 37337446aa95b51b820c00e72965566797cfb464 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 28 Mar 2024 18:08:24 +0100 Subject: [PATCH 25/29] [main] Update dependencies from dotnet/arcade (#19225) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 2 +- global.json | 4 ++-- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d6d251b94..bca707251 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -243,17 +243,17 @@ - + https://github.com/dotnet/arcade - b6fada3ec4fa37e08dcbafaa6ddf59213f3f8687 + 689fb2d1b620a9df28c3384d9b208e3654a0f928 - + https://github.com/dotnet/arcade - b6fada3ec4fa37e08dcbafaa6ddf59213f3f8687 + 689fb2d1b620a9df28c3384d9b208e3654a0f928 - + https://github.com/dotnet/arcade - b6fada3ec4fa37e08dcbafaa6ddf59213f3f8687 + 689fb2d1b620a9df28c3384d9b208e3654a0f928 https://github.com/dotnet/arcade-services @@ -263,14 +263,14 @@ https://github.com/dotnet/arcade-services 0e9abfee048404d9b994fc64235b42216ce68dad - + https://github.com/dotnet/arcade - b6fada3ec4fa37e08dcbafaa6ddf59213f3f8687 + 689fb2d1b620a9df28c3384d9b208e3654a0f928 - + https://github.com/dotnet/arcade - b6fada3ec4fa37e08dcbafaa6ddf59213f3f8687 + 689fb2d1b620a9df28c3384d9b208e3654a0f928 diff --git a/eng/Versions.props b/eng/Versions.props index ad7cd3e33..0029a93ee 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,7 +39,7 @@ - 9.0.0-beta.24176.6 + 9.0.0-beta.24177.2 diff --git a/global.json b/global.json index fd277162f..90bced43b 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "latest" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24176.6", - "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24176.6" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24177.2", + "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24177.2" } } From f10d359312ae975e7afff521a2f535c6ef73e97f Mon Sep 17 00:00:00 2001 From: Oleksandr Didyk <106967057+oleksandr-didyk@users.noreply.github.com> Date: Thu, 28 Mar 2024 20:49:17 +0100 Subject: [PATCH 26/29] Fixup parsing installer sha from VMR build tag (#19227) --- 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 aeab74edd..11438c14b 100644 --- a/eng/pipelines/templates/jobs/sdk-diff-tests.yml +++ b/eng/pipelines/templates/jobs/sdk-diff-tests.yml @@ -38,7 +38,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 7cf98ffd55601e67c0803036db416f6b847c3831 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 28 Mar 2024 17:30:52 -0700 Subject: [PATCH 27/29] [main] Update dependencies from dotnet/sdk (#19232) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 52 ++++++++++++++++++++--------------------- eng/Versions.props | 18 +++++++------- 2 files changed, 35 insertions(+), 35 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bca707251..caf0c34a6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -21,25 +21,25 @@ https://github.com/dotnet/windowsdesktop 64bd47b77584245e3fef1d50e7df26391ed1c43c - + https://github.com/dotnet/runtime - d7c4f0292dc9840c033c82ec3fa36af57dc3d8f6 + e612bf4d0b6f08623092902c34a504e932388664 - + https://github.com/dotnet/runtime - d7c4f0292dc9840c033c82ec3fa36af57dc3d8f6 + e612bf4d0b6f08623092902c34a504e932388664 - + https://github.com/dotnet/runtime - d7c4f0292dc9840c033c82ec3fa36af57dc3d8f6 + e612bf4d0b6f08623092902c34a504e932388664 - + https://github.com/dotnet/runtime - d7c4f0292dc9840c033c82ec3fa36af57dc3d8f6 + e612bf4d0b6f08623092902c34a504e932388664 - + https://github.com/dotnet/runtime - d7c4f0292dc9840c033c82ec3fa36af57dc3d8f6 + e612bf4d0b6f08623092902c34a504e932388664 @@ -47,14 +47,14 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - d7c4f0292dc9840c033c82ec3fa36af57dc3d8f6 + e612bf4d0b6f08623092902c34a504e932388664 - + https://github.com/dotnet/runtime - d7c4f0292dc9840c033c82ec3fa36af57dc3d8f6 + e612bf4d0b6f08623092902c34a504e932388664 @@ -91,26 +91,26 @@ 1c8f20be1fc4e97044d7ca93edae3af528bc3521 - + https://github.com/dotnet/sdk - a0f30b2d4330bba73c9ea83adeb5c4552288a893 + a8819e9aa9fdd298024419911d7fcd7a360e876e - + https://github.com/dotnet/sdk - a0f30b2d4330bba73c9ea83adeb5c4552288a893 + a8819e9aa9fdd298024419911d7fcd7a360e876e - + https://github.com/dotnet/sdk - a0f30b2d4330bba73c9ea83adeb5c4552288a893 + a8819e9aa9fdd298024419911d7fcd7a360e876e - + https://github.com/dotnet/sdk - a0f30b2d4330bba73c9ea83adeb5c4552288a893 + a8819e9aa9fdd298024419911d7fcd7a360e876e - + https://github.com/dotnet/sdk - a0f30b2d4330bba73c9ea83adeb5c4552288a893 + a8819e9aa9fdd298024419911d7fcd7a360e876e @@ -172,9 +172,9 @@ 6957756d70d6ade74e239a38ad709db5cb39fe0d - + https://github.com/dotnet/runtime - d7c4f0292dc9840c033c82ec3fa36af57dc3d8f6 + e612bf4d0b6f08623092902c34a504e932388664 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 0029a93ee..88a719514 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -80,9 +80,9 @@ - 9.0.100-preview.4.24178.20 - 9.0.100-preview.4.24178.20 - 9.0.100-preview.4.24178.20 + 9.0.100-preview.4.24178.23 + 9.0.100-preview.4.24178.23 + 9.0.100-preview.4.24178.23 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -93,15 +93,15 @@ - 9.0.0-preview.4.24177.12 + 9.0.0-preview.4.24178.3 - 9.0.0-preview.4.24177.12 - 9.0.0-preview.4.24177.12 - 9.0.0-preview.4.24177.12 - 9.0.0-preview.4.24177.12 - 9.0.0-preview.4.24177.12 + 9.0.0-preview.4.24178.3 + 9.0.0-preview.4.24178.3 + 9.0.0-preview.4.24178.3 + 9.0.0-preview.4.24178.3 + 9.0.0-preview.4.24178.3 2.1.0 From 6cb99adb7aea19d43c6af6aecae7526dfe61d763 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 29 Mar 2024 05:30:15 +0000 Subject: [PATCH 28/29] [main] Update dependencies from dotnet/sdk (#19235) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++------ 2 files changed, 44 insertions(+), 44 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index caf0c34a6..0a904a75e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,21 +5,21 @@ Source-build uses transitive dependency resolution to determine correct build SHA of all product contributing repos. The order of dependencies is important and should not be modified without approval from dotnet/source-build-internal. --> - + https://github.com/dotnet/windowsdesktop - 64bd47b77584245e3fef1d50e7df26391ed1c43c + 779fc998f3d71a33a0ed59b4acf849b45e9659a2 - + https://github.com/dotnet/windowsdesktop - 64bd47b77584245e3fef1d50e7df26391ed1c43c + 779fc998f3d71a33a0ed59b4acf849b45e9659a2 - + https://github.com/dotnet/windowsdesktop - 64bd47b77584245e3fef1d50e7df26391ed1c43c + 779fc998f3d71a33a0ed59b4acf849b45e9659a2 - + https://github.com/dotnet/windowsdesktop - 64bd47b77584245e3fef1d50e7df26391ed1c43c + 779fc998f3d71a33a0ed59b4acf849b45e9659a2 https://github.com/dotnet/runtime @@ -91,26 +91,26 @@ 1c8f20be1fc4e97044d7ca93edae3af528bc3521 - + https://github.com/dotnet/sdk - a8819e9aa9fdd298024419911d7fcd7a360e876e + 722cfe0512e8ef858287d3dcaf0c5e88ed336330 - + https://github.com/dotnet/sdk - a8819e9aa9fdd298024419911d7fcd7a360e876e + 722cfe0512e8ef858287d3dcaf0c5e88ed336330 - + https://github.com/dotnet/sdk - a8819e9aa9fdd298024419911d7fcd7a360e876e + 722cfe0512e8ef858287d3dcaf0c5e88ed336330 - + https://github.com/dotnet/sdk - a8819e9aa9fdd298024419911d7fcd7a360e876e + 722cfe0512e8ef858287d3dcaf0c5e88ed336330 - + https://github.com/dotnet/sdk - a8819e9aa9fdd298024419911d7fcd7a360e876e + 722cfe0512e8ef858287d3dcaf0c5e88ed336330 @@ -144,32 +144,32 @@ - + https://github.com/dotnet/winforms - bd0e29875b819a0467427cb9dc6f27852d5635a6 + 7b7e9b0f5cf667be3326ed8cf11be1f825da672b - + https://github.com/dotnet/wpf - 3c8f486a72db65d2574fedbc2617c9d9d21abefc + 69b072ec137ebf5b2efa9d7ffa40183d70625ae2 - + https://github.com/dotnet/fsharp - 483e55164135bd7360df637de12c803fd9e861a5 + 20b263ab495669df94b309fce12584b207dc765c - + https://github.com/dotnet/fsharp - 483e55164135bd7360df637de12c803fd9e861a5 + 20b263ab495669df94b309fce12584b207dc765c - + https://github.com/microsoft/vstest - 6957756d70d6ade74e239a38ad709db5cb39fe0d + 1cd0d8998250d36c95ed65a76304ef5d1b33e98f - + https://github.com/microsoft/vstest - 6957756d70d6ade74e239a38ad709db5cb39fe0d + 1cd0d8998250d36c95ed65a76304ef5d1b33e98f @@ -186,14 +186,14 @@ 70c173446a3b354fb586e51301fc79aa809fafb4 - + https://github.com/dotnet/msbuild - 6064d9c8fe7beb06ffc10f8ff27ce967039a2c0d + fc88a31e448201028ca50f890fea3a9878d7c534 - + https://github.com/dotnet/msbuild - 6064d9c8fe7beb06ffc10f8ff27ce967039a2c0d + fc88a31e448201028ca50f890fea3a9878d7c534 diff --git a/eng/Versions.props b/eng/Versions.props index 88a719514..6490a6a82 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,11 +47,11 @@ - 9.0.0-preview.4.24177.1 + 9.0.0-preview.4.24177.4 - 9.0.0-preview.4.24177.4 + 9.0.0-preview.4.24177.5 @@ -80,9 +80,9 @@ - 9.0.100-preview.4.24178.23 - 9.0.100-preview.4.24178.23 - 9.0.100-preview.4.24178.23 + 9.0.100-preview.4.24178.27 + 9.0.100-preview.4.24178.27 + 9.0.100-preview.4.24178.27 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -106,10 +106,10 @@ - 9.0.0-preview.4.24177.3 - 9.0.0-preview.4.24177.3 - 9.0.0-preview.4.24177.3 - 9.0.0-preview.4.24177.3 + 9.0.0-preview.4.24178.2 + 9.0.0-preview.4.24178.2 + 9.0.0-preview.4.24178.2 + 9.0.0-preview.4.24178.2 @@ -210,7 +210,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.10.0-preview-24170-01 + 17.10.0-release-24177-07 9.0.0-alpha.1.24058.10 9.0.0-preview.24176.1 From 58c25449515f8f1a7e5cebdd365e6c672e01b1ed Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Fri, 29 Mar 2024 17:36:33 +0100 Subject: [PATCH 29/29] Enable roslyn for unified build (#18769) Co-authored-by: Matt Mitchell (.NET) --- src/SourceBuild/content/repo-projects/Directory.Build.targets | 1 - src/SourceBuild/content/repo-projects/aspnetcore.proj | 2 +- src/SourceBuild/content/repo-projects/roslyn.proj | 3 +++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/SourceBuild/content/repo-projects/Directory.Build.targets b/src/SourceBuild/content/repo-projects/Directory.Build.targets index b54a33934..c8eca61db 100644 --- a/src/SourceBuild/content/repo-projects/Directory.Build.targets +++ b/src/SourceBuild/content/repo-projects/Directory.Build.targets @@ -54,7 +54,6 @@ - diff --git a/src/SourceBuild/content/repo-projects/aspnetcore.proj b/src/SourceBuild/content/repo-projects/aspnetcore.proj index bf77ef870..6fa87fb0f 100644 --- a/src/SourceBuild/content/repo-projects/aspnetcore.proj +++ b/src/SourceBuild/content/repo-projects/aspnetcore.proj @@ -24,13 +24,13 @@ - + diff --git a/src/SourceBuild/content/repo-projects/roslyn.proj b/src/SourceBuild/content/repo-projects/roslyn.proj index dfbeb7102..398f2cda1 100644 --- a/src/SourceBuild/content/repo-projects/roslyn.proj +++ b/src/SourceBuild/content/repo-projects/roslyn.proj @@ -17,6 +17,7 @@ $(BuildArgs) $(FlagParameterPrefix)officialSkipApplyOptimizationData true $(BuildArgs) $(FlagParameterPrefix)officialSourceBranchName placeholder $(BuildArgs) $(FlagParameterPrefix)officialVisualStudioDropAccessToken placeholder + $(BuildArgs) /p:TargetRid=$(TargetRid) $(BuildArgs) /p:TreatWarningsAsErrors=false $(BuildArgs) /p:ApplyPartialNgenOptimization=false $(BuildArgs) /p:EnablePartialNgenOptimization=false @@ -24,6 +25,8 @@ $(BuildArgs) /p:UsingToolMicrosoftNetCompilers=false + + $(BuildArgs) /p:EnableNgenOptimization=false