From ae3539434b5a07dfe594aff983fa7255743c522e Mon Sep 17 00:00:00 2001
From: Dustin Wojciechowski <dustin.wojciechowski@microsoft.com>
Date: Fri, 24 Mar 2023 14:54:51 -0700
Subject: [PATCH 01/10] For Maui Blazor Templates: Added Debug and Release
 Entitlements. Add ed comments in csproj for publishing to Mac App store.
 Modified Info.plist to add necessary keys for publishing.

---
 .../templates/maui-blazor/MauiApp.1.csproj    | 45 +++++++++++++++++++
 .../MacCatalyst/Entitlements.Debug.plist      | 10 +++++
 .../MacCatalyst/Entitlements.Release.plist    | 13 ++++++
 .../Platforms/MacCatalyst/Info.plist          |  9 ++++
 4 files changed, 77 insertions(+)
 create mode 100644 src/Templates/src/templates/maui-blazor/Platforms/MacCatalyst/Entitlements.Debug.plist
 create mode 100644 src/Templates/src/templates/maui-blazor/Platforms/MacCatalyst/Entitlements.Release.plist

diff --git a/src/Templates/src/templates/maui-blazor/MauiApp.1.csproj b/src/Templates/src/templates/maui-blazor/MauiApp.1.csproj
index 52c193b565ab..c16d69264bd6 100644
--- a/src/Templates/src/templates/maui-blazor/MauiApp.1.csproj
+++ b/src/Templates/src/templates/maui-blazor/MauiApp.1.csproj
@@ -5,6 +5,14 @@
         <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);DOTNET_TFM-windows10.0.19041.0</TargetFrameworks>
         <!-- Uncomment to also build the tizen app. You will need to install tizen by following this: https://github.com/Samsung/Tizen.NET -->
         <!-- <TargetFrameworks>$(TargetFrameworks);DOTNET_TFM-tizen</TargetFrameworks> -->
+
+         <!-- Note for MacCatalyst:
+            The default runtime is maccatalyst-x64, except in Release config, in which case the default is maccatalyst-x64;maccatalyst-arm64.
+            When specifying both architectures, use the plural <RuntimeIdentifiers> instead of the singular <RuntimeIdentifer>.
+            The App Store will NOT accept apps with ONLY maccatalyst-arm64 indicated;
+            either BOTH runtimes must be indicated or ONLY macatalyst-x64. -->
+         <!-- ex. <RuntimeIdentifiers>maccatalyst-x64;maccatalyst-arm64</RuntimeIdentifiers> -->
+
         <OutputType>Exe</OutputType>
         <RootNamespace>MauiApp._1</RootNamespace>
         <UseMaui>true</UseMaui>
@@ -52,4 +60,41 @@
         <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="MS_EXT_VERSION" />
     </ItemGroup>
 
