From c220123600be462d9ef9323ffac99f5509eb1339 Mon Sep 17 00:00:00 2001
From: Anirudh Agnihotry <anirudhagnihotry098@gmail.com>
Date: Mon, 23 Sep 2019 14:01:49 -0700
Subject: [PATCH] Removing microsoft.private.corefx.uap (dotnet/corefx#41187)

* removing microsoft.private.corefx.uap

* removing uap specific changes in ,.targets

* add uap-windowsNT


Commit migrated from https://github.com/dotnet/corefx/commit/49ba6ef9cb8120c87eae636fc41b79e07e88e707
---
 .../Configurations.props                           |  7 ---
 .../Microsoft.Private.CoreFx.UAP.builds            | 10 ----
 .../Microsoft.Private.CoreFx.UAP.pkgproj           | 67 ----------------------
 .../Microsoft.Private.CoreFx.UAP/uap.rids.props    | 24 --------
 src/libraries/pkg/descriptions.json                |  5 --
 5 files changed, 113 deletions(-)
 delete mode 100644 src/libraries/pkg/Microsoft.Private.CoreFx.UAP/Configurations.props
 delete mode 100644 src/libraries/pkg/Microsoft.Private.CoreFx.UAP/Microsoft.Private.CoreFx.UAP.builds
 delete mode 100644 src/libraries/pkg/Microsoft.Private.CoreFx.UAP/Microsoft.Private.CoreFx.UAP.pkgproj
 delete mode 100644 src/libraries/pkg/Microsoft.Private.CoreFx.UAP/uap.rids.props

diff --git a/src/libraries/pkg/Microsoft.Private.CoreFx.UAP/Configurations.props b/src/libraries/pkg/Microsoft.Private.CoreFx.UAP/Configurations.props
deleted file mode 100644
index a26810a..0000000
--- a/src/libraries/pkg/Microsoft.Private.CoreFx.UAP/Configurations.props
+++ /dev/null
@@ -1,7 +0,0 @@
-<Project>
-  <PropertyGroup>
-    <BuildConfigurations>
-      uap;
-    </BuildConfigurations>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/src/libraries/pkg/Microsoft.Private.CoreFx.UAP/Microsoft.Private.CoreFx.UAP.builds b/src/libraries/pkg/Microsoft.Private.CoreFx.UAP/Microsoft.Private.CoreFx.UAP.builds
deleted file mode 100644
index 0d02fc6..0000000
--- a/src/libraries/pkg/Microsoft.Private.CoreFx.UAP/Microsoft.Private.CoreFx.UAP.builds
+++ /dev/null
@@ -1,10 +0,0 @@
-<Project DefaultTargets="Build">
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />
-
-  <ItemGroup>
-    <!-- Identity project, runtime specific projects are included uap.rids.props. -->
-    <Project Include="$(MSBuildProjectName).pkgproj" Condition="'$(TargetsUap)'=='true'" />
-  </ItemGroup>
-
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(dir.traversal.targets))" />
-</Project>
\ No newline at end of file
diff --git a/src/libraries/pkg/Microsoft.Private.CoreFx.UAP/Microsoft.Private.CoreFx.UAP.pkgproj b/src/libraries/pkg/Microsoft.Private.CoreFx.UAP/Microsoft.Private.CoreFx.UAP.pkgproj
deleted file mode 100644
index 38201c7..0000000
--- a/src/libraries/pkg/Microsoft.Private.CoreFx.UAP/Microsoft.Private.CoreFx.UAP.pkgproj
+++ /dev/null
@@ -1,67 +0,0 @@
-<Project DefaultTargets="Build">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
-  <PropertyGroup>
-    <TargetFrameworkName>uap</TargetFrameworkName>
-    <TargetFrameworkVersion>$(UAPvNextVersion)</TargetFrameworkVersion>
-    <TargetFramework>$(TargetFrameworkName)$(TargetFrameworkVersion)</TargetFramework>
-    <RefBinDir>$(UAPPackageRefPath)</RefBinDir>
-    <LibBinDir>$(UAPPackageRuntimePath)</LibBinDir>
-    <IsFrameworkPackage>true</IsFrameworkPackage>
-    <!-- we cannot build native on Unix -->
-    <IncludeNativeFiles Condition="'$(OS)' != 'Windows_NT'">false</IncludeNativeFiles>
-    <!-- Private packages need symbols -->
-    <IncludeSymbolsInPackage Condition="'$(IncludeSymbolsInPackage)' == ''">true</IncludeSymbolsInPackage>
-
-    <!-- Uap assets are stripped out of other packages, but we don't want to do that for the framework package -->
-    <KeepUAPContent>true</KeepUAPContent>
-  </PropertyGroup>
-  <ItemGroup>
-    <IgnoredReference Include="System.Private.CoreLib" />
-    <IgnoredReference Include="Windows" />
-    <IgnoredReference Include="System.Private.Interop" />
-    <!-- The following three can be removed if we include RefEmit in UAP - tracked by https://github.com/dotnet/corefx/issues/34937 -->
-    <IgnoredReference Include="System.Reflection.Emit" />
-    <IgnoredReference Include="System.Reflection.Emit.ILGeneration" />
-    <IgnoredReference Include="System.Reflection.Emit.Lightweight" />
-
-    <!-- Exclude shims from the closure verification -->
-    <ExcludeFromClosure Include="mscorlib" />
-    <ExcludeFromClosure Include="System" />
-    <ExcludeFromClosure Include="System.Configuration" />
-    <ExcludeFromClosure Include="System.Core" />
-    <ExcludeFromClosure Include="System.Data" />
-    <ExcludeFromClosure Include="System.Drawing" />
-    <ExcludeFromClosure Include="System.Net" />
-    <ExcludeFromClosure Include="System.Security" />
-    <ExcludeFromClosure Include="System.ServiceModel.Web" />
-    <ExcludeFromClosure Include="System.ServiceProcess" />
-    <ExcludeFromClosure Include="System.Transactions" />
-    <ExcludeFromClosure Include="WindowsBase" />
-    <ExcludeFromDuplicateTypes Include="System.Private.Reflection.Metadata.Ecma335" />
-    <!-- Permit the following implementation-only assemblies -->
-    <ValidatePackageSuppression Condition="'$(PackageTargetRuntime)' != ''" Include="PermitInbox">
-      <Value>
-        System.Diagnostics.DiagnosticSource;
-        System.Private.DataContractSerialization;
-        System.Private.Uri;
-        System.Private.Xml;
-        System.Private.Xml.Linq;
-        System.Reflection.Emit.ILGeneration;
-        System.Reflection.Emit.Lightweight;
-        System.Reflection.Emit;
-        System.Security.AccessControl;
-        System.Security.Cryptography.Cng;
-        System.Security.Principal.Windows;
-        System.Threading.Tasks.Extensions;
-      </Value>
-    </ValidatePackageSuppression>
-    <!-- Permit missing Inbox since this used to be a shim and it is now OOB -->
-    <ValidatePackageSuppression Include="PermitMissingInbox">
-      <Value>
-            System.ComponentModel.Composition;
-            System.Reflection.Context;
-        </Value>
-    </ValidatePackageSuppression>
-  </ItemGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
-</Project>
diff --git a/src/libraries/pkg/Microsoft.Private.CoreFx.UAP/uap.rids.props b/src/libraries/pkg/Microsoft.Private.CoreFx.UAP/uap.rids.props
deleted file mode 100644
index 7db9c21..0000000
--- a/src/libraries/pkg/Microsoft.Private.CoreFx.UAP/uap.rids.props
+++ /dev/null
@@ -1,24 +0,0 @@
-<Project>
-  <ItemGroup>
-    <OfficialBuildRID Include="win10-x86">
-      <Platform>x86</Platform>
-    </OfficialBuildRID>
-    <OfficialBuildRID Include="win10-x64" />
-    <OfficialBuildRID Include="win10-arm">
-      <Platform>arm</Platform>
-    </OfficialBuildRID>
-    <OfficialBuildRID Include="win10-arm64">
-      <Platform>arm64</Platform>
-    </OfficialBuildRID>
-    <OfficialBuildRID Include="win10-x86-aot">
-      <Platform>x86</Platform>
-    </OfficialBuildRID>
-    <OfficialBuildRID Include="win10-x64-aot" />
-    <OfficialBuildRID Include="win10-arm-aot">
-      <Platform>arm</Platform>
-    </OfficialBuildRID>
-    <OfficialBuildRID Include="win10-arm64-aot">
-      <Platform>arm64</Platform>
-    </OfficialBuildRID>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/src/libraries/pkg/descriptions.json b/src/libraries/pkg/descriptions.json
index 975b3d4..bb20251 100644
--- a/src/libraries/pkg/descriptions.json
+++ b/src/libraries/pkg/descriptions.json
@@ -151,11 +151,6 @@
     "CommonTypes": []
   },
   {
-    "Name": "Microsoft.Private.CoreFx.UAP",
-    "Description": "Package used to represent the portions of UAP that come from CoreFx.",
-    "CommonTypes": []
-  },
-  {
     "Name": "Microsoft.TargetingPack.NETFramework.v4.6",
     "Description": "Contains the .NET Framework v4.6 targeting pack.",
     "CommonTypes": []
-- 
2.7.4