From e7571f5e114c3408ef346be7bee4dceb6d1c5c8f Mon Sep 17 00:00:00 2001
From: Dustin Wojciechowski <dustin.wojciechowski@microsoft.com>
Date: Thu, 16 Mar 2023 11:22:51 -0700
Subject: [PATCH 1/8] First pass at modifying templates for MacCatalyst

---
 .../maccatalyst/csharp/Entitlements.plist     |  6 ++++
 .../maccatalyst/csharp/Info.plist             |  5 ++++
 .../maccatalyst/csharp/MacCatalystApp1.csproj | 30 ++++++++++++++++---
 3 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/dotnet/Templates/Microsoft.MacCatalyst.Templates/maccatalyst/csharp/Entitlements.plist b/dotnet/Templates/Microsoft.MacCatalyst.Templates/maccatalyst/csharp/Entitlements.plist
index 36a87067067f..e53b9165d454 100644
--- a/dotnet/Templates/Microsoft.MacCatalyst.Templates/maccatalyst/csharp/Entitlements.plist
+++ b/dotnet/Templates/Microsoft.MacCatalyst.Templates/maccatalyst/csharp/Entitlements.plist
@@ -2,5 +2,11 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
     <dict>
+        <-- Uncomment the following lines when preparing for release builds.
+        <key>com.apple.security.app-sandbox</key>
+        <true/>
+        <key>com.apple.security.network.client</key>
+        <true/>
+        -->
     </dict>
 </plist>
diff --git a/dotnet/Templates/Microsoft.MacCatalyst.Templates/maccatalyst/csharp/Info.plist b/dotnet/Templates/Microsoft.MacCatalyst.Templates/maccatalyst/csharp/Info.plist
index f7cfc044625d..264e5aaf7c62 100644
--- a/dotnet/Templates/Microsoft.MacCatalyst.Templates/maccatalyst/csharp/Info.plist
+++ b/dotnet/Templates/Microsoft.MacCatalyst.Templates/maccatalyst/csharp/Info.plist
@@ -10,6 +10,11 @@
     <string>1.0</string>
     <key>CFBundleVersion</key>
     <string>1.0</string>
+    <key>ITSAppUsesNonExemptEncryption</key>
+    <false/>
+    <--Specify the category for your app here.-->
+    <key>LSApplicationCategoryType</key>
+    <string>public.app-category.productivity</string>
     <key>UIDeviceFamily</key>
     <array>
         <integer>2</integer>
diff --git a/dotnet/Templates/Microsoft.MacCatalyst.Templates/maccatalyst/csharp/MacCatalystApp1.csproj b/dotnet/Templates/Microsoft.MacCatalyst.Templates/maccatalyst/csharp/MacCatalystApp1.csproj
index 44add7cd4981..6dd545216847 100644
--- a/dotnet/Templates/Microsoft.MacCatalyst.Templates/maccatalyst/csharp/MacCatalystApp1.csproj
+++ b/dotnet/Templates/Microsoft.MacCatalyst.Templates/maccatalyst/csharp/MacCatalystApp1.csproj
@@ -1,11 +1,33 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net7.0-maccatalyst</TargetFramework>
-    <RuntimeIdentifier>maccatalyst-x64</RuntimeIdentifier>
+  <PropertyGroup Condition="$(TargetFramework.Contains('-maccatalyst')) and '$(Configuration)' == 'Debug'">
+		<MtouchLink>none</MtouchLink>
+		<EnableCodeSigning>false</EnableCodeSigning>
+		<ProvisionType>Manual</ProvisionType>
+		<CreatePackage>false</CreatePackage>
+		<EnablePackageSigning>true</EnablePackageSigning>
+		<CodesignKey>Apple Distribution: YOURNAME (*******)</CodesignKey>
+		<CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
+		<CodesignProvision>YOUR PROFILE NAME</CodesignProvision>
+		<PackageSigningKey>3rd Party Mac Developer Installer: YOURNAME (*******)</PackageSigningKey>
+		<UseHardenedRuntime>false</UseHardenedRuntime>
+	</PropertyGroup>
+	<PropertyGroup Condition="$(TargetFramework.Contains('-maccatalyst')) and '$(Configuration)' == 'Release'">
+		<MtouchLink>Full</MtouchLink>
+    <--You must specify both both architectures or only x64 as desired. arm64 only is not permitted.-->
+		<RuntimeIdentifiers>maccatalyst-x64;maccatalyst-arm64</RuntimeIdentifiers>
     <RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">MacCatalystApp1</RootNamespace>
     <OutputType>Exe</OutputType>
     <Nullable>enable</Nullable>
     <ImplicitUsings>true</ImplicitUsings>
     <SupportedOSPlatformVersion>minOSVersion</SupportedOSPlatformVersion>
