Add a general mesasge in the Strings.resx

Author: ArminShoeibi

src/libraries/System.Net.Primitives/src/Resources/Strings.resx

@@ -1,4 +1,64 @@
-<root>
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
   <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
     <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
     <xsd:element name="root" msdata:IsDataSet="true">
@@ -117,4 +177,7 @@
   <data name="PlatformNotSupported_NetPrimitives" xml:space="preserve">
     <value>System.Net.Primitives is not supported on this platform.</value>
   </data>
+  <data name="net_SocketException_OperationNotSupported" xml:space="preserve">
+    <value>The requested property is not supported for the current AddressFamily '{0}'. Use ScopeId for IPv6 or Address for IPv4 as appropriate.</value>
+  </data>
 </root>

src/libraries/System.Net.Primitives/src/System/Net/IPAddress.cs

@@ -771,9 +771,7 @@ public IPAddress MapToIPv4()
         [DoesNotReturn]
         private void ThrowSocketOperationNotSupported()
         {
-            string message = IsIPv4 ? "The requested operation is not supported for IPv4 addresses." :
-                                      "The requested operation is not supported for IPv6 addresses.";
-            throw new SocketException(SocketError.OperationNotSupported, message);
+            throw new SocketException(SocketError.OperationNotSupported, SR.Format(SR.net_SocketException_OperationNotSupported, AddressFamily));
         }
 
         private sealed class ReadOnlyIPAddress : IPAddress

src/libraries/System.Net.Primitives/tests/FunctionalTests/IPAddressTest.cs

@@ -306,7 +306,7 @@ public static IEnumerable<object[]> GetValidIPAddresses()
         {
             return IPAddressParsingFormatting.ValidIpv4Addresses
                 .Concat(IPAddressParsingFormatting.ValidIpv6Addresses)
-                .Select(array => new object[] {IPAddress.Parse((string)array[0])});
+                .Select(array => new object[] { IPAddress.Parse((string)array[0]) });
         }
 
         public static readonly object[][] GeneratedIPAddresses =
@@ -358,7 +358,7 @@ public static void ScopeId_ThrowsIPv4SpecificMessage()
             var ip = IPV4Address1();
             SocketException ex = Assert.Throws<SocketException>(() => _ = ip.ScopeId);
             Assert.Equal((int)SocketError.OperationNotSupported, ex.ErrorCode);
-            Assert.Contains("IPv4 addresses", ex.Message);
+            Assert.Contains("AddressFamily 'InterNetwork'", ex.Message);
         }
 
         [Fact]
@@ -367,7 +367,7 @@ public static void Address_ThrowsIPv6SpecificMessage()
             var ip = IPV6Address1();
             SocketException ex = Assert.Throws<SocketException>(() => _ = ip.Address);
             Assert.Equal((int)SocketError.OperationNotSupported, ex.ErrorCode);
-            Assert.Contains("IPv6 addresses", ex.Message);
+            Assert.Contains("AddressFamily 'InterNetworkV6'", ex.Message);
         }
 #pragma warning restore 618
     }