Prefer ILLinkTrim.xml over InternalsVisibleTo (System.Text.Encodings.Web) (dotnet...

Commit migrated from https://github.com/dotnet/corefx/commit/22ce0f6e236001f8280c5f8639f546a301a89a6c

diff --git a/src/libraries/System.Text.Encodings.Web/src/ILLinkTrim.xml b/src/libraries/System.Text.Encodings.Web/src/ILLinkTrim.xml
new file mode 100644 (file)
index 0000000..5afdc6d
--- /dev/null
+++ b/src/libraries/System.Text.Encodings.Web/src/ILLinkTrim.xml
@@ -0,0 +1,9 @@
+<linker>
+  <assembly fullname="System.Text.Encodings.Web">
+    <type fullname="System.Text.Encodings.Web.TextEncoder">
+      <!-- Not exposed via ref asm, but needed by JSON project and tests -->
+      <method name="EncodeUtf8Shim" />
+      <method name="FindFirstCharacterToEncodeUtf8Shim" />
+    </type>
+  </assembly>
+</linker>

diff --git a/src/libraries/System.Text.Encodings.Web/src/Properties/InternalsVisibleTo.cs b/src/libraries/System.Text.Encodings.Web/src/Properties/InternalsVisibleTo.cs
deleted file mode 100644 (file)
index 21107aa..0000000
--- a/src/libraries/System.Text.Encodings.Web/src/Properties/InternalsVisibleTo.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System.Runtime.CompilerServices;
-
-// This attribute only exists to prevent the build system from tree shaking
-// internal members out of the final compiled binary.
-
-[assembly: InternalsVisibleTo("System.Text.Encodings.Web.Tests, PublicKey=00240000048000009400000006020000002400005253413100040000010001004b86c4cb78549b34bab61a3b1800e23bfeb5b3ec390074041536a7e3cbd97f5f04cf0f857155a8928eaa29ebfd11cfbbad3ba70efea7bda3226c6a8d370a4cd303f714486b6ebc225985a638471e6ef571cc92a4613c00b8fa65d61ccee0cbe5f36330c9a01f4183559f1bef24cc2917c6d913e3a541333a1d05d9bed22b38cb")]

diff --git a/src/libraries/System.Text.Encodings.Web/src/System.Text.Encodings.Web.csproj b/src/libraries/System.Text.Encodings.Web/src/System.Text.Encodings.Web.csproj
index e27938f..aeb7f63 100644 (file)
--- a/src/libraries/System.Text.Encodings.Web/src/System.Text.Encodings.Web.csproj
+++ b/src/libraries/System.Text.Encodings.Web/src/System.Text.Encodings.Web.csproj
@@ -6,9 +6,6 @@
     <Configurations>netcoreapp-Debug;netcoreapp-Release;netstandard-Debug;netstandard-Release;uap-Windows_NT-Debug;uap-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="Properties\InternalsVisibleTo.cs" />
-  </ItemGroup>
-  <ItemGroup>
     <Compile Include="System\Text\Encodings\Web\HexUtil.cs" />
     <Compile Include="System\Text\Encodings\Web\HtmlEncoder.cs" />
     <Compile Include="System\Text\Encodings\Web\JavaScriptEncoder.cs" />