From 7d09b4c4fc49017ef8ec354ed09bef91fd65bcff Mon Sep 17 00:00:00 2001
From: Jonathan Peppers <jonathan.peppers@microsoft.com>
Date: Fri, 16 Aug 2019 15:47:50 -0500
Subject: [PATCH 1/2] [build] Java.Interop should use <ProjectReference/> for
 jnienv-gen

Java.Interop had a custom MSBuild target that builds
`jnienv-gen.csproj`:

    <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>

The problem with this, is if any `.cs` files change in
`jnienv-gen.csproj`, then this target will not run.

Instead we should be able to use `<ProjectReference/>` with
`%(ReferenceOutputAssembly)=False`, and everything should "just work".
---
 src/Java.Interop/Java.Interop.csproj  | 6 +++++-
 src/Java.Interop/Java.Interop.targets | 8 --------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/Java.Interop/Java.Interop.csproj b/src/Java.Interop/Java.Interop.csproj
index 138dcb234..749e31bf5 100644
--- a/src/Java.Interop/Java.Interop.csproj
+++ b/src/Java.Interop/Java.Interop.csproj
@@ -35,7 +35,6 @@
   <Import Project="Java.Interop.targets" />
   <PropertyGroup>
     <BuildDependsOn>
-      BuildJnienvGen;
       BuildJniEnvironment_g_cs;
       BuildInteropJar;
       $(BuildDependsOn)
@@ -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>
\ No newline at end of file
diff --git a/src/Java.Interop/Java.Interop.targets b/src/Java.Interop/Java.Interop.targets
index 4db58dab8..2c78acadc 100644
--- a/src/Java.Interop/Java.Interop.targets
+++ b/src/Java.Interop/Java.Interop.targets
@@ -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)" />

From 542001882dc89d8991d87ba39de45cf8951ba732 Mon Sep 17 00:00:00 2001
From: Jonathan Peppers <jonathan.peppers@microsoft.com>
Date: Fri, 16 Aug 2019 16:36:01 -0500
Subject: [PATCH 2/2] Update jnienv-gen.csproj

Added `Gendarme` `$(Configuration)`
---
 build-tools/jnienv-gen/jnienv-gen.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build-tools/jnienv-gen/jnienv-gen.csproj b/build-tools/jnienv-gen/jnienv-gen.csproj
index 6b07e9ed4..4e5c66973 100644
--- a/build-tools/jnienv-gen/jnienv-gen.csproj
+++ b/build-tools/jnienv-gen/jnienv-gen.csproj
@@ -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>