tsai
/
mathnet-numerics
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Cleanup, update deps

pull/875/head
Christoph Ruegg 4 years ago
parent
306cfa4414
commit
cdeb531e1f
10 changed files with 41 additions and 14 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      MathNet.Numerics.MKL.sln
  2. 1
      MathNet.Numerics.sln
  3. 2
      src/Data.Tests/Data.Tests.csproj
  4. 2
      src/FSharp.Tests/FSharp.Tests.fsproj
  5. 2
      src/FSharp/FSharp.fsproj
  6. 11
      src/Numerics.Tests/Numerics.Tests.CUDA.csproj
  7. 11
      src/Numerics.Tests/Numerics.Tests.MKL.csproj
  8. 11
      src/Numerics.Tests/Numerics.Tests.OpenBLAS.csproj
  9. 2
      src/Numerics.Tests/Numerics.Tests.csproj
  10. 10
      src/Numerics/Numerics.csproj

3
MathNet.Numerics.MKL.sln
View File

@ -38,9 +38,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Docs", "Docs", "{9275D8F1-8
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{97C9717A-68C7-4C86-B30E-E4FC54C43A13}"
ProjectSection(SolutionItems) = preProject
build\build-framework.fsx = build\build-framework.fsx
build.fsx = build.fsx
src\Directory.Build.props = src\Directory.Build.props
Directory.Build.props = Directory.Build.props
build\MathNet.Numerics.MKL.Linux-x64.nuspec = build\MathNet.Numerics.MKL.Linux-x64.nuspec
build\MathNet.Numerics.MKL.Linux-x86.nuspec = build\MathNet.Numerics.MKL.Linux-x86.nuspec
build\MathNet.Numerics.MKL.Linux.nuspec = build\MathNet.Numerics.MKL.Linux.nuspec

1
MathNet.Numerics.sln
View File

@ -27,7 +27,6 @@ EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{B54A0B40-DE22-49FB-B1C0-6E5BDA3B0B2F}"
ProjectSection(SolutionItems) = preProject
appveyor.yml = appveyor.yml
build\build-framework.fsx = build\build-framework.fsx
build.fsx = build.fsx
global.json = global.json
paket.dependencies = paket.dependencies

2
src/Data.Tests/Data.Tests.csproj
View File

@ -30,7 +30,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="NUnit" Version="3.13.2" />
<PackageReference Include="NUnit3TestAdapter" Version="4.0.0" />
<PackageReference Include="NUnit3TestAdapter" Version="4.1.0" />
<PackageReference Include="NUnitLite" Version="3.13.2" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.2">

2
src/FSharp.Tests/FSharp.Tests.fsproj
View File

@ -34,6 +34,8 @@
<Compile Include="Main.fs" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="FSharp.Core" Version="5.0.2" />
<PackageReference Include="System.ValueTuple" Version="4.5.0" Condition="'$(TargetFramework)' == 'net461'" />
<PackageReference Include="NUnit" Version="3.13.2" />
<PackageReference Include="NUnitLite" Version="3.13.2" />
<PackageReference Include="FsUnit" Version="4.1.0" />

2
src/FSharp/FSharp.fsproj
View File

@ -60,7 +60,7 @@ Control.Describe now includes CPU architecture and family identifier if know</Pa
<Compile Include="Quaternion.fs" />
</ItemGroup>
<ItemGroup>
<PackageReference Update="FSharp.Core" Version="4.7.2" />
<PackageReference Include="FSharp.Core" Version="5.0.2" />
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

11
src/Numerics.Tests/Numerics.Tests.CUDA.csproj
View File

@ -30,5 +30,14 @@
<ItemGroup>
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
</ItemGroup>
<Import Project="..\..\.paket\Paket.Restore.targets" />
<ItemGroup>
<PackageReference Include="NUnit" Version="3.13.2" />
<PackageReference Include="NUnit3TestAdapter" Version="4.1.0" />
<PackageReference Include="NUnitLite" Version="3.13.2" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>
</Project>

11
src/Numerics.Tests/Numerics.Tests.MKL.csproj
View File

@ -30,5 +30,14 @@
<ItemGroup>
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
</ItemGroup>
<Import Project="..\..\.paket\Paket.Restore.targets" />
<ItemGroup>
<PackageReference Include="NUnit" Version="3.13.2" />
<PackageReference Include="NUnit3TestAdapter" Version="4.1.0" />
<PackageReference Include="NUnitLite" Version="3.13.2" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>
</Project>

11
src/Numerics.Tests/Numerics.Tests.OpenBLAS.csproj
View File

@ -30,5 +30,14 @@
<ItemGroup>
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
</ItemGroup>
<Import Project="..\..\.paket\Paket.Restore.targets" />
<ItemGroup>
<PackageReference Include="NUnit" Version="3.13.2" />
<PackageReference Include="NUnit3TestAdapter" Version="4.1.0" />
<PackageReference Include="NUnitLite" Version="3.13.2" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>
</Project>

2
src/Numerics.Tests/Numerics.Tests.csproj
View File

@ -31,7 +31,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="NUnit" Version="3.13.2" />
<PackageReference Include="NUnit3TestAdapter" Version="4.0.0" />
<PackageReference Include="NUnit3TestAdapter" Version="4.1.0" />
<PackageReference Include="NUnitLite" Version="3.13.2" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.2">

10
src/Numerics/Numerics.csproj
View File

@ -45,10 +45,10 @@ Control.Describe now includes CPU architecture and family identifier if know</Pa
<Reference Include="System.Runtime.Serialization" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="System.ValueTuple" Version="4.5.0" Condition="'$(TargetFramework)' == 'net461'" />
<PackageReference Include="System.ValueTuple" Version="4.5.0" Condition="'$(TargetFramework)' == 'net461'" />
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>
</Project>

Write Preview
Loading…
Cancel
Save