Skip to content

Commit ad399f5

Browse files
committed
Moved ikvm.properties file stuff into separate file, so we can include it directly. And do so.
1 parent 3c67b44 commit ad399f5

File tree

31 files changed

+80
-35
lines changed

31 files changed

+80
-35
lines changed

src/IKVM.Benchmarks.Java/IKVM.Benchmarks.Java.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,6 @@
1616

1717
<Import Project="$(MSBuildThisFileDirectory)..\IKVM.NET.Sdk\Sdk\Sdk.targets" />
1818
<Import Project="$(MSBuildThisFileDirectory)..\IKVM\buildTransitive\IKVM.targets" />
19+
<Import Project="$(MSBuildThisFileDirectory)..\IKVM.Image\buildTransitive\IKVM.Image.properties.targets" />
1920
<Import Project="$(MSBuildThisFileDirectory)..\IKVM.MSBuild\buildTransitive\IKVM.MSBuild.targets" />
2021
</Project>

src/IKVM.Benchmarks/IKVM.Benchmarks.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,6 @@
2525

2626
<Import Sdk="Microsoft.NET.Sdk" Project="Sdk.targets" />
2727
<Import Project="$(MSBuildThisFileDirectory)..\IKVM\buildTransitive\IKVM.targets" />
28+
<Import Project="$(MSBuildThisFileDirectory)..\IKVM.Image\buildTransitive\IKVM.Image.properties.targets" />
2829
<Import Project="$(MSBuildThisFileDirectory)..\IKVM.MSBuild\buildTransitive\IKVM.MSBuild.targets" />
2930
</Project>

src/IKVM.ConsoleApp/IKVM.ConsoleApp.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,6 @@
2020

2121
<Import Sdk="Microsoft.NET.Sdk" Project="Sdk.targets" />
2222
<Import Project="$(MSBuildThisFileDirectory)..\IKVM\buildTransitive\IKVM.targets" />
23+
<Import Project="$(MSBuildThisFileDirectory)..\IKVM.Image\buildTransitive\IKVM.Image.properties.targets" />
2324
<Import Project="$(MSBuildThisFileDirectory)..\IKVM.MSBuild\buildTransitive\IKVM.MSBuild.targets" />
2425
</Project>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
<Project>
2+
<PropertyGroup>
3+
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
4+
</PropertyGroup>
5+
6+
<PropertyGroup>
7+
<IkvmImageTargetPath Condition=" '$(IkvmImageTargetPath)' == '' ">ikvm</IkvmImageTargetPath>
8+
<IkvmPropertiesFileName Condition=" '$(IkvmPropertiesFileName)' == '' ">ikvm.properties</IkvmPropertiesFileName>
9+
<CopyIkvmImageItemToOutputDirectory Condition=" '$(CopyIkvmImageItemToOutputDirectory)' == '' ">PreserveNewest</CopyIkvmImageItemToOutputDirectory>
10+
<CopyIkvmImageItemToPublishDirectory Condition=" '$(CopyIkvmImageItemToPublishDirectory)' == '' "></CopyIkvmImageItemToPublishDirectory>
11+
<CopyIkvmPropertiesFileToOutputDirectory Condition=" '$(CopyIkvmPropertiesFileToOutputDirectory)' == '' ">PreserveNewest</CopyIkvmPropertiesFileToOutputDirectory>
12+
<CopyIkvmPropertiesFileToPublishDirectory Condition=" '$(CopyIkvmPropertiesFileToPublishDirectory)' == '' "></CopyIkvmPropertiesFileToPublishDirectory>
13+
</PropertyGroup>
14+
15+
<Target Name="WriteIkvmPropertiesFile">
16+
<ItemGroup>
17+
<_IkvmPropertiesFileLine Include="ikvm.home.root=$(IkvmImageTargetPath)" />
18+
</ItemGroup>
19+
<MakeDir Directories="$(IntermediateOutputPath)" Condition="!Exists('$(IntermediateOutputPath)')" />
20+
<WriteLinesToFile Lines="@(_IkvmPropertiesFileLine)" File="$(IntermediateOutputPath)$(IkvmPropertiesFileName)" Overwrite="true" WriteOnlyWhenDifferent="true" />
21+
</Target>
22+
23+
<Target Name="IncludeIkvmPropertiesFile" DependsOnTargets="WriteIkvmPropertiesFile" BeforeTargets="_GetPackageFiles;AssignLinkMetadata;AssignTargetPaths">
24+
<ItemGroup>
25+
<None Include="$(IntermediateOutputPath)$(IkvmPropertiesFileName)" Condition="Exists('$(IntermediateOutputPath)$(IkvmPropertiesFileName)')">
26+
<CopyToOutputDirectory>$(CopyIkvmPropertiesFileToOutputDirectory)</CopyToOutputDirectory>
27+
<CopyToPublishDirectory>$(CopyIkvmPropertiesFileToPublishDirectory)</CopyToPublishDirectory>
28+
<TargetPath>$(IkvmPropertiesFileName)</TargetPath>
29+
<Link>$(IkvmPropertiesFileName)</Link>
30+
</None>
31+
</ItemGroup>
32+
</Target>
33+
34+
<PropertyGroup>
35+
<AssignTargetPathsDependsOn>
36+
WriteIkvmPropertiesFile;
37+
IncludeIkvmPropertiesFile;
38+
$(AssignTargetPathsDependsOn);
39+
</AssignTargetPathsDependsOn>
40+
</PropertyGroup>
41+
42+
</Project>

