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:
authorMiguel de Icaza <miguel@gnome.org>2016-06-14 23:57:09 +0300
committerGitHub <noreply@github.com>2016-06-14 23:57:09 +0300
commitaff1a51a389f09ca1865e54c16cfff4741435c8e (patch)
tree53e628ad93f7ce1e25957e45561c381cfe926113 /mcs/class/System.Web.Http.SelfHost
parent6b3a592de0eb47d9d92ce3a012ac771319afb868 (diff)
WIP [library.make] Make resource usage declarative in the class libraries (#3159)
[library.make] Make resource usage declarative in the class libraries
Diffstat (limited to 'mcs/class/System.Web.Http.SelfHost')
-rw-r--r--mcs/class/System.Web.Http.SelfHost/Makefile11
-rw-r--r--mcs/class/System.Web.Http.SelfHost/System.Web.Http.SelfHost-net_4_x.csproj8
2 files changed, 11 insertions, 8 deletions
diff --git a/mcs/class/System.Web.Http.SelfHost/Makefile b/mcs/class/System.Web.Http.SelfHost/Makefile
index f13d3b55f88..f4ff7d46645 100644
--- a/mcs/class/System.Web.Http.SelfHost/Makefile
+++ b/mcs/class/System.Web.Http.SelfHost/Makefile
@@ -4,17 +4,12 @@ include ../../build/rules.make
LIBRARY = System.Web.Http.SelfHost.dll
-System.Web.Http.SelfHost.Properties.CommonWebApiResources.resources: ../../../external/aspnetwebstack/src/Common/CommonWebApiResources.resx
- $(RESGEN) "$<" "$@"
-
-System.Web.Http.SelfHost.Properties.SRResources.resources: ../../../external/aspnetwebstack/src/System.Web.Http.SelfHost/Properties/SRResources.resx
- $(RESGEN) "$<" "$@"
-
+RESOURCE_DEFS = \
+ System.Web.Http.SelfHost.Properties.CommonWebApiResources,../../../external/aspnetwebstack/src/Common/CommonWebApiResources.resx \
+ System.Web.Http.SelfHost.Properties.SRResources,../../../external/aspnetwebstack/src/System.Web.Http.SelfHost/Properties/SRResources.resx
LIB_REFS = System.Core System System.Xml System.Configuration System.Net.Http System.Runtime.Serialization System.ServiceModel System.IdentityModel System.Web.Http System.Net.Http.Formatting
LIB_MCS_FLAGS = -d:ASPNETMVC -keyfile:../winfx.pub -delaysign
include ../../build/library.make
-$(the_lib): System.Web.Http.SelfHost.Properties.CommonWebApiResources.resources \
- System.Web.Http.SelfHost.Properties.SRResources.resources
diff --git a/mcs/class/System.Web.Http.SelfHost/System.Web.Http.SelfHost-net_4_x.csproj b/mcs/class/System.Web.Http.SelfHost/System.Web.Http.SelfHost-net_4_x.csproj
index 1260d005c16..70ba4af74c2 100644
--- a/mcs/class/System.Web.Http.SelfHost/System.Web.Http.SelfHost-net_4_x.csproj
+++ b/mcs/class/System.Web.Http.SelfHost/System.Web.Http.SelfHost-net_4_x.csproj
@@ -165,5 +165,13 @@
<ItemGroup>
<Folder Include="Properties\" />
</ItemGroup>
+ <ItemGroup>
+ <EmbeddedResource Include="../../../external/aspnetwebstack/src/Common/CommonWebApiResources.resx">
+ <LogicalName>System.Web.Http.SelfHost.Properties.CommonWebApiResources.resources</LogicalName>
+ </EmbeddedResource>
+ <EmbeddedResource Include="../../../external/aspnetwebstack/src/System.Web.Http.SelfHost/Properties/SRResources.resx">
+ <LogicalName>System.Web.Http.SelfHost.Properties.SRResources.resources</LogicalName>
+ </EmbeddedResource>
+ </ItemGroup>
</Project>