Remove maccatalyst as it won't work

infinitespace-studios · Aug 19, 2024 · 15b2dbb · 15b2dbb
1 parent 18fc443
commit 15b2dbb
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 52 deletions.
diff --git a/sample/Platforms/MacCatalyst/Program.cs b/sample/Platforms/MacCatalyst/Program.cs
diff --git a/sample/sample.csproj b/sample/sample.csproj
@@ -3,11 +3,12 @@
  <PropertyGroup>
  <OutputType>Exe</OutputType>
  <TargetFrameworks>net8.0;net8.0-android</TargetFrameworks>
- <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('osx'))">$(TargetFrameworks);net8.0-maccatalyst;net8.0-ios</TargetFrameworks>
+ <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('osx'))">$(TargetFrameworks);net8.0-ios</TargetFrameworks>
  <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net8.0-windows10.0.19041.0</TargetFrameworks>
  <ImplicitUsings>enable</ImplicitUsings>
  <!-- <Nullable>enable</Nullable> -->
  <SingleProject>true</SingleProject>
+ <EnableTrimAnalyzer>true</EnableTrimAnalyzer> 
  </PropertyGroup>
 
  <PropertyGroup>
@@ -23,9 +24,6 @@
  <ItemGroup Condition=" $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == ''">
  <PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.1.303" />
  </ItemGroup>
- <ItemGroup Condition=" $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">
- <PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.1.303" />
- </ItemGroup>
  <ItemGroup Condition=" $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">
  <PackageReference Include="MonoGame.Framework.Android" Version="3.8.1.303" />
  </ItemGroup>

diff --git a/src/buildTransitive/MonoGame.SingleProject.Before.targets b/src/buildTransitive/MonoGame.SingleProject.Before.targets
@@ -11,7 +11,6 @@
  </PropertyGroup>
  <PropertyGroup Condition="'$(MonoGamePlatform)' == ''">
  <MonoGamePlatform Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">windowsdx</MonoGamePlatform>
- <MonoGamePlatform Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">desktopgl</MonoGamePlatform>
  <MonoGamePlatform Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">android</MonoGamePlatform>
  <MonoGamePlatform Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">ios</MonoGamePlatform>
  <MonoGamePlatform Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == ''">desktopgl</MonoGamePlatform>

diff --git a/src/buildTransitive/MonoGame.SingleProject.props b/src/buildTransitive/MonoGame.SingleProject.props
@@ -0,0 +1,24 @@
+<Project>
+ <PropertyGroup>
+ <!-- To attempt XAML hot reload features one day -->
+ <!--<IgnoreMauiXamlHotReloadCompatibilityCheck>true</IgnoreMauiXamlHotReloadCompatibilityCheck>-->
+ <SingleProject>true</SingleProject>
+ </PropertyGroup>
+ <ItemGroup>
+ <!-- This tells VS Windows to load XamarinVS -->
+ <ProjectCapability Include="Maui" />
+ <!-- If we want to track MonoGame -->
+ <ProjectCapability Include="MonoGame" />
+ </ItemGroup>
+
+ <Import Project="MonoGame.SingleProject.Globs.props" /> 
+
+ <ItemGroup Condition="'$(ImplicitUsings)' == 'true' or '$(ImplicitUsings)' == 'enable'">
+ <Using Include="Microsoft.Xna.Framework" />
+ <Using Include="Microsoft.Xna.Framework.Graphics" />
+ <Using Include="Microsoft.Xna.Framework.Input" />
+ <Using Include="Microsoft.Xna.Framework.Audio" />
+ <Using Include="Microsoft.Xna.Framework.Content" />
+ </ItemGroup>
+
+</Project>
diff --git a/src/buildTransitive/MonoGame.SingleProject.targets b/src/buildTransitive/MonoGame.SingleProject.targets
@@ -15,10 +15,6 @@
  <EnableDefaultiOSItems>false</EnableDefaultiOSItems>
  <iOSProjectFolder Condition=" '$(iOSProjectFolder)' == '' ">$(PlatformsProjectFolder)iOS\</iOSProjectFolder>
  <iOSProjectFolder>$([MSBuild]::EnsureTrailingSlash('$(iOSProjectFolder)'))</iOSProjectFolder>
