Skip to content

Support for async dispose #53

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Support for async dispose #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
efc7fc4
Increasing target framework versions.
ds185357 Feb 15, 2022
07f1970
Adding support for asynchronously disposable resources.
ds185357 Feb 15, 2022
ae36d11
Updating nuget packages.
ds185357 Feb 15, 2022
aea897f
Updated README.
ds185357 Feb 15, 2022
73318a1
Replacing TickSpec project description by Package readme file reference.
ds185357 Feb 15, 2022
0f44f31
Using new windows image for the build.
Feb 16, 2022
b9c53f6
Increasing netstandard version to 2.1
Feb 16, 2022
5e3beee
Updated versions in README.
Feb 16, 2022
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
2 changes: 1 addition & 1 deletion .config/dotnet-tools.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"isRoot": true,
"tools": {
"fake-cli": {
"version": "5.20.4",
"version": "5.22.0",
"commands": [
"fake"
]
Expand Down
13 changes: 7 additions & 6 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,8 @@
<DisableImplicitSystemValueTupleReference>true</DisableImplicitSystemValueTupleReference>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="FSharp.Core" Version="4.2.3" Condition=" '$(ProjectExt)'=='.fsproj' AND '$(TargetFramework.StartsWith(net4))' " />
<PackageReference Include="FSharp.Core" Version="4.3.4" Condition=" '$(ProjectExt)'=='.fsproj' AND '$(TargetFramework.StartsWith(net5))' " />
<PackageReference Include="FSharp.Core" Version="4.3.4" Condition=" '$(ProjectExt)'=='.fsproj' AND '$(TargetFramework.StartsWith(netstandard))' " />
<PackageReference Include="FSharp.Core" Version="6.0.3" Condition=" '$(ProjectExt)'=='.fsproj' " />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
</ItemGroup>
<PropertyGroup>
<Authors>Phillip Trelford, Ruben Bartelink, Milos Chaloupka</Authors>
Expand All @@ -28,9 +27,11 @@
<IncludeSymbols>true</IncludeSymbols>
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
</ItemGroup>
<PropertyGroup>
<DotNetFrameworkVersion>net472</DotNetFrameworkVersion>
<DotNetStandardVersion>netstandard2.1</DotNetStandardVersion>
<DotNetCoreVersion>net6.0</DotNetCoreVersion>
</PropertyGroup>
<ItemGroup>
<None Include="$(MSBuildThisFileDirectory)/LICENSE.txt" Pack="true" PackagePath="LICENSE.txt"/>
</ItemGroup>
Expand Down
15 changes: 9 additions & 6 deletions Examples/ByFeature/CustomContainer/CustomContainer.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="../../../netfx.props" />
<PropertyGroup>
<TargetFrameworks>net5.0;net452</TargetFrameworks>
<TargetFrameworks>$(DotNetCoreVersion);$(DotNetFrameworkVersion)</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<Compile Include="XunitAutofacWiring.fs" />
Expand All @@ -14,11 +14,14 @@
<ItemGroup>
<ProjectReference Include="..\..\..\TickSpec\TickSpec.fsproj" />
<ProjectReference Include="..\..\..\Wiring\TickSpec.Xunit\TickSpec.Xunit.fsproj" />
<PackageReference Include="Autofac" Version="4.8.1" />
<PackageReference Include="unquote" Version="4.0.0" />
<PackageReference Include="Xunit" Version="2.4.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
<PackageReference Include="Autofac" Version="6.3.0" />
<PackageReference Include="unquote" Version="6.1.0" />
<PackageReference Include="Xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
</ItemGroup>
<ItemGroup>
<Reference Include="System.Runtime" />
Expand Down
8 changes: 4 additions & 4 deletions Examples/ByFeature/DependencyInjection/DependencyInjection.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="../../../netfx.props" />
<PropertyGroup>
<TargetFrameworks>net5.0;net452</TargetFrameworks>
<TargetFrameworks>$(DotNetCoreVersion);$(DotNetFrameworkVersion)</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<Compile Include="NunitWiring.fs" />
Expand All @@ -14,8 +14,8 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\TickSpec\TickSpec.fsproj" />
<PackageReference Include="NUnit" Version="3.11.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.10.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
<PackageReference Include="NUnit" Version="3.13.2" />
<PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
</ItemGroup>
</Project>
8 changes: 4 additions & 4 deletions Examples/ByFeature/FunctionalInjection/FunctionalInjection.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="../../../netfx.props" />
<PropertyGroup>
<TargetFrameworks>net5.0;net452</TargetFrameworks>
<TargetFrameworks>$(DotNetCoreVersion);$(DotNetFrameworkVersion)</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<Compile Include="NunitWiring.fs" />
Expand All @@ -24,8 +24,8 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\TickSpec\TickSpec.fsproj" />
<PackageReference Include="NUnit" Version="3.11.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.10.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
<PackageReference Include="NUnit" Version="3.13.2" />
<PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
</ItemGroup>
</Project>
8 changes: 4 additions & 4 deletions Examples/ByFeature/TaggedExamples/TaggedExamples.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="../../../netfx.props" />
<PropertyGroup>
<TargetFrameworks>net5.0;net452</TargetFrameworks>
<TargetFrameworks>$(DotNetCoreVersion);$(DotNetFrameworkVersion)</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<None Include="paket.references" />
Expand All @@ -14,8 +14,8 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\TickSpec\TickSpec.fsproj" />
<PackageReference Include="NUnit" Version="3.11.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.10.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
<PackageReference Include="NUnit" Version="3.13.2" />
<PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion Examples/ByFramework/CommandLine/CSharp/CSharp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Import Project="../../../../netfx.props" />
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>net5.0;net452</TargetFrameworks>
<TargetFrameworks>$(DotNetCoreVersion);$(DotNetFrameworkVersion)</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<None Remove="Feature.txt" />
Expand Down
2 changes: 1 addition & 1 deletion Examples/ByFramework/CommandLine/FSharp/FSharp.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Import Project="../../../../netfx.props" />
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>net5.0;net452</TargetFrameworks>
<TargetFrameworks>$(DotNetCoreVersion);$(DotNetFrameworkVersion)</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<Compile Include="StockItem.fs" />
Expand Down
2 changes: 1 addition & 1 deletion Examples/ByFramework/CommandLine/TicTacToe/TicTacToe.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Import Project="../../../../netfx.props" />
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>net5.0;net452</TargetFrameworks>
<TargetFrameworks>$(DotNetCoreVersion);$(DotNetFrameworkVersion)</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<EmbeddedResource Include="TicTacToeXO.txt" />
Expand Down
8 changes: 4 additions & 4 deletions Examples/ByFramework/Expecto/FSharp.Expecto/Expecto.FSharp.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="../../../../netfx.props" />
<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>$(DotNetCoreVersion)</TargetFramework>
<OutputType>Exe</OutputType>
<GenerateProgramFile>False</GenerateProgramFile>
</PropertyGroup>
Expand All @@ -22,8 +22,8 @@
<Reference Include="System.Runtime" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
<PackageReference Include="Expecto" Version="8.6.0" />
<PackageReference Include="YoloDev.Expecto.TestSdk" Version="0.6.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
<PackageReference Include="Expecto" Version="9.0.4" />
<PackageReference Include="YoloDev.Expecto.TestSdk" Version="0.12.13" />
</ItemGroup>
</Project>
8 changes: 4 additions & 4 deletions Examples/ByFramework/MSTest/MSTest.FSharp/MSTest.FSharp.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="../../../../netfx.props" />
<PropertyGroup>
<TargetFrameworks>net5.0;net452</TargetFrameworks>
<TargetFrameworks>$(DotNetCoreVersion);$(DotNetFrameworkVersion)</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<Compile Include="MSTestWiring.fs" />
Expand All @@ -12,9 +12,9 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\TickSpec\TickSpec.fsproj" />
<PackageReference Include="MSTest.TestFramework" Version="1.3.2" />
<PackageReference Include="MSTest.TestAdapter" Version="1.3.2" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
<PackageReference Include="MSTest.TestFramework" Version="2.2.8" />
<PackageReference Include="MSTest.TestAdapter" Version="2.2.8" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
</ItemGroup>
<ItemGroup>
<Reference Include="System.Runtime" />
Expand Down
8 changes: 4 additions & 4 deletions Examples/ByFramework/NUnit/CSharp.NUnit/NUnit.CSharp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="../../../../netfx.props" />
<PropertyGroup>
<TargetFrameworks>net5.0;net452</TargetFrameworks>
<TargetFrameworks>$(DotNetCoreVersion);$(DotNetFrameworkVersion)</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<None Remove="Stock.feature" />
Expand All @@ -12,8 +12,8 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\TickSpec\TickSpec.fsproj" />
<PackageReference Include="NUnit" Version="3.11.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.10.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
<PackageReference Include="NUnit" Version="3.13.2" />
<PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
</ItemGroup>
</Project>
8 changes: 4 additions & 4 deletions Examples/ByFramework/NUnit/FSharp.NUnit/NUnit.FSharp.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="../../../../netfx.props" />
<PropertyGroup>
<TargetFrameworks>net5.0;net452</TargetFrameworks>
<TargetFrameworks>$(DotNetCoreVersion);$(DotNetFrameworkVersion)</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<Compile Include="FeatureFixture.fs" />
Expand All @@ -14,8 +14,8 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\TickSpec\TickSpec.fsproj" />
<PackageReference Include="NUnit" Version="3.11.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.10.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
<PackageReference Include="NUnit" Version="3.13.2" />
<PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
</ItemGroup>
</Project>
11 changes: 7 additions & 4 deletions Examples/ByFramework/xUnit/FSharp.xUnit/Xunit.FSharp.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="../../../../netfx.props" />
<PropertyGroup>
<TargetFrameworks>net5.0;net452</TargetFrameworks>
<TargetFrameworks>$(DotNetCoreVersion);$(DotNetFrameworkVersion)</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<Compile Include="Retail.fs" />
Expand All @@ -16,9 +16,12 @@
<ItemGroup>
<ProjectReference Include="..\..\..\..\TickSpec\TickSpec.fsproj" />
<ProjectReference Include="..\..\..\..\Wiring\TickSpec.Xunit\TickSpec.Xunit.fsproj" />
<PackageReference Include="Xunit" Version="2.4.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
<PackageReference Include="Xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
</ItemGroup>
<ItemGroup>
<Reference Include="System.Runtime" />
Expand Down
8 changes: 4 additions & 4 deletions Examples/ByStyle/Attributes/Attributes.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="../../../netfx.props" />
<PropertyGroup>
<TargetFrameworks>net5.0;net452</TargetFrameworks>
<TargetFrameworks>$(DotNetCoreVersion);$(DotNetFrameworkVersion)</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<Content Include="ReadMe.txt" />
Expand Down Expand Up @@ -38,8 +38,8 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\TickSpec\TickSpec.fsproj" />
<PackageReference Include="NUnit" Version="3.11.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.10.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
<PackageReference Include="NUnit" Version="3.13.2" />
<PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
</ItemGroup>
</Project>
8 changes: 4 additions & 4 deletions Examples/ByStyle/Functional/Functional.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="../../../netfx.props" />
<PropertyGroup>
<TargetFrameworks>net5.0;net452</TargetFrameworks>
<TargetFrameworks>$(DotNetCoreVersion);$(DotNetFrameworkVersion)</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<Compile Include="Functional.fs" />
Expand All @@ -18,8 +18,8 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\TickSpec\TickSpec.fsproj" />
<PackageReference Include="NUnit" Version="3.11.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.10.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
<PackageReference Include="NUnit" Version="3.13.2" />
<PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion Examples/ByStyle/Interactive/Interactive.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="../../../netfx.props" />
<PropertyGroup>
<TargetFrameworks>net5.0;net452</TargetFrameworks>
<TargetFrameworks>$(DotNetCoreVersion);$(DotNetFrameworkVersion)</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<Compile Include="StoryRunner.fs" />
Expand Down
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.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

Expand Down
8 changes: 4 additions & 4 deletions TickSpec.Tests/TickSpec.Tests.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="../netfx.props" />
<PropertyGroup>
<TargetFrameworks>net5.0;net452</TargetFrameworks>
<TargetFrameworks>$(DotNetCoreVersion);$(DotNetFrameworkVersion)</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<EmbeddedResource Include="WithItems.feature" />
Expand All @@ -12,9 +12,9 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\TickSpec\TickSpec.fsproj" />
<PackageReference Include="NUnit" Version="3.11.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.10.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
<PackageReference Include="NUnit" Version="3.13.2" />
<PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
<PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
</ItemGroup>
</Project>
Loading