diff --git a/Documentation/release-notes/4823.md b/Documentation/release-notes/4823.md new file mode 100644 index 00000000000..41260123d5b --- /dev/null +++ b/Documentation/release-notes/4823.md @@ -0,0 +1,19 @@ +#### Application behavior on device and emulator + + * [GitHub 661](https://github.com/xamarin/java.interop/issues/661): + Fixes a `TypeLoadException` that could result when an app is built + with the API-R preview bindings, `$(TargetFrameworkVersion)`=v10.0.99, + when instantiating a type which implements an interface which contains + default interface members. + +#### Application and library build and deployment + + * [GitHub 515](https://github.com/xamarin/java.interop/issues/515): + Allow `.csv` files to declare C# enumeration members without requiring + a corresponding Java field. + +#### Android API binding + + * [GitHub 588](https://github.com/xamarin/java.interop/issues/588): + Don't invalidate an interface binding if it contains a static method + that couldn't be bound. diff --git a/build-tools/installers/create-installers.targets b/build-tools/installers/create-installers.targets index 7e86c65dfc5..4056e5e659a 100644 --- a/build-tools/installers/create-installers.targets +++ b/build-tools/installers/create-installers.targets @@ -192,7 +192,7 @@ <_MSBuildFiles Include="$(MSBuildSrcDir)\Mono.CompilerServices.SymbolWriter.dll" /> <_MSBuildFiles Include="$(MSBuildSrcDir)\Mono.CompilerServices.SymbolWriter.pdb" /> <_MSBuildFiles Include="$(MSBuildSrcDir)\Mono.Options.dll" /> - <_MSBuildFiles Include="$(MSBuildSrcDir)\Mono.Terminal.dll" Condition=" '$(PackageId)' != 'Microsoft.Android.Sdk' " /> + <_MSBuildFiles Include="$(MSBuildSrcDir)\LineEditor.dll" 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 b00e644e0d7..1de5501b2d4 160000 --- a/external/Java.Interop +++ b/external/Java.Interop @@ -1 +1 @@ -Subproject commit b00e644e0d701114a6a1325c0b2ffe7a431e3d48 +Subproject commit 1de5501b2d49df3d8d3b187df026d611996a67da