Merge branch 'main' into fix_WrapLayoutSample

Avid29 · web-flow · commit fccb4d018923 · 2026-02-07T02:03:45.000+02:00
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -17,7 +17,7 @@ on:
   merge_group:
 
 env:
-  DOTNET_VERSION: ${{ '9.0.x' }}
+  DOTNET_VERSION: '9.0.310'  # Only used by jobs that cannot access global.json (no checkout/artifact-only jobs)
   ENABLE_DIAGNOSTICS: true
   MSBUILD_VERBOSITY: normal
   #COREHOST_TRACE: 1
@@ -36,17 +36,17 @@ jobs:
 
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
-      - name: Install .NET SDK v${{ env.DOTNET_VERSION }}
-        uses: actions/setup-dotnet@v4
-        with:
-          dotnet-version: ${{ env.DOTNET_VERSION }}
-
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
       - name: Checkout Repository
         uses: actions/checkout@v4
         with:
           submodules: recursive
 
+      - name: Install .NET SDK
+        uses: actions/setup-dotnet@v4
+        with:
+          global-json-file: global.json
+
       # Restore Tools from Manifest list in the Repository
       - name: Restore dotnet tools
         run: dotnet tool restore
@@ -59,6 +59,9 @@ jobs:
     needs: [Xaml-Style-Check]
     runs-on: windows-2022
 
+    env:
+      PROCDUMP_PATH: ${{ github.workspace }}
+
     # See https://docs.github.com/actions/using-jobs/using-a-matrix-for-your-jobs
     strategy:
       fail-fast: false # prevent one matrix pipeline from being cancelled if one fails, we want them all to run to completion.
@@ -82,29 +85,27 @@ jobs:
           maximum-size: 32GB
           disk-root: "C:"
 
-      - name: Enable User-Mode Dumps collecting
-        if: ${{ env.ENABLE_DIAGNOSTICS == 'true' || env.COREHOST_TRACE != '' }}
-        shell: powershell
-        run: |
-          New-Item '${{ github.workspace }}\CrashDumps' -Type Directory
-          Set-ItemProperty -Path 'HKLM:\SOFTWARE\Microsoft\Windows\Windows Error Reporting\LocalDumps' -Name 'DumpFolder' -Type ExpandString -Value '${{ github.workspace }}\CrashDumps'
-          Set-ItemProperty -Path 'HKLM:\SOFTWARE\Microsoft\Windows\Windows Error Reporting\LocalDumps' -Name 'DumpCount' -Type DWord -Value '10'
-          Set-ItemProperty -Path 'HKLM:\SOFTWARE\Microsoft\Windows\Windows Error Reporting\LocalDumps' -Name 'DumpType' -Type DWord -Value '2'
+      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+      - name: Checkout Repository
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
 
-      - name: Install .NET SDK v${{ env.DOTNET_VERSION }}
+      - name: Install .NET SDK
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: ${{ env.DOTNET_VERSION }}
+          global-json-file: global.json
 
       - name: .NET Info (if diagnostics)
         if: ${{ env.ENABLE_DIAGNOSTICS == 'true' }}
         run: dotnet --info
 
-      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - name: Checkout Repository
-        uses: actions/checkout@v4
-        with:
-          submodules: recursive
+      - name: Install procdump
+        if: ${{ env.ENABLE_DIAGNOSTICS == 'true' }}
+        shell: pwsh
+        run: |
+          Invoke-WebRequest -Uri https://download.sysinternals.com/files/Procdump.zip -OutFile Procdump.zip
+          Expand-Archive -Path Procdump.zip -DestinationPath ${{ env.PROCDUMP_PATH }}
 
       # Restore Tools from Manifest list in the Repository
       - name: Restore dotnet tools
@@ -157,10 +158,17 @@ jobs:
         id: test-generator
         run: vstest.console.exe ./tooling/CommunityToolkit.Tooling.SampleGen.Tests/bin/Release/net8.0/CommunityToolkit.Tooling.SampleGen.Tests.dll /logger:"trx;LogFileName=SourceGenerators.trx"
 
