Skip to content
Merged
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
2 changes: 1 addition & 1 deletion .github/workflows/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
with:
name: Report release tests
# this path glob pattern requires forward slashes!
path: ./src/FSharpy.TaskSeq.Test/TestResults/test-results-release.trx
path: ./src/FSharp.Control.TaskSeq.Test/TestResults/test-results-release.trx
reporter: dotnet-trx

# deploy:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
with:
name: Report release tests
# this path glob pattern requires forward slashes!
path: ./src/FSharpy.TaskSeq.Test/TestResults/test-results-release.trx
path: ./src/FSharp.Control.TaskSeq.Test/TestResults/test-results-release.trx
reporter: dotnet-trx

test-debug:
Expand All @@ -48,5 +48,5 @@ jobs:
with:
name: Report debug tests
# this path glob pattern requires forward slashes!
path: ./src/FSharpy.TaskSeq.Test/TestResults/test-results-debug.trx
path: ./src/FSharp.Control.TaskSeq.Test/TestResults/test-results-debug.trx
reporter: dotnet-trx
4 changes: 2 additions & 2 deletions build.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ SET DOTNET_TEST_PROJECT_LOCATION=

SET DOTNET_CI_ARGS=--blame-hang-timeout 60000ms --logger "console;verbosity=detailed"
SET DOTNET_TEST_ARGS=--logger "console;verbosity=detailed"
SET DOTNET_TEST_PROJECT_LOCATION=".\src\FSharpy.TaskSeq.Test\FSharpy.TaskSeq.Test.fsproj"
SET DOTNET_TEST_PROJECT_LOCATION=".\src\FSharp.Control.TaskSeq.Test\FSharp.Control.TaskSeq.Test.fsproj"

REM This is used to get a 'rest of arguments' list, which allows passing
REM other arguments to the dotnet build and test commands
Expand Down Expand Up @@ -105,7 +105,7 @@ GOTO :EOF

REM Normal building
:runBuild
SET BUILD_COMMAND=dotnet build src/FSharpy.TaskSeq.sln -c %BUILD_CONFIG% %REST_ARGS%
SET BUILD_COMMAND=dotnet build src/FSharp.Control.TaskSeq.sln -c %BUILD_CONFIG% %REST_ARGS%
ECHO Building for %BUILD_CONFIG% configuration...
ECHO.
ECHO Executing:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ namespace TaskSeq.Tests

open System.Runtime.CompilerServices

// this prevents an XUnit bug to break over itself on CI
// tests themselves can be run in parallel just fine.
[<assembly: Xunit.CollectionBehavior(DisableTestParallelization = true)>]
[<assembly: Xunit.TestCaseOrderer("FSharpy.Tests.AlphabeticalOrderer", "FSharpy.TaskSeq.Test")>]

do ()
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
Expand Down Expand Up @@ -65,7 +65,7 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\FSharpy.TaskSeq\FSharpy.TaskSeq.fsproj" />
<ProjectReference Include="..\FSharp.Control.TaskSeq\FSharp.Control.TaskSeq.fsproj" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,6 @@ open FsToolkit.ErrorHandling
open Xunit
open Xunit.Sdk

type AlphabeticalOrderer() =
interface ITestCaseOrderer with
override this.OrderTestCases(testCases) =
testCases
|> Seq.sortBy (fun testCase ->
// sorting (or getting) the type fails
// and as soon as this method fails, no tests are discovered
testCase.TestMethod.Method.Name)


[<AutoOpen>]
module ExtraCustomMatchers =
Expand Down
4 changes: 2 additions & 2 deletions src/FSharpy.TaskSeq.sln → src/FSharp.Control.TaskSeq.sln
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.3.32811.315
MinimumVisualStudioVersion = 10.0.40219.1
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharpy.TaskSeq", "FSharpy.TaskSeq\FSharpy.TaskSeq.fsproj", "{9A723760-A7AB-4C8D-9A6E-F0A38341827C}"
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Control.TaskSeq", "FSharp.Control.TaskSeq\FSharp.Control.TaskSeq.fsproj", "{9A723760-A7AB-4C8D-9A6E-F0A38341827C}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{B252135E-C676-4542-8B72-412DF1B9487C}"
ProjectSection(SolutionItems) = preProject
Expand All @@ -20,7 +20,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{
..\.github\workflows\test.yaml = ..\.github\workflows\test.yaml
EndProjectSection
EndProject
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharpy.TaskSeq.Test", "FSharpy.TaskSeq.Test\FSharpy.TaskSeq.Test.fsproj", "{06CA2C7E-04DA-4A85-BB8E-4D94BD67AEB3}"
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Control.TaskSeq.Test", "FSharp.Control.TaskSeq.Test\FSharp.Control.TaskSeq.Test.fsproj", "{06CA2C7E-04DA-4A85-BB8E-4D94BD67AEB3}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.