Skip to content

Commit 9b62841

Browse files
committed
attempt to revive, upgrade tooling
1 parent e010de7 commit 9b62841

File tree

22 files changed

+62
-60
lines changed

22 files changed

+62
-60
lines changed

.config/dotnet-tools.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"isRoot": true,
44
"tools": {
55
"paket": {
6-
"version": "6.2.1",
6+
"version": "8.0.0",
77
"commands": [
88
"paket"
99
]

MathNet.Numerics.sln.DotSettings

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@
2525
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_SIMPLE_ACCESSOR_ATTRIBUTE_ON_SAME_LINE/@EntryValue">False</s:Boolean>
2626
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_BEFORE_BINARY_OPSIGN/@EntryValue">True</s:Boolean>
2727
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_LINES/@EntryValue">False</s:Boolean>
28-
<s:String x:Key="/Default/CodeStyle/FileHeader/FileHeaderText/@EntryValue">&lt;copyright file="$FILENAME$" company="Math.NET"&gt;&#xD;
28+
<s:String x:Key="/Default/CodeStyle/FileHeader/FileHeaderText/@EntryValue">&lt;copyright file="${File.FileName}" company="Math.NET"&gt;&#xD;
2929
Math.NET Numerics, part of the Math.NET Project&#xD;
3030
https://numerics.mathdotnet.com&#xD;
3131
https://github.com/mathnet/mathnet-numerics&#xD;
3232
https://mathnetnumerics.codeplex.com&#xD;
3333
&#xD;
34-
Copyright (c) 2009-$CURRENT_YEAR$ Math.NET&#xD;
34+
Copyright (c) 2009-${CurrentDate.Year} Math.NET&#xD;
3535
&#xD;
3636
Permission is hereby granted, free of charge, to any person&#xD;
3737
obtaining a copy of this software and associated documentation&#xD;
@@ -83,6 +83,7 @@ OTHER DEALINGS IN THE SOFTWARE.&#xD;
8383
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SVD/@EntryIndexedValue">SVD</s:String>
8484
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=TFQMR/@EntryIndexedValue">TFQMR</s:String>
8585
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=WH/@EntryIndexedValue">WH</s:String>
86+
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EFeature_002EServices_002ECodeCleanup_002EFileHeader_002EFileHeaderSettingsMigrate/@EntryIndexedValue">True</s:Boolean>
8687
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpAttributeForSingleLineMethodUpgrade/@EntryIndexedValue">True</s:Boolean>
8788
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpKeepExistingMigration/@EntryIndexedValue">True</s:Boolean>
8889
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpPlaceEmbeddedOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>

appveyor.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
image: Visual Studio 2017
1+
image: Visual Studio 2022
22
init:
33
- git config --global core.autocrlf true
44
install:
55
# Download .NET Core SDK 6.0.100 and add to PATH
6-
- ps: $urlCurrent = "https://dotnetcli.azureedge.net/dotnet/Sdk/6.0.100/dotnet-sdk-6.0.100-win-x64.zip"
6+
- ps: $urlCurrent = "https://dotnetcli.azureedge.net/dotnet/Sdk/8.0.100/dotnet-sdk-8.0.100-win-x64.zip"
77
- ps: $env:DOTNET_INSTALL_DIR = "$pwd\.dotnetsdk"
88
- ps: mkdir $env:DOTNET_INSTALL_DIR -Force | Out-Null
99
- ps: $tempFileCurrent = [System.IO.Path]::GetTempFileName()

build/build.fs

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -346,38 +346,38 @@ let initTargets strongname sign incremental =
346346

347347
// TEST
348348
Target.create "TestNumerics" ignore
349-
Target.create "TestNumericsNET60" (``Test Numerics`` "net6.0")
349+
Target.create "TestNumericsNET80" (``Test Numerics`` "net8.0")
350350
Target.create "TestNumericsNET48" (``Test Numerics`` "net48")
351-
"Build" ==> "TestNumericsNET60" ==> "TestNumerics" |> ignore
351+
"Build" ==> "TestNumericsNET80" ==> "TestNumerics" |> ignore
352352
"Build" =?> ("TestNumericsNET48", Environment.isWindows) ==> "TestNumerics" |> ignore
353353
Target.create "TestFsharp" ignore
354-
Target.create "TestFsharpNET60" (``Test FSharp`` "net6.0")
354+
Target.create "TestFsharpNET80" (``Test FSharp`` "net8.0")
355355
Target.create "TestFsharpNET48" (``Test FSharp`` "net48")
356-
"Build" ==> "TestFsharpNET60" ==> "TestFsharp" |> ignore
356+
"Build" ==> "TestFsharpNET80" ==> "TestFsharp" |> ignore
357357
"Build" =?> ("TestFsharpNET48", Environment.isWindows) ==> "TestFsharp" |> ignore
358358
Target.create "TestData" ignore
359-
Target.create "TestDataNET60" (``Test Data`` "net6.0")
359+
Target.create "TestDataNET80" (``Test Data`` "net8.0")
360360
Target.create "TestDataNET48" (``Test Data`` "net48")
361-
"Build" ==> "TestDataNET60" ==> "TestData" |> ignore
361+
"Build" ==> "TestDataNET80" ==> "TestData" |> ignore
362362
"Build" =?> ("TestDataNET48", Environment.isWindows) ==> "TestData" |> ignore
363363
Target.create "Test" ignore
364364
"TestNumerics" ==> "Test" |> ignore
365365
"TestFsharp" ==> "Test" |> ignore
366366
"TestData" ==> "Test" |> ignore
367367
Target.create "MklTest" ignore
368-
Target.create "MklTestNET60" (``Test MKL`` "net6.0")
368+
Target.create "MklTestNET80" (``Test MKL`` "net8.0")
369369
Target.create "MklTestNET48" (``Test MKL`` "net48")
370-
"MklWinBuild" ==> "MklTestNET60" ==> "MklTest" |> ignore
370+
"MklWinBuild" ==> "MklTestNET80" ==> "MklTest" |> ignore
371371
"MklWinBuild" =?> ("MklTestNET48", Environment.isWindows) ==> "MklTest" |> ignore
372372
Target.create "OpenBlasTest" ignore
373-
Target.create "OpenBlasTestNET60" (``Test OpenBLAS`` "net6.0")
373+
Target.create "OpenBlasTestNET80" (``Test OpenBLAS`` "net8.0")
374374
Target.create "OpenBlasTestNET48" (``Test OpenBLAS`` "net48")
375-
"OpenBlasWinBuild" ==> "OpenBlasTestNET60" ==> "OpenBlasTest" |> ignore
375+
"OpenBlasWinBuild" ==> "OpenBlasTestNET80" ==> "OpenBlasTest" |> ignore
376376
"OpenBlasWinBuild" =?> ("OpenBlasTestNET48", Environment.isWindows) ==> "OpenBlasTest" |> ignore
377377
Target.create "CudaTest" ignore
378-
Target.create "CudaTestNET60" (``Test CUDA`` "net6.0")
378+
Target.create "CudaTestNET80" (``Test CUDA`` "net8.0")
379379
Target.create "CudaTestNET48" (``Test CUDA`` "net48")
380-
"CudaWinBuild" ==> "CudaTestNET60" ==> "CudaTest" |> ignore
380+
"CudaWinBuild" ==> "CudaTestNET80" ==> "CudaTest" |> ignore
381381
"CudaWinBuild" =?> ("CudaTestNET48", Environment.isWindows) ==> "CudaTest" |> ignore
382382

383383
// PACKAGING ONLY WITHOUT BUILD

build/build.fsproj

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net6.0</TargetFramework>
5+
<TargetFramework>net8.0</TargetFramework>
66
<WarnOn>3390;$(WarnOn)</WarnOn>
77
<IsPackable>false</IsPackable>
88
</PropertyGroup>
@@ -17,16 +17,17 @@
1717
<Compile Include="build.fs" />
1818
</ItemGroup>
1919
<ItemGroup>
20-
<PackageReference Include="Fake.Core.Context" Version="5.21.1" />
21-
<PackageReference Include="Fake.Core.Environment" Version="5.21.1" />
22-
<PackageReference Include="Fake.Core.ReleaseNotes" Version="5.21.1" />
23-
<PackageReference Include="Fake.Core.String" Version="5.21.1" />
24-
<PackageReference Include="Fake.Core.Target" Version="5.21.1" />
25-
<PackageReference Include="Fake.Core.Trace" Version="5.21.1" />
26-
<PackageReference Include="Fake.DotNet.Cli" Version="5.21.1" />
27-
<PackageReference Include="Fake.DotNet.NuGet" Version="5.21.1" />
28-
<PackageReference Include="Fake.IO.FileSystem" Version="5.21.1" />
29-
<PackageReference Include="Fake.IO.Zip" Version="5.21.1" />
30-
<PackageReference Include="Fake.Tools.Git" Version="5.21.1" />
20+
<PackageReference Include="Fake.Core.Context" Version="6.0.0" />
21+
<PackageReference Include="Fake.Core.Environment" Version="6.0.0" />
22+
<PackageReference Include="Fake.Core.ReleaseNotes" Version="6.0.0" />
23+
<PackageReference Include="Fake.Core.String" Version="6.0.0" />
24+
<PackageReference Include="Fake.Core.Target" Version="6.0.0" />
25+
<PackageReference Include="Fake.Core.Trace" Version="6.0.0" />
26+
<PackageReference Include="Fake.DotNet.Cli" Version="6.0.0" />
27+
<PackageReference Include="Fake.DotNet.NuGet" Version="6.0.0" />
28+
<PackageReference Include="Fake.IO.FileSystem" Version="6.0.0" />
29+
<PackageReference Include="Fake.IO.Zip" Version="6.0.0" />
30+
<PackageReference Include="Fake.Tools.Git" Version="6.0.0" />
31+
<PackageReference Include="MSBuild.StructuredLogger" Version="2.2.100" />
3132
</ItemGroup>
3233
</Project>

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "6.0.100",
3+
"version": "8.0.100",
44
"rollForward": "feature"
55
}
66
}

