diff --git a/src/Numerics/Compatibility.cs b/src/Numerics/Compatibility.cs
index 2294cc15..680dd790 100644
--- a/src/Numerics/Compatibility.cs
+++ b/src/Numerics/Compatibility.cs
@@ -334,36 +334,3 @@ namespace MathNet.Numerics
}
}
#endif
-
-#if NETSTANDARD1_6
-namespace MathNet.Numerics
-{
- public interface ICloneable
-
- {
- object Clone();
- }
-}
-#endif
-
-#if NETSTANDARD1_6
-namespace MathNet.Numerics
-{
- using System;
-
- public static class MathExtensions
- {
- public static int DivRem(int a, int b, out int result)
- {
- result = a/b;
- return a%b;
- }
-
- public static long DivRem(long a, long b, out long result)
- {
- result = a/b;
- return a%b;
- }
- }
-}
-#endif
diff --git a/src/Numerics/ComplexExtensions.cs b/src/Numerics/ComplexExtensions.cs
index 77eddc23..b2ba2970 100644
--- a/src/Numerics/ComplexExtensions.cs
+++ b/src/Numerics/ComplexExtensions.cs
@@ -32,7 +32,7 @@ namespace MathNet.Numerics
using System;
using System.Collections.Generic;
-#if !PORTABLE || NETSTANDARD1_6
+#if !PORTABLE && !NETSTANDARD1_6
using System.Runtime;
#endif
diff --git a/src/Numerics/LinearAlgebra/Matrix.Arithmetic.cs b/src/Numerics/LinearAlgebra/Matrix.Arithmetic.cs
index 355311f1..793113a2 100644
--- a/src/Numerics/LinearAlgebra/Matrix.Arithmetic.cs
+++ b/src/Numerics/LinearAlgebra/Matrix.Arithmetic.cs
@@ -36,7 +36,7 @@ namespace MathNet.Numerics.LinearAlgebra
///
/// Defines the base class for Matrix classes.
///
- public abstract partial class Matrix : ICloneable
+ public abstract partial class Matrix
{
///
/// The value of 1.0.
diff --git a/src/Numerics/LinearAlgebra/Matrix.BCL.cs b/src/Numerics/LinearAlgebra/Matrix.BCL.cs
index 9c689109..b8c6bf57 100644
--- a/src/Numerics/LinearAlgebra/Matrix.BCL.cs
+++ b/src/Numerics/LinearAlgebra/Matrix.BCL.cs
@@ -37,7 +37,7 @@ namespace MathNet.Numerics.LinearAlgebra
{
[DebuggerDisplay("Matrix {RowCount}x{ColumnCount}")]
- public abstract partial class Matrix : ICloneable
+ public abstract partial class Matrix
{
///
/// Indicates whether the current object is equal to another object of the same type.
@@ -77,21 +77,19 @@ namespace MathNet.Numerics.LinearAlgebra
return Storage.GetHashCode();
}
-#if !PORTABLE
+#if !PORTABLE && !NETSTANDARD1_6
///
/// Creates a new object that is a copy of the current instance.
///
///
/// A new object that is a copy of this instance.
- ///
- ///
+ ///
object ICloneable.Clone()
{
return Clone();
}
-
#endif
///
diff --git a/src/Numerics/LinearAlgebra/Matrix.Operators.cs b/src/Numerics/LinearAlgebra/Matrix.Operators.cs
index 0979bac1..ee19f15c 100644
--- a/src/Numerics/LinearAlgebra/Matrix.Operators.cs
+++ b/src/Numerics/LinearAlgebra/Matrix.Operators.cs
@@ -35,7 +35,7 @@ namespace MathNet.Numerics.LinearAlgebra
///
/// Defines the base class for Matrix classes.
///
- public abstract partial class Matrix : ICloneable
+ public abstract partial class Matrix
{
///
/// Returns a Matrix containing the same values of .
diff --git a/src/Numerics/LinearAlgebra/Matrix.Solve.cs b/src/Numerics/LinearAlgebra/Matrix.Solve.cs
index e3e353fa..e46f6d64 100644
--- a/src/Numerics/LinearAlgebra/Matrix.Solve.cs
+++ b/src/Numerics/LinearAlgebra/Matrix.Solve.cs
@@ -36,7 +36,7 @@ namespace MathNet.Numerics.LinearAlgebra
///
/// Defines the base class for Matrix classes.
///
- public abstract partial class Matrix : ICloneable
+ public abstract partial class Matrix
{
// Factorizations
diff --git a/src/Numerics/LinearAlgebra/Matrix.cs b/src/Numerics/LinearAlgebra/Matrix.cs
index a42bc3ef..e3606f52 100644
--- a/src/Numerics/LinearAlgebra/Matrix.cs
+++ b/src/Numerics/LinearAlgebra/Matrix.cs
@@ -44,7 +44,7 @@ namespace MathNet.Numerics.LinearAlgebra
[Serializable]
public abstract partial class Matrix :
IFormattable, IEquatable>
-#if PORTABLE || NET461
+#if !PORTABLE && !NETSTANDARD1_6
, ICloneable
#endif
where T : struct, IEquatable, IFormattable
diff --git a/src/Numerics/LinearAlgebra/Vector.BCL.cs b/src/Numerics/LinearAlgebra/Vector.BCL.cs
index f7cdd553..8e4c1702 100644
--- a/src/Numerics/LinearAlgebra/Vector.BCL.cs
+++ b/src/Numerics/LinearAlgebra/Vector.BCL.cs
@@ -77,7 +77,7 @@ namespace MathNet.Numerics.LinearAlgebra
return Storage.GetHashCode();
}
-#if !PORTABLE
+#if !PORTABLE && !NETSTANDARD1_6
///
/// Creates a new object that is a copy of the current instance.
diff --git a/src/Numerics/LinearAlgebra/Vector.cs b/src/Numerics/LinearAlgebra/Vector.cs
index b7a4b780..acfeed0a 100644
--- a/src/Numerics/LinearAlgebra/Vector.cs
+++ b/src/Numerics/LinearAlgebra/Vector.cs
@@ -43,7 +43,7 @@ namespace MathNet.Numerics.LinearAlgebra
[Serializable]
public abstract partial class Vector :
IFormattable, IEquatable>, IList, IList
-#if !PORTABLE
+#if !PORTABLE && !NETSTANDARD1_6
, ICloneable
#endif
where T : struct, IEquatable, IFormattable
diff --git a/src/Numerics/Statistics/Histogram.cs b/src/Numerics/Statistics/Histogram.cs
index 6585fc90..6b603911 100644
--- a/src/Numerics/Statistics/Histogram.cs
+++ b/src/Numerics/Statistics/Histogram.cs
@@ -48,7 +48,7 @@ namespace MathNet.Numerics.Statistics
[Serializable]
[DataContract(Namespace = "urn:MathNet/Numerics")]
public class Bucket :
-#if PORTABLE
+#if PORTABLE || NETSTANDARD1_6
IComparable
#else
IComparable, ICloneable