From efc7fc4c8bad4db1f5ef4107eab325bcd43fb687 Mon Sep 17 00:00:00 2001 From: Dominik Skoda Date: Tue, 15 Feb 2022 17:57:44 +0100 Subject: [PATCH 1/8] Increasing target framework versions. --- .config/dotnet-tools.json | 2 +- Directory.Build.props | 13 +++++++------ .../CustomContainer/CustomContainer.fsproj | 2 +- .../DependencyInjection.fsproj | 2 +- .../FunctionalInjection.fsproj | 2 +- .../TaggedExamples/TaggedExamples.fsproj | 2 +- .../CommandLine/CSharp/CSharp.csproj | 2 +- .../CommandLine/FSharp/FSharp.fsproj | 2 +- .../CommandLine/TicTacToe/TicTacToe.fsproj | 2 +- .../FSharp.Expecto/Expecto.FSharp.fsproj | 2 +- .../MSTest/MSTest.FSharp/MSTest.FSharp.fsproj | 2 +- .../NUnit/CSharp.NUnit/NUnit.CSharp.csproj | 2 +- .../NUnit/FSharp.NUnit/NUnit.FSharp.fsproj | 2 +- .../xUnit/FSharp.xUnit/Xunit.FSharp.fsproj | 2 +- Examples/ByStyle/Attributes/Attributes.fsproj | 2 +- Examples/ByStyle/Functional/Functional.fsproj | 2 +- .../ByStyle/Interactive/Interactive.fsproj | 2 +- TickSpec.Tests/TickSpec.Tests.fsproj | 2 +- TickSpec.sln | 18 +++++++++++------- TickSpec/TickSpec.fsproj | 5 ++++- Wiring/TickSpec.Xunit/TickSpec.Xunit.fsproj | 2 +- build.fsx | 2 +- netfx.props | 1 + 23 files changed, 42 insertions(+), 33 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 9f4342d7..37fc5848 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "fake-cli": { - "version": "5.20.4", + "version": "5.22.0", "commands": [ "fake" ] diff --git a/Directory.Build.props b/Directory.Build.props index 8705d910..2f11403c 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -6,9 +6,8 @@ true - - - + + Phillip Trelford, Ruben Bartelink, Milos Chaloupka @@ -28,9 +27,11 @@ true snupkg - - - + + net472 + netstandard2.0 + net6.0 + diff --git a/Examples/ByFeature/CustomContainer/CustomContainer.fsproj b/Examples/ByFeature/CustomContainer/CustomContainer.fsproj index fcfe6d28..53fa83c6 100644 --- a/Examples/ByFeature/CustomContainer/CustomContainer.fsproj +++ b/Examples/ByFeature/CustomContainer/CustomContainer.fsproj @@ -2,7 +2,7 @@ - net5.0;net452 + $(DotNetCoreVersion);$(DotNetFrameworkVersion) diff --git a/Examples/ByFeature/DependencyInjection/DependencyInjection.fsproj b/Examples/ByFeature/DependencyInjection/DependencyInjection.fsproj index 114898a1..b3c1b460 100644 --- a/Examples/ByFeature/DependencyInjection/DependencyInjection.fsproj +++ b/Examples/ByFeature/DependencyInjection/DependencyInjection.fsproj @@ -2,7 +2,7 @@ - net5.0;net452 + $(DotNetCoreVersion);$(DotNetFrameworkVersion) diff --git a/Examples/ByFeature/FunctionalInjection/FunctionalInjection.fsproj b/Examples/ByFeature/FunctionalInjection/FunctionalInjection.fsproj index 9033b6cc..3bde7c21 100644 --- a/Examples/ByFeature/FunctionalInjection/FunctionalInjection.fsproj +++ b/Examples/ByFeature/FunctionalInjection/FunctionalInjection.fsproj @@ -2,7 +2,7 @@ - net5.0;net452 + $(DotNetCoreVersion);$(DotNetFrameworkVersion) diff --git a/Examples/ByFeature/TaggedExamples/TaggedExamples.fsproj b/Examples/ByFeature/TaggedExamples/TaggedExamples.fsproj index f3ce758a..74038ab2 100644 --- a/Examples/ByFeature/TaggedExamples/TaggedExamples.fsproj +++ b/Examples/ByFeature/TaggedExamples/TaggedExamples.fsproj @@ -2,7 +2,7 @@ - net5.0;net452 + $(DotNetCoreVersion);$(DotNetFrameworkVersion) diff --git a/Examples/ByFramework/CommandLine/CSharp/CSharp.csproj b/Examples/ByFramework/CommandLine/CSharp/CSharp.csproj index 426caddf..f08b51e7 100644 --- a/Examples/ByFramework/CommandLine/CSharp/CSharp.csproj +++ b/Examples/ByFramework/CommandLine/CSharp/CSharp.csproj @@ -3,7 +3,7 @@ Exe - net5.0;net452 + $(DotNetCoreVersion);$(DotNetFrameworkVersion) diff --git a/Examples/ByFramework/CommandLine/FSharp/FSharp.fsproj b/Examples/ByFramework/CommandLine/FSharp/FSharp.fsproj index 7379a72b..6b2cdf39 100644 --- a/Examples/ByFramework/CommandLine/FSharp/FSharp.fsproj +++ b/Examples/ByFramework/CommandLine/FSharp/FSharp.fsproj @@ -3,7 +3,7 @@ Exe - net5.0;net452 + $(DotNetCoreVersion);$(DotNetFrameworkVersion) diff --git a/Examples/ByFramework/CommandLine/TicTacToe/TicTacToe.fsproj b/Examples/ByFramework/CommandLine/TicTacToe/TicTacToe.fsproj index 81e047ec..d257e4b6 100644 --- a/Examples/ByFramework/CommandLine/TicTacToe/TicTacToe.fsproj +++ b/Examples/ByFramework/CommandLine/TicTacToe/TicTacToe.fsproj @@ -3,7 +3,7 @@ Exe - net5.0;net452 + $(DotNetCoreVersion);$(DotNetFrameworkVersion) diff --git a/Examples/ByFramework/Expecto/FSharp.Expecto/Expecto.FSharp.fsproj b/Examples/ByFramework/Expecto/FSharp.Expecto/Expecto.FSharp.fsproj index 92c586dc..7db5c0a2 100644 --- a/Examples/ByFramework/Expecto/FSharp.Expecto/Expecto.FSharp.fsproj +++ b/Examples/ByFramework/Expecto/FSharp.Expecto/Expecto.FSharp.fsproj @@ -2,7 +2,7 @@ - net5.0 + $(DotNetCoreVersion) Exe False diff --git a/Examples/ByFramework/MSTest/MSTest.FSharp/MSTest.FSharp.fsproj b/Examples/ByFramework/MSTest/MSTest.FSharp/MSTest.FSharp.fsproj index dde9ed27..5eba9488 100644 --- a/Examples/ByFramework/MSTest/MSTest.FSharp/MSTest.FSharp.fsproj +++ b/Examples/ByFramework/MSTest/MSTest.FSharp/MSTest.FSharp.fsproj @@ -2,7 +2,7 @@ - net5.0;net452 + $(DotNetCoreVersion);$(DotNetFrameworkVersion) diff --git a/Examples/ByFramework/NUnit/CSharp.NUnit/NUnit.CSharp.csproj b/Examples/ByFramework/NUnit/CSharp.NUnit/NUnit.CSharp.csproj index 6eb2208e..e4cce793 100644 --- a/Examples/ByFramework/NUnit/CSharp.NUnit/NUnit.CSharp.csproj +++ b/Examples/ByFramework/NUnit/CSharp.NUnit/NUnit.CSharp.csproj @@ -2,7 +2,7 @@ - net5.0;net452 + $(DotNetCoreVersion);$(DotNetFrameworkVersion) diff --git a/Examples/ByFramework/NUnit/FSharp.NUnit/NUnit.FSharp.fsproj b/Examples/ByFramework/NUnit/FSharp.NUnit/NUnit.FSharp.fsproj index 46006677..8a9020c6 100644 --- a/Examples/ByFramework/NUnit/FSharp.NUnit/NUnit.FSharp.fsproj +++ b/Examples/ByFramework/NUnit/FSharp.NUnit/NUnit.FSharp.fsproj @@ -2,7 +2,7 @@ - net5.0;net452 + $(DotNetCoreVersion);$(DotNetFrameworkVersion) diff --git a/Examples/ByFramework/xUnit/FSharp.xUnit/Xunit.FSharp.fsproj b/Examples/ByFramework/xUnit/FSharp.xUnit/Xunit.FSharp.fsproj index 02eb3ca1..2cf8784d 100644 --- a/Examples/ByFramework/xUnit/FSharp.xUnit/Xunit.FSharp.fsproj +++ b/Examples/ByFramework/xUnit/FSharp.xUnit/Xunit.FSharp.fsproj @@ -2,7 +2,7 @@ - net5.0;net452 + $(DotNetCoreVersion);$(DotNetFrameworkVersion) diff --git a/Examples/ByStyle/Attributes/Attributes.fsproj b/Examples/ByStyle/Attributes/Attributes.fsproj index d2775350..d0b3f3d8 100644 --- a/Examples/ByStyle/Attributes/Attributes.fsproj +++ b/Examples/ByStyle/Attributes/Attributes.fsproj @@ -2,7 +2,7 @@ - net5.0;net452 + $(DotNetCoreVersion);$(DotNetFrameworkVersion) diff --git a/Examples/ByStyle/Functional/Functional.fsproj b/Examples/ByStyle/Functional/Functional.fsproj index 9017c49a..91745e5d 100644 --- a/Examples/ByStyle/Functional/Functional.fsproj +++ b/Examples/ByStyle/Functional/Functional.fsproj @@ -2,7 +2,7 @@ - net5.0;net452 + $(DotNetCoreVersion);$(DotNetFrameworkVersion) diff --git a/Examples/ByStyle/Interactive/Interactive.fsproj b/Examples/ByStyle/Interactive/Interactive.fsproj index 8bbc1ee9..5e95c1e8 100644 --- a/Examples/ByStyle/Interactive/Interactive.fsproj +++ b/Examples/ByStyle/Interactive/Interactive.fsproj @@ -2,7 +2,7 @@ - net5.0;net452 + $(DotNetCoreVersion);$(DotNetFrameworkVersion) diff --git a/TickSpec.Tests/TickSpec.Tests.fsproj b/TickSpec.Tests/TickSpec.Tests.fsproj index 9245f1cc..93f8bddd 100644 --- a/TickSpec.Tests/TickSpec.Tests.fsproj +++ b/TickSpec.Tests/TickSpec.Tests.fsproj @@ -2,7 +2,7 @@ - net5.0;net452 + $(DotNetCoreVersion);$(DotNetFrameworkVersion) diff --git a/TickSpec.sln b/TickSpec.sln index da8ad5f8..679186a3 100644 --- a/TickSpec.sln +++ b/TickSpec.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.27130.2027 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.32126.317 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Examples", "Examples", "{CD7A2701-42ED-47BD-8724-1E130B5C5071}" EndProject @@ -33,11 +33,15 @@ Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Functional", "Examples\BySt EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "._", "._", "{51B6BE98-A176-4315-83F5-54800BC03EB4}" ProjectSection(SolutionItems) = preProject - .travis.yml = .travis.yml + .gitattributes = .gitattributes + .gitignore = .gitignore appveyor.yml = appveyor.yml build.bat = build.bat build.fsx = build.fsx - build.sh = build.sh + Directory.Build.props = Directory.Build.props + .config\dotnet-tools.json = .config\dotnet-tools.json + LICENSE.txt = LICENSE.txt + netfx.props = netfx.props README.md = README.md RELEASE_NOTES.md = RELEASE_NOTES.md EndProjectSection @@ -54,7 +58,7 @@ Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "DependencyInjection", "Exam EndProject Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FunctionalInjection", "Examples\ByFeature\FunctionalInjection\FunctionalInjection.fsproj", "{1CE6B475-C94F-438E-97D4-5E99FD0F04D4}" EndProject -Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "TickSpec.Tests", "TickSpec.Tests\TickSpec.Tests.fsproj", "{CD2AA807-5E4F-4A2C-80F7-A7D7CA6B3C2D}" +Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "TickSpec.Tests", "TickSpec.Tests\TickSpec.Tests.fsproj", "{CD2AA807-5E4F-4A2C-80F7-A7D7CA6B3C2D}" EndProject Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "TaggedExamples", "Examples\ByFeature\TaggedExamples\TaggedExamples.fsproj", "{39C63F8E-F3A5-48D8-851C-62BEB9C701C2}" EndProject @@ -64,11 +68,11 @@ Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "MSTest.FSharp", "Examples\B EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Expecto", "Expecto", "{750A854A-FB45-4E51-94DF-D79B4F1E46DC}" EndProject -Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Expecto.FSharp", "Examples\ByFramework\Expecto\FSharp.Expecto\Expecto.FSharp.fsproj", "{F9B139E4-0160-4150-B420-73DCCD57B6B8}" +Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Expecto.FSharp", "Examples\ByFramework\Expecto\FSharp.Expecto\Expecto.FSharp.fsproj", "{F9B139E4-0160-4150-B420-73DCCD57B6B8}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Wiring", "Wiring", "{373B654A-3A88-48CC-A0A3-0454514E61FF}" EndProject -Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "TickSpec.Xunit", "Wiring\TickSpec.Xunit\TickSpec.Xunit.fsproj", "{DDB39875-AA8B-494E-B923-C8143930464F}" +Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "TickSpec.Xunit", "Wiring\TickSpec.Xunit\TickSpec.Xunit.fsproj", "{DDB39875-AA8B-494E-B923-C8143930464F}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/TickSpec/TickSpec.fsproj b/TickSpec/TickSpec.fsproj index f25edc8e..b2b364d1 100644 --- a/TickSpec/TickSpec.fsproj +++ b/TickSpec/TickSpec.fsproj @@ -2,7 +2,7 @@ - netstandard2.0;net452 + $(DotNetStandardVersion);$(DotNetFrameworkVersion) TickSpec TickSpec is a lightweight Behaviour Driven Development (BDD) framework for .Net. @@ -11,6 +11,9 @@ (let ``tick method`` () = true) or attributed C# or F# methods. + + + diff --git a/Wiring/TickSpec.Xunit/TickSpec.Xunit.fsproj b/Wiring/TickSpec.Xunit/TickSpec.Xunit.fsproj index e1218694..45e55e44 100644 --- a/Wiring/TickSpec.Xunit/TickSpec.Xunit.fsproj +++ b/Wiring/TickSpec.Xunit/TickSpec.Xunit.fsproj @@ -2,7 +2,7 @@ - netstandard2.0;net452 + $(DotNetStandardVersion);$(DotNetFrameworkVersion) TickSpec.Xunit TickSpec integration with Xunit. diff --git a/build.fsx b/build.fsx index 930f4161..15d78465 100644 --- a/build.fsx +++ b/build.fsx @@ -101,7 +101,7 @@ Target.create "Build" (fun _ -> Target.create "Test" (fun _ -> // Xunit seems to be failing under Linux with net452 runner, let's just skip it // the .NET 4 tests all together there - let framework = if Environment.isWindows then None else Some "net5.0" + let framework = if Environment.isWindows then None else Some "net6.0" let logger = if AppVeyor.detect () then "Appveyor" |> Some else None Sln diff --git a/netfx.props b/netfx.props index c41b419a..240e2477 100644 --- a/netfx.props +++ b/netfx.props @@ -20,6 +20,7 @@ $(BaseFrameworkPathOverrideForMono)/4.6.2-api $(BaseFrameworkPathOverrideForMono)/4.7-api $(BaseFrameworkPathOverrideForMono)/4.7.1-api + $(BaseFrameworkPathOverrideForMono)/4.7.2-api true From 07f197005a0fe8bcf3eab8aa72ca260199bf279b Mon Sep 17 00:00:00 2001 From: Dominik Skoda Date: Tue, 15 Feb 2022 17:58:43 +0100 Subject: [PATCH 2/8] Adding support for asynchronously disposable resources. --- TickSpec/ServiceProvider.fs | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/TickSpec/ServiceProvider.fs b/TickSpec/ServiceProvider.fs index 90a8ba19..71ae65fa 100644 --- a/TickSpec/ServiceProvider.fs +++ b/TickSpec/ServiceProvider.fs @@ -26,6 +26,11 @@ type InstanceStore () = distinctAddRec key value (head :: revHead) rest distinctAddRec key value [] inList + let disposeAsync (d:IAsyncDisposable) = + d.DisposeAsync() + |> ignore + () + /// Stores element (skips storing existing, old element removed and new prepended) member this.Store key value = instances <- instances |> distinctAdd key value @@ -36,11 +41,13 @@ type InstanceStore () = | Some elem -> Some(snd elem) | None -> None + interface IDisposable with member __.Dispose() = instances |> Seq.map snd |> Seq.iter (function + | :? IAsyncDisposable as d -> disposeAsync(d) | :? IDisposable as d -> d.Dispose() | _ -> ()) instances <- [] From ae36d11d503bc8809ef871db867ea010d3c0f188 Mon Sep 17 00:00:00 2001 From: Dominik Skoda Date: Tue, 15 Feb 2022 20:47:55 +0100 Subject: [PATCH 3/8] Updating nuget packages. --- .../CustomContainer/CustomContainer.fsproj | 13 ++++++++----- .../DependencyInjection/DependencyInjection.fsproj | 6 +++--- .../FunctionalInjection/FunctionalInjection.fsproj | 6 +++--- .../ByFeature/TaggedExamples/TaggedExamples.fsproj | 6 +++--- .../Expecto/FSharp.Expecto/Expecto.FSharp.fsproj | 6 +++--- .../MSTest/MSTest.FSharp/MSTest.FSharp.fsproj | 6 +++--- .../NUnit/CSharp.NUnit/NUnit.CSharp.csproj | 6 +++--- .../NUnit/FSharp.NUnit/NUnit.FSharp.fsproj | 6 +++--- .../xUnit/FSharp.xUnit/Xunit.FSharp.fsproj | 9 ++++++--- Examples/ByStyle/Attributes/Attributes.fsproj | 6 +++--- Examples/ByStyle/Functional/Functional.fsproj | 6 +++--- TickSpec.Tests/TickSpec.Tests.fsproj | 6 +++--- Wiring/TickSpec.Xunit/TickSpec.Xunit.fsproj | 2 +- 13 files changed, 45 insertions(+), 39 deletions(-) diff --git a/Examples/ByFeature/CustomContainer/CustomContainer.fsproj b/Examples/ByFeature/CustomContainer/CustomContainer.fsproj index 53fa83c6..c11ec88b 100644 --- a/Examples/ByFeature/CustomContainer/CustomContainer.fsproj +++ b/Examples/ByFeature/CustomContainer/CustomContainer.fsproj @@ -14,11 +14,14 @@ - - - - - + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + diff --git a/Examples/ByFeature/DependencyInjection/DependencyInjection.fsproj b/Examples/ByFeature/DependencyInjection/DependencyInjection.fsproj index b3c1b460..b8b2cfe1 100644 --- a/Examples/ByFeature/DependencyInjection/DependencyInjection.fsproj +++ b/Examples/ByFeature/DependencyInjection/DependencyInjection.fsproj @@ -14,8 +14,8 @@ - - - + + + \ No newline at end of file diff --git a/Examples/ByFeature/FunctionalInjection/FunctionalInjection.fsproj b/Examples/ByFeature/FunctionalInjection/FunctionalInjection.fsproj index 3bde7c21..79bb56f6 100644 --- a/Examples/ByFeature/FunctionalInjection/FunctionalInjection.fsproj +++ b/Examples/ByFeature/FunctionalInjection/FunctionalInjection.fsproj @@ -24,8 +24,8 @@ - - - + + + \ No newline at end of file diff --git a/Examples/ByFeature/TaggedExamples/TaggedExamples.fsproj b/Examples/ByFeature/TaggedExamples/TaggedExamples.fsproj index 74038ab2..b55ab61d 100644 --- a/Examples/ByFeature/TaggedExamples/TaggedExamples.fsproj +++ b/Examples/ByFeature/TaggedExamples/TaggedExamples.fsproj @@ -14,8 +14,8 @@ - - - + + + \ No newline at end of file diff --git a/Examples/ByFramework/Expecto/FSharp.Expecto/Expecto.FSharp.fsproj b/Examples/ByFramework/Expecto/FSharp.Expecto/Expecto.FSharp.fsproj index 7db5c0a2..75652ed3 100644 --- a/Examples/ByFramework/Expecto/FSharp.Expecto/Expecto.FSharp.fsproj +++ b/Examples/ByFramework/Expecto/FSharp.Expecto/Expecto.FSharp.fsproj @@ -22,8 +22,8 @@ - - - + + + diff --git a/Examples/ByFramework/MSTest/MSTest.FSharp/MSTest.FSharp.fsproj b/Examples/ByFramework/MSTest/MSTest.FSharp/MSTest.FSharp.fsproj index 5eba9488..fda6ae4e 100644 --- a/Examples/ByFramework/MSTest/MSTest.FSharp/MSTest.FSharp.fsproj +++ b/Examples/ByFramework/MSTest/MSTest.FSharp/MSTest.FSharp.fsproj @@ -12,9 +12,9 @@ - - - + + + diff --git a/Examples/ByFramework/NUnit/CSharp.NUnit/NUnit.CSharp.csproj b/Examples/ByFramework/NUnit/CSharp.NUnit/NUnit.CSharp.csproj index e4cce793..6c42e197 100644 --- a/Examples/ByFramework/NUnit/CSharp.NUnit/NUnit.CSharp.csproj +++ b/Examples/ByFramework/NUnit/CSharp.NUnit/NUnit.CSharp.csproj @@ -12,8 +12,8 @@ - - - + + + \ No newline at end of file diff --git a/Examples/ByFramework/NUnit/FSharp.NUnit/NUnit.FSharp.fsproj b/Examples/ByFramework/NUnit/FSharp.NUnit/NUnit.FSharp.fsproj index 8a9020c6..b6a604dd 100644 --- a/Examples/ByFramework/NUnit/FSharp.NUnit/NUnit.FSharp.fsproj +++ b/Examples/ByFramework/NUnit/FSharp.NUnit/NUnit.FSharp.fsproj @@ -14,8 +14,8 @@ - - - + + + \ No newline at end of file diff --git a/Examples/ByFramework/xUnit/FSharp.xUnit/Xunit.FSharp.fsproj b/Examples/ByFramework/xUnit/FSharp.xUnit/Xunit.FSharp.fsproj index 2cf8784d..0231504d 100644 --- a/Examples/ByFramework/xUnit/FSharp.xUnit/Xunit.FSharp.fsproj +++ b/Examples/ByFramework/xUnit/FSharp.xUnit/Xunit.FSharp.fsproj @@ -16,9 +16,12 @@ - - - + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + diff --git a/Examples/ByStyle/Attributes/Attributes.fsproj b/Examples/ByStyle/Attributes/Attributes.fsproj index d0b3f3d8..8f6a8789 100644 --- a/Examples/ByStyle/Attributes/Attributes.fsproj +++ b/Examples/ByStyle/Attributes/Attributes.fsproj @@ -38,8 +38,8 @@ - - - + + + \ No newline at end of file diff --git a/Examples/ByStyle/Functional/Functional.fsproj b/Examples/ByStyle/Functional/Functional.fsproj index 91745e5d..0ed10990 100644 --- a/Examples/ByStyle/Functional/Functional.fsproj +++ b/Examples/ByStyle/Functional/Functional.fsproj @@ -18,8 +18,8 @@ - - - + + + \ No newline at end of file diff --git a/TickSpec.Tests/TickSpec.Tests.fsproj b/TickSpec.Tests/TickSpec.Tests.fsproj index 93f8bddd..486299ef 100644 --- a/TickSpec.Tests/TickSpec.Tests.fsproj +++ b/TickSpec.Tests/TickSpec.Tests.fsproj @@ -12,9 +12,9 @@ - - - + + + \ No newline at end of file diff --git a/Wiring/TickSpec.Xunit/TickSpec.Xunit.fsproj b/Wiring/TickSpec.Xunit/TickSpec.Xunit.fsproj index 45e55e44..0e57da5d 100644 --- a/Wiring/TickSpec.Xunit/TickSpec.Xunit.fsproj +++ b/Wiring/TickSpec.Xunit/TickSpec.Xunit.fsproj @@ -18,6 +18,6 @@ - + From aea897f99bd75d4f4c34c1570a64702e49ff2e08 Mon Sep 17 00:00:00 2001 From: Dominik Skoda Date: Tue, 15 Feb 2022 20:50:57 +0100 Subject: [PATCH 4/8] Updated README. --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 4baade7e..7af008a8 100644 --- a/README.md +++ b/README.md @@ -17,8 +17,8 @@ Example video: http://www.youtube.com/watch?v=UuTL3nj9fIE Simply reference TickSpec via [NuGet or Paket](https://www.nuget.org/packages/TickSpec/), download the assembly or build the project from source. -- The binary should work cleanly on any .NET Standard 2.0, .NET 4.5 or later environment. -- The TickSpec solution file works with Visual Studio 2017. +- The binary should work cleanly on any .NET Standard 2.0, .NET 4.7.2 or later environment. +- The TickSpec solution file works with Visual Studio 2017 and newer (tested with VS 2022). - Historically, Silverlight was supported; this support and the related examples were removed in 2017 (but remain in the commit history for the archeologically inclined) - Useful samples are available in the Examples folder https://github.com/fsprojects/TickSpec/tree/master/Examples/ and depending your choice, this one is a good start : https://github.com/fsprojects/TickSpec/tree/master/Examples/ByFramework From 73318a1ac9206d09085851fbc737ff5822c1a16b Mon Sep 17 00:00:00 2001 From: Dominik Skoda Date: Tue, 15 Feb 2022 20:54:23 +0100 Subject: [PATCH 5/8] Replacing TickSpec project description by Package readme file reference. --- TickSpec/TickSpec.fsproj | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/TickSpec/TickSpec.fsproj b/TickSpec/TickSpec.fsproj index b2b364d1..cf2fa6e8 100644 --- a/TickSpec/TickSpec.fsproj +++ b/TickSpec/TickSpec.fsproj @@ -4,15 +4,10 @@ $(DotNetStandardVersion);$(DotNetFrameworkVersion) TickSpec - - TickSpec is a lightweight Behaviour Driven Development (BDD) framework for .Net. - Describe behaviour in plain text using the Gherkin business language, i.e. Given, - When, Then. Easily execute the behaviour against matching F# 'ticked' methods - (let ``tick method`` () = true) or attributed C# or F# methods. - + README.md - + @@ -32,4 +27,10 @@ + + + True + \ + + From 0f44f31938e1d653eef8f71f0769481fe0c2ab35 Mon Sep 17 00:00:00 2001 From: DS185357 Date: Wed, 16 Feb 2022 09:36:06 +0100 Subject: [PATCH 6/8] Using new windows image for the build. --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 534ec6fe..42be65e4 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -2,7 +2,7 @@ skip_branch_with_pr: true image: - - Visual Studio 2019 + - Visual Studio 2022 - Ubuntu2004 before_build: # Display .NET Core version From b9c53f686630deaf2f79f9dcb1bf1aef772f2633 Mon Sep 17 00:00:00 2001 From: DS185357 Date: Wed, 16 Feb 2022 10:01:58 +0100 Subject: [PATCH 7/8] Increasing netstandard version to 2.1 --- Directory.Build.props | 2 +- TickSpec/FeatureGen.fs | 2 +- TickSpec/ScenarioGen.fs | 2 +- TickSpec/TickSpec.fs | 4 ++-- TickSpec/TickSpec.fsproj | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 2f11403c..7dd40188 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -29,7 +29,7 @@ net472 - netstandard2.0 + netstandard2.1 net6.0 diff --git a/TickSpec/FeatureGen.fs b/TickSpec/FeatureGen.fs index b3eac162..a2e3912e 100644 --- a/TickSpec/FeatureGen.fs +++ b/TickSpec/FeatureGen.fs @@ -1,6 +1,6 @@ namespace TickSpec -#if !NETSTANDARD2_0 +#if !NETSTANDARD2_1 open System open System.Collections.Generic open System.Diagnostics diff --git a/TickSpec/ScenarioGen.fs b/TickSpec/ScenarioGen.fs index 78c85297..343cc9b6 100644 --- a/TickSpec/ScenarioGen.fs +++ b/TickSpec/ScenarioGen.fs @@ -1,6 +1,6 @@ module internal TickSpec.ScenarioGen -#if !NETSTANDARD2_0 +#if !NETSTANDARD2_1 open System open System.Collections.Generic open System.Reflection diff --git a/TickSpec/TickSpec.fs b/TickSpec/TickSpec.fs index 66518000..dd632bfe 100644 --- a/TickSpec/TickSpec.fs +++ b/TickSpec/TickSpec.fs @@ -15,7 +15,7 @@ type StepDefinitions (givens,whens,thens,events,valueParsers) = static let getStepAttributes (m:MemberInfo) = Attribute.GetCustomAttributes(m,typeof) static let isMethodInScope (feature:string) (scenario:ScenarioSource) (scopedTags,scopedFeatures,scopedScenarios,m) = - let trim p (s:string) = + let trim (p:string) (s:string) = if s.StartsWith p then (s.Substring p.Length).Trim() else s let tagged = match scopedTags with @@ -204,7 +204,7 @@ type StepDefinitions (givens,whens,thens,events,valueParsers) = member __.GenerateFeature (sourceUrl:string,lines:string[]) = let featureSource = parseFeature lines let feature = featureSource.Name -#if !NETSTANDARD2_0 +#if !NETSTANDARD2_1 let gen = FeatureGen(featureSource.Name,sourceUrl) let genType scenario = let lines = diff --git a/TickSpec/TickSpec.fsproj b/TickSpec/TickSpec.fsproj index cf2fa6e8..d50ad751 100644 --- a/TickSpec/TickSpec.fsproj +++ b/TickSpec/TickSpec.fsproj @@ -7,7 +7,7 @@ README.md - + From 5e3beee7de328b44b8d0e41a484d6d8fe0c3a0ca Mon Sep 17 00:00:00 2001 From: DS185357 Date: Wed, 16 Feb 2022 10:07:35 +0100 Subject: [PATCH 8/8] Updated versions in README. --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 7af008a8..d74db928 100644 --- a/README.md +++ b/README.md @@ -17,8 +17,8 @@ Example video: http://www.youtube.com/watch?v=UuTL3nj9fIE Simply reference TickSpec via [NuGet or Paket](https://www.nuget.org/packages/TickSpec/), download the assembly or build the project from source. -- The binary should work cleanly on any .NET Standard 2.0, .NET 4.7.2 or later environment. -- The TickSpec solution file works with Visual Studio 2017 and newer (tested with VS 2022). +- The binary should work cleanly on any .NET Standard 2.1, .NET 4.7.2 or later environment. +- The TickSpec solution file works with Visual Studio 2022. - Historically, Silverlight was supported; this support and the related examples were removed in 2017 (but remain in the commit history for the archeologically inclined) - Useful samples are available in the Examples folder https://github.com/fsprojects/TickSpec/tree/master/Examples/ and depending your choice, this one is a good start : https://github.com/fsprojects/TickSpec/tree/master/Examples/ByFramework