-  </PropertyGroup>
+		<EnableCodeSigning>True</EnableCodeSigning>
+		<ProvisionType>Manual</ProvisionType>
+		<CreatePackage>true</CreatePackage>
+		<EnablePackageSigning>true</EnablePackageSigning>
+		<CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
+		<CodesignKey>Apple Distribution: YOURNAME (*******)</CodesignKey>
+		<CodesignProvision>YOUR PROFILE NAME</CodesignProvision>
+		<PackageSigningKey>3rd Party Mac Developer Installer: YOURNAME (*******)</PackageSigningKey>
+		<UseHardenedRuntime>true</UseHardenedRuntime>
+	</PropertyGroup>
 </Project>

From a80b9ed729c9435be137d0a53289b2c69d6bbb73 Mon Sep 17 00:00:00 2001
From: Dustin Wojciechowski <dustin.wojciechowski@microsoft.com>
Date: Thu, 16 Mar 2023 17:37:02 -0700
Subject: [PATCH 2/8] Added missing exclamation points to comments

---
 .../maccatalyst/csharp/Entitlements.plist                       | 2 +-
 .../maccatalyst/csharp/Info.plist                               | 2 +-
 .../maccatalyst/csharp/MacCatalystApp1.csproj                   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dotnet/Templates/Microsoft.MacCatalyst.Templates/maccatalyst/csharp/Entitlements.plist b/dotnet/Templates/Microsoft.MacCatalyst.Templates/maccatalyst/csharp/Entitlements.plist
index e53b9165d454..58ff5fd684b5 100644
--- a/dotnet/Templates/Microsoft.MacCatalyst.Templates/maccatalyst/csharp/Entitlements.plist
+++ b/dotnet/Templates/Microsoft.MacCatalyst.Templates/maccatalyst/csharp/Entitlements.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>
-        <-- Uncomment the following lines when preparing for release builds.
+        <!-- Uncomment the following lines when preparing for release builds.
         <key>com.apple.security.app-sandbox</key>
         <true/>
         <key>com.apple.security.network.client</key>
diff --git a/dotnet/Templates/Microsoft.MacCatalyst.Templates/maccatalyst/csharp/Info.plist b/dotnet/Templates/Microsoft.MacCatalyst.Templates/maccatalyst/csharp/Info.plist
index 264e5aaf7c62..e173dda24d15 100644
--- a/dotnet/Templates/Microsoft.MacCatalyst.Templates/maccatalyst/csharp/Info.plist
+++ b/dotnet/Templates/Microsoft.MacCatalyst.Templates/maccatalyst/csharp/Info.plist
@@ -12,7 +12,7 @@
     <string>1.0</string>
     <key>ITSAppUsesNonExemptEncryption</key>
     <false/>
-    <--Specify the category for your app here.-->
+    <!--Specify the category for your app here.-->
     <key>LSApplicationCategoryType</key>
     <string>public.app-category.productivity</string>
     <key>UIDeviceFamily</key>
