[tests] Add net6.0 TargetFramework. (#888)

jpobst · web-flow · commit 41ba34856ab1 · 2021-10-11T20:30:46.000-04:00
Today, even when building and testing on .NET 6, most of our test suites are still building and running with `net472`. Fix this by adding `net6.0` to `$(TargetFrameworks)` and updating CI to run the `net6.0` version instead of the `net472` version. Fixes were required to account for differences between `net472` and `net6.0` behavior, in particular: * The semantics for the [Round-trip format specifier `R`][0] changed between .NET Framework and .NET 6. Update `ConstantPoolFloatItem.ToString()` and `ConstantPoolDoubleItem.ToString()` to use the G9 and G17 format specifiers, respectively, so that behavior is consistent. * Types such as `System.String` moved from `mscorlib.dll` to `System.Private.CoreLib.dll`, which impacts the output of `JavaNativeTypeManager.GetPackageName()`, as the assembly name is taken into consideration. Assertions around `JavaNativeTypeManager.GetPackageName()` need to be based on the target framework. * When using `CSharpCompilation.Create()`, `System.Runtime.dll` must now be referenced when building on net6+, otherwise certain types won't be resolved: error CS0012: The type 'Enum' is defined in an assembly that is not referenced. You must add a reference to assembly 'System.Runtime, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a'. (SourceFile([871..891))) error CS0012: The type 'ValueType' is defined in an assembly that is not referenced. You must add a reference to assembly 'System.Runtime, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a'. (SourceFile([944..962))) error CS0012: The type 'IDisposable' is defined in an assembly that is not referenced. You must add a reference to assembly 'System.Runtime, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a'. (SourceFile([312..321))) * `MarshalMemberBuilderTest.cs` must be disabled when building for .NET 6+, as `AssemblyBuilderAccess.Save` doesn't exist, nor does `AppDomain.DefineDynamicAssembly()`, nor `LambdaExpression.CompileToMethod()`. Related: #616 error CS0117: 'AssemblyBuilderAccess' does not contain a definition for 'Save' error CS1061: 'AppDomain' does not contain a definition for 'DefineDynamicAssembly' and no accessible extension method 'DefineDynamicAssembly' accepting a first argument of type 'AppDomain' could be found (are you missing a using directive or an assembly reference?) error CS1061: 'LambdaExpression' does not contain a definition for 'CompileToMethod' and no accessible extension method 'CompileToMethod' accepting a first argument of type 'LambdaExpression' could be found (are you missing a using directive or an assembly reference?) [0]: https://docs.microsoft.com/en-us/dotnet/standard/base-types/standard-numeric-format-strings#round-trip-format-specifier-r
diff --git a/build-tools/automation/templates/core-tests.yaml b/build-tools/automation/templates/core-tests.yaml
@@ -7,56 +7,56 @@ steps:
   displayName: 'Tests: generator'
   inputs:
     command: test
-    arguments: bin/Test$(Build.Configuration)/generator-Tests.dll
+    arguments: bin/Test$(Build.Configuration)$(NetCoreTargetFrameworkPathSuffix)/generator-Tests.dll
   continueOnError: true
   
 - task: DotNetCoreCLI@2
   displayName: 'Tests: JavaCallableWrappers'
   inputs:
     command: test
-    arguments: bin/Test$(Build.Configuration)/Java.Interop.Tools.JavaCallableWrappers-Tests.dll
+    arguments: bin/Test$(Build.Configuration)$(NetCoreTargetFrameworkPathSuffix)/Java.Interop.Tools.JavaCallableWrappers-Tests.dll
   continueOnError: true
    
 - task: DotNetCoreCLI@2
   displayName: 'Tests: logcat-parse'
   inputs:
     command: test
-    arguments: bin/Test$(Build.Configuration)/logcat-parse-Tests.dll
+    arguments: bin/Test$(Build.Configuration)$(NetCoreTargetFrameworkPathSuffix)/logcat-parse-Tests.dll
   continueOnError: true
   
 - task: DotNetCoreCLI@2
   displayName: 'Tests: ApiXmlAdjuster'
   inputs:
     command: test
-    arguments: bin/Test$(Build.Configuration)/Xamarin.Android.Tools.ApiXmlAdjuster-Tests.dll
+    arguments: bin/Test$(Build.Configuration)$(NetCoreTargetFrameworkPathSuffix)/Xamarin.Android.Tools.ApiXmlAdjuster-Tests.dll
   continueOnError: true
   
 - task: DotNetCoreCLI@2
   displayName: 'Tests: Bytecode'
   inputs:
     command: test
-    arguments: bin/Test$(Build.Configuration)/Xamarin.Android.Tools.Bytecode-Tests.dll
+    arguments: bin/Test$(Build.Configuration)$(NetCoreTargetFrameworkPathSuffix)/Xamarin.Android.Tools.Bytecode-Tests.dll
   continueOnError: true
 
 - task: DotNetCoreCLI@2
   displayName: 'Tests: Java.Interop.Tools.Generator'
   inputs:
     command: test
-    arguments: bin/Test$(Build.Configuration)/Java.Interop.Tools.Generator-Tests.dll
+    arguments: bin/Test$(Build.Configuration)$(NetCoreTargetFrameworkPathSuffix)/Java.Interop.Tools.Generator-Tests.dll
   continueOnError: true
 
 - task: DotNetCoreCLI@2
   displayName: 'Tests: Java.Interop.Tools.JavaSource'
   inputs:
     command: test
-    arguments: bin/Test$(Build.Configuration)/Java.Interop.Tools.JavaSource-Tests.dll
+    arguments: bin/Test$(Build.Configuration)$(NetCoreTargetFrameworkPathSuffix)/Java.Interop.Tools.JavaSource-Tests.dll
   continueOnError: true
 
 - task: DotNetCoreCLI@2
   displayName: 'Tests: Xamarin.SourceWriter'
   inputs:
     command: test
-    arguments: bin/Test$(Build.Configuration)/Xamarin.SourceWriter-Tests.dll
+    arguments: bin/Test$(Build.Configuration)$(NetCoreTargetFrameworkPathSuffix)/Xamarin.SourceWriter-Tests.dll
   continueOnError: true
 
 - task: DotNetCoreCLI@2
@@ -80,15 +80,15 @@ steps:
   condition: eq('${{ parameters.runNativeTests }}', 'true')
   inputs:
     command: test
-    arguments: bin/Test$(Build.Configuration)/Java.Interop.Dynamic-Tests.dll
+    arguments: bin/Test$(Build.Configuration)$(NetCoreTargetFrameworkPathSuffix)/Java.Interop.Dynamic-Tests.dll
   continueOnError: true
 
 - task: DotNetCoreCLI@2
   displayName: 'Tests: Java.Interop.Export'
   condition: eq('${{ parameters.runNativeTests }}', 'true')
   inputs:
     command: test
-    arguments: bin/Test$(Build.Configuration)/Java.Interop.Export-Tests.dll
+    arguments: bin/Test$(Build.Configuration)$(NetCoreTargetFrameworkPathSuffix)/Java.Interop.Export-Tests.dll
   continueOnError: true
 
 - task: DotNetCoreCLI@2
diff --git a/src/Xamarin.Android.Tools.Bytecode/ConstantPool.cs b/src/Xamarin.Android.Tools.Bytecode/ConstantPool.cs
@@ -266,7 +266,7 @@ public float Value {
 
 		public override string ToString ()
 		{
-			return string.Format (CultureInfo.InvariantCulture, "Float({0})", Value);
+			return string.Format (CultureInfo.InvariantCulture, "Float({0:G9})", Value);
 		}
 	}
 
@@ -335,7 +335,7 @@ public double Value {
 
 		public override string ToString ()
 		{
-			return string.Format (CultureInfo.InvariantCulture, "Double({0})", Value);
+			return string.Format (CultureInfo.InvariantCulture, "Double({0:G17})", Value);
 		}
 	}
 
diff --git a/src/Xamarin.Android.Tools.Bytecode/XmlClassDeclarationBuilder.cs b/src/Xamarin.Android.Tools.Bytecode/XmlClassDeclarationBuilder.cs
@@ -529,7 +529,7 @@ static XAttribute GetValue (FieldInfo field)
 				else if (Double.IsPositiveInfinity (doubleItem.Value))
 					value = "(1.0 / 0.0)";
 				else
-					value = doubleItem.Value.ToString ("R", CultureInfo.InvariantCulture);
+					value = doubleItem.Value.ToString ("G17", CultureInfo.InvariantCulture);
 				break;
 			case ConstantPoolItemType.Float:
 				var floatItem = (ConstantPoolFloatItem) constant;
@@ -540,7 +540,7 @@ static XAttribute GetValue (FieldInfo field)
 				else if (Double.IsPositiveInfinity (floatItem.Value))
 					value = "(1.0f / 0.0f)";
 				else
-					value = floatItem.Value.ToString ("R", CultureInfo.InvariantCulture);
+					value = floatItem.Value.ToString ("G9", CultureInfo.InvariantCulture);
 				break;
 			case ConstantPoolItemType.Long:     value = ((ConstantPoolLongItem) constant).Value.ToString ();    break;
 			case ConstantPoolItemType.Integer:
diff --git a/tests/Java.Interop.Dynamic-Tests/Java.Interop.Dynamic-Tests.csproj b/tests/Java.Interop.Dynamic-Tests/Java.Interop.Dynamic-Tests.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net472</TargetFramework>
+    <TargetFrameworks>net472;net6.0</TargetFrameworks>
     <IsPackable>false</IsPackable>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
diff --git a/tests/Java.Interop.Export-Tests/Java.Interop.Export-Tests.csproj b/tests/Java.Interop.Export-Tests/Java.Interop.Export-Tests.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net472</TargetFramework>
+    <TargetFrameworks>net472;net6.0</TargetFrameworks>
     <IsPackable>false</IsPackable>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
diff --git a/tests/Java.Interop.Export-Tests/Java.Interop/MarshalMemberBuilderTest.cs b/tests/Java.Interop.Export-Tests/Java.Interop/MarshalMemberBuilderTest.cs
@@ -12,6 +12,7 @@
 
 namespace Java.InteropTests
 {
+#if !NET
 	[TestFixture]
 	class MarshalMemberBuilderTest : JavaVMFixture
 	{
@@ -555,4 +556,5 @@ public void CreateConstructActivationPeerExpression ()
 }}");
 		}
 	}
