Imported Upstream version 4.2.0.179

Former-commit-id: 4610231f55806d2a05ed69e5ff3faa7336cc1479
This commit is contained in:
Xamarin Public Jenkins
2015-08-26 07:17:56 -04:00
committed by Jo Shields
parent aa7da660d6
commit c042cd0c52
7507 changed files with 90259 additions and 657307 deletions

View File

@@ -4,14 +4,14 @@ include ../../build/rules.make
LIBRARY = System.Net.Http.Formatting.dll
System.Net.Http.Properties.CommonWebApiResources.resources: ../../../external/aspnetwebstack/src/Common/CommonWebApiResources.resx
$(RESGEN) "$<" "$@"
System.Net.Http.Properties.Resources.resources: ../../../external/aspnetwebstack/src/System.Net.Http.Formatting/Properties/Resources.resx
$(RESGEN) "$<" "$@"
LIB_MCS_FLAGS = -r:System.Core.dll -r:System.dll -r:System.Net.Http.dll -r:System.Xml.dll -r:System.Runtime.Serialization.dll -r:System.Xml.Linq.dll -r:System.Data.dll -r:System.Configuration.dll \
LIB_REFS = System.Core System System.Net.Http System.Xml System.Runtime.Serialization System.Xml.Linq System.Data System.Configuration
LIB_MCS_FLAGS = \
-d:ASPNETMVC -keyfile:../winfx.pub -delaysign \
-resource:System.Net.Http.Properties.CommonWebApiResources.resources \
-resource:System.Net.Http.Properties.Resources.resources
@@ -19,4 +19,4 @@ LIB_MCS_FLAGS = -r:System.Core.dll -r:System.dll -r:System.Net.Http.dll -r:Syste
include ../../build/library.make
$(the_lib): System.Net.Http.Properties.CommonWebApiResources.resources \
System.Net.Http.Properties.Resources.resources
System.Net.Http.Properties.Resources.resources