src/IKVM.Image/buildTransitive/IKVM.Image.targets

+8-35
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,7 @@
88
<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" />
99
</ItemGroup>
1010

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" />
1912

2013
<Choose>
2114
<When Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net461'))">
@@ -146,6 +139,13 @@
146139
</Task>
147140
</UsingTask>
148141

142+
<PropertyGroup>
143+
<GetIkvmImageItemsOutputItemsDependsOn>
144+
$(GetIkvmImageItemsOutputItemsDependsOn);
145+
ExpandIkvmImageItems;
146+
</GetIkvmImageItemsOutputItemsDependsOn>
147+
</PropertyGroup>
148+
149149
<Target Name="GetIkvmImageItemsOutputItems" BeforeTargets="_GetPackageFiles;AssignLinkMetadata;AssignTargetPaths" DependsOnTargets="$(GetIkvmImageItemsOutputItemsDependsOn)">
150150
<_FilterIkvmImageItems Items="@(_IkvmImageItemExpanded)">
151151
<Output TaskParameter="Items" ItemName="_IkvmImageItemFiltered" />
@@ -158,31 +158,6 @@
158158
</ItemGroup>
159159
</Target>
160160

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-
186161
<PropertyGroup>
187162
<CollectIkvmImageItemsOutputItemsDependsOn>
188163
ExpandIkvmImageItems;
@@ -198,8 +173,6 @@
198173
<PropertyGroup>
199174
<AssignTargetPathsDependsOn>
200175
CollectIkvmImageItemsOutputItems;
201-
WriteIkvmPropertiesFile;
202-
IncludeIkvmPropertiesFile;
203176
$(AssignTargetPathsDependsOn);
204177
</AssignTargetPathsDependsOn>
205178
</PropertyGroup>

src/IKVM.JTReg.TestAdapter.Core/IKVM.JTReg.TestAdapter.Core.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -42,5 +42,6 @@
4242

4343
<Import Sdk="Microsoft.NET.Sdk" Project="Sdk.targets" />
4444
<Import Project="$(MSBuildThisFileDirectory)..\IKVM\buildTransitive\IKVM.targets" />
45+
<Import Project="$(MSBuildThisFileDirectory)..\IKVM.Image\buildTransitive\IKVM.Image.properties.targets" />
4546
<Import Project="$(MSBuildThisFileDirectory)..\IKVM.MSBuild\buildTransitive\IKVM.MSBuild.targets" />
4647
</Project>

src/IKVM.JTReg.TestAdapter.Tests/IKVM.JTReg.TestAdapter.Tests.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545

