From ee36140a98ada30233fc1a47a7808a5758034a2b Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Tue, 4 Jun 2019 10:45:56 +0200
Subject: [PATCH] Retarget RefContext and CompRegistration to NS2.1

Commit migrated from https://github.com/dotnet/corefx/commit/97a07058b7cdb4f066fd81562102a44adbde5338
---
 ...ystem.ComponentModel.Composition.Registration.pkgproj |  2 +-
 .../ref/Configurations.props                             |  3 +--
 ...System.ComponentModel.Composition.Registration.csproj |  2 +-
 .../src/Configurations.props                             |  7 +------
 ...System.ComponentModel.Composition.Registration.csproj | 14 ++------------
 .../tests/Configurations.props                           |  1 -
 ....ComponentModel.Composition.Registration.Tests.csproj |  3 +--
 .../System.Reflection.Context/src/Configurations.props   |  4 +---
 .../src/System.Reflection.Context.csproj                 | 16 +++++-----------
 .../System.Reflection.Context/tests/Configurations.props |  1 -
 .../tests/System.Reflection.Context.Tests.csproj         |  2 +-
 11 files changed, 14 insertions(+), 41 deletions(-)

diff --git a/src/libraries/System.ComponentModel.Composition.Registration/pkg/System.ComponentModel.Composition.Registration.pkgproj b/src/libraries/System.ComponentModel.Composition.Registration/pkg/System.ComponentModel.Composition.Registration.pkgproj
index 4bc86a9..c2f62c3 100644
--- a/src/libraries/System.ComponentModel.Composition.Registration/pkg/System.ComponentModel.Composition.Registration.pkgproj
+++ b/src/libraries/System.ComponentModel.Composition.Registration/pkg/System.ComponentModel.Composition.Registration.pkgproj
@@ -2,7 +2,7 @@
     <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
     <ItemGroup>
     <ProjectReference Include="..\ref\System.ComponentModel.Composition.Registration.csproj">
-      <SupportedFramework>uap10.0.16299;netcoreapp2.0;net45;$(AllXamarinFrameworks)</SupportedFramework>
+      <SupportedFramework>netcoreapp3.0;net45;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\System.ComponentModel.Composition.Registration.csproj" />
     <InboxOnTargetFramework Include="net45">
diff --git a/src/libraries/System.ComponentModel.Composition.Registration/ref/Configurations.props b/src/libraries/System.ComponentModel.Composition.Registration/ref/Configurations.props
index 045fafb..a6a7390 100644
--- a/src/libraries/System.ComponentModel.Composition.Registration/ref/Configurations.props
+++ b/src/libraries/System.ComponentModel.Composition.Registration/ref/Configurations.props
@@ -1,8 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netstandard;
-      _netfx;
+      netstandard2.1;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
diff --git a/src/libraries/System.ComponentModel.Composition.Registration/ref/System.ComponentModel.Composition.Registration.csproj b/src/libraries/System.ComponentModel.Composition.Registration/ref/System.ComponentModel.Composition.Registration.csproj
index c59595f..10b4d4f 100644
--- a/src/libraries/System.ComponentModel.Composition.Registration/ref/System.ComponentModel.Composition.Registration.csproj
+++ b/src/libraries/System.ComponentModel.Composition.Registration/ref/System.ComponentModel.Composition.Registration.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <ProjectGuid>{6E0C5F44-0160-4082-A25C-2DB8EA7ED30D}</ProjectGuid>
-    <Configurations>netstandard-Debug;netstandard-Release</Configurations>
+    <Configurations>netstandard2.1-Debug;netstandard2.1-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.ComponentModel.Composition.Registration.cs" />
diff --git a/src/libraries/System.ComponentModel.Composition.Registration/src/Configurations.props b/src/libraries/System.ComponentModel.Composition.Registration/src/Configurations.props
index 4bc0dac..2beda10 100644
--- a/src/libraries/System.ComponentModel.Composition.Registration/src/Configurations.props
+++ b/src/libraries/System.ComponentModel.Composition.Registration/src/Configurations.props
@@ -1,12 +1,7 @@
 <Project>
   <PropertyGroup>
-    <PackageConfigurations>
-      netstandard;
-    </PackageConfigurations>
     <BuildConfigurations>
