Skip to content

[build] Java.Interop should use <ProjectReference/> for jnienv-gen #477

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 18, 2019
Merged

[build] Java.Interop should use <ProjectReference/> for jnienv-gen #477

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7d09b4c
[build] Java.Interop should use <ProjectReference/> for jnienv-gen
jonathanpeppers Aug 16, 2019
5420018
Update jnienv-gen.csproj
jonathanpeppers Aug 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build-tools/jnienv-gen/jnienv-gen.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<AssemblyName>jnienv-gen</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' Or '$(Configuration)|$(Platform)' == 'Gendarme|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
Expand Down
6 changes: 5 additions & 1 deletion src/Java.Interop/Java.Interop.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
<Import Project="Java.Interop.targets" />
<PropertyGroup>
<BuildDependsOn>
BuildJnienvGen;
BuildJniEnvironment_g_cs;
BuildInteropJar;
$(BuildDependsOn)
Expand All @@ -61,5 +60,10 @@
<None Include="Documentation\Java.Interop\IJavaPeerable.xml" />
<None Include="Documentation\Java.Interop\JniManagedPeerStates.xml" />
<None Include="Documentation\Java.Interop\JniEnvironment.References.xml" />
<ProjectReference Include="..\..\build-tools\jnienv-gen\jnienv-gen.csproj">
<Project>{6410DA0F-5E14-4FC0-9AEE-F4C542C96C7A}</Project>
<Name>jnienv-gen</Name>
<ReferenceOutputAssembly>False</ReferenceOutputAssembly>
</ProjectReference>
</ItemGroup>
</Project>
8 changes: 0 additions & 8 deletions src/Java.Interop/Java.Interop.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,8 @@
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
</ItemGroup>
<Target Name="BuildJnienvGen"
Inputs="..\..\build-tools\jnienv-gen\jnienv-gen.csproj"
Outputs="$(JNIEnvGenPath)\jnienv-gen.exe">
<MSBuild
Projects="..\..\build-tools\jnienv-gen\jnienv-gen.csproj"
/>
</Target>
<Target Name="BuildJniEnvironment_g_cs"
BeforeTargets="BeforeCompile"
DependsOnTargets="BuildJnienvGen"
Inputs="$(JNIEnvGenPath)\jnienv-gen.exe"
Outputs="Java.Interop\JniEnvironment.g.cs;$(IntermediateOutputPath)\jni.c">
<MakeDir Directories="$(IntermediateOutputPath)" />
Expand Down