fix: Invalid merge inclusion (#60)

* ci: Bump to uno latest * fix: Invalid merge inclusion * ci: Adjust android test app * ci: Adjust uno-check * ci: Skip android emulator install * ci: Update Uno.check for RC1
unoplatform · Apr 13, 2022 · a7c211c · a7c211c
1 parent 12de54a
commit a7c211c
Show file tree

Hide file tree

Showing 10 changed files with 31 additions and 33 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -13,8 +13,8 @@ on:
       - release/**
 
 env:
-  UnoCheck_Version: '0.2.0-dev.361'
-  UnoCheck_Manifest: 'https://raw.githubusercontent.com/unoplatform/uno.check/bf3684e2ad725baa66da3573759129d6bb1d8817/manifests/uno.ui.manifest.json'
+  UnoCheck_Version: '1.2.0-dev.24'
+  UnoCheck_Manifest: 'https://raw.githubusercontent.com/unoplatform/uno.check/7017ad61795de3cb8b401282405bdbe263b77548/manifests/uno.ui-preview.manifest.json'
 
 jobs:
   build:
@@ -50,7 +50,7 @@ jobs:
 
     - run: |
           & dotnet tool update --global uno.check --version ${{ env.UnoCheck_Version }} --add-source https://api.nuget.org/v3/index.json
-          & uno-check -v --ci --non-interactive --fix --skip xcode --skip gtk3 --skip vswin --skip vsmac --manifest ${{ env.UnoCheck_Manifest }}
+          & uno-check -v --ci --non-interactive --fix --skip xcode --skip androidemulator --skip gtk3 --skip vswin --skip vsmac --manifest ${{ env.UnoCheck_Manifest }}
       name: Install .NET Workloads
 
 
@@ -93,7 +93,7 @@ jobs:
 
     - run: |
           & dotnet tool update --global uno.check --version ${{ env.UnoCheck_Version }} --add-source https://api.nuget.org/v3/index.json
-          & uno-check -v --ci --non-interactive --fix --skip xcode --skip gtk3 --skip vswin --skip vsmac --manifest ${{ env.UnoCheck_Manifest }}
+          & uno-check -v --ci --non-interactive --fix --skip xcode --skip androidemulator --skip gtk3 --skip vswin --skip vsmac --manifest ${{ env.UnoCheck_Manifest }}
       name: Install .NET Workloads
 
     - name: Build task project

diff --git a/src/UWP/TestLibrary/TestLibrary.csproj b/src/UWP/TestLibrary/TestLibrary.csproj
@@ -9,7 +9,7 @@
 		<GenerateLibraryLayout>true</GenerateLibraryLayout>
 	</PropertyGroup>
 	<ItemGroup>
-		<PackageReference Include="Uno.UI" Version="4.0.13" />
+		<PackageReference Include="Uno.UI" Version="4.1.9" />
 	</ItemGroup>
 	<ItemGroup>
 		<Page Include="**\*.xaml" Exclude="bin\**\*.xaml;obj\**\*.xaml" />

diff --git a/src/UWP/TestLibrarySingleFile/TestLibrarySingleFile.csproj b/src/UWP/TestLibrarySingleFile/TestLibrarySingleFile.csproj
@@ -9,7 +9,7 @@
 		<GenerateLibraryLayout>true</GenerateLibraryLayout>
 	</PropertyGroup>
 	<ItemGroup>
-		<PackageReference Include="Uno.UI" Version="4.0.13" />
+		<PackageReference Include="Uno.UI" Version="4.1.9" />
 	</ItemGroup>
 	<ItemGroup>
 		<Page Include="**\*.xaml" Exclude="bin\**\*.xaml;obj\**\*.xaml" />

diff --git a/src/UWP/XamlMergeUWPTest/XamlMergeUWPTest.Droid/XamlMergeUWPTest.Droid.csproj b/src/UWP/XamlMergeUWPTest/XamlMergeUWPTest.Droid/XamlMergeUWPTest.Droid.csproj
@@ -17,7 +17,7 @@
     <AndroidUseAapt2>true</AndroidUseAapt2>
     <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
     <AndroidUseLatestPlatformSdk>False</AndroidUseLatestPlatformSdk>
-    <TargetFrameworkVersion>v10.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v11.0</TargetFrameworkVersion>
     <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
     <AndroidUseIntermediateDesignerFile>True</AndroidUseIntermediateDesignerFile>
     <ResourcesDirectory>..\XamlMergeUWPTest.Shared\Strings</ResourcesDirectory>
@@ -60,10 +60,10 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Uno.UI" Version="4.0.7" />
-    <PackageReference Include="Uno.UI.RemoteControl" Version="4.0.7" Condition="'$(Configuration)'=='Debug'" />
-    <PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.0.7" />
-    <PackageReference Include="Uno.UniversalImageLoader" Version="1.9.33" />
+    <PackageReference Include="Uno.UI" Version="4.1.9" />
+    <PackageReference Include="Uno.UI.RemoteControl" Version="4.1.9" Condition="'$(Configuration)'=='Debug'" />
+    <PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.1.9" />
+    <PackageReference Include="Uno.UniversalImageLoader" Version="1.9.35" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />
   </ItemGroup>

diff --git a/src/UWP/XamlMergeUWPTest/XamlMergeUWPTest.Skia.Gtk/XamlMergeUWPTest.Skia.Gtk.csproj b/src/UWP/XamlMergeUWPTest/XamlMergeUWPTest.Skia.Gtk/XamlMergeUWPTest.Skia.Gtk.csproj
@@ -15,9 +15,9 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
-    <PackageReference Include="Uno.UI.Skia.Gtk" Version="4.0.7" />
-    <PackageReference Include="Uno.UI.RemoteControl" Version="4.0.7" Condition="'$(Configuration)'=='Debug'" />
-    <PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.0.7" />
+    <PackageReference Include="Uno.UI.Skia.Gtk" Version="4.1.9" />
+    <PackageReference Include="Uno.UI.RemoteControl" Version="4.1.9" Condition="'$(Configuration)'=='Debug'" />
+    <PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.1.9" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\TestLibrary\TestLibrary.csproj" />

diff --git a/src/UWP/XamlMergeUWPTest/XamlMergeUWPTest.UWP/XamlMergeUWPTest.UWP.csproj b/src/UWP/XamlMergeUWPTest/XamlMergeUWPTest.UWP/XamlMergeUWPTest.UWP.csproj
@@ -11,10 +11,10 @@
       <Version>6.2.11</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.UI.Xaml" Version="2.6.2" />
-    <PackageReference Include="Uno.UI" Version="4.0.7" />
+    <PackageReference Include="Uno.UI" Version="4.1.9" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="5.0.0" />
-    <PackageReference Include="Uno.Core.Extensions.Logging.Singleton" Version="4.0.0-dev.7" />
+    <PackageReference Include="Uno.Core.Extensions.Logging.Singleton" Version="4.0.1" />
   </ItemGroup>
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

diff --git a/src/UWP/XamlMergeUWPTest/XamlMergeUWPTest.Wasm/XamlMergeUWPTest.Wasm.csproj b/src/UWP/XamlMergeUWPTest/XamlMergeUWPTest.Wasm/XamlMergeUWPTest.Wasm.csproj
@@ -42,17 +42,17 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Windows.Compatibility" Version="5.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />
-    <PackageReference Include="Uno.Extensions.Logging.WebAssembly.Console" Version="1.0.1" />
-    <PackageReference Include="Uno.UI.WebAssembly" Version="4.0.7" />
-    <PackageReference Include="Uno.UI.RemoteControl" Version="4.0.7" Condition="'$(Configuration)'=='Debug'" />
+    <PackageReference Include="Uno.Extensions.Logging.WebAssembly.Console" Version="1.1.0" />
+    <PackageReference Include="Uno.UI.WebAssembly" Version="4.1.9" />
+    <PackageReference Include="Uno.UI.RemoteControl" Version="4.1.9" Condition="'$(Configuration)'=='Debug'" />
     <PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.0.7" />
-    <PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.0.7" />
-    <PackageReference Include="Uno.Wasm.Bootstrap" Version="3.1.2" />
-    <PackageReference Include="Uno.Wasm.Bootstrap.DevServer" Version="3.1.2" />
+    <PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.1.9" />
+    <PackageReference Include="Uno.Wasm.Bootstrap" Version="3.3.1" />
+    <PackageReference Include="Uno.Wasm.Bootstrap.DevServer" Version="3.3.1" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\TestLibrary\TestLibrary.csproj" />
   </ItemGroup>
   <Import Project="..\XamlMergeUWPTest.Shared\XamlMergeUWPTest.Shared.projitems" Label="Shared" Condition="Exists('..\XamlMergeUWPTest.Shared\XamlMergeUWPTest.Shared.projitems')" />
-	<Import Project="..\XamlMergeUWPTest.UWP\XamlMerge.targets"/>
+	<Import Project="..\XamlMergeUWPTest.UWP\XamlMerge.targets" />
 </Project>
diff --git a/src/UWP/XamlMergeUWPTest/XamlMergeUWPTest.iOS/XamlMergeUWPTest.iOS.csproj b/src/UWP/XamlMergeUWPTest/XamlMergeUWPTest.iOS/XamlMergeUWPTest.iOS.csproj
@@ -113,11 +113,11 @@
     <BundleResource Include="Resources\Fonts\uno-fluentui-assets.ttf" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Uno.UI" Version="4.0.7" />
-    <PackageReference Include="Uno.UI.RemoteControl" Version="4.0.7" Condition="'$(Configuration)'=='Debug'" />
-    <PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.0.7" />
+    <PackageReference Include="Uno.UI" Version="4.1.9" />
+    <PackageReference Include="Uno.UI.RemoteControl" Version="4.1.9" Condition="'$(Configuration)'=='Debug'" />
+    <PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.1.9" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />
-    <PackageReference Include="Uno.Extensions.Logging.OSLog " Version="1.0.1" />
+    <PackageReference Include="Uno.Extensions.Logging.OSLog " Version="1.1.0" />
   </ItemGroup>
   <ItemGroup>
     <ImageAsset Include="Media.xcassets\AppIcons.appiconset\Contents.json">

diff --git a/src/Uno.XamlMerge.Task/BatchMergeXaml.cs b/src/Uno.XamlMerge.Task/BatchMergeXaml.cs
@@ -40,9 +40,8 @@ public override bool Execute()
                 return false;
             }
 
-            var filteredPages = Pages
-                .Except(MergedXamlFiles, FullPathComparer.Default)
-                .ToArray();
+            var filteredPages = Pages.ToList();
+            filteredPages.RemoveAll(e => MergedXamlFiles.Any(m => FullPathComparer.Default.Equals(e, m)));
 
             if (MergedXamlFiles.Length > 1)
             {
@@ -63,7 +62,7 @@ public override bool Execute()
                 BatchMerger.Merge(this,
                         MergedXamlFiles[0].ItemSpec,
                         ProjectFullPath,
-                        filteredPages);
+                        filteredPages.ToArray());
             }
 
             return !HasLoggedErrors;

diff --git a/src/Uno.XamlMerge.Task/FullPathComparer.cs b/src/Uno.XamlMerge.Task/FullPathComparer.cs
@@ -10,8 +10,7 @@ internal class FullPathComparer : IEqualityComparer<ITaskItem>
 
     public bool Equals(ITaskItem x, ITaskItem y)
     {
-        return x.GetMetadata("FullPath") == y.GetMetadata("FullPath")
-           && x.GetMetadata("MergeFile") == y.GetMetadata("MergeFile");
+        return x.GetMetadata("FullPath") == y.GetMetadata("FullPath");
     }
 
     public int GetHashCode(ITaskItem obj)