|
18 | 18 | <PaketExePath Condition=" '$(PaketExePath)' == '' ">$(PaketToolsPath)paket.exe</PaketExePath>
|
19 | 19 | <PaketCommand Condition=" '$(OS)' == 'Windows_NT'">"$(PaketExePath)"</PaketCommand>
|
20 | 20 | <PaketCommand Condition=" '$(OS)' != 'Windows_NT' ">$(MonoPath) --runtime=v4.0.30319 "$(PaketExePath)"</PaketCommand>
|
| 21 | + |
| 22 | + <!-- .net core fdd --> |
| 23 | + <_PaketExeExtension>$([System.IO.Path]::GetExtension("$(PaketExePath)"))</_PaketExeExtension> |
| 24 | + <PaketCommand Condition=" '$(_PaketExeExtension)' == '.dll' ">dotnet "$(PaketExePath)"</PaketCommand> |
| 25 | + |
| 26 | + <!-- no extension is a shell script --> |
| 27 | + <PaketCommand Condition=" '$(_PaketExeExtension)' == '' ">"$(PaketExePath)"</PaketCommand> |
| 28 | + |
21 | 29 | <PaketBootStrapperExePath Condition=" '$(PaketBootStrapperExePath)' == '' AND Exists('$(PaketRootPath)paket.bootstrapper.exe')">$(PaketRootPath)paket.bootstrapper.exe</PaketBootStrapperExePath>
|
22 | 30 | <PaketBootStrapperExePath Condition=" '$(PaketBootStrapperExePath)' == '' ">$(PaketToolsPath)paket.bootstrapper.exe</PaketBootStrapperExePath>
|
23 | 31 | <PaketBootStrapperCommand Condition=" '$(OS)' == 'Windows_NT'">"$(PaketBootStrapperExePath)"</PaketBootStrapperCommand>
|
|
45 | 53 | </PropertyGroup>
|
46 | 54 |
|
47 | 55 | <!-- If shasum and awk exist get the hashes -->
|
48 |
| - <Exec Condition=" '$(PaketRestoreCachedHasher)' != '' " Command="$(PaketRestoreCachedHasher)" ConsoleToMSBuild='true'> |
| 56 | + <Exec StandardOutputImportance="Low" Condition=" '$(PaketRestoreCachedHasher)' != '' " Command="$(PaketRestoreCachedHasher)" ConsoleToMSBuild='true'> |
49 | 57 | <Output TaskParameter="ConsoleOutput" PropertyName="PaketRestoreCachedHash" />
|
50 | 58 | </Exec>
|
51 |
| - <Exec Condition=" '$(PaketRestoreLockFileHasher)' != '' " Command="$(PaketRestoreLockFileHasher)" ConsoleToMSBuild='true'> |
| 59 | + <Exec StandardOutputImportance="Low" Condition=" '$(PaketRestoreLockFileHasher)' != '' " Command="$(PaketRestoreLockFileHasher)" ConsoleToMSBuild='true'> |
52 | 60 | <Output TaskParameter="ConsoleOutput" PropertyName="PaketRestoreLockFileHash" />
|
53 | 61 | </Exec>
|
54 | 62 |
|
|
114 | 122 | <PaketReferencesFileLinesInfo Include="@(PaketReferencesFileLines)" >
|
115 | 123 | <PackageName>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[0])</PackageName>
|
116 | 124 | <PackageVersion>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[1])</PackageVersion>
|
| 125 | + <AllPrivateAssets>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[4])</AllPrivateAssets> |
117 | 126 | </PaketReferencesFileLinesInfo>
|
118 | 127 | <PackageReference Include="%(PaketReferencesFileLinesInfo.PackageName)">
|
119 | 128 | <Version>%(PaketReferencesFileLinesInfo.PackageVersion)</Version>
|
| 129 | + <PrivateAssets Condition="%(PaketReferencesFileLinesInfo.AllPrivateAssets) == 'true'">All</PrivateAssets> |
120 | 130 | </PackageReference>
|
121 | 131 | </ItemGroup>
|
122 | 132 |
|
|
138 | 148 | </DotNetCliToolReference>
|
139 | 149 | </ItemGroup>
|
140 | 150 |
|
| 151 | + <!-- Disabled for now until we know what to do with runtime deps - https://github.com/fsprojects/Paket/issues/2964 |
141 | 152 | <PropertyGroup>
|
142 | 153 | <RestoreConfigFile>$(MSBuildProjectDirectory)/obj/$(MSBuildProjectFile).NuGet.Config</RestoreConfigFile>
|
143 |
| - </PropertyGroup> |
| 154 | + </PropertyGroup> --> |
144 | 155 |
|
145 | 156 | </Target>
|
146 | 157 |
|
|
0 commit comments