From 1e2397d4fe1333757cf95e0cb6885f51fb19f879 Mon Sep 17 00:00:00 2001
From: Andrew Arnott <andrewarnott@live.com>
Date: Sun, 16 Jul 2023 18:27:19 -0600
Subject: [PATCH 1/2] Restore copyright notice to PairwiseStrategy

Fixes #78
---
 src/Xunit.Combinatorial/PairwiseStrategy.cs | 23 +++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/src/Xunit.Combinatorial/PairwiseStrategy.cs b/src/Xunit.Combinatorial/PairwiseStrategy.cs
index a1050d7..a307438 100644
--- a/src/Xunit.Combinatorial/PairwiseStrategy.cs
+++ b/src/Xunit.Combinatorial/PairwiseStrategy.cs
@@ -1,5 +1,28 @@
 // Copyright (c) Andrew Arnott. All rights reserved. Licensed under the Ms-PL.
 
+// ***********************************************************************
+// Copyright (c) 2008 Charlie Poole
+// Copyright (c) 2015 Andrew Arnott (modified from Charlie's original)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+// ***********************************************************************
 namespace Xunit
 {
     using System;

From 79e5df49eb0be6f656428bc40f16bb7886a89299 Mon Sep 17 00:00:00 2001
From: Andrew Arnott <andrewarnott@live.com>
Date: Sun, 16 Jul 2023 18:41:30 -0600
Subject: [PATCH 2/2] Fix build break in v1.5 branch

---
 global.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/global.json b/global.json
index 973759e..c8733e2 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "6.0.100-rc.2.21505.57",
+    "version": "6.0.100",
     "rollForward": "patch",
     "allowPrerelease": true
   }