diff options
author | Miguel de Icaza <miguel@gnome.org> | 2016-06-14 23:57:09 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-06-14 23:57:09 +0300 |
commit | aff1a51a389f09ca1865e54c16cfff4741435c8e (patch) | |
tree | 53e628ad93f7ce1e25957e45561c381cfe926113 /mcs/class/System.Web.Http.WebHost | |
parent | 6b3a592de0eb47d9d92ce3a012ac771319afb868 (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.WebHost')
-rw-r--r-- | mcs/class/System.Web.Http.WebHost/Makefile | 12 | ||||
-rw-r--r-- | mcs/class/System.Web.Http.WebHost/System.Web.Http.WebHost-net_4_x.csproj | 8 |
2 files changed, 12 insertions, 8 deletions
diff --git a/mcs/class/System.Web.Http.WebHost/Makefile b/mcs/class/System.Web.Http.WebHost/Makefile index e0606bdbafb..b022ea314cf 100644 --- a/mcs/class/System.Web.Http.WebHost/Makefile +++ b/mcs/class/System.Web.Http.WebHost/Makefile @@ -4,17 +4,13 @@ include ../../build/rules.make LIBRARY = System.Web.Http.WebHost.dll -System.Web.Http.WebHost.Properties.CommonWebApiResources.resources: ../../../external/aspnetwebstack/src/Common/CommonWebApiResources.resx - $(RESGEN) "$<" "$@" - -System.Web.Http.WebHost.Properties.SRResources.resources: ../../../external/aspnetwebstack/src/System.Web.Http.WebHost/Properties/SRResources.resx - $(RESGEN) "$<" "$@" - +RESOURCE_DEFS = \ + System.Web.Http.WebHost.Properties.CommonWebApiResources,../../../external/aspnetwebstack/src/Common/CommonWebApiResources.resx \ + System.Web.Http.WebHost.Properties.SRResources,../../../external/aspnetwebstack/src/System.Web.Http.WebHost/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 System.Web.Routing System.Web Microsoft.Web.Infrastructure LIB_MCS_FLAGS = -d:ASPNETMVC -keyfile:../winfx.pub -delaysign include ../../build/library.make -$(the_lib): System.Web.Http.WebHost.Properties.CommonWebApiResources.resources \ - System.Web.Http.WebHost.Properties.SRResources.resources +$(the_lib): diff --git a/mcs/class/System.Web.Http.WebHost/System.Web.Http.WebHost-net_4_x.csproj b/mcs/class/System.Web.Http.WebHost/System.Web.Http.WebHost-net_4_x.csproj index 2a4f661c3b7..0d1b62859ab 100644 --- a/mcs/class/System.Web.Http.WebHost/System.Web.Http.WebHost-net_4_x.csproj +++ b/mcs/class/System.Web.Http.WebHost/System.Web.Http.WebHost-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.WebHost.Properties.CommonWebApiResources.resources</LogicalName>
+ </EmbeddedResource>
+ <EmbeddedResource Include="../../../external/aspnetwebstack/src/System.Web.Http.WebHost/Properties/SRResources.resx">
+ <LogicalName>System.Web.Http.WebHost.Properties.SRResources.resources</LogicalName>
+ </EmbeddedResource>
+ </ItemGroup>
</Project>
|