From 9c19dc607d89fcdff2663d620492ddfa22035d80 Mon Sep 17 00:00:00 2001
From: Dustin Wojciechowski <dustin.wojciechowski@microsoft.com>
Date: Wed, 4 Oct 2023 10:59:41 -0700
Subject: [PATCH 1/5] Updated integration test to check for app-sandbox and
 network.client entitlements in debug config as well for maui-blazor.

---
 .../src/Microsoft.Maui.IntegrationTests/TemplateTests.cs        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/TestUtils/src/Microsoft.Maui.IntegrationTests/TemplateTests.cs b/src/TestUtils/src/Microsoft.Maui.IntegrationTests/TemplateTests.cs
index de36d6535755..74006890ba94 100644
--- a/src/TestUtils/src/Microsoft.Maui.IntegrationTests/TemplateTests.cs
+++ b/src/TestUtils/src/Microsoft.Maui.IntegrationTests/TemplateTests.cs
@@ -250,7 +250,7 @@ public void CheckEntitlementsForMauiBlazorOnMacCatalyst(string id, string config
 
 			List<string> expectedEntitlements = config == "Release" ?
 				new() { "com.apple.security.app-sandbox", "com.apple.security.network.client" } :
-				new() { "com.apple.security.get-task-allow" };
+				new() { "com.apple.security.app-sandbox", "com.apple.security.network.client", "com.apple.security.get-task-allow" };
 			List<string> foundEntitlements = Codesign.SearchForExpectedEntitlements(entitlementsPath, appLocation, expectedEntitlements);
 
 			CollectionAssert.AreEqual(expectedEntitlements, foundEntitlements, "Entitlements missing from executable.");

From 49e1e2d282e73131e05464c718f983c7c913b973 Mon Sep 17 00:00:00 2001
From: Dustin Wojciechowski <dustin.wojciechowski@microsoft.com>
Date: Wed, 4 Oct 2023 10:52:46 -0700
Subject: [PATCH 2/5] Added app-sandbox and network.client entitlements to both
 debug and release entitlement plists for maui-blazor and maui-mobile
 templates for MacCatalyst. get-task-allow is commented out for debug for
 maui-mobile but is not for maui-blazor.

---
 .../Platforms/MacCatalyst/Entitlements.Debug.plist   | 10 +++++++++-
 .../Platforms/MacCatalyst/Entitlements.Release.plist |  2 ++
 .../Platforms/MacCatalyst/Entitlements.Debug.plist   | 12 +++++++++---
 .../Platforms/MacCatalyst/Entitlements.Release.plist |  2 ++
 4 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/src/Templates/src/templates/maui-blazor/Platforms/MacCatalyst/Entitlements.Debug.plist b/src/Templates/src/templates/maui-blazor/Platforms/MacCatalyst/Entitlements.Debug.plist
index cc0208055252..cf47600a9e0a 100644
--- a/src/Templates/src/templates/maui-blazor/Platforms/MacCatalyst/Entitlements.Debug.plist
+++ b/src/Templates/src/templates/maui-blazor/Platforms/MacCatalyst/Entitlements.Debug.plist
@@ -1,10 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
+    <!-- See https://aka.ms/maui-publish-app-store#add-entitlements for more information about adding entitlements. -->
     <dict>
-        <!-- Enable this value to use browser developer tools while debugging.-->
+        <!-- App Sandbox must be enabled to distribute a MacCatalyst app through the Mac App Store. -->
+        <key>com.apple.security.app-sandbox</key>
+        <true/>
+        <!-- When App Sandbox is enabled, this value is required to open outgoing network connections. -->
+        <key>com.apple.security.network.client</key>
+        <true/>
+        <!-- Enable this value to use browser developer tools while debugging. -->
         <!-- See https://aka.ms/blazor-hybrid-developer-tools -->
         <key>com.apple.security.get-task-allow</key>
         <true/>
     </dict>
+    
 </plist>
diff --git a/src/Templates/src/templates/maui-blazor/Platforms/MacCatalyst/Entitlements.Release.plist b/src/Templates/src/templates/maui-blazor/Platforms/MacCatalyst/Entitlements.Release.plist
index 1db1d9371a28..de4adc94a9c9 100644
--- a/src/Templates/src/templates/maui-blazor/Platforms/MacCatalyst/Entitlements.Release.plist
+++ b/src/Templates/src/templates/maui-blazor/Platforms/MacCatalyst/Entitlements.Release.plist
@@ -3,8 +3,10 @@
 <plist version="1.0">
     <!-- See https://aka.ms/maui-publish-app-store#add-entitlements for more information about adding entitlements.-->
     <dict>
+        <!-- App Sandbox must be enabled to distribute a MacCatalyst app through the Mac App Store. -->
         <key>com.apple.security.app-sandbox</key>
         <true/>
+        <!-- When App Sandbox is enabled, this value is required to open outgoing network connections. -->
         <key>com.apple.security.network.client</key>
         <true/>
     </dict>
diff --git a/src/Templates/src/templates/maui-mobile/Platforms/MacCatalyst/Entitlements.Debug.plist b/src/Templates/src/templates/maui-mobile/Platforms/MacCatalyst/Entitlements.Debug.plist
index 1659c8426552..37cfcaf8e318 100644
--- a/src/Templates/src/templates/maui-mobile/Platforms/MacCatalyst/Entitlements.Debug.plist
+++ b/src/Templates/src/templates/maui-mobile/Platforms/MacCatalyst/Entitlements.Debug.plist
@@ -2,10 +2,16 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
     <dict>
-        <!-- Enable this value to use browser developer tools while debugging.-->
-        <!-- See https://aka.ms/blazor-hybrid-developer-tools -->
-        <key>com.apple.security.get-task-allow</key>
+        <!-- App Sandbox must be enabled to distribute a MacCatalyst app through the Mac App Store. -->
+        <key>com.apple.security.app-sandbox</key>
+        <true/>
+        <!-- When App Sandbox is enabled, this value is required to open outgoing network connections. -->
+        <key>com.apple.security.network.client</key>
         <true/>
+        <!-- Enable this value to use browser developer tools while debugging. -->
+        <!-- See https://aka.ms/blazor-hybrid-developer-tools -->
+        <!-- <key>com.apple.security.get-task-allow</key> -->
+        <!-- <true/> -->
     </dict>
 </plist>
 
diff --git a/src/Templates/src/templates/maui-mobile/Platforms/MacCatalyst/Entitlements.Release.plist b/src/Templates/src/templates/maui-mobile/Platforms/MacCatalyst/Entitlements.Release.plist
index 1db1d9371a28..de4adc94a9c9 100644
--- a/src/Templates/src/templates/maui-mobile/Platforms/MacCatalyst/Entitlements.Release.plist
+++ b/src/Templates/src/templates/maui-mobile/Platforms/MacCatalyst/Entitlements.Release.plist
@@ -3,8 +3,10 @@
 <plist version="1.0">
     <!-- See https://aka.ms/maui-publish-app-store#add-entitlements for more information about adding entitlements.-->
     <dict>
+        <!-- App Sandbox must be enabled to distribute a MacCatalyst app through the Mac App Store. -->
         <key>com.apple.security.app-sandbox</key>
         <true/>
+        <!-- When App Sandbox is enabled, this value is required to open outgoing network connections. -->
         <key>com.apple.security.network.client</key>
         <true/>
     </dict>

From 633af8deab360d3c7705aa0f0b7365a19cedc33c Mon Sep 17 00:00:00 2001
From: Dustin Wojciechowski <dustin.wojciechowski@microsoft.com>
Date: Wed, 4 Oct 2023 12:25:24 -0700
Subject: [PATCH 3/5] Removed unnecessary space

---
 .../maui-blazor/Platforms/MacCatalyst/Entitlements.Debug.plist   | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Templates/src/templates/maui-blazor/Platforms/MacCatalyst/Entitlements.Debug.plist b/src/Templates/src/templates/maui-blazor/Platforms/MacCatalyst/Entitlements.Debug.plist
index cf47600a9e0a..26b0a3f2fa04 100644
--- a/src/Templates/src/templates/maui-blazor/Platforms/MacCatalyst/Entitlements.Debug.plist
+++ b/src/Templates/src/templates/maui-blazor/Platforms/MacCatalyst/Entitlements.Debug.plist
@@ -14,5 +14,4 @@
         <key>com.apple.security.get-task-allow</key>
         <true/>
     </dict>
-    
 </plist>

From eadca8054de2901b992d8a7fce43a6f16bdbceab Mon Sep 17 00:00:00 2001
From: Dustin Wojciechowski <dustin.wojciechowski@microsoft.com>
Date: Mon, 9 Oct 2023 10:28:25 -0700
Subject: [PATCH 4/5] Merged debug and release entitlement plists, edition
 conditionals in csproj

---
 .../src/templates/maui-blazor/MauiApp.1.csproj     |  9 ++-------
 .../MacCatalyst/Entitlements.Release.plist         | 14 --------------
 ...Entitlements.Debug.plist => Entitlements.plist} |  3 ++-
 .../src/templates/maui-mobile/MauiApp.1.csproj     |  9 ++-------
 .../MacCatalyst/Entitlements.Release.plist         | 14 --------------
 ...Entitlements.Debug.plist => Entitlements.plist} |  1 +
 6 files changed, 7 insertions(+), 43 deletions(-)
 delete mode 100644 src/Templates/src/templates/maui-blazor/Platforms/MacCatalyst/Entitlements.Release.plist
 rename src/Templates/src/templates/maui-blazor/Platforms/MacCatalyst/{Entitlements.Debug.plist => Entitlements.plist} (93%)
 delete mode 100644 src/Templates/src/templates/maui-mobile/Platforms/MacCatalyst/Entitlements.Release.plist
 rename src/Templates/src/templates/maui-mobile/Platforms/MacCatalyst/{Entitlements.Debug.plist => Entitlements.plist} (86%)

