Skip to content

Commit 3f95998

Browse files
author
Mirroring
committed
Merge commit '05343f1a3b97bb6cfbed7f1d7132e6636334e1f1'
2 parents 5bf22e3 + 05343f1 commit 3f95998

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
@@ -12,7 +12,7 @@
1212
<add key="darc-int-dotnet-aspnetcore-1988c37" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-1988c37e/nuget/v3/index.json" />
1313
<!-- End: Package sources from dotnet-aspnetcore -->
1414
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
15-
<add key="darc-pub-DotNet-msbuild-Trusted-d832838" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-d8328385/nuget/v3/index.json" />
15+
<add key="darc-pub-DotNet-msbuild-Trusted-af11d4f-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-af11d4f2-1/nuget/v3/index.json" />
1616
<!-- End: Package sources from DotNet-msbuild-Trusted -->
1717
<!-- Begin: Package sources from dotnet-roslyn-analyzers -->
1818
<!-- 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
@@ -55,17 +55,17 @@
5555
<Uri>https://github.com/dotnet/emsdk</Uri>
5656
<Sha>976b101e5539557c20e2ac39885ac879531bcf82</Sha>
5757
</Dependency>
58-
<Dependency Name="Microsoft.Build" Version="17.8.30">
58+
<Dependency Name="Microsoft.Build" Version="17.8.31">
5959
<Uri>https://github.com/dotnet/msbuild</Uri>
60-
<Sha>d832838517d47acce1d644b872ae7599c655b4e2</Sha>
60+
<Sha>af11d4f253ee5c813bfd4f9d5902772638014572</Sha>
6161
</Dependency>
62-
<Dependency Name="Microsoft.Build.Localization" Version="17.8.30-servicing-25278-04">
62+
<Dependency Name="Microsoft.Build.Localization" Version="17.8.31-servicing-25313-09">
6363
<Uri>https://github.com/dotnet/msbuild</Uri>
64-
<Sha>d832838517d47acce1d644b872ae7599c655b4e2</Sha>
64+
<Sha>af11d4f253ee5c813bfd4f9d5902772638014572</Sha>
6565
</Dependency>
66-
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.8.30-servicing-25278-04">
66+
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.8.31-servicing-25313-09">
6767
<Uri>https://github.com/dotnet/msbuild</Uri>
68-
<Sha>d832838517d47acce1d644b872ae7599c655b4e2</Sha>
68+
<Sha>af11d4f253ee5c813bfd4f9d5902772638014572</Sha>
6969
<SourceBuild RepoName="msbuild" ManagedOnly="true" />
7070
</Dependency>
7171
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.8.102-beta.24081.2">

eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@
121121
</PropertyGroup>
122122
<PropertyGroup>
123123
<!-- Dependencies from https://github.com/Microsoft/msbuild -->
124-
<MicrosoftBuildPackageVersion>17.8.30</MicrosoftBuildPackageVersion>
124+
<MicrosoftBuildPackageVersion>17.8.31</MicrosoftBuildPackageVersion>
125125
<MicrosoftBuildCurrentPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildCurrentPackageVersion>
126126
<!-- Some tasks and the resolver will need to run in an MSBuild that is older than the very latest,
127127
so target one that matches the version in minimumMSBuildVersion.
@@ -130,7 +130,7 @@
130130
<MicrosoftBuildPackageVersion Condition="exists('$(RepoRoot)\src\Layout\redist\minimumMSBuildVersion') and '$(DotNetBuildFromSource)' != 'true'">$([System.IO.File]::ReadAllText('$(RepoRoot)\src\Layout\redist\minimumMSBuildVersion').Trim())</MicrosoftBuildPackageVersion>
131131
<MicrosoftBuildFrameworkPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildFrameworkPackageVersion>
132132
<MicrosoftBuildRuntimePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildRuntimePackageVersion>
133-
<MicrosoftBuildLocalizationPackageVersion>17.8.30-servicing-25278-04</MicrosoftBuildLocalizationPackageVersion>
133+
<MicrosoftBuildLocalizationPackageVersion>17.8.31-servicing-25313-09</MicrosoftBuildLocalizationPackageVersion>
134134
<MicrosoftBuildUtilitiesCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildUtilitiesCorePackageVersion>
135135
<MicrosoftBuildTasksCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildTasksCorePackageVersion>
136136
<MicrosoftBuildTasksCoreVersion>$(MicrosoftBuildTasksCorePackageVersion)</MicrosoftBuildTasksCoreVersion>

0 commit comments

Comments
 (0)