From fbce3d22aaafad1cde3bd6c51bce342f1522f330 Mon Sep 17 00:00:00 2001
From: Kai Jellinghaus <contact@kaij.tech>
Date: Fri, 12 Aug 2022 11:29:14 +0200
Subject: [PATCH 1/2] Merge origin/develop/3.0

---
 Directory.Packages.props | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Directory.Packages.props b/Directory.Packages.props
index 9eaa25b08f..02bd76565d 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -30,8 +30,8 @@
         <PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="$(MsExtensionNugetVersion)"/>
         <PackageVersion Include="Microsoft.Extensions.Options" Version="$(MsExtensionNugetVersion)"/>
         <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.3.0"/>
-        <PackageVersion Include="xunit" Version="2.4.1"/>
-        <PackageVersion Include="xunit.runner.visualstudio" Version="2.4.3"/>
+        <PackageVersion Include="xunit" Version="2.4.2"/>
+        <PackageVersion Include="xunit.runner.visualstudio" Version="2.4.5"/>
         <PackageVersion Include="Statiq.Core" Version="1.0.0-beta.48"/>
         <PackageVersion Include="HtmlAgilityPack" Version="1.11.43"/>
         <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="3.11.0"/>

From 6e94aa9a7a870f6b541eabd7097b569b95fb57b4 Mon Sep 17 00:00:00 2001
From: Kai Jellinghaus <contact@kaij.tech>
Date: Fri, 12 Aug 2022 11:34:27 +0200
Subject: [PATCH 2/2] Change order

---
 tests/Silk.NET.Maths.Tests/Vector2Tests.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/Silk.NET.Maths.Tests/Vector2Tests.cs b/tests/Silk.NET.Maths.Tests/Vector2Tests.cs
index c7e6d4086b..a3fe0665b8 100644
--- a/tests/Silk.NET.Maths.Tests/Vector2Tests.cs
+++ b/tests/Silk.NET.Maths.Tests/Vector2Tests.cs
@@ -815,8 +815,8 @@ public void Vector2ConstructorTest2()
         public void Vector2ConstructorTest3()
         {
             Vector2D<float> target = new Vector2D<float>(float.NaN, float.MaxValue);
-            Assert.Equal(target.X, float.NaN);
-            Assert.Equal(target.Y, float.MaxValue);
+            Assert.Equal(float.NaN, target.X);
+            Assert.Equal(float.MaxValue, target.Y);
         }
 
         // A test for Vector2f (float)