From 061a4af379011677657522ab3186bcb57a6c2822 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Mon, 26 Apr 2021 22:44:15 +0200
Subject: [PATCH] Dead end System.ComponentModel.Annotations package

Nearly all configurations in the System.ComponentModel.Annotations
package weren't built live anymore and just redistributed from older
packages. Except for the netstandard2.0 configuration, the package
didn't receive any changes. As the library is exposed as part of the
shared framework, a reference to the package on .NETCoreApp isn't
necessary and will be ignored by the SDK.

Based on these reasons, dead-ending the package to remove the burden
of maintaining the harvesting of old configurations.

Contributes to https://github.com/dotnet/runtime/issues/47530
---
 eng/Versions.props                            |  2 +-
 ....Extensions.Options.DataAnnotations.csproj |  6 +---
 .../Directory.Build.props                     | 13 ---------
 .../System.ComponentModel.Annotations.pkgproj | 29 -------------------
 .../System.ComponentModel.Annotations.csproj  | 12 ++++----
 .../System.ComponentModel.Annotations.csproj  | 11 ++-----
 src/libraries/pkg/baseline/packageIndex.json  |  5 ++--
 7 files changed, 13 insertions(+), 65 deletions(-)
 delete mode 100644 src/libraries/System.ComponentModel.Annotations/pkg/System.ComponentModel.Annotations.pkgproj

diff --git a/eng/Versions.props b/eng/Versions.props
index 3438a89b00313..b006d304bfcca 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -81,7 +81,7 @@
     <SystemBuffersVersion>4.5.1</SystemBuffersVersion>
     <SystemCollectionsVersion>4.3.0</SystemCollectionsVersion>
     <SystemCollectionsConcurrentVersion>4.3.0</SystemCollectionsConcurrentVersion>
-    <SystemComponentModelAnnotationsVersion>4.7.0</SystemComponentModelAnnotationsVersion>
+    <SystemComponentModelAnnotationsVersion>5.0.0</SystemComponentModelAnnotationsVersion>
     <SystemDataSqlClientVersion>4.8.1</SystemDataSqlClientVersion>
     <SystemDiagnosticsContractsVersion>4.3.0</SystemDiagnosticsContractsVersion>
     <SystemDiagnosticsDebugVersion>4.3.0</SystemDiagnosticsDebugVersion>
diff --git a/src/libraries/Microsoft.Extensions.Options.DataAnnotations/src/Microsoft.Extensions.Options.DataAnnotations.csproj b/src/libraries/Microsoft.Extensions.Options.DataAnnotations/src/Microsoft.Extensions.Options.DataAnnotations.csproj
index bcf5ce56123e9..56e09a3300f20 100644
--- a/src/libraries/Microsoft.Extensions.Options.DataAnnotations/src/Microsoft.Extensions.Options.DataAnnotations.csproj
+++ b/src/libraries/Microsoft.Extensions.Options.DataAnnotations/src/Microsoft.Extensions.Options.DataAnnotations.csproj
@@ -10,14 +10,10 @@
     <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Options\src\Microsoft.Extensions.Options.csproj" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
+  <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETStandard'">
     <PackageReference Include="System.ComponentModel.Annotations" Version="$(SystemComponentModelAnnotationsVersion)" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.1'">
-    <ProjectReference Include="$(LibrariesProjectRoot)System.ComponentModel.Annotations\src\System.ComponentModel.Annotations.csproj" />
-  </ItemGroup>
-
   <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))">
     <Reference Include="System.ComponentModel.DataAnnotations" />
   </ItemGroup>
