Skip to content

Commit 7d4d2a4

Browse files
committed
add PaketBootstrapperStyle property
- classic (default). current behaviour with paket.bootstrapper.exe - proj (if paket.bootstrapper.proj exists). run Restore target of that msbuild .proj
1 parent 5ba7190 commit 7d4d2a4

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

src/Paket.Core/embedded/Paket.Restore.targets

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111
<PaketRootPath>$(MSBuildThisFileDirectory)..\</PaketRootPath>
1212
<PaketRestoreCacheFile>$(PaketRootPath)paket-files\paket.restore.cached</PaketRestoreCacheFile>
1313
<PaketLockFilePath>$(PaketRootPath)paket.lock</PaketLockFilePath>
14+
<PaketBootstrapperStyle>classic</PaketBootstrapperStyle>
15+
<PaketBootstrapperStyle Condition="Exists('$(PaketToolsPath)paket.bootstrapper.proj')">proj</PaketBootstrapperStyle>
1416
<MonoPath Condition="'$(MonoPath)' == '' And Exists('/Library/Frameworks/Mono.framework/Commands/mono')">/Library/Frameworks/Mono.framework/Commands/mono</MonoPath>
1517
<MonoPath Condition="'$(MonoPath)' == ''">mono</MonoPath>
1618
<!-- Paket command -->
@@ -82,7 +84,7 @@
8284
</PropertyGroup>
8385

8486
<!-- Do a global restore if required -->
85-
<Exec Command='$(PaketBootStrapperCommand)' Condition="Exists('$(PaketBootStrapperExePath)') AND !(Exists('$(PaketExePath)'))" ContinueOnError="false" />
87+
<Exec Command='$(PaketBootStrapperCommand)' Condition=" '$(PaketBootstrapperStyle)' == 'classic' AND Exists('$(PaketBootStrapperExePath)') AND !(Exists('$(PaketExePath)'))" ContinueOnError="false" />
8688
<Exec Command='$(PaketCommand) restore' Condition=" '$(PaketRestoreRequired)' == 'true' " ContinueOnError="false" />
8789

8890
<!-- Step 2 Detect project specific changes -->

0 commit comments

Comments
 (0)