Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Clean up S.N.Tensors project in main #94378

Merged
merged 4 commits into from
Nov 6, 2023
Merged

Clean up S.N.Tensors project in main #94378

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cb35bc6
Clean up S.N.Tensors project in main
stephentoub Nov 5, 2023
5d8249b
Merge branch 'main' into cleanuptensors
stephentoub Nov 6, 2023
a519fa5
Add CompatibilitySupressions
stephentoub Nov 6, 2023
d08e705
Address request to add net6.0/net7.0 package suppressions
stephentoub Nov 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions src/libraries/System.Numerics.Tensors/ref/System.Numerics.Tensors.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,13 @@

<PropertyGroup>
<TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppPrevious);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks>
<TargetFrameworks Condition="'$(DotNetBuildFromSource)' != 'true'">$(TargetFrameworks);net7.0;net6.0</TargetFrameworks>
</PropertyGroup>

<ItemGroup>
<Compile Include="System.Numerics.Tensors.cs" />
</ItemGroup>

<ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net7.0'))">
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'">
<Compile Include="System.Numerics.Tensors.netcore.cs" />
</ItemGroup>

Expand Down
214 changes: 214 additions & 0 deletions src/libraries/System.Numerics.Tensors/src/CompatibilitySuppressions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,214 @@
<?xml version="1.0" encoding="utf-8"?>
stephentoub marked this conversation as resolved.
Show resolved Hide resolved
<!-- https://learn.microsoft.com/en-us/dotnet/fundamentals/package-validation/diagnostic-ids -->
<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<Suppression>
<DiagnosticId>CP0001</DiagnosticId>
<Target>T:System.Numerics.Tensors.ArrayTensorExtensions</Target>
<Left>lib/net462/System.Numerics.Tensors.dll</Left>
<Right>lib/net462/System.Numerics.Tensors.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0001</DiagnosticId>
<Target>T:System.Numerics.Tensors.CompressedSparseTensor`1</Target>
<Left>lib/net462/System.Numerics.Tensors.dll</Left>
<Right>lib/net462/System.Numerics.Tensors.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0001</DiagnosticId>
<Target>T:System.Numerics.Tensors.DenseTensor`1</Target>
<Left>lib/net462/System.Numerics.Tensors.dll</Left>
<Right>lib/net462/System.Numerics.Tensors.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0001</DiagnosticId>
<Target>T:System.Numerics.Tensors.SparseTensor`1</Target>
<Left>lib/net462/System.Numerics.Tensors.dll</Left>
<Right>lib/net462/System.Numerics.Tensors.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0001</DiagnosticId>
<Target>T:System.Numerics.Tensors.Tensor</Target>
<Left>lib/net462/System.Numerics.Tensors.dll</Left>
<Right>lib/net462/System.Numerics.Tensors.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0001</DiagnosticId>
<Target>T:System.Numerics.Tensors.Tensor`1</Target>
<Left>lib/net462/System.Numerics.Tensors.dll</Left>
<Right>lib/net462/System.Numerics.Tensors.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0001</DiagnosticId>
<Target>T:System.Numerics.Tensors.ArrayTensorExtensions</Target>
<Left>lib/net6.0/System.Numerics.Tensors.dll</Left>
<Right>lib/netstandard2.0/System.Numerics.Tensors.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0001</DiagnosticId>
<Target>T:System.Numerics.Tensors.CompressedSparseTensor`1</Target>
<Left>lib/net6.0/System.Numerics.Tensors.dll</Left>
<Right>lib/netstandard2.0/System.Numerics.Tensors.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0001</DiagnosticId>
<Target>T:System.Numerics.Tensors.DenseTensor`1</Target>
<Left>lib/net6.0/System.Numerics.Tensors.dll</Left>
<Right>lib/netstandard2.0/System.Numerics.Tensors.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0001</DiagnosticId>
<Target>T:System.Numerics.Tensors.SparseTensor`1</Target>
<Left>lib/net6.0/System.Numerics.Tensors.dll</Left>
<Right>lib/netstandard2.0/System.Numerics.Tensors.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0001</DiagnosticId>
<Target>T:System.Numerics.Tensors.Tensor</Target>
<Left>lib/net6.0/System.Numerics.Tensors.dll</Left>
<Right>lib/netstandard2.0/System.Numerics.Tensors.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0001</DiagnosticId>
<Target>T:System.Numerics.Tensors.Tensor`1</Target>
<Left>lib/net6.0/System.Numerics.Tensors.dll</Left>
<Right>lib/netstandard2.0/System.Numerics.Tensors.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0001</DiagnosticId>
<Target>T:System.Numerics.Tensors.ArrayTensorExtensions</Target>
<Left>lib/net7.0/System.Numerics.Tensors.dll</Left>
<Right>lib/netstandard2.0/System.Numerics.Tensors.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0001</DiagnosticId>
<Target>T:System.Numerics.Tensors.CompressedSparseTensor`1</Target>
<Left>lib/net7.0/System.Numerics.Tensors.dll</Left>
<Right>lib/netstandard2.0/System.Numerics.Tensors.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0001</DiagnosticId>
<Target>T:System.Numerics.Tensors.DenseTensor`1</Target>
<Left>lib/net7.0/System.Numerics.Tensors.dll</Left>
<Right>lib/netstandard2.0/System.Numerics.Tensors.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0001</DiagnosticId>
<Target>T:System.Numerics.Tensors.SparseTensor`1</Target>
<Left>lib/net7.0/System.Numerics.Tensors.dll</Left>
<Right>lib/netstandard2.0/System.Numerics.Tensors.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0001</DiagnosticId>
<Target>T:System.Numerics.Tensors.Tensor</Target>
<Left>lib/net7.0/System.Numerics.Tensors.dll</Left>
<Right>lib/netstandard2.0/System.Numerics.Tensors.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0001</DiagnosticId>
<Target>T:System.Numerics.Tensors.Tensor`1</Target>
<Left>lib/net7.0/System.Numerics.Tensors.dll</Left>
<Right>lib/netstandard2.0/System.Numerics.Tensors.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0001</DiagnosticId>
<Target>T:System.Numerics.Tensors.ArrayTensorExtensions</Target>
<Left>lib/net8.0/System.Numerics.Tensors.dll</Left>
<Right>lib/net8.0/System.Numerics.Tensors.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0001</DiagnosticId>
<Target>T:System.Numerics.Tensors.CompressedSparseTensor`1</Target>
<Left>lib/net8.0/System.Numerics.Tensors.dll</Left>
<Right>lib/net8.0/System.Numerics.Tensors.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0001</DiagnosticId>
<Target>T:System.Numerics.Tensors.DenseTensor`1</Target>
<Left>lib/net8.0/System.Numerics.Tensors.dll</Left>
<Right>lib/net8.0/System.Numerics.Tensors.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0001</DiagnosticId>
<Target>T:System.Numerics.Tensors.SparseTensor`1</Target>
<Left>lib/net8.0/System.Numerics.Tensors.dll</Left>
<Right>lib/net8.0/System.Numerics.Tensors.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0001</DiagnosticId>
<Target>T:System.Numerics.Tensors.Tensor</Target>
<Left>lib/net8.0/System.Numerics.Tensors.dll</Left>
<Right>lib/net8.0/System.Numerics.Tensors.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0001</DiagnosticId>
<Target>T:System.Numerics.Tensors.Tensor`1</Target>
<Left>lib/net8.0/System.Numerics.Tensors.dll</Left>
<Right>lib/net8.0/System.Numerics.Tensors.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0001</DiagnosticId>
<Target>T:System.Numerics.Tensors.ArrayTensorExtensions</Target>
<Left>lib/netstandard2.0/System.Numerics.Tensors.dll</Left>
<Right>lib/netstandard2.0/System.Numerics.Tensors.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0001</DiagnosticId>
<Target>T:System.Numerics.Tensors.CompressedSparseTensor`1</Target>
<Left>lib/netstandard2.0/System.Numerics.Tensors.dll</Left>
<Right>lib/netstandard2.0/System.Numerics.Tensors.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0001</DiagnosticId>
<Target>T:System.Numerics.Tensors.DenseTensor`1</Target>
<Left>lib/netstandard2.0/System.Numerics.Tensors.dll</Left>
<Right>lib/netstandard2.0/System.Numerics.Tensors.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0001</DiagnosticId>
<Target>T:System.Numerics.Tensors.SparseTensor`1</Target>
<Left>lib/netstandard2.0/System.Numerics.Tensors.dll</Left>
<Right>lib/netstandard2.0/System.Numerics.Tensors.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0001</DiagnosticId>
<Target>T:System.Numerics.Tensors.Tensor</Target>
<Left>lib/netstandard2.0/System.Numerics.Tensors.dll</Left>
<Right>lib/netstandard2.0/System.Numerics.Tensors.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0001</DiagnosticId>
<Target>T:System.Numerics.Tensors.Tensor`1</Target>
<Left>lib/netstandard2.0/System.Numerics.Tensors.dll</Left>
<Right>lib/netstandard2.0/System.Numerics.Tensors.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
</Suppressions>
16 changes: 2 additions & 14 deletions src/libraries/System.Numerics.Tensors/src/System.Numerics.Tensors.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,9 @@

