Upstream trivial diffs

withSerializationContext needs to be exposed to tests, and BuildService.run needs to build and do so without warnings regardless of whether USE_STATIC_PLUGIN_INITIALIZATION is set. EXCLUDED_RECURSIVE_SEARCH_PATH_SUBDIRECTORIES's DefaultValue was duplicated in an incorrect merge conflict resolution. STRING_CATALOG_GENERATE_SYMBOLS was missing from the CoreBuildSystem xcspec.

Author: jakepetroules

Sources/SWBBuildService/BuildServiceEntryPoint.swift

@@ -95,7 +95,7 @@ extension BuildService {
     ///
     /// Called directly from the exported C entry point `swiftbuildServiceEntryPoint` for in-process connections, or from `BuildService.main()` (after some basic file descriptor setup) for out-of-process connections.
     fileprivate static func run(inputFD: FileDescriptor, outputFD: FileDescriptor, connectionMode: ServiceHostConnectionMode, pluginsDirectory: URL?, arguments: [String], pluginLoadingFinished: () throws -> Void) async throws {
-        let pluginManager = await { @PluginExtensionSystemActor in
+        let pluginManager = try await { @PluginExtensionSystemActor () async throws in
             // Create the plugin manager and load plugins.
             let pluginManager = PluginManager(skipLoadingPluginIdentifiers: [])
 

Sources/SWBCore/Specs/CoreBuildSystem.xcspec

@@ -1195,7 +1195,6 @@ When `GENERATE_INFOPLIST_FILE` is enabled, sets the value of the [CFBundleIdenti
                 Type = StringList;
                 Category = "Search Paths";
                 DefaultValue = "*.nib *.lproj *.framework *.gch *.xcode* *.xcassets *.icon (*) .DS_Store CVS .svn .git .hg *.pbproj *.pbxproj";
-                DefaultValue = "*.nib *.lproj *.framework *.gch *.xcode* *.xcassets (*) .DS_Store CVS .svn .git .hg *.pbproj *.pbxproj";
             },
             {
                 Name = "VERSIONING_SYSTEM";
@@ -3652,6 +3651,13 @@ When this setting is enabled:
                 Category = "Localization";
                 Description = "When enabled, string tables generated in a localization export will prefer the String Catalog format.";
             },
+            {   Name = STRING_CATALOG_GENERATE_SYMBOLS;
+                Type = Boolean;
+                DefaultValue = NO;
+                DisplayName = "Generate String Catalog Symbols";
+                Category = "Localization";
+                Description = "When enabled, symbols will be generated for manually-managed strings in String Catalogs.";
+            },
 
             // rdar://108915072 (Move Siri Category and relevant configs out of CoreBuildSystem)
             // Siri Settings

Sources/SWBTaskExecution/BuildDescription.swift

@@ -1398,7 +1398,7 @@ package final class TaskActionRegistry: Sendable {
         implementations = try TaskActionExtensionPoint.taskActionImplementations(pluginManager: pluginManager)
     }
 
-    func withSerializationContext<T>(_ block: () throws -> T) rethrows -> T {
+    @_spi(Testing) public func withSerializationContext<T>(_ block: () throws -> T) rethrows -> T {
         try TaskAction.$taskActionImplementations.withValue(implementations) {
             try block()
         }