Skip to content

Commit d7d6de5

Browse files
author
Mirroring
committed
Merge commit 'a345a00343aa14a693aec75a3d56fc07e99e517f'
2 parents 357543a + a345a00 commit d7d6de5

File tree

3 files changed

+10
-9
lines changed

3 files changed

+10
-9
lines changed

NuGet.config

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<add key="darc-int-dotnet-aspnetcore-4e4e1fc" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-4e4e1fc3/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-1cce779" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-1cce7796/nuget/v3/index.json" />
15+
<add key="darc-pub-DotNet-msbuild-Trusted-ed8c6ae" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-ed8c6aec/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 -->
@@ -21,6 +21,7 @@
2121
<!-- End: Package sources from dotnet-runtime -->
2222
<!-- Begin: Package sources from dotnet-templating -->
2323
<add key="darc-pub-dotnet-templating-b1003b4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-b1003b44/nuget/v3/index.json" />
24+
<add key="darc-pub-dotnet-templating-b1003b4-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-b1003b44-1/nuget/v3/index.json" />
2425
<!-- End: Package sources from dotnet-templating -->
2526
<!-- Begin: Package sources from dotnet-windowsdesktop -->
2627
<add key="darc-int-dotnet-windowsdesktop-1db7b9d" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-1db7b9dd/nuget/v3/index.json" />

eng/Version.Details.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -73,18 +73,18 @@
7373
<Sha>5a1972348bdf1daf0ae6c93e6d1ee89400e02cc4</Sha>
7474
<SourceBuild RepoName="emsdk" ManagedOnly="true" />
7575
</Dependency>
76-
<Dependency Name="Microsoft.Build" Version="17.12.12">
76+
<Dependency Name="Microsoft.Build" Version="17.12.18">
7777
<Uri>https://github.com/dotnet/msbuild</Uri>
78-
<Sha>1cce77968bca1366760f361c837ffbc3a6af70f0</Sha>
78+
<Sha>ed8c6aec5b774cfdad4e95033910c30aa0d93391</Sha>
7979
</Dependency>
80-
<Dependency Name="Microsoft.Build.Localization" Version="17.12.12-preview-24571-01">
80+
<Dependency Name="Microsoft.Build.Localization" Version="17.12.18-preview-24610-04">
8181
<Uri>https://github.com/dotnet/msbuild</Uri>
82-
<Sha>1cce77968bca1366760f361c837ffbc3a6af70f0</Sha>
82+
<Sha>ed8c6aec5b774cfdad4e95033910c30aa0d93391</Sha>
8383
</Dependency>
8484
<!-- Intermediate is necessary for source build. -->
85-
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.12.12-preview-24571-01">
85+
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.12.18-preview-24610-04">
8686
<Uri>https://github.com/dotnet/msbuild</Uri>
87-
<Sha>1cce77968bca1366760f361c837ffbc3a6af70f0</Sha>
87+
<Sha>ed8c6aec5b774cfdad4e95033910c30aa0d93391</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.12</MicrosoftBuildVersion>
184-
<MicrosoftBuildLocalizationVersion>17.12.12-preview-24571-01</MicrosoftBuildLocalizationVersion>
183+
<MicrosoftBuildVersion>17.12.18</MicrosoftBuildVersion>
184+
<MicrosoftBuildLocalizationVersion>17.12.18-preview-24610-04</MicrosoftBuildLocalizationVersion>
185185
<MicrosoftBuildMinimumVersion Condition="'$(DotNetBuildSourceOnly)' != 'true'">17.11.4</MicrosoftBuildMinimumVersion>
186186
<MinimumVSVersion>17.12</MinimumVSVersion>
187187
</PropertyGroup>

0 commit comments

Comments
 (0)