Use WinRT Types from CoreRT

As pointed by Jan, there are duplicate copy of these types in S.R.WR/S.P.Interop and CoreRT.

The change is to remove duplicate copy of WinRT Type in ProjectN and use types from CoreRT instead.

The next step is to remove the duplicate copy in S.R.WR.

[tfs-changeset: 1679183]

4 files changed, 15 insertions, 3 deletions

diff --git a/src/System.Private.Interop/src/System.Private.Interop.Mono.csproj b/src/System.Private.Interop/src/System.Private.Interop.Mono.csproj
index 25c4f62a6..66b5c1726 100644
--- a/src/System.Private.Interop/src/System.Private.Interop.Mono.csproj
+++ b/src/System.Private.Interop/src/System.Private.Interop.Mono.csproj
@@ -26,7 +26,7 @@
   </ItemGroup>
   
   <ItemGroup>
-    <Compile Include="Windows\Foundation\IKeyValuePair.cs" />
+    <Compile Include="Windows\Foundation\Collections\IKeyValuePair.cs" />
     <Compile Include="Windows\Foundation\IReference.cs" />
     <Compile Include="Windows\Foundation\Point.cs" />
     <Compile Include="Windows\Foundation\PropertyType.cs" />
diff --git a/src/System.Private.Interop/src/System.Private.Interop.csproj b/src/System.Private.Interop/src/System.Private.Interop.csproj
index aeadd885e..45754fa30 100644
--- a/src/System.Private.Interop/src/System.Private.Interop.csproj
+++ b/src/System.Private.Interop/src/System.Private.Interop.csproj
@@ -167,11 +167,23 @@
     <Compile Include="System\Runtime\InteropServices\WindowsRuntime\DefaultInterfaceAttribute.cs" />
     <Compile Include="System\Runtime\InteropServices\WindowsRuntime\EventRegistrationTokenTable.cs" />
     <Compile Include="System\Runtime\InteropServices\WindowsRuntime\InterfaceImplementedInVersionAttribute.cs" />
+    <Compile Include="System\Runtime\InteropServices\WindowsRuntime\IPropertyValue.cs" />
+    <Compile Include="System\Runtime\InteropServices\WindowsRuntime\IReferenceArray.cs" />
     <Compile Include="System\Runtime\InteropServices\WindowsRuntime\ReadOnlyArrayAttribute.cs" />
     <Compile Include="System\Runtime\InteropServices\WindowsRuntime\ReturnValueNameAttribute.cs" />
     <Compile Include="System\Runtime\InteropServices\WindowsRuntime\WindowsRuntimeImportAttribute.cs" />
     <Compile Include="System\Runtime\InteropServices\WindowsRuntime\WriteOnlyArrayAttribute.cs" />
   </ItemGroup>
+  
+  <ItemGroup Condition="'$(EnableWinRT)'=='true'">
+    <Compile Include="Windows\Foundation\Collections\IKeyValuePair.cs" />
+    <Compile Include="Windows\Foundation\Point.cs" />
+    <Compile Include="Windows\Foundation\Rect.cs" />
+    <Compile Include="Windows\Foundation\Size.cs" />
+    <Compile Include="Windows\Foundation\TokenizerHelper.cs" />
+    <Compile Include="Windows\Foundation\IReference.cs" />
+  </ItemGroup>
+  
   <ItemGroup Condition="'$(TargetsWindows)' == 'true'">
     <Compile Include="Interop\Interop.Sync.Windows.cs" />
     <Compile Include="Interop\Interop.WinRT.cs" />
diff --git a/src/System.Private.Interop/src/Windows/Foundation/IKeyValuePair.cs b/src/System.Private.Interop/src/Windows/Foundation/Collections/IKeyValuePair.cs
index 88ba75437..88ba75437 100644
--- a/src/System.Private.Interop/src/Windows/Foundation/IKeyValuePair.cs
+++ b/src/System.Private.Interop/src/Windows/Foundation/Collections/IKeyValuePair.cs
diff --git a/src/System.Private.Interop/src/Windows/Foundation/IReference.cs b/src/System.Private.Interop/src/Windows/Foundation/IReference.cs
index dc498b8f8..0533b01b0 100644
--- a/src/System.Private.Interop/src/Windows/Foundation/IReference.cs
+++ b/src/System.Private.Interop/src/Windows/Foundation/IReference.cs
@@ -4,10 +4,10 @@
 
 namespace Windows.Foundation
 {
-    [System.Runtime.CompilerServices.DependencyReductionRootAttribute]
+    [global::System.Runtime.CompilerServices.DependencyReductionRootAttribute]
     public interface IReference<T>
     {
-        [System.Runtime.InteropServices.McgAccessor(System.Runtime.InteropServices.McgAccessorKind.PropertyGet, "Value")]
+        [global::System.Runtime.InteropServices.McgAccessor(global::System.Runtime.InteropServices.McgAccessorKind.PropertyGet, "Value")]
         T get_Value();
     }
 }