|
72 | 72 | <PaketRestoreRequired Condition=" '$(PaketRestoreLockFileHash)' == '' ">true</PaketRestoreRequired> |
73 | 73 | </PropertyGroup> |
74 | 74 |
|
| 75 | + <PropertyGroup Condition="'$(PaketPropsVersion)' != '5.174.2' "> |
| 76 | + <PaketRestoreRequired>true</PaketRestoreRequired> |
| 77 | + </PropertyGroup> |
75 | 78 |
|
76 | 79 | <!-- Do a global restore if required --> |
77 | 80 | <Exec Command='$(PaketBootStrapperCommand)' Condition="Exists('$(PaketBootStrapperExePath)') AND !(Exists('$(PaketExePath)'))" ContinueOnError="false" /> |
|
93 | 96 | <PaketOriginalReferencesFilePath Condition=" !Exists('$(PaketOriginalReferencesFilePath)')">$(MSBuildProjectDirectory)\$(MSBuildProjectName).paket.references</PaketOriginalReferencesFilePath> |
94 | 97 | <!-- paket.references --> |
95 | 98 | <PaketOriginalReferencesFilePath Condition=" !Exists('$(PaketOriginalReferencesFilePath)')">$(MSBuildProjectDirectory)\paket.references</PaketOriginalReferencesFilePath> |
96 | | - |
| 99 | + |
97 | 100 | <DoAllResolvedFilesExist>false</DoAllResolvedFilesExist> |
98 | 101 | <DoAllResolvedFilesExist Condition="Exists(%(PaketResolvedFilePaths.Identity))">true</DoAllResolvedFilesExist> |
99 | 102 | <PaketRestoreRequired>true</PaketRestoreRequired> |
|
132 | 135 | <Error Condition=" '$(DoAllResolvedFilesExist)' != 'true' AND '$(ResolveNuGetPackages)' != 'False' " Text="One Paket file '@(PaketResolvedFilePaths)' is missing while restoring $(MSBuildProjectFile). Please delete 'paket-files/paket.restore.cached' and call 'paket restore'." /> |
133 | 136 |
|
134 | 137 | <!-- Step 4 forward all msbuild properties (PackageReference, DotNetCliToolReference) to msbuild --> |
135 | | - <ReadLinesFromFile Condition="'@(PaketResolvedFilePaths)' != ''" File="%(PaketResolvedFilePaths.Identity)" ><!--Condition="Exists('%(PaketResolvedFilePaths.Identity)')"--> |
| 138 | + <ReadLinesFromFile Condition="($(DesignTimeBuild) != true OR '$(PaketPropsLoaded)' != 'true') AND '@(PaketResolvedFilePaths)' != ''" File="%(PaketResolvedFilePaths.Identity)" > |
136 | 139 | <Output TaskParameter="Lines" ItemName="PaketReferencesFileLines"/> |
137 | 140 | </ReadLinesFromFile> |
138 | 141 |
|
139 | | - <ItemGroup Condition=" '@(PaketReferencesFileLines)' != '' " > |
| 142 | + <ItemGroup Condition="($(DesignTimeBuild) != true OR '$(PaketPropsLoaded)' != 'true') AND '@(PaketReferencesFileLines)' != '' " > |
140 | 143 | <PaketReferencesFileLinesInfo Include="@(PaketReferencesFileLines)" > |
141 | 144 | <PackageName>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[0])</PackageName> |
142 | 145 | <PackageVersion>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[1])</PackageVersion> |
143 | 146 | <AllPrivateAssets>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[4])</AllPrivateAssets> |
| 147 | + <CopyLocal>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[5])</CopyLocal> |
144 | 148 | </PaketReferencesFileLinesInfo> |
145 | 149 | <PackageReference Include="%(PaketReferencesFileLinesInfo.PackageName)"> |
146 | 150 | <Version>%(PaketReferencesFileLinesInfo.PackageVersion)</Version> |
147 | 151 | <PrivateAssets Condition=" ('%(PaketReferencesFileLinesInfo.AllPrivateAssets)' == 'true') Or ('$(PackAsTool)' == 'true') ">All</PrivateAssets> |
148 | | - <ExcludeAssets Condition="%(PaketReferencesFileLinesInfo.AllPrivateAssets) == 'exclude'">runtime</ExcludeAssets> |
| 152 | + <ExcludeAssets Condition="%(PaketReferencesFileLinesInfo.CopyLocal) == 'false'">runtime</ExcludeAssets> |
149 | 153 | <Publish Condition=" '$(PackAsTool)' == 'true' ">true</Publish> |
150 | 154 | </PackageReference> |
151 | 155 | </ItemGroup> |
|
0 commit comments