Merge pull request #16393 from unoplatform/mergify/bp/release/stable/…

…5.2/pr-16387 Fix invalid implicit packages read (backport #16387)
unoplatform · Apr 21, 2024 · c6bfb66 · c6bfb66
2 parents f0ade18 + d3290fb
commit c6bfb66
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/build/test-scripts/run-netcore-mobile-template-tests.ps1 b/build/test-scripts/run-netcore-mobile-template-tests.ps1
@@ -189,6 +189,7 @@ $projects =
     @("5.2/uno52blank/uno52blank/uno52blank.csproj", @("-f", "net8.0-android"), $true),
     @("5.2/uno52blank/uno52blank/uno52blank.csproj", @("-f", "net8.0-maccatalyst"), $true),
     @("5.2/uno52blank/uno52blank/uno52blank.csproj", @("-f", "net8.0-desktop"), $true),
+    @("5.2/uno52blank/uno52blank/uno52blank.csproj", @("-f", "net8.0-desktop", "-p:UnoFeatures=Material%3BExtensions%3BToolkit%3BCSharpMarkup%3BSvg"), $true),
 
     # Default mode for the template is WindowsAppSDKSelfContained=true, which requires specifying a target platform.
     @("5.2/uno52blank/uno52blank/uno52blank.csproj", @("-p:Platform=x86" , "-p:TargetFramework=net8.0-windows10.0.19041"), $false),

diff --git a/src/Uno.Sdk/Services/PackageManifest.cs b/src/Uno.Sdk/Services/PackageManifest.cs
@@ -57,7 +57,7 @@ public PackageManifest(TaskLoggingHelper log, string targetFrameworkVersion)
 
 	public string? GetPackageVersion(string packageId)
 	{
-		var group = _defaultManifest.SingleOrDefault(group => group.Packages.Any(p => p.Equals(packageId, System.StringComparison.InvariantCultureIgnoreCase)));
+		var group = Manifest.SingleOrDefault(group => group.Packages.Any(p => p.Equals(packageId, System.StringComparison.InvariantCultureIgnoreCase)));
 		if (group is null)
 		{
 			_log.LogMessage(MessageImportance.Normal, "Could not locate a package version for the package '{0}'.", packageId);

diff --git a/src/Uno.Sdk/targets/Uno.DefaultItems.Resizetizer.targets b/src/Uno.Sdk/targets/Uno.DefaultItems.Resizetizer.targets
@@ -10,7 +10,12 @@
 		<UnoSplashScreenFile Condition="$(UnoSplashScreenFile) == ''">$(UnoSplashFolder)splash_screen.svg</UnoSplashScreenFile>
 		<UnoSplashScreenBaseSize Condition="$(UnoSplashScreenBaseSize) == ''">128,128</UnoSplashScreenBaseSize>
 		<UnoSplashScreenColor Condition="$(UnoSplashScreenColor) == ''">#FFFFFF</UnoSplashScreenColor>
-		<_UnoResizetizerIsCompatibleApp Condition=" $(_IsUnoSingleProjectAndLegacy) == 'true' ">true</_UnoResizetizerIsCompatibleApp>
+
+		<!-- Support net8.0, without a platform identifier -->
+		<_UnoResizetizerIsCompatibleApp Condition=" 
+			$(_IsUnoSingleProjectAndLegacy) == 'true' 
+			AND '$(TargetFramework)' != '' 
+			AND  $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == '' ">true</_UnoResizetizerIsCompatibleApp>
 	</PropertyGroup>
 
 	<ItemGroup Condition=" $(_IsUnoSingleProjectAndLegacy) == 'true' ">