]> git.saurik.com Git - apple/configd.git/blobdiff - configd.xcodeproj/project.pbxproj
projects / apple / configd.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
configd-1061.40.2.tar.gz
[apple/configd.git] / configd.xcodeproj / project.pbxproj
diff --git a/configd.xcodeproj/project.pbxproj b/configd.xcodeproj/project.pbxproj
index 4f32631090c7a52b41044f6311fe9878b96177d7..fd9a358dd8dd823af60af0e4736d8f6f471fc2c3 100644 (file)
--- a/configd.xcodeproj/project.pbxproj
+++ b/configd.xcodeproj/project.pbxproj
@@ -17,6 +17,9 @@
                                158317100CFB77D1006F62B9 /* PBXTargetDependency */,
                                158317160CFB783B006F62B9 /* PBXTargetDependency */,
                                158317180CFB784D006F62B9 /* PBXTargetDependency */,
                                158317100CFB77D1006F62B9 /* PBXTargetDependency */,
                                158317160CFB783B006F62B9 /* PBXTargetDependency */,
                                158317180CFB784D006F62B9 /* PBXTargetDependency */,
+                               15401C2E21991B1B006326B7 /* PBXTargetDependency */,
+                               15EF89C221894837003B2C5C /* PBXTargetDependency */,
+                               15EF89C421894837003B2C5C /* PBXTargetDependency */,
                        );
                        name = "All-Embedded";
                        productName = Embedded;
                        );
                        name = "All-Embedded";
                        productName = Embedded;
@@ -38,6 +41,41 @@
                        name = "configd_base-EmbeddedSimulator";
                        productName = Frameworks;
                };
                        name = "configd_base-EmbeddedSimulator";
                        productName = Frameworks;
                };
+               15401C1C21991506006326B7 /* configd_extras */ = {
+                       isa = PBXAggregateTarget;
+                       buildConfigurationList = 15401C1D21991506006326B7 /* Build configuration list for PBXAggregateTarget "configd_extras" */;
+                       buildPhases = (
+                               15401C2021991549006326B7 /* Create non-empty Root */,
+                       );
+                       dependencies = (
+                       );
+                       name = configd_extras;
+                       productName = configd_extras;
+               };
+               15401C21219915BC006326B7 /* configd_extras-Embedded */ = {
+                       isa = PBXAggregateTarget;
+                       buildConfigurationList = 15401C23219915BC006326B7 /* Build configuration list for PBXAggregateTarget "configd_extras-Embedded" */;
+                       buildPhases = (
+                               15401C22219915BC006326B7 /* Create non-empty Root */,
+                       );
+                       dependencies = (
+                               155C626121C2B6FD008DCB1A /* PBXTargetDependency */,
+                               155C626521C2B6FD008DCB1A /* PBXTargetDependency */,
+                       );
+                       name = "configd_extras-Embedded";
+                       productName = configd_extras;
+               };
+               15401C26219915C6006326B7 /* configd_extras-EmbeddedSimulator */ = {
+                       isa = PBXAggregateTarget;
+                       buildConfigurationList = 15401C28219915C6006326B7 /* Build configuration list for PBXAggregateTarget "configd_extras-EmbeddedSimulator" */;
+                       buildPhases = (
+                               15401C27219915C6006326B7 /* Create non-empty Root */,
+                       );
+                       dependencies = (
+                       );
+                       name = "configd_extras-EmbeddedSimulator";
+                       productName = configd_extras;
+               };
                155847FA07550D210046C2E9 /* configd_executables */ = {
                        isa = PBXAggregateTarget;
                        buildConfigurationList = 156EB62E0905594A00EEF749 /* Build configuration list for PBXAggregateTarget "configd_executables" */;
                155847FA07550D210046C2E9 /* configd_executables */ = {
                        isa = PBXAggregateTarget;
                        buildConfigurationList = 156EB62E0905594A00EEF749 /* Build configuration list for PBXAggregateTarget "configd_executables" */;
@@ -45,9 +83,9 @@
                        );
                        dependencies = (
                                15631D111ECF92E70088EEDD /* PBXTargetDependency */,
                        );
                        dependencies = (
                                15631D111ECF92E70088EEDD /* PBXTargetDependency */,
-                               72C4A4801BE44D19009D570E /* PBXTargetDependency */,
                                1558480607550D470046C2E9 /* PBXTargetDependency */,
                                1558480807550D470046C2E9 /* PBXTargetDependency */,
                                1558480607550D470046C2E9 /* PBXTargetDependency */,
                                1558480807550D470046C2E9 /* PBXTargetDependency */,
+                               72C4A4801BE44D19009D570E /* PBXTargetDependency */,
                                D6DDAC3D147A24BC00A2E902 /* PBXTargetDependency */,
                                150ECB300D0042DA0065E94D /* PBXTargetDependency */,
                                72C12CB11D6EA2CA000EE61C /* PBXTargetDependency */,
                                D6DDAC3D147A24BC00A2E902 /* PBXTargetDependency */,
                                150ECB300D0042DA0065E94D /* PBXTargetDependency */,
                                72C12CB11D6EA2CA000EE61C /* PBXTargetDependency */,
@@ -132,10 +170,8 @@
                        dependencies = (
                                15631D131ECF93040088EEDD /* PBXTargetDependency */,
                                158317660CFB80D5006F62B9 /* PBXTargetDependency */,
                        dependencies = (
                                15631D131ECF93040088EEDD /* PBXTargetDependency */,
                                158317660CFB80D5006F62B9 /* PBXTargetDependency */,
-                               157434210D4A8166002ACA73 /* PBXTargetDependency */,
-                               1574341F0D4A815E002ACA73 /* PBXTargetDependency */,
                                1523BBE21E075859006281F1 /* PBXTargetDependency */,
                                1523BBE21E075859006281F1 /* PBXTargetDependency */,
-                               7271EA341D7660980055B1AA /* PBXTargetDependency */,
+                               1574341F0D4A815E002ACA73 /* PBXTargetDependency */,
                        );
                        name = "configd_executables-Embedded";
                        productName = configd_executables;
                        );
                        name = "configd_executables-Embedded";
                        productName = configd_executables;
@@ -196,6 +232,9 @@
                                157BB8C40759244B0025DA7A /* PBXTargetDependency */,
                                159D542E07529008004F8947 /* PBXTargetDependency */,
                                1558480F07550DD00046C2E9 /* PBXTargetDependency */,
                                157BB8C40759244B0025DA7A /* PBXTargetDependency */,
                                159D542E07529008004F8947 /* PBXTargetDependency */,
                                1558480F07550DD00046C2E9 /* PBXTargetDependency */,
+                               15401C2C21991B05006326B7 /* PBXTargetDependency */,
+                               150EC101210171AE0047F4BF /* PBXTargetDependency */,
+                               150EC103210171B60047F4BF /* PBXTargetDependency */,
                        );
                        name = All;
                        productName = "configd (Aggregate)";
                        );
                        name = All;
                        productName = "configd (Aggregate)";
@@ -222,6 +261,9 @@
                                157FDE44164A079B0040D6A8 /* PBXTargetDependency */,
                                151FE37A0D5B713C000D6DB1 /* PBXTargetDependency */,
                                15631D2D1ECF99A00088EEDD /* PBXTargetDependency */,
                                157FDE44164A079B0040D6A8 /* PBXTargetDependency */,
                                151FE37A0D5B713C000D6DB1 /* PBXTargetDependency */,
                                15631D2D1ECF99A00088EEDD /* PBXTargetDependency */,
+                               15401C3021991B31006326B7 /* PBXTargetDependency */,
+                               15EF89C62189484C003B2C5C /* PBXTargetDependency */,
+                               15EF89C82189484C003B2C5C /* PBXTargetDependency */,
                        );
                        name = "All-EmbeddedSimulator";
                        productName = EmbeddedSimulator;
                        );
                        name = "All-EmbeddedSimulator";
                        productName = EmbeddedSimulator;
@@ -237,6 +279,7 @@
                150BEC1814CA24F900237116 /* dnsinfo_server.c in Sources */ = {isa = PBXBuildFile; fileRef = 15B73F0D05FD1B670096477F /* dnsinfo_server.c */; };
                150BEC1A14CA252200237116 /* dnsinfo_server.c in Sources */ = {isa = PBXBuildFile; fileRef = 15B73F0D05FD1B670096477F /* dnsinfo_server.c */; };
                150D7E1E0D16DC6C00AF4BED /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1520A3DE0846B2DC0010B584 /* Security.framework */; };
                150BEC1814CA24F900237116 /* dnsinfo_server.c in Sources */ = {isa = PBXBuildFile; fileRef = 15B73F0D05FD1B670096477F /* dnsinfo_server.c */; };
                150BEC1A14CA252200237116 /* dnsinfo_server.c in Sources */ = {isa = PBXBuildFile; fileRef = 15B73F0D05FD1B670096477F /* dnsinfo_server.c */; };
                150D7E1E0D16DC6C00AF4BED /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1520A3DE0846B2DC0010B584 /* Security.framework */; };
+               150EC0FF21016BFD0047F4BF /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1547072E0D1F70C80075C28D /* SystemConfiguration.framework */; };
                151D060E1EC14C8600E02E48 /* liblog_SystemConfiguration.m in Sources */ = {isa = PBXBuildFile; fileRef = 151D060D1EC14C6700E02E48 /* liblog_SystemConfiguration.m */; };
                1520A3870846829A0010B584 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15CB6A6F05C0722B0099E85F /* CoreFoundation.framework */; };
                1520A3DF0846B2DD0010B584 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1520A3DE0846B2DC0010B584 /* Security.framework */; };
                151D060E1EC14C8600E02E48 /* liblog_SystemConfiguration.m in Sources */ = {isa = PBXBuildFile; fileRef = 151D060D1EC14C6700E02E48 /* liblog_SystemConfiguration.m */; };
                1520A3870846829A0010B584 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15CB6A6F05C0722B0099E85F /* CoreFoundation.framework */; };
                1520A3DF0846B2DD0010B584 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1520A3DE0846B2DC0010B584 /* Security.framework */; };
@@ -271,6 +314,9 @@
                153E16A91EE500ED0027698E /* SCNetworkReachabilityInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 15C330D0134B95AA0028E36B /* SCNetworkReachabilityInternal.h */; };
                153E16AA1EE500EF0027698E /* SCNetworkReachabilityInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 15C330D0134B95AA0028E36B /* SCNetworkReachabilityInternal.h */; };
                1540E3610987DA9500157C07 /* com.apple.configd.plist in Copy Files */ = {isa = PBXBuildFile; fileRef = 1540E3600987DA9500157C07 /* com.apple.configd.plist */; };
                153E16A91EE500ED0027698E /* SCNetworkReachabilityInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 15C330D0134B95AA0028E36B /* SCNetworkReachabilityInternal.h */; };
                153E16AA1EE500EF0027698E /* SCNetworkReachabilityInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 15C330D0134B95AA0028E36B /* SCNetworkReachabilityInternal.h */; };
                1540E3610987DA9500157C07 /* com.apple.configd.plist in Copy Files */ = {isa = PBXBuildFile; fileRef = 1540E3600987DA9500157C07 /* com.apple.configd.plist */; };
+               1542400521626F5A00C7CE8B /* SCDCache.c in Sources */ = {isa = PBXBuildFile; fileRef = 1542400421626DD300C7CE8B /* SCDCache.c */; };
+               1542400621626F5C00C7CE8B /* SCDCache.c in Sources */ = {isa = PBXBuildFile; fileRef = 1542400421626DD300C7CE8B /* SCDCache.c */; };
+               1542400721626F6000C7CE8B /* SCDCache.c in Sources */ = {isa = PBXBuildFile; fileRef = 1542400421626DD300C7CE8B /* SCDCache.c */; };
                154361E00752C81800A8EC6C /* set-hostname.c in Sources */ = {isa = PBXBuildFile; fileRef = 159D53AB07528B36004F8947 /* set-hostname.c */; };
                1543636B0752D03C00A8EC6C /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1543636A0752D03C00A8EC6C /* IOKit.framework */; };
                154707300D1F70C80075C28D /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1547072E0D1F70C80075C28D /* SystemConfiguration.framework */; };
                154361E00752C81800A8EC6C /* set-hostname.c in Sources */ = {isa = PBXBuildFile; fileRef = 159D53AB07528B36004F8947 /* set-hostname.c */; };
                1543636B0752D03C00A8EC6C /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1543636A0752D03C00A8EC6C /* IOKit.framework */; };
                154707300D1F70C80075C28D /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1547072E0D1F70C80075C28D /* SystemConfiguration.framework */; };
@@ -323,7 +369,7 @@
                155D223D0AF13A7300D52ED0 /* smb-configuration.h in Headers */ = {isa = PBXBuildFile; fileRef = 155D223A0AF13A7300D52ED0 /* smb-configuration.h */; };
                155F49A61C864FFC00E47D08 /* qos-marking.m in Sources */ = {isa = PBXBuildFile; fileRef = 155F49A51C864FE500E47D08 /* qos-marking.m */; };
                155F49A71C86500100E47D08 /* qos-marking.m in Sources */ = {isa = PBXBuildFile; fileRef = 155F49A51C864FE500E47D08 /* qos-marking.m */; };
                155D223D0AF13A7300D52ED0 /* smb-configuration.h in Headers */ = {isa = PBXBuildFile; fileRef = 155D223A0AF13A7300D52ED0 /* smb-configuration.h */; };
                155F49A61C864FFC00E47D08 /* qos-marking.m in Sources */ = {isa = PBXBuildFile; fileRef = 155F49A51C864FE500E47D08 /* qos-marking.m */; };
                155F49A71C86500100E47D08 /* qos-marking.m in Sources */ = {isa = PBXBuildFile; fileRef = 155F49A51C864FE500E47D08 /* qos-marking.m */; };
-               1562569120856CCC00FCD61E /* liblockdown.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 1562569020856CCC00FCD61E /* liblockdown.dylib */; };
+               1562569120856CCC00FCD61E /* liblockdown.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 1562569020856CCC00FCD61E /* liblockdown.dylib */; settings = {ATTRIBUTES = (Weak, ); }; };
                1565D85018B847590097062B /* SCNetworkMigration.c in Sources */ = {isa = PBXBuildFile; fileRef = 55A3DB9D183C2A8200ED3DB7 /* SCNetworkMigration.c */; };
                1565D85118B847F20097062B /* SCNetworkMigration.c in Sources */ = {isa = PBXBuildFile; fileRef = 55A3DB9D183C2A8200ED3DB7 /* SCNetworkMigration.c */; };
                156BD6BC07E0DFA9008698FF /* SCPreferencesSetSpecificPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 156BD6BB07E0DFA9008698FF /* SCPreferencesSetSpecificPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
                1565D85018B847590097062B /* SCNetworkMigration.c in Sources */ = {isa = PBXBuildFile; fileRef = 55A3DB9D183C2A8200ED3DB7 /* SCNetworkMigration.c */; };
                1565D85118B847F20097062B /* SCNetworkMigration.c in Sources */ = {isa = PBXBuildFile; fileRef = 55A3DB9D183C2A8200ED3DB7 /* SCNetworkMigration.c */; };
                156BD6BC07E0DFA9008698FF /* SCPreferencesSetSpecificPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 156BD6BB07E0DFA9008698FF /* SCPreferencesSetSpecificPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -393,7 +439,6 @@
                1572C4F20CFB55B400E2776E /* SCDNotifierWait.c in Sources */ = {isa = PBXBuildFile; fileRef = 15CB697605C0722B0099E85F /* SCDNotifierWait.c */; settings = {ATTRIBUTES = (); }; };
                1572C4F30CFB55B400E2776E /* SCDNotifierInformViaCallback.c in Sources */ = {isa = PBXBuildFile; fileRef = 15CB697805C0722B0099E85F /* SCDNotifierInformViaCallback.c */; settings = {ATTRIBUTES = (); }; };
                1572C4F50CFB55B400E2776E /* SCDNotifierInformViaFD.c in Sources */ = {isa = PBXBuildFile; fileRef = 15CB697C05C0722B0099E85F /* SCDNotifierInformViaFD.c */; settings = {ATTRIBUTES = (); }; };
                1572C4F20CFB55B400E2776E /* SCDNotifierWait.c in Sources */ = {isa = PBXBuildFile; fileRef = 15CB697605C0722B0099E85F /* SCDNotifierWait.c */; settings = {ATTRIBUTES = (); }; };
                1572C4F30CFB55B400E2776E /* SCDNotifierInformViaCallback.c in Sources */ = {isa = PBXBuildFile; fileRef = 15CB697805C0722B0099E85F /* SCDNotifierInformViaCallback.c */; settings = {ATTRIBUTES = (); }; };
                1572C4F50CFB55B400E2776E /* SCDNotifierInformViaFD.c in Sources */ = {isa = PBXBuildFile; fileRef = 15CB697C05C0722B0099E85F /* SCDNotifierInformViaFD.c */; settings = {ATTRIBUTES = (); }; };
-               1572C4F60CFB55B400E2776E /* SCDNotifierInformViaSignal.c in Sources */ = {isa = PBXBuildFile; fileRef = 15CB697E05C0722B0099E85F /* SCDNotifierInformViaSignal.c */; settings = {ATTRIBUTES = (); }; };
                1572C4F70CFB55B400E2776E /* SCDNotifierCancel.c in Sources */ = {isa = PBXBuildFile; fileRef = 15CB698005C0722B0099E85F /* SCDNotifierCancel.c */; settings = {ATTRIBUTES = (); }; };
                1572C4F80CFB55B400E2776E /* SCDSnapshot.c in Sources */ = {isa = PBXBuildFile; fileRef = 15CB698205C0722B0099E85F /* SCDSnapshot.c */; settings = {ATTRIBUTES = (); }; };
                1572C4F90CFB55B400E2776E /* SCP.c in Sources */ = {isa = PBXBuildFile; fileRef = 15CB698405C0722B0099E85F /* SCP.c */; settings = {ATTRIBUTES = (); }; };
                1572C4F70CFB55B400E2776E /* SCDNotifierCancel.c in Sources */ = {isa = PBXBuildFile; fileRef = 15CB698005C0722B0099E85F /* SCDNotifierCancel.c */; settings = {ATTRIBUTES = (); }; };
                1572C4F80CFB55B400E2776E /* SCDSnapshot.c in Sources */ = {isa = PBXBuildFile; fileRef = 15CB698205C0722B0099E85F /* SCDSnapshot.c */; settings = {ATTRIBUTES = (); }; };
                1572C4F90CFB55B400E2776E /* SCP.c in Sources */ = {isa = PBXBuildFile; fileRef = 15CB698405C0722B0099E85F /* SCP.c */; settings = {ATTRIBUTES = (); }; };
@@ -436,14 +481,12 @@
                15732A7816EA503200F3AC4C /* configd.h in Headers */ = {isa = PBXBuildFile; fileRef = 15CB69CF05C0722B0099E85F /* configd.h */; };
                15732A7916EA503200F3AC4C /* _SCD.h in Headers */ = {isa = PBXBuildFile; fileRef = 15CB69D105C0722B0099E85F /* _SCD.h */; };
                15732A7A16EA503200F3AC4C /* configd_server.h in Headers */ = {isa = PBXBuildFile; fileRef = 15CB69D305C0722B0099E85F /* configd_server.h */; };
                15732A7816EA503200F3AC4C /* configd.h in Headers */ = {isa = PBXBuildFile; fileRef = 15CB69CF05C0722B0099E85F /* configd.h */; };
                15732A7916EA503200F3AC4C /* _SCD.h in Headers */ = {isa = PBXBuildFile; fileRef = 15CB69D105C0722B0099E85F /* _SCD.h */; };
                15732A7A16EA503200F3AC4C /* configd_server.h in Headers */ = {isa = PBXBuildFile; fileRef = 15CB69D305C0722B0099E85F /* configd_server.h */; };
-               15732A7B16EA503200F3AC4C /* notify_server.h in Headers */ = {isa = PBXBuildFile; fileRef = 15CB69D505C0722B0099E85F /* notify_server.h */; };
                15732A7C16EA503200F3AC4C /* plugin_support.h in Headers */ = {isa = PBXBuildFile; fileRef = 15CB69D705C0722B0099E85F /* plugin_support.h */; };
                15732A7D16EA503200F3AC4C /* session.h in Headers */ = {isa = PBXBuildFile; fileRef = 15CB69D905C0722B0099E85F /* session.h */; };
                15732A7E16EA503200F3AC4C /* pattern.h in Headers */ = {isa = PBXBuildFile; fileRef = 15CB69DB05C0722B0099E85F /* pattern.h */; };
                15732A8016EA503200F3AC4C /* configd.m in Sources */ = {isa = PBXBuildFile; fileRef = 15CB69E005C0722B0099E85F /* configd.m */; settings = {ATTRIBUTES = (); }; };
                15732A8116EA503200F3AC4C /* _SCD.c in Sources */ = {isa = PBXBuildFile; fileRef = 15CB69E205C0722B0099E85F /* _SCD.c */; settings = {ATTRIBUTES = (); }; };
                15732A8216EA503200F3AC4C /* configd_server.c in Sources */ = {isa = PBXBuildFile; fileRef = 15CB69E405C0722B0099E85F /* configd_server.c */; settings = {ATTRIBUTES = (); }; };
                15732A7C16EA503200F3AC4C /* plugin_support.h in Headers */ = {isa = PBXBuildFile; fileRef = 15CB69D705C0722B0099E85F /* plugin_support.h */; };
                15732A7D16EA503200F3AC4C /* session.h in Headers */ = {isa = PBXBuildFile; fileRef = 15CB69D905C0722B0099E85F /* session.h */; };
                15732A7E16EA503200F3AC4C /* pattern.h in Headers */ = {isa = PBXBuildFile; fileRef = 15CB69DB05C0722B0099E85F /* pattern.h */; };
                15732A8016EA503200F3AC4C /* configd.m in Sources */ = {isa = PBXBuildFile; fileRef = 15CB69E005C0722B0099E85F /* configd.m */; settings = {ATTRIBUTES = (); }; };
                15732A8116EA503200F3AC4C /* _SCD.c in Sources */ = {isa = PBXBuildFile; fileRef = 15CB69E205C0722B0099E85F /* _SCD.c */; settings = {ATTRIBUTES = (); }; };
                15732A8216EA503200F3AC4C /* configd_server.c in Sources */ = {isa = PBXBuildFile; fileRef = 15CB69E405C0722B0099E85F /* configd_server.c */; settings = {ATTRIBUTES = (); }; };
-               15732A8316EA503200F3AC4C /* notify_server.c in Sources */ = {isa = PBXBuildFile; fileRef = 15CB69E605C0722B0099E85F /* notify_server.c */; settings = {ATTRIBUTES = (); }; };
                15732A8416EA503200F3AC4C /* plugin_support.c in Sources */ = {isa = PBXBuildFile; fileRef = 15CB69E805C0722B0099E85F /* plugin_support.c */; settings = {ATTRIBUTES = (); }; };
                15732A8516EA503200F3AC4C /* session.c in Sources */ = {isa = PBXBuildFile; fileRef = 15CB69EA05C0722B0099E85F /* session.c */; settings = {ATTRIBUTES = (); }; };
                15732A8616EA503200F3AC4C /* pattern.c in Sources */ = {isa = PBXBuildFile; fileRef = 15CB69EC05C0722B0099E85F /* pattern.c */; settings = {ATTRIBUTES = (); }; };
                15732A8416EA503200F3AC4C /* plugin_support.c in Sources */ = {isa = PBXBuildFile; fileRef = 15CB69E805C0722B0099E85F /* plugin_support.c */; settings = {ATTRIBUTES = (); }; };
                15732A8516EA503200F3AC4C /* session.c in Sources */ = {isa = PBXBuildFile; fileRef = 15CB69EA05C0722B0099E85F /* session.c */; settings = {ATTRIBUTES = (); }; };
                15732A8616EA503200F3AC4C /* pattern.c in Sources */ = {isa = PBXBuildFile; fileRef = 15CB69EC05C0722B0099E85F /* pattern.c */; settings = {ATTRIBUTES = (); }; };
@@ -461,7 +504,6 @@
                15732A9216EA503200F3AC4C /* _notifychanges.c in Sources */ = {isa = PBXBuildFile; fileRef = 15CB6A0C05C0722B0099E85F /* _notifychanges.c */; settings = {ATTRIBUTES = (); }; };
                15732A9316EA503200F3AC4C /* _notifyviaport.c in Sources */ = {isa = PBXBuildFile; fileRef = 15CB6A0E05C0722B0099E85F /* _notifyviaport.c */; settings = {ATTRIBUTES = (); }; };
                15732A9416EA503200F3AC4C /* _notifyviafd.c in Sources */ = {isa = PBXBuildFile; fileRef = 15CB6A1005C0722B0099E85F /* _notifyviafd.c */; settings = {ATTRIBUTES = (); }; };
                15732A9216EA503200F3AC4C /* _notifychanges.c in Sources */ = {isa = PBXBuildFile; fileRef = 15CB6A0C05C0722B0099E85F /* _notifychanges.c */; settings = {ATTRIBUTES = (); }; };
                15732A9316EA503200F3AC4C /* _notifyviaport.c in Sources */ = {isa = PBXBuildFile; fileRef = 15CB6A0E05C0722B0099E85F /* _notifyviaport.c */; settings = {ATTRIBUTES = (); }; };
                15732A9416EA503200F3AC4C /* _notifyviafd.c in Sources */ = {isa = PBXBuildFile; fileRef = 15CB6A1005C0722B0099E85F /* _notifyviafd.c */; settings = {ATTRIBUTES = (); }; };
-               15732A9516EA503200F3AC4C /* _notifyviasignal.c in Sources */ = {isa = PBXBuildFile; fileRef = 15CB6A1205C0722B0099E85F /* _notifyviasignal.c */; settings = {ATTRIBUTES = (); }; };
                15732A9616EA503200F3AC4C /* _notifycancel.c in Sources */ = {isa = PBXBuildFile; fileRef = 15CB6A1405C0722B0099E85F /* _notifycancel.c */; settings = {ATTRIBUTES = (); }; };
                15732A9716EA503200F3AC4C /* _snapshot.c in Sources */ = {isa = PBXBuildFile; fileRef = 15CB6A1605C0722B0099E85F /* _snapshot.c */; settings = {ATTRIBUTES = (); }; };
                15732A9816EA503200F3AC4C /* config.defs in Sources */ = {isa = PBXBuildFile; fileRef = 15CB69BE05C0722B0099E85F /* config.defs */; settings = {ATTRIBUTES = (Server, ); }; };
                15732A9616EA503200F3AC4C /* _notifycancel.c in Sources */ = {isa = PBXBuildFile; fileRef = 15CB6A1405C0722B0099E85F /* _notifycancel.c */; settings = {ATTRIBUTES = (); }; };
                15732A9716EA503200F3AC4C /* _snapshot.c in Sources */ = {isa = PBXBuildFile; fileRef = 15CB6A1605C0722B0099E85F /* _snapshot.c */; settings = {ATTRIBUTES = (); }; };
                15732A9816EA503200F3AC4C /* config.defs in Sources */ = {isa = PBXBuildFile; fileRef = 15CB69BE05C0722B0099E85F /* config.defs */; settings = {ATTRIBUTES = (Server, ); }; };
@@ -554,12 +596,10 @@
                157A84FB0D56C7E800B6F1A0 /* dns-configuration.c in Sources */ = {isa = PBXBuildFile; fileRef = 159D53AA07528B36004F8947 /* dns-configuration.c */; };
                157A84FC0D56C7E800B6F1A0 /* set-hostname.c in Sources */ = {isa = PBXBuildFile; fileRef = 159D53AB07528B36004F8947 /* set-hostname.c */; };
                157A85080D56C8AA00B6F1A0 /* ifnamer.c in Sources */ = {isa = PBXBuildFile; fileRef = 159D53AE07528B36004F8947 /* ifnamer.c */; };
                157A84FB0D56C7E800B6F1A0 /* dns-configuration.c in Sources */ = {isa = PBXBuildFile; fileRef = 159D53AA07528B36004F8947 /* dns-configuration.c */; };
                157A84FC0D56C7E800B6F1A0 /* set-hostname.c in Sources */ = {isa = PBXBuildFile; fileRef = 159D53AB07528B36004F8947 /* set-hostname.c */; };
                157A85080D56C8AA00B6F1A0 /* ifnamer.c in Sources */ = {isa = PBXBuildFile; fileRef = 159D53AE07528B36004F8947 /* ifnamer.c */; };
-               157A85120D56C8E000B6F1A0 /* cache.h in Headers */ = {isa = PBXBuildFile; fileRef = 159D53CB07528B36004F8947 /* cache.h */; };
                157A85140D56C8E000B6F1A0 /* ev_dlil.h in Headers */ = {isa = PBXBuildFile; fileRef = 159D53B207528B36004F8947 /* ev_dlil.h */; };
                157A85150D56C8E000B6F1A0 /* ev_ipv4.h in Headers */ = {isa = PBXBuildFile; fileRef = 159D53B807528B36004F8947 /* ev_ipv4.h */; };
                157A85160D56C8E000B6F1A0 /* ev_ipv6.h in Headers */ = {isa = PBXBuildFile; fileRef = 159D53BA07528B36004F8947 /* ev_ipv6.h */; };
                157A85170D56C8E000B6F1A0 /* eventmon.h in Headers */ = {isa = PBXBuildFile; fileRef = 159D53B707528B36004F8947 /* eventmon.h */; };
                157A85140D56C8E000B6F1A0 /* ev_dlil.h in Headers */ = {isa = PBXBuildFile; fileRef = 159D53B207528B36004F8947 /* ev_dlil.h */; };
                157A85150D56C8E000B6F1A0 /* ev_ipv4.h in Headers */ = {isa = PBXBuildFile; fileRef = 159D53B807528B36004F8947 /* ev_ipv4.h */; };
                157A85160D56C8E000B6F1A0 /* ev_ipv6.h in Headers */ = {isa = PBXBuildFile; fileRef = 159D53BA07528B36004F8947 /* ev_ipv6.h */; };
                157A85170D56C8E000B6F1A0 /* eventmon.h in Headers */ = {isa = PBXBuildFile; fileRef = 159D53B707528B36004F8947 /* eventmon.h */; };
-               157A85190D56C8E000B6F1A0 /* cache.c in Sources */ = {isa = PBXBuildFile; fileRef = 159D53CA07528B36004F8947 /* cache.c */; };
                157A851B0D56C8E000B6F1A0 /* ev_dlil.c in Sources */ = {isa = PBXBuildFile; fileRef = 159D53B107528B36004F8947 /* ev_dlil.c */; };
                157A851C0D56C8E000B6F1A0 /* ev_ipv4.c in Sources */ = {isa = PBXBuildFile; fileRef = 159D53B307528B36004F8947 /* ev_ipv4.c */; };
                157A851D0D56C8E000B6F1A0 /* ev_ipv6.c in Sources */ = {isa = PBXBuildFile; fileRef = 159D53B407528B36004F8947 /* ev_ipv6.c */; };
                157A851B0D56C8E000B6F1A0 /* ev_dlil.c in Sources */ = {isa = PBXBuildFile; fileRef = 159D53B107528B36004F8947 /* ev_dlil.c */; };
                157A851C0D56C8E000B6F1A0 /* ev_ipv4.c in Sources */ = {isa = PBXBuildFile; fileRef = 159D53B307528B36004F8947 /* ev_ipv4.c */; };
                157A851D0D56C8E000B6F1A0 /* ev_ipv6.c in Sources */ = {isa = PBXBuildFile; fileRef = 159D53B407528B36004F8947 /* ev_ipv6.c */; };
@@ -579,14 +619,12 @@
                158317250CFB80A1006F62B9 /* configd.h in Headers */ = {isa = PBXBuildFile; fileRef = 15CB69CF05C0722B0099E85F /* configd.h */; };
                158317260CFB80A1006F62B9 /* _SCD.h in Headers */ = {isa = PBXBuildFile; fileRef = 15CB69D105C0722B0099E85F /* _SCD.h */; };
                158317270CFB80A1006F62B9 /* configd_server.h in Headers */ = {isa = PBXBuildFile; fileRef = 15CB69D305C0722B0099E85F /* configd_server.h */; };
                158317250CFB80A1006F62B9 /* configd.h in Headers */ = {isa = PBXBuildFile; fileRef = 15CB69CF05C0722B0099E85F /* configd.h */; };
                158317260CFB80A1006F62B9 /* _SCD.h in Headers */ = {isa = PBXBuildFile; fileRef = 15CB69D105C0722B0099E85F /* _SCD.h */; };
                158317270CFB80A1006F62B9 /* configd_server.h in Headers */ = {isa = PBXBuildFile; fileRef = 15CB69D305C0722B0099E85F /* configd_server.h */; };
-               158317280CFB80A1006F62B9 /* notify_server.h in Headers */ = {isa = PBXBuildFile; fileRef = 15CB69D505C0722B0099E85F /* notify_server.h */; };
                158317290CFB80A1006F62B9 /* plugin_support.h in Headers */ = {isa = PBXBuildFile; fileRef = 15CB69D705C0722B0099E85F /* plugin_support.h */; };
                1583172A0CFB80A1006F62B9 /* session.h in Headers */ = {isa = PBXBuildFile; fileRef = 15CB69D905C0722B0099E85F /* session.h */; };
                1583172B0CFB80A1006F62B9 /* pattern.h in Headers */ = {isa = PBXBuildFile; fileRef = 15CB69DB05C0722B0099E85F /* pattern.h */; };
                1583172D0CFB80A1006F62B9 /* configd.m in Sources */ = {isa = PBXBuildFile; fileRef = 15CB69E005C0722B0099E85F /* configd.m */; settings = {ATTRIBUTES = (); }; };
                1583172E0CFB80A1006F62B9 /* _SCD.c in Sources */ = {isa = PBXBuildFile; fileRef = 15CB69E205C0722B0099E85F /* _SCD.c */; settings = {ATTRIBUTES = (); }; };
                1583172F0CFB80A1006F62B9 /* configd_server.c in Sources */ = {isa = PBXBuildFile; fileRef = 15CB69E405C0722B0099E85F /* configd_server.c */; settings = {ATTRIBUTES = (); }; };
                158317290CFB80A1006F62B9 /* plugin_support.h in Headers */ = {isa = PBXBuildFile; fileRef = 15CB69D705C0722B0099E85F /* plugin_support.h */; };
                1583172A0CFB80A1006F62B9 /* session.h in Headers */ = {isa = PBXBuildFile; fileRef = 15CB69D905C0722B0099E85F /* session.h */; };
                1583172B0CFB80A1006F62B9 /* pattern.h in Headers */ = {isa = PBXBuildFile; fileRef = 15CB69DB05C0722B0099E85F /* pattern.h */; };
                1583172D0CFB80A1006F62B9 /* configd.m in Sources */ = {isa = PBXBuildFile; fileRef = 15CB69E005C0722B0099E85F /* configd.m */; settings = {ATTRIBUTES = (); }; };
                1583172E0CFB80A1006F62B9 /* _SCD.c in Sources */ = {isa = PBXBuildFile; fileRef = 15CB69E205C0722B0099E85F /* _SCD.c */; settings = {ATTRIBUTES = (); }; };
                1583172F0CFB80A1006F62B9 /* configd_server.c in Sources */ = {isa = PBXBuildFile; fileRef = 15CB69E405C0722B0099E85F /* configd_server.c */; settings = {ATTRIBUTES = (); }; };
-               158317300CFB80A1006F62B9 /* notify_server.c in Sources */ = {isa = PBXBuildFile; fileRef = 15CB69E605C0722B0099E85F /* notify_server.c */; settings = {ATTRIBUTES = (); }; };
                158317310CFB80A1006F62B9 /* plugin_support.c in Sources */ = {isa = PBXBuildFile; fileRef = 15CB69E805C0722B0099E85F /* plugin_support.c */; settings = {ATTRIBUTES = (); }; };
                158317320CFB80A1006F62B9 /* session.c in Sources */ = {isa = PBXBuildFile; fileRef = 15CB69EA05C0722B0099E85F /* session.c */; settings = {ATTRIBUTES = (); }; };
                158317330CFB80A1006F62B9 /* pattern.c in Sources */ = {isa = PBXBuildFile; fileRef = 15CB69EC05C0722B0099E85F /* pattern.c */; settings = {ATTRIBUTES = (); }; };
                158317310CFB80A1006F62B9 /* plugin_support.c in Sources */ = {isa = PBXBuildFile; fileRef = 15CB69E805C0722B0099E85F /* plugin_support.c */; settings = {ATTRIBUTES = (); }; };
                158317320CFB80A1006F62B9 /* session.c in Sources */ = {isa = PBXBuildFile; fileRef = 15CB69EA05C0722B0099E85F /* session.c */; settings = {ATTRIBUTES = (); }; };
                158317330CFB80A1006F62B9 /* pattern.c in Sources */ = {isa = PBXBuildFile; fileRef = 15CB69EC05C0722B0099E85F /* pattern.c */; settings = {ATTRIBUTES = (); }; };