+#endif  // !NET
 }
diff --git a/tests/Java.Interop.Tools.Generator-Tests/Java.Interop.Tools.Generator-Tests.csproj b/tests/Java.Interop.Tools.Generator-Tests/Java.Interop.Tools.Generator-Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net472</TargetFramework>
+    <TargetFrameworks>net472;net6.0</TargetFrameworks>
     <RootNamespace>Java.Interop.Tools.Common_Tests</RootNamespace>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
diff --git a/tests/Java.Interop.Tools.JavaCallableWrappers-Tests/Java.Interop.Tools.JavaCallableWrappers-Tests.csproj b/tests/Java.Interop.Tools.JavaCallableWrappers-Tests/Java.Interop.Tools.JavaCallableWrappers-Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net472</TargetFramework>
+    <TargetFrameworks>net472;net6.0</TargetFrameworks>
     <IsPackable>false</IsPackable>
     <DefineConstants>$(DefineConstants);HAVE_CECIL;JCW_ONLY_TYPE_NAMES</DefineConstants>
   </PropertyGroup>
diff --git a/tests/Java.Interop.Tools.JavaCallableWrappers-Tests/Java.Interop.Tools.JavaCallableWrappers/JavaNativeTypeManagerTests.cs b/tests/Java.Interop.Tools.JavaCallableWrappers-Tests/Java.Interop.Tools.JavaCallableWrappers/JavaNativeTypeManagerTests.cs
@@ -29,7 +29,12 @@ public void TearDown ()
 		public void Crc64 ()
 		{
 			JavaNativeTypeManager.PackageNamingPolicy = PackageNamingPolicy.LowercaseCrc64;
+#if NET
+			// System.String moved assemblies in .NET
+			Assert.AreEqual ("crc64d04135c992393d83", JavaNativeTypeManager.GetPackageName (typeof (string)));
+#else   // !NET
 			Assert.AreEqual ("crc64b74743e9328eed0a", JavaNativeTypeManager.GetPackageName (typeof (string)));
+#endif  // !NET
 		}
 
 		[Test]