diff --git a/src/libraries/System.ComponentModel.Annotations/Directory.Build.props b/src/libraries/System.ComponentModel.Annotations/Directory.Build.props
index 4c4a6c680d76c..63f02a0f817ef 100644
--- a/src/libraries/System.ComponentModel.Annotations/Directory.Build.props
+++ b/src/libraries/System.ComponentModel.Annotations/Directory.Build.props
@@ -2,18 +2,5 @@
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
-    <PackageDescription>Provides attributes that are used to define metadata for objects used as data sources.
-
-Commonly Used Types:
-System.ComponentModel.DataAnnotations.ValidationResult
-System.ComponentModel.DataAnnotations.IValidatableObject
-System.ComponentModel.DataAnnotations.ValidationAttribute
-System.ComponentModel.DataAnnotations.RequiredAttribute
-System.ComponentModel.DataAnnotations.StringLengthAttribute
-System.ComponentModel.DataAnnotations.DisplayAttribute
-System.ComponentModel.DataAnnotations.RegularExpressionAttribute
-System.ComponentModel.DataAnnotations.DataTypeAttribute
-System.ComponentModel.DataAnnotations.RangeAttribute
-System.ComponentModel.DataAnnotations.KeyAttribute</PackageDescription>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/src/libraries/System.ComponentModel.Annotations/pkg/System.ComponentModel.Annotations.pkgproj b/src/libraries/System.ComponentModel.Annotations/pkg/System.ComponentModel.Annotations.pkgproj
deleted file mode 100644
index dd046a9850aac..0000000000000
--- a/src/libraries/System.ComponentModel.Annotations/pkg/System.ComponentModel.Annotations.pkgproj
+++ /dev/null
@@ -1,29 +0,0 @@
-<Project DefaultTargets="Build">
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />
-  <ItemGroup>
-    <ProjectReference Include="..\ref\System.ComponentModel.Annotations.csproj">
-      <SupportedFramework>netcoreapp3.0;$(AllXamarinFrameworks)</SupportedFramework>
-    </ProjectReference>
-    <ProjectReference Include="..\src\System.ComponentModel.Annotations.csproj" />
-    <HarvestIncludePaths Include="ref/netcore50;lib/netcore50" />
-    <HarvestIncludePaths Include="ref/netstandard1.1" />
-    <HarvestIncludePaths Include="ref/netstandard1.3" />
-    <HarvestIncludePaths Include="ref/netstandard1.4;lib/netstandard1.4" />
-    <HarvestIncludePaths Include="ref/netstandard2.0;lib/netstandard2.0" />
-    <HarvestIncludePaths Include="ref/net461;lib/net461" />
-    <InboxOnTargetFramework Include="$(AllXamarinFrameworks)" />
-    <InboxOnTargetFramework Include="net45">
-      <FrameworkReference>System.ComponentModel.DataAnnotations</FrameworkReference>
-    </InboxOnTargetFramework>
-    <InboxOnTargetFramework Include="win8" />
-    <InboxOnTargetFramework Include="portable-net45+win8" />
-    <ValidatePackageSuppression Include="PermitMissingImplementation">
-      <!-- Supported inbox by all ns1.1-1.3 frameworks -->
-      <Value>.NETStandard,Version=v1.1;.NETStandard,Version=v1.2;.NETStandard,Version=v1.3</Value>
-    </ValidatePackageSuppression>
-    <ValidatePackageSuppression Include="TreatAsOutOfBox">
-      <Value>.NETCoreApp;UAP</Value>
-    </ValidatePackageSuppression>
-  </ItemGroup>
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
-</Project>
\ No newline at end of file
diff --git a/src/libraries/System.ComponentModel.Annotations/ref/System.ComponentModel.Annotations.csproj b/src/libraries/System.ComponentModel.Annotations/ref/System.ComponentModel.Annotations.csproj
index 0f88fe44694e2..2267869cc4b98 100644
--- a/src/libraries/System.ComponentModel.Annotations/ref/System.ComponentModel.Annotations.csproj
+++ b/src/libraries/System.ComponentModel.Annotations/ref/System.ComponentModel.Annotations.csproj
@@ -1,12 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.1</TargetFrameworks>
+    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.ComponentModel.Annotations.cs" />
-    <Compile Include="$(CoreLibSharedDir)System\Diagnostics\CodeAnalysis\DynamicallyAccessedMembersAttribute.cs" />
-    <Compile Include="$(CoreLibSharedDir)System\Diagnostics\CodeAnalysis\DynamicallyAccessedMemberTypes.cs" />
-    <Compile Include="$(CoreLibSharedDir)System\Diagnostics\CodeAnalysis\RequiresUnreferencedCodeAttribute.cs" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+  <ItemGroup>
+    <ProjectReference Include="$(LibrariesProjectRoot)System.ComponentModel\ref\System.ComponentModel.csproj" />
+    <ProjectReference Include="$(LibrariesProjectRoot)System.ComponentModel.TypeConverter\ref\System.ComponentModel.TypeConverter.csproj" />
+    <ProjectReference Include="$(LibrariesProjectRoot)System.Runtime\ref\System.Runtime.csproj" />
+  </ItemGroup>
+</Project>
diff --git a/src/libraries/System.ComponentModel.Annotations/src/System.ComponentModel.Annotations.csproj b/src/libraries/System.ComponentModel.Annotations/src/System.ComponentModel.Annotations.csproj
index bc9a4134bad68..9c9dfebee9acc 100644
--- a/src/libraries/System.ComponentModel.Annotations/src/System.ComponentModel.Annotations.csproj
+++ b/src/libraries/System.ComponentModel.Annotations/src/System.ComponentModel.Annotations.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>$(NetCoreAppCurrent);netstandard2.1</TargetFrameworks>
-    <ExcludeCurrentNetCoreAppFromPackage>true</ExcludeCurrentNetCoreAppFromPackage>
+    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
     <Nullable>enable</Nullable>
     <!--
       Since many resource strings in this library are shown to an end-user,
