Update target frameworks

jerry08 · Nov 16, 2024 · 44c5395 · 44c5395
1 parent 2b3ab6e
commit 44c5395
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 10 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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>