Merge pull request #627 from unoplatform/mergify/bp/release/stable/5.…

…2/pr-608 re-enable disabled tests (backport #608)
unoplatform · Apr 10, 2024 · 3104032 · 3104032
2 parents 2258010 + 1107e30
commit 3104032
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 16 deletions.
diff --git a/build/.azure-pipelines.TemplateValidation.yml b/build/.azure-pipelines.TemplateValidation.yml
@@ -79,17 +79,15 @@ jobs:
         templateArgs: '-preset=recommended -auth=msal -markup csharp'
       MsalAuthMvvmCSharp:
         templateArgs: '-preset=recommended -presentation mvvm -auth=msal -markup csharp'
-      # NOTE: Temporarily disabling so we can merge #585
-      # MauiBlank:
-      #  templateArgs: '-preset=blank -maui'
-      # MauiRecommended:
-      #  templateArgs: '-preset=recommended -maui'
+      MauiBlank:
+       templateArgs: '-preset=blank -maui'
+      MauiRecommended:
+       templateArgs: '-preset=recommended -maui'
       ThemeService:
        templateArgs: '-theme-service'
-      # NOTE: Temporarily disabling so we can merge #585
       # https://github.com/unoplatform/uno.templates/issues/396
-      # Issue396:
-      #  templateArgs: '-preset blank -platforms windows -platforms android -presentation none -theme fluent -nav blank -log none -maui -markup csharp'
+      Issue396:
+       templateArgs: '-preset blank -platforms windows -platforms android -presentation none -theme fluent -nav blank -log none -maui -markup csharp'
       # https://github.com/unoplatform/uno.templates/issues/414
       Issue414:
        templateArgs: '-preset recommended -auth msal -markup csharp'

diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets
@@ -2,11 +2,11 @@
   <Import Project="Directory.UnoMetadata.targets" />
 
   <PropertyGroup>
-    <UnoVersion Condition="'$(UnoVersion)' == ''">5.2.7</UnoVersion>
-    <UnoExtensionsVersion Condition="'$(UnoExtensionsVersion)' == ''">4.1.1</UnoExtensionsVersion>
-    <UnoThemesVersion Condition="'$(UnoThemesVersion)' == ''">5.0.1</UnoThemesVersion>
-    <UnoToolkitVersion Condition="'$(UnoToolkitVersion)' == ''">6.0.2</UnoToolkitVersion>
-    <UnoMarkupVersion Condition="'$(UnoMarkupVersion)' == ''">5.2.0</UnoMarkupVersion>
+    <UnoVersion Condition="'$(UnoVersion)' == ''">5.2.22</UnoVersion>
+    <UnoExtensionsVersion Condition="'$(UnoExtensionsVersion)' == ''">4.1.4</UnoExtensionsVersion>
+    <UnoThemesVersion Condition="'$(UnoThemesVersion)' == ''">5.0.2</UnoThemesVersion>
+    <UnoToolkitVersion Condition="'$(UnoToolkitVersion)' == ''">6.0.5</UnoToolkitVersion>
+    <UnoMarkupVersion Condition="'$(UnoMarkupVersion)' == ''">5.2.2</UnoMarkupVersion>
     <UnoWasmBootstrapVersionNet8 Condition="'$(UnoWasmBootstrapVersionNet8)' == ''">8.0.11</UnoWasmBootstrapVersionNet8>
     <UnoWasmBootstrapVersionNet9 Condition="'$(UnoWasmBootstrapVersionNet9)' == ''">9.0.0-dev.39</UnoWasmBootstrapVersionNet9>
     <UnoExtensionsLoggingVersion Condition="'$(UnoExtensionsLoggingVersion)' == ''">1.7.0</UnoExtensionsLoggingVersion>

diff --git a/src/Uno.Templates/content/unoapp/Directory.Packages.props b/src/Uno.Templates/content/unoapp/Directory.Packages.props
@@ -29,6 +29,10 @@
     <PackageVersion Include="Uno.UITest.Helpers" Version="$UnoUITestHelpersVersion$" />
     <PackageVersion Include="Xamarin.UITest" Version="$XamarinUITest$" />
     <!--#endif-->
+    <!--#if (mauiEmbedding)-->
+    <PackageVersion Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
+    <PackageVersion Include="Microsoft.Maui.Controls.Compatibility" Version="$(MauiVersion)" />
+    <!--#endif-->
     <!--#if (enableDeveloperMode)-->
     $$EnableDeveloperMode_CPM_PackageVersion$$
     <!--#endif-->

diff --git a/...lates/content/unoapp/MyExtensionsApp.1.MauiControls/MyExtensionsApp.1.MauiControls.csproj b/...lates/content/unoapp/MyExtensionsApp.1.MauiControls/MyExtensionsApp.1.MauiControls.csproj
@@ -4,7 +4,11 @@
     <!--#if (unoMauiClassLibrary)-->
     <ImplicitUsings Condition="$(ImplicitUsings) == ''">enable</ImplicitUsings>
     <Nullable Condition="$(Nullable) == ''">enable</Nullable>
+    <ManagePackageVersionsCentrally Condition="$(ManagePackageVersionsCentrally) == ''">true</ManagePackageVersionsCentrally>
 
+    <!--#endif-->
+    <!--#if (useWinAppSdk)-->
+    <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows')) or '$(EnableWindowsTargeting)' == 'true'">$baseTargetFramework$-windows10.0.19041</TargetFrameworks>
     <!--#endif-->
     <TargetFrameworks>
       $baseTargetFramework$;
@@ -18,7 +22,7 @@
       $baseTargetFramework$-maccatalyst;
       <!--#endif-->
       <!--#if (useWinAppSdk)-->
-      $baseTargetFramework$-windows10.0.19041;
+      $(TargetFrameworks);
       <!--#endif-->
     </TargetFrameworks>
 
@@ -63,8 +67,8 @@
   <!--#endif-->
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Maui.Controls" VersionOverride="$(MauiVersion)" />
-    <PackageReference Include="Microsoft.Maui.Controls.Compatibility" VersionOverride="$(MauiVersion)" />
+    <PackageReference Include="Microsoft.Maui.Controls" />
+    <PackageReference Include="Microsoft.Maui.Controls.Compatibility" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Uno.Templates/content/unomauilib/Directory.Packages.props b/src/Uno.Templates/content/unomauilib/Directory.Packages.props
@@ -0,0 +1,6 @@
+<Project>
+  <ItemGroup>
+    <PackageVersion Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
+    <PackageVersion Include="Microsoft.Maui.Controls.Compatibility" Version="$(MauiVersion)" />
+  </ItemGroup>
+</Project>