+    <!-- Notes for Publishing on the Mac App Store:
+    1. For macOS it's possible to sign both the app bundle (EnableCodesigning=true) and the package (*.pkg) (EnablePackageSigning=true),
+       and these are signed separately and with different certificates.
+          CodesignKey: this is the signing key used for the app bundle
+          PackageSigningKey: this is the signing key used for the package
+    2. Publishing to the App Store requires signing both the app bundle and the package.
+          Must be 'Apple Distribution: ...' for the app bundle. Note that apps signed like this will not execute locally.
+          They have to be published to the App Store and then downloaded (Apple will resign the app with a different signing identity that allows for local execution).
+          Must be '3rd Party Mac Developer Installer: ...' for the pkg
+    3. Publishing outside of the App Store (i.e. only notarizing) requires:
+          Must be 'Developer ID Application: ...' for the app bundle
+          Must be 'Developer ID Installer: ...' for the pkg
+    4. During development, use the 'Apple Development: ...' signing key (typically to verify that the app works when is signed and entitlements are enforced).
+    5. Depending on the entitlements the app needs, a specific provisioning profile (CodesignProvision) might be needed.
+    6. UseHardenedRuntime must be set to true when app sandbox is enabled in Info.plist.
+    -->
+  <PropertyGroup Condition="$(TargetFramework.Contains('-maccatalyst')) and '$(Configuration)' == 'Debug'">
+    <CodesignEntitlements>Platforms/MacCatalyst/Entitlements.Debug.plist</CodesignEntitlements>
+    <!--
+    <CodesignProvision>YOUR PROFILE NAME</CodesignProvision>
+    <CodesignKey>Apple Development: YOURNAME (*******)</CodesignKey>
+    -->
+  </PropertyGroup>
+
+  <PropertyGroup Condition="$(TargetFramework.Contains('-maccatalyst')) and '$(Configuration)' == 'Release'">
+    <EnableCodeSigning>True</EnableCodeSigning>
+    <ProvisionType>Manual</ProvisionType>
+    <CreatePackage>true</CreatePackage>
+    <EnablePackageSigning>true</EnablePackageSigning>
+    <CodesignEntitlements>Platforms/MacCatalyst/Entitlements.Release.plist</CodesignEntitlements>
+    <UseHardenedRuntime>true</UseHardenedRuntime>
+    <!--
+    <CodesignKey>Apple Development: YOURNAME (*******)</CodesignKey>
+    <CodesignProvision>YOUR PROFILE NAME</CodesignProvision>
+    <PackageSigningKey>3rd Party Mac Developer Installer: YOURNAME (*******)</PackageSigningKey>
+    -->
+  </PropertyGroup>
 </Project>
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
new file mode 100644
index 000000000000..5e7cb34d2c23
--- /dev/null
+++ b/src/Templates/src/templates/maui-blazor/Platforms/MacCatalyst/Entitlements.Debug.plist
@@ -0,0 +1,10 @@
+<?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">
+    <dict>
+        <!-- Enable this value to use broswer developer tools with Blazor.  while debugging in order to use Dev tools.-->
+        <!-- See https://learn.microsoft.com/en-us/aspnet/core/blazor/hybrid/developer-tools?view=aspnetcore-7.0&pivots=macos -->
+        <key>com.apple.security.get-task-allow</key>
+        <true/>
+    </dict>
+</plist>
\ No newline at end of file
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
new file mode 100644
index 000000000000..43ec208a4119
--- /dev/null
+++ b/src/Templates/src/templates/maui-blazor/Platforms/MacCatalyst/Entitlements.Release.plist
@@ -0,0 +1,13 @@
+<?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">
+    <dict>
+        <!-- app.sandbox is required by the App Store. See https://developer.apple.com/documentation/security/app_sandbox-->
+        <key>com.apple.security.app-sandbox</key>
+        <true/>
+        
+        <!-- When sandbox is enabled, this value is required if app was created with Blazor.-->
+        <key>com.apple.security.network.client</key>
+        <true/>
+    </dict>
+</plist>
\ No newline at end of file
diff --git a/src/Templates/src/templates/maui-blazor/Platforms/MacCatalyst/Info.plist b/src/Templates/src/templates/maui-blazor/Platforms/MacCatalyst/Info.plist
index 78e923aa2a05..dc0dbc7599aa 100644
--- a/src/Templates/src/templates/maui-blazor/Platforms/MacCatalyst/Info.plist
+++ b/src/Templates/src/templates/maui-blazor/Platforms/MacCatalyst/Info.plist
@@ -1,6 +1,15 @@
 <?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">
+    <!-- The App store requires that ITSAppUsesNonExemptEncryption to be set -->
+    <!-- Please consult https://developer.apple.com/documentation/bundleresources/information_property_list/itsappusesnonexemptencryption -->
+    <!-- <key>ITSAppUsesNonExemptEncryption</key> -->
+    <!-- Please indicate <true/> or <false/> here. -->
+
+    <!-- Specify the category for your app here. -->
+    <!-- Please consult https://developer.apple.com/documentation/bundleresources/information_property_list/lsapplicationcategorytype -->
+    <!-- <key>LSApplicationCategoryType</key> -->
+    <!-- <string>public.app-category.YOUR-CATEGORY-HERE</string> -->
 <dict>
     <key>UIDeviceFamily</key>
     <array>

From fda811dbfb5c2019c10018b1013a8f90001b77db Mon Sep 17 00:00:00 2001
From: Dustin Wojciechowski <dustin.wojciechowski@microsoft.com>
Date: Fri, 24 Mar 2023 15:17:08 -0700
Subject: [PATCH 02/10] Corrected keys in info.plist not within <dict>

