diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 617ce869..efcb020f 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -7,12 +7,6 @@ "commands": [ "fable" ] - }, - "paket": { - "version": "7.2.1", - "commands": [ - "paket" - ] } } } \ No newline at end of file diff --git a/.paket/Paket.Restore.targets b/.paket/Paket.Restore.targets deleted file mode 100644 index 4deb15bc..00000000 --- a/.paket/Paket.Restore.targets +++ /dev/null @@ -1,557 +0,0 @@ - - - - - - - $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - - $(MSBuildVersion) - 15.0.0 - false - true - - true - $(MSBuildThisFileDirectory) - $(MSBuildThisFileDirectory)..\ - $(PaketRootPath)paket-files\paket.restore.cached - $(PaketRootPath)paket.lock - classic - proj - assembly - native - /Library/Frameworks/Mono.framework/Commands/mono - mono - - - $(PaketRootPath)paket.bootstrapper.exe - $(PaketToolsPath)paket.bootstrapper.exe - $([System.IO.Path]::GetDirectoryName("$(PaketBootStrapperExePath)"))\ - - "$(PaketBootStrapperExePath)" - $(MonoPath) --runtime=v4.0.30319 "$(PaketBootStrapperExePath)" - - - - - true - true - - - True - - - False - - $(BaseIntermediateOutputPath.TrimEnd('\').TrimEnd('\/')) - - - - - - - - - $(PaketRootPath)paket - $(PaketToolsPath)paket - - - - - - $(PaketRootPath)paket.exe - $(PaketToolsPath)paket.exe - - - - - - <_DotnetToolsJson Condition="Exists('$(PaketRootPath)/.config/dotnet-tools.json')">$([System.IO.File]::ReadAllText("$(PaketRootPath)/.config/dotnet-tools.json")) - <_ConfigContainsPaket Condition=" '$(_DotnetToolsJson)' != ''">$(_DotnetToolsJson.Contains('"paket"')) - <_ConfigContainsPaket Condition=" '$(_ConfigContainsPaket)' == ''">false - - - - - - - - - - - <_PaketCommand>dotnet paket - - - - - - $(PaketToolsPath)paket - $(PaketBootStrapperExeDir)paket - - - paket - - - - - <_PaketExeExtension>$([System.IO.Path]::GetExtension("$(PaketExePath)")) - <_PaketCommand Condition=" '$(_PaketCommand)' == '' AND '$(_PaketExeExtension)' == '.dll' ">dotnet "$(PaketExePath)" - <_PaketCommand Condition=" '$(_PaketCommand)' == '' AND '$(OS)' != 'Windows_NT' AND '$(_PaketExeExtension)' == '.exe' ">$(MonoPath) --runtime=v4.0.30319 "$(PaketExePath)" - <_PaketCommand Condition=" '$(_PaketCommand)' == '' ">"$(PaketExePath)" - - - - - - - - - - - - - - - - - - - - - true - $(NoWarn);NU1603;NU1604;NU1605;NU1608 - false - true - - - - - - - - - $([System.IO.File]::ReadAllText('$(PaketRestoreCacheFile)')) - - - - - - - $([System.Text.RegularExpressions.Regex]::Split(`%(Identity)`, `": "`)[0].Replace(`"`, ``).Replace(` `, ``)) - $([System.Text.RegularExpressions.Regex]::Split(`%(Identity)`, `": "`)[1].Replace(`"`, ``).Replace(` `, ``)) - - - - - %(PaketRestoreCachedKeyValue.Value) - %(PaketRestoreCachedKeyValue.Value) - - - - - true - false - true - - - - - true - - - - - - - - - - - - - - - - - - - $(PaketIntermediateOutputPath)\$(MSBuildProjectFile).paket.references.cached - - $(MSBuildProjectFullPath).paket.references - - $(MSBuildProjectDirectory)\$(MSBuildProjectName).paket.references - - $(MSBuildProjectDirectory)\paket.references - - false - true - true - references-file-or-cache-not-found - - - - - $([System.IO.File]::ReadAllText('$(PaketReferencesCachedFilePath)')) - $([System.IO.File]::ReadAllText('$(PaketOriginalReferencesFilePath)')) - references-file - false - - - - - false - - - - - true - target-framework '$(TargetFramework)' or '$(TargetFrameworks)' files @(PaketResolvedFilePaths) - - - - - - - - - - - false - true - - - - - - - - - - - $([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',').Length) - $([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[0]) - $([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[1]) - $([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[4]) - $([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[5]) - $([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[6]) - $([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[7]) - - - %(PaketReferencesFileLinesInfo.PackageVersion) - All - runtime - $(ExcludeAssets);contentFiles - $(ExcludeAssets);build;buildMultitargeting;buildTransitive - true - true - - - - - $(PaketIntermediateOutputPath)/$(MSBuildProjectFile).paket.clitools - - - - - - - - - $([System.String]::Copy('%(PaketCliToolFileLines.Identity)').Split(',')[0]) - $([System.String]::Copy('%(PaketCliToolFileLines.Identity)').Split(',')[1]) - - - %(PaketCliToolFileLinesInfo.PackageVersion) - - - - - - - - - - false - - - - - - <_NuspecFilesNewLocation Include="$(PaketIntermediateOutputPath)\$(Configuration)\*.nuspec"/> - - - - - - $(MSBuildProjectDirectory)/$(MSBuildProjectFile) - true - false - true - false - true - false - true - false - true - false - true - $(PaketIntermediateOutputPath)\$(Configuration) - $(PaketIntermediateOutputPath) - - - - <_NuspecFiles Include="$(AdjustedNuspecOutputPath)\*.$(PackageVersion.Split(`+`)[0]).nuspec"/> - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ARCtrl.sln b/ARCtrl.sln index dba1dac1..e4b3edb7 100644 --- a/ARCtrl.sln +++ b/ARCtrl.sln @@ -12,7 +12,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution .config\dotnet-tools.json = .config\dotnet-tools.json global.json = global.json package.json = package.json - paket.dependencies = paket.dependencies README.md = README.md RELEASE_NOTES.md = RELEASE_NOTES.md EndProjectSection diff --git a/build.cmd b/build.cmd index eb9dc494..3fba449c 100644 --- a/build.cmd +++ b/build.cmd @@ -1,6 +1,5 @@ @echo off dotnet tool restore -dotnet paket restore cls dotnet run --project ./build/build.fsproj %* \ No newline at end of file diff --git a/build.sh b/build.sh index ddabedbc..ed89ade1 100644 --- a/build.sh +++ b/build.sh @@ -3,6 +3,4 @@ set -eu set -o pipefail -dotnet paket restore - dotnet run --project ./build/Build.fsproj "$@" \ No newline at end of file diff --git a/build/Build.fsproj b/build/Build.fsproj index 6db33c3a..0a1b0056 100644 --- a/build/Build.fsproj +++ b/build/Build.fsproj @@ -6,7 +6,6 @@ - @@ -31,5 +30,4 @@ - \ No newline at end of file diff --git a/build/TestTasks.fs b/build/TestTasks.fs index 300dbf2c..538a0732 100644 --- a/build/TestTasks.fs +++ b/build/TestTasks.fs @@ -136,17 +136,9 @@ module RunTests = } let runTestsDotnet = BuildTask.create "runTestsDotnet" [clean; build] { + let dotnetRun = run dotnet "run" testProjects - |> Seq.iter (fun testProject -> - Fake.DotNet.DotNet.test(fun testParams -> - { - testParams with - Logger = Some "console;verbosity=detailed" - Configuration = DotNet.BuildConfiguration.fromString configuration - NoBuild = true - } - ) testProject - ) + |> Seq.iter dotnetRun } let runTests = BuildTask.create "RunTests" [clean; build; RunTests.runTestsJs; RunTests.runTestsJsNative; RunTests.runTestsDotnet] { diff --git a/build/paket.references b/build/paket.references deleted file mode 100644 index 640cf914..00000000 --- a/build/paket.references +++ /dev/null @@ -1 +0,0 @@ -FSharp.Core \ No newline at end of file diff --git a/paket.dependencies b/paket.dependencies deleted file mode 100644 index e921b176..00000000 --- a/paket.dependencies +++ /dev/null @@ -1,16 +0,0 @@ -source https://api.nuget.org/v3/index.json - -storage: none -framework: net6.0, netstandard2.0 - -nuget Fable.Core ~> 4.0.0 -nuget Fable.Fetch 2.6.0 -nuget Fable.SimpleHttp 3.5.0 -nuget FSharp.Core -nuget FsSpreadsheet 5.0.0 - -// Test NuGet packages -nuget Expecto ~> 9.0.4 -nuget Fable.Mocha ~> 2.16.0 -nuget Microsoft.NET.Test.Sdk ~> 17.4.0 -nuget YoloDev.Expecto.TestSdk ~> 0.13.2 \ No newline at end of file diff --git a/paket.lock b/paket.lock deleted file mode 100644 index 6b80ebf7..00000000 --- a/paket.lock +++ /dev/null @@ -1,76 +0,0 @@ -STORAGE: NONE -RESTRICTION: || (== net6.0) (== netstandard2.0) -NUGET - remote: https://api.nuget.org/v3/index.json - Expecto (9.0.4) - FSharp.Core (>= 4.6) - Mono.Cecil (>= 0.11.3) - Fable.Browser.Blob (1.3) - Fable.Core (>= 3.0) - FSharp.Core (>= 4.7.2) - Fable.Browser.Dom (2.14) - Fable.Browser.Blob (>= 1.3) - Fable.Browser.Event (>= 1.5) - Fable.Browser.WebStorage (>= 1.2) - Fable.Core (>= 3.2.8) - FSharp.Core (>= 4.7.2) - Fable.Browser.Event (1.5) - Fable.Browser.Gamepad (>= 1.1) - Fable.Core (>= 3.0) - FSharp.Core (>= 4.7.2) - Fable.Browser.Gamepad (1.2) - Fable.Core (>= 3.0) - FSharp.Core (>= 4.7.2) - Fable.Browser.WebStorage (1.2) - Fable.Browser.Event (>= 1.5) - Fable.Core (>= 3.0) - FSharp.Core (>= 4.7.2) - Fable.Browser.XMLHttpRequest (1.3) - Fable.Browser.Blob (>= 1.3) - Fable.Browser.Event (>= 1.5) - Fable.Core (>= 3.0) - FSharp.Core (>= 4.7.2) - Fable.Core (4.0) - Fable.Fetch (2.6) - Fable.Browser.Blob (>= 1.2) - Fable.Browser.Event (>= 1.5) - Fable.Core (>= 3.7.1) - Fable.Promise (>= 2.2.2) - FSharp.Core (>= 4.7.2) - Fable.Mocha (2.16) - Fable.Core (>= 3.0) - FSharp.Core (>= 4.7) - Fable.Promise (3.2) - Fable.Core (>= 3.7.1) - FSharp.Core (>= 4.7.2) - Fable.SimpleHttp (3.5) - Fable.Browser.Dom (>= 1.0) - Fable.Browser.XMLHttpRequest (>= 1.1) - Fable.Core (>= 3.0) - FSharp.Core (>= 4.6.2) - FSharp.Core (7.0.401) - FsSpreadsheet (5.0) - Fable.Core (>= 4.0) - FSharp.Core (>= 6.0.6) - Microsoft.CodeCoverage (17.7.2) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= net462)) (&& (== netstandard2.0) (>= netcoreapp3.1)) - Microsoft.NET.Test.Sdk (17.4.1) - Microsoft.CodeCoverage (>= 17.4.1) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= net462)) (&& (== netstandard2.0) (>= netcoreapp3.1)) - Microsoft.TestPlatform.TestHost (>= 17.4.1) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= netcoreapp3.1)) - Microsoft.TestPlatform.ObjectModel (17.7.2) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= netcoreapp3.1)) - NuGet.Frameworks (>= 6.5) - System.Reflection.Metadata (>= 1.6) - Microsoft.TestPlatform.TestHost (17.7.2) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= netcoreapp3.1)) - Microsoft.TestPlatform.ObjectModel (>= 17.7.2) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= netcoreapp3.1)) - Newtonsoft.Json (>= 13.0.1) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= netcoreapp3.1)) - Mono.Cecil (0.11.5) - Newtonsoft.Json (13.0.3) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= netcoreapp3.1)) - NuGet.Frameworks (6.7) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= netcoreapp3.1)) - System.Collections.Immutable (7.0) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= netcoreapp3.1)) - System.Runtime.CompilerServices.Unsafe (>= 6.0) - System.Reflection.Metadata (7.0.2) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= netcoreapp3.1)) - System.Collections.Immutable (>= 7.0) - System.Runtime.CompilerServices.Unsafe (6.0) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= net6.0)) (&& (== netstandard2.0) (>= netcoreapp3.1)) - YoloDev.Expecto.TestSdk (0.13.3) - Expecto (>= 9.0 < 10.0) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= netcoreapp3.1)) - FSharp.Core (>= 4.6.2) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= netcoreapp3.1)) - System.Collections.Immutable (>= 6.0) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= netcoreapp3.1)) diff --git a/src/ARCtrl/ARCtrl.fsproj b/src/ARCtrl/ARCtrl.fsproj index 1e0af39c..291ecbaa 100644 --- a/src/ARCtrl/ARCtrl.fsproj +++ b/src/ARCtrl/ARCtrl.fsproj @@ -18,7 +18,6 @@ - @@ -36,6 +35,10 @@ + + + + @@ -49,5 +52,4 @@ - \ No newline at end of file diff --git a/src/ARCtrl/paket.references b/src/ARCtrl/paket.references deleted file mode 100644 index c4fb6398..00000000 --- a/src/ARCtrl/paket.references +++ /dev/null @@ -1,4 +0,0 @@ -FSharp.Core -Fable.Core -Fable.Fetch -Fable.SimpleHttp \ No newline at end of file diff --git a/src/CWL/ARCtrl.CWL.fsproj b/src/CWL/ARCtrl.CWL.fsproj index aa13ecc7..86e2d5a9 100644 --- a/src/CWL/ARCtrl.CWL.fsproj +++ b/src/CWL/ARCtrl.CWL.fsproj @@ -5,7 +5,6 @@ true - @@ -23,5 +22,4 @@ https://github.com/nfdi4plants/ARCtrl git - \ No newline at end of file diff --git a/src/CWL/paket.references b/src/CWL/paket.references deleted file mode 100644 index 2387b156..00000000 --- a/src/CWL/paket.references +++ /dev/null @@ -1,2 +0,0 @@ -FSharp.Core -Fable.Core \ No newline at end of file diff --git a/src/Contract/ARCtrl.Contract.fsproj b/src/Contract/ARCtrl.Contract.fsproj index ce8cee60..7a958c62 100644 --- a/src/Contract/ARCtrl.Contract.fsproj +++ b/src/Contract/ARCtrl.Contract.fsproj @@ -5,7 +5,6 @@ true - @@ -13,6 +12,9 @@ + + + nfdi4plants, Kevin Frey, Lukas Weil, Kevin Schneider, Oliver Maus ARC helper functions for contracts management. @@ -23,5 +25,4 @@ https://github.com/nfdi4plants/ARCtrl git - \ No newline at end of file diff --git a/src/Contract/paket.references b/src/Contract/paket.references deleted file mode 100644 index 2387b156..00000000 --- a/src/Contract/paket.references +++ /dev/null @@ -1,2 +0,0 @@ -FSharp.Core -Fable.Core \ No newline at end of file diff --git a/src/FileSystem/ARCtrl.FileSystem.fsproj b/src/FileSystem/ARCtrl.FileSystem.fsproj index 906ddde6..46b3ad65 100644 --- a/src/FileSystem/ARCtrl.FileSystem.fsproj +++ b/src/FileSystem/ARCtrl.FileSystem.fsproj @@ -5,17 +5,21 @@ true - - + + + + + + nfdi4plants, Kevin Frey, Lukas Weil ARC helper functions for filesystem management. @@ -26,5 +30,4 @@ https://github.com/nfdi4plants/ARCtrl git - \ No newline at end of file diff --git a/src/FileSystem/paket.references b/src/FileSystem/paket.references deleted file mode 100644 index 2387b156..00000000 --- a/src/FileSystem/paket.references +++ /dev/null @@ -1,2 +0,0 @@ -FSharp.Core -Fable.Core \ No newline at end of file diff --git a/src/ISA/ISA.Json/ARCtrl.ISA.Json.fsproj b/src/ISA/ISA.Json/ARCtrl.ISA.Json.fsproj index 019010c4..25976272 100644 --- a/src/ISA/ISA.Json/ARCtrl.ISA.Json.fsproj +++ b/src/ISA/ISA.Json/ARCtrl.ISA.Json.fsproj @@ -5,7 +5,6 @@ true - Always @@ -46,11 +45,6 @@ - - - - - nfdi4plants, Lukas Weil, Florian Wetzels, Kevin Frey ARC and ISA json compliant parser for experimental metadata toolkit in F#. This project is meant as an easy means to open, manipulate and save ISA (Investigation,Study,Assay) metadata files in isa-json format. @@ -61,5 +55,4 @@ https://github.com/nfdi4plants/ARCtrl git - \ No newline at end of file diff --git a/src/ISA/ISA.Json/paket.references b/src/ISA/ISA.Json/paket.references deleted file mode 100644 index 2387b156..00000000 --- a/src/ISA/ISA.Json/paket.references +++ /dev/null @@ -1,2 +0,0 @@ -FSharp.Core -Fable.Core \ No newline at end of file diff --git a/src/ISA/ISA.Spreadsheet/ARCtrl.ISA.Spreadsheet.fsproj b/src/ISA/ISA.Spreadsheet/ARCtrl.ISA.Spreadsheet.fsproj index 264e0078..f4031f62 100644 --- a/src/ISA/ISA.Spreadsheet/ARCtrl.ISA.Spreadsheet.fsproj +++ b/src/ISA/ISA.Spreadsheet/ARCtrl.ISA.Spreadsheet.fsproj @@ -8,7 +8,6 @@ - @@ -32,6 +31,9 @@ + + + @@ -46,5 +48,4 @@ https://github.com/nfdi4plants/ARCtrl git - \ No newline at end of file diff --git a/src/ISA/ISA.Spreadsheet/paket.references b/src/ISA/ISA.Spreadsheet/paket.references deleted file mode 100644 index d95dfd31..00000000 --- a/src/ISA/ISA.Spreadsheet/paket.references +++ /dev/null @@ -1,3 +0,0 @@ -FSharp.Core -Fable.Core -FsSpreadsheet \ No newline at end of file diff --git a/src/ISA/ISA/ARCtrl.ISA.fsproj b/src/ISA/ISA/ARCtrl.ISA.fsproj index 9f7e9033..f21d026d 100644 --- a/src/ISA/ISA/ARCtrl.ISA.fsproj +++ b/src/ISA/ISA/ARCtrl.ISA.fsproj @@ -5,7 +5,6 @@ true - @@ -77,5 +76,4 @@ https://github.com/nfdi4plants/ARCtrl git - \ No newline at end of file diff --git a/src/ISA/ISA/paket.references b/src/ISA/ISA/paket.references deleted file mode 100644 index 2387b156..00000000 --- a/src/ISA/ISA/paket.references +++ /dev/null @@ -1,2 +0,0 @@ -FSharp.Core -Fable.Core \ No newline at end of file diff --git a/tests/ARCtrl/ARCtrl.Tests.fsproj b/tests/ARCtrl/ARCtrl.Tests.fsproj index 76e8beb8..d3737d30 100644 --- a/tests/ARCtrl/ARCtrl.Tests.fsproj +++ b/tests/ARCtrl/ARCtrl.Tests.fsproj @@ -6,7 +6,6 @@ false - @@ -18,5 +17,7 @@ - + + + \ No newline at end of file diff --git a/tests/ARCtrl/Main.fs b/tests/ARCtrl/Main.fs index a2abe52e..67d2d2be 100644 --- a/tests/ARCtrl/Main.fs +++ b/tests/ARCtrl/Main.fs @@ -7,7 +7,7 @@ open Expecto [] #endif -let all = testSequenced <| testList "All" [ +let all = testSequenced <| testList "ARCtrl" [ ARCtrl.Contracts.Tests.main ARCtrl.WebRequest.Tests.main ARCtrl.SemVer.Tests.main diff --git a/tests/ARCtrl/paket.references b/tests/ARCtrl/paket.references deleted file mode 100644 index 47cc4278..00000000 --- a/tests/ARCtrl/paket.references +++ /dev/null @@ -1,3 +0,0 @@ -FSharp.Core -Microsoft.NET.Test.Sdk -YoloDev.Expecto.TestSdk \ No newline at end of file diff --git a/tests/FileSystem/FileSystem.Tests.fsproj b/tests/FileSystem/FileSystem.Tests.fsproj index 45c814d1..5637568e 100644 --- a/tests/FileSystem/FileSystem.Tests.fsproj +++ b/tests/FileSystem/FileSystem.Tests.fsproj @@ -6,7 +6,6 @@ false - @@ -14,5 +13,7 @@ - + + + \ No newline at end of file diff --git a/tests/FileSystem/Main.fs b/tests/FileSystem/Main.fs index c2e06182..fd17cf93 100644 --- a/tests/FileSystem/Main.fs +++ b/tests/FileSystem/Main.fs @@ -7,7 +7,7 @@ open Expecto [] #endif -let all = testSequenced <| testList "All" [ +let all = testSequenced <| testList "FileSystem" [ ARCtrl.FileSystemTree.Tests.main ] diff --git a/tests/FileSystem/paket.references b/tests/FileSystem/paket.references deleted file mode 100644 index 47cc4278..00000000 --- a/tests/FileSystem/paket.references +++ /dev/null @@ -1,3 +0,0 @@ -FSharp.Core -Microsoft.NET.Test.Sdk -YoloDev.Expecto.TestSdk \ No newline at end of file diff --git a/tests/ISA/ISA.Json.Tests/ISA.Json.Tests.fsproj b/tests/ISA/ISA.Json.Tests/ISA.Json.Tests.fsproj index 96b0fbc6..e2cf110e 100644 --- a/tests/ISA/ISA.Json.Tests/ISA.Json.Tests.fsproj +++ b/tests/ISA/ISA.Json.Tests/ISA.Json.Tests.fsproj @@ -6,7 +6,6 @@ false - @@ -15,5 +14,7 @@ - + + + \ No newline at end of file diff --git a/tests/ISA/ISA.Json.Tests/Main.fs b/tests/ISA/ISA.Json.Tests/Main.fs index cf3b6b7e..79dcab5f 100644 --- a/tests/ISA/ISA.Json.Tests/Main.fs +++ b/tests/ISA/ISA.Json.Tests/Main.fs @@ -7,7 +7,7 @@ open Expecto [] #endif -let all = testSequenced <| testList "All" [ +let all = testSequenced <| testList "ISA.JSON" [ Json.Tests.main JsonSchema.Tests.main ] diff --git a/tests/ISA/ISA.Json.Tests/paket.references b/tests/ISA/ISA.Json.Tests/paket.references deleted file mode 100644 index 47cc4278..00000000 --- a/tests/ISA/ISA.Json.Tests/paket.references +++ /dev/null @@ -1,3 +0,0 @@ -FSharp.Core -Microsoft.NET.Test.Sdk -YoloDev.Expecto.TestSdk \ No newline at end of file diff --git a/tests/ISA/ISA.Spreadsheet.Tests/ISA.Spreadsheet.Tests.fsproj b/tests/ISA/ISA.Spreadsheet.Tests/ISA.Spreadsheet.Tests.fsproj index ec5630fd..b8746728 100644 --- a/tests/ISA/ISA.Spreadsheet.Tests/ISA.Spreadsheet.Tests.fsproj +++ b/tests/ISA/ISA.Spreadsheet.Tests/ISA.Spreadsheet.Tests.fsproj @@ -6,7 +6,6 @@ false - @@ -24,5 +23,7 @@ - + + + \ No newline at end of file diff --git a/tests/ISA/ISA.Spreadsheet.Tests/Main.fs b/tests/ISA/ISA.Spreadsheet.Tests/Main.fs index 23a21087..b34c986e 100644 --- a/tests/ISA/ISA.Spreadsheet.Tests/Main.fs +++ b/tests/ISA/ISA.Spreadsheet.Tests/Main.fs @@ -7,7 +7,7 @@ open Expecto [] #endif -let all = testSequenced <| testList "All" [ +let all = testSequenced <| testList "ISA.Spreadsheet" [ FableTests.main ArcInvestigationTests.main CompositeColumnTests.main diff --git a/tests/ISA/ISA.Spreadsheet.Tests/paket.references b/tests/ISA/ISA.Spreadsheet.Tests/paket.references deleted file mode 100644 index 47cc4278..00000000 --- a/tests/ISA/ISA.Spreadsheet.Tests/paket.references +++ /dev/null @@ -1,3 +0,0 @@ -FSharp.Core -Microsoft.NET.Test.Sdk -YoloDev.Expecto.TestSdk \ No newline at end of file diff --git a/tests/ISA/ISA.Tests/ISA.Tests.fsproj b/tests/ISA/ISA.Tests/ISA.Tests.fsproj index fce7c7cc..2ea554ab 100644 --- a/tests/ISA/ISA.Tests/ISA.Tests.fsproj +++ b/tests/ISA/ISA.Tests/ISA.Tests.fsproj @@ -6,7 +6,6 @@ false - @@ -29,5 +28,7 @@ - + + + \ No newline at end of file diff --git a/tests/ISA/ISA.Tests/Main.fs b/tests/ISA/ISA.Tests/Main.fs index 9b7cefa9..08daf574 100644 --- a/tests/ISA/ISA.Tests/Main.fs +++ b/tests/ISA/ISA.Tests/Main.fs @@ -7,7 +7,7 @@ open Expecto [] #endif -let all = testSequenced <| testList "All" [ +let all = testSequenced <| testList "ISA" [ Update.Tests.main DataModel.Tests.main Regex.Tests.main diff --git a/tests/ISA/ISA.Tests/paket.references b/tests/ISA/ISA.Tests/paket.references deleted file mode 100644 index 47cc4278..00000000 --- a/tests/ISA/ISA.Tests/paket.references +++ /dev/null @@ -1,3 +0,0 @@ -FSharp.Core -Microsoft.NET.Test.Sdk -YoloDev.Expecto.TestSdk \ No newline at end of file diff --git a/tests/TestingUtils/TestObjects.Spreadsheet/Spreadsheet.ArcTable.fs b/tests/TestingUtils/TestObjects.Spreadsheet/Spreadsheet.ArcTable.fs index 917aed39..048937da 100644 --- a/tests/TestingUtils/TestObjects.Spreadsheet/Spreadsheet.ArcTable.fs +++ b/tests/TestingUtils/TestObjects.Spreadsheet/Spreadsheet.ArcTable.fs @@ -287,7 +287,7 @@ module Protocol = let addSpacesToEnd (cc : FsCellsCollection) (t : FsTable) = let count = System.Collections.Generic.Dictionary() - t.HeadersRow().Cells(cc) |> Seq.iter (fun c -> + t.GetHeaderRow(cc) |> Seq.iter (fun c -> let k = c.ValueAsString() match Dictionary.tryGet k count with | Some v -> diff --git a/tests/TestingUtils/TestingUtils.fsproj b/tests/TestingUtils/TestingUtils.fsproj index 4b399e34..38efe2f2 100644 --- a/tests/TestingUtils/TestingUtils.fsproj +++ b/tests/TestingUtils/TestingUtils.fsproj @@ -21,12 +21,17 @@ - + + + + + - - + + + \ No newline at end of file diff --git a/tests/TestingUtils/paket.references b/tests/TestingUtils/paket.references deleted file mode 100644 index 5c28c4e4..00000000 --- a/tests/TestingUtils/paket.references +++ /dev/null @@ -1,4 +0,0 @@ -FSharp.Core -Fable.Core -Expecto -Fable.Mocha \ No newline at end of file