Skip to content
This repository was archived by the owner on Jul 14, 2020. It is now read-only.

Commit 79432ca

Browse files
authored
Minor improvements to GlobalRestoer (#275)
Don't run RestoreGlobalNuGetPackages under NuGet's restore Set CBTGlobalBuildPackagesCreated during traversal restore
1 parent 2b9d45a commit 79432ca

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

src/CBT.NuGet.GlobalRestore/build/After.Microsoft.Common.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<UsingTask AssemblyFile="$(CBTNuGetTasksAssemblyPath)" TaskName="CBT.NuGet.Tasks.GenerateNuGetProperties" />
88

99
<Target Name="RestoreGlobalNuGetPackages"
10-
Condition=" '$(CBTNuGetGlobalPackagesRestored)' != 'true' "
10+
Condition=" '$(CBTNuGetGlobalPackagesRestored)' != 'true' And '$(ExcludeRestorePackageImports)' != 'true' "
1111
Inputs="$(CBTNuGetAllProjects);$(CBTNuGetGlobalPackagesRestoreFile)"
1212
Outputs="$(CBTNuGetGlobalPackagesRestoredMarker)">
1313

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
4-
<TraversalGlobalProperties>$(TraversalGlobalProperties);CBTNuGetGlobalPackagesRestored=$(CBTNuGetGlobalPackagesRestored);CBTNuGetGlobalPackagePropertiesCreated=$(CBTNuGetGlobalPackagePropertiesCreated)</TraversalGlobalProperties>
4+
<TraversalGlobalProperties>$(TraversalGlobalProperties);CBTNuGetGlobalPackagesRestored=$(CBTNuGetGlobalPackagesRestored);CBTNuGetGlobalPackagePropertiesCreated=$(CBTNuGetGlobalPackagePropertiesCreated);CBTGlobalBuildPackagesCreated=$(CBTGlobalBuildPackagesCreated)</TraversalGlobalProperties>
55
</PropertyGroup>
66
</Project>

0 commit comments

Comments
 (0)