Removing the System.Numerics.Vectors pkgproj

external/binplacePackages/binplacePackages.depproj

@@ -32,6 +32,10 @@
       <Version>4.5.1</Version>
     </PackageReference>
 
+    <PackageReference Include="System.Numerics.Vectors" Condition="'$(DotNetBuildFromSource)' != 'true' AND '$(TargetsNetStandard)' == 'true' AND '$(NETStandardVersion)' &lt; 2.1">
+      <Version>4.5.0</Version>
+    </PackageReference>
+
     <PackageReference Include="System.Threading.Tasks.Extensions" Condition="'$(TargetGroup)' == 'netcoreapp2.0' OR '$(TargetsNetfx)' == 'true' OR '$(TargetsNetStandard)' == 'true'">
       <Version>4.5.1</Version>
     </PackageReference>

external/harvestPackages/harvestPackages.props

@@ -109,9 +109,6 @@
 <PackageReference Include="System.Numerics.Tensors">
   <Version>0.1.0</Version>
 </PackageReference>
-<PackageReference Include="System.Numerics.Vectors">
-  <Version>4.5.0</Version>
-</PackageReference>
 <PackageReference Include="System.Reflection.Context">
   <Version>4.3.0</Version>
 </PackageReference>

pkg/Microsoft.Private.PackageBaseline/packageIndex.json

@@ -3149,7 +3149,6 @@
         "4.1.2.0": "4.3.0",
         "4.1.3.0": "4.4.0",
         "4.1.4.0": "4.5.0",
-        "4.1.5.0": "4.6.0"
       }
     },
     "System.Numerics.Vectors.WindowsRuntime": {

pkg/baseline/packageBaseline.1.1.json

@@ -446,4 +446,4 @@
     }
   },
   "ModulesToPackages": {}
-}
+}

pkg/descriptions.json

@@ -1245,21 +1245,6 @@
       "System.Numerics.Tensors.SparseTensor<T>"
     ]
   },
-  {
-    "Name": "System.Numerics.Vectors",
-    "Description": "Provides hardware-accelerated numeric types, suitable for high-performance processing and graphics applications.",
-    "CommonTypes": [
-      "System.Numerics.Matrix3x2",
-      "System.Numerics.Matrix4x4",
-      "System.Numerics.Plane",
-      "System.Numerics.Quaternion",
-      "System.Numerics.Vector2",
-      "System.Numerics.Vector3",
-      "System.Numerics.Vector4",
-      "System.Numerics.Vector",
-      "System.Numerics.Vector<T>"
-    ]
-  },
   {
     "Name": "System.Numerics.Vectors.WindowsRuntime",
     "Description": "Provides extension methods for converting between System.Numerics.Vector2 and Windows.Foundation.Point and Size.",

src/System.Numerics.Vectors/ref/Configurations.props

@@ -1,16 +1,8 @@
 <Project>
   <PropertyGroup>
-    <PackageConfigurations>
-      netstandard1.0;
-      net45;
-      netstandard;
-      net46;
-    </PackageConfigurations>
     <BuildConfigurations>
       netcoreapp;
       uap;
-      netfx;
-      $(PackageConfigurations);
     </BuildConfigurations>
   </PropertyGroup>
-</Project>
+</Project>

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

@@ -1,24 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <ProjectGuid>{650277B5-9423-4ACE-BB54-2659995B21C7}</ProjectGuid>
-    <IsPartialFacadeAssembly Condition="'$(TargetsNetFx)'=='true' AND '$(TargetGroup)' != 'net45'">true</IsPartialFacadeAssembly>
-    <DefineConstants Condition="'$(TargetsNetCoreApp)'=='true' OR '$(TargetsUap)' == 'true'">$(DefineConstants);HAS_SPAN</DefineConstants>
-    <!-- Must match version supported by frameworks which support 4.1.* inbox.
-         Can be removed when API is added and this assembly is versioned to 4.2.* -->
-    <AssemblyVersion Condition="'$(TargetsNetFx)' != 'true'">4.1.3.0</AssemblyVersion>
-    <Configurations>net45-Debug;net45-Release;net46-Debug;net46-Release;netcoreapp-Debug;netcoreapp-Release;netfx-Debug;netfx-Release;netstandard-Debug;netstandard-Release;netstandard1.0-Debug;netstandard1.0-Release;uap-Debug;uap-Release</Configurations>
+    <DefineConstants>$(DefineConstants);HAS_SPAN</DefineConstants>
+    <Configurations>netcoreapp-Debug;netcoreapp-Release;uap-Debug;uap-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Numerics.Vectors.cs" />
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetsNetFx)'=='true'">
-    <Reference Include="mscorlib" />
-    <Reference Include="System.Numerics" />
-  </ItemGroup>
-  <ItemGroup Condition="'$(TargetGroup)' == 'netstandard1.0'">
-    <Reference Include="System.Runtime" />
-  </ItemGroup>
-  <ItemGroup Condition="'$(TargetsNetCoreApp)'=='true' OR '$(TargetsUap)' == 'true'">
+  <ItemGroup>
     <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" />
   </ItemGroup>
