Merge remote-tracking branch 'origin/master' into mono-2019-08

Author: Steve Pfister

Makefile

@@ -46,7 +46,13 @@ BUILD_PROPS = bin/Build$(CONFIGURATION)/JdkInfo.props bin/Build$(CONFIGURATION)/
 
 all: $(DEPENDENCIES) $(TESTS)
 
-run-all-tests: run-tests run-test-jnimarshal run-test-generator-core run-ptests
+run-all-tests:
+	r=0; \
+	$(MAKE) run-tests                 || r=1 ; \
+	$(MAKE) run-test-jnimarshal       || r=1 ; \
+	$(MAKE) run-test-generator-core   || r=1 ; \
+	$(MAKE) run-ptests                || r=1 ; \
+	exit $$r;
 
 include build-tools/scripts/msbuild.mk
 
@@ -145,14 +151,18 @@ shell:
 
 # $(call RUN_TEST,filename,log-lref?)
 define RUN_TEST
-	$(MSBUILD) $(MSBUILD_FLAGS) build-tools/scripts/RunNUnitTests.targets /p:TestAssembly=$(1) ;
+	$(MSBUILD) $(MSBUILD_FLAGS) build-tools/scripts/RunNUnitTests.targets /p:TestAssembly=$(1) || r=1;
 endef
 
 run-tests: $(TESTS) bin/Test$(CONFIGURATION)/$(JAVA_INTEROP_LIB)
-	$(foreach t,$(TESTS), $(call RUN_TEST,$(t),1))
+	r=0; \
+	$(foreach t,$(TESTS), $(call RUN_TEST,$(t),1)) \
+	exit $$r;
 
 run-ptests: $(PTESTS) bin/Test$(CONFIGURATION)/$(JAVA_INTEROP_LIB)
-	$(foreach t,$(PTESTS), $(call RUN_TEST,$(t)))
+	r=0; \
+	$(foreach t,$(PTESTS), $(call RUN_TEST,$(t))) \
+	exit $$r;
 
 bin/Test$(CONFIGURATION)/$(JAVA_INTEROP_LIB): bin/$(CONFIGURATION)/$(JAVA_INTEROP_LIB)
 	cp $< $@

build-tools/jnienv-gen/jnienv-gen.csproj

@@ -11,7 +11,7 @@
     <AssemblyName>jnienv-gen</AssemblyName>
     <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' Or '$(Configuration)|$(Platform)' == 'Gendarme|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>

build-tools/xamarin-android-docimporter-ng/generate.sh

@@ -3,7 +3,7 @@
 ANDROID_TOOLCHAIN=~/android-toolchain
 
 DROID_DOC_API_LEVELS="10 15 16 17 18 19 20 21 22 23"
-JAVA_STUB_API_LEVELS="24 25 26 27 28 Q"
+JAVA_STUB_API_LEVELS="24 25 26 27 28 29"
 
 
 for n in $JAVA_STUB_API_LEVELS
@@ -15,4 +15,3 @@ for API_LEVEL in $DROID_DOC_API_LEVELS
 do
 	time mono --debug xamarin-android-docimporter-ng/bin/Debug/xamarin-android-docimporter-ng.exe -droiddoc=$ANDROID_TOOLCHAIN/docs/docs-api-$API_LEVEL/ -output-text=api-$API_LEVEL.params.txt -output-xml=api-$API_LEVEL.params.xml -verbose -framework-only
 done
-

external/cecil

@@ -110,7 +110,7 @@ static bool IsParameterCompatibleWith (TypeReference a, TypeReference b)
 					return true;
 				var gpa = (GenericParameter) a;
 				foreach (var c in gpa.Constraints) {
-					if (!c.ConstraintType.IsAssignableFrom (b))
+					if (!c.IsAssignableFrom (b))
 						return false;
 				}
 				return true;

src/Java.Interop.Tools.Cecil/Java.Interop.Tools.Cecil/MethodDefinitionRocks.cs

@@ -76,7 +76,6 @@
   <Import Project="Java.Interop.targets" />
   <PropertyGroup>
     <BuildDependsOn>
-      BuildJnienvGen;
       BuildJniEnvironment_g_cs;
       BuildInteropJar;
       $(BuildDependsOn)

src/Java.Interop/Java.Interop-MonoAndroid.csproj

@@ -35,7 +35,6 @@
   <Import Project="Java.Interop.targets" />
   <PropertyGroup>
     <BuildDependsOn>
-      BuildJnienvGen;
       BuildJniEnvironment_g_cs;
       BuildInteropJar;
       $(BuildDependsOn)
@@ -61,5 +60,10 @@
     <None Include="Documentation\Java.Interop\IJavaPeerable.xml" />
     <None Include="Documentation\Java.Interop\JniManagedPeerStates.xml" />
     <None Include="Documentation\Java.Interop\JniEnvironment.References.xml" />
+    <ProjectReference Include="..\..\build-tools\jnienv-gen\jnienv-gen.csproj">
+      <Project>{6410DA0F-5E14-4FC0-9AEE-F4C542C96C7A}</Project>
+      <Name>jnienv-gen</Name>
+      <ReferenceOutputAssembly>False</ReferenceOutputAssembly>
+    </ProjectReference>
   </ItemGroup>
 </Project>

src/Java.Interop/Java.Interop.csproj

@@ -14,16 +14,8 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
-  <Target Name="BuildJnienvGen"
-      Inputs="..\..\build-tools\jnienv-gen\jnienv-gen.csproj"
-      Outputs="$(JNIEnvGenPath)\jnienv-gen.exe">
-    <MSBuild
-        Projects="..\..\build-tools\jnienv-gen\jnienv-gen.csproj"
-    />
-  </Target>
   <Target Name="BuildJniEnvironment_g_cs"
       BeforeTargets="BeforeCompile"
-      DependsOnTargets="BuildJnienvGen"
       Inputs="$(JNIEnvGenPath)\jnienv-gen.exe"
       Outputs="Java.Interop\JniEnvironment.g.cs;$(IntermediateOutputPath)\jni.c">
     <MakeDir Directories="$(IntermediateOutputPath)" />

src/Java.Interop/Java.Interop.targets

@@ -601,7 +601,7 @@ protected override string GetExpectedReturnValueFromManagedExpression (string jv
 		}}
 		else
 		{{
-			return {value}_ref = {value}.PeerReference;
+			return {value}_ref = (IJavaPeerable){value}.PeerReference;
 		}}
 		{value}_rtn = References.NewReturnToJniRef({value}_ref);
 		return {pret.Name};

src/Java.Interop/Tests/Java.Interop/JniValueMarshalerContractTests.cs

@@ -84,11 +84,15 @@ public static void Load (this JavaPackage package, XmlReader reader, bool isRefe
 		static readonly string [] expected_type_attributes = new String [] {
 			"abstract",
 			"deprecated",
+			"enclosing-method-jni-type",
+			"enclosing-method-name",
+			"enclosing-method-signature",
 			"final",
+			"jni-signature",
 			"name",
+			"source-file-name",
 			"static",
 			"visibility",
-			"jni-signature",
 		};
 
 		internal static void LoadTypeAttributes (this JavaType type, XmlReader reader, params string [] otherAllowedAttributes)