diff --git a/dotnet/Templates/Microsoft.MacCatalyst.Templates/maccatalyst/csharp/MacCatalystApp1.csproj b/dotnet/Templates/Microsoft.MacCatalyst.Templates/maccatalyst/csharp/MacCatalystApp1.csproj
index 6dd545216847..fee21915c098 100644
--- a/dotnet/Templates/Microsoft.MacCatalyst.Templates/maccatalyst/csharp/MacCatalystApp1.csproj
+++ b/dotnet/Templates/Microsoft.MacCatalyst.Templates/maccatalyst/csharp/MacCatalystApp1.csproj
@@ -13,7 +13,7 @@
 	</PropertyGroup>
 	<PropertyGroup Condition="$(TargetFramework.Contains('-maccatalyst')) and '$(Configuration)' == 'Release'">
 		<MtouchLink>Full</MtouchLink>
-    <--You must specify both both architectures or only x64 as desired. arm64 only is not permitted.-->
+    <!--You must specify both both architectures or only x64 as desired. arm64 only is not permitted.-->
 		<RuntimeIdentifiers>maccatalyst-x64;maccatalyst-arm64</RuntimeIdentifiers>
     <RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">MacCatalystApp1</RootNamespace>
     <OutputType>Exe</OutputType>

From 6676125b2c9286e76e233bd279aac3b1e78abb41 Mon Sep 17 00:00:00 2001
From: Dustin Wojciechowski <dustin.wojciechowski@microsoft.com>
Date: Thu, 16 Mar 2023 17:49:26 -0700
Subject: [PATCH 3/8] Fixed formatting in csproj file

---
 .../maccatalyst/csharp/MacCatalystApp1.csproj | 49 ++++++++++---------
 1 file changed, 25 insertions(+), 24 deletions(-)

diff --git a/dotnet/Templates/Microsoft.MacCatalyst.Templates/maccatalyst/csharp/MacCatalystApp1.csproj b/dotnet/Templates/Microsoft.MacCatalyst.Templates/maccatalyst/csharp/MacCatalystApp1.csproj
index fee21915c098..586a8ecf4c84 100644
--- a/dotnet/Templates/Microsoft.MacCatalyst.Templates/maccatalyst/csharp/MacCatalystApp1.csproj
+++ b/dotnet/Templates/Microsoft.MacCatalyst.Templates/maccatalyst/csharp/MacCatalystApp1.csproj
@@ -1,33 +1,34 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup Condition="$(TargetFramework.Contains('-maccatalyst')) and '$(Configuration)' == 'Debug'">
-		<MtouchLink>none</MtouchLink>
-		<EnableCodeSigning>false</EnableCodeSigning>
-		<ProvisionType>Manual</ProvisionType>
-		<CreatePackage>false</CreatePackage>
-		<EnablePackageSigning>true</EnablePackageSigning>
-		<CodesignKey>Apple Distribution: YOURNAME (*******)</CodesignKey>
-		<CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
-		<CodesignProvision>YOUR PROFILE NAME</CodesignProvision>
-		<PackageSigningKey>3rd Party Mac Developer Installer: YOURNAME (*******)</PackageSigningKey>
-		<UseHardenedRuntime>false</UseHardenedRuntime>
-	</PropertyGroup>
-	<PropertyGroup Condition="$(TargetFramework.Contains('-maccatalyst')) and '$(Configuration)' == 'Release'">
-		<MtouchLink>Full</MtouchLink>
+    <MtouchLink>none</MtouchLink>
+    <EnableCodeSigning>false</EnableCodeSigning>
+    <ProvisionType>Manual</ProvisionType>
+    <CreatePackage>false</CreatePackage>
+    <EnablePackageSigning>true</EnablePackageSigning>
+    <CodesignKey>Apple Distribution: YOURNAME (*******)</CodesignKey>
+    <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
+    <CodesignProvision>YOUR PROFILE NAME</CodesignProvision>
+    <PackageSigningKey>3rd Party Mac Developer Installer: YOURNAME (*******)</PackageSigningKey>
+    <UseHardenedRuntime>false</UseHardenedRuntime>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="$(TargetFramework.Contains('-maccatalyst')) and '$(Configuration)' == 'Release'">
+    <MtouchLink>Full</MtouchLink>
     <!--You must specify both both architectures or only x64 as desired. arm64 only is not permitted.-->
