Skip to content

Commit 3ee9f5f

Browse files
[release/10.0.1xx-preview2] Update dependencies from dotnet/msbuild (#47263)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Eduardo Villalpando Mello <[email protected]>
1 parent ead30dd commit 3ee9f5f

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

eng/Version.Details.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -101,18 +101,18 @@
101101
<Sha>e7f5a77e3351fca1c921a9bbe15ec1d4cd8234a7</Sha>
102102
<SourceBuild RepoName="emsdk" ManagedOnly="true" />
103103
</Dependency>
104-
<Dependency Name="Microsoft.Build" Version="17.14.0-preview-25126-06">
104+
<Dependency Name="Microsoft.Build" Version="17.14.0-preview-25154-01">
105105
<Uri>https://github.com/dotnet/msbuild</Uri>
106-
<Sha>e18e7f0af7252f8ec892a80d9b3523040ab6de0d</Sha>
106+
<Sha>d0473775c2797d723bfc55ca6e33184c2bbacbff</Sha>
107107
</Dependency>
108-
<Dependency Name="Microsoft.Build.Localization" Version="17.14.0-preview-25126-06">
108+
<Dependency Name="Microsoft.Build.Localization" Version="17.14.0-preview-25154-01">
109109
<Uri>https://github.com/dotnet/msbuild</Uri>
110-
<Sha>e18e7f0af7252f8ec892a80d9b3523040ab6de0d</Sha>
110+
<Sha>d0473775c2797d723bfc55ca6e33184c2bbacbff</Sha>
111111
</Dependency>
112112
<!-- Intermediate is necessary for source build. -->
113-
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.14.0-preview-25126-06">
113+
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.14.0-preview-25154-01">
114114
<Uri>https://github.com/dotnet/msbuild</Uri>
115-
<Sha>e18e7f0af7252f8ec892a80d9b3523040ab6de0d</Sha>
115+
<Sha>d0473775c2797d723bfc55ca6e33184c2bbacbff</Sha>
116116
<SourceBuild RepoName="msbuild" ManagedOnly="true" />
117117
</Dependency>
118118
<Dependency Name="Microsoft.FSharp.Compiler" Version="13.9.300-beta.25124.4">

eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -193,8 +193,8 @@
193193
At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes.
194194
195195
Additionally, set the MinimumVSVersion for the installer UI that's required for targeting NetCurrent -->
196-
<MicrosoftBuildVersion>17.14.0-preview-25126-06</MicrosoftBuildVersion>
197-
<MicrosoftBuildLocalizationVersion>17.14.0-preview-25126-06</MicrosoftBuildLocalizationVersion>
196+
<MicrosoftBuildVersion>17.14.0-preview-25154-01</MicrosoftBuildVersion>
197+
<MicrosoftBuildLocalizationVersion>17.14.0-preview-25154-01</MicrosoftBuildLocalizationVersion>
198198
<MicrosoftBuildMinimumVersion Condition="'$(DotNetBuildSourceOnly)' != 'true'">17.11.4</MicrosoftBuildMinimumVersion>
199199
<MinimumVSVersion>17.13</MinimumVSVersion>
200200
</PropertyGroup>

test/dotnet-sln.Tests/GivenDotnetSlnAdd.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ public void WhenNestedProjectIsAddedSolutionFoldersAreCreated(string solutionCom
245245
cmd.Should().Pass();
246246
}
247247

248-
[Theory]
248+
[Theory(Skip="https://github.com/dotnet/sdk/pull/47181#issuecomment-2690656241")]
249249
[InlineData("sln", true, ".sln")]
250250
[InlineData("sln", false, ".sln")]
251251
[InlineData("solution", true, ".sln")]

0 commit comments

Comments
 (0)