---
 .../src/templates/maui-blazor/Platforms/MacCatalyst/Info.plist  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Templates/src/templates/maui-blazor/Platforms/MacCatalyst/Info.plist b/src/Templates/src/templates/maui-blazor/Platforms/MacCatalyst/Info.plist
index dc0dbc7599aa..8e7f656ccc8d 100644
--- a/src/Templates/src/templates/maui-blazor/Platforms/MacCatalyst/Info.plist
+++ b/src/Templates/src/templates/maui-blazor/Platforms/MacCatalyst/Info.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">
+<dict>
     <!-- The App store requires that ITSAppUsesNonExemptEncryption to be set -->
     <!-- Please consult https://developer.apple.com/documentation/bundleresources/information_property_list/itsappusesnonexemptencryption -->
     <!-- <key>ITSAppUsesNonExemptEncryption</key> -->
@@ -10,7 +11,6 @@
     <!-- Please consult https://developer.apple.com/documentation/bundleresources/information_property_list/lsapplicationcategorytype -->
     <!-- <key>LSApplicationCategoryType</key> -->
     <!-- <string>public.app-category.YOUR-CATEGORY-HERE</string> -->
-<dict>
     <key>UIDeviceFamily</key>
     <array>
         <integer>2</integer>

From 64490b40dea1a86d832c57bcf2348b2cf72f52e1 Mon Sep 17 00:00:00 2001
From: Dustin Wojciechowski <dustin.wojciechowski@microsoft.com>
Date: Fri, 24 Mar 2023 16:35:40 -0700
Subject: [PATCH 03/10] Added missing newlines to end of Entitlements plists.

---
 .../maui-blazor/Platforms/MacCatalyst/Entitlements.Debug.plist  | 2 +-
 .../Platforms/MacCatalyst/Entitlements.Release.plist            | 2 +-
 2 files changed, 2 insertions(+), 2 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 5e7cb34d2c23..30d98ef7c752 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
@@ -7,4 +7,4 @@
         <key>com.apple.security.get-task-allow</key>
         <true/>
     </dict>
-</plist>
\ No newline at end of file
+</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 43ec208a4119..da42acb59177 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
@@ -10,4 +10,4 @@
         <key>com.apple.security.network.client</key>
         <true/>
     </dict>
-</plist>
\ No newline at end of file
+</plist>

From 2e3900ec4878007a171c61e688bda80d9d62c553 Mon Sep 17 00:00:00 2001
From: Dustin Wojciechowski <dustin.wojciechowski@microsoft.com>
Date: Mon, 3 Apr 2023 20:37:23 -0700
Subject: [PATCH 04/10] Removed commented directions from csproj and code sign
 portions. Will relocate those to docs.

---
 .../templates/maui-blazor/MauiApp.1.csproj    | 29 -------------------
 1 file changed, 29 deletions(-)

diff --git a/src/Templates/src/templates/maui-blazor/MauiApp.1.csproj b/src/Templates/src/templates/maui-blazor/MauiApp.1.csproj
index c16d69264bd6..6d8879783c64 100644
--- a/src/Templates/src/templates/maui-blazor/MauiApp.1.csproj
+++ b/src/Templates/src/templates/maui-blazor/MauiApp.1.csproj
@@ -60,41 +60,12 @@
         <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="MS_EXT_VERSION" />
     </ItemGroup>
 
-    <!-- Notes for Publishing on the Mac App Store:
-    1. For macOS it's possible to sign both the app bundle (EnableCodesigning=true) and the package (*.pkg) (EnablePackageSigning=true),
-       and these are signed separately and with different certificates.
-          CodesignKey: this is the signing key used for the app bundle
-          PackageSigningKey: this is the signing key used for the package
-    2. Publishing to the App Store requires signing both the app bundle and the package.
-          Must be 'Apple Distribution: ...' for the app bundle. Note that apps signed like this will not execute locally.
-          They have to be published to the App Store and then downloaded (Apple will resign the app with a different signing identity that allows for local execution).
-          Must be '3rd Party Mac Developer Installer: ...' for the pkg
-    3. Publishing outside of the App Store (i.e. only notarizing) requires:
-          Must be 'Developer ID Application: ...' for the app bundle
-          Must be 'Developer ID Installer: ...' for the pkg
-    4. During development, use the 'Apple Development: ...' signing key (typically to verify that the app works when is signed and entitlements are enforced).
-    5. Depending on the entitlements the app needs, a specific provisioning profile (CodesignProvision) might be needed.
-    6. UseHardenedRuntime must be set to true when app sandbox is enabled in Info.plist.
-    -->
   <PropertyGroup Condition="$(TargetFramework.Contains('-maccatalyst')) and '$(Configuration)' == 'Debug'">
     <CodesignEntitlements>Platforms/MacCatalyst/Entitlements.Debug.plist</CodesignEntitlements>
