From a7c211c9c0d0ce5e8ac7ebfa72e4a321826bd083 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Laban?= Date: Wed, 13 Apr 2022 08:22:03 -0400 Subject: [PATCH] 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 --- .github/workflows/ci.yml | 8 ++++---- src/UWP/TestLibrary/TestLibrary.csproj | 2 +- .../TestLibrarySingleFile.csproj | 2 +- .../XamlMergeUWPTest.Droid.csproj | 10 +++++----- .../XamlMergeUWPTest.Skia.Gtk.csproj | 6 +++--- .../XamlMergeUWPTest.UWP.csproj | 4 ++-- .../XamlMergeUWPTest.Wasm.csproj | 14 +++++++------- .../XamlMergeUWPTest.iOS.csproj | 8 ++++---- src/Uno.XamlMerge.Task/BatchMergeXaml.cs | 7 +++---- src/Uno.XamlMerge.Task/FullPathComparer.cs | 3 +-- 10 files changed, 31 insertions(+), 33 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bcf3a4c..cfa118a 100644 --- 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 index ac6ced3..e7f1c2b 100644 --- a/src/UWP/TestLibrary/TestLibrary.csproj +++ b/src/UWP/TestLibrary/TestLibrary.csproj @@ -9,7 +9,7 @@ true - + diff --git a/src/UWP/TestLibrarySingleFile/TestLibrarySingleFile.csproj b/src/UWP/TestLibrarySingleFile/TestLibrarySingleFile.csproj index ee5f248..4a9447c 100644 --- a/src/UWP/TestLibrarySingleFile/TestLibrarySingleFile.csproj +++ b/src/UWP/TestLibrarySingleFile/TestLibrarySingleFile.csproj @@ -9,7 +9,7 @@ true - + diff --git a/src/UWP/XamlMergeUWPTest/XamlMergeUWPTest.Droid/XamlMergeUWPTest.Droid.csproj b/src/UWP/XamlMergeUWPTest/XamlMergeUWPTest.Droid/XamlMergeUWPTest.Droid.csproj index d5f05b1..be92448 100644 --- a/src/UWP/XamlMergeUWPTest/XamlMergeUWPTest.Droid/XamlMergeUWPTest.Droid.csproj +++ b/src/UWP/XamlMergeUWPTest/XamlMergeUWPTest.Droid/XamlMergeUWPTest.Droid.csproj @@ -17,7 +17,7 @@ true Off False - v10.0 + v11.0 Properties\AndroidManifest.xml True ..\XamlMergeUWPTest.Shared\Strings @@ -60,10 +60,10 @@ - - - - + + + + diff --git a/src/UWP/XamlMergeUWPTest/XamlMergeUWPTest.Skia.Gtk/XamlMergeUWPTest.Skia.Gtk.csproj b/src/UWP/XamlMergeUWPTest/XamlMergeUWPTest.Skia.Gtk/XamlMergeUWPTest.Skia.Gtk.csproj index 73f70ee..d0fd1a5 100644 --- 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 @@ - - - + + + diff --git a/src/UWP/XamlMergeUWPTest/XamlMergeUWPTest.UWP/XamlMergeUWPTest.UWP.csproj b/src/UWP/XamlMergeUWPTest/XamlMergeUWPTest.UWP/XamlMergeUWPTest.UWP.csproj index f9b51a2..969d15a 100644 --- a/src/UWP/XamlMergeUWPTest/XamlMergeUWPTest.UWP/XamlMergeUWPTest.UWP.csproj +++ b/src/UWP/XamlMergeUWPTest/XamlMergeUWPTest.UWP/XamlMergeUWPTest.UWP.csproj @@ -11,10 +11,10 @@ 6.2.11 - + - + Debug diff --git a/src/UWP/XamlMergeUWPTest/XamlMergeUWPTest.Wasm/XamlMergeUWPTest.Wasm.csproj b/src/UWP/XamlMergeUWPTest/XamlMergeUWPTest.Wasm/XamlMergeUWPTest.Wasm.csproj index 3a0c158..058db3e 100644 --- a/src/UWP/XamlMergeUWPTest/XamlMergeUWPTest.Wasm/XamlMergeUWPTest.Wasm.csproj +++ b/src/UWP/XamlMergeUWPTest/XamlMergeUWPTest.Wasm/XamlMergeUWPTest.Wasm.csproj @@ -42,17 +42,17 @@ - - - + + + - - - + + + - + \ No newline at end of file diff --git a/src/UWP/XamlMergeUWPTest/XamlMergeUWPTest.iOS/XamlMergeUWPTest.iOS.csproj b/src/UWP/XamlMergeUWPTest/XamlMergeUWPTest.iOS/XamlMergeUWPTest.iOS.csproj index 8883a24..c08a7b4 100644 --- a/src/UWP/XamlMergeUWPTest/XamlMergeUWPTest.iOS/XamlMergeUWPTest.iOS.csproj +++ b/src/UWP/XamlMergeUWPTest/XamlMergeUWPTest.iOS/XamlMergeUWPTest.iOS.csproj @@ -113,11 +113,11 @@ - - - + + + - + diff --git a/src/Uno.XamlMerge.Task/BatchMergeXaml.cs b/src/Uno.XamlMerge.Task/BatchMergeXaml.cs index d46b849..80097c4 100644 --- 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 index bb83682..33bbde0 100644 --- a/src/Uno.XamlMerge.Task/FullPathComparer.cs +++ b/src/Uno.XamlMerge.Task/FullPathComparer.cs @@ -10,8 +10,7 @@ internal class FullPathComparer : IEqualityComparer 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)