Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/mono.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Baulig <martin.baulig@xamarin.com>2013-03-14 02:07:44 +0400
committerMartin Baulig <martin.baulig@xamarin.com>2013-03-14 02:07:44 +0400
commit8ea5b572f9ddad1ceb41a8cdfbd978f06a69c039 (patch)
tree86b2b2c9685802061fc029ea84d8e3f92ee5fb95 /mcs/class/System.ServiceModel.Web
parent1abdc24adcac52ffb4b8ec65e8894d63ec9f205a (diff)
Add type-forwarders for existing assemblies.
Diffstat (limited to 'mcs/class/System.ServiceModel.Web')
-rw-r--r--mcs/class/System.ServiceModel.Web/Assembly/TypeForwarders.cs30
-rw-r--r--mcs/class/System.ServiceModel.Web/common_System.ServiceModel.Web.dll.sources1
-rw-r--r--mcs/class/System.ServiceModel.Web/mobile_System.ServiceModel.Web.dll.sources1
3 files changed, 32 insertions, 0 deletions
diff --git a/mcs/class/System.ServiceModel.Web/Assembly/TypeForwarders.cs b/mcs/class/System.ServiceModel.Web/Assembly/TypeForwarders.cs
new file mode 100644
index 00000000000..47f656845fd
--- /dev/null
+++ b/mcs/class/System.ServiceModel.Web/Assembly/TypeForwarders.cs
@@ -0,0 +1,30 @@
+//
+// TypeForwarders.cs
+//
+// Author:
+// Martin Baulig <martin.baulig@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://www.xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+#if NET_4_5
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.Serialization.Json.DataContractJsonSerializer))]
+#endif
+
diff --git a/mcs/class/System.ServiceModel.Web/common_System.ServiceModel.Web.dll.sources b/mcs/class/System.ServiceModel.Web/common_System.ServiceModel.Web.dll.sources
index d9b9abcc1a2..1a8e3c3f2d4 100644
--- a/mcs/class/System.ServiceModel.Web/common_System.ServiceModel.Web.dll.sources
+++ b/mcs/class/System.ServiceModel.Web/common_System.ServiceModel.Web.dll.sources
@@ -2,6 +2,7 @@
../../build/common/Locale.cs
../../build/common/MonoTODOAttribute.cs
Assembly/AssemblyInfo.cs
+Assembly/TypeForwarders.cs
System.ServiceModel.Activation/WebScriptServiceHostFactory.cs
System.ServiceModel.Activation/WebServiceHostFactory.cs
System.ServiceModel.Channels/WebBodyFormatMessageProperty.cs
diff --git a/mcs/class/System.ServiceModel.Web/mobile_System.ServiceModel.Web.dll.sources b/mcs/class/System.ServiceModel.Web/mobile_System.ServiceModel.Web.dll.sources
index b419528d712..f3b3bc0933d 100644
--- a/mcs/class/System.ServiceModel.Web/mobile_System.ServiceModel.Web.dll.sources
+++ b/mcs/class/System.ServiceModel.Web/mobile_System.ServiceModel.Web.dll.sources
@@ -1,4 +1,5 @@
Assembly/AssemblyInfo.cs
+Assembly/TypeForwarders.cs
System.ServiceModel.Channels/WebBodyFormatMessageProperty.cs
System.ServiceModel.Channels/WebContentFormat.cs
System.ServiceModel.Channels/WebContentTypeMapper.cs