|
1 | 1 | <?xml version="1.0" encoding="utf-8"?>
|
2 | 2 | <Project Sdk="Microsoft.NET.Sdk">
|
3 | 3 | <PropertyGroup>
|
4 |
| - <TargetFramework>netstandard2.0</TargetFramework> |
| 4 | + <TargetFrameworks>netstandard2.0;netcoreapp3.1</TargetFrameworks> |
5 | 5 | <NoWarn>1591</NoWarn>
|
6 | 6 | <SignAssembly>true</SignAssembly>
|
7 | 7 | <AssemblyOriginatorKeyFile>..\..\product.snk</AssemblyOriginatorKeyFile>
|
8 | 8 | <DefineConstants>INTEROP;FEATURE_JNIENVIRONMENT_JI_PINVOKES;FEATURE_JNIOBJECTREFERENCE_INTPTRS;INTERNAL_NULLABLE_ATTRIBUTES</DefineConstants>
|
9 | 9 | <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
|
10 | 10 | <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
|
11 | 11 | <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
|
12 |
| - </PropertyGroup> |
13 |
| - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> |
14 |
| - <OutputPath>..\..\bin\Debug</OutputPath> |
15 |
| - <DocumentationFile>..\..\bin\Debug\Java.Interop.xml</DocumentationFile> |
16 |
| - <JNIEnvGenPath>..\..\bin\BuildDebug</JNIEnvGenPath> |
17 |
| - <DefineConstants>$(DefineConstants);DEBUG;NETSTANDARD;NETSTANDARD2_0</DefineConstants> |
| 12 | + <IntermediateOutputPath>$(BaseIntermediateOutputPath)$(Configuration)\$(TargetFramework.ToLowerInvariant())\</IntermediateOutputPath> |
| 13 | + <OutputPath>$(ToolOutputFullPath)</OutputPath> |
| 14 | + <DocumentationFile>$(ToolOutputFullPath)Java.Interop.xml</DocumentationFile> |
| 15 | + <JNIEnvGenPath>$(BuildToolOutputFullPath)</JNIEnvGenPath> |
18 | 16 | <LangVersion>8.0</LangVersion>
|
19 | 17 | <Nullable>enable</Nullable>
|
20 | 18 | </PropertyGroup>
|
21 |
| - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> |
22 |
| - <OutputPath>..\..\bin\Release</OutputPath> |
23 |
| - <DocumentationFile>..\..\bin\Release\Java.Interop.xml</DocumentationFile> |
24 |
| - <JNIEnvGenPath>..\..\bin\BuildRelease</JNIEnvGenPath> |
25 |
| - <LangVersion>8.0</LangVersion> |
26 |
| - <Nullable>enable</Nullable> |
| 19 | + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> |
| 20 | + <DefineConstants>DEBUG;$(DefineConstants)</DefineConstants> |
27 | 21 | </PropertyGroup>
|
28 | 22 | <ItemGroup>
|
29 | 23 | <Compile Remove="Java.Interop\JniLocationException.cs" />
|
30 | 24 | </ItemGroup>
|
31 |
| - <Import Project="Java.Interop.targets" /> |
32 | 25 | <PropertyGroup>
|
33 | 26 | <BuildDependsOn>
|
34 | 27 | BuildJniEnvironment_g_cs;
|
|
60 | 53 | <PrivateAssets>all</PrivateAssets>
|
61 | 54 | <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
62 | 55 | </PackageReference>
|
63 |
| - <ProjectReference Include="..\..\build-tools\jnienv-gen\jnienv-gen.csproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" /> |
| 56 | + <ProjectReference Include="..\..\build-tools\jnienv-gen\jnienv-gen.csproj" |
| 57 | + ReferenceOutputAssembly="false" |
| 58 | + /> |
64 | 59 | </ItemGroup>
|
65 | 60 | <ItemGroup>
|
66 | 61 | <Compile Condition=" '$(EnableDefaultCompileItems)' == 'true' " Update="Java.Interop\JavaPrimitiveArrays.cs">
|
|
0 commit comments