+      - name: Start Procdump monitoring for first-chance exceptions
+        if: ${{ (matrix.multitarget == 'uwp' || matrix.multitarget == 'wasdk') && env.ENABLE_DIAGNOSTICS == 'true' }}
+        shell: pwsh
+        run: |
+          $procdumpArgs = @("-accepteula", "-e", "1", "-w", "CommunityToolkit.Tests.${{ matrix.multitarget }}.exe", "-ma", "${{ env.PROCDUMP_PATH }}")
+          Start-Process -FilePath "${{ env.PROCDUMP_PATH }}/procdump64.exe" -ArgumentList $procdumpArgs -NoNewWindow
+
       - name: Run component tests against ${{ matrix.multitarget }}
         if: ${{ matrix.multitarget == 'uwp' || matrix.multitarget == 'wasdk' }}
         id: test-platform
-        run:  vstest.console.exe ./tooling/**/CommunityToolkit.Tests.${{ matrix.multitarget }}.build.appxrecipe /Framework:FrameworkUap10 /logger:"trx;LogFileName=${{ matrix.multitarget }}.trx" /Blame
+        run:  vstest.console.exe ./tooling/**/CommunityToolkit.Tests.${{ matrix.multitarget }}.build.appxrecipe /Framework:FrameworkUap10 /logger:"trx;LogFileName=${{ matrix.multitarget }}.trx" /Blame:"CollectDump;DumpType=Full;CollectHangDump;TestTimeout=30m;HangDumpType=Full" /Diag:"${{ github.workspace }}/vstest-diagnostic-log.txt"
 
       - name: Create test reports
         run: |
@@ -178,7 +186,7 @@ jobs:
         uses: actions/upload-artifact@v4
         if: ${{ (env.ENABLE_DIAGNOSTICS == 'true' || env.COREHOST_TRACE != '') && always() }}
         with:
-          name: ilc-repro
+          name: ilc-repro-${{ matrix.multitarget }}-winui${{ matrix.winui }}
           path: ./*.zip
 
       # https://github.com/dorny/paths-filter#custom-processing-of-changed-files
@@ -187,14 +195,21 @@ jobs:
         if: always()
         working-directory: ${{ github.workspace }}
         run: |
-          echo "DUMP_FILE=$(Get-ChildItem .\CrashDumps\*.dmp -ErrorAction SilentlyContinue)" >> $env:GITHUB_OUTPUT
+          echo "DUMP_FILE=$(Get-ChildItem ${{ env.PROCDUMP_PATH }}/**/*.dmp -ErrorAction SilentlyContinue)" >> $env:GITHUB_OUTPUT
 
-      - name: Artifact - WER crash dumps
+      - name: Artifact - Process Dumps
         uses: actions/upload-artifact@v4
         if: ${{ (env.ENABLE_DIAGNOSTICS == 'true' || env.COREHOST_TRACE != '') && always() }}
         with:
           name: CrashDumps-${{ matrix.multitarget }}-winui${{ matrix.winui }}
-          path: '${{ github.workspace }}/CrashDumps'
+          path: ${{ env.PROCDUMP_PATH }}/**/*.dmp
+
+      - name: Artifact - vstest-diagnostic-log
+        uses: actions/upload-artifact@v4
+        if: always()
+        with:
+          name: 'vstest-diagnostic-log-${{ matrix.multitarget }}-winui${{ matrix.winui }}.txt'
+          path: '${{ github.workspace }}/vstest-diagnostic-log.txt'
 
       - name: Analyze Dump
         if: ${{ steps.detect-dump.outputs.DUMP_FILE != '' && (env.ENABLE_DIAGNOSTICS == 'true' || env.COREHOST_TRACE != '') && always() }}
@@ -214,21 +229,21 @@ jobs:
       VERSION_PROPERTY: ${{ github.ref == 'refs/heads/main' && format('build.{0}', github.run_number) || format('pull-{0}.{1}', github.event.number, github.run_number) }}
 
     steps:
-      - name: Install .NET SDK v${{ env.DOTNET_VERSION }}
+      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+      - name: Checkout Repository
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+
+      - name: Install .NET SDK
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: ${{ env.DOTNET_VERSION }}
+          global-json-file: global.json
 
       - name: .NET Info (if diagnostics)
         if: ${{ env.ENABLE_DIAGNOSTICS == 'true' }}
         run: dotnet --info
 
-      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - name: Checkout Repository
-        uses: actions/checkout@v4
-        with:
-          submodules: recursive
-
       # Semver regex: https://regex101.com/r/Ly7O1x/3/
       - name: Format Date/Time of Release Package Version
         if: ${{ env.IS_RELEASE == 'true' }}
@@ -325,7 +340,7 @@ jobs:
         winui: [2, 3]
 
     steps:
-      - name: Install .NET SDK v${{ env.DOTNET_VERSION }}
+      - name: Install .NET SDK
         uses: actions/setup-dotnet@v4
         with:
           dotnet-version: ${{ env.DOTNET_VERSION }}
