Skip to content

Commit b80e734

Browse files
author
Mirroring
committed
Merge commit 'e39fc8c751e8ea4b083bce4b7d298345bac68a02'
2 parents 03d2e51 + e39fc8c commit b80e734

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-int-dotnet-aspnetcore-704f7cb" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-704f7cb1/nuget/v3/index.json" />
3131
<!-- End: Package sources from dotnet-aspnetcore -->
3232
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
33-
<add key="darc-pub-DotNet-msbuild-Trusted-90b52dd-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-90b52dda-1/nuget/v3/index.json" />
33+
<add key="darc-pub-DotNet-msbuild-Trusted-f7ab67b" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-f7ab67b0/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
@@ -73,18 +73,18 @@
7373
<Sha>2c27e405e17595694d91892159593d6dd10e61e2</Sha>
7474
<SourceBuild RepoName="emsdk" ManagedOnly="true" />
7575
</Dependency>
76-
<Dependency Name="Microsoft.Build" Version="17.12.24">
76+
<Dependency Name="Microsoft.Build" Version="17.12.26">
7777
<Uri>https://github.com/dotnet/msbuild</Uri>
78-
<Sha>90b52dda697be7d9b07b90b3a7eb7a80b433ef09</Sha>
78+
<Sha>f7ab67b00991bd693a518451426ba33915614d19</Sha>
7979
</Dependency>
80-
<Dependency Name="Microsoft.Build.Localization" Version="17.12.24-preview-25066-04">
80+
<Dependency Name="Microsoft.Build.Localization" Version="17.12.26-preview-25071-08">
8181
<Uri>https://github.com/dotnet/msbuild</Uri>
82-
<Sha>90b52dda697be7d9b07b90b3a7eb7a80b433ef09</Sha>
82+
<Sha>f7ab67b00991bd693a518451426ba33915614d19</Sha>
8383
</Dependency>
8484
<!-- Intermediate is necessary for source build. -->
85-
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.12.24-preview-25066-04">
85+
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.12.26-preview-25071-08">
8686
<Uri>https://github.com/dotnet/msbuild</Uri>
87-
<Sha>90b52dda697be7d9b07b90b3a7eb7a80b433ef09</Sha>
87+
<Sha>f7ab67b00991bd693a518451426ba33915614d19</Sha>
8888
<SourceBuild RepoName="msbuild" ManagedOnly="true" />
8989
</Dependency>
9090
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.9.101-beta.24602.3">

eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,8 +180,8 @@
180180
At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes.
181181
182182
Additionally, set the MinimumVSVersion for the installer UI that's required for targeting NetCurrent -->
183-
<MicrosoftBuildVersion>17.12.24</MicrosoftBuildVersion>
184-
<MicrosoftBuildLocalizationVersion>17.12.24-preview-25066-04</MicrosoftBuildLocalizationVersion>
183+
<MicrosoftBuildVersion>17.12.26</MicrosoftBuildVersion>
184+
<MicrosoftBuildLocalizationVersion>17.12.26-preview-25071-08</MicrosoftBuildLocalizationVersion>
185185
<MicrosoftBuildMinimumVersion Condition="'$(DotNetBuildSourceOnly)' != 'true'">17.11.4</MicrosoftBuildMinimumVersion>
186186
<MinimumVSVersion>17.12</MinimumVSVersion>
187187
</PropertyGroup>

0 commit comments

Comments
 (0)