Skip to content

[Mono.Android] Add unsigned NewArray overloads. #4180

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jonpryor merged 3 commits into from
Jan 28, 2020
Merged

[Mono.Android] Add unsigned NewArray overloads. #4180

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b260c54
Bump Java.Interop: d16-5@fc18c54b.
jpobst Jan 27, 2020
c087a75
[Mono.Android] Add unsigned NewArray overloads.
jpobst Jan 13, 2020
113696b
Consolidate all projects on Irony 1.1.0.
jpobst Jan 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion external/Java.Interop
Open in desktop
Submodule Java.Interop updated from c0cc77 to fc18c5
8 changes: 8 additions & 0 deletions src/Mono.Android/Android.Runtime/JNIEnv.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1292,6 +1292,14 @@ public static IntPtr NewArray (string[] array)
return result;
}

// We do these translations here instead of in the binding to force a compile
// time error if using an older Java.Interop.dll instead of a runtime error
public static IntPtr NewArray (uint[] array) => NewArray ((int[])(object)array);

public static IntPtr NewArray (ushort[] array) => NewArray ((short[])(object)array);

public static IntPtr NewArray (ulong[] array) => NewArray ((long[])(object)array);

public static IntPtr NewObjectArray (int length, IntPtr elementClass)
{
return NewObjectArray (length, elementClass, IntPtr.Zero);
Expand Down
2 changes: 1 addition & 1 deletion src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Xml" />
<Reference Include="Irony">
<HintPath>..\..\packages\Irony.0.9.1\lib\net40\Irony.dll</HintPath>
<HintPath>..\..\packages\Irony.1.1.0\lib\net40\Irony.dll</HintPath>
</Reference>
<Reference Include="FSharp.Compiler.CodeDom">
<HintPath>..\..\packages\FSharp.Compiler.CodeDom.1.0.0.1\lib\net40\FSharp.Compiler.CodeDom.dll</HintPath>
Expand Down
2 changes: 1 addition & 1 deletion src/Xamarin.Android.Build.Tasks/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<package id="FSharp.Compiler.CodeDom" version="1.0.0.1" targetFramework="net45" />
<package id="FSharp.Core" version="3.1.2.5" targetFramework="net451" />
<package id="ILRepack.Lib.MSBuild.Task" version="2.0.15.4" targetFramework="net462" />
<package id="Irony" version="0.9.1" targetFramework="net45" />
<package id="Irony" version="1.1.0" targetFramework="net45" />
<package id="Microsoft.Build.Framework" version="14.3.0" targetFramework="net472" />
<package id="Microsoft.Build.Tasks.Core" version="14.3.0" targetFramework="net472" />
<package id="Microsoft.Build.Utilities.Core" version="14.3.0" targetFramework="net472" />
Expand Down
2 changes: 1 addition & 1 deletion src/Xamarin.Android.Tools.Aidl/Xamarin.Android.Tools.Aidl.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="Irony">
<HintPath>..\..\packages\Irony.0.9.1\lib\net40\Irony.dll</HintPath>
<HintPath>..\..\packages\Irony.1.1.0\lib\net40\Irony.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Xamarin.Android.Cecil">
Expand Down
2 changes: 1 addition & 1 deletion src/Xamarin.Android.Tools.Aidl/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Irony" version="0.9.1" targetFramework="net40" />
<package id="Irony" version="1.1.0" targetFramework="net40" />
</packages>