Skip to content

Commit 3e9a9e9

Browse files
MiYanniMiYanni
authored
[release/8.0.3xx] Update dependencies from dotnet/msbuild (#49400)
2 parents f56b978 + da7a6c1 commit 3e9a9e9

File tree

3 files changed

+33
-16
lines changed

3 files changed

+33
-16
lines changed

‎NuGet.config

Lines changed: 22 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,26 +5,38 @@
55
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
66
<!-- Begin: Package sources from dotnet-emsdk -->
77
<add key="darc-pub-dotnet-emsdk-2b0cca8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-2b0cca8a/nuget/v3/index.json" />
8+
<add key="darc-pub-dotnet-emsdk-2b0cca8-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-2b0cca8a-3/nuget/v3/index.json" />
9+
<add key="darc-pub-dotnet-emsdk-2b0cca8-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-2b0cca8a-2/nuget/v3/index.json" />
10+
<add key="darc-pub-dotnet-emsdk-2b0cca8-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-2b0cca8a-1/nuget/v3/index.json" />
811
<!-- End: Package sources from dotnet-emsdk -->
912
<!-- Begin: Package sources from dotnet-format -->
1013
<add key="darc-pub-dotnet-format-c7e5d39" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-c7e5d39b/nuget/v3/index.json" />
1114
<!-- End: Package sources from dotnet-format -->
1215
<!-- Begin: Package sources from dotnet-aspnetcore -->
1316
<add key="darc-int-dotnet-aspnetcore-fa4d80b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-fa4d80b7/nuget/v3/index.json" />
17+
<add key="darc-int-dotnet-aspnetcore-fa4d80b-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-fa4d80b7-3/nuget/v3/index.json" />
18+
<add key="darc-int-dotnet-aspnetcore-fa4d80b-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-fa4d80b7-2/nuget/v3/index.json" />
19+
<add key="darc-int-dotnet-aspnetcore-fa4d80b-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-fa4d80b7-1/nuget/v3/index.json" />
1420
<!-- End: Package sources from dotnet-aspnetcore -->
1521
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
16-
<add key="darc-int-DotNet-msbuild-Trusted-27f9d42" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-DotNet-msbuild-Trusted-27f9d42f/nuget/v3/index.json" />
22+
<add key="darc-pub-DotNet-msbuild-Trusted-bb7294f-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-bb7294f7-1/nuget/v3/index.json" />
1723
<!-- End: Package sources from DotNet-msbuild-Trusted -->
1824
<!-- Begin: Package sources from dotnet-roslyn-analyzers -->
1925
<!-- End: Package sources from dotnet-roslyn-analyzers -->
2026
<!-- Begin: Package sources from dotnet-runtime -->
2127
<add key="darc-int-dotnet-runtime-77545d6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-77545d6f/nuget/v3/index.json" />
28+
<add key="darc-int-dotnet-runtime-77545d6-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-77545d6f-3/nuget/v3/index.json" />
29+
<add key="darc-int-dotnet-runtime-77545d6-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-77545d6f-2/nuget/v3/index.json" />
30+
<add key="darc-int-dotnet-runtime-77545d6-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-77545d6f-1/nuget/v3/index.json" />
2231
<!-- End: Package sources from dotnet-runtime -->
2332
<!-- Begin: Package sources from dotnet-templating -->
2433
<add key="darc-pub-dotnet-templating-7994f94" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-7994f94e/nuget/v3/index.json" />
2534
<!-- End: Package sources from dotnet-templating -->
2635
<!-- Begin: Package sources from dotnet-windowsdesktop -->
2736
<add key="darc-int-dotnet-windowsdesktop-5ce68f2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-5ce68f29/nuget/v3/index.json" />
37+
<add key="darc-int-dotnet-windowsdesktop-5ce68f2-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-5ce68f29-3/nuget/v3/index.json" />
38+
<add key="darc-int-dotnet-windowsdesktop-5ce68f2-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-5ce68f29-2/nuget/v3/index.json" />
39+
<add key="darc-int-dotnet-windowsdesktop-5ce68f2-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-5ce68f29-1/nuget/v3/index.json" />
2840
<!-- End: Package sources from dotnet-windowsdesktop -->
2941
<!-- Begin: Package sources from dotnet-winforms -->
3042
<!-- End: Package sources from dotnet-winforms -->
@@ -51,23 +63,28 @@
5163
<!-- Begin: Package sources from dotnet-templating -->
5264
<!-- End: Package sources from dotnet-templating -->
5365
<!-- Begin: Package sources from dotnet-aspnetcore -->
66+
<add key="darc-int-dotnet-aspnetcore-fa4d80b-1" value="true" />
67+
<add key="darc-int-dotnet-aspnetcore-fa4d80b-2" value="true" />
68+
<add key="darc-int-dotnet-aspnetcore-fa4d80b-3" value="true" />
5469
<add key="darc-int-dotnet-aspnetcore-fa4d80b" value="true" />
5570
<!-- End: Package sources from dotnet-aspnetcore -->
5671
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
57-
<add key="darc-int-DotNet-msbuild-Trusted-27f9d42" value="true" />
5872
<!-- End: Package sources from DotNet-msbuild-Trusted -->
5973
<!-- Begin: Package sources from dotnet-emsdk -->
6074
<!-- End: Package sources from dotnet-emsdk -->
6175
<!-- Begin: Package sources from dotnet-format -->
62-
<add key="darc-int-dotnet-format-6512c54-1" value="true" />
63-
<add key="darc-int-dotnet-format-6512c54-2" value="true" />
64-
<add key="darc-int-dotnet-format-6512c54" value="true" />
6576
<!-- End: Package sources from dotnet-format -->
6677
<!-- End: Package sources from dotnet-aspnetcore -->
6778
<!-- Begin: Package sources from dotnet-runtime -->
79+
<add key="darc-int-dotnet-runtime-77545d6-1" value="true" />
80+
<add key="darc-int-dotnet-runtime-77545d6-2" value="true" />
81+
<add key="darc-int-dotnet-runtime-77545d6-3" value="true" />
6882
<add key="darc-int-dotnet-runtime-77545d6" value="true" />
6983
<!-- End: Package sources from dotnet-runtime -->
7084
<!-- Begin: Package sources from dotnet-windowsdesktop -->
85+
<add key="darc-int-dotnet-windowsdesktop-5ce68f2-1" value="true" />
86+
<add key="darc-int-dotnet-windowsdesktop-5ce68f2-2" value="true" />
87+
<add key="darc-int-dotnet-windowsdesktop-5ce68f2-3" value="true" />
7188
<add key="darc-int-dotnet-windowsdesktop-5ce68f2" value="true" />
7289
<!-- Begin: Package sources from dotnet-winforms -->
7390
<!-- End: Package sources from dotnet-winforms -->

‎eng/Version.Details.xml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -55,17 +55,17 @@
5555
<Uri>https://github.com/dotnet/emsdk</Uri>
5656
<Sha>2b0cca8ad3a88e02fe0878139009ffffde071f1f</Sha>
5757
</Dependency>
58-
<Dependency Name="Microsoft.Build" Version="17.10.29">
59-
<Uri>https://dev.azure.com/devdiv/DevDiv/_git/DotNet-msbuild-Trusted</Uri>
60-
<Sha>27f9d42f6ea83c5aa7dddcab38a17806bfa50bc3</Sha>
58+
<Dependency Name="Microsoft.Build" Version="17.10.32">
59+
<Uri>https://github.com/dotnet/msbuild</Uri>
60+
<Sha>bb7294f72e2779834a7898b8d7f1d8c54eac9845</Sha>
6161
</Dependency>
62-
<Dependency Name="Microsoft.Build.Localization" Version="17.10.29-servicing-25223-08">
63-
<Uri>https://dev.azure.com/devdiv/DevDiv/_git/DotNet-msbuild-Trusted</Uri>
64-
<Sha>27f9d42f6ea83c5aa7dddcab38a17806bfa50bc3</Sha>
62+
<Dependency Name="Microsoft.Build.Localization" Version="17.10.32-servicing-25313-10">
63+
<Uri>https://github.com/dotnet/msbuild</Uri>
64+
<Sha>bb7294f72e2779834a7898b8d7f1d8c54eac9845</Sha>
6565
</Dependency>
66-
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.10.29-servicing-25223-08">
67-
<Uri>https://dev.azure.com/devdiv/DevDiv/_git/DotNet-msbuild-Trusted</Uri>
68-
<Sha>27f9d42f6ea83c5aa7dddcab38a17806bfa50bc3</Sha>
66+
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.10.32-servicing-25313-10">
67+
<Uri>https://github.com/dotnet/msbuild</Uri>
68+
<Sha>bb7294f72e2779834a7898b8d7f1d8c54eac9845</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.29</MicrosoftBuildPackageVersion>
127+
<MicrosoftBuildPackageVersion>17.10.32</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="'$(DotNetBuildFromSource)' != 'true'">17.8.29</MicrosoftBuildPackageVersion>
134134
<MicrosoftBuildFrameworkPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildFrameworkPackageVersion>
135135
<MicrosoftBuildRuntimePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildRuntimePackageVersion>
136-
<MicrosoftBuildLocalizationPackageVersion>17.10.29-servicing-25223-08</MicrosoftBuildLocalizationPackageVersion>
136+
<MicrosoftBuildLocalizationPackageVersion>17.10.32-servicing-25313-10</MicrosoftBuildLocalizationPackageVersion>
137137
<MicrosoftBuildUtilitiesCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildUtilitiesCorePackageVersion>
138138
<MicrosoftBuildTasksCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildTasksCorePackageVersion>
139139
<MicrosoftBuildTasksCoreVersion>$(MicrosoftBuildTasksCorePackageVersion)</MicrosoftBuildTasksCoreVersion>

0 commit comments

Comments
 (0)