Merge main into release/6.3

.github/dependabot.yml

@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"

.github/workflows/automerge.yml

@@ -13,7 +13,7 @@ on:
 jobs:
   create_merge_pr:
     name: Create PR to merge main into release branch
-    uses: swiftlang/github-workflows/.github/workflows/[email protected].1
+    uses: swiftlang/github-workflows/.github/workflows/[email protected].2
     with:
       head_branch: main
       base_branch: release/6.3

.github/workflows/pull_request.yml

@@ -12,29 +12,62 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  tests:
-    name: Test
-    uses: swiftlang/github-workflows/.github/workflows/[email protected]
+  tests-using-native:
+    needs: [soundness]
+    strategy:
+      fail-fast: false
+      matrix:
+        buildSystem: ["native", "swiftbuild"]
+        linuxSwiftVersion: ['["nightly-main", "nightly-6.2"]', '["nightly-main"]']
+        enable_windows_checks: [true]
+        exclude:
+          - buildSystem: "swiftbuild"
+            linuxSwiftVersion: '["nightly-main", "nightly-6.2"]'
+          - buildSystem: "swiftbuild"
+            enable_windows_checks: true
+          - buildSystem: "native"
+            linuxSwiftVersion: '["nightly-main"]'
+    name: Test (${{ matrix.buildSystem }})
+    uses: swiftlang/github-workflows/.github/workflows/[email protected]
+    with:
+      linux_os_versions: '["amazonlinux2", "bookworm", "noble", "jammy", "rhel-ubi9"]'
+      linux_swift_versions: ${{ matrix.linuxSwiftVersion }}
+      linux_pre_build_command: ./.github/scripts/prebuild.sh
+      linux_build_command: 'swift run swift-build --build-tests --build-system ${{ matrix.buildSystem}}'
+      windows_swift_versions: '["nightly-main"]'
+      windows_pre_build_command: 'Invoke-Program .\.github\scripts\prebuild.ps1'
+      windows_build_command: 'Invoke-Program swift run swift-build --build-tests --build-system ${{ matrix.buildSystem}}'
+      enable_windows_checks: ${{ matrix.enable_windows_checks }}
+      enable_ios_checks: true
+      enable_macos_checks: true
+      macos_exclude_xcode_versions: "[{\"xcode_version\": \"16.3\"}, {\"xcode_version\": \"16.4\"}]"
+      macos_build_command: 'swift run swift-build --build-tests --build-system ${{ matrix.buildSystem}}'
+
+  tests-using-swiftbuild:
+    name: Test (all SwiftBuild)
+    needs: [soundness]
+    uses: swiftlang/github-workflows/.github/workflows/[email protected]
     with:
       linux_os_versions: '["amazonlinux2", "bookworm", "noble", "jammy", "rhel-ubi9"]'
       linux_swift_versions: '["nightly-main"]'
       linux_pre_build_command: ./.github/scripts/prebuild.sh
-      linux_build_command: 'swift build'
+      linux_build_command: 'swift run --build-system swiftbuild swift-build --build-tests --build-system swiftbuild'
+      enable_windows_checks: false
       windows_swift_versions: '["nightly-main"]'
       windows_pre_build_command: 'Invoke-Program .\.github\scripts\prebuild.ps1'
-      windows_build_command: 'Invoke-Program swift build'
+      windows_build_command: 'Invoke-Program swift run --build-system swiftbuild swift-build --build-tests --build-system swiftbuild'
       enable_ios_checks: true
       enable_macos_checks: true
       macos_exclude_xcode_versions: "[{\"xcode_version\": \"16.3\"}, {\"xcode_version\": \"16.4\"}]"
-      macos_build_command: 'swift build'
+      macos_build_command: 'swift run --build-system swiftbuild swift-build --build-tests --build-system swiftbuild'
 
   soundness:
     name: Soundness
-    uses: swiftlang/github-workflows/.github/workflows/[email protected].1
+    uses: swiftlang/github-workflows/.github/workflows/[email protected].2
     with:
       license_header_check_project_name: "Swift"
-      license_header_check_enabled: false
-      unacceptable_language_check_enabled: false
+      license_header_check_enabled: true
+      unacceptable_language_check_enabled: true
       api_breakage_check_enabled: false
       format_check_enabled: false
       shell_check_enabled: false

.licenseignore

@@ -6,5 +6,24 @@
 .dir-locals.el
 .editorconfig
 .swift-version
+.swiftformat
+.pep8
+.mailmap
+.mailfilter
 CODEOWNERS
 Package.swift