-		<RuntimeIdentifiers>maccatalyst-x64;maccatalyst-arm64</RuntimeIdentifiers>
+    <RuntimeIdentifiers>maccatalyst-x64;maccatalyst-arm64</RuntimeIdentifiers>
     <RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">MacCatalystApp1</RootNamespace>
     <OutputType>Exe</OutputType>
     <Nullable>enable</Nullable>
     <ImplicitUsings>true</ImplicitUsings>
     <SupportedOSPlatformVersion>minOSVersion</SupportedOSPlatformVersion>
-		<EnableCodeSigning>True</EnableCodeSigning>
-		<ProvisionType>Manual</ProvisionType>
-		<CreatePackage>true</CreatePackage>
-		<EnablePackageSigning>true</EnablePackageSigning>
-		<CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
-		<CodesignKey>Apple Distribution: YOURNAME (*******)</CodesignKey>
-		<CodesignProvision>YOUR PROFILE NAME</CodesignProvision>
-		<PackageSigningKey>3rd Party Mac Developer Installer: YOURNAME (*******)</PackageSigningKey>
-		<UseHardenedRuntime>true</UseHardenedRuntime>
-	</PropertyGroup>
+    <EnableCodeSigning>True</EnableCodeSigning>
+    <ProvisionType>Manual</ProvisionType>
+    <CreatePackage>true</CreatePackage>
+    <EnablePackageSigning>true</EnablePackageSigning>
+    <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
+    <CodesignKey>Apple Distribution: YOURNAME (*******)</CodesignKey>
+    <CodesignProvision>YOUR PROFILE NAME</CodesignProvision>
+    <PackageSigningKey>3rd Party Mac Developer Installer: YOURNAME (*******)</PackageSigningKey>
+    <UseHardenedRuntime>true</UseHardenedRuntime>
+  </PropertyGroup>
 </Project>

From d3d1651e353a6835de302a064ab79e7650ffc826 Mon Sep 17 00:00:00 2001
From: Dustin Wojciechowski <dustin.wojciechowski@microsoft.com>
Date: Thu, 16 Mar 2023 18:10:35 -0700
Subject: [PATCH 4/8] Adjusted RuntimeIdentifier. Split out the debug and
 release sections and commented them out

---
 .../maccatalyst/csharp/MacCatalystApp1.csproj | 30 ++++++++++++++++---
 1 file changed, 26 insertions(+), 4 deletions(-)

diff --git a/dotnet/Templates/Microsoft.MacCatalyst.Templates/maccatalyst/csharp/MacCatalystApp1.csproj b/dotnet/Templates/Microsoft.MacCatalyst.Templates/maccatalyst/csharp/MacCatalystApp1.csproj
index 586a8ecf4c84..515b4e69cd89 100644
--- a/dotnet/Templates/Microsoft.MacCatalyst.Templates/maccatalyst/csharp/MacCatalystApp1.csproj
+++ b/dotnet/Templates/Microsoft.MacCatalyst.Templates/maccatalyst/csharp/MacCatalystApp1.csproj
@@ -1,4 +1,24 @@
 <Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net7.0-maccatalyst</TargetFramework>
+    <!--Both architectures:
+    <RuntimeIdentifier>maccatalyst-x64;maccatalyst-arm64</RuntimeIdentifier>-->
+    <!--Only x64. Please note that selecting only arm64 is not permitted.-->
+    <RuntimeIdentifier>maccatalyst-x64</RuntimeIdentifier>
+    <OutputType>Exe</OutputType>
+    <Nullable>enable</Nullable>
+    <ImplicitUsings>true</ImplicitUsings>
+    <SupportedOSPlatformVersion>14.2</SupportedOSPlatformVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <CreatePackage>false</CreatePackage>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <CreatePackage>false</CreatePackage>
+  </PropertyGroup>
+
+  <!--
+  For Debug:
   <PropertyGroup Condition="$(TargetFramework.Contains('-maccatalyst')) and '$(Configuration)' == 'Debug'">
     <MtouchLink>none</MtouchLink>
     <EnableCodeSigning>false</EnableCodeSigning>
