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.Data.Services.Client | |
| 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.Data.Services.Client')
| -rw-r--r-- | mcs/class/System.Data.Services.Client/Makefile | 8 | ||||
| -rw-r--r-- | mcs/class/System.Data.Services.Client/System.Data.Services.Client-net_4_x.csproj | 6 |
2 files changed, 5 insertions, 9 deletions
diff --git a/mcs/class/System.Data.Services.Client/Makefile b/mcs/class/System.Data.Services.Client/Makefile index 108d98cf149..f635e808fc3 100644 --- a/mcs/class/System.Data.Services.Client/Makefile +++ b/mcs/class/System.Data.Services.Client/Makefile @@ -4,13 +4,11 @@ include ../../build/rules.make LIBRARY = System.Data.Services.Client.dll -Client/System.Data.Services.Client.resources: Client/System.Data.Services.Client.txt - $(RESGEN) "$<" "$@" +RESOURCE_DEFS = System.Data.Services.Client,Client/System.Data.Services.Client.txt LIB_REFS = System System.Core System.Xml.Linq System.Data System.Xml LIB_MCS_FLAGS = \ -d:NET_3_5 \ - -resource:Client/System.Data.Services.Client.resources \ -warn:2 ifndef NO_WINDOWS_BASE @@ -21,7 +19,5 @@ endif include ../../build/library.make -$(the_lib): Client/System.Data.Services.Client.resources - EXTRA_DISTFILES = Client/System.Data.Services.Client.txt -CLEAN_FILES += Client/System.Data.Services.Client.resources + diff --git a/mcs/class/System.Data.Services.Client/System.Data.Services.Client-net_4_x.csproj b/mcs/class/System.Data.Services.Client/System.Data.Services.Client-net_4_x.csproj index 55b9e130c8c..e5d64222fa8 100644 --- a/mcs/class/System.Data.Services.Client/System.Data.Services.Client-net_4_x.csproj +++ b/mcs/class/System.Data.Services.Client/System.Data.Services.Client-net_4_x.csproj @@ -173,10 +173,10 @@ -->
<PropertyGroup>
<PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' "> -resgen $(ProjectDir)\Client\System.Data.Services.Client.txt $(ProjectDir)\Client\System.Data.Services.Client.resx + </PreBuildEvent>
<PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-resgen $(ProjectDir)\Client\System.Data.Services.Client.txt $(ProjectDir)\Client\System.Data.Services.Client.resx
+
</PreBuildEvent>
<PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' "> @@ -219,7 +219,7 @@ resgen $(ProjectDir)\Client\System.Data.Services.Client.txt $(ProjectDir)\Client <Folder Include="Properties\" />
</ItemGroup>
<ItemGroup>
- <EmbeddedResource Include="Client/System.Data.Services.Client.resx">
+ <EmbeddedResource Include="Client/System.Data.Services.Client.txt">
<LogicalName>System.Data.Services.Client.resources</LogicalName>
</EmbeddedResource>
</ItemGroup>
|