Skip to content

Commit 51877b2

Browse files
authored
Merge branch 'release/9.0.3xx' into darc-release/9.0.3xx-182deb11-07ae-4198-9cf3-548dfe0c1eff
2 parents 8165aae + 6773b23 commit 51877b2

File tree

3 files changed

+12
-11
lines changed

3 files changed

+12
-11
lines changed

NuGet.config

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
<!-- Begin: Package sources from dotnet-emsdk -->
3131
<!-- End: Package sources from dotnet-emsdk -->
3232
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
33+
<add key="darc-pub-DotNet-msbuild-Trusted-ee6457a-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-ee6457a6-2/nuget/v3/index.json" />
3334
<!-- End: Package sources from DotNet-msbuild-Trusted -->
3435
<!-- Begin: Package sources from dotnet-roslyn-analyzers -->
3536
<!-- End: Package sources from dotnet-roslyn-analyzers -->

eng/Version.Details.xml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -69,18 +69,18 @@
6969
<Sha>b65413ac057eb0a54c51b76b1855bc377c2132c3</Sha>
7070
<SourceBuild RepoName="emsdk" ManagedOnly="true" />
7171
</Dependency>
72-
<Dependency Name="Microsoft.Build" Version="17.14.28">
73-
<Uri>https://dev.azure.com/devdiv/DevDiv/_git/DotNet-msbuild-Trusted</Uri>
74-
<Sha>09c1be8483dad070189c3a0c660e7acacf478402</Sha>
72+
<Dependency Name="Microsoft.Build" Version="17.14.36">
73+
<Uri>https://github.com/dotnet/msbuild</Uri>
74+
<Sha>ee6457a6b06e66a5e4037549c84d8282ecd0df92</Sha>
7575
</Dependency>
76-
<Dependency Name="Microsoft.Build.Localization" Version="17.14.28-servicing-25466-01">
77-
<Uri>https://dev.azure.com/devdiv/DevDiv/_git/DotNet-msbuild-Trusted</Uri>
78-
<Sha>09c1be8483dad070189c3a0c660e7acacf478402</Sha>
76+
<Dependency Name="Microsoft.Build.Localization" Version="17.14.36-servicing-25575-03">
77+
<Uri>https://github.com/dotnet/msbuild</Uri>
78+
<Sha>ee6457a6b06e66a5e4037549c84d8282ecd0df92</Sha>
7979
</Dependency>
8080
<!-- Intermediate is necessary for source build. -->
81-
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.14.28-servicing-25466-01">
82-
<Uri>https://dev.azure.com/devdiv/DevDiv/_git/DotNet-msbuild-Trusted</Uri>
83-
<Sha>09c1be8483dad070189c3a0c660e7acacf478402</Sha>
81+
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.14.36-servicing-25575-03">
82+
<Uri>https://github.com/dotnet/msbuild</Uri>
83+
<Sha>ee6457a6b06e66a5e4037549c84d8282ecd0df92</Sha>
8484
<SourceBuild RepoName="msbuild" ManagedOnly="true" />
8585
</Dependency>
8686
<Dependency Name="Microsoft.FSharp.Compiler" Version="13.9.303-beta.25361.1">

eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,8 +182,8 @@
182182
At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes.
183183
184184
Additionally, set the MinimumVSVersion for the installer UI that's required for targeting NetCurrent -->
185-
<MicrosoftBuildVersion>17.14.28</MicrosoftBuildVersion>
186-
<MicrosoftBuildLocalizationVersion>17.14.28-servicing-25466-01</MicrosoftBuildLocalizationVersion>
185+
<MicrosoftBuildVersion>17.14.36</MicrosoftBuildVersion>
186+
<MicrosoftBuildLocalizationVersion>17.14.36-servicing-25575-03</MicrosoftBuildLocalizationVersion>
187187
<MicrosoftBuildMinimumVersion Condition="'$(DotNetBuildSourceOnly)' != 'true'">17.11.31</MicrosoftBuildMinimumVersion>
188188
<MinimumVSVersion>17.12</MinimumVSVersion>
189189
</PropertyGroup>

0 commit comments

Comments
 (0)