Skip to content

Commit 2483314

Browse files
wo80wo80
committed
Convert to project net standard.
1 parent db237e4 commit 2483314

File tree

10 files changed

+80
-326
lines changed

10 files changed

+80
-326
lines changed

‎CSparse.Tests/CSparse.Tests.csproj

Lines changed: 35 additions & 98 deletions
Original file line numberDiff line numberDiff line change
@@ -1,112 +1,49 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="..\packages\NUnit.3.11.0\build\NUnit.props" Condition="Exists('..\packages\NUnit.3.11.0\build\NUnit.props')" />
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
43
<PropertyGroup>
5-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7-
<ProjectGuid>{C4052DF8-0709-4B5F-86F4-1A7409B82BED}</ProjectGuid>
8-
<OutputType>Library</OutputType>
9-
<AppDesignerFolder>Properties</AppDesignerFolder>
10-
<RootNamespace>CSparse.Tests</RootNamespace>
11-
<AssemblyName>CSparse.Tests</AssemblyName>
12-
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
13-
<FileAlignment>512</FileAlignment>
14-
<TargetFrameworkProfile />
15-
<NuGetPackageImportStamp>
16-
</NuGetPackageImportStamp>
4+
<TargetFramework>netcoreapp2.1</TargetFramework>
5+
6+
<IsPackable>false</IsPackable>
177
</PropertyGroup>
18-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
19-
<DebugSymbols>true</DebugSymbols>
20-
<DebugType>full</DebugType>
21-
<Optimize>false</Optimize>
22-
<OutputPath>bin\Debug\</OutputPath>
23-
<DefineConstants>DEBUG;TRACE</DefineConstants>
24-
<ErrorReport>prompt</ErrorReport>
25-
<WarningLevel>4</WarningLevel>
26-
<Prefer32Bit>false</Prefer32Bit>
27-
</PropertyGroup>
28-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
29-
<DebugType>pdbonly</DebugType>
30-
<Optimize>true</Optimize>
31-
<OutputPath>bin\Release\</OutputPath>
32-
<DefineConstants>TRACE</DefineConstants>
33-
<ErrorReport>prompt</ErrorReport>
34-
<WarningLevel>4</WarningLevel>
35-
<Prefer32Bit>false</Prefer32Bit>
36-
</PropertyGroup>
37-
<ItemGroup>
38-
<Reference Include="nunit.framework, Version=3.11.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
39-
<HintPath>..\packages\NUnit.3.11.0\lib\net45\nunit.framework.dll</HintPath>
40-
</Reference>
41-
<Reference Include="System" />
42-
<Reference Include="System.Core" />
43-
<Reference Include="System.Numerics" />
44-
</ItemGroup>
45-
<ItemGroup>
46-
<Compile Include="Complex\SparseMatrixTest.cs" />
47-
<Compile Include="Complex\Factorization\SparseLUTest.cs" />
48-
<Compile Include="Complex\Factorization\SparseQRTest.cs" />
49-
<Compile Include="Complex\Factorization\SparseCholeskyTest.cs" />
50-
<Compile Include="Complex\Helper.cs" />
51-
<Compile Include="Complex\MatrixHelper.cs" />
52-
<Compile Include="ConverterTest.cs" />
53-
<Compile Include="DenseTestData.cs" />
54-
<Compile Include="SparseTestData.cs" />
55-
<Compile Include="Double\SparseMatrixTest.cs" />
56-
<Compile Include="Double\DenseMatrixTest.cs" />
57-
<Compile Include="Double\DenseTestDataReader.cs" />
58-
<Compile Include="Double\Factorization\SparseLUTest.cs" />
59-
<Compile Include="Double\Factorization\SparseQRTest.cs" />
60-
<Compile Include="Double\Factorization\SparseCholeskyTest.cs" />
61-
<Compile Include="Double\Helper.cs" />
62-
<Compile Include="Double\MatrixHelper.cs" />
63-
<Compile Include="Ordering\TestDulmageMendelsohn.cs" />
64-
<Compile Include="Properties\AssemblyInfo.cs" />
65-
<Compile Include="ResourceLoader.cs" />
66-
<Compile Include="Storage\SymbolicColumnStorageTest.cs" />
67-
</ItemGroup>
68-
<ItemGroup>
69-
<ProjectReference Include="..\CSparse\CSparse.csproj">
70-
<Project>{bd00d9bd-d669-4aee-91b7-0105afc994ec}</Project>
71-
<Name>CSparse</Name>
72-
</ProjectReference>
73-
</ItemGroup>
74-
<ItemGroup>
75-
<EmbeddedResource Include="Double\Data\general-20x40.mat" />
76-
<EmbeddedResource Include="Double\Data\general-40x20.mat" />
77-
<EmbeddedResource Include="Double\Data\general-40x40.mat" />
78-
<EmbeddedResource Include="Double\Data\symmetric-40-spd.mat" />
79-
<EmbeddedResource Include="Double\Data\symmetric-40.mat" />
80-
</ItemGroup>
81-
<ItemGroup>
82-
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
83-
</ItemGroup>
8+
9+
<ItemGroup>
10+
<None Remove="Complex\Data\general-20x40.mat" />
11+
<None Remove="Complex\Data\general-40x20.mat" />
12+
<None Remove="Complex\Data\general-40x40.mat" />
13+
<None Remove="Complex\Data\hermitian-40-spd.mat" />
14+
<None Remove="Complex\Data\hermitian-40.mat" />
15+
<None Remove="Double\Data\general-20x40.mat" />
16+
<None Remove="Double\Data\general-40x20.mat" />
17+
<None Remove="Double\Data\general-40x40.mat" />
18+
<None Remove="Double\Data\symmetric-40-spd.mat" />
19+
<None Remove="Double\Data\symmetric-40.mat" />
20+
<None Remove="Double\Data\test-data-dense-2x2.txt" />
21+
<None Remove="Double\Data\test-data-dense-2x3.txt" />
22+
</ItemGroup>
23+
8424
<ItemGroup>
8525
<EmbeddedResource Include="Complex\Data\general-20x40.mat" />
8626
<EmbeddedResource Include="Complex\Data\general-40x20.mat" />
8727
<EmbeddedResource Include="Complex\Data\general-40x40.mat" />
8828
<EmbeddedResource Include="Complex\Data\hermitian-40-spd.mat" />
8929
<EmbeddedResource Include="Complex\Data\hermitian-40.mat" />
90-
</ItemGroup>
91-
<ItemGroup>
30+
<EmbeddedResource Include="Double\Data\general-20x40.mat" />
31+
<EmbeddedResource Include="Double\Data\general-40x20.mat" />
32+
<EmbeddedResource Include="Double\Data\general-40x40.mat" />
33+
<EmbeddedResource Include="Double\Data\symmetric-40-spd.mat" />
34+
<EmbeddedResource Include="Double\Data\symmetric-40.mat" />
9235
<EmbeddedResource Include="Double\Data\test-data-dense-2x2.txt" />
9336
<EmbeddedResource Include="Double\Data\test-data-dense-2x3.txt" />
9437
</ItemGroup>
38+
39+
<ItemGroup>
40+
<PackageReference Include="nunit" Version="3.10.1" />
41+
<PackageReference Include="NUnit3TestAdapter" Version="3.10.0" />
42+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
43+
</ItemGroup>
44+
9545
<ItemGroup>
96-
<None Include="packages.config" />
46+
<ProjectReference Include="..\CSparse\CSparse.csproj" />
9747
</ItemGroup>
98-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
99-
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
100-
<PropertyGroup>
101-
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
102-
</PropertyGroup>
103-
<Error Condition="!Exists('..\packages\NUnit.3.11.0\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit.3.11.0\build\NUnit.props'))" />
104-
</Target>
105-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
106-
Other similar extension points exist, see Microsoft.Common.targets.
107-
<Target Name="BeforeBuild">
108-
</Target>
109-
<Target Name="AfterBuild">
110-
</Target>
111-
-->
48+
11249
</Project>