<PropertyGroup>
<TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppPrevious);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks>
<TargetFrameworks Condition="'$(DotNetBuildFromSource)' != 'true'">$(TargetFrameworks);net7.0;net6.0</TargetFrameworks>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<IsPackable>true</IsPackable>
<PackageDescription>Provides support for operating over tensors.</PackageDescription>
<!-- Disabling baseline validation since this is a brand new package.
Once this package has shipped a stable version, the following line
should be removed in order to re-enable validation. -->
<DisablePackageBaselineValidation>true</DisablePackageBaselineValidation>
stephentoub marked this conversation as resolved.
Show resolved Hide resolved
<GenAPIExcludeApiList>ReferenceAssemblyExclusions.txt</GenAPIExcludeApiList>
</PropertyGroup>

Expand All @@ -18,19 +13,12 @@
<Compile Include="System\ThrowHelper.cs" />
</ItemGroup>

<ItemGroup Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net7.0'))">
<Compile Include="System\Numerics\Tensors\TensorPrimitives.netstandard.cs" />
</ItemGroup>

<ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net7.0'))">
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'">
<Compile Include="System\Numerics\Tensors\TensorPrimitives.netcore.cs" />
</ItemGroup>

<ItemGroup>
<InternalsVisibleTo Include="System.Numerics.Tensors.Tests" Key="00240000048000009400000006020000002400005253413100040000010001004b86c4cb78549b34bab61a3b1800e23bfeb5b3ec390074041536a7e3cbd97f5f04cf0f857155a8928eaa29ebfd11cfbbad3ba70efea7bda3226c6a8d370a4cd303f714486b6ebc225985a638471e6ef571cc92a4613c00b8fa65d61ccee0cbe5f36330c9a01f4183559f1bef24cc2917c6d913e3a541333a1d05d9bed22b38cb" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'">
<Compile Include="System\Numerics\Tensors\TensorPrimitives.netstandard.cs" />
<PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" />
<ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Bcl.Numerics\src\Microsoft.Bcl.Numerics.csproj" />
</ItemGroup>
Expand Down
Loading