Imported Upstream version 5.8.0.22

Former-commit-id: df344e34b07851d296efb3e6604c8db42b6f7aa3
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-10-19 20:04:20 +00:00
parent 5f4a27cc8a
commit 7d05485754
5020 changed files with 114082 additions and 186061 deletions

View File

@@ -59,7 +59,6 @@ using System.Web.UI;
[assembly: TagPrefix("System.Web.UI.WebControls", "asp")]
#if !(TARGET_DOTNET)
[assembly: AssemblyDelaySign(true)]
[assembly: AssemblyKeyFile("../msfinal.pub")]
[assembly: AssemblyFileVersion (Consts.FxVersion)]
[assembly: CompilationRelaxations (CompilationRelaxations.NoStringInterning)]

View File

@@ -243,6 +243,7 @@ TXT_RESOURCE_STRINGS = ../referencesource/System.Web/System.Web.txt
LIB_REFS = System System.Core System.Drawing System.Data System.Xml System.EnterpriseServices System.Runtime.Serialization.Formatters.Soap \
System.ComponentModel.DataAnnotations System.Web.ApplicationServices System.Configuration Mono.Data.Sqlite
KEYFILE = ../msfinal.pub
LIB_MCS_FLAGS = \
-unsafe \
-nowarn:612,618 \

View File

