Fix files for Mac Catalyst (#446)

* Fix Catalyst

* This is uncool it seems

.nuspec/Microsoft.Maui.Controls.SingleProject.targets

@@ -3,20 +3,20 @@
   <PropertyGroup Condition=" '$(SingleProject)' == 'true' ">
     <!-- Android -->
     <EnableDefaultAndroidItems>false</EnableDefaultAndroidItems>
-    <AndroidProjectFolder Condition=" '$(AndroidProjectFolder)' == '' ">Android/</AndroidProjectFolder>
+    <AndroidProjectFolder Condition=" '$(AndroidProjectFolder)' == '' ">Android\</AndroidProjectFolder>
     <AndroidManifest>$(AndroidProjectFolder)AndroidManifest.xml</AndroidManifest>
     <MonoAndroidResourcePrefix>$(AndroidProjectFolder)Resources</MonoAndroidResourcePrefix>
     <MonoAndroidAssetsPrefix>$(AndroidProjectFolder)Assets</MonoAndroidAssetsPrefix>
     <!-- iOS -->
     <EnableDefaultiOSItems>false</EnableDefaultiOSItems>
-    <iOSProjectFolder Condition=" '$(iOSProjectFolder)' == '' ">iOS/</iOSProjectFolder>
+    <iOSProjectFolder Condition=" '$(iOSProjectFolder)' == '' ">iOS\</iOSProjectFolder>
     <IPhoneResourcePrefix Condition=" '$([MSBuild]::GetTargetPlatformIdentifier($(TargetFramework)))' == 'ios' ">$(iOSProjectFolder)Resources</IPhoneResourcePrefix>
     <_SingleProjectiOSExcludes>$(iOSProjectFolder)/**/.*/**</_SingleProjectiOSExcludes>
 
     <!-- MacCatalyst -->
     <EnableDefaultMacCatalystItems>false</EnableDefaultMacCatalystItems>
-    <MacCatalystProjectFolder Condition=" '$(MacCatalystProjectFolder)' == '' ">MacCatalyst/</MacCatalystProjectFolder>
-    <IPhoneResourcePrefix Condition=" '$([MSBuild]::GetTargetPlatformIdentifier($(TargetFramework)))' == 'maccatalyst' ">$(MacCatalystProjectFolder)Resources</IPhoneResourcePrefix>    
+    <MacCatalystProjectFolder Condition=" '$(MacCatalystProjectFolder)' == '' ">MacCatalyst\</MacCatalystProjectFolder>
+    <IPhoneResourcePrefix Condition=" '$([MSBuild]::GetTargetPlatformIdentifier($(TargetFramework)))' == 'maccatalyst' ">$(MacCatalystProjectFolder)Resources</IPhoneResourcePrefix>
     <_SingleProjectMacCatalystExcludes>$(MacCatalystProjectFolder)/**/.*/**</_SingleProjectMacCatalystExcludes>
   </PropertyGroup>
 

src/Controls/samples/Controls.Sample.MacCatalyst/Info.plist

@@ -10,8 +10,6 @@
 	<string>1.0</string>
 	<key>CFBundleVersion</key>
 	<string>1.0</string>
-	<key>LSRequiresIPhoneOS</key>
-	<true/>
 	<key>LSMinimumSystemVersion</key>
 	<string>10.15</string>
 	<key>UIDeviceFamily</key>

src/Controls/samples/Controls.Sample.SingleProject/MacCatalyst/Info.plist

@@ -2,9 +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>
-	<key>LSRequiresIPhoneOS</key>
-	<true/>
-	<key>LSMinimumOSVersion</key>
+	<key>LSMinimumSystemVersion</key>
 	<string>10.15</string>
 	<key>UIDeviceFamily</key>
 	<array>

src/Package/Package-net6.csproj

@@ -7,7 +7,7 @@
 		<AssemblyName>Microsoft.Maui.Package</AssemblyName>
 		<Nullable>enable</Nullable>
 		<RuntimeIdentifier Condition=" '$(TargetFramework)' == 'net6.0-ios' ">ios-x64</RuntimeIdentifier>
-    <RuntimeIdentifier Condition=" '$(TargetFramework)' == 'net6.0-maccatalyst' ">maccatalyst-x64</RuntimeIdentifier>
+		<RuntimeIdentifier Condition=" '$(TargetFramework)' == 'net6.0-maccatalyst' ">maccatalyst-x64</RuntimeIdentifier>
 		<IncludeBuildOutput>False</IncludeBuildOutput>
 		<NoWarn>$(NoWarn);NU5100;NU5128;</NoWarn>
 	</PropertyGroup>
@@ -29,7 +29,7 @@
 	<ItemGroup Condition=" '$(TargetPlatformIdentifier)' == 'android' ">
 		<ProjectReference Include="..\Compatibility\Core\src\Android.FormsViewGroup\Compatibility.Android.FormsViewGroup-net6.csproj" />
 	</ItemGroup>
-	<ItemGroup Condition=" '$(TargetPlatformIdentifier)' == 'android' Or  '$(TargetPlatformIdentifier)' == 'ios' ">
+	<ItemGroup Condition=" '$(TargetPlatformIdentifier)' == 'android' Or '$(TargetPlatformIdentifier)' == 'ios' Or '$(TargetPlatformIdentifier)' == 'maccatalyst' ">
 		<ProjectReference Include="..\Compatibility\Core\src\Compatibility-net6.csproj" />
 	</ItemGroup>