Imported Upstream version 4.0.0~alpha1

Former-commit-id: 806294f5ded97629b74c85c09952f2a74fe182d9
This commit is contained in:
Jo Shields
2015-04-07 09:35:12 +01:00
parent 283343f570
commit 3c1f479b9d
22469 changed files with 2931443 additions and 869343 deletions

View File

@@ -65,11 +65,7 @@ namespace System.Security.Cryptography {
get;
}
#if NET_4_0
public void Dispose ()
#else
void IDisposable.Dispose ()
#endif
{
Dispose (true);
GC.SuppressFinalize (this); // Finalization is now unnecessary
@@ -80,13 +76,9 @@ namespace System.Security.Cryptography {
Dispose (false);
}
#if NET_4_0
protected virtual void Dispose (bool disposing)
{
}
#else
protected abstract void Dispose (bool disposing);
#endif
public abstract void FromXmlString (string xmlString);
public abstract string ToXmlString (bool includePrivateParameters);