From e835de9cea9278713e00ac2110d42ca331effd5a Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Mon, 28 Feb 2022 11:16:01 -0600 Subject: [PATCH 1/3] [installer] add missing .pdb files to Xamarin.Android Partially fixes: https://devdiv.visualstudio.com/DevDiv/_workitems/edit/1467817 A warning is printed when building with `-p:MonoSymbolArchive=true`: Warning: Directory obj\Release\120\android\assets contains Java.Interop.dll but no debug symbols file was found. It turns out we are missing `Java.Interop.pdb` from our installer? I went ahead and also added `Mono.Posix.pdb` and `System.EnterpriseServices.pdb`, since we appear to have these in build output. --- build-tools/installers/create-installers.targets | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-tools/installers/create-installers.targets b/build-tools/installers/create-installers.targets index 14c22bfabe8..436c3480929 100644 --- a/build-tools/installers/create-installers.targets +++ b/build-tools/installers/create-installers.targets @@ -134,10 +134,13 @@ <_FrameworkFiles Include="@(MonoProfileAssembly->'$(FrameworkSrcDir)\$(BclFrameworkVersion)\%(Identity)')" /> <_FrameworkFiles Include="@(MonoProfileAssemblySymbol->'$(FrameworkSrcDir)\$(BclFrameworkVersion)\%(Identity)')" /> <_FrameworkFiles Include="$(FrameworkSrcDir)\$(BclFrameworkVersion)\Java.Interop.dll" /> + <_FrameworkFiles Include="$(FrameworkSrcDir)\$(BclFrameworkVersion)\Java.Interop.pdb" /> <_FrameworkFiles Include="$(FrameworkSrcDir)\$(BclFrameworkVersion)\Mono.Data.Sqlite.dll.config" /> <_FrameworkFiles Include="$(FrameworkSrcDir)\$(BclFrameworkVersion)\Mono.Posix.dll" /> + <_FrameworkFiles Include="$(FrameworkSrcDir)\$(BclFrameworkVersion)\Mono.Posix.pdb" /> <_FrameworkFiles Include="$(FrameworkSrcDir)\$(BclFrameworkVersion)\RedistList\FrameworkList.xml" /> <_FrameworkFiles Include="$(FrameworkSrcDir)\$(BclFrameworkVersion)\System.EnterpriseServices.dll" /> + <_FrameworkFiles Include="$(FrameworkSrcDir)\$(BclFrameworkVersion)\System.EnterpriseServices.pdb" /> <_FrameworkFiles Include="$(FrameworkSrcDir)\$(BclFrameworkVersion)\Xamarin.Android.NUnitLite.dll" /> <_FrameworkFiles Include="$(FrameworkSrcDir)\$(BclFrameworkVersion)\Xamarin.Android.NUnitLite.pdb" /> <_FrameworkFilesWin Include="$(FrameworkSrcDir)\$(FirstInstallerFrameworkVersion)\OpenTK-1.0.xml" /> From 4d0d31c8c27c42e1ed90d4f454f03d1648abb44f Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Tue, 1 Mar 2022 10:00:53 -0600 Subject: [PATCH 2/3] Bump to xamarin/java.interop/main@aae23c97 Changes: https://github.com/xamarin/java.interop/compare/cbd96668...aae23c97 * [ci] Move CI builds to 1ES's hardened images. * [Java.Interop] use $(DebugType)=portable --- external/Java.Interop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/Java.Interop b/external/Java.Interop index cbd966686e2..aae23c97137 160000 --- a/external/Java.Interop +++ b/external/Java.Interop @@ -1 +1 @@ -Subproject commit cbd966686e2a3179cf3e6285990302c6b7afab21 +Subproject commit aae23c971370cc462e3cab12226f8ccf29ba9c6b From ee1988bb4a5d7ade77805826a6babe65a7b07c10 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Tue, 1 Mar 2022 10:59:10 -0600 Subject: [PATCH 3/3] Copy Java.Interop.pdb files to build output --- src/Mono.Android/Mono.Android.targets | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Mono.Android/Mono.Android.targets b/src/Mono.Android/Mono.Android.targets index 115043cdeca..bb08c286c3d 100644 --- a/src/Mono.Android/Mono.Android.targets +++ b/src/Mono.Android/Mono.Android.targets @@ -34,7 +34,8 @@ Properties="$(_GlobalProperties)" /> - + +