diff --git a/src/Templates/src/templates/maui-blazor/MauiApp.1.csproj b/src/Templates/src/templates/maui-blazor/MauiApp.1.csproj
index fb98f7e479d1..63fec655a283 100644
--- a/src/Templates/src/templates/maui-blazor/MauiApp.1.csproj
+++ b/src/Templates/src/templates/maui-blazor/MauiApp.1.csproj
@@ -65,12 +65,7 @@
 
   <!-- Build Properties must be defined within these property groups to ensure successful publishing
        to the Mac App Store. See: https://aka.ms/maui-publish-app-store#define-build-properties-in-your-project-file -->
-  <PropertyGroup Condition="$(TargetFramework.Contains('-maccatalyst')) and '$(Configuration)' == 'Debug'">
-    <CodesignEntitlements>Platforms/MacCatalyst/Entitlements.Debug.plist</CodesignEntitlements>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="$(TargetFramework.Contains('-maccatalyst')) and '$(Configuration)' == 'Release'">
-    <CodesignEntitlements>Platforms/MacCatalyst/Entitlements.Release.plist</CodesignEntitlements>
-    <UseHardenedRuntime>true</UseHardenedRuntime>
+  <PropertyGroup Condition="$(TargetFramework.Contains('-maccatalyst'))">
+    <CodesignEntitlements>Platforms/MacCatalyst/Entitlements.plist</CodesignEntitlements>
   </PropertyGroup>
 </Project>