@@ -43,7 +48,12 @@ public void Lowercase ()
 		public void LowercaseWithAssemblyName ()
 		{
 			JavaNativeTypeManager.PackageNamingPolicy = PackageNamingPolicy.LowercaseWithAssemblyName;
+#if NET
+			// System.String moved assemblies in .NET
+			Assert.AreEqual ("assembly_system_private_corelib.system", JavaNativeTypeManager.GetPackageName (typeof (string)));
+#else   // !NET
 			Assert.AreEqual ("assembly_mscorlib.system", JavaNativeTypeManager.GetPackageName (typeof (string)));
+#endif  // !NET
 		}
 	}
 }
diff --git a/tests/Java.Interop.Tools.JavaSource-Tests/Java.Interop.Tools.JavaSource-Tests.csproj b/tests/Java.Interop.Tools.JavaSource-Tests/Java.Interop.Tools.JavaSource-Tests.csproj
@@ -1,6 +1,6 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net472</TargetFramework>
+    <TargetFrameworks>net472;net6.0</TargetFrameworks>
     <IsPackable>False</IsPackable>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/tests/Xamarin.Android.Tools.ApiXmlAdjuster-Tests/Xamarin.Android.Tools.ApiXmlAdjuster-Tests.csproj b/tests/Xamarin.Android.Tools.ApiXmlAdjuster-Tests/Xamarin.Android.Tools.ApiXmlAdjuster-Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net472</TargetFramework>
