6.2 merge main 0602

CODEOWNERS

@@ -24,6 +24,9 @@
 
 # The following lines are used by GitHub to automatically recommend reviewers.
 
-Sources/XCBuildSupport/* @jakepetroules
-
 * @jakepetroules @dschaefer2 @shawnhyam @bripeticca @plemarquand @owenv @bkhouri @cmcgee1024 @daveyc123
+
+Sources/XCBuildSupport/* @jakepetroules
+Sources/Commands/PackageCommands/Migrate.swift @AnthonyLatsis @bnbarham @xedin @jakepetroules @dschaefer2 @shawnhyam @bripeticca @plemarquand @owenv @bkhouri @cmcgee1024 @daveyc123
+Sources/SwiftFixIt/* @AnthonyLatsis @bnbarham @xedin @jakepetroules @dschaefer2 @shawnhyam @bripeticca @plemarquand @owenv @bkhouri @cmcgee1024 @daveyc123
+Tests/SwiftFixItTests/* @AnthonyLatsis @bnbarham @xedin @jakepetroules @dschaefer2 @shawnhyam @bripeticca @plemarquand @owenv @bkhouri @cmcgee1024 @daveyc123

CONTRIBUTING.md

@@ -343,6 +343,8 @@ your contribution to Apple and the community, and agree by submitting the patch
 that your contributions are licensed under the [Swift
 license](https://swift.org/LICENSE.txt).
 
+After a change is known not to cause regressions in the `main` branch, it may be considered for cherry-picking to the latest release branch depending on the release schedule. Cherry-picks require [a specific template to be followed](https://github.com/swiftlang/.github/blob/main/PULL_REQUEST_TEMPLATE/release.md) in PR description that consolidates information about the change necessary for inclusion in the release branch and provides risk evaluation for nominating the change.
+
 ## Continuous Integration
 
 SwiftPM uses [swift-ci](https://ci.swift.org) infrastructure for its continuous integration testing. The bots can be triggered on pull-requests if you have commit access. Otherwise, ask one of the code owners to trigger them for you.

Documentation/PackageRegistry/PackageRegistryUsage.md

@@ -137,7 +137,7 @@ Here is an example of a source control dependency:
 
 ```swift
 dependencies: [
-    .package(id: "https://github.com/mona/LinkedList", .upToNextMajor(from: "1.0.0")),
+    .package(url: "https://github.com/mona/LinkedList", .upToNextMajor(from: "1.0.0")),
 ],
 ```
 

Documentation/PackageRegistry/Registry.md

@@ -560,7 +560,7 @@ Content-Disposition: attachment; filename="Package.swift"
 Content-Length: 361
 Content-Version: 1
 Link: <http://packages.example.com/mona/LinkedList/1.1.1/Package.swift?swift-version=4>; rel="alternate"; filename="[email protected]"; swift-tools-version="4.0",
-      <http://packages.example.com/mona/LinkedList/1.1.1/Package.swift?swift-version=4.2>; rel="alternate"; filename="[email protected]"; swift-tools-version="4.0"
+      <http://packages.example.com/mona/LinkedList/1.1.1/Package.swift?swift-version=4.2>; rel="alternate"; filename="[email protected]"; swift-tools-version="4.2"
 
 // swift-tools-version:5.0
 import PackageDescription

Fixtures/DependencyResolution/External/Complex/FisherYates/src/Fisher-Yates_Shuffle.swift

@@ -1,12 +1,3 @@
-#if os(macOS) || os(iOS)
-import Darwin
-#elseif canImport(Glibc)
-import Glibc
-#elseif canImport(Musl)
-import Musl
-#elseif canImport(Bionic)
-import Bionic
-#endif
 
 public extension Collection {
     func shuffle() -> [Iterator.Element] {
@@ -24,15 +15,13 @@ public extension MutableCollection {
         guard c > 1 else { return }
 
         for (firstUnshuffled, unshuffledCount) in zip(indices, stride(from: c, to: 1, by: -1)) {
-#if os(macOS) || os(iOS)
-            let d = arc4random_uniform(numericCast(unshuffledCount))
-#else
-            let d = numericCast(random()) % unshuffledCount
-#endif
-            let i = index(firstUnshuffled, offsetBy: numericCast(d))
+            var g = SystemRandomNumberGenerator()
+            let d = Int.random(in: 1...unshuffledCount, using: &g)
+            let i = index(firstUnshuffled, offsetBy: d)
             swapAt(firstUnshuffled, i)
         }
     }
 }
 
+
 public let shuffle = false

Fixtures/Miscellaneous/AtMainSupport/Package.swift

@@ -9,7 +9,10 @@ let package = Package(
         .executable(name: "SwiftExecMultiFile", targets: ["SwiftExecMultiFile"]),
     ],
     targets: [
-        .executableTarget(name: "ClangExecSingleFile"),
+        .executableTarget(name: "ClangExecSingleFile",
+        linkerSettings: [
+                .linkedLibrary("swiftCore", .when(platforms: [.windows])), // for swift_addNewDSOImage
+            ]),
         .executableTarget(name: "SwiftExecSingleFile"),
         .executableTarget(name: "SwiftExecMultiFile"),
     ]

Fixtures/Miscellaneous/EchoExecutable/Sources/secho/main.swift

@@ -4,8 +4,12 @@
 	import Musl
 #elseif canImport(Android)
 	import Android
-#else
+#elseif canImport(Darwin.C)
 	import Darwin.C
+#elseif canImport(ucrt)
+	import ucrt
+	let PATH_MAX = 260
+	typealias Int = Int32
 #endif
 
 let cwd = getcwd(nil, Int(PATH_MAX))

Fixtures/Miscellaneous/EchoExecutable/echo.bat

@@ -0,0 +1,2 @@
+echo sentinel
+echo %*

Fixtures/Miscellaneous/EchoExecutable/toolset.win32.json

@@ -0,0 +1,6 @@
+{
+  "debugger": { "path": "echo.bat" },
+  "testRunner": { "path": "echo.bat" },
+  "schemaVersion" : "1.0",
+  "rootPath" : "."
+}

Fixtures/Miscellaneous/PluginGeneratedResources/Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version: 5.7
+// swift-tools-version: 6.0
 
 import PackageDescription
 

Fixtures/Miscellaneous/PluginGeneratedResources/Plugins/Generator/plugin.swift

@@ -1,9 +1,15 @@
 import PackagePlugin
+import Foundation
 
 #if os(Android)
 let touchExe = "/system/bin/touch"
+let touchArgs: [String] = []
+#elseif os(Windows)
+let touchExe = "C:/Windows/System32/cmd.exe"
+let touchArgs = ["/c", "copy", "NUL"]
 #else
 let touchExe = "/usr/bin/touch"
+let touchArgs: [String] = []
 #endif
 
 @main
@@ -12,9 +18,9 @@ struct GeneratorPlugin: BuildToolPlugin {
         return [
             .prebuildCommand(
                 displayName: "Generating empty file",
-                executable: .init(touchExe),
-                arguments: [context.pluginWorkDirectory.appending("best.txt")],
-                outputFilesDirectory: context.pluginWorkDirectory
+                executable: .init(fileURLWithPath: touchExe),
+                arguments: touchArgs + [String(cString: (context.pluginWorkDirectoryURL.appending(path: "best.txt") as NSURL).fileSystemRepresentation)],
+                outputFilesDirectory: context.pluginWorkDirectoryURL
             )
         ]
     }

Fixtures/Miscellaneous/TestableExe/Package.swift

@@ -5,13 +5,23 @@ let package = Package(
     name: "TestableExe",
     targets: [
         .executableTarget(
-            name: "TestableExe1"
+            name: "TestableExe1",
+            linkerSettings: [
+                .linkedLibrary("swiftCore", .when(platforms: [.windows])), // for swift_addNewDSOImage
+            ]
         ),
         .executableTarget(
-            name: "TestableExe2"
+            name: "TestableExe2",
+            linkerSettings: [
+                .linkedLibrary("swiftCore", .when(platforms: [.windows])), // for swift_addNewDSOImage
+            ]
+
         ),
         .executableTarget(
-            name: "TestableExe3"
+            name: "TestableExe3",
+            linkerSettings: [
+                .linkedLibrary("swiftCore", .when(platforms: [.windows])), // for swift_addNewDSOImage
+            ]
         ),
         .testTarget(
             name: "TestableExeTests",

Fixtures/Miscellaneous/TestableExe/Tests/TestableExeTests/TestableExeTests.swift

@@ -5,6 +5,13 @@ import XCTest
 import class Foundation.Bundle
 
 final class TestableExeTests: XCTestCase {
+
+  #if os(Windows)
+      let eol = "\r\n"
+#else
+      let eol = "\n"
+#endif
+
     func testExample() throws {
         // This is an example of a functional test case.
         // Use XCTAssert and related functions to verify your tests produce the correct
@@ -30,7 +37,7 @@ final class TestableExeTests: XCTestCase {
         process.waitUntilExit()
         var data = pipe.fileHandleForReading.readDataToEndOfFile()
         var output = String(data: data, encoding: .utf8)
-        XCTAssertEqual(output, "Hello, world!\n")
+        XCTAssertEqual(output, "Hello, world!\(eol)")
 
         execPath = productsDirectory.appendingPathComponent("TestableExe2")
         process = Process()
@@ -41,7 +48,7 @@ final class TestableExeTests: XCTestCase {
         process.waitUntilExit()
         data = pipe.fileHandleForReading.readDataToEndOfFile()
         output = String(data: data, encoding: .utf8)
-        XCTAssertEqual(output, "Hello, planet!\n")
+        XCTAssertEqual(output, "Hello, planet!\(eol)")
 
         execPath = productsDirectory.appendingPathComponent("TestableExe3")
         process = Process()
@@ -52,7 +59,7 @@ final class TestableExeTests: XCTestCase {
         process.waitUntilExit()
         data = pipe.fileHandleForReading.readDataToEndOfFile()
         output = String(data: data, encoding: .utf8)
-        XCTAssertEqual(output, "Hello, universe!\n")
+        XCTAssertEqual(output, "Hello, universe!\(eol)")
     }
 
     /// Returns path to the built products directory.

Package.swift

@@ -945,6 +945,13 @@ let package = Package(
             dependencies: ["XCBuildSupport", "_InternalTestSupport", "_InternalBuildTestSupport"],
             exclude: ["Inputs/Foo.pc"]
         ),
+        .testTarget(
+            name: "FunctionalPerformanceTests",
+            dependencies: [
+                "swift-package-manager",
+                "_InternalTestSupport",
+            ]
+        ),
         // Examples (These are built to ensure they stay up to date with the API.)
         .executableTarget(
             name: "package-info",
@@ -963,19 +970,6 @@ package.targets.append(contentsOf: [
 ])
 #endif
 
-// Workaround SwiftPM's attempt to link in executables which does not work on all
-// platforms.
-#if !os(Windows)
-package.targets.append(contentsOf: [
-    .testTarget(
-        name: "FunctionalPerformanceTests",
-        dependencies: [
-            "swift-package-manager",
-            "_InternalTestSupport",
-        ]
-    ),
-])
-
 // rdar://101868275 "error: cannot find 'XCTAssertEqual' in scope" can affect almost any functional test, so we flat out
 // disable them all until we know what is going on
 if ProcessInfo.processInfo.environment["SWIFTCI_DISABLE_SDK_DEPENDENT_TESTS"] == nil {
@@ -988,7 +982,6 @@ if ProcessInfo.processInfo.environment["SWIFTCI_DISABLE_SDK_DEPENDENT_TESTS"] ==
                 "_InternalTestSupport",
             ]
         ),
-
         .executableTarget(
             name: "dummy-swiftc",
             dependencies: [
@@ -1019,7 +1012,6 @@ if ProcessInfo.processInfo.environment["SWIFTCI_DISABLE_SDK_DEPENDENT_TESTS"] ==
         ),
     ])
 }
-#endif
 
 
 func swiftSyntaxDependencies(_ names: [String]) -> [Target.Dependency] {

Sources/Basics/CMakeLists.txt

@@ -60,6 +60,7 @@ add_library(Basics
   Netrc.swift
   Observability.swift
   OSSignpost.swift
+  Process.swift
   ProgressAnimation/NinjaProgressAnimation.swift
   ProgressAnimation/PercentProgressAnimation.swift
   ProgressAnimation/ProgressAnimationProtocol.swift

Sources/Basics/Cancellator.swift

@@ -128,7 +128,7 @@ public final class Cancellator: Cancellable, Sendable {
         self.register(name: "\(process.arguments.joined(separator: " "))", handler: process.terminate)
     }
 
-    #if !os(iOS) && !os(watchOS) && !os(tvOS)
+    #if !canImport(Darwin) || os(macOS)
     public func register(_ process: Foundation.Process) -> RegistrationKey? {
         self.register(name: "\(process.description)", handler: process.terminate(timeout:))
     }
@@ -245,7 +245,7 @@ extension AsyncProcess {
     }
 }
 
-#if !os(iOS) && !os(watchOS) && !os(tvOS)
+#if !canImport(Darwin) || os(macOS)
 extension Foundation.Process {
     fileprivate func terminate(timeout: DispatchTime) {
         guard self.isRunning else {

Sources/Basics/DispatchTimeInterval+Extensions.swift

@@ -86,7 +86,7 @@ extension DispatchTimeInterval {
             return String(format: "%.2f", Double(value) / Double(1_000_000_000)) + "s"
         case .never:
             return "n/a"
-        #if os(macOS) || os(iOS) || os(tvOS) || os(watchOS)
+        #if canImport(Darwin)
         @unknown default:
             return "n/a"
         #endif

Sources/Basics/JSON+Extensions.swift

@@ -15,64 +15,8 @@ import class Foundation.DateFormatter
 import class Foundation.JSONDecoder
 import class Foundation.JSONEncoder
 
-#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS)
-extension DateFormatter {
-    public static let iso8601: DateFormatter = {
-        let dateFormatter = DateFormatter()
-        dateFormatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ssZ"
-        return dateFormatter
-    }()
-}
-
-extension JSONEncoder.DateEncodingStrategy {
-    public static let customISO8601 = custom {
-        var container = $1.singleValueContainer()
-        try container.encode(DateFormatter.iso8601.string(from: $0))
-    }
-}
-
-extension JSONDecoder.DateDecodingStrategy {
-    public static let customISO8601 = custom {
-        let container = try $0.singleValueContainer()
-        let string = try container.decode(String.self)
-        if let date = DateFormatter.iso8601.date(from: string) {
-            return date
-        }
-        throw DecodingError.dataCorruptedError(in: container, debugDescription: "Invalid date: \(string)")
-    }
-}
-#endif
-
-extension JSONEncoder.DateEncodingStrategy {
-    public static var safeISO8601: JSONEncoder.DateEncodingStrategy {
-        #if os(macOS) || os(iOS) || os(tvOS) || os(watchOS)
-        if #available(macOS 10.12, iOS 10.0, watchOS 3.0, tvOS 10.0, *) {
-            return .iso8601
-        } else {
-            return .customISO8601
-        }
-        #else
-        return .iso8601
-        #endif
-    }
-}
-
-extension JSONDecoder.DateDecodingStrategy {
-    public static var safeISO8601: JSONDecoder.DateDecodingStrategy {
-        #if os(macOS) || os(iOS) || os(tvOS) || os(watchOS)
-        if #available(macOS 10.12, iOS 10.0, watchOS 3.0, tvOS 10.0, *) {
-            return .iso8601
-        } else {
-            return .customISO8601
-        }
-        #else
-        return .iso8601
-        #endif
-    }
-}
-
 extension JSONDecoder {
-    public static func makeWithDefaults(dateDecodingStrategy: DateDecodingStrategy = .safeISO8601) -> JSONDecoder {
+    public static func makeWithDefaults(dateDecodingStrategy: DateDecodingStrategy = .iso8601) -> JSONDecoder {
         let decoder = JSONDecoder()
         decoder.dateDecodingStrategy = dateDecodingStrategy
         return decoder
@@ -82,7 +26,7 @@ extension JSONDecoder {
 extension JSONEncoder {
     public static func makeWithDefaults(
         prettified: Bool = true,
-        dateEncodingStrategy: DateEncodingStrategy = .safeISO8601
+        dateEncodingStrategy: DateEncodingStrategy = .iso8601
     ) -> JSONEncoder {
         Self.makeWithDefaults(
             sortKeys: prettified,
@@ -96,19 +40,13 @@ extension JSONEncoder {
         sortKeys: Bool,
         prettyPrint: Bool,
         escapeSlashes: Bool,
-        dateEncodingStrategy: DateEncodingStrategy = .safeISO8601
+        dateEncodingStrategy: DateEncodingStrategy = .iso8601
     ) -> JSONEncoder {
         let encoder = JSONEncoder()
         var outputFormatting: JSONEncoder.OutputFormatting = []
 
         if sortKeys {
-            #if os(macOS) || os(iOS) || os(tvOS) || os(watchOS)
-            if #available(macOS 10.15, iOS 11.0, watchOS 4.0, tvOS 11.0, *) {
-                outputFormatting.insert(.sortedKeys)
-            }
-            #else
             outputFormatting.insert(.sortedKeys)
-            #endif
         }
         if prettyPrint {
             outputFormatting.insert(.prettyPrinted)