From 7d9232ba350df32d62ffa3c28d09f474b3accb68 Mon Sep 17 00:00:00 2001
From: Oski Kervinen <oski.kervinen@m-files.com>
Date: Mon, 30 Jan 2023 12:11:53 +0200
Subject: [PATCH] Make usable as a NuGet package

* End assembly file name in .TestAdapter to make VS recognize
  it from a nuget package.
* Create Catch2TestAdapter.nuspec to configure the nuget package.
  I tried embedding the nuget metadata in the project, but could
  not get it to support the exotic combination of having .NET
  assemblies that are meant to be installed in a native project.

See https://github.com/microsoft/vstest/blob/main/docs/RFCs/0004-Adapter-Extensibility.md
Command to generate the package:
`nuget pack .\Catch2TestAdapter.csproj -Version 1.8.0 -IncludeReferencedProjects -p Configuration=Debug`
---
 Libraries/Catch2.TestAdapter.nuspec           | 30 +++++++++++++++++++
 .../Catch2TestAdapter.csproj                  |  2 +-
 2 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 Libraries/Catch2.TestAdapter.nuspec

diff --git a/Libraries/Catch2.TestAdapter.nuspec b/Libraries/Catch2.TestAdapter.nuspec
new file mode 100644
index 0000000..c715bc6
--- /dev/null
+++ b/Libraries/Catch2.TestAdapter.nuspec
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<package >
+  <metadata>
+    <id>Catch2.TestAdapter</id>
+    <version>$version$</version>
+    <title>Visual Studio Test Adapter for Catch2</title>
+    <authors>JohnnyHendriks</authors>
+    <owners>JohnnyHendriks</owners>
+    <projectUrl>https://github.com/JohnnyHendriks/TestAdapter_Catch2</projectUrl>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <license type="expression">MIT</license>
+    <description>
+        Class library containing the Visual Studio Test Adapter for Catch2
+    </description>
+    <releaseNotes></releaseNotes>
+    <copyright></copyright>
+    <tags>native catch2 test adapter</tags>
+    <dependencies>
+      <group targetFramework="native" />
+    </dependencies>
+  </metadata>
+  <files>
+    <!-- Must copy the files to the folder "native" to make the package installable in native projects.
+         The Visual Studio test window recognizes any file named *.TestAdapter.dll in a nuget package
+         as a potential adapter, not caring about the platform. See
+         https://github.com/microsoft/vstest/blob/main/docs/RFCs/0004-Adapter-Extensibility.md -->
+    <file src="Catch2TestAdapter\bin\$configuration$\Catch2.TestAdapter.dll" target="lib\native\" />
+    <file src="Catch2Interface\bin\$configuration$\Catch2Interface.dll" target="lib\native\" />
+  </files>
+</package>
diff --git a/Libraries/Catch2TestAdapter/Catch2TestAdapter.csproj b/Libraries/Catch2TestAdapter/Catch2TestAdapter.csproj
index 9e932d1..a7a14d6 100644
--- a/Libraries/Catch2TestAdapter/Catch2TestAdapter.csproj
+++ b/Libraries/Catch2TestAdapter/Catch2TestAdapter.csproj
@@ -12,7 +12,7 @@
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Catch2TestAdapter</RootNamespace>
-    <AssemblyName>Catch2TestAdapter</AssemblyName>
+    <AssemblyName>Catch2.TestAdapter</AssemblyName>
     <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>