Add MediaTypeMappings support in NetCore assembly

Author: dougbu

src/System.Net.Http.Formatting/Formatting/JsonMediaTypeFormatter.cs

@@ -35,10 +35,8 @@ public JsonMediaTypeFormatter()
             SupportedMediaTypes.Add(MediaTypeConstants.ApplicationJsonMediaType);
             SupportedMediaTypes.Add(MediaTypeConstants.TextJsonMediaType);
 
-#if !NETFX_CORE // MediaTypeMappings are not supported in portable library
             _requestHeaderMapping = new XmlHttpRequestHeaderMapping();
             MediaTypeMappings.Add(_requestHeaderMapping);
-#endif
         }
 
         /// <summary>

src/System.Net.Http.Formatting/Formatting/MediaTypeFormatter.cs

@@ -33,10 +33,8 @@ public abstract class MediaTypeFormatter
 
         private readonly List<MediaTypeHeaderValue> _supportedMediaTypes;
         private readonly List<Encoding> _supportedEncodings;
-#if !NETFX_CORE // No MediaTypeMappings in portable library or IRequiredMemberSelector (no model state on client)
         private readonly List<MediaTypeMapping> _mediaTypeMappings;
         private IRequiredMemberSelector _requiredMemberSelector;
-#endif
 
         /// <summary>
         /// Initializes a new instance of the <see cref="MediaTypeFormatter"/> class.
@@ -47,10 +45,8 @@ protected MediaTypeFormatter()
             SupportedMediaTypes = new MediaTypeHeaderValueCollection(_supportedMediaTypes);
             _supportedEncodings = new List<Encoding>();
             SupportedEncodings = new Collection<Encoding>(_supportedEncodings);
-#if !NETFX_CORE // No MediaTypeMappings in portable library
             _mediaTypeMappings = new List<MediaTypeMapping>();
             MediaTypeMappings = new Collection<MediaTypeMapping>(_mediaTypeMappings);
-#endif
         }
 
         /// <summary>
@@ -68,11 +64,9 @@ protected MediaTypeFormatter(MediaTypeFormatter formatter)
             SupportedMediaTypes = formatter.SupportedMediaTypes;
             _supportedEncodings = formatter._supportedEncodings;
             SupportedEncodings = formatter.SupportedEncodings;
-#if !NETFX_CORE // No MediaTypeMappings in portable library or IRequiredMemberSelector (no model state on client)
             _mediaTypeMappings = formatter._mediaTypeMappings;
             MediaTypeMappings = formatter.MediaTypeMappings;
             _requiredMemberSelector = formatter._requiredMemberSelector;
-#endif
         }
 
         /// <summary>
@@ -123,7 +117,6 @@ internal List<Encoding> SupportedEncodingsInternal
             get { return _supportedEncodings; }
         }
 
-#if !NETFX_CORE // No MediaTypeMappings in portable library
         /// <summary>
         /// Gets the mutable collection of <see cref="MediaTypeMapping"/> elements used
         /// by this <see cref="MediaTypeFormatter"/> instance to determine the
@@ -135,7 +128,6 @@ internal List<MediaTypeMapping> MediaTypeMappingsInternal
         {
             get { return _mediaTypeMappings; }
         }
-#endif
 
 #if !NETFX_CORE // IRequiredMemberSelector is not in portable libraries because there is no model state on the client.
         /// <summary>

test/System.Net.Http.Formatting.Test/DataSets/HttpTestData.cs

@@ -356,7 +356,6 @@ public static TestData<HttpContent> StandardHttpContents
 
         //// TODO: make this list compose from other data?
         // Collection of legal instances of all standard MediaTypeMapping types
-#if !NETFX_CORE // not present in portable library version
         public static TestData<MediaTypeMapping> StandardMediaTypeMappings
         {
             get
@@ -375,7 +374,6 @@ public static TestData<QueryStringMapping> QueryStringMappings
                 });
             }
         }
-#endif
 
         public static TestData<string> LegalUriPathExtensions
         {

test/System.Net.Http.Formatting.Test/Formatting/MediaTypeFormatterTests.cs

@@ -51,12 +51,10 @@ public void Constructor()
             Collection<MediaTypeHeaderValue> supportedMediaTypes = formatter.SupportedMediaTypes;
             Assert.NotNull(supportedMediaTypes);
             Assert.Empty(supportedMediaTypes);
-#if !NETFX_CORE // No MediaTypeMapping support in portable libraries
             Collection<MediaTypeMapping> mappings = formatter.MediaTypeMappings;
 
             Assert.NotNull(mappings);
             Assert.Empty(mappings);
-#endif
         }
 
         [Fact]
@@ -65,11 +63,9 @@ void CopyConstructor()
             TestMediaTypeFormatter formatter = new TestMediaTypeFormatter();
             TestMediaTypeFormatter derivedFormatter = new TestMediaTypeFormatter(formatter);
 
-#if !NETFX_CORE // No MediaTypeMapping or RequiredMemberSelector in client libraries
             Assert.Same(formatter.MediaTypeMappings, derivedFormatter.MediaTypeMappings);
             Assert.Same(formatter.MediaTypeMappingsInternal, derivedFormatter.MediaTypeMappingsInternal);
             Assert.Equal(formatter.RequiredMemberSelector, derivedFormatter.RequiredMemberSelector);
-#endif
 
             Assert.Same(formatter.SupportedMediaTypes, derivedFormatter.SupportedMediaTypes);
             Assert.Same(formatter.SupportedMediaTypesInternal, derivedFormatter.SupportedMediaTypesInternal);
@@ -151,7 +147,6 @@ public void SupportedMediaTypes_InsertThrowsWithMediaRange(MediaTypeHeaderValue
             Assert.ThrowsArgument(() => supportedMediaTypes.Insert(0, mediaType), "item", Error.Format(Properties.Resources.CannotUseMediaRangeForSupportedMediaType, typeof(MediaTypeHeaderValue).Name, mediaType.MediaType));
         }
 
-#if !NETFX_CORE // No MediaTypeMapping support in portable libraries
         [Fact]
         public void MediaTypeMappings_IsMutable()
         {
@@ -165,7 +160,6 @@ public void MediaTypeMappings_IsMutable()
 
             Assert.True(standardMappings.SequenceEqual(formatter.MediaTypeMappings));
         }
-#endif
 
         [Fact]
         public void SelectCharacterEncoding_ThrowsIfNoSupportedEncodings()