Filtering down the NETNative TargetingPack to avoid type conflicts (#15929)

Filtering down the NETNative TargetingPack to avoid type conflicts

5 files changed, 7 insertions, 10 deletions

diff --git a/Tools-Override/depProj.targets b/Tools-Override/depProj.targets
index ea32123741..ec8a63e593 100644
--- a/Tools-Override/depProj.targets
+++ b/Tools-Override/depProj.targets
@@ -97,7 +97,7 @@ See the LICENSE file in the project root for more information.
 
   <PropertyGroup>
     <!-- don't use TargetingPackReference, we do our own filtering -->
-    <SkipFilterTargetingPackResolvedNugetPackages>true</SkipFilterTargetingPackResolvedNugetPackages>
+    <SkipFilterTargetingPackResolvedNugetPackages Condition="'$(SkipFilterTargetingPackResolvedNugetPackages)'==''">true</SkipFilterTargetingPackResolvedNugetPackages>
   </PropertyGroup>
   
   <!-- Support filtering to a subset of packages or files -->
diff --git a/external/runtime/runtime.depproj b/external/runtime/runtime.depproj
index 0694fa592d..24faf6573b 100644
--- a/external/runtime/runtime.depproj
+++ b/external/runtime/runtime.depproj
@@ -11,6 +11,12 @@
   <PropertyGroup Condition="'$(TargetGroup)' == 'uapaot'">
     <ProjectJsonTemplate>$(MSBuildThisFileDirectory)NETNative/project.json.template</ProjectJsonTemplate>
     <NuGetDeploySourceItem>Reference</NuGetDeploySourceItem>
+    <SkipFilterTargetingPackResolvedNugetPackages>false</SkipFilterTargetingPackResolvedNugetPackages>
   </PropertyGroup>
+  <ItemGroup Condition="'$(TargetGroup)'=='uapaot'">
+    <TargetingPackReference Include="System.Private.CoreLib" />
+    <TargetingPackReference Include="System.Private.Interop" />
+    <TargetingPackReference Include="System.Private.Threading" />
+  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/System.Private.DataContractSerialization/src/System.Private.DataContractSerialization.csproj b/src/System.Private.DataContractSerialization/src/System.Private.DataContractSerialization.csproj
index 7f543e44f7..72defaf2c0 100644
--- a/src/System.Private.DataContractSerialization/src/System.Private.DataContractSerialization.csproj
+++ b/src/System.Private.DataContractSerialization/src/System.Private.DataContractSerialization.csproj
@@ -162,7 +162,6 @@
     <Compile Include="System\Xml\IFragmentCapableXmlDictionaryWriter.cs" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetGroup)'=='uapaot'">
-    <ReferenceFromRuntime Include="System.Private.CoreLib.Augments" />
     <EmbeddedResource Include="$(MsBuildThisFileDirectory)Resources\$(AssemblyName).rd.xml" />
   </ItemGroup>
   <ItemGroup>
diff --git a/src/System.Private.DataContractSerialization/src/System/Runtime/Serialization/XmlFormatReaderGenerator.cs b/src/System.Private.DataContractSerialization/src/System/Runtime/Serialization/XmlFormatReaderGenerator.cs
index a771363961..15db02167f 100644
--- a/src/System.Private.DataContractSerialization/src/System/Runtime/Serialization/XmlFormatReaderGenerator.cs
+++ b/src/System.Private.DataContractSerialization/src/System/Runtime/Serialization/XmlFormatReaderGenerator.cs
@@ -11,9 +11,6 @@ using System.Collections;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Security;
-#if NET_NATIVE
-using Internal.Runtime.Augments;
-#endif
 
 namespace System.Runtime.Serialization
 {
@@ -929,11 +926,7 @@ namespace System.Runtime.Serialization
 
         internal static object UnsafeGetUninitializedObject(Type type)
         {
-#if !NET_NATIVE
             return FormatterServices.GetUninitializedObject(type);
-#else
-            return RuntimeAugments.NewObject(type.TypeHandle);
-#endif
         }
 
         /// <SecurityNote>
diff --git a/src/System.Runtime.WindowsRuntime/src/System.Runtime.WindowsRuntime.csproj b/src/System.Runtime.WindowsRuntime/src/System.Runtime.WindowsRuntime.csproj
index 59873e3598..77c308293a 100644
--- a/src/System.Runtime.WindowsRuntime/src/System.Runtime.WindowsRuntime.csproj
+++ b/src/System.Runtime.WindowsRuntime/src/System.Runtime.WindowsRuntime.csproj
@@ -53,7 +53,6 @@
     <ReferenceFromRuntime Include="System.Private.Threading" />
     <Reference Include="Windows" />
     <Reference Include="mscorlib" />
-    <ReferenceFromRuntime Include="System.Private.CoreLib.WinRTInterop" />
     <ProjectReference Include="..\..\System.Runtime\src\System.Runtime.csproj">
       <TargetGroup>uapaot</TargetGroup>
     </ProjectReference>