-    <!--
-    <CodesignProvision>YOUR PROFILE NAME</CodesignProvision>
-    <CodesignKey>Apple Development: YOURNAME (*******)</CodesignKey>
-    -->
   </PropertyGroup>
 
   <PropertyGroup Condition="$(TargetFramework.Contains('-maccatalyst')) and '$(Configuration)' == 'Release'">
-    <EnableCodeSigning>True</EnableCodeSigning>
-    <ProvisionType>Manual</ProvisionType>
-    <CreatePackage>true</CreatePackage>
-    <EnablePackageSigning>true</EnablePackageSigning>
     <CodesignEntitlements>Platforms/MacCatalyst/Entitlements.Release.plist</CodesignEntitlements>
     <UseHardenedRuntime>true</UseHardenedRuntime>
-    <!--
-    <CodesignKey>Apple Development: YOURNAME (*******)</CodesignKey>
-    <CodesignProvision>YOUR PROFILE NAME</CodesignProvision>
-    <PackageSigningKey>3rd Party Mac Developer Installer: YOURNAME (*******)</PackageSigningKey>
-    -->
   </PropertyGroup>
 </Project>

From fddeb4145ad3a10ccef79e6a11b622ff2e76557e Mon Sep 17 00:00:00 2001
From: Dustin Wojciechowski <dustin.wojciechowski@microsoft.com>
Date: Tue, 4 Apr 2023 16:34:06 -0700
Subject: [PATCH 05/10] Added links to the Maui Publishing docs where relevant.

---
 src/Templates/src/templates/maui-blazor/MauiApp.1.csproj     | 3 +++
 .../Platforms/MacCatalyst/Entitlements.Debug.plist           | 2 +-
 .../Platforms/MacCatalyst/Entitlements.Release.plist         | 5 ++---
 .../templates/maui-blazor/Platforms/MacCatalyst/Info.plist   | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/Templates/src/templates/maui-blazor/MauiApp.1.csproj b/src/Templates/src/templates/maui-blazor/MauiApp.1.csproj
index 6d8879783c64..14a611b27394 100644
--- a/src/Templates/src/templates/maui-blazor/MauiApp.1.csproj
+++ b/src/Templates/src/templates/maui-blazor/MauiApp.1.csproj
@@ -60,6 +60,9 @@
         <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="MS_EXT_VERSION" />
     </ItemGroup>
 
+  <!-- Build Properties must be defined within these property groups to ensure successful publishing
+       to the App Store. See "Define build properties in your project file" here:
+       https://learn.microsoft.com/en-us/dotnet/maui/mac-catalyst/deployment/publish-app-store -->
   <PropertyGroup Condition="$(TargetFramework.Contains('-maccatalyst')) and '$(Configuration)' == 'Debug'">
     <CodesignEntitlements>Platforms/MacCatalyst/Entitlements.Debug.plist</CodesignEntitlements>
   </PropertyGroup>
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 30d98ef7c752..0c397d907b18 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
@@ -2,7 +2,7 @@
 <!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 broswer developer tools with Blazor.  while debugging in order to use Dev tools.-->
+        <!-- Enable this value to use broswer developer tools with Blazor while debugging in order to use Dev tools.-->
         <!-- See https://learn.microsoft.com/en-us/aspnet/core/blazor/hybrid/developer-tools?view=aspnetcore-7.0&pivots=macos -->
         <key>com.apple.security.get-task-allow</key>
         <true/>
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 da42acb59177..eedfece7f390 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
@@ -1,12 +1,11 @@
 <?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://learn.microsoft.com/en-us/dotnet/maui/mac-catalyst/deployment/publish-app-store?view=net-maui-7.0#add-entitlements for more