4646
<Import Sdk="Microsoft.NET.Sdk" Project="Sdk.targets" />
4747
<Import Project="$(MSBuildThisFileDirectory)..\IKVM\buildTransitive\IKVM.targets" />
48+
<Import Project="$(MSBuildThisFileDirectory)..\IKVM.Image\buildTransitive\IKVM.Image.properties.targets" />
4849
<Import Project="$(MSBuildThisFileDirectory)..\IKVM.MSBuild\buildTransitive\IKVM.MSBuild.targets" />
4950

5051
</Project>

src/IKVM.JTReg.TestAdapter/IKVM.JTReg.TestAdapter.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,6 @@
2424

2525
<Import Sdk="Microsoft.NET.Sdk" Project="Sdk.targets" />
2626
<Import Project="$(MSBuildThisFileDirectory)..\IKVM\buildTransitive\IKVM.targets" />
27+
<Import Project="$(MSBuildThisFileDirectory)..\IKVM.Image\buildTransitive\IKVM.Image.properties.targets" />
2728
<Import Project="$(MSBuildThisFileDirectory)..\IKVM.MSBuild\buildTransitive\IKVM.MSBuild.targets" />
2829
</Project>

src/IKVM.Java.Extensions/IKVM.Java.Extensions.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,6 @@
1212

1313
<Import Sdk="Microsoft.NET.Sdk" Project="Sdk.targets" />
1414
<Import Project="$(MSBuildThisFileDirectory)..\IKVM\buildTransitive\IKVM.targets" />
15+
<Import Project="$(MSBuildThisFileDirectory)..\IKVM.Image\buildTransitive\IKVM.Image.properties.targets" />
1516
<Import Project="$(MSBuildThisFileDirectory)..\IKVM.MSBuild\buildTransitive\IKVM.MSBuild.targets" />
1617
</Project>

src/IKVM.Java.Tests.Util/IKVM.Java.Tests.Util.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,6 @@
1818

1919
<Import Project="$(MSBuildThisFileDirectory)..\IKVM.NET.Sdk\Sdk\Sdk.targets" />
2020
<Import Project="$(MSBuildThisFileDirectory)..\IKVM\buildTransitive\IKVM.targets" />
21+
<Import Project="$(MSBuildThisFileDirectory)..\IKVM.Image\buildTransitive\IKVM.Image.properties.targets" />
2122
<Import Project="$(MSBuildThisFileDirectory)..\IKVM.MSBuild\buildTransitive\IKVM.MSBuild.targets" />
2223
</Project>

src/IKVM.Java.Tests/IKVM.Java.Tests.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,6 @@
2424

2525
<Import Project="$(MSBuildThisFileDirectory)..\IKVM.NET.Sdk\Sdk\Sdk.targets" />
2626
<Import Project="$(MSBuildThisFileDirectory)..\IKVM\buildTransitive\IKVM.targets" />
27+
<Import Project="$(MSBuildThisFileDirectory)..\IKVM.Image\buildTransitive\IKVM.Image.properties.targets" />
2728
<Import Project="$(MSBuildThisFileDirectory)..\IKVM.MSBuild\buildTransitive\IKVM.MSBuild.targets" />
2829
</Project>

src/IKVM.MSBuild.Tasks/IKVM.MSBuild.Tasks.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -52,5 +52,6 @@
5252

5353
<Import Sdk="Microsoft.NET.Sdk" Project="Sdk.targets" />
5454
<Import Project="$(MSBuildThisFileDirectory)..\IKVM\buildTransitive\IKVM.targets" />
55+
<Import Project="$(MSBuildThisFileDirectory)..\IKVM.Image\buildTransitive\IKVM.Image.properties.targets" />
5556
<Import Project="$(MSBuildThisFileDirectory)..\IKVM.MSBuild\buildTransitive\IKVM.MSBuild.targets" />
5657
</Project>

src/IKVM.Tests/IKVM.Tests.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -202,5 +202,6 @@
202202

