Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/mono.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Köplinger <alex.koeplinger@outlook.com>2017-02-15 21:53:59 +0300
committerAlexander Köplinger <alex.koeplinger@outlook.com>2017-02-15 21:53:59 +0300
commit75702b65c9bed2b517ebfe698636ab0f448621df (patch)
tree48ecb7ce598917c6d882f56ab0144f3892d930cb /mcs/class/referencesource
parentb50ac20959875cbae315d223aff897d6417ef4dc (diff)
[bcl] Remove the NETSTANDARD ifdef from profiles
We're always using the code now and will deal with the differences to .NET 4.x by producing reference assemblies.
Diffstat (limited to 'mcs/class/referencesource')
-rw-r--r--mcs/class/referencesource/System.Core/Microsoft/Scripting/Ast/LambdaExpression.cs4
-rw-r--r--mcs/class/referencesource/System.Core/System/Linq/Enumerable.cs2
-rw-r--r--mcs/class/referencesource/System.Core/System/Security/Cryptography/CngAlgorithm.cs2
-rw-r--r--mcs/class/referencesource/System.Core/System/Security/Cryptography/CngKeyBlobFormat.cs2
-rw-r--r--mcs/class/referencesource/System.Core/System/Security/Cryptography/ECDsa.cs2
-rw-r--r--mcs/class/referencesource/System.Core/System/Security/Cryptography/ECDsaCng.cs2
-rw-r--r--mcs/class/referencesource/System.Core/System/Security/Cryptography/RsaCng.cs2
-rw-r--r--mcs/class/referencesource/System/regex/system/text/regularexpressions/Regex.cs2
-rw-r--r--mcs/class/referencesource/mscorlib/system/AppContext/AppContext.cs2
9 files changed, 0 insertions, 20 deletions
diff --git a/mcs/class/referencesource/System.Core/Microsoft/Scripting/Ast/LambdaExpression.cs b/mcs/class/referencesource/System.Core/Microsoft/Scripting/Ast/LambdaExpression.cs
index 3e70f3f8c7d..1318e3550a6 100644
--- a/mcs/class/referencesource/System.Core/Microsoft/Scripting/Ast/LambdaExpression.cs
+++ b/mcs/class/referencesource/System.Core/Microsoft/Scripting/Ast/LambdaExpression.cs
@@ -139,12 +139,10 @@ namespace System.Linq.Expressions {
return LambdaCompiler.Compile(this, debugInfoGenerator);
}
-#if NETSTANDARD
public Delegate Compile(bool preferInterpretation) {
// TODO: add logic for preferInterpretation
return Compile();
}
-#endif
/// <summary>
/// Compiles the lambda into a method definition.
@@ -207,12 +205,10 @@ namespace System.Linq.Expressions {
return (TDelegate)(object)LambdaCompiler.Compile(this, debugInfoGenerator);
}
-#if NETSTANDARD
public new TDelegate Compile(bool preferInterpretation) {
// TODO: add logic for preferInterpretation
return Compile();
}
-#endif
/// <summary>
/// Creates a new expression that is like this one, but using the
diff --git a/mcs/class/referencesource/System.Core/System/Linq/Enumerable.cs b/mcs/class/referencesource/System.Core/System/Linq/Enumerable.cs
index 373609195c2..d1dc03000a9 100644
--- a/mcs/class/referencesource/System.Core/System/Linq/Enumerable.cs
+++ b/mcs/class/referencesource/System.Core/System/Linq/Enumerable.cs
@@ -694,7 +694,6 @@ namespace System.Linq
foreach (TSource element in second) yield return element;
}
-#if NETSTANDARD
public static IEnumerable<TSource> Append<TSource>(this IEnumerable<TSource> source, TSource element)
{
if (source == null) throw Error.ArgumentNull("source");
@@ -718,7 +717,6 @@ namespace System.Linq
yield return element;
foreach (TSource e1 in source) yield return e1;
}
-#endif
public static IEnumerable<TResult> Zip<TFirst, TSecond, TResult>(this IEnumerable<TFirst> first, IEnumerable<TSecond> second, Func<TFirst, TSecond, TResult> resultSelector) {
if (first == null) throw Error.ArgumentNull("first");
diff --git a/mcs/class/referencesource/System.Core/System/Security/Cryptography/CngAlgorithm.cs b/mcs/class/referencesource/System.Core/System/Security/Cryptography/CngAlgorithm.cs
index 55e173b3542..5cfafbab887 100644
--- a/mcs/class/referencesource/System.Core/System/Security/Cryptography/CngAlgorithm.cs
+++ b/mcs/class/referencesource/System.Core/System/Security/Cryptography/CngAlgorithm.cs
@@ -242,7 +242,6 @@ namespace System.Security.Cryptography {
}
}
-#if NETSTANDARD
public static CngAlgorithm ECDiffieHellman {
get {
throw new NotImplementedException ();
@@ -254,6 +253,5 @@ namespace System.Security.Cryptography {
throw new NotImplementedException ();
}
}
-#endif
}
}
diff --git a/mcs/class/referencesource/System.Core/System/Security/Cryptography/CngKeyBlobFormat.cs b/mcs/class/referencesource/System.Core/System/Security/Cryptography/CngKeyBlobFormat.cs
index 6592635e850..8ee5e598f41 100644
--- a/mcs/class/referencesource/System.Core/System/Security/Cryptography/CngKeyBlobFormat.cs
+++ b/mcs/class/referencesource/System.Core/System/Security/Cryptography/CngKeyBlobFormat.cs
@@ -119,7 +119,6 @@ namespace System.Security.Cryptography {
}
}
-#if NETSTANDARD
public static CngKeyBlobFormat EccFullPrivateBlob {
get {
throw new NotImplementedException ();
@@ -131,7 +130,6 @@ namespace System.Security.Cryptography {
throw new NotImplementedException ();
}
}
-#endif
public static CngKeyBlobFormat GenericPrivateBlob {
get {
diff --git a/mcs/class/referencesource/System.Core/System/Security/Cryptography/ECDsa.cs b/mcs/class/referencesource/System.Core/System/Security/Cryptography/ECDsa.cs
index 79202306c85..04f11603a17 100644
--- a/mcs/class/referencesource/System.Core/System/Security/Cryptography/ECDsa.cs
+++ b/mcs/class/referencesource/System.Core/System/Security/Cryptography/ECDsa.cs
@@ -41,7 +41,6 @@ namespace System.Security.Cryptography {
return CryptoConfig.CreateFromName(algorithm) as ECDsa;
}
-#if NETSTANDARD
public static ECDsa Create (ECCurve curve)
{
throw new NotImplementedException ();
@@ -71,7 +70,6 @@ namespace System.Security.Cryptography {
{
throw new NotImplementedException ();
}
-#endif
//
// Signature operations
diff --git a/mcs/class/referencesource/System.Core/System/Security/Cryptography/ECDsaCng.cs b/mcs/class/referencesource/System.Core/System/Security/Cryptography/ECDsaCng.cs
index ec51a5c6653..b0267ab9983 100644
--- a/mcs/class/referencesource/System.Core/System/Security/Cryptography/ECDsaCng.cs
+++ b/mcs/class/referencesource/System.Core/System/Security/Cryptography/ECDsaCng.cs
@@ -31,11 +31,9 @@ namespace System.Security.Cryptography {
throw new NotImplementedException ();
}
-#if NETSTANDARD
public ECDsaCng(ECCurve curve) {
throw new NotImplementedException ();
}
-#endif
public CngKey Key {
get {
diff --git a/mcs/class/referencesource/System.Core/System/Security/Cryptography/RsaCng.cs b/mcs/class/referencesource/System.Core/System/Security/Cryptography/RsaCng.cs
index 78764bb4680..ca99748e84c 100644
--- a/mcs/class/referencesource/System.Core/System/Security/Cryptography/RsaCng.cs
+++ b/mcs/class/referencesource/System.Core/System/Security/Cryptography/RsaCng.cs
@@ -18,12 +18,10 @@ namespace System.Security.Cryptography
throw new NotImplementedException ();
}
-#if NETSTANDARD
public RSACng(CngKey key)
{
throw new NotImplementedException ();
}
-#endif
public CngKey Key
{
diff --git a/mcs/class/referencesource/System/regex/system/text/regularexpressions/Regex.cs b/mcs/class/referencesource/System/regex/system/text/regularexpressions/Regex.cs
index 7ee9e535544..a978e8e73ab 100644
--- a/mcs/class/referencesource/System/regex/system/text/regularexpressions/Regex.cs
+++ b/mcs/class/referencesource/System/regex/system/text/regularexpressions/Regex.cs
@@ -472,7 +472,6 @@ namespace System.Text.RegularExpressions {
}
}
-#if NETSTANDARD
[CLSCompliant (false)]
protected IDictionary Caps
{
@@ -527,7 +526,6 @@ namespace System.Text.RegularExpressions {
}
}
}
-#endif
/// <devdoc>
/// <para>
diff --git a/mcs/class/referencesource/mscorlib/system/AppContext/AppContext.cs b/mcs/class/referencesource/mscorlib/system/AppContext/AppContext.cs
index 48b508d50de..a2fec93aa83 100644
--- a/mcs/class/referencesource/mscorlib/system/AppContext/AppContext.cs
+++ b/mcs/class/referencesource/mscorlib/system/AppContext/AppContext.cs
@@ -33,7 +33,6 @@ namespace System
}
}
-#if NETSTANDARD
public static string TargetFrameworkName
{
get
@@ -46,7 +45,6 @@ namespace System
{
throw new NotImplementedException();
}
-#endif
#region Switch APIs
#if !MONO