Cleanup.

dotnet · jonpryor · Feb 22, 2024 · Oct 24, 2023 · Oct 25, 2023 · Oct 25, 2023
commit 59314fc389c607efd8cb2358c24083e3a396f9d0
diff --git a/samples/Hello-NativeAOTFromJNI/App.cs b/samples/Hello-NativeAOTFromJNI/App.cs
@@ -6,7 +6,7 @@ namespace Hello_NativeAOTFromJNI;
 
 static class App {
 
-	// symbol name from `$(IntermediateOutputPath)obj/Release/osx-arm64/h-classes/net_dot_jni_hello_App.h`
+	// symbol name from `$(IntermediateOutputPath)obj/Release/osx-x64/h-classes/net_dot_jni_hello_App.h`
 	[UnmanagedCallersOnly (EntryPoint="Java_net_dot_jni_hello_App_sayHello")]
 	static IntPtr sayHello (IntPtr jnienv, IntPtr klass)
 	{
@@ -28,4 +28,4 @@ static IntPtr sayHello (IntPtr jnienv, IntPtr klass)
 		}
 		return nint.Zero;
 	}
-}
+}
diff --git a/samples/Hello-NativeAOTFromJNI/Hello-NativeAOTFromJNI.targets b/samples/Hello-NativeAOTFromJNI/Hello-NativeAOTFromJNI.targets
@@ -88,33 +88,11 @@
     <Copy SourceFiles="$(OutputPath)hello-from-java.jar" DestinationFolder="$(PublishDir)" />
   </Target>
 
-  <Target Name="_DumpDirContents"
-      AfterTargets="Publish">
-    <ItemGroup>
-      <_TD Include="$(MSBuildThisFileDirectory)**\*" />
-    </ItemGroup>
-    <Message Text="# jonp: $(MSBuildThisFileDirectory) Contents:" Importance="high" />
-    <Message Text="  @(_TD, '
-  ')" Importance="high" />
-  </Target>
-
   <Target Name="RunJavaSample">
-    <PropertyGroup>
-      <_HavePD Condition=" Exists('$(MSBuildThisFileDirectory)$(PublishDir)') ">true</_HavePD>
-    </PropertyGroup>
-    <Message Text="# jonp: PublishDir='$(PublishDir)'; exists? $(_HavePD)" Importance="high" />
     <ItemGroup>
       <_Classpath Include="hello-from-java.jar" />
       <_Classpath Include="java-interop.jar" />
-      <_TD Include="$(MSBuildThisFileDirectory)**\*" />
-      <_PD Include="$(MSBuildThisFileDirectory)$(PublishDir)**\*" />
     </ItemGroup>
-    <Message Text="# jonp: $(MSBuildThisFileDirectory)$(PublishDir) Contents:" />
-    <Message Text="  @(_PD, '
-  ')" Importance="high" />
-    <Message Text="# jonp: $(MSBuildThisFileDirectory) Contents:" />
-    <Message Text="  @(_TD, '
-  ')" Importance="high" />
     <PropertyGroup>
       <_CPSep Condition=" '$(OS)' == 'Windows_NT' ">;</_CPSep>
       <_CPSep Condition=" '$(_CPSep)' == '' ">:</_CPSep>