Skip to content

Commit f3b58e9

Browse files
committed
Revert "Issue #24343 Vector Ctor using Span"
This reverts commit 82c6f63.
1 parent 70e425d commit f3b58e9

11 files changed

+13
-927
lines changed

src/System.Numerics.Vectors/ref/System.Numerics.Vectors.cs

-3
Original file line numberDiff line numberDiff line change
@@ -301,9 +301,6 @@ public partial struct Vector<T> : System.IEquatable<System.Numerics.Vector<T>>,
301301
public Vector(T value) { throw null; }
302302
public Vector(T[] values) { throw null; }
303303
public Vector(T[] values, int index) { throw null; }
304-
#if netcoreapp
305-
public Vector(Span<T> values) { throw null; }
306-
#endif
307304
public static int Count { get { throw null; } }
308305
public T this[int index] { get { throw null; } }
309306
public static System.Numerics.Vector<T> One { get { throw null; } }

src/System.Numerics.Vectors/ref/System.Numerics.Vectors.csproj

+3-6
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,7 @@
33
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
44
<PropertyGroup>
55
<ProjectGuid>{650277B5-9423-4ACE-BB54-2659995B21C7}</ProjectGuid>
6-
<IsTargetingNetFx Condition="'$(TargetGroup)'=='netfx' OR '$(TargetGroup)'=='net46'">true</IsTargetingNetFx>
7-
<IsTargetingNetCoreApp Condition="'$(TargetGroup)'=='netcoreapp' OR '$(TargetGroup)'=='uap'">true</IsTargetingNetCoreApp>
8-
<IsPartialFacadeAssembly Condition="'$(IsTargetingNetFx)'=='true'">true</IsPartialFacadeAssembly>
9-
<DefineConstants Condition="'$(IsTargetingNetCoreApp)'=='true'">$(DefineConstants);netcoreapp</DefineConstants>
6+
<IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'netfx' OR '$(TargetGroup)' == 'net46'">true</IsPartialFacadeAssembly>
107
</PropertyGroup>
118
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net46-Debug|AnyCPU'" />
129
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net46-Release|AnyCPU'" />
@@ -23,14 +20,14 @@
2320
<ItemGroup>
2421
<Compile Include="System.Numerics.Vectors.cs" />
2522
</ItemGroup>
26-
<ItemGroup Condition="'$(IsTargetingNetFx)'=='true'">
23+
<ItemGroup Condition="'$(TargetGroup)' == 'netfx' OR '$(TargetGroup)' == 'net46'">
2724
<Reference Include="mscorlib" />
2825
<Reference Include="System.Numerics" />
2926
</ItemGroup>
3027
<ItemGroup Condition="'$(TargetGroup)' == 'netstandard1.0'">
3128
<Reference Include="System.Runtime" />
3229
</ItemGroup>
33-
<ItemGroup Condition="'$(IsTargetingNetCoreApp)'=='true'">
30+
<ItemGroup Condition="'$(TargetGroup)' == 'netcoreapp' OR '$(TargetGroup)' == 'uap' OR '$(TargetGroup)' == 'uapaot'">
3431
<ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" />
3532
</ItemGroup>
3633
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />

src/System.Numerics.Vectors/src/ApiCompatBaseline.uapaot.txt

-1
This file was deleted.

src/System.Numerics.Vectors/tests/GenericVectorTests.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ namespace System.Numerics.Tests
1414
/// <summary>
1515
/// Vector{T} tests that use random number generation and a unified generic test structure
1616
/// </summary>
17-
public partial class GenericVectorTests
17+
public class GenericVectorTests
1818
{
1919
// Static constructor in top-level class\
2020
static System.Numerics.Vector<float> dummy;
@@ -2699,11 +2699,11 @@ private static void ValidateVector<T>(Vector<T> vector, Action<int, T> indexVali
26992699
}
27002700
}
27012701

2702-
internal static T[] GenerateRandomValuesForVector<T>(int? numValues = null) where T : struct
2702+
internal static T[] GenerateRandomValuesForVector<T>() where T : struct
27032703
{
27042704
int minValue = GetMinValue<T>();
27052705
int maxValue = GetMaxValue<T>();
2706-
return Util.GenerateRandomValues<T>(numValues ?? Vector<T>.Count, minValue, maxValue);
2706+
return Util.GenerateRandomValues<T>(Vector<T>.Count, minValue, maxValue);
27072707
}
27082708

27092709
internal static int GetMinValue<T>() where T : struct
@@ -2776,4 +2776,4 @@ internal static T GetValueWithAllOnesSet<T>() where T : struct
27762776
}
27772777
#endregion
27782778
}
2779-
}
2779+
}

src/System.Numerics.Vectors/tests/GenericVectorTests.netcoreapp.cs

-226
This file was deleted.

0 commit comments

Comments
 (0)