Skip to content

Commit a4faf0f

Browse files
Fix for Java.Interop-Tests.csproj
Set %(SkipGetTargetFrameworkProperties)
1 parent 7fe3543 commit a4faf0f

File tree

2 files changed

+15
-1
lines changed

2 files changed

+15
-1
lines changed

src/Java.Interop.GenericMarshaler/Java.Interop.GenericMarshaler.csproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424
<ProjectReference Include="..\Java.Interop\Java.Interop.csproj">
2525
<Project>{94BD81F7-B06F-4295-9636-F8A3B6BDC762}</Project>
2626
<Name>Java.Interop</Name>
27+
<SkipGetTargetFrameworkProperties>true</SkipGetTargetFrameworkProperties>
28+
<AdditionalProperties>TargetFramework=netstandard2.0</AdditionalProperties>
2729
</ProjectReference>
2830
</ItemGroup>
2931
</Project>

src/Java.Interop/Java.Interop.csproj

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,18 @@
44
<XAConfigPath>..\..\bin\Build$(Configuration)\XAConfig.props</XAConfigPath>
55
</PropertyGroup>
66
<Import Condition="Exists ('$(XAConfigPath)')" Project="$(XAConfigPath)" />
7-
<PropertyGroup>
7+
<!--
8+
NOTE: in xamarin-android, this project gets built by xabuild in Xamarin.Android-Tests.sln
9+
Exclude net6.0, because xabuild cannot build net5.0 or higher
10+
-->
11+
<PropertyGroup Condition=" '$(XABuild)' == 'true' ">
12+
<TargetFramework>netstandard2.0</TargetFramework>
13+
<_JniEnvAdditionalProperties>TargetFramework=net472</_JniEnvAdditionalProperties>
14+
</PropertyGroup>
15+
<PropertyGroup Condition=" '$(XABuild)' != 'true' ">
816
<TargetFrameworks>netstandard2.0;net6.0</TargetFrameworks>
17+
</PropertyGroup>
18+
<PropertyGroup>
919
<NoWarn>1591</NoWarn>
1020
<SignAssembly>true</SignAssembly>
1121
<AssemblyOriginatorKeyFile>..\..\product.snk</AssemblyOriginatorKeyFile>
@@ -57,6 +67,8 @@
5767
<None Include="Documentation\Java.Interop\JniEnvironment.References.xml" />
5868
<ProjectReference Include="..\..\build-tools\jnienv-gen\jnienv-gen.csproj"
5969
ReferenceOutputAssembly="false"
70+
SkipGetTargetFrameworkProperties="true"
71+
AdditionalProperties="$(_JniEnvAdditionalProperties)"
6072
/>
6173
</ItemGroup>
6274
<ItemGroup>

0 commit comments

Comments
 (0)