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
10 changes: 5 additions & 5 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [windows-latest, ubuntu-latest]
dotnet: [6.0.x]
os: [windows-latest, ubuntu-latest, macos-latest]
dotnet: [9.0.x]
runs-on: ${{ matrix.os }}

steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v4
- name: Setup .NET Core
uses: actions/setup-dotnet@v1
uses: actions/setup-dotnet@v4
with:
dotnet-version: ${{ matrix.dotnet }}
- name: Build & Tests
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ jobs:
runs-on: windows-latest

steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v4
- name: Setup .NET Core
uses: actions/setup-dotnet@v1
uses: actions/setup-dotnet@v4
with:
dotnet-version: 6.0.x
dotnet-version: 9.0.x
- name: Build, Tests & Release
if: github.ref == 'refs/heads/master'
run: dotnet run --project ./fake-build/Build.fsproj -- -t PublishNuget
Expand Down
13 changes: 2 additions & 11 deletions Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,16 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. -->
<Project>
<PropertyGroup>
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
<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))' " />
</ItemGroup>
<PropertyGroup>
<PropertyGroup>
<Authors>Phillip Trelford, Ruben Bartelink, Milos Chaloupka</Authors>
<Copyright>Copyright © 2010-21 Phillip Trelford, Ruben Bartelink, Milos Chaloupka</Copyright>
<PackageProjectUrl>https://github.com/fsprojects/TickSpec</PackageProjectUrl>
Expand All @@ -29,7 +20,7 @@
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
</ItemGroup>
<ItemGroup>
<None Include="$(MSBuildThisFileDirectory)/LICENSE.txt" Pack="true" PackagePath="LICENSE.txt"/>
Expand Down
15 changes: 7 additions & 8 deletions Examples/ByFeature/CustomContainer/CustomContainer.fsproj
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="../../../netfx.props" />

<PropertyGroup>
<TargetFrameworks>net6.0;net452</TargetFrameworks>
<TargetFramework>net9.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<Compile Include="XunitAutofacWiring.fs" />
Expand All @@ -14,13 +14,12 @@
<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="8.2.0" />
<PackageReference Include="unquote" Version="7.0.0" />
<PackageReference Include="Xunit" Version="2.9.3" />
<PackageReference Include="xunit.runner.visualstudio" Version="3.0.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
</ItemGroup>
<ItemGroup>
<Reference Include="System.Runtime" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="../../../netfx.props" />

<PropertyGroup>
<TargetFrameworks>net6.0;net452</TargetFrameworks>
<TargetFramework>net9.0</TargetFramework>
</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.14.0" />
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="../../../netfx.props" />

<PropertyGroup>
<TargetFrameworks>net6.0;net452</TargetFrameworks>
<TargetFramework>net9.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<Compile Include="Logger.fs" />
Expand All @@ -27,8 +27,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.14.0" />
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
</ItemGroup>
</Project>
10 changes: 5 additions & 5 deletions Examples/ByFeature/TaggedExamples/TaggedExamples.fsproj
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="../../../netfx.props" />

<PropertyGroup>
<TargetFrameworks>net6.0;net452</TargetFrameworks>
<TargetFramework>net9.0</TargetFramework>
</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.14.0" />
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions Examples/ByFramework/CommandLine/CSharp/CSharp.csproj
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="../../../../netfx.props" />

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>net6.0;net452</TargetFrameworks>
<TargetFramework>net9.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<None Remove="Feature.txt" />
Expand Down
4 changes: 2 additions & 2 deletions Examples/ByFramework/CommandLine/FSharp/FSharp.fsproj
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="../../../../netfx.props" />

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>net6.0;net452</TargetFrameworks>
<TargetFramework>net9.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<Compile Include="StockItem.fs" />
Expand Down
4 changes: 2 additions & 2 deletions Examples/ByFramework/CommandLine/TicTacToe/TicTacToe.fsproj
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="../../../../netfx.props" />

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>net6.0;net452</TargetFrameworks>
<TargetFramework>net9.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<EmbeddedResource Include="TicTacToeXO.txt" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="../../../../netfx.props" />

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<OutputType>Exe</OutputType>
<GenerateProgramFile>False</GenerateProgramFile>
</PropertyGroup>
Expand All @@ -19,11 +19,10 @@
<ProjectReference Include="..\..\..\..\TickSpec\TickSpec.fsproj" />
</ItemGroup>
<ItemGroup>
<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.12.0" />
<PackageReference Include="Expecto" Version="10.2.1" />
<PackageReference Include="YoloDev.Expecto.TestSdk" Version="0.14.3" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion Examples/ByFramework/Expecto/FSharp.Expecto/Program.fs
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,5 @@ let additionTests = featureTest "Addition.feature"