-      $(PackageConfigurations);
-      netcoreapp;
-      uap;
+      netstandard2.1;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
diff --git a/src/libraries/System.ComponentModel.Composition.Registration/src/System.ComponentModel.Composition.Registration.csproj b/src/libraries/System.ComponentModel.Composition.Registration/src/System.ComponentModel.Composition.Registration.csproj
index cfbb9e8..6a7d50a 100644
--- a/src/libraries/System.ComponentModel.Composition.Registration/src/System.ComponentModel.Composition.Registration.csproj
+++ b/src/libraries/System.ComponentModel.Composition.Registration/src/System.ComponentModel.Composition.Registration.csproj
@@ -2,10 +2,9 @@
   <PropertyGroup>
     <ProjectGuid>{E3663E26-6819-4997-B372-94454DB4D60E}</ProjectGuid>
     <AssemblyName>System.ComponentModel.Composition.Registration</AssemblyName>
-    <GeneratePlatformNotSupportedAssemblyMessage Condition="'$(TargetGroup)' == 'netstandard'">SR.PlatformNotSupported_ComponentModel_Composition_Registration</GeneratePlatformNotSupportedAssemblyMessage>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release;netstandard-Debug;netstandard-Release;uap-Debug;uap-Release</Configurations>
+    <Configurations>netstandard2.1-Debug;netstandard2.1-Release</Configurations>
   </PropertyGroup>
-  <ItemGroup Condition="'$(TargetGroup)' != 'netstandard'">
+  <ItemGroup>
     <Compile Include="System\ComponentModel\Composition\Registration\ExportBuilder.cs" />
     <Compile Include="System\ComponentModel\Composition\Registration\ImportBuilder.cs" />
     <Compile Include="System\ComponentModel\Composition\Registration\ParameterImportBuilder.cs" />
@@ -35,13 +34,4 @@
     <Reference Include="System.ComponentModel.Composition" />
     <Reference Include="System.Reflection.Context" />
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetGroup)' != 'netstandard'">
-    <Reference Include="System.Collections" />
-    <Reference Include="System.Diagnostics.Debug" />
-    <Reference Include="System.Linq" />
-    <Reference Include="System.Linq.Expressions" />
-    <Reference Include="System.Resources.ResourceManager" />
-    <Reference Include="System.Runtime" />
-    <Reference Include="System.Threading" />
-  </ItemGroup>
 </Project>
diff --git a/src/libraries/System.ComponentModel.Composition.Registration/tests/Configurations.props b/src/libraries/System.ComponentModel.Composition.Registration/tests/Configurations.props
index 2b2323d..19236e7 100644
--- a/src/libraries/System.ComponentModel.Composition.Registration/tests/Configurations.props
+++ b/src/libraries/System.ComponentModel.Composition.Registration/tests/Configurations.props
@@ -2,7 +2,6 @@
   <PropertyGroup>
     <BuildConfigurations>
       netcoreapp;
-      uap;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
diff --git a/src/libraries/System.ComponentModel.Composition.Registration/tests/System.ComponentModel.Composition.Registration.Tests.csproj b/src/libraries/System.ComponentModel.Composition.Registration/tests/System.ComponentModel.Composition.Registration.Tests.csproj
index c691136..aba6504 100644
--- a/src/libraries/System.ComponentModel.Composition.Registration/tests/System.ComponentModel.Composition.Registration.Tests.csproj
+++ b/src/libraries/System.ComponentModel.Composition.Registration/tests/System.ComponentModel.Composition.Registration.Tests.csproj
@@ -1,8 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <!-- TODO: Add netfx configuration after OOB package bug is fixed: https://github.com/dotnet/corefx/issues/23889 -->
   <PropertyGroup>
     <ProjectGuid>{0F8CFFA3-6E16-4642-82C1-289D95338D7C}</ProjectGuid>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release;uap-Debug;uap-Release</Configurations>
+    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="InternalCalls.cs" />
diff --git a/src/libraries/System.Reflection.Context/src/Configurations.props b/src/libraries/System.Reflection.Context/src/Configurations.props
index 090e947..1cdc42d 100644
--- a/src/libraries/System.Reflection.Context/src/Configurations.props
+++ b/src/libraries/System.Reflection.Context/src/Configurations.props
@@ -1,11 +1,9 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
       netstandard;
       netstandard1.1;