@@ -174,7 +174,11 @@ namespace System.Web.Configuration
{
string fullPath = (string) hostInitConfigurationParams [1];
map = (WebConfigurationFileMap) hostInitConfigurationParams [0];
bool inAnotherApp = (bool) hostInitConfigurationParams [7];
bool inAnotherApp = false;
if ((hostInitConfigurationParams.Length > 7)
&& (hostInitConfigurationParams[7] is bool))
inAnotherApp = (bool) hostInitConfigurationParams[7];
if (inAnotherApp)
appVirtualPath = fullPath;

View File

@@ -24,7 +24,7 @@ APPLICATION_ASSEMBLY_MCS_FLAGS = \
-debug:full \
-r:System.Web.dll
VALID_PROFILE := $(filter 4.0, $(FRAMEWORK_VERSION))
VALID_PROFILE := $(filter 4.5, $(FRAMEWORK_VERSION))
ifndef VALID_PROFILE
all:

View File

@@ -13,7 +13,7 @@ APPLICATION_ASSEMBLY_MCS_FLAGS = \
-debug:full \
-r:System.Web.dll
VALID_PROFILE := $(filter 4.0, $(FRAMEWORK_VERSION))
VALID_PROFILE := $(filter 4.5, $(FRAMEWORK_VERSION))
ifndef VALID_PROFILE
all:

View File

@@ -13,7 +13,7 @@ APPLICATION_ASSEMBLY_MCS_FLAGS = \
-debug:full \
-r:System.Web.dll
VALID_PROFILE := $(filter 4.0, $(FRAMEWORK_VERSION))
VALID_PROFILE := $(filter 4.5, $(FRAMEWORK_VERSION))
ifndef VALID_PROFILE
all:

View File

@@ -13,7 +13,7 @@ APPLICATION_ASSEMBLY_MCS_FLAGS = \
-debug:full \
-r:System.Web.dll
VALID_PROFILE := $(filter 4.0, $(FRAMEWORK_VERSION))
VALID_PROFILE := $(filter 4.5, $(FRAMEWORK_VERSION))
ifndef VALID_PROFILE
all:

View File

@@ -13,7 +13,7 @@ APPLICATION_ASSEMBLY_MCS_FLAGS = \
-debug:full \
-r:System.Web.dll
VALID_PROFILE := $(filter 4.0, $(FRAMEWORK_VERSION))
VALID_PROFILE := $(filter 4.5, $(FRAMEWORK_VERSION))
ifndef VALID_PROFILE
all:

View File

@@ -13,7 +13,7 @@ APPLICATION_ASSEMBLY_MCS_FLAGS = \
-debug:full \
-r:System.Web.dll
VALID_PROFILE := $(filter 4.0, $(FRAMEWORK_VERSION))
VALID_PROFILE := $(filter 4.5, $(FRAMEWORK_VERSION))
ifndef VALID_PROFILE
all:

View File

@@ -13,7 +13,7 @@ APPLICATION_ASSEMBLY_MCS_FLAGS = \
-debug:full \
-r:System.Web.dll
VALID_PROFILE := $(filter 4.0, $(FRAMEWORK_VERSION))
VALID_PROFILE := $(filter 4.5, $(FRAMEWORK_VERSION))
ifndef VALID_PROFILE
all:

View File

@@ -13,7 +13,7 @@ APPLICATION_ASSEMBLY_MCS_FLAGS = \
-debug:full \
-r:System.Web.dll
VALID_PROFILE := $(filter 4.0, $(FRAMEWORK_VERSION))
VALID_PROFILE := $(filter 4.5, $(FRAMEWORK_VERSION))
ifndef VALID_PROFILE
all:

View File

@@ -12,7 +12,7 @@ APPLICATION_ASSEMBLY_MCS_FLAGS = \
-debug:full \
-r:System.Web.dll
VALID_PROFILE := $(filter 4.0, $(FRAMEWORK_VERSION))
VALID_PROFILE := $(filter 4.5, $(FRAMEWORK_VERSION))
ifndef VALID_PROFILE
all:

View File

@@ -12,7 +12,7 @@ APPLICATION_ASSEMBLY_MCS_FLAGS = \
-debug:full \
-r:System.Web.dll
VALID_PROFILE := $(filter 4.0, $(FRAMEWORK_VERSION))
VALID_PROFILE := $(filter 4.5, $(FRAMEWORK_VERSION))
ifndef VALID_PROFILE
all:

View File

@@ -12,7 +12,7 @@ APPLICATION_ASSEMBLY_MCS_FLAGS = \
-debug:full \
-r:System.Web.dll
VALID_PROFILE := $(filter 4.0, $(FRAMEWORK_VERSION))
VALID_PROFILE := $(filter 4.5, $(FRAMEWORK_VERSION))
ifndef VALID_PROFILE
all:

View File

@@ -12,7 +12,7 @@ APPLICATION_ASSEMBLY_MCS_FLAGS = \
-debug:full \
-r:System.Web.dll
VALID_PROFILE := $(filter 4.0, $(FRAMEWORK_VERSION))
VALID_PROFILE := $(filter 4.5, $(FRAMEWORK_VERSION))
ifndef VALID_PROFILE
all:

View File

@@ -12,7 +12,7 @@ APPLICATION_ASSEMBLY_MCS_FLAGS = \
-debug:full \
-r:System.Web.dll
VALID_PROFILE := $(filter 4.0, $(FRAMEWORK_VERSION))
VALID_PROFILE := $(filter 4.5, $(FRAMEWORK_VERSION))
ifndef VALID_PROFILE
all:

View File

@@ -12,7 +12,7 @@ APPLICATION_ASSEMBLY_MCS_FLAGS = \
-debug:full \
-r:System.Web.dll
VALID_PROFILE := $(filter 4.0, $(FRAMEWORK_VERSION))
VALID_PROFILE := $(filter 4.5, $(FRAMEWORK_VERSION))
ifndef VALID_PROFILE
all:

View File

@@ -12,7 +12,7 @@ APPLICATION_ASSEMBLY_MCS_FLAGS = \
-debug:full \
-r:System.Web.dll
VALID_PROFILE := $(filter 4.0, $(FRAMEWORK_VERSION))
VALID_PROFILE := $(filter 4.5, $(FRAMEWORK_VERSION))
ifndef VALID_PROFILE
all:

View File

@@ -12,7 +12,7 @@ APPLICATION_ASSEMBLY_MCS_FLAGS = \
-debug:full \
-r:System.Web.dll
VALID_PROFILE := $(filter 4.0, $(FRAMEWORK_VERSION))
VALID_PROFILE := $(filter 4.5, $(FRAMEWORK_VERSION))
ifndef VALID_PROFILE
all:

View File

@@ -12,7 +12,7 @@ APPLICATION_ASSEMBLY_MCS_FLAGS = \
-debug:full \
-r:System.Web.dll
VALID_PROFILE := $(filter 4.0, $(FRAMEWORK_VERSION))
VALID_PROFILE := $(filter 4.5, $(FRAMEWORK_VERSION))
ifndef VALID_PROFILE
all:

Some files were not shown because too many files have changed in this diff Show More