@@ -11,11 +31,12 @@
     <PackageSigningKey>3rd Party Mac Developer Installer: YOURNAME (*******)</PackageSigningKey>
     <UseHardenedRuntime>false</UseHardenedRuntime>
   </PropertyGroup>
+  -->
 
+  <!--
+  For Release:
   <PropertyGroup Condition="$(TargetFramework.Contains('-maccatalyst')) and '$(Configuration)' == 'Release'">
     <MtouchLink>Full</MtouchLink>
-    <!--You must specify both both architectures or only x64 as desired. arm64 only is not permitted.-->
-    <RuntimeIdentifiers>maccatalyst-x64;maccatalyst-arm64</RuntimeIdentifiers>
     <RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">MacCatalystApp1</RootNamespace>
     <OutputType>Exe</OutputType>
     <Nullable>enable</Nullable>
@@ -30,5 +51,6 @@
     <CodesignProvision>YOUR PROFILE NAME</CodesignProvision>
     <PackageSigningKey>3rd Party Mac Developer Installer: YOURNAME (*******)</PackageSigningKey>
     <UseHardenedRuntime>true</UseHardenedRuntime>
-  </PropertyGroup>
-</Project>
+  </PropertyGroup>-->
+
+</Project>
\ No newline at end of file

From 9ec6b2e13669fbf56561902e71b992781d0efe31 Mon Sep 17 00:00:00 2001
From: Dustin Wojciechowski <dustin.wojciechowski@microsoft.com>
Date: Thu, 16 Mar 2023 18:19:08 -0700
Subject: [PATCH 5/8] Added comments about replacing placeholder information
 before building

---
 .../maccatalyst/csharp/MacCatalystApp1.csproj                 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dotnet/Templates/Microsoft.MacCatalyst.Templates/maccatalyst/csharp/MacCatalystApp1.csproj b/dotnet/Templates/Microsoft.MacCatalyst.Templates/maccatalyst/csharp/MacCatalystApp1.csproj
index 515b4e69cd89..e4e940e94f49 100644
--- a/dotnet/Templates/Microsoft.MacCatalyst.Templates/maccatalyst/csharp/MacCatalystApp1.csproj
+++ b/dotnet/Templates/Microsoft.MacCatalyst.Templates/maccatalyst/csharp/MacCatalystApp1.csproj
@@ -18,7 +18,7 @@
   </PropertyGroup>
 
   <!--
-  For Debug:
+  For Debug: (Note: Replace placeholder information before building)
   <PropertyGroup Condition="$(TargetFramework.Contains('-maccatalyst')) and '$(Configuration)' == 'Debug'">
     <MtouchLink>none</MtouchLink>
     <EnableCodeSigning>false</EnableCodeSigning>
@@ -34,7 +34,7 @@
   -->
 
   <!--
-  For Release:
+  For Release: (Note: Replace placeholder information before building)
   <PropertyGroup Condition="$(TargetFramework.Contains('-maccatalyst')) and '$(Configuration)' == 'Release'">
     <MtouchLink>Full</MtouchLink>
     <RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">MacCatalystApp1</RootNamespace>

From 563b0fc74fb6164b6eb51282041dcd471bb011b5 Mon Sep 17 00:00:00 2001
From: Dustin Wojciechowski <dustin.wojciechowski@microsoft.com>
Date: Fri, 17 Mar 2023 10:12:37 -0700
Subject: [PATCH 6/8] Addressed PR comments

---
 .../maccatalyst/csharp/Entitlements.plist     |  9 +++--
 .../maccatalyst/csharp/Info.plist             | 14 ++++---
 .../maccatalyst/csharp/MacCatalystApp1.csproj | 39 +++++++++++--------
 3 files changed, 38 insertions(+), 24 deletions(-)

