Imported Upstream version 4.6.0.150

Former-commit-id: 73e3bb1e96dd09dc931c1dfe559d2c7f7b8b02c7

mcs/tests/Makefile

@@ -98,4 +98,8 @@ csproj-local:
 setup:
 	$(CSCOMPILE) -t:library dlls/test-679-2/test-679-lib-2.cs
 	$(CSCOMPILE) -t:library dlls/test-679-1/test-679-lib.cs -r:dlls/test-679-2/test-679-lib-2.dll
+	$(CSCOMPILE) -t:library dlls/test-939-common.cs -keyfile:key.snk -publicsign
+	$(CSCOMPILE) -t:library dlls/test-939-1/test-939-lib.cs -keyfile:key.snk -publicsign
+	$(CSCOMPILE) -t:library dlls/test-939-1/test-939-ref.cs -r:dlls/test-939-1/test-939-lib.dll -keyfile:key.snk -publicsign
+	$(CSCOMPILE) -t:library dlls/test-939-2/test-939-lib.cs -r:dlls/test-939-common.dll -keyfile:key.snk -publicsign
 	$(ILASM) -dll dlls/test-883.il

mcs/tests/dlls/test-939-1/test-939-lib.cs

@@ -0,0 +1,9 @@
+[assembly:System.Reflection.AssemblyVersionAttribute ("2.1.0.0")]
+
+public class Common
+{
+	public static void Foo ()
+	{
+
+	}
+}

mcs/tests/dlls/test-939-1/test-939-ref.cs

@@ -0,0 +1,10 @@
+[assembly:System.Reflection.AssemblyVersionAttribute ("4.0.0.0")]
+
+public class A : Common
+{
+}
+
+public class B
+{
+	
+}

mcs/tests/dlls/test-939-2/test-939-lib.cs

@@ -0,0 +1,5 @@
+using System.Runtime.CompilerServices;
+
+[assembly:System.Reflection.AssemblyVersionAttribute ("2.0.0.0")]
+
+[assembly:TypeForwardedTo (typeof (Common))]

mcs/tests/dlls/test-939-common.cs

@@ -0,0 +1,9 @@
+[assembly:System.Reflection.AssemblyVersionAttribute ("1.0.0.0")]
+
+public class Common
+{
+	public static void Foo ()
+	{
+
+	}
+}

mcs/tests/test-939.cs

@@ -0,0 +1,14 @@
+// Compiler options: -r:dlls/test-939-1/test-939-ref.dll -r:dlls/test-939-2/test-939-lib.dll -r:dlls/test-939-common.dll
+
+class X
+{
+	public static void Main ()
+	{
+	}
+
+	static void RealTest ()
+	{
+		A.Foo ();
+		new B ();
+	}
+}

mcs/tests/test-async-87.cs

@@ -0,0 +1,55 @@
+using System;
+using System.Threading.Tasks;
+
+class CA
+{
+	public CB CB { get; set; }
+	public DeviceDetails DeviceDetails { get; set; }
+}
+
+class CB
+{
+	public CB (string arg)
+	{
+	}
+}
+
+class DeviceDetails
+{
+	public DeviceDetails (string arg)
+	{
+	}
+}
+
+class BB
+{
+	public Task<string> GetUser()
+	{        
+		return Task.FromResult ("aa");
+	}
+
+	public Task<string> GetDevice()
+	{
+		return Task.FromResult ("bb");
+	}    
+}
+
+class X
+{
+	BB bb = new BB ();
+
+	public async Task<CA> GetCAAsync()
+	{
+		return new CA
+		{
+			CB = new CB(await bb.GetUser()),
+			DeviceDetails = new DeviceDetails(await bb.GetDevice())
+		};
+	}
+
+	static void Main ()
+	{
+		var x = new X ();
+		x.GetCAAsync ().Wait ();
+	}
+}

mcs/tests/test-static-using-12.cs

@@ -0,0 +1,24 @@
+namespace A.B
+{
+	public static class G<T>
+	{
+		public class DD
+		{
+		}
+
+		public static object Dock () => null;
+	}
+}
+
+namespace N2
+{
+	using static A.B.G<int>;
+
+	class M : DD
+	{
+		public static void Main ()
+		{
+			Dock ();
+		}
+	}
+}

mcs/tests/ver-il-net_4_x.xml.REMOVED.git-id

@@ -1 +1 @@
-c705efa9a031fbfcd360998fccab5c8d635e52ed
+2a519f077e32487fd84bbb5ea835758cd42cb85d