Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Commit 9e4e45d

Browse files
tannergoodingtannergooding
authored
Removing the System.Numerics.Vectors pkgproj (#37301)
1 parent 97fb231 commit 9e4e45d

File tree

12 files changed

+23
-133
lines changed

12 files changed

+23
-133
lines changed

‎external/binplacePackages/binplacePackages.depproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,10 @@
3232
<Version>4.5.1</Version>
3333
</PackageReference>
3434

35+
<PackageReference Include="System.Numerics.Vectors" Condition="'$(DotNetBuildFromSource)' != 'true' AND '$(TargetsNetStandard)' == 'true' AND '$(NETStandardVersion)' &lt; 2.1">
36+
<Version>4.5.0</Version>
37+
</PackageReference>
38+
3539
<PackageReference Include="System.Threading.Tasks.Extensions" Condition="'$(TargetGroup)' == 'netcoreapp2.0' OR '$(TargetsNetfx)' == 'true' OR '$(TargetsNetStandard)' == 'true'">
3640
<Version>4.5.1</Version>
3741
</PackageReference>

‎external/harvestPackages/harvestPackages.props‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -109,9 +109,6 @@
109109
<PackageReference Include="System.Numerics.Tensors">
110110
<Version>0.1.0</Version>
111111
</PackageReference>
112-
<PackageReference Include="System.Numerics.Vectors">
113-
<Version>4.5.0</Version>
114-
</PackageReference>
115112
<PackageReference Include="System.Reflection.Context">
116113
<Version>4.3.0</Version>
117114
</PackageReference>

‎pkg/Microsoft.Private.PackageBaseline/packageIndex.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3149,7 +3149,6 @@
31493149
"4.1.2.0": "4.3.0",
31503150
"4.1.3.0": "4.4.0",
31513151
"4.1.4.0": "4.5.0",
3152-
"4.1.5.0": "4.6.0"
31533152
}
31543153
},
31553154
"System.Numerics.Vectors.WindowsRuntime": {

‎pkg/baseline/packageBaseline.1.1.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -446,4 +446,4 @@
446446
}
447447
},
448448
"ModulesToPackages": {}
449-
}
449+
}

