Merge pull request #495 from nicolas-raoul/fix-for-issue2907-with-no-formatting-changes

[mono.git] / mcs / class / System.Json / System.Json-net_4_0.csproj

diff --git a/mcs/class/System.Json/System.Json-net_4_0.csproj b/mcs/class/System.Json/System.Json-net_4_0.csproj
index c772ac2c523ec59000e83c2caf152d1b5c70f049..2611515e0030c02a8c5190e8e086831a607b8086 100644 (file)
--- a/mcs/class/System.Json/System.Json-net_4_0.csproj
+++ b/mcs/class/System.Json/System.Json-net_4_0.csproj
@@ -16,26 +16,22 @@
     <AssemblyName>System.Json</AssemblyName>\r
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
-    <!-- Filter out System.Core added by: Microsoft.NETFramework.props  -->\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
   </PropertyGroup>\r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <PlatformTarget>AnyCPU</PlatformTarget>\r
     <DebugSymbols>true</DebugSymbols>\r
     <DebugType>full</DebugType>\r
     <NoWarn>1699</NoWarn>\r
     <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;ASPNETMVC</DefineConstants>\r
+    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
     <ErrorReport>prompt</ErrorReport>\r
     <WarningLevel>4</WarningLevel>\r
     <AdditionalLibPaths>./../../class/lib/net_4_0</AdditionalLibPaths>\r
   </PropertyGroup>\r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <PlatformTarget>AnyCPU</PlatformTarget>  \r
     <DebugType>pdbonly</DebugType>\r
     <NoWarn>1699</NoWarn>\r
     <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;ASPNETMVC</DefineConstants>\r
+    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>\r
     <ErrorReport>prompt</ErrorReport>\r
     <WarningLevel>4</WarningLevel>\r
     <AdditionalLibPaths>./../../class/lib/net_4_0</AdditionalLibPaths>\r
@@ -44,24 +40,12 @@
   <ItemGroup>\r
    <Compile Include="..\..\build\common\Consts.cs" />
    <Compile Include="Assembly\AssemblyInfo.cs" />
-   <Compile Include="..\..\..\external\aspnetwebstack\src\RS.cs" />
-   <Compile Include="..\..\..\external\aspnetwebstack\src\CommonAssemblyInfo.cs" />
-   <Compile Include="..\..\..\external\aspnetwebstack\src\TransparentCommonAssemblyInfo.cs" />
-   <Compile Include="..\..\..\external\aspnetwebstack\src\System.Json\Properties\AssemblyInfo.cs" />
-   <Compile Include="..\..\..\external\aspnetwebstack\src\System.Json\Extensions\JsonValueExtensions.cs" />
-   <Compile Include="..\..\..\external\aspnetwebstack\src\System.Json\GlobalSuppressions.cs" />
-   <Compile Include="..\..\..\external\aspnetwebstack\src\System.Json\JXmlToJsonValueConverter.cs" />
-   <Compile Include="..\..\..\external\aspnetwebstack\src\System.Json\JsonArray.cs" />
-   <Compile Include="..\..\..\external\aspnetwebstack\src\System.Json\JsonObject.cs" />
-   <Compile Include="..\..\..\external\aspnetwebstack\src\System.Json\JsonPrimitive.cs" />
-   <Compile Include="..\..\..\external\aspnetwebstack\src\System.Json\JsonType.cs" />
-   <Compile Include="..\..\..\external\aspnetwebstack\src\System.Json\JsonValue.cs" />
-   <Compile Include="..\..\..\external\aspnetwebstack\src\System.Json\JsonValueChange.cs" />
-   <Compile Include="..\..\..\external\aspnetwebstack\src\System.Json\JsonValueChangeEventArgs.cs" />
-   <Compile Include="..\..\..\external\aspnetwebstack\src\System.Json\JsonValueDynamicMetaObject.cs" />
-   <Compile Include="..\..\..\external\aspnetwebstack\src\System.Json\JsonValueLinqExtensions.cs" />
-   <Compile Include="..\..\..\external\aspnetwebstack\src\System.Json\NGenWrapper.cs" />
-   <Compile Include="..\..\..\external\aspnetwebstack\src\System.Json\Properties\Resources.Designer.cs" />
+   <Compile Include="System.Json\JsonArray.cs" />
+   <Compile Include="System.Json\JsonObject.cs" />
+   <Compile Include="System.Json\JsonPrimitive.cs" />
+   <Compile Include="System.Json\JsonType.cs" />
+   <Compile Include="System.Json\JsonValue.cs" />
+   <Compile Include="..\System.ServiceModel.Web\System.Runtime.Serialization.Json\JavaScriptReader.cs" />
 \r
   </ItemGroup>\r
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
@@ -75,7 +59,7 @@
     <PreBuildEvent></PreBuildEvent>\r
   </PropertyGroup>\r
   <ItemGroup>\r
-    <Reference Include="mscorlib.dll">
+        <Reference Include="mscorlib.dll">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>mscorlib.dll</HintPath>
     </Reference>
@@ -91,28 +75,15 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>System.Core.dll</HintPath>
     </Reference>
-    <Reference Include="System.Runtime.Serialization.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>System.Runtime.Serialization.dll</HintPath>
-    </Reference>
     <Reference Include="System.ServiceModel.Web.dll">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>System.ServiceModel.Web.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.CSharp.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>Microsoft.CSharp.dll</HintPath>
-    </Reference>
 \r
   </ItemGroup>\r
   <ItemGroup>\r
     <Folder Include="Properties\" />\r
   </ItemGroup>\r
-    <ItemGroup>
-    <EmbeddedResource Include="System.Json.Properties.Resources.resources">
-       <LogicalName>System.Json.Properties.Resources.resources</LogicalName>
-    </EmbeddedResource>
-  </ItemGroup>
-\r
+  \r
 </Project>\r