‎CSparse.Tests/Complex/Factorization/SparseCholeskyTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ namespace CSparse.Tests.Complex.Factorization
55
using CSparse.Complex.Factorization;
66
using NUnit.Framework;
77
using System;
8-
using System.Numerics;
8+
using Complex = System.Numerics.Complex;
99

1010
public class SparseCholeskyTest
1111
{

‎CSparse.Tests/Complex/Factorization/SparseLUTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ namespace CSparse.Tests.Complex.Factorization
44
using CSparse.Complex;
55
using CSparse.Complex.Factorization;
66
using NUnit.Framework;
7-
using System.Numerics;
7+
using Complex = System.Numerics.Complex;
88

99
public class SparseLUTest
1010
{

‎CSparse.Tests/Complex/Factorization/SparseQRTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ namespace CSparse.Tests.Complex.Factorization
44
using CSparse.Complex;
55
using CSparse.Complex.Factorization;
66
using NUnit.Framework;
7-
using System.Numerics;
7+
using Complex = System.Numerics.Complex;
88

99
public class SparseQRTest
1010
{

‎CSparse.Tests/Properties/AssemblyInfo.cs

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

‎CSparse.Tests/Storage/SymbolicColumnStorageTest.cs

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

‎CSparse.Tests/packages.config

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

‎CSparse.sln

Lines changed: 15 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,31 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 14
4-
VisualStudioVersion = 14.0.23107.0
3+
# Visual Studio 15
4+
VisualStudioVersion = 15.0.28307.572
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSparse", "CSparse\CSparse.csproj", "{BD00D9BD-D669-4AEE-91B7-0105AFC994EC}"
6+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CSparse", "CSparse\CSparse.csproj", "{BE369FD3-02F6-4A13-8DA2-E44A819FAE3C}"
77
EndProject
8-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSparse.Tests", "CSparse.Tests\CSparse.Tests.csproj", "{C4052DF8-0709-4B5F-86F4-1A7409B82BED}"
8+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSparse.Tests", "CSparse.Tests\CSparse.Tests.csproj", "{84D239FA-7BA0-4E5D-89FF-C29C5267CDB0}"
99
EndProject
1010
Global
1111
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1212
Debug|Any CPU = Debug|Any CPU
13-
Debug|x86 = Debug|x86
1413
Release|Any CPU = Release|Any CPU
15-
Release|x86 = Release|x86
1614
EndGlobalSection
1715
GlobalSection(ProjectConfigurationPlatforms) = postSolution
18-
{BD00D9BD-D669-4AEE-91B7-0105AFC994EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
19-
{BD00D9BD-D669-4AEE-91B7-0105AFC994EC}.Debug|Any CPU.Build.0 = Debug|Any CPU
20-
{BD00D9BD-D669-4AEE-91B7-0105AFC994EC}.Debug|x86.ActiveCfg = Debug|Any CPU
21-
{BD00D9BD-D669-4AEE-91B7-0105AFC994EC}.Release|Any CPU.ActiveCfg = Release|Any CPU
22-
{BD00D9BD-D669-4AEE-91B7-0105AFC994EC}.Release|Any CPU.Build.0 = Release|Any CPU
23-
{BD00D9BD-D669-4AEE-91B7-0105AFC994EC}.Release|x86.ActiveCfg = Release|Any CPU
24-
{C4052DF8-0709-4B5F-86F4-1A7409B82BED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
25-
{C4052DF8-0709-4B5F-86F4-1A7409B82BED}.Debug|Any CPU.Build.0 = Debug|Any CPU
26-
{C4052DF8-0709-4B5F-86F4-1A7409B82BED}.Debug|x86.ActiveCfg = Debug|Any CPU
27-
{C4052DF8-0709-4B5F-86F4-1A7409B82BED}.Release|Any CPU.ActiveCfg = Release|Any CPU
28-
{C4052DF8-0709-4B5F-86F4-1A7409B82BED}.Release|Any CPU.Build.0 = Release|Any CPU
29-
{C4052DF8-0709-4B5F-86F4-1A7409B82BED}.Release|x86.ActiveCfg = Release|Any CPU
16+
{BE369FD3-02F6-4A13-8DA2-E44A819FAE3C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
17+
{BE369FD3-02F6-4A13-8DA2-E44A819FAE3C}.Debug|Any CPU.Build.0 = Debug|Any CPU
18+
{BE369FD3-02F6-4A13-8DA2-E44A819FAE3C}.Release|Any CPU.ActiveCfg = Release|Any CPU
19+
{BE369FD3-02F6-4A13-8DA2-E44A819FAE3C}.Release|Any CPU.Build.0 = Release|Any CPU
20+
{84D239FA-7BA0-4E5D-89FF-C29C5267CDB0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
21+
{84D239FA-7BA0-4E5D-89FF-C29C5267CDB0}.Debug|Any CPU.Build.0 = Debug|Any CPU
22+
{84D239FA-7BA0-4E5D-89FF-C29C5267CDB0}.Release|Any CPU.ActiveCfg = Release|Any CPU
23+
{84D239FA-7BA0-4E5D-89FF-C29C5267CDB0}.Release|Any CPU.Build.0 = Release|Any CPU
3024
EndGlobalSection
3125
GlobalSection(SolutionProperties) = preSolution
3226
HideSolutionNode = FALSE
3327
EndGlobalSection
28+
GlobalSection(ExtensibilityGlobals) = postSolution
29+
SolutionGuid = {952E537E-0CA1-4AA7-8DBC-CCE91743835F}
30+
EndGlobalSection
3431
EndGlobal

0 commit comments

Comments
 (0)