‎pkg/descriptions.json‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1245,21 +1245,6 @@
12451245
"System.Numerics.Tensors.SparseTensor<T>"
12461246
]
12471247
},
1248-
{
1249-
"Name": "System.Numerics.Vectors",
1250-
"Description": "Provides hardware-accelerated numeric types, suitable for high-performance processing and graphics applications.",
1251-
"CommonTypes": [
1252-
"System.Numerics.Matrix3x2",
1253-
"System.Numerics.Matrix4x4",
1254-
"System.Numerics.Plane",
1255-
"System.Numerics.Quaternion",
1256-
"System.Numerics.Vector2",
1257-
"System.Numerics.Vector3",
1258-
"System.Numerics.Vector4",
1259-
"System.Numerics.Vector",
1260-
"System.Numerics.Vector<T>"
1261-
]
1262-
},
12631248
{
12641249
"Name": "System.Numerics.Vectors.WindowsRuntime",
12651250
"Description": "Provides extension methods for converting between System.Numerics.Vector2 and Windows.Foundation.Point and Size.",

‎src/System.Numerics.Vectors/pkg/System.Numerics.Vectors.pkgproj‎

Lines changed: 0 additions & 22 deletions
This file was deleted.

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

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,8 @@
11
<Project>
22
<PropertyGroup>
3-
<PackageConfigurations>
4-
netstandard1.0;
5-
net45;
6-
netstandard;
7-
net46;
8-
</PackageConfigurations>
93
<BuildConfigurations>
104
netcoreapp;
115
uap;
12-
netfx;
13-
$(PackageConfigurations);
146
</BuildConfigurations>
157
</PropertyGroup>
16-
</Project>
8+
</Project>

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

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,13 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<ProjectGuid>{650277B5-9423-4ACE-BB54-2659995B21C7}</ProjectGuid>
4-
<IsPartialFacadeAssembly Condition="'$(TargetsNetFx)'=='true' AND '$(TargetGroup)' != 'net45'">true</IsPartialFacadeAssembly>
5-
<DefineConstants Condition="'$(TargetsNetCoreApp)'=='true' OR '$(TargetsUap)' == 'true'">$(DefineConstants);HAS_SPAN</DefineConstants>
6-
<!-- Must match version supported by frameworks which support 4.1.* inbox.
7-
Can be removed when API is added and this assembly is versioned to 4.2.* -->
8-
<AssemblyVersion Condition="'$(TargetsNetFx)' != 'true'">4.1.3.0</AssemblyVersion>
9-
<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>
4+
<DefineConstants>$(DefineConstants);HAS_SPAN</DefineConstants>
5+
<Configurations>netcoreapp-Debug;netcoreapp-Release;uap-Debug;uap-Release</Configurations>
106
</PropertyGroup>
117
<ItemGroup>
128
<Compile Include="System.Numerics.Vectors.cs" />
139
</ItemGroup>
14-
<ItemGroup Condition="'$(TargetsNetFx)'=='true'">
15-
<Reference Include="mscorlib" />
16-
<Reference Include="System.Numerics" />
17-
</ItemGroup>
18-
<ItemGroup Condition="'$(TargetGroup)' == 'netstandard1.0'">
19-
<Reference Include="System.Runtime" />
20-
</ItemGroup>
21-
<ItemGroup Condition="'$(TargetsNetCoreApp)'=='true' OR '$(TargetsUap)' == 'true'">
10+
<ItemGroup>
2211
<ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" />
2312
</ItemGroup>
24-
</Project>
13+
</Project>

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

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,10 @@
11
<Project>
22
<PropertyGroup>
3-
<PackageConfigurations>
4-
netstandard1.0;
5-
netstandard;
6-
net46;
7-
</PackageConfigurations>
83
<BuildConfigurations>
9-
uapaot-Windows_NT;
10-
uap-Windows_NT;
11-
netfx-Windows_NT;
12-
netcoreapp-Windows_NT;
134
netcoreapp-Unix;
14-
$(PackageConfigurations)
5+
netcoreapp-Windows_NT;
6+
uap-Windows_NT;
7+
uapaot-Windows_NT;
158
</BuildConfigurations>
169
</PropertyGroup>
1710
</Project>

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

Lines changed: 5 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,10 @@
33
<ProjectGuid>{53134B0C-0D57-481B-B84E-D1991E8D54FF}</ProjectGuid>
44
<RootNamespace>System.Numerics</RootNamespace>
55
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
6-
<TargetsNetCoreAppOrUap Condition="'$(TargetsNetCoreApp)'=='true' OR '$(TargetsUap)' == 'true'">true</TargetsNetCoreAppOrUap>
7-
<IsPartialFacadeAssembly Condition="'$(TargetsNetFx)'=='true' OR '$(TargetsNetCoreAppOrUap)'=='true'">true</IsPartialFacadeAssembly>
6+
<IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
87
<HasIntrinsics Condition="'$(TargetsNetCoreApp)'=='true'">true</HasIntrinsics>
98
<DefineConstants Condition="'$(HasIntrinsics)'=='true'">$(DefineConstants);HAS_INTRINSICS</DefineConstants>
10-
<PackageTargetFramework Condition="'$(TargetGroup)' == 'netstandard1.0'">netstandard1.0;portable-net45+win8+wp8+wpa81</PackageTargetFramework>
11-
<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>
9+
<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>
1210
</PropertyGroup>
1311
<!-- Shared -->
1412
<ItemGroup>
@@ -19,38 +17,8 @@
1917
<Link>System\Runtime\CompilerServices\IntrinsicAttribute.cs</Link>
2018
</Compile>
2119
</ItemGroup>
22-
<!-- On .NET Core, Vector<T> is in System.Private.CoreLib -->
23-
<ItemGroup Condition="'$(TargetsNetCoreAppOrUap)' != 'true'">
24-
<Compile Include="$(CommonPath)\CoreLib\System\Numerics\ConstantHelper.cs">
25-
<AutoGen>True</AutoGen>
26-
<DesignTime>True</DesignTime>
27-
<DependentUpon>ConstantHelper.tt</DependentUpon>
28-
<Link>System\Numerics\ConstantHelper.cs</Link>
29-
</Compile>
30-
<Compile Include="$(CommonPath)\CoreLib\System\Numerics\Register.cs">
31-
<AutoGen>True</AutoGen>
32-
<DesignTime>True</DesignTime>
33-
<DependentUpon>Register.tt</DependentUpon>
34-
<Link>System\Numerics\Register.cs</Link>
35-
</Compile>
36-
<Compile Include="$(CommonPath)\CoreLib\System\Numerics\Vector.cs">
37-
<AutoGen>True</AutoGen>
38-
<DesignTime>True</DesignTime>
39-
<DependentUpon>Vector.tt</DependentUpon>
40-
<Link>System\Numerics\Vector.cs</Link>
41-
</Compile>
42-
<Compile Include="$(CommonPath)\CoreLib\System\Numerics\Vector_Operations.cs">
43-
<Link>System\Numerics\Vector_Operations.cs</Link>
44-
</Compile>
45-
</ItemGroup>
46-
<!-- Carry a copy of MathF where not available -->
47-
<ItemGroup Condition="'$(TargetsNetFx)' == 'true' OR $(TargetGroup.StartsWith('netstandard'))">
48-
<Compile Include="$(CommonPath)\System\MathF.netstandard.cs">
49-
<Link>System\MathF.netstandard.cs</Link>
50-
</Compile>
51-
</ItemGroup>
5220
<!-- Portable version only -->
53-
<ItemGroup Condition="'$(TargetsNetFx)' != 'true'">
21+
<ItemGroup>
5422
<Compile Include="System\Numerics\Matrix3x2.cs" />
5523
<Compile Include="System\Numerics\Matrix4x4.cs" />
5624
<Compile Include="System\Numerics\Plane.cs" />
@@ -65,10 +33,6 @@
6533
<ItemGroup Condition="'$(HasIntrinsics)' == 'true'">
6634
<Compile Include="System\Numerics\VectorMath.cs" />
6735
</ItemGroup>
68-
<ItemGroup Condition="'$(TargetsNetFx)' == 'true'">
69-
<Reference Include="mscorlib" />
70-
<Reference Include="System.Numerics" />
71-
</ItemGroup>
7236
<ItemGroup>
7337
<None Include="$(CommonPath)\CoreLib\System\Numerics\GenerationConfig.ttinclude">
7438
<Link>System\Numerics\GenerationConfig.ttinclude</Link>
@@ -89,17 +53,10 @@
8953
<Link>System\Numerics\Vector.tt</Link>
9054
</Content>
9155
</ItemGroup>
92-
<ItemGroup Condition="'$(TargetsNetCoreAppOrUap)' == 'true'">
56+
<ItemGroup>
9357
<ReferenceFromRuntime Include="System.Private.CoreLib" />
9458
</ItemGroup>
95-
<ItemGroup Condition="'$(TargetsNetCoreAppOrUap)' != 'true'">
96-
<Reference Include="System.Diagnostics.Tools" />
97-
<Reference Include="System.Globalization" />
98-
<Reference Include="System.Resources.ResourceManager" />
99-
<Reference Include="System.Runtime" />
100-
<Reference Include="System.Runtime.Extensions" />
101-
</ItemGroup>
10259
<ItemGroup>
10360
<Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
10461
</ItemGroup>
105-
</Project>
62+
</Project>

0 commit comments

Comments
 (0)