diff --git a/build-tools/scripts/JavaCallableWrappers.targets b/build-tools/scripts/JavaCallableWrappers.targets index 3e8a86ba242..df18fa9cc69 100644 --- a/build-tools/scripts/JavaCallableWrappers.targets +++ b/build-tools/scripts/JavaCallableWrappers.targets @@ -5,11 +5,17 @@ Inputs="$(JavaCallableWrapperAbsAssembly);@(JavaCallableWrapperSource)" Outputs="$(OutputPath)mono.android.jar"> + + <_CorlibPath Include="@(ReferencePath->'%(RootDir)%(Directory)')" Condition=" '%(FileName)%(Extension)' == 'mscorlib.dll' " /> + + <_CorlibDir>@(_CorlibPath) $(OutputPath) $(MSBuildProjectDirectory)\$(OutputPath) "$(XAInstallPrefix)xbuild\Xamarin\Android\jcw-gen.exe" -v10 - <_LibDirs>-L "$(OutputPathAbs.TrimEnd('\'))" -L "$(OutputPathAbs)..\v1.0" -L "$(OutputPathAbs)..\v1.0\Facades" + <_LibDirs>-L "$(OutputPathAbs.TrimEnd('\'))" + <_LibDirs Condition=" '$(TargetFramework)' != 'netcoreapp3.1' ">$(_LibDirs) -L "$(OutputPathAbs)..\v1.0" -L "$(OutputPathAbs)..\v1.0\Facades" + <_LibDirs Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">$(_LibDirs) -L "$(_CorlibDir.TrimEnd('\'))" <_Out>-o "$(MSBuildProjectDirectory)\$(IntermediateOutputPath)jcw\src" v; +#if MONOANDROID1_0 Mono.SystemDependencyProvider.Initialize (); +#endif BoundExceptionType = (BoundExceptionType)args->ioExceptionType; androidRuntime = new AndroidRuntime (args->env, args->javaVm, androidSdkVersion > 10, args->grefLoader, args->Loader_loadClass, args->jniAddNativeMethodRegistrationAttributePresent != 0); diff --git a/src/Mono.Android/Mono.Android.csproj b/src/Mono.Android/Mono.Android.csproj index afcf103b90a..c4bd490a51a 100644 --- a/src/Mono.Android/Mono.Android.csproj +++ b/src/Mono.Android/Mono.Android.csproj @@ -1,10 +1,11 @@ - + + - monoandroid10 + monoandroid10;netcoreapp3.1 Android true ..\..\product.snk @@ -30,6 +31,11 @@ false + + $(XAInstallPrefix)xbuild-frameworks\Xamarin.Android.App\$(TargetFramework)\ + false + + $(OutputPath)..\v1.0\mscorlib.dll @@ -73,6 +79,10 @@ + + + + JavaNativeTypeManager.cs @@ -325,9 +335,16 @@ - - + + + + + + + + + diff --git a/src/Mono.Android/Mono.Android.targets b/src/Mono.Android/Mono.Android.targets index 8602a2bc58b..ebf3780fd6f 100644 --- a/src/Mono.Android/Mono.Android.targets +++ b/src/Mono.Android/Mono.Android.targets @@ -10,6 +10,7 @@ @@ -134,6 +135,7 @@ @@ -185,7 +187,7 @@