From bd1a63e4f4334120d86cb588c39af5f6934a04a7 Mon Sep 17 00:00:00 2001 From: Marek Safar Date: Sun, 1 Apr 2018 14:50:09 +0200 Subject: Moves vector to mscorlib --- mcs/class/System.Numerics.Vectors/Assembly/TypeForwarders.cs | 2 ++ mcs/class/System.Numerics.Vectors/Makefile | 4 +--- .../System.Numerics.Vectors.dll.sources | 11 ----------- mcs/class/System.Numerics.Vectors/corefx/SR.cs | 12 ------------ 4 files changed, 3 insertions(+), 26 deletions(-) delete mode 100644 mcs/class/System.Numerics.Vectors/corefx/SR.cs (limited to 'mcs/class/System.Numerics.Vectors') diff --git a/mcs/class/System.Numerics.Vectors/Assembly/TypeForwarders.cs b/mcs/class/System.Numerics.Vectors/Assembly/TypeForwarders.cs index b2929d84ecf..a3949103721 100644 --- a/mcs/class/System.Numerics.Vectors/Assembly/TypeForwarders.cs +++ b/mcs/class/System.Numerics.Vectors/Assembly/TypeForwarders.cs @@ -34,3 +34,5 @@ using System.Runtime.CompilerServices; [assembly: TypeForwardedTo(typeof(Vector2))] [assembly: TypeForwardedTo(typeof(Vector3))] [assembly: TypeForwardedTo(typeof(Vector4))] +[assembly: TypeForwardedTo(typeof(Vector<>))] +[assembly: TypeForwardedTo(typeof(Vector))] diff --git a/mcs/class/System.Numerics.Vectors/Makefile b/mcs/class/System.Numerics.Vectors/Makefile index 6e89b99e9b3..5e66c3955ba 100644 --- a/mcs/class/System.Numerics.Vectors/Makefile +++ b/mcs/class/System.Numerics.Vectors/Makefile @@ -6,9 +6,7 @@ LIBRARY = System.Numerics.Vectors.dll LIB_REFS = System System.Numerics KEYFILE = ../msfinal.pub LIB_MCS_FLAGS = -unsafe -#LIBRARY_WARN_AS_ERROR = yes - -RESX_RESOURCE_STRING = ../../../external/corefx/src/System.Numerics.Vectors/src/Resources/Strings.resx +LIBRARY_WARN_AS_ERROR = yes EXTRA_DISTFILES = diff --git a/mcs/class/System.Numerics.Vectors/System.Numerics.Vectors.dll.sources b/mcs/class/System.Numerics.Vectors/System.Numerics.Vectors.dll.sources index 8e029a0c6d6..2a702eff0e2 100644 --- a/mcs/class/System.Numerics.Vectors/System.Numerics.Vectors.dll.sources +++ b/mcs/class/System.Numerics.Vectors/System.Numerics.Vectors.dll.sources @@ -1,14 +1,3 @@ ../../build/common/Consts.cs -../../build/common/SR.cs Assembly/AssemblyInfo.cs Assembly/TypeForwarders.cs -corefx/SR.cs - -../../../external/corefx/src/Common/src/CoreLib/System/Numerics/ConstantHelper.cs -../../../external/corefx/src/Common/src/CoreLib/System/Numerics/Register.cs -../../../external/corefx/src/Common/src/CoreLib/System/Numerics/Vector.cs -../../../external/corefx/src/Common/src/CoreLib/System/Numerics/Vector_Operations.cs - -../../../external/corefx/src/Common/src/CoreLib/System/Runtime/CompilerServices/IntrinsicAttribute.cs - -../../../external/corefx/src/Common/src/System/Numerics/Hashing/HashHelpers.cs diff --git a/mcs/class/System.Numerics.Vectors/corefx/SR.cs b/mcs/class/System.Numerics.Vectors/corefx/SR.cs deleted file mode 100644 index b08c3f6cb69..00000000000 --- a/mcs/class/System.Numerics.Vectors/corefx/SR.cs +++ /dev/null @@ -1,12 +0,0 @@ -// -// This file was generated by resx2sr tool -// - -partial class SR -{ - public const string Arg_ArgumentOutOfRangeException = "Index was out of bounds:"; - public const string Arg_ElementsInSourceIsGreaterThanDestination = "Number of elements in source vector is greater than the destination array"; - public const string Arg_NullArgumentNullRef = "The method was called with a null array argument."; - public const string Arg_TypeNotSupported = "Specified type is not supported"; - public const string Arg_InsufficientNumberOfElements = "At least {0} element(s) are expected in the parameter \"{1}\"."; -} -- cgit v1.2.3