@@ -604,7 +642,6 @@
                158317410CFB80A1006F62B9 /* _notifychanges.c in Sources */ = {isa = PBXBuildFile; fileRef = 15CB6A0C05C0722B0099E85F /* _notifychanges.c */; settings = {ATTRIBUTES = (); }; };
                158317420CFB80A1006F62B9 /* _notifyviaport.c in Sources */ = {isa = PBXBuildFile; fileRef = 15CB6A0E05C0722B0099E85F /* _notifyviaport.c */; settings = {ATTRIBUTES = (); }; };
                158317430CFB80A1006F62B9 /* _notifyviafd.c in Sources */ = {isa = PBXBuildFile; fileRef = 15CB6A1005C0722B0099E85F /* _notifyviafd.c */; settings = {ATTRIBUTES = (); }; };
                158317410CFB80A1006F62B9 /* _notifychanges.c in Sources */ = {isa = PBXBuildFile; fileRef = 15CB6A0C05C0722B0099E85F /* _notifychanges.c */; settings = {ATTRIBUTES = (); }; };
                158317420CFB80A1006F62B9 /* _notifyviaport.c in Sources */ = {isa = PBXBuildFile; fileRef = 15CB6A0E05C0722B0099E85F /* _notifyviaport.c */; settings = {ATTRIBUTES = (); }; };
                158317430CFB80A1006F62B9 /* _notifyviafd.c in Sources */ = {isa = PBXBuildFile; fileRef = 15CB6A1005C0722B0099E85F /* _notifyviafd.c */; settings = {ATTRIBUTES = (); }; };
-               158317440CFB80A1006F62B9 /* _notifyviasignal.c in Sources */ = {isa = PBXBuildFile; fileRef = 15CB6A1205C0722B0099E85F /* _notifyviasignal.c */; settings = {ATTRIBUTES = (); }; };
                158317450CFB80A1006F62B9 /* _notifycancel.c in Sources */ = {isa = PBXBuildFile; fileRef = 15CB6A1405C0722B0099E85F /* _notifycancel.c */; settings = {ATTRIBUTES = (); }; };
                158317460CFB80A1006F62B9 /* _snapshot.c in Sources */ = {isa = PBXBuildFile; fileRef = 15CB6A1605C0722B0099E85F /* _snapshot.c */; settings = {ATTRIBUTES = (); }; };
                158317470CFB80A1006F62B9 /* config.defs in Sources */ = {isa = PBXBuildFile; fileRef = 15CB69BE05C0722B0099E85F /* config.defs */; settings = {ATTRIBUTES = (Server, ); }; };
                158317450CFB80A1006F62B9 /* _notifycancel.c in Sources */ = {isa = PBXBuildFile; fileRef = 15CB6A1405C0722B0099E85F /* _notifycancel.c */; settings = {ATTRIBUTES = (); }; };
                158317460CFB80A1006F62B9 /* _snapshot.c in Sources */ = {isa = PBXBuildFile; fileRef = 15CB6A1605C0722B0099E85F /* _snapshot.c */; settings = {ATTRIBUTES = (); }; };
                158317470CFB80A1006F62B9 /* config.defs in Sources */ = {isa = PBXBuildFile; fileRef = 15CB69BE05C0722B0099E85F /* config.defs */; settings = {ATTRIBUTES = (Server, ); }; };
@@ -659,8 +696,6 @@
                159A752C107FEAA400A57EAB /* VPNPrivate.c in Sources */ = {isa = PBXBuildFile; fileRef = 159A7517107FEAA400A57EAB /* VPNPrivate.c */; };
                159A752E107FEAA400A57EAB /* VPNConfiguration.c in Sources */ = {isa = PBXBuildFile; fileRef = 159A7519107FEAA400A57EAB /* VPNConfiguration.c */; };
                159C32B60F583724008A72EE /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1520A3DE0846B2DC0010B584 /* Security.framework */; };
                159A752C107FEAA400A57EAB /* VPNPrivate.c in Sources */ = {isa = PBXBuildFile; fileRef = 159A7517107FEAA400A57EAB /* VPNPrivate.c */; };
                159A752E107FEAA400A57EAB /* VPNConfiguration.c in Sources */ = {isa = PBXBuildFile; fileRef = 159A7519107FEAA400A57EAB /* VPNConfiguration.c */; };
                159C32B60F583724008A72EE /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1520A3DE0846B2DC0010B584 /* Security.framework */; };
-               159D540907528D3A004F8947 /* cache.c in Sources */ = {isa = PBXBuildFile; fileRef = 159D53CA07528B36004F8947 /* cache.c */; };
-               159D540A07528D3B004F8947 /* cache.h in Headers */ = {isa = PBXBuildFile; fileRef = 159D53CB07528B36004F8947 /* cache.h */; };
                159D540D07528DAE004F8947 /* ev_dlil.c in Sources */ = {isa = PBXBuildFile; fileRef = 159D53B107528B36004F8947 /* ev_dlil.c */; };
                159D540E07528DAE004F8947 /* ev_dlil.h in Headers */ = {isa = PBXBuildFile; fileRef = 159D53B207528B36004F8947 /* ev_dlil.h */; };
                159D540F07528DB0004F8947 /* ev_ipv4.c in Sources */ = {isa = PBXBuildFile; fileRef = 159D53B307528B36004F8947 /* ev_ipv4.c */; };
                159D540D07528DAE004F8947 /* ev_dlil.c in Sources */ = {isa = PBXBuildFile; fileRef = 159D53B107528B36004F8947 /* ev_dlil.c */; };
                159D540E07528DAE004F8947 /* ev_dlil.h in Headers */ = {isa = PBXBuildFile; fileRef = 159D53B207528B36004F8947 /* ev_dlil.h */; };
                159D540F07528DB0004F8947 /* ev_ipv4.c in Sources */ = {isa = PBXBuildFile; fileRef = 159D53B307528B36004F8947 /* ev_ipv4.c */; };
@@ -677,14 +712,12 @@
                159D54A407529FFF004F8947 /* configd.h in Headers */ = {isa = PBXBuildFile; fileRef = 15CB69CF05C0722B0099E85F /* configd.h */; };
                159D54A507529FFF004F8947 /* _SCD.h in Headers */ = {isa = PBXBuildFile; fileRef = 15CB69D105C0722B0099E85F /* _SCD.h */; };
                159D54A607529FFF004F8947 /* configd_server.h in Headers */ = {isa = PBXBuildFile; fileRef = 15CB69D305C0722B0099E85F /* configd_server.h */; };
                159D54A407529FFF004F8947 /* configd.h in Headers */ = {isa = PBXBuildFile; fileRef = 15CB69CF05C0722B0099E85F /* configd.h */; };
                159D54A507529FFF004F8947 /* _SCD.h in Headers */ = {isa = PBXBuildFile; fileRef = 15CB69D105C0722B0099E85F /* _SCD.h */; };
                159D54A607529FFF004F8947 /* configd_server.h in Headers */ = {isa = PBXBuildFile; fileRef = 15CB69D305C0722B0099E85F /* configd_server.h */; };
-               159D54A707529FFF004F8947 /* notify_server.h in Headers */ = {isa = PBXBuildFile; fileRef = 15CB69D505C0722B0099E85F /* notify_server.h */; };
                159D54A807529FFF004F8947 /* plugin_support.h in Headers */ = {isa = PBXBuildFile; fileRef = 15CB69D705C0722B0099E85F /* plugin_support.h */; };
                159D54A907529FFF004F8947 /* session.h in Headers */ = {isa = PBXBuildFile; fileRef = 15CB69D905C0722B0099E85F /* session.h */; };
                159D54AA07529FFF004F8947 /* pattern.h in Headers */ = {isa = PBXBuildFile; fileRef = 15CB69DB05C0722B0099E85F /* pattern.h */; };
                159D54AC07529FFF004F8947 /* configd.m in Sources */ = {isa = PBXBuildFile; fileRef = 15CB69E005C0722B0099E85F /* configd.m */; settings = {ATTRIBUTES = (); }; };
                159D54AD07529FFF004F8947 /* _SCD.c in Sources */ = {isa = PBXBuildFile; fileRef = 15CB69E205C0722B0099E85F /* _SCD.c */; settings = {ATTRIBUTES = (); }; };
                159D54AE07529FFF004F8947 /* configd_server.c in Sources */ = {isa = PBXBuildFile; fileRef = 15CB69E405C0722B0099E85F /* configd_server.c */; settings = {ATTRIBUTES = (); }; };
                159D54A807529FFF004F8947 /* plugin_support.h in Headers */ = {isa = PBXBuildFile; fileRef = 15CB69D705C0722B0099E85F /* plugin_support.h */; };
                159D54A907529FFF004F8947 /* session.h in Headers */ = {isa = PBXBuildFile; fileRef = 15CB69D905C0722B0099E85F /* session.h */; };
                159D54AA07529FFF004F8947 /* pattern.h in Headers */ = {isa = PBXBuildFile; fileRef = 15CB69DB05C0722B0099E85F /* pattern.h */; };
                159D54AC07529FFF004F8947 /* configd.m in Sources */ = {isa = PBXBuildFile; fileRef = 15CB69E005C0722B0099E85F /* configd.m */; settings = {ATTRIBUTES = (); }; };
                159D54AD07529FFF004F8947 /* _SCD.c in Sources */ = {isa = PBXBuildFile; fileRef = 15CB69E205C0722B0099E85F /* _SCD.c */; settings = {ATTRIBUTES = (); }; };
                159D54AE07529FFF004F8947 /* configd_server.c in Sources */ = {isa = PBXBuildFile; fileRef = 15CB69E405C0722B0099E85F /* configd_server.c */; settings = {ATTRIBUTES = (); }; };
-               159D54AF07529FFF004F8947 /* notify_server.c in Sources */ = {isa = PBXBuildFile; fileRef = 15CB69E605C0722B0099E85F /* notify_server.c */; settings = {ATTRIBUTES = (); }; };
                159D54B007529FFF004F8947 /* plugin_support.c in Sources */ = {isa = PBXBuildFile; fileRef = 15CB69E805C0722B0099E85F /* plugin_support.c */; settings = {ATTRIBUTES = (); }; };
                159D54B107529FFF004F8947 /* session.c in Sources */ = {isa = PBXBuildFile; fileRef = 15CB69EA05C0722B0099E85F /* session.c */; settings = {ATTRIBUTES = (); }; };
                159D54B207529FFF004F8947 /* pattern.c in Sources */ = {isa = PBXBuildFile; fileRef = 15CB69EC05C0722B0099E85F /* pattern.c */; settings = {ATTRIBUTES = (); }; };
                159D54B007529FFF004F8947 /* plugin_support.c in Sources */ = {isa = PBXBuildFile; fileRef = 15CB69E805C0722B0099E85F /* plugin_support.c */; settings = {ATTRIBUTES = (); }; };
                159D54B107529FFF004F8947 /* session.c in Sources */ = {isa = PBXBuildFile; fileRef = 15CB69EA05C0722B0099E85F /* session.c */; settings = {ATTRIBUTES = (); }; };
                159D54B207529FFF004F8947 /* pattern.c in Sources */ = {isa = PBXBuildFile; fileRef = 15CB69EC05C0722B0099E85F /* pattern.c */; settings = {ATTRIBUTES = (); }; };
@@ -702,12 +735,13 @@
                159D54C007529FFF004F8947 /* _notifychanges.c in Sources */ = {isa = PBXBuildFile; fileRef = 15CB6A0C05C0722B0099E85F /* _notifychanges.c */; settings = {ATTRIBUTES = (); }; };
                159D54C107529FFF004F8947 /* _notifyviaport.c in Sources */ = {isa = PBXBuildFile; fileRef = 15CB6A0E05C0722B0099E85F /* _notifyviaport.c */; settings = {ATTRIBUTES = (); }; };
                159D54C207529FFF004F8947 /* _notifyviafd.c in Sources */ = {isa = PBXBuildFile; fileRef = 15CB6A1005C0722B0099E85F /* _notifyviafd.c */; settings = {ATTRIBUTES = (); }; };
                159D54C007529FFF004F8947 /* _notifychanges.c in Sources */ = {isa = PBXBuildFile; fileRef = 15CB6A0C05C0722B0099E85F /* _notifychanges.c */; settings = {ATTRIBUTES = (); }; };
                159D54C107529FFF004F8947 /* _notifyviaport.c in Sources */ = {isa = PBXBuildFile; fileRef = 15CB6A0E05C0722B0099E85F /* _notifyviaport.c */; settings = {ATTRIBUTES = (); }; };
                159D54C207529FFF004F8947 /* _notifyviafd.c in Sources */ = {isa = PBXBuildFile; fileRef = 15CB6A1005C0722B0099E85F /* _notifyviafd.c */; settings = {ATTRIBUTES = (); }; };
-               159D54C307529FFF004F8947 /* _notifyviasignal.c in Sources */ = {isa = PBXBuildFile; fileRef = 15CB6A1205C0722B0099E85F /* _notifyviasignal.c */; settings = {ATTRIBUTES = (); }; };
                159D54C407529FFF004F8947 /* _notifycancel.c in Sources */ = {isa = PBXBuildFile; fileRef = 15CB6A1405C0722B0099E85F /* _notifycancel.c */; settings = {ATTRIBUTES = (); }; };
                159D54C507529FFF004F8947 /* _snapshot.c in Sources */ = {isa = PBXBuildFile; fileRef = 15CB6A1605C0722B0099E85F /* _snapshot.c */; settings = {ATTRIBUTES = (); }; };
                159D54C607529FFF004F8947 /* config.defs in Sources */ = {isa = PBXBuildFile; fileRef = 15CB69BE05C0722B0099E85F /* config.defs */; settings = {ATTRIBUTES = (Server, ); }; };
                159D54CC07529FFF004F8947 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15CB6A6F05C0722B0099E85F /* CoreFoundation.framework */; };
                159D54D607529FFF004F8947 /* configd.8 in CopyFiles */ = {isa = PBXBuildFile; fileRef = 15CB6A2005C0722B0099E85F /* configd.8 */; };
                159D54C407529FFF004F8947 /* _notifycancel.c in Sources */ = {isa = PBXBuildFile; fileRef = 15CB6A1405C0722B0099E85F /* _notifycancel.c */; settings = {ATTRIBUTES = (); }; };
                159D54C507529FFF004F8947 /* _snapshot.c in Sources */ = {isa = PBXBuildFile; fileRef = 15CB6A1605C0722B0099E85F /* _snapshot.c */; settings = {ATTRIBUTES = (); }; };
                159D54C607529FFF004F8947 /* config.defs in Sources */ = {isa = PBXBuildFile; fileRef = 15CB69BE05C0722B0099E85F /* config.defs */; settings = {ATTRIBUTES = (Server, ); }; };
                159D54CC07529FFF004F8947 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15CB6A6F05C0722B0099E85F /* CoreFoundation.framework */; };
                159D54D607529FFF004F8947 /* configd.8 in CopyFiles */ = {isa = PBXBuildFile; fileRef = 15CB6A2005C0722B0099E85F /* configd.8 */; };
+               159FFD5F2110EA44009311DD /* dnsinfo_flatfile.c in Sources */ = {isa = PBXBuildFile; fileRef = 1522FCE50FA7FD7000B24128 /* dnsinfo_flatfile.c */; };
+               159FFD612110EA71009311DD /* dnsinfo_flatfile.c in Sources */ = {isa = PBXBuildFile; fileRef = 1522FCE50FA7FD7000B24128 /* dnsinfo_flatfile.c */; };
                15A1FF3210597F17004C9CC9 /* CaptiveNetwork.h in Headers */ = {isa = PBXBuildFile; fileRef = 15A1FF3010597F17004C9CC9 /* CaptiveNetwork.h */; settings = {ATTRIBUTES = (Public, ); }; };
                15A1FF3310597F17004C9CC9 /* CaptiveNetwork.c in Sources */ = {isa = PBXBuildFile; fileRef = 15A1FF3110597F17004C9CC9 /* CaptiveNetwork.c */; };
                15A1FF3410597F17004C9CC9 /* CaptiveNetwork.h in Headers */ = {isa = PBXBuildFile; fileRef = 15A1FF3010597F17004C9CC9 /* CaptiveNetwork.h */; settings = {ATTRIBUTES = (Public, ); }; };
                15A1FF3210597F17004C9CC9 /* CaptiveNetwork.h in Headers */ = {isa = PBXBuildFile; fileRef = 15A1FF3010597F17004C9CC9 /* CaptiveNetwork.h */; settings = {ATTRIBUTES = (Public, ); }; };
                15A1FF3310597F17004C9CC9 /* CaptiveNetwork.c in Sources */ = {isa = PBXBuildFile; fileRef = 15A1FF3110597F17004C9CC9 /* CaptiveNetwork.c */; };
                15A1FF3410597F17004C9CC9 /* CaptiveNetwork.h in Headers */ = {isa = PBXBuildFile; fileRef = 15A1FF3010597F17004C9CC9 /* CaptiveNetwork.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -775,7 +809,6 @@
                15A5A2310D5B94190087BDA0 /* SCDNotifierWait.c in Sources */ = {isa = PBXBuildFile; fileRef = 15CB697605C0722B0099E85F /* SCDNotifierWait.c */; settings = {ATTRIBUTES = (); }; };
                15A5A2320D5B94190087BDA0 /* SCDNotifierInformViaCallback.c in Sources */ = {isa = PBXBuildFile; fileRef = 15CB697805C0722B0099E85F /* SCDNotifierInformViaCallback.c */; settings = {ATTRIBUTES = (); }; };
                15A5A2340D5B94190087BDA0 /* SCDNotifierInformViaFD.c in Sources */ = {isa = PBXBuildFile; fileRef = 15CB697C05C0722B0099E85F /* SCDNotifierInformViaFD.c */; settings = {ATTRIBUTES = (); }; };
                15A5A2310D5B94190087BDA0 /* SCDNotifierWait.c in Sources */ = {isa = PBXBuildFile; fileRef = 15CB697605C0722B0099E85F /* SCDNotifierWait.c */; settings = {ATTRIBUTES = (); }; };
                15A5A2320D5B94190087BDA0 /* SCDNotifierInformViaCallback.c in Sources */ = {isa = PBXBuildFile; fileRef = 15CB697805C0722B0099E85F /* SCDNotifierInformViaCallback.c */; settings = {ATTRIBUTES = (); }; };
                15A5A2340D5B94190087BDA0 /* SCDNotifierInformViaFD.c in Sources */ = {isa = PBXBuildFile; fileRef = 15CB697C05C0722B0099E85F /* SCDNotifierInformViaFD.c */; settings = {ATTRIBUTES = (); }; };
-               15A5A2350D5B94190087BDA0 /* SCDNotifierInformViaSignal.c in Sources */ = {isa = PBXBuildFile; fileRef = 15CB697E05C0722B0099E85F /* SCDNotifierInformViaSignal.c */; settings = {ATTRIBUTES = (); }; };
                15A5A2360D5B94190087BDA0 /* SCDNotifierCancel.c in Sources */ = {isa = PBXBuildFile; fileRef = 15CB698005C0722B0099E85F /* SCDNotifierCancel.c */; settings = {ATTRIBUTES = (); }; };
                15A5A2370D5B94190087BDA0 /* SCDSnapshot.c in Sources */ = {isa = PBXBuildFile; fileRef = 15CB698205C0722B0099E85F /* SCDSnapshot.c */; settings = {ATTRIBUTES = (); }; };
                15A5A2380D5B94190087BDA0 /* SCP.c in Sources */ = {isa = PBXBuildFile; fileRef = 15CB698405C0722B0099E85F /* SCP.c */; settings = {ATTRIBUTES = (); }; };
                15A5A2360D5B94190087BDA0 /* SCDNotifierCancel.c in Sources */ = {isa = PBXBuildFile; fileRef = 15CB698005C0722B0099E85F /* SCDNotifierCancel.c */; settings = {ATTRIBUTES = (); }; };
                15A5A2370D5B94190087BDA0 /* SCDSnapshot.c in Sources */ = {isa = PBXBuildFile; fileRef = 15CB698205C0722B0099E85F /* SCDSnapshot.c */; settings = {ATTRIBUTES = (); }; };
                15A5A2380D5B94190087BDA0 /* SCP.c in Sources */ = {isa = PBXBuildFile; fileRef = 15CB698405C0722B0099E85F /* SCP.c */; settings = {ATTRIBUTES = (); }; };
@@ -823,8 +856,6 @@
                15C330D1134B95AA0028E36B /* SCNetworkReachabilityInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 15C330D0134B95AA0028E36B /* SCNetworkReachabilityInternal.h */; };
                15C330D2134B95AA0028E36B /* SCNetworkReachabilityInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 15C330D0134B95AA0028E36B /* SCNetworkReachabilityInternal.h */; };
                15C330D3134B95AA0028E36B /* SCNetworkReachabilityInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 15C330D0134B95AA0028E36B /* SCNetworkReachabilityInternal.h */; };
                15C330D1134B95AA0028E36B /* SCNetworkReachabilityInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 15C330D0134B95AA0028E36B /* SCNetworkReachabilityInternal.h */; };
                15C330D2134B95AA0028E36B /* SCNetworkReachabilityInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 15C330D0134B95AA0028E36B /* SCNetworkReachabilityInternal.h */; };
                15C330D3134B95AA0028E36B /* SCNetworkReachabilityInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 15C330D0134B95AA0028E36B /* SCNetworkReachabilityInternal.h */; };
-               15C8C6BF170AAB4E005375CE /* cache.c in Sources */ = {isa = PBXBuildFile; fileRef = 159D53CA07528B36004F8947 /* cache.c */; };
-               15C8C6C0170AAB4E005375CE /* cache.h in Headers */ = {isa = PBXBuildFile; fileRef = 159D53CB07528B36004F8947 /* cache.h */; };
                15CB8F701EE4DCFC00726685 /* network_state_information_logging.h in Headers */ = {isa = PBXBuildFile; fileRef = 1528922C1EDE41ED00FCFE71 /* network_state_information_logging.h */; };
                15CB8F711EE4DCFF00726685 /* network_state_information_logging.h in Headers */ = {isa = PBXBuildFile; fileRef = 1528922C1EDE41ED00FCFE71 /* network_state_information_logging.h */; };
                15CB8F721EE4DD0400726685 /* network_state_information_logging.h in Headers */ = {isa = PBXBuildFile; fileRef = 1528922C1EDE41ED00FCFE71 /* network_state_information_logging.h */; };
                15CB8F701EE4DCFC00726685 /* network_state_information_logging.h in Headers */ = {isa = PBXBuildFile; fileRef = 1528922C1EDE41ED00FCFE71 /* network_state_information_logging.h */; };
                15CB8F711EE4DCFF00726685 /* network_state_information_logging.h in Headers */ = {isa = PBXBuildFile; fileRef = 1528922C1EDE41ED00FCFE71 /* network_state_information_logging.h */; };
                15CB8F721EE4DD0400726685 /* network_state_information_logging.h in Headers */ = {isa = PBXBuildFile; fileRef = 1528922C1EDE41ED00FCFE71 /* network_state_information_logging.h */; };
@@ -869,8 +900,7 @@
                15D92BA31FFC647800DF2632 /* libnetwork.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 15D92BA01FFC641500DF2632 /* libnetwork.tbd */; };
                15D92BA41FFC648900DF2632 /* libnetwork.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 15D92B9D1FFC61F400DF2632 /* libnetwork.tbd */; };
                15D92BA51FFC64DB00DF2632 /* libnetwork.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 15D92BA01FFC641500DF2632 /* libnetwork.tbd */; };
                15D92BA31FFC647800DF2632 /* libnetwork.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 15D92BA01FFC641500DF2632 /* libnetwork.tbd */; };
                15D92BA41FFC648900DF2632 /* libnetwork.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 15D92B9D1FFC61F400DF2632 /* libnetwork.tbd */; };
                15D92BA51FFC64DB00DF2632 /* libnetwork.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 15D92BA01FFC641500DF2632 /* libnetwork.tbd */; };
-               15D92BA71FFC669100DF2632 /* MobileWiFi.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15D92BA61FFC669000DF2632 /* MobileWiFi.framework */; };
-               15D9DCFB10DD90A1004E545D /* AppWorkaround.plist in AppWorkaround.plist */ = {isa = PBXBuildFile; fileRef = 15D9DCFA10DD90A1004E545D /* AppWorkaround.plist */; };
+               15D92BA71FFC669100DF2632 /* MobileWiFi.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15D92BA61FFC669000DF2632 /* MobileWiFi.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
                15DAD5E1075913CE0084A6ED /* dnsinfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 15B73F0905FD1B670096477F /* dnsinfo.h */; settings = {ATTRIBUTES = (Public, ); }; };
                15DAD5E2075913CE0084A6ED /* dnsinfo_private.h in Headers */ = {isa = PBXBuildFile; fileRef = 15B73F0C05FD1B670096477F /* dnsinfo_private.h */; };
                15DAD5E6075913CE0084A6ED /* dnsinfo_copy.c in Sources */ = {isa = PBXBuildFile; fileRef = 15B73F0805FD1B670096477F /* dnsinfo_copy.c */; };
                15DAD5E1075913CE0084A6ED /* dnsinfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 15B73F0905FD1B670096477F /* dnsinfo.h */; settings = {ATTRIBUTES = (Public, ); }; };
                15DAD5E2075913CE0084A6ED /* dnsinfo_private.h in Headers */ = {isa = PBXBuildFile; fileRef = 15B73F0C05FD1B670096477F /* dnsinfo_private.h */; };
                15DAD5E6075913CE0084A6ED /* dnsinfo_copy.c in Sources */ = {isa = PBXBuildFile; fileRef = 15B73F0805FD1B670096477F /* dnsinfo_copy.c */; };
@@ -922,7 +952,6 @@
                15DAD67F07591A1A0084A6ED /* SCDNotifierWait.c in Sources */ = {isa = PBXBuildFile; fileRef = 15CB697605C0722B0099E85F /* SCDNotifierWait.c */; settings = {ATTRIBUTES = (); }; };
                15DAD68007591A1A0084A6ED /* SCDNotifierInformViaCallback.c in Sources */ = {isa = PBXBuildFile; fileRef = 15CB697805C0722B0099E85F /* SCDNotifierInformViaCallback.c */; settings = {ATTRIBUTES = (); }; };
                15DAD68207591A1A0084A6ED /* SCDNotifierInformViaFD.c in Sources */ = {isa = PBXBuildFile; fileRef = 15CB697C05C0722B0099E85F /* SCDNotifierInformViaFD.c */; settings = {ATTRIBUTES = (); }; };
                15DAD67F07591A1A0084A6ED /* SCDNotifierWait.c in Sources */ = {isa = PBXBuildFile; fileRef = 15CB697605C0722B0099E85F /* SCDNotifierWait.c */; settings = {ATTRIBUTES = (); }; };
                15DAD68007591A1A0084A6ED /* SCDNotifierInformViaCallback.c in Sources */ = {isa = PBXBuildFile; fileRef = 15CB697805C0722B0099E85F /* SCDNotifierInformViaCallback.c */; settings = {ATTRIBUTES = (); }; };
                15DAD68207591A1A0084A6ED /* SCDNotifierInformViaFD.c in Sources */ = {isa = PBXBuildFile; fileRef = 15CB697C05C0722B0099E85F /* SCDNotifierInformViaFD.c */; settings = {ATTRIBUTES = (); }; };
-               15DAD68307591A1A0084A6ED /* SCDNotifierInformViaSignal.c in Sources */ = {isa = PBXBuildFile; fileRef = 15CB697E05C0722B0099E85F /* SCDNotifierInformViaSignal.c */; settings = {ATTRIBUTES = (); }; };
                15DAD68407591A1A0084A6ED /* SCDNotifierCancel.c in Sources */ = {isa = PBXBuildFile; fileRef = 15CB698005C0722B0099E85F /* SCDNotifierCancel.c */; settings = {ATTRIBUTES = (); }; };
                15DAD68507591A1A0084A6ED /* SCDSnapshot.c in Sources */ = {isa = PBXBuildFile; fileRef = 15CB698205C0722B0099E85F /* SCDSnapshot.c */; settings = {ATTRIBUTES = (); }; };
                15DAD68607591A1A0084A6ED /* SCP.c in Sources */ = {isa = PBXBuildFile; fileRef = 15CB698405C0722B0099E85F /* SCP.c */; settings = {ATTRIBUTES = (); }; };
                15DAD68407591A1A0084A6ED /* SCDNotifierCancel.c in Sources */ = {isa = PBXBuildFile; fileRef = 15CB698005C0722B0099E85F /* SCDNotifierCancel.c */; settings = {ATTRIBUTES = (); }; };
                15DAD68507591A1A0084A6ED /* SCDSnapshot.c in Sources */ = {isa = PBXBuildFile; fileRef = 15CB698205C0722B0099E85F /* SCDSnapshot.c */; settings = {ATTRIBUTES = (); }; };
                15DAD68607591A1A0084A6ED /* SCP.c in Sources */ = {isa = PBXBuildFile; fileRef = 15CB698405C0722B0099E85F /* SCP.c */; settings = {ATTRIBUTES = (); }; };
@@ -975,6 +1004,23 @@
                15E1B05316EBAE3C00E5F06F /* libSystemConfiguration_server.c in Sources */ = {isa = PBXBuildFile; fileRef = 1596A7AF14EDB73D00798C39 /* libSystemConfiguration_server.c */; };
                15E1B05416EBAE3C00E5F06F /* scprefs_observer.c in Sources */ = {isa = PBXBuildFile; fileRef = D61AAEAD1522C99C0066B003 /* scprefs_observer.c */; };
                15E1B05516EBAE3C00E5F06F /* IPMonitorControlPrefs.c in Sources */ = {isa = PBXBuildFile; fileRef = F9A3780E16A4846E00C57CDC /* IPMonitorControlPrefs.c */; };
                15E1B05316EBAE3C00E5F06F /* libSystemConfiguration_server.c in Sources */ = {isa = PBXBuildFile; fileRef = 1596A7AF14EDB73D00798C39 /* libSystemConfiguration_server.c */; };
                15E1B05416EBAE3C00E5F06F /* scprefs_observer.c in Sources */ = {isa = PBXBuildFile; fileRef = D61AAEAD1522C99C0066B003 /* scprefs_observer.c */; };
                15E1B05516EBAE3C00E5F06F /* IPMonitorControlPrefs.c in Sources */ = {isa = PBXBuildFile; fileRef = F9A3780E16A4846E00C57CDC /* IPMonitorControlPrefs.c */; };
+               15E56C552193840000088C51 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15A5A26A0D5B94190087BDA0 /* SystemConfiguration.framework */; };
+               15E56C5921939B6400088C51 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 725CB7541BF439C6000C05A8 /* Foundation.framework */; };
+               15E56C5B21939B7B00088C51 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15E56C5A21939B7B00088C51 /* Foundation.framework */; };
+               15E56C5C21939B8E00088C51 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15E56C5A21939B7B00088C51 /* Foundation.framework */; };
+               15E91DB721893E83001155DC /* test-objC.m in Sources */ = {isa = PBXBuildFile; fileRef = 72D3E66B1AE6EAF600DB4C69 /* test-objC.m */; };
+               15E91DB921893E83001155DC /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1547072E0D1F70C80075C28D /* SystemConfiguration.framework */; };
+               15E91DD021893EE1001155DC /* main.swift in Sources */ = {isa = PBXBuildFile; fileRef = 72D3E6601AE6EA3A00DB4C69 /* main.swift */; };
+               15EF899F21894452003B2C5C /* SCNetworkInterfaceProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = F90E43542012AD3900EF27C4 /* SCNetworkInterfaceProvider.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               15EF89A021894533003B2C5C /* SNHelperPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = B0C967F717441F0E00889853 /* SNHelperPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               15EF89AA21894636003B2C5C /* test-objC.m in Sources */ = {isa = PBXBuildFile; fileRef = 72D3E66B1AE6EAF600DB4C69 /* test-objC.m */; };
+               15EF89AC21894636003B2C5C /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1547072E0D1F70C80075C28D /* SystemConfiguration.framework */; };
+               15EF89B621894665003B2C5C /* main.swift in Sources */ = {isa = PBXBuildFile; fileRef = 72D3E6601AE6EA3A00DB4C69 /* main.swift */; };
+               15EF89C921894AA5003B2C5C /* SCNetworkInterfaceProvider.c in Sources */ = {isa = PBXBuildFile; fileRef = F90E43552012AD4500EF27C4 /* SCNetworkInterfaceProvider.c */; };
+               15EF89CA21894AB4003B2C5C /* SNHelper.c in Sources */ = {isa = PBXBuildFile; fileRef = B0C9689B174426C200889853 /* SNHelper.c */; };
+               15EF89CB21894B1A003B2C5C /* IPMonitorControlPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = F9B7AE5E1862116500C78D18 /* IPMonitorControlPrivate.h */; };
+               15EF89CC21894B28003B2C5C /* IPMonitorControl.h in Headers */ = {isa = PBXBuildFile; fileRef = F9B7AE5D1862116500C78D18 /* IPMonitorControl.h */; };
+               15EF89CD21894B32003B2C5C /* IPMonitorControl.c in Sources */ = {isa = PBXBuildFile; fileRef = F9B7AE5C1862116500C78D18 /* IPMonitorControl.c */; };
                15F21618110F823500E89CF7 /* libbsm.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 15BAA32207F0699A00D9EC95 /* libbsm.dylib */; };
                15F742DD1EC6370000DA2E7A /* liblog_SystemConfiguration.m in Sources */ = {isa = PBXBuildFile; fileRef = 151D060D1EC14C6700E02E48 /* liblog_SystemConfiguration.m */; };
                15F742DF1EC6370000DA2E7A /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 725CB7541BF439C6000C05A8 /* Foundation.framework */; };
                15F21618110F823500E89CF7 /* libbsm.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 15BAA32207F0699A00D9EC95 /* libbsm.dylib */; };
                15F742DD1EC6370000DA2E7A /* liblog_SystemConfiguration.m in Sources */ = {isa = PBXBuildFile; fileRef = 151D060D1EC14C6700E02E48 /* liblog_SystemConfiguration.m */; };
                15F742DF1EC6370000DA2E7A /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 725CB7541BF439C6000C05A8 /* Foundation.framework */; };
@@ -998,7 +1044,7 @@
                720A4C0C1C585C97007436B8 /* dnsAgent.h in Headers */ = {isa = PBXBuildFile; fileRef = 7280157C1BE16833009F4F60 /* dnsAgent.h */; };
                720A4C0D1C585C9F007436B8 /* proxyAgent.h in Headers */ = {isa = PBXBuildFile; fileRef = 7280157F1BE16833009F4F60 /* proxyAgent.h */; };
                7214BCE31BEB392000A8F056 /* Network.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 728015951BE16B6C009F4F60 /* Network.framework */; };
                720A4C0C1C585C97007436B8 /* dnsAgent.h in Headers */ = {isa = PBXBuildFile; fileRef = 7280157C1BE16833009F4F60 /* dnsAgent.h */; };
                720A4C0D1C585C9F007436B8 /* proxyAgent.h in Headers */ = {isa = PBXBuildFile; fileRef = 7280157F1BE16833009F4F60 /* proxyAgent.h */; };
                7214BCE31BEB392000A8F056 /* Network.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 728015951BE16B6C009F4F60 /* Network.framework */; };
-               7214BCE41BEB392300A8F056 /* NetworkExtension.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 728015961BE16B6C009F4F60 /* NetworkExtension.framework */; };
+               7214BCE41BEB392300A8F056 /* NetworkExtension.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 728015961BE16B6C009F4F60 /* NetworkExtension.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
                72499BA41AC9B7AB0090C49F /* get-network-info in Resources */ = {isa = PBXBuildFile; fileRef = 72499BA31AC9B7AB0090C49F /* get-network-info */; };
                72499BA51AC9B7AB0090C49F /* get-network-info in Resources */ = {isa = PBXBuildFile; fileRef = 72499BA31AC9B7AB0090C49F /* get-network-info */; };
                72573D291D667372004975AD /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 72573D281D667372004975AD /* main.m */; };
                72499BA41AC9B7AB0090C49F /* get-network-info in Resources */ = {isa = PBXBuildFile; fileRef = 72499BA31AC9B7AB0090C49F /* get-network-info */; };
                72499BA51AC9B7AB0090C49F /* get-network-info in Resources */ = {isa = PBXBuildFile; fileRef = 72499BA31AC9B7AB0090C49F /* get-network-info */; };
                72573D291D667372004975AD /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 72573D281D667372004975AD /* main.m */; };
@@ -1048,7 +1094,7 @@
                728015911BE1686C009F4F60 /* proxyAgent.m in Sources */ = {isa = PBXBuildFile; fileRef = 728015801BE16833009F4F60 /* proxyAgent.m */; };
                728015921BE1686F009F4F60 /* proxyAgent.m in Sources */ = {isa = PBXBuildFile; fileRef = 728015801BE16833009F4F60 /* proxyAgent.m */; };
                728015971BE16B6C009F4F60 /* Network.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 728015951BE16B6C009F4F60 /* Network.framework */; };
                728015911BE1686C009F4F60 /* proxyAgent.m in Sources */ = {isa = PBXBuildFile; fileRef = 728015801BE16833009F4F60 /* proxyAgent.m */; };
                728015921BE1686F009F4F60 /* proxyAgent.m in Sources */ = {isa = PBXBuildFile; fileRef = 728015801BE16833009F4F60 /* proxyAgent.m */; };
                728015971BE16B6C009F4F60 /* Network.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 728015951BE16B6C009F4F60 /* Network.framework */; };
