From cadebe8941011e196f9cbb30ae1de83796bebdcf Mon Sep 17 00:00:00 2001 From: Jonathan Pryor Date: Fri, 6 May 2022 03:43:53 -0400 Subject: [PATCH] [Java.Base-Tests] Use $(UtilityOutputFullPath)/jcw-gen.dll MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Context: https://github.com/xamarin/xamarin-android/pull/6984 While attempting to bump Java.Interop, the **nunit Java.Interop tests** job is failing on Windows, because it can't find `jcw-gen.dll`: C:\a\_work\2\s\external\Java.Interop\tests\Java.Base-Tests\Java.Base-Tests.targets(27,5): error MSB3073: The command "C:\a\_work\2\s\bin\Release\dotnet\dotnet "C:\a\_work\2\s\external\Java.Interop\bin\Release-net6.0\/jcw-gen.dll" …"" exited with code 1. The `jcw-gen.dll` invocation needs to use `$(UtilityOutputFullPath)`, not `$(ToolOutputFullPath)`, as the `jcw-gen.dll` output path is altered within xamarin/xamarin-android. `$(UtilityOutputFullPath)` allows customization by xamarin-android, not `$(ToolOutputFullPath)`. --- tests/Java.Base-Tests/Java.Base-Tests.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Java.Base-Tests/Java.Base-Tests.targets b/tests/Java.Base-Tests/Java.Base-Tests.targets index f05455f59..01d86c744 100644 --- a/tests/Java.Base-Tests/Java.Base-Tests.targets +++ b/tests/Java.Base-Tests/Java.Base-Tests.targets @@ -19,7 +19,7 @@ <_RefAsmDirs Include="@(ReferencePathWithRefAssemblies->'%(RootDir)%(Directory).'->Distinct())" /> - <_JcwGen>"$(ToolOutputFullPath)/jcw-gen.dll" + <_JcwGen>"$(UtilityOutputFullPath)/jcw-gen.dll" <_Target>--codegen-target JavaInterop1 <_Output>-o "$(IntermediateOutputPath)/java" <_Libpath>@(_RefAsmDirs->'-L "%(Identity)"', ' ')