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] 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