From f25a22be3642031d3a7522d99c9b401a0515eb43 Mon Sep 17 00:00:00 2001 From: Arlo Godfrey Date: Thu, 20 Jun 2024 00:50:13 -0500 Subject: [PATCH 1/9] Update to WinAppSdk 1.6.240531000-experimental1 --- MultiTarget/PackageReferences/WinAppSdk.props | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/MultiTarget/PackageReferences/WinAppSdk.props b/MultiTarget/PackageReferences/WinAppSdk.props index 20463cae..436edae1 100644 --- a/MultiTarget/PackageReferences/WinAppSdk.props +++ b/MultiTarget/PackageReferences/WinAppSdk.props @@ -1,6 +1,9 @@ - + + + + From 03c5ce73902e38b0f1caa83ff51c3cd389ff717c Mon Sep 17 00:00:00 2001 From: Arlo Godfrey Date: Thu, 20 Jun 2024 00:52:08 -0500 Subject: [PATCH 2/9] Enabled AoT for WinAppSdk 1.6-experimental1. Added RuntimeIdentifier to head, removed redundant RuntimeIdentifiers definition on libraries. --- MultiTarget/WinUI.Extra.props | 2 +- ProjectHeads/Head.WinAppSdk.props | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/MultiTarget/WinUI.Extra.props b/MultiTarget/WinUI.Extra.props index ba824ca0..5ca94a8f 100644 --- a/MultiTarget/WinUI.Extra.props +++ b/MultiTarget/WinUI.Extra.props @@ -26,7 +26,7 @@ win-x86;win-x64;win-arm64 win10-x86;win10-x64;win10-arm64 - win-x86;win-x64;win-arm64 + 10.0.22621.35-preview diff --git a/ProjectHeads/Head.WinAppSdk.props b/ProjectHeads/Head.WinAppSdk.props index 74b8498a..56c090c9 100644 --- a/ProjectHeads/Head.WinAppSdk.props +++ b/ProjectHeads/Head.WinAppSdk.props @@ -15,8 +15,9 @@ - - false + true + win-$(Platform) + win10-$(Platform) From 489d5d1f8c0a067b4dea53712ed3653cb6970e51 Mon Sep 17 00:00:00 2001 From: Arlo Date: Fri, 28 Jun 2024 15:35:58 -0500 Subject: [PATCH 3/9] Update MultiTarget/PackageReferences/WinAppSdk.props --- MultiTarget/PackageReferences/WinAppSdk.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MultiTarget/PackageReferences/WinAppSdk.props b/MultiTarget/PackageReferences/WinAppSdk.props index 436edae1..9792165c 100644 --- a/MultiTarget/PackageReferences/WinAppSdk.props +++ b/MultiTarget/PackageReferences/WinAppSdk.props @@ -3,7 +3,7 @@ - + From a0381dd771b7e31421a217504f4de890b4d899d7 Mon Sep 17 00:00:00 2001 From: Arlo Date: Tue, 2 Jul 2024 11:55:26 -0500 Subject: [PATCH 4/9] Update MultiTarget/PackageReferences/WinAppSdk.props Resolves https://github.com/CommunityToolkit/Tooling-Windows-Submodule/pull/195/files#r1662838806 --- MultiTarget/PackageReferences/WinAppSdk.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MultiTarget/PackageReferences/WinAppSdk.props b/MultiTarget/PackageReferences/WinAppSdk.props index 9792165c..68eb7bc5 100644 --- a/MultiTarget/PackageReferences/WinAppSdk.props +++ b/MultiTarget/PackageReferences/WinAppSdk.props @@ -4,6 +4,6 @@ - + From 027946ac66a2e70261a2d907e6a4dda58c95d0a0 Mon Sep 17 00:00:00 2001 From: Arlo Godfrey Date: Mon, 29 Jul 2024 13:53:36 -0500 Subject: [PATCH 5/9] Update to prerelease packages for Wasdk AoT --- MultiTarget/PackageReferences/WinAppSdk.props | 2 +- MultiTarget/WinUI.Extra.props | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/MultiTarget/PackageReferences/WinAppSdk.props b/MultiTarget/PackageReferences/WinAppSdk.props index 68eb7bc5..1e598248 100644 --- a/MultiTarget/PackageReferences/WinAppSdk.props +++ b/MultiTarget/PackageReferences/WinAppSdk.props @@ -4,6 +4,6 @@ - + diff --git a/MultiTarget/WinUI.Extra.props b/MultiTarget/WinUI.Extra.props index 5ca94a8f..d27db269 100644 --- a/MultiTarget/WinUI.Extra.props +++ b/MultiTarget/WinUI.Extra.props @@ -26,7 +26,7 @@ win-x86;win-x64;win-arm64 win10-x86;win10-x64;win10-arm64 - 10.0.22621.35-preview + 10.0.22621.37-preview From ff1ae97a30c595bcdb2a85d7abadb93ae0f47496 Mon Sep 17 00:00:00 2001 From: "Michael Hawker MSFT (XAML Llama)" <24302614+michael-hawker@users.noreply.github.com> Date: Wed, 31 Jul 2024 14:19:35 -0700 Subject: [PATCH 6/9] Update build.yml to test including process dumps Needed to help diagnose issue https://github.com/CommunityToolkit/Windows/issues/347 --- .github/workflows/build.yml | 47 ++++++++++++++++++++++++++++++++++++- 1 file changed, 46 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e19ef14b..2d4d0ed8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -17,7 +17,7 @@ on: env: DOTNET_VERSION: ${{ '8.0.x' }} - ENABLE_DIAGNOSTICS: false + ENABLE_DIAGNOSTICS: true #COREHOST_TRACE: 1 COREHOST_TRACEFILE: corehosttrace.log @@ -153,6 +153,44 @@ jobs: minimum-size: 32GB maximum-size: 32GB disk-root: "C:" + + - name: Enable Crash Dumps + if: ${{ env.ENABLE_DIAGNOSTICS == 'true' }} + shell: pwsh + run: | + # If we set the registry from a 32-bit process on a 64-bit machine, we will set the "virtualized" syswow registry. + # For crash dump collection we always want to set the "native" registry, so we make sure to invoke the native cmd.exe + $nativeCmdPath = "$env:SystemRoot\system32\cmd.exe" + if([Environment]::Is64BitOperatingSystem -and ![Environment]::Is64BitProcess) + { + # The "sysnative" path is a 'magic' path that allows a 32-bit process to invoke the native 64-bit cmd.exe. + $nativeCmdPath = "$env:SystemRoot\sysnative\cmd.exe" + } + + if(!$dumpFolder) + { + $dumpFolder = "C:\dumps" + } + + function Enable-CrashDumpsForProcesses { + Param([string[]]$namesOfProcessesForDumpCollection) + + foreach($procName in $namesOfProcessesForDumpCollection ) + { + Write-Host "Enabling local crash dumps for $procName" + & $nativeCmdPath /c reg add "HKLM\Software\Microsoft\Windows\Windows Error Reporting\LocalDumps\$procName" /v DumpFolder /t REG_EXPAND_SZ /d $dumpFolder /f + & $nativeCmdPath /c reg add "HKLM\Software\Microsoft\Windows\Windows Error Reporting\LocalDumps\$procName" /v DumpType /t REG_DWORD /d 2 /f + & $nativeCmdPath /c reg add "HKLM\Software\Microsoft\Windows\Windows Error Reporting\LocalDumps\$procName" /v DumpCount /t REG_DWORD /d 3 /f + } + } + + # enable dump collection for our test apps: + $namesOfProcessesForDumpCollection = @( + "CommunityToolkit.Tests.Uwp.exe", + "CommunityToolkit.Tests.WinAppSdk.exe", + "VSTest.Console.exe") + + Enable-CrashDumpsForProcesses $namesOfProcessesForDumpCollection - name: Install .NET SDK v${{ env.DOTNET_VERSION }} uses: actions/setup-dotnet@v4 @@ -235,6 +273,13 @@ jobs: name: new-experiment-logs path: ./**/*.*log + - name: Artifact - Process Dumps + uses: actions/upload-artifact@v4 + if: ${{ (env.ENABLE_DIAGNOSTICS == 'true' || env.COREHOST_TRACE != '') && always() }} + with: + name: new-experiment-dumps + path: C:/dumps/*.*dmp + wasm-linux: runs-on: ubuntu-latest env: From 05770c219321215d617735ba572d761345285096 Mon Sep 17 00:00:00 2001 From: "Michael Hawker MSFT (XAML Llama)" <24302614+michael-hawker@users.noreply.github.com> Date: Wed, 31 Jul 2024 14:49:57 -0700 Subject: [PATCH 7/9] Update dotnet-tools.json for slngen 11.2.6 --- .config/dotnet-tools.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 2817fea9..3b3d280a 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -15,10 +15,10 @@ ] }, "microsoft.visualstudio.slngen.tool": { - "version": "11.2.3", + "version": "11.2.6", "commands": [ "slngen" ] } } -} \ No newline at end of file +} From 6d3967e31e1f0405f57f2f3aeaad49b9450dedbc Mon Sep 17 00:00:00 2001 From: "Michael Hawker MSFT (XAML Llama)" <24302614+michael-hawker@users.noreply.github.com> Date: Wed, 31 Jul 2024 14:56:19 -0700 Subject: [PATCH 8/9] [TEMP] Update build.yml - remove slngen diagnostics See https://github.com/microsoft/slngen/issues/451 --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2d4d0ed8..d198d729 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -130,7 +130,7 @@ jobs: - name: Add project heads to ProjectTemplate working-directory: ./${{ env.PROJECT_DIRECTORY }} - run: ${{ github.workspace }}/${{ env.HEADS_DIRECTORY }}/GenerateSingleSampleHeads.ps1 -componentPath ${{ github.workspace }}/${{ env.PROJECT_DIRECTORY }}${{ env.ENABLE_DIAGNOSTICS == 'true' && ' -UseDiagnostics' || '' }} + run: ${{ github.workspace }}/${{ env.HEADS_DIRECTORY }}/GenerateSingleSampleHeads.ps1 -componentPath ${{ github.workspace }}/${{ env.PROJECT_DIRECTORY }} # Build and use template for creating new experiments - name: Build ProjectTemplate @@ -238,7 +238,7 @@ jobs: - name: Add project heads to ${{ env.TEST_PROJECT_NAME }} working-directory: ./${{ env.TEST_PROJECT_DIRECTORY }} - run: ${{ github.workspace }}/${{ env.HEADS_DIRECTORY }}/GenerateSingleSampleHeads.ps1 -componentPath ${{ github.workspace }}/${{ env.TEST_PROJECT_DIRECTORY }}${{ env.ENABLE_DIAGNOSTICS == 'true' && ' -UseDiagnostics' || '' }} + run: ${{ github.workspace }}/${{ env.HEADS_DIRECTORY }}/GenerateSingleSampleHeads.ps1 -componentPath ${{ github.workspace }}/${{ env.TEST_PROJECT_DIRECTORY }} - name: MSBuild working-directory: ./${{ env.TEST_PROJECT_DIRECTORY }} From 0e00cfa87c7598bed111ff7d283f8a4f0bef8bbb Mon Sep 17 00:00:00 2001 From: "Michael Hawker MSFT (XAML Llama)" <24302614+michael-hawker@users.noreply.github.com> Date: Wed, 31 Jul 2024 17:59:02 -0700 Subject: [PATCH 9/9] Update build.yml to include additional test processes to dump logs for --- .github/workflows/build.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d198d729..1128f304 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -188,6 +188,12 @@ jobs: $namesOfProcessesForDumpCollection = @( "CommunityToolkit.Tests.Uwp.exe", "CommunityToolkit.Tests.WinAppSdk.exe", + "CiTestExp.Tests.Uwp.exe", + "CiTestExp.Tests.WinAppSdk.exe", + "Labs.CiTestExp.Tests.Uwp.exe", + "Labs.CiTestExp.Tests.AppSdk.exe", + "Labs.CiTestExp.Tests.Uwp_1.0.0.0_x64__1v6rh0sdhj24c.exe", + "Labs.CiTestExp.Tests.AppSdk_1.0.0.0_x64__1v6rh0sdhj24c.exe", "VSTest.Console.exe") Enable-CrashDumpsForProcesses $namesOfProcessesForDumpCollection