From ef7ac25f703baca68881f8295d03be3d35465ccd Mon Sep 17 00:00:00 2001
From: Jamie Magee <jamagee@microsoft.com>
Date: Mon, 16 Dec 2024 21:50:16 -0800
Subject: [PATCH] chore(deps): migrate to xunit.v3

---
 src/Directory.Build.props                       |  1 +
 test/Directory.Build.props                      |  9 +++++++--
 .../Octokit.Webhooks.AzureFunctions.Test.csproj |  2 +-
 .../Octokit.Webhooks.Test.csproj                |  2 +-
 .../WebhookEventProcessorTests.cs               |  6 +++++-
 .../WebhookEventProcessorTestsData.cs           | 17 +++++------------
 .../Octokit.Webhooks.TestUtils.csproj           |  8 +-------
 7 files changed, 21 insertions(+), 24 deletions(-)

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index da3a4e53..f99c1cdc 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -5,6 +5,7 @@
   <PropertyGroup Label="Build">
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+    <SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
   </PropertyGroup>
 
   <PropertyGroup Label="Signing">
diff --git a/test/Directory.Build.props b/test/Directory.Build.props
index 71432f58..e45ab7ed 100644
--- a/test/Directory.Build.props
+++ b/test/Directory.Build.props
@@ -2,7 +2,12 @@
 
   <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))"/>
 
-  <ItemGroup Label="Package References">
+  <PropertyGroup Label="Build">
+    <TargetFramework>net9.0</TargetFramework>
+    <IsPackable>false</IsPackable>
+  </PropertyGroup>
+
+  <ItemGroup Label="Package References" Condition="'$(OutputType)' == 'Exe'">
     <PackageReference Include="CaseExtensions" Version="1.1.0"/>
     <PackageReference Include="coverlet.collector" PrivateAssets="all" Version="6.0.2">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -10,7 +15,7 @@
     <PackageReference Include="FluentAssertions" Version="7.0.0"/>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0"/>
     <PackageReference Include="Moq" Version="4.20.72"/>
-    <PackageReference Include="xunit" Version="2.9.2"/>
+    <PackageReference Include="xunit.v3" Version="1.0.0"/>
     <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="all" Version="3.0.0">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
diff --git a/test/Octokit.Webhooks.AzureFunctions.Test/Octokit.Webhooks.AzureFunctions.Test.csproj b/test/Octokit.Webhooks.AzureFunctions.Test/Octokit.Webhooks.AzureFunctions.Test.csproj
index 5a6013c1..38304491 100644
--- a/test/Octokit.Webhooks.AzureFunctions.Test/Octokit.Webhooks.AzureFunctions.Test.csproj
+++ b/test/Octokit.Webhooks.AzureFunctions.Test/Octokit.Webhooks.AzureFunctions.Test.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup Label="Build">
-    <TargetFramework>net9.0</TargetFramework>
+    <OutputType>Exe</OutputType>
   </PropertyGroup>
 
   <ItemGroup Label="Project References">
diff --git a/test/Octokit.Webhooks.Test/Octokit.Webhooks.Test.csproj b/test/Octokit.Webhooks.Test/Octokit.Webhooks.Test.csproj
index 8d90b292..77a20c84 100644
--- a/test/Octokit.Webhooks.Test/Octokit.Webhooks.Test.csproj
+++ b/test/Octokit.Webhooks.Test/Octokit.Webhooks.Test.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup Label="Build">
-    <TargetFramework>net9.0</TargetFramework>
+    <OutputType>Exe</OutputType>
   </PropertyGroup>
 
   <ItemGroup Label="Project References">
diff --git a/test/Octokit.Webhooks.Test/WebhookEventProcessorTests.cs b/test/Octokit.Webhooks.Test/WebhookEventProcessorTests.cs
index 01c98d33..aab50a9f 100644
--- a/test/Octokit.Webhooks.Test/WebhookEventProcessorTests.cs
+++ b/test/Octokit.Webhooks.Test/WebhookEventProcessorTests.cs
@@ -10,8 +10,12 @@ public class WebhookEventProcessorTests
 
     [Theory]
     [ClassData(typeof(WebhookEventProcessorTestsData))]
-    public void CanDeserialize(WebhookHeaders headers, string payload, Type expectedType)
+    public void CanDeserialize(string @event, string payload, Type expectedType)
     {
+        var headers = new WebhookHeaders
+        {
+            Event = @event,
+        };
         var result = this.webhookEventProcessor.DeserializeWebhookEvent(headers, payload);
         result.Should().BeAssignableTo(expectedType);
     }
diff --git a/test/Octokit.Webhooks.Test/WebhookEventProcessorTestsData.cs b/test/Octokit.Webhooks.Test/WebhookEventProcessorTestsData.cs
index 852f17ff..22275702 100644
--- a/test/Octokit.Webhooks.Test/WebhookEventProcessorTestsData.cs
+++ b/test/Octokit.Webhooks.Test/WebhookEventProcessorTestsData.cs
@@ -1,14 +1,16 @@
 namespace Octokit.Webhooks.Test;
 
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.IO;
 using CaseExtensions;
 using Octokit.Webhooks.TestUtils;
+using Xunit;
 
-public class WebhookEventProcessorTestsData : IEnumerable<object[]>
+public class WebhookEventProcessorTestsData : IEnumerable<TheoryDataRow<string, string, Type>>
 {
-    public IEnumerator<object[]> GetEnumerator()
+    public IEnumerator<TheoryDataRow<string, string, Type>> GetEnumerator()
     {
         var resourcesDirectory = ResourceUtils.GetResources();
         var files = Directory.GetFiles(resourcesDirectory, "*.json", SearchOption.AllDirectories);
@@ -16,18 +18,9 @@ public IEnumerator<object[]> GetEnumerator()
         {
             var relativeResource = file.Replace($"{resourcesDirectory}{Path.DirectorySeparatorChar}", string.Empty);
             var parts = relativeResource.Split(Path.DirectorySeparatorChar);
-            var headers = new WebhookHeaders
-            {
-                Event = parts[0],
-            };
             var expectedType = ClassUtils.GetEventTypeByName(parts[0].ToPascalCase());
             var content = ResourceUtils.ReadResource(relativeResource);
-            yield return new object[]
-            {
-                headers,
-                content,
-                expectedType,
-            };
+            yield return new TheoryDataRow<string, string, Type>(parts[0], content, expectedType);
         }
     }
 
diff --git a/test/Octokit.Webhooks.TestUtils/Octokit.Webhooks.TestUtils.csproj b/test/Octokit.Webhooks.TestUtils/Octokit.Webhooks.TestUtils.csproj
index d4a4afdc..d6ca42c7 100644
--- a/test/Octokit.Webhooks.TestUtils/Octokit.Webhooks.TestUtils.csproj
+++ b/test/Octokit.Webhooks.TestUtils/Octokit.Webhooks.TestUtils.csproj
@@ -1,7 +1 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup Label="Build">
-    <TargetFramework>net9.0</TargetFramework>
-  </PropertyGroup>
-
-</Project>
+<Project Sdk="Microsoft.NET.Sdk"/>