зеркало из https://github.com/dotnet/msbuild.git
Merge pull request #8856 from dotnet/revert-8498-turn-off-static-graph-restore
Reënable static graph restore
This commit is contained in:
Коммит
4598629a24
|
@ -246,6 +246,9 @@
|
||||||
<Copy SourceFiles="$(RepoRoot)src\MSBuild.Bootstrap\RedirectNuGetConsoleProcess.After.Microsoft.Common.targets"
|
<Copy SourceFiles="$(RepoRoot)src\MSBuild.Bootstrap\RedirectNuGetConsoleProcess.After.Microsoft.Common.targets"
|
||||||
DestinationFolder="$(BootstrapDestination)\Current\Microsoft.Common.targets\ImportAfter" />
|
DestinationFolder="$(BootstrapDestination)\Current\Microsoft.Common.targets\ImportAfter" />
|
||||||
|
|
||||||
|
<Copy SourceFiles="$(RepoRoot)src\MSBuild.Bootstrap\RedirectNuGetConsoleProcess.After.Microsoft.Common.targets"
|
||||||
|
DestinationFolder="$(BootstrapDestination)\Current\SolutionFile\ImportAfter" />
|
||||||
|
|
||||||
<!-- Disable workload resolver until we can figure out whether it can work in the bootstrap
|
<!-- Disable workload resolver until we can figure out whether it can work in the bootstrap
|
||||||
https://github.com/dotnet/msbuild/issues/6566 -->
|
https://github.com/dotnet/msbuild/issues/6566 -->
|
||||||
<Touch Files="$(BootstrapDestination)\DisableWorkloadResolver.sentinel" AlwaysCreate="true" />
|
<Touch Files="$(BootstrapDestination)\DisableWorkloadResolver.sentinel" AlwaysCreate="true" />
|
||||||
|
|
|
@ -2,13 +2,9 @@
|
||||||
<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the MIT license. See License.txt in the project root for full license information. -->
|
<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the MIT license. See License.txt in the project root for full license information. -->
|
||||||
<Project>
|
<Project>
|
||||||
|
|
||||||
<!-- Commented out as a temporary fix for the msbuild CI.
|
|
||||||
Waiting for https://github.com/NuGet/NuGet.Client/pull/5010 fix to flow to CI machines. -->
|
|
||||||
<!--
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<RestoreUseStaticGraphEvaluation Condition="'$(DotNetBuildFromSource)' != 'true'">true</RestoreUseStaticGraphEvaluation>
|
<RestoreUseStaticGraphEvaluation Condition="'$(DotNetBuildFromSource)' != 'true'">true</RestoreUseStaticGraphEvaluation>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
-->
|
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<!-- Remove all sln files globbed by arcade so far and add only MSBuild.sln to the build.
|
<!-- Remove all sln files globbed by arcade so far and add only MSBuild.sln to the build.
|
||||||
|
|
Загрузка…
Ссылка в новой задаче