Skip to content

Commit

Permalink
Updated libs
Browse files Browse the repository at this point in the history
  • Loading branch information
jason-kerney committed Mar 10, 2023
1 parent 758c433 commit 0c72016
Show file tree
Hide file tree
Showing 12 changed files with 61 additions and 38 deletions.
13 changes: 13 additions & 0 deletions .idea/.idea.FeldSpar/.idea/.gitignore
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions .idea/.idea.FeldSpar/.idea/encodings.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions .idea/.idea.FeldSpar/.idea/indexLayout.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/.idea.FeldSpar/.idea/vcs.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions FeldSpar.ContinuousIntegration/ContinuousIntegration.fsproj
View file
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
<AssemblyName>FeldSpar.ContinuousIntegration</AssemblyName>
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
<Authors>JasonKerney</Authors>
Expand All @@ -20,13 +20,13 @@
<Compile Include="Program.fs" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="ApprovalUtilities" Version="5.2.5" />
<PackageReference Include="ApprovalUtilities" Version="5.8.0" />
<PackageReference Include="Argu" Version="6.1.1" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\FeldSpar.Framework\Framework.fsproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Update="FSharp.Core" Version="4.7.2" />
<PackageReference Update="FSharp.Core" Version="7.0.200" />
</ItemGroup>
</Project>
6 changes: 3 additions & 3 deletions FeldSpar.Framework/Framework.fsproj
View file
Expand Up @@ -32,10 +32,10 @@
</ItemGroup>
<ItemGroup />
<ItemGroup>
<PackageReference Include="ApprovalTests" Version="5.2.5" />
<PackageReference Include="ApprovalUtilities" Version="5.2.5" />
<PackageReference Include="ApprovalTests" Version="5.8.0" />
<PackageReference Include="ApprovalUtilities" Version="5.8.0" />
</ItemGroup>
<ItemGroup>
<PackageReference Update="FSharp.Core" Version="4.7.2" />
<PackageReference Update="FSharp.Core" Version="7.0.200" />
</ItemGroup>
</Project>
22 changes: 9 additions & 13 deletions ...sts_should.build_a_report_from_execution_summaries_that_are_sorted_naturally.approved.txt
View file
@@ -1,15 +1,11 @@
"{ AssemblyName = "internal tests"
Reports =
seq
[{ TestContainerName =
"Can Build Report from Execution Summaries Sorted by numeric Values"
Failures =
[|{ TestName = "Summary 12"
FailureType =
ExpectationFailure
"5 expected to be 4" };
{ TestName = "Summary 4"
FailureType =
GeneralFailure
"Something unknown happened" }|]
Successes = [|"Summary 11"; "Summary 3"|] }] }"
seq
[{ TestContainerName =
"Can Build Report from Execution Summaries Sorted by numeric Values"
Failures =
[|{ TestName = "Summary 12"
FailureType = ExpectationFailure "5 expected to be 4" };
{ TestName = "Summary 4"
FailureType = GeneralFailure "Something unknown happened" }|]
Successes = [|"Summary 11"; "Summary 3"|] }] }"
20 changes: 8 additions & 12 deletions ...r.Tests/Building_of_tests_should.build_a_report_from_the_Execution_Summaries.approved.txt
View file
@@ -1,14 +1,10 @@
"{ AssemblyName = "internal tests"
Reports =
seq
[{ TestContainerName = "Can Build Report from Execution Summaries"
Failures =
[|{ TestName = "Summary Four"
FailureType =
ExpectationFailure
"5 expected to be 4" };
{ TestName = "Summary Two"
FailureType =
GeneralFailure
"Something unknown happened" }|]
Successes = [|"Summary One"; "Summary Three"|] }] }"
seq
[{ TestContainerName = "Can Build Report from Execution Summaries"
Failures =
[|{ TestName = "Summary Four"
FailureType = ExpectationFailure "5 expected to be 4" };
{ TestName = "Summary Two"
FailureType = GeneralFailure "Something unknown happened" }|]
Successes = [|"Summary One"; "Summary Three"|] }] }"
2 changes: 1 addition & 1 deletion FeldSpar.Tests/Building_of_tests_should.get_a_representitive_environment.approved.txt
View file
Expand Up @@ -4,6 +4,6 @@
CanonicalizedName = "get_a_representitive_environment"
GoldStandardPath = "...\FeldSpar.Tests\"
Assembly =
FeldSpar.Tests, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
FeldSpar.Tests, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
AssemblyPath = "...\FeldSpar.Tests\bin\..."
Reporters = [] }"
2 changes: 1 addition & 1 deletion FeldSpar.Tests/Program.fs
View file
Expand Up @@ -29,7 +29,7 @@ module Program =
let currentToken =
let assembly = System.Reflection.Assembly.GetExecutingAssembly()
let assemblyPath =
let codebase = assembly.CodeBase
let codebase = assembly.Location
let uriBuilder = System.UriBuilder codebase
let path = System.Uri.UnescapeDataString uriBuilder.Path
System.IO.Path.GetDirectoryName path
Expand Down
2 changes: 1 addition & 1 deletion FeldSpar.Tests/SetupAndTearDownTests.fs
View file
Expand Up @@ -23,7 +23,7 @@ module SetupAndTearDownTestingSupport =
| _ -> failwith "Unexpected result from setup"

let successfulSetup = beforeTest (fun context -> Success, 42, context)
let throwsSetup = beforeTest<string> (fun _env -> failwith "setup threw exception")
let throwsSetup = beforeTest (fun _env -> failwith "setup threw exception")
let successfulTest = (fun _env _data -> Success)

let buildSuccessfulSetup env = Success, successfulSetup, env
Expand Down
8 changes: 4 additions & 4 deletions FeldSpar.Tests/Tests.fsproj
View file
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
<AssemblyName>FeldSpar.Tests</AssemblyName>
</PropertyGroup>

Expand All @@ -22,16 +22,16 @@
<ItemGroup />

<ItemGroup>
<PackageReference Include="ApprovalTests" Version="5.2.5" />
<PackageReference Include="ApprovalUtilities" Version="5.2.5" />
<PackageReference Include="ApprovalTests" Version="5.8.0" />
<PackageReference Include="ApprovalUtilities" Version="5.8.0" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\FeldSpar.Framework\Framework.fsproj" />
</ItemGroup>

<ItemGroup>
<PackageReference Update="FSharp.Core" Version="4.7.2" />
<PackageReference Update="FSharp.Core" Version="7.0.200" />
</ItemGroup>

</Project>

0 comments on commit 0c72016

Please sign in to comment.