diff --git a/src/Templates/src/templates/maui-blazor/Platforms/MacCatalyst/Entitlements.Release.plist b/src/Templates/src/templates/maui-blazor/Platforms/MacCatalyst/Entitlements.Release.plist
deleted file mode 100644
index de4adc94a9c9..000000000000
--- a/src/Templates/src/templates/maui-blazor/Platforms/MacCatalyst/Entitlements.Release.plist
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-    <!-- See https://aka.ms/maui-publish-app-store#add-entitlements for more information about adding entitlements.-->
-    <dict>
-        <!-- App Sandbox must be enabled to distribute a MacCatalyst app through the Mac App Store. -->
-        <key>com.apple.security.app-sandbox</key>
-        <true/>
-        <!-- When App Sandbox is enabled, this value is required to open outgoing network connections. -->
-        <key>com.apple.security.network.client</key>
-        <true/>
-    </dict>
-</plist>
-
diff --git a/src/Templates/src/templates/maui-blazor/Platforms/MacCatalyst/Entitlements.Debug.plist b/src/Templates/src/templates/maui-blazor/Platforms/MacCatalyst/Entitlements.plist
similarity index 93%
rename from src/Templates/src/templates/maui-blazor/Platforms/MacCatalyst/Entitlements.Debug.plist
rename to src/Templates/src/templates/maui-blazor/Platforms/MacCatalyst/Entitlements.plist
index 26b0a3f2fa04..ac853ae00090 100644
--- a/src/Templates/src/templates/maui-blazor/Platforms/MacCatalyst/Entitlements.Debug.plist
+++ b/src/Templates/src/templates/maui-blazor/Platforms/MacCatalyst/Entitlements.plist
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
-    <!-- See https://aka.ms/maui-publish-app-store#add-entitlements for more information about adding entitlements. -->
+    <!-- See https://aka.ms/maui-publish-app-store#add-entitlements for more information about adding entitlements.-->
     <dict>
         <!-- App Sandbox must be enabled to distribute a MacCatalyst app through the Mac App Store. -->
         <key>com.apple.security.app-sandbox</key>
