Prevent setting presets from overwriting settings in target xcconfig files

added comment for test config change

changelog updated

Author: k-thorat

CHANGELOG.md

@@ -7,6 +7,7 @@
 
 #### Fixed
 - Allow SDK dependencies to be embedded. [#922](https://github.com/yonaskolb/XcodeGen/pull/922) @k-thorat 
+- Prevent setting presets from overwriting settings in target xcconfig files. [#924](https://github.com/yonaskolb/XcodeGen/pull/924) @k-thorat
 
 ## 2.17.0
 

Sources/XcodeGenKit/SettingsBuilder.swift

@@ -55,6 +55,8 @@ extension Project {
             buildSettings[target.platform.deploymentTargetSetting] = version.deploymentTarget
         }
 
+        buildSettings += getBuildSettings(settings: target.settings, config: config)
+        
         // Prevent setting presets from overrwriting settings in target xcconfig files
         if let configPath = target.configFiles[config.name] {
             buildSettings = removeConfigFileSettings(from: buildSettings, configPath: configPath)
@@ -64,8 +66,6 @@ extension Project {
             buildSettings = removeConfigFileSettings(from: buildSettings, configPath: configPath)
         }
 
-        buildSettings += getBuildSettings(settings: target.settings, config: config)
-
         return buildSettings
     }
 

Tests/Fixtures/settings_test.yml

@@ -71,10 +71,15 @@ targets:
   Target:
     type: application
     platform: iOS
+    configFiles:
+      # To verify build setting merge we need to duplicate setting in configFiles and settings
+      # BASE_SETTING: baseSetting is defined in base.xcconfig and for this target under settings:base:
+      config1: TestProject/Configs/base.xcconfig
     settings:
       groups:
         - preset7
       base:
+        BASE_SETTING: baseSetting
         SETTING 2: value 2
       configs:
         config1: