Project: Remove OS name from appex file name

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>

diff --git a/WireGuard/WireGuard.xcodeproj/project.pbxproj b/WireGuard/WireGuard.xcodeproj/project.pbxproj
index 1d8001787e2dc505f8bc9e4402fcd792e414fc39..473ae0b2cc27f08a052c0bb43c67b642146da65b 100644 (file)
--- a/WireGuard/WireGuard.xcodeproj/project.pbxproj
+++ b/WireGuard/WireGuard.xcodeproj/project.pbxproj
@@ -38,7 +38,7 @@
                6F5A2B4621AFDED40081EDD8 /* FileManager+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6F5A2B4421AFDE020081EDD8 /* FileManager+Extension.swift */; };
                6F5A2B4821AFF49A0081EDD8 /* FileManager+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6F5A2B4421AFDE020081EDD8 /* FileManager+Extension.swift */; };
                6F5D0C1D218352EF000F85AD /* PacketTunnelProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6F5D0C1C218352EF000F85AD /* PacketTunnelProvider.swift */; };
-               6F5D0C22218352EF000F85AD /* WireGuardNetworkExtensioniOS.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = 6F5D0C1A218352EF000F85AD /* WireGuardNetworkExtensioniOS.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
+               6F5D0C22218352EF000F85AD /* WireGuardNetworkExtension.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = 6F5D0C1A218352EF000F85AD /* WireGuardNetworkExtension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
                6F613D9B21DE33B8004B217A /* KeyValueRow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6F613D9A21DE33B8004B217A /* KeyValueRow.swift */; };
                6F61F1E921B932F700483816 /* WireGuardAppError.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6F61F1E821B932F700483816 /* WireGuardAppError.swift */; };
                6F61F1EB21B937EF00483816 /* WireGuardResult.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6F61F1EA21B937EF00483816 /* WireGuardResult.swift */; };
@@ -67,7 +67,7 @@
                6FB1017921C57DE600766195 /* MockTunnels.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6FB1017821C57DE600766195 /* MockTunnels.swift */; };
                6FB1BD6021D2607A00A991BF /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6FB1BD5F21D2607A00A991BF /* AppDelegate.swift */; };
                6FB1BD6221D2607E00A991BF /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 6FB1BD6121D2607E00A991BF /* Assets.xcassets */; };
-               6FB1BD9921D4BFE700A991BF /* WireGuardNetworkExtensionmacOS.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = 6FB1BD9121D4BFE600A991BF /* WireGuardNetworkExtensionmacOS.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
+               6FB1BD9921D4BFE700A991BF /* WireGuardNetworkExtension.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = 6FB1BD9121D4BFE600A991BF /* WireGuardNetworkExtension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
                6FB1BDA121D4E00A00A991BF /* libwg-go.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6FB1BDA021D4E00A00A991BF /* libwg-go.a */; };
                6FB1BDA221D4F53300A991BF /* ringlogger.c in Sources */ = {isa = PBXBuildFile; fileRef = 6FF3526C21C23F960008484E /* ringlogger.c */; };
                6FB1BDA421D4F53300A991BF /* Logger.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6FF3526E21C23FA10008484E /* Logger.swift */; };
@@ -200,7 +200,7 @@
                        dstPath = "";
                        dstSubfolderSpec = 13;
                        files = (
-                               6F5D0C22218352EF000F85AD /* WireGuardNetworkExtensioniOS.appex in Embed App Extensions */,
+                               6F5D0C22218352EF000F85AD /* WireGuardNetworkExtension.appex in Embed App Extensions */,
                        );
                        name = "Embed App Extensions";
                        runOnlyForDeploymentPostprocessing = 0;
@@ -211,7 +211,7 @@
                        dstPath = "";
                        dstSubfolderSpec = 13;
                        files = (
-                               6FB1BD9921D4BFE700A991BF /* WireGuardNetworkExtensionmacOS.appex in Embed App Extensions */,
+                               6FB1BD9921D4BFE700A991BF /* WireGuardNetworkExtension.appex in Embed App Extensions */,
                        );
                        name = "Embed App Extensions";
                        runOnlyForDeploymentPostprocessing = 0;
@@ -244,7 +244,7 @@
                6F4DD16D21DBEA0700690EAE /* ManageTunnelsRootViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ManageTunnelsRootViewController.swift; sourceTree = "<group>"; };
                6F5A2B4421AFDE020081EDD8 /* FileManager+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "FileManager+Extension.swift"; sourceTree = "<group>"; };
                6F5D0C1421832391000F85AD /* DNSResolver.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DNSResolver.swift; sourceTree = "<group>"; };
-               6F5D0C1A218352EF000F85AD /* WireGuardNetworkExtensioniOS.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = WireGuardNetworkExtensioniOS.appex; sourceTree = BUILT_PRODUCTS_DIR; };
+               6F5D0C1A218352EF000F85AD /* WireGuardNetworkExtension.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = WireGuardNetworkExtension.appex; sourceTree = BUILT_PRODUCTS_DIR; };
                6F5D0C1C218352EF000F85AD /* PacketTunnelProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PacketTunnelProvider.swift; sourceTree = "<group>"; };
                6F5D0C1E218352EF000F85AD /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
                6F5D0C1F218352EF000F85AD /* WireGuardNetworkExtension_iOS.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = WireGuardNetworkExtension_iOS.entitlements; sourceTree = "<group>"; };
@@ -283,7 +283,7 @@
                6FB1BD6121D2607E00A991BF /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
                6FB1BD6621D2607E00A991BF /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
                6FB1BD6721D2607E00A991BF /* WireGuard.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = WireGuard.entitlements; sourceTree = "<group>"; };
-               6FB1BD9121D4BFE600A991BF /* WireGuardNetworkExtensionmacOS.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = WireGuardNetworkExtensionmacOS.appex; sourceTree = BUILT_PRODUCTS_DIR; };
+               6FB1BD9121D4BFE600A991BF /* WireGuardNetworkExtension.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = WireGuardNetworkExtension.appex; sourceTree = BUILT_PRODUCTS_DIR; };
                6FB1BD9621D4BFE700A991BF /* WireGuardNetworkExtension_macOS.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = WireGuardNetworkExtension_macOS.entitlements; sourceTree = "<group>"; };
                6FB1BDA021D4E00A00A991BF /* libwg-go.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libwg-go.a"; sourceTree = BUILT_PRODUCTS_DIR; };
                6FB1BDB621D4F8B800A991BF /* NetworkExtension.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = NetworkExtension.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.14.sdk/System/Library/Frameworks/NetworkExtension.framework; sourceTree = DEVELOPER_DIR; };
@@ -610,9 +610,9 @@
                        isa = PBXGroup;
                        children = (
                                6FF4AC14211EC46F002C96EB /* WireGuard.app */,