@@ -15,3 +15,4 @@
         <true/>
     </dict>
 </plist>
+
diff --git a/src/Templates/src/templates/maui-mobile/MauiApp.1.csproj b/src/Templates/src/templates/maui-mobile/MauiApp.1.csproj
index 9ff065642de3..b8b01caf73f6 100644
--- a/src/Templates/src/templates/maui-mobile/MauiApp.1.csproj
+++ b/src/Templates/src/templates/maui-mobile/MauiApp.1.csproj
@@ -63,12 +63,7 @@
 
 	<!-- Build Properties must be defined within these property groups to ensure successful publishing
        to the Mac App Store. See: https://aka.ms/maui-publish-app-store#define-build-properties-in-your-project-file -->
-  <PropertyGroup Condition="$(TargetFramework.Contains('-maccatalyst')) and '$(Configuration)' == 'Debug'">
-    <CodesignEntitlements>Platforms/MacCatalyst/Entitlements.Debug.plist</CodesignEntitlements>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="$(TargetFramework.Contains('-maccatalyst')) and '$(Configuration)' == 'Release'">
-    <CodesignEntitlements>Platforms/MacCatalyst/Entitlements.Release.plist</CodesignEntitlements>
-    <UseHardenedRuntime>true</UseHardenedRuntime>
+  <PropertyGroup Condition="$(TargetFramework.Contains('-maccatalyst'))">
+    <CodesignEntitlements>Platforms/MacCatalyst/Entitlements.plist</CodesignEntitlements>
   </PropertyGroup>
 </Project>