-               728015981BE16B6C009F4F60 /* NetworkExtension.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 728015961BE16B6C009F4F60 /* NetworkExtension.framework */; };
+               728015981BE16B6C009F4F60 /* NetworkExtension.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 728015961BE16B6C009F4F60 /* NetworkExtension.framework */; settings = {ATTRIBUTES = (Required, ); }; };
                728015991BE1812B009F4F60 /* agent-monitor.h in Headers */ = {isa = PBXBuildFile; fileRef = 728015931BE1697E009F4F60 /* agent-monitor.h */; };
                7280159B1BE1812B009F4F60 /* configAgent.h in Headers */ = {isa = PBXBuildFile; fileRef = 728015781BE16833009F4F60 /* configAgent.h */; };
                7280159C1BE1812B009F4F60 /* controller.h in Headers */ = {isa = PBXBuildFile; fileRef = 7280157A1BE16833009F4F60 /* controller.h */; };
                728015991BE1812B009F4F60 /* agent-monitor.h in Headers */ = {isa = PBXBuildFile; fileRef = 728015931BE1697E009F4F60 /* agent-monitor.h */; };
                7280159B1BE1812B009F4F60 /* configAgent.h in Headers */ = {isa = PBXBuildFile; fileRef = 728015781BE16833009F4F60 /* configAgent.h */; };
                7280159C1BE1812B009F4F60 /* controller.h in Headers */ = {isa = PBXBuildFile; fileRef = 7280157A1BE16833009F4F60 /* controller.h */; };
@@ -1083,6 +1129,13 @@
                C42633891A9E4991009F7AE4 /* VPNFlow.c in Sources */ = {isa = PBXBuildFile; fileRef = C4CDB8141631935700819B44 /* VPNFlow.c */; };
                C4666C72206ED01800247AB6 /* EventFactory.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15FA0F74203A390E00C7702F /* EventFactory.framework */; };
                C4666C7A206ED27800247AB6 /* EventFactory.m in Sources */ = {isa = PBXBuildFile; fileRef = 1597A9A41FBCECCD000FAA86 /* EventFactory.m */; };
                C42633891A9E4991009F7AE4 /* VPNFlow.c in Sources */ = {isa = PBXBuildFile; fileRef = C4CDB8141631935700819B44 /* VPNFlow.c */; };
                C4666C72206ED01800247AB6 /* EventFactory.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15FA0F74203A390E00C7702F /* EventFactory.framework */; };
                C4666C7A206ED27800247AB6 /* EventFactory.m in Sources */ = {isa = PBXBuildFile; fileRef = 1597A9A41FBCECCD000FAA86 /* EventFactory.m */; };
+               C469CB2920EED6C100A7AD35 /* StateDumpParser.m in Sources */ = {isa = PBXBuildFile; fileRef = C469CB2820EED6C100A7AD35 /* StateDumpParser.m */; };
+               C496A09620F909FF0098B3E5 /* IPConfigurationParser.m in Sources */ = {isa = PBXBuildFile; fileRef = C496A09520F909FF0098B3E5 /* IPConfigurationParser.m */; };
+               C4C5FB0520EA9B6F00F35614 /* SCLogParser.m in Sources */ = {isa = PBXBuildFile; fileRef = C4C5FB0420EA9B6F00F35614 /* SCLogParser.m */; };
+               C4C5FB0620EA9C3200F35614 /* KernelEventMonitorParser.m in Sources */ = {isa = PBXBuildFile; fileRef = C4C5FB0220EA9A5A00F35614 /* KernelEventMonitorParser.m */; };
+               C4C5FB0920EAB0DD00F35614 /* InterfaceNamerParser.m in Sources */ = {isa = PBXBuildFile; fileRef = C4C5FB0820EAB0DD00F35614 /* InterfaceNamerParser.m */; };
+               C4C5FB0C20EABD9E00F35614 /* IPMonitorParser.m in Sources */ = {isa = PBXBuildFile; fileRef = C4C5FB0B20EABD9E00F35614 /* IPMonitorParser.m */; };
+               C4C5FB0F20EAC05200F35614 /* PreferencesMonitorParser.m in Sources */ = {isa = PBXBuildFile; fileRef = C4C5FB0E20EAC05200F35614 /* PreferencesMonitorParser.m */; };
                C4CDB8151631935700819B44 /* VPNFlow.c in Sources */ = {isa = PBXBuildFile; fileRef = C4CDB8141631935700819B44 /* VPNFlow.c */; };
                C4CDB8161631935700819B44 /* VPNFlow.c in Sources */ = {isa = PBXBuildFile; fileRef = C4CDB8141631935700819B44 /* VPNFlow.c */; };
                C4CDB8171631938000819B44 /* VPNFlow.h in Headers */ = {isa = PBXBuildFile; fileRef = C4CDB8111631933400819B44 /* VPNFlow.h */; settings = {ATTRIBUTES = (Private, ); }; };
                C4CDB8151631935700819B44 /* VPNFlow.c in Sources */ = {isa = PBXBuildFile; fileRef = C4CDB8141631935700819B44 /* VPNFlow.c */; };
                C4CDB8161631935700819B44 /* VPNFlow.c in Sources */ = {isa = PBXBuildFile; fileRef = C4CDB8141631935700819B44 /* VPNFlow.c */; };
                C4CDB8171631938000819B44 /* VPNFlow.h in Headers */ = {isa = PBXBuildFile; fileRef = C4CDB8111631933400819B44 /* VPNFlow.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -1105,6 +1158,10 @@
                D6986A79136891650091C931 /* network_information.c in Sources */ = {isa = PBXBuildFile; fileRef = D6986A77136891300091C931 /* network_information.c */; };
                E49173E1137C4E4F0000089F /* network_state_information_priv.c in Sources */ = {isa = PBXBuildFile; fileRef = D6986A75136891120091C931 /* network_state_information_priv.c */; };
                E4F211D3137B0AB900BBB915 /* network_state_information_priv.c in Sources */ = {isa = PBXBuildFile; fileRef = D6986A75136891120091C931 /* network_state_information_priv.c */; };
                D6986A79136891650091C931 /* network_information.c in Sources */ = {isa = PBXBuildFile; fileRef = D6986A77136891300091C931 /* network_information.c */; };
                E49173E1137C4E4F0000089F /* network_state_information_priv.c in Sources */ = {isa = PBXBuildFile; fileRef = D6986A75136891120091C931 /* network_state_information_priv.c */; };
                E4F211D3137B0AB900BBB915 /* network_state_information_priv.c in Sources */ = {isa = PBXBuildFile; fileRef = D6986A75136891120091C931 /* network_state_information_priv.c */; };
+               F90E43562012AD4F00EF27C4 /* SCNetworkInterfaceProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = F90E43542012AD3900EF27C4 /* SCNetworkInterfaceProvider.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               F90E43572012AD6000EF27C4 /* SCNetworkInterfaceProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = F90E43542012AD3900EF27C4 /* SCNetworkInterfaceProvider.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               F90E43582012AD6900EF27C4 /* SCNetworkInterfaceProvider.c in Sources */ = {isa = PBXBuildFile; fileRef = F90E43552012AD4500EF27C4 /* SCNetworkInterfaceProvider.c */; };
+               F90E43592012AD6B00EF27C4 /* SCNetworkInterfaceProvider.c in Sources */ = {isa = PBXBuildFile; fileRef = F90E43552012AD4500EF27C4 /* SCNetworkInterfaceProvider.c */; };
                F9347FF7187C796E003D4178 /* IPMonitorControl.c in Sources */ = {isa = PBXBuildFile; fileRef = F9B7AE5C1862116500C78D18 /* IPMonitorControl.c */; };
                F9347FF8187C7993003D4178 /* IPMonitorControl.h in Headers */ = {isa = PBXBuildFile; fileRef = F9B7AE5D1862116500C78D18 /* IPMonitorControl.h */; };
                F9347FF9187C7993003D4178 /* IPMonitorControlPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = F9B7AE5E1862116500C78D18 /* IPMonitorControlPrivate.h */; };
                F9347FF7187C796E003D4178 /* IPMonitorControl.c in Sources */ = {isa = PBXBuildFile; fileRef = F9B7AE5C1862116500C78D18 /* IPMonitorControl.c */; };
                F9347FF8187C7993003D4178 /* IPMonitorControl.h in Headers */ = {isa = PBXBuildFile; fileRef = F9B7AE5D1862116500C78D18 /* IPMonitorControl.h */; };
                F9347FF9187C7993003D4178 /* IPMonitorControlPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = F9B7AE5E1862116500C78D18 /* IPMonitorControlPrivate.h */; };
@@ -1112,13 +1169,12 @@
                F95B8A430B03E07A00993BA3 /* SCNetworkSignature.c in Sources */ = {isa = PBXBuildFile; fileRef = F95B8A420B03E07A00993BA3 /* SCNetworkSignature.c */; };
                F95B8A460B03E09300993BA3 /* SCNetworkSignature.h in Headers */ = {isa = PBXBuildFile; fileRef = F95B8A440B03E09300993BA3 /* SCNetworkSignature.h */; settings = {ATTRIBUTES = (Private, ); }; };
                F95B8A470B03E09300993BA3 /* SCNetworkSignaturePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = F95B8A450B03E09300993BA3 /* SCNetworkSignaturePrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
                F95B8A430B03E07A00993BA3 /* SCNetworkSignature.c in Sources */ = {isa = PBXBuildFile; fileRef = F95B8A420B03E07A00993BA3 /* SCNetworkSignature.c */; };
                F95B8A460B03E09300993BA3 /* SCNetworkSignature.h in Headers */ = {isa = PBXBuildFile; fileRef = F95B8A440B03E09300993BA3 /* SCNetworkSignature.h */; settings = {ATTRIBUTES = (Private, ); }; };
                F95B8A470B03E09300993BA3 /* SCNetworkSignaturePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = F95B8A450B03E09300993BA3 /* SCNetworkSignaturePrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               F97F9FC7202CBD5A0040BD50 /* SCNetworkInterfaceProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = F97F9FC5202CBD130040BD50 /* SCNetworkInterfaceProvider.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               F97F9FC8202CBD600040BD50 /* SCNetworkInterfaceProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = F97F9FC5202CBD130040BD50 /* SCNetworkInterfaceProvider.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               F97F9FC9202CBD710040BD50 /* SCNetworkInterfaceProvider.c in Sources */ = {isa = PBXBuildFile; fileRef = F97F9FC6202CBD230040BD50 /* SCNetworkInterfaceProvider.c */; };
-               F999388920FE54DB005EE20D /* AwdMetadata-0x81-IPMonitor.bin in CopyFiles */ = {isa = PBXBuildFile; fileRef = F999388820FE54CB005EE20D /* AwdMetadata-0x81-IPMonitor.bin */; };
+               F963401020FE8E6000F1E1F1 /* AwdMetadata-0x81-IPMonitor.bin in CopyFiles */ = {isa = PBXBuildFile; fileRef = F963400E20FE8E1D00F1E1F1 /* AwdMetadata-0x81-IPMonitor.bin */; };
+               F97289D322652D0600080596 /* serviceIDNumber.c in Sources */ = {isa = PBXBuildFile; fileRef = F97289D122652CE600080596 /* serviceIDNumber.c */; };
+               F97289D422652D0A00080596 /* serviceIDNumber.c in Sources */ = {isa = PBXBuildFile; fileRef = F97289D122652CE600080596 /* serviceIDNumber.c */; };
+               F97289D522652D0D00080596 /* serviceIDNumber.c in Sources */ = {isa = PBXBuildFile; fileRef = F97289D122652CE600080596 /* serviceIDNumber.c */; };
                F9A3781016A4847700C57CDC /* IPMonitorControlPrefs.c in Sources */ = {isa = PBXBuildFile; fileRef = F9A3780E16A4846E00C57CDC /* IPMonitorControlPrefs.c */; };
                F9A3781116A4849100C57CDC /* IPMonitorControlPrefs.c in Sources */ = {isa = PBXBuildFile; fileRef = F9A3780E16A4846E00C57CDC /* IPMonitorControlPrefs.c */; };
                F9A3781016A4847700C57CDC /* IPMonitorControlPrefs.c in Sources */ = {isa = PBXBuildFile; fileRef = F9A3780E16A4846E00C57CDC /* IPMonitorControlPrefs.c */; };
                F9A3781116A4849100C57CDC /* IPMonitorControlPrefs.c in Sources */ = {isa = PBXBuildFile; fileRef = F9A3780E16A4846E00C57CDC /* IPMonitorControlPrefs.c */; };
-               F9AF76C1202CCD86008D3BEB /* SCNetworkInterfaceProvider.c in Sources */ = {isa = PBXBuildFile; fileRef = F97F9FC6202CBD230040BD50 /* SCNetworkInterfaceProvider.c */; };
                F9B50FF316A4CBB200CA274E /* IPMonitorControlPrefs.c in Sources */ = {isa = PBXBuildFile; fileRef = F9A3780E16A4846E00C57CDC /* IPMonitorControlPrefs.c */; };
                F9B50FF416A4CBB800CA274E /* IPMonitorControlPrefs.c in Sources */ = {isa = PBXBuildFile; fileRef = F9A3780E16A4846E00C57CDC /* IPMonitorControlPrefs.c */; };
                F9B7AE641862119300C78D18 /* IPMonitorControl.c in Sources */ = {isa = PBXBuildFile; fileRef = F9B7AE5C1862116500C78D18 /* IPMonitorControl.c */; };
                F9B50FF316A4CBB200CA274E /* IPMonitorControlPrefs.c in Sources */ = {isa = PBXBuildFile; fileRef = F9A3780E16A4846E00C57CDC /* IPMonitorControlPrefs.c */; };
                F9B50FF416A4CBB800CA274E /* IPMonitorControlPrefs.c in Sources */ = {isa = PBXBuildFile; fileRef = F9A3780E16A4846E00C57CDC /* IPMonitorControlPrefs.c */; };
                F9B7AE641862119300C78D18 /* IPMonitorControl.c in Sources */ = {isa = PBXBuildFile; fileRef = F9B7AE5C1862116500C78D18 /* IPMonitorControl.c */; };
@@ -1135,8 +1191,8 @@
                F9B7AE6F186211F600C78D18 /* symbol_scope.h in Headers */ = {isa = PBXBuildFile; fileRef = F9B7AE631862116500C78D18 /* symbol_scope.h */; };
                F9D7304B20DDBE9900521181 /* AWDIPMonitorInterfaceAdvisoryReport.m in Sources */ = {isa = PBXBuildFile; fileRef = F9D7304920DD89C600521181 /* AWDIPMonitorInterfaceAdvisoryReport.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
                F9D7304C20DDBEAB00521181 /* IPMonitorAWDReport.m in Sources */ = {isa = PBXBuildFile; fileRef = F9D7303D20DD894C00521181 /* IPMonitorAWDReport.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
                F9B7AE6F186211F600C78D18 /* symbol_scope.h in Headers */ = {isa = PBXBuildFile; fileRef = F9B7AE631862116500C78D18 /* symbol_scope.h */; };
                F9D7304B20DDBE9900521181 /* AWDIPMonitorInterfaceAdvisoryReport.m in Sources */ = {isa = PBXBuildFile; fileRef = F9D7304920DD89C600521181 /* AWDIPMonitorInterfaceAdvisoryReport.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
                F9D7304C20DDBEAB00521181 /* IPMonitorAWDReport.m in Sources */ = {isa = PBXBuildFile; fileRef = F9D7303D20DD894C00521181 /* IPMonitorAWDReport.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
-               F9D7304F20E41D9C00521181 /* ProtocolBuffer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F9D7304E20E41D9C00521181 /* ProtocolBuffer.framework */; };
-               F9D7305120E41DD500521181 /* WirelessDiagnostics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F9D7305020E41DD500521181 /* WirelessDiagnostics.framework */; settings = {ATTRIBUTES = (Required, ); }; };
+               F9D7304F20E41D9C00521181 /* ProtocolBuffer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F9D7304E20E41D9C00521181 /* ProtocolBuffer.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
+               F9D7305120E41DD500521181 /* WirelessDiagnostics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F9D7305020E41DD500521181 /* WirelessDiagnostics.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
                F9D7305220E4211900521181 /* AWDIPMonitorInterfaceAdvisoryReport.m in Sources */ = {isa = PBXBuildFile; fileRef = F9D7304920DD89C600521181 /* AWDIPMonitorInterfaceAdvisoryReport.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
                F9D7305320E4211900521181 /* IPMonitorAWDReport.m in Sources */ = {isa = PBXBuildFile; fileRef = F9D7303D20DD894C00521181 /* IPMonitorAWDReport.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
                F9D7305420E4387A00521181 /* ProtocolBuffer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F9D7304E20E41D9C00521181 /* ProtocolBuffer.framework */; };
                F9D7305220E4211900521181 /* AWDIPMonitorInterfaceAdvisoryReport.m in Sources */ = {isa = PBXBuildFile; fileRef = F9D7304920DD89C600521181 /* AWDIPMonitorInterfaceAdvisoryReport.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
                F9D7305320E4211900521181 /* IPMonitorAWDReport.m in Sources */ = {isa = PBXBuildFile; fileRef = F9D7303D20DD894C00521181 /* IPMonitorAWDReport.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
                F9D7305420E4387A00521181 /* ProtocolBuffer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F9D7304E20E41D9C00521181 /* ProtocolBuffer.framework */; };
@@ -1144,6 +1200,20 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
+               150EC100210171AE0047F4BF /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 15CB6A7705C0722B0099E85F /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = 72D3E6681AE6EAF600DB4C69;
+                       remoteInfo = "SCTest-ObjC";
+               };
+               150EC102210171B60047F4BF /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 15CB6A7705C0722B0099E85F /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = 72D3E65D1AE6EA3900DB4C69;
+                       remoteInfo = "SCTest-Swift";
+               };
                150ECB2F0D0042DA0065E94D /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = 15CB6A7705C0722B0099E85F /* Project object */;
                150ECB2F0D0042DA0065E94D /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = 15CB6A7705C0722B0099E85F /* Project object */;
@@ -1165,6 +1235,27 @@
                        remoteGlobalIDString = 158337990CFB6B9E0033AB93;
                        remoteInfo = "SCHelper-Embedded";
                };
                        remoteGlobalIDString = 158337990CFB6B9E0033AB93;
                        remoteInfo = "SCHelper-Embedded";
                };
+               15401C2B21991B05006326B7 /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 15CB6A7705C0722B0099E85F /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = 15401C1C21991506006326B7;
+                       remoteInfo = configd_extras;
+               };
+               15401C2D21991B1B006326B7 /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 15CB6A7705C0722B0099E85F /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = 15401C21219915BC006326B7;
+                       remoteInfo = "configd_extras-Embedded";
+               };
+               15401C2F21991B31006326B7 /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 15CB6A7705C0722B0099E85F /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = 15401C26219915C6006326B7;
+                       remoteInfo = "configd_extras-EmbeddedSimulator";
+               };
                1558480507550D470046C2E9 /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = 15CB6A7705C0722B0099E85F /* Project object */;
                1558480507550D470046C2E9 /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = 15CB6A7705C0722B0099E85F /* Project object */;
@@ -1186,6 +1277,20 @@
                        remoteGlobalIDString = 155847FA07550D210046C2E9;
                        remoteInfo = configd_executables;
                };
                        remoteGlobalIDString = 155847FA07550D210046C2E9;
                        remoteInfo = configd_executables;
                };
+               155C626021C2B6FD008DCB1A /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 15CB6A7705C0722B0099E85F /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = 157433DD0D4A8122002ACA73;
+                       remoteInfo = "scselect-Embedded";
+               };
+               155C626421C2B6FD008DCB1A /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 15CB6A7705C0722B0099E85F /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = 7271EA1B1D76600B0055B1AA;
+                       remoteInfo = "sctest-Embedded";
+               };
                155F49A81C8650E900E47D08 /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = 15CB6A7705C0722B0099E85F /* Project object */;
                155F49A81C8650E900E47D08 /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = 15CB6A7705C0722B0099E85F /* Project object */;
@@ -1270,13 +1375,6 @@
                        remoteGlobalIDString = 157433F00D4A8137002ACA73;
                        remoteInfo = "scutil-Embedded";
                };
                        remoteGlobalIDString = 157433F00D4A8137002ACA73;
                        remoteInfo = "scutil-Embedded";
                };
-               157434200D4A8166002ACA73 /* PBXContainerItemProxy */ = {
-                       isa = PBXContainerItemProxy;
-                       containerPortal = 15CB6A7705C0722B0099E85F /* Project object */;
-                       proxyType = 1;
-                       remoteGlobalIDString = 157433DD0D4A8122002ACA73;
-                       remoteInfo = "scselect-Embedded";
-               };
                157A85470D56CA0B00B6F1A0 /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = 15CB6A7705C0722B0099E85F /* Project object */;
                157A85470D56CA0B00B6F1A0 /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = 15CB6A7705C0722B0099E85F /* Project object */;
@@ -1592,26 +1690,75 @@
                        remoteGlobalIDString = 15FD13BF0D59485000F9409C;
                        remoteInfo = "All-EmbeddedSimulator";
                };
                        remoteGlobalIDString = 15FD13BF0D59485000F9409C;
                        remoteInfo = "All-EmbeddedSimulator";
                };
-               723050311AE6F292004AC149 /* PBXContainerItemProxy */ = {
+               15EF89A121894601003B2C5C /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = 15CB6A7705C0722B0099E85F /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 15CB6A7705C0722B0099E85F /* Project object */;
                        proxyType = 1;
-                       remoteGlobalIDString = 15DAD63F07591A1A0084A6ED;
-                       remoteInfo = SystemConfiguration.framework;
+                       remoteGlobalIDString = 1572C4A60CFB55B400E2776E;
+                       remoteInfo = "SystemConfiguration.framework-Embedded";
                };
                };
-               723050331AE6F29D004AC149 /* PBXContainerItemProxy */ = {
+               15EF89A32189461B003B2C5C /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 15CB6A7705C0722B0099E85F /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = 1572C4A60CFB55B400E2776E;
+                       remoteInfo = "SystemConfiguration.framework-Embedded";
+               };
+               15EF89BD2189467B003B2C5C /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 15CB6A7705C0722B0099E85F /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = 15A5A1E40D5B94190087BDA0;
+                       remoteInfo = "SystemConfiguration.framework-EmbeddedSimulator";
+               };
+               15EF89BF21894688003B2C5C /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 15CB6A7705C0722B0099E85F /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = 15A5A1E40D5B94190087BDA0;
+                       remoteInfo = "SystemConfiguration.framework-EmbeddedSimulator";
+               };
+               15EF89C121894837003B2C5C /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 15CB6A7705C0722B0099E85F /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = 15E91DB221893E83001155DC;
+                       remoteInfo = "SCTest-ObjC-Embedded";
+               };
+               15EF89C321894837003B2C5C /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 15CB6A7705C0722B0099E85F /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = 15E91DCC21893EE1001155DC;
+                       remoteInfo = "SCTest-Swift-Embedded";
+               };
+               15EF89C52189484C003B2C5C /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 15CB6A7705C0722B0099E85F /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = 15EF89A521894636003B2C5C;
+                       remoteInfo = "SCTest-ObjC-EmbeddedSimulator";
+               };
+               15EF89C72189484C003B2C5C /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 15CB6A7705C0722B0099E85F /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = 15EF89B221894665003B2C5C;
+                       remoteInfo = "SCTest-Swift-EmbeddedSimulator";
+               };
+               723050311AE6F292004AC149 /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = 15CB6A7705C0722B0099E85F /* Project object */;
                        proxyType = 1;
                        remoteGlobalIDString = 15DAD63F07591A1A0084A6ED;
                        remoteInfo = SystemConfiguration.framework;
                };
                        isa = PBXContainerItemProxy;
                        containerPortal = 15CB6A7705C0722B0099E85F /* Project object */;
                        proxyType = 1;
                        remoteGlobalIDString = 15DAD63F07591A1A0084A6ED;
                        remoteInfo = SystemConfiguration.framework;
                };
-               7271EA331D7660980055B1AA /* PBXContainerItemProxy */ = {
+               723050331AE6F29D004AC149 /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = 15CB6A7705C0722B0099E85F /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 15CB6A7705C0722B0099E85F /* Project object */;
                        proxyType = 1;
-                       remoteGlobalIDString = 7271EA1B1D76600B0055B1AA;
-                       remoteInfo = "sctest-Embedded";
+                       remoteGlobalIDString = 15DAD63F07591A1A0084A6ED;
+                       remoteInfo = SystemConfiguration.framework;
                };
                72C12CB01D6EA2CA000EE61C /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                };
                72C12CB01D6EA2CA000EE61C /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
@@ -1748,15 +1895,40 @@
                        name = "Copy Files";
                        runOnlyForDeploymentPostprocessing = 1;
                };
                        name = "Copy Files";
                        runOnlyForDeploymentPostprocessing = 1;
                };
-               15D9DCF910DD909F004E545D /* AppWorkaround.plist */ = {
+               15E91DBA21893E83001155DC /* CopyFiles */ = {
                        isa = PBXCopyFilesBuildPhase;
                        isa = PBXCopyFilesBuildPhase;
-                       buildActionMask = 8;
-                       dstPath = /usr/local/AppSpecificWorkaround/SystemConfiguration;
+                       buildActionMask = 2147483647;
+                       dstPath = /usr/share/man/man1/;
+                       dstSubfolderSpec = 0;
+                       files = (
+                       );
+                       runOnlyForDeploymentPostprocessing = 1;
+               };
+               15E91DD221893EE1001155DC /* CopyFiles */ = {
+                       isa = PBXCopyFilesBuildPhase;
+                       buildActionMask = 2147483647;
+                       dstPath = /usr/share/man/man1/;
+                       dstSubfolderSpec = 0;
+                       files = (
+                       );
+                       runOnlyForDeploymentPostprocessing = 1;
+               };
+               15EF89AD21894636003B2C5C /* CopyFiles */ = {
+                       isa = PBXCopyFilesBuildPhase;
+                       buildActionMask = 2147483647;
+                       dstPath = /usr/share/man/man1/;
+                       dstSubfolderSpec = 0;
+                       files = (
+                       );
+                       runOnlyForDeploymentPostprocessing = 1;
+               };
+               15EF89B821894665003B2C5C /* CopyFiles */ = {
+                       isa = PBXCopyFilesBuildPhase;
+                       buildActionMask = 2147483647;
+                       dstPath = /usr/share/man/man1/;
                        dstSubfolderSpec = 0;
                        files = (
                        dstSubfolderSpec = 0;
                        files = (
-                               15D9DCFB10DD90A1004E545D /* AppWorkaround.plist in AppWorkaround.plist */,
                        );
                        );
-                       name = AppWorkaround.plist;
                        runOnlyForDeploymentPostprocessing = 1;
                };
                15FF5C380CDF778F00EEC8AA /* CopyFiles */ = {
                        runOnlyForDeploymentPostprocessing = 1;
                };
                15FF5C380CDF778F00EEC8AA /* CopyFiles */ = {
@@ -1809,13 +1981,13 @@
                        );
                        runOnlyForDeploymentPostprocessing = 1;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 1;
                };
-               F999388720FE546D005EE20D /* CopyFiles */ = {
+               F963400F20FE8E4100F1E1F1 /* CopyFiles */ = {
                        isa = PBXCopyFilesBuildPhase;
                        buildActionMask = 8;
                        dstPath = /System/Library/AWD/Metadata;
                        dstSubfolderSpec = 0;
                        files = (
                        isa = PBXCopyFilesBuildPhase;
                        buildActionMask = 8;
                        dstPath = /System/Library/AWD/Metadata;
                        dstSubfolderSpec = 0;
                        files = (
-                               F999388920FE54DB005EE20D /* AwdMetadata-0x81-IPMonitor.bin in CopyFiles */,
+                               F963401020FE8E6000F1E1F1 /* AwdMetadata-0x81-IPMonitor.bin in CopyFiles */,
                        );
                        runOnlyForDeploymentPostprocessing = 1;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 1;
                };
@@ -1856,6 +2028,10 @@
                153ACCA614E322D5005029A5 /* network_information_server.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; lineEnding = 0; name = network_information_server.c; path = nwi/network_information_server.c; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.c; };
                153ACCA714E322D5005029A5 /* network_information_server.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = network_information_server.h; path = nwi/network_information_server.h; sourceTree = "<group>"; };
                1540E3600987DA9500157C07 /* com.apple.configd.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.plist.xml; path = com.apple.configd.plist; sourceTree = "<group>"; };
                153ACCA614E322D5005029A5 /* network_information_server.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; lineEnding = 0; name = network_information_server.c; path = nwi/network_information_server.c; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.c; };
                153ACCA714E322D5005029A5 /* network_information_server.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = network_information_server.h; path = nwi/network_information_server.h; sourceTree = "<group>"; };
                1540E3600987DA9500157C07 /* com.apple.configd.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.plist.xml; path = com.apple.configd.plist; sourceTree = "<group>"; };
+               1542400421626DD300C7CE8B /* SCDCache.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SCDCache.c; sourceTree = "<group>"; };
+               15436251218AA22800283462 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = SCMonitor/en.lproj/Localizable.strings; sourceTree = "<group>"; };
+               15436253218AA26100283462 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = "<group>"; };
+               15436255218AA27400283462 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/NetworkInterface.strings; sourceTree = "<group>"; };
                1543636A0752D03C00A8EC6C /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = /System/Library/Frameworks/IOKit.framework; sourceTree = "<absolute>"; };
                1547001D08455B98006787CE /* SCHelper */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = SCHelper; sourceTree = BUILT_PRODUCTS_DIR; };
                1547072E0D1F70C80075C28D /* SystemConfiguration.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SystemConfiguration.framework; sourceTree = BUILT_PRODUCTS_DIR; };
                1543636A0752D03C00A8EC6C /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = /System/Library/Frameworks/IOKit.framework; sourceTree = "<absolute>"; };
                1547001D08455B98006787CE /* SCHelper */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = SCHelper; sourceTree = BUILT_PRODUCTS_DIR; };
                1547072E0D1F70C80075C28D /* SystemConfiguration.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SystemConfiguration.framework; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -1894,7 +2070,6 @@
                1574341A0D4A8137002ACA73 /* scutil */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = scutil; sourceTree = BUILT_PRODUCTS_DIR; };
                1575FD2512CD15C60003D86E /* proxy-configuration.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "proxy-configuration.c"; sourceTree = "<group>"; };
                1575FD2612CD15C60003D86E /* proxy-configuration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "proxy-configuration.h"; sourceTree = "<group>"; };
                1574341A0D4A8137002ACA73 /* scutil */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = scutil; sourceTree = BUILT_PRODUCTS_DIR; };
                1575FD2512CD15C60003D86E /* proxy-configuration.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "proxy-configuration.c"; sourceTree = "<group>"; };
                1575FD2612CD15C60003D86E /* proxy-configuration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "proxy-configuration.h"; sourceTree = "<group>"; };
-               1577252F06EFB96700D7B52B /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/NetworkInterface.strings; sourceTree = "<group>"; };
                157A84E80D56C63900B6F1A0 /* libsystem_configuration.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libsystem_configuration.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
                157A85020D56C7E800B6F1A0 /* libIPMonitor.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libIPMonitor.a; sourceTree = BUILT_PRODUCTS_DIR; };
                157A850D0D56C8AA00B6F1A0 /* libInterfaceNamer.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libInterfaceNamer.a; sourceTree = BUILT_PRODUCTS_DIR; };
                157A84E80D56C63900B6F1A0 /* libsystem_configuration.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libsystem_configuration.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
                157A85020D56C7E800B6F1A0 /* libIPMonitor.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libIPMonitor.a; sourceTree = BUILT_PRODUCTS_DIR; };
                157A850D0D56C8AA00B6F1A0 /* libInterfaceNamer.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libInterfaceNamer.a; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -1936,8 +2111,6 @@
                159D53BA07528B36004F8947 /* ev_ipv6.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ev_ipv6.h; sourceTree = "<group>"; };
                159D53C107528B36004F8947 /* linkconfig.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = linkconfig.c; sourceTree = "<group>"; };
                159D53C307528B36004F8947 /* prefsmon.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = prefsmon.c; sourceTree = "<group>"; };
                159D53BA07528B36004F8947 /* ev_ipv6.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ev_ipv6.h; sourceTree = "<group>"; };
                159D53C107528B36004F8947 /* linkconfig.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = linkconfig.c; sourceTree = "<group>"; };
                159D53C307528B36004F8947 /* prefsmon.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = prefsmon.c; sourceTree = "<group>"; };
-               159D53CA07528B36004F8947 /* cache.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = cache.c; sourceTree = "<group>"; };
-               159D53CB07528B36004F8947 /* cache.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = cache.h; sourceTree = "<group>"; };
                159D53D407528BDA004F8947 /* libKernelEventMonitor.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libKernelEventMonitor.a; sourceTree = BUILT_PRODUCTS_DIR; };
                159D53E507528C4A004F8947 /* libInterfaceNamer.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libInterfaceNamer.a; sourceTree = BUILT_PRODUCTS_DIR; };
                159D53EC07528C61004F8947 /* libIPMonitor.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libIPMonitor.a; sourceTree = BUILT_PRODUCTS_DIR; };
                159D53D407528BDA004F8947 /* libKernelEventMonitor.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libKernelEventMonitor.a; sourceTree = BUILT_PRODUCTS_DIR; };
                159D53E507528C4A004F8947 /* libInterfaceNamer.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libInterfaceNamer.a; sourceTree = BUILT_PRODUCTS_DIR; };
                159D53EC07528C61004F8947 /* libIPMonitor.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libIPMonitor.a; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -1951,7 +2124,6 @@
                15A509A306C2518F001F0AB7 /* net.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = net.c; sourceTree = "<group>"; };
                15A509A406C2518F001F0AB7 /* net.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = net.h; sourceTree = "<group>"; };
                15A5A26A0D5B94190087BDA0 /* SystemConfiguration.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SystemConfiguration.framework; sourceTree = BUILT_PRODUCTS_DIR; };
                15A509A306C2518F001F0AB7 /* net.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = net.c; sourceTree = "<group>"; };
                15A509A406C2518F001F0AB7 /* net.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = net.h; sourceTree = "<group>"; };
                15A5A26A0D5B94190087BDA0 /* SystemConfiguration.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SystemConfiguration.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-               15A6F7C30A4B266D00B907EA /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/Localizable.strings; sourceTree = "<group>"; };
                15AAA7F1108E310700C2A607 /* VPNTunnelPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VPNTunnelPrivate.h; sourceTree = "<group>"; };
                15AAA7F2108E310700C2A607 /* VPNTunnel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VPNTunnel.h; sourceTree = "<group>"; };
                15AAA7F3108E310700C2A607 /* VPNTunnel.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = VPNTunnel.c; sourceTree = "<group>"; };
                15AAA7F1108E310700C2A607 /* VPNTunnelPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VPNTunnelPrivate.h; sourceTree = "<group>"; };
                15AAA7F2108E310700C2A607 /* VPNTunnel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VPNTunnel.h; sourceTree = "<group>"; };
                15AAA7F3108E310700C2A607 /* VPNTunnel.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = VPNTunnel.c; sourceTree = "<group>"; };
@@ -2010,7 +2182,6 @@
                15CB697605C0722B0099E85F /* SCDNotifierWait.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = SCDNotifierWait.c; sourceTree = "<group>"; };
                15CB697805C0722B0099E85F /* SCDNotifierInformViaCallback.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = SCDNotifierInformViaCallback.c; sourceTree = "<group>"; };
                15CB697C05C0722B0099E85F /* SCDNotifierInformViaFD.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = SCDNotifierInformViaFD.c; sourceTree = "<group>"; };
                15CB697605C0722B0099E85F /* SCDNotifierWait.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = SCDNotifierWait.c; sourceTree = "<group>"; };
                15CB697805C0722B0099E85F /* SCDNotifierInformViaCallback.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = SCDNotifierInformViaCallback.c; sourceTree = "<group>"; };
                15CB697C05C0722B0099E85F /* SCDNotifierInformViaFD.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = SCDNotifierInformViaFD.c; sourceTree = "<group>"; };
-               15CB697E05C0722B0099E85F /* SCDNotifierInformViaSignal.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = SCDNotifierInformViaSignal.c; sourceTree = "<group>"; };
                15CB698005C0722B0099E85F /* SCDNotifierCancel.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = SCDNotifierCancel.c; sourceTree = "<group>"; };
                15CB698205C0722B0099E85F /* SCDSnapshot.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = SCDSnapshot.c; sourceTree = "<group>"; };
                15CB698405C0722B0099E85F /* SCP.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = SCP.c; sourceTree = "<group>"; };
                15CB698005C0722B0099E85F /* SCDNotifierCancel.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = SCDNotifierCancel.c; sourceTree = "<group>"; };
                15CB698205C0722B0099E85F /* SCDSnapshot.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = SCDSnapshot.c; sourceTree = "<group>"; };
                15CB698405C0722B0099E85F /* SCP.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = SCP.c; sourceTree = "<group>"; };
@@ -2041,14 +2212,12 @@
                15CB69CF05C0722B0099E85F /* configd.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = configd.h; sourceTree = "<group>"; };
                15CB69D105C0722B0099E85F /* _SCD.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = _SCD.h; sourceTree = "<group>"; };
                15CB69D305C0722B0099E85F /* configd_server.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = configd_server.h; sourceTree = "<group>"; };
                15CB69CF05C0722B0099E85F /* configd.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = configd.h; sourceTree = "<group>"; };
                15CB69D105C0722B0099E85F /* _SCD.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = _SCD.h; sourceTree = "<group>"; };
                15CB69D305C0722B0099E85F /* configd_server.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = configd_server.h; sourceTree = "<group>"; };
-               15CB69D505C0722B0099E85F /* notify_server.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = notify_server.h; sourceTree = "<group>"; };
                15CB69D705C0722B0099E85F /* plugin_support.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = plugin_support.h; sourceTree = "<group>"; };
                15CB69D905C0722B0099E85F /* session.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = session.h; sourceTree = "<group>"; };
                15CB69DB05C0722B0099E85F /* pattern.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = pattern.h; sourceTree = "<group>"; };
                15CB69E005C0722B0099E85F /* configd.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = configd.m; sourceTree = "<group>"; };
                15CB69E205C0722B0099E85F /* _SCD.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = _SCD.c; sourceTree = "<group>"; };
                15CB69E405C0722B0099E85F /* configd_server.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = configd_server.c; sourceTree = "<group>"; };
                15CB69D705C0722B0099E85F /* plugin_support.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = plugin_support.h; sourceTree = "<group>"; };
                15CB69D905C0722B0099E85F /* session.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = session.h; sourceTree = "<group>"; };
                15CB69DB05C0722B0099E85F /* pattern.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = pattern.h; sourceTree = "<group>"; };
                15CB69E005C0722B0099E85F /* configd.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = configd.m; sourceTree = "<group>"; };
                15CB69E205C0722B0099E85F /* _SCD.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = _SCD.c; sourceTree = "<group>"; };
                15CB69E405C0722B0099E85F /* configd_server.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = configd_server.c; sourceTree = "<group>"; };
-               15CB69E605C0722B0099E85F /* notify_server.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = notify_server.c; sourceTree = "<group>"; };
                15CB69E805C0722B0099E85F /* plugin_support.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = plugin_support.c; sourceTree = "<group>"; };
                15CB69EA05C0722B0099E85F /* session.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = session.c; sourceTree = "<group>"; };
                15CB69EC05C0722B0099E85F /* pattern.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = pattern.c; sourceTree = "<group>"; };
                15CB69E805C0722B0099E85F /* plugin_support.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = plugin_support.c; sourceTree = "<group>"; };
                15CB69EA05C0722B0099E85F /* session.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = session.c; sourceTree = "<group>"; };
                15CB69EC05C0722B0099E85F /* pattern.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = pattern.c; sourceTree = "<group>"; };
@@ -2066,7 +2235,6 @@
                15CB6A0C05C0722B0099E85F /* _notifychanges.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = _notifychanges.c; sourceTree = "<group>"; };
                15CB6A0E05C0722B0099E85F /* _notifyviaport.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = _notifyviaport.c; sourceTree = "<group>"; };
                15CB6A1005C0722B0099E85F /* _notifyviafd.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = _notifyviafd.c; sourceTree = "<group>"; };
                15CB6A0C05C0722B0099E85F /* _notifychanges.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = _notifychanges.c; sourceTree = "<group>"; };
                15CB6A0E05C0722B0099E85F /* _notifyviaport.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = _notifyviaport.c; sourceTree = "<group>"; };
                15CB6A1005C0722B0099E85F /* _notifyviafd.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = _notifyviafd.c; sourceTree = "<group>"; };
-               15CB6A1205C0722B0099E85F /* _notifyviasignal.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = _notifyviasignal.c; sourceTree = "<group>"; };
                15CB6A1405C0722B0099E85F /* _notifycancel.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = _notifycancel.c; sourceTree = "<group>"; };
                15CB6A1605C0722B0099E85F /* _snapshot.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = _snapshot.c; sourceTree = "<group>"; };
                15CB6A2005C0722B0099E85F /* configd.8 */ = {isa = PBXFileReference; explicitFileType = text.man; path = configd.8; sourceTree = "<group>"; };
                15CB6A1405C0722B0099E85F /* _notifycancel.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = _notifycancel.c; sourceTree = "<group>"; };
                15CB6A1605C0722B0099E85F /* _snapshot.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = _snapshot.c; sourceTree = "<group>"; };
                15CB6A2005C0722B0099E85F /* configd.8 */ = {isa = PBXFileReference; explicitFileType = text.man; path = configd.8; sourceTree = "<group>"; };