+         information about adding entitlements.-->
     <dict>
-        <!-- app.sandbox is required by the App Store. See https://developer.apple.com/documentation/security/app_sandbox-->
         <key>com.apple.security.app-sandbox</key>
         <true/>
-        
-        <!-- When sandbox is enabled, this value is required if app was created with Blazor.-->
         <key>com.apple.security.network.client</key>
         <true/>
     </dict>
diff --git a/src/Templates/src/templates/maui-blazor/Platforms/MacCatalyst/Info.plist b/src/Templates/src/templates/maui-blazor/Platforms/MacCatalyst/Info.plist
index 8e7f656ccc8d..9cf73a0b7646 100644
--- a/src/Templates/src/templates/maui-blazor/Platforms/MacCatalyst/Info.plist
+++ b/src/Templates/src/templates/maui-blazor/Platforms/MacCatalyst/Info.plist
@@ -2,7 +2,7 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-    <!-- The App store requires that ITSAppUsesNonExemptEncryption to be set -->
+    <!-- The App store requires you specify if the app uses encryption. -->
     <!-- Please consult https://developer.apple.com/documentation/bundleresources/information_property_list/itsappusesnonexemptencryption -->
     <!-- <key>ITSAppUsesNonExemptEncryption</key> -->
     <!-- Please indicate <true/> or <false/> here. -->

From 6c7642269f77f211e739a4cf375f3932d149177d Mon Sep 17 00:00:00 2001
From: Dustin Wojciechowski <dustin.wojciechowski@microsoft.com>
Date: Thu, 6 Apr 2023 20:42:06 -0700
Subject: [PATCH 06/10] Modified links to use aka.ms

---
 src/Templates/src/templates/maui-blazor/MauiApp.1.csproj       | 3 +--
 .../maui-blazor/Platforms/MacCatalyst/Entitlements.Debug.plist | 2 +-
 .../Platforms/MacCatalyst/Entitlements.Release.plist           | 3 +--
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/Templates/src/templates/maui-blazor/MauiApp.1.csproj b/src/Templates/src/templates/maui-blazor/MauiApp.1.csproj
index 14a611b27394..e2632f76c81a 100644
--- a/src/Templates/src/templates/maui-blazor/MauiApp.1.csproj
+++ b/src/Templates/src/templates/maui-blazor/MauiApp.1.csproj
@@ -61,8 +61,7 @@
     </ItemGroup>
 
   <!-- Build Properties must be defined within these property groups to ensure successful publishing
-       to the App Store. See "Define build properties in your project file" here:
-       https://learn.microsoft.com/en-us/dotnet/maui/mac-catalyst/deployment/publish-app-store -->
+       to the 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>
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 0c397d907b18..833b1d115d7a 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
@@ -3,7 +3,7 @@
 <plist version="1.0">
     <dict>
         <!-- Enable this value to use broswer developer tools with Blazor while debugging in order to use Dev tools.-->
-        <!-- See https://learn.microsoft.com/en-us/aspnet/core/blazor/hybrid/developer-tools?view=aspnetcore-7.0&pivots=macos -->
+        <!-- See https://aka.ms/blazor-hybrid-developer-tools -->
         <key>com.apple.security.get-task-allow</key>
         <true/>
     </dict>
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 eedfece7f390..d7a5231b4d84 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
@@ -1,8 +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://learn.microsoft.com/en-us/dotnet/maui/mac-catalyst/deployment/publish-app-store?view=net-maui-7.0#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>
         <key>com.apple.security.app-sandbox</key>
         <true/>

From 33cb804701f5a9bafd4669703c5578b8f685a038 Mon Sep 17 00:00:00 2001
From: Dustin Wojciechowski <dustin.wojciechowski@microsoft.com>
Date: Thu, 6 Apr 2023 21:39:33 -0700
Subject: [PATCH 07/10] Modified templates for maccatalyst for maui-mobile.
 Reworded comment.

