From 7a348749a0ec96c7e0af2ca281a106ff4b410a57 Mon Sep 17 00:00:00 2001
From: Jonathan Grynspan <jgrynspan@apple.com>
Date: Thu, 19 Dec 2024 18:04:16 -0500
Subject: [PATCH 1/2] Remove the workaround for swift-package-manager-#8111.

Remove the workaround for https://github.com/swiftlang/swift-package-manager/issues/8111.
The issue has been resolved and Windows correctly exports symbols from dynamic library
targets.
---
 Package.swift                               | 1 +
 Tests/TestingTests/ABIEntryPointTests.swift | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/Package.swift b/Package.swift
index 266ea2a7d..30d852632 100644
--- a/Package.swift
+++ b/Package.swift
@@ -28,6 +28,7 @@ let package = Package(
   products: [
     .library(
       name: "Testing",
+      type: .dynamic,
       targets: ["Testing"]
     ),
   ],
diff --git a/Tests/TestingTests/ABIEntryPointTests.swift b/Tests/TestingTests/ABIEntryPointTests.swift
index db9440033..f259fc8cf 100644
--- a/Tests/TestingTests/ABIEntryPointTests.swift
+++ b/Tests/TestingTests/ABIEntryPointTests.swift
@@ -129,7 +129,6 @@ struct ABIEntryPointTests {
     passing arguments: __CommandLineArguments_v0,
     recordHandler: @escaping @Sendable (_ recordJSON: UnsafeRawBufferPointer) -> Void = { _ in }
   ) async throws -> Bool {
-#if !(!SWT_FIXED_SWIFTPM_8111 && os(Windows))
 #if !os(Linux) && !os(FreeBSD) && !os(Android) && !SWT_NO_DYNAMIC_LINKING
     // Get the ABI entry point by dynamically looking it up at runtime.
     //
@@ -143,7 +142,6 @@ struct ABIEntryPointTests {
         }
       )
     }
-#endif
 #endif
     let abiEntryPoint = unsafeBitCast(abiv0_getEntryPoint(), to: ABIv0.EntryPoint.self)
 

From cd72caa8926d0d3bf20d421ad69e7aa2b9905016 Mon Sep 17 00:00:00 2001
From: Jonathan Grynspan <jgrynspan@apple.com>
Date: Fri, 20 Dec 2024 12:15:23 -0500
Subject: [PATCH 2/2] Add comment

---
 Package.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Package.swift b/Package.swift
index 30d852632..3cf7a1e12 100644
--- a/Package.swift
+++ b/Package.swift
@@ -28,7 +28,7 @@ let package = Package(
   products: [
     .library(
       name: "Testing",
-      type: .dynamic,
+      type: .dynamic, // needed so Windows exports ABI entry point symbols
       targets: ["Testing"]
     ),
   ],