diff --git a/dotnet/Templates/Microsoft.MacCatalyst.Templates/maccatalyst/csharp/Entitlements.plist b/dotnet/Templates/Microsoft.MacCatalyst.Templates/maccatalyst/csharp/Entitlements.plist
index 58ff5fd684b5..20a283665b37 100644
--- a/dotnet/Templates/Microsoft.MacCatalyst.Templates/maccatalyst/csharp/Entitlements.plist
+++ b/dotnet/Templates/Microsoft.MacCatalyst.Templates/maccatalyst/csharp/Entitlements.plist
@@ -2,10 +2,13 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
     <dict>
-        <!-- Uncomment the following lines when preparing for release builds.
-        <key>com.apple.security.app-sandbox</key>
+        <!-- app.sandbox is required by the App Store.-->
+        <!-- <key>com.apple.security.app-sandbox</key>
         <true/>
-        <key>com.apple.security.network.client</key>
+        -->
+
+        <!-- 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/dotnet/Templates/Microsoft.MacCatalyst.Templates/maccatalyst/csharp/Info.plist b/dotnet/Templates/Microsoft.MacCatalyst.Templates/maccatalyst/csharp/Info.plist
index e173dda24d15..b86e4981b302 100644
--- a/dotnet/Templates/Microsoft.MacCatalyst.Templates/maccatalyst/csharp/Info.plist
+++ b/dotnet/Templates/Microsoft.MacCatalyst.Templates/maccatalyst/csharp/Info.plist
@@ -10,11 +10,15 @@
     <string>1.0</string>
     <key>CFBundleVersion</key>
     <string>1.0</string>
-    <key>ITSAppUsesNonExemptEncryption</key>
-    <false/>
-    <!--Specify the category for your app here.-->
-    <key>LSApplicationCategoryType</key>
-    <string>public.app-category.productivity</string>
+    <!-- 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> -->
     <key>UIDeviceFamily</key>
     <array>
         <integer>2</integer>
diff --git a/dotnet/Templates/Microsoft.MacCatalyst.Templates/maccatalyst/csharp/MacCatalystApp1.csproj b/dotnet/Templates/Microsoft.MacCatalyst.Templates/maccatalyst/csharp/MacCatalystApp1.csproj
index e4e940e94f49..965a3f664200 100644
--- a/dotnet/Templates/Microsoft.MacCatalyst.Templates/maccatalyst/csharp/MacCatalystApp1.csproj
+++ b/dotnet/Templates/Microsoft.MacCatalyst.Templates/maccatalyst/csharp/MacCatalystApp1.csproj
@@ -1,26 +1,35 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>net7.0-maccatalyst</TargetFramework>
-    <!--Both architectures:
-    <RuntimeIdentifier>maccatalyst-x64;maccatalyst-arm64</RuntimeIdentifier>-->
-    <!--Only x64. Please note that selecting only arm64 is not permitted.-->
-    <RuntimeIdentifier>maccatalyst-x64</RuntimeIdentifier>
+    <!-- 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>
     <Nullable>enable</Nullable>
     <ImplicitUsings>true</ImplicitUsings>
-    <SupportedOSPlatformVersion>14.2</SupportedOSPlatformVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <CreatePackage>false</CreatePackage>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <CreatePackage>false</CreatePackage>
   </PropertyGroup>
 
+  <!-- Notes about the values set below:
+    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.
+    -->
   <!--
   For Debug: (Note: Replace placeholder information before building)
-  <PropertyGroup Condition="$(TargetFramework.Contains('-maccatalyst')) and '$(Configuration)' == 'Debug'">
-    <MtouchLink>none</MtouchLink>
+  <PropertyGroup Condition="'$(Configuration)' == 'Debug'">
     <EnableCodeSigning>false</EnableCodeSigning>
     <ProvisionType>Manual</ProvisionType>
     <CreatePackage>false</CreatePackage>
@@ -32,10 +41,9 @@
     <UseHardenedRuntime>false</UseHardenedRuntime>
   </PropertyGroup>
   -->
-
   <!--
   For Release: (Note: Replace placeholder information before building)
-  <PropertyGroup Condition="$(TargetFramework.Contains('-maccatalyst')) and '$(Configuration)' == 'Release'">
+  <PropertyGroup Condition="'$(Configuration)' == 'Release'">
     <MtouchLink>Full</MtouchLink>
     <RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">MacCatalystApp1</RootNamespace>
     <OutputType>Exe</OutputType>
