Skip to content

Commit 3c96403

Browse files
authored
Merge branch 'release/9.0.1xx' into darc-release/9.0.1xx-45bd37c3-bb10-432b-8e67-e99bcd127c07
2 parents 85dcb21 + 1b0f4e2 commit 3c96403

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-f6b3a5d" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-f6b3a5da/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-590305f" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-590305fc/nuget/v3/index.json" />
33+
<add key="darc-pub-DotNet-msbuild-Trusted-9dcc26a" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-9dcc26a5/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>b567cdb6b8b461de79f2a2536a22ca3a67f2f33e</Sha>
7474
<SourceBuild RepoName="emsdk" ManagedOnly="true" />
7575
</Dependency>
76-
<Dependency Name="Microsoft.Build" Version="17.12.39">
76+
<Dependency Name="Microsoft.Build" Version="17.12.41">
7777
<Uri>https://github.com/dotnet/msbuild</Uri>
78-
<Sha>590305fc69a6af024c9d868d557be3efd5e42ddf</Sha>
78+
<Sha>9dcc26a5fd6a7449e6c1dc1d99c332141aeae361</Sha>
7979
</Dependency>
80-
<Dependency Name="Microsoft.Build.Localization" Version="17.12.39-preview-25312-03">
80+
<Dependency Name="Microsoft.Build.Localization" Version="17.12.41-preview-25359-01">
8181
<Uri>https://github.com/dotnet/msbuild</Uri>
82-
<Sha>590305fc69a6af024c9d868d557be3efd5e42ddf</Sha>
82+
<Sha>9dcc26a5fd6a7449e6c1dc1d99c332141aeae361</Sha>
8383
</Dependency>
8484
<!-- Intermediate is necessary for source build. -->
85-
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.12.39-preview-25312-03">
85+
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.12.41-preview-25359-01">
8686
<Uri>https://github.com/dotnet/msbuild</Uri>
87-
<Sha>590305fc69a6af024c9d868d557be3efd5e42ddf</Sha>
87+
<Sha>9dcc26a5fd6a7449e6c1dc1d99c332141aeae361</Sha>
8888
<SourceBuild RepoName="msbuild" ManagedOnly="true" />
8989
</Dependency>
9090
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.9.101-beta.25070.7">

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.39</MicrosoftBuildVersion>
184-
<MicrosoftBuildLocalizationVersion>17.12.39-preview-25312-03</MicrosoftBuildLocalizationVersion>
183+
<MicrosoftBuildVersion>17.12.41</MicrosoftBuildVersion>
184+
<MicrosoftBuildLocalizationVersion>17.12.41-preview-25359-01</MicrosoftBuildLocalizationVersion>
185185
<MicrosoftBuildMinimumVersion Condition="'$(DotNetBuildSourceOnly)' != 'true'">17.11.31</MicrosoftBuildMinimumVersion>
186186
<MinimumVSVersion>17.12</MinimumVSVersion>
187187
</PropertyGroup>

0 commit comments

Comments
 (0)