Remove UAP target (dotnet/corefx#41759)

* Remove Uap target

* Remove RemoteInvokeForUap wrapper calls entirely

* Harvest S.D.SqlClient on UWP

* Disable UWP PInvoke analyzer

* Enable WindowsRuntime* tests on netcoreapp

Commit migrated from https://github.com/dotnet/corefx/commit/3b6ec2ba944fb72f921f95b99b6ebf2e7bb3dc5a

10 files changed, 5 insertions, 90 deletions

diff --git a/eng/restore/binplacePackages/Configurations.props b/eng/restore/binplacePackages/Configurations.props
index ef125f33c08..ac745e0ce86 100644
--- a/eng/restore/binplacePackages/Configurations.props
+++ b/eng/restore/binplacePackages/Configurations.props
@@ -14,7 +14,6 @@
       netcoreapp2.0;
       netcoreapp3.0;
       netcoreapp;
-      uap10.0.16299;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
diff --git a/eng/restore/binplacePackages/binplacePackages.depproj b/eng/restore/binplacePackages/binplacePackages.depproj
index 8e7933bb0fc..1f6e3292325 100644
--- a/eng/restore/binplacePackages/binplacePackages.depproj
+++ b/eng/restore/binplacePackages/binplacePackages.depproj
@@ -4,7 +4,7 @@
     <BinPlaceRuntime>true</BinPlaceRuntime>
     <NETStandardVersion Condition="$(TargetFramework.StartsWith('netstandard'))">$(TargetFramework.SubString(11))</NETStandardVersion>
     <NuGetDeploySourceItem>Reference</NuGetDeploySourceItem>
-    <TargetsNetStandardLowerThan21 Condition="'$(TargetsNetStandard)' == 'true' AND '$(NETStandardVersion)' &lt; 2.1">true</TargetsNetStandardLowerThan21>
+    <TargetsNetStandardLowerThan21 Condition="'$(TargetsNetStandard)' == 'true' and '$(NETStandardVersion)' &lt; 2.1">true</TargetsNetStandardLowerThan21>
   </PropertyGroup>
 
     <!-- Ref binplacing for all configurations -->
@@ -28,15 +28,14 @@
 
   <!-- This is to make sure that nothing unintended gets restored for netcoreapp. -->
   <ItemGroup Condition="'$(TargetGroup)' != 'netcoreapp'">
-    <!-- runtime dependency: System.Data.SqlClient uap10.0.16299 -->
     <!-- runtime dependency: System.Diagnostics.PerformanceCounters netcoreapp2.0,net461 -->
-    <PackageReference Include="System.Memory" Version="4.5.2" Condition="'$(TargetFramework)' == 'netcoreapp2.0' OR '$(TargetFramework)' == 'uap10.0.16299' OR '$(TargetsNetfx)' == 'true' OR ('$(TargetsNetStandard)' == 'true' AND '$(NETStandardVersion)' &gt;= 1.1)" />
-    <PackageReference Include="System.Numerics.Vectors" Version="4.5.0" Condition="'$(TargetsNetStandardLowerThan21)' == 'true' OR '$(TargetsNetfx)' == 'true'" />
-    <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.2" Condition="'$(TargetFramework)' == 'netcoreapp2.0' OR '$(TargetsNetfx)' == 'true' OR '$(TargetsNetStandard)' == 'true'" />
+    <PackageReference Include="System.Memory" Version="4.5.2" Condition="'$(TargetFramework)' == 'netcoreapp2.0' or '$(TargetsNetfx)' == 'true' or ('$(TargetsNetStandard)' == 'true' and '$(NETStandardVersion)' &gt;= 1.1)" />
+    <PackageReference Include="System.Numerics.Vectors" Version="4.5.0" Condition="'$(TargetsNetStandardLowerThan21)' == 'true' or '$(TargetsNetfx)' == 'true'" />
+    <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.2" Condition="'$(TargetFramework)' == 'netcoreapp2.0' or '$(TargetsNetfx)' == 'true' or '$(TargetsNetStandard)' == 'true'" />
   </ItemGroup>
   
   <ItemGroup>
-    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="1.0.0" Condition="'$(TargetsNetStandard)' != 'true' OR '$(NETStandardVersion)' &gt;= 2.0" />
+    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="1.0.0" Condition="'$(TargetsNetStandard)' != 'true' or '$(NETStandardVersion)' &gt;= 2.0" />
     <!-- Only include the assets from the direct packages we reference in the output -->
     <PackageToInclude Include="@(PackageReference)" />
   </ItemGroup>
diff --git a/eng/restore/dirs.proj b/eng/restore/dirs.proj
index a6ac20efb63..3c87a323789 100644
--- a/eng/restore/dirs.proj
+++ b/eng/restore/dirs.proj
@@ -8,7 +8,6 @@
   <!-- Build for all configurations -->
   <ItemGroup>
     <Project Condition="'$(BuildAllConfigurations)' == 'true'" Include="netcoreapp/netcoreapp.depproj" />
-    <Project Condition="'$(BuildAllConfigurations)' == 'true'" Include="uap/uap.depproj" />
     <Project Include="netstandard/netstandard.depproj" />
     <Project Include="netfx/netfx.depproj" />
     <Project Include="runtime/runtime.depproj" />
diff --git a/eng/restore/netfx/Configurations.props b/eng/restore/netfx/Configurations.props
index a9f2b3349f5..490a182fc8c 100644
--- a/eng/restore/netfx/Configurations.props
+++ b/eng/restore/netfx/Configurations.props
@@ -11,7 +11,6 @@
       net471;
       netfx;
       netcoreapp;
-      uap;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
diff --git a/eng/restore/runtime/Configurations.props b/eng/restore/runtime/Configurations.props
index bd4fd57ae90..2763918bc10 100644
--- a/eng/restore/runtime/Configurations.props
+++ b/eng/restore/runtime/Configurations.props
@@ -5,8 +5,6 @@
       netcoreapp3.0-Unix;
       netcoreapp-Windows_NT;
       netcoreapp-Unix;
-      uap10.0.16299;
-      uap;
       mono;
     </BuildConfigurations>
   </PropertyGroup>
diff --git a/eng/restore/runtime/runtime.depproj b/eng/restore/runtime/runtime.depproj
index 78303c3c0b7..89ef92cace1 100644
--- a/eng/restore/runtime/runtime.depproj
+++ b/eng/restore/runtime/runtime.depproj
@@ -3,8 +3,6 @@
     <RuntimeIdentifier>$(PackageRID)</RuntimeIdentifier>
     <NoWarn>$(NoWarn);NU1603;NU1605</NoWarn>
     <SwapNativeForIL Condition="'$(SwapNativeForIL)' == '' AND ('$(ConfigurationGroup)' == 'Debug' OR '$(Coverage)' == 'true')">true</SwapNativeForIL>
-    <!-- uap10.0.16299 is missing IL -->
-    <SwapNativeForIL Condition="'$(TargetFramework)'=='uap10.0.16299'">false</SwapNativeForIL>
   </PropertyGroup>
 
   <ItemGroup Condition="'$(DotNetBuildFromSource)' != 'true'">
@@ -17,11 +15,6 @@
     <MicrosoftPrivateCorefxNETCoreAppVersion>4.6.0-rc2.19462.14</MicrosoftPrivateCorefxNETCoreAppVersion>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(TargetFramework)' == 'uap10.0.16299'">
-    <!-- Following is version used in release/uwp6.0 -->
-    <MicrosoftNETCoreRuntimeCoreCLRPackageVersion>2.1.0-b-uwp6-25707-02</MicrosoftNETCoreRuntimeCoreCLRPackageVersion>
-  </PropertyGroup>
-
   <ItemGroup>
     <PackageReference Include="Microsoft.NETCore.Platforms" Version="$(MicrosoftNETCorePlatformsPackageVersion)" />
     <PackageReference Include="transport.Microsoft.NETCore.Runtime.CoreCLR" Version="$(MicrosoftNETCoreRuntimeCoreCLRPackageVersion)" />
diff --git a/eng/restore/uap-tools.targets b/eng/restore/uap-tools.targets
deleted file mode 100644
index 5dbccee665e..00000000000
--- a/eng/restore/uap-tools.targets
+++ /dev/null
@@ -1,29 +0,0 @@
-<Project>
-
-   <!-- Retrieve the UAP Tools to the TestHost folder -->
-  <Target Name="CopyUAPToolsToTestHost"
-          Condition="'$(TargetGroup)' == 'uap' and '$(BuildAllConfigurations)' != 'true' and '$(DotNetBuildFromSource)' != 'true'"
-          AfterTargets="Restore">
-
-    <PropertyGroup>
-      <UAPToolsFolder>$(NuGetPackageRoot)$(MicrosoftDotNetUapTestToolsPackageId)\$(MicrosoftDotNetUapTestToolsPackageVersion)\Tools\$(ArchGroup)</UAPToolsFolder>
-    </PropertyGroup>
-
-    <Error Condition="!Exists('$(UAPToolsFolder)')" Text="UAP Tools package not restored or missing assets." />
-
-    <ItemGroup>
-      <RunnerFolderContents Include="$(UAPToolsFolder)\Runner\**\*" />
-      <LauncherFolderContents Include="$(UAPToolsFolder)\Launcher\**\*" />
-    </ItemGroup>
-
-    <Copy SourceFiles="@(RunnerFolderContents)"
-          DestinationFolder="$(TestHostRootPath)Runner\%(RecursiveDir)"
-          SkipUnchangedFiles="true" />
-
-    <Copy SourceFiles="@(LauncherFolderContents)"
-          DestinationFolder="$(TestHostRootPath)Launcher\%(RecursiveDir)"
-          SkipUnchangedFiles="true" />
-
-  </Target>
-
-</Project>
diff --git a/eng/restore/uap/Configurations.props b/eng/restore/uap/Configurations.props
deleted file mode 100644
index a4dd681c869..00000000000
--- a/eng/restore/uap/Configurations.props
+++ /dev/null
@@ -1,7 +0,0 @@
-<Project>
-  <PropertyGroup>
-    <BuildConfigurations>
-      uap10.0.16299;
-    </BuildConfigurations>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/eng/restore/uap/uap.depproj b/eng/restore/uap/uap.depproj
deleted file mode 100644
index 1d9d5eff2df..00000000000
--- a/eng/restore/uap/uap.depproj
+++ /dev/null
@@ -1,35 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <!-- This project restores and publishes the targeting pack for specific versions of UAP.
-       With this, we are able to compile assemblies against shipped, stable versions of UAP. -->
-  <PropertyGroup>
-    <BinPlaceRef>true</BinPlaceRef>
-    <NuGetDeploySourceItem>Reference</NuGetDeploySourceItem>
-    <UAPPackageVersion>6.0.7</UAPPackageVersion>
-    <TargetFramework>uap10.0.16299</TargetFramework>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
-      <Version>$(UAPPackageVersion)</Version>
-    </PackageReference>
-    <!-- System.Reflection.Emit and System.Reflection.Emit.ILGeneration are needed for the closure of the implementation of System.Reflection.DispatchProxy.
-    Because they are only available on the implementation, they won't be restored as part of the targeting pack, so adding package references to those
-    as well. -->
-    <PackageReference Include="System.Reflection.Emit">
-      <Version>4.3.0</Version>
-    </PackageReference>
-    <PackageReference Include="System.Reflection.Emit.ILGeneration">
-      <Version>4.3.0</Version>
-    </PackageReference>
-    <PackageToInclude Include="Microsoft.NETCore.UniversalWindowsPlatform" />
-    <PackageToInclude Include="System.Reflection.Emit" />
-    <PackageToInclude Include="System.Reflection.Emit.ILGeneration" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <!-- for all configurations this project provides refs for that configuration -->
-    <BinPlaceConfiguration Include="$(Configuration)">
-      <RefPath>$(RefPath)</RefPath>
-    </BinPlaceConfiguration>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/eng/restore/winrt/Configurations.props b/eng/restore/winrt/Configurations.props
index f2ed3b80c33..d7ebc9bbced 100644
--- a/eng/restore/winrt/Configurations.props
+++ b/eng/restore/winrt/Configurations.props
@@ -3,7 +3,6 @@
     <BuildConfigurations>
       netcoreapp3.0;
       netcoreapp;
-      uap;
       netstandard1.0;
     </BuildConfigurations>
   </PropertyGroup>