From 44c5395441083432ba3d8d47670713df9ab93c7a Mon Sep 17 00:00:00 2001
From: jerry08 <jeremyyearwood99@gmail.com>
Date: Sat, 16 Nov 2024 18:24:50 -0400
Subject: [PATCH] Update target frameworks

---
 .github/workflows/main.yml                           | 3 +--
 Yosu.Spotify.Core/Yosu.Spotify.Core.csproj           | 6 +-----
 Yosu.Youtube.Converter/Yosu.Youtube.Converter.csproj | 3 ++-
 Yosu.Youtube.Core/Yosu.Youtube.Core.csproj           | 3 ++-
 Yosu/Yosu.csproj                                     | 3 ++-
 5 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index cf3d9cb..8c3e549 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -69,8 +69,7 @@ jobs:
 
       - name: Install MAUI Workload
         #run: dotnet workload install maui --ignore-failed-sources
-        #run: dotnet workload install maui-android
-        run: dotnet workload install maui
+        run: dotnet workload install maui-android
 
       # Setup JDK and Android SDK on Linux
       - name: Set up JDK
diff --git a/Yosu.Spotify.Core/Yosu.Spotify.Core.csproj b/Yosu.Spotify.Core/Yosu.Spotify.Core.csproj
index 3a48ed5..e3bafc7 100644
--- a/Yosu.Spotify.Core/Yosu.Spotify.Core.csproj
+++ b/Yosu.Spotify.Core/Yosu.Spotify.Core.csproj
@@ -1,11 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>$(NetVersion)-android;$(NetVersion)-ios;$(NetVersion)-maccatalyst</TargetFrameworks>
-    <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);$(NetVersion)-windows10.0.19041.0</TargetFrameworks>
-
-    <!--https://github.com/dotnet/maui/issues/12100-->
-    <PublishReadyToRun>false</PublishReadyToRun>
+    <TargetFramework>$(NetVersion)</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/Yosu.Youtube.Converter/Yosu.Youtube.Converter.csproj b/Yosu.Youtube.Converter/Yosu.Youtube.Converter.csproj
index f28ca53..dde7cc6 100644
--- a/Yosu.Youtube.Converter/Yosu.Youtube.Converter.csproj
+++ b/Yosu.Youtube.Converter/Yosu.Youtube.Converter.csproj
@@ -1,7 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>$(NetVersion);$(NetVersion)-android;$(NetVersion)-ios;$(NetVersion)-maccatalyst</TargetFrameworks>
+    <TargetFrameworks>$(NetVersion)-android</TargetFrameworks>
+    <TargetFrameworks Condition="$([System.OperatingSystem]::IsLinux()) != true">$(NetVersion)-ios;$(NetVersion)-maccatalyst</TargetFrameworks>
 		<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);$(NetVersion)-windows10.0.19041.0</TargetFrameworks>
     <UseMaui>true</UseMaui>
     <!--<UseMauiEssentials>true</UseMauiEssentials>-->
diff --git a/Yosu.Youtube.Core/Yosu.Youtube.Core.csproj b/Yosu.Youtube.Core/Yosu.Youtube.Core.csproj
index 234d054..37e2606 100644
--- a/Yosu.Youtube.Core/Yosu.Youtube.Core.csproj
+++ b/Yosu.Youtube.Core/Yosu.Youtube.Core.csproj
@@ -1,7 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>$(NetVersion)-android;$(NetVersion)-ios;$(NetVersion)-maccatalyst</TargetFrameworks>
+    <TargetFrameworks>$(NetVersion)-android</TargetFrameworks>
+    <TargetFrameworks Condition="$([System.OperatingSystem]::IsLinux()) != true">$(NetVersion)-ios;$(NetVersion)-maccatalyst</TargetFrameworks>
     <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);$(NetVersion)-windows10.0.19041.0</TargetFrameworks>
 
     <!--https://github.com/dotnet/maui/issues/12100-->
diff --git a/Yosu/Yosu.csproj b/Yosu/Yosu.csproj
index 3d3360f..acdad39 100644
--- a/Yosu/Yosu.csproj
+++ b/Yosu/Yosu.csproj
@@ -1,7 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>$(NetVersion)-android;$(NetVersion)-ios</TargetFrameworks>
+    <TargetFrameworks>$(NetVersion)-android</TargetFrameworks>
+    <TargetFrameworks Condition="$([System.OperatingSystem]::IsLinux()) != true">$(NetVersion)-ios</TargetFrameworks>
     <OutputType>Exe</OutputType>
     <RootNamespace>Yosu</RootNamespace>
     <UseMaui>true</UseMaui>