From 157bfed965853d7e3776aefcc9f5a630a1dbef1f Mon Sep 17 00:00:00 2001
From: Magesh K <47920326+mahee96@users.noreply.github.com>
Date: Tue, 24 Dec 2024 18:00:17 +0530
Subject: [PATCH] [xcconfig]: move out PRODUCT_BUNDLE_IDENTIFIER[config=Debug]
 from build.xcconfig into CodeSigning template

---
 Build.xcconfig              | 7 ++-----
 CodeSigning.xcconfig.sample | 5 +++++
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Build.xcconfig b/Build.xcconfig
index 363a7fee..e8ccbedf 100644
--- a/Build.xcconfig
+++ b/Build.xcconfig
@@ -16,11 +16,8 @@ ORG_PREFIX = $(ORG_IDENTIFIER)
 PRODUCT_NAME = SideStore
 //PRODUCT_NAME[configuration=Debug] = Prov Debug
 
-PRODUCT_BUNDLE_IDENTIFIER   = $(ORG_PREFIX).SideStore
-// add team ID to bundle ID for debug builds since these will most likely be installed via Xcode
-// SideStore will expect the team ID to be at the end of the bundle ID, but this doesn't happen when we install via Xcode
-// we don't want to do this for release since those builds will most likely be installed via SideServer, which adds the team ID
-PRODUCT_BUNDLE_IDENTIFIER[config=Debug] = $(ORG_PREFIX).SideStore.$(DEVELOPMENT_TEAM)
+PRODUCT_BUNDLE_IDENTIFIER[config=Debug]   =  $(ORG_PREFIX).SideStore$(DEBUG_BUNDLE_ID_SUFFIX)
+PRODUCT_BUNDLE_IDENTIFIER[config=Release] =  $(ORG_PREFIX).SideStore
 
 EXTENSION_PREFIX            = $(PRODUCT_BUNDLE_IDENTIFIER)
 APP_GROUP_IDENTIFIER        = $(PRODUCT_BUNDLE_IDENTIFIER)
diff --git a/CodeSigning.xcconfig.sample b/CodeSigning.xcconfig.sample
index 3133e24a..688ccde8 100644
--- a/CodeSigning.xcconfig.sample
+++ b/CodeSigning.xcconfig.sample
@@ -10,6 +10,11 @@ DEVELOPMENT_TEAM = XYZ0123456
 //   - com.myuniquename.provenance.topshelf
 ORG_IDENTIFIER = com.myuniquename
 
+// add team ID to bundle ID for debug builds since these will most likely be installed via Xcode
+// SideStore will expect the team ID to be at the end of the bundle ID, but this doesn't happen when we install via Xcode
+// we don't want to do this for release since those builds will most likely be installed via SideServer, which adds the team ID
+DEBUG_BUNDLE_ID_SUFFIX = .$(DEVELOPMENT_TEAM)
+
 // Set to YES if you have a valid paid Apple Developer account
 DEVELOPER_ACCOUNT_PAID = NO