File tree Expand file tree Collapse file tree 2 files changed +15
-1
lines changed
Java.Interop.GenericMarshaler Expand file tree Collapse file tree 2 files changed +15
-1
lines changed Original file line number Diff line number Diff line change 24
24
<ProjectReference Include =" ..\Java.Interop\Java.Interop.csproj" >
25
25
<Project >{94BD81F7-B06F-4295-9636-F8A3B6BDC762}</Project >
26
26
<Name >Java.Interop</Name >
27
+ <SkipGetTargetFrameworkProperties >true</SkipGetTargetFrameworkProperties >
28
+ <AdditionalProperties >TargetFramework=netstandard2.0</AdditionalProperties >
27
29
</ProjectReference >
28
30
</ItemGroup >
29
31
</Project >
Original file line number Diff line number Diff line change 4
4
<XAConfigPath >..\..\bin\Build$(Configuration)\XAConfig.props</XAConfigPath >
5
5
</PropertyGroup >
6
6
<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' " >
8
16
<TargetFrameworks >netstandard2.0;net6.0</TargetFrameworks >
17
+ </PropertyGroup >
18
+ <PropertyGroup >
9
19
<NoWarn >1591</NoWarn >
10
20
<SignAssembly >true</SignAssembly >
11
21
<AssemblyOriginatorKeyFile >..\..\product.snk</AssemblyOriginatorKeyFile >
57
67
<None Include =" Documentation\Java.Interop\JniEnvironment.References.xml" />
58
68
<ProjectReference Include =" ..\..\build-tools\jnienv-gen\jnienv-gen.csproj"
59
69
ReferenceOutputAssembly =" false"
70
+ SkipGetTargetFrameworkProperties =" true"
71
+ AdditionalProperties =" $(_JniEnvAdditionalProperties)"
60
72
/>
61
73
</ItemGroup >
62
74
<ItemGroup >
You can’t perform that action at this time.
0 commit comments