@@ -390,7 +405,7 @@ jobs:
         winui: [2, 3]
 
     steps:
-      - name: Install .NET SDK v${{ env.DOTNET_VERSION }}
+      - name: Install .NET SDK
         uses: actions/setup-dotnet@v4
         with:
           dotnet-version: ${{ env.DOTNET_VERSION }}
@@ -413,21 +428,21 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - name: Install .NET SDK v${{ env.DOTNET_VERSION }}
+      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+      - name: Checkout Repository
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+
+      - name: Install .NET SDK
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: ${{ env.DOTNET_VERSION }}
+          global-json-file: global.json
 
       - name: .NET Info (if diagnostics)
         if: ${{ env.ENABLE_DIAGNOSTICS == 'true' }}
         run: dotnet --info
 
-      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - name: Checkout Repository
-        uses: actions/checkout@v4
-        with:
-          submodules: recursive
-
       # Restore Tools from Manifest list in the Repository
       - name: Restore dotnet tools
         run: dotnet tool restore
@@ -459,3 +474,4 @@ jobs:
         with:
           name: linux-logs
           path: ./**/*.*log
+
diff --git a/components/Extensions/src/Shadows/AttachedShadowBase.cs b/components/Extensions/src/Shadows/AttachedShadowBase.cs
@@ -161,8 +161,8 @@ protected internal virtual void OnElementContextInitialized(AttachedShadowElemen
     /// <param name="context">The <see cref="AttachedShadowElementContext"/> that is being uninitialized.</param>
     protected internal virtual void OnElementContextUninitialized(AttachedShadowElementContext context)
     {
-        context.ClearAndDisposeResources();
         ElementCompositionPreview.SetElementChildVisual(context.Element, null!);
+        context.ClearAndDisposeResources();
     }
 
     /// <inheritdoc/>
diff --git a/components/Extensions/src/Shadows/AttachedShadowElementContext.cs b/components/Extensions/src/Shadows/AttachedShadowElementContext.cs
@@ -135,6 +135,12 @@ private void Uninitialize()
 
         IsInitialized = false;
 
+        if (Element != null)
+        {
+            ElementCompositionPreview.SetElementChildVisual(Element, null!);
+            Element.SizeChanged -= OnElementSizeChanged;
+        }
+
         Parent.OnElementContextUninitialized(this);
 
         if (SpriteVisual != null)
@@ -148,12 +154,6 @@ private void Uninitialize()
             Shadow.Dispose();
         }
 
-        if (Element != null)
-        {
-            ElementCompositionPreview.SetElementChildVisual(Element, null!);
-            Element.SizeChanged -= OnElementSizeChanged;
-        }
-
         SpriteVisual = null;
         Shadow = null;
         ElementVisual = null;
diff --git a/global.json b/global.json
@@ -1,9 +1,9 @@
 {
   "sdk": {
-    "version": "9.0.101",
+    "version": "9.0.310",
     "rollForward": "latestFeature"
   },
-  "msbuild-sdks": 
+  "msbuild-sdks":
   {
     "MSBuild.Sdk.Extras":"3.0.23"
   }

Original file line number	Diff line number	Diff line change
`@@ -161,8 +161,8 @@ protected internal virtual void OnElementContextInitialized(AttachedShadowElemen`
`161`	`161`	`/// <param name="context">The <see cref="AttachedShadowElementContext"/> that is being uninitialized.</param>`
`162`	`162`	`protected internal virtual void OnElementContextUninitialized(AttachedShadowElementContext context)`
`163`	`163`	`{`
`164`		`- context.ClearAndDisposeResources();`
`165`	`164`	`ElementCompositionPreview.SetElementChildVisual(context.Element, null!);`
	`165`	`+ context.ClearAndDisposeResources();`
`166`	`166`	`}`
`167`	`167`
`168`	`168`	`/// <inheritdoc/>`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,9 @@`
`1`	`1`	`{`
`2`	`2`	`"sdk": {`
`3`		`- "version": "9.0.101",`
	`3`	`+ "version": "9.0.310",`
`4`	`4`	`"rollForward": "latestFeature"`
`5`	`5`	`},`
`6`		`- "msbuild-sdks":`
	`6`	`+ "msbuild-sdks":`
`7`	`7`	`{`
`8`	`8`	`"MSBuild.Sdk.Extras":"3.0.23"`
`9`	`9`	`}`