+    <TargetFrameworks>net472;net6.0</TargetFrameworks>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
diff --git a/tests/Xamarin.Android.Tools.Bytecode-Tests/JavaTypeTests.cs b/tests/Xamarin.Android.Tools.Bytecode-Tests/JavaTypeTests.cs
@@ -1,4 +1,4 @@
-﻿using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 
@@ -114,25 +114,25 @@ public void ClassFile_WithJavaType_class ()
 						Name                = "STATIC_FINAL_SINGLE_MIN",
 						Descriptor          = "F",
 						AccessFlags         = FieldAccessFlags.Public | FieldAccessFlags.Static | FieldAccessFlags.Final,
-						ConstantValue       = "Float(1.401298E-45)",
+						ConstantValue       = "Float(1.40129846E-45)",
 					},
 					new ExpectedFieldDeclaration {
 						Name                = "STATIC_FINAL_SINGLE_MAX",
 						Descriptor          = "F",
 						AccessFlags         = FieldAccessFlags.Public | FieldAccessFlags.Static | FieldAccessFlags.Final,
-						ConstantValue       = "Float(3.402823E+38)",
+						ConstantValue       = "Float(3.40282347E+38)",
 					},
 					new ExpectedFieldDeclaration {
 						Name                = "STATIC_FINAL_DOUBLE_MIN",
 						Descriptor          = "D",
 						AccessFlags         = FieldAccessFlags.Public | FieldAccessFlags.Static | FieldAccessFlags.Final,
-						ConstantValue       = "Double(4.94065645841247E-324)",
+						ConstantValue       = "Double(4.9406564584124654E-324)",
 					},
 					new ExpectedFieldDeclaration {
 						Name                = "STATIC_FINAL_DOUBLE_MAX",
 						Descriptor          = "D",
 						AccessFlags         = FieldAccessFlags.Public | FieldAccessFlags.Static | FieldAccessFlags.Final,
-						ConstantValue       = "Double(1.79769313486232E+308)",
+						ConstantValue       = "Double(1.7976931348623157E+308)",
 					},
 					new ExpectedFieldDeclaration {
 						Name                = "STATIC_FINAL_STRING",
diff --git a/tests/Xamarin.Android.Tools.Bytecode-Tests/Resources/JavaType.xml b/tests/Xamarin.Android.Tools.Bytecode-Tests/Resources/JavaType.xml
@@ -490,7 +490,7 @@
         type="double"
         type-generic-aware="double"
         jni-signature="D"
-        value="4.94065645841247E-324"
+        value="4.9406564584124654E-324"
         visibility="public"
         volatile="false" />
       <field
@@ -593,7 +593,7 @@
         type="float"
         type-generic-aware="float"
         jni-signature="F"
-        value="1.401298E-45"
+        value="1.40129846E-45"
         visibility="public"
         volatile="false" />
       <field
diff --git a/tests/Xamarin.Android.Tools.Bytecode-Tests/Xamarin.Android.Tools.Bytecode-Tests.csproj b/tests/Xamarin.Android.Tools.Bytecode-Tests/Xamarin.Android.Tools.Bytecode-Tests.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net472</TargetFramework>
+    <TargetFrameworks>net472;net6.0</TargetFrameworks>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
diff --git a/tests/Xamarin.SourceWriter-Tests/Xamarin.SourceWriter-Tests.csproj b/tests/Xamarin.SourceWriter-Tests/Xamarin.SourceWriter-Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net472</TargetFramework>
+    <TargetFrameworks>net472;net6.0</TargetFrameworks>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
diff --git a/tests/generator-Tests/Integration-Tests/Compiler.cs b/tests/generator-Tests/Integration-Tests/Compiler.cs
@@ -47,9 +47,13 @@ public static Assembly Compile (Xamarin.Android.Binder.CodeGeneratorOptions opti
 				MetadataReference.CreateFromFile (typeof(Enumerable).Assembly.Location),
 				MetadataReference.CreateFromFile (typeof(Uri).Assembly.Location),
 				MetadataReference.CreateFromFile (Path.Combine (binDir, "Java.Interop.dll")),
-				MetadataReference.CreateFromFile (Path.Combine (facDir, "netstandard.dll"))
+				MetadataReference.CreateFromFile (Path.Combine (facDir, "netstandard.dll")),
+#if NET
+				MetadataReference.CreateFromFile (Path.Combine (facDir, "System.Runtime.dll")),
+#endif  // NET
 			};
 
+
 			// Compile!
 			var compilation = CSharpCompilation.Create (
 			    Path.GetFileName (assemblyFileName),
diff --git a/tests/generator-Tests/generator-Tests.csproj b/tests/generator-Tests/generator-Tests.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net472</TargetFramework>
+    <TargetFrameworks>net472;net6.0</TargetFrameworks>
     <IsPackable>false</IsPackable>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
diff --git a/tests/logcat-parse-Tests/logcat-parse-Tests.csproj b/tests/logcat-parse-Tests/logcat-parse-Tests.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net472</TargetFramework>
+    <TargetFrameworks>net472;net6.0</TargetFrameworks>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 

Original file line number	Diff line number	Diff line change
`@@ -266,7 +266,7 @@ public float Value {`
`266`	`266`
`267`	`267`	`public override string ToString ()`
`268`	`268`	`{`
`269`		`- return string.Format (CultureInfo.InvariantCulture, "Float({0})", Value);`
	`269`	`+ return string.Format (CultureInfo.InvariantCulture, "Float({0:G9})", Value);`
`270`	`270`	`}`
`271`	`271`	`}`
`272`	`272`
`@@ -335,7 +335,7 @@ public double Value {`
`335`	`335`
`336`	`336`	`public override string ToString ()`
`337`	`337`	`{`
`338`		`- return string.Format (CultureInfo.InvariantCulture, "Double({0})", Value);`
	`338`	`+ return string.Format (CultureInfo.InvariantCulture, "Double({0:G17})", Value);`
`339`	`339`	`}`
`340`	`340`	`}`
`341`	`341`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@`
`12`	`12`
`13`	`13`	`namespace Java.InteropTests`
`14`	`14`	`{`
	`15`	`+#if !NET`
`15`	`16`	`[TestFixture]`
`16`	`17`	`class MarshalMemberBuilderTest : JavaVMFixture`
`17`	`18`	`{`
`@@ -555,4 +556,5 @@ public void CreateConstructActivationPeerExpression ()`
`555`	`556`	`}}");`
`556`	`557`	`}`
`557`	`558`	`}`
	`559`	`+#endif // !NET`
`558`	`560`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,12 @@ public void TearDown ()`
`29`	`29`	`public void Crc64 ()`
`30`	`30`	`{`
`31`	`31`	`JavaNativeTypeManager.PackageNamingPolicy = PackageNamingPolicy.LowercaseCrc64;`
	`32`	`+#if NET`
	`33`	`+ // System.String moved assemblies in .NET`
	`34`	`+ Assert.AreEqual ("crc64d04135c992393d83", JavaNativeTypeManager.GetPackageName (typeof (string)));`
	`35`	`+#else // !NET`
`32`	`36`	`Assert.AreEqual ("crc64b74743e9328eed0a", JavaNativeTypeManager.GetPackageName (typeof (string)));`
	`37`	`+#endif // !NET`
`33`	`38`	`}`
`34`	`39`
`35`	`40`	`[Test]`
`@@ -43,7 +48,12 @@ public void Lowercase ()`
`43`	`48`	`public void LowercaseWithAssemblyName ()`
`44`	`49`	`{`
`45`	`50`	`JavaNativeTypeManager.PackageNamingPolicy = PackageNamingPolicy.LowercaseWithAssemblyName;`
	`51`	`+#if NET`
	`52`	`+ // System.String moved assemblies in .NET`
	`53`	`+ Assert.AreEqual ("assembly_system_private_corelib.system", JavaNativeTypeManager.GetPackageName (typeof (string)));`
	`54`	`+#else // !NET`
`46`	`55`	`Assert.AreEqual ("assembly_mscorlib.system", JavaNativeTypeManager.GetPackageName (typeof (string)));`
	`56`	`+#endif // !NET`
`47`	`57`	`}`
`48`	`58`	`}`
`49`	`59`	`}`