Skip to content

Commit 2ece6a2

Browse files
author
Mirroring
committed
Merge commit '61b9f317e82999ad7988d70e39cbe1f43288b329'
2 parents 37052dc + 61b9f31 commit 2ece6a2

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
@@ -21,7 +21,7 @@
2121
<add key="darc-int-dotnet-aspnetcore-009e1cc-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-009e1cca-1/nuget/v3/index.json" />
2222
<!-- End: Package sources from dotnet-aspnetcore -->
2323
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
24-
<add key="darc-pub-DotNet-msbuild-Trusted-89b5892" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-89b58924/nuget/v3/index.json" />
24+
<add key="darc-pub-DotNet-msbuild-Trusted-2b19be4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-2b19be47/nuget/v3/index.json" />
2525
<!-- End: Package sources from DotNet-msbuild-Trusted -->
2626
<!-- Begin: Package sources from dotnet-roslyn-analyzers -->
2727
<!-- 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>ec84e775d21d3b7a6698ec30f7b2a5a9e3acd314</Sha>
5757
</Dependency>
58-
<Dependency Name="Microsoft.Build" Version="17.11.24">
58+
<Dependency Name="Microsoft.Build" Version="17.11.26">
5959
<Uri>https://github.com/dotnet/msbuild</Uri>
60-
<Sha>89b58924da213679505c63060e5c84786865000f</Sha>
60+
<Sha>2b19be476c8b86077deb82788563d7f7cc53468b</Sha>
6161
</Dependency>
62-
<Dependency Name="Microsoft.Build.Localization" Version="17.11.24-servicing-25072-01">
62+
<Dependency Name="Microsoft.Build.Localization" Version="17.11.26-servicing-25111-04">
6363
<Uri>https://github.com/dotnet/msbuild</Uri>
64-
<Sha>89b58924da213679505c63060e5c84786865000f</Sha>
64+
<Sha>2b19be476c8b86077deb82788563d7f7cc53468b</Sha>
6565
</Dependency>
66-
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.11.24-servicing-25072-01">
66+
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.11.26-servicing-25111-04">
6767
<Uri>https://github.com/dotnet/msbuild</Uri>
68-
<Sha>89b58924da213679505c63060e5c84786865000f</Sha>
68+
<Sha>2b19be476c8b86077deb82788563d7f7cc53468b</Sha>
6969
<SourceBuild RepoName="msbuild" ManagedOnly="true" />
7070
</Dependency>
7171
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.8.403-beta.24526.2">

eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@
124124
</PropertyGroup>
125125
<PropertyGroup>
126126
<!-- Dependencies from https://github.com/Microsoft/msbuild -->
127-
<MicrosoftBuildPackageVersion>17.11.24</MicrosoftBuildPackageVersion>
127+
<MicrosoftBuildPackageVersion>17.11.26</MicrosoftBuildPackageVersion>
128128
<MicrosoftBuildCurrentPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildCurrentPackageVersion>
129129
<!-- Some tasks and the resolver will need to run in an MSBuild that is older than the very latest,
130130
so target one that matches the version in minimumMSBuildVersion.
@@ -133,7 +133,7 @@
133133
<MicrosoftBuildMinimumVersion Condition="exists('$(RepoRoot)\src\Layout\redist\minimumMSBuildVersion') and '$(DotNetBuildFromSource)' != 'true'">$([System.IO.File]::ReadAllText('$(RepoRoot)\src\Layout\redist\minimumMSBuildVersion').Trim())</MicrosoftBuildMinimumVersion>
134134
<MicrosoftBuildFrameworkPackageVersion>$(MicrosoftBuildMinimumVersion)</MicrosoftBuildFrameworkPackageVersion>
135135
<MicrosoftBuildRuntimePackageVersion>$(MicrosoftBuildMinimumVersion)</MicrosoftBuildRuntimePackageVersion>
136-
<MicrosoftBuildLocalizationPackageVersion>17.11.24-servicing-25072-01</MicrosoftBuildLocalizationPackageVersion>
136+
<MicrosoftBuildLocalizationPackageVersion>17.11.26-servicing-25111-04</MicrosoftBuildLocalizationPackageVersion>
137137
<MicrosoftBuildUtilitiesCorePackageVersion>$(MicrosoftBuildMinimumVersion)</MicrosoftBuildUtilitiesCorePackageVersion>
138138
<MicrosoftBuildTasksCorePackageVersion>$(MicrosoftBuildMinimumVersion)</MicrosoftBuildTasksCorePackageVersion>
139139
<MicrosoftBuildTasksCoreVersion>$(MicrosoftBuildTasksCorePackageVersion)</MicrosoftBuildTasksCoreVersion>

0 commit comments

Comments
 (0)