-</Project>
+</Project>

src/System.Numerics.Vectors/src/Configurations.props

@@ -1,17 +1,10 @@
 <Project>
   <PropertyGroup>
-    <PackageConfigurations>
-      netstandard1.0;
-      netstandard;
-      net46;
-    </PackageConfigurations>
     <BuildConfigurations>
-      uapaot-Windows_NT;
-      uap-Windows_NT;
-      netfx-Windows_NT;
-      netcoreapp-Windows_NT;
       netcoreapp-Unix;
-      $(PackageConfigurations)
+      netcoreapp-Windows_NT;
+      uap-Windows_NT;
+      uapaot-Windows_NT;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

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

@@ -3,12 +3,10 @@
     <ProjectGuid>{53134B0C-0D57-481B-B84E-D1991E8D54FF}</ProjectGuid>
     <RootNamespace>System.Numerics</RootNamespace>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <TargetsNetCoreAppOrUap Condition="'$(TargetsNetCoreApp)'=='true' OR '$(TargetsUap)' == 'true'">true</TargetsNetCoreAppOrUap>
-    <IsPartialFacadeAssembly Condition="'$(TargetsNetFx)'=='true' OR '$(TargetsNetCoreAppOrUap)'=='true'">true</IsPartialFacadeAssembly>
+    <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
     <HasIntrinsics Condition="'$(TargetsNetCoreApp)'=='true'">true</HasIntrinsics>
     <DefineConstants Condition="'$(HasIntrinsics)'=='true'">$(DefineConstants);HAS_INTRINSICS</DefineConstants>
-    <PackageTargetFramework Condition="'$(TargetGroup)' == 'netstandard1.0'">netstandard1.0;portable-net45+win8+wp8+wpa81</PackageTargetFramework>
-    <Configurations>net46-Debug;net46-Release;netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release;netfx-Windows_NT-Debug;netfx-Windows_NT-Release;netstandard-Debug;netstandard-Release;netstandard1.0-Debug;netstandard1.0-Release;uap-Windows_NT-Debug;uap-Windows_NT-Release;uapaot-Windows_NT-Debug;uapaot-Windows_NT-Release</Configurations>
+    <Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release;uap-Windows_NT-Debug;uap-Windows_NT-Release;uapaot-Windows_NT-Debug;uapaot-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <!-- Shared -->
   <ItemGroup>
@@ -19,38 +17,8 @@
       <Link>System\Runtime\CompilerServices\IntrinsicAttribute.cs</Link>
     </Compile>
   </ItemGroup>
-  <!-- On .NET Core, Vector<T> is in System.Private.CoreLib -->
-  <ItemGroup Condition="'$(TargetsNetCoreAppOrUap)' != 'true'">
-    <Compile Include="$(CommonPath)\CoreLib\System\Numerics\ConstantHelper.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>ConstantHelper.tt</DependentUpon>
-      <Link>System\Numerics\ConstantHelper.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonPath)\CoreLib\System\Numerics\Register.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Register.tt</DependentUpon>
-      <Link>System\Numerics\Register.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonPath)\CoreLib\System\Numerics\Vector.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Vector.tt</DependentUpon>
-      <Link>System\Numerics\Vector.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonPath)\CoreLib\System\Numerics\Vector_Operations.cs">
-      <Link>System\Numerics\Vector_Operations.cs</Link>
-    </Compile>
-  </ItemGroup>
-  <!-- Carry a copy of MathF where not available -->
-  <ItemGroup Condition="'$(TargetsNetFx)' == 'true' OR $(TargetGroup.StartsWith('netstandard'))">
-    <Compile Include="$(CommonPath)\System\MathF.netstandard.cs">
-      <Link>System\MathF.netstandard.cs</Link>
-    </Compile>
-  </ItemGroup>
   <!-- Portable version only -->
