Imported Upstream version 5.0.0.42

Former-commit-id: fd56571888259555122d8a0f58c68838229cea2b
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-04-10 11:41:01 +00:00
parent 1190d13a04
commit 6bdd276d05
19939 changed files with 3099680 additions and 93811 deletions

View File

@@ -52,7 +52,7 @@ endif
LIB_REFS = System System.Core System.Drawing System.Data System.Data.Linq System.Xml System.Web System.Web.Services System.Configuration System.EnterpriseServices System.ServiceModel
LIB_MCS_FLAGS = \
-unsafe \
-define:NET_3_5 \
-define:NET_3_5 -nowarn:436 \
-define:SYSTEM_WEB_EXTENSIONS \
$(OTHER_LIB_MCS_FLAGS) \
$(RESOURCE_FILES:%=/resource:%)

View File

@@ -42,7 +42,9 @@ namespace System.Web.ClientServices.Providers
{
public class ClientFormsAuthenticationMembershipProvider : System.Web.Security.MembershipProvider
{
#pragma warning disable 67
public event EventHandler <UserValidatedEventArgs> UserValidated;
#pragma warning restore 67
public override string ApplicationName {
get { throw new NotImplementedException (); }

View File

@@ -43,7 +43,9 @@ namespace System.Web.ClientServices.Providers
{
public class ClientSettingsProvider : SettingsProvider, IApplicationSettingsProvider
{
#pragma warning disable 67
public event EventHandler <SettingsSavedEventArgs> SettingsSaved;
#pragma warning restore 67
public static string ServiceUri {
get { throw new NotImplementedException (); }

View File

@@ -1,6 +1,3 @@
../../build/common/Consts.cs
../../build/common/Locale.cs
../../build/common/MonoTODOAttribute.cs
../System.Web/System.Web.Util/MachineKeySectionUtils.cs
../System.Web/System.Web.Configuration_2.0/MachineKeyRegistryStorage.cs
../System.Web/System.Web.Handlers/AssemblyResourceLoader.cs

View File

@@ -133,7 +133,6 @@ namespace System.Web.Handlers
if (entries.Count == 0)
throw new HttpException (404, "Resource not found");
long atime;
DateTime modifiedSince;
bool hasIfModifiedSince = HasIfModifiedSince (context.Request, out modifiedSince);

View File

@@ -1226,7 +1226,7 @@ namespace MonoTests.System.Web.UI.WebControls
string pageHtml = t.Run ();
string renderedHtml = HtmlDiff.GetControlFromPageHtml (pageHtml);
Assert.AreEqual (originalHtml_1, renderedHtml, "#A1");
Assert.AreEqual (originalHtml_1.Replace ("\r\n", "\n"), renderedHtml, "#A1");
FormRequest fr = new FormRequest (t.Response, "form1");
fr.Controls.Add ("__EVENTTARGET");
@@ -1236,7 +1236,7 @@ namespace MonoTests.System.Web.UI.WebControls
pageHtml = t.Run ();
renderedHtml = HtmlDiff.GetControlFromPageHtml (pageHtml);
Assert.AreEqual (originalHtml_2, renderedHtml, "#A2");
Assert.AreEqual (originalHtml_2.Replace ("\r\n", "\n"), renderedHtml, "#A2");
}
[Test (Description="Bug #535701, test 2")]
@@ -1262,7 +1262,7 @@ namespace MonoTests.System.Web.UI.WebControls
string pageHtml = t.Run ();
string renderedHtml = HtmlDiff.GetControlFromPageHtml (pageHtml);
Assert.AreEqual (originalHtml_1, renderedHtml, "#A1");
Assert.AreEqual (originalHtml_1.Replace ("\r\n", "\n"), renderedHtml, "#A1");
FormRequest fr = new FormRequest (t.Response, "form1");
fr.Controls.Add ("__EVENTTARGET");
@@ -1272,7 +1272,7 @@ namespace MonoTests.System.Web.UI.WebControls
pageHtml = t.Run ();
renderedHtml = HtmlDiff.GetControlFromPageHtml (pageHtml);
Assert.AreEqual (originalHtml_2, renderedHtml, "#A2");
Assert.AreEqual (originalHtml_2.Replace ("\r\n", "\n"), renderedHtml, "#A2");
}
[Test (Description="Bug #604053")]