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 | |
| 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')
| -rw-r--r-- | mcs/class/System.Web.Http/Makefile | 17 | ||||
| -rw-r--r-- | mcs/class/System.Web.Http/System.Web.Http-net_4_x.csproj | 8 |
2 files changed, 7 insertions, 18 deletions
diff --git a/mcs/class/System.Web.Http/Makefile b/mcs/class/System.Web.Http/Makefile index fb50d52d2e9..72afa046d2a 100644 --- a/mcs/class/System.Web.Http/Makefile +++ b/mcs/class/System.Web.Http/Makefile @@ -4,20 +4,13 @@ include ../../build/rules.make LIBRARY = System.Web.Http.dll -System.Web.Http.Properties.CommonWebApiResources.resources: ../../../external/aspnetwebstack/src/Common/CommonWebApiResources.resx - $(RESGEN) "$<" "$@" - -System.Web.Http.Properties.SRResources.resources: ../../../external/aspnetwebstack/src/System.Web.Http/Properties/SRResources.resx - $(RESGEN) "$<" "$@" +RESOURCE_DEFS = \ + System.Web.Http.Properties.CommonWebApiResources,../../../external/aspnetwebstack/src/Common/CommonWebApiResources.resx \ + System.Web.Http.Properties.SRResources,../../../external/aspnetwebstack/src/System.Web.Http/Properties/SRResources.resx + LIB_REFS = System.Core System System.Xml System.Net.Http System.ComponentModel.DataAnnotations System.Net.Http.Formatting System.Runtime.Caching System.Runtime.Serialization System.Data.Linq -LIB_MCS_FLAGS = \ - -d:ASPNETMVC -keyfile:../winfx.pub -delaysign \ - -resource:System.Web.Http.Properties.CommonWebApiResources.resources \ - -resource:System.Web.Http.Properties.SRResources.resources +LIB_MCS_FLAGS = -d:ASPNETMVC -keyfile:../winfx.pub -delaysign include ../../build/library.make - -$(the_lib): System.Web.Http.Properties.CommonWebApiResources.resources \ - System.Web.Http.Properties.SRResources.resources diff --git a/mcs/class/System.Web.Http/System.Web.Http-net_4_x.csproj b/mcs/class/System.Web.Http/System.Web.Http-net_4_x.csproj index dab06f09c1f..bb5c8db8c3f 100644 --- a/mcs/class/System.Web.Http/System.Web.Http-net_4_x.csproj +++ b/mcs/class/System.Web.Http/System.Web.Http-net_4_x.csproj @@ -327,13 +327,9 @@ -->
<PropertyGroup>
<PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' "> -cp $(ProjectDir)/../../../external/aspnetwebstack/src/Common/CommonWebApiResources.resx $(ProjectDir)/System.Web.Http.Properties.CommonWebApiResources.resx -cp $(ProjectDir)/../../../external/aspnetwebstack/src/System.Web.Http/Properties/SRResources.resx $(ProjectDir)/System.Web.Http.Properties.SRResources.resx </PreBuildEvent>
<PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-cp $(ProjectDir)/../../../external/aspnetwebstack/src/Common/CommonWebApiResources.resx $(ProjectDir)/System.Web.Http.Properties.CommonWebApiResources.resx -cp $(ProjectDir)/../../../external/aspnetwebstack/src/System.Web.Http/Properties/SRResources.resx $(ProjectDir)/System.Web.Http.Properties.SRResources.resx </PreBuildEvent>
<PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' "> @@ -389,10 +385,10 @@ cp $(ProjectDir)/../../../external/aspnetwebstack/src/System.Web.Http/Properties <Folder Include="Properties\" />
</ItemGroup>
<ItemGroup>
- <EmbeddedResource Include="System.Web.Http.Properties.CommonWebApiResources.resx">
+ <EmbeddedResource Include="../../../external/aspnetwebstack/src/Common/CommonWebApiResources.resx">
<LogicalName>System.Web.Http.Properties.CommonWebApiResources.resources</LogicalName>
</EmbeddedResource>
- <EmbeddedResource Include="System.Web.Http.Properties.SRResources.resx">
+ <EmbeddedResource Include="../../../external/aspnetwebstack/src/System.Web.Http/Properties/SRResources.resx">
<LogicalName>System.Web.Http.Properties.SRResources.resources</LogicalName>
</EmbeddedResource>
</ItemGroup>
|