Merge pull request #11078 from unoplatform/dev/jela/templates-adjust

Misc templates adjustments

src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Views/UnoQuickStart.csproj

@@ -1,11 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFrameworks>$libarybasetargetframework$</TargetFrameworks>
 		$if$($UseWinUI$ == True)<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('Windows')) or '$(EnableWindowsTargeting)' == 'true'">$(TargetFrameworks);$basetargetframework$-windows10.0.18362</TargetFrameworks>$endif$
-		$if$($UseAndroid$ == True)<TargetFrameworks>$(TargetFrameworks);$basetargetframework$-android</TargetFrameworks>$endif$
-		$if$($UseIOS$ == True)<TargetFrameworks>$(TargetFrameworks);$basetargetframework$-ios</TargetFrameworks>$endif$
-		$if$($UseCatalyst$ == True)<TargetFrameworks>$(TargetFrameworks);$basetargetframework$-maccatalyst</TargetFrameworks>$endif$
-		$if$($UseAppKit$ == True)<TargetFrameworks>$(TargetFrameworks);$basetargetframework$-macos</TargetFrameworks>$endif$
+		<TargetFrameworks>$(TargetFrameworks);$libarybasetargetframework$</TargetFrameworks>
+
+		<!-- 
+			This condition is used when building under Linux. If you're not building under
+			 Linux, you can remove this line and the conditions below.
+		-->
+		<_CanUseMobileTargets Condition="!$([MSBuild]::IsOSPlatform('Linux'))">true</_CanUseMobileTargets>
+
+		$if$($UseAndroid$ == True)<TargetFrameworks Condition="'$(_CanUseMobileTargets)'=='true'">$(TargetFrameworks);$basetargetframework$-android</TargetFrameworks>$endif$
+		$if$($UseIOS$ == True)<TargetFrameworks Condition="'$(_CanUseMobileTargets)'=='true'">$(TargetFrameworks);$basetargetframework$-ios</TargetFrameworks>$endif$
+		$if$($UseCatalyst$ == True)<TargetFrameworks Condition="'$(_CanUseMobileTargets)'=='true'">$(TargetFrameworks);$basetargetframework$-maccatalyst</TargetFrameworks>$endif$
+		$if$($UseAppKit$ == True)<TargetFrameworks Condition="'$(_CanUseMobileTargets)'=='true'">$(TargetFrameworks);$basetargetframework$-macos</TargetFrameworks>$endif$
 
 		<DefaultLanguage>en</DefaultLanguage>
 

src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Wasm/LinkerConfig.xml

@@ -1,10 +1,11 @@
 <linker>
   <assembly fullname="$ext_safeprojectname$.Wasm" />
-  <assembly fullname="Uno.UI" />
   <assembly fullname="Microsoft.Extensions.Options" />
 
+	<!-- 
+  Uncomment this section when using JSON.NET
   <assembly fullname="System.Core">
-	<!-- This is required by JSon.NET and any expression.Compile caller -->
-	<type fullname="System.Linq.Expressions*" />
+	  <type fullname="System.Linq.Expressions*" />
   </assembly>
+   -->
 </linker>