Merge branch 'main' into fix/imagecropper-aspect-ratio-not-updating-on-image-load

Arlodotexe · web-flow · commit 4ea8826e5a95 · 2022-09-26T11:32:39.000-05:00
diff --git a/Microsoft.Toolkit.Uwp.UI/Shadows/AttachedShadowBase.cs b/Microsoft.Toolkit.Uwp.UI/Shadows/AttachedShadowBase.cs
@@ -174,9 +174,12 @@ public AttachedShadowElementContext GetElementContext(FrameworkElement element)
         /// <inheritdoc/>
         public IEnumerable<AttachedShadowElementContext> EnumerateElementContexts()
         {
-            foreach (var kvp in ShadowElementContextTable)
+            if (ShadowElementContextTable != null)
             {
-                yield return kvp.Value;
+                foreach (var kvp in ShadowElementContextTable)
+                {
+                    yield return kvp.Value;
+                }
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -174,9 +174,12 @@ public AttachedShadowElementContext GetElementContext(FrameworkElement element)`
`174`	`174`	`/// <inheritdoc/>`
`175`	`175`	`public IEnumerable<AttachedShadowElementContext> EnumerateElementContexts()`
`176`	`176`	`{`
`177`		`- foreach (var kvp in ShadowElementContextTable)`
	`177`	`+ if (ShadowElementContextTable != null)`
`178`	`178`	`{`
`179`		`- yield return kvp.Value;`
	`179`	`+ foreach (var kvp in ShadowElementContextTable)`
	`180`	`+ {`
	`181`	`+ yield return kvp.Value;`
	`182`	`+ }`
`180`	`183`	`}`
`181`	`184`	`}`
`182`	`185`