diff options
| author | Miguel de Icaza <miguel@gnome.org> | 2016-06-01 00:17:59 +0300 |
|---|---|---|
| committer | Miguel de Icaza <miguel@gnome.org> | 2016-06-01 00:18:13 +0300 |
| commit | 9dc91ef0d388c0375d9fcb37d26f3c18b1ee3efd (patch) | |
| tree | d91553e068c2ac3921e83c4f2c970f319fe66fb4 /mcs/class/System.Json.Microsoft | |
| parent | 07b2a10491496316c18a442effd4484c2dadc85d (diff) | |
[genproj] Another library works, System.Json.Microsoft
Diffstat (limited to 'mcs/class/System.Json.Microsoft')
| -rw-r--r-- | mcs/class/System.Json.Microsoft/Makefile | 6 | ||||
| -rw-r--r-- | mcs/class/System.Json.Microsoft/System.Json.Microsoft-net_4_x.csproj | 12 |
2 files changed, 9 insertions, 9 deletions
diff --git a/mcs/class/System.Json.Microsoft/Makefile b/mcs/class/System.Json.Microsoft/Makefile index 4c2329392d3..2d13a176b82 100644 --- a/mcs/class/System.Json.Microsoft/Makefile +++ b/mcs/class/System.Json.Microsoft/Makefile @@ -2,13 +2,13 @@ thisdir = class/System.Json.Microsoft SUBDIRS = include ../../build/rules.make -System.Json.Properties.Resources.resources: System.Json/Properties/Resources.resx +System.Json/Properties/Resources.resources: System.Json/Properties/Resources.resx $(RESGEN) "$<" "$@" LIBRARY = System.Json.Microsoft.dll LIB_REFS = System System.Xml System.Core System.Runtime.Serialization LIB_MCS_FLAGS = /d:ASPNETMVC -keyfile:../winfx.pub -delaysign \ - /resource:System.Json.Properties.Resources.resources + /resource:System.Json/Properties/Resources.resources,System.Json.Properties.Resources.resources EXTRA_DISTFILES = System.Json/Properties/Resources.resx @@ -25,4 +25,4 @@ TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) include ../../build/library.make -$(the_lib): System.Json.Properties.Resources.resources +$(the_lib): System.Json/Properties/Resources.resources diff --git a/mcs/class/System.Json.Microsoft/System.Json.Microsoft-net_4_x.csproj b/mcs/class/System.Json.Microsoft/System.Json.Microsoft-net_4_x.csproj index 3496fd33365..c346b611174 100644 --- a/mcs/class/System.Json.Microsoft/System.Json.Microsoft-net_4_x.csproj +++ b/mcs/class/System.Json.Microsoft/System.Json.Microsoft-net_4_x.csproj @@ -7,7 +7,7 @@ <SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{E6A6B9F7-BD0C-4F8D-8AFE-2EF76A2FB3AD}</ProjectGuid>
<OutputType>Library</OutputType>
- <NoWarn>1699</NoWarn>
+ <NoWarn>1699,1699</NoWarn>
<OutputPath>./../../class/lib/net_4_x</OutputPath>
<IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
<GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
@@ -32,17 +32,17 @@ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
- <NoWarn>1699</NoWarn>
+ <NoWarn>1699,1699</NoWarn>
<Optimize>false</Optimize>
- <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE;ASPNETMVC;FEATURE_DYNAMIC</DefineConstants>
+ <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE;ASPNETMVC;FEATURE_DYNAMIC;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE;ASPNETMVC;FEATURE_DYNAMIC</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
- <NoWarn>1699</NoWarn>
+ <NoWarn>1699,1699</NoWarn>
<Optimize>true</Optimize>
- <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE;ASPNETMVC;FEATURE_DYNAMIC</DefineConstants>
+ <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE;ASPNETMVC;FEATURE_DYNAMIC;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE;ASPNETMVC;FEATURE_DYNAMIC</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
@@ -125,7 +125,7 @@ <Folder Include="Properties\" />
</ItemGroup>
<ItemGroup>
- <EmbeddedResource Include="System.Json.Properties.Resources.resx">
+ <EmbeddedResource Include="System.Json/Properties/Resources.resx">
<LogicalName>System.Json.Properties.Resources.resources</LogicalName>
</EmbeddedResource>
</ItemGroup>
|