Skip to content

Commit 5632c10

Browse files
author
Mirroring
committed
Merge commit 'ea9076b76b30a62fa781850a25206fb4b0e3b817'
2 parents 5799714 + ea9076b commit 5632c10

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

NuGet.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<add key="darc-pub-dotnet-emsdk-0bcc3e6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-0bcc3e67/nuget/v3/index.json" />
3131
<!-- End: Package sources from dotnet-emsdk -->
3232
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
33-
<add key="darc-pub-DotNet-msbuild-Trusted-d21f833" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-d21f833b/nuget/v3/index.json" />
33+
<add key="darc-pub-DotNet-msbuild-Trusted-5d8159c" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-5d8159c5/nuget/v3/index.json" />
3434
<!-- End: Package sources from DotNet-msbuild-Trusted -->
3535
<!-- Begin: Package sources from dotnet-roslyn-analyzers -->
3636
<!-- 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>0bcc3e67026ea44a16fb018a50e4e134c06ab3d6</Sha>
7070
<SourceBuild RepoName="emsdk" ManagedOnly="true" />
7171
</Dependency>
72-
<Dependency Name="Microsoft.Build" Version="17.14.15">
72+
<Dependency Name="Microsoft.Build" Version="17.14.16">
7373
<Uri>https://github.com/dotnet/msbuild</Uri>
74-
<Sha>d21f833b9027346d36a311d538320d58ab7a8895</Sha>
74+
<Sha>5d8159c5fa474b60b0c1e5159b0dd054a102ee8a</Sha>
7575
</Dependency>
76-
<Dependency Name="Microsoft.Build.Localization" Version="17.14.15-servicing-25353-03">
76+
<Dependency Name="Microsoft.Build.Localization" Version="17.14.16-servicing-25360-01">
7777
<Uri>https://github.com/dotnet/msbuild</Uri>
78-
<Sha>d21f833b9027346d36a311d538320d58ab7a8895</Sha>
78+
<Sha>5d8159c5fa474b60b0c1e5159b0dd054a102ee8a</Sha>
7979
</Dependency>
8080
<!-- Intermediate is necessary for source build. -->
81-
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.14.15-servicing-25353-03">
81+
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.14.16-servicing-25360-01">
8282
<Uri>https://github.com/dotnet/msbuild</Uri>
83-
<Sha>d21f833b9027346d36a311d538320d58ab7a8895</Sha>
83+
<Sha>5d8159c5fa474b60b0c1e5159b0dd054a102ee8a</Sha>
8484
<SourceBuild RepoName="msbuild" ManagedOnly="true" />
8585
</Dependency>
8686
<Dependency Name="Microsoft.FSharp.Compiler" Version="13.9.300-beta.25228.3">

eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,8 +182,8 @@
182182
At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes.
183183
184184
Additionally, set the MinimumVSVersion for the installer UI that's required for targeting NetCurrent -->
185-
<MicrosoftBuildVersion>17.14.15</MicrosoftBuildVersion>
186-
<MicrosoftBuildLocalizationVersion>17.14.15-servicing-25353-03</MicrosoftBuildLocalizationVersion>
185+
<MicrosoftBuildVersion>17.14.16</MicrosoftBuildVersion>
186+
<MicrosoftBuildLocalizationVersion>17.14.16-servicing-25360-01</MicrosoftBuildLocalizationVersion>
187187
<MicrosoftBuildMinimumVersion Condition="'$(DotNetBuildSourceOnly)' != 'true'">17.11.31</MicrosoftBuildMinimumVersion>
188188
<MinimumVSVersion>17.12</MinimumVSVersion>
189189
</PropertyGroup>

0 commit comments

Comments
 (0)