mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 4.3.2.467

Browse Source 
Former-commit-id: 9c2cb47f45fa221e661ab616387c9cda183f283d
This commit is contained in:
Xamarin Public Jenkins
2016-02-22 11:00:01 -05:00
parent f302175246
commit f3e3aab35a
4097 changed files with 122406 additions and 82300 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mcs/class/System.Web.Extensions/Makefile
View File

@@ -30,9 +30,7 @@ RESOURCE_FILES_DIST= \
NUNIT_RESOURCE_FILES= \
Test/resources/Web.mono.config \
Test/resources/profile.config.4.5 \
Test/resources/profile.config.4.0 \
Test/resources/profile.config.2.0 \
Test/resources/profile.config.4.x \
$(wildcard Test/resources/*.as?x) \
$(wildcard ../System.Web/Test/mainsoft/NunitWeb/NunitWeb/Resources/*.cs) \
$(wildcard ../System.Web/Test/mainsoft/NunitWeb/NunitWeb/Resources/*.as?x) \

8
mcs/class/System.Web.Extensions/Test/System.Web.Script.Serialization/JavaScriptSerializerTest.cs
View File

File diff suppressed because one or more lines are too long

34
mcs/class/System.Web.Extensions/Test/System.Web.UI.WebControls/ListViewTest.cs
View File

File diff suppressed because one or more lines are too long

8
mcs/class/System.Web.Extensions/Test/code/WebTestLocal.cs
View File

@@ -10,12 +10,10 @@ namespace MonoTests.SystemWeb.Framework
#if !DOTNET
CopyResource (myself, "Web.mono.config", "Web.config");
#endif
#if NET_4_5
CopyResource (myself, "profile.config.4.5", "profile.config");
#elif NET_4_0
CopyResource (myself, "profile.config.4.0", "profile.config");
#if NET_4_6
CopyResource (myself, "profile.config.4.x", "profile.config");
#else
CopyResource (myself, "profile.config.2.0", "profile.config");
#error "Unknown profile"
#endif
}
}

8
mcs/class/System.Web.Extensions/Test/resources/profile.config.2.0
View File

@@ -1,8 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<pages>
<controls>
<add tagPrefix="asp" namespace="System.Web.UI" assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
<add tagPrefix="asp" namespace="System.Web.UI.WebControls" assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
<add tagPrefix="t" namespace="MonoTests.System.Web.UI.WebControls" assembly="System.Web.Extensions_test_net_2_0"/>
</controls>
</pages>

8
mcs/class/System.Web.Extensions/Test/resources/profile.config.4.5
View File

@@ -1,8 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<pages>
<controls>
<add tagPrefix="asp" namespace="System.Web.UI" assembly="System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
<add tagPrefix="asp" namespace="System.Web.UI.WebControls" assembly="System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
<add tagPrefix="t" namespace="MonoTests.System.Web.UI.WebControls" assembly="System.Web.Extensions_test_net_4_5"/>
</controls>
</pages>

2
mcs/class/System.Web.Extensions/Test/resources/profile.config.4.0 → mcs/class/System.Web.Extensions/Test/resources/profile.config.4.x
View File

@@ -3,6 +3,6 @@
<controls>
<add tagPrefix="asp" namespace="System.Web.UI" assembly="System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
<add tagPrefix="asp" namespace="System.Web.UI.WebControls" assembly="System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
<add tagPrefix="t" namespace="MonoTests.System.Web.UI.WebControls" assembly="System.Web.Extensions_test_net_4_0"/>
<add tagPrefix="t" namespace="MonoTests.System.Web.UI.WebControls" assembly="System.Web.Extensions_test_net_4_x"/>
</controls>
</pages>