@@ -2101,7 +2269,6 @@
                15D92B9D1FFC61F400DF2632 /* libnetwork.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libnetwork.tbd; path = usr/lib/libnetwork.tbd; sourceTree = SDKROOT; };
                15D92BA01FFC641500DF2632 /* libnetwork.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libnetwork.tbd; path = usr/lib/libnetwork.tbd; sourceTree = SDKROOT; };
                15D92BA61FFC669000DF2632 /* MobileWiFi.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MobileWiFi.framework; path = System/Library/PrivateFrameworks/MobileWiFi.framework; sourceTree = SDKROOT; };
                15D92B9D1FFC61F400DF2632 /* libnetwork.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libnetwork.tbd; path = usr/lib/libnetwork.tbd; sourceTree = SDKROOT; };
                15D92BA01FFC641500DF2632 /* libnetwork.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libnetwork.tbd; path = usr/lib/libnetwork.tbd; sourceTree = SDKROOT; };
                15D92BA61FFC669000DF2632 /* MobileWiFi.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MobileWiFi.framework; path = System/Library/PrivateFrameworks/MobileWiFi.framework; sourceTree = SDKROOT; };
-               15D9DCFA10DD90A1004E545D /* AppWorkaround.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = AppWorkaround.plist; sourceTree = "<group>"; };
                15DAD5EE075913CE0084A6ED /* libsystem_configuration.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libsystem_configuration.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
                15DAF2D808466D4900D1B2BD /* SCHelper_client.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = SCHelper_client.c; path = helper/SCHelper_client.c; sourceTree = "<group>"; };
                15DAF2D908466D4900D1B2BD /* SCHelper_server.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = SCHelper_server.c; path = helper/SCHelper_server.c; sourceTree = "<group>"; };
                15DAD5EE075913CE0084A6ED /* libsystem_configuration.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libsystem_configuration.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
                15DAF2D808466D4900D1B2BD /* SCHelper_client.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = SCHelper_client.c; path = helper/SCHelper_client.c; sourceTree = "<group>"; };
                15DAF2D908466D4900D1B2BD /* SCHelper_server.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = SCHelper_server.c; path = helper/SCHelper_server.c; sourceTree = "<group>"; };
@@ -2115,6 +2282,11 @@
                15DC346E0711D49400A3311C /* net_set.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = net_set.h; sourceTree = "<group>"; };
                15E1B05916EBAE3C00E5F06F /* libIPMonitor_sim.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libIPMonitor_sim.a; sourceTree = BUILT_PRODUCTS_DIR; };
                15E1B06116EBAE7800E5F06F /* IPMonitor.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = IPMonitor.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
                15DC346E0711D49400A3311C /* net_set.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = net_set.h; sourceTree = "<group>"; };
                15E1B05916EBAE3C00E5F06F /* libIPMonitor_sim.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libIPMonitor_sim.a; sourceTree = BUILT_PRODUCTS_DIR; };
                15E1B06116EBAE7800E5F06F /* IPMonitor.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = IPMonitor.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
+               15E56C5A21939B7B00088C51 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS13.0.Internal.sdk/System/Library/Frameworks/Foundation.framework; sourceTree = DEVELOPER_DIR; };
+               15E91DBE21893E83001155DC /* SCTest-ObjC-Embedded */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = "SCTest-ObjC-Embedded"; sourceTree = BUILT_PRODUCTS_DIR; };
+               15E91DD621893EE1001155DC /* SCTest-Swift-Embedded */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = "SCTest-Swift-Embedded"; sourceTree = BUILT_PRODUCTS_DIR; };
+               15EF89B121894636003B2C5C /* SCTest-ObjC-EmbeddedSimulator */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = "SCTest-ObjC-EmbeddedSimulator"; sourceTree = BUILT_PRODUCTS_DIR; };
+               15EF89BC21894665003B2C5C /* SCTest-Swift-EmbeddedSimulator */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = "SCTest-Swift-EmbeddedSimulator"; sourceTree = BUILT_PRODUCTS_DIR; };
                15F742E41EC6370000DA2E7A /* liblog_SystemConfiguration.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = liblog_SystemConfiguration.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
                15F742F11EC638D100DA2E7A /* liblog_SystemConfiguration.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = liblog_SystemConfiguration.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
                15FA0F73203A379600C7702F /* EventFactory.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = EventFactory.framework; sourceTree = "<group>"; };
                15F742E41EC6370000DA2E7A /* liblog_SystemConfiguration.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = liblog_SystemConfiguration.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
                15F742F11EC638D100DA2E7A /* liblog_SystemConfiguration.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = liblog_SystemConfiguration.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
                15FA0F73203A379600C7702F /* EventFactory.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = EventFactory.framework; sourceTree = "<group>"; };
@@ -2134,7 +2306,6 @@
                15FD743E0754DE7A001CC321 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
                15FD7B3B101E439200C56621 /* BridgeConfiguration.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = BridgeConfiguration.c; sourceTree = "<group>"; };
                15FEE80D0CCFD341001312F9 /* ApplicationServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ApplicationServices.framework; path = /System/Library/Frameworks/ApplicationServices.framework; sourceTree = "<absolute>"; };
                15FD743E0754DE7A001CC321 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
                15FD7B3B101E439200C56621 /* BridgeConfiguration.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = BridgeConfiguration.c; sourceTree = "<group>"; };
                15FEE80D0CCFD341001312F9 /* ApplicationServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ApplicationServices.framework; path = /System/Library/Frameworks/ApplicationServices.framework; sourceTree = "<absolute>"; };
-               15FEE8160CD03CA3001312F9 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = SCMonitor/English.lproj/Localizable.strings; sourceTree = "<group>"; };
                15FF5C290CDF770500EEC8AA /* com.apple.SCHelper.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = com.apple.SCHelper.plist; path = helper/com.apple.SCHelper.plist; sourceTree = "<group>"; };
                23C1E2B4062DD2C700835B54 /* pppcontroller_types.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = pppcontroller_types.h; path = usr/local/include/ppp/pppcontroller_types.h; sourceTree = SDKROOT; };
                23C1E2B8062DD45900835B54 /* pppcontroller.defs */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.mig; name = pppcontroller.defs; path = SystemConfiguration.fproj/pppcontroller.defs; sourceTree = "<group>"; };
                15FF5C290CDF770500EEC8AA /* com.apple.SCHelper.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = com.apple.SCHelper.plist; path = helper/com.apple.SCHelper.plist; sourceTree = "<group>"; };
                23C1E2B4062DD2C700835B54 /* pppcontroller_types.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = pppcontroller_types.h; path = usr/local/include/ppp/pppcontroller_types.h; sourceTree = SDKROOT; };
                23C1E2B8062DD45900835B54 /* pppcontroller.defs */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.mig; name = pppcontroller.defs; path = SystemConfiguration.fproj/pppcontroller.defs; sourceTree = "<group>"; };
@@ -2190,8 +2361,23 @@
                B0A88CA616397A1200A60B3A /* VPNAppLayerPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = VPNAppLayerPrivate.h; sourceTree = "<group>"; tabWidth = 4; };
                B0C967F717441F0E00889853 /* SNHelperPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SNHelperPrivate.h; sourceTree = "<group>"; };
                B0C9689B174426C200889853 /* SNHelper.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = SNHelper.c; sourceTree = "<group>"; };
                B0A88CA616397A1200A60B3A /* VPNAppLayerPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = VPNAppLayerPrivate.h; sourceTree = "<group>"; tabWidth = 4; };
                B0C967F717441F0E00889853 /* SNHelperPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SNHelperPrivate.h; sourceTree = "<group>"; };
                B0C9689B174426C200889853 /* SNHelper.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = SNHelper.c; sourceTree = "<group>"; };
+               C43F873A226D3A18000E8CE5 /* entitlements.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = entitlements.plist; sourceTree = "<group>"; };
                C4666C71206ED01800247AB6 /* SystemConfigurationEventFactory.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = SystemConfigurationEventFactory.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
                C4666C74206ED01800247AB6 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
                C4666C71206ED01800247AB6 /* SystemConfigurationEventFactory.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = SystemConfigurationEventFactory.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
                C4666C74206ED01800247AB6 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+               C469CB2720EED63C00A7AD35 /* StateDumpParser.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = StateDumpParser.h; sourceTree = "<group>"; };
+               C469CB2820EED6C100A7AD35 /* StateDumpParser.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = StateDumpParser.m; sourceTree = "<group>"; };
+               C496A09420F909BD0098B3E5 /* IPConfigurationParser.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = IPConfigurationParser.h; sourceTree = "<group>"; };
+               C496A09520F909FF0098B3E5 /* IPConfigurationParser.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = IPConfigurationParser.m; sourceTree = "<group>"; };
+               C4C5FB0020EA98AC00F35614 /* KernelEventMonitorParser.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = KernelEventMonitorParser.h; sourceTree = "<group>"; };
+               C4C5FB0120EA992700F35614 /* SCLogParser.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SCLogParser.h; sourceTree = "<group>"; };
+               C4C5FB0220EA9A5A00F35614 /* KernelEventMonitorParser.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = KernelEventMonitorParser.m; sourceTree = "<group>"; };
+               C4C5FB0420EA9B6F00F35614 /* SCLogParser.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SCLogParser.m; sourceTree = "<group>"; };
+               C4C5FB0720EAB0BC00F35614 /* InterfaceNamerParser.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = InterfaceNamerParser.h; sourceTree = "<group>"; };
+               C4C5FB0820EAB0DD00F35614 /* InterfaceNamerParser.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = InterfaceNamerParser.m; sourceTree = "<group>"; };
+               C4C5FB0A20EABD5F00F35614 /* IPMonitorParser.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = IPMonitorParser.h; sourceTree = "<group>"; };
+               C4C5FB0B20EABD9E00F35614 /* IPMonitorParser.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = IPMonitorParser.m; sourceTree = "<group>"; };
+               C4C5FB0D20EAC01900F35614 /* PreferencesMonitorParser.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PreferencesMonitorParser.h; sourceTree = "<group>"; };
+               C4C5FB0E20EAC05200F35614 /* PreferencesMonitorParser.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PreferencesMonitorParser.m; sourceTree = "<group>"; };
                C4CDB8111631933400819B44 /* VPNFlow.h */ = {isa = PBXFileReference; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = VPNFlow.h; sourceTree = "<group>"; tabWidth = 4; };
                C4CDB8141631935700819B44 /* VPNFlow.c */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.c; path = VPNFlow.c; sourceTree = "<group>"; tabWidth = 4; };
                C4F1847F16237AFC00D97043 /* VPNService.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = VPNService.c; sourceTree = "<group>"; };
                C4CDB8111631933400819B44 /* VPNFlow.h */ = {isa = PBXFileReference; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = VPNFlow.h; sourceTree = "<group>"; tabWidth = 4; };
                C4CDB8141631935700819B44 /* VPNFlow.c */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.c; path = VPNFlow.c; sourceTree = "<group>"; tabWidth = 4; };
                C4F1847F16237AFC00D97043 /* VPNService.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = VPNService.c; sourceTree = "<group>"; };
@@ -2202,12 +2388,14 @@
                D6986A77136891300091C931 /* network_information.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = network_information.c; path = nwi/network_information.c; sourceTree = "<group>"; };
                D6986A781368913C0091C931 /* network_information.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = network_information.h; path = nwi/network_information.h; sourceTree = "<group>"; };
                D6AEB89815AE4446009F2FAF /* ip_plugin.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ip_plugin.h; sourceTree = "<group>"; };
                D6986A77136891300091C931 /* network_information.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = network_information.c; path = nwi/network_information.c; sourceTree = "<group>"; };
                D6986A781368913C0091C931 /* network_information.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = network_information.h; path = nwi/network_information.h; sourceTree = "<group>"; };
                D6AEB89815AE4446009F2FAF /* ip_plugin.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ip_plugin.h; sourceTree = "<group>"; };
+               F90E43542012AD3900EF27C4 /* SCNetworkInterfaceProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SCNetworkInterfaceProvider.h; sourceTree = "<group>"; };
+               F90E43552012AD4500EF27C4 /* SCNetworkInterfaceProvider.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SCNetworkInterfaceProvider.c; sourceTree = "<group>"; };
                F95B8A420B03E07A00993BA3 /* SCNetworkSignature.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = SCNetworkSignature.c; sourceTree = "<group>"; };
                F95B8A440B03E09300993BA3 /* SCNetworkSignature.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SCNetworkSignature.h; sourceTree = "<group>"; };
                F95B8A450B03E09300993BA3 /* SCNetworkSignaturePrivate.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SCNetworkSignaturePrivate.h; sourceTree = "<group>"; };
                F95B8A420B03E07A00993BA3 /* SCNetworkSignature.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = SCNetworkSignature.c; sourceTree = "<group>"; };
                F95B8A440B03E09300993BA3 /* SCNetworkSignature.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SCNetworkSignature.h; sourceTree = "<group>"; };
                F95B8A450B03E09300993BA3 /* SCNetworkSignaturePrivate.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SCNetworkSignaturePrivate.h; sourceTree = "<group>"; };
-               F97F9FC5202CBD130040BD50 /* SCNetworkInterfaceProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SCNetworkInterfaceProvider.h; sourceTree = "<group>"; };
-               F97F9FC6202CBD230040BD50 /* SCNetworkInterfaceProvider.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SCNetworkInterfaceProvider.c; sourceTree = "<group>"; };
-               F999388820FE54CB005EE20D /* AwdMetadata-0x81-IPMonitor.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; path = "AwdMetadata-0x81-IPMonitor.bin"; sourceTree = "<group>"; };
+               F963400E20FE8E1D00F1E1F1 /* AwdMetadata-0x81-IPMonitor.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; path = "AwdMetadata-0x81-IPMonitor.bin"; sourceTree = "<group>"; };
+               F97289D122652CE600080596 /* serviceIDNumber.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = serviceIDNumber.c; sourceTree = "<group>"; };
+               F97289D222652CE600080596 /* serviceIDNumber.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = serviceIDNumber.h; sourceTree = "<group>"; };
                F9A3780E16A4846E00C57CDC /* IPMonitorControlPrefs.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = IPMonitorControlPrefs.c; sourceTree = "<group>"; };
                F9A3780F16A4846E00C57CDC /* IPMonitorControlPrefs.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = IPMonitorControlPrefs.h; sourceTree = "<group>"; };
                F9B7AE5C1862116500C78D18 /* IPMonitorControl.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = IPMonitorControl.c; sourceTree = "<group>"; };
                F9A3780E16A4846E00C57CDC /* IPMonitorControlPrefs.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = IPMonitorControlPrefs.c; sourceTree = "<group>"; };
                F9A3780F16A4846E00C57CDC /* IPMonitorControlPrefs.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = IPMonitorControlPrefs.h; sourceTree = "<group>"; };
                F9B7AE5C1862116500C78D18 /* IPMonitorControl.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = IPMonitorControl.c; sourceTree = "<group>"; };
@@ -2427,6 +2615,39 @@
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
+               15E91DB821893E83001155DC /* Frameworks */ = {
+                       isa = PBXFrameworksBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               15E91DB921893E83001155DC /* SystemConfiguration.framework in Frameworks */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+               15E91DD121893EE1001155DC /* Frameworks */ = {
+                       isa = PBXFrameworksBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               15E56C5B21939B7B00088C51 /* Foundation.framework in Frameworks */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+               15EF89AB21894636003B2C5C /* Frameworks */ = {
+                       isa = PBXFrameworksBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               15EF89AC21894636003B2C5C /* SystemConfiguration.framework in Frameworks */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+               15EF89B721894665003B2C5C /* Frameworks */ = {
+                       isa = PBXFrameworksBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               15E56C5C21939B8E00088C51 /* Foundation.framework in Frameworks */,
+                               15E56C552193840000088C51 /* SystemConfiguration.framework in Frameworks */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
                15F742DE1EC6370000DA2E7A /* Frameworks */ = {
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                15F742DE1EC6370000DA2E7A /* Frameworks */ = {
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
@@ -2471,6 +2692,7 @@
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
+                               15E56C5921939B6400088C51 /* Foundation.framework in Frameworks */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
@@ -2478,6 +2700,7 @@
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
+                               150EC0FF21016BFD0047F4BF /* SystemConfiguration.framework in Frameworks */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
@@ -2719,6 +2942,8 @@
                                15812A2D1EA5540B001CF384 /* nat64-configuration.c */,
                                1575FD2612CD15C60003D86E /* proxy-configuration.h */,
                                1575FD2512CD15C60003D86E /* proxy-configuration.c */,
                                15812A2D1EA5540B001CF384 /* nat64-configuration.c */,
                                1575FD2612CD15C60003D86E /* proxy-configuration.h */,
                                1575FD2512CD15C60003D86E /* proxy-configuration.c */,
+                               F97289D122652CE600080596 /* serviceIDNumber.c */,
+                               F97289D222652CE600080596 /* serviceIDNumber.h */,
                                155D22390AF13A7300D52ED0 /* set-hostname.h */,
                                159D53AB07528B36004F8947 /* set-hostname.c */,
                                155D223A0AF13A7300D52ED0 /* smb-configuration.h */,
                                155D22390AF13A7300D52ED0 /* set-hostname.h */,
                                159D53AB07528B36004F8947 /* set-hostname.c */,
                                155D223A0AF13A7300D52ED0 /* smb-configuration.h */,
@@ -2786,8 +3011,6 @@
                                15FB1F881E27E9A000B4F809 /* InterfaceNamerControlPrefs.c */,
                                F9A3780F16A4846E00C57CDC /* IPMonitorControlPrefs.h */,
                                F9A3780E16A4846E00C57CDC /* IPMonitorControlPrefs.c */,
                                15FB1F881E27E9A000B4F809 /* InterfaceNamerControlPrefs.c */,
                                F9A3780F16A4846E00C57CDC /* IPMonitorControlPrefs.h */,
                                F9A3780E16A4846E00C57CDC /* IPMonitorControlPrefs.c */,
-                               159D53CA07528B36004F8947 /* cache.c */,
-                               159D53CB07528B36004F8947 /* cache.h */,
                                1572AA8B1D8234500021E093 /* plugin_shared.h */,
                        );
                        name = common;
                                1572AA8B1D8234500021E093 /* plugin_shared.h */,
                        );
                        name = common;
@@ -2812,7 +3035,6 @@
                15B6861D0678B61900FF4023 /* Supporting Files */ = {
                        isa = PBXGroup;
                        children = (
                15B6861D0678B61900FF4023 /* Supporting Files */ = {
                        isa = PBXGroup;
                        children = (
-                               15D9DCFA10DD90A1004E545D /* AppWorkaround.plist */,
                                15A6F7C20A4B266D00B907EA /* Localizable.strings */,
                                15B686220678B65C00FF4023 /* NetworkConfiguration.plist */,
                                1577253606EFBF3100D7B52B /* NetworkInterface.strings */,
                                15A6F7C20A4B266D00B907EA /* Localizable.strings */,
                                15B686220678B65C00FF4023 /* NetworkConfiguration.plist */,
                                1577253606EFBF3100D7B52B /* NetworkInterface.strings */,
@@ -2883,6 +3105,7 @@
                                15CB695805C0722B0099E85F /* SCDOpen.c */,
                                15CB695E05C0722B0099E85F /* SCDList.c */,
                                15CB696005C0722B0099E85F /* SCDAdd.c */,
                                15CB695805C0722B0099E85F /* SCDOpen.c */,
                                15CB695E05C0722B0099E85F /* SCDList.c */,
                                15CB696005C0722B0099E85F /* SCDAdd.c */,
+                               1542400421626DD300C7CE8B /* SCDCache.c */,
                                15CB696405C0722B0099E85F /* SCDGet.c */,
                                15CB696605C0722B0099E85F /* SCDSet.c */,
                                15CB696805C0722B0099E85F /* SCDRemove.c */,
                                15CB696405C0722B0099E85F /* SCDGet.c */,
                                15CB696605C0722B0099E85F /* SCDSet.c */,
                                15CB696805C0722B0099E85F /* SCDRemove.c */,
@@ -2894,7 +3117,6 @@
                                15CB697605C0722B0099E85F /* SCDNotifierWait.c */,
                                15CB697805C0722B0099E85F /* SCDNotifierInformViaCallback.c */,
                                15CB697C05C0722B0099E85F /* SCDNotifierInformViaFD.c */,
                                15CB697605C0722B0099E85F /* SCDNotifierWait.c */,
                                15CB697805C0722B0099E85F /* SCDNotifierInformViaCallback.c */,
                                15CB697C05C0722B0099E85F /* SCDNotifierInformViaFD.c */,
-                               15CB697E05C0722B0099E85F /* SCDNotifierInformViaSignal.c */,
                                15CB698005C0722B0099E85F /* SCDNotifierCancel.c */,
                                15CB698205C0722B0099E85F /* SCDSnapshot.c */,
                        );
                                15CB698005C0722B0099E85F /* SCDNotifierCancel.c */,
                                15CB698205C0722B0099E85F /* SCDSnapshot.c */,
                        );
@@ -3060,17 +3282,17 @@
                                15CB690705C0722A0099E85F /* SystemConfiguration */,
                                151F5DA80CCE995D0093AC3B /* SCMonitor */,
                                15CB69C205C0722B0099E85F /* configd */,
                                15CB690705C0722A0099E85F /* SystemConfiguration */,
                                151F5DA80CCE995D0093AC3B /* SCMonitor */,
                                15CB69C205C0722B0099E85F /* configd */,
-                               15CB6A2205C0722B0099E85F /* scselect */,
-                               15CB6A3705C0722B0099E85F /* scutil */,
                                159D53A207528B06004F8947 /* Plugins */,
                                F9B7AE5B1862116500C78D18 /* IPMonitorControl */,
                                159D53A207528B06004F8947 /* Plugins */,
                                F9B7AE5B1862116500C78D18 /* IPMonitorControl */,
-                               15CB6A6E05C0722B0099E85F /* External Frameworks and Libraries */,
-                               72D3E65F1AE6EA3A00DB4C69 /* SCTest-Swift */,
-                               72D3E66A1AE6EAF600DB4C69 /* SCTest-ObjC */,
+                               15CB6A3705C0722B0099E85F /* scutil */,
+                               15CB6A2205C0722B0099E85F /* scselect */,
                                72573D271D667372004975AD /* sctest */,
                                C4666C73206ED01800247AB6 /* EventFactory */,
                                72573D271D667372004975AD /* sctest */,
                                C4666C73206ED01800247AB6 /* EventFactory */,
+                               72D3E66A1AE6EAF600DB4C69 /* SCTest-ObjC */,
+                               72D3E65F1AE6EA3A00DB4C69 /* SCTest-Swift */,
                                15CB690F05C0722B0099E85F /* Products */,
                                90507AAE1CE2F55B0067D16B /* Frameworks */,
                                15CB690F05C0722B0099E85F /* Products */,
                                90507AAE1CE2F55B0067D16B /* Frameworks */,
+                               15CB6A6E05C0722B0099E85F /* External Frameworks and Libraries */,
                        );
                        indentWidth = 8;
                        name = configd;
                        );
                        indentWidth = 8;
                        name = configd;
@@ -3087,7 +3309,7 @@
                                1547002E084561B4006787CE /* SCHelper */,
                                15C330DB134B9B8B0028E36B /* SCNetworkConfiguration */,
                                15C330DE134B9C290028E36B /* SCNetworkConnection */,
                                1547002E084561B4006787CE /* SCHelper */,
                                15C330DB134B9B8B0028E36B /* SCNetworkConfiguration */,
                                15C330DE134B9C290028E36B /* SCNetworkConnection */,
-                               F97F9FC2202CBCA00040BD50 /* SCNetworkInterfaceProvider */,
+                               F90E43512012ACF900EF27C4 /* SCNetworkInterfaceProvider */,
                                15C330B4134B91930028E36B /* SCNetworkReachability */,
                                15C330E1134B9C8E0028E36B /* VPN */,
                                15CB691205C0722B0099E85F /* Other Headers */,
                                15C330B4134B91930028E36B /* SCNetworkReachability */,
                                15C330E1134B9C8E0028E36B /* VPN */,
                                15CB691205C0722B0099E85F /* Other Headers */,
@@ -3124,6 +3346,10 @@
                                15F742E41EC6370000DA2E7A /* liblog_SystemConfiguration.dylib */,
                                15F742F11EC638D100DA2E7A /* liblog_SystemConfiguration.dylib */,
                                C4666C71206ED01800247AB6 /* SystemConfigurationEventFactory.bundle */,
                                15F742E41EC6370000DA2E7A /* liblog_SystemConfiguration.dylib */,
                                15F742F11EC638D100DA2E7A /* liblog_SystemConfiguration.dylib */,
                                C4666C71206ED01800247AB6 /* SystemConfigurationEventFactory.bundle */,
+                               15E91DBE21893E83001155DC /* SCTest-ObjC-Embedded */,
+                               15E91DD621893EE1001155DC /* SCTest-Swift-Embedded */,
+                               15EF89B121894636003B2C5C /* SCTest-ObjC-EmbeddedSimulator */,
+                               15EF89BC21894665003B2C5C /* SCTest-Swift-EmbeddedSimulator */,
                        );
                        name = Products;
                        sourceTree = "<group>";
                        );
                        name = Products;
                        sourceTree = "<group>";
@@ -3187,7 +3413,6 @@
                                15CB69CF05C0722B0099E85F /* configd.h */,
                                15CB69D105C0722B0099E85F /* _SCD.h */,
                                15CB69D305C0722B0099E85F /* configd_server.h */,
                                15CB69CF05C0722B0099E85F /* configd.h */,
                                15CB69D105C0722B0099E85F /* _SCD.h */,
                                15CB69D305C0722B0099E85F /* configd_server.h */,
-                               15CB69D505C0722B0099E85F /* notify_server.h */,
                                15CB69D705C0722B0099E85F /* plugin_support.h */,
                                15CB69D905C0722B0099E85F /* session.h */,
                                15CB69DB05C0722B0099E85F /* pattern.h */,
                                15CB69D705C0722B0099E85F /* plugin_support.h */,
                                15CB69D905C0722B0099E85F /* session.h */,
                                15CB69DB05C0722B0099E85F /* pattern.h */,
@@ -3201,7 +3426,6 @@
                                15CB69E005C0722B0099E85F /* configd.m */,
                                15CB69E205C0722B0099E85F /* _SCD.c */,
                                15CB69E405C0722B0099E85F /* configd_server.c */,
                                15CB69E005C0722B0099E85F /* configd.m */,
                                15CB69E205C0722B0099E85F /* _SCD.c */,
                                15CB69E405C0722B0099E85F /* configd_server.c */,
-                               15CB69E605C0722B0099E85F /* notify_server.c */,
                                15CB69E805C0722B0099E85F /* plugin_support.c */,
                                15CB69EA05C0722B0099E85F /* session.c */,
                                15CB69EC05C0722B0099E85F /* pattern.c */,
                                15CB69E805C0722B0099E85F /* plugin_support.c */,
                                15CB69EA05C0722B0099E85F /* session.c */,
                                15CB69EC05C0722B0099E85F /* pattern.c */,
@@ -3219,7 +3443,6 @@
                                15CB6A0C05C0722B0099E85F /* _notifychanges.c */,
                                15CB6A0E05C0722B0099E85F /* _notifyviaport.c */,
                                15CB6A1005C0722B0099E85F /* _notifyviafd.c */,
                                15CB6A0C05C0722B0099E85F /* _notifychanges.c */,
                                15CB6A0E05C0722B0099E85F /* _notifyviaport.c */,
                                15CB6A1005C0722B0099E85F /* _notifyviafd.c */,
-                               15CB6A1205C0722B0099E85F /* _notifyviasignal.c */,
                                15CB6A1405C0722B0099E85F /* _notifycancel.c */,
                                15CB6A1605C0722B0099E85F /* _snapshot.c */,
                        );
                                15CB6A1405C0722B0099E85F /* _notifycancel.c */,
                                15CB6A1605C0722B0099E85F /* _snapshot.c */,
                        );
@@ -3321,6 +3544,7 @@
                        isa = PBXGroup;
                        children = (
                                15CB6A6A05C0722B0099E85F /* scutil.8 */,
                        isa = PBXGroup;
                        children = (
                                15CB6A6A05C0722B0099E85F /* scutil.8 */,
+                               C43F873A226D3A18000E8CE5 /* entitlements.plist */,
                        );
                        name = "Supporting Files";
                        sourceTree = "<group>";
                        );
                        name = "Supporting Files";
                        sourceTree = "<group>";