-                               6F5D0C1A218352EF000F85AD /* WireGuardNetworkExtensioniOS.appex */,
+                               6F5D0C1A218352EF000F85AD /* WireGuardNetworkExtension.appex */,
                                6FB1BD5D21D2607A00A991BF /* WireGuard.app */,
-                               6FB1BD9121D4BFE600A991BF /* WireGuardNetworkExtensionmacOS.appex */,
+                               6FB1BD9121D4BFE600A991BF /* WireGuardNetworkExtension.appex */,
                        );
                        name = Products;
                        sourceTree = "<group>";
@@ -696,7 +696,7 @@
                        );
                        name = WireGuardNetworkExtensioniOS;
                        productName = WireGuardNetworkExtension;
-                       productReference = 6F5D0C1A218352EF000F85AD /* WireGuardNetworkExtensioniOS.appex */;
+                       productReference = 6F5D0C1A218352EF000F85AD /* WireGuardNetworkExtension.appex */;
                        productType = "com.apple.product-type.app-extension";
                };
                6FB1BD5C21D2607A00A991BF /* WireGuardmacOS */ = {
@@ -737,8 +737,8 @@
                                6FB1BD9F21D4DF7A00A991BF /* PBXTargetDependency */,
                        );
                        name = WireGuardNetworkExtensionmacOS;
-                       productName = WireGuardNetworkExtensionmacOS;
-                       productReference = 6FB1BD9121D4BFE600A991BF /* WireGuardNetworkExtensionmacOS.appex */;
+                       productName = WireGuardNetworkExtension;
+                       productReference = 6FB1BD9121D4BFE600A991BF /* WireGuardNetworkExtension.appex */;
                        productType = "com.apple.product-type.app-extension";
                };
                6FF4AC13211EC46F002C96EB /* WireGuardiOS */ = {
@@ -1292,7 +1292,7 @@
                                        "@executable_path/../../Frameworks",
                                );
                                PRODUCT_BUNDLE_IDENTIFIER = "$(APP_ID_IOS).network-extension";
-                               PRODUCT_NAME = "$(TARGET_NAME)";
+                               PRODUCT_NAME = WireGuardNetworkExtension;
                                SKIP_INSTALL = YES;
                                SWIFT_OBJC_BRIDGING_HEADER = "WireGuardNetworkExtension/WireGuardNetworkExtension-Bridging-Header.h";
                                SWIFT_VERSION = 4.2;
@@ -1313,7 +1313,7 @@
                                        "@executable_path/../../Frameworks",
                                );
                                PRODUCT_BUNDLE_IDENTIFIER = "$(APP_ID_IOS).network-extension";
-                               PRODUCT_NAME = "$(TARGET_NAME)";
+                               PRODUCT_NAME = WireGuardNetworkExtension;
                                SKIP_INSTALL = YES;
                                SWIFT_OBJC_BRIDGING_HEADER = "WireGuardNetworkExtension/WireGuardNetworkExtension-Bridging-Header.h";
                                SWIFT_VERSION = 4.2;
@@ -1371,7 +1371,7 @@
                                );
                                MACOSX_DEPLOYMENT_TARGET = 10.14;
                                PRODUCT_BUNDLE_IDENTIFIER = "$(APP_ID_MACOS).network-extension";
-                               PRODUCT_NAME = "$(TARGET_NAME)";
+                               PRODUCT_NAME = WireGuardNetworkExtension;
                                SDKROOT = macosx;
                                SKIP_INSTALL = YES;
                                SWIFT_OBJC_BRIDGING_HEADER = "WireGuardNetworkExtension/WireGuardNetworkExtension-Bridging-Header.h";
@@ -1391,7 +1391,7 @@
                                );
                                MACOSX_DEPLOYMENT_TARGET = 10.14;
                                PRODUCT_BUNDLE_IDENTIFIER = "$(APP_ID_MACOS).network-extension";
-                               PRODUCT_NAME = "$(TARGET_NAME)";
+                               PRODUCT_NAME = WireGuardNetworkExtension;
                                SDKROOT = macosx;
                                SKIP_INSTALL = YES;
                                SWIFT_OBJC_BRIDGING_HEADER = "WireGuardNetworkExtension/WireGuardNetworkExtension-Bridging-Header.h";