From 7033b3fcb611dd821fb7c943dcac60cc28e3be96 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 4 Mar 2025 22:07:25 +0000 Subject: [PATCH 1/2] Update dependencies from https://github.com/dotnet/msbuild build 20250304.1 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.14.0-preview-25126-06 -> To Version 17.14.0-preview-25154-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 bf468f127371..4b82fc084422 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -101,18 +101,18 @@ e7f5a77e3351fca1c921a9bbe15ec1d4cd8234a7 - + https://github.com/dotnet/msbuild - e18e7f0af7252f8ec892a80d9b3523040ab6de0d + d0473775c2797d723bfc55ca6e33184c2bbacbff - + https://github.com/dotnet/msbuild - e18e7f0af7252f8ec892a80d9b3523040ab6de0d + d0473775c2797d723bfc55ca6e33184c2bbacbff - + https://github.com/dotnet/msbuild - e18e7f0af7252f8ec892a80d9b3523040ab6de0d + d0473775c2797d723bfc55ca6e33184c2bbacbff diff --git a/eng/Versions.props b/eng/Versions.props index 0ebe607de046..16560c3ca573 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -193,8 +193,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-25154-01 + 17.14.0-preview-25154-01 17.11.4 17.13 From a4b1e47ae30eb8558570af3d9a8908eec20c4a83 Mon Sep 17 00:00:00 2001 From: Eduardo Villalpando Mello Date: Tue, 4 Mar 2025 15:04:26 -0800 Subject: [PATCH 2/2] Skip tests --- test/dotnet-sln.Tests/GivenDotnetSlnAdd.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/dotnet-sln.Tests/GivenDotnetSlnAdd.cs b/test/dotnet-sln.Tests/GivenDotnetSlnAdd.cs index 44089df8025c..789c8cbb0ca2 100644 --- a/test/dotnet-sln.Tests/GivenDotnetSlnAdd.cs +++ b/test/dotnet-sln.Tests/GivenDotnetSlnAdd.cs @@ -245,7 +245,7 @@ public void WhenNestedProjectIsAddedSolutionFoldersAreCreated(string solutionCom cmd.Should().Pass(); } - [Theory] + [Theory(Skip="https://github.com/dotnet/sdk/pull/47181#issuecomment-2690656241")] [InlineData("sln", true, ".sln")] [InlineData("sln", false, ".sln")] [InlineData("solution", true, ".sln")]