Merge main to 6.2

.editorconfig

@@ -0,0 +1,13 @@
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+indent_size = 4
+indent_style = space
+insert_final_newline = true
+trim_trailing_whitespace = true
+xcode_trim_whitespace_on_empty_lines = true
+
+[*.{yml,yaml}]
+indent_size = 2

CONTRIBUTING.md

@@ -88,7 +88,7 @@ $> swift --version
 Apple Swift version 5.3
 ```
 
-Note: Alternatively use tools like [swiftenv](https://github.com/kylef/swiftenv) that help manage toolchains versions.
+Note: Alternatively use tools like [swiftly](https://www.swift.org/swiftly/documentation/swiftlydocs/) that help manage toolchains versions.
 
 ## Local Development
 

Documentation/Usage.md

@@ -497,7 +497,7 @@ This feature is intended for use in the following scenarios:
 
 It is *not* expected that the packages would ever use this feature unless absolutely
 necessary to support existing clients. Specifically, packages *should not*
-adopt this syntax for tagging versions supporting the _latest GM_ Swift
+adopt this syntax for tagging versions supporting the _latest released_ Swift
 version.
 
 The package manager supports looking for any of the following marked tags, in
@@ -511,7 +511,7 @@ order of preference:
 
 The package manager will additionally look for a version-specific marked
 manifest version when loading the particular version of a package, by searching
-for a manifest in the form of `Package@swift-3.swift`. The set of markers
+for a manifest in the form of `Package@swift-6.swift`. The set of markers
 looked for is the same as for version-specific tag selection.
 
 This feature is intended for use in cases where a package wishes to maintain
@@ -521,20 +521,28 @@ changes in the manifest API).
 
 It is *not* expected the packages would ever use this feature unless absolutely
 necessary to support existing clients. Specifically, packages *should not*
-adopt this syntax for tagging versions supporting the _latest GM_ Swift
+adopt this syntax for tagging versions supporting the _latest released_ Swift
 version.
 
 In case the current Swift version doesn't match any version-specific manifest,
 the package manager will pick the manifest with the most compatible tools
 version. For example, if there are three manifests:
 
-`Package.swift` (tools version 3.0)
-`Package@swift-4.swift` (tools version 4.0)
-`Package@swift-4.2.swift` (tools version 4.2)
+- `Package.swift` (tools version 6.0)
+- `Package@swift-5.10.swift` (tools version 5.10)
+- `Package@swift-5.9.swift` (tools version 5.9)
 
-The package manager will pick `Package.swift` on Swift 3, `[email protected]` on
-Swift 4, and `[email protected]` on Swift 4.2 and above because its tools
-version will be most compatible with future version of the package manager.
+The package manager will pick `Package.swift` on Swift 6 and above, because its
+tools version will be most compatible with future version of the package manager.
+When using Swift 5.10, it will pick `[email protected]`. Otherwise, when
+using Swift 5.9 it will pick `[email protected]`, and this is the minimum
+tools version this package may be used with.
+
+A package may have versioned manifest files which specify newer tools versions
+than its unversioned `Package.swift` file[^1]. In this scenario, the manifest
+corresponding to the newest-compatible tools version will be used.
+
+[^1]: Support for having a versioned manifest file with a _newer_ tools version was required when the feature was first introduced, because prior versions of the package manager were not aware of the concept and only knew to look for the unversioned `Package.swift`. This is still supported, but there have been many Swift releases since the feature was introduced and it is now considered best practice to have `Package.swift` declare the newest-supported tools version and for versioned manifest files to only specifer older versions.
 
 ## Editing a Package
 

IntegrationTests/Sources/IntegrationTestSupport/Helpers.swift

@@ -106,7 +106,7 @@ public let lldb: AbsolutePath = {
 }()
 
 public let swiftpmBinaryDirectory: AbsolutePath = {
-    if let environmentPath = ProcessInfo.processInfo.environment["SWIFTPM_BIN_DIR"] {
+    if let environmentPath = ProcessInfo.processInfo.environment["SWIFTPM_CUSTOM_BIN_DIR"] {
         return try! AbsolutePath(validating: environmentPath)
     }
 

IntegrationTests/Tests/IntegrationTests/BasicTests.swift

@@ -94,7 +94,7 @@ private struct BasicTests {
     }
 
     @Test(
-        .skipHostOS(.windows, "'try!' expression unexpectedly raised an error: TSCBasic.Process.Error.missingExecutableProgram(program: \"which\")"),
+        .skipHostOS(.windows, "'try!' expression unexpectedly raised an error: TSCBasic.Process.Error.missingExecutableProgram(program: \"which\")")
     )
     func testSwiftCompiler() throws {
         try withTemporaryDirectory { tempDir in

IntegrationTests/Tests/IntegrationTests/SwiftPMTests.swift

@@ -75,64 +75,79 @@ private struct SwiftPMTests {
     }
 
     @Test(
+        .requireThreadSafeWorkingDirectory,
+        arguments: [BuildSystemProvider.native]
+    )
+    func packageInitExecutable(_ buildSystemProvider: BuildSystemProvider) throws {
+        try _packageInitExecutable(buildSystemProvider)
+    }
+
+    @Test(
+        .skipHostOS(.windows),
         .requireThreadSafeWorkingDirectory,
         .bug(
             "https://github.com/swiftlang/swift-package-manager/issues/8416",
-            "swift run using --build-system swiftbuild fails to run executable"
+            "[Linux] swift run using --build-system swiftbuild fails to run executable"
         ),
-        arguments: BuildSystemProvider.allCases
+        .bug(
+            "https://github.com/swiftlang/swift-package-manager/issues/8514",
+            "[Windows] Integration test SwiftPMTests.packageInitExecutable with --build-system swiftbuild is skipped"
+        ),
+        arguments: [BuildSystemProvider.swiftbuild]
     )
-    func packageInitExecutable(_ buildSystemProvider: BuildSystemProvider) throws {
-        // Executable
-        do {
-            try withTemporaryDirectory { tmpDir in
-                let packagePath = tmpDir.appending(component: "foo")
-                try localFileSystem.createDirectory(packagePath)
-                try sh(swiftPackage, "--package-path", packagePath, "init", "--type", "executable")
-                try sh(swiftBuild, "--package-path", packagePath, "--build-system", buildSystemProvider.rawValue)
-
-                try withKnownIssue("Error while loading shared libraries: libswiftCore.so: cannot open shared object file: No such file or directory") {
-                    // The 'native' build system uses 'swiftc' as the linker driver, which adds an RUNPATH to the swift runtime libraries in the SDK.
-                    // 'swiftbuild' directly calls clang, which does not add the extra RUNPATH, so runtime libraries cannot be found.
-                    let (stdout, stderr) = try sh(
-                        swiftRun, "--package-path", packagePath, "--build-system", buildSystemProvider.rawValue
-                    )
-                    #expect(!stderr.contains("error:"))
-                    #expect(stdout.contains("Hello, world!"))
-                } when: {
-                    buildSystemProvider == .swiftbuild && ProcessInfo.hostOperatingSystem == .linux
-                }
+    func packageInitExecutablSkipWindows(_ buildSystemProvider: BuildSystemProvider) throws {
+        try _packageInitExecutable(buildSystemProvider)
+    }
+
+    private func _packageInitExecutable(_ buildSystemProvider: BuildSystemProvider) throws {
+        try withTemporaryDirectory { tmpDir in
+            let packagePath = tmpDir.appending(component: "foo")
+            try localFileSystem.createDirectory(packagePath)
+            try sh(swiftPackage, "--package-path", packagePath, "init", "--type", "executable")
+            try sh(swiftBuild, "--package-path", packagePath, "--build-system", buildSystemProvider.rawValue)
+
+            try withKnownIssue("Error while loading shared libraries: libswiftCore.so: cannot open shared object file: No such file or directory") {
+                // The 'native' build system uses 'swiftc' as the linker driver, which adds an RUNPATH to the swift runtime libraries in the SDK.
+                // 'swiftbuild' directly calls clang, which does not add the extra RUNPATH, so runtime libraries cannot be found.
+                let (stdout, stderr) = try sh(
+                    swiftRun, "--package-path", packagePath, "--build-system", buildSystemProvider.rawValue
+                )
+                #expect(!stderr.contains("error:"))
+                #expect(stdout.contains("Hello, world!"))
+            } when: {
+                buildSystemProvider == .swiftbuild && ProcessInfo.hostOperatingSystem == .linux
+            }
             }
-        }
     }
 
     @Test(
         .requireThreadSafeWorkingDirectory,
         .bug(id: 0, "SWBINTTODO: Linux: /lib/x86_64-linux-gnu/Scrt1.o:function _start: error:"),
         .bug("https://github.com/swiftlang/swift-package-manager/issues/8380", "lld-link: error: subsystem must be defined"),
-        .bug(id:0, "SWBINTTODO: MacOS: Could not find or use auto-linked library 'Testing': library 'Testing' not found"),
+        .bug(id: 0, "SWBINTTODO: MacOS: Could not find or use auto-linked library 'Testing': library 'Testing' not found"),
         arguments: BuildSystemProvider.allCases
     )
     func packageInitLibrary(_ buildSystemProvider: BuildSystemProvider) throws {
-        do {
-            try withTemporaryDirectory { tmpDir in
-                let packagePath = tmpDir.appending(component: "foo")
-                try localFileSystem.createDirectory(packagePath)
-                try sh(swiftPackage, "--package-path", packagePath, "init", "--type", "library")
-                try withKnownIssue("""
-                       Linux: /lib/x86_64-linux-gnu/Scrt1.o:function _start: error: undefined reference to 'main'
-                       Windows: lld-link: error: subsystem must be defined
-                       MacOS: Could not find or use auto-linked library 'Testing': library 'Testing' not found
-                    """) {
-                    try sh(swiftBuild, "--package-path", packagePath, "--build-system", buildSystemProvider.rawValue, "--vv")
-                    let (stdout, stderr) = try sh(
-                        swiftTest, "--package-path", packagePath, "--build-system", buildSystemProvider.rawValue, "--vv"
-                    )
-                    #expect(!stderr.contains("error:"))
-                    #expect(stdout.contains("Test Suite 'All tests' passed"))
-                } when: {
-                    buildSystemProvider == .swiftbuild
-                }
+        try withTemporaryDirectory { tmpDir in
+            let packagePath = tmpDir.appending(component: "foo")
+            try localFileSystem.createDirectory(packagePath)
+            try sh(swiftPackage, "--package-path", packagePath, "init", "--type", "library")
+            try withKnownIssue(
+                """
+                Linux: /lib/x86_64-linux-gnu/Scrt1.o:function _start: error: undefined reference to 'main'
+                Windows: lld-link: error: subsystem must be defined
+                MacOS: Could not find or use auto-linked library 'Testing': library 'Testing' not found
+                """,
+                isIntermittent: true
+            ) {
+                try sh(swiftBuild, "--package-path", packagePath, "--build-system", buildSystemProvider.rawValue, "--vv")
+                let (stdout, stderr) = try sh(
+                    swiftTest, "--package-path", packagePath, "--build-system", buildSystemProvider.rawValue, "--vv"
+                )
+                #expect(!stderr.contains("error:"))
+                #expect(stdout.contains("Test Suite 'All tests' passed"))
+            } when: {
+                buildSystemProvider == .swiftbuild
             }
         }
     }