- <!-- MacCatalyst -->
- <EnableDefaultMacCatalystItems>false</EnableDefaultMacCatalystItems>
- <MacCatalystProjectFolder Condition=" '$(MacCatalystProjectFolder)' == '' ">$(PlatformsProjectFolder)MacCatalyst\</MacCatalystProjectFolder>
- <MacCatalystProjectFolder>$([MSBuild]::EnsureTrailingSlash('$(MacCatalystProjectFolder)'))</MacCatalystProjectFolder>
  <!-- Windows -->
  <EnableDefaultWindowsItems>false</EnableDefaultWindowsItems>
  <WindowsProjectFolder Condition=" '$(WindowsProjectFolder)' == '' ">$(PlatformsProjectFolder)Windows\</WindowsProjectFolder>
@@ -32,7 +28,6 @@
  <ItemGroup>
  <MonoGamePlatformSpecificFolder Include="$(AndroidProjectFolder)" TargetPlatformIdentifier="android" />
  <MonoGamePlatformSpecificFolder Include="$(iOSProjectFolder)" TargetPlatformIdentifier="ios" />
- <MonoGamePlatformSpecificFolder Include="$(MacCatalystProjectFolder)" TargetPlatformIdentifier="maccatalyst" />
  <MonoGamePlatformSpecificFolder Include="$(WindowsProjectFolder)" TargetPlatformIdentifier="windows" />
  <MonoGamePlatformSpecificFolder Include="$(DesktopProjectFolder)" TargetPlatformIdentifier="" />
  </ItemGroup>
@@ -49,12 +44,6 @@
  <_SingleProjectiOSExcludes>$(iOSProjectFolder)/**/.*/**</_SingleProjectiOSExcludes>
  </PropertyGroup>
 
- <PropertyGroup Condition=" '$(SingleProject)' == 'true' and '$([MSBuild]::GetTargetPlatformIdentifier($(TargetFramework)))' == 'maccatalyst' ">
- <IPhoneResourcePrefix>$(MacCatalystProjectFolder)Resources</IPhoneResourcePrefix>
- <CodesignEntitlements Condition=" Exists('$(MacCatalystProjectFolder)Entitlements.plist') ">$(MacCatalystProjectFolder)Entitlements.plist</CodesignEntitlements>
- <_SingleProjectMacCatalystExcludes>$(MacCatalystProjectFolder)/**/.*/**</_SingleProjectMacCatalystExcludes>
- </PropertyGroup>
-
  <PropertyGroup Condition=" '$(SingleProject)' == 'true' and '$([MSBuild]::GetTargetPlatformIdentifier($(TargetFramework)))' == 'windows' ">
  <ApplicationManifest Condition=" Exists('$(WindowsProjectFolder)app.manifest') ">$(WindowsProjectFolder)app.manifest</ApplicationManifest>
  <PackageManifest Condition=" Exists('$(WindowsProjectFolder)Package.appxmanifest') ">$(WindowsProjectFolder)Package.appxmanifest</PackageManifest>
@@ -86,11 +75,6 @@
  Update="$(iOSProjectFolder)**/*$(DefaultLanguageSourceExtension)">
  <ExcludeFromCurrentConfiguration>false</ExcludeFromCurrentConfiguration>
  </Compile>
- <Compile
- Condition=" '$(TargetPlatformIdentifier)' == 'maccatalyst' "
- Update="$(MacCatalystProjectFolder)**/*$(DefaultLanguageSourceExtension)">
- <ExcludeFromCurrentConfiguration>false</ExcludeFromCurrentConfiguration>
- </Compile>
  <Compile
  Condition=" '$(TargetPlatformIdentifier)' == 'windows' "
  Update="$(WindowsProjectFolder)**/*$(DefaultLanguageSourceExtension)">