Skip to content

Commit 6773b23

Browse files
authored
[release/9.0.3xx] Update dependencies from dotnet/msbuild (#51845)
2 parents a9b9b19 + f3fa1a0 commit 6773b23

File tree

3 files changed

+12
-18
lines changed

3 files changed

+12
-18
lines changed

NuGet.config

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,25 +24,22 @@
2424
<!-- Begin: Package sources from dotnet-aspire -->
2525
<!-- End: Package sources from dotnet-aspire -->
2626
<!-- Begin: Package sources from dotnet-emsdk -->
27-
<add key="darc-pub-dotnet-emsdk-b65413a" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-b65413ac/nuget/v3/index.json" />
2827
<!-- End: Package sources from dotnet-emsdk -->
2928
<!-- Begin: Package sources from dotnet-aspnetcore -->
30-
<add key="darc-int-dotnet-aspnetcore-d3aba8f" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-d3aba8fe/nuget/v3/index.json" />
3129
<!-- End: Package sources from dotnet-aspnetcore -->
3230
<!-- Begin: Package sources from dotnet-emsdk -->
3331
<!-- End: Package sources from dotnet-emsdk -->
3432
<!-- 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" />
3534
<!-- End: Package sources from DotNet-msbuild-Trusted -->
3635
<!-- Begin: Package sources from dotnet-roslyn-analyzers -->
3736
<!-- End: Package sources from dotnet-roslyn-analyzers -->
3837
<!-- Begin: Package sources from dotnet-runtime -->
39-
<add key="darc-int-dotnet-runtime-fa7cdde" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-fa7cdded/nuget/v3/index.json" />
4038
<!-- End: Package sources from dotnet-runtime -->
4139
<!-- Begin: Package sources from dotnet-templating -->
4240
<add key="darc-pub-dotnet-templating-afcc004" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-afcc0048/nuget/v3/index.json" />
4341
<!-- End: Package sources from dotnet-templating -->
4442
<!-- Begin: Package sources from dotnet-windowsdesktop -->
45-
<add key="darc-int-dotnet-windowsdesktop-6c65543" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-6c65543c/nuget/v3/index.json" />
4643
<!-- End: Package sources from dotnet-windowsdesktop -->
4744
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
4845
<add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
@@ -71,13 +68,10 @@
7168
<!-- Begin: Package sources from dotnet-templating -->
7269
<!-- End: Package sources from dotnet-templating -->
7370
<!-- Begin: Package sources from dotnet-aspnetcore -->
74-
<add key="darc-int-dotnet-aspnetcore-d3aba8f" value="true" />
7571
<!-- End: Package sources from dotnet-aspnetcore -->
7672
<!-- Begin: Package sources from dotnet-runtime -->
77-
<add key="darc-int-dotnet-runtime-fa7cdde" value="true" />
7873
<!-- End: Package sources from dotnet-runtime -->
7974
<!-- Begin: Package sources from dotnet-windowsdesktop -->
80-
<add key="darc-int-dotnet-windowsdesktop-6c65543" value="true" />
8175
<!-- End: Package sources from dotnet-windowsdesktop -->
8276
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
8377
</disabledPackageSources>

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)