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

@ -56,9 +56,9 @@ namespace System.Configuration.Internal
return host.CreateDeprecatedConfigContext (configPath);
}
public virtual string DecryptSection (string encryptedXml, ProtectedConfigurationProvider protectionProvider, ProtectedConfigurationSection protectedSection)
public virtual string DecryptSection (string encryptedXml, ProtectedConfigurationProvider protectionProvider, ProtectedConfigurationSection protectedConfigSection)
{
return host.DecryptSection (encryptedXml, protectionProvider, protectedSection);
return host.DecryptSection (encryptedXml, protectionProvider, protectedConfigSection);
}
public virtual void DeleteStream (string streamName)
@ -66,14 +66,14 @@ namespace System.Configuration.Internal
host.DeleteStream (streamName);
}
public virtual string EncryptSection (string encryptedXml, ProtectedConfigurationProvider protectionProvider, ProtectedConfigurationSection protectedSection)
public virtual string EncryptSection (string clearTextXml, ProtectedConfigurationProvider protectionProvider, ProtectedConfigurationSection protectedConfigSection)
{
return host.EncryptSection (encryptedXml, protectionProvider, protectedSection);
return host.EncryptSection (clearTextXml, protectionProvider, protectedConfigSection);
}
public virtual string GetConfigPathFromLocationSubPath (string configPath, string locatinSubPath)
public virtual string GetConfigPathFromLocationSubPath (string configPath, string locationSubPath)
{
return host.GetConfigPathFromLocationSubPath (configPath, locatinSubPath);
return host.GetConfigPathFromLocationSubPath (configPath, locationSubPath);
}
public virtual Type GetConfigType (string typeName, bool throwOnError)
@ -111,14 +111,14 @@ namespace System.Configuration.Internal
return host.Impersonate ();
}
public virtual void Init (IInternalConfigRoot root, params object[] hostInitParams)
public virtual void Init (IInternalConfigRoot configRoot, params object[] hostInitParams)
{
host.Init (root, hostInitParams);
host.Init (configRoot, hostInitParams);
}
public virtual void InitForConfiguration (ref string locationSubPath, out string configPath, out string locationConfigPath, IInternalConfigRoot root, params object[] hostInitConfigurationParams)
public virtual void InitForConfiguration (ref string locationSubPath, out string configPath, out string locationConfigPath, IInternalConfigRoot configRoot, params object[] hostInitConfigurationParams)
{
host.InitForConfiguration (ref locationSubPath, out configPath, out locationConfigPath, root, hostInitConfigurationParams);
host.InitForConfiguration (ref locationSubPath, out configPath, out locationConfigPath, configRoot, hostInitConfigurationParams);
}
public virtual bool IsAboveApplication (string configPath)