@@ -52,5 +60,4 @@
     <PackageSigningKey>3rd Party Mac Developer Installer: YOURNAME (*******)</PackageSigningKey>
     <UseHardenedRuntime>true</UseHardenedRuntime>
   </PropertyGroup>-->
-
 </Project>
\ No newline at end of file

From 9a62e1578485bda84611032b0426482bc59ea3d3 Mon Sep 17 00:00:00 2001
From: Dustin Wojciechowski <dustin.wojciechowski@microsoft.com>
Date: Tue, 21 Mar 2023 10:51:36 -0700
Subject: [PATCH 7/8] Addressed PR comments

---
 .../maccatalyst/csharp/Entitlements.plist     |  2 +-
 .../maccatalyst/csharp/MacCatalystApp1.csproj | 32 +++++++------------
 .../maccatalyst/csharp/MacCatalystApp1.sln    | 25 +++++++++++++++
 3 files changed, 37 insertions(+), 22 deletions(-)
 create mode 100644 dotnet/Templates/Microsoft.MacCatalyst.Templates/maccatalyst/csharp/MacCatalystApp1.sln

diff --git a/dotnet/Templates/Microsoft.MacCatalyst.Templates/maccatalyst/csharp/Entitlements.plist b/dotnet/Templates/Microsoft.MacCatalyst.Templates/maccatalyst/csharp/Entitlements.plist
index 20a283665b37..f1386b8822b0 100644
--- a/dotnet/Templates/Microsoft.MacCatalyst.Templates/maccatalyst/csharp/Entitlements.plist
+++ b/dotnet/Templates/Microsoft.MacCatalyst.Templates/maccatalyst/csharp/Entitlements.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>
-        <!-- app.sandbox is required by the App Store.-->
+        <!-- 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/>
         -->
diff --git a/dotnet/Templates/Microsoft.MacCatalyst.Templates/maccatalyst/csharp/MacCatalystApp1.csproj b/dotnet/Templates/Microsoft.MacCatalyst.Templates/maccatalyst/csharp/MacCatalystApp1.csproj
index 965a3f664200..3605b3448c98 100644
--- a/dotnet/Templates/Microsoft.MacCatalyst.Templates/maccatalyst/csharp/MacCatalystApp1.csproj
+++ b/dotnet/Templates/Microsoft.MacCatalyst.Templates/maccatalyst/csharp/MacCatalystApp1.csproj
@@ -9,6 +9,8 @@
     <OutputType>Exe</OutputType>
     <Nullable>enable</Nullable>
     <ImplicitUsings>true</ImplicitUsings>
+    <RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">MacCatalystApp1</RootNamespace>
+    <SupportedOSPlatformVersion>minOSVersion</SupportedOSPlatformVersion>
   </PropertyGroup>
 
   <!-- Notes about the values set below:
@@ -17,47 +19,35 @@
           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.
+          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
+          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).
+          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.
+    6. UseHardenedRuntime must be set to true when app sandbox is enabled in Info.plist.
     -->
   <!--
   For Debug: (Note: Replace placeholder information before building)
   <PropertyGroup Condition="'$(Configuration)' == 'Debug'">
-    <EnableCodeSigning>false</EnableCodeSigning>
-    <ProvisionType>Manual</ProvisionType>
-    <CreatePackage>false</CreatePackage>
-    <EnablePackageSigning>true</EnablePackageSigning>
-    <CodesignKey>Apple Distribution: YOURNAME (*******)</CodesignKey>
+    <CodesignKey>Apple Development: YOURNAME (*******)</CodesignKey>
     <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
     <CodesignProvision>YOUR PROFILE NAME</CodesignProvision>
-    <PackageSigningKey>3rd Party Mac Developer Installer: YOURNAME (*******)</PackageSigningKey>
-    <UseHardenedRuntime>false</UseHardenedRuntime>
   </PropertyGroup>
   -->
   <!--
   For Release: (Note: Replace placeholder information before building)
   <PropertyGroup Condition="'$(Configuration)' == 'Release'">
