Skip to content

Commit e3ecbc4

Browse files
author
v-wuzhai
authored
[release/8.0.3xx] Update dependencies from dotnet/msbuild (#46752)
2 parents 7163b4d + fcf9e7f commit e3ecbc4

File tree

3 files changed

+43
-23
lines changed

3 files changed

+43
-23
lines changed

‎NuGet.config

Lines changed: 35 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -14,34 +14,37 @@
1414
<!-- End: Package sources from dotnet-format -->
1515
<!-- Begin: Package sources from dotnet-aspnetcore -->
1616
<add key="darc-int-dotnet-aspnetcore-009e1cc" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-009e1cca/nuget/v3/index.json" />
17+
<add key="darc-int-dotnet-aspnetcore-009e1cc-8" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-009e1cca-8/nuget/v3/index.json" />
18+
<add key="darc-int-dotnet-aspnetcore-009e1cc-7" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-009e1cca-7/nuget/v3/index.json" />
19+
<add key="darc-int-dotnet-aspnetcore-009e1cc-6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-009e1cca-6/nuget/v3/index.json" />
20+
<add key="darc-int-dotnet-aspnetcore-009e1cc-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-009e1cca-5/nuget/v3/index.json" />
21+
<add key="darc-int-dotnet-aspnetcore-009e1cc-4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-009e1cca-4/nuget/v3/index.json" />
22+
<add key="darc-int-dotnet-aspnetcore-009e1cc-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-009e1cca-3/nuget/v3/index.json" />
23+
<add key="darc-int-dotnet-aspnetcore-009e1cc-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-009e1cca-2/nuget/v3/index.json" />
24+
<add key="darc-int-dotnet-aspnetcore-009e1cc-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-009e1cca-1/nuget/v3/index.json" />
1725
<!-- End: Package sources from dotnet-aspnetcore -->
1826
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
19-
<add key="darc-pub-DotNet-msbuild-Trusted-939cc33" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-939cc332/nuget/v3/index.json" />
27+
<add key="darc-pub-DotNet-msbuild-Trusted-0e18be8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-0e18be81/nuget/v3/index.json" />
2028
<!-- End: Package sources from DotNet-msbuild-Trusted -->
2129
<!-- Begin: Package sources from dotnet-roslyn-analyzers -->
2230
<!-- End: Package sources from dotnet-roslyn-analyzers -->
2331
<!-- Begin: Package sources from dotnet-runtime -->
2432
<add key="darc-int-dotnet-runtime-eba546b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-eba546b0/nuget/v3/index.json" />
33+
<add key="darc-int-dotnet-runtime-eba546b-6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-eba546b0-6/nuget/v3/index.json" />
2534
<!-- End: Package sources from dotnet-runtime -->
2635
<!-- Begin: Package sources from dotnet-templating -->
2736
<add key="darc-pub-dotnet-templating-d7198dd" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-d7198dd0/nuget/v3/index.json" />
28-
<add key="darc-pub-dotnet-templating-ee4a55e" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-ee4a55ee/nuget/v3/index.json" />
29-
<add key="darc-pub-dotnet-templating-ee4a55e-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-ee4a55ee-3/nuget/v3/index.json" />
30-
<add key="darc-pub-dotnet-templating-ee4a55e-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-ee4a55ee-2/nuget/v3/index.json" />
31-
<add key="darc-pub-dotnet-templating-ee4a55e-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-ee4a55ee-1/nuget/v3/index.json" />
32-
<add key="darc-pub-dotnet-templating-6ede63a" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-6ede63a6/nuget/v3/index.json" />
33-
<add key="darc-pub-dotnet-templating-ee4a55e-8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-ee4a55ee-8/nuget/v3/index.json" />
34-
<add key="darc-pub-dotnet-templating-ee4a55e-7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-ee4a55ee-7/nuget/v3/index.json" />
35-
<add key="darc-pub-dotnet-templating-ee4a55e-6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-ee4a55ee-6/nuget/v3/index.json" />
36-
<add key="darc-pub-dotnet-templating-ee4a55e-5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-ee4a55ee-5/nuget/v3/index.json" />
37-
<add key="darc-pub-dotnet-templating-ee4a55e-4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-ee4a55ee-4/nuget/v3/index.json" />
38-
<add key="darc-pub-dotnet-templating-ee4a55e-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-ee4a55ee-3/nuget/v3/index.json" />
39-
<add key="darc-pub-dotnet-templating-ee4a55e-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-ee4a55ee-2/nuget/v3/index.json" />
40-
<add key="darc-pub-dotnet-templating-ee4a55e-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-ee4a55ee-1/nuget/v3/index.json" />
41-
<add key="darc-pub-dotnet-templating-6ede63a" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-6ede63a6/nuget/v3/index.json" />
4237
<!-- End: Package sources from dotnet-templating -->
4338
<!-- Begin: Package sources from dotnet-windowsdesktop -->
4439
<add key="darc-int-dotnet-windowsdesktop-e43b37d" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-e43b37de/nuget/v3/index.json" />
40+
<add key="darc-int-dotnet-windowsdesktop-e43b37d-8" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-e43b37de-8/nuget/v3/index.json" />
41+
<add key="darc-int-dotnet-windowsdesktop-e43b37d-7" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-e43b37de-7/nuget/v3/index.json" />
42+
<add key="darc-int-dotnet-windowsdesktop-e43b37d-6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-e43b37de-6/nuget/v3/index.json" />
43+
<add key="darc-int-dotnet-windowsdesktop-e43b37d-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-e43b37de-5/nuget/v3/index.json" />
44+
<add key="darc-int-dotnet-windowsdesktop-e43b37d-4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-e43b37de-4/nuget/v3/index.json" />
45+
<add key="darc-int-dotnet-windowsdesktop-e43b37d-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-e43b37de-3/nuget/v3/index.json" />
46+
<add key="darc-int-dotnet-windowsdesktop-e43b37d-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-e43b37de-2/nuget/v3/index.json" />
47+
<add key="darc-int-dotnet-windowsdesktop-e43b37d-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-e43b37de-1/nuget/v3/index.json" />
4548
<!-- End: Package sources from dotnet-windowsdesktop -->
4649
<!-- Begin: Package sources from dotnet-winforms -->
4750
<!-- End: Package sources from dotnet-winforms -->
@@ -68,16 +71,33 @@
6871
<!-- Begin: Package sources from dotnet-templating -->
6972
<!-- End: Package sources from dotnet-templating -->
7073
<!-- Begin: Package sources from dotnet-aspnetcore -->
74+
<add key="darc-int-dotnet-aspnetcore-009e1cc-1" value="true" />
75+
<add key="darc-int-dotnet-aspnetcore-009e1cc-2" value="true" />
76+
<add key="darc-int-dotnet-aspnetcore-009e1cc-3" value="true" />
77+
<add key="darc-int-dotnet-aspnetcore-009e1cc-4" value="true" />
78+
<add key="darc-int-dotnet-aspnetcore-009e1cc-5" value="true" />
79+
<add key="darc-int-dotnet-aspnetcore-009e1cc-6" value="true" />
80+
<add key="darc-int-dotnet-aspnetcore-009e1cc-7" value="true" />
81+
<add key="darc-int-dotnet-aspnetcore-009e1cc-8" value="true" />
7182
<add key="darc-int-dotnet-aspnetcore-009e1cc" value="true" />
7283
<!-- Begin: Package sources from dotnet-emsdk -->
7384
<!-- End: Package sources from dotnet-emsdk -->
7485
<!-- Begin: Package sources from dotnet-format -->
7586
<!-- End: Package sources from dotnet-format -->
7687
<!-- End: Package sources from dotnet-aspnetcore -->
7788
<!-- Begin: Package sources from dotnet-runtime -->
89+
<add key="darc-int-dotnet-runtime-eba546b-6" value="true" />
7890
<add key="darc-int-dotnet-runtime-eba546b" value="true" />
7991
<!-- End: Package sources from dotnet-runtime -->
8092
<!-- Begin: Package sources from dotnet-windowsdesktop -->
93+
<add key="darc-int-dotnet-windowsdesktop-e43b37d-1" value="true" />
94+
<add key="darc-int-dotnet-windowsdesktop-e43b37d-2" value="true" />
95+
<add key="darc-int-dotnet-windowsdesktop-e43b37d-3" value="true" />
96+
<add key="darc-int-dotnet-windowsdesktop-e43b37d-4" value="true" />
97+
<add key="darc-int-dotnet-windowsdesktop-e43b37d-5" value="true" />
98+
<add key="darc-int-dotnet-windowsdesktop-e43b37d-6" value="true" />
99+
<add key="darc-int-dotnet-windowsdesktop-e43b37d-7" value="true" />
100+
<add key="darc-int-dotnet-windowsdesktop-e43b37d-8" value="true" />
81101
<add key="darc-int-dotnet-windowsdesktop-e43b37d" value="true" />
82102
<!-- Begin: Package sources from dotnet-winforms -->
83103
<!-- End: Package sources from dotnet-winforms -->

‎eng/Version.Details.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,17 +55,17 @@
5555
<Uri>https://github.com/dotnet/emsdk</Uri>
5656
<Sha>c458a7647c04e323c238f381eb176af24254b3ff</Sha>
5757
</Dependency>
58-
<Dependency Name="Microsoft.Build" Version="17.10.19">
58+
<Dependency Name="Microsoft.Build" Version="17.10.21">
5959
<Uri>https://github.com/dotnet/msbuild</Uri>
60-
<Sha>939cc332cc357d59cc6cfdde70ddc03372e22c26</Sha>
60+
<Sha>0e18be81c1881b24619dd1239afca022aeff1eef</Sha>
6161
</Dependency>
62-
<Dependency Name="Microsoft.Build.Localization" Version="17.10.19-preview-25071-10">
62+
<Dependency Name="Microsoft.Build.Localization" Version="17.10.21-preview-25111-03">
6363
<Uri>https://github.com/dotnet/msbuild</Uri>
64-
<Sha>939cc332cc357d59cc6cfdde70ddc03372e22c26</Sha>
64+
<Sha>0e18be81c1881b24619dd1239afca022aeff1eef</Sha>
6565
</Dependency>
66-
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.10.19-preview-25071-10">
66+
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.10.21-preview-25111-03">
6767
<Uri>https://github.com/dotnet/msbuild</Uri>
68-
<Sha>939cc332cc357d59cc6cfdde70ddc03372e22c26</Sha>
68+
<Sha>0e18be81c1881b24619dd1239afca022aeff1eef</Sha>
6969
<SourceBuild RepoName="msbuild" ManagedOnly="true" />
7070
</Dependency>
7171
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.8.301-beta.24271.6">

‎eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@
124124
</PropertyGroup>
125125
<PropertyGroup>
126126
<!-- Dependencies from https://github.com/Microsoft/msbuild -->
127-
<MicrosoftBuildPackageVersion>17.10.19</MicrosoftBuildPackageVersion>
127+
<MicrosoftBuildPackageVersion>17.10.21</MicrosoftBuildPackageVersion>
128128
<MicrosoftBuildCurrentPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildCurrentPackageVersion>
129129
<!-- Some tasks and the resolver will need to run in an MSBuild that is older than the very latest,
130130
so target one that matches the version in minimumMSBuildVersion.
@@ -133,7 +133,7 @@
133133
<MicrosoftBuildPackageVersion Condition="exists('$(RepoRoot)\src\Layout\redist\minimumMSBuildVersion') and '$(DotNetBuildFromSource)' != 'true'">$([System.IO.File]::ReadAllText('$(RepoRoot)\src\Layout\redist\minimumMSBuildVersion').Trim())</MicrosoftBuildPackageVersion>
134134
<MicrosoftBuildFrameworkPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildFrameworkPackageVersion>
135135
<MicrosoftBuildRuntimePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildRuntimePackageVersion>
136-
<MicrosoftBuildLocalizationPackageVersion>17.10.19-preview-25071-10</MicrosoftBuildLocalizationPackageVersion>
136+
<MicrosoftBuildLocalizationPackageVersion>17.10.21-preview-25111-03</MicrosoftBuildLocalizationPackageVersion>
137137
<MicrosoftBuildUtilitiesCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildUtilitiesCorePackageVersion>
138138
<MicrosoftBuildTasksCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildTasksCorePackageVersion>
139139
<MicrosoftBuildTasksCoreVersion>$(MicrosoftBuildTasksCorePackageVersion)</MicrosoftBuildTasksCoreVersion>

0 commit comments

Comments
 (0)