diff --git a/src/Templates/src/templates/maui-mobile/Platforms/MacCatalyst/Entitlements.Release.plist b/src/Templates/src/templates/maui-mobile/Platforms/MacCatalyst/Entitlements.Release.plist
deleted file mode 100644
index de4adc94a9c9..000000000000
--- a/src/Templates/src/templates/maui-mobile/Platforms/MacCatalyst/Entitlements.Release.plist
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-    <!-- See https://aka.ms/maui-publish-app-store#add-entitlements for more information about adding entitlements.-->
-    <dict>
-        <!-- App Sandbox must be enabled to distribute a MacCatalyst app through the Mac App Store. -->
-        <key>com.apple.security.app-sandbox</key>
-        <true/>
-        <!-- When App Sandbox is enabled, this value is required to open outgoing network connections. -->
-        <key>com.apple.security.network.client</key>
-        <true/>
-    </dict>
-</plist>
-
diff --git a/src/Templates/src/templates/maui-mobile/Platforms/MacCatalyst/Entitlements.Debug.plist b/src/Templates/src/templates/maui-mobile/Platforms/MacCatalyst/Entitlements.plist
similarity index 86%
rename from src/Templates/src/templates/maui-mobile/Platforms/MacCatalyst/Entitlements.Debug.plist
rename to src/Templates/src/templates/maui-mobile/Platforms/MacCatalyst/Entitlements.plist
index 37cfcaf8e318..dacbbb8191dd 100644
--- a/src/Templates/src/templates/maui-mobile/Platforms/MacCatalyst/Entitlements.Debug.plist
+++ b/src/Templates/src/templates/maui-mobile/Platforms/MacCatalyst/Entitlements.plist
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
+    <!-- See https://aka.ms/maui-publish-app-store#add-entitlements for more information about adding entitlements.-->
     <dict>
         <!-- App Sandbox must be enabled to distribute a MacCatalyst app through the Mac App Store. -->
         <key>com.apple.security.app-sandbox</key>

From 15629a4fde8ac35ed80773ca9535701319495355 Mon Sep 17 00:00:00 2001
From: Dustin Wojciechowski <dustin.wojciechowski@microsoft.com>
Date: Wed, 11 Oct 2023 16:07:24 -0700
Subject: [PATCH 5/5] Removed unnecessary items from csproj

---
 src/Templates/src/templates/maui-blazor/MauiApp.1.csproj | 5 -----
 src/Templates/src/templates/maui-mobile/MauiApp.1.csproj | 5 -----
 2 files changed, 10 deletions(-)

diff --git a/src/Templates/src/templates/maui-blazor/MauiApp.1.csproj b/src/Templates/src/templates/maui-blazor/MauiApp.1.csproj
index 63fec655a283..3f016b9b66d2 100644
--- a/src/Templates/src/templates/maui-blazor/MauiApp.1.csproj
+++ b/src/Templates/src/templates/maui-blazor/MauiApp.1.csproj
@@ -63,9 +63,4 @@
         <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="MS_EXT_LOG_DEBUG_VERSION" />
     </ItemGroup>
 
-  <!-- Build Properties must be defined within these property groups to ensure successful publishing
-       to the Mac App Store. See: https://aka.ms/maui-publish-app-store#define-build-properties-in-your-project-file -->
-  <PropertyGroup Condition="$(TargetFramework.Contains('-maccatalyst'))">
-    <CodesignEntitlements>Platforms/MacCatalyst/Entitlements.plist</CodesignEntitlements>
-  </PropertyGroup>
 </Project>
diff --git a/src/Templates/src/templates/maui-mobile/MauiApp.1.csproj b/src/Templates/src/templates/maui-mobile/MauiApp.1.csproj
index b8b01caf73f6..0202ba086f38 100644
--- a/src/Templates/src/templates/maui-mobile/MauiApp.1.csproj
+++ b/src/Templates/src/templates/maui-mobile/MauiApp.1.csproj
@@ -61,9 +61,4 @@
 		<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="MS_EXT_LOG_DEBUG_VERSION" />
 	</ItemGroup>
 
-	<!-- Build Properties must be defined within these property groups to ensure successful publishing
-       to the Mac App Store. See: https://aka.ms/maui-publish-app-store#define-build-properties-in-your-project-file -->
-  <PropertyGroup Condition="$(TargetFramework.Contains('-maccatalyst'))">
-    <CodesignEntitlements>Platforms/MacCatalyst/Entitlements.plist</CodesignEntitlements>
-  </PropertyGroup>
 </Project>