Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

[main] Update dependencies from dotnet/msbuild #47181

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
+13 −12
Open

[main] Update dependencies from dotnet/msbuild #47181

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7e57922
Update dependencies from https://github.com/dotnet/msbuild build 2025…
dotnet-maestro[bot] Feb 28, 2025
82cbabe
Update dependencies from https://github.com/dotnet/msbuild build 2025…
dotnet-maestro[bot] Mar 1, 2025
595df90
Disable tests that rely on vs-solutionpersistence fix
akoeplinger Mar 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,18 +101,18 @@
<Sha>46e7f0e542981ed77988f2ec0d37c8da0dd7da0d</Sha>
<SourceBuild RepoName="emsdk" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.Build" Version="17.14.0-preview-25126-06">
<Dependency Name="Microsoft.Build" Version="17.14.0-preview-25128-02">
<Uri>https://github.com/dotnet/msbuild</Uri>
<Sha>e18e7f0af7252f8ec892a80d9b3523040ab6de0d</Sha>
<Sha>0f466124dc843c0db2c84eedc1b8bebd6f6daff3</Sha>
</Dependency>
<Dependency Name="Microsoft.Build.Localization" Version="17.14.0-preview-25126-06">
<Dependency Name="Microsoft.Build.Localization" Version="17.14.0-preview-25128-02">
<Uri>https://github.com/dotnet/msbuild</Uri>
<Sha>e18e7f0af7252f8ec892a80d9b3523040ab6de0d</Sha>
<Sha>0f466124dc843c0db2c84eedc1b8bebd6f6daff3</Sha>
</Dependency>
<!-- Intermediate is necessary for source build. -->
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.14.0-preview-25126-06">
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.14.0-preview-25128-02">
<Uri>https://github.com/dotnet/msbuild</Uri>
<Sha>e18e7f0af7252f8ec892a80d9b3523040ab6de0d</Sha>
<Sha>0f466124dc843c0db2c84eedc1b8bebd6f6daff3</Sha>
<SourceBuild RepoName="msbuild" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.FSharp.Compiler" Version="13.9.300-beta.25124.4">
Expand Down
4 changes: 2 additions & 2 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 -->
<MicrosoftBuildVersion>17.14.0-preview-25126-06</MicrosoftBuildVersion>
<MicrosoftBuildLocalizationVersion>17.14.0-preview-25126-06</MicrosoftBuildLocalizationVersion>
<MicrosoftBuildVersion>17.14.0-preview-25128-02</MicrosoftBuildVersion>
<MicrosoftBuildLocalizationVersion>17.14.0-preview-25128-02</MicrosoftBuildLocalizationVersion>
<MicrosoftBuildMinimumVersion Condition="'$(DotNetBuildSourceOnly)' != 'true'">17.11.4</MicrosoftBuildMinimumVersion>
<MinimumVSVersion>17.13</MinimumVSVersion>
</PropertyGroup>
Expand Down
9 changes: 5 additions & 4 deletions test/dotnet-sln.Tests/GivenDotnetSlnAdd.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,10 +246,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)
Expand Down
Loading