+Fixtures/**/*.*
+**/*.pc
+**/*.cer
+**/*.zip
+**/*.tar
+**/*.tgz
+**/*.gz
+**/*.svg
+**/*.bat
+**/*.xctestplan
+**/processInputs/**
+Utilities/bootstrap
+Utilities/build-using-self
+Utilities/new-bootstrap
+Utilities/test-toolchain

Benchmarks/Benchmarks/PackageGraphBenchmarks/PackageGraphBenchmarks.swift

@@ -1,3 +1,15 @@
+//===----------------------------------------------------------------------===//
+//
+// This source file is part of the Swift open source project
+//
+// Copyright (c) 2024 Apple Inc. and the Swift project authors
+// Licensed under Apache License v2.0 with Runtime Library Exception
+//
+// See http://swift.org/LICENSE.txt for license information
+// See http://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+//
+//===----------------------------------------------------------------------===//
+
 @_spi(DontAdoptOutsideOfSwiftPMExposedForBenchmarksAndTestsOnly)
 import Basics
 import Benchmark
@@ -103,18 +115,18 @@ let benchmarks = {
         )
     ) { benchmark in
         try syntheticModulesGraph(
-            benchmark, 
-            modulesGraphDepth: modulesGraphDepth, 
+            benchmark,
+            modulesGraphDepth: modulesGraphDepth,
             modulesGraphWidth: modulesGraphWidth,
             includeMacros: true
         )
     }
 }
 
 func syntheticModulesGraph(
-    _ benchmark: Benchmark, 
-    modulesGraphDepth: Int, 
-    modulesGraphWidth: Int, 
+    _ benchmark: Benchmark,
+    modulesGraphDepth: Int,
+    modulesGraphWidth: Int,
     includeMacros: Bool = false
 ) throws {
     // If macros are included, modules are split in three parts:

CODEOWNERS

@@ -26,6 +26,6 @@
 
 * @jakepetroules @dschaefer2 @bripeticca @plemarquand @owenv @bkhouri @cmcgee1024 @daveyc123 @rconnell9
 
-Sources/Commands/PackageCommands/Migrate.swift @AnthonyLatsis @bnbarham @xedin @jakepetroules @dschaefer2 @bripeticca @plemarquand @owenv @bkhouri @cmcgee1024 @daveyc123 @rconnell9
-Sources/SwiftFixIt/* @AnthonyLatsis @bnbarham @xedin @jakepetroules @dschaefer2 @bripeticca @plemarquand @owenv @bkhouri @cmcgee1024 @daveyc123 @rconnell9
-Tests/SwiftFixItTests/* @AnthonyLatsis @bnbarham @xedin @jakepetroules @dschaefer2 @bripeticca @plemarquand @owenv @bkhouri @cmcgee1024 @daveyc123 @rconnell9
+Sources/Commands/PackageCommands/Migrate.swift @AnthonyLatsis @xedin @jakepetroules @dschaefer2 @bripeticca @plemarquand @owenv @bkhouri @cmcgee1024 @daveyc123 @rconnell9
+Sources/SwiftFixIt/* @AnthonyLatsis @xedin @jakepetroules @dschaefer2 @bripeticca @plemarquand @owenv @bkhouri @cmcgee1024 @daveyc123 @rconnell9
+Tests/SwiftFixItTests/* @AnthonyLatsis @xedin @jakepetroules @dschaefer2 @bripeticca @plemarquand @owenv @bkhouri @cmcgee1024 @daveyc123 @rconnell9

CONTRIBUTING.md

@@ -2,7 +2,7 @@
 
 There are several types of contributions one can make. Bug fixes, documentation and enhancements that do not materially change the user facing semantics of Swift Package Manager should be submitted directly as PR.
 
-Larger changes that do materially change the semantics of Swift Package Manager (e.g. changes to the manifest format or behavior) are required to go through [Swift Evolution Process](https://github.com/swiftlang/swift-evolution/blob/master/process.md).
+Larger changes that do materially change the semantics of Swift Package Manager (e.g. changes to the manifest format or behavior) are required to go through [Swift Evolution Process](https://github.com/swiftlang/swift-evolution/blob/main/process.md).
 
 To see how previous evolution decisions for SwiftPM have been made and have some direction for the development of future features please check out the [Community Proposals](https://forums.swift.org/tag/packagemanager).
 
@@ -16,7 +16,7 @@ Fill the following fields:
 
 * `Title`: A one line summary of the problem you're facing.
 * `Description`: The complete description of the problem. Be specific.
-* `Expected behavior`: How you expect SwiftPM to behave. 
+* `Expected behavior`: How you expect SwiftPM to behave.
 * `Actual behavior` : What actually happens.
 * `Steps to reproduce`: Be specific, provide steps to reproduce the bug.
 * `Swift Package Manager version/commit hash` : With which version are you testing.
@@ -510,5 +510,5 @@ Make sure to update your TSC (Tools Support Core):
 ```bash
 $> swift package update
 ```
-Alternatively, if you are using Xcode, you can update to the latest version of all packages:  
+Alternatively, if you are using Xcode, you can update to the latest version of all packages:
 **Xcode App** > *File* > *Swift Packages* > *Update to Latest Package Versions*

Documentation/Design/EvolutionIdeas.md

@@ -13,7 +13,7 @@ If you're interested in participating in a particular evolution idea, please
 familiarize yourself with the existing discussion on that topic and start
 participating in the discussion thread of that idea. If a thread doesn't exist
 for that idea, please start one with a [draft
-proposal](https://github.com/swiftlang/swift-evolution/blob/master/proposal-templates/0000-swiftpm-template.md)
+proposal](https://github.com/swiftlang/swift-evolution/blob/main/proposal-templates/0000-swiftpm-template.md)
 that can be used as a starting point.
 
 **Important Note**: This list is not in any particular order. I plan to keep