Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
"isRoot": true,
"tools": {
"paket": {
"version": "5.258.1",
"version": "9.0.2",
"commands": [
"paket"
]
},
"fake-cli": {
"version": "5.20.4",
"version": "6.1.3",
"commands": [
"fake"
]
Expand Down
948 changes: 509 additions & 439 deletions .paket/Paket.Restore.targets

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion NuGet.config
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<packageSources>
<clear />
<clear />
<add key="NuGet" value="https://api.nuget.org/v3/index.json" />
</packageSources>
</configuration>
3 changes: 3 additions & 0 deletions RELEASENOTES.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
### 0.7.1-alpha.0
* Add net8.0 as target

### 0.7.0 - 2020-05-10
* Bilinear Transform *~Nico Caprioli*
* Butterworth Designer and IIR Coefficients *~Nico Caprioli*
Expand Down
8 changes: 4 additions & 4 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
image: Visual Studio 2017
image: Visual Studio 2022
init:
- git config --global core.autocrlf true
install:
# Download .NET Core SDK 5.0.100 and add to PATH
- ps: $urlCurrent = "https://dotnetcli.azureedge.net/dotnet/Sdk/5.0.100/dotnet-sdk-5.0.100-win-x64.zip"
# Download .NET Core SDK 8.0.411 and add to PATH
- ps: $urlCurrent = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.411/dotnet-sdk-8.0.411-win-x64.zip"
- ps: $env:DOTNET_INSTALL_DIR = "$pwd\.dotnetsdk"
- ps: mkdir $env:DOTNET_INSTALL_DIR -Force | Out-Null
- ps: $tempFileCurrent = [System.IO.Path]::GetTempFileName()
- ps: (New-Object System.Net.WebClient).DownloadFile($urlCurrent, $tempFileCurrent)
- ps: Invoke-WebRequest -Uri $urlCurrent -OutFile $tempFileCurrent
- ps: Add-Type -AssemblyName System.IO.Compression.FileSystem; [System.IO.Compression.ZipFile]::ExtractToDirectory($tempFileCurrent, $env:DOTNET_INSTALL_DIR)
- ps: $env:Path = "$env:DOTNET_INSTALL_DIR;$env:Path"
build_script:
Expand Down
23 changes: 17 additions & 6 deletions build.fsx
Original file line number Diff line number Diff line change
Expand Up @@ -116,17 +116,28 @@ Target "Build" (fun _ ->

// Normal Build (without strong name, with certificate signature)
CleanDirs (!! "src/**/obj/" ++ "src/**/bin/" )
printfn " * cleaned directories"
restoreWeak filteringSolution
printfn " * restored packages"
buildWeak filteringSolution
if isWindows && hasBuildParam "sign" then sign fingerprint timeserver filteringSolution
printfn " * built solution %s" filteringSolution.SolutionFile
if isWindows && hasBuildParam "sign" then
sign fingerprint timeserver filteringSolution
printfn " * signed solution %s" filteringSolution.SolutionFile
collectBinaries filteringSolution
printfn " * collected binaries from solution %s" filteringSolution.SolutionFile
zip filteringZipPackage filteringSolution.OutputZipDir filteringSolution.OutputLibDir (fun f -> f.Contains("MathNet.Filtering.") || f.Contains("MathNet.Numerics."))
printfn " * zipped solution %s to %s" filteringSolution.SolutionFile filteringZipPackage.Title
if isWindows then
packWeak filteringSolution
printfn " * packed solution %s to %s" filteringSolution.SolutionFile filteringSolution.OutputNuGetDir
collectNuGetPackages filteringSolution
printfn " * collected NuGet packages from solution %s" filteringSolution.SolutionFile

// NuGet Sign (all or nothing)
if isWindows && hasBuildParam "sign" then signNuGet fingerprint timeserver [filteringSolution; filteringStrongNameSolution]
if isWindows && hasBuildParam "sign" then
signNuGet fingerprint timeserver [filteringSolution; filteringStrongNameSolution]
printfn " * signed NuGet packages from solution %s" filteringSolution.SolutionFile

)
"Prepare" ==> "Build"
Expand All @@ -138,23 +149,23 @@ Target "Build" (fun _ ->

let testFiltering framework = test "src/Filtering.Tests" "Filtering.Tests.csproj" framework
Target "TestFiltering" DoNothing
Target "TestFilteringCore3.1" (fun _ -> testFiltering "netcoreapp3.1")
Target "TestFilteringNet8.0" (fun _ -> testFiltering "net8.0")
Target "TestFilteringNET40" (fun _ -> testFiltering "net40")
Target "TestFilteringNET45" (fun _ -> testFiltering "net45")
Target "TestFilteringNET461" (fun _ -> testFiltering "net461")
Target "TestFilteringNET47" (fun _ -> testFiltering "net47")
"Build" ==> "TestFilteringCore3.1" ==> "TestFiltering"
"Build" ==> "TestFilteringNet8.0" ==> "TestFiltering"
"Build" =?> ("TestFilteringNET40", isWindows)
"Build" =?> ("TestFilteringNET45", isWindows)
"Build" =?> ("TestFilteringNET461", isWindows) ==> "TestFiltering"
"Build" =?> ("TestFilteringNET47", isWindows)
let testKalman framework = test "src/Kalman.Tests" "Kalman.Tests.csproj" framework
Target "TestKalman" DoNothing
Target "TestKalmanCore3.1" (fun _ -> testKalman "netcoreapp3.1")
Target "TestKalmanNet8.0" (fun _ -> testKalman "net8.0")
Target "TestKalmanNET45" (fun _ -> testKalman "net45")
Target "TestKalmanNET461" (fun _ -> testKalman "net461")
Target "TestKalmanNET47" (fun _ -> testKalman "net47")
"Build" ==> "TestKalmanCore3.1" ==> "TestKalman"
"Build" ==> "TestKalmanNet8.0" ==> "TestKalman"
"Build" =?> ("TestKalmanNET45", isWindows)
"Build" =?> ("TestKalmanNET461", isWindows) ==> "TestKalman"
"Build" =?> ("TestKalmanNET47", isWindows)
Expand Down
11 changes: 7 additions & 4 deletions build/build-framework.fsx
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,8 @@ let dotnet workingDir command =
let properties =
[
]
let suffix = properties |> List.map (fun (name, value) -> sprintf """ /p:%s="%s" /nr:false """ name value) |> String.concat ""
let suffix = properties |> List.map (fun (name, value) ->
sprintf """ /p:%s="%s" /nr:false """ name value) |> String.concat ""
DotNetCli.RunCommand
(fun c -> { c with WorkingDir = workingDir})
(command + suffix)
Expand All @@ -46,7 +47,8 @@ let dotnetWeak workingDir command =
[
yield "StrongName", "False"
]
let suffix = properties |> List.map (fun (name, value) -> sprintf """ /p:%s="%s" /nr:false """ name value) |> String.concat ""
let suffix = properties |> List.map (fun (name, value) ->
sprintf """ /p:%s="%s" /nr:false """ name value) |> String.concat ""
DotNetCli.RunCommand
(fun c -> { c with WorkingDir = workingDir})
(command + suffix)
Expand All @@ -56,7 +58,8 @@ let dotnetStrong workingDir command =
[
yield "StrongName", "True"
]
let suffix = properties |> List.map (fun (name, value) -> sprintf """ /p:%s="%s" /nr:false """ name value) |> String.concat ""
let suffix = properties |> List.map (fun (name, value) ->
sprintf """ /p:%s="%s" /nr:false """ name value) |> String.concat ""
DotNetCli.RunCommand
(fun c -> { c with WorkingDir = workingDir})
(command + suffix)
Expand Down Expand Up @@ -310,7 +313,7 @@ let collectNuGetPackages (solution:Solution) =
// --------------------------------------------------------------------------------------

let test testsDir testsProj framework =
dotnet testsDir (sprintf "run -p %s --configuration Release --framework %s --no-restore --no-build" testsProj framework)
dotnet testsDir (sprintf "run --project %s --configuration Release --framework %s --no-restore --no-build" testsProj framework)


// --------------------------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "5.0.100",
"version": "8.0.411",
"rollForward": "latestFeature"
}
}
32 changes: 16 additions & 16 deletions paket.dependencies
Original file line number Diff line number Diff line change
Expand Up @@ -4,26 +4,26 @@ storage: packages
nuget MathNet.Numerics ~> 4.7
nuget MathNet.Numerics.Signed ~> 4.7

nuget Microsoft.NETFramework.ReferenceAssemblies copy_local:true, framework:net40,net461
nuget System.ValueTuple lowest_matching, strategy:min, framework:net40,net461,netstandard1.3
nuget Microsoft.NETFramework.ReferenceAssemblies copy_local:true, framework:net461
nuget System.ValueTuple >= 4.5.0 strategy:min, framework:net40,net461

// Testing
nuget NUnit ~> 3.0 framework:net461,netcoreapp3.1
nuget NUnitLite ~> 3.0 framework:net461,netcoreapp3.1
nuget Microsoft.NET.Test.Sdk ~> 16.4.0 lowest_matching, strategy:min
nuget NUnit ~> 3.13 framework:net461,netstandard2.0,net8.0
nuget NUnitLite ~> 3.0 framework:net461,netstandard2.0,net8.0
nuget Microsoft.NET.Test.Sdk ~> 17.3.2 lowest_matching, strategy:min
nuget NUnit3TestAdapter

nuget NETStandard.Library 2.0.3 lowest_matching, strategy:min, framework:netstandard2.0,netcoreapp3.1
nuget Microsoft.NETCore.Platforms 3.1.0 lowest_matching, strategy:min, framework:netstandard2.0,netcoreapp3.1
nuget Microsoft.NETCore.App 2.2.8 lowest_matching, strategy:min, framework:netstandard2.0,netcoreapp3.1
nuget Microsoft.NETCore.DotNetHost 3.1.1 lowest_matching, strategy:min, framework:netstandard2.0,netcoreapp3.1
nuget Microsoft.NETCore.DotNetAppHost 3.1.1 lowest_matching, strategy:min, framework:netstandard2.0,netcoreapp3.1
nuget Microsoft.NETCore.DotNetHostPolicy 3.1.1 lowest_matching, strategy:min, framework:netstandard2.0,netcoreapp3.1
nuget Microsoft.NETCore.DotNetHostResolver 3.1.1 lowest_matching, strategy:min, framework:netstandard2.0,netcoreapp3.1
nuget Microsoft.NETCore.Jit 2.0.8 lowest_matching, strategy:min, framework:netstandard2.0,netcoreapp3.1
nuget Microsoft.NETCore.Targets 2.0 lowest_matching, strategy:min, framework:netstandard2.0,netcoreapp3.1
nuget Microsoft.NETCore.Runtime.CoreCLR 2.0.8 lowest_matching, strategy:min, framework:netstandard2.0,netcoreapp3.1
nuget Microsoft.DotNet.PlatformAbstractions 3.1.1 lowest_matching, strategy:min, framework:netstandard2.0,netcoreapp3.1
nuget NETStandard.Library 2.0.3 lowest_matching, strategy:min, framework:netstandard2.0
nuget Microsoft.NETCore.Platforms 3.1.0 lowest_matching, strategy:min, framework:netstandard2.0
nuget Microsoft.NETCore.App 2.2.8 lowest_matching, strategy:min, framework:netstandard2.0
nuget Microsoft.NETCore.DotNetHost 3.1.1 lowest_matching, strategy:min, framework:netstandard2.0
nuget Microsoft.NETCore.DotNetAppHost 3.1.1 lowest_matching, strategy:min, framework:netstandard2.0
nuget Microsoft.NETCore.DotNetHostPolicy 3.1.1 lowest_matching, strategy:min, framework:netstandard2.0
nuget Microsoft.NETCore.DotNetHostResolver 3.1.1 lowest_matching, strategy:min, framework:netstandard2.0
nuget Microsoft.NETCore.Jit 2.0.8 lowest_matching, strategy:min, framework:netstandard2.0
nuget Microsoft.NETCore.Targets 2.0 lowest_matching, strategy:min, framework:netstandard2.0
nuget Microsoft.NETCore.Runtime.CoreCLR 2.0.8 lowest_matching, strategy:min, framework:netstandard2.0
nuget Microsoft.DotNet.PlatformAbstractions 3.1.1 lowest_matching, strategy:min, framework:netstandard2.0

group Build
source https://api.nuget.org/v3/index.json
Expand Down
Loading