@@ -3453,6 +3677,7 @@
                90507AAE1CE2F55B0067D16B /* Frameworks */ = {
                        isa = PBXGroup;
                        children = (
                90507AAE1CE2F55B0067D16B /* Frameworks */ = {
                        isa = PBXGroup;
                        children = (
+                               15E56C5A21939B7B00088C51 /* Foundation.framework */,
                                F9D7305020E41DD500521181 /* WirelessDiagnostics.framework */,
                                F9D7304E20E41D9C00521181 /* ProtocolBuffer.framework */,
                                1562569020856CCC00FCD61E /* liblockdown.dylib */,
                                F9D7305020E41DD500521181 /* WirelessDiagnostics.framework */,
                                F9D7304E20E41D9C00521181 /* ProtocolBuffer.framework */,
                                1562569020856CCC00FCD61E /* liblockdown.dylib */,
@@ -3472,6 +3697,20 @@
                        children = (
                                1597A9A31FBCECCD000FAA86 /* EventFactory.h */,
                                1597A9A41FBCECCD000FAA86 /* EventFactory.m */,
                        children = (
                                1597A9A31FBCECCD000FAA86 /* EventFactory.h */,
                                1597A9A41FBCECCD000FAA86 /* EventFactory.m */,
+                               C4C5FB0120EA992700F35614 /* SCLogParser.h */,
+                               C4C5FB0420EA9B6F00F35614 /* SCLogParser.m */,
+                               C4C5FB0020EA98AC00F35614 /* KernelEventMonitorParser.h */,
+                               C4C5FB0220EA9A5A00F35614 /* KernelEventMonitorParser.m */,
+                               C4C5FB0720EAB0BC00F35614 /* InterfaceNamerParser.h */,
+                               C4C5FB0820EAB0DD00F35614 /* InterfaceNamerParser.m */,
+                               C496A09420F909BD0098B3E5 /* IPConfigurationParser.h */,
+                               C496A09520F909FF0098B3E5 /* IPConfigurationParser.m */,
+                               C4C5FB0A20EABD5F00F35614 /* IPMonitorParser.h */,
+                               C4C5FB0B20EABD9E00F35614 /* IPMonitorParser.m */,
+                               C4C5FB0D20EAC01900F35614 /* PreferencesMonitorParser.h */,
+                               C4C5FB0E20EAC05200F35614 /* PreferencesMonitorParser.m */,
+                               C469CB2720EED63C00A7AD35 /* StateDumpParser.h */,
+                               C469CB2820EED6C100A7AD35 /* StateDumpParser.m */,
                                C4666C74206ED01800247AB6 /* Info.plist */,
                        );
                        path = EventFactory;
                                C4666C74206ED01800247AB6 /* Info.plist */,
                        );
                        path = EventFactory;
@@ -3509,29 +3748,29 @@
                        name = Sources;
                        sourceTree = "<group>";
                };
                        name = Sources;
                        sourceTree = "<group>";
                };
-               F97F9FC2202CBCA00040BD50 /* SCNetworkInterfaceProvider */ = {
+               F90E43512012ACF900EF27C4 /* SCNetworkInterfaceProvider */ = {
                        isa = PBXGroup;
                        children = (
                        isa = PBXGroup;
                        children = (
-                               F97F9FC4202CBCF50040BD50 /* Headers */,
-                               F97F9FC3202CBCF10040BD50 /* Source */,
+                               F90E43522012AD1900EF27C4 /* Headers */,
+                               F90E43532012AD2300EF27C4 /* Source */,
                        );
                        name = SCNetworkInterfaceProvider;
                        sourceTree = "<group>";
                };
                        );
                        name = SCNetworkInterfaceProvider;
                        sourceTree = "<group>";
                };
-               F97F9FC3202CBCF10040BD50 /* Source */ = {
+               F90E43522012AD1900EF27C4 /* Headers */ = {
                        isa = PBXGroup;
                        children = (
                        isa = PBXGroup;
                        children = (
-                               F97F9FC6202CBD230040BD50 /* SCNetworkInterfaceProvider.c */,
+                               F90E43542012AD3900EF27C4 /* SCNetworkInterfaceProvider.h */,
                        );
                        );
-                       name = Source;
+                       name = Headers;
                        sourceTree = "<group>";
                };
                        sourceTree = "<group>";
                };
-               F97F9FC4202CBCF50040BD50 /* Headers */ = {
+               F90E43532012AD2300EF27C4 /* Source */ = {
                        isa = PBXGroup;
                        children = (
                        isa = PBXGroup;
                        children = (
-                               F97F9FC5202CBD130040BD50 /* SCNetworkInterfaceProvider.h */,
+                               F90E43552012AD4500EF27C4 /* SCNetworkInterfaceProvider.c */,
                        );
                        );
-                       name = Headers;
+                       name = Source;
                        sourceTree = "<group>";
                };
                F9B7AE5B1862116500C78D18 /* IPMonitorControl */ = {
                        sourceTree = "<group>";
                };
                F9B7AE5B1862116500C78D18 /* IPMonitorControl */ = {
@@ -3556,7 +3795,7 @@
                F9D7304420DD89C600521181 /* AWD */ = {
                        isa = PBXGroup;
                        children = (
                F9D7304420DD89C600521181 /* AWD */ = {
                        isa = PBXGroup;
                        children = (
-                               F999388820FE54CB005EE20D /* AwdMetadata-0x81-IPMonitor.bin */,
+                               F963400E20FE8E1D00F1E1F1 /* AwdMetadata-0x81-IPMonitor.bin */,
                                F9D7304620DD89C600521181 /* AWDIPMonitorInterfaceAdvisoryReport.h */,
                                F9D7304720DD89C600521181 /* AWDIPMonitorGlobalEnums.h */,
                                F9D7304820DD89C600521181 /* AWDMetricIds_IPMonitor.h */,
                                F9D7304620DD89C600521181 /* AWDIPMonitorInterfaceAdvisoryReport.h */,
                                F9D7304720DD89C600521181 /* AWDIPMonitorGlobalEnums.h */,
                                F9D7304820DD89C600521181 /* AWDMetricIds_IPMonitor.h */,
@@ -3663,7 +3902,7 @@
                                1572C4B90CFB55B400E2776E /* SCNetworkConfiguration.h in Headers */,
                                1572C4BA0CFB55B400E2776E /* SCNetworkConfigurationInternal.h in Headers */,
                                D61AAEB61522C9E60066B003 /* scprefs_observer.h in Headers */,
                                1572C4B90CFB55B400E2776E /* SCNetworkConfiguration.h in Headers */,
                                1572C4BA0CFB55B400E2776E /* SCNetworkConfigurationInternal.h in Headers */,
                                D61AAEB61522C9E60066B003 /* scprefs_observer.h in Headers */,
-                               F97F9FC8202CBD600040BD50 /* SCNetworkInterfaceProvider.h in Headers */,
+                               F90E43572012AD6000EF27C4 /* SCNetworkInterfaceProvider.h in Headers */,
                                1572C4BB0CFB55B400E2776E /* SCNetwork.h in Headers */,
                                1572C4BC0CFB55B400E2776E /* SCNetworkConnection.h in Headers */,
                                1572C4BD0CFB55B400E2776E /* SCNetworkReachability.h in Headers */,
                                1572C4BB0CFB55B400E2776E /* SCNetwork.h in Headers */,
                                1572C4BC0CFB55B400E2776E /* SCNetworkConnection.h in Headers */,
                                1572C4BD0CFB55B400E2776E /* SCNetworkReachability.h in Headers */,
@@ -3707,7 +3946,6 @@
                                15732A7816EA503200F3AC4C /* configd.h in Headers */,
                                15732A7916EA503200F3AC4C /* _SCD.h in Headers */,
                                15732A7A16EA503200F3AC4C /* configd_server.h in Headers */,
                                15732A7816EA503200F3AC4C /* configd.h in Headers */,
                                15732A7916EA503200F3AC4C /* _SCD.h in Headers */,
                                15732A7A16EA503200F3AC4C /* configd_server.h in Headers */,
-                               15732A7B16EA503200F3AC4C /* notify_server.h in Headers */,
                                15732A7C16EA503200F3AC4C /* plugin_support.h in Headers */,
                                15732A7D16EA503200F3AC4C /* session.h in Headers */,
                                15732A7E16EA503200F3AC4C /* pattern.h in Headers */,
                                15732A7C16EA503200F3AC4C /* plugin_support.h in Headers */,
                                15732A7D16EA503200F3AC4C /* session.h in Headers */,
                                15732A7E16EA503200F3AC4C /* pattern.h in Headers */,
@@ -3842,7 +4080,6 @@
                        buildActionMask = 2147483647;
                        files = (
                                157A85170D56C8E000B6F1A0 /* eventmon.h in Headers */,
                        buildActionMask = 2147483647;
                        files = (
                                157A85170D56C8E000B6F1A0 /* eventmon.h in Headers */,
-                               157A85120D56C8E000B6F1A0 /* cache.h in Headers */,
                                157A85140D56C8E000B6F1A0 /* ev_dlil.h in Headers */,
                                157A85150D56C8E000B6F1A0 /* ev_ipv4.h in Headers */,
                                157A85160D56C8E000B6F1A0 /* ev_ipv6.h in Headers */,
                                157A85140D56C8E000B6F1A0 /* ev_dlil.h in Headers */,
                                157A85150D56C8E000B6F1A0 /* ev_ipv4.h in Headers */,
                                157A85160D56C8E000B6F1A0 /* ev_ipv6.h in Headers */,
@@ -3872,7 +4109,6 @@
                                158317250CFB80A1006F62B9 /* configd.h in Headers */,
                                158317260CFB80A1006F62B9 /* _SCD.h in Headers */,
                                158317270CFB80A1006F62B9 /* configd_server.h in Headers */,
                                158317250CFB80A1006F62B9 /* configd.h in Headers */,
                                158317260CFB80A1006F62B9 /* _SCD.h in Headers */,
                                158317270CFB80A1006F62B9 /* configd_server.h in Headers */,
-                               158317280CFB80A1006F62B9 /* notify_server.h in Headers */,
                                158317290CFB80A1006F62B9 /* plugin_support.h in Headers */,
                                1583172A0CFB80A1006F62B9 /* session.h in Headers */,
                                1583172B0CFB80A1006F62B9 /* pattern.h in Headers */,
                                158317290CFB80A1006F62B9 /* plugin_support.h in Headers */,
                                1583172A0CFB80A1006F62B9 /* session.h in Headers */,
                                1583172B0CFB80A1006F62B9 /* pattern.h in Headers */,
@@ -3893,7 +4129,6 @@
                        buildActionMask = 2147483647;
                        files = (
                                159D541407528DB5004F8947 /* eventmon.h in Headers */,
                        buildActionMask = 2147483647;
                        files = (
                                159D541407528DB5004F8947 /* eventmon.h in Headers */,
-                               159D540A07528D3B004F8947 /* cache.h in Headers */,
                                159D540E07528DAE004F8947 /* ev_dlil.h in Headers */,
                                159D541007528DB1004F8947 /* ev_ipv4.h in Headers */,
                                159D541207528DB3004F8947 /* ev_ipv6.h in Headers */,
                                159D540E07528DAE004F8947 /* ev_dlil.h in Headers */,
                                159D541007528DB1004F8947 /* ev_ipv4.h in Headers */,
                                159D541207528DB3004F8947 /* ev_ipv6.h in Headers */,
@@ -3961,7 +4196,6 @@
                                159D54A407529FFF004F8947 /* configd.h in Headers */,
                                159D54A507529FFF004F8947 /* _SCD.h in Headers */,
                                159D54A607529FFF004F8947 /* configd_server.h in Headers */,
                                159D54A407529FFF004F8947 /* configd.h in Headers */,
                                159D54A507529FFF004F8947 /* _SCD.h in Headers */,
                                159D54A607529FFF004F8947 /* configd_server.h in Headers */,
-                               159D54A707529FFF004F8947 /* notify_server.h in Headers */,
                                159D54A807529FFF004F8947 /* plugin_support.h in Headers */,
                                159D54A907529FFF004F8947 /* session.h in Headers */,
                                159D54AA07529FFF004F8947 /* pattern.h in Headers */,
                                159D54A807529FFF004F8947 /* plugin_support.h in Headers */,
                                159D54A907529FFF004F8947 /* session.h in Headers */,
                                159D54AA07529FFF004F8947 /* pattern.h in Headers */,
@@ -3973,6 +4207,8 @@
                        buildActionMask = 2147483647;
                        files = (
                                15A5A2090D5B94190087BDA0 /* pppcontroller.h in Headers */,
                        buildActionMask = 2147483647;
                        files = (
                                15A5A2090D5B94190087BDA0 /* pppcontroller.h in Headers */,
+                               15EF899F21894452003B2C5C /* SCNetworkInterfaceProvider.h in Headers */,
+                               15EF89CC21894B28003B2C5C /* IPMonitorControl.h in Headers */,
                                15A5A2080D5B94190087BDA0 /* pppcontroller_types.h in Headers */,
                                1572C57F171CCFE200870549 /* pppcontroller_mach_defines.h in Headers */,
                                15A5A1E70D5B94190087BDA0 /* SCSchemaDefinitions.h in Headers */,
                                15A5A2080D5B94190087BDA0 /* pppcontroller_types.h in Headers */,
                                1572C57F171CCFE200870549 /* pppcontroller_mach_defines.h in Headers */,
                                15A5A1E70D5B94190087BDA0 /* SCSchemaDefinitions.h in Headers */,
@@ -4007,6 +4243,7 @@
                                15A5A2050D5B94190087BDA0 /* SCPreferencesPathKey.h in Headers */,
                                15A5A2060D5B94190087BDA0 /* dnsinfo.h in Headers */,
                                15A5A2070D5B94190087BDA0 /* dnsinfo_private.h in Headers */,
                                15A5A2050D5B94190087BDA0 /* SCPreferencesPathKey.h in Headers */,
                                15A5A2060D5B94190087BDA0 /* dnsinfo.h in Headers */,
                                15A5A2070D5B94190087BDA0 /* dnsinfo_private.h in Headers */,
+                               15EF89CB21894B1A003B2C5C /* IPMonitorControlPrivate.h in Headers */,
                                15A5A20C0D5B94190087BDA0 /* SCPreferencesSetSpecificPrivate.h in Headers */,
                                15A5A20D0D5B94190087BDA0 /* SCPreferencesGetSpecificPrivate.h in Headers */,
                                727AF255191386A0009AB153 /* VPNFlow.h in Headers */,
                                15A5A20C0D5B94190087BDA0 /* SCPreferencesSetSpecificPrivate.h in Headers */,
                                15A5A20D0D5B94190087BDA0 /* SCPreferencesGetSpecificPrivate.h in Headers */,
                                727AF255191386A0009AB153 /* VPNFlow.h in Headers */,
@@ -4014,6 +4251,7 @@
                                15A5A2100D5B94190087BDA0 /* SCHelper_client.h in Headers */,
                                15A5A2110D5B94190087BDA0 /* SCNetworkConnectionPrivate.h in Headers */,
                                15A5A2120D5B94190087BDA0 /* SCPreferencesKeychainPrivate.h in Headers */,
                                15A5A2100D5B94190087BDA0 /* SCHelper_client.h in Headers */,
                                15A5A2110D5B94190087BDA0 /* SCNetworkConnectionPrivate.h in Headers */,
                                15A5A2120D5B94190087BDA0 /* SCPreferencesKeychainPrivate.h in Headers */,
+                               15EF89A021894533003B2C5C /* SNHelperPrivate.h in Headers */,
                                15A5A2130D5B94190087BDA0 /* SCSchemaDefinitionsPrivate.h in Headers */,
                                15A5A2140D5B94190087BDA0 /* SCNetworkSignature.h in Headers */,
                                15A5A2150D5B94190087BDA0 /* SCNetworkSignaturePrivate.h in Headers */,
                                15A5A2130D5B94190087BDA0 /* SCSchemaDefinitionsPrivate.h in Headers */,
                                15A5A2140D5B94190087BDA0 /* SCNetworkSignature.h in Headers */,
                                15A5A2150D5B94190087BDA0 /* SCNetworkSignaturePrivate.h in Headers */,
@@ -4031,7 +4269,6 @@
                        isa = PBXHeadersBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        isa = PBXHeadersBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
-                               15C8C6C0170AAB4E005375CE /* cache.h in Headers */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
@@ -4076,7 +4313,7 @@
                                15DAD65107591A1A0084A6ED /* SCPreferencesSetSpecific.h in Headers */,
                                15DAD65207591A1A0084A6ED /* SCNetworkConfiguration.h in Headers */,
                                D61AAEB51522C9D00066B003 /* scprefs_observer.h in Headers */,
                                15DAD65107591A1A0084A6ED /* SCPreferencesSetSpecific.h in Headers */,
                                15DAD65207591A1A0084A6ED /* SCNetworkConfiguration.h in Headers */,
                                D61AAEB51522C9D00066B003 /* scprefs_observer.h in Headers */,
-                               F97F9FC7202CBD5A0040BD50 /* SCNetworkInterfaceProvider.h in Headers */,
+                               F90E43562012AD4F00EF27C4 /* SCNetworkInterfaceProvider.h in Headers */,
                                15DAD65307591A1A0084A6ED /* SCNetworkConfigurationInternal.h in Headers */,
                                F9B7AE66186211BE00C78D18 /* IPMonitorControlPrivate.h in Headers */,
                                15DAD65407591A1A0084A6ED /* SCNetwork.h in Headers */,
                                15DAD65307591A1A0084A6ED /* SCNetworkConfigurationInternal.h in Headers */,
                                F9B7AE66186211BE00C78D18 /* IPMonitorControlPrivate.h in Headers */,
                                15DAD65407591A1A0084A6ED /* SCNetwork.h in Headers */,
@@ -4478,7 +4715,7 @@
                        buildPhases = (
                                157A84F50D56C7E800B6F1A0 /* Headers */,
                                157A84F90D56C7E800B6F1A0 /* Sources */,
                        buildPhases = (
                                157A84F50D56C7E800B6F1A0 /* Headers */,
                                157A84F90D56C7E800B6F1A0 /* Sources */,
-                               F999388720FE546D005EE20D /* CopyFiles */,
+                               F963400F20FE8E4100F1E1F1 /* CopyFiles */,
                        );
                        buildRules = (
                        );
                        );
                        buildRules = (
                        );
@@ -4875,7 +5112,6 @@
                                15A66BB11F18177100F7253B /* Update "install_path" for address|thread sanitizers */,
                                15DAD66807591A1A0084A6ED /* Resources */,
                                15DAD6B007591A1A0084A6ED /* get-mobility-info */,
                                15A66BB11F18177100F7253B /* Update "install_path" for address|thread sanitizers */,
                                15DAD66807591A1A0084A6ED /* Resources */,
                                15DAD6B007591A1A0084A6ED /* get-mobility-info */,
-                               15D9DCF910DD909F004E545D /* AppWorkaround.plist */,
                                158D6D881C974E7E00A08E78 /* Logging Preferences */,
                        );
                        buildRules = (
                                158D6D881C974E7E00A08E78 /* Logging Preferences */,
                        );
                        buildRules = (
@@ -4920,6 +5156,80 @@
                        productReference = 15E1B06116EBAE7800E5F06F /* IPMonitor.bundle */;
                        productType = "com.apple.product-type.bundle";
                };
                        productReference = 15E1B06116EBAE7800E5F06F /* IPMonitor.bundle */;
                        productType = "com.apple.product-type.bundle";
                };
+               15E91DB221893E83001155DC /* SCTest-ObjC-Embedded */ = {
+                       isa = PBXNativeTarget;
+                       buildConfigurationList = 15E91DBB21893E83001155DC /* Build configuration list for PBXNativeTarget "SCTest-ObjC-Embedded" */;
+                       buildPhases = (
+                               15E91DB521893E83001155DC /* Flush Module Cache */,
+                               15E91DB621893E83001155DC /* Sources */,
+                               15E91DB821893E83001155DC /* Frameworks */,
+                               15E91DBA21893E83001155DC /* CopyFiles */,
+                       );
+                       buildRules = (
+                       );
+                       dependencies = (
+                               15EF89A221894601003B2C5C /* PBXTargetDependency */,
+                       );
+                       name = "SCTest-ObjC-Embedded";
+                       productName = "SCTest-ObjC";
+                       productReference = 15E91DBE21893E83001155DC /* SCTest-ObjC-Embedded */;
+                       productType = "com.apple.product-type.tool";
+               };
+               15E91DCC21893EE1001155DC /* SCTest-Swift-Embedded */ = {
+                       isa = PBXNativeTarget;
+                       buildConfigurationList = 15E91DD321893EE1001155DC /* Build configuration list for PBXNativeTarget "SCTest-Swift-Embedded" */;
+                       buildPhases = (
+                               15E91DCF21893EE1001155DC /* Sources */,
+                               15E91DD121893EE1001155DC /* Frameworks */,
+                               15E91DD221893EE1001155DC /* CopyFiles */,
+                       );
+                       buildRules = (
+                       );
+                       dependencies = (
+                               15EF89A42189461B003B2C5C /* PBXTargetDependency */,
+                       );
+                       name = "SCTest-Swift-Embedded";
+                       productName = "SCTest-Swift";
+                       productReference = 15E91DD621893EE1001155DC /* SCTest-Swift-Embedded */;
+                       productType = "com.apple.product-type.tool";
+               };
+               15EF89A521894636003B2C5C /* SCTest-ObjC-EmbeddedSimulator */ = {
+                       isa = PBXNativeTarget;
+                       buildConfigurationList = 15EF89AE21894636003B2C5C /* Build configuration list for PBXNativeTarget "SCTest-ObjC-EmbeddedSimulator" */;
+                       buildPhases = (
+                               15EF89A821894636003B2C5C /* Flush Module Cache */,
+                               15EF89A921894636003B2C5C /* Sources */,
+                               15EF89AB21894636003B2C5C /* Frameworks */,
+                               15EF89AD21894636003B2C5C /* CopyFiles */,
+                       );
+                       buildRules = (
+                       );
+                       dependencies = (
+                               15EF89BE2189467B003B2C5C /* PBXTargetDependency */,
+                       );
+                       name = "SCTest-ObjC-EmbeddedSimulator";
+                       productName = "SCTest-ObjC";
+                       productReference = 15EF89B121894636003B2C5C /* SCTest-ObjC-EmbeddedSimulator */;
+                       productType = "com.apple.product-type.tool";
+               };
+               15EF89B221894665003B2C5C /* SCTest-Swift-EmbeddedSimulator */ = {
+                       isa = PBXNativeTarget;
+                       buildConfigurationList = 15EF89B921894665003B2C5C /* Build configuration list for PBXNativeTarget "SCTest-Swift-EmbeddedSimulator" */;
+                       buildPhases = (
+                               15EF89B521894665003B2C5C /* Sources */,
+                               15EF89B721894665003B2C5C /* Frameworks */,
+                               15EF89B821894665003B2C5C /* CopyFiles */,
+                       );
+                       buildRules = (
+                       );
+                       dependencies = (
+                               15EF89C021894688003B2C5C /* PBXTargetDependency */,
+                       );
+                       name = "SCTest-Swift-EmbeddedSimulator";
+                       productName = "SCTest-Swift";
+                       productReference = 15EF89BC21894665003B2C5C /* SCTest-Swift-EmbeddedSimulator */;
+                       productType = "com.apple.product-type.tool";
+               };
                15F742DA1EC6370000DA2E7A /* liblog_SystemConfiguration-Embedded */ = {
                        isa = PBXNativeTarget;
                        buildConfigurationList = 15F742E11EC6370000DA2E7A /* Build configuration list for PBXNativeTarget "liblog_SystemConfiguration-Embedded" */;
                15F742DA1EC6370000DA2E7A /* liblog_SystemConfiguration-Embedded */ = {
                        isa = PBXNativeTarget;
                        buildConfigurationList = 15F742E11EC6370000DA2E7A /* Build configuration list for PBXNativeTarget "liblog_SystemConfiguration-Embedded" */;
@@ -5081,6 +5391,7 @@
                        isa = PBXNativeTarget;
                        buildConfigurationList = 72D3E66D1AE6EAF600DB4C69 /* Build configuration list for PBXNativeTarget "SCTest-ObjC" */;
                        buildPhases = (
                        isa = PBXNativeTarget;
                        buildConfigurationList = 72D3E66D1AE6EAF600DB4C69 /* Build configuration list for PBXNativeTarget "SCTest-ObjC" */;
                        buildPhases = (
+                               150EC0FE21016BAA0047F4BF /* Flush Module Cache */,
                                72D3E6651AE6EAF600DB4C69 /* Sources */,
                                72D3E6661AE6EAF600DB4C69 /* Frameworks */,
                                72D3E6671AE6EAF600DB4C69 /* CopyFiles */,
                                72D3E6651AE6EAF600DB4C69 /* Sources */,
                                72D3E6661AE6EAF600DB4C69 /* Frameworks */,
                                72D3E6671AE6EAF600DB4C69 /* CopyFiles */,
@@ -5101,7 +5412,6 @@
                        buildPhases = (
                                C4666C6D206ED01800247AB6 /* Sources */,
                                C4666C6E206ED01800247AB6 /* Frameworks */,
                        buildPhases = (
                                C4666C6D206ED01800247AB6 /* Sources */,
                                C4666C6E206ED01800247AB6 /* Frameworks */,
-                               C4666C6F206ED01800247AB6 /* Resources */,
                        );
                        buildRules = (
                        );
                        );
                        buildRules = (
                        );
@@ -5118,8 +5428,11 @@
                15CB6A7705C0722B0099E85F /* Project object */ = {
                        isa = PBXProject;
                        attributes = {
                15CB6A7705C0722B0099E85F /* Project object */ = {
                        isa = PBXProject;
                        attributes = {
-                               LastUpgradeCheck = 0930;
+                               LastUpgradeCheck = 1100;
                                TargetAttributes = {
                                TargetAttributes = {
+                                       15401C1C21991506006326B7 = {
+                                               CreatedOnToolsVersion = 11.0;
+                                       };
                                        72573D251D667372004975AD = {
                                                CreatedOnToolsVersion = 8.0;
                                                ProvisioningStyle = Automatic;
                                        72573D251D667372004975AD = {
                                                CreatedOnToolsVersion = 8.0;
                                                ProvisioningStyle = Automatic;
@@ -5138,13 +5451,11 @@
                        };
                        buildConfigurationList = 156EB63E0905594A00EEF749 /* Build configuration list for PBXProject "configd" */;
                        compatibilityVersion = "Xcode 3.2";
                        };
                        buildConfigurationList = 156EB63E0905594A00EEF749 /* Build configuration list for PBXProject "configd" */;
                        compatibilityVersion = "Xcode 3.2";
-                       developmentRegion = English;
+                       developmentRegion = en;
                        hasScannedForEncodings = 1;
                        knownRegions = (
                        hasScannedForEncodings = 1;
                        knownRegions = (
-                               English,
-                               Japanese,
-                               French,
-                               German,
+                               en,
+                               Base,
                        );
                        mainGroup = 15CB68FC05C072220099E85F /* configd */;
                        productRefGroup = 15CB690F05C0722B0099E85F /* Products */;
                        );
                        mainGroup = 15CB68FC05C072220099E85F /* configd */;
                        productRefGroup = 15CB690F05C0722B0099E85F /* Products */;
@@ -5156,14 +5467,13 @@
                                15DAD5DF075913CE0084A6ED /* libsystem_configuration */,
                                157BB8AE075924360025DA7A /* configd_base */,
                                15DAD63F07591A1A0084A6ED /* SystemConfiguration.framework */,
                                15DAD5DF075913CE0084A6ED /* libsystem_configuration */,
                                157BB8AE075924360025DA7A /* configd_base */,
                                15DAD63F07591A1A0084A6ED /* SystemConfiguration.framework */,
-                               1547001808455B98006787CE /* SCHelper */,
                                159D542007528E7C004F8947 /* configd_plugins */,
                                159D542007528E7C004F8947 /* configd_plugins */,
-                               159D53EB07528C61004F8947 /* IPMonitor */,
-                               15FD72A10754DA4C001CC321 /* IPMonitor.bundle */,
-                               159D53E407528C4A004F8947 /* InterfaceNamer */,
-                               15FD72930754DA2B001CC321 /* InterfaceNamer.bundle */,
                                159D53D307528BDA004F8947 /* KernelEventMonitor */,
                                15828AE60753B5F900AD4710 /* KernelEventMonitor.bundle */,
                                159D53D307528BDA004F8947 /* KernelEventMonitor */,
                                15828AE60753B5F900AD4710 /* KernelEventMonitor.bundle */,
+                               159D53E407528C4A004F8947 /* InterfaceNamer */,
+                               15FD72930754DA2B001CC321 /* InterfaceNamer.bundle */,
+                               159D53EB07528C61004F8947 /* IPMonitor */,
+                               15FD72A10754DA4C001CC321 /* IPMonitor.bundle */,
                                159D53F207528C79004F8947 /* LinkConfiguration */,
                                15FD72B10754DA69001CC321 /* LinkConfiguration.bundle */,
                                159D53F907528C95004F8947 /* PreferencesMonitor */,
                                159D53F207528C79004F8947 /* LinkConfiguration */,
                                15FD72B10754DA69001CC321 /* LinkConfiguration.bundle */,
                                159D53F907528C95004F8947 /* PreferencesMonitor */,
@@ -5175,20 +5485,21 @@
                                159D549F07529FFF004F8947 /* configd */,
                                1558481207550EC10046C2E9 /* scselect */,
                                155847430754FDCD0046C2E9 /* scutil */,
                                159D549F07529FFF004F8947 /* configd */,
                                1558481207550EC10046C2E9 /* scselect */,
                                155847430754FDCD0046C2E9 /* scutil */,
-                               72573D251D667372004975AD /* sctest */,
+                               1547001808455B98006787CE /* SCHelper */,
                                151F5D990CCE98E50093AC3B /* SCMonitor */,
                                151F5D990CCE98E50093AC3B /* SCMonitor */,
+                               72573D251D667372004975AD /* sctest */,
                                C4666C70206ED01800247AB6 /* SystemConfigurationEventFactory */,
                                C4666C70206ED01800247AB6 /* SystemConfigurationEventFactory */,
+                               15401C1C21991506006326B7 /* configd_extras */,
                                151C1CC60CFB487000C5AFD6 /* All-Embedded */,
                                15C64A280F684C6B00D78394 /* configd_libSystem-Embedded */,
                                157A84D80D56C63900B6F1A0 /* libsystem_configuration-Embedded */,
                                158316CF0CFB774B006F62B9 /* configd_base-Embedded */,
                                1572C4A60CFB55B400E2776E /* SystemConfiguration.framework-Embedded */,
                                151C1CC60CFB487000C5AFD6 /* All-Embedded */,
                                15C64A280F684C6B00D78394 /* configd_libSystem-Embedded */,
                                157A84D80D56C63900B6F1A0 /* libsystem_configuration-Embedded */,
                                158316CF0CFB774B006F62B9 /* configd_base-Embedded */,
                                1572C4A60CFB55B400E2776E /* SystemConfiguration.framework-Embedded */,
-                               158337990CFB6B9E0033AB93 /* SCHelper-Embedded */,
                                158316E30CFB7761006F62B9 /* configd_plugins-Embedded */,
                                158316E30CFB7761006F62B9 /* configd_plugins-Embedded */,
-                               157A84F40D56C7E800B6F1A0 /* IPMonitor-Embedded */,
-                               1583177D0CFB85C8006F62B9 /* IPMonitor.bundle-Embedded */,
                                157A85050D56C8AA00B6F1A0 /* InterfaceNamer-Embedded */,
                                158317870CFB85DD006F62B9 /* InterfaceNamer.bundle-Embedded */,
                                157A85050D56C8AA00B6F1A0 /* InterfaceNamer-Embedded */,
                                158317870CFB85DD006F62B9 /* InterfaceNamer.bundle-Embedded */,
+                               157A84F40D56C7E800B6F1A0 /* IPMonitor-Embedded */,
+                               1583177D0CFB85C8006F62B9 /* IPMonitor.bundle-Embedded */,
                                157A85100D56C8E000B6F1A0 /* KernelEventMonitor-Embedded */,
                                158317900CFB85F7006F62B9 /* KernelEventMonitor.bundle-Embedded */,
                                157A85260D56C91100B6F1A0 /* LinkConfiguration-Embedded */,
                                157A85100D56C8E000B6F1A0 /* KernelEventMonitor-Embedded */,
                                158317900CFB85F7006F62B9 /* KernelEventMonitor.bundle-Embedded */,
                                157A85260D56C91100B6F1A0 /* LinkConfiguration-Embedded */,
@@ -5202,7 +5513,9 @@
                                158317230CFB80A1006F62B9 /* configd-Embedded */,
                                157433DD0D4A8122002ACA73 /* scselect-Embedded */,
                                157433F00D4A8137002ACA73 /* scutil-Embedded */,
                                158317230CFB80A1006F62B9 /* configd-Embedded */,
                                157433DD0D4A8122002ACA73 /* scselect-Embedded */,
                                157433F00D4A8137002ACA73 /* scutil-Embedded */,
+                               158337990CFB6B9E0033AB93 /* SCHelper-Embedded */,
                                7271EA1B1D76600B0055B1AA /* sctest-Embedded */,
                                7271EA1B1D76600B0055B1AA /* sctest-Embedded */,
+                               15401C21219915BC006326B7 /* configd_extras-Embedded */,
                                15FD13BF0D59485000F9409C /* All-EmbeddedSimulator */,
                                157FDE3B164A075F0040D6A8 /* configd_libSystem-EmbeddedSimulator */,
                                15732AD616EA6B6700F3AC4C /* libsystem_configuration-EmbeddedSimulator */,
                                15FD13BF0D59485000F9409C /* All-EmbeddedSimulator */,
                                157FDE3B164A075F0040D6A8 /* configd_libSystem-EmbeddedSimulator */,
                                15732AD616EA6B6700F3AC4C /* libsystem_configuration-EmbeddedSimulator */,
@@ -5216,10 +5529,15 @@
                                15F742E71EC638D100DA2E7A /* liblog_SystemConfiguration-EmbeddedSimulator */,
                                15732A7616EA503200F3AC4C /* configd-EmbeddedSimulator */,
                                15732AAD16EA511900F3AC4C /* scutil-EmbeddedSimulator */,
                                15F742E71EC638D100DA2E7A /* liblog_SystemConfiguration-EmbeddedSimulator */,
                                15732A7616EA503200F3AC4C /* configd-EmbeddedSimulator */,
                                15732AAD16EA511900F3AC4C /* scutil-EmbeddedSimulator */,
-                               151F63DA09328A3C0096DCC9 /* Schema */,
+                               15401C26219915C6006326B7 /* configd_extras-EmbeddedSimulator */,
                                15E83104167F9AF600FD51EC /* EVERYTHING */,
                                15E83104167F9AF600FD51EC /* EVERYTHING */,
-                               72D3E65D1AE6EA3900DB4C69 /* SCTest-Swift */,
+                               151F63DA09328A3C0096DCC9 /* Schema */,
                                72D3E6681AE6EAF600DB4C69 /* SCTest-ObjC */,
                                72D3E6681AE6EAF600DB4C69 /* SCTest-ObjC */,
+                               15E91DB221893E83001155DC /* SCTest-ObjC-Embedded */,
+                               15EF89A521894636003B2C5C /* SCTest-ObjC-EmbeddedSimulator */,
+                               72D3E65D1AE6EA3900DB4C69 /* SCTest-Swift */,
+                               15E91DCC21893EE1001155DC /* SCTest-Swift-Embedded */,
+                               15EF89B221894665003B2C5C /* SCTest-Swift-EmbeddedSimulator */,
                        );
                };
 /* End PBXProject section */
                        );
                };
 /* End PBXProject section */
@@ -5365,13 +5683,6 @@
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
-               C4666C6F206ED01800247AB6 /* Resources */ = {
-                       isa = PBXResourcesBuildPhase;
-                       buildActionMask = 2147483647;
-                       files = (
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
-               };
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
@@ -5390,6 +5701,25 @@
                        shellScript = "#\n# move libsystem_configuration_[at]san.dylib out of /usr/lib/system\n#\n# Note: to use the asan/tsan .dylib, set DYLD_INSERT_LIBRARIES=...\n#\nfor VARIANT in ${BUILD_VARIANTS}\ndo\n    if [ \"${VARIANT}\" = \"asan\" -o  \"${VARIANT}\" = \"tsan\" ]; then\n        DIR_O=\"/usr/lib/system\"\n        DIR_N=\"/usr/local/lib\"\n        DYLIB=\"libsystem_configuration_${VARIANT}.dylib\"\n\n\t\tmkdir -p \"${DSTROOT}/${DIR_N}\"\n\t\tmv \"${DSTROOT}/${DIR_O}/${DYLIB}\" \"${DSTROOT}/${DIR_N}/${DYLIB}\"\n\t\tif [ -d \"${DSTROOT}/${DIR_O}/${DYLIB}.dSYM\" ]; then\n\t\t\tmv \"${DSTROOT}/${DIR_O}/${DYLIB}.dSYM\" \"${DSTROOT}/${DIR_N}/${DYLIB}.dSYM\"\n\t\tfi\n    fi\ndone";
                        showEnvVarsInLog = 0;
                };
                        shellScript = "#\n# move libsystem_configuration_[at]san.dylib out of /usr/lib/system\n#\n# Note: to use the asan/tsan .dylib, set DYLD_INSERT_LIBRARIES=...\n#\nfor VARIANT in ${BUILD_VARIANTS}\ndo\n    if [ \"${VARIANT}\" = \"asan\" -o  \"${VARIANT}\" = \"tsan\" ]; then\n        DIR_O=\"/usr/lib/system\"\n        DIR_N=\"/usr/local/lib\"\n        DYLIB=\"libsystem_configuration_${VARIANT}.dylib\"\n\n\t\tmkdir -p \"${DSTROOT}/${DIR_N}\"\n\t\tmv \"${DSTROOT}/${DIR_O}/${DYLIB}\" \"${DSTROOT}/${DIR_N}/${DYLIB}\"\n\t\tif [ -d \"${DSTROOT}/${DIR_O}/${DYLIB}.dSYM\" ]; then\n\t\t\tmv \"${DSTROOT}/${DIR_O}/${DYLIB}.dSYM\" \"${DSTROOT}/${DIR_N}/${DYLIB}.dSYM\"\n\t\tfi\n    fi\ndone";
                        showEnvVarsInLog = 0;
                };
+               150EC0FE21016BAA0047F4BF /* Flush Module Cache */ = {
+                       isa = PBXShellScriptBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                       );
+                       inputFileListPaths = (
+                       );
+                       inputPaths = (
+                       );
+                       name = "Flush Module Cache";
+                       outputFileListPaths = (
+                       );
+                       outputPaths = (
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+                       shellPath = /bin/sh;
+                       shellScript = "rm -rf \"${CLANG_MODULE_CACHE_PATH}\"\n";
+                       showEnvVarsInLog = 0;
+               };
                1510A7301B17E1AF00125A85 /* Add framework symlink (TEMPORARY) */ = {
                        isa = PBXShellScriptBuildPhase;
                        buildActionMask = 2147483647;
                1510A7301B17E1AF00125A85 /* Add framework symlink (TEMPORARY) */ = {
                        isa = PBXShellScriptBuildPhase;
                        buildActionMask = 2147483647;
@@ -5630,7 +5960,7 @@
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                        shellPath = /bin/sh;
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                        shellPath = /bin/sh;
-                       shellScript = "if [ -x ${SCRIPT_INPUT_FILE_0} ]; then\n    ${SCRIPT_INPUT_FILE_0}\nfi\n";
+                       shellScript = "if [ -x ${SCRIPT_INPUT_FILE_0} ]; then\n    ${SCRIPT_INPUT_FILE_0} \"${TARGET_BUILD_DIR}/${PRIVATE_HEADERS_FOLDER_PATH}\"\nfi\n";
                        showEnvVarsInLog = 0;
                };
                1535FEDC1B0FDDCD00B2A3AD /* Add framework symlink (TEMPORARY) */ = {
                        showEnvVarsInLog = 0;
                };
                1535FEDC1B0FDDCD00B2A3AD /* Add framework symlink (TEMPORARY) */ = {
@@ -5648,9 +5978,66 @@
                        shellScript = "if [ \"${USING_PRIVATE_SYSTEMCONFIGURATION_FRAMEWORK}\" = \"YES\" ]; then\n    mkdir -p ${DSTROOT}/System/Library/Frameworks\n    cd ${DSTROOT}/System/Library/Frameworks\n    rm -rf SystemConfiguration.framework\n    ln -s ../PrivateFrameworks/SystemConfiguration.framework .\nfi";
                        showEnvVarsInLog = 0;
                };
                        shellScript = "if [ \"${USING_PRIVATE_SYSTEMCONFIGURATION_FRAMEWORK}\" = \"YES\" ]; then\n    mkdir -p ${DSTROOT}/System/Library/Frameworks\n    cd ${DSTROOT}/System/Library/Frameworks\n    rm -rf SystemConfiguration.framework\n    ln -s ../PrivateFrameworks/SystemConfiguration.framework .\nfi";
                        showEnvVarsInLog = 0;
                };
-               154070A01B968548003195EF /* Update "install_path" for address|thread sanitizers */ = {
+               15401C2021991549006326B7 /* Create non-empty Root */ = {
                        isa = PBXShellScriptBuildPhase;
                        isa = PBXShellScriptBuildPhase;
-                       buildActionMask = 12;
+                       buildActionMask = 2147483647;
+                       files = (
+                       );
+                       inputFileListPaths = (
+                       );
+                       inputPaths = (
+                       );
+                       name = "Create non-empty Root";
+                       outputFileListPaths = (
+                       );
+                       outputPaths = (
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+                       shellPath = /bin/sh;
+                       shellScript = "mkdir -p \"${DSTROOT}/AppleInternal\"\n";
+                       showEnvVarsInLog = 0;
+               };
+               15401C22219915BC006326B7 /* Create non-empty Root */ = {
+                       isa = PBXShellScriptBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                       );
+                       inputFileListPaths = (
+                       );
+                       inputPaths = (
+                       );
+                       name = "Create non-empty Root";
+                       outputFileListPaths = (
+                       );
+                       outputPaths = (
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+                       shellPath = /bin/sh;
+                       shellScript = "mkdir -p \"${DSTROOT}/AppleInternal\"\n";
+                       showEnvVarsInLog = 0;
+               };
+               15401C27219915C6006326B7 /* Create non-empty Root */ = {
+                       isa = PBXShellScriptBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                       );
+                       inputFileListPaths = (
+                       );
+                       inputPaths = (
+                       );
+                       name = "Create non-empty Root";
+                       outputFileListPaths = (
+                       );
+                       outputPaths = (
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+                       shellPath = /bin/sh;
+                       shellScript = "mkdir -p \"${DSTROOT}/AppleInternal\"\n";
+                       showEnvVarsInLog = 0;
+               };
+               154070A01B968548003195EF /* Update "install_path" for address|thread sanitizers */ = {
+                       isa = PBXShellScriptBuildPhase;
+                       buildActionMask = 12;
                        files = (
                        );
                        inputPaths = (
                        files = (
                        );
                        inputPaths = (
@@ -5721,7 +6108,7 @@
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                        shellPath = /bin/sh;
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                        shellPath = /bin/sh;
-                       shellScript = "if [ -x ${SCRIPT_INPUT_FILE_0} ]; then\n    ${SCRIPT_INPUT_FILE_0}\nfi\n";
+                       shellScript = "if [ -x ${SCRIPT_INPUT_FILE_0} ]; then\n${SCRIPT_INPUT_FILE_0} \"${TARGET_BUILD_DIR}/${PRIVATE_HEADERS_FOLDER_PATH}\"\nfi\n";
                        showEnvVarsInLog = 0;
                };
                15A66BB11F18177100F7253B /* Update "install_path" for address|thread sanitizers */ = {
                        showEnvVarsInLog = 0;
                };
                15A66BB11F18177100F7253B /* Update "install_path" for address|thread sanitizers */ = {
@@ -5801,6 +6188,44 @@
                        shellScript = "mkdir -p \"${DSTROOT}/usr/local/bin\"\nln -fs \"${INSTALL_PATH}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/get-mobility-info\" \"${DSTROOT}/usr/local/bin/\"\n";
                        showEnvVarsInLog = 0;
                };
                        shellScript = "mkdir -p \"${DSTROOT}/usr/local/bin\"\nln -fs \"${INSTALL_PATH}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/get-mobility-info\" \"${DSTROOT}/usr/local/bin/\"\n";
                        showEnvVarsInLog = 0;
                };
+               15E91DB521893E83001155DC /* Flush Module Cache */ = {
+                       isa = PBXShellScriptBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                       );
+                       inputFileListPaths = (
+                       );
+                       inputPaths = (
+                       );
+                       name = "Flush Module Cache";
+                       outputFileListPaths = (
+                       );
+                       outputPaths = (
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+                       shellPath = /bin/sh;
+                       shellScript = "rm -rf \"${CLANG_MODULE_CACHE_PATH}\"\n";
+                       showEnvVarsInLog = 0;
+               };
+               15EF89A821894636003B2C5C /* Flush Module Cache */ = {
+                       isa = PBXShellScriptBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                       );
+                       inputFileListPaths = (
+                       );
+                       inputPaths = (
+                       );
+                       name = "Flush Module Cache";
+                       outputFileListPaths = (
+                       );
+                       outputPaths = (
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+                       shellPath = /bin/sh;
+                       shellScript = "rm -rf \"${CLANG_MODULE_CACHE_PATH}\"\n";
+                       showEnvVarsInLog = 0;
+               };
                15FBB54D17D75DE70035D752 /* Update MachServices */ = {
                        isa = PBXShellScriptBuildPhase;
                        buildActionMask = 2147483647;
                15FBB54D17D75DE70035D752 /* Update MachServices */ = {
                        isa = PBXShellScriptBuildPhase;
                        buildActionMask = 2147483647;
@@ -5978,7 +6403,6 @@
                                1572C4F20CFB55B400E2776E /* SCDNotifierWait.c in Sources */,
                                1572C4F30CFB55B400E2776E /* SCDNotifierInformViaCallback.c in Sources */,
                                1572C4F50CFB55B400E2776E /* SCDNotifierInformViaFD.c in Sources */,
                                1572C4F20CFB55B400E2776E /* SCDNotifierWait.c in Sources */,
                                1572C4F30CFB55B400E2776E /* SCDNotifierInformViaCallback.c in Sources */,
                                1572C4F50CFB55B400E2776E /* SCDNotifierInformViaFD.c in Sources */,
-                               1572C4F60CFB55B400E2776E /* SCDNotifierInformViaSignal.c in Sources */,
                                1572C4F70CFB55B400E2776E /* SCDNotifierCancel.c in Sources */,
                                1572C4F80CFB55B400E2776E /* SCDSnapshot.c in Sources */,
                                1572C4F90CFB55B400E2776E /* SCP.c in Sources */,
                                1572C4F70CFB55B400E2776E /* SCDNotifierCancel.c in Sources */,
                                1572C4F80CFB55B400E2776E /* SCDSnapshot.c in Sources */,
                                1572C4F90CFB55B400E2776E /* SCP.c in Sources */,
@@ -5992,7 +6416,7 @@
                                1572C5000CFB55B400E2776E /* SCPSet.c in Sources */,
                                1572C5010CFB55B400E2776E /* SCPRemove.c in Sources */,
                                1572C5020CFB55B400E2776E /* SCPCommit.c in Sources */,
                                1572C5000CFB55B400E2776E /* SCPSet.c in Sources */,
                                1572C5010CFB55B400E2776E /* SCPRemove.c in Sources */,
                                1572C5020CFB55B400E2776E /* SCPCommit.c in Sources */,
-                               F97F9FC9202CBD710040BD50 /* SCNetworkInterfaceProvider.c in Sources */,
+                               F90E43592012AD6B00EF27C4 /* SCNetworkInterfaceProvider.c in Sources */,
                                1572C5040CFB55B400E2776E /* SCPPath.c in Sources */,
                                1572C5030CFB55B400E2776E /* SCPApply.c in Sources */,
                                1572C5060CFB55B400E2776E /* SCDHostName.c in Sources */,
                                1572C5040CFB55B400E2776E /* SCPPath.c in Sources */,
                                1572C5030CFB55B400E2776E /* SCPApply.c in Sources */,
                                1572C5060CFB55B400E2776E /* SCDHostName.c in Sources */,
@@ -6007,6 +6431,7 @@
                                1572C5150CFB55B400E2776E /* SCPreferencesPathKey.c in Sources */,
                                1572C5190CFB55B400E2776E /* SCNetworkConfigurationInternal.c in Sources */,
                                1572C51A0CFB55B400E2776E /* SCNetworkInterface.c in Sources */,
                                1572C5150CFB55B400E2776E /* SCPreferencesPathKey.c in Sources */,
                                1572C5190CFB55B400E2776E /* SCNetworkConfigurationInternal.c in Sources */,
                                1572C51A0CFB55B400E2776E /* SCNetworkInterface.c in Sources */,
+                               1542400621626F5C00C7CE8B /* SCDCache.c in Sources */,
                                1572C51B0CFB55B400E2776E /* SCNetworkProtocol.c in Sources */,
                                1572C51C0CFB55B400E2776E /* SCNetworkService.c in Sources */,
                                1572C51D0CFB55B400E2776E /* SCNetworkSet.c in Sources */,
                                1572C51B0CFB55B400E2776E /* SCNetworkProtocol.c in Sources */,
                                1572C51C0CFB55B400E2776E /* SCNetworkService.c in Sources */,
                                1572C51D0CFB55B400E2776E /* SCNetworkSet.c in Sources */,
@@ -6036,7 +6461,6 @@
                                15732A8016EA503200F3AC4C /* configd.m in Sources */,
                                15732A8116EA503200F3AC4C /* _SCD.c in Sources */,
                                15732A8216EA503200F3AC4C /* configd_server.c in Sources */,
                                15732A8016EA503200F3AC4C /* configd.m in Sources */,
                                15732A8116EA503200F3AC4C /* _SCD.c in Sources */,
                                15732A8216EA503200F3AC4C /* configd_server.c in Sources */,
-                               15732A8316EA503200F3AC4C /* notify_server.c in Sources */,
                                15732A8416EA503200F3AC4C /* plugin_support.c in Sources */,
                                15732A8516EA503200F3AC4C /* session.c in Sources */,
                                15732A8616EA503200F3AC4C /* pattern.c in Sources */,
                                15732A8416EA503200F3AC4C /* plugin_support.c in Sources */,
                                15732A8516EA503200F3AC4C /* session.c in Sources */,
                                15732A8616EA503200F3AC4C /* pattern.c in Sources */,
@@ -6054,7 +6478,6 @@
                                15732A9216EA503200F3AC4C /* _notifychanges.c in Sources */,
                                15732A9316EA503200F3AC4C /* _notifyviaport.c in Sources */,
                                15732A9416EA503200F3AC4C /* _notifyviafd.c in Sources */,
                                15732A9216EA503200F3AC4C /* _notifychanges.c in Sources */,
                                15732A9316EA503200F3AC4C /* _notifyviaport.c in Sources */,
                                15732A9416EA503200F3AC4C /* _notifyviafd.c in Sources */,
-                               15732A9516EA503200F3AC4C /* _notifyviasignal.c in Sources */,
                                15732A9616EA503200F3AC4C /* _notifycancel.c in Sources */,
                                15732A9716EA503200F3AC4C /* _snapshot.c in Sources */,
                        );
                                15732A9616EA503200F3AC4C /* _notifycancel.c in Sources */,
                                15732A9716EA503200F3AC4C /* _snapshot.c in Sources */,
                        );
@@ -6139,14 +6562,16 @@
                        files = (
                                157A84FB0D56C7E800B6F1A0 /* dns-configuration.c in Sources */,
                                15D48EC10F67061F00B4711E /* dnsinfo_create.c in Sources */,
                        files = (
                                157A84FB0D56C7E800B6F1A0 /* dns-configuration.c in Sources */,
                                15D48EC10F67061F00B4711E /* dnsinfo_create.c in Sources */,
+                               159FFD5F2110EA44009311DD /* dnsinfo_flatfile.c in Sources */,
+                               150BEC1A14CA252200237116 /* dnsinfo_server.c in Sources */,
                                7280158E1BE16863009F4F60 /* dnsAgent.m in Sources */,
                                F9B7AE69186211CE00C78D18 /* IPMonitorControlServer.c in Sources */,
                                728015881BE16851009F4F60 /* configAgent.m in Sources */,
                                728015911BE1686C009F4F60 /* proxyAgent.m in Sources */,
                                7280158E1BE16863009F4F60 /* dnsAgent.m in Sources */,
                                F9B7AE69186211CE00C78D18 /* IPMonitorControlServer.c in Sources */,
                                728015881BE16851009F4F60 /* configAgent.m in Sources */,
                                728015911BE1686C009F4F60 /* proxyAgent.m in Sources */,
-                               150BEC1A14CA252200237116 /* dnsinfo_server.c in Sources */,
                                155281020E3E4A0F00C54315 /* ip_plugin.c in Sources */,
                                E4F211D3137B0AB900BBB915 /* network_state_information_priv.c in Sources */,
                                153ACCA914E322D5005029A5 /* network_information_server.c in Sources */,
                                155281020E3E4A0F00C54315 /* ip_plugin.c in Sources */,
                                E4F211D3137B0AB900BBB915 /* network_state_information_priv.c in Sources */,
                                153ACCA914E322D5005029A5 /* network_information_server.c in Sources */,
+                               F97289D322652D0600080596 /* serviceIDNumber.c in Sources */,
                                1575FD2712CD15C60003D86E /* proxy-configuration.c in Sources */,
                                157A84FC0D56C7E800B6F1A0 /* set-hostname.c in Sources */,
                                1501F76A1EA8019D006A71B0 /* nat64-configuration.c in Sources */,
                                1575FD2712CD15C60003D86E /* proxy-configuration.c in Sources */,
                                157A84FC0D56C7E800B6F1A0 /* set-hostname.c in Sources */,
                                1501F76A1EA8019D006A71B0 /* nat64-configuration.c in Sources */,
@@ -6173,7 +6598,6 @@
                        buildActionMask = 2147483647;
                        files = (
                                157A851E0D56C8E000B6F1A0 /* eventmon.c in Sources */,
                        buildActionMask = 2147483647;
                        files = (
                                157A851E0D56C8E000B6F1A0 /* eventmon.c in Sources */,
-                               157A85190D56C8E000B6F1A0 /* cache.c in Sources */,
                                157A851B0D56C8E000B6F1A0 /* ev_dlil.c in Sources */,
                                157A851C0D56C8E000B6F1A0 /* ev_ipv4.c in Sources */,
                                157A851D0D56C8E000B6F1A0 /* ev_ipv6.c in Sources */,
                                157A851B0D56C8E000B6F1A0 /* ev_dlil.c in Sources */,
                                157A851C0D56C8E000B6F1A0 /* ev_ipv4.c in Sources */,
                                157A851D0D56C8E000B6F1A0 /* ev_ipv6.c in Sources */,
@@ -6205,7 +6629,6 @@
                                1583172D0CFB80A1006F62B9 /* configd.m in Sources */,
                                1583172E0CFB80A1006F62B9 /* _SCD.c in Sources */,
                                1583172F0CFB80A1006F62B9 /* configd_server.c in Sources */,
                                1583172D0CFB80A1006F62B9 /* configd.m in Sources */,
                                1583172E0CFB80A1006F62B9 /* _SCD.c in Sources */,
                                1583172F0CFB80A1006F62B9 /* configd_server.c in Sources */,
-                               158317300CFB80A1006F62B9 /* notify_server.c in Sources */,
                                158317310CFB80A1006F62B9 /* plugin_support.c in Sources */,
                                158317320CFB80A1006F62B9 /* session.c in Sources */,
                                158317330CFB80A1006F62B9 /* pattern.c in Sources */,
                                158317310CFB80A1006F62B9 /* plugin_support.c in Sources */,
                                158317320CFB80A1006F62B9 /* session.c in Sources */,
                                158317330CFB80A1006F62B9 /* pattern.c in Sources */,
@@ -6223,7 +6646,6 @@
                                158317410CFB80A1006F62B9 /* _notifychanges.c in Sources */,
                                158317420CFB80A1006F62B9 /* _notifyviaport.c in Sources */,
                                158317430CFB80A1006F62B9 /* _notifyviafd.c in Sources */,
                                158317410CFB80A1006F62B9 /* _notifychanges.c in Sources */,
                                158317420CFB80A1006F62B9 /* _notifyviaport.c in Sources */,
                                158317430CFB80A1006F62B9 /* _notifyviafd.c in Sources */,
-                               158317440CFB80A1006F62B9 /* _notifyviasignal.c in Sources */,
                                158317450CFB80A1006F62B9 /* _notifycancel.c in Sources */,
                                158317460CFB80A1006F62B9 /* _snapshot.c in Sources */,
                        );
                                158317450CFB80A1006F62B9 /* _notifycancel.c in Sources */,
                                158317460CFB80A1006F62B9 /* _snapshot.c in Sources */,
                        );
@@ -6243,7 +6665,6 @@
                        buildActionMask = 2147483647;
                        files = (
                                159D541307528DB5004F8947 /* eventmon.c in Sources */,
                        buildActionMask = 2147483647;
                        files = (
                                159D541307528DB5004F8947 /* eventmon.c in Sources */,
-                               159D540907528D3A004F8947 /* cache.c in Sources */,
                                159D540D07528DAE004F8947 /* ev_dlil.c in Sources */,
                                159D540F07528DB0004F8947 /* ev_ipv4.c in Sources */,
                                159D541107528DB2004F8947 /* ev_ipv6.c in Sources */,
                                159D540D07528DAE004F8947 /* ev_dlil.c in Sources */,
                                159D540F07528DB0004F8947 /* ev_ipv4.c in Sources */,
                                159D541107528DB2004F8947 /* ev_ipv6.c in Sources */,
@@ -6286,6 +6707,7 @@
                                F9B7AE6A186211D300C78D18 /* IPMonitorControlServer.c in Sources */,
                                F9D7305320E4211900521181 /* IPMonitorAWDReport.m in Sources */,
                                F9D7305220E4211900521181 /* AWDIPMonitorInterfaceAdvisoryReport.m in Sources */,
                                F9B7AE6A186211D300C78D18 /* IPMonitorControlServer.c in Sources */,
                                F9D7305320E4211900521181 /* IPMonitorAWDReport.m in Sources */,
                                F9D7305220E4211900521181 /* AWDIPMonitorInterfaceAdvisoryReport.m in Sources */,
+                               F97289D422652D0A00080596 /* serviceIDNumber.c in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
@@ -6313,7 +6735,6 @@
                                159D54AC07529FFF004F8947 /* configd.m in Sources */,
                                159D54AD07529FFF004F8947 /* _SCD.c in Sources */,
                                159D54AE07529FFF004F8947 /* configd_server.c in Sources */,
                                159D54AC07529FFF004F8947 /* configd.m in Sources */,
                                159D54AD07529FFF004F8947 /* _SCD.c in Sources */,
                                159D54AE07529FFF004F8947 /* configd_server.c in Sources */,
-                               159D54AF07529FFF004F8947 /* notify_server.c in Sources */,
                                159D54B007529FFF004F8947 /* plugin_support.c in Sources */,
                                159D54B107529FFF004F8947 /* session.c in Sources */,
                                159D54B207529FFF004F8947 /* pattern.c in Sources */,
                                159D54B007529FFF004F8947 /* plugin_support.c in Sources */,
                                159D54B107529FFF004F8947 /* session.c in Sources */,
                                159D54B207529FFF004F8947 /* pattern.c in Sources */,
@@ -6331,7 +6752,6 @@
                                159D54C007529FFF004F8947 /* _notifychanges.c in Sources */,
                                159D54C107529FFF004F8947 /* _notifyviaport.c in Sources */,
                                159D54C207529FFF004F8947 /* _notifyviafd.c in Sources */,
                                159D54C007529FFF004F8947 /* _notifychanges.c in Sources */,
                                159D54C107529FFF004F8947 /* _notifyviaport.c in Sources */,
                                159D54C207529FFF004F8947 /* _notifyviafd.c in Sources */,
-                               159D54C307529FFF004F8947 /* _notifyviasignal.c in Sources */,
                                159D54C407529FFF004F8947 /* _notifycancel.c in Sources */,
                                159D54C507529FFF004F8947 /* _snapshot.c in Sources */,
                        );
                                159D54C407529FFF004F8947 /* _notifycancel.c in Sources */,
                                159D54C507529FFF004F8947 /* _snapshot.c in Sources */,
                        );
@@ -6363,9 +6783,10 @@
                                15A5A2310D5B94190087BDA0 /* SCDNotifierWait.c in Sources */,
                                15A5A2320D5B94190087BDA0 /* SCDNotifierInformViaCallback.c in Sources */,
                                15A5A2340D5B94190087BDA0 /* SCDNotifierInformViaFD.c in Sources */,
                                15A5A2310D5B94190087BDA0 /* SCDNotifierWait.c in Sources */,
                                15A5A2320D5B94190087BDA0 /* SCDNotifierInformViaCallback.c in Sources */,
                                15A5A2340D5B94190087BDA0 /* SCDNotifierInformViaFD.c in Sources */,
-                               15A5A2350D5B94190087BDA0 /* SCDNotifierInformViaSignal.c in Sources */,
+                               1542400721626F6000C7CE8B /* SCDCache.c in Sources */,
                                15A5A2360D5B94190087BDA0 /* SCDNotifierCancel.c in Sources */,
                                15A5A2370D5B94190087BDA0 /* SCDSnapshot.c in Sources */,
                                15A5A2360D5B94190087BDA0 /* SCDNotifierCancel.c in Sources */,
                                15A5A2370D5B94190087BDA0 /* SCDSnapshot.c in Sources */,
+                               15EF89CA21894AB4003B2C5C /* SNHelper.c in Sources */,
                                15A5A2380D5B94190087BDA0 /* SCP.c in Sources */,
                                15A5A2390D5B94190087BDA0 /* SCPOpen.c in Sources */,
                                15A5A23A0D5B94190087BDA0 /* SCPLock.c in Sources */,
                                15A5A2380D5B94190087BDA0 /* SCP.c in Sources */,
                                15A5A2390D5B94190087BDA0 /* SCPOpen.c in Sources */,
                                15A5A23A0D5B94190087BDA0 /* SCPLock.c in Sources */,
@@ -6376,6 +6797,7 @@
                                15A5A23F0D5B94190087BDA0 /* SCPSet.c in Sources */,
                                15A5A2400D5B94190087BDA0 /* SCPRemove.c in Sources */,
                                15A5A2410D5B94190087BDA0 /* SCPCommit.c in Sources */,
                                15A5A23F0D5B94190087BDA0 /* SCPSet.c in Sources */,
                                15A5A2400D5B94190087BDA0 /* SCPRemove.c in Sources */,
                                15A5A2410D5B94190087BDA0 /* SCPCommit.c in Sources */,
+                               15EF89C921894AA5003B2C5C /* SCNetworkInterfaceProvider.c in Sources */,
                                15A5A2420D5B94190087BDA0 /* SCPApply.c in Sources */,
                                15A5A2430D5B94190087BDA0 /* SCPPath.c in Sources */,
                                15A5A2450D5B94190087BDA0 /* SCDHostName.c in Sources */,
                                15A5A2420D5B94190087BDA0 /* SCPApply.c in Sources */,
                                15A5A2430D5B94190087BDA0 /* SCPPath.c in Sources */,
                                15A5A2450D5B94190087BDA0 /* SCDHostName.c in Sources */,
@@ -6406,6 +6828,7 @@
                                D61AAEB21522C99C0066B003 /* scprefs_observer.c in Sources */,
                                C4F1848316237B1400D97043 /* VPNService.c in Sources */,
                                B0FEF41B1644089200174B99 /* VPNAppLayer.c in Sources */,
                                D61AAEB21522C99C0066B003 /* scprefs_observer.c in Sources */,
                                C4F1848316237B1400D97043 /* VPNService.c in Sources */,
                                B0FEF41B1644089200174B99 /* VPNAppLayer.c in Sources */,
+                               15EF89CD21894B32003B2C5C /* IPMonitorControl.c in Sources */,
                                727AF25919138E24009AB153 /* VPNTunnel.c in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                                727AF25919138E24009AB153 /* VPNTunnel.c in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
@@ -6415,7 +6838,6 @@
                        buildActionMask = 2147483647;
                        files = (
                                15D3083916F3EB8600014F82 /* simulator_support.c in Sources */,
                        buildActionMask = 2147483647;
                        files = (
                                15D3083916F3EB8600014F82 /* simulator_support.c in Sources */,
-                               15C8C6BF170AAB4E005375CE /* cache.c in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
@@ -6443,6 +6865,7 @@
                                15DAD66F07591A1A0084A6ED /* SCDPrivate.c in Sources */,
                                15DAD67007591A1A0084A6ED /* SCDPlugin.c in Sources */,
                                7264C144147319E7004FD76D /* CaptiveNetwork.c in Sources */,
                                15DAD66F07591A1A0084A6ED /* SCDPrivate.c in Sources */,
                                15DAD67007591A1A0084A6ED /* SCDPlugin.c in Sources */,
                                7264C144147319E7004FD76D /* CaptiveNetwork.c in Sources */,
+                               1542400521626F5A00C7CE8B /* SCDCache.c in Sources */,
                                15DAD67107591A1A0084A6ED /* SCDOpen.c in Sources */,
                                15DAD67407591A1A0084A6ED /* SCDList.c in Sources */,
                                15DAD67507591A1A0084A6ED /* SCDAdd.c in Sources */,
                                15DAD67107591A1A0084A6ED /* SCDOpen.c in Sources */,
                                15DAD67407591A1A0084A6ED /* SCDList.c in Sources */,
                                15DAD67507591A1A0084A6ED /* SCDAdd.c in Sources */,
@@ -6458,7 +6881,6 @@
                                15DAD67F07591A1A0084A6ED /* SCDNotifierWait.c in Sources */,
                                15DAD68007591A1A0084A6ED /* SCDNotifierInformViaCallback.c in Sources */,
                                15DAD68207591A1A0084A6ED /* SCDNotifierInformViaFD.c in Sources */,
                                15DAD67F07591A1A0084A6ED /* SCDNotifierWait.c in Sources */,
                                15DAD68007591A1A0084A6ED /* SCDNotifierInformViaCallback.c in Sources */,
                                15DAD68207591A1A0084A6ED /* SCDNotifierInformViaFD.c in Sources */,
-                               15DAD68307591A1A0084A6ED /* SCDNotifierInformViaSignal.c in Sources */,
                                15DAD68407591A1A0084A6ED /* SCDNotifierCancel.c in Sources */,
                                15DAD68507591A1A0084A6ED /* SCDSnapshot.c in Sources */,
                                15DAD68607591A1A0084A6ED /* SCP.c in Sources */,
                                15DAD68407591A1A0084A6ED /* SCDNotifierCancel.c in Sources */,
                                15DAD68507591A1A0084A6ED /* SCDSnapshot.c in Sources */,
                                15DAD68607591A1A0084A6ED /* SCP.c in Sources */,
@@ -6491,7 +6913,7 @@
                                15DAD6A707591A1A0084A6ED /* SCNetworkInterface.c in Sources */,
                                15DAD6A807591A1A0084A6ED /* SCNetworkProtocol.c in Sources */,
                                15DAD6A907591A1A0084A6ED /* SCNetworkService.c in Sources */,
                                15DAD6A707591A1A0084A6ED /* SCNetworkInterface.c in Sources */,
                                15DAD6A807591A1A0084A6ED /* SCNetworkProtocol.c in Sources */,
                                15DAD6A907591A1A0084A6ED /* SCNetworkService.c in Sources */,
-                               F9AF76C1202CCD86008D3BEB /* SCNetworkInterfaceProvider.c in Sources */,
+                               F90E43582012AD6900EF27C4 /* SCNetworkInterfaceProvider.c in Sources */,
                                15DAD6AA07591A1A0084A6ED /* SCNetworkSet.c in Sources */,
                                55A3DB9E183C2AD900ED3DB7 /* SCNetworkMigration.c in Sources */,
                                15DAD6AB07591A1A0084A6ED /* BondConfiguration.c in Sources */,
                                15DAD6AA07591A1A0084A6ED /* SCNetworkSet.c in Sources */,
                                55A3DB9E183C2AD900ED3DB7 /* SCNetworkMigration.c in Sources */,
                                15DAD6AB07591A1A0084A6ED /* BondConfiguration.c in Sources */,
@@ -6515,8 +6937,10 @@
                        files = (
                                15E1B04B16EBAE3C00E5F06F /* dns-configuration.c in Sources */,
                                15E1B04C16EBAE3C00E5F06F /* dnsinfo_create.c in Sources */,
                        files = (
                                15E1B04B16EBAE3C00E5F06F /* dns-configuration.c in Sources */,
                                15E1B04C16EBAE3C00E5F06F /* dnsinfo_create.c in Sources */,
+                               159FFD612110EA71009311DD /* dnsinfo_flatfile.c in Sources */,
                                15E1B04D16EBAE3C00E5F06F /* dnsinfo_server.c in Sources */,
                                15E1B04E16EBAE3C00E5F06F /* ip_plugin.c in Sources */,
                                15E1B04D16EBAE3C00E5F06F /* dnsinfo_server.c in Sources */,
                                15E1B04E16EBAE3C00E5F06F /* ip_plugin.c in Sources */,
+                               F97289D522652D0D00080596 /* serviceIDNumber.c in Sources */,
                                15E1B04F16EBAE3C00E5F06F /* network_state_information_priv.c in Sources */,
                                15E1B05016EBAE3C00E5F06F /* network_information_server.c in Sources */,
                                15E1B05116EBAE3C00E5F06F /* proxy-configuration.c in Sources */,
                                15E1B04F16EBAE3C00E5F06F /* network_state_information_priv.c in Sources */,
                                15E1B05016EBAE3C00E5F06F /* network_information_server.c in Sources */,
                                15E1B05116EBAE3C00E5F06F /* proxy-configuration.c in Sources */,
@@ -6526,6 +6950,38 @@
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
+               15E91DB621893E83001155DC /* Sources */ = {
+                       isa = PBXSourcesBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               15E91DB721893E83001155DC /* test-objC.m in Sources */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+               15E91DCF21893EE1001155DC /* Sources */ = {
+                       isa = PBXSourcesBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               15E91DD021893EE1001155DC /* main.swift in Sources */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+               15EF89A921894636003B2C5C /* Sources */ = {
+                       isa = PBXSourcesBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               15EF89AA21894636003B2C5C /* test-objC.m in Sources */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+               15EF89B521894665003B2C5C /* Sources */ = {
+                       isa = PBXSourcesBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               15EF89B621894665003B2C5C /* main.swift in Sources */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
                15F742DC1EC6370000DA2E7A /* Sources */ = {
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                15F742DC1EC6370000DA2E7A /* Sources */ = {
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
@@ -6594,13 +7050,30 @@
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
+                               C496A09620F909FF0098B3E5 /* IPConfigurationParser.m in Sources */,
                                C4666C7A206ED27800247AB6 /* EventFactory.m in Sources */,
                                C4666C7A206ED27800247AB6 /* EventFactory.m in Sources */,
+                               C4C5FB0C20EABD9E00F35614 /* IPMonitorParser.m in Sources */,
+                               C4C5FB0520EA9B6F00F35614 /* SCLogParser.m in Sources */,
+                               C4C5FB0920EAB0DD00F35614 /* InterfaceNamerParser.m in Sources */,
+                               C469CB2920EED6C100A7AD35 /* StateDumpParser.m in Sources */,
+                               C4C5FB0F20EAC05200F35614 /* PreferencesMonitorParser.m in Sources */,
+                               C4C5FB0620EA9C3200F35614 /* KernelEventMonitorParser.m in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
 /* End PBXSourcesBuildPhase section */
 
 /* Begin PBXTargetDependency section */
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
 /* End PBXSourcesBuildPhase section */
 
 /* Begin PBXTargetDependency section */
+               150EC101210171AE0047F4BF /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = 72D3E6681AE6EAF600DB4C69 /* SCTest-ObjC */;
+                       targetProxy = 150EC100210171AE0047F4BF /* PBXContainerItemProxy */;
+               };
+               150EC103210171B60047F4BF /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = 72D3E65D1AE6EA3900DB4C69 /* SCTest-Swift */;
+                       targetProxy = 150EC102210171B60047F4BF /* PBXContainerItemProxy */;
+               };
                150ECB300D0042DA0065E94D /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = 151F5D990CCE98E50093AC3B /* SCMonitor */;
                150ECB300D0042DA0065E94D /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = 151F5D990CCE98E50093AC3B /* SCMonitor */;
@@ -6616,6 +7089,21 @@
                        target = 158337990CFB6B9E0033AB93 /* SCHelper-Embedded */;
                        targetProxy = 1523BBE11E075859006281F1 /* PBXContainerItemProxy */;
                };
                        target = 158337990CFB6B9E0033AB93 /* SCHelper-Embedded */;
                        targetProxy = 1523BBE11E075859006281F1 /* PBXContainerItemProxy */;
                };
+               15401C2C21991B05006326B7 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = 15401C1C21991506006326B7 /* configd_extras */;
+                       targetProxy = 15401C2B21991B05006326B7 /* PBXContainerItemProxy */;
+               };
+               15401C2E21991B1B006326B7 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = 15401C21219915BC006326B7 /* configd_extras-Embedded */;
+                       targetProxy = 15401C2D21991B1B006326B7 /* PBXContainerItemProxy */;
+               };
+               15401C3021991B31006326B7 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = 15401C26219915C6006326B7 /* configd_extras-EmbeddedSimulator */;
+                       targetProxy = 15401C2F21991B31006326B7 /* PBXContainerItemProxy */;
+               };
                1558480607550D470046C2E9 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = 159D549F07529FFF004F8947 /* configd */;
                1558480607550D470046C2E9 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = 159D549F07529FFF004F8947 /* configd */;
@@ -6631,6 +7119,16 @@
                        target = 155847FA07550D210046C2E9 /* configd_executables */;
                        targetProxy = 1558480E07550DD00046C2E9 /* PBXContainerItemProxy */;
                };
                        target = 155847FA07550D210046C2E9 /* configd_executables */;
                        targetProxy = 1558480E07550DD00046C2E9 /* PBXContainerItemProxy */;
                };
+               155C626121C2B6FD008DCB1A /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = 157433DD0D4A8122002ACA73 /* scselect-Embedded */;
+                       targetProxy = 155C626021C2B6FD008DCB1A /* PBXContainerItemProxy */;
+               };
+               155C626521C2B6FD008DCB1A /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = 7271EA1B1D76600B0055B1AA /* sctest-Embedded */;
+                       targetProxy = 155C626421C2B6FD008DCB1A /* PBXContainerItemProxy */;
+               };
                155F49A91C8650E900E47D08 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = 155F49861C864F1400E47D08 /* QoSMarking */;
                155F49A91C8650E900E47D08 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = 155F49861C864F1400E47D08 /* QoSMarking */;
@@ -6691,11 +7189,6 @@
                        target = 157433F00D4A8137002ACA73 /* scutil-Embedded */;
                        targetProxy = 1574341E0D4A815E002ACA73 /* PBXContainerItemProxy */;
                };
                        target = 157433F00D4A8137002ACA73 /* scutil-Embedded */;
                        targetProxy = 1574341E0D4A815E002ACA73 /* PBXContainerItemProxy */;
                };
-               157434210D4A8166002ACA73 /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       target = 157433DD0D4A8122002ACA73 /* scselect-Embedded */;
-                       targetProxy = 157434200D4A8166002ACA73 /* PBXContainerItemProxy */;
-               };
                157A85480D56CA0B00B6F1A0 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = 157A84F40D56C7E800B6F1A0 /* IPMonitor-Embedded */;
                157A85480D56CA0B00B6F1A0 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = 157A84F40D56C7E800B6F1A0 /* IPMonitor-Embedded */;
@@ -6921,6 +7414,46 @@
                        target = 15FD13BF0D59485000F9409C /* All-EmbeddedSimulator */;
                        targetProxy = 15E8310C167F9B1200FD51EC /* PBXContainerItemProxy */;
                };
                        target = 15FD13BF0D59485000F9409C /* All-EmbeddedSimulator */;
                        targetProxy = 15E8310C167F9B1200FD51EC /* PBXContainerItemProxy */;
                };
+               15EF89A221894601003B2C5C /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = 1572C4A60CFB55B400E2776E /* SystemConfiguration.framework-Embedded */;
+                       targetProxy = 15EF89A121894601003B2C5C /* PBXContainerItemProxy */;
+               };
+               15EF89A42189461B003B2C5C /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = 1572C4A60CFB55B400E2776E /* SystemConfiguration.framework-Embedded */;
+                       targetProxy = 15EF89A32189461B003B2C5C /* PBXContainerItemProxy */;
+               };
+               15EF89BE2189467B003B2C5C /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = 15A5A1E40D5B94190087BDA0 /* SystemConfiguration.framework-EmbeddedSimulator */;
+                       targetProxy = 15EF89BD2189467B003B2C5C /* PBXContainerItemProxy */;
+               };
+               15EF89C021894688003B2C5C /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = 15A5A1E40D5B94190087BDA0 /* SystemConfiguration.framework-EmbeddedSimulator */;
+                       targetProxy = 15EF89BF21894688003B2C5C /* PBXContainerItemProxy */;
+               };
+               15EF89C221894837003B2C5C /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = 15E91DB221893E83001155DC /* SCTest-ObjC-Embedded */;
+                       targetProxy = 15EF89C121894837003B2C5C /* PBXContainerItemProxy */;
+               };
+               15EF89C421894837003B2C5C /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = 15E91DCC21893EE1001155DC /* SCTest-Swift-Embedded */;
+                       targetProxy = 15EF89C321894837003B2C5C /* PBXContainerItemProxy */;
+               };
+               15EF89C62189484C003B2C5C /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = 15EF89A521894636003B2C5C /* SCTest-ObjC-EmbeddedSimulator */;
+                       targetProxy = 15EF89C52189484C003B2C5C /* PBXContainerItemProxy */;
+               };
+               15EF89C82189484C003B2C5C /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = 15EF89B221894665003B2C5C /* SCTest-Swift-EmbeddedSimulator */;
+                       targetProxy = 15EF89C72189484C003B2C5C /* PBXContainerItemProxy */;
+               };
                723050321AE6F292004AC149 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = 15DAD63F07591A1A0084A6ED /* SystemConfiguration.framework */;
                723050321AE6F292004AC149 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = 15DAD63F07591A1A0084A6ED /* SystemConfiguration.framework */;
@@ -6931,11 +7464,6 @@
                        target = 15DAD63F07591A1A0084A6ED /* SystemConfiguration.framework */;
                        targetProxy = 723050331AE6F29D004AC149 /* PBXContainerItemProxy */;
                };
                        target = 15DAD63F07591A1A0084A6ED /* SystemConfiguration.framework */;
                        targetProxy = 723050331AE6F29D004AC149 /* PBXContainerItemProxy */;
                };
-               7271EA341D7660980055B1AA /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       target = 7271EA1B1D76600B0055B1AA /* sctest-Embedded */;
-                       targetProxy = 7271EA331D7660980055B1AA /* PBXContainerItemProxy */;
-               };
                72C12CB11D6EA2CA000EE61C /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = 72573D251D667372004975AD /* sctest */;
                72C12CB11D6EA2CA000EE61C /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = 72573D251D667372004975AD /* sctest */;
@@ -6962,7 +7490,7 @@
                1577253606EFBF3100D7B52B /* NetworkInterface.strings */ = {
                        isa = PBXVariantGroup;
                        children = (
                1577253606EFBF3100D7B52B /* NetworkInterface.strings */ = {
                        isa = PBXVariantGroup;
                        children = (
-                               1577252F06EFB96700D7B52B /* English */,
+                               15436255218AA27400283462 /* en */,
                        );
                        name = NetworkInterface.strings;
                        sourceTree = "<group>";
                        );
                        name = NetworkInterface.strings;
                        sourceTree = "<group>";
@@ -6970,7 +7498,7 @@
                15A6F7C20A4B266D00B907EA /* Localizable.strings */ = {
                        isa = PBXVariantGroup;
                        children = (
                15A6F7C20A4B266D00B907EA /* Localizable.strings */ = {
                        isa = PBXVariantGroup;
                        children = (
-                               15A6F7C30A4B266D00B907EA /* English */,
+                               15436253218AA26100283462 /* en */,
                        );
                        name = Localizable.strings;
                        sourceTree = "<group>";
                        );
                        name = Localizable.strings;
                        sourceTree = "<group>";
@@ -6978,7 +7506,7 @@
                15FEE8180CD03CBB001312F9 /* Localizable.strings */ = {
                        isa = PBXVariantGroup;
                        children = (
                15FEE8180CD03CBB001312F9 /* Localizable.strings */ = {
                        isa = PBXVariantGroup;
                        children = (
-                               15FEE8160CD03CA3001312F9 /* English */,
+                               15436251218AA22800283462 /* en */,
                        );
                        name = Localizable.strings;
                        sourceTree = "<group>";
                        );
                        name = Localizable.strings;
                        sourceTree = "<group>";
@@ -7020,7 +7548,6 @@
                                STRIP_INSTALLED_PRODUCT_normal = YES;
                                STRIP_INSTALLED_PRODUCT_profile = NO;
                                STRIP_INSTALLED_PRODUCT_tsan = NO;
                                STRIP_INSTALLED_PRODUCT_normal = YES;
                                STRIP_INSTALLED_PRODUCT_profile = NO;
                                STRIP_INSTALLED_PRODUCT_tsan = NO;
-                               VERSION_INFO_PREFIX = liblog_;
                        };
                        name = Debug;
                };
                        };
                        name = Debug;
                };
@@ -7042,7 +7569,6 @@
                                STRIP_INSTALLED_PRODUCT_normal = YES;
                                STRIP_INSTALLED_PRODUCT_profile = NO;
                                STRIP_INSTALLED_PRODUCT_tsan = NO;
                                STRIP_INSTALLED_PRODUCT_normal = YES;
                                STRIP_INSTALLED_PRODUCT_profile = NO;
                                STRIP_INSTALLED_PRODUCT_tsan = NO;
-                               VERSION_INFO_PREFIX = liblog_;
                        };
                        name = Release;
                };
                        };
                        name = Release;
                };
@@ -7124,6 +7650,52 @@
                        };
                        name = Release;
                };
                        };
                        name = Release;
                };