[<EntryPoint>]
let main args =
runTestsInAssembly defaultConfig args
runTestsInAssemblyWithCLIArgs [] args

11 changes: 5 additions & 6 deletions Examples/ByFramework/MSTest/MSTest.FSharp/MSTest.FSharp.fsproj
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="../../../../netfx.props" />

<PropertyGroup>
<TargetFrameworks>net6.0;net452</TargetFrameworks>
<TargetFramework>net9.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<Compile Include="MSTestWiring.fs" />
Expand All @@ -12,11 +12,10 @@
</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="3.7.0" />
<PackageReference Include="MSTest.TestAdapter" Version="3.7.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
</ItemGroup>
<ItemGroup>
<Reference Include="System.Runtime" />
</ItemGroup>
</Project>
10 changes: 5 additions & 5 deletions Examples/ByFramework/NUnit/CSharp.NUnit/NUnit.CSharp.csproj
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="../../../../netfx.props" />

<PropertyGroup>
<TargetFrameworks>net6.0;net452</TargetFrameworks>
<TargetFramework>net9.0</TargetFramework>
</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.14.0" />
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
</ItemGroup>
</Project>
10 changes: 5 additions & 5 deletions Examples/ByFramework/NUnit/FSharp.NUnit/NUnit.FSharp.fsproj
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="../../../../netfx.props" />

<PropertyGroup>
<TargetFrameworks>net6.0;net452</TargetFrameworks>
<TargetFramework>net9.0</TargetFramework>
</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.14.0" />
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
</ItemGroup>
</Project>
11 changes: 5 additions & 6 deletions Examples/ByFramework/xUnit/FSharp.xUnit/Xunit.FSharp.fsproj
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="../../../../netfx.props" />

<PropertyGroup>
<TargetFrameworks>net6.0;net452</TargetFrameworks>
<TargetFramework>net9.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<Compile Include="Retail.fs" />
Expand All @@ -16,11 +16,10 @@
<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.9.3" />
<PackageReference Include="xunit.runner.visualstudio" Version="3.0.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
</ItemGroup>
<ItemGroup>
<Reference Include="System.Runtime" />
</ItemGroup>
</Project>
10 changes: 5 additions & 5 deletions Examples/ByStyle/Attributes/Attributes.fsproj
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="../../../netfx.props" />

<PropertyGroup>
<TargetFrameworks>net6.0;net452</TargetFrameworks>
<TargetFramework>net9.0</TargetFramework>
</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.14.0" />
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion Examples/ByStyle/Attributes/Prelude.fs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ module NUnitExtensions =
open NUnit.Framework
type Assert with
static member Contains(expected:obj, xs:'a list) =
Assert.Contains(expected, xs |> List.toArray)
CollectionAssert.Contains(xs |> List.toArray, expected)

module Union =
open Microsoft.FSharp.Reflection
Expand Down
10 changes: 5 additions & 5 deletions Examples/ByStyle/Functional/Functional.fsproj
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="../../../netfx.props" />

<PropertyGroup>
<TargetFrameworks>net6.0;net452</TargetFrameworks>
<TargetFramework>net9.0</TargetFramework>
</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.14.0" />
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
</ItemGroup>
</Project>
Loading
Loading