From 2cba20ea1ec2962ab4050b106e3b6572b3c329a3 Mon Sep 17 00:00:00 2001 From: Jonathan Pryor Date: Mon, 19 Oct 2020 16:04:12 -0400 Subject: [PATCH] Bump to xamarin/Java.Interop/master@da74abd2 Fixes: https://devdiv.visualstudio.com/DevDiv/_workitems/edit/1230070 Changes: https://github.com/xamarin/Java.Interop/compare/b991bb869c022616f53e4c3a324a01d77e6e4a2b...da74abd24d95ce6c3511467e3cd481680d888230 * xamarin/Java.Interop@da74abd2: Bump to mono/LineEditor/v5.4.1@3fa0c2eb (#740) * xamarin/Java.Interop@5fe912ad: Bump to xamarin/xamarin-android-tools/main@26d65d9 (#741) * xamarin/Java.Interop@9c73dbff: [generator] Output correct formatting for binding warnings (#737) Update `create-installers.targets` so that `LineEditor.pdb` is included in the macOS `.pkg` and Windows `.vsix` installers. --- build-tools/installers/create-installers.targets | 1 + external/Java.Interop | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/build-tools/installers/create-installers.targets b/build-tools/installers/create-installers.targets index e06222f75dc..c0a79fa5eaa 100644 --- a/build-tools/installers/create-installers.targets +++ b/build-tools/installers/create-installers.targets @@ -209,6 +209,7 @@ <_MSBuildFiles Include="$(MSBuildSrcDir)\Mono.CompilerServices.SymbolWriter.pdb" /> <_MSBuildFiles Include="$(MSBuildSrcDir)\Mono.Options.dll" /> <_MSBuildFiles Include="$(MSBuildSrcDir)\LineEditor.dll" Condition=" '$(PackageId)' != 'Microsoft.Android.Sdk' " /> + <_MSBuildFiles Include="$(MSBuildSrcDir)\LineEditor.pdb" Condition=" '$(PackageId)' != 'Microsoft.Android.Sdk' " /> <_MSBuildFiles Include="$(MSBuildSrcDir)\monodoc.dll" /> <_MSBuildFiles Include="$(MSBuildSrcDir)\monodoc.pdb" /> <_MSBuildFiles Include="$(MSBuildSrcDir)\MULTIDEX_JAR_LICENSE" /> diff --git a/external/Java.Interop b/external/Java.Interop index b991bb869c0..da74abd24d9 160000 --- a/external/Java.Interop +++ b/external/Java.Interop @@ -1 +1 @@ -Subproject commit b991bb869c022616f53e4c3a324a01d77e6e4a2b +Subproject commit da74abd24d95ce6c3511467e3cd481680d888230