203203
<Import Sdk="MSTest.Sdk" Project="Sdk.targets" />
204204
<Import Project="$(MSBuildThisFileDirectory)..\IKVM\buildTransitive\IKVM.targets" />
205+
<Import Project="$(MSBuildThisFileDirectory)..\IKVM.Image\buildTransitive\IKVM.Image.properties.targets" />
205206
<Import Project="$(MSBuildThisFileDirectory)..\IKVM.MSBuild\buildTransitive\IKVM.MSBuild.targets" />
206207
</Project>

src/jar/jar.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,6 @@
1717
<Import Project="$(MSBuildThisFileDirectory)..\..\IKVM.refs.targets" />
1818
<Import Project="$(MSBuildThisFileDirectory)..\IKVM.NET.Sdk\Sdk\Sdk.targets" />
1919
<Import Project="$(MSBuildThisFileDirectory)..\IKVM\buildTransitive\IKVM.targets" />
20+
<Import Project="$(MSBuildThisFileDirectory)..\IKVM.Image\buildTransitive\IKVM.Image.properties.targets" />
2021
<Import Project="$(MSBuildThisFileDirectory)..\IKVM.MSBuild\buildTransitive\IKVM.MSBuild.targets" />
2122
</Project>

src/jarsigner/jarsigner.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,6 @@
1717
<Import Project="$(MSBuildThisFileDirectory)..\..\IKVM.refs.targets" />
1818
<Import Project="$(MSBuildThisFileDirectory)..\IKVM.NET.Sdk\Sdk\Sdk.targets" />
1919
<Import Project="$(MSBuildThisFileDirectory)..\IKVM\buildTransitive\IKVM.targets" />
20+
<Import Project="$(MSBuildThisFileDirectory)..\IKVM.Image\buildTransitive\IKVM.Image.properties.targets" />
2021
<Import Project="$(MSBuildThisFileDirectory)..\IKVM.MSBuild\buildTransitive\IKVM.MSBuild.targets" />
2122
</Project>

src/java/java.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,6 @@
1717

1818
<Import Project="$(MSBuildThisFileDirectory)..\IKVM.NET.Sdk\Sdk\Sdk.targets" />
1919
<Import Project="$(MSBuildThisFileDirectory)..\IKVM\buildTransitive\IKVM.targets" />
20+
<Import Project="$(MSBuildThisFileDirectory)..\IKVM.Image\buildTransitive\IKVM.Image.properties.targets" />
2021
<Import Project="$(MSBuildThisFileDirectory)..\IKVM.MSBuild\buildTransitive\IKVM.MSBuild.targets" />
2122
</Project>

src/javac-ref/javac-ref.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323

2424
<Import Project="$(MSBuildThisFileDirectory)..\IKVM.NET.Sdk\Sdk\Sdk.targets" />
2525
<Import Project="$(MSBuildThisFileDirectory)..\IKVM\buildTransitive\IKVM.targets" />
26+
<Import Project="$(MSBuildThisFileDirectory)..\IKVM.Image\buildTransitive\IKVM.Image.properties.targets" />
2627
<Import Project="$(MSBuildThisFileDirectory)..\IKVM.MSBuild\buildTransitive\IKVM.MSBuild.targets" />
2728

2829
<!-- javac-ref uses the javac executable from JAVA_HOME: bootstrap -->

src/javac/javac.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,6 @@
1818

1919
<Import Project="$(MSBuildThisFileDirectory)..\IKVM.NET.Sdk\Sdk\Sdk.targets" />
2020
<Import Project="$(MSBuildThisFileDirectory)..\IKVM\buildTransitive\IKVM.targets" />
21+
<Import Project="$(MSBuildThisFileDirectory)..\IKVM.Image\buildTransitive\IKVM.Image.properties.targets" />
2122
<Import Project="$(MSBuildThisFileDirectory)..\IKVM.MSBuild\buildTransitive\IKVM.MSBuild.targets" />
2223
</Project>

src/javadoc/javadoc.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,6 @@
1818