---
 .../MacCatalyst/Entitlements.Debug.plist      |  2 +-
 .../MacCatalyst/Entitlements.Release.plist    |  1 +
 .../templates/maui-mobile/MauiApp.1.csproj    | 26 ++++++++++++++++++-
 .../MacCatalyst/Entitlements.Debug.plist      | 11 ++++++++
 .../MacCatalyst/Entitlements.Release.plist    | 12 +++++++++
 .../Platforms/MacCatalyst/Info.plist          |  9 +++++++
 6 files changed, 59 insertions(+), 2 deletions(-)
 create mode 100644 src/Templates/src/templates/maui-mobile/Platforms/MacCatalyst/Entitlements.Debug.plist
 create mode 100644 src/Templates/src/templates/maui-mobile/Platforms/MacCatalyst/Entitlements.Release.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.Debug.plist
index 833b1d115d7a..cc0208055252 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
@@ -2,7 +2,7 @@
 <!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 broswer developer tools with Blazor while debugging in order to use Dev tools.-->
+        <!-- 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/>
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 d7a5231b4d84..1db1d9371a28 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
@@ -9,3 +9,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 052e2f46f019..402db51e9715 100644
--- a/src/Templates/src/templates/maui-mobile/MauiApp.1.csproj
+++ b/src/Templates/src/templates/maui-mobile/MauiApp.1.csproj
@@ -5,6 +5,14 @@
 		<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);DOTNET_TFM-windows10.0.19041.0</TargetFrameworks>
 		<!-- Uncomment to also build the tizen app. You will need to install tizen by following this: https://github.com/Samsung/Tizen.NET -->
 		<!-- <TargetFrameworks>$(TargetFrameworks);DOTNET_TFM-tizen</TargetFrameworks> -->
+
+		<!-- Note for MacCatalyst:
+		The default runtime is maccatalyst-x64, except in Release config, in which case the default is maccatalyst-x64;maccatalyst-arm64.
+		When specifying both architectures, use the plural <RuntimeIdentifiers> instead of the singular <RuntimeIdentifer>.
+		The App Store will NOT accept apps with ONLY maccatalyst-arm64 indicated;
+		either BOTH runtimes must be indicated or ONLY macatalyst-x64. -->
+		<!-- ex. <RuntimeIdentifiers>maccatalyst-x64;maccatalyst-arm64</RuntimeIdentifiers> -->
+
 		<OutputType>Exe</OutputType>
 		<RootNamespace>MauiApp._1</RootNamespace>
 		<UseMaui>true</UseMaui>
@@ -48,7 +56,23 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="MS_EXT_VERSION" />
+		<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="$(MicrosoftExtensionsPackageVersion)" />
 	</ItemGroup>
 
+	<!-- Build Properties must be defined within these property groups to ensure successful publishing
+       to the 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>
+  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|DOTNET_TFM-ios|AnyCPU'">
+    <CreatePackage>false</CreatePackage>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|DOTNET_TFM-ios|AnyCPU'">
+    <CreatePackage>false</CreatePackage>
+  </PropertyGroup>
 </Project>
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
new file mode 100644
index 000000000000..1659c8426552
--- /dev/null
+++ b/src/Templates/src/templates/maui-mobile/Platforms/MacCatalyst/Entitlements.Debug.plist
@@ -0,0 +1,11 @@
+<?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">
+    <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>
+        <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
new file mode 100644
index 000000000000..1db1d9371a28
--- /dev/null
+++ b/src/Templates/src/templates/maui-mobile/Platforms/MacCatalyst/Entitlements.Release.plist
@@ -0,0 +1,12 @@
+<?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>
+        <key>com.apple.security.app-sandbox</key>
+        <true/>
+        <key>com.apple.security.network.client</key>
+        <true/>
+    </dict>
+</plist>
+
diff --git a/src/Templates/src/templates/maui-mobile/Platforms/MacCatalyst/Info.plist b/src/Templates/src/templates/maui-mobile/Platforms/MacCatalyst/Info.plist
index 79a863bb8261..9cac54b828f5 100644
--- a/src/Templates/src/templates/maui-mobile/Platforms/MacCatalyst/Info.plist
+++ b/src/Templates/src/templates/maui-mobile/Platforms/MacCatalyst/Info.plist
@@ -2,6 +2,15 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+    <!-- The App store requires you specify if the app uses encryption. -->
+    <!-- Please consult https://developer.apple.com/documentation/bundleresources/information_property_list/itsappusesnonexemptencryption -->
+    <!-- <key>ITSAppUsesNonExemptEncryption</key> -->
+    <!-- Please indicate <true/> or <false/> here. -->
+
+    <!-- Specify the category for your app here. -->
+    <!-- Please consult https://developer.apple.com/documentation/bundleresources/information_property_list/lsapplicationcategorytype -->
+    <!-- <key>LSApplicationCategoryType</key> -->
+    <!-- <string>public.app-category.YOUR-CATEGORY-HERE</string> -->
 	<key>UIDeviceFamily</key>
 	<array>
 		<integer>2</integer>