paket.dependencies

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
source https://api.nuget.org/v3/index.json
22
storage: packages
33

4-
framework: net5.0,net48,net461,netstandard2.0
4+
framework: net8.0,net6.0,net48,net461,netstandard2.0
55

66
group Build
77
source https://api.nuget.org/v3/index.json

paket.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
STORAGE: PACKAGES
2-
RESTRICTION: || (== net461) (== net48) (== net50) (== netstandard2.0)
2+
RESTRICTION: || (== net461) (== net48) (== net6.0) (== net8.0) (== netstandard2.0)
33

44
GROUP Build
55
STORAGE: PACKAGES

src/Benchmark/Benchmark.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFrameworks>net6.0;net48</TargetFrameworks>
5+
<TargetFrameworks>net8.0;net6.0;net48</TargetFrameworks>
66
<LangVersion>7.3</LangVersion>
77
<AssemblyName>Benchmark</AssemblyName>
88
<RootNamespace>Benchmark</RootNamespace>
@@ -21,7 +21,7 @@
2121
<ProjectReference Include="..\Providers.MKL\Providers.MKL.csproj" />
2222
</ItemGroup>
2323
<ItemGroup>
24-
<PackageReference Include="BenchmarkDotNet" Version="0.13.5" />
24+
<PackageReference Include="BenchmarkDotNet" Version="0.13.11" />
2525
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3">
2626
<PrivateAssets>all</PrivateAssets>
2727
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

