Merge pull request #6163 from dotnet-bot/from-tfs

Merge changes from TFS

3 files changed, 29 insertions, 0 deletions

diff --git a/src/System.Private.CoreLib/src/Resources/Strings.resx b/src/System.Private.CoreLib/src/Resources/Strings.resx
index 5b870d38b..1cfdaaa76 100644
--- a/src/System.Private.CoreLib/src/Resources/Strings.resx
+++ b/src/System.Private.CoreLib/src/Resources/Strings.resx
@@ -2392,6 +2392,9 @@
   <data name="Serialization_DateTimeTicksOutOfRange" xml:space="preserve">
     <value>Invalid serialized DateTime data. Ticks must be between DateTime.MinValue.Ticks and DateTime.MaxValue.Ticks.</value>
   </data>
+  <data name="FeatureRemoved_Message" xml:space="preserve">
+    <value>Code to support feature '{0}' was removed during publishing. If this is in error, update the project configuration to not disable feature '{0}'.</value>
+  </data>
   <data name="Arg_InvalidANSIString" xml:space="preserve">
     <value>The ANSI string passed in could not be converted from the default ANSI code page to Unicode.</value>
   </data>
diff --git a/src/System.Private.CoreLib/src/System.Private.CoreLib.csproj b/src/System.Private.CoreLib/src/System.Private.CoreLib.csproj
index 605b68f64..ee7b79f3b 100644
--- a/src/System.Private.CoreLib/src/System.Private.CoreLib.csproj
+++ b/src/System.Private.CoreLib/src/System.Private.CoreLib.csproj
@@ -149,6 +149,7 @@
     <Compile Include="Interop\Interop.manual.cs" />
     <Compile Include="Interop\Interop.WinRT.cs" Condition="'$(EnableWinRT)' == 'true'" />
     <Compile Include="System\Runtime\CompilerServices\CastableObject.cs" />
+    <Compile Include="System\Runtime\CompilerServices\FeatureRemovedException.cs" />
     <Compile Include="System\Reflection\AssemblyNameHelpers.StrongName.cs" />
     <Compile Include="System\Reflection\AssemblyNameHelpers.cs" />
     <Compile Include="System\Reflection\AssemblyNameLexer.cs" />
diff --git a/src/System.Private.CoreLib/src/System/Runtime/CompilerServices/FeatureRemovedException.cs b/src/System.Private.CoreLib/src/System/Runtime/CompilerServices/FeatureRemovedException.cs
new file mode 100644
index 000000000..fce17a87f
--- /dev/null
+++ b/src/System.Private.CoreLib/src/System/Runtime/CompilerServices/FeatureRemovedException.cs
@@ -0,0 +1,25 @@
+// 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.
+
+namespace System.Runtime.CompilerServices
+{
+    // Exception to be thrown when a feature was removed during publishing.
+    internal sealed class FeatureRemovedException : Exception
+    {
+        public string FeatureName { get; }
+
+        public FeatureRemovedException(string featureName)
+        {
+            FeatureName = featureName;
+        }
+
+        public override string Message
+        {
+            get
+            {
+                return SR.Format(SR.FeatureRemoved_Message, FeatureName);
+            }
+        }
+    }
+}