From cf2e9f589587f2d98cfa3455aa64cfe326793363 Mon Sep 17 00:00:00 2001 From: michael-hawker <24302614+michael-hawker@users.noreply.github.com> Date: Mon, 14 Aug 2023 13:24:57 -0700 Subject: [PATCH 1/5] Fixes issues with the build script in detecting dump files to upload and analyze dorny/paths-filter only works on detecting changes to git files not untracked files Add Blame to test runner and upload of sequence file --- .github/workflows/build.yml | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b38aea89..e7079d4c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -159,7 +159,7 @@ jobs: - name: Run experiment tests against ${{ env.TEST_PLATFORM }} id: test-platform - run: vstest.console.exe ./tooling/**/CommunityToolkit.Tests.${{ env.TEST_PLATFORM }}.build.appxrecipe /Framework:FrameworkUap10 /logger:"trx;LogFileName=${{ env.TEST_PLATFORM }}.trx" + run: vstest.console.exe ./tooling/**/CommunityToolkit.Tests.${{ env.TEST_PLATFORM }}.build.appxrecipe /Framework:FrameworkUap10 /logger:"trx;LogFileName=${{ env.TEST_PLATFORM }}.trx" /Blame - name: Create test reports run: | @@ -182,26 +182,24 @@ jobs: # https://github.com/dorny/paths-filter#custom-processing-of-changed-files - name: Detect If any Dump Files - uses: dorny/paths-filter@v2.11.1 - id: filter - with: - list-files: shell - filters: | - dump: - - added: '${{ github.workspace }}/CrashDumps/*.dmp' + id: detect-dump + if: always() + working-directory: ${{ github.workspace }} + run: | + echo "DUMP_FILE=$(Get-ChildItem .\CrashDumps\*.dmp -ErrorAction SilentlyContinue)" >> $env:GITHUB_OUTPUT - name: Artifact - WER crash dumps uses: actions/upload-artifact@v3 - if: ${{ steps.filter.outputs.dump == 'true' && (env.ENABLE_DIAGNOSTICS == 'true' || env.COREHOST_TRACE != '') && always() }} + if: ${{ (env.ENABLE_DIAGNOSTICS == 'true' || env.COREHOST_TRACE != '') && always() }} with: name: CrashDumps-${{ matrix.platform }} path: '${{ github.workspace }}/CrashDumps' - name: Analyze Dump - if: ${{ steps.filter.outputs.dump == 'true' && (env.ENABLE_DIAGNOSTICS == 'true' || env.COREHOST_TRACE != '') && always() }} + if: ${{ steps.detect-dump.outputs.DUMP_FILE != '' && (env.ENABLE_DIAGNOSTICS == 'true' || env.COREHOST_TRACE != '') && always() }} run: | dotnet tool install --global dotnet-dump - dotnet-dump analyze ${{ steps.filter.outputs.dump_files }} -c "clrstack" -c "pe -lines" -c "exit" + dotnet-dump analyze ${{ steps.detect-dump.outputs.DUMP_FILE }} -c "clrstack" -c "pe -lines" -c "exit" wasm-linux: runs-on: ubuntu-latest From 1535076f83cd6b71ecad08dc15e97d629f7f5bdd Mon Sep 17 00:00:00 2001 From: michael-hawker <24302614+michael-hawker@users.noreply.github.com> Date: Tue, 15 Aug 2023 17:15:14 -0700 Subject: [PATCH 2/5] Not sure why icon isn't showing up in NuGet metadata, maybe casing as all examples show lowercase? Also, add PackageIconUrl back as acceptable to have both for backwards compat --- Directory.Build.targets | 2 +- Windows.Toolkit.Common.props | 3 ++- Icon.png => icon.png | Bin 3 files changed, 3 insertions(+), 2 deletions(-) rename Icon.png => icon.png (100%) diff --git a/Directory.Build.targets b/Directory.Build.targets index b716bac5..d037221d 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -12,7 +12,7 @@ - + diff --git a/Windows.Toolkit.Common.props b/Windows.Toolkit.Common.props index 2ee34314..8853b027 100644 --- a/Windows.Toolkit.Common.props +++ b/Windows.Toolkit.Common.props @@ -9,7 +9,8 @@ (c) .NET Foundation and Contributors. All rights reserved. https://github.com/CommunityToolkit/Windows https://github.com/CommunityToolkit/Windows/releases - Icon.png + icon.png + https://github.com/CommunityToolkit/Windows/blob/main/icon.png $(NoWarn);NU1505;NU1504 diff --git a/Icon.png b/icon.png similarity index 100% rename from Icon.png rename to icon.png From 80b8f46dcbaf1a0de2fac974471f9896bb63d333 Mon Sep 17 00:00:00 2001 From: michael-hawker <24302614+michael-hawker@users.noreply.github.com> Date: Tue, 15 Aug 2023 17:40:59 -0700 Subject: [PATCH 3/5] Update base package tags --- Directory.Build.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Directory.Build.targets b/Directory.Build.targets index d037221d..50c3db65 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -6,7 +6,7 @@ - $(CommonTags);UWP;WinUI;Uno;Labs;Experimental + $(CommonTags);UWP;WinUI;Uno;Platform;WindowsAppSDK;WASDK;WinAppSDK;Universal $(CommonTags);$(PackageTags) $(CommonTags) From 9151f0b990632de135ad451c90311dc9c9fb937b Mon Sep 17 00:00:00 2001 From: michael-hawker <24302614+michael-hawker@users.noreply.github.com> Date: Tue, 15 Aug 2023 14:18:42 -0700 Subject: [PATCH 4/5] Try Ignoring tests that regularly fail more often (though still think it's just random based on number of tests run...) Need to comment out as Ignore ignored... see https://github.com/CommunityToolkit/Tooling-Windows-Submodule/issues/121 Related to investigation, see info in https://github.com/actions/runner-images/issues/7937 --- .../Extensions/tests/DispatcherQueueExtensionTests.cs | 3 ++- .../FrameworkElementExtensionsTests.RelativeAncestor.cs | 7 ++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/components/Extensions/tests/DispatcherQueueExtensionTests.cs b/components/Extensions/tests/DispatcherQueueExtensionTests.cs index b1b6d251..bd3370e5 100644 --- a/components/Extensions/tests/DispatcherQueueExtensionTests.cs +++ b/components/Extensions/tests/DispatcherQueueExtensionTests.cs @@ -336,8 +336,9 @@ await DispatcherQueue.GetForCurrentThread().EnqueueAsync(async () => Assert.IsNull(taskSource.Task.Exception); } + [Ignore] [TestCategory("DispatcherQueueExtensions")] - [UIThreadTestMethod] + ////[UIThreadTestMethod] - TODO: https://github.com/CommunityToolkit/Tooling-Windows-Submodule/issues/121 public async Task DispatcherQueueHelper_FuncOfTaskOfT_Exception() { var task = DispatcherQueue.GetForCurrentThread().EnqueueAsync(new Func>(() => diff --git a/components/Extensions/tests/Element/FrameworkElementExtensionsTests.RelativeAncestor.cs b/components/Extensions/tests/Element/FrameworkElementExtensionsTests.RelativeAncestor.cs index fab4af3d..a2a7f431 100644 --- a/components/Extensions/tests/Element/FrameworkElementExtensionsTests.RelativeAncestor.cs +++ b/components/Extensions/tests/Element/FrameworkElementExtensionsTests.RelativeAncestor.cs @@ -59,8 +59,9 @@ public async Task FrameworkElementExtension_RelativeAncestor_FreeParentBaseline( Assert.IsFalse(textRef.IsAlive, "TextBox is still alive..."); } + [Ignore] [TestCategory("FrameworkElementExtension")] - [UIThreadTestMethod] + ////[UIThreadTestMethod] - TODO: https://github.com/CommunityToolkit/Tooling-Windows-Submodule/issues/121 public async Task FrameworkElementExtension_RelativeAncestor_FreeParent(FrameworkElementRelativeAncestorDataTemplateTestPage page) { var list = page.FindDescendant(); @@ -85,9 +86,9 @@ public async Task FrameworkElementExtension_RelativeAncestor_FreeParent(Framewor Assert.IsFalse(listRef.IsAlive, "ListView is still alive..."); } - [TestCategory("FrameworkElementExtension")] - [UIThreadTestMethod] [Ignore] + [TestCategory("FrameworkElementExtension")] + ////[UIThreadTestMethod] - TODO: https://github.com/CommunityToolkit/Tooling-Windows-Submodule/issues/121 public async Task FrameworkElementExtension_RelativeAncestor_FreePageNavigation() { TaskCompletionSource taskCompletionSource = new(); From 720fd28c6369988f933c672c27d06735156327f0 Mon Sep 17 00:00:00 2001 From: michael-hawker <24302614+michael-hawker@users.noreply.github.com> Date: Wed, 16 Aug 2023 14:53:56 -0700 Subject: [PATCH 5/5] Update Release Build Tooling Dependency Versions See if this helps with `PackageIcon` --- Directory.Build.targets | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Directory.Build.targets b/Directory.Build.targets index 50c3db65..e3c75c2c 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -1,8 +1,8 @@ - - + +