From cf24eba8e0cc8900303e7a7a888fa963b8e7c568 Mon Sep 17 00:00:00 2001
From: alalamav <2132122+alalamav@users.noreply.github.com>
Date: Thu, 1 Jul 2021 16:48:04 -0400
Subject: [PATCH] macOS release updates (#1053)

---
 apple/xcode/osx/Outline.xcodeproj/project.pbxproj | 4 +++-
 apple/xcode/osx/Outline/Outline-Info.plist        | 2 +-
 apple/xcode/osx/Outline/VpnExtension-Info.plist   | 2 +-
 src/www/ui_components/app-root.js                 | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/apple/xcode/osx/Outline.xcodeproj/project.pbxproj b/apple/xcode/osx/Outline.xcodeproj/project.pbxproj
index a57be17fa1..6c3bc473fa 100644
--- a/apple/xcode/osx/Outline.xcodeproj/project.pbxproj
+++ b/apple/xcode/osx/Outline.xcodeproj/project.pbxproj
@@ -301,9 +301,9 @@
 			children = (
 				FCB2DED41F3E3CAD000C6A44 /* VpnExtension.entitlements */,
 				FC5FF9121F3E1D1B0032A745 /* Outline.entitlements */,
+				70BD682D18FFB02D00A1EFCF /* Supporting Files */,
 				707060AE18FFC05700755D46 /* MainViewController.xib */,
 				70BD683E18FFB02D00A1EFCF /* Images.xcassets */,
-				70BD682D18FFB02D00A1EFCF /* Supporting Files */,
 			);
 			path = Outline;
 			sourceTree = "<group>";
@@ -688,6 +688,7 @@
 				COPY_PHASE_STRIP = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
+				EXCLUDED_ARCHS = arm64; /* Remove once framework dependencies support Apple Silicon */
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
@@ -747,6 +748,7 @@
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				EXCLUDED_ARCHS = arm64; /* Remove once framework dependencies support Apple Silicon */
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
 				GCC_NO_COMMON_BLOCKS = YES;
diff --git a/apple/xcode/osx/Outline/Outline-Info.plist b/apple/xcode/osx/Outline/Outline-Info.plist
index df44b2eb35..4b733ed719 100644
--- a/apple/xcode/osx/Outline/Outline-Info.plist
+++ b/apple/xcode/osx/Outline/Outline-Info.plist
@@ -5,7 +5,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1.5.0</string>
 	<key>CFBundleVersion</key>
-	<string>25</string>
+	<string>26</string>
   <key>CFBundleDevelopmentRegion</key>
   <string>en</string>
   <key>CFBundleExecutable</key>
diff --git a/apple/xcode/osx/Outline/VpnExtension-Info.plist b/apple/xcode/osx/Outline/VpnExtension-Info.plist
index a661e3d726..827f9dac9b 100644
--- a/apple/xcode/osx/Outline/VpnExtension-Info.plist
+++ b/apple/xcode/osx/Outline/VpnExtension-Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1.5.0</string>
 	<key>CFBundleVersion</key>
-	<string>25</string>
+	<string>26</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>${MACOSX_DEPLOYMENT_TARGET}</string>
 	<key>NSExtension</key>
diff --git a/src/www/ui_components/app-root.js b/src/www/ui_components/app-root.js
index 35f2b05ef2..9a1faad373 100644
--- a/src/www/ui_components/app-root.js
+++ b/src/www/ui_components/app-root.js
@@ -694,7 +694,7 @@ export class AppRoot extends mixinBehaviors
   }
 
   _computeShouldShowQuitButton(platform) {
-    return platform === 'Mac OS X' || platform === 'Electron';
+    return platform === 'macOS' || platform === 'Electron';
   }
 
   _computeIsLastVisibleMenuItem(shouldShowQuitButton) {