Imported Upstream version 5.2.0.175

Former-commit-id: bb0468d0f257ff100aa895eb5fe583fb5dfbf900
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-06-07 13:16:24 +00:00
parent 4bdbaf4a88
commit 966bba02bb
8776 changed files with 346420 additions and 149650 deletions

View File

@ -1,4 +1,4 @@
//
//
// ScriptResourceAttribute.cs
//
// Author:
@ -40,10 +40,10 @@ namespace System.Web.UI
string _scriptResourceName;
string _typeName;
public ScriptResourceAttribute (string scriptName, string scriptResourceName, string typeName) {
public ScriptResourceAttribute (string scriptName, string stringResourceName, string stringResourceClientTypeName) {
_scriptName = scriptName;
_scriptResourceName = scriptResourceName;
_typeName = typeName;
_scriptResourceName = stringResourceName;
_typeName = stringResourceClientTypeName;
}
public string ScriptName {