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

Disable global package restore during traversal restore #206

Merged
jeffkl merged 2 commits into from
Nov 3, 2017
Merged

Disable global package restore during traversal restore #206

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3c17ff0
Disable global package restore during traversal restore
jeffkl Nov 3, 2017
6b5b3d6
Update dependency on CBT.NuGet to 2.1.19
jeffkl Nov 3, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/CBT.NuGet.GlobalRestore/CBT.NuGet.GlobalRestore.nuproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,9 @@
<Import Project="$(NuProjPath)\NuProj.props" Condition="Exists('$(NuProjPath)\NuProj.props')" />
<ItemGroup>
<Dependency Include="CBT.NuGet">
<Version>[2.0.0,)</Version>
<Version>[2.1.19,)</Version>
</Dependency>
<Content Include="build\After.Traversal.targets" />
<Content Include="build\Before.CBT.NuGet.PackageProperties.props" />
<Content Include="build\After.Microsoft.Common.targets" />
<Content Include="build\module.config" />
Expand Down
12 changes: 2 additions & 10 deletions src/CBT.NuGet.GlobalRestore/build/After.Microsoft.Common.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" InitialTargets="NuGetRestoreGlobalPackages">
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" InitialTargets="RestoreGlobalNuGetPackages">

<PropertyGroup>
<RestoreNuGetPackagesDependsOn>RestoreGlobalNuGetPackages;$(RestoreNuGetPackagesDependsOn)</RestoreNuGetPackagesDependsOn>
</PropertyGroup>
<UsingTask AssemblyFile="$(CBTNuGetTasksAssemblyPath)" TaskName="CBT.NuGet.Tasks.GenerateNuGetProperties" />

<Target Name="RestoreGlobalNuGetPackages"
Condition=" '$(CBTEnableGlobalPackageRestore)' == 'true' And '$(BuildingInsideVisualStudio)' != 'true' "
DependsOnTargets="_CheckForCBTNuGetGlobalPackagesRestoredMarker"
Inputs="$(CBTNuGetAllProjects);$(CBTNuGetGlobalPackagesRestoreFile)"
Outputs="$(CBTNuGetGlobalPackagesRestoredMarker)">
<CallTarget Targets="NuGetRestoreGlobalPackages" />
</Target>

<Target Name="NuGetRestoreGlobalPackages"
Condition=" '$(CBTNuGetGlobalPackagesRestored)' != 'true'"
Condition=" '$(CBTNuGetGlobalPackagesRestored)' != 'true' "
Inputs="$(CBTNuGetAllProjects);$(CBTNuGetGlobalPackagesRestoreFile)"
Outputs="$(CBTNuGetGlobalPackagesRestoredMarker)">

Expand Down
6 changes: 6 additions & 0 deletions src/CBT.NuGet.GlobalRestore/build/After.Traversal.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<TraversalGlobalProperties>$(TraversalGlobalProperties);CBTNuGetGlobalPackagesRestored=$(CBTNuGetGlobalPackagesRestored)</TraversalGlobalProperties>
</PropertyGroup>
</Project>