From 1da4de64171b45c74977deb9bb56d8a9b704b3cd Mon Sep 17 00:00:00 2001
From: Dustin Wojciechowski <dustin.wojciechowski@microsoft.com>
Date: Mon, 10 Apr 2023 10:30:25 -0700
Subject: [PATCH 08/10] Correct usage to 'Mac App Store' in comments

---
 src/Templates/src/templates/maui-blazor/MauiApp.1.csproj      | 4 ++--
 .../templates/maui-blazor/Platforms/MacCatalyst/Info.plist    | 2 +-
 src/Templates/src/templates/maui-mobile/MauiApp.1.csproj      | 4 ++--
 .../templates/maui-mobile/Platforms/MacCatalyst/Info.plist    | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/Templates/src/templates/maui-blazor/MauiApp.1.csproj b/src/Templates/src/templates/maui-blazor/MauiApp.1.csproj
index e2632f76c81a..6f68566b69e1 100644
--- a/src/Templates/src/templates/maui-blazor/MauiApp.1.csproj
+++ b/src/Templates/src/templates/maui-blazor/MauiApp.1.csproj
@@ -9,7 +9,7 @@
          <!-- Note for MacCatalyst:
             The default runtime is maccatalyst-x64, except in Release config, in which case the default is maccatalyst-x64;maccatalyst-arm64.
             When specifying both architectures, use the plural <RuntimeIdentifiers> instead of the singular <RuntimeIdentifer>.
-            The App Store will NOT accept apps with ONLY maccatalyst-arm64 indicated;
+            The Mac App Store will NOT accept apps with ONLY maccatalyst-arm64 indicated;
             either BOTH runtimes must be indicated or ONLY macatalyst-x64. -->
          <!-- ex. <RuntimeIdentifiers>maccatalyst-x64;maccatalyst-arm64</RuntimeIdentifiers> -->
 
@@ -61,7 +61,7 @@
     </ItemGroup>
 
   <!-- Build Properties must be defined within these property groups to ensure successful publishing
-       to the App Store. See: https://aka.ms/maui-publish-app-store#define-build-properties-in-your-project-file -->
+       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>
diff --git a/src/Templates/src/templates/maui-blazor/Platforms/MacCatalyst/Info.plist b/src/Templates/src/templates/maui-blazor/Platforms/MacCatalyst/Info.plist
index 9cf73a0b7646..7b1e6e6219c9 100644
--- a/src/Templates/src/templates/maui-blazor/Platforms/MacCatalyst/Info.plist
+++ b/src/Templates/src/templates/maui-blazor/Platforms/MacCatalyst/Info.plist
@@ -2,7 +2,7 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-    <!-- The App store requires you specify if the app uses encryption. -->
+    <!-- The Mac App Store requires you specify if the app uses encryption. -->
     <!-- Please consult https://developer.apple.com/documentation/bundleresources/information_property_list/itsappusesnonexemptencryption -->
     <!-- <key>ITSAppUsesNonExemptEncryption</key> -->
     <!-- Please indicate <true/> or <false/> here. -->
diff --git a/src/Templates/src/templates/maui-mobile/MauiApp.1.csproj b/src/Templates/src/templates/maui-mobile/MauiApp.1.csproj
index 402db51e9715..5fc02ebca8d9 100644
--- a/src/Templates/src/templates/maui-mobile/MauiApp.1.csproj
+++ b/src/Templates/src/templates/maui-mobile/MauiApp.1.csproj
@@ -9,7 +9,7 @@
 		<!-- Note for MacCatalyst:
 		The default runtime is maccatalyst-x64, except in Release config, in which case the default is maccatalyst-x64;maccatalyst-arm64.
 		When specifying both architectures, use the plural <RuntimeIdentifiers> instead of the singular <RuntimeIdentifer>.
