From 76d1145aebec10b0aca3d00b41ea9cb2d48f6234 Mon Sep 17 00:00:00 2001
From: Ben Barham <ben_barham@apple.com>
Date: Tue, 9 Sep 2025 13:31:00 -0700
Subject: [PATCH 1/2] Update isDevelopment check on 6.2

---
 Sources/Basics/SwiftVersion.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Sources/Basics/SwiftVersion.swift b/Sources/Basics/SwiftVersion.swift
index 81f6b27b07f..1b2b0f76ae4 100644
--- a/Sources/Basics/SwiftVersion.swift
+++ b/Sources/Basics/SwiftVersion.swift
@@ -59,7 +59,7 @@ extension SwiftVersion {
     /// The current version of the package manager.
     public static let current = SwiftVersion(
         version: (6, 2, 0),
-        isDevelopment: true,
+        isDevelopment: false,
         buildIdentifier: getBuildIdentifier()
     )
 }

From 67f61b6090b7fe565a80764a68610668b0987e5e Mon Sep 17 00:00:00 2001
From: Sam Khouri <bkhouri@apple.com>
Date: Wed, 10 Sep 2025 09:57:45 -0400
Subject: [PATCH 2/2] disable Development mode

---
 .../PDAppleProductLoadingTests.swift          |  2 +-
 .../PD_Next_LoadingTests.swift                |  2 +-
 .../TraitLoadingTests.swift                   |  2 +-
 Tests/WorkspaceTests/WorkspaceTests.swift     | 49 +++++++++++++++++++
 4 files changed, 52 insertions(+), 3 deletions(-)

diff --git a/Tests/PackageLoadingTests/PDAppleProductLoadingTests.swift b/Tests/PackageLoadingTests/PDAppleProductLoadingTests.swift
index 3b918859da4..2bd05cfbb1c 100644
--- a/Tests/PackageLoadingTests/PDAppleProductLoadingTests.swift
+++ b/Tests/PackageLoadingTests/PDAppleProductLoadingTests.swift
@@ -18,7 +18,7 @@ import PackageLoading
 
 class PackageDescriptionAppleProductLoadingTests: PackageDescriptionLoadingTests {
     override var toolsVersion: ToolsVersion {
-        .vNext
+        .v6_0 // TODO: confirm this value
     }
 
     func testApplicationProducts() throws {
diff --git a/Tests/PackageLoadingTests/PD_Next_LoadingTests.swift b/Tests/PackageLoadingTests/PD_Next_LoadingTests.swift
index 7adc59f0761..d254a47112d 100644
--- a/Tests/PackageLoadingTests/PD_Next_LoadingTests.swift
+++ b/Tests/PackageLoadingTests/PD_Next_LoadingTests.swift
@@ -16,7 +16,7 @@ import PackageModel
 import _InternalTestSupport
 import XCTest
 
-class PackageDescriptionNextLoadingTests: PackageDescriptionLoadingTests {
+final class PackageDescriptionNextLoadingTests: PackageDescriptionLoadingTests {
     override var toolsVersion: ToolsVersion {
         .vNext
     }
diff --git a/Tests/PackageLoadingTests/TraitLoadingTests.swift b/Tests/PackageLoadingTests/TraitLoadingTests.swift
index ed775bd7971..6f2378fd694 100644
--- a/Tests/PackageLoadingTests/TraitLoadingTests.swift
+++ b/Tests/PackageLoadingTests/TraitLoadingTests.swift
@@ -18,7 +18,7 @@ import XCTest
 
 final class TraitLoadingTests: PackageDescriptionLoadingTests {
     override var toolsVersion: ToolsVersion {
-        .vNext
+        .v6_1
     }
 
     func testTraits() async throws {
diff --git a/Tests/WorkspaceTests/WorkspaceTests.swift b/Tests/WorkspaceTests/WorkspaceTests.swift
index 2af54fc2529..5c88dcdd530 100644
--- a/Tests/WorkspaceTests/WorkspaceTests.swift
+++ b/Tests/WorkspaceTests/WorkspaceTests.swift
@@ -227,8 +227,57 @@ final class WorkspaceTests: XCTestCase {
                     )
                     """
                 )
+                if SwiftVersion.current.isDevelopment {
+                    XCTAssertMatch(try ws.interpreterFlags(for: packageManifest), [.equal("-swift-version"), .equal("6")])
+                } else {
+                    XCTAssertThrowsError(
+                        try ws.interpreterFlags(for: packageManifest)
+                    )
+                }
+            }
+
+            do {
+                let ws = try createWorkspace(
+                """
+                // swift-tools-version:6.0
+                import PackageDescription
+                let package = Package(
+                    name: "foo"
+                )
+                """
+                )
+
+                XCTAssertMatch(try ws.interpreterFlags(for: packageManifest), [.equal("-swift-version"), .equal("6")])
+            }
+
+            do {
+                let ws = try createWorkspace(
+                """
+                // swift-tools-version:6.1
+                import PackageDescription
+                let package = Package(
+                    name: "foo"
+                )
+                """
+                )
+
+                XCTAssertMatch(try ws.interpreterFlags(for: packageManifest), [.equal("-swift-version"), .equal("6")])
+                XCTAssertMatch(try ws.interpreterFlags(for: packageManifest), [.equal("-package-description-version"), .equal("6.1.0")])
+            }
+
+            do {
+                let ws = try createWorkspace(
+                """
+                // swift-tools-version:6.2
+                import PackageDescription
+                let package = Package(
+                    name: "foo"
+                )
+                """
+                )
 
                 XCTAssertMatch(try ws.interpreterFlags(for: packageManifest), [.equal("-swift-version"), .equal("6")])
+                XCTAssertMatch(try ws.interpreterFlags(for: packageManifest), [.equal("-package-description-version"), .equal("6.2.0")])
             }
 
             do {