1919
<Import Project="$(MSBuildThisFileDirectory)..\IKVM.NET.Sdk\Sdk\Sdk.targets" />
2020
<Import Project="$(MSBuildThisFileDirectory)..\IKVM\buildTransitive\IKVM.targets" />
21+
<Import Project="$(MSBuildThisFileDirectory)..\IKVM.Image\buildTransitive\IKVM.Image.properties.targets" />
2122
<Import Project="$(MSBuildThisFileDirectory)..\IKVM.MSBuild\buildTransitive\IKVM.MSBuild.targets" />
2223
</Project>

src/javah/javah.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,6 @@
1818

1919
<Import Project="$(MSBuildThisFileDirectory)..\IKVM.NET.Sdk\Sdk\Sdk.targets" />
2020
<Import Project="$(MSBuildThisFileDirectory)..\IKVM\buildTransitive\IKVM.targets" />
21+
<Import Project="$(MSBuildThisFileDirectory)..\IKVM.Image\buildTransitive\IKVM.Image.properties.targets" />
2122
<Import Project="$(MSBuildThisFileDirectory)..\IKVM.MSBuild\buildTransitive\IKVM.MSBuild.targets" />
2223
</Project>

src/javap/javap.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,6 @@
1818

1919
<Import Project="$(MSBuildThisFileDirectory)..\IKVM.NET.Sdk\Sdk\Sdk.targets" />
2020
<Import Project="$(MSBuildThisFileDirectory)..\IKVM\buildTransitive\IKVM.targets" />
21+
<Import Project="$(MSBuildThisFileDirectory)..\IKVM.Image\buildTransitive\IKVM.Image.properties.targets" />
2122
<Import Project="$(MSBuildThisFileDirectory)..\IKVM.MSBuild\buildTransitive\IKVM.MSBuild.targets" />
2223
</Project>

src/jdeps/jdeps.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,6 @@
1818

1919
<Import Project="$(MSBuildThisFileDirectory)..\IKVM.NET.Sdk\Sdk\Sdk.targets" />
2020
<Import Project="$(MSBuildThisFileDirectory)..\IKVM\buildTransitive\IKVM.targets" />
21+
<Import Project="$(MSBuildThisFileDirectory)..\IKVM.Image\buildTransitive\IKVM.Image.properties.targets" />
2122
<Import Project="$(MSBuildThisFileDirectory)..\IKVM.MSBuild\buildTransitive\IKVM.MSBuild.targets" />
2223
</Project>

src/keytool/keytool.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,6 @@
1818

1919
<Import Project="$(MSBuildThisFileDirectory)..\IKVM.NET.Sdk\Sdk\Sdk.targets" />
2020
<Import Project="$(MSBuildThisFileDirectory)..\IKVM\buildTransitive\IKVM.targets" />
21+
<Import Project="$(MSBuildThisFileDirectory)..\IKVM.Image\buildTransitive\IKVM.Image.properties.targets" />
2122
<Import Project="$(MSBuildThisFileDirectory)..\IKVM.MSBuild\buildTransitive\IKVM.MSBuild.targets" />
2223
</Project>

src/native2ascii/native2ascii.csproj

+2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,10 @@
1515

1616
<Import Project="$(MSBuildThisFileDirectory)..\..\IKVM.deps.targets" />
1717
<Import Project="$(MSBuildThisFileDirectory)..\..\IKVM.refs.targets" />
18+
1819
<Import Project="$(MSBuildThisFileDirectory)..\IKVM.NET.Sdk\Sdk\Sdk.targets" />
1920
<Import Project="$(MSBuildThisFileDirectory)..\IKVM\buildTransitive\IKVM.targets" />
21+
<Import Project="$(MSBuildThisFileDirectory)..\IKVM.Image\buildTransitive\IKVM.Image.properties.targets" />
2022
<Import Project="$(MSBuildThisFileDirectory)..\IKVM.MSBuild\buildTransitive\IKVM.MSBuild.targets" />
2123
</Project>
2224

src/orbd/orbd.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,6 @@
1818

