From f5c23b14a7d2d8d4d34646bff66f1141fdd3b252 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 28 Feb 2025 05:01:54 +0000 Subject: [PATCH 1/4] Update dependencies from https://github.com/dotnet/msbuild build 20250227.7 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.14.0-preview-25126-06 -> To Version 17.14.0-preview-25127-07 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2d17af62252d..2ab383ba470d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -69,18 +69,18 @@ 763d10a1a251be35337ee736832bfde3f9200672 - + https://github.com/dotnet/msbuild - e18e7f0af7252f8ec892a80d9b3523040ab6de0d + c012996cff65a416898f9bcd95de1691ec46335a - + https://github.com/dotnet/msbuild - e18e7f0af7252f8ec892a80d9b3523040ab6de0d + c012996cff65a416898f9bcd95de1691ec46335a - + https://github.com/dotnet/msbuild - e18e7f0af7252f8ec892a80d9b3523040ab6de0d + c012996cff65a416898f9bcd95de1691ec46335a diff --git a/eng/Versions.props b/eng/Versions.props index 3ba46fddaf5c..474da7c051a8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -178,8 +178,8 @@ At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes. Additionally, set the MinimumVSVersion for the installer UI that's required for targeting NetCurrent --> - 17.14.0-preview-25126-06 - 17.14.0-preview-25126-06 + 17.14.0-preview-25127-07 + 17.14.0-preview-25127-07 17.11.4 17.12 From 583466601489207c11f45fb16ddc4af9ec8295cf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 1 Mar 2025 05:02:15 +0000 Subject: [PATCH 2/4] Update dependencies from https://github.com/dotnet/msbuild build 20250228.2 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.14.0-preview-25126-06 -> To Version 17.14.0-preview-25128-02 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2ab383ba470d..dd90c9482543 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -69,18 +69,18 @@ 763d10a1a251be35337ee736832bfde3f9200672 - + https://github.com/dotnet/msbuild - c012996cff65a416898f9bcd95de1691ec46335a + 0f466124dc843c0db2c84eedc1b8bebd6f6daff3 - + https://github.com/dotnet/msbuild - c012996cff65a416898f9bcd95de1691ec46335a + 0f466124dc843c0db2c84eedc1b8bebd6f6daff3 - + https://github.com/dotnet/msbuild - c012996cff65a416898f9bcd95de1691ec46335a + 0f466124dc843c0db2c84eedc1b8bebd6f6daff3 diff --git a/eng/Versions.props b/eng/Versions.props index 474da7c051a8..93fbb242f5c7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -178,8 +178,8 @@ At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes. Additionally, set the MinimumVSVersion for the installer UI that's required for targeting NetCurrent --> - 17.14.0-preview-25127-07 - 17.14.0-preview-25127-07 + 17.14.0-preview-25128-02 + 17.14.0-preview-25128-02 17.11.4 17.12 From 4ca7deb4e210717f1a225421d38aa79f11603061 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= Date: Sat, 1 Mar 2025 09:41:12 +0100 Subject: [PATCH 3/4] Disable tests that rely on vs-solutionpersistence fix --- test/dotnet-sln.Tests/GivenDotnetSlnAdd.cs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/test/dotnet-sln.Tests/GivenDotnetSlnAdd.cs b/test/dotnet-sln.Tests/GivenDotnetSlnAdd.cs index e22f2f979cda..cb33ed83d77a 100644 --- a/test/dotnet-sln.Tests/GivenDotnetSlnAdd.cs +++ b/test/dotnet-sln.Tests/GivenDotnetSlnAdd.cs @@ -244,10 +244,11 @@ public void WhenNestedProjectIsAddedSolutionFoldersAreCreated(string solutionCom } [Theory] - [InlineData("sln", true, ".sln")] - [InlineData("sln", false, ".sln")] - [InlineData("solution", true, ".sln")] - [InlineData("solution", false, ".sln")] + // needs https://github.com/microsoft/vs-solutionpersistence/pull/101 + //[InlineData("sln", true, ".sln")] + //[InlineData("sln", false, ".sln")] + //[InlineData("solution", true, ".sln")] + //[InlineData("solution", false, ".sln")] [InlineData("sln", true, ".slnx")] [InlineData("solution", false, ".slnx")] public void WhenNestedProjectIsAddedSolutionFoldersAreCreatedBuild(string solutionCommand, bool fooFirst, string solutionExtension) From 31baa99550fdcbb1a78781d5a8b71c85d05a167d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 3 Mar 2025 05:02:30 +0000 Subject: [PATCH 4/4] Update dependencies from https://github.com/dotnet/msbuild build 20250303.1 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.14.0-preview-25126-06 -> To Version 17.14.0-preview-25153-01 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index dd90c9482543..ce51a78d907e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -69,18 +69,18 @@ 763d10a1a251be35337ee736832bfde3f9200672 - + https://github.com/dotnet/msbuild - 0f466124dc843c0db2c84eedc1b8bebd6f6daff3 + c012996cff65a416898f9bcd95de1691ec46335a - + https://github.com/dotnet/msbuild - 0f466124dc843c0db2c84eedc1b8bebd6f6daff3 + c012996cff65a416898f9bcd95de1691ec46335a - + https://github.com/dotnet/msbuild - 0f466124dc843c0db2c84eedc1b8bebd6f6daff3 + c012996cff65a416898f9bcd95de1691ec46335a diff --git a/eng/Versions.props b/eng/Versions.props index 93fbb242f5c7..90330cd6805e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -178,8 +178,8 @@ At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes. Additionally, set the MinimumVSVersion for the installer UI that's required for targeting NetCurrent --> - 17.14.0-preview-25128-02 - 17.14.0-preview-25128-02 + 17.14.0-preview-25153-01 + 17.14.0-preview-25153-01 17.11.4 17.12