Merge pull request #4805 from dotnet/nmirror

Merge nmirror to master

5 files changed, 17 insertions, 5 deletions

diff --git a/src/System.Private.Interop/src/System.Private.Interop.CoreCLR.csproj b/src/System.Private.Interop/src/System.Private.Interop.CoreCLR.csproj
index 6c1648e5f..e8967228e 100644
--- a/src/System.Private.Interop/src/System.Private.Interop.CoreCLR.csproj
+++ b/src/System.Private.Interop/src/System.Private.Interop.CoreCLR.csproj
@@ -7,7 +7,7 @@
     <OutputType>Library</OutputType>
     <ProjectGuid>{A85709C9-22D5-4704-8B7A-73751BB4386A}</ProjectGuid>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);TARGET_CORE_API_SET;CORECLR</DefineConstants>
+    <DefineConstants>TARGET_CORE_API_SET;CORECLR</DefineConstants>
     <!-- Disable warning about CLSCompliant attributes on members not being needed. -->
     <NoWarn>$(NoWarn);3021</NoWarn>
     <!-- Use MSFT assembly key for compatibility with uapaot targeting pack -->
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..7c39d0962 100644
--- a/src/System.Private.Interop/src/System.Private.Interop.Mono.csproj
+++ b/src/System.Private.Interop/src/System.Private.Interop.Mono.csproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
+  <Import Project="System.Private.Interop.CoreCLR.csproj" />
   <PropertyGroup>
     <AssemblyName>System.Private.Interop</AssemblyName>
     <TargetName>$(AssemblyName)</TargetName>
@@ -26,7 +27,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" />
@@ -35,5 +36,4 @@
     <Compile Include="Windows\Foundation\TokenizerHelper.cs" />
   </ItemGroup>
 
-  <Import Project="System.Private.Interop.CoreCLR.csproj" />
 </Project>
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();
     }
 }