Skip to content

Commit 7c09b29

Browse files
authored
Merge branch 'main' into fix_converter_sample
2 parents 677db83 + 55b92b8 commit 7c09b29

3 files changed

Lines changed: 15 additions & 7 deletions

File tree

.github/workflows/build.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,13 @@ jobs:
158158
id: test-generator
159159
run: vstest.console.exe ./tooling/CommunityToolkit.Tooling.SampleGen.Tests/bin/Release/net8.0/CommunityToolkit.Tooling.SampleGen.Tests.dll /logger:"trx;LogFileName=SourceGenerators.trx"
160160

161+
- name: Start Procdump monitoring for first-chance exceptions
162+
if: ${{ (matrix.multitarget == 'uwp' || matrix.multitarget == 'wasdk') && env.ENABLE_DIAGNOSTICS == 'true' }}
163+
shell: pwsh
164+
run: |
165+
$procdumpArgs = @("-accepteula", "-e", "1", "-w", "CommunityToolkit.Tests.${{ matrix.multitarget }}.exe", "-ma", "${{ env.PROCDUMP_PATH }}")
166+
Start-Process -FilePath "${{ env.PROCDUMP_PATH }}/procdump64.exe" -ArgumentList $procdumpArgs -NoNewWindow
167+
161168
- name: Run component tests against ${{ matrix.multitarget }}
162169
if: ${{ matrix.multitarget == 'uwp' || matrix.multitarget == 'wasdk' }}
163170
id: test-platform
@@ -467,3 +474,4 @@ jobs:
467474
with:
468475
name: linux-logs
469476
path: ./**/*.*log
477+

components/Extensions/src/Shadows/AttachedShadowBase.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,8 +161,8 @@ protected internal virtual void OnElementContextInitialized(AttachedShadowElemen
161161
/// <param name="context">The <see cref="AttachedShadowElementContext"/> that is being uninitialized.</param>
162162
protected internal virtual void OnElementContextUninitialized(AttachedShadowElementContext context)
163163
{
164-
context.ClearAndDisposeResources();
165164
ElementCompositionPreview.SetElementChildVisual(context.Element, null!);
165+
context.ClearAndDisposeResources();
166166
}
167167

168168
/// <inheritdoc/>

components/Extensions/src/Shadows/AttachedShadowElementContext.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,12 @@ private void Uninitialize()
135135

136136
IsInitialized = false;
137137

138+
if (Element != null)
139+
{
140+
ElementCompositionPreview.SetElementChildVisual(Element, null!);
141+
Element.SizeChanged -= OnElementSizeChanged;
142+
}
143+
138144
Parent.OnElementContextUninitialized(this);
139145

140146
if (SpriteVisual != null)
@@ -148,12 +154,6 @@ private void Uninitialize()
148154
Shadow.Dispose();
149155
}
150156

151-
if (Element != null)
152-
{
153-
ElementCompositionPreview.SetElementChildVisual(Element, null!);
154-
Element.SizeChanged -= OnElementSizeChanged;
155-
}
156-
157157
SpriteVisual = null;
158158
Shadow = null;
159159
ElementVisual = null;

0 commit comments

Comments
 (0)