-  <ItemGroup Condition="'$(TargetsNetFx)' != 'true'">
+  <ItemGroup>
     <Compile Include="System\Numerics\Matrix3x2.cs" />
     <Compile Include="System\Numerics\Matrix4x4.cs" />
     <Compile Include="System\Numerics\Plane.cs" />
@@ -65,10 +33,6 @@
   <ItemGroup Condition="'$(HasIntrinsics)' == 'true'">
     <Compile Include="System\Numerics\VectorMath.cs" />
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetsNetFx)' == 'true'">
-    <Reference Include="mscorlib" />
-    <Reference Include="System.Numerics" />
-  </ItemGroup>
   <ItemGroup>
     <None Include="$(CommonPath)\CoreLib\System\Numerics\GenerationConfig.ttinclude">
       <Link>System\Numerics\GenerationConfig.ttinclude</Link>
@@ -89,17 +53,10 @@
       <Link>System\Numerics\Vector.tt</Link>
     </Content>
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetsNetCoreAppOrUap)' == 'true'">
+  <ItemGroup>
     <ReferenceFromRuntime Include="System.Private.CoreLib" />
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetsNetCoreAppOrUap)' != 'true'">
-    <Reference Include="System.Diagnostics.Tools" />
-    <Reference Include="System.Globalization" />
-    <Reference Include="System.Resources.ResourceManager" />
-    <Reference Include="System.Runtime" />
-    <Reference Include="System.Runtime.Extensions" />
-  </ItemGroup>
   <ItemGroup>
     <Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
   </ItemGroup>
-</Project>
+</Project>

src/System.Numerics.Vectors/tests/Configurations.props

@@ -2,8 +2,7 @@
   <PropertyGroup>
     <BuildConfigurations>
       netcoreapp;
-      netstandard;
       uap;
     </BuildConfigurations>
   </PropertyGroup>
-</Project>
+</Project>

src/System.Numerics.Vectors/tests/System.Numerics.Vectors.Tests.csproj

@@ -2,7 +2,7 @@
   <PropertyGroup>
     <ProjectGuid>{99E1E564-0EF4-4E33-BECE-8ABE64771349}</ProjectGuid>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release;netstandard-Debug;netstandard-Release;uap-Debug;uap-Release</Configurations>
+    <Configurations>netcoreapp-Debug;netcoreapp-Release;uap-Debug;uap-Release</Configurations>
     <TestRuntime>true</TestRuntime>
   </PropertyGroup>
   <ItemGroup>
@@ -25,11 +25,8 @@
     <Compile Include="Matrix4x4Tests.cs" />
     <Compile Include="PlaneTests.cs" />
     <Compile Include="QuaternionTests.cs" />
-    <Compile Condition="'$(TargetGroup)' == 'netfx' OR '$(TargetGroup)' == 'netstandard'" Include="..\..\Common\src\System\MathF.netstandard.cs">
-      <Link>System\MathF.netstandard.cs</Link>
-    </Compile>
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetGroup)' == 'netcoreapp' OR '$(TargetGroup)' == 'uap'">
+  <ItemGroup>
     <Compile Include="GenericVectorTests.netcoreapp.cs">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
@@ -50,10 +47,10 @@
       <LastGenOutput>GenericVectorTests.cs</LastGenOutput>
     </None>
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetGroup)' == 'netcoreapp'">
+  <ItemGroup>
     <Content Include="GenericVectorTests.netcoreapp.tt">
       <Generator>TextTemplatingFileGenerator</Generator>
       <LastGenOutput>GenericVectorTests.netcoreapp.cs</LastGenOutput>
     </Content>
   </ItemGroup>
-</Project>
+</Project>