@@ -60,13 +59,7 @@
     <Compile Include="$(CommonPath)System\NotImplemented.cs"
              Link="Common\System\NotImplemented.cs" />
   </ItemGroup>
-  <ItemGroup Condition="$([MSBuild]::GetTargetFrameworkIdentifier('$(TargetFramework)')) != '.NETCoreApp'">
-    <Compile Include="$(CoreLibSharedDir)System\Diagnostics\CodeAnalysis\DynamicallyAccessedMembersAttribute.cs" />
-    <Compile Include="$(CoreLibSharedDir)System\Diagnostics\CodeAnalysis\DynamicallyAccessedMemberTypes.cs" />
-    <Compile Include="$(CoreLibSharedDir)System\Diagnostics\CodeAnalysis\RequiresUnreferencedCodeAttribute.cs" />
-    <Compile Include="$(CoreLibSharedDir)System\Diagnostics\CodeAnalysis\UnconditionalSuppressMessageAttribute.cs" />
-  </ItemGroup>
-  <ItemGroup Condition="$([MSBuild]::GetTargetFrameworkIdentifier('$(TargetFramework)')) == '.NETCoreApp'">
+  <ItemGroup>
     <Reference Include="System.Collections" />
     <Reference Include="System.Collections.Concurrent" />
     <Reference Include="System.ComponentModel" />
diff --git a/src/libraries/pkg/baseline/packageIndex.json b/src/libraries/pkg/baseline/packageIndex.json
index 23d23bb500793..40018a9aec9e0 100644
--- a/src/libraries/pkg/baseline/packageIndex.json
+++ b/src/libraries/pkg/baseline/packageIndex.json
@@ -2030,7 +2030,7 @@
         "4.6.0",
         "5.0.0"
       ],
-      "BaselineVersion": "6.0.0",
+      "BaselineVersion": "5.0.0",
       "InboxOn": {
         "netcoreapp2.0": "4.2.0.0",
         "netcoreapp2.1": "4.2.1.0",
@@ -2059,8 +2059,7 @@
         "4.2.0.0": "4.4.0",
         "4.2.1.0": "4.5.0",
         "4.3.0.0": "4.6.0",
-        "5.0.0.0": "5.0.0",
-        "6.0.0.0": "6.0.0"
+        "5.0.0.0": "5.0.0"
       }
     },
     "System.ComponentModel.Composition": {