-      uap;
-      _netfx;
+      netstandard2.1;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/src/libraries/System.Reflection.Context/src/System.Reflection.Context.csproj b/src/libraries/System.Reflection.Context/src/System.Reflection.Context.csproj
index 2750203..5268e05 100644
--- a/src/libraries/System.Reflection.Context/src/System.Reflection.Context.csproj
+++ b/src/libraries/System.Reflection.Context/src/System.Reflection.Context.csproj
@@ -2,12 +2,10 @@
   <PropertyGroup>
     <OutputType>Library</OutputType>
     <ProjectGuid>{404DB891-B5AF-41E6-B89D-29E3F4573C4F}</ProjectGuid>
-    <!-- Only supported on .NET Framework, .NET Core and UAP -->
-    <GeneratePlatformNotSupportedAssemblyMessage Condition="'$(TargetGroup)' == 'netstandard1.1' OR '$(TargetGroup)' == 'netstandard'">SR.PlatformNotSupported_ReflectionContext</GeneratePlatformNotSupportedAssemblyMessage>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release;netstandard-Debug;netstandard-Release;netstandard1.1-Debug;netstandard1.1-Release;uap-Debug;uap-Release</Configurations>
+    <GeneratePlatformNotSupportedAssemblyMessage Condition="'$(TargetFramework)' == 'netstandard1.1' OR '$(TargetFramework)' == 'netstandard2.0'">SR.PlatformNotSupported_ReflectionContext</GeneratePlatformNotSupportedAssemblyMessage>
+    <Configurations>netstandard2.1-Debug;netstandard2.1-Release;netstandard-Debug;netstandard-Release;netstandard1.1-Debug;netstandard1.1-Release</Configurations>
   </PropertyGroup>
-  <!-- Default configurations to help VS understand the options -->
-  <ItemGroup Condition="'$(TargetGroup)' == 'netcoreapp' OR '$(TargetGroup)' == 'uap'">
+  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.1'">
     <Compile Include="System\Reflection\Context\CollectionServices.cs" />
     <Compile Include="System\Reflection\Context\CustomReflectionContext.cs" />
     <Compile Include="System\Reflection\Context\CustomReflectionContext.Projector.cs" />
@@ -64,13 +62,9 @@
     <Compile Include="System\Reflection\Context\Virtual\VirtualPropertyInfo.PropertySetter.cs" />
     <Compile Include="System\Reflection\Context\Virtual\VirtualReturnParameter.cs" />
   </ItemGroup>
-  <ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.1'">
     <Reference Include="System.Runtime" />
     <Reference Include="System.Reflection" />
     <Reference Include="System.Resources.ResourceManager" />
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetGroup)' == 'netcoreapp' OR '$(TargetGroup)' == 'uap'">
-    <Reference Include="System.Collections" />
-    <Reference Include="System.Diagnostics.Debug" />
-  </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.Reflection.Context/tests/Configurations.props b/src/libraries/System.Reflection.Context/tests/Configurations.props
index 1a037ad..55d2de1 100644
--- a/src/libraries/System.Reflection.Context/tests/Configurations.props
+++ b/src/libraries/System.Reflection.Context/tests/Configurations.props
@@ -2,7 +2,6 @@
   <PropertyGroup>
     <BuildConfigurations>
       netcoreapp;
-      netfx;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/src/libraries/System.Reflection.Context/tests/System.Reflection.Context.Tests.csproj b/src/libraries/System.Reflection.Context/tests/System.Reflection.Context.Tests.csproj
index c37a805..d667434 100644
--- a/src/libraries/System.Reflection.Context/tests/System.Reflection.Context.Tests.csproj
+++ b/src/libraries/System.Reflection.Context/tests/System.Reflection.Context.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <ProjectGuid>{6183784D-CF12-476F-BA5F-CFAFF1EF1BE3}</ProjectGuid>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release;netfx-Debug;netfx-Release</Configurations>
+    <Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="CustomAssemblyAttributes.cs" />
-- 
2.7.4