-		The App Store will NOT accept apps with ONLY maccatalyst-arm64 indicated;
+		The Mac App Store will NOT accept apps with ONLY maccatalyst-arm64 indicated;
 		either BOTH runtimes must be indicated or ONLY macatalyst-x64. -->
 		<!-- ex. <RuntimeIdentifiers>maccatalyst-x64;maccatalyst-arm64</RuntimeIdentifiers> -->
 
@@ -60,7 +60,7 @@
 	</ItemGroup>
 
 	<!-- Build Properties must be defined within these property groups to ensure successful publishing
-       to the App Store. See: https://aka.ms/maui-publish-app-store#define-build-properties-in-your-project-file -->
+       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>
diff --git a/src/Templates/src/templates/maui-mobile/Platforms/MacCatalyst/Info.plist b/src/Templates/src/templates/maui-mobile/Platforms/MacCatalyst/Info.plist
index 9cac54b828f5..72689771518a 100644
--- a/src/Templates/src/templates/maui-mobile/Platforms/MacCatalyst/Info.plist
+++ b/src/Templates/src/templates/maui-mobile/Platforms/MacCatalyst/Info.plist
@@ -2,7 +2,7 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-    <!-- The App store requires you specify if the app uses encryption. -->
+    <!-- The Mac App Store requires you specify if the app uses encryption. -->
     <!-- Please consult https://developer.apple.com/documentation/bundleresources/information_property_list/itsappusesnonexemptencryption -->
     <!-- <key>ITSAppUsesNonExemptEncryption</key> -->
     <!-- Please indicate <true/> or <false/> here. -->

From 82dcbc33c5e9f338ca8b12405ce2ea070485a9a0 Mon Sep 17 00:00:00 2001
From: Dustin Wojciechowski <dustin.wojciechowski@microsoft.com>
Date: Mon, 10 Apr 2023 10:34:46 -0700
Subject: [PATCH 09/10] Reverted back Logging version that got changed by
 accident

---
 src/Templates/src/templates/maui-mobile/MauiApp.1.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Templates/src/templates/maui-mobile/MauiApp.1.csproj b/src/Templates/src/templates/maui-mobile/MauiApp.1.csproj
index 5fc02ebca8d9..b474d60ae663 100644
--- a/src/Templates/src/templates/maui-mobile/MauiApp.1.csproj
+++ b/src/Templates/src/templates/maui-mobile/MauiApp.1.csproj
@@ -56,7 +56,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="$(MicrosoftExtensionsPackageVersion)" />
+		<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="MS_EXT_VERSION" />
 	</ItemGroup>
 
 	<!-- Build Properties must be defined within these property groups to ensure successful publishing

From 56036d638eb95c9376b352bfb59e33f0227934ef Mon Sep 17 00:00:00 2001
From: Dustin Wojciechowski <dustin.wojciechowski@microsoft.com>
Date: Mon, 10 Apr 2023 12:19:56 -0700
Subject: [PATCH 10/10] Removed unnecessary code from csproj

---
 src/Templates/src/templates/maui-mobile/MauiApp.1.csproj | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/Templates/src/templates/maui-mobile/MauiApp.1.csproj b/src/Templates/src/templates/maui-mobile/MauiApp.1.csproj
index b474d60ae663..af76ba0f3223 100644
--- a/src/Templates/src/templates/maui-mobile/MauiApp.1.csproj
+++ b/src/Templates/src/templates/maui-mobile/MauiApp.1.csproj
@@ -69,10 +69,4 @@
     <CodesignEntitlements>Platforms/MacCatalyst/Entitlements.Release.plist</CodesignEntitlements>
     <UseHardenedRuntime>true</UseHardenedRuntime>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|DOTNET_TFM-ios|AnyCPU'">
-    <CreatePackage>false</CreatePackage>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|DOTNET_TFM-ios|AnyCPU'">
-    <CreatePackage>false</CreatePackage>
-  </PropertyGroup>
 </Project>