Skip to content

Commit 55be5dc

Browse files
marcpopMSFTmarcpopMSFT
authored
[release/8.0.1xx] Update dependencies from dotnet/msbuild (#46020)
2 parents cd246b3 + e4f75d4 commit 55be5dc

File tree

3 files changed

+26
-9
lines changed

3 files changed

+26
-9
lines changed

‎NuGet.config

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
55
<!-- Begin: Package sources from dotnet-emsdk -->
66
<add key="darc-pub-dotnet-emsdk-c458a76" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-c458a764/nuget/v3/index.json" />
7+
<add key="darc-pub-dotnet-emsdk-c458a76-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-c458a764-3/nuget/v3/index.json" />
8+
<add key="darc-pub-dotnet-emsdk-c458a76-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-c458a764-2/nuget/v3/index.json" />
9+
<add key="darc-pub-dotnet-emsdk-c458a76-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-c458a764-1/nuget/v3/index.json" />
710
<!-- End: Package sources from dotnet-emsdk -->
811
<!-- Begin: Package sources from dotnet-format -->
912
<add key="darc-pub-dotnet-format-27f1865" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-27f18656/nuget/v3/index.json" />
@@ -19,20 +22,27 @@
1922
<!-- End: Package sources from dotnet-format -->
2023
<!-- Begin: Package sources from dotnet-aspnetcore -->
2124
<add key="darc-int-dotnet-aspnetcore-31d685b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-31d685b2/nuget/v3/index.json" />
25+
<add key="darc-int-dotnet-aspnetcore-31d685b-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-31d685b2-3/nuget/v3/index.json" />
26+
<add key="darc-int-dotnet-aspnetcore-31d685b-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-31d685b2-2/nuget/v3/index.json" />
27+
<add key="darc-int-dotnet-aspnetcore-31d685b-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-31d685b2-1/nuget/v3/index.json" />
2228
<!-- End: Package sources from dotnet-aspnetcore -->
2329
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
24-
<add key="darc-pub-DotNet-msbuild-Trusted-e2abee0" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-e2abee08/nuget/v3/index.json" />
30+
<add key="darc-pub-DotNet-msbuild-Trusted-31744df" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-31744dfc/nuget/v3/index.json" />
2531
<!-- End: Package sources from DotNet-msbuild-Trusted -->
2632
<!-- Begin: Package sources from dotnet-roslyn-analyzers -->
2733
<!-- End: Package sources from dotnet-roslyn-analyzers -->
2834
<!-- Begin: Package sources from dotnet-runtime -->
2935
<add key="darc-int-dotnet-runtime-89ef51c" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-89ef51c5/nuget/v3/index.json" />
36+
<add key="darc-int-dotnet-runtime-89ef51c-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-89ef51c5-3/nuget/v3/index.json" />
3037
<!-- End: Package sources from dotnet-runtime -->
3138
<!-- Begin: Package sources from dotnet-templating -->
3239
<add key="darc-pub-dotnet-templating-3dc94e3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-3dc94e39/nuget/v3/index.json" />
3340
<!-- End: Package sources from dotnet-templating -->
3441
<!-- Begin: Package sources from dotnet-windowsdesktop -->
3542
<add key="darc-int-dotnet-windowsdesktop-0dad47b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-0dad47b4/nuget/v3/index.json" />
43+
<add key="darc-int-dotnet-windowsdesktop-0dad47b-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-0dad47b4-3/nuget/v3/index.json" />
44+
<add key="darc-int-dotnet-windowsdesktop-0dad47b-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-0dad47b4-2/nuget/v3/index.json" />
45+
<add key="darc-int-dotnet-windowsdesktop-0dad47b-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-0dad47b4-1/nuget/v3/index.json" />
3646
<!-- End: Package sources from dotnet-windowsdesktop -->
3747
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
3848
<add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
@@ -57,6 +67,9 @@
5767
<!-- Begin: Package sources from dotnet-templating -->
5868
<!-- End: Package sources from dotnet-templating -->
5969
<!-- Begin: Package sources from dotnet-aspnetcore -->
70+
<add key="darc-int-dotnet-aspnetcore-31d685b-1" value="true" />
71+
<add key="darc-int-dotnet-aspnetcore-31d685b-2" value="true" />
72+
<add key="darc-int-dotnet-aspnetcore-31d685b-3" value="true" />
6073
<add key="darc-int-dotnet-aspnetcore-31d685b" value="true" />
6174
<!-- End: Package sources from dotnet-aspnetcore -->
6275
<!-- Begin: Package sources from dotnet-format -->
@@ -72,9 +85,13 @@
7285
<!-- End: Package sources from dotnet-format -->
7386
<!-- End: Package sources from dotnet-aspnetcore -->
7487
<!-- Begin: Package sources from dotnet-runtime -->
88+
<add key="darc-int-dotnet-runtime-89ef51c-3" value="true" />
7589
<add key="darc-int-dotnet-runtime-89ef51c" value="true" />
7690
<!-- End: Package sources from dotnet-runtime -->
7791
<!-- Begin: Package sources from dotnet-windowsdesktop -->
92+
<add key="darc-int-dotnet-windowsdesktop-0dad47b-1" value="true" />
93+
<add key="darc-int-dotnet-windowsdesktop-0dad47b-2" value="true" />
94+
<add key="darc-int-dotnet-windowsdesktop-0dad47b-3" value="true" />
7895
<add key="darc-int-dotnet-windowsdesktop-0dad47b" value="true" />
7996
<!-- End: Package sources from dotnet-windowsdesktop -->
8097
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->

‎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.8.15">
58+
<Dependency Name="Microsoft.Build" Version="17.8.18">
5959
<Uri>https://github.com/dotnet/msbuild</Uri>
60-
<Sha>e2abee08172c2efeae8bb2db8d292cbd9c1aa1ef</Sha>
60+
<Sha>31744dfcae98daa4dcc011c6ebf6d404b93fcf5c</Sha>
6161
</Dependency>
62-
<Dependency Name="Microsoft.Build.Localization" Version="17.8.15-preview-24613-11">
62+
<Dependency Name="Microsoft.Build.Localization" Version="17.8.18-preview-25066-03">
6363
<Uri>https://github.com/dotnet/msbuild</Uri>
64-
<Sha>e2abee08172c2efeae8bb2db8d292cbd9c1aa1ef</Sha>
64+
<Sha>31744dfcae98daa4dcc011c6ebf6d404b93fcf5c</Sha>
6565
</Dependency>
66-
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.8.15-preview-24613-11">
66+
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.8.18-preview-25066-03">
6767
<Uri>https://github.com/dotnet/msbuild</Uri>
68-
<Sha>e2abee08172c2efeae8bb2db8d292cbd9c1aa1ef</Sha>
68+
<Sha>31744dfcae98daa4dcc011c6ebf6d404b93fcf5c</Sha>
6969
<SourceBuild RepoName="msbuild" ManagedOnly="true" />
7070
</Dependency>
7171
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.8.102-beta.24081.2">

‎eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@
121121
</PropertyGroup>
122122
<PropertyGroup>
123123
<!-- Dependencies from https://github.com/Microsoft/msbuild -->
124-
<MicrosoftBuildPackageVersion>17.8.15</MicrosoftBuildPackageVersion>
124+
<MicrosoftBuildPackageVersion>17.8.18</MicrosoftBuildPackageVersion>
125125
<MicrosoftBuildCurrentPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildCurrentPackageVersion>
126126
<!-- Some tasks and the resolver will need to run in an MSBuild that is older than the very latest,
127127
so target one that matches the version in minimumMSBuildVersion.
@@ -130,7 +130,7 @@
130130
<MicrosoftBuildPackageVersion Condition="exists('$(RepoRoot)\src\Layout\redist\minimumMSBuildVersion') and '$(DotNetBuildFromSource)' != 'true'">$([System.IO.File]::ReadAllText('$(RepoRoot)\src\Layout\redist\minimumMSBuildVersion').Trim())</MicrosoftBuildPackageVersion>
131131
<MicrosoftBuildFrameworkPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildFrameworkPackageVersion>
132132
<MicrosoftBuildRuntimePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildRuntimePackageVersion>
133-
<MicrosoftBuildLocalizationPackageVersion>17.8.15-preview-24613-11</MicrosoftBuildLocalizationPackageVersion>
133+
<MicrosoftBuildLocalizationPackageVersion>17.8.18-preview-25066-03</MicrosoftBuildLocalizationPackageVersion>
134134
<MicrosoftBuildUtilitiesCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildUtilitiesCorePackageVersion>
135135
<MicrosoftBuildTasksCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildTasksCorePackageVersion>
136136
<MicrosoftBuildTasksCoreVersion>$(MicrosoftBuildTasksCorePackageVersion)</MicrosoftBuildTasksCoreVersion>

0 commit comments

Comments
 (0)