+               15401C1E21991506006326B7 /* Debug */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               PRODUCT_NAME = configd_extras;
+                       };
+                       name = Debug;
+               };
+               15401C1F21991506006326B7 /* Release */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               PRODUCT_NAME = configd_extras;
+                       };
+                       name = Release;
+               };
+               15401C24219915BC006326B7 /* Debug */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               PRODUCT_NAME = "configd_extras (Embedded)";
+                               SUPPORTED_PLATFORMS = "iphoneos watchos tvos bridgeos";
+                       };
+                       name = Debug;
+               };
+               15401C25219915BC006326B7 /* Release */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               PRODUCT_NAME = "configd_extras (Embedded)";
+                               SUPPORTED_PLATFORMS = "iphoneos watchos tvos bridgeos";
+                       };
+                       name = Release;
+               };
+               15401C29219915C6006326B7 /* Debug */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               PRODUCT_NAME = "configd_extras (EmbeddedSimulator)";
+                               SUPPORTED_PLATFORMS = "iphonesimulator tvossimulator watchsimulator bridgesimulator";
+                       };
+                       name = Debug;
+               };
+               15401C2A219915C6006326B7 /* Release */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               PRODUCT_NAME = "configd_extras (EmbeddedSimulator)";
+                               SUPPORTED_PLATFORMS = "iphonesimulator tvossimulator watchsimulator bridgesimulator";
+                       };
+                       name = Release;
+               };
                155F498B1C864F1400E47D08 /* Debug */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
                155F498B1C864F1400E47D08 /* Debug */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
