|
20 | 20 | <PaketBootstrapperStyle Condition="Exists('$(PaketToolsPath)paket.bootstrapper.proj')">proj</PaketBootstrapperStyle> |
21 | 21 | <PaketExeImage>assembly</PaketExeImage> |
22 | 22 | <PaketExeImage Condition=" '$(PaketBootstrapperStyle)' == 'proj' ">native</PaketExeImage> |
23 | | - <MonoPath Condition="'$(MonoPath)' == '' AND Exists('/Library/Frameworks/Mono.framework/Commands/mono')">/Library/Frameworks/Mono.framework/Commands/mono</MonoPath> |
| 23 | + <MonoPath Condition="'$(MonoPath)' == '' And Exists('/Library/Frameworks/Mono.framework/Commands/mono')">/Library/Frameworks/Mono.framework/Commands/mono</MonoPath> |
24 | 24 | <MonoPath Condition="'$(MonoPath)' == ''">mono</MonoPath> |
25 | 25 |
|
26 | 26 | <!-- PaketBootStrapper --> |
27 | 27 | <PaketBootStrapperExePath Condition=" '$(PaketBootStrapperExePath)' == '' AND Exists('$(PaketRootPath)paket.bootstrapper.exe')">$(PaketRootPath)paket.bootstrapper.exe</PaketBootStrapperExePath> |
28 | 28 | <PaketBootStrapperExePath Condition=" '$(PaketBootStrapperExePath)' == '' ">$(PaketToolsPath)paket.bootstrapper.exe</PaketBootStrapperExePath> |
29 | 29 | <PaketBootStrapperExeDir Condition=" Exists('$(PaketBootStrapperExePath)') " >$([System.IO.Path]::GetDirectoryName("$(PaketBootStrapperExePath)"))\</PaketBootStrapperExeDir> |
30 | 30 |
|
31 | | - <PaketBootStrapperCommand Condition=" '$(OS)' == 'Windows_NT' ">"$(PaketBootStrapperExePath)"</PaketBootStrapperCommand> |
| 31 | + <PaketBootStrapperCommand Condition=" '$(OS)' == 'Windows_NT'">"$(PaketBootStrapperExePath)"</PaketBootStrapperCommand> |
32 | 32 | <PaketBootStrapperCommand Condition=" '$(OS)' != 'Windows_NT' ">$(MonoPath) --runtime=v4.0.30319 "$(PaketBootStrapperExePath)"</PaketBootStrapperCommand> |
33 | 33 |
|
| 34 | + <!-- Disable automagic references for F# dotnet sdk --> |
| 35 | + <!-- This will not do anything for other project types --> |
| 36 | + <!-- see https://github.com/fsharp/fslang-design/blob/master/tooling/FST-1002-fsharp-in-dotnet-sdk.md --> |
| 37 | + <DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference> |
| 38 | + <DisableImplicitSystemValueTupleReference>true</DisableImplicitSystemValueTupleReference> |
| 39 | + |
34 | 40 | <!-- Disable Paket restore under NCrunch build --> |
35 | 41 | <PaketRestoreDisabled Condition="'$(NCrunch)' == '1'">True</PaketRestoreDisabled> |
36 | 42 |
|
37 | | - <!-- Disable test for CLI tool completely - overrideable via properties in projects or via environment variables --> |
38 | | - <PaketDisableCliTest Condition=" '$(PaketDisableCliTest)' == '' ">False</PaketDisableCliTest> |
39 | | - |
40 | 43 | <PaketIntermediateOutputPath Condition=" '$(PaketIntermediateOutputPath)' == '' ">$(BaseIntermediateOutputPath.TrimEnd('\').TrimEnd('\/'))</PaketIntermediateOutputPath> |
41 | 44 | </PropertyGroup> |
42 | 45 |
|
43 | | - <!-- Resolve how paket should be called --> |
44 | | - <!-- Current priority is: local (1: repo root, 2: .paket folder) => 3: as CLI tool => as bootstrapper (4: proj Bootstrapper style, 5: BootstrapperExeDir) => 6: global path variable --> |
| 46 | + <!-- Check if paket is available as local dotnet cli tool --> |
45 | 47 | <Target Name="SetPaketCommand" > |
46 | | - <!-- Test if paket is available in the standard locations. If so, that takes priority. Case 1/2 - non-windows specific --> |
47 | | - <PropertyGroup Condition=" '$(OS)' != 'Windows_NT' "> |
48 | | - <!-- no windows, try native paket as default, root => tool --> |
49 | | - <PaketExePath Condition=" '$(PaketExePath)' == '' AND Exists('$(PaketRootPath)paket') ">$(PaketRootPath)paket</PaketExePath> |
50 | | - <PaketExePath Condition=" '$(PaketExePath)' == '' AND Exists('$(PaketToolsPath)paket') ">$(PaketToolsPath)paket</PaketExePath> |
51 | | - </PropertyGroup> |
| 48 | + |
| 49 | + <!-- Call 'dotnet paket' and see if it returns without an error. Mute all the output. --> |
| 50 | + <Exec Command="dotnet paket --version" IgnoreExitCode="true" StandardOutputImportance="low" StandardErrorImportance="low" > |
| 51 | + <Output TaskParameter="ExitCode" PropertyName="LocalPaketToolExitCode" /> |
| 52 | + </Exec> |
52 | 53 |
|
53 | | - <!-- Test if paket is available in the standard locations. If so, that takes priority. Case 2/2 - same across platforms --> |
54 | | - <PropertyGroup> |
55 | | - <!-- root => tool --> |
56 | | - <PaketExePath Condition=" '$(PaketExePath)' == '' AND Exists('$(PaketRootPath)paket.exe') ">$(PaketRootPath)paket.exe</PaketExePath> |
57 | | - <PaketExePath Condition=" '$(PaketExePath)' == '' AND Exists('$(PaketToolsPath)paket.exe') ">$(PaketToolsPath)paket.exe</PaketExePath> |
| 54 | + <!-- If local paket tool is found, use that --> |
| 55 | + <PropertyGroup Condition=" '$(LocalPaketToolExitCode)' == '0' "> |
| 56 | + <InternalPaketCommand>dotnet paket</InternalPaketCommand> |
58 | 57 | </PropertyGroup> |
59 | 58 |
|
60 | | - <!-- If paket hasn't be found in standard locations, test for CLI tool usage. --> |
61 | | - <!-- First test: Is CLI configured to be used in "dotnet-tools.json"? - can result in a false negative; only a positive outcome is reliable. --> |
62 | | - <PropertyGroup Condition=" '$(PaketExePath)' == '' "> |
63 | | - <_DotnetToolsJson Condition="Exists('$(PaketRootPath)/.config/dotnet-tools.json')">$([System.IO.File]::ReadAllText("$(PaketRootPath)/.config/dotnet-tools.json"))</_DotnetToolsJson> |
64 | | - <_ConfigContainsPaket Condition=" '$(_DotnetToolsJson)' != ''">$(_DotnetToolsJson.Contains('"paket"'))</_ConfigContainsPaket> |
65 | | - <_ConfigContainsPaket Condition=" '$(_ConfigContainsPaket)' == ''">false</_ConfigContainsPaket> |
66 | | - </PropertyGroup> |
| 59 | + <!-- If not, then we go through our normal steps of setting the Paket command. --> |
| 60 | + <PropertyGroup Condition=" '$(LocalPaketToolExitCode)' != '0' "> |
| 61 | + <!-- windows, root => tool => proj style => bootstrapper => global --> |
| 62 | + <PaketExePath Condition=" '$(PaketExePath)' == '' AND '$(OS)' == 'Windows_NT' AND Exists('$(PaketRootPath)paket.exe') ">$(PaketRootPath)paket.exe</PaketExePath> |
| 63 | + <PaketExePath Condition=" '$(PaketExePath)' == '' AND '$(OS)' == 'Windows_NT' AND Exists('$(PaketToolsPath)paket.exe') ">$(PaketToolsPath)paket.exe</PaketExePath> |
| 64 | + <PaketExePath Condition=" '$(PaketExePath)' == '' AND '$(OS)' == 'Windows_NT' AND '$(PaketBootstrapperStyle)' == 'proj' ">$(PaketToolsPath)paket.exe</PaketExePath> |
| 65 | + <PaketExePath Condition=" '$(PaketExePath)' == '' AND '$(OS)' == 'Windows_NT' AND Exists('$(PaketBootStrapperExeDir)') ">$(_PaketBootStrapperExeDir)paket.exe</PaketExePath> |
| 66 | + <PaketExePath Condition=" '$(PaketExePath)' == '' AND '$(OS)' == 'Windows_NT' ">paket.exe</PaketExePath> |
67 | 67 |
|
68 | | - <!-- Second test: Call 'dotnet paket' and see if it returns without an error. Mute all the output. Only run if previous test failed and the test has not been disabled. --> |
69 | | - <!-- WARNING: This method can lead to processes hanging forever, and should be used as little as possible. See https://github.com/fsprojects/Paket/issues/3705 for details. --> |
70 | | - <Exec Condition=" '$(PaketExePath)' == '' AND !$(PaketDisableCliTest) AND !$(_ConfigContainsPaket)" Command="dotnet paket --version" IgnoreExitCode="true" StandardOutputImportance="low" StandardErrorImportance="low" > |
71 | | - <Output TaskParameter="ExitCode" PropertyName="LocalPaketToolExitCode" /> |
72 | | - </Exec> |
| 68 | + <!-- no windows, try native paket as default, root => tool => proj style => mono paket => bootstrpper => global --> |
| 69 | + <PaketExePath Condition=" '$(PaketExePath)' == '' AND '$(OS)' != 'Windows_NT' AND Exists('$(PaketRootPath)paket') ">$(PaketRootPath)paket</PaketExePath> |
| 70 | + <PaketExePath Condition=" '$(PaketExePath)' == '' AND '$(OS)' != 'Windows_NT' AND Exists('$(PaketToolsPath)paket') ">$(PaketToolsPath)paket</PaketExePath> |
| 71 | + <PaketExePath Condition=" '$(PaketExePath)' == '' AND '$(OS)' != 'Windows_NT' AND '$(PaketBootstrapperStyle)' == 'proj' ">$(PaketToolsPath)paket</PaketExePath> |
73 | 72 |
|
74 | | - <!-- If paket is installed as CLI use that. Again, only if paket haven't already been found in standard locations. --> |
75 | | - <PropertyGroup Condition=" '$(PaketExePath)' == '' AND ($(_ConfigContainsPaket) OR '$(LocalPaketToolExitCode)' == '0') "> |
76 | | - <_PaketCommand>dotnet paket</_PaketCommand> |
77 | | - </PropertyGroup> |
| 73 | + <!-- no windows, try mono paket --> |
| 74 | + <PaketExePath Condition=" '$(PaketExePath)' == '' AND '$(OS)' != 'Windows_NT' AND Exists('$(PaketRootPath)paket.exe') ">$(PaketRootPath)paket.exe</PaketExePath> |
| 75 | + <PaketExePath Condition=" '$(PaketExePath)' == '' AND '$(OS)' != 'Windows_NT' AND Exists('$(PaketToolsPath)paket.exe') ">$(PaketToolsPath)paket.exe</PaketExePath> |
78 | 76 |
|
79 | | - <!-- If neither local files nor CLI tool can be found, final attempt is searching for boostrapper config before falling back to global path variable. --> |
80 | | - <PropertyGroup Condition=" '$(PaketExePath)' == '' AND '$(_PaketCommand)' == '' "> |
81 | | - <!-- Test for bootstrapper setup --> |
82 | | - <PaketExePath Condition=" '$(PaketExePath)' == '' AND '$(PaketBootstrapperStyle)' == 'proj' ">$(PaketToolsPath)paket</PaketExePath> |
83 | | - <PaketExePath Condition=" '$(PaketExePath)' == '' AND Exists('$(PaketBootStrapperExeDir)') ">$(PaketBootStrapperExeDir)paket</PaketExePath> |
| 77 | + <!-- no windows, try bootstrapper --> |
| 78 | + <PaketExePath Condition=" '$(PaketExePath)' == '' AND '$(OS)' != 'Windows_NT' AND Exists('$(PaketBootStrapperExeDir)') ">$(PaketBootStrapperExeDir)paket.exe</PaketExePath> |
84 | 79 |
|
85 | | - <!-- If all else fails, use global path approach. --> |
86 | | - <PaketExePath Condition=" '$(PaketExePath)' == ''">paket</PaketExePath> |
87 | | - </PropertyGroup> |
| 80 | + <!-- no windows, try global native paket --> |
| 81 | + <PaketExePath Condition=" '$(PaketExePath)' == '' AND '$(OS)' != 'Windows_NT' ">paket</PaketExePath> |
88 | 82 |
|
89 | | - <!-- If not using CLI, setup correct execution command. --> |
90 | | - <PropertyGroup Condition=" '$(_PaketCommand)' == '' "> |
91 | 83 | <_PaketExeExtension>$([System.IO.Path]::GetExtension("$(PaketExePath)"))</_PaketExeExtension> |
92 | | - <_PaketCommand Condition=" '$(_PaketCommand)' == '' AND '$(_PaketExeExtension)' == '.dll' ">dotnet "$(PaketExePath)"</_PaketCommand> |
93 | | - <_PaketCommand Condition=" '$(_PaketCommand)' == '' AND '$(OS)' != 'Windows_NT' AND '$(_PaketExeExtension)' == '.exe' ">$(MonoPath) --runtime=v4.0.30319 "$(PaketExePath)"</_PaketCommand> |
94 | | - <_PaketCommand Condition=" '$(_PaketCommand)' == '' ">"$(PaketExePath)"</_PaketCommand> |
| 84 | + <InternalPaketCommand Condition=" '$(InternalPaketCommand)' == '' AND '$(_PaketExeExtension)' == '.dll' ">dotnet "$(PaketExePath)"</InternalPaketCommand> |
| 85 | + <InternalPaketCommand Condition=" '$(InternalPaketCommand)' == '' AND '$(OS)' != 'Windows_NT' AND '$(_PaketExeExtension)' == '.exe' ">$(MonoPath) --runtime=v4.0.30319 "$(PaketExePath)"</InternalPaketCommand> |
| 86 | + <InternalPaketCommand Condition=" '$(InternalPaketCommand)' == '' ">"$(PaketExePath)"</InternalPaketCommand> |
| 87 | + |
95 | 88 | </PropertyGroup> |
96 | 89 |
|
97 | 90 | <!-- The way to get a property to be available outside the target is to use this task. --> |
98 | | - <CreateProperty Value="$(_PaketCommand)"> |
| 91 | + <CreateProperty Value="$(InternalPaketCommand)"> |
99 | 92 | <Output TaskParameter="Value" PropertyName="PaketCommand"/> |
100 | 93 | </CreateProperty> |
101 | 94 |
|
|
0 commit comments