CoreFX: System.Json, System.ServiceModel.Syndication, System.Threading.Tasks.Dataflow (#8246)

Use corefx sources and tests for:
- System.Json
- System.ServiceModel.Syndication
- System.Threading.Tasks.Dataflow

7 files changed, 115 insertions, 83 deletions

diff --git a/mcs/class/System.ServiceModel/Dummy_2_1.cs b/mcs/class/System.ServiceModel/Dummy_2_1.cs
index 2773e6a93c1..0c50b70aa05 100644
--- a/mcs/class/System.ServiceModel/Dummy_2_1.cs
+++ b/mcs/class/System.ServiceModel/Dummy_2_1.cs
@@ -9,17 +9,6 @@ using System.Text;
 using System.Xml;
 using System.Threading;
 
-namespace System.Runtime.CompilerServices
-{
-	// introduced for silverlight sdk compatibility
-	internal class FriendAccessAllowedAttribute : Attribute
-	{
-		public FriendAccessAllowedAttribute ()
-		{
-		}
-	}
-}
-
 namespace System.ServiceModel
 {
 	public class EndpointIdentity {}
diff --git a/mcs/class/System.ServiceModel/Makefile b/mcs/class/System.ServiceModel/Makefile
index c563c1ad87f..bb9d5bb4a61 100644
--- a/mcs/class/System.ServiceModel/Makefile
+++ b/mcs/class/System.ServiceModel/Makefile
@@ -6,6 +6,9 @@ RESOURCE_FILES = \
 	resources/WS-Addressing.schema	\
 	resources/ws-addr.xsd
 
+RESX_RESOURCE_STRING = \
+	../../../external/corefx/src/System.ServiceModel.Syndication/src/Resources/Strings.resx
+
 LIBRARY = System.ServiceModel.dll
 
 LIB_REFS = System System.Xml System.Core System.Runtime.Serialization System.IdentityModel
diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.csproj b/mcs/class/System.ServiceModel/System.ServiceModel.csproj
index e136d94b0c9..ee3f8a4df52 100644
--- a/mcs/class/System.ServiceModel/System.ServiceModel.csproj
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.csproj
@@ -105,6 +105,7 @@
   <ItemGroup>

     <Compile Include="..\..\build\common\Consts.cs" />

     <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />

+    <Compile Include="..\..\build\common\SR.cs" />
     <Compile Include="Assembly\AssemblyInfo.cs" />

     <Compile Include="Mono.CodeGeneration\CodeAdd.cs" />

     <Compile Include="Mono.CodeGeneration\CodeAnd.cs" />

@@ -394,49 +395,59 @@
     <Compile Include="System.ServiceModel\XmlSerializerFormatAttribute.cs" />

   </ItemGroup>

   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">

+    <Compile Include="..\..\..\external\corefx\src\System.ServiceModel.Syndication\src\System\ServiceModel\Channels\UriGenerator.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.ServiceModel.Syndication\src\System\ServiceModel\DiagnosticUtility.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.ServiceModel.Syndication\src\System\ServiceModel\Syndication\App10Constants.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.ServiceModel.Syndication\src\System\ServiceModel\Syndication\Atom10Constants.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.ServiceModel.Syndication\src\System\ServiceModel\Syndication\Atom10FeedFormatter.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.ServiceModel.Syndication\src\System\ServiceModel\Syndication\Atom10ItemFormatter.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.ServiceModel.Syndication\src\System\ServiceModel\Syndication\AtomPub10CategoriesDocumentFormatter.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.ServiceModel.Syndication\src\System\ServiceModel\Syndication\AtomPub10ServiceDocumentFormatter.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.ServiceModel.Syndication\src\System\ServiceModel\Syndication\CategoriesDocument.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.ServiceModel.Syndication\src\System\ServiceModel\Syndication\CategoriesDocumentFormatter.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.ServiceModel.Syndication\src\System\ServiceModel\Syndication\DateTimeHelper.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.ServiceModel.Syndication\src\System\ServiceModel\Syndication\ExtensibleSyndicationObject.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.ServiceModel.Syndication\src\System\ServiceModel\Syndication\FeedUtils.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.ServiceModel.Syndication\src\System\ServiceModel\Syndication\IExtensibleSyndicationObject.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.ServiceModel.Syndication\src\System\ServiceModel\Syndication\InlineCategoriesDocument.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.ServiceModel.Syndication\src\System\ServiceModel\Syndication\NullNotAllowedCollection.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.ServiceModel.Syndication\src\System\ServiceModel\Syndication\ReferencedCategoriesDocument.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.ServiceModel.Syndication\src\System\ServiceModel\Syndication\ResourceCollectionInfo.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.ServiceModel.Syndication\src\System\ServiceModel\Syndication\Rss20Constants.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.ServiceModel.Syndication\src\System\ServiceModel\Syndication\Rss20FeedFormatter.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.ServiceModel.Syndication\src\System\ServiceModel\Syndication\Rss20ItemFormatter.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.ServiceModel.Syndication\src\System\ServiceModel\Syndication\ServiceDocument.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.ServiceModel.Syndication\src\System\ServiceModel\Syndication\ServiceDocumentFormatter.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.ServiceModel.Syndication\src\System\ServiceModel\Syndication\SyndicationCategory.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.ServiceModel.Syndication\src\System\ServiceModel\Syndication\SyndicationContent.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.ServiceModel.Syndication\src\System\ServiceModel\Syndication\SyndicationElementExtension.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.ServiceModel.Syndication\src\System\ServiceModel\Syndication\SyndicationElementExtensionCollection.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.ServiceModel.Syndication\src\System\ServiceModel\Syndication\SyndicationElementExtensionKindHelper.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.ServiceModel.Syndication\src\System\ServiceModel\Syndication\SyndicationFeed.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.ServiceModel.Syndication\src\System\ServiceModel\Syndication\SyndicationFeedFormatter.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.ServiceModel.Syndication\src\System\ServiceModel\Syndication\SyndicationItem.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.ServiceModel.Syndication\src\System\ServiceModel\Syndication\SyndicationItemFormatter.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.ServiceModel.Syndication\src\System\ServiceModel\Syndication\SyndicationLink.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.ServiceModel.Syndication\src\System\ServiceModel\Syndication\SyndicationPerson.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.ServiceModel.Syndication\src\System\ServiceModel\Syndication\SyndicationTextInput.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.ServiceModel.Syndication\src\System\ServiceModel\Syndication\SyndicationVersions.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.ServiceModel.Syndication\src\System\ServiceModel\Syndication\TextSyndicationContent.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.ServiceModel.Syndication\src\System\ServiceModel\Syndication\TextSyndicationContentKind.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.ServiceModel.Syndication\src\System\ServiceModel\Syndication\TextSyndicationContentKindHelper.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.ServiceModel.Syndication\src\System\ServiceModel\Syndication\UrlSyndicationContent.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.ServiceModel.Syndication\src\System\ServiceModel\Syndication\Workspace.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.ServiceModel.Syndication\src\System\ServiceModel\Syndication\XmlDateTimeData.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.ServiceModel.Syndication\src\System\ServiceModel\Syndication\XmlSyndicationContent.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.ServiceModel.Syndication\src\System\ServiceModel\Syndication\XmlUriData.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.ServiceModel.Syndication\src\System\ServiceModel\XmlBuffer.cs" />
     <Compile Include="..\..\build\common\Locale.cs" />

     <Compile Include="..\referencesource\System.ServiceModel\System\ServiceModel\Description\UseRequestHeadersForMetadataAddressBehavior.cs" />

-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\Atom10FeedFormatter.cs" />

-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\Atom10FeedFormatter_1.cs" />

-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\Atom10ItemFormatter.cs" />

-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\Atom10ItemFormatter_1.cs" />

-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\AtomPub10CategoriesDocumentFormatter.cs" />

-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\AtomPub10ServiceDocumentFormatter.cs" />

-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\AtomPub10ServiceDocumentFormatter_1.cs" />

-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\CategoriesDocument.cs" />

-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\CategoriesDocumentFormatter.cs" />

-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\InlineCategoriesDocument.cs" />

-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\ISyndicationElement.cs" />

-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\ReferencedCategoriesDocument.cs" />

-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\ResourceCollectionInfo.cs" />

-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\Rss20FeedFormatter.cs" />

-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\Rss20FeedFormatter_1.cs" />

-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\Rss20ItemFormatter.cs" />

-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\Rss20ItemFormatter_1.cs" />

-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\ServiceDocument.cs" />

-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\ServiceDocumentFormatter.cs" />

-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\SyndicationCategory.cs" />

-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\SyndicationContent.cs" />

-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\SyndicationElementExtension.cs" />

-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\SyndicationElementExtensionCollection.cs" />

-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\SyndicationExtensions.cs" />

-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\SyndicationFeed.cs" />

-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\SyndicationFeedFormatter.cs" />

-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\SyndicationItem.cs" />

-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\SyndicationItemFormatter.cs" />

-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\SyndicationLink.cs" />

-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\SyndicationPerson.cs" />

-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\SyndicationVersions.cs" />

-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\TextSyndicationContent.cs" />

-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\TextSyndicationContentKind.cs" />

-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\UrlSyndicationContent.cs" />

-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\Workspace.cs" />

-    <Compile Include="..\System.ServiceModel.Web\System.ServiceModel.Syndication\XmlSyndicationContent.cs" />

     <Compile Include="..\System.ServiceModel.Web\System\UriTemplate.cs" />

     <Compile Include="..\System.ServiceModel.Web\System\UriTemplateEquivalenceComparer.cs" />

     <Compile Include="..\System.ServiceModel.Web\System\UriTemplateMatch.cs" />

     <Compile Include="..\System.ServiceModel.Web\System\UriTemplateMatchException.cs" />

     <Compile Include="..\System.ServiceModel.Web\System\UriTemplateTable.cs" />

+    <Compile Include="corefx\SR.cs" />
     <Compile Include="Mono.Security.Cryptography\MD5SHA1.cs" />

     <Compile Include="Mono.Security.Cryptography\TlsHMAC.cs" />

     <Compile Include="Mono.Security.Protocol.Ntlm\BitConverterLE.cs" />

@@ -1146,6 +1157,7 @@
     <Compile Include="System.ServiceModel.Channels\MessageBuffer_2_1.cs" />

   </ItemGroup>

   <ItemGroup Condition=" '$(Platform)' == 'xammac_net_4_5' ">

+    <Compile Include="corefx\SR.cs" />
     <Compile Include="Dummy_2_1.cs" />

     <Compile Include="Dummy_XM_4_5.cs" />

     <Compile Include="System.ServiceModel.Channels\IChannelListener.cs" />

diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.dll.sources b/mcs/class/System.ServiceModel/System.ServiceModel.dll.sources
index 3754386ab5e..9863c8e1aa5 100644
--- a/mcs/class/System.ServiceModel/System.ServiceModel.dll.sources
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.dll.sources
@@ -1,6 +1,8 @@
 ../../build/common/Consts.cs
 ../../build/common/Locale.cs
+../../build/common/SR.cs
 ../../build/common/MonoTODOAttribute.cs
+corefx/SR.cs
 Assembly/AssemblyInfo.cs
 Mono.CodeGeneration/CodeAdd.cs
 Mono.CodeGeneration/CodeAnd.cs
@@ -951,42 +953,9 @@ System.ServiceModel/XmlSerializerFormatAttribute.cs
 System.ServiceModel.Channels/IHttpCookieContainer.cs
 System.ServiceModel.Channels/HttpCookieContainerBindingElement.cs
 
-../System.ServiceModel.Web/System.ServiceModel.Syndication/Atom10FeedFormatter.cs
-../System.ServiceModel.Web/System.ServiceModel.Syndication/Atom10FeedFormatter_1.cs
-../System.ServiceModel.Web/System.ServiceModel.Syndication/Atom10ItemFormatter.cs
-../System.ServiceModel.Web/System.ServiceModel.Syndication/Atom10ItemFormatter_1.cs
-../System.ServiceModel.Web/System.ServiceModel.Syndication/AtomPub10CategoriesDocumentFormatter.cs
-../System.ServiceModel.Web/System.ServiceModel.Syndication/AtomPub10ServiceDocumentFormatter.cs
-../System.ServiceModel.Web/System.ServiceModel.Syndication/AtomPub10ServiceDocumentFormatter_1.cs
-../System.ServiceModel.Web/System.ServiceModel.Syndication/CategoriesDocument.cs
-../System.ServiceModel.Web/System.ServiceModel.Syndication/CategoriesDocumentFormatter.cs
-../System.ServiceModel.Web/System.ServiceModel.Syndication/ISyndicationElement.cs
-../System.ServiceModel.Web/System.ServiceModel.Syndication/InlineCategoriesDocument.cs
-../System.ServiceModel.Web/System.ServiceModel.Syndication/ReferencedCategoriesDocument.cs
-../System.ServiceModel.Web/System.ServiceModel.Syndication/ResourceCollectionInfo.cs
-../System.ServiceModel.Web/System.ServiceModel.Syndication/Rss20FeedFormatter.cs
-../System.ServiceModel.Web/System.ServiceModel.Syndication/Rss20FeedFormatter_1.cs
-../System.ServiceModel.Web/System.ServiceModel.Syndication/Rss20ItemFormatter.cs
-../System.ServiceModel.Web/System.ServiceModel.Syndication/Rss20ItemFormatter_1.cs
-../System.ServiceModel.Web/System.ServiceModel.Syndication/ServiceDocument.cs
-../System.ServiceModel.Web/System.ServiceModel.Syndication/ServiceDocumentFormatter.cs
-../System.ServiceModel.Web/System.ServiceModel.Syndication/SyndicationCategory.cs
-../System.ServiceModel.Web/System.ServiceModel.Syndication/SyndicationContent.cs
-../System.ServiceModel.Web/System.ServiceModel.Syndication/SyndicationElementExtension.cs
-../System.ServiceModel.Web/System.ServiceModel.Syndication/SyndicationElementExtensionCollection.cs
-../System.ServiceModel.Web/System.ServiceModel.Syndication/SyndicationExtensions.cs
-../System.ServiceModel.Web/System.ServiceModel.Syndication/SyndicationFeed.cs
-../System.ServiceModel.Web/System.ServiceModel.Syndication/SyndicationFeedFormatter.cs
-../System.ServiceModel.Web/System.ServiceModel.Syndication/SyndicationItem.cs
-../System.ServiceModel.Web/System.ServiceModel.Syndication/SyndicationItemFormatter.cs
-../System.ServiceModel.Web/System.ServiceModel.Syndication/SyndicationLink.cs
-../System.ServiceModel.Web/System.ServiceModel.Syndication/SyndicationPerson.cs
-../System.ServiceModel.Web/System.ServiceModel.Syndication/SyndicationVersions.cs
-../System.ServiceModel.Web/System.ServiceModel.Syndication/TextSyndicationContent.cs
-../System.ServiceModel.Web/System.ServiceModel.Syndication/TextSyndicationContentKind.cs
-../System.ServiceModel.Web/System.ServiceModel.Syndication/UrlSyndicationContent.cs
-../System.ServiceModel.Web/System.ServiceModel.Syndication/Workspace.cs
-../System.ServiceModel.Web/System.ServiceModel.Syndication/XmlSyndicationContent.cs
+../../../external/corefx/src/System.ServiceModel.Syndication/src/System/ServiceModel/Syndication/*.cs
+../../../external/corefx/src/System.ServiceModel.Syndication/src/System/ServiceModel/Channels/*.cs
+../../../external/corefx/src/System.ServiceModel.Syndication/src/System/ServiceModel/*.cs
 ../System.ServiceModel.Web/System/UriTemplate.cs
 ../System.ServiceModel.Web/System/UriTemplateEquivalenceComparer.cs
 ../System.ServiceModel.Web/System/UriTemplateMatch.cs
diff --git a/mcs/class/System.ServiceModel/corefx/SR.cs b/mcs/class/System.ServiceModel/corefx/SR.cs
new file mode 100644
index 00000000000..4fb2514cdbc
--- /dev/null
+++ b/mcs/class/System.ServiceModel/corefx/SR.cs
@@ -0,0 +1,56 @@
+//
+// This file was generated by resx2sr tool
+//
+
+partial class SR
+{
+	public const string Atom10SpecRequiresTextConstruct = "The Atom10 specification requires '{0}' to have one of these values: \\\"text\\\", \\\"html\\\", \\\"xhtml\\\", however this value is '{1}' in the document being deserialized.";
+	public const string DocumentFormatterDoesNotHaveDocument = "The document formatter must be configured with a document.";
+	public const string ErrorInLine = "Error in line {0} position {1}.";
+	public const string ErrorParsingDateTime = "An error was encountered when parsing a DateTime value in the XML.";
+	public const string ErrorParsingDocument = "An error was encountered when parsing the document's XML. Refer to the inner exception for more details.";
+	public const string ErrorParsingFeed = "An error was encountered when parsing the feed's XML. Refer to the inner exception for more details.";
+	public const string ErrorParsingItem = "An error was encountered when parsing the item's XML. Refer to the inner exception for more details.";
+	public const string ErrorParsingUri = "An error was encountered when parsing a Uri value in the XML.";
+	public const string ExtensionNameNotSpecified = "The name of the extension element must be specified.";
+	public const string FeedAuthorsIgnoredOnWrite = "The feed's authors were not serialized as part of serializing the feed in RSS 2.0 format.";
+	public const string FeedContributorsIgnoredOnWrite = "The feed's contributors were not serialized as part of serializing the feed in RSS 2.0 format.";
+	public const string FeedCreatedNullCategory = "The feed created a null category.";
+	public const string FeedCreatedNullItem = "The feed created a null item.";
+	public const string FeedCreatedNullPerson = "The feed created a null person.";
+	public const string FeedFormatterDoesNotHaveFeed = "The syndication feed formatter must be configured with a syndication feed.";
+	public const string FeedHasNonContiguousItems = "The feed being deserialized has non-contiguous sets of items in it. This is not supported by '{0}'.";
+	public const string FeedIdIgnoredOnWrite = "The feed's id was not serialized as part of serializing the feed in RSS 2.0 format.";
+	public const string FeedLinksIgnoredOnWrite = "The feed's links were not serialized as part of serializing the feed in RSS 2.0 format.";
+	public const string InvalidObjectTypePassed = "The Type of object passed as parameter '{0}' is not derived from {1}. Ensure that the type of object passed is either of type {1} or derived from {1}.";
+	public const string ItemAuthorsIgnoredOnWrite = "The item's authors were not serialized as part of serializing the feed in RSS 2.0 format.";
+	public const string ItemContentIgnoredOnWrite = "The item's content was not serialized as part of serializing the feed in RSS 2.0 format.";
+	public const string ItemContributorsIgnoredOnWrite = "The item's contributors were not serialized as part of serializing the feed in RSS 2.0 format.";
+	public const string ItemCopyrightIgnoredOnWrite = "The item's copyrights were not serialized as part of serializing the feed in RSS 2.0 format.";
+	public const string ItemCreatedNullCategory = "The item created a null category.";
+	public const string ItemCreatedNullPerson = "The item created a null person.";
+	public const string ItemFormatterDoesNotHaveItem = "The syndication item formatter must be configured with a syndication item.";
+	public const string ItemLastUpdatedTimeIgnoredOnWrite = "The item's last updated time was not serialized as part of serializing the feed in RSS 2.0 format.";
+	public const string ItemLinksIgnoredOnWrite = "The item's links were not serialized as part of serializing the feed in RSS 2.0 format.";
+	public const string OuterElementNameNotSpecified = "The outer element name must be specified.";
+	public const string OuterNameOfElementExtensionEmpty = "The outer name of the element extension cannot be empty.";
+	public const string UnbufferedItemsCannotBeCloned = "A feed containing items that are not buffered (i.e. the items are not stored in an IList) cannot clone its items. Buffer the items in the feed before calling Clone on it or pass false to the Clone method.";
+	public const string UnknownDocumentXml = "The element with name '{0}' and namespace '{1}' is not an allowed document format.";
+	public const string UnknownFeedXml = "The element with name '{0}' and namespace '{1}' is not an allowed feed format.";
+	public const string UnknownItemXml = "The element with name '{0}' and namespace '{1}' is not an allowed item format.";
+	public const string UnsupportedRssVersion = "The Rss20Serializer does not support RSS version '{0}'.";
+	public const string UriGeneratorSchemeMustNotBeEmpty = "The scheme parameter must not be empty.";
+	public const string ValueMustBeNonNegative = "The value of this argument must be non-negative.";
+	public const string XmlBufferInInvalidState = "An internal error has occurred. The XML buffer is not in the correct state to perform the operation.";
+	public const string XmlFoundCData = "cdata '{0}'";
+	public const string XmlFoundComment = "comment '{0}'";
+	public const string XmlFoundElement = "element '{0}' from namespace '{1}'";
+	public const string XmlFoundEndElement = "end element '{0}' from namespace '{1}'";
+	public const string XmlFoundEndOfFile = "end of file";
+	public const string XmlFoundNodeType = "node {0}";
+	public const string XmlFoundText = "text '{0}'";
+	public const string XmlLineInfo = "Line {0}, position {1}.";
+	public const string XmlStartElementExpected = "Start element expected. Found {0}.";
+	public const string InvalidSkipHourValue = "Cannot parse string `{0}` as skip hour. The value for skip hours must be an integer betwen 0 and 23.";
+	public const string InvalidTimeToLiveValue = "The value for TimeToLive must be a non-negative whole number of minutes.";
+}
diff --git a/mcs/class/System.ServiceModel/mobile_System.ServiceModel.dll.sources b/mcs/class/System.ServiceModel/mobile_System.ServiceModel.dll.sources
index 64af3348dc7..f16d0b952ee 100644
--- a/mcs/class/System.ServiceModel/mobile_System.ServiceModel.dll.sources
+++ b/mcs/class/System.ServiceModel/mobile_System.ServiceModel.dll.sources
@@ -1,5 +1,6 @@
 ../../build/common/Consts.cs
 ../../build/common/MonoTODOAttribute.cs
+../../build/common/SR.cs
 Assembly/AssemblyInfo.cs
 Mono.CodeGeneration/CodeAdd.cs
 Mono.CodeGeneration/CodeAnd.cs
diff --git a/mcs/class/System.ServiceModel/xammac_net_4_5_System.ServiceModel.dll.sources b/mcs/class/System.ServiceModel/xammac_net_4_5_System.ServiceModel.dll.sources
index ea92e69528e..9fd456750e4 100644
--- a/mcs/class/System.ServiceModel/xammac_net_4_5_System.ServiceModel.dll.sources
+++ b/mcs/class/System.ServiceModel/xammac_net_4_5_System.ServiceModel.dll.sources
@@ -1,4 +1,6 @@
 #include mobile_System.ServiceModel.dll.sources
+../../build/common/SR.cs
+corefx/SR.cs
 System.ServiceModel.Channels/IChannelListener.cs
 System.ServiceModel.Channels/IReplyChannel.cs
 System.ServiceModel.Channels/IReplySessionChannel.cs