@@ -7232,7 +7804,7 @@
                15631D241ECF98FB0088EEDD /* Debug */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
                15631D241ECF98FB0088EEDD /* Debug */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
-                               PRODUCT_NAME = "$(TARGET_NAME)";
+                               PRODUCT_NAME = "configd_executables (EmbeddedSimulator)";
                                SUPPORTED_PLATFORMS = "iphonesimulator tvossimulator watchsimulator bridgesimulator";
                        };
                        name = Debug;
                                SUPPORTED_PLATFORMS = "iphonesimulator tvossimulator watchsimulator bridgesimulator";
                        };
                        name = Debug;
@@ -7240,7 +7812,7 @@
                15631D251ECF98FB0088EEDD /* Release */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
                15631D251ECF98FB0088EEDD /* Release */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
-                               PRODUCT_NAME = "$(TARGET_NAME)";
+                               PRODUCT_NAME = "configd_executables (EmbeddedSimulator)";
                                SUPPORTED_PLATFORMS = "iphonesimulator tvossimulator watchsimulator bridgesimulator";
                        };
                        name = Release;
                                SUPPORTED_PLATFORMS = "iphonesimulator tvossimulator watchsimulator bridgesimulator";
                        };
                        name = Release;
@@ -7383,13 +7955,14 @@
                                        "$(SYMROOT)",
                                        "$(SDKROOT)/usr/local/lib",
                                );
                                        "$(SYMROOT)",
                                        "$(SDKROOT)/usr/local/lib",
                                );
-                               MODULEMAP_FILE = SystemConfiguration.fproj/Modules/sc_modules.modulemap;
+                               MODULEMAP_FILE = SystemConfiguration.fproj/Modules/SystemConfiguration.modulemap;
+                               MODULEMAP_PRIVATE_FILE = SystemConfiguration.fproj/Modules/SystemConfiguration.private.modulemap;
                                OTHER_CFLAGS = (
                                        "$(inherited)",
                                        "-DSC_LOG_OR_PRINT",
                                );
                                OTHER_CFLAGS_debug = "-O0";
                                OTHER_CFLAGS = (
                                        "$(inherited)",
                                        "-DSC_LOG_OR_PRINT",
                                );
                                OTHER_CFLAGS_debug = "-O0";
-                               OTHER_TAPI_FLAGS = "$(inherited) -DEXCLUDE_VPN_TUNNEL_PLUGIN_FUNCTIONS -I$(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/System.framework/PrivateHeaders --extra-private-header=$(PROJECT_DIR)/SystemConfiguration.fproj/SystemConfigurationInternal.h --extra-private-header=$(PROJECT_DIR)/SystemConfiguration.fproj/SCDynamicStoreInternal.h";
+                               OTHER_TAPI_FLAGS = "$(inherited) -DEXCLUDE_VPN_TUNNEL_PLUGIN_FUNCTIONS -I$(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/System.framework/PrivateHeaders --extra-private-header=$(PROJECT_DIR)/SystemConfiguration.fproj/SystemConfigurationInternal.h --extra-private-header=$(PROJECT_DIR)/SystemConfiguration.fproj/SCDynamicStoreInternal.h --verify-api-skip-external-headers";
                                PRODUCT_BUNDLE_IDENTIFIER = com.apple.SystemConfiguration;
                                PRODUCT_NAME = SystemConfiguration;
                                WRAPPER_EXTENSION = framework;
                                PRODUCT_BUNDLE_IDENTIFIER = com.apple.SystemConfiguration;
                                PRODUCT_NAME = SystemConfiguration;
                                WRAPPER_EXTENSION = framework;
@@ -7416,13 +7989,14 @@
                                        "$(SYMROOT)",
                                        "$(SDKROOT)/usr/local/lib",
                                );
                                        "$(SYMROOT)",
                                        "$(SDKROOT)/usr/local/lib",
                                );
-                               MODULEMAP_FILE = SystemConfiguration.fproj/Modules/sc_modules.modulemap;
+                               MODULEMAP_FILE = SystemConfiguration.fproj/Modules/SystemConfiguration.modulemap;
+                               MODULEMAP_PRIVATE_FILE = SystemConfiguration.fproj/Modules/SystemConfiguration.private.modulemap;
                                OTHER_CFLAGS = (
                                        "$(inherited)",
                                        "-DSC_LOG_OR_PRINT",
                                );
                                OTHER_CFLAGS_debug = "-O0";
                                OTHER_CFLAGS = (
                                        "$(inherited)",
                                        "-DSC_LOG_OR_PRINT",
                                );
                                OTHER_CFLAGS_debug = "-O0";
-                               OTHER_TAPI_FLAGS = "$(inherited) -DEXCLUDE_VPN_TUNNEL_PLUGIN_FUNCTIONS -I$(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/System.framework/PrivateHeaders --extra-private-header=$(PROJECT_DIR)/SystemConfiguration.fproj/SystemConfigurationInternal.h --extra-private-header=$(PROJECT_DIR)/SystemConfiguration.fproj/SCDynamicStoreInternal.h";
+                               OTHER_TAPI_FLAGS = "$(inherited) -DEXCLUDE_VPN_TUNNEL_PLUGIN_FUNCTIONS -I$(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/System.framework/PrivateHeaders --extra-private-header=$(PROJECT_DIR)/SystemConfiguration.fproj/SystemConfigurationInternal.h --extra-private-header=$(PROJECT_DIR)/SystemConfiguration.fproj/SCDynamicStoreInternal.h --verify-api-skip-external-headers";
                                PRODUCT_BUNDLE_IDENTIFIER = com.apple.SystemConfiguration;
                                PRODUCT_NAME = SystemConfiguration;
                                SECTORDER_FLAGS = (
                                PRODUCT_BUNDLE_IDENTIFIER = com.apple.SystemConfiguration;
                                PRODUCT_NAME = SystemConfiguration;
                                SECTORDER_FLAGS = (
@@ -7481,7 +8055,7 @@
                                LIBRARY_STYLE = STATIC;
                                OTHER_CFLAGS = (
                                        "$(inherited)",
                                LIBRARY_STYLE = STATIC;
                                OTHER_CFLAGS = (
                                        "$(inherited)",
-                                       "-DSC_LOG_HANDLE=\"__log_IPMonitor()\"",
+                                       "-DSC_LOG_HANDLE=\"__log_IPMonitor\"",
                                );
                                PRODUCT_NAME = IPMonitor;
                                STRIP_INSTALLED_PRODUCT = NO;
                                );
                                PRODUCT_NAME = IPMonitor;
                                STRIP_INSTALLED_PRODUCT = NO;
@@ -7499,7 +8073,7 @@
                                LIBRARY_STYLE = STATIC;
                                OTHER_CFLAGS = (
                                        "$(inherited)",
                                LIBRARY_STYLE = STATIC;
                                OTHER_CFLAGS = (
                                        "$(inherited)",
-                                       "-DSC_LOG_HANDLE=\"__log_IPMonitor()\"",
+                                       "-DSC_LOG_HANDLE=\"__log_IPMonitor\"",
                                );
                                PRODUCT_NAME = IPMonitor;
                                STRIP_INSTALLED_PRODUCT = NO;
                                );
                                PRODUCT_NAME = IPMonitor;
                                STRIP_INSTALLED_PRODUCT = NO;
@@ -7534,7 +8108,7 @@
                                LIBRARY_STYLE = STATIC;
                                OTHER_CFLAGS = (
                                        "$(inherited)",
                                LIBRARY_STYLE = STATIC;
                                OTHER_CFLAGS = (
                                        "$(inherited)",
-                                       "-DSC_LOG_HANDLE=\"__log_InterfaceNamer()\"",
+                                       "-DSC_LOG_HANDLE=\"__log_InterfaceNamer\"",
                                );
                                PRODUCT_NAME = InterfaceNamer;
                                STRIP_INSTALLED_PRODUCT = NO;
                                );
                                PRODUCT_NAME = InterfaceNamer;
                                STRIP_INSTALLED_PRODUCT = NO;
@@ -7549,7 +8123,7 @@
                                LIBRARY_STYLE = STATIC;
                                OTHER_CFLAGS = (
                                        "$(inherited)",
                                LIBRARY_STYLE = STATIC;
                                OTHER_CFLAGS = (
                                        "$(inherited)",
-                                       "-DSC_LOG_HANDLE=\"__log_InterfaceNamer()\"",
+                                       "-DSC_LOG_HANDLE=\"__log_InterfaceNamer\"",
                                );
                                PRODUCT_NAME = InterfaceNamer;
                                STRIP_INSTALLED_PRODUCT = NO;
                                );
                                PRODUCT_NAME = InterfaceNamer;
                                STRIP_INSTALLED_PRODUCT = NO;
@@ -7606,7 +8180,7 @@
                                LIBRARY_STYLE = STATIC;
                                OTHER_CFLAGS = (
                                        "$(inherited)",
                                LIBRARY_STYLE = STATIC;
                                OTHER_CFLAGS = (
                                        "$(inherited)",
-                                       "-DSC_LOG_HANDLE=\"__log_KernelEventMonitor()\"",
+                                       "-DSC_LOG_HANDLE=\"__log_KernelEventMonitor\"",
                                );
                                PRODUCT_NAME = KernelEventMonitor;
                                STRIP_INSTALLED_PRODUCT = NO;
                                );
                                PRODUCT_NAME = KernelEventMonitor;
                                STRIP_INSTALLED_PRODUCT = NO;
@@ -7623,7 +8197,7 @@
                                LIBRARY_STYLE = STATIC;
                                OTHER_CFLAGS = (
                                        "$(inherited)",
                                LIBRARY_STYLE = STATIC;
                                OTHER_CFLAGS = (
                                        "$(inherited)",
-                                       "-DSC_LOG_HANDLE=\"__log_KernelEventMonitor()\"",
+                                       "-DSC_LOG_HANDLE=\"__log_KernelEventMonitor\"",
                                );
                                PRODUCT_NAME = KernelEventMonitor;
                                STRIP_INSTALLED_PRODUCT = NO;
                                );
                                PRODUCT_NAME = KernelEventMonitor;
                                STRIP_INSTALLED_PRODUCT = NO;
@@ -7804,6 +8378,7 @@
                156EB62B0905594A00EEF749 /* Debug */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
                156EB62B0905594A00EEF749 /* Debug */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
+                               CODE_SIGN_ENTITLEMENTS = scutil.tproj/entitlements.plist;
                                FRAMEWORK_SEARCH_PATHS = "$(SYMROOT)";
                                GCC_DYNAMIC_NO_PIC = NO;
                                INSTALL_PATH = /usr/sbin;
                                FRAMEWORK_SEARCH_PATHS = "$(SYMROOT)";
                                GCC_DYNAMIC_NO_PIC = NO;
                                INSTALL_PATH = /usr/sbin;
@@ -7815,6 +8390,7 @@
                156EB62C0905594A00EEF749 /* Release */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
                156EB62C0905594A00EEF749 /* Release */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
+                               CODE_SIGN_ENTITLEMENTS = scutil.tproj/entitlements.plist;
                                FRAMEWORK_SEARCH_PATHS = "$(SYMROOT)";
                                GCC_DYNAMIC_NO_PIC = NO;
                                INSTALL_PATH = /usr/sbin;
                                FRAMEWORK_SEARCH_PATHS = "$(SYMROOT)";
                                GCC_DYNAMIC_NO_PIC = NO;
                                INSTALL_PATH = /usr/sbin;
@@ -7854,28 +8430,37 @@
                156EB63F0905594A00EEF749 /* Debug */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
                156EB63F0905594A00EEF749 /* Debug */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
+                               ALWAYS_SEARCH_USER_PATHS = NO;
                                APPLY_RULES_IN_COPY_FILES = YES;
                                BUILD_VARIANTS = (
                                        normal,
                                        "${EXTRA_BUILD_VARIANT}",
                                );
                                CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
                                APPLY_RULES_IN_COPY_FILES = YES;
                                BUILD_VARIANTS = (
                                        normal,
                                        "${EXTRA_BUILD_VARIANT}",
                                );
                                CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
+                               CLANG_ANALYZER_SECURITY_FLOATLOOPCOUNTER = YES;
+                               CLANG_ANALYZER_SECURITY_INSECUREAPI_STRCPY = YES;
                                CLANG_ENABLE_OBJC_WEAK = YES;
                                CLANG_ENABLE_OBJC_WEAK = YES;
+                               CLANG_MODULE_CACHE_PATH = "$(CONFIGURATION_TEMP_DIR)/ModuleCache";
+                               CLANG_STATIC_ANALYZER_MODE = deep;
                                CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
                                CLANG_WARN_BOOL_CONVERSION = YES;
                                CLANG_WARN_COMMA = YES;
                                CLANG_WARN_CONSTANT_CONVERSION = YES;
                                CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
                                CLANG_WARN_BOOL_CONVERSION = YES;
                                CLANG_WARN_COMMA = YES;
                                CLANG_WARN_CONSTANT_CONVERSION = YES;
+                               CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
                                CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
                                CLANG_WARN_EMPTY_BODY = YES;
                                CLANG_WARN_ENUM_CONVERSION = YES;
                                CLANG_WARN_INFINITE_RECURSION = YES;
                                CLANG_WARN_INT_CONVERSION = YES;
                                CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
                                CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
                                CLANG_WARN_EMPTY_BODY = YES;
                                CLANG_WARN_ENUM_CONVERSION = YES;
                                CLANG_WARN_INFINITE_RECURSION = YES;
                                CLANG_WARN_INT_CONVERSION = YES;
                                CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+                               CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
                                CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
                                CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
                                CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
                                CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+                               CLANG_WARN_STRICT_PROTOTYPES = YES;
                                CLANG_WARN_SUSPICIOUS_MOVE = YES;
                                CLANG_WARN_UNREACHABLE_CODE = YES;
                                CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
                                CLANG_WARN_SUSPICIOUS_MOVE = YES;
                                CLANG_WARN_UNREACHABLE_CODE = YES;
                                CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+                               CODE_SIGN_IDENTITY = "-";
                                COMBINE_HIDPI_IMAGES = YES;
                                COPY_PHASE_STRIP = NO;
                                CURRENT_PROJECT_VERSION = "$(RC_ProjectSourceVersion)";
                                COMBINE_HIDPI_IMAGES = YES;
                                COPY_PHASE_STRIP = NO;
                                CURRENT_PROJECT_VERSION = "$(RC_ProjectSourceVersion)";
@@ -7908,7 +8493,6 @@
                                        "$(inherited)",
                                        "-fconstant-cfstrings",
                                        "-fstack-protector-all",
                                        "$(inherited)",
                                        "-fconstant-cfstrings",
                                        "-fstack-protector-all",
-                                       "-DOS_ACTIVITY_OBJECT_API=1",
                                );
                                OTHER_CFLAGS_asan = "-fsanitize=address";
                                "OTHER_CFLAGS_asan[arch=i386]" = "";
                                );
                                OTHER_CFLAGS_asan = "-fsanitize=address";
                                "OTHER_CFLAGS_asan[arch=i386]" = "";
@@ -7923,8 +8507,10 @@
                                SDKROOT = macosx.internal;
                                SUPPORTED_PLATFORMS = macosx;
                                SUPPORTS_TEXT_BASED_API = YES;
                                SDKROOT = macosx.internal;
                                SUPPORTED_PLATFORMS = macosx;
                                SUPPORTS_TEXT_BASED_API = YES;
-                               TAPI_VERIFY_MODE = ErrorsAndWarnings;
+                               SWIFT_VERSION = 4.2;
+                               TAPI_VERIFY_MODE = Pedantic;
                                VERSIONING_SYSTEM = "apple-generic";
                                VERSIONING_SYSTEM = "apple-generic";
+                               VERSION_INFO_PREFIX = "__attribute__((visibility(\"hidden\")))";
                                WARNING_CFLAGS = (
                                        "-Wall",
                                        "-Wextra",
                                WARNING_CFLAGS = (
                                        "-Wall",
                                        "-Wextra",
@@ -7940,28 +8526,37 @@
                156EB6400905594A00EEF749 /* Release */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
                156EB6400905594A00EEF749 /* Release */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
+                               ALWAYS_SEARCH_USER_PATHS = NO;
                                APPLY_RULES_IN_COPY_FILES = YES;
                                BUILD_VARIANTS = (
                                        normal,
                                        "${EXTRA_BUILD_VARIANT}",
                                );
                                CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
                                APPLY_RULES_IN_COPY_FILES = YES;
                                BUILD_VARIANTS = (
                                        normal,
                                        "${EXTRA_BUILD_VARIANT}",
                                );
                                CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
+                               CLANG_ANALYZER_SECURITY_FLOATLOOPCOUNTER = YES;
+                               CLANG_ANALYZER_SECURITY_INSECUREAPI_STRCPY = YES;
                                CLANG_ENABLE_OBJC_WEAK = YES;
                                CLANG_ENABLE_OBJC_WEAK = YES;
+                               CLANG_MODULE_CACHE_PATH = "$(CONFIGURATION_TEMP_DIR)/ModuleCache";
+                               CLANG_STATIC_ANALYZER_MODE = deep;
                                CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
                                CLANG_WARN_BOOL_CONVERSION = YES;
                                CLANG_WARN_COMMA = YES;
                                CLANG_WARN_CONSTANT_CONVERSION = YES;
                                CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
                                CLANG_WARN_BOOL_CONVERSION = YES;
                                CLANG_WARN_COMMA = YES;
                                CLANG_WARN_CONSTANT_CONVERSION = YES;
+                               CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
                                CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
                                CLANG_WARN_EMPTY_BODY = YES;
                                CLANG_WARN_ENUM_CONVERSION = YES;
                                CLANG_WARN_INFINITE_RECURSION = YES;
                                CLANG_WARN_INT_CONVERSION = YES;
                                CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
                                CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
                                CLANG_WARN_EMPTY_BODY = YES;
                                CLANG_WARN_ENUM_CONVERSION = YES;
                                CLANG_WARN_INFINITE_RECURSION = YES;
                                CLANG_WARN_INT_CONVERSION = YES;
                                CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+                               CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
                                CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
                                CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
                                CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
                                CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+                               CLANG_WARN_STRICT_PROTOTYPES = YES;
                                CLANG_WARN_SUSPICIOUS_MOVE = YES;
                                CLANG_WARN_UNREACHABLE_CODE = YES;
                                CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
                                CLANG_WARN_SUSPICIOUS_MOVE = YES;
                                CLANG_WARN_UNREACHABLE_CODE = YES;
                                CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+                               CODE_SIGN_IDENTITY = "-";
                                COMBINE_HIDPI_IMAGES = YES;
                                CURRENT_PROJECT_VERSION = "$(RC_ProjectSourceVersion)";
                                DEAD_CODE_STRIPPING = YES;
                                COMBINE_HIDPI_IMAGES = YES;
                                CURRENT_PROJECT_VERSION = "$(RC_ProjectSourceVersion)";
                                DEAD_CODE_STRIPPING = YES;
@@ -7986,7 +8581,6 @@
                                        "$(inherited)",
                                        "-fconstant-cfstrings",
                                        "-fstack-protector-all",
                                        "$(inherited)",
                                        "-fconstant-cfstrings",
                                        "-fstack-protector-all",
-                                       "-DOS_ACTIVITY_OBJECT_API=1",
                                );
                                OTHER_CFLAGS_asan = "-fsanitize=address";
                                "OTHER_CFLAGS_asan[arch=i386]" = "";
                                );
                                OTHER_CFLAGS_asan = "-fsanitize=address";
                                "OTHER_CFLAGS_asan[arch=i386]" = "";
@@ -8001,8 +8595,10 @@
                                SUPPORTED_PLATFORMS = macosx;
                                SUPPORTS_TEXT_BASED_API = YES;
                                SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
                                SUPPORTED_PLATFORMS = macosx;
                                SUPPORTS_TEXT_BASED_API = YES;
                                SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
-                               TAPI_VERIFY_MODE = ErrorsAndWarnings;
+                               SWIFT_VERSION = 4.2;
+                               TAPI_VERIFY_MODE = Pedantic;
                                VERSIONING_SYSTEM = "apple-generic";
                                VERSIONING_SYSTEM = "apple-generic";
+                               VERSION_INFO_PREFIX = "__attribute__((visibility(\"hidden\")))";
                                WARNING_CFLAGS = (
                                        "-Wall",
                                        "-Wextra",
                                WARNING_CFLAGS = (
                                        "-Wall",
                                        "-Wextra",
@@ -8028,12 +8624,12 @@
                                "INSTALL_PATH[sdk=appletv*]" = "$(SYSTEM_LIBRARY_DIR)/Frameworks";
                                "INSTALL_PATH[sdk=iphone*]" = "$(SYSTEM_LIBRARY_DIR)/Frameworks";
                                "INSTALL_PATH[sdk=watch*]" = "$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks";
                                "INSTALL_PATH[sdk=appletv*]" = "$(SYSTEM_LIBRARY_DIR)/Frameworks";
                                "INSTALL_PATH[sdk=iphone*]" = "$(SYSTEM_LIBRARY_DIR)/Frameworks";
                                "INSTALL_PATH[sdk=watch*]" = "$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks";
-                               IS_ZIPPERED = YES;
                                LIBRARY_SEARCH_PATHS = (
                                        "$(SYMROOT)",
                                        "$(SDKROOT)/usr/local/lib",
                                );
                                LIBRARY_SEARCH_PATHS = (
                                        "$(SYMROOT)",
                                        "$(SDKROOT)/usr/local/lib",
                                );
-                               MODULEMAP_FILE = SystemConfiguration.fproj/Modules/sc_modules.modulemap;
+                               MODULEMAP_FILE = SystemConfiguration.fproj/Modules/SystemConfiguration.modulemap;
+                               MODULEMAP_PRIVATE_FILE = SystemConfiguration.fproj/Modules/SystemConfiguration.private.modulemap;
                                OTHER_CFLAGS = (
                                        "$(inherited)",
                                        "-DSC_LOG_OR_PRINT",
                                OTHER_CFLAGS = (
                                        "$(inherited)",
                                        "-DSC_LOG_OR_PRINT",
@@ -8064,12 +8660,12 @@
                                "INSTALL_PATH[sdk=appletv*]" = "$(SYSTEM_LIBRARY_DIR)/Frameworks";
                                "INSTALL_PATH[sdk=iphone*]" = "$(SYSTEM_LIBRARY_DIR)/Frameworks";
                                "INSTALL_PATH[sdk=watch*]" = "$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks";
                                "INSTALL_PATH[sdk=appletv*]" = "$(SYSTEM_LIBRARY_DIR)/Frameworks";
                                "INSTALL_PATH[sdk=iphone*]" = "$(SYSTEM_LIBRARY_DIR)/Frameworks";
                                "INSTALL_PATH[sdk=watch*]" = "$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks";
-                               IS_ZIPPERED = YES;
                                LIBRARY_SEARCH_PATHS = (
                                        "$(SYMROOT)",
                                        "$(SDKROOT)/usr/local/lib",
                                );
                                LIBRARY_SEARCH_PATHS = (
                                        "$(SYMROOT)",
                                        "$(SDKROOT)/usr/local/lib",
                                );
-                               MODULEMAP_FILE = SystemConfiguration.fproj/Modules/sc_modules.modulemap;
+                               MODULEMAP_FILE = SystemConfiguration.fproj/Modules/SystemConfiguration.modulemap;
+                               MODULEMAP_PRIVATE_FILE = SystemConfiguration.fproj/Modules/SystemConfiguration.private.modulemap;
                                OTHER_CFLAGS = (
                                        "$(inherited)",
                                        "-DSC_LOG_OR_PRINT",
                                OTHER_CFLAGS = (
                                        "$(inherited)",
                                        "-DSC_LOG_OR_PRINT",
@@ -8133,6 +8729,7 @@
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                BUILD_VARIANTS = normal;
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                BUILD_VARIANTS = normal;
+                               CODE_SIGN_ENTITLEMENTS = scutil.tproj/entitlements.plist;
                                FRAMEWORK_SEARCH_PATHS = (
                                        "$(SYMROOT)",
                                        "$(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks",
                                FRAMEWORK_SEARCH_PATHS = (
                                        "$(SYMROOT)",
                                        "$(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks",
@@ -8152,6 +8749,7 @@
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                BUILD_VARIANTS = normal;
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                BUILD_VARIANTS = normal;
+                               CODE_SIGN_ENTITLEMENTS = scutil.tproj/entitlements.plist;
                                FRAMEWORK_SEARCH_PATHS = (
                                        "$(SYMROOT)",
                                        "$(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks",
                                FRAMEWORK_SEARCH_PATHS = (
                                        "$(SYMROOT)",
                                        "$(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks",
@@ -8175,7 +8773,6 @@
                                GENERATE_PROFILING_CODE_profile = YES;
                                INSTALLHDRS_COPY_PHASE = YES;
                                INSTALL_PATH = /usr/lib/system;
                                GENERATE_PROFILING_CODE_profile = YES;
                                INSTALLHDRS_COPY_PHASE = YES;
                                INSTALL_PATH = /usr/lib/system;
-                               IS_ZIPPERED = YES;
                                LINK_WITH_STANDARD_LIBRARIES = NO;
                                OTHER_LDFLAGS = (
                                        "-Wl,-umbrella,System",
                                LINK_WITH_STANDARD_LIBRARIES = NO;
                                OTHER_LDFLAGS = (
                                        "-Wl,-umbrella,System",
@@ -8212,7 +8809,6 @@
                                GENERATE_PROFILING_CODE_profile = YES;
                                INSTALLHDRS_COPY_PHASE = YES;
                                INSTALL_PATH = /usr/lib/system;
                                GENERATE_PROFILING_CODE_profile = YES;
                                INSTALLHDRS_COPY_PHASE = YES;
                                INSTALL_PATH = /usr/lib/system;
-                               IS_ZIPPERED = YES;
                                LINK_WITH_STANDARD_LIBRARIES = NO;
                                OTHER_LDFLAGS = (
                                        "-Wl,-umbrella,System",
                                LINK_WITH_STANDARD_LIBRARIES = NO;
                                OTHER_LDFLAGS = (
                                        "-Wl,-umbrella,System",
@@ -8266,6 +8862,7 @@
                157434170D4A8137002ACA73 /* Debug */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
                157434170D4A8137002ACA73 /* Debug */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
+                               CODE_SIGN_ENTITLEMENTS = scutil.tproj/entitlements.plist;
                                FRAMEWORK_SEARCH_PATHS = (
                                        "$(SYMROOT)",
                                        "$(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks",
                                FRAMEWORK_SEARCH_PATHS = (
                                        "$(SYMROOT)",
                                        "$(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks",
@@ -8284,6 +8881,7 @@
                157434180D4A8137002ACA73 /* Release */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
                157434180D4A8137002ACA73 /* Release */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
+                               CODE_SIGN_ENTITLEMENTS = scutil.tproj/entitlements.plist;
                                FRAMEWORK_SEARCH_PATHS = (
                                        "$(SYMROOT)",
                                        "$(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks",
                                FRAMEWORK_SEARCH_PATHS = (
                                        "$(SYMROOT)",
                                        "$(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks",
@@ -8308,7 +8906,6 @@
                                INSTALL_PATH = /usr/lib/system;
                                INSTALL_PATH_asan = /usr/local/lib;
                                INSTALL_PATH_tsan = /usr/local/lib;
                                INSTALL_PATH = /usr/lib/system;
                                INSTALL_PATH_asan = /usr/local/lib;
                                INSTALL_PATH_tsan = /usr/local/lib;
-                               IS_ZIPPERED = YES;
                                LINK_WITH_STANDARD_LIBRARIES = NO;
                                OTHER_LDFLAGS = (
                                        "-Wl,-umbrella,System",
                                LINK_WITH_STANDARD_LIBRARIES = NO;
                                OTHER_LDFLAGS = (
                                        "-Wl,-umbrella,System",
@@ -8363,7 +8960,6 @@
                                INSTALL_PATH = /usr/lib/system;
                                INSTALL_PATH_asan = /usr/local/lib;
                                INSTALL_PATH_tsan = /usr/local/lib;
                                INSTALL_PATH = /usr/lib/system;
                                INSTALL_PATH_asan = /usr/local/lib;
                                INSTALL_PATH_tsan = /usr/local/lib;
-                               IS_ZIPPERED = YES;
                                LINK_WITH_STANDARD_LIBRARIES = NO;
                                OTHER_LDFLAGS = (
                                        "-Wl,-umbrella,System",
                                LINK_WITH_STANDARD_LIBRARIES = NO;
                                OTHER_LDFLAGS = (
                                        "-Wl,-umbrella,System",
@@ -8420,7 +9016,7 @@
                                LIBRARY_STYLE = STATIC;
                                OTHER_CFLAGS = (
                                        "$(inherited)",
                                LIBRARY_STYLE = STATIC;
                                OTHER_CFLAGS = (
                                        "$(inherited)",
-                                       "-DSC_LOG_HANDLE=\"__log_IPMonitor()\"",
+                                       "-DSC_LOG_HANDLE=\"__log_IPMonitor\"",
                                );
                                PRODUCT_NAME = IPMonitor;
                                SDKROOT = iphoneos.internal;
                                );
                                PRODUCT_NAME = IPMonitor;
                                SDKROOT = iphoneos.internal;
@@ -8440,7 +9036,7 @@
                                LIBRARY_STYLE = STATIC;
                                OTHER_CFLAGS = (
                                        "$(inherited)",
                                LIBRARY_STYLE = STATIC;
                                OTHER_CFLAGS = (
                                        "$(inherited)",
-                                       "-DSC_LOG_HANDLE=\"__log_IPMonitor()\"",
+                                       "-DSC_LOG_HANDLE=\"__log_IPMonitor\"",
                                );
                                PRODUCT_NAME = IPMonitor;
                                SDKROOT = iphoneos.internal;
                                );
                                PRODUCT_NAME = IPMonitor;
                                SDKROOT = iphoneos.internal;
@@ -8457,7 +9053,7 @@
                                LIBRARY_STYLE = STATIC;
                                OTHER_CFLAGS = (
                                        "$(inherited)",
                                LIBRARY_STYLE = STATIC;
                                OTHER_CFLAGS = (
                                        "$(inherited)",
-                                       "-DSC_LOG_HANDLE=\"__log_IPMonitor()\"",
+                                       "-DSC_LOG_HANDLE=\"__log_InterfaceNamer\"",
                                );
                                PRODUCT_NAME = InterfaceNamer;
                                SDKROOT = iphoneos.internal;
                                );
                                PRODUCT_NAME = InterfaceNamer;
                                SDKROOT = iphoneos.internal;
@@ -8474,7 +9070,7 @@
                                LIBRARY_STYLE = STATIC;
                                OTHER_CFLAGS = (
                                        "$(inherited)",
                                LIBRARY_STYLE = STATIC;
                                OTHER_CFLAGS = (
                                        "$(inherited)",
-                                       "-DSC_LOG_HANDLE=\"__log_IPMonitor()\"",
+                                       "-DSC_LOG_HANDLE=\"__log_InterfaceNamer\"",
                                );
                                PRODUCT_NAME = InterfaceNamer;
                                SDKROOT = iphoneos.internal;
                                );
                                PRODUCT_NAME = InterfaceNamer;
                                SDKROOT = iphoneos.internal;
@@ -8492,7 +9088,7 @@
                                LIBRARY_STYLE = STATIC;
                                OTHER_CFLAGS = (
                                        "$(inherited)",
                                LIBRARY_STYLE = STATIC;
                                OTHER_CFLAGS = (
                                        "$(inherited)",
-                                       "-DSC_LOG_HANDLE=\"__log_KernelEventMonitor()\"",
+                                       "-DSC_LOG_HANDLE=\"__log_KernelEventMonitor\"",
                                );
                                PRODUCT_NAME = KernelEventMonitor;
                                SDKROOT = iphoneos.internal;
                                );
                                PRODUCT_NAME = KernelEventMonitor;
                                SDKROOT = iphoneos.internal;
@@ -8510,7 +9106,7 @@
                                LIBRARY_STYLE = STATIC;
                                OTHER_CFLAGS = (
                                        "$(inherited)",
                                LIBRARY_STYLE = STATIC;
                                OTHER_CFLAGS = (
                                        "$(inherited)",
-                                       "-DSC_LOG_HANDLE=\"__log_KernelEventMonitor()\"",
+                                       "-DSC_LOG_HANDLE=\"__log_KernelEventMonitor\"",
                                );
                                PRODUCT_NAME = KernelEventMonitor;
                                SDKROOT = iphoneos.internal;
                                );
                                PRODUCT_NAME = KernelEventMonitor;
                                SDKROOT = iphoneos.internal;
@@ -8853,12 +9449,12 @@
                                "INSTALL_PATH[sdk=appletv*]" = "$(SYSTEM_LIBRARY_DIR)/Frameworks";
                                "INSTALL_PATH[sdk=iphone*]" = "$(SYSTEM_LIBRARY_DIR)/Frameworks";
                                "INSTALL_PATH[sdk=watch*]" = "$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks";
                                "INSTALL_PATH[sdk=appletv*]" = "$(SYSTEM_LIBRARY_DIR)/Frameworks";
                                "INSTALL_PATH[sdk=iphone*]" = "$(SYSTEM_LIBRARY_DIR)/Frameworks";
                                "INSTALL_PATH[sdk=watch*]" = "$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks";
-                               IS_ZIPPERED = YES;
                                LIBRARY_SEARCH_PATHS = (
                                        "$(SYMROOT)",
                                        "$(SDKROOT)/usr/local/lib",
                                );
                                LIBRARY_SEARCH_PATHS = (
                                        "$(SYMROOT)",
                                        "$(SDKROOT)/usr/local/lib",
                                );
-                               MODULEMAP_FILE = SystemConfiguration.fproj/Modules/sc_modules.modulemap;
+                               MODULEMAP_FILE = SystemConfiguration.fproj/Modules/SystemConfiguration.modulemap;
+                               MODULEMAP_PRIVATE_FILE = SystemConfiguration.fproj/Modules/SystemConfiguration.private.modulemap;
                                OTHER_CFLAGS = (
                                        "$(inherited)",
                                        "-idirafter",
                                OTHER_CFLAGS = (
                                        "$(inherited)",
                                        "-idirafter",
@@ -8892,12 +9488,12 @@
                                "INSTALL_PATH[sdk=appletv*]" = "$(SYSTEM_LIBRARY_DIR)/Frameworks";
                                "INSTALL_PATH[sdk=iphone*]" = "$(SYSTEM_LIBRARY_DIR)/Frameworks";
                                "INSTALL_PATH[sdk=watch*]" = "$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks";
                                "INSTALL_PATH[sdk=appletv*]" = "$(SYSTEM_LIBRARY_DIR)/Frameworks";
                                "INSTALL_PATH[sdk=iphone*]" = "$(SYSTEM_LIBRARY_DIR)/Frameworks";
                                "INSTALL_PATH[sdk=watch*]" = "$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks";
-                               IS_ZIPPERED = YES;
                                LIBRARY_SEARCH_PATHS = (
                                        "$(SYMROOT)",
                                        "$(SDKROOT)/usr/local/lib",
                                );
                                LIBRARY_SEARCH_PATHS = (
                                        "$(SYMROOT)",
                                        "$(SDKROOT)/usr/local/lib",
                                );
-                               MODULEMAP_FILE = SystemConfiguration.fproj/Modules/sc_modules.modulemap;
+                               MODULEMAP_FILE = SystemConfiguration.fproj/Modules/SystemConfiguration.modulemap;
+                               MODULEMAP_PRIVATE_FILE = SystemConfiguration.fproj/Modules/SystemConfiguration.private.modulemap;
                                OTHER_CFLAGS = (
                                        "$(inherited)",
                                        "-idirafter",
                                OTHER_CFLAGS = (
                                        "$(inherited)",
                                        "-idirafter",
@@ -8957,7 +9553,7 @@
                                LIBRARY_STYLE = STATIC;
                                OTHER_CFLAGS = (
                                        "$(inherited)",
                                LIBRARY_STYLE = STATIC;
                                OTHER_CFLAGS = (
                                        "$(inherited)",
-                                       "-DSC_LOG_HANDLE=\"__log_SimulatorSupport()\"",
+                                       "-DSC_LOG_HANDLE=\"__log_SimulatorSupport\"",
                                );
                                PRODUCT_NAME = SimulatorSupport_sim;
                                SDKROOT = iphoneos.internal;
                                );
                                PRODUCT_NAME = SimulatorSupport_sim;
                                SDKROOT = iphoneos.internal;
@@ -8976,7 +9572,7 @@
                                LIBRARY_STYLE = STATIC;
                                OTHER_CFLAGS = (
                                        "$(inherited)",
                                LIBRARY_STYLE = STATIC;
                                OTHER_CFLAGS = (
                                        "$(inherited)",
-                                       "-DSC_LOG_HANDLE=\"__log_SimulatorSupport()\"",
+                                       "-DSC_LOG_HANDLE=\"__log_SimulatorSupport\"",
                                );
                                PRODUCT_NAME = SimulatorSupport_sim;
                                SDKROOT = iphoneos.internal;
                                );
                                PRODUCT_NAME = SimulatorSupport_sim;
                                SDKROOT = iphoneos.internal;
@@ -9020,7 +9616,7 @@
                                LIBRARY_STYLE = STATIC;
                                OTHER_CFLAGS = (
                                        "$(inherited)",
                                LIBRARY_STYLE = STATIC;
                                OTHER_CFLAGS = (
                                        "$(inherited)",
-                                       "-DSC_LOG_HANDLE=\"__log_IPMonitor()\"",
+                                       "-DSC_LOG_HANDLE=\"__log_IPMonitor\"",
                                );
                                PRODUCT_BUNDLE_IDENTIFIER = com.apple.SystemConfiguration.IPMonitor;
                                PRODUCT_NAME = IPMonitor_sim;
                                );
                                PRODUCT_BUNDLE_IDENTIFIER = com.apple.SystemConfiguration.IPMonitor;
                                PRODUCT_NAME = IPMonitor_sim;
@@ -9041,7 +9637,7 @@
                                LIBRARY_STYLE = STATIC;
                                OTHER_CFLAGS = (
                                        "$(inherited)",
                                LIBRARY_STYLE = STATIC;
                                OTHER_CFLAGS = (
                                        "$(inherited)",
-                                       "-DSC_LOG_HANDLE=\"__log_IPMonitor()\"",
+                                       "-DSC_LOG_HANDLE=\"__log_IPMonitor\"",
                                );
                                PRODUCT_BUNDLE_IDENTIFIER = com.apple.SystemConfiguration.IPMonitor;
                                PRODUCT_NAME = IPMonitor_sim;
                                );
                                PRODUCT_BUNDLE_IDENTIFIER = com.apple.SystemConfiguration.IPMonitor;
                                PRODUCT_NAME = IPMonitor_sim;
@@ -9089,6 +9685,106 @@
                        };
                        name = Release;
                };
                        };
                        name = Release;
                };
+               15E91DBC21893E83001155DC /* Debug */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES;
+                               CLANG_ENABLE_MODULES = YES;
+                               CLANG_MODULES_DISABLE_PRIVATE_WARNING = YES;
+                               OTHER_CFLAGS = (
+                                       "$(inherited)",
+                                       "-Wnon-modular-include-in-module",
+                               );
+                               PRODUCT_NAME = "$(TARGET_NAME)";
+                               SDKROOT = iphoneos.internal;
+                               SUPPORTED_PLATFORMS = iphoneos;
+                       };
+                       name = Debug;
+               };
+               15E91DBD21893E83001155DC /* Release */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES;
+                               CLANG_ENABLE_MODULES = YES;
+                               CLANG_MODULES_DISABLE_PRIVATE_WARNING = YES;
+                               OTHER_CFLAGS = (
+                                       "$(inherited)",
+                                       "-Wnon-modular-include-in-module",
+                               );
+                               PRODUCT_NAME = "$(TARGET_NAME)";
+                               SDKROOT = iphoneos.internal;
+                               SUPPORTED_PLATFORMS = iphoneos;
+                       };
+                       name = Release;
+               };
+               15E91DD421893EE1001155DC /* Debug */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               PRODUCT_NAME = "$(TARGET_NAME)";
+                               SDKROOT = iphoneos.internal;
+                               SUPPORTED_PLATFORMS = iphoneos;
+                       };
+                       name = Debug;
+               };
+               15E91DD521893EE1001155DC /* Release */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               PRODUCT_NAME = "$(TARGET_NAME)";
+                               SDKROOT = iphoneos.internal;
+                               SUPPORTED_PLATFORMS = iphoneos;
+                       };
+                       name = Release;
+               };
+               15EF89AF21894636003B2C5C /* Debug */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES;
+                               CLANG_ENABLE_MODULES = YES;
+                               CLANG_MODULES_DISABLE_PRIVATE_WARNING = YES;
+                               OTHER_CFLAGS = (
+                                       "$(inherited)",
+                                       "-Wnon-modular-include-in-module",
+                               );
+                               PRODUCT_NAME = "$(TARGET_NAME)";
+                               SDKROOT = iphoneos.internal;
+                               SUPPORTED_PLATFORMS = iphonesimulator;
+                       };
+                       name = Debug;
+               };
+               15EF89B021894636003B2C5C /* Release */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES;
+                               CLANG_ENABLE_MODULES = YES;
+                               CLANG_MODULES_DISABLE_PRIVATE_WARNING = YES;
+                               OTHER_CFLAGS = (
+                                       "$(inherited)",
+                                       "-Wnon-modular-include-in-module",
+                               );
+                               PRODUCT_NAME = "$(TARGET_NAME)";
+                               SDKROOT = iphoneos.internal;
+                               SUPPORTED_PLATFORMS = iphonesimulator;
+                       };
+                       name = Release;
+               };
+               15EF89BA21894665003B2C5C /* Debug */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               PRODUCT_NAME = "$(TARGET_NAME)";
+                               SDKROOT = iphoneos.internal;
+                               SUPPORTED_PLATFORMS = iphonesimulator;
+                       };
+                       name = Debug;
+               };
+               15EF89BB21894665003B2C5C /* Release */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               PRODUCT_NAME = "$(TARGET_NAME)";
+                               SDKROOT = iphoneos.internal;
+                               SUPPORTED_PLATFORMS = iphonesimulator;
+                       };
+                       name = Release;
+               };
                15F742E21EC6370000DA2E7A /* Debug */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
                15F742E21EC6370000DA2E7A /* Debug */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
@@ -9098,7 +9794,6 @@
                                GENERATE_PROFILING_CODE_profile = YES;
                                INSTALLHDRS_COPY_PHASE = YES;
                                INSTALL_PATH = /usr/lib/log;
                                GENERATE_PROFILING_CODE_profile = YES;
                                INSTALLHDRS_COPY_PHASE = YES;
                                INSTALL_PATH = /usr/lib/log;
-                               IS_ZIPPERED = YES;
                                OTHER_CFLAGS_debug = "-O0";
                                OTHER_TAPI_FLAGS = "$(inherited) --extra-private-header=$(PROJECT_DIR)/logging/liblog_SystemConfiguration_internal.h";
                                PRODUCT_NAME = SystemConfiguration;
                                OTHER_CFLAGS_debug = "-O0";
                                OTHER_TAPI_FLAGS = "$(inherited) --extra-private-header=$(PROJECT_DIR)/logging/liblog_SystemConfiguration_internal.h";
                                PRODUCT_NAME = SystemConfiguration;
@@ -9109,7 +9804,6 @@
                                STRIP_INSTALLED_PRODUCT_profile = NO;
                                STRIP_INSTALLED_PRODUCT_tsan = NO;
                                SUPPORTED_PLATFORMS = "iphoneos tvos watchos bridgeos";
                                STRIP_INSTALLED_PRODUCT_profile = NO;
                                STRIP_INSTALLED_PRODUCT_tsan = NO;
                                SUPPORTED_PLATFORMS = "iphoneos tvos watchos bridgeos";
-                               VERSION_INFO_PREFIX = liblog_;
                        };
                        name = Debug;
                };
                        };
                        name = Debug;
                };
@@ -9122,7 +9816,6 @@
                                GENERATE_PROFILING_CODE_profile = YES;
                                INSTALLHDRS_COPY_PHASE = YES;
                                INSTALL_PATH = /usr/lib/log;
                                GENERATE_PROFILING_CODE_profile = YES;
                                INSTALLHDRS_COPY_PHASE = YES;
                                INSTALL_PATH = /usr/lib/log;
-                               IS_ZIPPERED = YES;
                                OTHER_CFLAGS_debug = "-O0";
                                OTHER_TAPI_FLAGS = "$(inherited) --extra-private-header=$(PROJECT_DIR)/logging/liblog_SystemConfiguration_internal.h";
                                PRODUCT_NAME = SystemConfiguration;
                                OTHER_CFLAGS_debug = "-O0";
                                OTHER_TAPI_FLAGS = "$(inherited) --extra-private-header=$(PROJECT_DIR)/logging/liblog_SystemConfiguration_internal.h";
                                PRODUCT_NAME = SystemConfiguration;
@@ -9133,7 +9826,6 @@
                                STRIP_INSTALLED_PRODUCT_profile = NO;
                                STRIP_INSTALLED_PRODUCT_tsan = NO;
                                SUPPORTED_PLATFORMS = "iphoneos tvos watchos bridgeos";
                                STRIP_INSTALLED_PRODUCT_profile = NO;
                                STRIP_INSTALLED_PRODUCT_tsan = NO;
                                SUPPORTED_PLATFORMS = "iphoneos tvos watchos bridgeos";
-                               VERSION_INFO_PREFIX = liblog_;
                        };
                        name = Release;
                };
                        };
                        name = Release;
                };
