From fd21f83b1a108a9630885f215fed529bc12e1129 Mon Sep 17 00:00:00 2001
From: Bassam Khouri <bkhouri@apple.com>
Date: Thu, 19 Dec 2024 21:43:46 -0500
Subject: [PATCH] Tool version updates

Update the ToolsVersion data structure to include the 6.1.0 release, and
update some references to ToolsVersion.vNext and 999.0 to non-development
releases.
---
 Sources/PackageModel/ToolsVersion.swift   |  1 +
 Tests/WorkspaceTests/WorkspaceTests.swift | 18 ++++++++++++++++--
 Utilities/build-using-self                |  3 +++
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/Sources/PackageModel/ToolsVersion.swift b/Sources/PackageModel/ToolsVersion.swift
index 571882a2126..1fd6abb6c66 100644
--- a/Sources/PackageModel/ToolsVersion.swift
+++ b/Sources/PackageModel/ToolsVersion.swift
@@ -32,6 +32,7 @@ public struct ToolsVersion: Equatable, Hashable, Codable, Sendable {
     public static let v5_9 = ToolsVersion(version: "5.9.0")
     public static let v5_10 = ToolsVersion(version: "5.10.0")
     public static let v6_0 = ToolsVersion(version: "6.0.0")
+    public static let v6_1 = ToolsVersion(version: "6.1.0")
     public static let vNext = ToolsVersion(version: "999.0.0")
 
     /// The current tools version in use.
diff --git a/Tests/WorkspaceTests/WorkspaceTests.swift b/Tests/WorkspaceTests/WorkspaceTests.swift
index d4296f32302..f89e018de30 100644
--- a/Tests/WorkspaceTests/WorkspaceTests.swift
+++ b/Tests/WorkspaceTests/WorkspaceTests.swift
@@ -217,11 +217,25 @@ final class WorkspaceTests: XCTestCase {
                 XCTAssertMatch(try ws.interpreterFlags(for: packageManifest), [.equal("-swift-version"), .equal("6")])
             }
 
+            do {
+                let ws = try createWorkspace(
+                    """
+                    // swift-tools-version:5.9.2
+                    import PackageDescription
+                    let package = Package(
+                        name: "foo"
+                    )
+                    """
+                )
+
+                XCTAssertMatch(try ws.interpreterFlags(for: packageManifest), [.equal("-swift-version"), .equal("5")])
+            }
+
             do {
                 // Invalid package manifest should still produce build settings.
                 let ws = try createWorkspace(
                     """
-                    // swift-tools-version:999.0
+                    // swift-tools-version:5.9.2
                     import PackageDescription
                     """
                 )
@@ -4122,7 +4136,7 @@ final class WorkspaceTests: XCTestCase {
                         .sourceControl(url: "https://localhost/org/foo", requirement: .upToNextMajor(from: "1.0.0")),
                         .sourceControl(url: "https://localhost/org/bar", requirement: .upToNextMinor(from: "1.1.0"))
                     ],
-                    toolsVersion: .vNext // change to the one after 5.9
+                    toolsVersion: .v5_10
                 ),
             ],
             packages: [
diff --git a/Utilities/build-using-self b/Utilities/build-using-self
index 543d01d5782..c1277db00e1 100755
--- a/Utilities/build-using-self
+++ b/Utilities/build-using-self
@@ -32,6 +32,9 @@ set -x
 
 env | sort
 
+# Display toolchain version
+swift --version
+
 # Perform package update in order to get the latest commits for the dependencies.
 swift package update
 swift build -c $CONFIGURATION