Merge branch 'main' into fix/alt-color

Author: Avid29

.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
@@ -85,21 +85,21 @@ jobs:
           maximum-size: 32GB
           disk-root: "C:"
 
-      - 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
-
       - name: Install procdump
         if: ${{ env.ENABLE_DIAGNOSTICS == 'true' }}
         shell: pwsh
@@ -158,6 +158,13 @@ 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
@@ -222,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' }}
@@ -333,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 }}
@@ -398,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 }}
@@ -421,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
@@ -467,3 +474,4 @@ jobs:
         with:
           name: linux-logs
           path: ./**/*.*log
+

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/>

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;

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"
   }