@@ -9146,7 +9838,6 @@
                                GENERATE_PROFILING_CODE_profile = YES;
                                INSTALLHDRS_COPY_PHASE = YES;
                                INSTALL_PATH = /usr/lib/log;
                                GENERATE_PROFILING_CODE_profile = YES;
                                INSTALLHDRS_COPY_PHASE = YES;
                                INSTALL_PATH = /usr/lib/log;
-                               IS_ZIPPERED = YES;
                                OTHER_CFLAGS_debug = "-O0";
                                OTHER_TAPI_FLAGS = "$(inherited) --extra-private-header=$(PROJECT_DIR)/logging/liblog_SystemConfiguration_internal.h";
                                PRODUCT_NAME = SystemConfiguration;
                                OTHER_CFLAGS_debug = "-O0";
                                OTHER_TAPI_FLAGS = "$(inherited) --extra-private-header=$(PROJECT_DIR)/logging/liblog_SystemConfiguration_internal.h";
                                PRODUCT_NAME = SystemConfiguration;
@@ -9157,7 +9848,6 @@
                                STRIP_INSTALLED_PRODUCT_profile = NO;
                                STRIP_INSTALLED_PRODUCT_tsan = NO;
                                SUPPORTED_PLATFORMS = "iphonesimulator tvossimulator watchsimulator bridgesimulator";
                                STRIP_INSTALLED_PRODUCT_profile = NO;
                                STRIP_INSTALLED_PRODUCT_tsan = NO;
                                SUPPORTED_PLATFORMS = "iphonesimulator tvossimulator watchsimulator bridgesimulator";
-                               VERSION_INFO_PREFIX = liblog_;
                        };
                        name = Debug;
                };
                        };
                        name = Debug;
                };
@@ -9170,7 +9860,6 @@
                                GENERATE_PROFILING_CODE_profile = YES;
                                INSTALLHDRS_COPY_PHASE = YES;
                                INSTALL_PATH = /usr/lib/log;
                                GENERATE_PROFILING_CODE_profile = YES;
                                INSTALLHDRS_COPY_PHASE = YES;
                                INSTALL_PATH = /usr/lib/log;
-                               IS_ZIPPERED = YES;
                                OTHER_CFLAGS_debug = "-O0";
                                OTHER_TAPI_FLAGS = "$(inherited) --extra-private-header=$(PROJECT_DIR)/logging/liblog_SystemConfiguration_internal.h";
                                PRODUCT_NAME = SystemConfiguration;
                                OTHER_CFLAGS_debug = "-O0";
                                OTHER_TAPI_FLAGS = "$(inherited) --extra-private-header=$(PROJECT_DIR)/logging/liblog_SystemConfiguration_internal.h";
                                PRODUCT_NAME = SystemConfiguration;
@@ -9181,7 +9870,6 @@
                                STRIP_INSTALLED_PRODUCT_profile = NO;
                                STRIP_INSTALLED_PRODUCT_tsan = NO;
                                SUPPORTED_PLATFORMS = "iphonesimulator tvossimulator watchsimulator bridgesimulator";
                                STRIP_INSTALLED_PRODUCT_profile = NO;
                                STRIP_INSTALLED_PRODUCT_tsan = NO;
                                SUPPORTED_PLATFORMS = "iphonesimulator tvossimulator watchsimulator bridgesimulator";
-                               VERSION_INFO_PREFIX = liblog_;
                        };
                        name = Release;
                };
                        };
                        name = Release;
                };
@@ -9204,14 +9892,12 @@
                72573D2B1D667372004975AD /* Debug */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
                72573D2B1D667372004975AD /* Debug */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
-                               CLANG_ENABLE_MODULES = NO;
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CODE_SIGN_ENTITLEMENTS = "sctest/sctest-entitlements.plist";
                                CODE_SIGN_IDENTITY = "-";
                                FRAMEWORK_SEARCH_PATHS = "$(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks";
                                HEADER_SEARCH_PATHS = "$(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/System.framework/PrivateHeaders";
                                INSTALL_PATH = /usr/local/bin;
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CODE_SIGN_ENTITLEMENTS = "sctest/sctest-entitlements.plist";
                                CODE_SIGN_IDENTITY = "-";
                                FRAMEWORK_SEARCH_PATHS = "$(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks";
                                HEADER_SEARCH_PATHS = "$(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/System.framework/PrivateHeaders";
                                INSTALL_PATH = /usr/local/bin;
-                               MTL_ENABLE_DEBUG_INFO = YES;
                                PLIST_FILE_OUTPUT_FORMAT = "same-as-input";
                                PRODUCT_NAME = "$(TARGET_NAME)";
                        };
                                PLIST_FILE_OUTPUT_FORMAT = "same-as-input";
                                PRODUCT_NAME = "$(TARGET_NAME)";
                        };
@@ -9220,14 +9906,12 @@
                72573D2C1D667372004975AD /* Release */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
                72573D2C1D667372004975AD /* Release */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
-                               CLANG_ENABLE_MODULES = NO;
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CODE_SIGN_ENTITLEMENTS = "sctest/sctest-entitlements.plist";
                                CODE_SIGN_IDENTITY = "-";
                                FRAMEWORK_SEARCH_PATHS = "$(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks";
                                HEADER_SEARCH_PATHS = "$(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/System.framework/PrivateHeaders";
                                INSTALL_PATH = /usr/local/bin;
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CODE_SIGN_ENTITLEMENTS = "sctest/sctest-entitlements.plist";
                                CODE_SIGN_IDENTITY = "-";
                                FRAMEWORK_SEARCH_PATHS = "$(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks";
                                HEADER_SEARCH_PATHS = "$(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/System.framework/PrivateHeaders";
                                INSTALL_PATH = /usr/local/bin;
-                               MTL_ENABLE_DEBUG_INFO = NO;
                                PLIST_FILE_OUTPUT_FORMAT = "same-as-input";
                                PRODUCT_NAME = "$(TARGET_NAME)";
                        };
                                PLIST_FILE_OUTPUT_FORMAT = "same-as-input";
                                PRODUCT_NAME = "$(TARGET_NAME)";
                        };
@@ -9236,14 +9920,12 @@
                7271EA301D76600B0055B1AA /* Debug */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
                7271EA301D76600B0055B1AA /* Debug */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
-                               CLANG_ENABLE_MODULES = NO;
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CODE_SIGN_ENTITLEMENTS = "sctest/sctest-entitlements.plist";
                                CODE_SIGN_IDENTITY = "-";
                                FRAMEWORK_SEARCH_PATHS = "$(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks";
                                HEADER_SEARCH_PATHS = "$(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/System.framework/PrivateHeaders";
                                INSTALL_PATH = /usr/local/bin;
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CODE_SIGN_ENTITLEMENTS = "sctest/sctest-entitlements.plist";
                                CODE_SIGN_IDENTITY = "-";
                                FRAMEWORK_SEARCH_PATHS = "$(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks";
                                HEADER_SEARCH_PATHS = "$(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/System.framework/PrivateHeaders";
                                INSTALL_PATH = /usr/local/bin;
-                               MTL_ENABLE_DEBUG_INFO = YES;
                                PLIST_FILE_OUTPUT_FORMAT = "same-as-input";
                                PRODUCT_NAME = sctest;
                                SDKROOT = iphoneos.internal;
                                PLIST_FILE_OUTPUT_FORMAT = "same-as-input";
                                PRODUCT_NAME = sctest;
                                SDKROOT = iphoneos.internal;
@@ -9254,14 +9936,12 @@
                7271EA311D76600B0055B1AA /* Release */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
                7271EA311D76600B0055B1AA /* Release */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
-                               CLANG_ENABLE_MODULES = NO;
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CODE_SIGN_ENTITLEMENTS = "sctest/sctest-entitlements.plist";
                                CODE_SIGN_IDENTITY = "-";
                                FRAMEWORK_SEARCH_PATHS = "$(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks";
                                HEADER_SEARCH_PATHS = "$(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/System.framework/PrivateHeaders";
                                INSTALL_PATH = /usr/local/bin;
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CODE_SIGN_ENTITLEMENTS = "sctest/sctest-entitlements.plist";
                                CODE_SIGN_IDENTITY = "-";
                                FRAMEWORK_SEARCH_PATHS = "$(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks";
                                HEADER_SEARCH_PATHS = "$(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/System.framework/PrivateHeaders";
                                INSTALL_PATH = /usr/local/bin;
-                               MTL_ENABLE_DEBUG_INFO = NO;
                                PLIST_FILE_OUTPUT_FORMAT = "same-as-input";
                                PRODUCT_NAME = sctest;
                                SDKROOT = iphoneos.internal;
                                PLIST_FILE_OUTPUT_FORMAT = "same-as-input";
                                PRODUCT_NAME = sctest;
                                SDKROOT = iphoneos.internal;
@@ -9272,148 +9952,48 @@
                72D3E6631AE6EA3A00DB4C69 /* Debug */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
                72D3E6631AE6EA3A00DB4C69 /* Debug */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
-                               ALWAYS_SEARCH_USER_PATHS = NO;
-                               CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
-                               CLANG_CXX_LIBRARY = "libc++";
-                               CLANG_ENABLE_MODULES = YES;
-                               CLANG_ENABLE_OBJC_ARC = YES;
-                               CLANG_WARN_BOOL_CONVERSION = YES;
-                               CLANG_WARN_CONSTANT_CONVERSION = YES;
-                               CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
-                               CLANG_WARN_EMPTY_BODY = YES;
-                               CLANG_WARN_ENUM_CONVERSION = YES;
-                               CLANG_WARN_INT_CONVERSION = YES;
-                               CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-                               CLANG_WARN_UNREACHABLE_CODE = YES;
-                               CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-                               DEBUG_INFORMATION_FORMAT = dwarf;
-                               ENABLE_STRICT_OBJC_MSGSEND = YES;
-                               GCC_C_LANGUAGE_STANDARD = gnu99;
-                               GCC_DYNAMIC_NO_PIC = NO;
-                               GCC_NO_COMMON_BLOCKS = YES;
-                               GCC_SYMBOLS_PRIVATE_EXTERN = NO;
-                               GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-                               GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-                               GCC_WARN_UNDECLARED_SELECTOR = YES;
-                               GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-                               GCC_WARN_UNUSED_FUNCTION = YES;
-                               GCC_WARN_UNUSED_VARIABLE = YES;
-                               MTL_ENABLE_DEBUG_INFO = YES;
-                               ONLY_ACTIVE_ARCH = YES;
                                PRODUCT_NAME = "$(TARGET_NAME)";
                                PRODUCT_NAME = "$(TARGET_NAME)";
-                               SDKROOT = macosx;
-                               SWIFT_OPTIMIZATION_LEVEL = "-Onone";
                        };
                        name = Debug;
                };
                72D3E6641AE6EA3A00DB4C69 /* Release */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
                        };
                        name = Debug;
                };
                72D3E6641AE6EA3A00DB4C69 /* Release */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
-                               ALWAYS_SEARCH_USER_PATHS = NO;
-                               CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
-                               CLANG_CXX_LIBRARY = "libc++";
-                               CLANG_ENABLE_MODULES = YES;
-                               CLANG_ENABLE_OBJC_ARC = YES;
-                               CLANG_WARN_BOOL_CONVERSION = YES;
-                               CLANG_WARN_CONSTANT_CONVERSION = YES;
-                               CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
-                               CLANG_WARN_EMPTY_BODY = YES;
-                               CLANG_WARN_ENUM_CONVERSION = YES;
-                               CLANG_WARN_INT_CONVERSION = YES;
-                               CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-                               CLANG_WARN_UNREACHABLE_CODE = YES;
-                               CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-                               COPY_PHASE_STRIP = NO;
-                               ENABLE_NS_ASSERTIONS = NO;
-                               ENABLE_STRICT_OBJC_MSGSEND = YES;
-                               GCC_C_LANGUAGE_STANDARD = gnu99;
-                               GCC_NO_COMMON_BLOCKS = YES;
-                               GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-                               GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-                               GCC_WARN_UNDECLARED_SELECTOR = YES;
-                               GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-                               GCC_WARN_UNUSED_FUNCTION = YES;
-                               GCC_WARN_UNUSED_VARIABLE = YES;
-                               MTL_ENABLE_DEBUG_INFO = NO;
                                PRODUCT_NAME = "$(TARGET_NAME)";
                                PRODUCT_NAME = "$(TARGET_NAME)";
-                               SDKROOT = macosx;
                        };
                        name = Release;
                };
                72D3E66E1AE6EAF600DB4C69 /* Debug */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
                        };
                        name = Release;
                };
                72D3E66E1AE6EAF600DB4C69 /* Debug */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
-                               ALWAYS_SEARCH_USER_PATHS = NO;
-                               CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
-                               CLANG_CXX_LIBRARY = "libc++";
+                               CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES;
                                CLANG_ENABLE_MODULES = YES;
                                CLANG_ENABLE_MODULES = YES;
-                               CLANG_ENABLE_OBJC_ARC = YES;
-                               CLANG_WARN_BOOL_CONVERSION = YES;
-                               CLANG_WARN_CONSTANT_CONVERSION = YES;
-                               CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
-                               CLANG_WARN_EMPTY_BODY = YES;
-                               CLANG_WARN_ENUM_CONVERSION = YES;
-                               CLANG_WARN_INT_CONVERSION = YES;
-                               CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-                               CLANG_WARN_UNREACHABLE_CODE = YES;
-                               CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-                               DEBUG_INFORMATION_FORMAT = dwarf;
-                               ENABLE_STRICT_OBJC_MSGSEND = YES;
-                               GCC_C_LANGUAGE_STANDARD = gnu99;
-                               GCC_DYNAMIC_NO_PIC = NO;
-                               GCC_NO_COMMON_BLOCKS = YES;
-                               GCC_SYMBOLS_PRIVATE_EXTERN = NO;
-                               GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-                               GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-                               GCC_WARN_UNDECLARED_SELECTOR = YES;
-                               GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-                               GCC_WARN_UNUSED_FUNCTION = YES;
-                               GCC_WARN_UNUSED_VARIABLE = YES;
-                               MTL_ENABLE_DEBUG_INFO = YES;
-                               ONLY_ACTIVE_ARCH = YES;
+                               CLANG_MODULES_DISABLE_PRIVATE_WARNING = YES;
+                               OTHER_CFLAGS = (
+                                       "$(inherited)",
+                                       "-Wnon-modular-include-in-module",
+                               );
                                PRODUCT_NAME = "$(TARGET_NAME)";
                                PRODUCT_NAME = "$(TARGET_NAME)";
-                               SDKROOT = macosx;
                        };
                        name = Debug;
                };
                72D3E66F1AE6EAF600DB4C69 /* Release */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
                        };
                        name = Debug;
                };
                72D3E66F1AE6EAF600DB4C69 /* Release */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
-                               ALWAYS_SEARCH_USER_PATHS = NO;
-                               CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
-                               CLANG_CXX_LIBRARY = "libc++";
+                               CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES;
                                CLANG_ENABLE_MODULES = YES;
                                CLANG_ENABLE_MODULES = YES;
-                               CLANG_ENABLE_OBJC_ARC = YES;
-                               CLANG_WARN_BOOL_CONVERSION = YES;
-                               CLANG_WARN_CONSTANT_CONVERSION = YES;
-                               CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
-                               CLANG_WARN_EMPTY_BODY = YES;
-                               CLANG_WARN_ENUM_CONVERSION = YES;
-                               CLANG_WARN_INT_CONVERSION = YES;
-                               CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-                               CLANG_WARN_UNREACHABLE_CODE = YES;
-                               CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-                               COPY_PHASE_STRIP = NO;
-                               ENABLE_NS_ASSERTIONS = NO;
-                               ENABLE_STRICT_OBJC_MSGSEND = YES;
-                               GCC_C_LANGUAGE_STANDARD = gnu99;
-                               GCC_NO_COMMON_BLOCKS = YES;
-                               GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-                               GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-                               GCC_WARN_UNDECLARED_SELECTOR = YES;
-                               GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-                               GCC_WARN_UNUSED_FUNCTION = YES;
-                               GCC_WARN_UNUSED_VARIABLE = YES;
-                               MTL_ENABLE_DEBUG_INFO = NO;
+                               CLANG_MODULES_DISABLE_PRIVATE_WARNING = YES;
+                               OTHER_CFLAGS = (
+                                       "$(inherited)",
+                                       "-Wnon-modular-include-in-module",
+                               );
                                PRODUCT_NAME = "$(TARGET_NAME)";
                                PRODUCT_NAME = "$(TARGET_NAME)";
-                               SDKROOT = macosx;
                        };
                        name = Release;
                };
                C4666C75206ED01800247AB6 /* Debug */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
                        };
                        name = Release;
                };
                C4666C75206ED01800247AB6 /* Debug */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
-                               ALWAYS_SEARCH_USER_PATHS = NO;
                                CLANG_ANALYZER_NONNULL = YES;
                                CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
                                CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
                                CLANG_ANALYZER_NONNULL = YES;
                                CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
                                CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
@@ -9427,35 +10007,29 @@
                                CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
                                CODE_SIGN_IDENTITY = "-";
                                CODE_SIGN_STYLE = Automatic;
                                CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
                                CODE_SIGN_IDENTITY = "-";
                                CODE_SIGN_STYLE = Automatic;
-                               DEBUG_INFORMATION_FORMAT = dwarf;
+                               DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+                               DWARF_DSYM_FILE_SHOULD_ACCOMPANY_PRODUCT = YES;
                                FRAMEWORK_SEARCH_PATHS = (
                                        "$(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks",
                                        "$(SDKROOT)$(APPLE_INTERNAL_LIBRARY_DIR)/Frameworks",
                                );
                                GCC_C_LANGUAGE_STANDARD = gnu11;
                                FRAMEWORK_SEARCH_PATHS = (
                                        "$(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks",
                                        "$(SDKROOT)$(APPLE_INTERNAL_LIBRARY_DIR)/Frameworks",
                                );
                                GCC_C_LANGUAGE_STANDARD = gnu11;
-                               GCC_DYNAMIC_NO_PIC = NO;
-                               GCC_PREPROCESSOR_DEFINITIONS = (
-                                       "DEBUG=1",
-                                       "$(inherited)",
-                               );
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
                                INFOPLIST_FILE = EventFactory/Info.plist;
                                INSTALL_PATH = "$(APPLE_INTERNAL_LIBRARY_DIR)/Frameworks/EventFactory.framework/PlugIns";
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
                                INFOPLIST_FILE = EventFactory/Info.plist;
                                INSTALL_PATH = "$(APPLE_INTERNAL_LIBRARY_DIR)/Frameworks/EventFactory.framework/PlugIns";
+                               LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../../../../";
                                MACOSX_DEPLOYMENT_TARGET = 10.14;
                                MACOSX_DEPLOYMENT_TARGET = 10.14;
-                               MTL_ENABLE_DEBUG_INFO = YES;
                                ONLY_ACTIVE_ARCH = YES;
                                PRODUCT_BUNDLE_IDENTIFIER = "com.apple.$(TARGET_NAME)";
                                PRODUCT_NAME = "$(TARGET_NAME)";
                                SDKROOT = macosx.internal;
                                ONLY_ACTIVE_ARCH = YES;
                                PRODUCT_BUNDLE_IDENTIFIER = "com.apple.$(TARGET_NAME)";
                                PRODUCT_NAME = "$(TARGET_NAME)";
                                SDKROOT = macosx.internal;
-                               SKIP_INSTALL = NO;
                        };
                        name = Debug;
                };
                C4666C76206ED01800247AB6 /* Release */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
                        };
                        name = Debug;
                };
                C4666C76206ED01800247AB6 /* Release */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
-                               ALWAYS_SEARCH_USER_PATHS = NO;
                                CLANG_ANALYZER_NONNULL = YES;
                                CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
                                CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
                                CLANG_ANALYZER_NONNULL = YES;
                                CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
                                CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
@@ -9470,6 +10044,7 @@
                                CODE_SIGN_IDENTITY = "-";
                                CODE_SIGN_STYLE = Automatic;
                                COPY_PHASE_STRIP = NO;
                                CODE_SIGN_IDENTITY = "-";
                                CODE_SIGN_STYLE = Automatic;
                                COPY_PHASE_STRIP = NO;
+                               DWARF_DSYM_FILE_SHOULD_ACCOMPANY_PRODUCT = "";
                                ENABLE_NS_ASSERTIONS = NO;
                                FRAMEWORK_SEARCH_PATHS = (
                                        "$(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks",
                                ENABLE_NS_ASSERTIONS = NO;
                                FRAMEWORK_SEARCH_PATHS = (
                                        "$(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks",
@@ -9480,12 +10055,11 @@
                                GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
                                INFOPLIST_FILE = EventFactory/Info.plist;
                                INSTALL_PATH = "$(APPLE_INTERNAL_LIBRARY_DIR)/Frameworks/EventFactory.framework/PlugIns";
                                GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
                                INFOPLIST_FILE = EventFactory/Info.plist;
                                INSTALL_PATH = "$(APPLE_INTERNAL_LIBRARY_DIR)/Frameworks/EventFactory.framework/PlugIns";
+                               LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../../../../";
                                MACOSX_DEPLOYMENT_TARGET = 10.14;
                                MACOSX_DEPLOYMENT_TARGET = 10.14;
-                               MTL_ENABLE_DEBUG_INFO = NO;
                                PRODUCT_BUNDLE_IDENTIFIER = "com.apple.$(TARGET_NAME)";
                                PRODUCT_NAME = "$(TARGET_NAME)";
                                SDKROOT = macosx.internal;
                                PRODUCT_BUNDLE_IDENTIFIER = "com.apple.$(TARGET_NAME)";
                                PRODUCT_NAME = "$(TARGET_NAME)";
                                SDKROOT = macosx.internal;
-                               SKIP_INSTALL = NO;
                        };
                        name = Release;
                };
                        };
                        name = Release;
                };
@@ -9537,6 +10111,33 @@
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Release;
                };
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Release;
                };
+               15401C1D21991506006326B7 /* Build configuration list for PBXAggregateTarget "configd_extras" */ = {
+                       isa = XCConfigurationList;
+                       buildConfigurations = (
+                               15401C1E21991506006326B7 /* Debug */,
+                               15401C1F21991506006326B7 /* Release */,
+                       );
+                       defaultConfigurationIsVisible = 0;
+                       defaultConfigurationName = Release;
+               };
+               15401C23219915BC006326B7 /* Build configuration list for PBXAggregateTarget "configd_extras-Embedded" */ = {
+                       isa = XCConfigurationList;
+                       buildConfigurations = (
+                               15401C24219915BC006326B7 /* Debug */,
+                               15401C25219915BC006326B7 /* Release */,
+                       );
+                       defaultConfigurationIsVisible = 0;
+                       defaultConfigurationName = Release;
+               };
+               15401C28219915C6006326B7 /* Build configuration list for PBXAggregateTarget "configd_extras-EmbeddedSimulator" */ = {
+                       isa = XCConfigurationList;
+                       buildConfigurations = (
+                               15401C29219915C6006326B7 /* Debug */,
+                               15401C2A219915C6006326B7 /* Release */,
+                       );
+                       defaultConfigurationIsVisible = 0;
+                       defaultConfigurationName = Release;
+               };
                155F498A1C864F1400E47D08 /* Build configuration list for PBXNativeTarget "QoSMarking" */ = {
                        isa = XCConfigurationList;
                        buildConfigurations = (
                155F498A1C864F1400E47D08 /* Build configuration list for PBXNativeTarget "QoSMarking" */ = {
                        isa = XCConfigurationList;
                        buildConfigurations = (
@@ -10050,6 +10651,42 @@
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Release;
                };
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Release;
                };
+               15E91DBB21893E83001155DC /* Build configuration list for PBXNativeTarget "SCTest-ObjC-Embedded" */ = {
+                       isa = XCConfigurationList;
+                       buildConfigurations = (
+                               15E91DBC21893E83001155DC /* Debug */,
+                               15E91DBD21893E83001155DC /* Release */,
+                       );
+                       defaultConfigurationIsVisible = 0;
+                       defaultConfigurationName = Release;
+               };
+               15E91DD321893EE1001155DC /* Build configuration list for PBXNativeTarget "SCTest-Swift-Embedded" */ = {
+                       isa = XCConfigurationList;
+                       buildConfigurations = (
+                               15E91DD421893EE1001155DC /* Debug */,
+                               15E91DD521893EE1001155DC /* Release */,
+                       );
+                       defaultConfigurationIsVisible = 0;
+                       defaultConfigurationName = Release;
+               };
+               15EF89AE21894636003B2C5C /* Build configuration list for PBXNativeTarget "SCTest-ObjC-EmbeddedSimulator" */ = {
+                       isa = XCConfigurationList;
+                       buildConfigurations = (
+                               15EF89AF21894636003B2C5C /* Debug */,
+                               15EF89B021894636003B2C5C /* Release */,
+                       );
+                       defaultConfigurationIsVisible = 0;
+                       defaultConfigurationName = Release;
+               };
+               15EF89B921894665003B2C5C /* Build configuration list for PBXNativeTarget "SCTest-Swift-EmbeddedSimulator" */ = {
+                       isa = XCConfigurationList;
+                       buildConfigurations = (
+                               15EF89BA21894665003B2C5C /* Debug */,
+                               15EF89BB21894665003B2C5C /* Release */,
+                       );
+                       defaultConfigurationIsVisible = 0;
+                       defaultConfigurationName = Release;
+               };
                15F742E11EC6370000DA2E7A /* Build configuration list for PBXNativeTarget "liblog_SystemConfiguration-Embedded" */ = {
                        isa = XCConfigurationList;
                        buildConfigurations = (
                15F742E11EC6370000DA2E7A /* Build configuration list for PBXNativeTarget "liblog_SystemConfiguration-Embedded" */ = {
                        isa = XCConfigurationList;
                        buildConfigurations = (
mirror of configd