6.2 merge main (#8580)

Co-authored-by: Paulo Mattos <[email protected]>
Co-authored-by: Bassam (Sam) Khouri <[email protected]>
Co-authored-by: Stuart Montgomery <[email protected]>
Co-authored-by: Yuta Saito <[email protected]>
Co-authored-by: nate-chandler <[email protected]>
Co-authored-by: Max Desiatov <[email protected]>
Co-authored-by: 3405691582 <[email protected]>
Co-authored-by: Chris McGee <[email protected]>
Co-authored-by: Dave Inglis <[email protected]>
Co-authored-by: Jonathan Grynspan <[email protected]>
Co-authored-by: Jake Petroules <[email protected]>
Co-authored-by: Shawn Hyam <[email protected]>
Co-authored-by: Paul LeMarquand <[email protected]>
Co-authored-by: Pavel Yaskevich <[email protected]>
Co-authored-by: johnbute <[email protected]>
Co-authored-by: John Bute <[email protected]>
Co-authored-by: Joseph Heck <[email protected]>
Co-authored-by: kcieplak <[email protected]>

Author: 19 people

Package.swift

@@ -815,11 +815,17 @@ let package = Package(
                 "Archiver/Inputs/invalid_archive.tar.gz",
                 "Archiver/Inputs/invalid_archive.zip",
                 "processInputs/long-stdout-stderr",
+                "processInputs/long-stdout-stderr.bat",
                 "processInputs/exit4",
+                "processInputs/exit4.bat",
                 "processInputs/simple-stdout-stderr",
+                "processInputs/simple-stdout-stderr.bat",
                 "processInputs/deadlock-if-blocking-io",
+                "processInputs/deadlock-if-blocking-io.bat",
                 "processInputs/echo",
+                "processInputs/echo.bat",
                 "processInputs/in-to-out",
+                "processInputs/in-to-out.bat",
             ]
         ),
         .testTarget(

Sources/Basics/Concurrency/AsyncProcess.swift

@@ -387,6 +387,20 @@ package final class AsyncProcess {
         self.loggingHandler = loggingHandler ?? AsyncProcess.loggingHandler
     }
 
+    package convenience init(
+        args: [String],
+        environment: Environment = .current,
+        outputRedirection: OutputRedirection = .collect,
+        loggingHandler: LoggingHandler? = .none
+    ) {
+        self.init(
+            arguments: args,
+            environment: environment,
+            outputRedirection: outputRedirection,
+            loggingHandler: loggingHandler
+        )
+    }
+
     package convenience init(
         args: String...,
         environment: Environment = .current,

Sources/Commands/SwiftRunCommand.swift

@@ -274,7 +274,8 @@ public struct SwiftRunCommand: AsyncSwiftCommand {
         // If the executable is implicit, search through root products.
         let rootExecutables = graph.rootPackages
             .flatMap { $0.products }
-            .filter { $0.type == .executable || $0.type == .snippet }
+            // The type checker slows down significantly when ProductTypes arent explicitly typed.
+            .filter { $0.type == ProductType.executable || $0.type == ProductType.snippet }
             .map { $0.name }
 
         // Error out if the package contains no executables.

Sources/PackageDescription/PackageDependency.swift

@@ -511,7 +511,6 @@ extension Package.Dependency {
     /// ```
     ///
     /// - Parameters:
-    ///   - name: The name of the package, or nil to deduce it from the URL.
     ///   - url: The valid Git URL of the package.
     ///   - range: The custom version range requirement.
     ///
@@ -534,7 +533,6 @@ extension Package.Dependency {
     /// ```
     ///
     /// - Parameters:
-    ///   - name: The name of the package, or nil to deduce it from the URL.
     ///   - url: The valid Git URL of the package.
     ///   - range: The custom version range requirement.
     ///   - traits: The trait configuration of this dependency. Defaults to enabling the default traits.
@@ -585,7 +583,6 @@ extension Package.Dependency {
     /// ```
     ///
     /// - Parameters:
-    ///   - name: The name of the package, or `nil` to deduce it from the URL.
     ///   - url: The valid Git URL of the package.
     ///   - range: The closed version range requirement.
     ///
@@ -608,7 +605,6 @@ extension Package.Dependency {
     /// ```
     ///
     /// - Parameters:
-    ///   - name: The name of the package, or `nil` to deduce it from the URL.
     ///   - url: The valid Git URL of the package.
     ///   - range: The closed version range requirement.
     ///   - traits: The trait configuration of this dependency. Defaults to enabling the default traits.
@@ -788,7 +784,6 @@ extension Package.Dependency {
     /// Adds a remote package dependency given a version requirement.
     ///
     /// - Parameters:
-    ///   - name: The name of the package, or nil to deduce it from the URL.
     ///   - url: The valid Git URL of the package.
     ///   - requirement: A dependency requirement. See static methods on `Package.Dependency.Requirement` for available options.
     ///

Sources/PackageDescription/PackageDescription.docc/Curation/BuildSettingCondition.md

@@ -6,5 +6,6 @@
 
 - ``when(platforms:)``
 - ``when(configuration:)``
-- ``when(platforms:configuration:)-2991l``
 - ``when(platforms:configuration:)-475co``
+- ``when(platforms:configuration:traits:)``
+- ``when(platforms:configuration:)-2991l``

Sources/PackageDescription/PackageDescription.docc/Curation/Dependency.md

@@ -5,20 +5,52 @@
 ### Creating a Package Dependency
 
 - ``package(name:path:)``
+- ``package(name:path:traits:)``
+- ``package(path:)``
+- ``package(path:traits:)``
 - ``package(url:from:)``
 - ``package(url:_:)-2ys47``
 - ``package(url:_:)-1r6rc``
 - ``package(url:branch:)``
 - ``package(url:revision:)``
 - ``package(url:exact:)``
-- ``package(path:)``
+- ``package(url:exact:traits:)``
+- ``package(url:_:traits:)-(_,Range<Version>,_)``
+- ``package(url:_:traits:)-(_,ClosedRange<Version>,_)``
+- ``package(url:branch:traits:)``
+- ``package(url:from:traits:)``
+- ``package(url:revision:traits:)``
+- ``package(id:_:)-(_,Range<Version>)``
+- ``package(id:_:)-(_,ClosedRange<Version>)``
+- ``package(id:_:traits:)-(_,Range<Version>,_)``
+- ``package(id:_:traits:)-(_,ClosedRange<Version>,_)``
+- ``package(id:exact:)``
+- ``package(id:exact:traits:)``
+- ``package(id:from:)``
+- ``package(id:from:traits:)``
+- ``package(name:url:_:)-(String?,_,_)``
+- ``package(name:url:_:)-(_,_,Range<Version>)``
+- ``package(name:url:_:)-(_,_,ClosedRange<Version>)``
+- ``package(name:url:branch:)``
+- ``package(name:url:from:)``
+- ``package(name:url:revision:)``
+- ``package(url:_:)-(_,Package.Dependency.Requirement)``
+- ``name``
+- ``url``
 
 ### Declaring Requirements
 
 - ``requirement-swift.property``
 - ``Requirement-swift.enum``
+- ``traits``
+- ``Trait``
+- ``RegistryRequirement``
+- ``SourceControlRequirement``
 
 ### Describing a Package Dependency
 
+- ``name``
+- ``url``
 - ``kind-swift.property``
+- ``Kind``
 - ``Version``

Sources/PackageDescription/PackageDescription.docc/Curation/Extensions/CLanguageStandard-hash.md

@@ -6,4 +6,4 @@
 
 Hashes the C language standard by feeding the item into the given hasher.
 
-- Parameter into: The hasher.
+- Parameter hasher: The hasher.

Sources/PackageDescription/PackageDescription.docc/Curation/Extensions/CXXLanguageStandard-hash.md

@@ -6,4 +6,4 @@
 
 Hashes the C++ language standard by feeding the item into the given hasher.
 
-- Parameter into: The hasher.
+- Parameter hasher: The hasher.

Sources/PackageDescription/PackageDescription.docc/Curation/Extensions/LanguageTag-hash.md

@@ -6,4 +6,4 @@
 
 Hashes the language tag by feeding the item into the given hasher.
 
-- Parameter into: The hasher.
+- Parameter hasher: The hasher.

Sources/PackageDescription/PackageDescription.docc/Curation/Extensions/Library-LibraryType-hash.md

@@ -11,4 +11,4 @@ Implement this method to conform to the Hashable protocol. The components used f
 > Important:
 > Never call finalize() on hasher. Doing so may become a compile-time error in the future.
 
-- Parameter into: The hasher to use when combining the components of this instance.
+- Parameter hasher: The hasher to use when combining the components of this instance.