|
8 | 8 | <IkvmImageAvailableRuntimeIdentifiers Include="win-x64;win-x86;win-arm64;linux-x64;linux-arm;linux-arm64;linux-musl-x64;linux-musl-arm;linux-musl-arm64;osx-x64;osx-arm64;android-x64;android-arm64" />
|
9 | 9 | </ItemGroup>
|
10 | 10 |
|
11 |
| - <PropertyGroup> |
12 |
| - <IkvmImageTargetPath Condition=" '$(IkvmImageTargetPath)' == '' ">ikvm</IkvmImageTargetPath> |
13 |
| - <IkvmPropertiesFileName Condition=" '$(IkvmPropertiesFileName)' == '' ">ikvm.properties</IkvmPropertiesFileName> |
14 |
| - <CopyIkvmImageItemToOutputDirectory Condition=" '$(CopyIkvmImageItemToOutputDirectory)' == '' ">PreserveNewest</CopyIkvmImageItemToOutputDirectory> |
15 |
| - <CopyIkvmImageItemToPublishDirectory Condition=" '$(CopyIkvmImageItemToPublishDirectory)' == '' "></CopyIkvmImageItemToPublishDirectory> |
16 |
| - <CopyIkvmPropertiesFileToOutputDirectory Condition=" '$(CopyIkvmPropertiesFileToOutputDirectory)' == '' ">PreserveNewest</CopyIkvmPropertiesFileToOutputDirectory> |
17 |
| - <CopyIkvmPropertiesFileToPublishDirectory Condition=" '$(CopyIkvmPropertiesFileToPublishDirectory)' == '' "></CopyIkvmPropertiesFileToPublishDirectory> |
18 |
| - </PropertyGroup> |
| 11 | + <Import Project="IKVM.Image.properties.targets" /> |
19 | 12 |
|
20 | 13 | <Choose>
|
21 | 14 | <When Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net461'))">
|
|
146 | 139 | </Task>
|
147 | 140 | </UsingTask>
|
148 | 141 |
|
| 142 | + <PropertyGroup> |
| 143 | + <GetIkvmImageItemsOutputItemsDependsOn> |
| 144 | + $(GetIkvmImageItemsOutputItemsDependsOn); |
| 145 | + ExpandIkvmImageItems; |
| 146 | + </GetIkvmImageItemsOutputItemsDependsOn> |
| 147 | + </PropertyGroup> |
| 148 | + |
149 | 149 | <Target Name="GetIkvmImageItemsOutputItems" BeforeTargets="_GetPackageFiles;AssignLinkMetadata;AssignTargetPaths" DependsOnTargets="$(GetIkvmImageItemsOutputItemsDependsOn)">
|
150 | 150 | <_FilterIkvmImageItems Items="@(_IkvmImageItemExpanded)">
|
151 | 151 | <Output TaskParameter="Items" ItemName="_IkvmImageItemFiltered" />
|
|
158 | 158 | </ItemGroup>
|
159 | 159 | </Target>
|
160 | 160 |
|
161 |
| - <PropertyGroup> |
162 |
| - <GetIkvmImageItemsOutputItemsDependsOn> |
163 |
| - $(GetIkvmImageItemsOutputItemsDependsOn); |
164 |
| - ExpandIkvmImageItems; |
165 |
| - </GetIkvmImageItemsOutputItemsDependsOn> |
166 |
| - </PropertyGroup> |
167 |
| - |
168 |
| - <Target Name="WriteIkvmPropertiesFile"> |
169 |
| - <ItemGroup> |
170 |
| - <_IkvmPropertiesFileLine Include="ikvm.home.root=$(IkvmImageTargetPath)" /> |
171 |
| - </ItemGroup> |
172 |
| - <WriteLinesToFile Lines="@(_IkvmPropertiesFileLine)" File="$(IntermediateOutputPath)$(IkvmPropertiesFileName)" Overwrite="true" WriteOnlyWhenDifferent="true" /> |
173 |
| - </Target> |
174 |
| - |
175 |
| - <Target Name="IncludeIkvmPropertiesFile" DependsOnTargets="WriteIkvmPropertiesFile" BeforeTargets="_GetPackageFiles;AssignLinkMetadata;AssignTargetPaths"> |
176 |
| - <ItemGroup> |
177 |
| - <None Include="$(IntermediateOutputPath)$(IkvmPropertiesFileName)" Condition="Exists('$(IntermediateOutputPath)$(IkvmPropertiesFileName)')"> |
178 |
| - <CopyToOutputDirectory>$(CopyIkvmPropertiesFileToOutputDirectory)</CopyToOutputDirectory> |
179 |
| - <CopyToPublishDirectory>$(CopyIkvmPropertiesFileToPublishDirectory)</CopyToPublishDirectory> |
180 |
| - <TargetPath>$(IkvmPropertiesFileName)</TargetPath> |
181 |
| - <Link>$(IkvmPropertiesFileName)</Link> |
182 |
| - </None> |
183 |
| - </ItemGroup> |
184 |
| - </Target> |
185 |
| - |
186 | 161 | <PropertyGroup>
|
187 | 162 | <CollectIkvmImageItemsOutputItemsDependsOn>
|
188 | 163 | ExpandIkvmImageItems;
|
|
198 | 173 | <PropertyGroup>
|
199 | 174 | <AssignTargetPathsDependsOn>
|
200 | 175 | CollectIkvmImageItemsOutputItems;
|
201 |
| - WriteIkvmPropertiesFile; |
202 |
| - IncludeIkvmPropertiesFile; |
203 | 176 | $(AssignTargetPathsDependsOn);
|
204 | 177 | </AssignTargetPathsDependsOn>
|
205 | 178 | </PropertyGroup>
|
|
0 commit comments