src/Data.Matlab/Data.Matlab.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
44
<OutputType>Library</OutputType>
5-
<TargetFrameworks>net6.0;net5.0;net461;net48;netstandard2.0</TargetFrameworks>
5+
<TargetFrameworks>net8.0;net6.0;net48;netstandard2.0</TargetFrameworks>
66
<LangVersion>7.3</LangVersion>
77
<AssemblyName>MathNet.Numerics.Data.Matlab</AssemblyName>
88
<RootNamespace>MathNet.Numerics.Data.Matlab</RootNamespace>
@@ -56,14 +56,14 @@ Control.Describe now includes CPU architecture and family identifier if know</Pa
5656
<ProjectReference Include="..\Numerics\Numerics.csproj" />
5757
</ItemGroup>
5858
<ItemGroup>
59-
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="7.0.1">
59+
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0">
6060
<PrivateAssets>all</PrivateAssets>
6161
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
6262
</PackageReference>
6363
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3">
6464
<PrivateAssets>all</PrivateAssets>
6565
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
6666
</PackageReference>
67-
<PackageReference Include="OneOf" Version="3.0.223" />
67+
<PackageReference Include="OneOf" Version="3.0.263" />
6868
</ItemGroup>
6969
</Project>

0 commit comments

Comments
 (0)