-    <MtouchLink>Full</MtouchLink>
-    <RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">MacCatalystApp1</RootNamespace>
-    <OutputType>Exe</OutputType>
-    <Nullable>enable</Nullable>
-    <ImplicitUsings>true</ImplicitUsings>
-    <SupportedOSPlatformVersion>minOSVersion</SupportedOSPlatformVersion>
     <EnableCodeSigning>True</EnableCodeSigning>
     <ProvisionType>Manual</ProvisionType>
     <CreatePackage>true</CreatePackage>
     <EnablePackageSigning>true</EnablePackageSigning>
     <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
-    <CodesignKey>Apple Distribution: YOURNAME (*******)</CodesignKey>
+    <CodesignKey>Apple Development: YOURNAME (*******)</CodesignKey>
     <CodesignProvision>YOUR PROFILE NAME</CodesignProvision>
     <PackageSigningKey>3rd Party Mac Developer Installer: YOURNAME (*******)</PackageSigningKey>
     <UseHardenedRuntime>true</UseHardenedRuntime>
   </PropertyGroup>-->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/dotnet/Templates/Microsoft.MacCatalyst.Templates/maccatalyst/csharp/MacCatalystApp1.sln b/dotnet/Templates/Microsoft.MacCatalyst.Templates/maccatalyst/csharp/MacCatalystApp1.sln
new file mode 100644
index 000000000000..f0446d216263
--- /dev/null
+++ b/dotnet/Templates/Microsoft.MacCatalyst.Templates/maccatalyst/csharp/MacCatalystApp1.sln
@@ -0,0 +1,25 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 25.0.1706.0
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MacCatalystApp1", "MacCatalystApp1.csproj", "{BD89ED39-5859-4FF5-8BFC-61F32E97BB18}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{BD89ED39-5859-4FF5-8BFC-61F32E97BB18}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BD89ED39-5859-4FF5-8BFC-61F32E97BB18}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BD89ED39-5859-4FF5-8BFC-61F32E97BB18}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BD89ED39-5859-4FF5-8BFC-61F32E97BB18}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {CA2A02EF-A45C-4DBF-BB84-9E2648D03117}
+	EndGlobalSection
+EndGlobal

From 52500b8a4ef6ab8672bdcd166b93715deeaafe61 Mon Sep 17 00:00:00 2001
From: dustin-wojciechowski <dustin.wojciechowski@microsoft.com>
Date: Tue, 21 Mar 2023 12:52:58 -0700
Subject: [PATCH 8/8] Delete MacCatalystApp1.sln

---
 .../maccatalyst/csharp/MacCatalystApp1.sln    | 25 -------------------
 1 file changed, 25 deletions(-)
 delete mode 100644 dotnet/Templates/Microsoft.MacCatalyst.Templates/maccatalyst/csharp/MacCatalystApp1.sln

diff --git a/dotnet/Templates/Microsoft.MacCatalyst.Templates/maccatalyst/csharp/MacCatalystApp1.sln b/dotnet/Templates/Microsoft.MacCatalyst.Templates/maccatalyst/csharp/MacCatalystApp1.sln
deleted file mode 100644
index f0446d216263..000000000000
--- a/dotnet/Templates/Microsoft.MacCatalyst.Templates/maccatalyst/csharp/MacCatalystApp1.sln
+++ /dev/null
@@ -1,25 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 25.0.1706.0
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MacCatalystApp1", "MacCatalystApp1.csproj", "{BD89ED39-5859-4FF5-8BFC-61F32E97BB18}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{BD89ED39-5859-4FF5-8BFC-61F32E97BB18}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BD89ED39-5859-4FF5-8BFC-61F32E97BB18}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BD89ED39-5859-4FF5-8BFC-61F32E97BB18}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BD89ED39-5859-4FF5-8BFC-61F32E97BB18}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {CA2A02EF-A45C-4DBF-BB84-9E2648D03117}
-	EndGlobalSection
-EndGlobal