Skip to content

Commit ef3ba50

Browse files
NogginBopsNogginBops
committed
Updated paket and updated tests to use .net6.0.
1 parent 0c8808c commit ef3ba50

File tree

4 files changed

+29
-29
lines changed

4 files changed

+29
-29
lines changed

‎.config/dotnet-tools.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"isRoot": true,
44
"tools": {
55
"paket": {
6-
"version": "7.2.0",
6+
"version": "9.0.2",
77
"commands": [
88
"paket"
99
]

‎tests/OpenTK.Tests.Integration/OpenTK.Tests.Integration.fsproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>netcoreapp3.1</TargetFramework>
3+
<TargetFramework>net6.0</TargetFramework>
44
<Deterministic>true</Deterministic>
55
<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
66
</PropertyGroup>

‎tests/OpenTK.Tests/Assertions.fs‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -38,100 +38,100 @@ module private AssertHelpers =
3838
type internal Assert =
3939

4040
static member ApproximatelyEquivalent(a : Vector2,b : Vector2) =
41-
if not <| approxEq a.X b.X && approxEq a.Y b.Y then raise <| new Xunit.Sdk.EqualException(a,b)
41+
if not <| approxEq a.X b.X && approxEq a.Y b.Y then raise <| Xunit.Sdk.EqualException.ForMismatchedValues(a,b)
4242

4343
static member ApproximatelyEquivalent(a : Vector3,b : Vector3) =
44-
if not <| approxEq a.X b.X && approxEq a.Y b.Y && approxEq a.Z b.Z then raise <| new Xunit.Sdk.EqualException(a,b)
44+
if not <| approxEq a.X b.X && approxEq a.Y b.Y && approxEq a.Z b.Z then raise <| Xunit.Sdk.EqualException.ForMismatchedValues(a,b)
4545

4646
static member ApproximatelyEquivalent(a : Vector4,b : Vector4) =
4747
if not <| approxEq a.X b.X && approxEq a.Y b.Y && approxEq a.Z b.Z && approxEq a.W b.W then
48-
raise <| new Xunit.Sdk.EqualException(a,b)
48+
raise <| Xunit.Sdk.EqualException.ForMismatchedValues(a,b)
4949

5050
static member ApproximatelyEquivalent(a : float32,b : float32) =
51-
if not <| approxEq a b then raise <| new Xunit.Sdk.EqualException(a,b)
51+
if not <| approxEq a b then raise <| Xunit.Sdk.EqualException.ForMismatchedValues(a,b)
5252

5353
static member ApproximatelyEquivalent(a : Color4, b : Color4, epsilon:float32) =
5454
if not <| approxEqEpsilon a.R b.R epsilon && approxEqEpsilon a.G b.G epsilon && approxEqEpsilon a.B b.B epsilon && approxEqEpsilon a.A b.A epsilon then
55-
raise <| new Xunit.Sdk.EqualException(a,b)
55+
raise <| Xunit.Sdk.EqualException.ForMismatchedValues(a,b)
5656

5757
static member ApproximatelyEqualEpsilon(a : Vector2, b : Vector2, epsilon:float32) =
5858
if neqEpsilon a.X b.X epsilon || neqEpsilon a.Y b.Y epsilon then
59-
raise <| new Xunit.Sdk.EqualException(a,b)
59+
raise <| Xunit.Sdk.EqualException.ForMismatchedValues(a,b)
6060

6161
static member ApproximatelyEqualEpsilon(a : Vector3, b : Vector3, epsilon:float32) =
6262
if neqEpsilon a.X b.X epsilon || neqEpsilon a.Y b.Y epsilon || neqEpsilon a.Z b.Z epsilon then
63-
raise <| new Xunit.Sdk.EqualException(a,b)
63+
raise <| Xunit.Sdk.EqualException.ForMismatchedValues(a,b)
6464

6565
static member ApproximatelyEqualEpsilon(a : Vector3, b : Vector3, epsilon:Vector3) =
6666
if neqEpsilon a.X b.X epsilon.X || neqEpsilon a.Y b.Y epsilon.Y || neqEpsilon a.Z b.Z epsilon.Z then
67-
raise <| new Xunit.Sdk.EqualException(a,b)
67+
raise <| Xunit.Sdk.EqualException.ForMismatchedValues(a,b)
6868

6969
static member ApproximatelyEqualEpsilon(a : Vector4, b : Vector4, epsilon:float32) =
7070
if neqEpsilon a.X b.X epsilon || neqEpsilon a.Y b.Y epsilon || neqEpsilon a.Z b.Z epsilon || neqEpsilon a.W b.W epsilon then
71-
raise <| new Xunit.Sdk.EqualException(a,b)
71+
raise <| Xunit.Sdk.EqualException.ForMismatchedValues(a,b)
7272

7373
static member ApproximatelyEqualEpsilon(a : float32, b : float32) =
74-
if not <| approxEqSingleEpsilon a b then raise <| new Xunit.Sdk.EqualException(a,b)
74+
if not <| approxEqSingleEpsilon a b then raise <| Xunit.Sdk.EqualException.ForMismatchedValues(a,b)
7575

7676
static member ApproximatelyEqualEpsilon(a : float32, b : float32, c : float32) =
77-
if not <| approxEqSingleEpsilonWithError(a, b, c) then raise <| new Xunit.Sdk.EqualException(a,b)
77+
if not <| approxEqSingleEpsilonWithError(a, b, c) then raise <| Xunit.Sdk.EqualException.ForMismatchedValues(a,b)
7878

7979
static member ApproximatelyEqualEpsilon(a : float, b : float) =
80-
if not <| approxEqDoubleEpsilon a b then raise <| new Xunit.Sdk.EqualException(a,b)
80+
if not <| approxEqDoubleEpsilon a b then raise <| Xunit.Sdk.EqualException.ForMismatchedValues(a,b)
8181

8282
static member ApproximatelyEqualEpsilon(a : float, b : float, c : float) =
83-
if not <| approxEqDoubleEpsilonWithError(a, b, c) then raise <| new Xunit.Sdk.EqualException(a,b)
83+
if not <| approxEqDoubleEpsilonWithError(a, b, c) then raise <| Xunit.Sdk.EqualException.ForMismatchedValues(a,b)
8484

8585
static member ApproximatelyEqualDelta(a : float32, b : float32, c : float32) =
86-
if not <| approxEqEpsilon a b c then raise <| new Xunit.Sdk.EqualException(a,b)
86+
if not <| approxEqEpsilon a b c then raise <| Xunit.Sdk.EqualException.ForMismatchedValues(a,b)
8787

8888
static member ApproximatelyEqualDelta(a : Vector3, b : Vector3, tol : Vector3) =
8989
if neqTolerance a.X b.X tol.X || neqTolerance a.Y b.Y tol.Y || neqTolerance a.Z b.Z tol.Z then
90-
raise <| new Xunit.Sdk.EqualException(a,b)
90+
raise <| Xunit.Sdk.EqualException.ForMismatchedValues(a,b)
9191

9292
static member ApproximatelyEqualDelta(a : Vector2, b : Vector2, tol : Vector2) =
9393
if neqTolerance a.X b.X tol.X || neqTolerance a.Y b.Y tol.Y then
94-
raise <| new Xunit.Sdk.EqualException(a,b)
94+
raise <| Xunit.Sdk.EqualException.ForMismatchedValues(a,b)
9595

9696
static member NotApproximatelyEqualEpsilon(a : float32, b : float32) =
97-
if approxEqSingleEpsilon a b then raise <| new Xunit.Sdk.EqualException(a,b)
97+
if approxEqSingleEpsilon a b then raise <| Xunit.Sdk.EqualException.ForMismatchedValues(a,b)
9898

9999
static member NotApproximatelyEqualEpsilon(a : float32, b : float32, c : float32) =
100-
if approxEqSingleEpsilonWithError(a, b, c) then raise <| new Xunit.Sdk.EqualException(a,b)
100+
if approxEqSingleEpsilonWithError(a, b, c) then raise <| Xunit.Sdk.EqualException.ForMismatchedValues(a,b)
101101

102102

103103
static member NotApproximatelyEqualEpsilon(a : float, b : float) =
104-
if approxEqDoubleEpsilon a b then raise <| new Xunit.Sdk.EqualException(a,b)
104+
if approxEqDoubleEpsilon a b then raise <| Xunit.Sdk.EqualException.ForMismatchedValues(a,b)
105105

106106
static member NotApproximatelyEqualEpsilon(a : float, b : float, c : float) =
107-
if approxEqDoubleEpsilonWithError(a, b, c) then raise <| new Xunit.Sdk.EqualException(a,b)
107+
if approxEqDoubleEpsilonWithError(a, b, c) then raise <| Xunit.Sdk.EqualException.ForMismatchedValues(a,b)
108108

109109
static member ThrowsIndexExn(f:unit -> unit) = Assert.Throws<IndexOutOfRangeException>(f) |> ignore
110110

111111
static member ThrowsArgOutOfRangeExn(f:unit -> unit) = Assert.Throws<ArgumentOutOfRangeException>(f) |> ignore
112112

113113
static member ApproximatelyEqual(a : float32, b : float32) =
114-
if not <| approxEqDelta a b then raise <| new Xunit.Sdk.EqualException(a, b)
114+
if not <| approxEqDelta a b then raise <| Xunit.Sdk.EqualException.ForMismatchedValues(a,b)
115115

116116
static member EpsilonFromValue4Digits(v : float32) =
117117
MathF.Max(MathF.Pow(10.0f, MathF.Floor(MathF.Log10(MathF.Abs(v))) - 4.0f), 0.0001f)
118118

119119
static member AllComponentsPositiveOrZero(v : Vector2) =
120120
if not (v.X >= 0.0f && v.Y >= 0.0f) then
121-
raise <| new Xunit.Sdk.NotInRangeException(v, Vector2.Zero, null);
121+
raise <| Xunit.Sdk.NotInRangeException.ForValueInRange(v, Vector3.Zero, null);
122122

123123
static member AllComponentsPositiveOrZero(v : Vector3) =
124124
if not (v.X >= 0.0f && v.Y >= 0.0f && v.Z >= 0.0f) then
125-
raise <| Xunit.Sdk.NotInRangeException(v, Vector3.Zero, null);
125+
raise <| Xunit.Sdk.NotInRangeException.ForValueInRange(v, Vector3.Zero, null);
126126

127127
static member AllComponentsNan(v : Vector2) =
128128
if not (Single.IsNaN(v.X) && Single.IsNaN(v.Y)) then
129-
raise <| Xunit.Sdk.EqualException(Vector2(Single.NaN, Single.NaN), v)
129+
raise <| Xunit.Sdk.EqualException.ForMismatchedValues(Vector2(Single.NaN, Single.NaN), v)
130130

131131
static member AllComponentsNan(v : Vector3) =
132132
if not (Single.IsNaN(v.X) && Single.IsNaN(v.Y) && Single.IsNaN(v.Z)) then
133-
raise <| Xunit.Sdk.EqualException(Vector3(Single.NaN, Single.NaN, Single.NaN), v)
133+
raise <| Xunit.Sdk.EqualException.ForMismatchedValues(Vector2(Single.NaN, Single.NaN), v)
134134

135135
static member AllComponentsNan(v : Vector4) =
136136
if not (Single.IsNaN(v.X) && Single.IsNaN(v.Y) && Single.IsNaN(v.Z) && Single.IsNaN(v.W)) then
137-
raise <| Xunit.Sdk.EqualException(Vector4(Single.NaN, Single.NaN, Single.NaN, Single.NaN), v)
137+
raise <| Xunit.Sdk.EqualException.ForMismatchedValues(Vector2(Single.NaN, Single.NaN), v)

‎tests/OpenTK.Tests/OpenTK.Tests.fsproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>netcoreapp3.1</TargetFramework>
3+
<TargetFramework>net6.0</TargetFramework>
44
<Deterministic>true</Deterministic>
55
<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
66
</PropertyGroup>

0 commit comments

Comments
 (0)