From d25a7658c82cfabd06193e09b946bb2a5e9afc2f Mon Sep 17 00:00:00 2001
From: Eric Erhardt <eric.erhardt@microsoft.com>
Date: Mon, 10 Aug 2020 13:59:59 -0500
Subject: [PATCH] Remove LinkerWorkaround.xml (#24748)

* Remove LinkerWorkaround.xml

The workaround file is no longer needed, now that the underlying bugs are fixed in the dotnet/runtime libraries.

Fix #23262

* Also remove LinkerWorkaround from Components/WebAssembly
---
 .../Sdk/src/targets/LinkerWorkaround.xml          | 15 ---------------
 ...soft.NET.Sdk.BlazorWebAssembly.Current.targets |  1 -
 .../src/build/netstandard2.0/LinkerWorkaround.xml | 15 ---------------
 ...icrosoft.NET.Sdk.Razor.Components.Wasm.targets |  1 -
 4 files changed, 32 deletions(-)
 delete mode 100644 src/Components/WebAssembly/Sdk/src/targets/LinkerWorkaround.xml
 delete mode 100644 src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/LinkerWorkaround.xml

diff --git a/src/Components/WebAssembly/Sdk/src/targets/LinkerWorkaround.xml b/src/Components/WebAssembly/Sdk/src/targets/LinkerWorkaround.xml
deleted file mode 100644
index c61bc7a3cc..0000000000
--- a/src/Components/WebAssembly/Sdk/src/targets/LinkerWorkaround.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<linker>
-
-  <!-- This file specifies which parts of the BCL or Blazor packages must not be stripped
-  by the IL linker even if they are not referenced by user code. The file format is
-  described at https://github.com/mono/linker/blob/master/src/linker/README.md#syntax-of-xml-descriptor -->
-
-  <assembly fullname="System">
-    <!-- Without this, [Required(typeof(bool), "true", "true", ErrorMessage = "...")] fails -->
-    <type fullname="System.ComponentModel.BooleanConverter" />
-
-    <!-- TypeConverters are only used through reflection. These are two built-in TypeConverters that are useful. -->
-    <type fullname="System.ComponentModel.GuidConverter" />
-    <type fullname="System.ComponentModel.TimeSpanConverter" />
-  </assembly>
-</linker>
diff --git a/src/Components/WebAssembly/Sdk/src/targets/Microsoft.NET.Sdk.BlazorWebAssembly.Current.targets b/src/Components/WebAssembly/Sdk/src/targets/Microsoft.NET.Sdk.BlazorWebAssembly.Current.targets
index a0c4faa979..eaf1888673 100644
--- a/src/Components/WebAssembly/Sdk/src/targets/Microsoft.NET.Sdk.BlazorWebAssembly.Current.targets
+++ b/src/Components/WebAssembly/Sdk/src/targets/Microsoft.NET.Sdk.BlazorWebAssembly.Current.targets
@@ -405,7 +405,6 @@ Copyright (c) .NET Foundation. All rights reserved.
 
     <ItemGroup>
       <TrimmerRootDescriptor Include="$(_BlazorTypeGranularTrimmerDescriptorFile)" />
-      <TrimmerRootDescriptor Include="$(MSBuildThisFileDirectory)LinkerWorkaround.xml" />
 
       <FileWrites Include="$(_BlazorTypeGranularTrimmerDescriptorFile)" />
     </ItemGroup>
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/LinkerWorkaround.xml b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/LinkerWorkaround.xml
deleted file mode 100644
index c61bc7a3cc..0000000000
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/LinkerWorkaround.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<linker>
-
-  <!-- This file specifies which parts of the BCL or Blazor packages must not be stripped
-  by the IL linker even if they are not referenced by user code. The file format is
-  described at https://github.com/mono/linker/blob/master/src/linker/README.md#syntax-of-xml-descriptor -->
-
-  <assembly fullname="System">
-    <!-- Without this, [Required(typeof(bool), "true", "true", ErrorMessage = "...")] fails -->
-    <type fullname="System.ComponentModel.BooleanConverter" />
-
-    <!-- TypeConverters are only used through reflection. These are two built-in TypeConverters that are useful. -->
-    <type fullname="System.ComponentModel.GuidConverter" />
-    <type fullname="System.ComponentModel.TimeSpanConverter" />
-  </assembly>
-</linker>
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Components.Wasm.targets b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Components.Wasm.targets
index 3df372457c..f748e635dc 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Components.Wasm.targets
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Components.Wasm.targets
@@ -387,7 +387,6 @@ Copyright (c) .NET Foundation. All rights reserved.
 
     <ItemGroup>
       <TrimmerRootDescriptor Include="$(_BlazorTypeGranularTrimmerDescriptorFile)" />
-      <TrimmerRootDescriptor Include="$(MSBuildThisFileDirectory)LinkerWorkaround.xml" />
 
       <FileWrites Include="$(_BlazorTypeGranularTrimmerDescriptorFile)" />
     </ItemGroup>