From 5aebb5f59adc406cfdd8b33c60f8785c490b03cd Mon Sep 17 00:00:00 2001
From: Bassam Khouri <bkhouri@apple.com>
Date: Thu, 24 Oct 2024 15:55:10 -0400
Subject: [PATCH] Disabled SwiftVersion development mode

---
 Sources/Basics/SwiftVersion.swift         | 2 +-
 Tests/WorkspaceTests/WorkspaceTests.swift | 7 +++++--
 Utilities/build-using-self                | 3 +++
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/Sources/Basics/SwiftVersion.swift b/Sources/Basics/SwiftVersion.swift
index e183b7af9d7..7ca4db42fd8 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, 0, 3),
-        isDevelopment: true,
+        isDevelopment: false,
         buildIdentifier: getBuildIdentifier()
     )
 }
diff --git a/Tests/WorkspaceTests/WorkspaceTests.swift b/Tests/WorkspaceTests/WorkspaceTests.swift
index 0738f786247..c825e3b6b65 100644
--- a/Tests/WorkspaceTests/WorkspaceTests.swift
+++ b/Tests/WorkspaceTests/WorkspaceTests.swift
@@ -213,7 +213,10 @@ final class WorkspaceTests: XCTestCase {
                     """
                 )
 
-                XCTAssertMatch(ws.interpreterFlags(for: foo), [.equal("-swift-version"), .equal("6")])
+                XCTAssertMatch(
+                    ws.interpreterFlags(for: foo),
+                    (SwiftVersion.current.isDevelopment) ? [.equal("-swift-version"), .equal("6")] : []
+                )
             }
         }
     }
@@ -4015,7 +4018,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 1d6a1552993..b9a78ef88ab 100755
--- a/Utilities/build-using-self
+++ b/Utilities/build-using-self
@@ -23,6 +23,9 @@ export SWIFTCI_IS_SELF_HOSTED=1
 
 set -x
 
+# 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