From aaddd31045a909ff6283f38ef54249f481807332 Mon Sep 17 00:00:00 2001
From: Alex Ghiondea <ghiondea.alexandru@microsoft.com>
Date: Mon, 6 Jun 2016 17:31:43 -0700
Subject: [PATCH] Introduce explicity typeforwards to internal types that are
 needed by WinRT

GenFacades does not correcty create the type forwards for internal types even if there are internalsvisibleto attributes setup.

[tfs-changeset: 1610866]
---
 src/mscorlib/facade/TypeForwards.cs | 39 +++++++++++++++++++++++++++++
 src/mscorlib/facade/mscorlib.csproj |  4 +++
 src/mscorlib/ref/mscorlib.cs        |  4 +++
 3 files changed, 47 insertions(+)
 create mode 100644 src/mscorlib/facade/TypeForwards.cs

diff --git a/src/mscorlib/facade/TypeForwards.cs b/src/mscorlib/facade/TypeForwards.cs
new file mode 100644
index 0000000000..ee75b85a61
--- /dev/null
+++ b/src/mscorlib/facade/TypeForwards.cs
@@ -0,0 +1,39 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Runtime.CompilerServices;
+
+#if FEATURE_COMINTEROP
+[assembly: TypeForwardedTo(typeof(System.Threading.WinRTSynchronizationContextFactoryBase))]
+[assembly: TypeForwardedTo(typeof(System.Resources.WindowsRuntimeResourceManagerBase))]
+[assembly: TypeForwardedTo(typeof(System.Resources.PRIExceptionInfo))]
+[assembly: TypeForwardedTo(typeof(System.Runtime.InteropServices.WindowsRuntime.WindowsRuntimeImportAttribute))]
+[assembly: TypeForwardedTo(typeof(System.Runtime.InteropServices.WindowsRuntime.IRestrictedErrorInfo))]
+[assembly: TypeForwardedTo(typeof(System.Runtime.CompilerServices.FriendAccessAllowedAttribute))]
+[assembly: TypeForwardedTo(typeof(System.Globalization.CultureTypes))]
+[assembly: TypeForwardedTo(typeof(System.StubHelpers.EventArgsMarshaler))]
+[assembly: TypeForwardedTo(typeof(System.StubHelpers.InterfaceMarshaler))]
+#endif
+
+[assembly: TypeForwardedTo(typeof(System.Diagnostics.Tracing.FrameworkEventSource))]
+[assembly: TypeForwardedTo(typeof(System.Globalization.CultureData))]
+[assembly: TypeForwardedTo(typeof(System.Globalization.CalendarData))]
+[assembly: TypeForwardedTo(typeof(System.IO.BufferedStream))]
+[assembly: TypeForwardedTo(typeof(System.Runtime.CompilerServices.JitHelpers))]
+[assembly: TypeForwardedTo(typeof(System.Runtime.CompilerServices.ObjectHandleOnStack))]
+[assembly: TypeForwardedTo(typeof(System.Runtime.CompilerServices.PinningHelper))]
+[assembly: TypeForwardedTo(typeof(System.Runtime.CompilerServices.StackCrawlMarkHandle))]
+[assembly: TypeForwardedTo(typeof(System.Runtime.CompilerServices.StringHandleOnStack))]
+[assembly: TypeForwardedTo(typeof(System.Runtime.CompilerServices.FriendAccessAllowedAttribute))]
+[assembly: TypeForwardedTo(typeof(System.StubHelpers.StubHelpers))]
+[assembly: TypeForwardedTo(typeof(System.StubHelpers.CleanupWorkList))]
+[assembly: TypeForwardedTo(typeof(System.StubHelpers.CleanupWorkListElement))]
+[assembly: TypeForwardedTo(typeof(System.Threading.StackCrawlMark))]
+[assembly: TypeForwardedTo(typeof(System.Threading.Tasks.AsyncCausalityStatus))]
+[assembly: TypeForwardedTo(typeof(System.Threading.Tasks.CausalityRelation))]
+[assembly: TypeForwardedTo(typeof(System.Threading.Tasks.CausalitySynchronousWork))]
+[assembly: TypeForwardedTo(typeof(System.Threading.Tasks.AsyncCausalityTracer))]
+[assembly: TypeForwardedTo(typeof(System.Threading.Tasks.CausalityTraceLevel))]
+
+
diff --git a/src/mscorlib/facade/mscorlib.csproj b/src/mscorlib/facade/mscorlib.csproj
index d163967d43..0aa705376c 100644
--- a/src/mscorlib/facade/mscorlib.csproj
+++ b/src/mscorlib/facade/mscorlib.csproj
@@ -61,6 +61,10 @@
   <ItemGroup>
     <ProjectReference Include="..\System.Private.CoreLib.csproj" />
   </ItemGroup>
+  
+  <ItemGroup>
+    <Compile Include="TypeForwards.cs" />
+  </ItemGroup>
 
   <ItemGroup>
     <None Include="project.json" />
diff --git a/src/mscorlib/ref/mscorlib.cs b/src/mscorlib/ref/mscorlib.cs
index 25222410f5..d0615e2a77 100644
--- a/src/mscorlib/ref/mscorlib.cs
+++ b/src/mscorlib/ref/mscorlib.cs
@@ -1,3 +1,7 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
 [assembly:System.Runtime.CompilerServices.InternalsVisibleTo("System.Runtime.WindowsRuntime, PublicKey=00000000000000000400000000000000")]
 
 namespace Microsoft.Win32.SafeHandles
-- 
2.34.1