From efda0d4c622664b616005e45e549c99d2946d87f Mon Sep 17 00:00:00 2001 From: Martin Baulig Date: Fri, 15 Mar 2013 18:14:44 -0400 Subject: [PATCH] Revert "Fixes make dist" This reverts commit 87e95b46ed84d290d1e26806881a9a03e5864633. This puts DataContractJsonSerializerSettings.cs back into mcs/class/System.ServiceModel.Web/System.Runtime.Serialization.Json. Let's please not have a single file from this namespace in another directory, either move the entire System.Runtime.Serialization.Json stuff into System.Runtime.Serialization or leave it here. --- .../net_4_5_System.Runtime.Serialization.dll.sources | 2 +- .../DataContractJsonSerializerSettings.cs | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename mcs/class/{System.Runtime.Serialization => System.ServiceModel.Web}/System.Runtime.Serialization.Json/DataContractJsonSerializerSettings.cs (100%) diff --git a/mcs/class/System.Runtime.Serialization/net_4_5_System.Runtime.Serialization.dll.sources b/mcs/class/System.Runtime.Serialization/net_4_5_System.Runtime.Serialization.dll.sources index 36520a7436049..be9e8242268f4 100644 --- a/mcs/class/System.Runtime.Serialization/net_4_5_System.Runtime.Serialization.dll.sources +++ b/mcs/class/System.Runtime.Serialization/net_4_5_System.Runtime.Serialization.dll.sources @@ -1,5 +1,5 @@ #include net_4_0_System.Runtime.Serialization.dll.sources System.Runtime.Serialization/DateTimeFormat.cs System.Runtime.Serialization/EmitTypeInformation.cs -System.Runtime.Serialization.Json/DataContractJsonSerializerSettings.cs +../System.ServiceModel.Web/System.Runtime.Serialization.Json/DataContractJsonSerializerSettings.cs System.Runtime.Serialization/DataContractSerializerSettings.cs diff --git a/mcs/class/System.Runtime.Serialization/System.Runtime.Serialization.Json/DataContractJsonSerializerSettings.cs b/mcs/class/System.ServiceModel.Web/System.Runtime.Serialization.Json/DataContractJsonSerializerSettings.cs similarity index 100% rename from mcs/class/System.Runtime.Serialization/System.Runtime.Serialization.Json/DataContractJsonSerializerSettings.cs rename to mcs/class/System.ServiceModel.Web/System.Runtime.Serialization.Json/DataContractJsonSerializerSettings.cs