Skip to content

Commit cdeb531

Browse files
cdrnetcdrnet
committed
Cleanup, update deps
1 parent 306cfa4 commit cdeb531

10 files changed

Lines changed: 41 additions & 14 deletions

‎MathNet.Numerics.MKL.sln‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Docs", "Docs", "{9275D8F1-8
3838
EndProject
3939
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{97C9717A-68C7-4C86-B30E-E4FC54C43A13}"
4040
ProjectSection(SolutionItems) = preProject
41-
build\build-framework.fsx = build\build-framework.fsx
4241
build.fsx = build.fsx
43-
src\Directory.Build.props = src\Directory.Build.props
42+
Directory.Build.props = Directory.Build.props
4443
build\MathNet.Numerics.MKL.Linux-x64.nuspec = build\MathNet.Numerics.MKL.Linux-x64.nuspec
4544
build\MathNet.Numerics.MKL.Linux-x86.nuspec = build\MathNet.Numerics.MKL.Linux-x86.nuspec
4645
build\MathNet.Numerics.MKL.Linux.nuspec = build\MathNet.Numerics.MKL.Linux.nuspec

‎MathNet.Numerics.sln‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ EndProject
2727
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{B54A0B40-DE22-49FB-B1C0-6E5BDA3B0B2F}"
2828
ProjectSection(SolutionItems) = preProject
2929
appveyor.yml = appveyor.yml
30-
build\build-framework.fsx = build\build-framework.fsx
3130
build.fsx = build.fsx
3231
global.json = global.json
3332
paket.dependencies = paket.dependencies

‎src/Data.Tests/Data.Tests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
</ItemGroup>
3131
<ItemGroup>
3232
<PackageReference Include="NUnit" Version="3.13.2" />
33-
<PackageReference Include="NUnit3TestAdapter" Version="4.0.0" />
33+
<PackageReference Include="NUnit3TestAdapter" Version="4.1.0" />
3434
<PackageReference Include="NUnitLite" Version="3.13.2" />
3535
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
3636
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.2">

‎src/FSharp.Tests/FSharp.Tests.fsproj‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@
3434
<Compile Include="Main.fs" />
3535
</ItemGroup>
3636
<ItemGroup>
37+
<PackageReference Include="FSharp.Core" Version="5.0.2" />
38+
<PackageReference Include="System.ValueTuple" Version="4.5.0" Condition="'$(TargetFramework)' == 'net461'" />
3739
<PackageReference Include="NUnit" Version="3.13.2" />
3840
<PackageReference Include="NUnitLite" Version="3.13.2" />
3941
<PackageReference Include="FsUnit" Version="4.1.0" />

‎src/FSharp/FSharp.fsproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ Control.Describe now includes CPU architecture and family identifier if know</Pa
6060
<Compile Include="Quaternion.fs" />
6161
</ItemGroup>
6262
<ItemGroup>
63-
<PackageReference Update="FSharp.Core" Version="4.7.2" />
63+
<PackageReference Include="FSharp.Core" Version="5.0.2" />
6464
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.2">
6565
<PrivateAssets>all</PrivateAssets>
6666
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

‎src/Numerics.Tests/Numerics.Tests.CUDA.csproj‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,5 +30,14 @@
3030
<ItemGroup>
3131
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
3232
</ItemGroup>
33-
<Import Project="..\..\.paket\Paket.Restore.targets" />
33+
<ItemGroup>
34+
<PackageReference Include="NUnit" Version="3.13.2" />
35+
<PackageReference Include="NUnit3TestAdapter" Version="4.1.0" />
36+
<PackageReference Include="NUnitLite" Version="3.13.2" />
37+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
38+
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.2">
39+
<PrivateAssets>all</PrivateAssets>
40+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
41+
</PackageReference>
42+
</ItemGroup>
3443
</Project>

‎src/Numerics.Tests/Numerics.Tests.MKL.csproj‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,5 +30,14 @@
3030
<ItemGroup>
3131
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
3232
</ItemGroup>
33-
<Import Project="..\..\.paket\Paket.Restore.targets" />
33+
<ItemGroup>
34+
<PackageReference Include="NUnit" Version="3.13.2" />
35+
<PackageReference Include="NUnit3TestAdapter" Version="4.1.0" />
36+
<PackageReference Include="NUnitLite" Version="3.13.2" />
37+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
38+
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.2">
39+
<PrivateAssets>all</PrivateAssets>
40+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
41+
</PackageReference>
42+
</ItemGroup>
3443
</Project>

‎src/Numerics.Tests/Numerics.Tests.OpenBLAS.csproj‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,5 +30,14 @@
3030
<ItemGroup>
3131
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
3232
</ItemGroup>
33-
<Import Project="..\..\.paket\Paket.Restore.targets" />
33+
<ItemGroup>
34+
<PackageReference Include="NUnit" Version="3.13.2" />
35+
<PackageReference Include="NUnit3TestAdapter" Version="4.1.0" />
36+
<PackageReference Include="NUnitLite" Version="3.13.2" />
37+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
38+
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.2">
39+
<PrivateAssets>all</PrivateAssets>
40+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
41+
</PackageReference>
42+
</ItemGroup>
3443
</Project>

‎src/Numerics.Tests/Numerics.Tests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
</ItemGroup>
3232
<ItemGroup>
3333
<PackageReference Include="NUnit" Version="3.13.2" />
34-
<PackageReference Include="NUnit3TestAdapter" Version="4.0.0" />
34+
<PackageReference Include="NUnit3TestAdapter" Version="4.1.0" />
3535
<PackageReference Include="NUnitLite" Version="3.13.2" />
3636
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
3737
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.2">

‎src/Numerics/Numerics.csproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,10 @@ Control.Describe now includes CPU architecture and family identifier if know</Pa
4545
<Reference Include="System.Runtime.Serialization" />
4646
</ItemGroup>
4747
<ItemGroup>
48-
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.2">
49-
<PrivateAssets>all</PrivateAssets>
50-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
51-
</PackageReference>
52-
<PackageReference Include="System.ValueTuple" Version="4.5.0" Condition="'$(TargetFramework)' == 'net461'" />
48+
<PackageReference Include="System.ValueTuple" Version="4.5.0" Condition="'$(TargetFramework)' == 'net461'" />
49+
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.2">
50+
<PrivateAssets>all</PrivateAssets>
51+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
52+
</PackageReference>
5353
</ItemGroup>
5454
</Project>

0 commit comments

Comments
 (0)