1919
<Import Project="$(MSBuildThisFileDirectory)..\IKVM.NET.Sdk\Sdk\Sdk.targets" />
2020
<Import Project="$(MSBuildThisFileDirectory)..\IKVM\buildTransitive\IKVM.targets" />
21+
<Import Project="$(MSBuildThisFileDirectory)..\IKVM.Image\buildTransitive\IKVM.Image.properties.targets" />
2122
<Import Project="$(MSBuildThisFileDirectory)..\IKVM.MSBuild\buildTransitive\IKVM.MSBuild.targets" />
2223
</Project>

src/policytool/policytool.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
<Import Project="$(MSBuildThisFileDirectory)..\IKVM.NET.Sdk\Sdk\Sdk.targets" />
2020
<Import Project="$(MSBuildThisFileDirectory)..\IKVM\buildTransitive\IKVM.targets" />
21+
<Import Project="$(MSBuildThisFileDirectory)..\IKVM.Image\buildTransitive\IKVM.Image.properties.targets" />
2122
<Import Project="$(MSBuildThisFileDirectory)..\IKVM.MSBuild\buildTransitive\IKVM.MSBuild.targets" />
2223
</Project>
2324

src/rmic/rmic.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
<Import Project="$(MSBuildThisFileDirectory)..\IKVM.NET.Sdk\Sdk\Sdk.targets" />
2020
<Import Project="$(MSBuildThisFileDirectory)..\IKVM\buildTransitive\IKVM.targets" />
21+
<Import Project="$(MSBuildThisFileDirectory)..\IKVM.Image\buildTransitive\IKVM.Image.properties.targets" />
2122
<Import Project="$(MSBuildThisFileDirectory)..\IKVM.MSBuild\buildTransitive\IKVM.MSBuild.targets" />
2223
</Project>
2324

src/schemagen/schemagen.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
<Import Project="$(MSBuildThisFileDirectory)..\IKVM.NET.Sdk\Sdk\Sdk.targets" />
2020
<Import Project="$(MSBuildThisFileDirectory)..\IKVM\buildTransitive\IKVM.targets" />
21+
<Import Project="$(MSBuildThisFileDirectory)..\IKVM.Image\buildTransitive\IKVM.Image.properties.targets" />
2122
<Import Project="$(MSBuildThisFileDirectory)..\IKVM.MSBuild\buildTransitive\IKVM.MSBuild.targets" />
2223
</Project>
2324

src/wsgen/wsgen.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
<Import Project="$(MSBuildThisFileDirectory)..\IKVM.NET.Sdk\Sdk\Sdk.targets" />
2020
<Import Project="$(MSBuildThisFileDirectory)..\IKVM\buildTransitive\IKVM.targets" />
21+
<Import Project="$(MSBuildThisFileDirectory)..\IKVM.Image\buildTransitive\IKVM.Image.properties.targets" />
2122
<Import Project="$(MSBuildThisFileDirectory)..\IKVM.MSBuild\buildTransitive\IKVM.MSBuild.targets" />
2223
</Project>
2324

src/wsimport/wsimport.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
<Import Project="$(MSBuildThisFileDirectory)..\IKVM.NET.Sdk\Sdk\Sdk.targets" />
2020
<Import Project="$(MSBuildThisFileDirectory)..\IKVM\buildTransitive\IKVM.targets" />
21+
<Import Project="$(MSBuildThisFileDirectory)..\IKVM.Image\buildTransitive\IKVM.Image.properties.targets" />
2122
<Import Project="$(MSBuildThisFileDirectory)..\IKVM.MSBuild\buildTransitive\IKVM.MSBuild.targets" />
2223
</Project>
2324

src/xjc/xjc.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,6 @@
1818

1919
<Import Project="$(MSBuildThisFileDirectory)..\IKVM.NET.Sdk\Sdk\Sdk.targets" />
2020
<Import Project="$(MSBuildThisFileDirectory)..\IKVM\buildTransitive\IKVM.targets" />
21+
<Import Project="$(MSBuildThisFileDirectory)..\IKVM.Image\buildTransitive\IKVM.Image.properties.targets" />
2122
<Import Project="$(MSBuildThisFileDirectory)..\IKVM.MSBuild\buildTransitive\IKVM.MSBuild.targets" />
2223
</Project>

0 commit comments

Comments
 (0)