Copy JCW .jar to OutputPath

Context: 37f68a3

Commit 37f68a3 contained a comment+TODO:

	# Something is missing in the targets that `Hello-Java.Base.jar` isn't copied; copy it.
	# TODO: fix this.
	cp samples/Hello-Java.Base/bin/Release/Hello-Java.Base.jar samples/Hello-Java.Base/bin/Release/osx-x64/publish

Fix that.  The extra `cp` is no longer needed.

Fixing this required three things:

 1. Adding the JCW `.jar` to `@(Content)` (or `@(None)`, or…)
 2. Setting `%(Content.CopyToOutputDirectory)`=PreserveNewest
 3. Setting `%(Content.TargetPath)`

`%(TargetPath)` is used to control the filename within the final
`$(OutputPath)` directory tree; *without* `%(TargetPath)`, then
`%(Identity)` is used, and since `%(Identity)` is now within
`$(IntermediateOutputPath)`, that's *wrong*.

Rename `$(JavaOutputJar)` to `$(JavaOutputJarName)`, as the
new implied semantic is that it *cannot* contain a directory; it's
*just* the filename.

Update the `_JavaCreateJcws` so that instead of being a post-Build
target it's instead a post-CoreCompile target.  This is required
because post-Build is too late; MSBuild tries to copy the `@(Content)`
entries to `$(OutputPath)` *before the end* of `Build`, and as a
post-Build step it didn't have a chance to *create* the jar yet!
A post-CoreCompile target works nicer in this context.

Because we're now post-CoreCompile, `$(TargetPath)` doesn't exist.
(That's created during the build, by copying the intermediate
assembly to the outptu path.)  Update `_JavaCreateJcws` to use
`@(IntermediateAssembly)` instead of `$(TargetPath)`.

Update unit tests accordingly.

Author: jonpryor

build-tools/Java.Interop.Sdk/Sdk/Sdk.targets

@@ -10,7 +10,7 @@
   </ItemDefinitionGroup>
 
   <PropertyGroup>
-    <JavaOutputJar Condition=" '$(JavaOutputJar)' == '' ">$(OutputPath)$(AssemblyName).jar</JavaOutputJar>
+    <JavaOutputJarName Condition=" '$(JavaOutputJarName)' == '' ">$(AssemblyName).jar</JavaOutputJarName>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -32,7 +32,7 @@
   </Target>
 
   <Target Name="JavaCreateOutputJar"
-      AfterTargets="Build"
+      AfterTargets="CoreCompile"
       DependsOnTargets="$(JavaCreateOutputJarDependsOn)">
   </Target>
 
@@ -43,8 +43,16 @@
     <_JavaManagedBindingDir>$(_JavaIntermediateDir)mcw\</_JavaManagedBindingDir>
     <_JavaJcwClassesDir>$(_JavaIntermediateDir)classes\</_JavaJcwClassesDir>
     <_JavaJcwSourcesDir>$(_JavaIntermediateDir)java\</_JavaJcwSourcesDir>
+    <_JavaOutputJarPath>$(_JavaIntermediateDir)$(JavaOutputJarName)</_JavaOutputJarPath>
   </PropertyGroup>
 
+  <ItemGroup>
+    <Content Include="$(_JavaOutputJarPath)"
+        CopyToOutputDirectory="PreserveNewest"
+        TargetPath="$(JavaOutputJarName)"
+    />
+  </ItemGroup>
+
   <Target Name="_CollectJavaCompileForManagedBindingInputs">
     <ItemGroup>
       <_JavaCompileForBindingInputs
@@ -169,8 +177,8 @@
   <Target Name="_CleanupManagedBinding" />
 
   <Target Name="_JavaCreateJcws"
-      Condition=" '$(TargetPath)' != '' And Exists($(TargetPath))"
-      Inputs="$(TargetPath)"
+      Condition=" '@(IntermediateAssembly)' != '' And Exists(@(IntermediateAssembly))"
+      Inputs="@(IntermediateAssembly)"
       Outputs="$(_JavaJcwSourcesDir).stamp">
     <RemoveDir Directories="$(_JavaJcwSourcesDir)" />
     <MakeDir Directories="$(_JavaJcwSourcesDir)" />
@@ -184,7 +192,7 @@
       <_Output>-o "$(_JavaJcwSourcesDir)."</_Output>
       <_Libpath>@(_RefAsmDirs->'-L "%(Identity)"', ' ')</_Libpath>
     </PropertyGroup>
-    <Exec Command="$(DotnetToolPath) $(_JcwGen) -v &quot;$(TargetPath)&quot; $(_Target) $(_Output) $(_Libpath)" />
+    <Exec Command="$(DotnetToolPath) $(_JcwGen) -v @(IntermediateAssembly->'&quot;%(Identity)&quot;', ' ') $(_Target) $(_Output) $(_Libpath)" />
     <Touch Files="$(_JavaJcwSourcesDir).stamp" AlwaysCreate="True" />
   </Target>
 
@@ -197,7 +205,7 @@
   <Target Name="_JavaCreateOutputJar"
       DependsOnTargets="_JavaCollectGeneratdJcwSource;_JavaCollectJavacRefs"
       Inputs="@(_JavaGeneratedJcwSource)"
-      Outputs="$(JavaOutputJar)">
+      Outputs="$(_JavaOutputJarPath)">
     <RemoveDir Directories="$(_JavaJcwClassesDir)" />
     <MakeDir Directories="$(_JavaJcwClassesDir)" />
     <PropertyGroup>
@@ -215,7 +223,11 @@
     />
     <Exec Command="&quot;$(JavaCPath)&quot; $(_JavacSourceOptions) -d &quot;$(_JavaJcwClassesDir).&quot; -classpath &quot;$(_Classpath)&quot; &quot;@$(_JavaIntermediateDir)_java_sources.txt&quot;" />
     <Delete Files="$(_JavaIntermediateDir)_java_sources.txt" />
-    <Exec Command="&quot;$(JarPath)&quot; cf &quot;$(JavaOutputJar)&quot; -C &quot;$(_JavaJcwClassesDir).&quot; ." />
+    <Exec Command="&quot;$(JarPath)&quot; cf &quot;$(_JavaOutputJarPath)&quot; -C &quot;$(_JavaJcwClassesDir).&quot; ." />
+
+    <ItemGroup>
+      <FileWrites Include="$(_JavaOutputJarPath)" />
+    </ItemGroup>
   </Target>
 
 </Project>

tests/Java.Base-Tests/Java.Base-Tests.csproj

@@ -13,7 +13,7 @@
 
   <PropertyGroup>
     <OutputPath>$(TestOutputFullPath)</OutputPath>
-    <JavaOutputJar>$(OutputPath)java.base-tests.jar</JavaOutputJar>
+    <JavaOutputJarName>java.base-tests.jar</JavaOutputJarName>
   </PropertyGroup>
 
   <ItemGroup>