diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Generated/ContentElement.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Generated/ContentElement.cs
index affb818ffdb..7854ba5222f 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Generated/ContentElement.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Generated/ContentElement.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -11,7 +11,6 @@
 
 using MS.Internal;
 using MS.Internal.KnownBoxes;
-using MS.Internal.PresentationCore;
 using MS.Utility;
 using System.ComponentModel;
 using System.Windows.Input;
@@ -591,7 +590,8 @@ public void RemoveHandler(RoutedEvent routedEvent, Delegate handler)
                     EventHandlersStoreField.ClearValue(this);
                     WriteFlag(CoreFlags.ExistsEventHandlersStore, false);
                 }
-}
+
+            }
         }
 
         /// <summary>
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Generated/TextDecoration.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Generated/TextDecoration.cs
index e204b00778f..c111db714e7 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Generated/TextDecoration.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Generated/TextDecoration.cs
@@ -9,12 +9,15 @@
 // Please see MilCodeGen.html for more information.
 //
 
+using System.Collections;
 using System.Windows.Media;
 using System.Windows.Media.Animation;
-// These types are aliased to match the unamanaged names used in interop
+using MS.Utility;
 
 namespace System.Windows
 {
+
+
     sealed partial class TextDecoration : Animatable
     {
         //------------------------------------------------------
@@ -259,8 +262,7 @@ static TextDecoration()
             // We check our static default fields which are of type Freezable
             // to make sure that they are not mutable, otherwise we will throw
             // if these get touched by more than one thread in the lifetime
-            // of your app.  (Windows OS 
-
+            // of your app.
 
 
             // Initializations
@@ -312,6 +314,8 @@ static TextDecoration()
                                    /* coerceValueCallback */ null);
         }
 
+
+
         #endregion Constructors
     }
 }
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Generated/TextDecorationCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Generated/TextDecorationCollection.cs
index 8a2a39dd034..edd4aabb12e 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Generated/TextDecorationCollection.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Generated/TextDecorationCollection.cs
@@ -2,23 +2,24 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+//
+//
 // This file was generated, please do not edit it directly.
 //
 // Please see MilCodeGen.html for more information.
+//
 
 using System.Collections;
+using System.Windows.Media;
 using System.Windows.Media.Animation;
 using MS.Utility;
 
-// These types are aliased to match the unamanaged names used in interop
-
 namespace System.Windows
 {
     /// <summary>
     /// A collection of TextDecoration objects.
     /// </summary>
 
-
     public sealed partial class TextDecorationCollection : Animatable, IList, IList<TextDecoration>
     {
         //------------------------------------------------------
@@ -194,7 +195,7 @@ internal void RemoveAtWithoutFiringPublicEvents(int index)
         {
             WritePreamble();
 
-            TextDecoration oldValue = _collection[index];
+            TextDecoration oldValue = _collection[ index ];
 
             OnFreezablePropertyChanged(oldValue, null);
 
@@ -229,12 +230,15 @@ public TextDecoration this[int index]
 
                 WritePreamble();
 
-                if (!Object.ReferenceEquals(_collection[index], value))
+                if (!Object.ReferenceEquals(_collection[ index ], value))
                 {
-                    TextDecoration oldValue = _collection[index];
+
+                    TextDecoration oldValue = _collection[ index ];
                     OnFreezablePropertyChanged(oldValue, value);
 
-                    _collection[index] = value;
+                    _collection[ index ] = value;
+
+
                 }
 
 
@@ -471,10 +475,10 @@ internal override void OnInheritanceContextChangedCore(EventArgs args)
         {
             base.OnInheritanceContextChangedCore(args);
 
-            for (int i = 0; i < this.Count; i++)
+            for (int i=0; i<this.Count; i++)
             {
                 DependencyObject inheritanceChild = _collection[i];
-                if (inheritanceChild != null && inheritanceChild.InheritanceContext == this)
+                if (inheritanceChild!= null && inheritanceChild.InheritanceContext == this)
                 {
                     inheritanceChild.OnInheritanceContextChanged(args);
                 }
@@ -494,7 +498,7 @@ private TextDecoration Cast(object value)
                 throw new System.ArgumentException(SR.Format(SR.Collection_BadType, this.GetType().Name, value.GetType().Name, "TextDecoration"));
             }
 
-            return (TextDecoration)value;
+            return (TextDecoration) value;
         }
 
         // IList.Add returns int and IList<T>.Add does not. This
@@ -567,7 +571,7 @@ protected override Freezable CreateInstanceCore()
         /// </summary>
         protected override void CloneCore(Freezable source)
         {
-            TextDecorationCollection sourceTextDecorationCollection = (TextDecorationCollection)source;
+            TextDecorationCollection sourceTextDecorationCollection = (TextDecorationCollection) source;
 
             base.CloneCore(source);
 
@@ -577,17 +581,19 @@ protected override void CloneCore(Freezable source)
 
             for (int i = 0; i < count; i++)
             {
-                TextDecoration newValue = (TextDecoration)sourceTextDecorationCollection._collection[i].Clone();
+                TextDecoration newValue = (TextDecoration) sourceTextDecorationCollection._collection[i].Clone();
                 OnFreezablePropertyChanged(/* oldValue = */ null, newValue);
                 _collection.Add(newValue);
+
             }
+
         }
         /// <summary>
         /// Implementation of Freezable.CloneCurrentValueCore()
         /// </summary>
         protected override void CloneCurrentValueCore(Freezable source)
         {
-            TextDecorationCollection sourceTextDecorationCollection = (TextDecorationCollection)source;
+            TextDecorationCollection sourceTextDecorationCollection = (TextDecorationCollection) source;
 
             base.CloneCurrentValueCore(source);
 
@@ -597,17 +603,19 @@ protected override void CloneCurrentValueCore(Freezable source)
 
             for (int i = 0; i < count; i++)
             {
-                TextDecoration newValue = (TextDecoration)sourceTextDecorationCollection._collection[i].CloneCurrentValue();
+                TextDecoration newValue = (TextDecoration) sourceTextDecorationCollection._collection[i].CloneCurrentValue();
                 OnFreezablePropertyChanged(/* oldValue = */ null, newValue);
                 _collection.Add(newValue);
+
             }
+
         }
         /// <summary>
         /// Implementation of Freezable.GetAsFrozenCore()
         /// </summary>
         protected override void GetAsFrozenCore(Freezable source)
         {
-            TextDecorationCollection sourceTextDecorationCollection = (TextDecorationCollection)source;
+            TextDecorationCollection sourceTextDecorationCollection = (TextDecorationCollection) source;
 
             base.GetAsFrozenCore(source);
 
@@ -617,17 +625,19 @@ protected override void GetAsFrozenCore(Freezable source)
 
             for (int i = 0; i < count; i++)
             {
-                TextDecoration newValue = (TextDecoration)sourceTextDecorationCollection._collection[i].GetAsFrozen();
+                TextDecoration newValue = (TextDecoration) sourceTextDecorationCollection._collection[i].GetAsFrozen();
                 OnFreezablePropertyChanged(/* oldValue = */ null, newValue);
                 _collection.Add(newValue);
+
             }
+
         }
         /// <summary>
         /// Implementation of Freezable.GetCurrentValueAsFrozenCore()
         /// </summary>
         protected override void GetCurrentValueAsFrozenCore(Freezable source)
         {
-            TextDecorationCollection sourceTextDecorationCollection = (TextDecorationCollection)source;
+            TextDecorationCollection sourceTextDecorationCollection = (TextDecorationCollection) source;
 
             base.GetCurrentValueAsFrozenCore(source);
 
@@ -637,10 +647,12 @@ protected override void GetCurrentValueAsFrozenCore(Freezable source)
 
             for (int i = 0; i < count; i++)
             {
-                TextDecoration newValue = (TextDecoration)sourceTextDecorationCollection._collection[i].GetCurrentValueAsFrozen();
+                TextDecoration newValue = (TextDecoration) sourceTextDecorationCollection._collection[i].GetCurrentValueAsFrozen();
                 OnFreezablePropertyChanged(/* oldValue = */ null, newValue);
                 _collection.Add(newValue);
+
             }
+
         }
         /// <summary>
         /// Implementation of <see cref="System.Windows.Freezable.FreezeCore">Freezable.FreezeCore</see>.
@@ -745,6 +757,7 @@ internal Enumerator(TextDecorationCollection list)
 
             void IDisposable.Dispose()
             {
+
             }
 
             /// <summary>
@@ -913,6 +926,7 @@ public TextDecorationCollection(IEnumerable<TextDecoration> collection)
                         TextDecoration newValue = item;
                         OnFreezablePropertyChanged(/* oldValue = */ null, newValue);
                         _collection.Add(newValue);
+
                     }
 
                     needsItemValidation = false;
@@ -928,6 +942,7 @@ public TextDecorationCollection(IEnumerable<TextDecoration> collection)
                         throw new System.ArgumentException(SR.Collection_NoNull);
                     }
                     OnFreezablePropertyChanged(/* oldValue = */ null, item);
+
                 }
             }
 
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Generated/TextDecorationLocation.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Generated/TextDecorationLocation.cs
index c5bd200dfac..aa06aecad16 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Generated/TextDecorationLocation.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Generated/TextDecorationLocation.cs
@@ -9,10 +9,6 @@
 // Please see MilCodeGen.html for more information.
 //
 
-#if PRESENTATION_CORE
-#else
-using SR=System.Windows.SR;
-#endif
 
 namespace System.Windows
 {
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Generated/TextDecorationUnit.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Generated/TextDecorationUnit.cs
index 9c33440c45d..981aa92206c 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Generated/TextDecorationUnit.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Generated/TextDecorationUnit.cs
@@ -9,10 +9,6 @@
 // Please see MilCodeGen.html for more information.
 //
 
-#if PRESENTATION_CORE
-#else
-using SR=System.Windows.SR;
-#endif
 
 namespace System.Windows
 {
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Generated/UIElement.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Generated/UIElement.cs
index 9dac8fed590..2c3894beeb4 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Generated/UIElement.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Generated/UIElement.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -11,7 +11,6 @@
 
 using MS.Internal;
 using MS.Internal.KnownBoxes;
-using MS.Internal.PresentationCore;
 using MS.Utility;
 using System.ComponentModel;
 using System.Windows.Input;
@@ -591,7 +590,8 @@ public void RemoveHandler(RoutedEvent routedEvent, Delegate handler)
                     EventHandlersStoreField.ClearValue(this);
                     WriteFlag(CoreFlags.ExistsEventHandlersStore, false);
                 }
-}
+
+            }
         }
 
         /// <summary>
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Generated/UIElement3D.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Generated/UIElement3D.cs
index a4fd6bfb03c..a1241ad30f0 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Generated/UIElement3D.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Generated/UIElement3D.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -10,10 +10,11 @@
 //
 
 using MS.Internal;
-using MS.Internal.PresentationCore;
+using MS.Internal.KnownBoxes;
 using MS.Utility;
 using System.ComponentModel;
 using System.Windows.Input;
+using System.Windows.Media.Animation;
 
 namespace System.Windows
 {
@@ -395,7 +396,8 @@ public void RemoveHandler(RoutedEvent routedEvent, Delegate handler)
                     EventHandlersStoreField.ClearValue(this);
                     WriteFlag(CoreFlags.ExistsEventHandlersStore, false);
                 }
-}
+
+            }
         }
 
         /// <summary>
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Animatable.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Animatable.cs
index d6bb12bd2d2..7ddc55c01f5 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Animatable.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Animatable.cs
@@ -1,13 +1,18 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+//
+//
 // This file was generated, please do not edit it directly.
 // 
 // This file was generated from the codegen template located at:
 //     wpf\src\Graphics\codegen\mcg\generators\AnimatableTemplate.cs
 //
 // Please see MilCodeGen.html for more information.
+//
+
+using System.Windows.Media.Animation;
 
 namespace System.Windows.Media.Animation
 {
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/BooleanAnimationBase.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/BooleanAnimationBase.cs
index de054cca958..fe287e9d9f5 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/BooleanAnimationBase.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/BooleanAnimationBase.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -9,6 +9,8 @@
 // Please see MilCodeGen.html for more information.
 //
 
+using System.Windows.Media.Media3D;
+
 namespace System.Windows.Media.Animation
 {
     /// <summary>
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/BooleanAnimationUsingKeyFrames.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/BooleanAnimationUsingKeyFrames.cs
index 4e12b5fcb59..caa4e1ccca1 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/BooleanAnimationUsingKeyFrames.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/BooleanAnimationUsingKeyFrames.cs
@@ -1,14 +1,19 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+//
+//
 // This file was generated, please do not edit it directly.
+//
 // Please see MilCodeGen.html for more information.
+//
 
+using MS.Internal.KnownBoxes;
 using System.Collections;
 using System.ComponentModel;
 using System.Windows.Markup;
-
+using System.Windows.Media.Media3D;
 using MS.Internal.PresentationCore;
 
 namespace System.Windows.Media.Animation
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/BooleanKeyFrameCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/BooleanKeyFrameCollection.cs
index cdbf9ca78a2..befbef890c4 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/BooleanKeyFrameCollection.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/BooleanKeyFrameCollection.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/ByteAnimation.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/ByteAnimation.cs
index db5c57e86b7..b9caa9ddcac 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/ByteAnimation.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/ByteAnimation.cs
@@ -11,6 +11,7 @@
 
 using MS.Internal.KnownBoxes;
 using System.Globalization;
+using System.Windows.Media.Media3D;
 
 using MS.Internal.PresentationCore;
 
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/ByteAnimationBase.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/ByteAnimationBase.cs
index 719aa42902c..8ee26a5deca 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/ByteAnimationBase.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/ByteAnimationBase.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -9,6 +9,8 @@
 // Please see MilCodeGen.html for more information.
 //
 
+using System.Windows.Media.Media3D;
+
 namespace System.Windows.Media.Animation
 {
     /// <summary>
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/ByteAnimationUsingKeyFrames.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/ByteAnimationUsingKeyFrames.cs
index ce51d630745..153ed0d5da7 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/ByteAnimationUsingKeyFrames.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/ByteAnimationUsingKeyFrames.cs
@@ -1,14 +1,19 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+//
+//
 // This file was generated, please do not edit it directly.
+//
 // Please see MilCodeGen.html for more information.
+//
 
 using MS.Internal.KnownBoxes;
 using System.Collections;
 using System.ComponentModel;
 using System.Windows.Markup;
+using System.Windows.Media.Media3D;
 using MS.Internal.PresentationCore;
 
 namespace System.Windows.Media.Animation
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/ByteKeyFrameCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/ByteKeyFrameCollection.cs
index 87880f6cb30..9afb69907e5 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/ByteKeyFrameCollection.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/ByteKeyFrameCollection.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/CharAnimationBase.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/CharAnimationBase.cs
index 6a3a9763053..5c454afbc22 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/CharAnimationBase.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/CharAnimationBase.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -9,6 +9,8 @@
 // Please see MilCodeGen.html for more information.
 //
 
+using System.Windows.Media.Media3D;
+
 namespace System.Windows.Media.Animation
 {
     /// <summary>
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/CharAnimationUsingKeyFrames.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/CharAnimationUsingKeyFrames.cs
index 3844fa8fe57..88bb2a5f77d 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/CharAnimationUsingKeyFrames.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/CharAnimationUsingKeyFrames.cs
@@ -1,13 +1,19 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+//
+//
 // This file was generated, please do not edit it directly.
+//
 // Please see MilCodeGen.html for more information.
+//
 
+using MS.Internal.KnownBoxes;
 using System.Collections;
 using System.ComponentModel;
 using System.Windows.Markup;
+using System.Windows.Media.Media3D;
 using MS.Internal.PresentationCore;
 
 namespace System.Windows.Media.Animation
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/CharKeyFrameCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/CharKeyFrameCollection.cs
index 01c0c75df22..70b01cf3acb 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/CharKeyFrameCollection.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/CharKeyFrameCollection.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/ColorAnimation.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/ColorAnimation.cs
index 176789c2234..1ac138703b2 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/ColorAnimation.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/ColorAnimation.cs
@@ -11,6 +11,7 @@
 
 using MS.Internal.KnownBoxes;
 using System.Globalization;
+using System.Windows.Media.Media3D;
 
 using MS.Internal.PresentationCore;
 
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/ColorAnimationBase.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/ColorAnimationBase.cs
index dd8f730573c..83ffe271b56 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/ColorAnimationBase.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/ColorAnimationBase.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -9,6 +9,8 @@
 // Please see MilCodeGen.html for more information.
 //
 
+using System.Windows.Media.Media3D;
+
 namespace System.Windows.Media.Animation
 {
     /// <summary>
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/ColorAnimationUsingKeyFrames.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/ColorAnimationUsingKeyFrames.cs
index 6f21ef881ad..92a5e802f3b 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/ColorAnimationUsingKeyFrames.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/ColorAnimationUsingKeyFrames.cs
@@ -1,14 +1,19 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+//
+//
 // This file was generated, please do not edit it directly.
+//
 // Please see MilCodeGen.html for more information.
+//
 
 using MS.Internal.KnownBoxes;
 using System.Collections;
 using System.ComponentModel;
 using System.Windows.Markup;
+using System.Windows.Media.Media3D;
 using MS.Internal.PresentationCore;
 
 namespace System.Windows.Media.Animation
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/ColorIndependentAnimationStorage.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/ColorIndependentAnimationStorage.cs
index b853496697e..51eb6197dad 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/ColorIndependentAnimationStorage.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/ColorIndependentAnimationStorage.cs
@@ -13,6 +13,7 @@
 //
 
 using System.Windows.Media.Composition;
+using System.Windows.Media.Media3D;
 
 namespace System.Windows.Media.Animation
 {
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/ColorKeyFrameCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/ColorKeyFrameCollection.cs
index ba4d5d86382..93cfcf324a1 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/ColorKeyFrameCollection.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/ColorKeyFrameCollection.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/DecimalAnimation.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/DecimalAnimation.cs
index 2dea7bf2d4e..1b5fc71aff5 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/DecimalAnimation.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/DecimalAnimation.cs
@@ -11,6 +11,7 @@
 
 using MS.Internal.KnownBoxes;
 using System.Globalization;
+using System.Windows.Media.Media3D;
 
 using MS.Internal.PresentationCore;
 
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/DecimalAnimationBase.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/DecimalAnimationBase.cs
index 33f6d558bd7..85a1ebddffb 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/DecimalAnimationBase.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/DecimalAnimationBase.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -9,6 +9,8 @@
 // Please see MilCodeGen.html for more information.
 //
 
+using System.Windows.Media.Media3D;
+
 namespace System.Windows.Media.Animation
 {
     /// <summary>
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/DecimalAnimationUsingKeyFrames.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/DecimalAnimationUsingKeyFrames.cs
index d30ba230611..c740e59e6ab 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/DecimalAnimationUsingKeyFrames.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/DecimalAnimationUsingKeyFrames.cs
@@ -1,14 +1,19 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+//
+//
 // This file was generated, please do not edit it directly.
+//
 // Please see MilCodeGen.html for more information.
+//
 
 using MS.Internal.KnownBoxes;
 using System.Collections;
 using System.ComponentModel;
 using System.Windows.Markup;
+using System.Windows.Media.Media3D;
 using MS.Internal.PresentationCore;
 
 namespace System.Windows.Media.Animation
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/DecimalKeyFrameCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/DecimalKeyFrameCollection.cs
index 7d2383ce27b..5a3ed47ef89 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/DecimalKeyFrameCollection.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/DecimalKeyFrameCollection.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/DiscreteKeyFrames.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/DiscreteKeyFrames.cs
index bc7ffc06789..3e2a29dc2fb 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/DiscreteKeyFrames.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/DiscreteKeyFrames.cs
@@ -13,6 +13,8 @@
 
 namespace System.Windows.Media.Animation
 {
+
+
     /// <summary>
     /// This class is used as part of a BooleanKeyFrameCollection in
     /// conjunction with a KeyFrameBooleanAnimation to animate a
@@ -1607,4 +1609,5 @@ protected override Vector3D InterpolateValueCore(Vector3D baseValue, double keyF
 
         #endregion
     }
-}
+
+}
\ No newline at end of file
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/DoubleAnimation.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/DoubleAnimation.cs
index 80f2edd1534..7beb0e14bcb 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/DoubleAnimation.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/DoubleAnimation.cs
@@ -11,6 +11,7 @@
 
 using MS.Internal.KnownBoxes;
 using System.Globalization;
+using System.Windows.Media.Media3D;
 
 using MS.Internal.PresentationCore;
 
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/DoubleAnimationBase.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/DoubleAnimationBase.cs
index 8a6c49cd4d7..227a2efb702 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/DoubleAnimationBase.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/DoubleAnimationBase.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -9,6 +9,8 @@
 // Please see MilCodeGen.html for more information.
 //
 
+using System.Windows.Media.Media3D;
+
 namespace System.Windows.Media.Animation
 {
     /// <summary>
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/DoubleAnimationClockResource.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/DoubleAnimationClockResource.cs
index 0d06e8fae41..9a22fca1017 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/DoubleAnimationClockResource.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/DoubleAnimationClockResource.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/DoubleAnimationUsingKeyFrames.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/DoubleAnimationUsingKeyFrames.cs
index e2707abf545..5b84dcad1e9 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/DoubleAnimationUsingKeyFrames.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/DoubleAnimationUsingKeyFrames.cs
@@ -1,14 +1,19 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+//
+//
 // This file was generated, please do not edit it directly.
+//
 // Please see MilCodeGen.html for more information.
+//
 
 using MS.Internal.KnownBoxes;
 using System.Collections;
 using System.ComponentModel;
 using System.Windows.Markup;
+using System.Windows.Media.Media3D;
 using MS.Internal.PresentationCore;
 
 namespace System.Windows.Media.Animation
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/DoubleIndependentAnimationStorage.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/DoubleIndependentAnimationStorage.cs
index 7f7adeb679f..7b4b73d4e7e 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/DoubleIndependentAnimationStorage.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/DoubleIndependentAnimationStorage.cs
@@ -13,6 +13,7 @@
 //
 
 using System.Windows.Media.Composition;
+using System.Windows.Media.Media3D;
 
 namespace System.Windows.Media.Animation
 {
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/DoubleKeyFrameCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/DoubleKeyFrameCollection.cs
index 229abc202f7..42aa1967b6a 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/DoubleKeyFrameCollection.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/DoubleKeyFrameCollection.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/EasingKeyFrames.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/EasingKeyFrames.cs
index 5d420b9423e..d4d99d60708 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/EasingKeyFrames.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/EasingKeyFrames.cs
@@ -15,6 +15,8 @@
 
 namespace System.Windows.Media.Animation
 {
+
+
     /// <summary>
     /// This class is used as part of a ByteKeyFrameCollection in
     /// conjunction with a KeyFrameByteAnimation to animate a
@@ -2013,4 +2015,5 @@ public IEasingFunction EasingFunction
 
         #endregion
     }
-}
+
+}
\ No newline at end of file
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Int16Animation.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Int16Animation.cs
index 3b21d943d2a..60f80097cb4 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Int16Animation.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Int16Animation.cs
@@ -11,6 +11,7 @@
 
 using MS.Internal.KnownBoxes;
 using System.Globalization;
+using System.Windows.Media.Media3D;
 
 using MS.Internal.PresentationCore;
 
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Int16AnimationBase.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Int16AnimationBase.cs
index ad08810f939..8025f32e33b 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Int16AnimationBase.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Int16AnimationBase.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -9,6 +9,8 @@
 // Please see MilCodeGen.html for more information.
 //
 
+using System.Windows.Media.Media3D;
+
 namespace System.Windows.Media.Animation
 {
     /// <summary>
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Int16AnimationUsingKeyFrames.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Int16AnimationUsingKeyFrames.cs
index b5674a485ec..9d6d8384a08 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Int16AnimationUsingKeyFrames.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Int16AnimationUsingKeyFrames.cs
@@ -1,14 +1,19 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+//
+//
 // This file was generated, please do not edit it directly.
+//
 // Please see MilCodeGen.html for more information.
+//
 
 using MS.Internal.KnownBoxes;
 using System.Collections;
 using System.ComponentModel;
 using System.Windows.Markup;
+using System.Windows.Media.Media3D;
 using MS.Internal.PresentationCore;
 
 namespace System.Windows.Media.Animation
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Int16KeyFrameCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Int16KeyFrameCollection.cs
index 259fcea8bb0..8179c3fb71f 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Int16KeyFrameCollection.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Int16KeyFrameCollection.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Int32Animation.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Int32Animation.cs
index d0bbbe12ceb..2c61caf3eb6 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Int32Animation.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Int32Animation.cs
@@ -11,6 +11,7 @@
 
 using MS.Internal.KnownBoxes;
 using System.Globalization;
+using System.Windows.Media.Media3D;
 
 using MS.Internal.PresentationCore;
 
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Int32AnimationBase.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Int32AnimationBase.cs
index cfa74c80ea6..498422ce38e 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Int32AnimationBase.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Int32AnimationBase.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -9,6 +9,8 @@
 // Please see MilCodeGen.html for more information.
 //
 
+using System.Windows.Media.Media3D;
+
 namespace System.Windows.Media.Animation
 {
     /// <summary>
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Int32AnimationUsingKeyFrames.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Int32AnimationUsingKeyFrames.cs
index 63a4affefc1..22074e46df8 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Int32AnimationUsingKeyFrames.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Int32AnimationUsingKeyFrames.cs
@@ -1,14 +1,19 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+//
+//
 // This file was generated, please do not edit it directly.
+//
 // Please see MilCodeGen.html for more information.
+//
 
 using MS.Internal.KnownBoxes;
 using System.Collections;
 using System.ComponentModel;
 using System.Windows.Markup;
+using System.Windows.Media.Media3D;
 using MS.Internal.PresentationCore;
 
 namespace System.Windows.Media.Animation
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Int32KeyFrameCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Int32KeyFrameCollection.cs
index 3ff0a6364a3..8c14ecf50b3 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Int32KeyFrameCollection.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Int32KeyFrameCollection.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Int64Animation.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Int64Animation.cs
index 5b80fffe4d0..9b0967f8c6b 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Int64Animation.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Int64Animation.cs
@@ -11,6 +11,7 @@
 
 using MS.Internal.KnownBoxes;
 using System.Globalization;
+using System.Windows.Media.Media3D;
 
 using MS.Internal.PresentationCore;
 
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Int64AnimationBase.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Int64AnimationBase.cs
index 04a09b9a235..dd821e78dc7 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Int64AnimationBase.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Int64AnimationBase.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -9,6 +9,8 @@
 // Please see MilCodeGen.html for more information.
 //
 
+using System.Windows.Media.Media3D;
+
 namespace System.Windows.Media.Animation
 {
     /// <summary>
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Int64AnimationUsingKeyFrames.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Int64AnimationUsingKeyFrames.cs
index 2c679681d21..22cece0fa88 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Int64AnimationUsingKeyFrames.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Int64AnimationUsingKeyFrames.cs
@@ -1,14 +1,19 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+//
+//
 // This file was generated, please do not edit it directly.
+//
 // Please see MilCodeGen.html for more information.
+//
 
 using MS.Internal.KnownBoxes;
 using System.Collections;
 using System.ComponentModel;
 using System.Windows.Markup;
+using System.Windows.Media.Media3D;
 using MS.Internal.PresentationCore;
 
 namespace System.Windows.Media.Animation
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Int64KeyFrameCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Int64KeyFrameCollection.cs
index b53e6383a20..408d4821140 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Int64KeyFrameCollection.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Int64KeyFrameCollection.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/KeyFrames.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/KeyFrames.cs
index 03a75a4d28d..ccc7622c2e7 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/KeyFrames.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/KeyFrames.cs
@@ -13,6 +13,8 @@
 
 namespace System.Windows.Media.Animation
 {
+
+
     /// <summary>
     /// This class is used as part of a BooleanKeyFrameCollection in
     /// conjunction with a KeyFrameBooleanAnimation to animate a
@@ -2972,4 +2974,5 @@ protected abstract Vector3D InterpolateValueCore(
 
         #endregion
     }                 
-}
+
+}
\ No newline at end of file
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/LinearKeyFrames.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/LinearKeyFrames.cs
index 07d26283311..c05fbd0e49a 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/LinearKeyFrames.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/LinearKeyFrames.cs
@@ -15,6 +15,8 @@
 
 namespace System.Windows.Media.Animation
 {
+
+
     /// <summary>
     /// This class is used as part of a ByteKeyFrameCollection in
     /// conjunction with a KeyFrameByteAnimation to animate a
@@ -1245,4 +1247,5 @@ protected override Vector3D InterpolateValueCore(Vector3D baseValue, double keyF
 
         #endregion
     }
-}
+
+}
\ No newline at end of file
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/MatrixAnimationBase.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/MatrixAnimationBase.cs
index 2f07ecc2b14..de2f6912ec8 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/MatrixAnimationBase.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/MatrixAnimationBase.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -9,6 +9,8 @@
 // Please see MilCodeGen.html for more information.
 //
 
+using System.Windows.Media.Media3D;
+
 namespace System.Windows.Media.Animation
 {
     /// <summary>
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/MatrixAnimationUsingKeyFrames.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/MatrixAnimationUsingKeyFrames.cs
index a727a12610b..491159c6135 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/MatrixAnimationUsingKeyFrames.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/MatrixAnimationUsingKeyFrames.cs
@@ -1,13 +1,19 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+//
+//
 // This file was generated, please do not edit it directly.
+//
 // Please see MilCodeGen.html for more information.
+//
 
+using MS.Internal.KnownBoxes;
 using System.Collections;
 using System.ComponentModel;
 using System.Windows.Markup;
+using System.Windows.Media.Media3D;
 using MS.Internal.PresentationCore;
 
 namespace System.Windows.Media.Animation
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/MatrixIndependentAnimationStorage.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/MatrixIndependentAnimationStorage.cs
index 8ca0aaf8a6d..01ff0b0bce8 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/MatrixIndependentAnimationStorage.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/MatrixIndependentAnimationStorage.cs
@@ -13,6 +13,7 @@
 //
 
 using System.Windows.Media.Composition;
+using System.Windows.Media.Media3D;
 
 namespace System.Windows.Media.Animation
 {
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/MatrixKeyFrameCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/MatrixKeyFrameCollection.cs
index 9986b35da21..376fa769948 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/MatrixKeyFrameCollection.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/MatrixKeyFrameCollection.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/ObjectAnimationBase.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/ObjectAnimationBase.cs
index 05d0104eaf3..eea31c86bdc 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/ObjectAnimationBase.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/ObjectAnimationBase.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -9,6 +9,8 @@
 // Please see MilCodeGen.html for more information.
 //
 
+using System.Windows.Media.Media3D;
+
 namespace System.Windows.Media.Animation
 {
     /// <summary>
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/ObjectAnimationUsingKeyFrames.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/ObjectAnimationUsingKeyFrames.cs
index 1eb292bc0f5..b5f222992ed 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/ObjectAnimationUsingKeyFrames.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/ObjectAnimationUsingKeyFrames.cs
@@ -1,13 +1,19 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+//
+//
 // This file was generated, please do not edit it directly.
+//
 // Please see MilCodeGen.html for more information.
+//
 
+using MS.Internal.KnownBoxes;
 using System.Collections;
 using System.ComponentModel;
 using System.Windows.Markup;
+using System.Windows.Media.Media3D;
 using MS.Internal.PresentationCore;
 
 namespace System.Windows.Media.Animation
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/ObjectKeyFrameCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/ObjectKeyFrameCollection.cs
index 323d21615a9..5fcc12d8373 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/ObjectKeyFrameCollection.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/ObjectKeyFrameCollection.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/ParallelTimeline.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/ParallelTimeline.cs
index 6b11f0cba52..84d46cca0f5 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/ParallelTimeline.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/ParallelTimeline.cs
@@ -9,9 +9,14 @@
 // Please see MilCodeGen.html for more information.
 //
 
-// These types are aliased to match the unamanaged names used in interop
+using MS.Internal;
+using MS.Utility;
+using System.Collections;
+
 namespace System.Windows.Media.Animation
 {
+
+
     partial class ParallelTimeline : TimelineGroup
     {
         //------------------------------------------------------
@@ -77,6 +82,8 @@ protected override Freezable CreateInstanceCore()
             return new ParallelTimeline();
         }
 
+
+
         #endregion ProtectedMethods
 
         //------------------------------------------------------
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Point3DAnimationBase.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Point3DAnimationBase.cs
index 4da69cc1565..7bd26dedbab 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Point3DAnimationBase.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Point3DAnimationBase.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Point3DAnimationUsingKeyFrames.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Point3DAnimationUsingKeyFrames.cs
index eb3fc9626eb..09bd208b4ad 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Point3DAnimationUsingKeyFrames.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Point3DAnimationUsingKeyFrames.cs
@@ -1,9 +1,13 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+//
+//
 // This file was generated, please do not edit it directly.
+//
 // Please see MilCodeGen.html for more information.
+//
 
 using MS.Internal.KnownBoxes;
 using System.Collections;
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Point3DKeyFrameCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Point3DKeyFrameCollection.cs
index 2bbc15ea388..b70ece4f826 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Point3DKeyFrameCollection.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Point3DKeyFrameCollection.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/PointAnimation.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/PointAnimation.cs
index c3d8f2c08d4..be1cea9dd85 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/PointAnimation.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/PointAnimation.cs
@@ -11,6 +11,7 @@
 
 using MS.Internal.KnownBoxes;
 using System.Globalization;
+using System.Windows.Media.Media3D;
 
 using MS.Internal.PresentationCore;
 
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/PointAnimationBase.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/PointAnimationBase.cs
index 6a3acbb8c02..71008141c84 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/PointAnimationBase.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/PointAnimationBase.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -9,6 +9,8 @@
 // Please see MilCodeGen.html for more information.
 //
 
+using System.Windows.Media.Media3D;
+
 namespace System.Windows.Media.Animation
 {
     /// <summary>
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/PointAnimationClockResource.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/PointAnimationClockResource.cs
index 61652787cd3..9e6a40adba7 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/PointAnimationClockResource.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/PointAnimationClockResource.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/PointAnimationUsingKeyFrames.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/PointAnimationUsingKeyFrames.cs
index e93770012d2..c7d22d2f31c 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/PointAnimationUsingKeyFrames.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/PointAnimationUsingKeyFrames.cs
@@ -1,14 +1,19 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+//
+//
 // This file was generated, please do not edit it directly.
+//
 // Please see MilCodeGen.html for more information.
+//
 
 using MS.Internal.KnownBoxes;
 using System.Collections;
 using System.ComponentModel;
 using System.Windows.Markup;
+using System.Windows.Media.Media3D;
 using MS.Internal.PresentationCore;
 
 namespace System.Windows.Media.Animation
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/PointIndependentAnimationStorage.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/PointIndependentAnimationStorage.cs
index ac8c3671f9d..b0af74b6d55 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/PointIndependentAnimationStorage.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/PointIndependentAnimationStorage.cs
@@ -13,6 +13,7 @@
 //
 
 using System.Windows.Media.Composition;
+using System.Windows.Media.Media3D;
 
 namespace System.Windows.Media.Animation
 {
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/PointKeyFrameCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/PointKeyFrameCollection.cs
index bd2e8d042bf..605178b6cec 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/PointKeyFrameCollection.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/PointKeyFrameCollection.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/QuaternionAnimationBase.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/QuaternionAnimationBase.cs
index 86318ac75b2..2eab352c7b9 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/QuaternionAnimationBase.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/QuaternionAnimationBase.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/QuaternionAnimationUsingKeyFrames.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/QuaternionAnimationUsingKeyFrames.cs
index d6945c72666..dcdc94c1ce6 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/QuaternionAnimationUsingKeyFrames.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/QuaternionAnimationUsingKeyFrames.cs
@@ -1,9 +1,13 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+//
+//
 // This file was generated, please do not edit it directly.
+//
 // Please see MilCodeGen.html for more information.
+//
 
 using MS.Internal.KnownBoxes;
 using System.Collections;
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/QuaternionKeyFrameCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/QuaternionKeyFrameCollection.cs
index 8966772fba0..52708cb94a9 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/QuaternionKeyFrameCollection.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/QuaternionKeyFrameCollection.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/RectAnimation.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/RectAnimation.cs
index ee341621696..7d8204d63f6 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/RectAnimation.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/RectAnimation.cs
@@ -11,6 +11,7 @@
 
 using MS.Internal.KnownBoxes;
 using System.Globalization;
+using System.Windows.Media.Media3D;
 
 using MS.Internal.PresentationCore;
 
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/RectAnimationBase.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/RectAnimationBase.cs
index fa180a834db..db71d3a7669 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/RectAnimationBase.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/RectAnimationBase.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -9,6 +9,8 @@
 // Please see MilCodeGen.html for more information.
 //
 
+using System.Windows.Media.Media3D;
+
 namespace System.Windows.Media.Animation
 {
     /// <summary>
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/RectAnimationClockResource.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/RectAnimationClockResource.cs
index 770a4b4f4de..a20d18b688e 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/RectAnimationClockResource.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/RectAnimationClockResource.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/RectAnimationUsingKeyFrames.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/RectAnimationUsingKeyFrames.cs
index 5aa166609da..7052b23ece4 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/RectAnimationUsingKeyFrames.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/RectAnimationUsingKeyFrames.cs
@@ -1,14 +1,19 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+//
+//
 // This file was generated, please do not edit it directly.
+//
 // Please see MilCodeGen.html for more information.
+//
 
 using MS.Internal.KnownBoxes;
 using System.Collections;
 using System.ComponentModel;
 using System.Windows.Markup;
+using System.Windows.Media.Media3D;
 using MS.Internal.PresentationCore;
 
 namespace System.Windows.Media.Animation
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/RectIndependentAnimationStorage.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/RectIndependentAnimationStorage.cs
index c051984cc59..65c0b86a2bd 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/RectIndependentAnimationStorage.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/RectIndependentAnimationStorage.cs
@@ -13,6 +13,7 @@
 //
 
 using System.Windows.Media.Composition;
+using System.Windows.Media.Media3D;
 
 namespace System.Windows.Media.Animation
 {
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/RectKeyFrameCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/RectKeyFrameCollection.cs
index d0f88c07b4f..c734b342090 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/RectKeyFrameCollection.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/RectKeyFrameCollection.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Rotation3DAnimationBase.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Rotation3DAnimationBase.cs
index 909e64b613e..98347803d8c 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Rotation3DAnimationBase.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Rotation3DAnimationBase.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Rotation3DAnimationUsingKeyFrames.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Rotation3DAnimationUsingKeyFrames.cs
index abcc538f572..afd43f50553 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Rotation3DAnimationUsingKeyFrames.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Rotation3DAnimationUsingKeyFrames.cs
@@ -1,9 +1,13 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+//
+//
 // This file was generated, please do not edit it directly.
+//
 // Please see MilCodeGen.html for more information.
+//
 
 using MS.Internal.KnownBoxes;
 using System.Collections;
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Rotation3DKeyFrameCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Rotation3DKeyFrameCollection.cs
index f5e038dd21c..243ca48bb6f 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Rotation3DKeyFrameCollection.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Rotation3DKeyFrameCollection.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/SingleAnimation.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/SingleAnimation.cs
index cc514870c91..5b45e8a56d9 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/SingleAnimation.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/SingleAnimation.cs
@@ -11,6 +11,7 @@
 
 using MS.Internal.KnownBoxes;
 using System.Globalization;
+using System.Windows.Media.Media3D;
 
 using MS.Internal.PresentationCore;
 
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/SingleAnimationBase.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/SingleAnimationBase.cs
index 3bed0a6d888..7322f7441ca 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/SingleAnimationBase.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/SingleAnimationBase.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -9,6 +9,8 @@
 // Please see MilCodeGen.html for more information.
 //
 
+using System.Windows.Media.Media3D;
+
 namespace System.Windows.Media.Animation
 {
     /// <summary>
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/SingleAnimationUsingKeyFrames.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/SingleAnimationUsingKeyFrames.cs
index 3a2566b368e..d607793a765 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/SingleAnimationUsingKeyFrames.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/SingleAnimationUsingKeyFrames.cs
@@ -1,14 +1,19 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+//
+//
 // This file was generated, please do not edit it directly.
+//
 // Please see MilCodeGen.html for more information.
+//
 
 using MS.Internal.KnownBoxes;
 using System.Collections;
 using System.ComponentModel;
 using System.Windows.Markup;
+using System.Windows.Media.Media3D;
 using MS.Internal.PresentationCore;
 
 namespace System.Windows.Media.Animation
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/SingleKeyFrameCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/SingleKeyFrameCollection.cs
index a23d57a0747..ce6c1bac525 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/SingleKeyFrameCollection.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/SingleKeyFrameCollection.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/SizeAnimation.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/SizeAnimation.cs
index 78a2ec56d44..7935a92cc91 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/SizeAnimation.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/SizeAnimation.cs
@@ -11,6 +11,7 @@
 
 using MS.Internal.KnownBoxes;
 using System.Globalization;
+using System.Windows.Media.Media3D;
 
 using MS.Internal.PresentationCore;
 
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/SizeAnimationBase.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/SizeAnimationBase.cs
index e5cc8eb27fa..fa4ea7333d1 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/SizeAnimationBase.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/SizeAnimationBase.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -9,6 +9,8 @@
 // Please see MilCodeGen.html for more information.
 //
 
+using System.Windows.Media.Media3D;
+
 namespace System.Windows.Media.Animation
 {
     /// <summary>
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/SizeAnimationClockResource.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/SizeAnimationClockResource.cs
index fcb40a2cb0f..e723893b858 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/SizeAnimationClockResource.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/SizeAnimationClockResource.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/SizeAnimationUsingKeyFrames.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/SizeAnimationUsingKeyFrames.cs
index a9f5f2dd13e..a16319127b1 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/SizeAnimationUsingKeyFrames.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/SizeAnimationUsingKeyFrames.cs
@@ -1,14 +1,19 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+//
+//
 // This file was generated, please do not edit it directly.
+//
 // Please see MilCodeGen.html for more information.
+//
 
 using MS.Internal.KnownBoxes;
 using System.Collections;
 using System.ComponentModel;
 using System.Windows.Markup;
+using System.Windows.Media.Media3D;
 using MS.Internal.PresentationCore;
 
 namespace System.Windows.Media.Animation
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/SizeIndependentAnimationStorage.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/SizeIndependentAnimationStorage.cs
index 42f7bd2aa2d..5fafcc0c53f 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/SizeIndependentAnimationStorage.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/SizeIndependentAnimationStorage.cs
@@ -13,6 +13,7 @@
 //
 
 using System.Windows.Media.Composition;
+using System.Windows.Media.Media3D;
 
 namespace System.Windows.Media.Animation
 {
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/SizeKeyFrameCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/SizeKeyFrameCollection.cs
index c5212be0b20..0b96a67912b 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/SizeKeyFrameCollection.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/SizeKeyFrameCollection.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/SplineKeyFrames.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/SplineKeyFrames.cs
index 1163587a5ab..59f7999d77e 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/SplineKeyFrames.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/SplineKeyFrames.cs
@@ -9,12 +9,19 @@
 // Please see MilCodeGen.html for more information.
 //
 
+using MS.Internal;
+
+using System.Collections;
+using System.ComponentModel;
+using System.Windows.Media;
 using System.Windows.Media.Media3D;
 
 using MS.Internal.PresentationCore;
 
 namespace System.Windows.Media.Animation
 {
+
+
     /// <summary>
     /// This class is used as part of a ByteKeyFrameCollection in
     /// conjunction with a KeyFrameByteAnimation to animate a
@@ -2044,4 +2051,6 @@ public KeySpline KeySpline
 
         #endregion
     }
-}
+
+
+}
\ No newline at end of file
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/StringAnimationBase.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/StringAnimationBase.cs
index 1e324436ff4..a1eaccefa09 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/StringAnimationBase.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/StringAnimationBase.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -9,6 +9,8 @@
 // Please see MilCodeGen.html for more information.
 //
 
+using System.Windows.Media.Media3D;
+
 namespace System.Windows.Media.Animation
 {
     /// <summary>
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/StringAnimationUsingKeyFrames.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/StringAnimationUsingKeyFrames.cs
index 9ae09c760a2..c61a243fe01 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/StringAnimationUsingKeyFrames.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/StringAnimationUsingKeyFrames.cs
@@ -1,13 +1,19 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+//
+//
 // This file was generated, please do not edit it directly.
+//
 // Please see MilCodeGen.html for more information.
+//
 
+using MS.Internal.KnownBoxes;
 using System.Collections;
 using System.ComponentModel;
 using System.Windows.Markup;
+using System.Windows.Media.Media3D;
 using MS.Internal.PresentationCore;
 
 namespace System.Windows.Media.Animation
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/StringKeyFrameCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/StringKeyFrameCollection.cs
index ab4be0bf4ba..55f676d0883 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/StringKeyFrameCollection.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/StringKeyFrameCollection.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Timeline.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Timeline.cs
index b077097253a..d5bb133cc63 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Timeline.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Timeline.cs
@@ -9,9 +9,14 @@
 // Please see MilCodeGen.html for more information.
 //
 
-// These types are aliased to match the unamanaged names used in interop
+using MS.Internal;
+using MS.Utility;
+using System.Collections;
+
 namespace System.Windows.Media.Animation
 {
+
+
     abstract partial class Timeline : Animatable
     {
         //------------------------------------------------------
@@ -40,6 +45,9 @@ abstract partial class Timeline : Animatable
             return (Timeline)base.CloneCurrentValue();
         }
 
+
+
+
         #endregion Public Methods
 
         //------------------------------------------------------
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/TimelineCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/TimelineCollection.cs
index 791c36cf919..dd5e64b73a5 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/TimelineCollection.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/TimelineCollection.cs
@@ -1,20 +1,24 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+//
+//
 // This file was generated, please do not edit it directly.
+//
 // Please see MilCodeGen.html for more information.
+//
 
+using MS.Internal;
 using MS.Utility;
 using System.Collections;
 
-// These types are aliased to match the unamanaged names used in interop
-
 namespace System.Windows.Media.Animation
 {
     /// <summary>
     /// A collection of Timeline objects.
     /// </summary>
+
     public sealed partial class TimelineCollection : Animatable, IList, IList<Timeline>
     {
         //------------------------------------------------------
@@ -891,66 +895,60 @@ public TimelineCollection(IEnumerable<Timeline> collection)
 
             WritePreamble();
 
-            if (collection != null)
+            ArgumentNullException.ThrowIfNull(collection);
+
+            bool needsItemValidation = true;
+            ICollection<Timeline> icollectionOfT = collection as ICollection<Timeline>;
+
+            if (icollectionOfT != null)
             {
-                bool needsItemValidation = true;
-                ICollection<Timeline> icollectionOfT = collection as ICollection<Timeline>;
+                _collection = new FrugalStructList<Timeline>(icollectionOfT);
+            }
+            else
+            {
+                ICollection icollection = collection as ICollection;
 
-                if (icollectionOfT != null)
+                if (icollection != null) // an IC but not and IC<T>
                 {
-                    _collection = new FrugalStructList<Timeline>(icollectionOfT);
+                    _collection = new FrugalStructList<Timeline>(icollection);
                 }
-                else
-                {       
-                    ICollection icollection = collection as ICollection;
+                else // not a IC or IC<T> so fall back to the slower Add
+                {
+                    _collection = new FrugalStructList<Timeline>();
 
-                    if (icollection != null) // an IC but not and IC<T>
-                    {
-                        _collection = new FrugalStructList<Timeline>(icollection);
-                    }
-                    else // not a IC or IC<T> so fall back to the slower Add
+                    foreach (Timeline item in collection)
                     {
-                        _collection = new FrugalStructList<Timeline>();
-
-                        foreach (Timeline item in collection)
+                        if (item == null)
                         {
-                            if (item == null)
-                            {
-                                throw new System.ArgumentException(SR.Collection_NoNull);
-                            }
-                            Timeline newValue = item;
-                            OnFreezablePropertyChanged(/* oldValue = */ null, newValue);
-                            _collection.Add(newValue);
-
+                            throw new System.ArgumentException(SR.Collection_NoNull);
                         }
+                        Timeline newValue = item;
+                        OnFreezablePropertyChanged(/* oldValue = */ null, newValue);
+                        _collection.Add(newValue);
 
-                        needsItemValidation = false;
                     }
+
+                    needsItemValidation = false;
                 }
+            }
 
-                if (needsItemValidation)
+            if (needsItemValidation)
+            {
+                foreach (Timeline item in collection)
                 {
-                    foreach (Timeline item in collection)
+                    if (item == null)
                     {
-                        if (item == null)
-                        {
-                            throw new System.ArgumentException(SR.Collection_NoNull);
-                        }
-                        OnFreezablePropertyChanged(/* oldValue = */ null, item);
-
+                        throw new System.ArgumentException(SR.Collection_NoNull);
                     }
+                    OnFreezablePropertyChanged(/* oldValue = */ null, item);
+
                 }
+            }
 
 
-                WritePostscript();
-            }
-            else
-            {
-                throw new ArgumentNullException(nameof(collection));
-            }
+            WritePostscript();
         }
 
         #endregion Constructors
-
     }
 }
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/TimelineGroup.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/TimelineGroup.cs
index 5adc30167df..1617737e350 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/TimelineGroup.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/TimelineGroup.cs
@@ -10,10 +10,13 @@
 //
 
 using MS.Internal;
-// These types are aliased to match the unamanaged names used in interop
+using MS.Utility;
+using System.Collections;
 
 namespace System.Windows.Media.Animation
 {
+
+
     abstract partial class TimelineGroup : Timeline
     {
         //------------------------------------------------------
@@ -167,10 +170,9 @@ static TimelineGroup()
             // We check our static default fields which are of type Freezable
             // to make sure that they are not mutable, otherwise we will throw
             // if these get touched by more than one thread in the lifetime
-            // of your app
-
+            // of your app.
             Debug.Assert(s_Children == null || s_Children.IsFrozen,
-                "Detected context bound default value TimelineGroup.s_Children");
+                "Detected context bound default value TimelineGroup.s_Children (See OS Bug #947272).");
 
 
             // Initializations
@@ -186,6 +188,8 @@ static TimelineGroup()
                                    /* coerceValueCallback */ null);
         }
 
+
+
         #endregion Constructors
     }
 }
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Vector3DAnimationBase.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Vector3DAnimationBase.cs
index 937a93822c2..37f5f791bb4 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Vector3DAnimationBase.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Vector3DAnimationBase.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Vector3DAnimationUsingKeyFrames.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Vector3DAnimationUsingKeyFrames.cs
index 8a3ed642665..f8d4a0dac72 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Vector3DAnimationUsingKeyFrames.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Vector3DAnimationUsingKeyFrames.cs
@@ -1,9 +1,13 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+//
+//
 // This file was generated, please do not edit it directly.
+//
 // Please see MilCodeGen.html for more information.
+//
 
 using MS.Internal.KnownBoxes;
 using System.Collections;
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Vector3DKeyFrameCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Vector3DKeyFrameCollection.cs
index c139da06f18..f9dba381faa 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Vector3DKeyFrameCollection.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Vector3DKeyFrameCollection.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/VectorAnimation.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/VectorAnimation.cs
index 5cfa056aa65..0e35b0dd1f3 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/VectorAnimation.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/VectorAnimation.cs
@@ -11,6 +11,7 @@
 
 using MS.Internal.KnownBoxes;
 using System.Globalization;
+using System.Windows.Media.Media3D;
 
 using MS.Internal.PresentationCore;
 
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/VectorAnimationBase.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/VectorAnimationBase.cs
index 6f565ea78dc..6a65c2d5661 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/VectorAnimationBase.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/VectorAnimationBase.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -9,6 +9,8 @@
 // Please see MilCodeGen.html for more information.
 //
 
+using System.Windows.Media.Media3D;
+
 namespace System.Windows.Media.Animation
 {
     /// <summary>
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/VectorAnimationUsingKeyFrames.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/VectorAnimationUsingKeyFrames.cs
index 1ff2970d860..9ae5e85ace5 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/VectorAnimationUsingKeyFrames.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/VectorAnimationUsingKeyFrames.cs
@@ -1,14 +1,19 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+//
+//
 // This file was generated, please do not edit it directly.
+//
 // Please see MilCodeGen.html for more information.
+//
 
 using MS.Internal.KnownBoxes;
 using System.Collections;
 using System.ComponentModel;
 using System.Windows.Markup;
+using System.Windows.Media.Media3D;
 using MS.Internal.PresentationCore;
 
 namespace System.Windows.Media.Animation
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/VectorKeyFrameCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/VectorKeyFrameCollection.cs
index 639b9a70be0..21e7e1f52b9 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/VectorKeyFrameCollection.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/VectorKeyFrameCollection.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Converters/Generated/BrushValueSerializer.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Converters/Generated/BrushValueSerializer.cs
index 212f2b53fb6..515aa18b01e 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Converters/Generated/BrushValueSerializer.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Converters/Generated/BrushValueSerializer.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -9,7 +9,19 @@
 // Please see MilCodeGen.html for more information.
 //
 
+using MS.Internal;
+using MS.Internal.KnownBoxes;
+using MS.Internal.Collections;
+using MS.Utility;
+using System.Collections;
+using System.ComponentModel;
+using System.Globalization;
+using System.Text;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Composition;
 using System.Windows.Markup;
+using System.Windows.Media.Converters;
 
 namespace System.Windows.Media.Converters
 {
@@ -41,7 +53,7 @@ public override bool CanConvertToString(object value, IValueSerializerContext co
             Brush instance  = (Brush) value;
 
             return instance.CanSerializeToString();
-}
+        }
 
         /// <summary>
         /// Converts a string into a Brush.
@@ -56,7 +68,7 @@ public override object ConvertFromString(string value, IValueSerializerContext c
             {
                 return base.ConvertFromString( value, context );
             }
-}
+        }
 
         /// <summary>
         /// Converts the value into a string.
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Converters/Generated/CacheModeValueSerializer.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Converters/Generated/CacheModeValueSerializer.cs
index 8d66cd11124..da1bbb062c8 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Converters/Generated/CacheModeValueSerializer.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Converters/Generated/CacheModeValueSerializer.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -9,7 +9,19 @@
 // Please see MilCodeGen.html for more information.
 //
 
+using MS.Internal;
+using MS.Internal.KnownBoxes;
+using MS.Internal.Collections;
+using MS.Utility;
+using System.Collections;
+using System.ComponentModel;
+using System.Globalization;
+using System.Text;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Composition;
 using System.Windows.Markup;
+using System.Windows.Media.Converters;
 
 namespace System.Windows.Media.Converters
 {
@@ -41,7 +53,7 @@ public override bool CanConvertToString(object value, IValueSerializerContext co
             CacheMode instance  = (CacheMode) value;
 
             return instance.CanSerializeToString();
-}
+        }
 
         /// <summary>
         /// Converts a string into a CacheMode.
@@ -56,7 +68,7 @@ public override object ConvertFromString(string value, IValueSerializerContext c
             {
                 return base.ConvertFromString( value, context );
             }
-}
+        }
 
         /// <summary>
         /// Converts the value into a string.
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Converters/Generated/DoubleCollectionValueSerializer.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Converters/Generated/DoubleCollectionValueSerializer.cs
index cc0c8f52726..f7139e069b6 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Converters/Generated/DoubleCollectionValueSerializer.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Converters/Generated/DoubleCollectionValueSerializer.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -9,7 +9,19 @@
 // Please see MilCodeGen.html for more information.
 //
 
+using MS.Internal;
+using MS.Internal.KnownBoxes;
+using MS.Internal.Collections;
+using MS.Utility;
+using System.Collections;
+using System.ComponentModel;
+using System.Globalization;
+using System.Text;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Composition;
 using System.Windows.Markup;
+using System.Windows.Media.Converters;
 
 namespace System.Windows.Media.Converters
 {
@@ -39,7 +51,7 @@ public override bool CanConvertToString(object value, IValueSerializerContext co
             }
 
             return true;
-}
+        }
 
         /// <summary>
         /// Converts a string into a DoubleCollection.
@@ -54,7 +66,7 @@ public override object ConvertFromString(string value, IValueSerializerContext c
             {
                 return base.ConvertFromString( value, context );
             }
-}
+        }
 
         /// <summary>
         /// Converts the value into a string.
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Converters/Generated/GeometryValueSerializer.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Converters/Generated/GeometryValueSerializer.cs
index 37301ad0244..471617db037 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Converters/Generated/GeometryValueSerializer.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Converters/Generated/GeometryValueSerializer.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -9,7 +9,19 @@
 // Please see MilCodeGen.html for more information.
 //
 
+using MS.Internal;
+using MS.Internal.KnownBoxes;
+using MS.Internal.Collections;
+using MS.Utility;
+using System.Collections;
+using System.ComponentModel;
+using System.Globalization;
+using System.Text;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Composition;
 using System.Windows.Markup;
+using System.Windows.Media.Converters;
 
 namespace System.Windows.Media.Converters
 {
@@ -41,7 +53,7 @@ public override bool CanConvertToString(object value, IValueSerializerContext co
             Geometry instance  = (Geometry) value;
 
             return instance.CanSerializeToString();
-}
+        }
 
         /// <summary>
         /// Converts a string into a Geometry.
@@ -56,7 +68,7 @@ public override object ConvertFromString(string value, IValueSerializerContext c
             {
                 return base.ConvertFromString( value, context );
             }
-}
+        }
 
         /// <summary>
         /// Converts the value into a string.
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Converters/Generated/Int32CollectionValueSerializer.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Converters/Generated/Int32CollectionValueSerializer.cs
index 0c8fb5a8e33..cdfd9a62310 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Converters/Generated/Int32CollectionValueSerializer.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Converters/Generated/Int32CollectionValueSerializer.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -9,7 +9,19 @@
 // Please see MilCodeGen.html for more information.
 //
 
+using MS.Internal;
+using MS.Internal.KnownBoxes;
+using MS.Internal.Collections;
+using MS.Utility;
+using System.Collections;
+using System.ComponentModel;
+using System.Globalization;
+using System.Text;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Composition;
 using System.Windows.Markup;
+using System.Windows.Media.Converters;
 
 namespace System.Windows.Media.Converters
 {
@@ -39,7 +51,7 @@ public override bool CanConvertToString(object value, IValueSerializerContext co
             }
 
             return true;
-}
+        }
 
         /// <summary>
         /// Converts a string into a Int32Collection.
@@ -54,7 +66,7 @@ public override object ConvertFromString(string value, IValueSerializerContext c
             {
                 return base.ConvertFromString( value, context );
             }
-}
+        }
 
         /// <summary>
         /// Converts the value into a string.
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Converters/Generated/PathFigureCollectionValueSerializer.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Converters/Generated/PathFigureCollectionValueSerializer.cs
index ee94041245e..84d621981f6 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Converters/Generated/PathFigureCollectionValueSerializer.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Converters/Generated/PathFigureCollectionValueSerializer.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -9,7 +9,19 @@
 // Please see MilCodeGen.html for more information.
 //
 
+using MS.Internal;
+using MS.Internal.KnownBoxes;
+using MS.Internal.Collections;
+using MS.Utility;
+using System.Collections;
+using System.ComponentModel;
+using System.Globalization;
+using System.Text;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Composition;
 using System.Windows.Markup;
+using System.Windows.Media.Converters;
 
 namespace System.Windows.Media.Converters
 {
@@ -41,7 +53,7 @@ public override bool CanConvertToString(object value, IValueSerializerContext co
             PathFigureCollection instance  = (PathFigureCollection) value;
 
             return instance.CanSerializeToString();
-}
+        }
 
         /// <summary>
         /// Converts a string into a PathFigureCollection.
@@ -56,7 +68,7 @@ public override object ConvertFromString(string value, IValueSerializerContext c
             {
                 return base.ConvertFromString( value, context );
             }
-}
+        }
 
         /// <summary>
         /// Converts the value into a string.
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Converters/Generated/PointCollectionValueSerializer.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Converters/Generated/PointCollectionValueSerializer.cs
index c32c04cf7a4..0d611e050fc 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Converters/Generated/PointCollectionValueSerializer.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Converters/Generated/PointCollectionValueSerializer.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -9,7 +9,19 @@
 // Please see MilCodeGen.html for more information.
 //
 
+using MS.Internal;
+using MS.Internal.KnownBoxes;
+using MS.Internal.Collections;
+using MS.Utility;
+using System.Collections;
+using System.ComponentModel;
+using System.Globalization;
+using System.Text;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Composition;
 using System.Windows.Markup;
+using System.Windows.Media.Converters;
 
 namespace System.Windows.Media.Converters
 {
@@ -39,7 +51,7 @@ public override bool CanConvertToString(object value, IValueSerializerContext co
             }
 
             return true;
-}
+        }
 
         /// <summary>
         /// Converts a string into a PointCollection.
@@ -54,7 +66,7 @@ public override object ConvertFromString(string value, IValueSerializerContext c
             {
                 return base.ConvertFromString( value, context );
             }
-}
+        }
 
         /// <summary>
         /// Converts the value into a string.
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Converters/Generated/TransformValueSerializer.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Converters/Generated/TransformValueSerializer.cs
index f528772648e..09e4074c372 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Converters/Generated/TransformValueSerializer.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Converters/Generated/TransformValueSerializer.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -9,7 +9,19 @@
 // Please see MilCodeGen.html for more information.
 //
 
+using MS.Internal;
+using MS.Internal.KnownBoxes;
+using MS.Internal.Collections;
+using MS.Utility;
+using System.Collections;
+using System.ComponentModel;
+using System.Globalization;
+using System.Text;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Composition;
 using System.Windows.Markup;
+using System.Windows.Media.Converters;
 
 namespace System.Windows.Media.Converters
 {
@@ -41,7 +53,7 @@ public override bool CanConvertToString(object value, IValueSerializerContext co
             Transform instance  = (Transform) value;
 
             return instance.CanSerializeToString();
-}
+        }
 
         /// <summary>
         /// Converts a string into a Transform.
@@ -56,7 +68,7 @@ public override object ConvertFromString(string value, IValueSerializerContext c
             {
                 return base.ConvertFromString( value, context );
             }
-}
+        }
 
         /// <summary>
         /// Converts the value into a string.
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Converters/Generated/VectorCollectionValueSerializer.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Converters/Generated/VectorCollectionValueSerializer.cs
index e30980fbb8d..17eeb59d886 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Converters/Generated/VectorCollectionValueSerializer.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Converters/Generated/VectorCollectionValueSerializer.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -9,7 +9,19 @@
 // Please see MilCodeGen.html for more information.
 //
 
+using MS.Internal;
+using MS.Internal.KnownBoxes;
+using MS.Internal.Collections;
+using MS.Utility;
+using System.Collections;
+using System.ComponentModel;
+using System.Globalization;
+using System.Text;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Composition;
 using System.Windows.Markup;
+using System.Windows.Media.Converters;
 
 namespace System.Windows.Media.Converters
 {
@@ -39,7 +51,7 @@ public override bool CanConvertToString(object value, IValueSerializerContext co
             }
 
             return true;
-}
+        }
 
         /// <summary>
         /// Converts a string into a VectorCollection.
@@ -54,7 +66,7 @@ public override object ConvertFromString(string value, IValueSerializerContext c
             {
                 return base.ConvertFromString( value, context );
             }
-}
+        }
 
         /// <summary>
         /// Converts the value into a string.
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/BevelBitmapEffect.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/BevelBitmapEffect.cs
index d110bc82d47..ee4dee6cc3d 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/BevelBitmapEffect.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/BevelBitmapEffect.cs
@@ -9,9 +9,17 @@
 // Please see MilCodeGen.html for more information.
 //
 
-// These types are aliased to match the unamanaged names used in interop
+using MS.Internal;
+using MS.Utility;
+using System.Collections;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Composition;
+using System.Windows.Media.Imaging;
+
 namespace System.Windows.Media.Effects
 {
+
+
     sealed partial class BevelBitmapEffect : BitmapEffect
     {
         //------------------------------------------------------
@@ -279,8 +287,7 @@ static BevelBitmapEffect()
             // We check our static default fields which are of type Freezable
             // to make sure that they are not mutable, otherwise we will throw
             // if these get touched by more than one thread in the lifetime
-            // of your app.  (Windows OS 
-
+            // of your app.
 
 
             // Initializations
@@ -332,6 +339,8 @@ static BevelBitmapEffect()
                                    /* coerceValueCallback */ null);
         }
 
+
+
         #endregion Constructors
     }
 }
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/BitmapEffect.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/BitmapEffect.cs
index ad943ca5116..0dc969e57be 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/BitmapEffect.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/BitmapEffect.cs
@@ -9,11 +9,17 @@
 // Please see MilCodeGen.html for more information.
 //
 
+using MS.Internal;
+using MS.Utility;
+using System.Collections;
 using System.Windows.Media.Animation;
-// These types are aliased to match the unamanaged names used in interop
+using System.Windows.Media.Composition;
+using System.Windows.Media.Imaging;
 
 namespace System.Windows.Media.Effects
 {
+
+
     abstract partial class BitmapEffect : Animatable
     {
         //------------------------------------------------------
@@ -42,6 +48,9 @@ abstract partial class BitmapEffect : Animatable
             return (BitmapEffect)base.CloneCurrentValue();
         }
 
+
+
+
         #endregion Public Methods
 
         //------------------------------------------------------
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/BitmapEffectCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/BitmapEffectCollection.cs
index 26111e76b82..540dd402579 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/BitmapEffectCollection.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/BitmapEffectCollection.cs
@@ -2,14 +2,19 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+//
+//
 // This file was generated, please do not edit it directly.
+//
 // Please see MilCodeGen.html for more information.
+//
 
+using MS.Internal;
 using MS.Utility;
 using System.Collections;
 using System.Windows.Media.Animation;
-
-// These types are aliased to match the unamanaged names used in interop
+using System.Windows.Media.Composition;
+using System.Windows.Media.Imaging;
 
 namespace System.Windows.Media.Effects
 {
@@ -17,7 +22,6 @@ namespace System.Windows.Media.Effects
     /// A collection of BitmapEffect objects.
     /// </summary>
 
-
     public sealed partial class BitmapEffectCollection : Animatable, IList, IList<BitmapEffect>
     {
         //------------------------------------------------------
@@ -230,11 +234,14 @@ public BitmapEffect this[int index]
 
                 if (!Object.ReferenceEquals(_collection[ index ], value))
                 {
+
                     BitmapEffect oldValue = _collection[ index ];
                     OnFreezablePropertyChanged(oldValue, value);
 
                     _collection[ index ] = value;
-}
+
+
+                }
 
 
                 ++_version;
@@ -579,8 +586,10 @@ protected override void CloneCore(Freezable source)
                 BitmapEffect newValue = (BitmapEffect) sourceBitmapEffectCollection._collection[i].Clone();
                 OnFreezablePropertyChanged(/* oldValue = */ null, newValue);
                 _collection.Add(newValue);
-}
-}
+
+            }
+
+        }
         /// <summary>
         /// Implementation of Freezable.CloneCurrentValueCore()
         /// </summary>
@@ -599,8 +608,10 @@ protected override void CloneCurrentValueCore(Freezable source)
                 BitmapEffect newValue = (BitmapEffect) sourceBitmapEffectCollection._collection[i].CloneCurrentValue();
                 OnFreezablePropertyChanged(/* oldValue = */ null, newValue);
                 _collection.Add(newValue);
-}
-}
+
+            }
+
+        }
         /// <summary>
         /// Implementation of Freezable.GetAsFrozenCore()
         /// </summary>
@@ -619,8 +630,10 @@ protected override void GetAsFrozenCore(Freezable source)
                 BitmapEffect newValue = (BitmapEffect) sourceBitmapEffectCollection._collection[i].GetAsFrozen();
                 OnFreezablePropertyChanged(/* oldValue = */ null, newValue);
                 _collection.Add(newValue);
-}
-}
+
+            }
+
+        }
         /// <summary>
         /// Implementation of Freezable.GetCurrentValueAsFrozenCore()
         /// </summary>
@@ -639,8 +652,10 @@ protected override void GetCurrentValueAsFrozenCore(Freezable source)
                 BitmapEffect newValue = (BitmapEffect) sourceBitmapEffectCollection._collection[i].GetCurrentValueAsFrozen();
                 OnFreezablePropertyChanged(/* oldValue = */ null, newValue);
                 _collection.Add(newValue);
-}
-}
+
+            }
+
+        }
         /// <summary>
         /// Implementation of <see cref="System.Windows.Freezable.FreezeCore">Freezable.FreezeCore</see>.
         /// </summary>
@@ -744,6 +759,7 @@ internal Enumerator(BitmapEffectCollection list)
 
             void IDisposable.Dispose()
             {
+
             }
 
             /// <summary>
@@ -912,6 +928,7 @@ public BitmapEffectCollection(IEnumerable<BitmapEffect> collection)
                         BitmapEffect newValue = item;
                         OnFreezablePropertyChanged(/* oldValue = */ null, newValue);
                         _collection.Add(newValue);
+
                     }
 
                     needsItemValidation = false;
@@ -927,6 +944,7 @@ public BitmapEffectCollection(IEnumerable<BitmapEffect> collection)
                         throw new System.ArgumentException(SR.Collection_NoNull);
                     }
                     OnFreezablePropertyChanged(/* oldValue = */ null, item);
+
                 }
             }
 
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/BitmapEffectGroup.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/BitmapEffectGroup.cs
index 3aa93766e44..b87cbd6907d 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/BitmapEffectGroup.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/BitmapEffectGroup.cs
@@ -10,10 +10,16 @@
 //
 
 using MS.Internal;
-// These types are aliased to match the unamanaged names used in interop
+using MS.Utility;
+using System.Collections;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Composition;
+using System.Windows.Media.Imaging;
 
 namespace System.Windows.Media.Effects
 {
+
+
     sealed partial class BitmapEffectGroup : BitmapEffect
     {
         //------------------------------------------------------
@@ -187,9 +193,9 @@ static BitmapEffectGroup()
             // We check our static default fields which are of type Freezable
             // to make sure that they are not mutable, otherwise we will throw
             // if these get touched by more than one thread in the lifetime
-            // of your app. 
+            // of your app.
             Debug.Assert(s_Children == null || s_Children.IsFrozen,
-                "Detected context bound default value BitmapEffectGroup.s_Children");
+                "Detected context bound default value BitmapEffectGroup.s_Children (See OS Bug #947272).");
 
 
             // Initializations
@@ -205,6 +211,8 @@ static BitmapEffectGroup()
                                    /* coerceValueCallback */ null);
         }
 
+
+
         #endregion Constructors
     }
 }
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/BitmapEffectInput.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/BitmapEffectInput.cs
index 550a94c9092..88130ea886b 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/BitmapEffectInput.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/BitmapEffectInput.cs
@@ -9,12 +9,17 @@
 // Please see MilCodeGen.html for more information.
 //
 
+using MS.Internal;
+using MS.Utility;
+using System.Collections;
 using System.Windows.Media.Animation;
+using System.Windows.Media.Composition;
 using System.Windows.Media.Imaging;
-// These types are aliased to match the unamanaged names used in interop
 
 namespace System.Windows.Media.Effects
 {
+
+
     sealed partial class BitmapEffectInput : Animatable
     {
         //------------------------------------------------------
@@ -221,9 +226,9 @@ static BitmapEffectInput()
             // We check our static default fields which are of type Freezable
             // to make sure that they are not mutable, otherwise we will throw
             // if these get touched by more than one thread in the lifetime
-            // of your app. 
+            // of your app.
             Debug.Assert(s_Input == null || s_Input.IsFrozen,
-                "Detected context bound default value BitmapEffectInput.s_Input");
+                "Detected context bound default value BitmapEffectInput.s_Input (See OS Bug #947272).");
 
 
             // Initializations
@@ -257,6 +262,8 @@ static BitmapEffectInput()
                                    /* coerceValueCallback */ null);
         }
 
+
+
         #endregion Constructors
     }
 }
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/BlurBitmapEffect.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/BlurBitmapEffect.cs
index f2502ae80c5..ee821b9f6d7 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/BlurBitmapEffect.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/BlurBitmapEffect.cs
@@ -9,9 +9,17 @@
 // Please see MilCodeGen.html for more information.
 //
 
-// These types are aliased to match the unamanaged names used in interop
+using MS.Internal;
+using MS.Utility;
+using System.Collections;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Composition;
+using System.Windows.Media.Imaging;
+
 namespace System.Windows.Media.Effects
 {
+
+
     sealed partial class BlurBitmapEffect : BitmapEffect
     {
         //------------------------------------------------------
@@ -223,6 +231,8 @@ static BlurBitmapEffect()
                                    /* coerceValueCallback */ null);
         }
 
+
+
         #endregion Constructors
     }
 }
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/BlurEffect.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/BlurEffect.cs
index 6376044a486..08a34fbe370 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/BlurEffect.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/BlurEffect.cs
@@ -9,11 +9,17 @@
 // Please see MilCodeGen.html for more information.
 //
 
+using MS.Internal;
+using MS.Utility;
+using System.Collections;
+using System.Windows.Media.Animation;
 using System.Windows.Media.Composition;
-// These types are aliased to match the unamanaged names used in interop
+using System.Windows.Media.Imaging;
 
 namespace System.Windows.Media.Effects
 {
+
+
     sealed partial class BlurEffect : Effect
     {
         //------------------------------------------------------
@@ -55,21 +61,21 @@ sealed partial class BlurEffect : Effect
 
         private static void RadiusPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
-            BlurEffect target = ((BlurEffect)d);
+            BlurEffect target = ((BlurEffect) d);
 
 
             target.PropertyChanged(RadiusProperty);
         }
         private static void KernelTypePropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
-            BlurEffect target = ((BlurEffect)d);
+            BlurEffect target = ((BlurEffect) d);
 
 
             target.PropertyChanged(KernelTypeProperty);
         }
         private static void RenderingBiasPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
-            BlurEffect target = ((BlurEffect)d);
+            BlurEffect target = ((BlurEffect) d);
 
 
             target.PropertyChanged(RenderingBiasProperty);
@@ -85,7 +91,7 @@ public double Radius
         {
             get
             {
-                return (double)GetValue(RadiusProperty);
+                return (double) GetValue(RadiusProperty);
             }
             set
             {
@@ -100,7 +106,7 @@ public KernelType KernelType
         {
             get
             {
-                return (KernelType)GetValue(KernelTypeProperty);
+                return (KernelType) GetValue(KernelTypeProperty);
             }
             set
             {
@@ -115,7 +121,7 @@ public RenderingBias RenderingBias
         {
             get
             {
-                return (RenderingBias)GetValue(RenderingBiasProperty);
+                return (RenderingBias) GetValue(RenderingBiasProperty);
             }
             set
             {
@@ -189,24 +195,33 @@ internal override void UpdateResource(DUCE.Channel channel, bool skipOnChannelCh
         }
         internal override DUCE.ResourceHandle AddRefOnChannelCore(DUCE.Channel channel)
         {
-            if (_duceResource.CreateOrAddRefOnChannel(this, channel, System.Windows.Media.Composition.DUCE.ResourceType.TYPE_BLUREFFECT))
-            {
-                AddRefOnChannelAnimations(channel);
 
+                if (_duceResource.CreateOrAddRefOnChannel(this, channel, System.Windows.Media.Composition.DUCE.ResourceType.TYPE_BLUREFFECT))
+                {
 
-                UpdateResource(channel, true /* skip "on channel" check - we already know that we're on channel */ );
-            }
 
-            return _duceResource.GetHandle(channel);
+                    AddRefOnChannelAnimations(channel);
+
+
+                    UpdateResource(channel, true /* skip "on channel" check - we already know that we're on channel */ );
+                }
+
+                return _duceResource.GetHandle(channel);
+
         }
         internal override void ReleaseOnChannelCore(DUCE.Channel channel)
         {
-            Debug.Assert(_duceResource.IsOnChannel(channel));
 
-            if (_duceResource.ReleaseOnChannel(channel))
-            {
-                ReleaseOnChannelAnimations(channel);
-            }
+                Debug.Assert(_duceResource.IsOnChannel(channel));
+
+                if (_duceResource.ReleaseOnChannel(channel))
+                {
+
+
+                    ReleaseOnChannelAnimations(channel);
+
+                }
+
         }
         internal override DUCE.ResourceHandle GetHandleCore(DUCE.Channel channel)
         {
@@ -331,6 +346,8 @@ static BlurEffect()
                                    /* coerceValueCallback */ null);
         }
 
+
+
         #endregion Constructors
     }
 }
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/DropShadowBitmapEffect.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/DropShadowBitmapEffect.cs
index 2d7378af99a..705e2a6724a 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/DropShadowBitmapEffect.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/DropShadowBitmapEffect.cs
@@ -9,9 +9,17 @@
 // Please see MilCodeGen.html for more information.
 //
 
-// These types are aliased to match the unamanaged names used in interop
+using MS.Internal;
+using MS.Utility;
+using System.Collections;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Composition;
+using System.Windows.Media.Imaging;
+
 namespace System.Windows.Media.Effects
 {
+
+
     sealed partial class DropShadowBitmapEffect : BitmapEffect
     {
         //------------------------------------------------------
@@ -316,7 +324,6 @@ static DropShadowBitmapEffect()
             // of your app.
 
 
-
             // Initializations
             Type typeofThis = typeof(DropShadowBitmapEffect);
             ShadowDepthProperty =
@@ -375,6 +382,8 @@ static DropShadowBitmapEffect()
                                    /* coerceValueCallback */ null);
         }
 
+
+
         #endregion Constructors
     }
 }
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/DropShadowEffect.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/DropShadowEffect.cs
index 00c4d22f50e..663d83c6cad 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/DropShadowEffect.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/DropShadowEffect.cs
@@ -9,11 +9,17 @@
 // Please see MilCodeGen.html for more information.
 //
 
+using MS.Internal;
+using MS.Utility;
+using System.Collections;
+using System.Windows.Media.Animation;
 using System.Windows.Media.Composition;
-// These types are aliased to match the unamanaged names used in interop
+using System.Windows.Media.Imaging;
 
 namespace System.Windows.Media.Effects
 {
+
+
     sealed partial class DropShadowEffect : Effect
     {
         //------------------------------------------------------
@@ -278,8 +284,11 @@ internal override void UpdateResource(DUCE.Channel channel, bool skipOnChannelCh
         }
         internal override DUCE.ResourceHandle AddRefOnChannelCore(DUCE.Channel channel)
         {
+
                 if (_duceResource.CreateOrAddRefOnChannel(this, channel, System.Windows.Media.Composition.DUCE.ResourceType.TYPE_DROPSHADOWEFFECT))
                 {
+
+
                     AddRefOnChannelAnimations(channel);
 
 
@@ -287,16 +296,22 @@ internal override DUCE.ResourceHandle AddRefOnChannelCore(DUCE.Channel channel)
                 }
 
                 return _duceResource.GetHandle(channel);
-}
+
+        }
         internal override void ReleaseOnChannelCore(DUCE.Channel channel)
         {
+
                 Debug.Assert(_duceResource.IsOnChannel(channel));
 
                 if (_duceResource.ReleaseOnChannel(channel))
                 {
+
+
                     ReleaseOnChannelAnimations(channel);
-}
-}
+
+                }
+
+        }
         internal override DUCE.ResourceHandle GetHandleCore(DUCE.Channel channel)
         {
             // Note that we are in a lock here already.
@@ -404,7 +419,6 @@ static DropShadowEffect()
             // of your app.
 
 
-
             // Initializations
             Type typeofThis = typeof(DropShadowEffect);
             ShadowDepthProperty =
@@ -463,6 +477,8 @@ static DropShadowEffect()
                                    /* coerceValueCallback */ null);
         }
 
+
+
         #endregion Constructors
     }
 }
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/EdgeProfile.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/EdgeProfile.cs
index 96d6742bb41..090a2b5ff7f 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/EdgeProfile.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/EdgeProfile.cs
@@ -9,10 +9,6 @@
 // Please see MilCodeGen.html for more information.
 //
 
-#if PRESENTATION_CORE
-#else
-using SR=System.Windows.SR;
-#endif
 
 namespace System.Windows.Media.Effects
 {
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/Effect.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/Effect.cs
index a8e93adb0b6..82a7dbb1021 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/Effect.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/Effect.cs
@@ -9,12 +9,17 @@
 // Please see MilCodeGen.html for more information.
 //
 
+using MS.Internal;
+using MS.Utility;
+using System.Collections;
 using System.Windows.Media.Animation;
 using System.Windows.Media.Composition;
-// These types are aliased to match the unamanaged names used in interop
+using System.Windows.Media.Imaging;
 
 namespace System.Windows.Media.Effects
 {
+
+
     abstract partial class Effect : Animatable, DUCE.IResource
     {
         //------------------------------------------------------
@@ -149,6 +154,7 @@ DUCE.Channel DUCE.IResource.GetChannel(int index)
             return GetChannelCore(index);
         }
 
+
         #endregion Internal Methods
 
         //------------------------------------------------------
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/EmbossBitmapEffect.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/EmbossBitmapEffect.cs
index dc7496c1345..b18441e73bb 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/EmbossBitmapEffect.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/EmbossBitmapEffect.cs
@@ -9,9 +9,17 @@
 // Please see MilCodeGen.html for more information.
 //
 
-// These types are aliased to match the unamanaged names used in interop
+using MS.Internal;
+using MS.Utility;
+using System.Collections;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Composition;
+using System.Windows.Media.Imaging;
+
 namespace System.Windows.Media.Effects
 {
+
+
     sealed partial class EmbossBitmapEffect : BitmapEffect
     {
         //------------------------------------------------------
@@ -205,8 +213,7 @@ static EmbossBitmapEffect()
             // We check our static default fields which are of type Freezable
             // to make sure that they are not mutable, otherwise we will throw
             // if these get touched by more than one thread in the lifetime
-            // of your app
-
+            // of your app.
 
 
             // Initializations
@@ -231,6 +238,8 @@ static EmbossBitmapEffect()
                                    /* coerceValueCallback */ null);
         }
 
+
+
         #endregion Constructors
     }
 }
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/ImplicitInputBrush.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/ImplicitInputBrush.cs
index 6d913cf6c85..2946ff9f308 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/ImplicitInputBrush.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/ImplicitInputBrush.cs
@@ -9,11 +9,17 @@
 // Please see MilCodeGen.html for more information.
 //
 
+using MS.Internal;
+using MS.Utility;
+using System.Collections;
+using System.Windows.Media.Animation;
 using System.Windows.Media.Composition;
-// These types are aliased to match the unamanaged names used in interop
+using System.Windows.Media.Imaging;
 
 namespace System.Windows.Media.Effects
 {
+
+
     sealed partial class ImplicitInputBrush : Brush
     {
         //------------------------------------------------------
@@ -154,6 +160,7 @@ internal override void UpdateResource(DUCE.Channel channel, bool skipOnChannelCh
         }
         internal override DUCE.ResourceHandle AddRefOnChannelCore(DUCE.Channel channel)
         {
+
                 if (_duceResource.CreateOrAddRefOnChannel(this, channel, System.Windows.Media.Composition.DUCE.ResourceType.TYPE_IMPLICITINPUTBRUSH))
                 {
                     Transform vTransform = Transform;
@@ -168,9 +175,11 @@ internal override DUCE.ResourceHandle AddRefOnChannelCore(DUCE.Channel channel)
                 }
 
                 return _duceResource.GetHandle(channel);
-}
+
+        }
         internal override void ReleaseOnChannelCore(DUCE.Channel channel)
         {
+
                 Debug.Assert(_duceResource.IsOnChannel(channel));
 
                 if (_duceResource.ReleaseOnChannel(channel))
@@ -181,8 +190,10 @@ internal override void ReleaseOnChannelCore(DUCE.Channel channel)
                     if (vRelativeTransform != null) ((DUCE.IResource)vRelativeTransform).ReleaseOnChannel(channel);
 
                     ReleaseOnChannelAnimations(channel);
-}
-}
+
+                }
+
+        }
         internal override DUCE.ResourceHandle GetHandleCore(DUCE.Channel channel)
         {
             // Note that we are in a lock here already.
@@ -240,6 +251,8 @@ internal override DUCE.Channel GetChannelCore(int index)
 
         internal System.Windows.Media.Composition.DUCE.MultiChannelResource _duceResource = new System.Windows.Media.Composition.DUCE.MultiChannelResource();
 
+
+
         #endregion Internal Fields
 
 
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/KernelType.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/KernelType.cs
index eb71edede05..5508338ff3b 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/KernelType.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/KernelType.cs
@@ -9,10 +9,6 @@
 // Please see MilCodeGen.html for more information.
 //
 
-#if PRESENTATION_CORE
-#else
-using SR=System.Windows.SR;
-#endif
 
 namespace System.Windows.Media.Effects
 {
@@ -22,7 +18,7 @@ namespace System.Windows.Media.Effects
     public enum KernelType
     {
         /// <summary>
-        ///     Gaussian - Use a Gaussian filter
+        ///     Gaussian - Use a Guassian filter
         /// </summary>
         Gaussian = 0,
 
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/OuterGlowBitmapEffect.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/OuterGlowBitmapEffect.cs
index 503b7b23a99..9c395dfaa5a 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/OuterGlowBitmapEffect.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/OuterGlowBitmapEffect.cs
@@ -9,9 +9,17 @@
 // Please see MilCodeGen.html for more information.
 //
 
-// These types are aliased to match the unamanaged names used in interop
+using MS.Internal;
+using MS.Utility;
+using System.Collections;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Composition;
+using System.Windows.Media.Imaging;
+
 namespace System.Windows.Media.Effects
 {
+
+
     sealed partial class OuterGlowBitmapEffect : BitmapEffect
     {
         //------------------------------------------------------
@@ -259,8 +267,7 @@ static OuterGlowBitmapEffect()
             // We check our static default fields which are of type Freezable
             // to make sure that they are not mutable, otherwise we will throw
             // if these get touched by more than one thread in the lifetime
-            // of your app
-            //
+            // of your app.
 
 
             // Initializations
@@ -303,6 +310,8 @@ static OuterGlowBitmapEffect()
                                    /* coerceValueCallback */ null);
         }
 
+
+
         #endregion Constructors
     }
 }
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/PixelShader.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/PixelShader.cs
index 952bf19293c..9ff9610fe68 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/PixelShader.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/PixelShader.cs
@@ -9,12 +9,17 @@
 // Please see MilCodeGen.html for more information.
 //
 
+using MS.Internal;
+using MS.Utility;
+using System.Collections;
 using System.Windows.Media.Animation;
 using System.Windows.Media.Composition;
-// These types are aliased to match the unamanaged names used in interop
+using System.Windows.Media.Imaging;
 
 namespace System.Windows.Media.Effects
 {
+
+
     sealed partial class PixelShader : Animatable, DUCE.IResource
     {
         //------------------------------------------------------
@@ -146,6 +151,8 @@ DUCE.ResourceHandle DUCE.IResource.AddRefOnChannel(DUCE.Channel channel)
             {
                 if (_duceResource.CreateOrAddRefOnChannel(this, channel, System.Windows.Media.Composition.DUCE.ResourceType.TYPE_PIXELSHADER))
                 {
+
+
                     AddRefOnChannelAnimations(channel);
 
 
@@ -163,8 +170,11 @@ void DUCE.IResource.ReleaseOnChannel(DUCE.Channel channel)
 
                 if (_duceResource.ReleaseOnChannel(channel))
                 {
+
+
                     ReleaseOnChannelAnimations(channel);
-}
+
+                }
             }
         }
         DUCE.ResourceHandle DUCE.IResource.GetHandle(DUCE.Channel channel)
@@ -269,8 +279,7 @@ static PixelShader()
             // We check our static default fields which are of type Freezable
             // to make sure that they are not mutable, otherwise we will throw
             // if these get touched by more than one thread in the lifetime
-            // of your app. 
-
+            // of your app.
 
 
             // Initializations
@@ -295,6 +304,8 @@ static PixelShader()
                                    /* coerceValueCallback */ null);
         }
 
+
+
         #endregion Constructors
     }
 }
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/RenderingBias.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/RenderingBias.cs
index 54304eb15e6..6aa4aaa5319 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/RenderingBias.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/RenderingBias.cs
@@ -9,10 +9,6 @@
 // Please see MilCodeGen.html for more information.
 //
 
-#if PRESENTATION_CORE
-#else
-using SR=System.Windows.SR;
-#endif
 
 namespace System.Windows.Media.Effects
 {
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/ShaderEffect.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/ShaderEffect.cs
index 6e403a6157d..ba26a7e2fb8 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/ShaderEffect.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/ShaderEffect.cs
@@ -9,11 +9,17 @@
 // Please see MilCodeGen.html for more information.
 //
 
+using MS.Internal;
+using MS.Utility;
+using System.Collections;
+using System.Windows.Media.Animation;
 using System.Windows.Media.Composition;
-// These types are aliased to match the unamanaged names used in interop
+using System.Windows.Media.Imaging;
 
 namespace System.Windows.Media.Effects
 {
+
+
     partial class ShaderEffect : Effect
     {
         //------------------------------------------------------
@@ -55,6 +61,7 @@ partial class ShaderEffect : Effect
 
         private static void PixelShaderPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
+
             ShaderEffect target = ((ShaderEffect) d);
 
 
@@ -162,6 +169,7 @@ internal override void UpdateResource(DUCE.Channel channel, bool skipOnChannelCh
         }
         private DUCE.ResourceHandle GeneratedAddRefOnChannelCore(DUCE.Channel channel)
         {
+
                 if (_duceResource.CreateOrAddRefOnChannel(this, channel, System.Windows.Media.Composition.DUCE.ResourceType.TYPE_SHADEREFFECT))
                 {
                     PixelShader vPixelShader = PixelShader;
@@ -174,9 +182,11 @@ private DUCE.ResourceHandle GeneratedAddRefOnChannelCore(DUCE.Channel channel)
                 }
 
                 return _duceResource.GetHandle(channel);
-}
+
+        }
         private void GeneratedReleaseOnChannelCore(DUCE.Channel channel)
         {
+
                 Debug.Assert(_duceResource.IsOnChannel(channel));
 
                 if (_duceResource.ReleaseOnChannel(channel))
@@ -185,8 +195,10 @@ private void GeneratedReleaseOnChannelCore(DUCE.Channel channel)
                     if (vPixelShader != null) ((DUCE.IResource)vPixelShader).ReleaseOnChannel(channel);
 
                     ReleaseOnChannelAnimations(channel);
-}
-}
+
+                }
+
+        }
         internal override DUCE.ResourceHandle GetHandleCore(DUCE.Channel channel)
         {
             // Note that we are in a lock here already.
@@ -266,8 +278,7 @@ static ShaderEffect()
             // We check our static default fields which are of type Freezable
             // to make sure that they are not mutable, otherwise we will throw
             // if these get touched by more than one thread in the lifetime
-            // of your app
-
+            // of your app.
 
 
             // Initializations
@@ -283,6 +294,8 @@ static ShaderEffect()
                                    /* coerceValueCallback */ null);
         }
 
+
+
         #endregion Constructors
     }
 }
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/ShaderRenderMode.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/ShaderRenderMode.cs
index 4aaa0cfcc58..10a5806962c 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/ShaderRenderMode.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/ShaderRenderMode.cs
@@ -9,10 +9,6 @@
 // Please see MilCodeGen.html for more information.
 //
 
-#if PRESENTATION_CORE
-#else
-using SR=System.Windows.SR;
-#endif
 
 namespace System.Windows.Media.Effects
 {
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/AlignmentX.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/AlignmentX.cs
index c519cd4d5cf..8b2a555ea3b 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/AlignmentX.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/AlignmentX.cs
@@ -9,10 +9,6 @@
 // Please see MilCodeGen.html for more information.
 //
 
-#if PRESENTATION_CORE
-#else
-using SR=System.Windows.SR;
-#endif
 
 namespace System.Windows.Media
 {
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/AlignmentY.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/AlignmentY.cs
index 72d67271ff8..adf64fa59bb 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/AlignmentY.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/AlignmentY.cs
@@ -9,10 +9,6 @@
 // Please see MilCodeGen.html for more information.
 //
 
-#if PRESENTATION_CORE
-#else
-using SR=System.Windows.SR;
-#endif
 
 namespace System.Windows.Media
 {
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/ArcSegment.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/ArcSegment.cs
index 1dfaab1baf1..90833520f7c 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/ArcSegment.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/ArcSegment.cs
@@ -9,11 +9,24 @@
 // Please see MilCodeGen.html for more information.
 //
 
+using MS.Internal;
 using MS.Internal.KnownBoxes;
-// These types are aliased to match the unamanaged names used in interop
+using MS.Internal.Collections;
+using MS.Utility;
+using System.Collections;
+using System.ComponentModel;
+using System.Globalization;
+using System.Text;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Composition;
+using System.Windows.Markup;
+using System.Windows.Media.Converters;
 
 namespace System.Windows.Media
 {
+
+
     sealed partial class ArcSegment : PathSegment
     {
         //------------------------------------------------------
@@ -254,8 +267,7 @@ static ArcSegment()
             // We check our static default fields which are of type Freezable
             // to make sure that they are not mutable, otherwise we will throw
             // if these get touched by more than one thread in the lifetime
-            // of your app.  (Windows OS 
-
+            // of your app.
 
 
             // Initializations
@@ -307,6 +319,8 @@ static ArcSegment()
                                    /* coerceValueCallback */ null);
         }
 
+
+
         #endregion Constructors
     }
 }
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/BezierSegment.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/BezierSegment.cs
index 21c9db73285..eab15eda783 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/BezierSegment.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/BezierSegment.cs
@@ -9,9 +9,24 @@
 // Please see MilCodeGen.html for more information.
 //
 
-// These types are aliased to match the unamanaged names used in interop
+using MS.Internal;
+using MS.Internal.KnownBoxes;
+using MS.Internal.Collections;
+using MS.Utility;
+using System.Collections;
+using System.ComponentModel;
+using System.Globalization;
+using System.Text;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Composition;
+using System.Windows.Markup;
+using System.Windows.Media.Converters;
+
 namespace System.Windows.Media
 {
+
+
     sealed partial class BezierSegment : PathSegment
     {
         //------------------------------------------------------
@@ -227,8 +242,7 @@ static BezierSegment()
             // We check our static default fields which are of type Freezable
             // to make sure that they are not mutable, otherwise we will throw
             // if these get touched by more than one thread in the lifetime
-            // of your app.  (Windows OS 
-
+            // of your app.
 
 
             // Initializations
@@ -262,6 +276,8 @@ static BezierSegment()
                                    /* coerceValueCallback */ null);
         }
 
+
+
         #endregion Constructors
     }
 }
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/BitmapCache.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/BitmapCache.cs
index 519491fe957..e3bebff0b1b 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/BitmapCache.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/BitmapCache.cs
@@ -9,12 +9,24 @@
 // Please see MilCodeGen.html for more information.
 //
 
+using MS.Internal;
 using MS.Internal.KnownBoxes;
+using MS.Internal.Collections;
+using MS.Utility;
+using System.Collections;
+using System.ComponentModel;
+using System.Globalization;
+using System.Text;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Animation;
 using System.Windows.Media.Composition;
-// These types are aliased to match the unamanaged names used in interop
+using System.Windows.Markup;
+using System.Windows.Media.Converters;
 
 namespace System.Windows.Media
 {
+
+
     sealed partial class BitmapCache : CacheMode
     {
         //------------------------------------------------------
@@ -190,8 +202,11 @@ internal override void UpdateResource(DUCE.Channel channel, bool skipOnChannelCh
         }
         internal override DUCE.ResourceHandle AddRefOnChannelCore(DUCE.Channel channel)
         {
+
                 if (_duceResource.CreateOrAddRefOnChannel(this, channel, System.Windows.Media.Composition.DUCE.ResourceType.TYPE_BITMAPCACHE))
                 {
+
+
                     AddRefOnChannelAnimations(channel);
 
 
@@ -199,16 +214,22 @@ internal override DUCE.ResourceHandle AddRefOnChannelCore(DUCE.Channel channel)
                 }
 
                 return _duceResource.GetHandle(channel);
-}
+
+        }
         internal override void ReleaseOnChannelCore(DUCE.Channel channel)
         {
+
                 Debug.Assert(_duceResource.IsOnChannel(channel));
 
                 if (_duceResource.ReleaseOnChannel(channel))
                 {
+
+
                     ReleaseOnChannelAnimations(channel);
-}
-}
+
+                }
+
+        }
         internal override DUCE.ResourceHandle GetHandleCore(DUCE.Channel channel)
         {
             // Note that we are in a lock here already.
@@ -298,8 +319,7 @@ static BitmapCache()
             // We check our static default fields which are of type Freezable
             // to make sure that they are not mutable, otherwise we will throw
             // if these get touched by more than one thread in the lifetime
-            // of your app.  (Windows OS 
-
+            // of your app.
 
 
             // Initializations
@@ -333,6 +353,8 @@ static BitmapCache()
                                    /* coerceValueCallback */ null);
         }
 
+
+
         #endregion Constructors
     }
 }
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/BitmapCacheBrush.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/BitmapCacheBrush.cs
index 61e8283d719..e2aff0d16e9 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/BitmapCacheBrush.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/BitmapCacheBrush.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -9,12 +9,24 @@
 // Please see MilCodeGen.html for more information.
 //
 
+using MS.Internal;
 using MS.Internal.KnownBoxes;
+using MS.Internal.Collections;
+using MS.Utility;
+using System.Collections;
+using System.ComponentModel;
+using System.Globalization;
+using System.Text;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Animation;
 using System.Windows.Media.Composition;
-// These types are aliased to match the unamanaged names used in interop
+using System.Windows.Markup;
+using System.Windows.Media.Converters;
 
 namespace System.Windows.Media
 {
+
+
     sealed partial class BitmapCacheBrush : Brush
     {
         //------------------------------------------------------
@@ -63,6 +75,10 @@ private static void TargetPropertyChanged(DependencyObject d, DependencyProperty
         }
         private static void BitmapCachePropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
+
+
+
+
             // The first change to the default value of a mutable collection property (e.g. GeometryGroup.Children) 
             // will promote the property value from a default value to a local value. This is technically a sub-property 
             // change because the collection was changed and not a new collection set (GeometryGroup.Children.
@@ -359,6 +375,7 @@ internal override void UpdateResource(DUCE.Channel channel, bool skipOnChannelCh
         }
         internal override DUCE.ResourceHandle AddRefOnChannelCore(DUCE.Channel channel)
         {
+
                 if (_duceResource.CreateOrAddRefOnChannel(this, channel, System.Windows.Media.Composition.DUCE.ResourceType.TYPE_BITMAPCACHEBRUSH))
                 {
                     Transform vTransform = Transform;
@@ -376,9 +393,11 @@ internal override DUCE.ResourceHandle AddRefOnChannelCore(DUCE.Channel channel)
                 }
 
                 return _duceResource.GetHandle(channel);
-}
+
+        }
         internal override void ReleaseOnChannelCore(DUCE.Channel channel)
         {
+
                 Debug.Assert(_duceResource.IsOnChannel(channel));
 
                 if (_duceResource.ReleaseOnChannel(channel))
@@ -392,8 +411,10 @@ internal override void ReleaseOnChannelCore(DUCE.Channel channel)
                     Visual vInternalTarget = InternalTarget;
                     vInternalTarget?.ReleaseOnChannelForCyclicBrush(this, channel);
                     ReleaseOnChannelAnimations(channel);
-}
-}
+
+                }
+
+        }
         internal override DUCE.ResourceHandle GetHandleCore(DUCE.Channel channel)
         {
             // Note that we are in a lock here already.
@@ -503,8 +524,7 @@ static BitmapCacheBrush()
             // We check our static default fields which are of type Freezable
             // to make sure that they are not mutable, otherwise we will throw
             // if these get touched by more than one thread in the lifetime
-            // of your app.  (Windows OS 
-
+            // of your app.
 
 
             // Initializations
@@ -557,6 +577,8 @@ static BitmapCacheBrush()
                                    /* coerceValueCallback */ null);
         }
 
+
+
         #endregion Constructors
     }
 }
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/BitmapScalingMode.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/BitmapScalingMode.cs
index 1cd6b1f0418..3106e14e4d9 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/BitmapScalingMode.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/BitmapScalingMode.cs
@@ -9,10 +9,6 @@
 // Please see MilCodeGen.html for more information.
 //
 
-#if PRESENTATION_CORE
-#else
-using SR=System.Windows.SR;
-#endif
 
 namespace System.Windows.Media
 {
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/Brush.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/Brush.cs
index dbd7388f2d3..ea206cf0896 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/Brush.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/Brush.cs
@@ -9,15 +9,23 @@
 // Please see MilCodeGen.html for more information.
 //
 
+using MS.Internal;
+using MS.Internal.KnownBoxes;
+using MS.Internal.Collections;
+using MS.Utility;
+using System.Collections;
 using System.ComponentModel;
+using System.Globalization;
+using System.Text;
+using System.Windows.Media.Effects;
 using System.Windows.Media.Animation;
 using System.Windows.Media.Composition;
 using System.Windows.Markup;
 using System.Windows.Media.Converters;
-// These types are aliased to match the unamanaged names used in interop
 
 namespace System.Windows.Media
 {
+
     [TypeConverter(typeof(BrushConverter))]
     [ValueSerializer(typeof(BrushValueSerializer))] // Used by MarkupWriter
     abstract partial class Brush : Animatable, IFormattable, DUCE.IResource
@@ -68,6 +76,10 @@ private static void OpacityPropertyChanged(DependencyObject d, DependencyPropert
         }
         private static void TransformPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
+
+
+
+
             // The first change to the default value of a mutable collection property (e.g. GeometryGroup.Children) 
             // will promote the property value from a default value to a local value. This is technically a sub-property 
             // change because the collection was changed and not a new collection set (GeometryGroup.Children.
@@ -112,6 +124,10 @@ private static void TransformPropertyChanged(DependencyObject d, DependencyPrope
         }
         private static void RelativeTransformPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
+
+
+
+
             // The first change to the default value of a mutable collection property (e.g. GeometryGroup.Children) 
             // will promote the property value from a default value to a local value. This is technically a sub-property 
             // change because the collection was changed and not a new collection set (GeometryGroup.Children.
@@ -419,8 +435,7 @@ static Brush()
             // We check our static default fields which are of type Freezable
             // to make sure that they are not mutable, otherwise we will throw
             // if these get touched by more than one thread in the lifetime
-            // of your app.  (Windows OS 
-
+            // of your app.
             Debug.Assert(s_Transform == null || s_Transform.IsFrozen,
                 "Detected context bound default value Brush.s_Transform (See OS Bug #947272).");
 
@@ -460,6 +475,8 @@ static Brush()
                                    /* coerceValueCallback */ null);
         }
 
+
+
         #endregion Constructors
     }
 }
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/BrushConverter.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/BrushConverter.cs
index 0033b41b639..61c606ba991 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/BrushConverter.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/BrushConverter.cs
@@ -1,12 +1,27 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+//
+//
 // This file was generated, please do not edit it directly.
+//
 // Please see MilCodeGen.html for more information.
+//
 
+using MS.Internal;
+using MS.Internal.KnownBoxes;
+using MS.Internal.Collections;
+using MS.Utility;
+using System.Collections;
 using System.ComponentModel;
 using System.Globalization;
+using System.Text;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Composition;
+using System.Windows.Markup;
+using System.Windows.Media.Converters;
 
 namespace System.Windows.Media
 {
@@ -84,9 +99,8 @@ public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo c
                 throw GetConvertFromException(value);
             }
 
-            String source = value as string;
 
-            if (source != null)
+            if (value is string source)
             {
                 return Brush.Parse(source, context);
             }
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/BrushMappingMode.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/BrushMappingMode.cs
index 4591a4a4b7a..05e4a1c2159 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/BrushMappingMode.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/BrushMappingMode.cs
@@ -9,10 +9,6 @@
 // Please see MilCodeGen.html for more information.
 //
 
-#if PRESENTATION_CORE
-#else
-using SR=System.Windows.SR;
-#endif
 
 namespace System.Windows.Media
 {
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/CacheMode.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/CacheMode.cs
index 2a8cbe94169..5ccb494cf95 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/CacheMode.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/CacheMode.cs
@@ -9,15 +9,23 @@
 // Please see MilCodeGen.html for more information.
 //
 
+using MS.Internal;
+using MS.Internal.KnownBoxes;
+using MS.Internal.Collections;
+using MS.Utility;
+using System.Collections;
 using System.ComponentModel;
+using System.Globalization;
+using System.Text;
+using System.Windows.Media.Effects;
 using System.Windows.Media.Animation;
 using System.Windows.Media.Composition;
 using System.Windows.Markup;
 using System.Windows.Media.Converters;
-// These types are aliased to match the unamanaged names used in interop
 
 namespace System.Windows.Media
 {
+
     [TypeConverter(typeof(CacheModeConverter))]
     [ValueSerializer(typeof(CacheModeValueSerializer))] // Used by MarkupWriter
     abstract partial class CacheMode : Animatable, DUCE.IResource
@@ -154,6 +162,7 @@ DUCE.Channel DUCE.IResource.GetChannel(int index)
             return GetChannelCore(index);
         }
 
+
         #endregion Internal Methods
 
         //------------------------------------------------------
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/CacheModeConverter.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/CacheModeConverter.cs
index ecb18d966c4..ff4f94d7511 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/CacheModeConverter.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/CacheModeConverter.cs
@@ -1,12 +1,27 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+//
+//
 // This file was generated, please do not edit it directly.
+//
 // Please see MilCodeGen.html for more information.
+//
 
+using MS.Internal;
+using MS.Internal.KnownBoxes;
+using MS.Internal.Collections;
+using MS.Utility;
+using System.Collections;
 using System.ComponentModel;
 using System.Globalization;
+using System.Text;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Composition;
+using System.Windows.Markup;
+using System.Windows.Media.Converters;
 
 namespace System.Windows.Media
 {
@@ -84,9 +99,8 @@ public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo c
                 throw GetConvertFromException(value);
             }
 
-            String source = value as string;
 
-            if (source != null)
+            if (value is string source)
             {
                 return CacheMode.Parse(source);
             }
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/CachingHint.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/CachingHint.cs
index bba1222a30f..0e17cb03c03 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/CachingHint.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/CachingHint.cs
@@ -9,10 +9,6 @@
 // Please see MilCodeGen.html for more information.
 //
 
-#if PRESENTATION_CORE
-#else
-using SR=System.Windows.SR;
-#endif
 
 namespace System.Windows.Media
 {
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/ClearTypeHint.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/ClearTypeHint.cs
index f466bf0924a..fc3e71e0dba 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/ClearTypeHint.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/ClearTypeHint.cs
@@ -9,10 +9,6 @@
 // Please see MilCodeGen.html for more information.
 //
 
-#if PRESENTATION_CORE
-#else
-using SR=System.Windows.SR;
-#endif
 
 namespace System.Windows.Media
 {
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/ColorInterpolationMode.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/ColorInterpolationMode.cs
index 9dd201cbb5d..b989bb220b7 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/ColorInterpolationMode.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/ColorInterpolationMode.cs
@@ -9,10 +9,6 @@
 // Please see MilCodeGen.html for more information.
 //
 
-#if PRESENTATION_CORE
-#else
-using SR=System.Windows.SR;
-#endif
 
 namespace System.Windows.Media
 {
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/CombinedGeometry.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/CombinedGeometry.cs
index 7dc8cedc0cd..164fff7f1d1 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/CombinedGeometry.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/CombinedGeometry.cs
@@ -9,11 +9,24 @@
 // Please see MilCodeGen.html for more information.
 //
 
+using MS.Internal;
+using MS.Internal.KnownBoxes;
+using MS.Internal.Collections;
+using MS.Utility;
+using System.Collections;
+using System.ComponentModel;
+using System.Globalization;
+using System.Text;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Animation;
 using System.Windows.Media.Composition;
-// These types are aliased to match the unamanaged names used in interop
+using System.Windows.Markup;
+using System.Windows.Media.Converters;
 
 namespace System.Windows.Media
 {
+
+
     sealed partial class CombinedGeometry : Geometry
     {
         //------------------------------------------------------
@@ -62,6 +75,10 @@ private static void GeometryCombineModePropertyChanged(DependencyObject d, Depen
         }
         private static void Geometry1PropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
+
+
+
+
             // The first change to the default value of a mutable collection property (e.g. GeometryGroup.Children) 
             // will promote the property value from a default value to a local value. This is technically a sub-property 
             // change because the collection was changed and not a new collection set (GeometryGroup.Children.
@@ -106,6 +123,10 @@ private static void Geometry1PropertyChanged(DependencyObject d, DependencyPrope
         }
         private static void Geometry2PropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
+
+
+
+
             // The first change to the default value of a mutable collection property (e.g. GeometryGroup.Children) 
             // will promote the property value from a default value to a local value. This is technically a sub-property 
             // change because the collection was changed and not a new collection set (GeometryGroup.Children.
@@ -277,6 +298,7 @@ internal override void UpdateResource(DUCE.Channel channel, bool skipOnChannelCh
         }
         internal override DUCE.ResourceHandle AddRefOnChannelCore(DUCE.Channel channel)
         {
+
                 if (_duceResource.CreateOrAddRefOnChannel(this, channel, System.Windows.Media.Composition.DUCE.ResourceType.TYPE_COMBINEDGEOMETRY))
                 {
                     Transform vTransform = Transform;
@@ -293,9 +315,11 @@ internal override DUCE.ResourceHandle AddRefOnChannelCore(DUCE.Channel channel)
                 }
 
                 return _duceResource.GetHandle(channel);
-}
+
+        }
         internal override void ReleaseOnChannelCore(DUCE.Channel channel)
         {
+
                 Debug.Assert(_duceResource.IsOnChannel(channel));
 
                 if (_duceResource.ReleaseOnChannel(channel))
@@ -308,8 +332,10 @@ internal override void ReleaseOnChannelCore(DUCE.Channel channel)
                     if (vGeometry2 != null) ((DUCE.IResource)vGeometry2).ReleaseOnChannel(channel);
 
                     ReleaseOnChannelAnimations(channel);
-}
-}
+
+                }
+
+        }
         internal override DUCE.ResourceHandle GetHandleCore(DUCE.Channel channel)
         {
             // Note that we are in a lock here already.
@@ -414,8 +440,7 @@ static CombinedGeometry()
             // We check our static default fields which are of type Freezable
             // to make sure that they are not mutable, otherwise we will throw
             // if these get touched by more than one thread in the lifetime
-            // of your app.  (Windows OS 
-
+            // of your app.
             Debug.Assert(s_Geometry1 == null || s_Geometry1.IsFrozen,
                 "Detected context bound default value CombinedGeometry.s_Geometry1 (See OS Bug #947272).");
 
@@ -455,6 +480,8 @@ static CombinedGeometry()
                                    /* coerceValueCallback */ null);
         }
 
+
+
         #endregion Constructors
     }
 }
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/DashStyle.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/DashStyle.cs
index 264f663b824..4806d93cc83 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/DashStyle.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/DashStyle.cs
@@ -10,12 +10,23 @@
 //
 
 using MS.Internal;
+using MS.Internal.KnownBoxes;
+using MS.Internal.Collections;
+using MS.Utility;
+using System.Collections;
+using System.ComponentModel;
+using System.Globalization;
+using System.Text;
+using System.Windows.Media.Effects;
 using System.Windows.Media.Animation;
 using System.Windows.Media.Composition;
-// These types are aliased to match the unamanaged names used in interop
+using System.Windows.Markup;
+using System.Windows.Media.Converters;
 
 namespace System.Windows.Media
 {
+
+
     sealed partial class DashStyle : Animatable, DUCE.IResource
     {
         //------------------------------------------------------
@@ -64,6 +75,10 @@ private static void OffsetPropertyChanged(DependencyObject d, DependencyProperty
         }
         private static void DashesPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
+
+
+
+
             DashStyle target = ((DashStyle) d);
 
 
@@ -192,6 +207,8 @@ DUCE.ResourceHandle DUCE.IResource.AddRefOnChannel(DUCE.Channel channel)
             {
                 if (_duceResource.CreateOrAddRefOnChannel(this, channel, System.Windows.Media.Composition.DUCE.ResourceType.TYPE_DASHSTYLE))
                 {
+
+
                     AddRefOnChannelAnimations(channel);
 
 
@@ -209,8 +226,11 @@ void DUCE.IResource.ReleaseOnChannel(DUCE.Channel channel)
 
                 if (_duceResource.ReleaseOnChannel(channel))
                 {
+
+
                     ReleaseOnChannelAnimations(channel);
-}
+
+                }
             }
         }
         DUCE.ResourceHandle DUCE.IResource.GetHandle(DUCE.Channel channel)
@@ -315,8 +335,7 @@ static DashStyle()
             // We check our static default fields which are of type Freezable
             // to make sure that they are not mutable, otherwise we will throw
             // if these get touched by more than one thread in the lifetime
-            // of your app
-
+            // of your app.
             Debug.Assert(s_Dashes == null || s_Dashes.IsFrozen,
                 "Detected context bound default value DashStyle.s_Dashes (See OS Bug #947272).");
 
@@ -343,6 +362,8 @@ static DashStyle()
                                    /* coerceValueCallback */ null);
         }
 
+
+
         #endregion Constructors
     }
 }
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/DoubleCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/DoubleCollection.cs
index 00ed4afa61d..8fd4cb6a41b 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/DoubleCollection.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/DoubleCollection.cs
@@ -2,25 +2,32 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+//
+//
 // This file was generated, please do not edit it directly.
+//
 // Please see MilCodeGen.html for more information.
+//
 
 using MS.Internal;
+using MS.Internal.KnownBoxes;
+using MS.Internal.Collections;
 using MS.Utility;
 using System.Collections;
 using System.ComponentModel;
+using System.Globalization;
 using System.Text;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Composition;
 using System.Windows.Markup;
 using System.Windows.Media.Converters;
 
-// These types are aliased to match the unamanaged names used in interop
-
 namespace System.Windows.Media
 {
     /// <summary>
     /// A collection of doubles.
     /// </summary>
-
     [TypeConverter(typeof(DoubleCollectionConverter))]
     [ValueSerializer(typeof(DoubleCollectionValueSerializer))] // Used by MarkupWriter
     public sealed partial class DoubleCollection : Freezable, IFormattable, IList, IList<double>
@@ -111,6 +118,8 @@ public int IndexOf(double value)
         /// </summary>
         public void Insert(int index, double value)
         {
+
+
             WritePreamble();
             _collection.Insert(index, value);
 
@@ -188,6 +197,8 @@ public double this[int index]
             }
             set
             {
+
+
                 WritePreamble();
                 _collection[ index ] = value;
 
@@ -524,7 +535,8 @@ protected override void CloneCore(Freezable source)
             {
                 _collection.Add(sourceDoubleCollection._collection[i]);
             }
-}
+
+        }
         /// <summary>
         /// Implementation of Freezable.CloneCurrentValueCore()
         /// </summary>
@@ -542,7 +554,8 @@ protected override void CloneCurrentValueCore(Freezable source)
             {
                 _collection.Add(sourceDoubleCollection._collection[i]);
             }
-}
+
+        }
         /// <summary>
         /// Implementation of Freezable.GetAsFrozenCore()
         /// </summary>
@@ -560,7 +573,8 @@ protected override void GetAsFrozenCore(Freezable source)
             {
                 _collection.Add(sourceDoubleCollection._collection[i]);
             }
-}
+
+        }
         /// <summary>
         /// Implementation of Freezable.GetCurrentValueAsFrozenCore()
         /// </summary>
@@ -578,7 +592,8 @@ protected override void GetCurrentValueAsFrozenCore(Freezable source)
             {
                 _collection.Add(sourceDoubleCollection._collection[i]);
             }
-}
+
+        }
 
 
         #endregion ProtectedMethods
@@ -769,6 +784,7 @@ internal Enumerator(DoubleCollection list)
 
             void IDisposable.Dispose()
             {
+
             }
 
             /// <summary>
@@ -909,6 +925,7 @@ public DoubleCollection(IEnumerable<double> collection)
 
             ArgumentNullException.ThrowIfNull(collection);
 
+
             ICollection<double> icollectionOfT = collection as ICollection<double>;
 
             if (icollectionOfT != null)
@@ -929,8 +946,11 @@ public DoubleCollection(IEnumerable<double> collection)
 
                     foreach (double item in collection)
                     {
+
                         _collection.Add(item);
                     }
+
+
                 }
             }
 
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/DoubleCollectionConverter.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/DoubleCollectionConverter.cs
index 933d0072668..18fc679dec8 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/DoubleCollectionConverter.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/DoubleCollectionConverter.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -9,8 +9,19 @@
 // Please see MilCodeGen.html for more information.
 //
 
+using MS.Internal;
+using MS.Internal.KnownBoxes;
+using MS.Internal.Collections;
+using MS.Utility;
+using System.Collections;
 using System.ComponentModel;
 using System.Globalization;
+using System.Text;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Composition;
+using System.Windows.Markup;
+using System.Windows.Media.Converters;
 
 namespace System.Windows.Media
 {
@@ -75,9 +86,8 @@ public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo c
                 throw GetConvertFromException(value);
             }
 
-            String source = value as string;
 
-            if (source != null)
+            if (value is string source)
             {
                 return DoubleCollection.Parse(source);
             }
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/Drawing.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/Drawing.cs
index 65d4e74c9de..8a140dd1b92 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/Drawing.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/Drawing.cs
@@ -9,12 +9,24 @@
 // Please see MilCodeGen.html for more information.
 //
 
+using MS.Internal;
+using MS.Internal.KnownBoxes;
+using MS.Internal.Collections;
+using MS.Utility;
+using System.Collections;
+using System.ComponentModel;
+using System.Globalization;
+using System.Text;
+using System.Windows.Media.Effects;
 using System.Windows.Media.Animation;
 using System.Windows.Media.Composition;
-// These types are aliased to match the unamanaged names used in interop
+using System.Windows.Markup;
+using System.Windows.Media.Converters;
 
 namespace System.Windows.Media
 {
+
+
     abstract partial class Drawing : Animatable, DUCE.IResource
     {
         //------------------------------------------------------
@@ -149,6 +161,7 @@ DUCE.Channel DUCE.IResource.GetChannel(int index)
             return GetChannelCore(index);
         }
 
+
         #endregion Internal Methods
 
         //------------------------------------------------------
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/DrawingBrush.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/DrawingBrush.cs
index 6561a9dd068..ec996ab74c4 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/DrawingBrush.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/DrawingBrush.cs
@@ -9,11 +9,24 @@
 // Please see MilCodeGen.html for more information.
 //
 
+using MS.Internal;
+using MS.Internal.KnownBoxes;
+using MS.Internal.Collections;
+using MS.Utility;
+using System.Collections;
+using System.ComponentModel;
+using System.Globalization;
+using System.Text;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Animation;
 using System.Windows.Media.Composition;
-// These types are aliased to match the unamanaged names used in interop
+using System.Windows.Markup;
+using System.Windows.Media.Converters;
 
 namespace System.Windows.Media
 {
+
+
     sealed partial class DrawingBrush : TileBrush
     {
         //------------------------------------------------------
@@ -55,6 +68,10 @@ sealed partial class DrawingBrush : TileBrush
 
         private static void DrawingPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
+
+
+
+
             // The first change to the default value of a mutable collection property (e.g. GeometryGroup.Children) 
             // will promote the property value from a default value to a local value. This is technically a sub-property 
             // change because the collection was changed and not a new collection set (GeometryGroup.Children.
@@ -234,6 +251,7 @@ internal override void UpdateResource(DUCE.Channel channel, bool skipOnChannelCh
         }
         internal override DUCE.ResourceHandle AddRefOnChannelCore(DUCE.Channel channel)
         {
+
                 if (_duceResource.CreateOrAddRefOnChannel(this, channel, System.Windows.Media.Composition.DUCE.ResourceType.TYPE_DRAWINGBRUSH))
                 {
                     Transform vTransform = Transform;
@@ -250,9 +268,11 @@ internal override DUCE.ResourceHandle AddRefOnChannelCore(DUCE.Channel channel)
                 }
 
                 return _duceResource.GetHandle(channel);
-}
+
+        }
         internal override void ReleaseOnChannelCore(DUCE.Channel channel)
         {
+
                 Debug.Assert(_duceResource.IsOnChannel(channel));
 
                 if (_duceResource.ReleaseOnChannel(channel))
@@ -265,8 +285,10 @@ internal override void ReleaseOnChannelCore(DUCE.Channel channel)
                     if (vDrawing != null) ((DUCE.IResource)vDrawing).ReleaseOnChannel(channel);
 
                     ReleaseOnChannelAnimations(channel);
-}
-}
+
+                }
+
+        }
         internal override DUCE.ResourceHandle GetHandleCore(DUCE.Channel channel)
         {
             // Note that we are in a lock here already.
@@ -359,8 +381,7 @@ static DrawingBrush()
             // We check our static default fields which are of type Freezable
             // to make sure that they are not mutable, otherwise we will throw
             // if these get touched by more than one thread in the lifetime
-            // of your app.  
-
+            // of your app.
 
 
             // Initializations
@@ -376,6 +397,8 @@ static DrawingBrush()
                                    /* coerceValueCallback */ null);
         }
 
+
+
         #endregion Constructors
     }
 }
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/DrawingCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/DrawingCollection.cs
index f12ce84e5ba..a25ee61bc63 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/DrawingCollection.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/DrawingCollection.cs
@@ -2,21 +2,33 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+//
+//
 // This file was generated, please do not edit it directly.
+//
 // Please see MilCodeGen.html for more information.
+//
 
+using MS.Internal;
+using MS.Internal.KnownBoxes;
 using MS.Internal.Collections;
 using MS.Utility;
 using System.Collections;
+using System.ComponentModel;
+using System.Globalization;
+using System.Text;
+using System.Windows.Media.Effects;
 using System.Windows.Media.Animation;
-
-// These types are aliased to match the unamanaged names used in interop
+using System.Windows.Media.Composition;
+using System.Windows.Markup;
+using System.Windows.Media.Converters;
 
 namespace System.Windows.Media
 {
     /// <summary>
     /// A collection of Drawing objects.
     /// </summary>
+
     public sealed partial class DrawingCollection : Animatable, IList, IList<Drawing>
     {
         //------------------------------------------------------
@@ -241,6 +253,7 @@ public Drawing this[int index]
 
                 if (!Object.ReferenceEquals(_collection[ index ], value))
                 {
+
                     Drawing oldValue = _collection[ index ];
                     OnFreezablePropertyChanged(oldValue, value);
 
@@ -617,7 +630,8 @@ protected override void CloneCore(Freezable source)
                 _collection.Add(newValue);
                 OnInsert(newValue);
             }
-}
+
+        }
         /// <summary>
         /// Implementation of Freezable.CloneCurrentValueCore()
         /// </summary>
@@ -638,7 +652,8 @@ protected override void CloneCurrentValueCore(Freezable source)
                 _collection.Add(newValue);
                 OnInsert(newValue);
             }
-}
+
+        }
         /// <summary>
         /// Implementation of Freezable.GetAsFrozenCore()
         /// </summary>
@@ -659,7 +674,8 @@ protected override void GetAsFrozenCore(Freezable source)
                 _collection.Add(newValue);
                 OnInsert(newValue);
             }
-}
+
+        }
         /// <summary>
         /// Implementation of Freezable.GetCurrentValueAsFrozenCore()
         /// </summary>
@@ -680,7 +696,8 @@ protected override void GetCurrentValueAsFrozenCore(Freezable source)
                 _collection.Add(newValue);
                 OnInsert(newValue);
             }
-}
+
+        }
         /// <summary>
         /// Implementation of <see cref="System.Windows.Freezable.FreezeCore">Freezable.FreezeCore</see>.
         /// </summary>
@@ -784,6 +801,7 @@ internal Enumerator(DrawingCollection list)
 
             void IDisposable.Dispose()
             {
+
             }
 
             /// <summary>
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/DrawingContext.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/DrawingContext.cs
index 471b3e3e915..a90e423ebb8 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/DrawingContext.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/DrawingContext.cs
@@ -9,8 +9,11 @@
 // Please see MilCodeGen.html for more information.
 //
 
+using MS.Internal;
+using System.Runtime.InteropServices;
 using System.Windows.Threading;
 using System.Windows.Media.Animation;
+using System.Windows.Media.Composition;
 using System.Windows.Media.Effects;
 
 namespace System.Windows.Media
@@ -420,5 +423,6 @@ public abstract void PushEffect(
         /// </summary>
         public abstract void Pop(
             );
-}
+
+    }
 }
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/DrawingContextDrawingContextWalker.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/DrawingContextDrawingContextWalker.cs
index a62064faaaf..10aff420c4f 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/DrawingContextDrawingContextWalker.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/DrawingContextDrawingContextWalker.cs
@@ -9,7 +9,11 @@
 // Please see MilCodeGen.html for more information.
 //
 
+using MS.Internal;
+using System.Runtime.InteropServices;
+using System.Windows.Threading;
 using System.Windows.Media.Animation;
+using System.Windows.Media.Composition;
 using System.Windows.Media.Effects;
 
 namespace System.Windows.Media
@@ -583,5 +587,6 @@ public override void Pop(
 
                 );
         }
-}
+
+    }
 }
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/DrawingContextWalker.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/DrawingContextWalker.cs
index b8794d77574..ea4ccec9924 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/DrawingContextWalker.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/DrawingContextWalker.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -9,7 +9,11 @@
 // Please see MilCodeGen.html for more information.
 //
 
+using MS.Internal;
+using System.Runtime.InteropServices;
+using System.Windows.Threading;
 using System.Windows.Media.Animation;
+using System.Windows.Media.Composition;
 using System.Windows.Media.Effects;
 
 namespace System.Windows.Media
@@ -495,5 +499,6 @@ public override void Pop(
         {
             Debug.Assert(false);
         }
-}
+
+    }
 }
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/DrawingGroup.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/DrawingGroup.cs
index 725e4e0d5b3..ecce80ea346 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/DrawingGroup.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/DrawingGroup.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -10,12 +10,23 @@
 //
 
 using MS.Internal;
+using MS.Internal.KnownBoxes;
+using MS.Internal.Collections;
+using MS.Utility;
+using System.Collections;
+using System.ComponentModel;
+using System.Globalization;
+using System.Text;
 using System.Windows.Media.Effects;
+using System.Windows.Media.Animation;
 using System.Windows.Media.Composition;
-// These types are aliased to match the unamanaged names used in interop
+using System.Windows.Markup;
+using System.Windows.Media.Converters;
 
 namespace System.Windows.Media
 {
+
+
     sealed partial class DrawingGroup : Drawing
     {
         //------------------------------------------------------
@@ -57,6 +68,10 @@ sealed partial class DrawingGroup : Drawing
 
         private static void ChildrenPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
+
+
+
+
             // The first change to the default value of a mutable collection property (e.g. GeometryGroup.Children) 
             // will promote the property value from a default value to a local value. This is technically a sub-property 
             // change because the collection was changed and not a new collection set (GeometryGroup.Children.
@@ -144,6 +159,10 @@ private static void ChildrenPropertyChanged(DependencyObject d, DependencyProper
         }
         private static void ClipGeometryPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
+
+
+
+
             // The first change to the default value of a mutable collection property (e.g. GeometryGroup.Children) 
             // will promote the property value from a default value to a local value. This is technically a sub-property 
             // change because the collection was changed and not a new collection set (GeometryGroup.Children.
@@ -195,6 +214,10 @@ private static void OpacityPropertyChanged(DependencyObject d, DependencyPropert
         }
         private static void OpacityMaskPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
+
+
+
+
             // The first change to the default value of a mutable collection property (e.g. GeometryGroup.Children) 
             // will promote the property value from a default value to a local value. This is technically a sub-property 
             // change because the collection was changed and not a new collection set (GeometryGroup.Children.
@@ -239,6 +262,10 @@ private static void OpacityMaskPropertyChanged(DependencyObject d, DependencyPro
         }
         private static void TransformPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
+
+
+
+
             // The first change to the default value of a mutable collection property (e.g. GeometryGroup.Children) 
             // will promote the property value from a default value to a local value. This is technically a sub-property 
             // change because the collection was changed and not a new collection set (GeometryGroup.Children.
@@ -283,6 +310,10 @@ private static void TransformPropertyChanged(DependencyObject d, DependencyPrope
         }
         private static void GuidelineSetPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
+
+
+
+
             // The first change to the default value of a mutable collection property (e.g. GeometryGroup.Children) 
             // will promote the property value from a default value to a local value. This is technically a sub-property 
             // change because the collection was changed and not a new collection set (GeometryGroup.Children.
@@ -334,6 +365,10 @@ private static void EdgeModePropertyChanged(DependencyObject d, DependencyProper
         }
         private static void BitmapEffectPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
+
+
+
+
             DrawingGroup target = ((DrawingGroup) d);
 
 
@@ -341,6 +376,10 @@ private static void BitmapEffectPropertyChanged(DependencyObject d, DependencyPr
         }
         private static void BitmapEffectInputPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
+
+
+
+
             DrawingGroup target = ((DrawingGroup) d);
 
 
@@ -596,6 +635,7 @@ internal override void UpdateResource(DUCE.Channel channel, bool skipOnChannelCh
         }
         internal override DUCE.ResourceHandle AddRefOnChannelCore(DUCE.Channel channel)
         {
+
                 if (_duceResource.CreateOrAddRefOnChannel(this, channel, System.Windows.Media.Composition.DUCE.ResourceType.TYPE_DRAWINGGROUP))
                 {
                     Geometry vClipGeometry = ClipGeometry;
@@ -624,9 +664,11 @@ internal override DUCE.ResourceHandle AddRefOnChannelCore(DUCE.Channel channel)
                 }
 
                 return _duceResource.GetHandle(channel);
-}
+
+        }
         internal override void ReleaseOnChannelCore(DUCE.Channel channel)
         {
+
                 Debug.Assert(_duceResource.IsOnChannel(channel));
 
                 if (_duceResource.ReleaseOnChannel(channel))
@@ -651,8 +693,10 @@ internal override void ReleaseOnChannelCore(DUCE.Channel channel)
                         }
                     }
                     ReleaseOnChannelAnimations(channel);
-}
-}
+
+                }
+
+        }
         internal override DUCE.ResourceHandle GetHandleCore(DUCE.Channel channel)
         {
             // Note that we are in a lock here already.
@@ -813,8 +857,7 @@ static DrawingGroup()
             // We check our static default fields which are of type Freezable
             // to make sure that they are not mutable, otherwise we will throw
             // if these get touched by more than one thread in the lifetime
-            // of your app.  (Windows OS 
-
+            // of your app.
             Debug.Assert(s_Children == null || s_Children.IsFrozen,
                 "Detected context bound default value DrawingGroup.s_Children (See OS Bug #947272).");
 
@@ -910,6 +953,8 @@ static DrawingGroup()
                                    /* coerceValueCallback */ null);
         }
 
+
+
         #endregion Constructors
     }
 }
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/DrawingImage.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/DrawingImage.cs
index b09ba4d25c9..cd2494ad48d 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/DrawingImage.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/DrawingImage.cs
@@ -9,11 +9,24 @@
 // Please see MilCodeGen.html for more information.
 //
 
+using MS.Internal;
+using MS.Internal.KnownBoxes;
+using MS.Internal.Collections;
+using MS.Utility;
+using System.Collections;
+using System.ComponentModel;
+using System.Globalization;
+using System.Text;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Animation;
 using System.Windows.Media.Composition;
-// These types are aliased to match the unamanaged names used in interop
+using System.Windows.Markup;
+using System.Windows.Media.Converters;
 
 namespace System.Windows.Media
 {
+
+
     sealed partial class DrawingImage : ImageSource
     {
         //------------------------------------------------------
@@ -55,6 +68,10 @@ sealed partial class DrawingImage : ImageSource
 
         private static void DrawingPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
+
+
+
+
             // The first change to the default value of a mutable collection property (e.g. GeometryGroup.Children) 
             // will promote the property value from a default value to a local value. This is technically a sub-property 
             // change because the collection was changed and not a new collection set (GeometryGroup.Children.
@@ -179,6 +196,7 @@ internal override void UpdateResource(DUCE.Channel channel, bool skipOnChannelCh
         }
         internal override DUCE.ResourceHandle AddRefOnChannelCore(DUCE.Channel channel)
         {
+
                 if (_duceResource.CreateOrAddRefOnChannel(this, channel, System.Windows.Media.Composition.DUCE.ResourceType.TYPE_DRAWINGIMAGE))
                 {
                     Drawing vDrawing = Drawing;
@@ -191,9 +209,11 @@ internal override DUCE.ResourceHandle AddRefOnChannelCore(DUCE.Channel channel)
                 }
 
                 return _duceResource.GetHandle(channel);
-}
+
+        }
         internal override void ReleaseOnChannelCore(DUCE.Channel channel)
         {
+
                 Debug.Assert(_duceResource.IsOnChannel(channel));
 
                 if (_duceResource.ReleaseOnChannel(channel))
@@ -202,8 +222,10 @@ internal override void ReleaseOnChannelCore(DUCE.Channel channel)
                     if (vDrawing != null) ((DUCE.IResource)vDrawing).ReleaseOnChannel(channel);
 
                     ReleaseOnChannelAnimations(channel);
-}
-}
+
+                }
+
+        }
         internal override DUCE.ResourceHandle GetHandleCore(DUCE.Channel channel)
         {
             // Note that we are in a lock here already.
@@ -296,8 +318,7 @@ static DrawingImage()
             // We check our static default fields which are of type Freezable
             // to make sure that they are not mutable, otherwise we will throw
             // if these get touched by more than one thread in the lifetime
-            // of your app.  (Windows OS 
-
+            // of your app.
 
 
             // Initializations
@@ -313,6 +334,8 @@ static DrawingImage()
                                    /* coerceValueCallback */ null);
         }
 
+
+
         #endregion Constructors
     }
 }
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/EdgeMode.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/EdgeMode.cs
index fa91b74de25..d9eaf5267d7 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/EdgeMode.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/EdgeMode.cs
@@ -9,10 +9,6 @@
 // Please see MilCodeGen.html for more information.
 //
 
-#if PRESENTATION_CORE
-#else
-using SR=System.Windows.SR;
-#endif
 
 namespace System.Windows.Media
 {
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/EllipseGeometry.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/EllipseGeometry.cs
index 786c53c9599..2ba001f6849 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/EllipseGeometry.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/EllipseGeometry.cs
@@ -9,11 +9,24 @@
 // Please see MilCodeGen.html for more information.
 //
 
+using MS.Internal;
+using MS.Internal.KnownBoxes;
+using MS.Internal.Collections;
+using MS.Utility;
+using System.Collections;
+using System.ComponentModel;
+using System.Globalization;
+using System.Text;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Animation;
 using System.Windows.Media.Composition;
-// These types are aliased to match the unamanaged names used in interop
+using System.Windows.Markup;
+using System.Windows.Media.Converters;
 
 namespace System.Windows.Media
 {
+
+
     sealed partial class EllipseGeometry : Geometry
     {
         //------------------------------------------------------
@@ -216,6 +229,7 @@ internal override void UpdateResource(DUCE.Channel channel, bool skipOnChannelCh
         }
         internal override DUCE.ResourceHandle AddRefOnChannelCore(DUCE.Channel channel)
         {
+
                 if (_duceResource.CreateOrAddRefOnChannel(this, channel, System.Windows.Media.Composition.DUCE.ResourceType.TYPE_ELLIPSEGEOMETRY))
                 {
                     Transform vTransform = Transform;
@@ -228,9 +242,11 @@ internal override DUCE.ResourceHandle AddRefOnChannelCore(DUCE.Channel channel)
                 }
 
                 return _duceResource.GetHandle(channel);
-}
+
+        }
         internal override void ReleaseOnChannelCore(DUCE.Channel channel)
         {
+
                 Debug.Assert(_duceResource.IsOnChannel(channel));
 
                 if (_duceResource.ReleaseOnChannel(channel))
@@ -239,8 +255,10 @@ internal override void ReleaseOnChannelCore(DUCE.Channel channel)
                     if (vTransform != null) ((DUCE.IResource)vTransform).ReleaseOnChannel(channel);
 
                     ReleaseOnChannelAnimations(channel);
-}
-}
+
+                }
+
+        }
         internal override DUCE.ResourceHandle GetHandleCore(DUCE.Channel channel)
         {
             // Note that we are in a lock here already.
@@ -345,7 +363,7 @@ static EllipseGeometry()
             // We check our static default fields which are of type Freezable
             // to make sure that they are not mutable, otherwise we will throw
             // if these get touched by more than one thread in the lifetime
-            // of your app. 
+            // of your app.
 
 
             // Initializations
@@ -379,6 +397,8 @@ static EllipseGeometry()
                                    /* coerceValueCallback */ null);
         }
 
+
+
         #endregion Constructors
     }
 }
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/FillRule.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/FillRule.cs
index 71b724154a6..e656cd5b425 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/FillRule.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/FillRule.cs
@@ -9,10 +9,6 @@
 // Please see MilCodeGen.html for more information.
 //
 
-#if PRESENTATION_CORE
-#else
-using SR=System.Windows.SR;
-#endif
 
 namespace System.Windows.Media
 {
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/GeneralTransform.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/GeneralTransform.cs
index 7a30ebcacd5..702759a62f0 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/GeneralTransform.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/GeneralTransform.cs
@@ -9,11 +9,24 @@
 // Please see MilCodeGen.html for more information.
 //
 
+using MS.Internal;
+using MS.Internal.KnownBoxes;
+using MS.Internal.Collections;
+using MS.Utility;
+using System.Collections;
+using System.ComponentModel;
+using System.Globalization;
+using System.Text;
+using System.Windows.Media.Effects;
 using System.Windows.Media.Animation;
-// These types are aliased to match the unamanaged names used in interop
+using System.Windows.Media.Composition;
+using System.Windows.Markup;
+using System.Windows.Media.Converters;
 
 namespace System.Windows.Media
 {
+
+
     abstract partial class GeneralTransform : Animatable, IFormattable
     {
         //------------------------------------------------------
@@ -160,6 +173,7 @@ internal virtual string ConvertToString(string format, IFormatProvider provider)
             return base.ToString();
         }
 
+
         #endregion Internal Properties
 
         //------------------------------------------------------
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/GeneralTransformCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/GeneralTransformCollection.cs
index 336f0f859a9..eb320f3714d 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/GeneralTransformCollection.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/GeneralTransformCollection.cs
@@ -2,20 +2,33 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+//
+//
 // This file was generated, please do not edit it directly.
+//
 // Please see MilCodeGen.html for more information.
+//
 
+using MS.Internal;
+using MS.Internal.KnownBoxes;
+using MS.Internal.Collections;
 using MS.Utility;
 using System.Collections;
+using System.ComponentModel;
+using System.Globalization;
+using System.Text;
+using System.Windows.Media.Effects;
 using System.Windows.Media.Animation;
-
-// These types are aliased to match the unamanaged names used in interop
+using System.Windows.Media.Composition;
+using System.Windows.Markup;
+using System.Windows.Media.Converters;
 
 namespace System.Windows.Media
 {
     /// <summary>
     /// A collection of GeneralTransform objects.
     /// </summary>
+
     public sealed partial class GeneralTransformCollection : Animatable, IList, IList<GeneralTransform>
     {
         //------------------------------------------------------
@@ -228,11 +241,14 @@ public GeneralTransform this[int index]
 
                 if (!Object.ReferenceEquals(_collection[ index ], value))
                 {
+
                     GeneralTransform oldValue = _collection[ index ];
                     OnFreezablePropertyChanged(oldValue, value);
 
                     _collection[ index ] = value;
-}
+
+
+                }
 
 
                 ++_version;
@@ -577,8 +593,10 @@ protected override void CloneCore(Freezable source)
                 GeneralTransform newValue = (GeneralTransform) sourceGeneralTransformCollection._collection[i].Clone();
                 OnFreezablePropertyChanged(/* oldValue = */ null, newValue);
                 _collection.Add(newValue);
-}
-}
+
+            }
+
+        }
         /// <summary>
         /// Implementation of Freezable.CloneCurrentValueCore()
         /// </summary>
@@ -597,8 +615,10 @@ protected override void CloneCurrentValueCore(Freezable source)
                 GeneralTransform newValue = (GeneralTransform) sourceGeneralTransformCollection._collection[i].CloneCurrentValue();
                 OnFreezablePropertyChanged(/* oldValue = */ null, newValue);
                 _collection.Add(newValue);
-}
-}
+
+            }
+
+        }
         /// <summary>
         /// Implementation of Freezable.GetAsFrozenCore()
         /// </summary>
@@ -617,8 +637,10 @@ protected override void GetAsFrozenCore(Freezable source)
                 GeneralTransform newValue = (GeneralTransform) sourceGeneralTransformCollection._collection[i].GetAsFrozen();
                 OnFreezablePropertyChanged(/* oldValue = */ null, newValue);
                 _collection.Add(newValue);
-}
-}
+
+            }
+
+        }
         /// <summary>
         /// Implementation of Freezable.GetCurrentValueAsFrozenCore()
         /// </summary>
@@ -637,8 +659,10 @@ protected override void GetCurrentValueAsFrozenCore(Freezable source)
                 GeneralTransform newValue = (GeneralTransform) sourceGeneralTransformCollection._collection[i].GetCurrentValueAsFrozen();
                 OnFreezablePropertyChanged(/* oldValue = */ null, newValue);
                 _collection.Add(newValue);
-}
-}
+
+            }
+
+        }
         /// <summary>
         /// Implementation of <see cref="System.Windows.Freezable.FreezeCore">Freezable.FreezeCore</see>.
         /// </summary>
@@ -742,6 +766,7 @@ internal Enumerator(GeneralTransformCollection list)
 
             void IDisposable.Dispose()
             {
+
             }
 
             /// <summary>
@@ -910,6 +935,7 @@ public GeneralTransformCollection(IEnumerable<GeneralTransform> collection)
                         GeneralTransform newValue = item;
                         OnFreezablePropertyChanged(/* oldValue = */ null, newValue);
                         _collection.Add(newValue);
+
                     }
 
                     needsItemValidation = false;
@@ -925,6 +951,7 @@ public GeneralTransformCollection(IEnumerable<GeneralTransform> collection)
                         throw new System.ArgumentException(SR.Collection_NoNull);
                     }
                     OnFreezablePropertyChanged(/* oldValue = */ null, item);
+
                 }
             }
 
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/GeneralTransformGroup.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/GeneralTransformGroup.cs
index edfb98ab2a4..c9442529e57 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/GeneralTransformGroup.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/GeneralTransformGroup.cs
@@ -10,10 +10,23 @@
 //
 
 using MS.Internal;
-// These types are aliased to match the unamanaged names used in interop
+using MS.Internal.KnownBoxes;
+using MS.Internal.Collections;
+using MS.Utility;
+using System.Collections;
+using System.ComponentModel;
+using System.Globalization;
+using System.Text;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Composition;
+using System.Windows.Markup;
+using System.Windows.Media.Converters;
 
 namespace System.Windows.Media
 {
+
+
     sealed partial class GeneralTransformGroup : GeneralTransform
     {
         //------------------------------------------------------
@@ -174,8 +187,7 @@ static GeneralTransformGroup()
             // We check our static default fields which are of type Freezable
             // to make sure that they are not mutable, otherwise we will throw
             // if these get touched by more than one thread in the lifetime
-            // of your app. 
-
+            // of your app.
             Debug.Assert(s_Children == null || s_Children.IsFrozen,
                 "Detected context bound default value GeneralTransformGroup.s_Children (See OS Bug #947272).");
 
@@ -193,6 +205,8 @@ static GeneralTransformGroup()
                                    /* coerceValueCallback */ null);
         }
 
+
+
         #endregion Constructors
     }
 }
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/Geometry.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/Geometry.cs
index e35cdd8b4f4..6fc2caa602b 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/Geometry.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/Geometry.cs
@@ -9,15 +9,23 @@
 // Please see MilCodeGen.html for more information.
 //
 
+using MS.Internal;
+using MS.Internal.KnownBoxes;
+using MS.Internal.Collections;
+using MS.Utility;
+using System.Collections;
 using System.ComponentModel;
+using System.Globalization;
+using System.Text;
+using System.Windows.Media.Effects;
 using System.Windows.Media.Animation;
 using System.Windows.Media.Composition;
 using System.Windows.Markup;
 using System.Windows.Media.Converters;
-// These types are aliased to match the unamanaged names used in interop
 
 namespace System.Windows.Media
 {
+
     [TypeConverter(typeof(GeometryConverter))]
     [ValueSerializer(typeof(GeometryValueSerializer))] // Used by MarkupWriter
     abstract partial class Geometry : Animatable, IFormattable, DUCE.IResource
@@ -61,6 +69,7 @@ abstract partial class Geometry : Animatable, IFormattable, DUCE.IResource
 
         private static void TransformPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
+
             Geometry target = ((Geometry) d);
 
 
@@ -343,8 +352,7 @@ static Geometry()
             // We check our static default fields which are of type Freezable
             // to make sure that they are not mutable, otherwise we will throw
             // if these get touched by more than one thread in the lifetime
-            // of your app.  
-
+            // of your app.
             Debug.Assert(s_Transform == null || s_Transform.IsFrozen,
                 "Detected context bound default value Geometry.s_Transform (See OS Bug #947272).");
 
@@ -362,6 +370,8 @@ static Geometry()
                                    /* coerceValueCallback */ null);
         }
 
+
+
         #endregion Constructors
     }
 }
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/GeometryCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/GeometryCollection.cs
index af893d344e1..de0324b2574 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/GeometryCollection.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/GeometryCollection.cs
@@ -2,21 +2,33 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+//
+//
 // This file was generated, please do not edit it directly.
+//
 // Please see MilCodeGen.html for more information.
+//
 
+using MS.Internal;
+using MS.Internal.KnownBoxes;
 using MS.Internal.Collections;
 using MS.Utility;
 using System.Collections;
+using System.ComponentModel;
+using System.Globalization;
+using System.Text;
+using System.Windows.Media.Effects;
 using System.Windows.Media.Animation;
-
-// These types are aliased to match the unamanaged names used in interop
+using System.Windows.Media.Composition;
+using System.Windows.Markup;
+using System.Windows.Media.Converters;
 
 namespace System.Windows.Media
 {
     /// <summary>
     /// A collection of Geometry objects.
     /// </summary>
+
     public sealed partial class GeometryCollection : Animatable, IList, IList<Geometry>
     {
         //------------------------------------------------------
@@ -241,6 +253,7 @@ public Geometry this[int index]
 
                 if (!Object.ReferenceEquals(_collection[ index ], value))
                 {
+
                     Geometry oldValue = _collection[ index ];
                     OnFreezablePropertyChanged(oldValue, value);
 
@@ -617,7 +630,8 @@ protected override void CloneCore(Freezable source)
                 _collection.Add(newValue);
                 OnInsert(newValue);
             }
-}
+
+        }
         /// <summary>
         /// Implementation of Freezable.CloneCurrentValueCore()
         /// </summary>
@@ -638,7 +652,8 @@ protected override void CloneCurrentValueCore(Freezable source)
                 _collection.Add(newValue);
                 OnInsert(newValue);
             }
-}
+
+        }
         /// <summary>
         /// Implementation of Freezable.GetAsFrozenCore()
         /// </summary>
@@ -659,7 +674,8 @@ protected override void GetAsFrozenCore(Freezable source)
                 _collection.Add(newValue);
                 OnInsert(newValue);
             }
-}
+
+        }
         /// <summary>
         /// Implementation of Freezable.GetCurrentValueAsFrozenCore()
         /// </summary>
@@ -680,7 +696,8 @@ protected override void GetCurrentValueAsFrozenCore(Freezable source)
                 _collection.Add(newValue);
                 OnInsert(newValue);
             }
-}
+
+        }
         /// <summary>
         /// Implementation of <see cref="System.Windows.Freezable.FreezeCore">Freezable.FreezeCore</see>.
         /// </summary>
@@ -784,6 +801,7 @@ internal Enumerator(GeometryCollection list)
 
             void IDisposable.Dispose()
             {
+
             }
 
             /// <summary>
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/GeometryCombineMode.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/GeometryCombineMode.cs
index e8951fc9b77..7813832fb0d 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/GeometryCombineMode.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/GeometryCombineMode.cs
@@ -9,10 +9,6 @@
 // Please see MilCodeGen.html for more information.
 //
 
-#if PRESENTATION_CORE
-#else
-using SR=System.Windows.SR;
-#endif
 
 namespace System.Windows.Media
 {
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/GeometryConverter.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/GeometryConverter.cs
index 46288992ec9..e2c8588e3a6 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/GeometryConverter.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/GeometryConverter.cs
@@ -1,12 +1,27 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+//
+//
 // This file was generated, please do not edit it directly.
+//
 // Please see MilCodeGen.html for more information.
+//
 
+using MS.Internal;
+using MS.Internal.KnownBoxes;
+using MS.Internal.Collections;
+using MS.Utility;
+using System.Collections;
 using System.ComponentModel;
 using System.Globalization;
+using System.Text;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Composition;
+using System.Windows.Markup;
+using System.Windows.Media.Converters;
 
 namespace System.Windows.Media
 {
@@ -84,9 +99,8 @@ public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo c
                 throw GetConvertFromException(value);
             }
 
-            String source = value as string;
 
-            if (source != null)
+            if (value is string source)
             {
                 return Geometry.Parse(source);
             }
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/GeometryDrawing.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/GeometryDrawing.cs
index 5812bc773c9..23401136bdb 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/GeometryDrawing.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/GeometryDrawing.cs
@@ -9,11 +9,24 @@
 // Please see MilCodeGen.html for more information.
 //
 
+using MS.Internal;
+using MS.Internal.KnownBoxes;
+using MS.Internal.Collections;
+using MS.Utility;
+using System.Collections;
+using System.ComponentModel;
+using System.Globalization;
+using System.Text;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Animation;
 using System.Windows.Media.Composition;
-// These types are aliased to match the unamanaged names used in interop
+using System.Windows.Markup;
+using System.Windows.Media.Converters;
 
 namespace System.Windows.Media
 {
+
+
     sealed partial class GeometryDrawing : Drawing
     {
         //------------------------------------------------------
@@ -55,6 +68,10 @@ sealed partial class GeometryDrawing : Drawing
 
         private static void BrushPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
+
+
+
+
             // The first change to the default value of a mutable collection property (e.g. GeometryGroup.Children) 
             // will promote the property value from a default value to a local value. This is technically a sub-property 
             // change because the collection was changed and not a new collection set (GeometryGroup.Children.
@@ -99,6 +116,10 @@ private static void BrushPropertyChanged(DependencyObject d, DependencyPropertyC
         }
         private static void PenPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
+
+
+
+
             // The first change to the default value of a mutable collection property (e.g. GeometryGroup.Children) 
             // will promote the property value from a default value to a local value. This is technically a sub-property 
             // change because the collection was changed and not a new collection set (GeometryGroup.Children.
@@ -143,6 +164,10 @@ private static void PenPropertyChanged(DependencyObject d, DependencyPropertyCha
         }
         private static void GeometryPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
+
+
+
+
             // The first change to the default value of a mutable collection property (e.g. GeometryGroup.Children) 
             // will promote the property value from a default value to a local value. This is technically a sub-property 
             // change because the collection was changed and not a new collection set (GeometryGroup.Children.
@@ -303,6 +328,7 @@ internal override void UpdateResource(DUCE.Channel channel, bool skipOnChannelCh
         }
         internal override DUCE.ResourceHandle AddRefOnChannelCore(DUCE.Channel channel)
         {
+
                 if (_duceResource.CreateOrAddRefOnChannel(this, channel, System.Windows.Media.Composition.DUCE.ResourceType.TYPE_GEOMETRYDRAWING))
                 {
                     Brush vBrush = Brush;
@@ -319,9 +345,11 @@ internal override DUCE.ResourceHandle AddRefOnChannelCore(DUCE.Channel channel)
                 }
 
                 return _duceResource.GetHandle(channel);
-}
+
+        }
         internal override void ReleaseOnChannelCore(DUCE.Channel channel)
         {
+
                 Debug.Assert(_duceResource.IsOnChannel(channel));
 
                 if (_duceResource.ReleaseOnChannel(channel))
@@ -334,8 +362,10 @@ internal override void ReleaseOnChannelCore(DUCE.Channel channel)
                     if (vGeometry != null) ((DUCE.IResource)vGeometry).ReleaseOnChannel(channel);
 
                     ReleaseOnChannelAnimations(channel);
-}
-}
+
+                }
+
+        }
         internal override DUCE.ResourceHandle GetHandleCore(DUCE.Channel channel)
         {
             // Note that we are in a lock here already.
@@ -423,8 +453,7 @@ static GeometryDrawing()
             // We check our static default fields which are of type Freezable
             // to make sure that they are not mutable, otherwise we will throw
             // if these get touched by more than one thread in the lifetime
-            // of your app. 
-
+            // of your app.
 
 
             // Initializations
@@ -458,6 +487,8 @@ static GeometryDrawing()
                                    /* coerceValueCallback */ null);
         }
 
+
+
         #endregion Constructors
     }
 }
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/GeometryGroup.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/GeometryGroup.cs
index a71079a523c..d47bb420b51 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/GeometryGroup.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/GeometryGroup.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -11,11 +11,22 @@
 
 using MS.Internal;
 using MS.Internal.KnownBoxes;
+using MS.Internal.Collections;
+using MS.Utility;
+using System.Collections;
+using System.ComponentModel;
+using System.Globalization;
+using System.Text;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Animation;
 using System.Windows.Media.Composition;
-// These types are aliased to match the unamanaged names used in interop
+using System.Windows.Markup;
+using System.Windows.Media.Converters;
 
 namespace System.Windows.Media
 {
+
+
     sealed partial class GeometryGroup : Geometry
     {
         //------------------------------------------------------
@@ -64,6 +75,10 @@ private static void FillRulePropertyChanged(DependencyObject d, DependencyProper
         }
         private static void ChildrenPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
+
+
+
+
             // The first change to the default value of a mutable collection property (e.g. GeometryGroup.Children) 
             // will promote the property value from a default value to a local value. This is technically a sub-property 
             // change because the collection was changed and not a new collection set (GeometryGroup.Children.
@@ -276,6 +291,7 @@ internal override void UpdateResource(DUCE.Channel channel, bool skipOnChannelCh
         }
         internal override DUCE.ResourceHandle AddRefOnChannelCore(DUCE.Channel channel)
         {
+
                 if (_duceResource.CreateOrAddRefOnChannel(this, channel, System.Windows.Media.Composition.DUCE.ResourceType.TYPE_GEOMETRYGROUP))
                 {
                     Transform vTransform = Transform;
@@ -298,9 +314,11 @@ internal override DUCE.ResourceHandle AddRefOnChannelCore(DUCE.Channel channel)
                 }
 
                 return _duceResource.GetHandle(channel);
-}
+
+        }
         internal override void ReleaseOnChannelCore(DUCE.Channel channel)
         {
+
                 Debug.Assert(_duceResource.IsOnChannel(channel));
 
                 if (_duceResource.ReleaseOnChannel(channel))
@@ -319,8 +337,10 @@ internal override void ReleaseOnChannelCore(DUCE.Channel channel)
                         }
                     }
                     ReleaseOnChannelAnimations(channel);
-}
-}
+
+                }
+
+        }
         internal override DUCE.ResourceHandle GetHandleCore(DUCE.Channel channel)
         {
             // Note that we are in a lock here already.
@@ -467,8 +487,7 @@ static GeometryGroup()
             // We check our static default fields which are of type Freezable
             // to make sure that they are not mutable, otherwise we will throw
             // if these get touched by more than one thread in the lifetime
-            // of your app. 
-
+            // of your app.
             Debug.Assert(s_Children == null || s_Children.IsFrozen,
                 "Detected context bound default value GeometryGroup.s_Children (See OS Bug #947272).");
 
@@ -495,6 +514,8 @@ static GeometryGroup()
                                    /* coerceValueCallback */ null);
         }
 
+
+
         #endregion Constructors
     }
 }
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/GlyphRunDrawing.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/GlyphRunDrawing.cs
index 1cc67f37582..c9340af46fe 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/GlyphRunDrawing.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/GlyphRunDrawing.cs
@@ -9,11 +9,24 @@
 // Please see MilCodeGen.html for more information.
 //
 
+using MS.Internal;
+using MS.Internal.KnownBoxes;
+using MS.Internal.Collections;
+using MS.Utility;
+using System.Collections;
+using System.ComponentModel;
+using System.Globalization;
+using System.Text;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Animation;
 using System.Windows.Media.Composition;
-// These types are aliased to match the unamanaged names used in interop
+using System.Windows.Markup;
+using System.Windows.Media.Converters;
 
 namespace System.Windows.Media
 {
+
+
     sealed partial class GlyphRunDrawing : Drawing
     {
         //------------------------------------------------------
@@ -84,6 +97,10 @@ private static void GlyphRunPropertyChanged(DependencyObject d, DependencyProper
         }
         private static void ForegroundBrushPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
+
+
+
+
             // The first change to the default value of a mutable collection property (e.g. GeometryGroup.Children) 
             // will promote the property value from a default value to a local value. This is technically a sub-property 
             // change because the collection was changed and not a new collection set (GeometryGroup.Children.
@@ -226,6 +243,7 @@ internal override void UpdateResource(DUCE.Channel channel, bool skipOnChannelCh
         }
         internal override DUCE.ResourceHandle AddRefOnChannelCore(DUCE.Channel channel)
         {
+
                 if (_duceResource.CreateOrAddRefOnChannel(this, channel, System.Windows.Media.Composition.DUCE.ResourceType.TYPE_GLYPHRUNDRAWING))
                 {
                     GlyphRun vGlyphRun = GlyphRun;
@@ -240,9 +258,11 @@ internal override DUCE.ResourceHandle AddRefOnChannelCore(DUCE.Channel channel)
                 }
 
                 return _duceResource.GetHandle(channel);
-}
+
+        }
         internal override void ReleaseOnChannelCore(DUCE.Channel channel)
         {
+
                 Debug.Assert(_duceResource.IsOnChannel(channel));
 
                 if (_duceResource.ReleaseOnChannel(channel))
@@ -253,8 +273,10 @@ internal override void ReleaseOnChannelCore(DUCE.Channel channel)
                     if (vForegroundBrush != null) ((DUCE.IResource)vForegroundBrush).ReleaseOnChannel(channel);
 
                     ReleaseOnChannelAnimations(channel);
-}
-}
+
+                }
+
+        }
         internal override DUCE.ResourceHandle GetHandleCore(DUCE.Channel channel)
         {
             // Note that we are in a lock here already.
@@ -341,7 +363,6 @@ static GlyphRunDrawing()
             // of your app.
 
 
-
             // Initializations
             Type typeofThis = typeof(GlyphRunDrawing);
             GlyphRunProperty =
@@ -364,6 +385,8 @@ static GlyphRunDrawing()
                                    /* coerceValueCallback */ null);
         }
 
+
+
         #endregion Constructors
     }
 }
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/GradientBrush.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/GradientBrush.cs
index c5c9d81ff58..f37f9e320d8 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/GradientBrush.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/GradientBrush.cs
@@ -10,10 +10,23 @@
 //
 
 using MS.Internal;
-// These types are aliased to match the unamanaged names used in interop
+using MS.Internal.KnownBoxes;
+using MS.Internal.Collections;
+using MS.Utility;
+using System.Collections;
+using System.ComponentModel;
+using System.Globalization;
+using System.Text;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Composition;
+using System.Windows.Markup;
+using System.Windows.Media.Converters;
 
 namespace System.Windows.Media
 {
+
+
     abstract partial class GradientBrush : Brush
     {
         //------------------------------------------------------
@@ -76,6 +89,10 @@ private static void SpreadMethodPropertyChanged(DependencyObject d, DependencyPr
         }
         private static void GradientStopsPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
+
+
+
+
             GradientBrush target = ((GradientBrush) d);
 
 
@@ -312,6 +329,8 @@ static GradientBrush()
                                    /* coerceValueCallback */ null);
         }
 
+
+
         #endregion Constructors
     }
 }
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/GradientSpreadMethod.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/GradientSpreadMethod.cs
index 1843b2671af..cef64548f0c 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/GradientSpreadMethod.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/GradientSpreadMethod.cs
@@ -9,10 +9,6 @@
 // Please see MilCodeGen.html for more information.
 //
 
-#if PRESENTATION_CORE
-#else
-using SR=System.Windows.SR;
-#endif
 
 namespace System.Windows.Media
 {
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/GradientStopCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/GradientStopCollection.cs
index 01c608eebc2..325d4c78491 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/GradientStopCollection.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/GradientStopCollection.cs
@@ -2,21 +2,33 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+//
+//
 // This file was generated, please do not edit it directly.
+//
 // Please see MilCodeGen.html for more information.
+//
 
 using MS.Internal;
+using MS.Internal.KnownBoxes;
+using MS.Internal.Collections;
 using MS.Utility;
 using System.Collections;
+using System.ComponentModel;
+using System.Globalization;
 using System.Text;
+using System.Windows.Media.Effects;
 using System.Windows.Media.Animation;
-// These types are aliased to match the unamanaged names used in interop
+using System.Windows.Media.Composition;
+using System.Windows.Markup;
+using System.Windows.Media.Converters;
 
 namespace System.Windows.Media
 {
     /// <summary>
     /// A collection of GradientStop objects.
     /// </summary>
+
     public sealed partial class GradientStopCollection : Animatable, IFormattable, IList, IList<GradientStop>
     {
         //------------------------------------------------------
@@ -229,11 +241,14 @@ public GradientStop this[int index]
 
                 if (!Object.ReferenceEquals(_collection[ index ], value))
                 {
+
                     GradientStop oldValue = _collection[ index ];
                     OnFreezablePropertyChanged(oldValue, value);
 
                     _collection[ index ] = value;
-}
+
+
+                }
 
 
                 ++_version;
@@ -578,8 +593,10 @@ protected override void CloneCore(Freezable source)
                 GradientStop newValue = (GradientStop) sourceGradientStopCollection._collection[i].Clone();
                 OnFreezablePropertyChanged(/* oldValue = */ null, newValue);
                 _collection.Add(newValue);
-}
-}
+
+            }
+
+        }
         /// <summary>
         /// Implementation of Freezable.CloneCurrentValueCore()
         /// </summary>
@@ -598,8 +615,10 @@ protected override void CloneCurrentValueCore(Freezable source)
                 GradientStop newValue = (GradientStop) sourceGradientStopCollection._collection[i].CloneCurrentValue();
                 OnFreezablePropertyChanged(/* oldValue = */ null, newValue);
                 _collection.Add(newValue);
-}
-}
+
+            }
+
+        }
         /// <summary>
         /// Implementation of Freezable.GetAsFrozenCore()
         /// </summary>
@@ -618,8 +637,10 @@ protected override void GetAsFrozenCore(Freezable source)
                 GradientStop newValue = (GradientStop) sourceGradientStopCollection._collection[i].GetAsFrozen();
                 OnFreezablePropertyChanged(/* oldValue = */ null, newValue);
                 _collection.Add(newValue);
-}
-}
+
+            }
+
+        }
         /// <summary>
         /// Implementation of Freezable.GetCurrentValueAsFrozenCore()
         /// </summary>
@@ -638,8 +659,10 @@ protected override void GetCurrentValueAsFrozenCore(Freezable source)
                 GradientStop newValue = (GradientStop) sourceGradientStopCollection._collection[i].GetCurrentValueAsFrozen();
                 OnFreezablePropertyChanged(/* oldValue = */ null, newValue);
                 _collection.Add(newValue);
-}
-}
+
+            }
+
+        }
         /// <summary>
         /// Implementation of <see cref="System.Windows.Freezable.FreezeCore">Freezable.FreezeCore</see>.
         /// </summary>
@@ -846,6 +869,7 @@ internal Enumerator(GradientStopCollection list)
 
             void IDisposable.Dispose()
             {
+
             }
 
             /// <summary>
@@ -1014,6 +1038,7 @@ public GradientStopCollection(IEnumerable<GradientStop> collection)
                         GradientStop newValue = item;
                         OnFreezablePropertyChanged(/* oldValue = */ null, newValue);
                         _collection.Add(newValue);
+
                     }
 
                     needsItemValidation = false;
@@ -1029,6 +1054,7 @@ public GradientStopCollection(IEnumerable<GradientStop> collection)
                         throw new System.ArgumentException(SR.Collection_NoNull);
                     }
                     OnFreezablePropertyChanged(/* oldValue = */ null, item);
+
                 }
             }
 
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/GuidelineSet.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/GuidelineSet.cs
index dc904a6b93f..b5b582a25ab 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/GuidelineSet.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/GuidelineSet.cs
@@ -11,12 +11,22 @@
 
 using MS.Internal;
 using MS.Internal.KnownBoxes;
+using MS.Internal.Collections;
+using MS.Utility;
+using System.Collections;
+using System.ComponentModel;
+using System.Globalization;
+using System.Text;
+using System.Windows.Media.Effects;
 using System.Windows.Media.Animation;
 using System.Windows.Media.Composition;
-// These types are aliased to match the unamanaged names used in interop
+using System.Windows.Markup;
+using System.Windows.Media.Converters;
 
 namespace System.Windows.Media
 {
+
+
     sealed partial class GuidelineSet : Animatable, DUCE.IResource
     {
         //------------------------------------------------------
@@ -58,6 +68,10 @@ sealed partial class GuidelineSet : Animatable, DUCE.IResource
 
         private static void GuidelinesXPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
+
+
+
+
             GuidelineSet target = ((GuidelineSet) d);
 
 
@@ -65,6 +79,10 @@ private static void GuidelinesXPropertyChanged(DependencyObject d, DependencyPro
         }
         private static void GuidelinesYPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
+
+
+
+
             GuidelineSet target = ((GuidelineSet) d);
 
 
@@ -222,6 +240,8 @@ DUCE.ResourceHandle DUCE.IResource.AddRefOnChannel(DUCE.Channel channel)
             {
                 if (_duceResource.CreateOrAddRefOnChannel(this, channel, System.Windows.Media.Composition.DUCE.ResourceType.TYPE_GUIDELINESET))
                 {
+
+
                     AddRefOnChannelAnimations(channel);
 
 
@@ -239,8 +259,11 @@ void DUCE.IResource.ReleaseOnChannel(DUCE.Channel channel)
 
                 if (_duceResource.ReleaseOnChannel(channel))
                 {
+
+
                     ReleaseOnChannelAnimations(channel);
-}
+
+                }
             }
         }
         DUCE.ResourceHandle DUCE.IResource.GetHandle(DUCE.Channel channel)
@@ -337,8 +360,7 @@ static GuidelineSet()
             // We check our static default fields which are of type Freezable
             // to make sure that they are not mutable, otherwise we will throw
             // if these get touched by more than one thread in the lifetime
-            // of your app.  (Windows OS 
-
+            // of your app.
             Debug.Assert(s_GuidelinesX == null || s_GuidelinesX.IsFrozen,
                 "Detected context bound default value GuidelineSet.s_GuidelinesX (See OS Bug #947272).");
 
@@ -378,6 +400,8 @@ static GuidelineSet()
                                    /* coerceValueCallback */ null);
         }
 
+
+
         #endregion Constructors
     }
 }
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/ImageBrush.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/ImageBrush.cs
index 4ba293fdd6c..a67e01c3ff4 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/ImageBrush.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/ImageBrush.cs
@@ -9,11 +9,24 @@
 // Please see MilCodeGen.html for more information.
 //
 
+using MS.Internal;
+using MS.Internal.KnownBoxes;
+using MS.Internal.Collections;
+using MS.Utility;
+using System.Collections;
+using System.ComponentModel;
+using System.Globalization;
+using System.Text;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Animation;
 using System.Windows.Media.Composition;
-// These types are aliased to match the unamanaged names used in interop
+using System.Windows.Markup;
+using System.Windows.Media.Converters;
 
 namespace System.Windows.Media
 {
+
+
     sealed partial class ImageBrush : TileBrush
     {
         //------------------------------------------------------
@@ -55,6 +68,10 @@ sealed partial class ImageBrush : TileBrush
 
         private static void ImageSourcePropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
+
+
+
+
             // The first change to the default value of a mutable collection property (e.g. GeometryGroup.Children) 
             // will promote the property value from a default value to a local value. This is technically a sub-property 
             // change because the collection was changed and not a new collection set (GeometryGroup.Children.
@@ -234,6 +251,7 @@ internal override void UpdateResource(DUCE.Channel channel, bool skipOnChannelCh
         }
         internal override DUCE.ResourceHandle AddRefOnChannelCore(DUCE.Channel channel)
         {
+
                 if (_duceResource.CreateOrAddRefOnChannel(this, channel, System.Windows.Media.Composition.DUCE.ResourceType.TYPE_IMAGEBRUSH))
                 {
                     Transform vTransform = Transform;
@@ -250,9 +268,11 @@ internal override DUCE.ResourceHandle AddRefOnChannelCore(DUCE.Channel channel)
                 }
 
                 return _duceResource.GetHandle(channel);
-}
+
+        }
         internal override void ReleaseOnChannelCore(DUCE.Channel channel)
         {
+
                 Debug.Assert(_duceResource.IsOnChannel(channel));
 
                 if (_duceResource.ReleaseOnChannel(channel))
@@ -265,8 +285,10 @@ internal override void ReleaseOnChannelCore(DUCE.Channel channel)
                     if (vImageSource != null) ((DUCE.IResource)vImageSource).ReleaseOnChannel(channel);
 
                     ReleaseOnChannelAnimations(channel);
-}
-}
+
+                }
+
+        }
         internal override DUCE.ResourceHandle GetHandleCore(DUCE.Channel channel)
         {
             // Note that we are in a lock here already.
@@ -359,8 +381,7 @@ static ImageBrush()
             // We check our static default fields which are of type Freezable
             // to make sure that they are not mutable, otherwise we will throw
             // if these get touched by more than one thread in the lifetime
-            // of your app. 
-
+            // of your app.
 
 
             // Initializations
@@ -376,6 +397,8 @@ static ImageBrush()
                                    /* coerceValueCallback */ null);
         }
 
+
+
         #endregion Constructors
     }
 }
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/ImageDrawing.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/ImageDrawing.cs
index 8f7fa3a4eab..660915a211c 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/ImageDrawing.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/ImageDrawing.cs
@@ -9,11 +9,24 @@
 // Please see MilCodeGen.html for more information.
 //
 
+using MS.Internal;
+using MS.Internal.KnownBoxes;
+using MS.Internal.Collections;
+using MS.Utility;
+using System.Collections;
+using System.ComponentModel;
+using System.Globalization;
+using System.Text;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Animation;
 using System.Windows.Media.Composition;
-// These types are aliased to match the unamanaged names used in interop
+using System.Windows.Markup;
+using System.Windows.Media.Converters;
 
 namespace System.Windows.Media
 {
+
+
     sealed partial class ImageDrawing : Drawing
     {
         //------------------------------------------------------
@@ -55,6 +68,10 @@ sealed partial class ImageDrawing : Drawing
 
         private static void ImageSourcePropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
+
+
+
+
             // The first change to the default value of a mutable collection property (e.g. GeometryGroup.Children) 
             // will promote the property value from a default value to a local value. This is technically a sub-property 
             // change because the collection was changed and not a new collection set (GeometryGroup.Children.
@@ -209,6 +226,7 @@ internal override void UpdateResource(DUCE.Channel channel, bool skipOnChannelCh
         }
         internal override DUCE.ResourceHandle AddRefOnChannelCore(DUCE.Channel channel)
         {
+
                 if (_duceResource.CreateOrAddRefOnChannel(this, channel, System.Windows.Media.Composition.DUCE.ResourceType.TYPE_IMAGEDRAWING))
                 {
                     ImageSource vImageSource = ImageSource;
@@ -221,9 +239,11 @@ internal override DUCE.ResourceHandle AddRefOnChannelCore(DUCE.Channel channel)
                 }
 
                 return _duceResource.GetHandle(channel);
-}
+
+        }
         internal override void ReleaseOnChannelCore(DUCE.Channel channel)
         {
+
                 Debug.Assert(_duceResource.IsOnChannel(channel));
 
                 if (_duceResource.ReleaseOnChannel(channel))
@@ -232,8 +252,10 @@ internal override void ReleaseOnChannelCore(DUCE.Channel channel)
                     if (vImageSource != null) ((DUCE.IResource)vImageSource).ReleaseOnChannel(channel);
 
                     ReleaseOnChannelAnimations(channel);
-}
-}
+
+                }
+
+        }
         internal override DUCE.ResourceHandle GetHandleCore(DUCE.Channel channel)
         {
             // Note that we are in a lock here already.
@@ -317,8 +339,7 @@ static ImageDrawing()
             // We check our static default fields which are of type Freezable
             // to make sure that they are not mutable, otherwise we will throw
             // if these get touched by more than one thread in the lifetime
-            // of your app. 
-
+            // of your app.
 
 
             // Initializations
@@ -343,6 +364,8 @@ static ImageDrawing()
                                    /* coerceValueCallback */ null);
         }
 
+
+
         #endregion Constructors
     }
 }
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/ImageSource.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/ImageSource.cs
index 9888a541ba7..c5f2c183244 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/ImageSource.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/ImageSource.cs
@@ -9,12 +9,24 @@
 // Please see MilCodeGen.html for more information.
 //
 
+using MS.Internal;
+using MS.Internal.KnownBoxes;
+using MS.Internal.Collections;
+using MS.Utility;
+using System.Collections;
+using System.ComponentModel;
+using System.Globalization;
+using System.Text;
+using System.Windows.Media.Effects;
 using System.Windows.Media.Animation;
 using System.Windows.Media.Composition;
-// These types are aliased to match the unamanaged names used in interop
+using System.Windows.Markup;
+using System.Windows.Media.Converters;
 
 namespace System.Windows.Media
 {
+
+
     abstract partial class ImageSource : Animatable, IFormattable, DUCE.IResource
     {
         //------------------------------------------------------
@@ -218,6 +230,7 @@ internal virtual string ConvertToString(string format, IFormatProvider provider)
             return base.ToString();
         }
 
+
         #endregion Internal Properties
 
         //------------------------------------------------------
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/Int32Collection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/Int32Collection.cs
index 821c02279f0..188d9ccd47f 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/Int32Collection.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/Int32Collection.cs
@@ -2,19 +2,27 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+//
+//
 // This file was generated, please do not edit it directly.
+//
 // Please see MilCodeGen.html for more information.
+//
 
 using MS.Internal;
+using MS.Internal.KnownBoxes;
+using MS.Internal.Collections;
 using MS.Utility;
 using System.Collections;
 using System.ComponentModel;
+using System.Globalization;
 using System.Text;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Composition;
 using System.Windows.Markup;
 using System.Windows.Media.Converters;
 
-// These types are aliased to match the unamanaged names used in interop
-
 namespace System.Windows.Media
 {
     /// <summary>
@@ -110,6 +118,8 @@ public int IndexOf(int value)
         /// </summary>
         public void Insert(int index, int value)
         {
+
+
             WritePreamble();
             _collection.Insert(index, value);
 
@@ -187,6 +197,8 @@ public int this[int index]
             }
             set
             {
+
+
                 WritePreamble();
                 _collection[ index ] = value;
 
@@ -523,7 +535,8 @@ protected override void CloneCore(Freezable source)
             {
                 _collection.Add(sourceInt32Collection._collection[i]);
             }
-}
+
+        }
         /// <summary>
         /// Implementation of Freezable.CloneCurrentValueCore()
         /// </summary>
@@ -541,7 +554,8 @@ protected override void CloneCurrentValueCore(Freezable source)
             {
                 _collection.Add(sourceInt32Collection._collection[i]);
             }
-}
+
+        }
         /// <summary>
         /// Implementation of Freezable.GetAsFrozenCore()
         /// </summary>
@@ -559,7 +573,8 @@ protected override void GetAsFrozenCore(Freezable source)
             {
                 _collection.Add(sourceInt32Collection._collection[i]);
             }
-}
+
+        }
         /// <summary>
         /// Implementation of Freezable.GetCurrentValueAsFrozenCore()
         /// </summary>
@@ -577,7 +592,8 @@ protected override void GetCurrentValueAsFrozenCore(Freezable source)
             {
                 _collection.Add(sourceInt32Collection._collection[i]);
             }
-}
+
+        }
 
 
         #endregion ProtectedMethods
@@ -768,6 +784,7 @@ internal Enumerator(Int32Collection list)
 
             void IDisposable.Dispose()
             {
+
             }
 
             /// <summary>
@@ -908,6 +925,7 @@ public Int32Collection(IEnumerable<int> collection)
 
             ArgumentNullException.ThrowIfNull(collection);
 
+
             ICollection<int> icollectionOfT = collection as ICollection<int>;
 
             if (icollectionOfT != null)
@@ -928,8 +946,11 @@ public Int32Collection(IEnumerable<int> collection)
 
                     foreach (int item in collection)
                     {
+
                         _collection.Add(item);
                     }
+
+
                 }
             }
 
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/Int32CollectionConverter.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/Int32CollectionConverter.cs
index 2319da78437..4f1b3b95557 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/Int32CollectionConverter.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/Int32CollectionConverter.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -9,8 +9,19 @@
 // Please see MilCodeGen.html for more information.
 //
 
+using MS.Internal;
+using MS.Internal.KnownBoxes;
+using MS.Internal.Collections;
+using MS.Utility;
+using System.Collections;
 using System.ComponentModel;
 using System.Globalization;
+using System.Text;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Composition;
+using System.Windows.Markup;
+using System.Windows.Media.Converters;
 
 namespace System.Windows.Media
 {
@@ -75,9 +86,8 @@ public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo c
                 throw GetConvertFromException(value);
             }
 
-            String source = value as string;
 
-            if (source != null)
+            if (value is string source)
             {
                 return Int32Collection.Parse(source);
             }
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/LineGeometry.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/LineGeometry.cs
index 155d4b14adf..43416bd4dd7 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/LineGeometry.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/LineGeometry.cs
@@ -9,11 +9,24 @@
 // Please see MilCodeGen.html for more information.
 //
 
+using MS.Internal;
+using MS.Internal.KnownBoxes;
+using MS.Internal.Collections;
+using MS.Utility;
+using System.Collections;
+using System.ComponentModel;
+using System.Globalization;
+using System.Text;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Animation;
 using System.Windows.Media.Composition;
-// These types are aliased to match the unamanaged names used in interop
+using System.Windows.Markup;
+using System.Windows.Media.Converters;
 
 namespace System.Windows.Media
 {
+
+
     sealed partial class LineGeometry : Geometry
     {
         //------------------------------------------------------
@@ -188,6 +201,7 @@ internal override void UpdateResource(DUCE.Channel channel, bool skipOnChannelCh
         }
         internal override DUCE.ResourceHandle AddRefOnChannelCore(DUCE.Channel channel)
         {
+
                 if (_duceResource.CreateOrAddRefOnChannel(this, channel, System.Windows.Media.Composition.DUCE.ResourceType.TYPE_LINEGEOMETRY))
                 {
                     Transform vTransform = Transform;
@@ -200,9 +214,11 @@ internal override DUCE.ResourceHandle AddRefOnChannelCore(DUCE.Channel channel)
                 }
 
                 return _duceResource.GetHandle(channel);
-}
+
+        }
         internal override void ReleaseOnChannelCore(DUCE.Channel channel)
         {
+
                 Debug.Assert(_duceResource.IsOnChannel(channel));
 
                 if (_duceResource.ReleaseOnChannel(channel))
@@ -211,8 +227,10 @@ internal override void ReleaseOnChannelCore(DUCE.Channel channel)
                     if (vTransform != null) ((DUCE.IResource)vTransform).ReleaseOnChannel(channel);
 
                     ReleaseOnChannelAnimations(channel);
-}
-}
+
+                }
+
+        }
         internal override DUCE.ResourceHandle GetHandleCore(DUCE.Channel channel)
         {
             // Note that we are in a lock here already.
@@ -297,8 +315,7 @@ static LineGeometry()
             // We check our static default fields which are of type Freezable
             // to make sure that they are not mutable, otherwise we will throw
             // if these get touched by more than one thread in the lifetime
-            // of your app
-
+            // of your app.
 
 
             // Initializations
@@ -323,6 +340,8 @@ static LineGeometry()
                                    /* coerceValueCallback */ null);
         }
 
+
+
         #endregion Constructors
     }
 }
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/LineSegment.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/LineSegment.cs
index c06ceb8fd1a..0268d5b3568 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/LineSegment.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/LineSegment.cs
@@ -9,9 +9,24 @@
 // Please see MilCodeGen.html for more information.
 //
 
-// These types are aliased to match the unamanaged names used in interop
+using MS.Internal;
+using MS.Internal.KnownBoxes;
+using MS.Internal.Collections;
+using MS.Utility;
+using System.Collections;
+using System.ComponentModel;
+using System.Globalization;
+using System.Text;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Composition;
+using System.Windows.Markup;
+using System.Windows.Media.Converters;
+
 namespace System.Windows.Media
 {
+
+
     sealed partial class LineSegment : PathSegment
     {
         //------------------------------------------------------
@@ -185,8 +200,7 @@ static LineSegment()
             // We check our static default fields which are of type Freezable
             // to make sure that they are not mutable, otherwise we will throw
             // if these get touched by more than one thread in the lifetime
-            // of your app. 
-
+            // of your app.
 
 
             // Initializations
@@ -202,6 +216,8 @@ static LineSegment()
                                    /* coerceValueCallback */ null);
         }
 
+
+
         #endregion Constructors
     }
 }
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/LinearGradientBrush.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/LinearGradientBrush.cs
index c3cd0391d73..5eb9c3795e6 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/LinearGradientBrush.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/LinearGradientBrush.cs
@@ -9,11 +9,24 @@
 // Please see MilCodeGen.html for more information.
 //
 
+using MS.Internal;
+using MS.Internal.KnownBoxes;
+using MS.Internal.Collections;
+using MS.Utility;
+using System.Collections;
+using System.ComponentModel;
+using System.Globalization;
+using System.Text;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Animation;
 using System.Windows.Media.Composition;
-// These types are aliased to match the unamanaged names used in interop
+using System.Windows.Markup;
+using System.Windows.Media.Converters;
 
 namespace System.Windows.Media
 {
+
+
     sealed partial class LinearGradientBrush : GradientBrush
     {
         //------------------------------------------------------
@@ -139,6 +152,7 @@ internal override void UpdateResource(DUCE.Channel channel, bool skipOnChannelCh
         }
         internal override DUCE.ResourceHandle AddRefOnChannelCore(DUCE.Channel channel)
         {
+
                 if (_duceResource.CreateOrAddRefOnChannel(this, channel, System.Windows.Media.Composition.DUCE.ResourceType.TYPE_LINEARGRADIENTBRUSH))
                 {
                     Transform vTransform = Transform;
@@ -153,9 +167,11 @@ internal override DUCE.ResourceHandle AddRefOnChannelCore(DUCE.Channel channel)
                 }
 
                 return _duceResource.GetHandle(channel);
-}
+
+        }
         internal override void ReleaseOnChannelCore(DUCE.Channel channel)
         {
+
                 Debug.Assert(_duceResource.IsOnChannel(channel));
 
                 if (_duceResource.ReleaseOnChannel(channel))
@@ -166,8 +182,10 @@ internal override void ReleaseOnChannelCore(DUCE.Channel channel)
                     if (vRelativeTransform != null) ((DUCE.IResource)vRelativeTransform).ReleaseOnChannel(channel);
 
                     ReleaseOnChannelAnimations(channel);
-}
-}
+
+                }
+
+        }
         internal override DUCE.ResourceHandle GetHandleCore(DUCE.Channel channel)
         {
             // Note that we are in a lock here already.
@@ -267,8 +285,7 @@ static LinearGradientBrush()
             // We check our static default fields which are of type Freezable
             // to make sure that they are not mutable, otherwise we will throw
             // if these get touched by more than one thread in the lifetime
-            // of your app. 
-
+            // of your app.
 
 
             // Initializations
@@ -293,6 +310,8 @@ static LinearGradientBrush()
                                    /* coerceValueCallback */ null);
         }
 
+
+
         #endregion Constructors
     }
 }
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/MatrixTransform.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/MatrixTransform.cs
index 8f8137b8590..f4f2cd920a5 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/MatrixTransform.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/MatrixTransform.cs
@@ -9,11 +9,24 @@
 // Please see MilCodeGen.html for more information.
 //
 
+using MS.Internal;
+using MS.Internal.KnownBoxes;
+using MS.Internal.Collections;
+using MS.Utility;
+using System.Collections;
+using System.ComponentModel;
+using System.Globalization;
+using System.Text;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Animation;
 using System.Windows.Media.Composition;
-// These types are aliased to match the unamanaged names used in interop
+using System.Windows.Markup;
+using System.Windows.Media.Converters;
 
 namespace System.Windows.Media
 {
+
+
     sealed partial class MatrixTransform : Transform
     {
         //------------------------------------------------------
@@ -143,8 +156,11 @@ internal override void UpdateResource(DUCE.Channel channel, bool skipOnChannelCh
         }
         internal override DUCE.ResourceHandle AddRefOnChannelCore(DUCE.Channel channel)
         {
+
                 if (_duceResource.CreateOrAddRefOnChannel(this, channel, System.Windows.Media.Composition.DUCE.ResourceType.TYPE_MATRIXTRANSFORM))
                 {
+
+
                     AddRefOnChannelAnimations(channel);
 
 
@@ -152,16 +168,22 @@ internal override DUCE.ResourceHandle AddRefOnChannelCore(DUCE.Channel channel)
                 }
 
                 return _duceResource.GetHandle(channel);
-}
+
+        }
         internal override void ReleaseOnChannelCore(DUCE.Channel channel)
         {
+
                 Debug.Assert(_duceResource.IsOnChannel(channel));
 
                 if (_duceResource.ReleaseOnChannel(channel))
                 {
+
+
                     ReleaseOnChannelAnimations(channel);
-}
-}
+
+                }
+
+        }
         internal override DUCE.ResourceHandle GetHandleCore(DUCE.Channel channel)
         {
             // Note that we are in a lock here already.
@@ -254,8 +276,7 @@ static MatrixTransform()
             // We check our static default fields which are of type Freezable
             // to make sure that they are not mutable, otherwise we will throw
             // if these get touched by more than one thread in the lifetime
-            // of your app.  
-
+            // of your app.
 
 
             // Initializations
@@ -271,6 +292,8 @@ static MatrixTransform()
                                    /* coerceValueCallback */ null);
         }
 
+
+
         #endregion Constructors
     }
 }
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/MediaTimeline.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/MediaTimeline.cs
index 599742a39c9..b0dde9c8de0 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/MediaTimeline.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/MediaTimeline.cs
@@ -9,11 +9,24 @@
 // Please see MilCodeGen.html for more information.
 //
 
+using MS.Internal;
+using MS.Internal.KnownBoxes;
+using MS.Internal.Collections;
+using MS.Utility;
+using System.Collections;
+using System.ComponentModel;
+using System.Globalization;
+using System.Text;
+using System.Windows.Media.Effects;
 using System.Windows.Media.Animation;
-// These types are aliased to match the unamanaged names used in interop
+using System.Windows.Media.Composition;
+using System.Windows.Markup;
+using System.Windows.Media.Converters;
 
 namespace System.Windows.Media
 {
+
+
     partial class MediaTimeline : Timeline
     {
         //------------------------------------------------------
@@ -190,7 +203,6 @@ static MediaTimeline()
             // of your app.
 
 
-
             // Initializations
             Type typeofThis = typeof(MediaTimeline);
             SourceProperty =
@@ -204,6 +216,8 @@ static MediaTimeline()
                                    /* coerceValueCallback */ null);
         }
 
+
+
         #endregion Constructors
     }
 }
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PathFigure.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PathFigure.cs
index 89527ccfcaa..0f4e70f9a0e 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PathFigure.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PathFigure.cs
@@ -11,11 +11,22 @@
 
 using MS.Internal;
 using MS.Internal.KnownBoxes;
+using MS.Internal.Collections;
+using MS.Utility;
+using System.Collections;
+using System.ComponentModel;
+using System.Globalization;
+using System.Text;
+using System.Windows.Media.Effects;
 using System.Windows.Media.Animation;
-// These types are aliased to match the unamanaged names used in interop
+using System.Windows.Media.Composition;
+using System.Windows.Markup;
+using System.Windows.Media.Converters;
 
 namespace System.Windows.Media
 {
+
+
     sealed partial class PathFigure : Animatable
     {
         //------------------------------------------------------
@@ -252,7 +263,6 @@ static PathFigure()
             // to make sure that they are not mutable, otherwise we will throw
             // if these get touched by more than one thread in the lifetime
             // of your app.
-
             Debug.Assert(s_Segments == null || s_Segments.IsFrozen,
                 "Detected context bound default value PathFigure.s_Segments (See OS Bug #947272).");
 
@@ -297,6 +307,8 @@ static PathFigure()
                                    /* coerceValueCallback */ null);
         }
 
+
+
         #endregion Constructors
     }
 }
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PathFigureCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PathFigureCollection.cs
index 60698998a3b..7394e0809fd 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PathFigureCollection.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PathFigureCollection.cs
@@ -2,19 +2,27 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+//
+//
 // This file was generated, please do not edit it directly.
+//
 // Please see MilCodeGen.html for more information.
+//
 
+using MS.Internal;
+using MS.Internal.KnownBoxes;
+using MS.Internal.Collections;
 using MS.Utility;
 using System.Collections;
 using System.ComponentModel;
+using System.Globalization;
 using System.Text;
+using System.Windows.Media.Effects;
 using System.Windows.Media.Animation;
+using System.Windows.Media.Composition;
 using System.Windows.Markup;
 using System.Windows.Media.Converters;
 
-// These types are aliased to match the unamanaged names used in interop
-
 namespace System.Windows.Media
 {
     /// <summary>
@@ -234,11 +242,14 @@ public PathFigure this[int index]
 
                 if (!Object.ReferenceEquals(_collection[ index ], value))
                 {
+
                     PathFigure oldValue = _collection[ index ];
                     OnFreezablePropertyChanged(oldValue, value);
 
                     _collection[ index ] = value;
-}
+
+
+                }
 
 
                 ++_version;
@@ -583,8 +594,10 @@ protected override void CloneCore(Freezable source)
                 PathFigure newValue = (PathFigure) sourcePathFigureCollection._collection[i].Clone();
                 OnFreezablePropertyChanged(/* oldValue = */ null, newValue);
                 _collection.Add(newValue);
-}
-}
+
+            }
+
+        }
         /// <summary>
         /// Implementation of Freezable.CloneCurrentValueCore()
         /// </summary>
@@ -603,8 +616,10 @@ protected override void CloneCurrentValueCore(Freezable source)
                 PathFigure newValue = (PathFigure) sourcePathFigureCollection._collection[i].CloneCurrentValue();
                 OnFreezablePropertyChanged(/* oldValue = */ null, newValue);
                 _collection.Add(newValue);
-}
-}
+
+            }
+
+        }
         /// <summary>
         /// Implementation of Freezable.GetAsFrozenCore()
         /// </summary>
@@ -623,8 +638,10 @@ protected override void GetAsFrozenCore(Freezable source)
                 PathFigure newValue = (PathFigure) sourcePathFigureCollection._collection[i].GetAsFrozen();
                 OnFreezablePropertyChanged(/* oldValue = */ null, newValue);
                 _collection.Add(newValue);
-}
-}
+
+            }
+
+        }
         /// <summary>
         /// Implementation of Freezable.GetCurrentValueAsFrozenCore()
         /// </summary>
@@ -643,8 +660,10 @@ protected override void GetCurrentValueAsFrozenCore(Freezable source)
                 PathFigure newValue = (PathFigure) sourcePathFigureCollection._collection[i].GetCurrentValueAsFrozen();
                 OnFreezablePropertyChanged(/* oldValue = */ null, newValue);
                 _collection.Add(newValue);
-}
-}
+
+            }
+
+        }
         /// <summary>
         /// Implementation of <see cref="System.Windows.Freezable.FreezeCore">Freezable.FreezeCore</see>.
         /// </summary>
@@ -837,6 +856,7 @@ internal Enumerator(PathFigureCollection list)
 
             void IDisposable.Dispose()
             {
+
             }
 
             /// <summary>
@@ -1005,6 +1025,7 @@ public PathFigureCollection(IEnumerable<PathFigure> collection)
                         PathFigure newValue = item;
                         OnFreezablePropertyChanged(/* oldValue = */ null, newValue);
                         _collection.Add(newValue);
+
                     }
 
                     needsItemValidation = false;
@@ -1020,6 +1041,7 @@ public PathFigureCollection(IEnumerable<PathFigure> collection)
                         throw new System.ArgumentException(SR.Collection_NoNull);
                     }
                     OnFreezablePropertyChanged(/* oldValue = */ null, item);
+
                 }
             }
 
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PathFigureCollectionConverter.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PathFigureCollectionConverter.cs
index 37b719edcf2..7b35abfd29a 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PathFigureCollectionConverter.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PathFigureCollectionConverter.cs
@@ -1,12 +1,27 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+//
+//
 // This file was generated, please do not edit it directly.
+//
 // Please see MilCodeGen.html for more information.
+//
 
+using MS.Internal;
+using MS.Internal.KnownBoxes;
+using MS.Internal.Collections;
+using MS.Utility;
+using System.Collections;
 using System.ComponentModel;
 using System.Globalization;
+using System.Text;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Composition;
+using System.Windows.Markup;
+using System.Windows.Media.Converters;
 
 namespace System.Windows.Media
 {
@@ -84,9 +99,8 @@ public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo c
                 throw GetConvertFromException(value);
             }
 
-            String source = value as string;
 
-            if (source != null)
+            if (value is string source)
             {
                 return PathFigureCollection.Parse(source);
             }
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PathGeometry.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PathGeometry.cs
index d5372443158..709658444a7 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PathGeometry.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PathGeometry.cs
@@ -11,11 +11,22 @@
 
 using MS.Internal;
 using MS.Internal.KnownBoxes;
+using MS.Internal.Collections;
+using MS.Utility;
+using System.Collections;
+using System.ComponentModel;
+using System.Globalization;
+using System.Text;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Animation;
 using System.Windows.Media.Composition;
-// These types are aliased to match the unamanaged names used in interop
+using System.Windows.Markup;
+using System.Windows.Media.Converters;
 
 namespace System.Windows.Media
 {
+
+
     sealed partial class PathGeometry : Geometry
     {
         //------------------------------------------------------
@@ -64,6 +75,7 @@ private static void FillRulePropertyChanged(DependencyObject d, DependencyProper
         }
         private static void FiguresPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
+
             PathGeometry target = ((PathGeometry) d);
 
 
@@ -146,6 +158,7 @@ internal override void UpdateResource(DUCE.Channel channel, bool skipOnChannelCh
         }
         internal override DUCE.ResourceHandle AddRefOnChannelCore(DUCE.Channel channel)
         {
+
                 if (_duceResource.CreateOrAddRefOnChannel(this, channel, System.Windows.Media.Composition.DUCE.ResourceType.TYPE_PATHGEOMETRY))
                 {
                     Transform vTransform = Transform;
@@ -158,9 +171,11 @@ internal override DUCE.ResourceHandle AddRefOnChannelCore(DUCE.Channel channel)
                 }
 
                 return _duceResource.GetHandle(channel);
-}
+
+        }
         internal override void ReleaseOnChannelCore(DUCE.Channel channel)
         {
+
                 Debug.Assert(_duceResource.IsOnChannel(channel));
 
                 if (_duceResource.ReleaseOnChannel(channel))
@@ -169,8 +184,10 @@ internal override void ReleaseOnChannelCore(DUCE.Channel channel)
                     if (vTransform != null) ((DUCE.IResource)vTransform).ReleaseOnChannel(channel);
 
                     ReleaseOnChannelAnimations(channel);
-}
-}
+
+                }
+
+        }
         internal override DUCE.ResourceHandle GetHandleCore(DUCE.Channel channel)
         {
             // Note that we are in a lock here already.
@@ -268,8 +285,7 @@ static PathGeometry()
             // We check our static default fields which are of type Freezable
             // to make sure that they are not mutable, otherwise we will throw
             // if these get touched by more than one thread in the lifetime
-            // of your app. 
-
+            // of your app.
             Debug.Assert(s_Figures == null || s_Figures.IsFrozen,
                 "Detected context bound default value PathGeometry.s_Figures (See OS Bug #947272).");
 
@@ -296,6 +312,8 @@ static PathGeometry()
                                    /* coerceValueCallback */ null);
         }
 
+
+
         #endregion Constructors
     }
 }
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PathSegment.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PathSegment.cs
index e5aaebeb006..1f866efd04c 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PathSegment.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PathSegment.cs
@@ -9,12 +9,24 @@
 // Please see MilCodeGen.html for more information.
 //
 
+using MS.Internal;
 using MS.Internal.KnownBoxes;
+using MS.Internal.Collections;
+using MS.Utility;
+using System.Collections;
+using System.ComponentModel;
+using System.Globalization;
+using System.Text;
+using System.Windows.Media.Effects;
 using System.Windows.Media.Animation;
-// These types are aliased to match the unamanaged names used in interop
+using System.Windows.Media.Composition;
+using System.Windows.Markup;
+using System.Windows.Media.Converters;
 
 namespace System.Windows.Media
 {
+
+
     abstract partial class PathSegment : Animatable
     {
         //------------------------------------------------------
@@ -188,8 +200,7 @@ static PathSegment()
             // We check our static default fields which are of type Freezable
             // to make sure that they are not mutable, otherwise we will throw
             // if these get touched by more than one thread in the lifetime
-            // of your app
-
+            // of your app.
 
 
             // Initializations
@@ -214,6 +225,8 @@ static PathSegment()
                                    /* coerceValueCallback */ null);
         }
 
+
+
         #endregion Constructors
     }
 }
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PathSegmentCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PathSegmentCollection.cs
index 957af0692bf..5a231e33ea6 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PathSegmentCollection.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PathSegmentCollection.cs
@@ -2,20 +2,33 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+//
+//
 // This file was generated, please do not edit it directly.
+//
 // Please see MilCodeGen.html for more information.
+//
 
+using MS.Internal;
+using MS.Internal.KnownBoxes;
+using MS.Internal.Collections;
 using MS.Utility;
 using System.Collections;
+using System.ComponentModel;
+using System.Globalization;
+using System.Text;
+using System.Windows.Media.Effects;
 using System.Windows.Media.Animation;
-
-// These types are aliased to match the unamanaged names used in interop
+using System.Windows.Media.Composition;
+using System.Windows.Markup;
+using System.Windows.Media.Converters;
 
 namespace System.Windows.Media
 {
     /// <summary>
     /// A collection of PathSegment objects.
     /// </summary>
+
     public sealed partial class PathSegmentCollection : Animatable, IList, IList<PathSegment>
     {
         //------------------------------------------------------
@@ -228,11 +241,14 @@ public PathSegment this[int index]
 
                 if (!Object.ReferenceEquals(_collection[ index ], value))
                 {
+
                     PathSegment oldValue = _collection[ index ];
                     OnFreezablePropertyChanged(oldValue, value);
 
                     _collection[ index ] = value;
-}
+
+
+                }
 
 
                 ++_version;
@@ -577,8 +593,10 @@ protected override void CloneCore(Freezable source)
                 PathSegment newValue = (PathSegment) sourcePathSegmentCollection._collection[i].Clone();
                 OnFreezablePropertyChanged(/* oldValue = */ null, newValue);
                 _collection.Add(newValue);
-}
-}
+
+            }
+
+        }
         /// <summary>
         /// Implementation of Freezable.CloneCurrentValueCore()
         /// </summary>
@@ -597,8 +615,10 @@ protected override void CloneCurrentValueCore(Freezable source)
                 PathSegment newValue = (PathSegment) sourcePathSegmentCollection._collection[i].CloneCurrentValue();
                 OnFreezablePropertyChanged(/* oldValue = */ null, newValue);
                 _collection.Add(newValue);
-}
-}
+
+            }
+
+        }
         /// <summary>
         /// Implementation of Freezable.GetAsFrozenCore()
         /// </summary>
@@ -617,8 +637,10 @@ protected override void GetAsFrozenCore(Freezable source)
                 PathSegment newValue = (PathSegment) sourcePathSegmentCollection._collection[i].GetAsFrozen();
                 OnFreezablePropertyChanged(/* oldValue = */ null, newValue);
                 _collection.Add(newValue);
-}
-}
+
+            }
+
+        }
         /// <summary>
         /// Implementation of Freezable.GetCurrentValueAsFrozenCore()
         /// </summary>
@@ -637,8 +659,10 @@ protected override void GetCurrentValueAsFrozenCore(Freezable source)
                 PathSegment newValue = (PathSegment) sourcePathSegmentCollection._collection[i].GetCurrentValueAsFrozen();
                 OnFreezablePropertyChanged(/* oldValue = */ null, newValue);
                 _collection.Add(newValue);
-}
-}
+
+            }
+
+        }
         /// <summary>
         /// Implementation of <see cref="System.Windows.Freezable.FreezeCore">Freezable.FreezeCore</see>.
         /// </summary>
@@ -742,6 +766,7 @@ internal Enumerator(PathSegmentCollection list)
 
             void IDisposable.Dispose()
             {
+
             }
 
             /// <summary>
@@ -910,6 +935,7 @@ public PathSegmentCollection(IEnumerable<PathSegment> collection)
                         PathSegment newValue = item;
                         OnFreezablePropertyChanged(/* oldValue = */ null, newValue);
                         _collection.Add(newValue);
+
                     }
 
                     needsItemValidation = false;
@@ -925,6 +951,7 @@ public PathSegmentCollection(IEnumerable<PathSegment> collection)
                         throw new System.ArgumentException(SR.Collection_NoNull);
                     }
                     OnFreezablePropertyChanged(/* oldValue = */ null, item);
+
                 }
             }
 
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/Pen.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/Pen.cs
index 84c5b4773ad..15d834312d4 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/Pen.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/Pen.cs
@@ -9,12 +9,24 @@
 // Please see MilCodeGen.html for more information.
 //
 
+using MS.Internal;
+using MS.Internal.KnownBoxes;
+using MS.Internal.Collections;
+using MS.Utility;
+using System.Collections;
+using System.ComponentModel;
+using System.Globalization;
+using System.Text;
+using System.Windows.Media.Effects;
 using System.Windows.Media.Animation;
 using System.Windows.Media.Composition;
-// These types are aliased to match the unamanaged names used in interop
+using System.Windows.Markup;
+using System.Windows.Media.Converters;
 
 namespace System.Windows.Media
 {
+
+
     sealed partial class Pen : Animatable, DUCE.IResource
     {
         //------------------------------------------------------
@@ -56,6 +68,10 @@ sealed partial class Pen : Animatable, DUCE.IResource
 
         private static void BrushPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
+
+
+
+
             // The first change to the default value of a mutable collection property (e.g. GeometryGroup.Children) 
             // will promote the property value from a default value to a local value. This is technically a sub-property 
             // change because the collection was changed and not a new collection set (GeometryGroup.Children.
@@ -142,6 +158,10 @@ private static void MiterLimitPropertyChanged(DependencyObject d, DependencyProp
         }
         private static void DashStylePropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
+
+
+
+
             // The first change to the default value of a mutable collection property (e.g. GeometryGroup.Children) 
             // will promote the property value from a default value to a local value. This is technically a sub-property 
             // change because the collection was changed and not a new collection set (GeometryGroup.Children.
@@ -419,7 +439,8 @@ void DUCE.IResource.ReleaseOnChannel(DUCE.Channel channel)
                     if (vDashStyle != null) ((DUCE.IResource)vDashStyle).ReleaseOnChannel(channel);
 
                     ReleaseOnChannelAnimations(channel);
-}
+
+                }
             }
         }
         DUCE.ResourceHandle DUCE.IResource.GetHandle(DUCE.Channel channel)
@@ -540,8 +561,7 @@ static Pen()
             // We check our static default fields which are of type Freezable
             // to make sure that they are not mutable, otherwise we will throw
             // if these get touched by more than one thread in the lifetime
-            // of your app.  
-
+            // of your app.
             Debug.Assert(s_DashStyle == null || s_DashStyle.IsFrozen,
                 "Detected context bound default value Pen.s_DashStyle (See OS Bug #947272).");
 
@@ -622,6 +642,8 @@ static Pen()
                                    /* coerceValueCallback */ null);
         }
 
+
+
         #endregion Constructors
     }
 }
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PenLineCap.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PenLineCap.cs
index e9a5a48d2e9..83fca74e250 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PenLineCap.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PenLineCap.cs
@@ -9,10 +9,6 @@
 // Please see MilCodeGen.html for more information.
 //
 
-#if PRESENTATION_CORE
-#else
-using SR=System.Windows.SR;
-#endif
 
 namespace System.Windows.Media
 {
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PenLineJoin.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PenLineJoin.cs
index 438c931f600..79329b0dbf4 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PenLineJoin.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PenLineJoin.cs
@@ -9,10 +9,6 @@
 // Please see MilCodeGen.html for more information.
 //
 
-#if PRESENTATION_CORE
-#else
-using SR=System.Windows.SR;
-#endif
 
 namespace System.Windows.Media
 {
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PointCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PointCollection.cs
index 83db4df2921..39894b76238 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PointCollection.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PointCollection.cs
@@ -2,19 +2,27 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+//
+//
 // This file was generated, please do not edit it directly.
+//
 // Please see MilCodeGen.html for more information.
+//
 
 using MS.Internal;
+using MS.Internal.KnownBoxes;
+using MS.Internal.Collections;
 using MS.Utility;
 using System.Collections;
 using System.ComponentModel;
+using System.Globalization;
 using System.Text;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Composition;
 using System.Windows.Markup;
 using System.Windows.Media.Converters;
 
-// These types are aliased to match the unamanaged names used in interop
-
 namespace System.Windows.Media
 {
     /// <summary>
@@ -110,6 +118,8 @@ public int IndexOf(Point value)
         /// </summary>
         public void Insert(int index, Point value)
         {
+
+
             WritePreamble();
             _collection.Insert(index, value);
 
@@ -187,6 +197,8 @@ public Point this[int index]
             }
             set
             {
+
+
                 WritePreamble();
                 _collection[ index ] = value;
 
@@ -523,7 +535,8 @@ protected override void CloneCore(Freezable source)
             {
                 _collection.Add(sourcePointCollection._collection[i]);
             }
-}
+
+        }
         /// <summary>
         /// Implementation of Freezable.CloneCurrentValueCore()
         /// </summary>
@@ -541,7 +554,8 @@ protected override void CloneCurrentValueCore(Freezable source)
             {
                 _collection.Add(sourcePointCollection._collection[i]);
             }
-}
+
+        }
         /// <summary>
         /// Implementation of Freezable.GetAsFrozenCore()
         /// </summary>
@@ -559,7 +573,8 @@ protected override void GetAsFrozenCore(Freezable source)
             {
                 _collection.Add(sourcePointCollection._collection[i]);
             }
-}
+
+        }
         /// <summary>
         /// Implementation of Freezable.GetCurrentValueAsFrozenCore()
         /// </summary>
@@ -577,7 +592,8 @@ protected override void GetCurrentValueAsFrozenCore(Freezable source)
             {
                 _collection.Add(sourcePointCollection._collection[i]);
             }
-}
+
+        }
 
 
         #endregion ProtectedMethods
@@ -770,6 +786,7 @@ internal Enumerator(PointCollection list)
 
             void IDisposable.Dispose()
             {
+
             }
 
             /// <summary>
@@ -910,6 +927,7 @@ public PointCollection(IEnumerable<Point> collection)
 
             ArgumentNullException.ThrowIfNull(collection);
 
+
             ICollection<Point> icollectionOfT = collection as ICollection<Point>;
 
             if (icollectionOfT != null)
@@ -930,8 +948,11 @@ public PointCollection(IEnumerable<Point> collection)
 
                     foreach (Point item in collection)
                     {
+
                         _collection.Add(item);
                     }
+
+
                 }
             }
 
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PointCollectionConverter.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PointCollectionConverter.cs
index 45754cb8ef8..bf732d0db43 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PointCollectionConverter.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PointCollectionConverter.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -9,8 +9,19 @@
 // Please see MilCodeGen.html for more information.
 //
 
+using MS.Internal;
+using MS.Internal.KnownBoxes;
+using MS.Internal.Collections;
+using MS.Utility;
+using System.Collections;
 using System.ComponentModel;
 using System.Globalization;
+using System.Text;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Composition;
+using System.Windows.Markup;
+using System.Windows.Media.Converters;
 
 namespace System.Windows.Media
 {
@@ -75,9 +86,8 @@ public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo c
                 throw GetConvertFromException(value);
             }
 
-            String source = value as string;
 
-            if (source != null)
+            if (value is string source)
             {
                 return PointCollection.Parse(source);
             }
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PolyBezierSegment.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PolyBezierSegment.cs
index cc842a8a290..c387474c526 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PolyBezierSegment.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PolyBezierSegment.cs
@@ -10,10 +10,23 @@
 //
 
 using MS.Internal;
-// These types are aliased to match the unamanaged names used in interop
+using MS.Internal.KnownBoxes;
+using MS.Internal.Collections;
+using MS.Utility;
+using System.Collections;
+using System.ComponentModel;
+using System.Globalization;
+using System.Text;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Composition;
+using System.Windows.Markup;
+using System.Windows.Media.Converters;
 
 namespace System.Windows.Media
 {
+
+
     sealed partial class PolyBezierSegment : PathSegment
     {
         //------------------------------------------------------
@@ -187,8 +200,7 @@ static PolyBezierSegment()
             // We check our static default fields which are of type Freezable
             // to make sure that they are not mutable, otherwise we will throw
             // if these get touched by more than one thread in the lifetime
-            // of your app. 
-
+            // of your app.
             Debug.Assert(s_Points == null || s_Points.IsFrozen,
                 "Detected context bound default value PolyBezierSegment.s_Points (See OS Bug #947272).");
 
@@ -206,6 +218,8 @@ static PolyBezierSegment()
                                    /* coerceValueCallback */ null);
         }
 
+
+
         #endregion Constructors
     }
 }
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PolyBezierSegmentFigureLogic.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PolyBezierSegmentFigureLogic.cs
index cb7fca1ec41..56c2226fe17 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PolyBezierSegmentFigureLogic.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PolyBezierSegmentFigureLogic.cs
@@ -12,6 +12,16 @@
 // Please see MilCodeGen.html for more information.
 //
 
+using System.Collections;
+using System.ComponentModel;
+using System.Windows;
+using System.Windows.Markup;
+using System.Windows.Media.Animation;
+using System.ComponentModel.Design.Serialization;
+using System.Windows.Media.Composition;
+using System.Reflection;
+using MS.Internal;
+
 namespace System.Windows.Media
 {
     #region PolyBezierSegment
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PolyLineSegment.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PolyLineSegment.cs
index 8d0cefe51fd..4b15fa16b86 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PolyLineSegment.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PolyLineSegment.cs
@@ -10,10 +10,23 @@
 //
 
 using MS.Internal;
-// These types are aliased to match the unamanaged names used in interop
+using MS.Internal.KnownBoxes;
+using MS.Internal.Collections;
+using MS.Utility;
+using System.Collections;
+using System.ComponentModel;
+using System.Globalization;
+using System.Text;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Composition;
+using System.Windows.Markup;
+using System.Windows.Media.Converters;
 
 namespace System.Windows.Media
 {
+
+
     sealed partial class PolyLineSegment : PathSegment
     {
         //------------------------------------------------------
@@ -188,7 +201,6 @@ static PolyLineSegment()
             // to make sure that they are not mutable, otherwise we will throw
             // if these get touched by more than one thread in the lifetime
             // of your app.
-
             Debug.Assert(s_Points == null || s_Points.IsFrozen,
                 "Detected context bound default value PolyLineSegment.s_Points (See OS Bug #947272).");
 
@@ -206,6 +218,8 @@ static PolyLineSegment()
                                    /* coerceValueCallback */ null);
         }
 
+
+
         #endregion Constructors
     }
 }
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PolyLineSegmentFigureLogic.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PolyLineSegmentFigureLogic.cs
index 6f6d9872a15..df32ebf1de4 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PolyLineSegmentFigureLogic.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PolyLineSegmentFigureLogic.cs
@@ -12,6 +12,16 @@
 // Please see MilCodeGen.html for more information.
 //
 
+using System.Collections;
+using System.ComponentModel;
+using System.Windows;
+using System.Windows.Markup;
+using System.Windows.Media.Animation;
+using System.ComponentModel.Design.Serialization;
+using System.Windows.Media.Composition;
+using System.Reflection;
+using MS.Internal;
+
 namespace System.Windows.Media
 {
     #region PolyLineSegment
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PolyQuadraticBezierSegment.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PolyQuadraticBezierSegment.cs
index dee7ba0d893..f3368b3da6b 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PolyQuadraticBezierSegment.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PolyQuadraticBezierSegment.cs
@@ -10,10 +10,23 @@
 //
 
 using MS.Internal;
-// These types are aliased to match the unamanaged names used in interop
+using MS.Internal.KnownBoxes;
+using MS.Internal.Collections;
+using MS.Utility;
+using System.Collections;
+using System.ComponentModel;
+using System.Globalization;
+using System.Text;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Composition;
+using System.Windows.Markup;
+using System.Windows.Media.Converters;
 
 namespace System.Windows.Media
 {
+
+
     sealed partial class PolyQuadraticBezierSegment : PathSegment
     {
         //------------------------------------------------------
@@ -187,8 +200,7 @@ static PolyQuadraticBezierSegment()
             // We check our static default fields which are of type Freezable
             // to make sure that they are not mutable, otherwise we will throw
             // if these get touched by more than one thread in the lifetime
-            // of your app
-
+            // of your app.
             Debug.Assert(s_Points == null || s_Points.IsFrozen,
                 "Detected context bound default value PolyQuadraticBezierSegment.s_Points (See OS Bug #947272).");
 
@@ -206,6 +218,8 @@ static PolyQuadraticBezierSegment()
                                    /* coerceValueCallback */ null);
         }
 
+
+
         #endregion Constructors
     }
 }
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PolyQuadraticBezierSegmentFigureLogic.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PolyQuadraticBezierSegmentFigureLogic.cs
index 1fb2d7e2cb5..52c2425b855 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PolyQuadraticBezierSegmentFigureLogic.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PolyQuadraticBezierSegmentFigureLogic.cs
@@ -12,6 +12,16 @@
 // Please see MilCodeGen.html for more information.
 //
 
+using System.Collections;
+using System.ComponentModel;
+using System.Windows;
+using System.Windows.Markup;
+using System.Windows.Media.Animation;
+using System.ComponentModel.Design.Serialization;
+using System.Windows.Media.Composition;
+using System.Reflection;
+using MS.Internal;
+
 namespace System.Windows.Media
 {
     #region PolyQuadraticBezierSegment
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/QuadraticBezierSegment.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/QuadraticBezierSegment.cs
index c7d0f93a7fa..5f8e707b6e1 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/QuadraticBezierSegment.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/QuadraticBezierSegment.cs
@@ -9,9 +9,24 @@
 // Please see MilCodeGen.html for more information.
 //
 
-// These types are aliased to match the unamanaged names used in interop
+using MS.Internal;
+using MS.Internal.KnownBoxes;
+using MS.Internal.Collections;
+using MS.Utility;
+using System.Collections;
+using System.ComponentModel;
+using System.Globalization;
+using System.Text;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Composition;
+using System.Windows.Markup;
+using System.Windows.Media.Converters;
+
 namespace System.Windows.Media
 {
+
+
     sealed partial class QuadraticBezierSegment : PathSegment
     {
         //------------------------------------------------------
@@ -192,8 +207,7 @@ static QuadraticBezierSegment()
             // We check our static default fields which are of type Freezable
             // to make sure that they are not mutable, otherwise we will throw
             // if these get touched by more than one thread in the lifetime
-            // of your app
-
+            // of your app.
 
 
             // Initializations
@@ -218,6 +232,8 @@ static QuadraticBezierSegment()
                                    /* coerceValueCallback */ null);
         }
 
+
+
         #endregion Constructors
     }
 }
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/RadialGradientBrush.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/RadialGradientBrush.cs
index 69e8d9d0299..0ad22a63339 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/RadialGradientBrush.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/RadialGradientBrush.cs
@@ -9,11 +9,24 @@
 // Please see MilCodeGen.html for more information.
 //
 
+using MS.Internal;
+using MS.Internal.KnownBoxes;
+using MS.Internal.Collections;
+using MS.Utility;
+using System.Collections;
+using System.ComponentModel;
+using System.Globalization;
+using System.Text;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Animation;
 using System.Windows.Media.Composition;
-// These types are aliased to match the unamanaged names used in interop
+using System.Windows.Markup;
+using System.Windows.Media.Converters;
 
 namespace System.Windows.Media
 {
+
+
     sealed partial class RadialGradientBrush : GradientBrush
     {
         //------------------------------------------------------
@@ -183,6 +196,7 @@ internal override void UpdateResource(DUCE.Channel channel, bool skipOnChannelCh
         }
         internal override DUCE.ResourceHandle AddRefOnChannelCore(DUCE.Channel channel)
         {
+
                 if (_duceResource.CreateOrAddRefOnChannel(this, channel, System.Windows.Media.Composition.DUCE.ResourceType.TYPE_RADIALGRADIENTBRUSH))
                 {
                     Transform vTransform = Transform;
@@ -197,9 +211,11 @@ internal override DUCE.ResourceHandle AddRefOnChannelCore(DUCE.Channel channel)
                 }
 
                 return _duceResource.GetHandle(channel);
-}
+
+        }
         internal override void ReleaseOnChannelCore(DUCE.Channel channel)
         {
+
                 Debug.Assert(_duceResource.IsOnChannel(channel));
 
                 if (_duceResource.ReleaseOnChannel(channel))
@@ -210,8 +226,10 @@ internal override void ReleaseOnChannelCore(DUCE.Channel channel)
                     if (vRelativeTransform != null) ((DUCE.IResource)vRelativeTransform).ReleaseOnChannel(channel);
 
                     ReleaseOnChannelAnimations(channel);
-}
-}
+
+                }
+
+        }
         internal override DUCE.ResourceHandle GetHandleCore(DUCE.Channel channel)
         {
             // Note that we are in a lock here already.
@@ -319,8 +337,7 @@ static RadialGradientBrush()
             // We check our static default fields which are of type Freezable
             // to make sure that they are not mutable, otherwise we will throw
             // if these get touched by more than one thread in the lifetime
-            // of your app
-
+            // of your app.
 
 
             // Initializations
@@ -363,6 +380,8 @@ static RadialGradientBrush()
                                    /* coerceValueCallback */ null);
         }
 
+
+
         #endregion Constructors
     }
 }
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/RectangleGeometry.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/RectangleGeometry.cs
index 6809766e4af..5f58a78436b 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/RectangleGeometry.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/RectangleGeometry.cs
@@ -9,11 +9,24 @@
 // Please see MilCodeGen.html for more information.
 //
 
+using MS.Internal;
+using MS.Internal.KnownBoxes;
+using MS.Internal.Collections;
+using MS.Utility;
+using System.Collections;
+using System.ComponentModel;
+using System.Globalization;
+using System.Text;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Animation;
 using System.Windows.Media.Composition;
-// These types are aliased to match the unamanaged names used in interop
+using System.Windows.Markup;
+using System.Windows.Media.Converters;
 
 namespace System.Windows.Media
 {
+
+
     sealed partial class RectangleGeometry : Geometry
     {
         //------------------------------------------------------
@@ -216,6 +229,7 @@ internal override void UpdateResource(DUCE.Channel channel, bool skipOnChannelCh
         }
         internal override DUCE.ResourceHandle AddRefOnChannelCore(DUCE.Channel channel)
         {
+
                 if (_duceResource.CreateOrAddRefOnChannel(this, channel, System.Windows.Media.Composition.DUCE.ResourceType.TYPE_RECTANGLEGEOMETRY))
                 {
                     Transform vTransform = Transform;
@@ -228,9 +242,11 @@ internal override DUCE.ResourceHandle AddRefOnChannelCore(DUCE.Channel channel)
                 }
 
                 return _duceResource.GetHandle(channel);
-}
+
+        }
         internal override void ReleaseOnChannelCore(DUCE.Channel channel)
         {
+
                 Debug.Assert(_duceResource.IsOnChannel(channel));
 
                 if (_duceResource.ReleaseOnChannel(channel))
@@ -239,8 +255,10 @@ internal override void ReleaseOnChannelCore(DUCE.Channel channel)
                     if (vTransform != null) ((DUCE.IResource)vTransform).ReleaseOnChannel(channel);
 
                     ReleaseOnChannelAnimations(channel);
-}
-}
+
+                }
+
+        }
         internal override DUCE.ResourceHandle GetHandleCore(DUCE.Channel channel)
         {
             // Note that we are in a lock here already.
@@ -343,8 +361,7 @@ static RectangleGeometry()
             // We check our static default fields which are of type Freezable
             // to make sure that they are not mutable, otherwise we will throw
             // if these get touched by more than one thread in the lifetime
-            // of your app
-
+            // of your app.
 
 
             // Initializations
@@ -378,6 +395,8 @@ static RectangleGeometry()
                                    /* coerceValueCallback */ null);
         }
 
+
+
         #endregion Constructors
     }
 }
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/RenderData.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/RenderData.cs
index 76b770f447e..9782c64ade5 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/RenderData.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/RenderData.cs
@@ -9,7 +9,9 @@
 // Please see MilCodeGen.html for more information.
 //
 
+using MS.Internal;
 using System.Runtime.InteropServices;
+using System.Windows.Threading;
 using System.Windows.Media.Animation;
 using System.Windows.Media.Composition;
 using System.Windows.Media.Effects;
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/RenderDataDrawingContext.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/RenderDataDrawingContext.cs
index 35b76963d00..b96fd7893a2 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/RenderDataDrawingContext.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/RenderDataDrawingContext.cs
@@ -2,10 +2,16 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+//
+//
 // This file was generated, please do not edit it directly.
+//
 // Please see MilCodeGen.html for more information.
+//
 
 using MS.Internal;
+using System.Runtime.InteropServices;
+using System.Windows.Threading;
 using System.Windows.Media.Animation;
 using System.Windows.Media.Composition;
 using System.Windows.Media.Effects;
@@ -62,7 +68,10 @@ public override void DrawLine(
                                             (byte*)&record,
                                             40 /* sizeof(MILCMD_DRAW_LINE) */);
             }                           
-}
+
+
+
+        }
 
         /// <summary>
         ///     DrawLine - 
@@ -120,7 +129,10 @@ public override void DrawLine(
                                             (byte*)&record,
                                             48 /* sizeof(MILCMD_DRAW_LINE_ANIMATE) */);
             }                            
-}
+
+
+
+        }
         /// <summary>
         ///     DrawRectangle - 
         ///     Draw a rectangle with the provided Brush and/or Pen.
@@ -172,7 +184,10 @@ public override void DrawRectangle(
                                             (byte*)&record,
                                             40 /* sizeof(MILCMD_DRAW_RECTANGLE) */);
             }                           
-}
+
+
+
+        }
 
         /// <summary>
         ///     DrawRectangle - 
@@ -231,7 +246,10 @@ public override void DrawRectangle(
                                             (byte*)&record,
                                             48 /* sizeof(MILCMD_DRAW_RECTANGLE_ANIMATE) */);
             }                            
-}
+
+
+
+        }
         /// <summary>
         ///     DrawRoundedRectangle - 
         ///     Draw a rounded rectangle with the provided Brush and/or Pen.
@@ -295,7 +313,10 @@ public override void DrawRoundedRectangle(
                                             (byte*)&record,
                                             56 /* sizeof(MILCMD_DRAW_ROUNDED_RECTANGLE) */);
             }                           
-}
+
+
+
+        }
 
         /// <summary>
         ///     DrawRoundedRectangle - 
@@ -376,7 +397,10 @@ public override void DrawRoundedRectangle(
                                             (byte*)&record,
                                             72 /* sizeof(MILCMD_DRAW_ROUNDED_RECTANGLE_ANIMATE) */);
             }                            
-}
+
+
+
+        }
         /// <summary>
         ///     DrawEllipse - 
         ///     Draw an ellipse with the provided Brush and/or Pen.
@@ -442,7 +466,10 @@ public override void DrawEllipse(
                                             (byte*)&record,
                                             40 /* sizeof(MILCMD_DRAW_ELLIPSE) */);
             }                           
-}
+
+
+
+        }
 
         /// <summary>
         ///     DrawEllipse - 
@@ -525,7 +552,10 @@ public override void DrawEllipse(
                                             (byte*)&record,
                                             56 /* sizeof(MILCMD_DRAW_ELLIPSE_ANIMATE) */);
             }                            
-}
+
+
+
+        }
         /// <summary>
         ///     DrawGeometry - 
         ///     Draw a Geometry with the provided Brush and/or Pen.
@@ -577,7 +607,10 @@ public override void DrawGeometry(
                                             (byte*)&record,
                                             16 /* sizeof(MILCMD_DRAW_GEOMETRY) */);
             }                           
-}
+
+
+
+        }
 
         /// <summary>
         ///     DrawImage - 
@@ -625,7 +658,10 @@ public override void DrawImage(
                                             (byte*)&record,
                                             40 /* sizeof(MILCMD_DRAW_IMAGE) */);
             }                           
-}
+
+
+
+        }
 
         /// <summary>
         ///     DrawImage - 
@@ -679,7 +715,10 @@ public override void DrawImage(
                                             (byte*)&record,
                                             40 /* sizeof(MILCMD_DRAW_IMAGE_ANIMATE) */);
             }                            
-}
+
+
+
+        }
         /// <summary>
         ///     DrawGlyphRun - 
         ///     Draw a GlyphRun
@@ -723,7 +762,10 @@ public override void DrawGlyphRun(
                                             (byte*)&record,
                                             8 /* sizeof(MILCMD_DRAW_GLYPH_RUN) */);
             }                           
-}
+
+
+
+        }
 
         /// <summary>
         ///     DrawDrawing - 
@@ -763,7 +805,10 @@ public override void DrawDrawing(
                                             (byte*)&record,
                                             8 /* sizeof(MILCMD_DRAW_DRAWING) */);
             }                           
-}
+
+
+
+        }
 
         /// <summary>
         ///     DrawVideo - 
@@ -809,7 +854,10 @@ public override void DrawVideo(
                                             (byte*)&record,
                                             40 /* sizeof(MILCMD_DRAW_VIDEO) */);
             }                           
-}
+
+
+
+        }
 
         /// <summary>
         ///     DrawVideo - 
@@ -861,7 +909,10 @@ public override void DrawVideo(
                                             (byte*)&record,
                                             40 /* sizeof(MILCMD_DRAW_VIDEO_ANIMATE) */);
             }                            
-}
+
+
+
+        }
         /// <summary>
         ///     PushClip - 
         ///     Push a clip region, which will apply to all drawing primitives until the 
@@ -899,7 +950,8 @@ public override void PushClip(
             }                           
 
             _stackDepth++;                            
-}
+
+        }
 
         /// <summary>
         ///     PushOpacityMask - 
@@ -938,7 +990,8 @@ public override void PushOpacityMask(
             }                           
 
             _stackDepth++;                            
-}
+
+        }
 
         /// <summary>
         ///     PushOpacity - 
@@ -979,7 +1032,8 @@ public override void PushOpacity(
             }                           
 
             _stackDepth++;                            
-}
+
+        }
 
         /// <summary>
         ///     PushOpacity - 
@@ -1026,7 +1080,8 @@ public override void PushOpacity(
             }                            
 
             _stackDepth++;
-}
+
+        }
         /// <summary>
         ///     PushTransform - 
         ///     Push a Transform which will apply to all drawing operations until the corresponding 
@@ -1064,7 +1119,8 @@ public override void PushTransform(
             }                           
 
             _stackDepth++;                            
-}
+
+        }
 
         /// <summary>
         ///     PushGuidelineSet - 
@@ -1128,6 +1184,8 @@ public override void PushGuidelineSet(
                 }
                 else
                 {
+
+
                     MILCMD_PUSH_GUIDELINE_SET record =
                         new MILCMD_PUSH_GUIDELINE_SET (
                             _renderData.AddDependentResource(guidelines)
@@ -1181,7 +1239,8 @@ internal override void PushGuidelineY1(
             }                           
 
             _stackDepth++;                            
-}
+
+        }
 
         /// <summary>
         ///     PushGuidelineY2 - 
@@ -1226,7 +1285,8 @@ internal override void PushGuidelineY2(
             }                           
 
             _stackDepth++;                            
-}
+
+        }
 
         /// <summary>
         ///     PushEffect - 
@@ -1319,7 +1379,8 @@ public override void Pop(
             {
                 _renderData.EndTopLevelBitmapEffect();
             }
-}
+
+        }
 
         private UInt32 UseAnimations(
             Double baseValue,
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/RotateTransform.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/RotateTransform.cs
index 14f63615e06..8787bd82cc1 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/RotateTransform.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/RotateTransform.cs
@@ -9,11 +9,24 @@
 // Please see MilCodeGen.html for more information.
 //
 
+using MS.Internal;
+using MS.Internal.KnownBoxes;
+using MS.Internal.Collections;
+using MS.Utility;
+using System.Collections;
+using System.ComponentModel;
+using System.Globalization;
+using System.Text;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Animation;
 using System.Windows.Media.Composition;
-// These types are aliased to match the unamanaged names used in interop
+using System.Windows.Markup;
+using System.Windows.Media.Converters;
 
 namespace System.Windows.Media
 {
+
+
     sealed partial class RotateTransform : Transform
     {
         //------------------------------------------------------
@@ -199,8 +212,11 @@ internal override void UpdateResource(DUCE.Channel channel, bool skipOnChannelCh
         }
         internal override DUCE.ResourceHandle AddRefOnChannelCore(DUCE.Channel channel)
         {
+
                 if (_duceResource.CreateOrAddRefOnChannel(this, channel, System.Windows.Media.Composition.DUCE.ResourceType.TYPE_ROTATETRANSFORM))
                 {
+
+
                     AddRefOnChannelAnimations(channel);
 
 
@@ -208,16 +224,22 @@ internal override DUCE.ResourceHandle AddRefOnChannelCore(DUCE.Channel channel)
                 }
 
                 return _duceResource.GetHandle(channel);
-}
+
+        }
         internal override void ReleaseOnChannelCore(DUCE.Channel channel)
         {
+
                 Debug.Assert(_duceResource.IsOnChannel(channel));
 
                 if (_duceResource.ReleaseOnChannel(channel))
                 {
+
+
                     ReleaseOnChannelAnimations(channel);
-}
-}
+
+                }
+
+        }
         internal override DUCE.ResourceHandle GetHandleCore(DUCE.Channel channel)
         {
             // Note that we are in a lock here already.
@@ -307,8 +329,7 @@ static RotateTransform()
             // We check our static default fields which are of type Freezable
             // to make sure that they are not mutable, otherwise we will throw
             // if these get touched by more than one thread in the lifetime
-            // of your app
-
+            // of your app.
 
 
             // Initializations
@@ -342,6 +363,8 @@ static RotateTransform()
                                    /* coerceValueCallback */ null);
         }
 
+
+
         #endregion Constructors
     }
 }
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/Rotation.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/Rotation.cs
index 2a21a069d40..94a983240c7 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/Rotation.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/Rotation.cs
@@ -9,10 +9,6 @@
 // Please see MilCodeGen.html for more information.
 //
 
-#if PRESENTATION_CORE
-#else
-using SR=System.Windows.SR;
-#endif
 
 namespace System.Windows.Media.Imaging
 {
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/ScaleTransform.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/ScaleTransform.cs
index 555e6eb0a43..1c635b59bc8 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/ScaleTransform.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/ScaleTransform.cs
@@ -9,11 +9,24 @@
 // Please see MilCodeGen.html for more information.
 //
 
+using MS.Internal;
+using MS.Internal.KnownBoxes;
+using MS.Internal.Collections;
+using MS.Utility;
+using System.Collections;
+using System.ComponentModel;
+using System.Globalization;
+using System.Text;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Animation;
 using System.Windows.Media.Composition;
-// These types are aliased to match the unamanaged names used in interop
+using System.Windows.Markup;
+using System.Windows.Media.Converters;
 
 namespace System.Windows.Media
 {
+
+
     sealed partial class ScaleTransform : Transform
     {
         //------------------------------------------------------
@@ -227,8 +240,11 @@ internal override void UpdateResource(DUCE.Channel channel, bool skipOnChannelCh
         }
         internal override DUCE.ResourceHandle AddRefOnChannelCore(DUCE.Channel channel)
         {
+
                 if (_duceResource.CreateOrAddRefOnChannel(this, channel, System.Windows.Media.Composition.DUCE.ResourceType.TYPE_SCALETRANSFORM))
                 {
+
+
                     AddRefOnChannelAnimations(channel);
 
 
@@ -236,16 +252,22 @@ internal override DUCE.ResourceHandle AddRefOnChannelCore(DUCE.Channel channel)
                 }
 
                 return _duceResource.GetHandle(channel);
-}
+
+        }
         internal override void ReleaseOnChannelCore(DUCE.Channel channel)
         {
+
                 Debug.Assert(_duceResource.IsOnChannel(channel));
 
                 if (_duceResource.ReleaseOnChannel(channel))
                 {
+
+
                     ReleaseOnChannelAnimations(channel);
-}
-}
+
+                }
+
+        }
         internal override DUCE.ResourceHandle GetHandleCore(DUCE.Channel channel)
         {
             // Note that we are in a lock here already.
@@ -343,7 +365,6 @@ static ScaleTransform()
             // of your app.
 
 
-
             // Initializations
             Type typeofThis = typeof(ScaleTransform);
             ScaleXProperty =
@@ -384,6 +405,8 @@ static ScaleTransform()
                                    /* coerceValueCallback */ null);
         }
 
+
+
         #endregion Constructors
     }
 }
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/SkewTransform.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/SkewTransform.cs
index 1c92424ebe1..f9a58300fc6 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/SkewTransform.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/SkewTransform.cs
@@ -9,11 +9,24 @@
 // Please see MilCodeGen.html for more information.
 //
 
+using MS.Internal;
+using MS.Internal.KnownBoxes;
+using MS.Internal.Collections;
+using MS.Utility;
+using System.Collections;
+using System.ComponentModel;
+using System.Globalization;
+using System.Text;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Animation;
 using System.Windows.Media.Composition;
-// These types are aliased to match the unamanaged names used in interop
+using System.Windows.Markup;
+using System.Windows.Media.Converters;
 
 namespace System.Windows.Media
 {
+
+
     sealed partial class SkewTransform : Transform
     {
         //------------------------------------------------------
@@ -227,8 +240,11 @@ internal override void UpdateResource(DUCE.Channel channel, bool skipOnChannelCh
         }
         internal override DUCE.ResourceHandle AddRefOnChannelCore(DUCE.Channel channel)
         {
+
                 if (_duceResource.CreateOrAddRefOnChannel(this, channel, System.Windows.Media.Composition.DUCE.ResourceType.TYPE_SKEWTRANSFORM))
                 {
+
+
                     AddRefOnChannelAnimations(channel);
 
 
@@ -236,16 +252,22 @@ internal override DUCE.ResourceHandle AddRefOnChannelCore(DUCE.Channel channel)
                 }
 
                 return _duceResource.GetHandle(channel);
-}
+
+        }
         internal override void ReleaseOnChannelCore(DUCE.Channel channel)
         {
+
                 Debug.Assert(_duceResource.IsOnChannel(channel));
 
                 if (_duceResource.ReleaseOnChannel(channel))
                 {
+
+
                     ReleaseOnChannelAnimations(channel);
-}
-}
+
+                }
+
+        }
         internal override DUCE.ResourceHandle GetHandleCore(DUCE.Channel channel)
         {
             // Note that we are in a lock here already.
@@ -340,8 +362,7 @@ static SkewTransform()
             // We check our static default fields which are of type Freezable
             // to make sure that they are not mutable, otherwise we will throw
             // if these get touched by more than one thread in the lifetime
-            // of your app. 
-
+            // of your app.
 
 
             // Initializations
@@ -384,6 +405,8 @@ static SkewTransform()
                                    /* coerceValueCallback */ null);
         }
 
+
+
         #endregion Constructors
     }
 }
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/SolidColorBrush.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/SolidColorBrush.cs
index 6a87a4d602c..577bf86cdee 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/SolidColorBrush.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/SolidColorBrush.cs
@@ -9,11 +9,24 @@
 // Please see MilCodeGen.html for more information.
 //
 
+using MS.Internal;
+using MS.Internal.KnownBoxes;
+using MS.Internal.Collections;
+using MS.Utility;
+using System.Collections;
+using System.ComponentModel;
+using System.Globalization;
+using System.Text;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Animation;
 using System.Windows.Media.Composition;
-// These types are aliased to match the unamanaged names used in interop
+using System.Windows.Markup;
+using System.Windows.Media.Converters;
 
 namespace System.Windows.Media
 {
+
+
     sealed partial class SolidColorBrush : Brush
     {
         //------------------------------------------------------
@@ -179,6 +192,7 @@ internal override void UpdateResource(DUCE.Channel channel, bool skipOnChannelCh
         }
         internal override DUCE.ResourceHandle AddRefOnChannelCore(DUCE.Channel channel)
         {
+
                 if (_duceResource.CreateOrAddRefOnChannel(this, channel, System.Windows.Media.Composition.DUCE.ResourceType.TYPE_SOLIDCOLORBRUSH))
                 {
                     Transform vTransform = Transform;
@@ -193,9 +207,11 @@ internal override DUCE.ResourceHandle AddRefOnChannelCore(DUCE.Channel channel)
                 }
 
                 return _duceResource.GetHandle(channel);
-}
+
+        }
         internal override void ReleaseOnChannelCore(DUCE.Channel channel)
         {
+
                 Debug.Assert(_duceResource.IsOnChannel(channel));
 
                 if (_duceResource.ReleaseOnChannel(channel))
@@ -206,8 +222,10 @@ internal override void ReleaseOnChannelCore(DUCE.Channel channel)
                     if (vRelativeTransform != null) ((DUCE.IResource)vRelativeTransform).ReleaseOnChannel(channel);
 
                     ReleaseOnChannelAnimations(channel);
-}
-}
+
+                }
+
+        }
         internal override DUCE.ResourceHandle GetHandleCore(DUCE.Channel channel)
         {
             // Note that we are in a lock here already.
@@ -300,8 +318,7 @@ static SolidColorBrush()
             // We check our static default fields which are of type Freezable
             // to make sure that they are not mutable, otherwise we will throw
             // if these get touched by more than one thread in the lifetime
-            // of your app. 
-
+            // of your app.
 
 
             // Initializations
@@ -317,6 +334,8 @@ static SolidColorBrush()
                                    /* coerceValueCallback */ null);
         }
 
+
+
         #endregion Constructors
     }
 }
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/StreamGeometry.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/StreamGeometry.cs
index afc2d791928..7f75d76ec20 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/StreamGeometry.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/StreamGeometry.cs
@@ -9,11 +9,24 @@
 // Please see MilCodeGen.html for more information.
 //
 
+using MS.Internal;
 using MS.Internal.KnownBoxes;
-// These types are aliased to match the unamanaged names used in interop
+using MS.Internal.Collections;
+using MS.Utility;
+using System.Collections;
+using System.ComponentModel;
+using System.Globalization;
+using System.Text;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Composition;
+using System.Windows.Markup;
+using System.Windows.Media.Converters;
 
 namespace System.Windows.Media
 {
+
+
     sealed partial class StreamGeometry : Geometry
     {
         //------------------------------------------------------
@@ -180,8 +193,7 @@ static StreamGeometry()
             // We check our static default fields which are of type Freezable
             // to make sure that they are not mutable, otherwise we will throw
             // if these get touched by more than one thread in the lifetime
-            // of your app. 
-
+            // of your app.
 
 
             // Initializations
@@ -197,6 +209,8 @@ static StreamGeometry()
                                    /* coerceValueCallback */ null);
         }
 
+
+
         #endregion Constructors
     }
 }
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/Stretch.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/Stretch.cs
index 04bd9f23bed..7d560e8607f 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/Stretch.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/Stretch.cs
@@ -9,10 +9,6 @@
 // Please see MilCodeGen.html for more information.
 //
 
-#if PRESENTATION_CORE
-#else
-using SR=System.Windows.SR;
-#endif
 
 namespace System.Windows.Media
 {
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/SweepDirection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/SweepDirection.cs
index 6371dc7249e..0e174e20f6b 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/SweepDirection.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/SweepDirection.cs
@@ -9,10 +9,6 @@
 // Please see MilCodeGen.html for more information.
 //
 
-#if PRESENTATION_CORE
-#else
-using SR=System.Windows.SR;
-#endif
 
 namespace System.Windows.Media
 {
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/TextEffect.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/TextEffect.cs
index 2f8e648666c..3c198210fcd 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/TextEffect.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/TextEffect.cs
@@ -9,11 +9,24 @@
 // Please see MilCodeGen.html for more information.
 //
 
+using MS.Internal;
+using MS.Internal.KnownBoxes;
+using MS.Internal.Collections;
+using MS.Utility;
+using System.Collections;
+using System.ComponentModel;
+using System.Globalization;
+using System.Text;
+using System.Windows.Media.Effects;
 using System.Windows.Media.Animation;
-// These types are aliased to match the unamanaged names used in interop
+using System.Windows.Media.Composition;
+using System.Windows.Markup;
+using System.Windows.Media.Converters;
 
 namespace System.Windows.Media
 {
+
+
     sealed partial class TextEffect : Animatable
     {
         //------------------------------------------------------
@@ -55,6 +68,7 @@ sealed partial class TextEffect : Animatable
 
         private static bool ValidatePositionStartValue(object value)
         {
+
             // This resource needs to be notified on new values being set.
             if (!OnPositionStartChanging((int) value))
             {
@@ -64,6 +78,7 @@ private static bool ValidatePositionStartValue(object value)
         }
         private static bool ValidatePositionCountValue(object value)
         {
+
             // This resource needs to be notified on new values being set.
             if (!OnPositionCountChanging((int) value))
             {
@@ -273,8 +288,7 @@ static TextEffect()
             // We check our static default fields which are of type Freezable
             // to make sure that they are not mutable, otherwise we will throw
             // if these get touched by more than one thread in the lifetime
-            // of your app. 
-
+            // of your app.
 
 
             // Initializations
@@ -326,6 +340,8 @@ static TextEffect()
                                    /* coerceValueCallback */ null);
         }
 
+
+
         #endregion Constructors
     }
 }
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/TextEffectCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/TextEffectCollection.cs
index 9fc5feaa023..1ff30664f0f 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/TextEffectCollection.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/TextEffectCollection.cs
@@ -1,21 +1,34 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+//
+//
 // This file was generated, please do not edit it directly.
+//
 // Please see MilCodeGen.html for more information.
+//
 
+using MS.Internal;
+using MS.Internal.KnownBoxes;
+using MS.Internal.Collections;
 using MS.Utility;
 using System.Collections;
+using System.ComponentModel;
+using System.Globalization;
+using System.Text;
+using System.Windows.Media.Effects;
 using System.Windows.Media.Animation;
-
-// These types are aliased to match the unamanaged names used in interop
+using System.Windows.Media.Composition;
+using System.Windows.Markup;
+using System.Windows.Media.Converters;
 
 namespace System.Windows.Media
 {
     /// <summary>
     /// A collection of TextEffect objects.
     /// </summary>
+
     public sealed partial class TextEffectCollection : Animatable, IList, IList<TextEffect>
     {
         //------------------------------------------------------
@@ -228,11 +241,14 @@ public TextEffect this[int index]
 
                 if (!Object.ReferenceEquals(_collection[ index ], value))
                 {
+
                     TextEffect oldValue = _collection[ index ];
                     OnFreezablePropertyChanged(oldValue, value);
 
                     _collection[ index ] = value;
-}
+
+
+                }
 
 
                 ++_version;
@@ -577,8 +593,10 @@ protected override void CloneCore(Freezable source)
                 TextEffect newValue = (TextEffect) sourceTextEffectCollection._collection[i].Clone();
                 OnFreezablePropertyChanged(/* oldValue = */ null, newValue);
                 _collection.Add(newValue);
-}
-}
+
+            }
+
+        }
         /// <summary>
         /// Implementation of Freezable.CloneCurrentValueCore()
         /// </summary>
@@ -597,8 +615,10 @@ protected override void CloneCurrentValueCore(Freezable source)
                 TextEffect newValue = (TextEffect) sourceTextEffectCollection._collection[i].CloneCurrentValue();
                 OnFreezablePropertyChanged(/* oldValue = */ null, newValue);
                 _collection.Add(newValue);
-}
-}
+
+            }
+
+        }
         /// <summary>
         /// Implementation of Freezable.GetAsFrozenCore()
         /// </summary>
@@ -617,8 +637,10 @@ protected override void GetAsFrozenCore(Freezable source)
                 TextEffect newValue = (TextEffect) sourceTextEffectCollection._collection[i].GetAsFrozen();
                 OnFreezablePropertyChanged(/* oldValue = */ null, newValue);
                 _collection.Add(newValue);
-}
-}
+
+            }
+
+        }
         /// <summary>
         /// Implementation of Freezable.GetCurrentValueAsFrozenCore()
         /// </summary>
@@ -637,8 +659,10 @@ protected override void GetCurrentValueAsFrozenCore(Freezable source)
                 TextEffect newValue = (TextEffect) sourceTextEffectCollection._collection[i].GetCurrentValueAsFrozen();
                 OnFreezablePropertyChanged(/* oldValue = */ null, newValue);
                 _collection.Add(newValue);
-}
-}
+
+            }
+
+        }
         /// <summary>
         /// Implementation of <see cref="System.Windows.Freezable.FreezeCore">Freezable.FreezeCore</see>.
         /// </summary>
@@ -742,6 +766,7 @@ internal Enumerator(TextEffectCollection list)
 
             void IDisposable.Dispose()
             {
+
             }
 
             /// <summary>
@@ -880,61 +905,58 @@ public TextEffectCollection(IEnumerable<TextEffect> collection)
 
             WritePreamble();
 
-            if (collection != null)
-            {
-                bool needsItemValidation = true;
-                ICollection<TextEffect> icollectionOfT = collection as ICollection<TextEffect>;
+            ArgumentNullException.ThrowIfNull(collection);
 
-                if (icollectionOfT != null)
-                {
-                    _collection = new FrugalStructList<TextEffect>(icollectionOfT);
-                }
-                else
-                {       
-                    ICollection icollection = collection as ICollection;
-
-                    if (icollection != null) // an IC but not and IC<T>
-                    {
-                        _collection = new FrugalStructList<TextEffect>(icollection);
-                    }
-                    else // not a IC or IC<T> so fall back to the slower Add
-                    {
-                        _collection = new FrugalStructList<TextEffect>();
+            bool needsItemValidation = true;
+            ICollection<TextEffect> icollectionOfT = collection as ICollection<TextEffect>;
 
-                        foreach (TextEffect item in collection)
-                        {
-                            if (item == null)
-                            {
-                                throw new System.ArgumentException(SR.Collection_NoNull);
-                            }
-                            TextEffect newValue = item;
-                            OnFreezablePropertyChanged(/* oldValue = */ null, newValue);
-                            _collection.Add(newValue);
-}
+            if (icollectionOfT != null)
+            {
+                _collection = new FrugalStructList<TextEffect>(icollectionOfT);
+            }
+            else
+            {
+                ICollection icollection = collection as ICollection;
 
-                        needsItemValidation = false;
-                    }
+                if (icollection != null) // an IC but not and IC<T>
+                {
+                    _collection = new FrugalStructList<TextEffect>(icollection);
                 }
-
-                if (needsItemValidation)
+                else // not a IC or IC<T> so fall back to the slower Add
                 {
+                    _collection = new FrugalStructList<TextEffect>();
+
                     foreach (TextEffect item in collection)
                     {
                         if (item == null)
                         {
                             throw new System.ArgumentException(SR.Collection_NoNull);
                         }
-                        OnFreezablePropertyChanged(/* oldValue = */ null, item);
-}
-                }
+                        TextEffect newValue = item;
+                        OnFreezablePropertyChanged(/* oldValue = */ null, newValue);
+                        _collection.Add(newValue);
 
+                    }
 
-                WritePostscript();
+                    needsItemValidation = false;
+                }
             }
-            else
+
+            if (needsItemValidation)
             {
-                throw new ArgumentNullException(nameof(collection));
+                foreach (TextEffect item in collection)
+                {
+                    if (item == null)
+                    {
+                        throw new System.ArgumentException(SR.Collection_NoNull);
+                    }
+                    OnFreezablePropertyChanged(/* oldValue = */ null, item);
+
+                }
             }
+
+
+            WritePostscript();
         }
 
         #endregion Constructors
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/TextHintingMode.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/TextHintingMode.cs
index f8c353742cf..ebea8a96757 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/TextHintingMode.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/TextHintingMode.cs
@@ -9,10 +9,6 @@
 // Please see MilCodeGen.html for more information.
 //
 
-#if PRESENTATION_CORE
-#else
-using SR=System.Windows.SR;
-#endif
 
 namespace System.Windows.Media
 {
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/TextRenderingMode.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/TextRenderingMode.cs
index 05ea684665b..b242f9fd633 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/TextRenderingMode.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/TextRenderingMode.cs
@@ -9,10 +9,6 @@
 // Please see MilCodeGen.html for more information.
 //
 
-#if PRESENTATION_CORE
-#else
-using SR=System.Windows.SR;
-#endif
 
 namespace System.Windows.Media
 {
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/TileBrush.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/TileBrush.cs
index 506203a1dae..5edc843b9cd 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/TileBrush.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/TileBrush.cs
@@ -9,9 +9,24 @@
 // Please see MilCodeGen.html for more information.
 //
 
-// These types are aliased to match the unamanaged names used in interop
+using MS.Internal;
+using MS.Internal.KnownBoxes;
+using MS.Internal.Collections;
+using MS.Utility;
+using System.Collections;
+using System.ComponentModel;
+using System.Globalization;
+using System.Text;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Composition;
+using System.Windows.Markup;
+using System.Windows.Media.Converters;
+
 namespace System.Windows.Media
 {
+
+
     abstract partial class TileBrush : Brush
     {
         //------------------------------------------------------
@@ -384,8 +399,7 @@ static TileBrush()
             // We check our static default fields which are of type Freezable
             // to make sure that they are not mutable, otherwise we will throw
             // if these get touched by more than one thread in the lifetime
-            // of your app. 
-
+            // of your app.
             RenderOptions.CachingHintProperty.OverrideMetadata(
                 typeof(TileBrush),
                 new UIPropertyMetadata(CachingHint.Unspecified,
@@ -477,6 +491,8 @@ static TileBrush()
                                    /* coerceValueCallback */ null);
         }
 
+
+
         #endregion Constructors
     }
 }
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/TileMode.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/TileMode.cs
index 9998a15129d..4c7a8dd609a 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/TileMode.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/TileMode.cs
@@ -9,10 +9,6 @@
 // Please see MilCodeGen.html for more information.
 //
 
-#if PRESENTATION_CORE
-#else
-using SR=System.Windows.SR;
-#endif
 
 namespace System.Windows.Media
 {
@@ -29,8 +25,8 @@ public enum TileMode
 
         /// <summary>
         ///     Tile - The basic tile mode  the base tile is drawn and the remaining area is filled 
-        ///     by repeating the base tile such that the right edge of one tile is adjacent to the left edge 
-        ///     of the next, and similarly for bottom and top
+        ///     by repeating the base tile such that the right edge of one tile is adjacent to the 
+        ///     left edge of the next, and similarly for bottom and top
         /// </summary>
         Tile = 4,
 
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/ToleranceType.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/ToleranceType.cs
index f7090c5d55a..6aec07b8c4d 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/ToleranceType.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/ToleranceType.cs
@@ -9,10 +9,6 @@
 // Please see MilCodeGen.html for more information.
 //
 
-#if PRESENTATION_CORE
-#else
-using SR=System.Windows.SR;
-#endif
 
 namespace System.Windows.Media
 {
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/Transform.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/Transform.cs
index 19bec01e268..d9182f546d7 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/Transform.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/Transform.cs
@@ -9,14 +9,23 @@
 // Please see MilCodeGen.html for more information.
 //
 
+using MS.Internal;
+using MS.Internal.KnownBoxes;
+using MS.Internal.Collections;
+using MS.Utility;
+using System.Collections;
 using System.ComponentModel;
+using System.Globalization;
+using System.Text;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Animation;
 using System.Windows.Media.Composition;
 using System.Windows.Markup;
 using System.Windows.Media.Converters;
-// These types are aliased to match the unamanaged names used in interop
 
 namespace System.Windows.Media
 {
+
     [TypeConverter(typeof(TransformConverter))]
     [ValueSerializer(typeof(TransformValueSerializer))] // Used by MarkupWriter
     abstract partial class Transform : GeneralTransform, DUCE.IResource
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/TransformCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/TransformCollection.cs
index 615f1af218a..95bbd3ebc57 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/TransformCollection.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/TransformCollection.cs
@@ -2,21 +2,33 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+//
+//
 // This file was generated, please do not edit it directly.
+//
 // Please see MilCodeGen.html for more information.
+//
 
+using MS.Internal;
+using MS.Internal.KnownBoxes;
 using MS.Internal.Collections;
 using MS.Utility;
 using System.Collections;
+using System.ComponentModel;
+using System.Globalization;
+using System.Text;
+using System.Windows.Media.Effects;
 using System.Windows.Media.Animation;
-
-// These types are aliased to match the unamanaged names used in interop
+using System.Windows.Media.Composition;
+using System.Windows.Markup;
+using System.Windows.Media.Converters;
 
 namespace System.Windows.Media
 {
     /// <summary>
     /// A collection of Transform objects.
     /// </summary>
+
     public sealed partial class TransformCollection : Animatable, IList, IList<Transform>
     {
         //------------------------------------------------------
@@ -241,6 +253,7 @@ public Transform this[int index]
 
                 if (!Object.ReferenceEquals(_collection[ index ], value))
                 {
+
                     Transform oldValue = _collection[ index ];
                     OnFreezablePropertyChanged(oldValue, value);
 
@@ -617,7 +630,8 @@ protected override void CloneCore(Freezable source)
                 _collection.Add(newValue);
                 OnInsert(newValue);
             }
-}
+
+        }
         /// <summary>
         /// Implementation of Freezable.CloneCurrentValueCore()
         /// </summary>
@@ -638,7 +652,8 @@ protected override void CloneCurrentValueCore(Freezable source)
                 _collection.Add(newValue);
                 OnInsert(newValue);
             }
-}
+
+        }
         /// <summary>
         /// Implementation of Freezable.GetAsFrozenCore()
         /// </summary>
@@ -659,7 +674,8 @@ protected override void GetAsFrozenCore(Freezable source)
                 _collection.Add(newValue);
                 OnInsert(newValue);
             }
-}
+
+        }
         /// <summary>
         /// Implementation of Freezable.GetCurrentValueAsFrozenCore()
         /// </summary>
@@ -680,7 +696,8 @@ protected override void GetCurrentValueAsFrozenCore(Freezable source)
                 _collection.Add(newValue);
                 OnInsert(newValue);
             }
-}
+
+        }
         /// <summary>
         /// Implementation of <see cref="System.Windows.Freezable.FreezeCore">Freezable.FreezeCore</see>.
         /// </summary>
@@ -784,6 +801,7 @@ internal Enumerator(TransformCollection list)
 
             void IDisposable.Dispose()
             {
+
             }
 
             /// <summary>
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/TransformConverter.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/TransformConverter.cs
index 121291c8791..73fbbffd43b 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/TransformConverter.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/TransformConverter.cs
@@ -1,12 +1,27 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+//
+//
 // This file was generated, please do not edit it directly.
+//
 // Please see MilCodeGen.html for more information.
+//
 
+using MS.Internal;
+using MS.Internal.KnownBoxes;
+using MS.Internal.Collections;
+using MS.Utility;
+using System.Collections;
 using System.ComponentModel;
 using System.Globalization;
+using System.Text;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Composition;
+using System.Windows.Markup;
+using System.Windows.Media.Converters;
 
 namespace System.Windows.Media
 {
@@ -84,9 +99,8 @@ public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo c
                 throw GetConvertFromException(value);
             }
 
-            String source = value as string;
 
-            if (source != null)
+            if (value is string source)
             {
                 return Transform.Parse(source);
             }
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/TransformGroup.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/TransformGroup.cs
index 514f36da494..045a7fdd108 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/TransformGroup.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/TransformGroup.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -10,11 +10,23 @@
 //
 
 using MS.Internal;
+using MS.Internal.KnownBoxes;
+using MS.Internal.Collections;
+using MS.Utility;
+using System.Collections;
+using System.ComponentModel;
+using System.Globalization;
+using System.Text;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Animation;
 using System.Windows.Media.Composition;
-// These types are aliased to match the unamanaged names used in interop
+using System.Windows.Markup;
+using System.Windows.Media.Converters;
 
 namespace System.Windows.Media
 {
+
+
     sealed partial class TransformGroup : Transform
     {
         //------------------------------------------------------
@@ -56,6 +68,10 @@ sealed partial class TransformGroup : Transform
 
         private static void ChildrenPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
+
+
+
+
             // The first change to the default value of a mutable collection property (e.g. GeometryGroup.Children) 
             // will promote the property value from a default value to a local value. This is technically a sub-property 
             // change because the collection was changed and not a new collection set (GeometryGroup.Children.
@@ -237,8 +253,11 @@ internal override void UpdateResource(DUCE.Channel channel, bool skipOnChannelCh
         }
         internal override DUCE.ResourceHandle AddRefOnChannelCore(DUCE.Channel channel)
         {
+
                 if (_duceResource.CreateOrAddRefOnChannel(this, channel, System.Windows.Media.Composition.DUCE.ResourceType.TYPE_TRANSFORMGROUP))
                 {
+
+
                     TransformCollection vChildren = Children;
 
                     if (vChildren != null)
@@ -256,13 +275,17 @@ internal override DUCE.ResourceHandle AddRefOnChannelCore(DUCE.Channel channel)
                 }
 
                 return _duceResource.GetHandle(channel);
-}
+
+        }
         internal override void ReleaseOnChannelCore(DUCE.Channel channel)
         {
+
                 Debug.Assert(_duceResource.IsOnChannel(channel));
 
                 if (_duceResource.ReleaseOnChannel(channel))
                 {
+
+
                     TransformCollection vChildren = Children;
 
                     if (vChildren != null)
@@ -274,8 +297,10 @@ internal override void ReleaseOnChannelCore(DUCE.Channel channel)
                         }
                     }
                     ReleaseOnChannelAnimations(channel);
-}
-}
+
+                }
+
+        }
         internal override DUCE.ResourceHandle GetHandleCore(DUCE.Channel channel)
         {
             // Note that we are in a lock here already.
@@ -418,7 +443,6 @@ static TransformGroup()
             // to make sure that they are not mutable, otherwise we will throw
             // if these get touched by more than one thread in the lifetime
             // of your app.
-
             Debug.Assert(s_Children == null || s_Children.IsFrozen,
                 "Detected context bound default value TransformGroup.s_Children (See OS Bug #947272).");
 
@@ -436,6 +460,8 @@ static TransformGroup()
                                    /* coerceValueCallback */ null);
         }
 
+
+
         #endregion Constructors
     }
 }
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/TranslateTransform.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/TranslateTransform.cs
index 158b486f4f7..5b08816d6c4 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/TranslateTransform.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/TranslateTransform.cs
@@ -9,11 +9,24 @@
 // Please see MilCodeGen.html for more information.
 //
 
+using MS.Internal;
+using MS.Internal.KnownBoxes;
+using MS.Internal.Collections;
+using MS.Utility;
+using System.Collections;
+using System.ComponentModel;
+using System.Globalization;
+using System.Text;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Animation;
 using System.Windows.Media.Composition;
-// These types are aliased to match the unamanaged names used in interop
+using System.Windows.Markup;
+using System.Windows.Media.Converters;
 
 namespace System.Windows.Media
 {
+
+
     sealed partial class TranslateTransform : Transform
     {
         //------------------------------------------------------
@@ -171,8 +184,11 @@ internal override void UpdateResource(DUCE.Channel channel, bool skipOnChannelCh
         }
         internal override DUCE.ResourceHandle AddRefOnChannelCore(DUCE.Channel channel)
         {
+
                 if (_duceResource.CreateOrAddRefOnChannel(this, channel, System.Windows.Media.Composition.DUCE.ResourceType.TYPE_TRANSLATETRANSFORM))
                 {
+
+
                     AddRefOnChannelAnimations(channel);
 
 
@@ -180,16 +196,22 @@ internal override DUCE.ResourceHandle AddRefOnChannelCore(DUCE.Channel channel)
                 }
 
                 return _duceResource.GetHandle(channel);
-}
+
+        }
         internal override void ReleaseOnChannelCore(DUCE.Channel channel)
         {
+
                 Debug.Assert(_duceResource.IsOnChannel(channel));
 
                 if (_duceResource.ReleaseOnChannel(channel))
                 {
+
+
                     ReleaseOnChannelAnimations(channel);
-}
-}
+
+                }
+
+        }
         internal override DUCE.ResourceHandle GetHandleCore(DUCE.Channel channel)
         {
             // Note that we are in a lock here already.
@@ -274,8 +296,7 @@ static TranslateTransform()
             // We check our static default fields which are of type Freezable
             // to make sure that they are not mutable, otherwise we will throw
             // if these get touched by more than one thread in the lifetime
-            // of your app
-
+            // of your app.
 
 
             // Initializations
@@ -300,6 +321,8 @@ static TranslateTransform()
                                    /* coerceValueCallback */ null);
         }
 
+
+
         #endregion Constructors
     }
 }
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/VectorCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/VectorCollection.cs
index 58d183f8cd6..17ed80e1896 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/VectorCollection.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/VectorCollection.cs
@@ -2,19 +2,27 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+//
+//
 // This file was generated, please do not edit it directly.
+//
 // Please see MilCodeGen.html for more information.
+//
 
 using MS.Internal;
+using MS.Internal.KnownBoxes;
+using MS.Internal.Collections;
 using MS.Utility;
 using System.Collections;
 using System.ComponentModel;
+using System.Globalization;
 using System.Text;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Composition;
 using System.Windows.Markup;
 using System.Windows.Media.Converters;
 
-// These types are aliased to match the unamanaged names used in interop
-
 namespace System.Windows.Media
 {
     /// <summary>
@@ -110,6 +118,8 @@ public int IndexOf(Vector value)
         /// </summary>
         public void Insert(int index, Vector value)
         {
+
+
             WritePreamble();
             _collection.Insert(index, value);
 
@@ -187,6 +197,8 @@ public Vector this[int index]
             }
             set
             {
+
+
                 WritePreamble();
                 _collection[ index ] = value;
 
@@ -523,7 +535,8 @@ protected override void CloneCore(Freezable source)
             {
                 _collection.Add(sourceVectorCollection._collection[i]);
             }
-}
+
+        }
         /// <summary>
         /// Implementation of Freezable.CloneCurrentValueCore()
         /// </summary>
@@ -541,7 +554,8 @@ protected override void CloneCurrentValueCore(Freezable source)
             {
                 _collection.Add(sourceVectorCollection._collection[i]);
             }
-}
+
+        }
         /// <summary>
         /// Implementation of Freezable.GetAsFrozenCore()
         /// </summary>
@@ -559,7 +573,8 @@ protected override void GetAsFrozenCore(Freezable source)
             {
                 _collection.Add(sourceVectorCollection._collection[i]);
             }
-}
+
+        }
         /// <summary>
         /// Implementation of Freezable.GetCurrentValueAsFrozenCore()
         /// </summary>
@@ -577,7 +592,8 @@ protected override void GetCurrentValueAsFrozenCore(Freezable source)
             {
                 _collection.Add(sourceVectorCollection._collection[i]);
             }
-}
+
+        }
 
 
         #endregion ProtectedMethods
@@ -770,6 +786,7 @@ internal Enumerator(VectorCollection list)
 
             void IDisposable.Dispose()
             {
+
             }
 
             /// <summary>
@@ -910,6 +927,7 @@ public VectorCollection(IEnumerable<Vector> collection)
 
             ArgumentNullException.ThrowIfNull(collection);
 
+
             ICollection<Vector> icollectionOfT = collection as ICollection<Vector>;
 
             if (icollectionOfT != null)
@@ -930,8 +948,11 @@ public VectorCollection(IEnumerable<Vector> collection)
 
                     foreach (Vector item in collection)
                     {
+
                         _collection.Add(item);
                     }
+
+
                 }
             }
 
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/VectorCollectionConverter.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/VectorCollectionConverter.cs
index c1a937e2486..cadc966934c 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/VectorCollectionConverter.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/VectorCollectionConverter.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -9,8 +9,19 @@
 // Please see MilCodeGen.html for more information.
 //
 
+using MS.Internal;
+using MS.Internal.KnownBoxes;
+using MS.Internal.Collections;
+using MS.Utility;
+using System.Collections;
 using System.ComponentModel;
 using System.Globalization;
+using System.Text;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Composition;
+using System.Windows.Markup;
+using System.Windows.Media.Converters;
 
 namespace System.Windows.Media
 {
@@ -75,9 +86,8 @@ public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo c
                 throw GetConvertFromException(value);
             }
 
-            String source = value as string;
 
-            if (source != null)
+            if (value is string source)
             {
                 return VectorCollection.Parse(source);
             }
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/VideoDrawing.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/VideoDrawing.cs
index 9d359fe3579..1c542dc51d3 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/VideoDrawing.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/VideoDrawing.cs
@@ -9,11 +9,24 @@
 // Please see MilCodeGen.html for more information.
 //
 
+using MS.Internal;
+using MS.Internal.KnownBoxes;
+using MS.Internal.Collections;
+using MS.Utility;
+using System.Collections;
+using System.ComponentModel;
+using System.Globalization;
+using System.Text;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Animation;
 using System.Windows.Media.Composition;
-// These types are aliased to match the unamanaged names used in interop
+using System.Windows.Markup;
+using System.Windows.Media.Converters;
 
 namespace System.Windows.Media
 {
+
+
     sealed partial class VideoDrawing : Drawing
     {
         //------------------------------------------------------
@@ -194,6 +207,7 @@ internal override void UpdateResource(DUCE.Channel channel, bool skipOnChannelCh
         }
         internal override DUCE.ResourceHandle AddRefOnChannelCore(DUCE.Channel channel)
         {
+
                 if (_duceResource.CreateOrAddRefOnChannel(this, channel, System.Windows.Media.Composition.DUCE.ResourceType.TYPE_VIDEODRAWING))
                 {
                     MediaPlayer vPlayer = Player;
@@ -206,9 +220,11 @@ internal override DUCE.ResourceHandle AddRefOnChannelCore(DUCE.Channel channel)
                 }
 
                 return _duceResource.GetHandle(channel);
-}
+
+        }
         internal override void ReleaseOnChannelCore(DUCE.Channel channel)
         {
+
                 Debug.Assert(_duceResource.IsOnChannel(channel));
 
                 if (_duceResource.ReleaseOnChannel(channel))
@@ -217,8 +233,10 @@ internal override void ReleaseOnChannelCore(DUCE.Channel channel)
                     if (vPlayer != null) ((DUCE.IResource)vPlayer).ReleaseOnChannel(channel);
 
                     ReleaseOnChannelAnimations(channel);
-}
-}
+
+                }
+
+        }
         internal override DUCE.ResourceHandle GetHandleCore(DUCE.Channel channel)
         {
             // Note that we are in a lock here already.
@@ -302,8 +320,7 @@ static VideoDrawing()
             // We check our static default fields which are of type Freezable
             // to make sure that they are not mutable, otherwise we will throw
             // if these get touched by more than one thread in the lifetime
-            // of your app.  
-
+            // of your app.
 
 
             // Initializations
@@ -328,6 +345,8 @@ static VideoDrawing()
                                    /* coerceValueCallback */ null);
         }
 
+
+
         #endregion Constructors
     }
 }
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/VisualBrush.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/VisualBrush.cs
index 911ce978d5a..61b03c43bd3 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/VisualBrush.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/VisualBrush.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -9,12 +9,24 @@
 // Please see MilCodeGen.html for more information.
 //
 
+using MS.Internal;
 using MS.Internal.KnownBoxes;
+using MS.Internal.Collections;
+using MS.Utility;
+using System.Collections;
+using System.ComponentModel;
+using System.Globalization;
+using System.Text;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Animation;
 using System.Windows.Media.Composition;
-// These types are aliased to match the unamanaged names used in interop
+using System.Windows.Markup;
+using System.Windows.Media.Converters;
 
 namespace System.Windows.Media
 {
+
+
     sealed partial class VisualBrush : TileBrush
     {
         //------------------------------------------------------
@@ -271,6 +283,7 @@ internal override void UpdateResource(DUCE.Channel channel, bool skipOnChannelCh
         }
         internal override DUCE.ResourceHandle AddRefOnChannelCore(DUCE.Channel channel)
         {
+
                 if (_duceResource.CreateOrAddRefOnChannel(this, channel, System.Windows.Media.Composition.DUCE.ResourceType.TYPE_VISUALBRUSH))
                 {
                     Transform vTransform = Transform;
@@ -286,9 +299,11 @@ internal override DUCE.ResourceHandle AddRefOnChannelCore(DUCE.Channel channel)
                 }
 
                 return _duceResource.GetHandle(channel);
-}
+
+        }
         internal override void ReleaseOnChannelCore(DUCE.Channel channel)
         {
+
                 Debug.Assert(_duceResource.IsOnChannel(channel));
 
                 if (_duceResource.ReleaseOnChannel(channel))
@@ -300,8 +315,10 @@ internal override void ReleaseOnChannelCore(DUCE.Channel channel)
                     Visual vVisual = Visual;
                     vVisual?.ReleaseOnChannelForCyclicBrush(this, channel);
                     ReleaseOnChannelAnimations(channel);
-}
-}
+
+                }
+
+        }
         internal override DUCE.ResourceHandle GetHandleCore(DUCE.Channel channel)
         {
             // Note that we are in a lock here already.
@@ -401,7 +418,6 @@ static VisualBrush()
             // of your app.
 
 
-
             // Initializations
             Type typeofThis = typeof(VisualBrush);
             VisualProperty =
@@ -424,6 +440,8 @@ static VisualBrush()
                                    /* coerceValueCallback */ null);
         }
 
+
+
         #endregion Constructors
     }
 }
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/Generated/BitmapImage.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/Generated/BitmapImage.cs
index 1eaebf2270a..9e4844a1cea 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/Generated/BitmapImage.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/Generated/BitmapImage.cs
@@ -12,10 +12,11 @@
 using System.IO;
 using System.ComponentModel;
 using System.Net.Cache;
-// These types are aliased to match the unamanaged names used in interop
 
 namespace System.Windows.Media.Imaging
 {
+
+
     sealed partial class BitmapImage : BitmapSource
     {
         //------------------------------------------------------
@@ -485,8 +486,7 @@ static BitmapImage()
             // We check our static default fields which are of type Freezable
             // to make sure that they are not mutable, otherwise we will throw
             // if these get touched by more than one thread in the lifetime
-            // of your app. 
-
+            // of your app.
 
 
             // Initializations
@@ -574,6 +574,8 @@ static BitmapImage()
                                    /* coerceValueCallback */ new CoerceValueCallback(CoerceCacheOption));
         }
 
+
+
         #endregion Constructors
     }
 }
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/Generated/ColorConvertedBitmap.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/Generated/ColorConvertedBitmap.cs
index 337e9ac4442..fec7920c729 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/Generated/ColorConvertedBitmap.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/Generated/ColorConvertedBitmap.cs
@@ -9,10 +9,14 @@
 // Please see MilCodeGen.html for more information.
 //
 
-// These types are aliased to match the unamanaged names used in interop
+using System.IO;
+using System.ComponentModel;
+using System.Net.Cache;
 
 namespace System.Windows.Media.Imaging
 {
+
+
     sealed partial class ColorConvertedBitmap : BitmapSource
     {
         //------------------------------------------------------
@@ -54,6 +58,7 @@ sealed partial class ColorConvertedBitmap : BitmapSource
 
         private static void SourcePropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
+
             ColorConvertedBitmap target = ((ColorConvertedBitmap) d);
 
 
@@ -353,7 +358,7 @@ static ColorConvertedBitmap()
             // We check our static default fields which are of type Freezable
             // to make sure that they are not mutable, otherwise we will throw
             // if these get touched by more than one thread in the lifetime
-            // of your app. 
+            // of your app.
             Debug.Assert(s_Source == null || s_Source.IsFrozen,
                 "Detected context bound default value ColorConvertedBitmap.s_Source (See OS Bug #947272).");
 
@@ -398,6 +403,8 @@ static ColorConvertedBitmap()
                                    /* coerceValueCallback */ new CoerceValueCallback(CoerceDestinationFormat));
         }
 
+
+
         #endregion Constructors
     }
 }
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/Generated/CroppedBitmap.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/Generated/CroppedBitmap.cs
index 8966a32a253..8ebb429f97a 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/Generated/CroppedBitmap.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/Generated/CroppedBitmap.cs
@@ -9,10 +9,14 @@
 // Please see MilCodeGen.html for more information.
 //
 
-// These types are aliased to match the unamanaged names used in interop
+using System.IO;
+using System.ComponentModel;
+using System.Net.Cache;
 
 namespace System.Windows.Media.Imaging
 {
+
+
     sealed partial class CroppedBitmap : BitmapSource
     {
         //------------------------------------------------------
@@ -54,6 +58,7 @@ sealed partial class CroppedBitmap : BitmapSource
 
         private static void SourcePropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
+
             CroppedBitmap target = ((CroppedBitmap) d);
 
 
@@ -295,8 +300,7 @@ static CroppedBitmap()
             // We check our static default fields which are of type Freezable
             // to make sure that they are not mutable, otherwise we will throw
             // if these get touched by more than one thread in the lifetime
-            // of your app. 
-
+            // of your app.
             Debug.Assert(s_Source == null || s_Source.IsFrozen,
                 "Detected context bound default value CroppedBitmap.s_Source (See OS Bug #947272).");
 
@@ -323,6 +327,8 @@ static CroppedBitmap()
                                    /* coerceValueCallback */ new CoerceValueCallback(CoerceSourceRect));
         }
 
+
+
         #endregion Constructors
     }
 }
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/Generated/FormatConvertedBitmap.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/Generated/FormatConvertedBitmap.cs
index 4c5a97dd56c..a2219b27ef6 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/Generated/FormatConvertedBitmap.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/Generated/FormatConvertedBitmap.cs
@@ -9,10 +9,14 @@
 // Please see MilCodeGen.html for more information.
 //
 
-// These types are aliased to match the unamanaged names used in interop
+using System.IO;
+using System.ComponentModel;
+using System.Net.Cache;
 
 namespace System.Windows.Media.Imaging
 {
+
+
     sealed partial class FormatConvertedBitmap : BitmapSource
     {
         //------------------------------------------------------
@@ -54,6 +58,7 @@ sealed partial class FormatConvertedBitmap : BitmapSource
 
         private static void SourcePropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
+
             FormatConvertedBitmap target = ((FormatConvertedBitmap) d);
 
 
@@ -353,8 +358,7 @@ static FormatConvertedBitmap()
             // We check our static default fields which are of type Freezable
             // to make sure that they are not mutable, otherwise we will throw
             // if these get touched by more than one thread in the lifetime
-            // of your app. 
-
+            // of your app.
             Debug.Assert(s_Source == null || s_Source.IsFrozen,
                 "Detected context bound default value FormatConvertedBitmap.s_Source (See OS Bug #947272).");
 
@@ -399,6 +403,8 @@ static FormatConvertedBitmap()
                                    /* coerceValueCallback */ new CoerceValueCallback(CoerceAlphaThreshold));
         }
 
+
+
         #endregion Constructors
     }
 }
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/Generated/TransformedBitmap.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/Generated/TransformedBitmap.cs
index bd9b331725b..fc53ce21141 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/Generated/TransformedBitmap.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/Generated/TransformedBitmap.cs
@@ -9,10 +9,14 @@
 // Please see MilCodeGen.html for more information.
 //
 
-// These types are aliased to match the unamanaged names used in interop
+using System.IO;
+using System.ComponentModel;
+using System.Net.Cache;
 
 namespace System.Windows.Media.Imaging
 {
+
+
     sealed partial class TransformedBitmap : BitmapSource
     {
         //------------------------------------------------------
@@ -54,6 +58,7 @@ sealed partial class TransformedBitmap : BitmapSource
 
         private static void SourcePropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
+
             TransformedBitmap target = ((TransformedBitmap) d);
 
 
@@ -81,6 +86,7 @@ private static void SourcePropertyChanged(DependencyObject d, DependencyProperty
         }
         private static void TransformPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
+
             TransformedBitmap target = ((TransformedBitmap) d);
 
 
@@ -313,8 +319,7 @@ static TransformedBitmap()
             // We check our static default fields which are of type Freezable
             // to make sure that they are not mutable, otherwise we will throw
             // if these get touched by more than one thread in the lifetime
-            // of your app. 
-
+            // of your app.
             Debug.Assert(s_Source == null || s_Source.IsFrozen,
                 "Detected context bound default value TransformedBitmap.s_Source (See OS Bug #947272).");
 
@@ -345,6 +350,8 @@ static TransformedBitmap()
                                    /* coerceValueCallback */ new CoerceValueCallback(CoerceTransform));
         }
 
+
+
         #endregion Constructors
     }
 }
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Converters/Generated/Matrix3DValueSerializer.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Converters/Generated/Matrix3DValueSerializer.cs
index 59e16bb2440..94490424a87 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Converters/Generated/Matrix3DValueSerializer.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Converters/Generated/Matrix3DValueSerializer.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -9,7 +9,17 @@
 // Please see MilCodeGen.html for more information.
 //
 
+using MS.Internal;
+using MS.Internal.Collections;
+using MS.Utility;
+using System.Collections;
+using System.ComponentModel;
+using System.Globalization;
+using System.Text;
 using System.Windows.Markup;
+using System.Windows.Media.Media3D.Converters;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Composition;
 
 namespace System.Windows.Media.Media3D.Converters
 {
@@ -39,7 +49,7 @@ public override bool CanConvertToString(object value, IValueSerializerContext co
             }
 
             return true;
-}
+        }
 
         /// <summary>
         /// Converts a string into a Matrix3D.
@@ -54,7 +64,7 @@ public override object ConvertFromString(string value, IValueSerializerContext c
             {
                 return base.ConvertFromString( value, context );
             }
-}
+        }
 
         /// <summary>
         /// Converts the value into a string.
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Converters/Generated/Point3DCollectionValueSerializer.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Converters/Generated/Point3DCollectionValueSerializer.cs
index c1de320ab3c..5e9c96f223c 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Converters/Generated/Point3DCollectionValueSerializer.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Converters/Generated/Point3DCollectionValueSerializer.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -9,7 +9,17 @@
 // Please see MilCodeGen.html for more information.
 //
 
+using MS.Internal;
+using MS.Internal.Collections;
+using MS.Utility;
+using System.Collections;
+using System.ComponentModel;
+using System.Globalization;
+using System.Text;
 using System.Windows.Markup;
+using System.Windows.Media.Media3D.Converters;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Composition;
 
 namespace System.Windows.Media.Media3D.Converters
 {
@@ -39,7 +49,7 @@ public override bool CanConvertToString(object value, IValueSerializerContext co
             }
 
             return true;
-}
+        }
 
         /// <summary>
         /// Converts a string into a Point3DCollection.
@@ -54,7 +64,7 @@ public override object ConvertFromString(string value, IValueSerializerContext c
             {
                 return base.ConvertFromString( value, context );
             }
-}
+        }
 
         /// <summary>
         /// Converts the value into a string.
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Converters/Generated/Point3DValueSerializer.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Converters/Generated/Point3DValueSerializer.cs
index 07b6babf6d8..3b144fcca82 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Converters/Generated/Point3DValueSerializer.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Converters/Generated/Point3DValueSerializer.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -9,7 +9,17 @@
 // Please see MilCodeGen.html for more information.
 //
 
+using MS.Internal;
+using MS.Internal.Collections;
+using MS.Utility;
+using System.Collections;
+using System.ComponentModel;
+using System.Globalization;
+using System.Text;
 using System.Windows.Markup;
+using System.Windows.Media.Media3D.Converters;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Composition;
 
 namespace System.Windows.Media.Media3D.Converters
 {
@@ -39,7 +49,7 @@ public override bool CanConvertToString(object value, IValueSerializerContext co
             }
 
             return true;
-}
+        }
 
         /// <summary>
         /// Converts a string into a Point3D.
@@ -54,7 +64,7 @@ public override object ConvertFromString(string value, IValueSerializerContext c
             {
                 return base.ConvertFromString( value, context );
             }
-}
+        }
 
         /// <summary>
         /// Converts the value into a string.
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Converters/Generated/Point4DValueSerializer.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Converters/Generated/Point4DValueSerializer.cs
index 0a48d79c72b..2b43a1fc2eb 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Converters/Generated/Point4DValueSerializer.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Converters/Generated/Point4DValueSerializer.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -9,7 +9,17 @@
 // Please see MilCodeGen.html for more information.
 //
 
+using MS.Internal;
+using MS.Internal.Collections;
+using MS.Utility;
+using System.Collections;
+using System.ComponentModel;
+using System.Globalization;
+using System.Text;
 using System.Windows.Markup;
+using System.Windows.Media.Media3D.Converters;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Composition;
 
 namespace System.Windows.Media.Media3D.Converters
 {
@@ -39,7 +49,7 @@ public override bool CanConvertToString(object value, IValueSerializerContext co
             }
 
             return true;
-}
+        }
 
         /// <summary>
         /// Converts a string into a Point4D.
@@ -54,7 +64,7 @@ public override object ConvertFromString(string value, IValueSerializerContext c
             {
                 return base.ConvertFromString( value, context );
             }
-}
+        }
 
         /// <summary>
         /// Converts the value into a string.
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Converters/Generated/QuaternionValueSerializer.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Converters/Generated/QuaternionValueSerializer.cs
index e659fbfbfb8..42ddcbf36df 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Converters/Generated/QuaternionValueSerializer.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Converters/Generated/QuaternionValueSerializer.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -9,7 +9,17 @@
 // Please see MilCodeGen.html for more information.
 //
 
+using MS.Internal;
+using MS.Internal.Collections;
+using MS.Utility;
+using System.Collections;
+using System.ComponentModel;
+using System.Globalization;
+using System.Text;
 using System.Windows.Markup;
+using System.Windows.Media.Media3D.Converters;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Composition;
 
 namespace System.Windows.Media.Media3D.Converters
 {
@@ -39,7 +49,7 @@ public override bool CanConvertToString(object value, IValueSerializerContext co
             }
 
             return true;
-}
+        }
 
         /// <summary>
         /// Converts a string into a Quaternion.
@@ -54,7 +64,7 @@ public override object ConvertFromString(string value, IValueSerializerContext c
             {
                 return base.ConvertFromString( value, context );
             }
-}
+        }
 
         /// <summary>
         /// Converts the value into a string.
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Converters/Generated/Rect3DValueSerializer.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Converters/Generated/Rect3DValueSerializer.cs
index 73de968a2b5..9143abdaf0d 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Converters/Generated/Rect3DValueSerializer.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Converters/Generated/Rect3DValueSerializer.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -9,7 +9,17 @@
 // Please see MilCodeGen.html for more information.
 //
 
+using MS.Internal;
+using MS.Internal.Collections;
+using MS.Utility;
+using System.Collections;
+using System.ComponentModel;
+using System.Globalization;
+using System.Text;
 using System.Windows.Markup;
+using System.Windows.Media.Media3D.Converters;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Composition;
 
 namespace System.Windows.Media.Media3D.Converters
 {
@@ -39,7 +49,7 @@ public override bool CanConvertToString(object value, IValueSerializerContext co
             }
 
             return true;
-}
+        }
 
         /// <summary>
         /// Converts a string into a Rect3D.
@@ -54,7 +64,7 @@ public override object ConvertFromString(string value, IValueSerializerContext c
             {
                 return base.ConvertFromString( value, context );
             }
-}
+        }
 
         /// <summary>
         /// Converts the value into a string.
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Converters/Generated/Size3DValueSerializer.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Converters/Generated/Size3DValueSerializer.cs
index f4ce4b237e2..036356048b6 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Converters/Generated/Size3DValueSerializer.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Converters/Generated/Size3DValueSerializer.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -9,7 +9,17 @@
 // Please see MilCodeGen.html for more information.
 //
 
+using MS.Internal;
+using MS.Internal.Collections;
+using MS.Utility;
+using System.Collections;
+using System.ComponentModel;
+using System.Globalization;
+using System.Text;
 using System.Windows.Markup;
+using System.Windows.Media.Media3D.Converters;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Composition;
 
 namespace System.Windows.Media.Media3D.Converters
 {
@@ -39,7 +49,7 @@ public override bool CanConvertToString(object value, IValueSerializerContext co
             }
 
             return true;
-}
+        }
 
         /// <summary>
         /// Converts a string into a Size3D.
@@ -54,7 +64,7 @@ public override object ConvertFromString(string value, IValueSerializerContext c
             {
                 return base.ConvertFromString( value, context );
             }
-}
+        }
 
         /// <summary>
         /// Converts the value into a string.
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Converters/Generated/Vector3DCollectionValueSerializer.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Converters/Generated/Vector3DCollectionValueSerializer.cs
index d3f20195954..2288def21c2 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Converters/Generated/Vector3DCollectionValueSerializer.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Converters/Generated/Vector3DCollectionValueSerializer.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -9,7 +9,17 @@
 // Please see MilCodeGen.html for more information.
 //
 
+using MS.Internal;
+using MS.Internal.Collections;
+using MS.Utility;
+using System.Collections;
+using System.ComponentModel;
+using System.Globalization;
+using System.Text;
 using System.Windows.Markup;
+using System.Windows.Media.Media3D.Converters;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Composition;
 
 namespace System.Windows.Media.Media3D.Converters
 {
@@ -39,7 +49,7 @@ public override bool CanConvertToString(object value, IValueSerializerContext co
             }
 
             return true;
-}
+        }
 
         /// <summary>
         /// Converts a string into a Vector3DCollection.
@@ -54,7 +64,7 @@ public override object ConvertFromString(string value, IValueSerializerContext c
             {
                 return base.ConvertFromString( value, context );
             }
-}
+        }
 
         /// <summary>
         /// Converts the value into a string.
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Converters/Generated/Vector3DValueSerializer.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Converters/Generated/Vector3DValueSerializer.cs
index 4afa3f903d1..2f1201c0747 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Converters/Generated/Vector3DValueSerializer.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Converters/Generated/Vector3DValueSerializer.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -9,7 +9,17 @@
 // Please see MilCodeGen.html for more information.
 //
 
+using MS.Internal;
+using MS.Internal.Collections;
+using MS.Utility;
+using System.Collections;
+using System.ComponentModel;
+using System.Globalization;
+using System.Text;
 using System.Windows.Markup;
+using System.Windows.Media.Media3D.Converters;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Composition;
 
 namespace System.Windows.Media.Media3D.Converters
 {
@@ -39,7 +49,7 @@ public override bool CanConvertToString(object value, IValueSerializerContext co
             }
 
             return true;
-}
+        }
 
         /// <summary>
         /// Converts a string into a Vector3D.
@@ -54,7 +64,7 @@ public override object ConvertFromString(string value, IValueSerializerContext c
             {
                 return base.ConvertFromString( value, context );
             }
-}
+        }
 
         /// <summary>
         /// Converts the value into a string.
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/AffineTransform3D.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/AffineTransform3D.cs
index b84f3a86806..01ad2ede031 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/AffineTransform3D.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/AffineTransform3D.cs
@@ -9,9 +9,22 @@
 // Please see MilCodeGen.html for more information.
 //
 
-// These types are aliased to match the unamanaged names used in interop
+using MS.Internal;
+using MS.Internal.Collections;
+using MS.Utility;
+using System.Collections;
+using System.ComponentModel;
+using System.Globalization;
+using System.Text;
+using System.Windows.Markup;
+using System.Windows.Media.Media3D.Converters;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Composition;
+
 namespace System.Windows.Media.Media3D
 {
+
+
     abstract partial class AffineTransform3D : Transform3D
     {
         //------------------------------------------------------
@@ -40,6 +53,9 @@ abstract partial class AffineTransform3D : Transform3D
             return (AffineTransform3D)base.CloneCurrentValue();
         }
 
+
+
+
         #endregion Public Methods
 
         //------------------------------------------------------
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/AmbientLight.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/AmbientLight.cs
index cf67e5fff5c..d51dd3bf37f 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/AmbientLight.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/AmbientLight.cs
@@ -9,11 +9,22 @@
 // Please see MilCodeGen.html for more information.
 //
 
+using MS.Internal;
+using MS.Internal.Collections;
+using MS.Utility;
+using System.Collections;
+using System.ComponentModel;
+using System.Globalization;
+using System.Text;
+using System.Windows.Markup;
+using System.Windows.Media.Media3D.Converters;
+using System.Windows.Media.Animation;
 using System.Windows.Media.Composition;
-// These types are aliased to match the unamanaged names used in interop
 
 namespace System.Windows.Media.Media3D
 {
+
+
     sealed partial class AmbientLight : Light
     {
         //------------------------------------------------------
@@ -141,6 +152,7 @@ internal override void UpdateResource(DUCE.Channel channel, bool skipOnChannelCh
         }
         internal override DUCE.ResourceHandle AddRefOnChannelCore(DUCE.Channel channel)
         {
+
                 if (_duceResource.CreateOrAddRefOnChannel(this, channel, System.Windows.Media.Composition.DUCE.ResourceType.TYPE_AMBIENTLIGHT))
                 {
                     Transform3D vTransform = Transform;
@@ -153,9 +165,11 @@ internal override DUCE.ResourceHandle AddRefOnChannelCore(DUCE.Channel channel)
                 }
 
                 return _duceResource.GetHandle(channel);
-}
+
+        }
         internal override void ReleaseOnChannelCore(DUCE.Channel channel)
         {
+
                 Debug.Assert(_duceResource.IsOnChannel(channel));
 
                 if (_duceResource.ReleaseOnChannel(channel))
@@ -164,8 +178,10 @@ internal override void ReleaseOnChannelCore(DUCE.Channel channel)
                     if (vTransform != null) ((DUCE.IResource)vTransform).ReleaseOnChannel(channel);
 
                     ReleaseOnChannelAnimations(channel);
-}
-}
+
+                }
+
+        }
         internal override DUCE.ResourceHandle GetHandleCore(DUCE.Channel channel)
         {
             // Note that we are in a lock here already.
@@ -236,6 +252,8 @@ internal override int EffectiveValuesInitialSize
 
         internal System.Windows.Media.Composition.DUCE.MultiChannelResource _duceResource = new System.Windows.Media.Composition.DUCE.MultiChannelResource();
 
+
+
         #endregion Internal Fields
 
 
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/AxisAngleRotation3D.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/AxisAngleRotation3D.cs
index fbc545319ae..5a7b06ade7f 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/AxisAngleRotation3D.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/AxisAngleRotation3D.cs
@@ -9,11 +9,22 @@
 // Please see MilCodeGen.html for more information.
 //
 
+using MS.Internal;
+using MS.Internal.Collections;
+using MS.Utility;
+using System.Collections;
+using System.ComponentModel;
+using System.Globalization;
+using System.Text;
+using System.Windows.Markup;
+using System.Windows.Media.Media3D.Converters;
+using System.Windows.Media.Animation;
 using System.Windows.Media.Composition;
-// These types are aliased to match the unamanaged names used in interop
 
 namespace System.Windows.Media.Media3D
 {
+
+
     sealed partial class AxisAngleRotation3D : Rotation3D
     {
         //------------------------------------------------------
@@ -175,8 +186,11 @@ internal override void UpdateResource(DUCE.Channel channel, bool skipOnChannelCh
         }
         internal override DUCE.ResourceHandle AddRefOnChannelCore(DUCE.Channel channel)
         {
+
                 if (_duceResource.CreateOrAddRefOnChannel(this, channel, System.Windows.Media.Composition.DUCE.ResourceType.TYPE_AXISANGLEROTATION3D))
                 {
+
+
                     AddRefOnChannelAnimations(channel);
 
 
@@ -184,16 +198,22 @@ internal override DUCE.ResourceHandle AddRefOnChannelCore(DUCE.Channel channel)
                 }
 
                 return _duceResource.GetHandle(channel);
-}
+
+        }
         internal override void ReleaseOnChannelCore(DUCE.Channel channel)
         {
+
                 Debug.Assert(_duceResource.IsOnChannel(channel));
 
                 if (_duceResource.ReleaseOnChannel(channel))
                 {
+
+
                     ReleaseOnChannelAnimations(channel);
-}
-}
+
+                }
+
+        }
         internal override DUCE.ResourceHandle GetHandleCore(DUCE.Channel channel)
         {
             // Note that we are in a lock here already.
@@ -281,7 +301,6 @@ static AxisAngleRotation3D()
             // of your app.
 
 
-
             // Initializations
             Type typeofThis = typeof(AxisAngleRotation3D);
             AxisProperty =
@@ -304,6 +323,8 @@ static AxisAngleRotation3D()
                                    /* coerceValueCallback */ null);
         }
 
+
+
         #endregion Constructors
     }
 }
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Camera.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Camera.cs
index 59732bd5e7a..8df81bbdd22 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Camera.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Camera.cs
@@ -9,12 +9,22 @@
 // Please see MilCodeGen.html for more information.
 //
 
+using MS.Internal;
+using MS.Internal.Collections;
+using MS.Utility;
+using System.Collections;
+using System.ComponentModel;
+using System.Globalization;
+using System.Text;
+using System.Windows.Markup;
+using System.Windows.Media.Media3D.Converters;
 using System.Windows.Media.Animation;
 using System.Windows.Media.Composition;
-// These types are aliased to match the unamanaged names used in interop
 
 namespace System.Windows.Media.Media3D
 {
+
+
     abstract partial class Camera : Animatable, IFormattable, DUCE.IResource
     {
         //------------------------------------------------------
@@ -56,6 +66,10 @@ abstract partial class Camera : Animatable, IFormattable, DUCE.IResource
 
         private static void TransformPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
+
+
+
+
             // The first change to the default value of a mutable collection property (e.g. GeometryGroup.Children) 
             // will promote the property value from a default value to a local value. This is technically a sub-property 
             // change because the collection was changed and not a new collection set (GeometryGroup.Children.
@@ -324,7 +338,6 @@ static Camera()
             // to make sure that they are not mutable, otherwise we will throw
             // if these get touched by more than one thread in the lifetime
             // of your app.
-
             Debug.Assert(s_Transform == null || s_Transform.IsFrozen,
                 "Detected context bound default value Camera.s_Transform (See OS Bug #947272).");
 
@@ -342,6 +355,8 @@ static Camera()
                                    /* coerceValueCallback */ null);
         }
 
+
+
         #endregion Constructors
     }
 }
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/DiffuseMaterial.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/DiffuseMaterial.cs
index 8ad3cdbba7f..488cf0946aa 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/DiffuseMaterial.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/DiffuseMaterial.cs
@@ -9,11 +9,22 @@
 // Please see MilCodeGen.html for more information.
 //
 
+using MS.Internal;
+using MS.Internal.Collections;
+using MS.Utility;
+using System.Collections;
+using System.ComponentModel;
+using System.Globalization;
+using System.Text;
+using System.Windows.Markup;
+using System.Windows.Media.Media3D.Converters;
+using System.Windows.Media.Animation;
 using System.Windows.Media.Composition;
-// These types are aliased to match the unamanaged names used in interop
 
 namespace System.Windows.Media.Media3D
 {
+
+
     sealed partial class DiffuseMaterial : Material
     {
         //------------------------------------------------------
@@ -69,6 +80,10 @@ private static void AmbientColorPropertyChanged(DependencyObject d, DependencyPr
         }
         private static void BrushPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
+
+
+
+
             // The first change to the default value of a mutable collection property (e.g. GeometryGroup.Children) 
             // will promote the property value from a default value to a local value. This is technically a sub-property 
             // change because the collection was changed and not a new collection set (GeometryGroup.Children.
@@ -225,6 +240,7 @@ internal override void UpdateResource(DUCE.Channel channel, bool skipOnChannelCh
         }
         internal override DUCE.ResourceHandle AddRefOnChannelCore(DUCE.Channel channel)
         {
+
                 if (_duceResource.CreateOrAddRefOnChannel(this, channel, System.Windows.Media.Composition.DUCE.ResourceType.TYPE_DIFFUSEMATERIAL))
                 {
                     Brush vBrush = Brush;
@@ -237,9 +253,11 @@ internal override DUCE.ResourceHandle AddRefOnChannelCore(DUCE.Channel channel)
                 }
 
                 return _duceResource.GetHandle(channel);
-}
+
+        }
         internal override void ReleaseOnChannelCore(DUCE.Channel channel)
         {
+
                 Debug.Assert(_duceResource.IsOnChannel(channel));
 
                 if (_duceResource.ReleaseOnChannel(channel))
@@ -248,8 +266,10 @@ internal override void ReleaseOnChannelCore(DUCE.Channel channel)
                     if (vBrush != null) ((DUCE.IResource)vBrush).ReleaseOnChannel(channel);
 
                     ReleaseOnChannelAnimations(channel);
-}
-}
+
+                }
+
+        }
         internal override DUCE.ResourceHandle GetHandleCore(DUCE.Channel channel)
         {
             // Note that we are in a lock here already.
@@ -353,7 +373,6 @@ static DiffuseMaterial()
             // to make sure that they are not mutable, otherwise we will throw
             // if these get touched by more than one thread in the lifetime
             // of your app.
-
             Debug.Assert(s_Brush == null || s_Brush.IsFrozen,
                 "Detected context bound default value DiffuseMaterial.s_Brush (See OS Bug #947272).");
 
@@ -389,6 +408,8 @@ static DiffuseMaterial()
                                    /* coerceValueCallback */ null);
         }
 
+
+
         #endregion Constructors
     }
 }
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/DirectionalLight.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/DirectionalLight.cs
index bc141416c90..e3972e9a423 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/DirectionalLight.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/DirectionalLight.cs
@@ -9,11 +9,22 @@
 // Please see MilCodeGen.html for more information.
 //
 
+using MS.Internal;
+using MS.Internal.Collections;
+using MS.Utility;
+using System.Collections;
+using System.ComponentModel;
+using System.Globalization;
+using System.Text;
+using System.Windows.Markup;
+using System.Windows.Media.Media3D.Converters;
+using System.Windows.Media.Animation;
 using System.Windows.Media.Composition;
-// These types are aliased to match the unamanaged names used in interop
 
 namespace System.Windows.Media.Media3D
 {
+
+
     sealed partial class DirectionalLight : Light
     {
         //------------------------------------------------------
@@ -166,6 +177,7 @@ internal override void UpdateResource(DUCE.Channel channel, bool skipOnChannelCh
         }
         internal override DUCE.ResourceHandle AddRefOnChannelCore(DUCE.Channel channel)
         {
+
                 if (_duceResource.CreateOrAddRefOnChannel(this, channel, System.Windows.Media.Composition.DUCE.ResourceType.TYPE_DIRECTIONALLIGHT))
                 {
                     Transform3D vTransform = Transform;
@@ -178,9 +190,11 @@ internal override DUCE.ResourceHandle AddRefOnChannelCore(DUCE.Channel channel)
                 }
 
                 return _duceResource.GetHandle(channel);
-}
+
+        }
         internal override void ReleaseOnChannelCore(DUCE.Channel channel)
         {
+
                 Debug.Assert(_duceResource.IsOnChannel(channel));
 
                 if (_duceResource.ReleaseOnChannel(channel))
@@ -189,8 +203,10 @@ internal override void ReleaseOnChannelCore(DUCE.Channel channel)
                     if (vTransform != null) ((DUCE.IResource)vTransform).ReleaseOnChannel(channel);
 
                     ReleaseOnChannelAnimations(channel);
-}
-}
+
+                }
+
+        }
         internal override DUCE.ResourceHandle GetHandleCore(DUCE.Channel channel)
         {
             // Note that we are in a lock here already.
@@ -270,8 +286,7 @@ static DirectionalLight()
             // We check our static default fields which are of type Freezable
             // to make sure that they are not mutable, otherwise we will throw
             // if these get touched by more than one thread in the lifetime
-            // of your app. 
-
+            // of your app.
 
 
             // Initializations
@@ -287,6 +302,8 @@ static DirectionalLight()
                                    /* coerceValueCallback */ null);
         }
 
+
+
         #endregion Constructors
     }
 }
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/EmissiveMaterial.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/EmissiveMaterial.cs
index e73f8421e82..00edde24b63 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/EmissiveMaterial.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/EmissiveMaterial.cs
@@ -9,11 +9,22 @@
 // Please see MilCodeGen.html for more information.
 //
 
+using MS.Internal;
+using MS.Internal.Collections;
+using MS.Utility;
+using System.Collections;
+using System.ComponentModel;
+using System.Globalization;
+using System.Text;
+using System.Windows.Markup;
+using System.Windows.Media.Media3D.Converters;
+using System.Windows.Media.Animation;
 using System.Windows.Media.Composition;
-// These types are aliased to match the unamanaged names used in interop
 
 namespace System.Windows.Media.Media3D
 {
+
+
     sealed partial class EmissiveMaterial : Material
     {
         //------------------------------------------------------
@@ -62,6 +73,10 @@ private static void ColorPropertyChanged(DependencyObject d, DependencyPropertyC
         }
         private static void BrushPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
+
+
+
+
             // The first change to the default value of a mutable collection property (e.g. GeometryGroup.Children) 
             // will promote the property value from a default value to a local value. This is technically a sub-property 
             // change because the collection was changed and not a new collection set (GeometryGroup.Children.
@@ -202,6 +217,7 @@ internal override void UpdateResource(DUCE.Channel channel, bool skipOnChannelCh
         }
         internal override DUCE.ResourceHandle AddRefOnChannelCore(DUCE.Channel channel)
         {
+
                 if (_duceResource.CreateOrAddRefOnChannel(this, channel, System.Windows.Media.Composition.DUCE.ResourceType.TYPE_EMISSIVEMATERIAL))
                 {
                     Brush vBrush = Brush;
@@ -214,9 +230,11 @@ internal override DUCE.ResourceHandle AddRefOnChannelCore(DUCE.Channel channel)
                 }
 
                 return _duceResource.GetHandle(channel);
-}
+
+        }
         internal override void ReleaseOnChannelCore(DUCE.Channel channel)
         {
+
                 Debug.Assert(_duceResource.IsOnChannel(channel));
 
                 if (_duceResource.ReleaseOnChannel(channel))
@@ -225,8 +243,10 @@ internal override void ReleaseOnChannelCore(DUCE.Channel channel)
                     if (vBrush != null) ((DUCE.IResource)vBrush).ReleaseOnChannel(channel);
 
                     ReleaseOnChannelAnimations(channel);
-}
-}
+
+                }
+
+        }
         internal override DUCE.ResourceHandle GetHandleCore(DUCE.Channel channel)
         {
             // Note that we are in a lock here already.
@@ -325,7 +345,6 @@ static EmissiveMaterial()
             // to make sure that they are not mutable, otherwise we will throw
             // if these get touched by more than one thread in the lifetime
             // of your app.
-
             Debug.Assert(s_Brush == null || s_Brush.IsFrozen,
                 "Detected context bound default value EmissiveMaterial.s_Brush (See OS Bug #947272).");
 
@@ -352,6 +371,8 @@ static EmissiveMaterial()
                                    /* coerceValueCallback */ null);
         }
 
+
+
         #endregion Constructors
     }
 }
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/GeneralTransform3D.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/GeneralTransform3D.cs
index 0ddd2fc0591..2a3e13f98ca 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/GeneralTransform3D.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/GeneralTransform3D.cs
@@ -9,11 +9,22 @@
 // Please see MilCodeGen.html for more information.
 //
 
+using MS.Internal;
+using MS.Internal.Collections;
+using MS.Utility;
+using System.Collections;
+using System.ComponentModel;
+using System.Globalization;
+using System.Text;
+using System.Windows.Markup;
+using System.Windows.Media.Media3D.Converters;
 using System.Windows.Media.Animation;
-// These types are aliased to match the unamanaged names used in interop
+using System.Windows.Media.Composition;
 
 namespace System.Windows.Media.Media3D
 {
+
+
     abstract partial class GeneralTransform3D : Animatable, IFormattable
     {
         //------------------------------------------------------
@@ -160,6 +171,7 @@ internal virtual string ConvertToString(string format, IFormatProvider provider)
             return base.ToString();
         }
 
+
         #endregion Internal Properties
 
         //------------------------------------------------------
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/GeneralTransform3DCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/GeneralTransform3DCollection.cs
index 68ae2a86a88..98e114c231a 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/GeneralTransform3DCollection.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/GeneralTransform3DCollection.cs
@@ -2,20 +2,31 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+//
+//
 // This file was generated, please do not edit it directly.
+//
 // Please see MilCodeGen.html for more information.
+//
 
+using MS.Internal;
+using MS.Internal.Collections;
 using MS.Utility;
 using System.Collections;
+using System.ComponentModel;
+using System.Globalization;
+using System.Text;
+using System.Windows.Markup;
+using System.Windows.Media.Media3D.Converters;
 using System.Windows.Media.Animation;
-
-// These types are aliased to match the unamanaged names used in interop
+using System.Windows.Media.Composition;
 
 namespace System.Windows.Media.Media3D
 {
     /// <summary>
     /// A collection of GeneralTransform3D objects.
     /// </summary>
+
     public sealed partial class GeneralTransform3DCollection : Animatable, IList, IList<GeneralTransform3D>
     {
         //------------------------------------------------------
@@ -139,7 +150,7 @@ public bool Remove(GeneralTransform3D value)
             // not in the collection.  Therefore we need to first verify the old value exists
             // before calling OnFreezablePropertyChanged.  Since we already need to locate
             // the item in the collection we keep the index and use RemoveAt(...) to do
-            // the work.#1016178)
+            // the work.  (Windows OS #1016178)
 
             // We use the public IndexOf to guard our UIContext since OnFreezablePropertyChanged
             // is only called conditionally.  IList.IndexOf returns -1 if the value is not found.
@@ -228,11 +239,14 @@ public GeneralTransform3D this[int index]
 
                 if (!Object.ReferenceEquals(_collection[ index ], value))
                 {
+
                     GeneralTransform3D oldValue = _collection[ index ];
                     OnFreezablePropertyChanged(oldValue, value);
 
                     _collection[ index ] = value;
-}
+
+
+                }
 
 
                 ++_version;
@@ -577,8 +591,10 @@ protected override void CloneCore(Freezable source)
                 GeneralTransform3D newValue = (GeneralTransform3D) sourceGeneralTransform3DCollection._collection[i].Clone();
                 OnFreezablePropertyChanged(/* oldValue = */ null, newValue);
                 _collection.Add(newValue);
-}
-}
+
+            }
+
+        }
         /// <summary>
         /// Implementation of Freezable.CloneCurrentValueCore()
         /// </summary>
@@ -597,8 +613,10 @@ protected override void CloneCurrentValueCore(Freezable source)
                 GeneralTransform3D newValue = (GeneralTransform3D) sourceGeneralTransform3DCollection._collection[i].CloneCurrentValue();
                 OnFreezablePropertyChanged(/* oldValue = */ null, newValue);
                 _collection.Add(newValue);
-}
-}
+
+            }
+
+        }
         /// <summary>
         /// Implementation of Freezable.GetAsFrozenCore()
         /// </summary>
@@ -617,8 +635,10 @@ protected override void GetAsFrozenCore(Freezable source)
                 GeneralTransform3D newValue = (GeneralTransform3D) sourceGeneralTransform3DCollection._collection[i].GetAsFrozen();
                 OnFreezablePropertyChanged(/* oldValue = */ null, newValue);
                 _collection.Add(newValue);
-}
-}
+
+            }
+
+        }
         /// <summary>
         /// Implementation of Freezable.GetCurrentValueAsFrozenCore()
         /// </summary>
@@ -637,8 +657,10 @@ protected override void GetCurrentValueAsFrozenCore(Freezable source)
                 GeneralTransform3D newValue = (GeneralTransform3D) sourceGeneralTransform3DCollection._collection[i].GetCurrentValueAsFrozen();
                 OnFreezablePropertyChanged(/* oldValue = */ null, newValue);
                 _collection.Add(newValue);
-}
-}
+
+            }
+
+        }
         /// <summary>
         /// Implementation of <see cref="System.Windows.Freezable.FreezeCore">Freezable.FreezeCore</see>.
         /// </summary>
@@ -742,6 +764,7 @@ internal Enumerator(GeneralTransform3DCollection list)
 
             void IDisposable.Dispose()
             {
+
             }
 
             /// <summary>
@@ -910,6 +933,7 @@ public GeneralTransform3DCollection(IEnumerable<GeneralTransform3D> collection)
                         GeneralTransform3D newValue = item;
                         OnFreezablePropertyChanged(/* oldValue = */ null, newValue);
                         _collection.Add(newValue);
+
                     }
 
                     needsItemValidation = false;
@@ -925,6 +949,7 @@ public GeneralTransform3DCollection(IEnumerable<GeneralTransform3D> collection)
                         throw new System.ArgumentException(SR.Collection_NoNull);
                     }
                     OnFreezablePropertyChanged(/* oldValue = */ null, item);
+
                 }
             }
 
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/GeneralTransform3DGroup.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/GeneralTransform3DGroup.cs
index 8c0c00ab138..818fe39dbb5 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/GeneralTransform3DGroup.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/GeneralTransform3DGroup.cs
@@ -10,10 +10,21 @@
 //
 
 using MS.Internal;
-// These types are aliased to match the unamanaged names used in interop
+using MS.Internal.Collections;
+using MS.Utility;
+using System.Collections;
+using System.ComponentModel;
+using System.Globalization;
+using System.Text;
+using System.Windows.Markup;
+using System.Windows.Media.Media3D.Converters;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Composition;
 
 namespace System.Windows.Media.Media3D
 {
+
+
     sealed partial class GeneralTransform3DGroup : GeneralTransform3D
     {
         //------------------------------------------------------
@@ -175,7 +186,6 @@ static GeneralTransform3DGroup()
             // to make sure that they are not mutable, otherwise we will throw
             // if these get touched by more than one thread in the lifetime
             // of your app.
-
             Debug.Assert(s_Children == null || s_Children.IsFrozen,
                 "Detected context bound default value GeneralTransform3DGroup.s_Children (See OS Bug #947272).");
 
@@ -193,6 +203,8 @@ static GeneralTransform3DGroup()
                                    /* coerceValueCallback */ null);
         }
 
+
+
         #endregion Constructors
     }
 }
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Geometry3D.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Geometry3D.cs
index 721b4efffc5..5571e116ed3 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Geometry3D.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Geometry3D.cs
@@ -9,12 +9,22 @@
 // Please see MilCodeGen.html for more information.
 //
 
+using MS.Internal;
+using MS.Internal.Collections;
+using MS.Utility;
+using System.Collections;
+using System.ComponentModel;
+using System.Globalization;
+using System.Text;
+using System.Windows.Markup;
+using System.Windows.Media.Media3D.Converters;
 using System.Windows.Media.Animation;
 using System.Windows.Media.Composition;
-// These types are aliased to match the unamanaged names used in interop
 
 namespace System.Windows.Media.Media3D
 {
+
+
     abstract partial class Geometry3D : Animatable, DUCE.IResource
     {
         //------------------------------------------------------
@@ -149,6 +159,7 @@ DUCE.Channel DUCE.IResource.GetChannel(int index)
             return GetChannelCore(index);
         }
 
+
         #endregion Internal Methods
 
         //------------------------------------------------------
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/GeometryModel3D.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/GeometryModel3D.cs
index f335f5c8745..3f556c44972 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/GeometryModel3D.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/GeometryModel3D.cs
@@ -9,11 +9,22 @@
 // Please see MilCodeGen.html for more information.
 //
 
+using MS.Internal;
+using MS.Internal.Collections;
+using MS.Utility;
+using System.Collections;
+using System.ComponentModel;
+using System.Globalization;
+using System.Text;
+using System.Windows.Markup;
+using System.Windows.Media.Media3D.Converters;
+using System.Windows.Media.Animation;
 using System.Windows.Media.Composition;
-// These types are aliased to match the unamanaged names used in interop
 
 namespace System.Windows.Media.Media3D
 {
+
+
     sealed partial class GeometryModel3D : Model3D
     {
         //------------------------------------------------------
@@ -55,6 +66,10 @@ sealed partial class GeometryModel3D : Model3D
 
         private static void GeometryPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
+
+
+
+
             // The first change to the default value of a mutable collection property (e.g. GeometryGroup.Children) 
             // will promote the property value from a default value to a local value. This is technically a sub-property 
             // change because the collection was changed and not a new collection set (GeometryGroup.Children.
@@ -99,6 +114,7 @@ private static void GeometryPropertyChanged(DependencyObject d, DependencyProper
         }
         private static void MaterialPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
+
             GeometryModel3D target = ((GeometryModel3D) d);
 
 
@@ -148,6 +164,7 @@ private static void MaterialPropertyChanged(DependencyObject d, DependencyProper
         }
         private static void BackMaterialPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
+
             GeometryModel3D target = ((GeometryModel3D) d);
 
 
@@ -326,6 +343,7 @@ internal override void UpdateResource(DUCE.Channel channel, bool skipOnChannelCh
         }
         internal override DUCE.ResourceHandle AddRefOnChannelCore(DUCE.Channel channel)
         {
+
                 if (_duceResource.CreateOrAddRefOnChannel(this, channel, System.Windows.Media.Composition.DUCE.ResourceType.TYPE_GEOMETRYMODEL3D))
                 {
                     Transform3D vTransform = Transform;
@@ -344,9 +362,11 @@ internal override DUCE.ResourceHandle AddRefOnChannelCore(DUCE.Channel channel)
                 }
 
                 return _duceResource.GetHandle(channel);
-}
+
+        }
         internal override void ReleaseOnChannelCore(DUCE.Channel channel)
         {
+
                 Debug.Assert(_duceResource.IsOnChannel(channel));
 
                 if (_duceResource.ReleaseOnChannel(channel))
@@ -361,8 +381,10 @@ internal override void ReleaseOnChannelCore(DUCE.Channel channel)
                     if (vBackMaterial != null) ((DUCE.IResource)vBackMaterial).ReleaseOnChannel(channel);
 
                     ReleaseOnChannelAnimations(channel);
-}
-}
+
+                }
+
+        }
         internal override DUCE.ResourceHandle GetHandleCore(DUCE.Channel channel)
         {
             // Note that we are in a lock here already.
@@ -453,7 +475,6 @@ static GeometryModel3D()
             // of your app.
 
 
-
             // Initializations
             Type typeofThis = typeof(GeometryModel3D);
             GeometryProperty =
@@ -485,6 +506,8 @@ static GeometryModel3D()
                                    /* coerceValueCallback */ null);
         }
 
+
+
         #endregion Constructors
     }
 }
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Light.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Light.cs
index 4d684a39015..6a64b16ac9b 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Light.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Light.cs
@@ -9,9 +9,22 @@
 // Please see MilCodeGen.html for more information.
 //
 
-// These types are aliased to match the unamanaged names used in interop
+using MS.Internal;
+using MS.Internal.Collections;
+using MS.Utility;
+using System.Collections;
+using System.ComponentModel;
+using System.Globalization;
+using System.Text;
+using System.Windows.Markup;
+using System.Windows.Media.Media3D.Converters;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Composition;
+
 namespace System.Windows.Media.Media3D
 {
+
+
     abstract partial class Light : Model3D
     {
         //------------------------------------------------------
@@ -187,7 +200,6 @@ static Light()
             // of your app.
 
 
-
             // Initializations
             Type typeofThis = typeof(Light);
             ColorProperty =
@@ -201,6 +213,8 @@ static Light()
                                    /* coerceValueCallback */ null);
         }
 
+
+
         #endregion Constructors
     }
 }
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Material.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Material.cs
index 7517c67fca0..c7e45743725 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Material.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Material.cs
@@ -9,12 +9,22 @@
 // Please see MilCodeGen.html for more information.
 //
 
+using MS.Internal;
+using MS.Internal.Collections;
+using MS.Utility;
+using System.Collections;
+using System.ComponentModel;
+using System.Globalization;
+using System.Text;
+using System.Windows.Markup;
+using System.Windows.Media.Media3D.Converters;
 using System.Windows.Media.Animation;
 using System.Windows.Media.Composition;
-// These types are aliased to match the unamanaged names used in interop
 
 namespace System.Windows.Media.Media3D
 {
+
+
     abstract partial class Material : Animatable, IFormattable, DUCE.IResource
     {
         //------------------------------------------------------
@@ -218,6 +228,7 @@ internal virtual string ConvertToString(string format, IFormatProvider provider)
             return base.ToString();
         }
 
+
         #endregion Internal Properties
 
         //------------------------------------------------------
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/MaterialCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/MaterialCollection.cs
index 2c1236fb2af..c90c480b566 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/MaterialCollection.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/MaterialCollection.cs
@@ -2,21 +2,31 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+//
+//
 // This file was generated, please do not edit it directly.
+//
 // Please see MilCodeGen.html for more information.
+//
 
+using MS.Internal;
 using MS.Internal.Collections;
 using MS.Utility;
 using System.Collections;
+using System.ComponentModel;
+using System.Globalization;
+using System.Text;
+using System.Windows.Markup;
+using System.Windows.Media.Media3D.Converters;
 using System.Windows.Media.Animation;
-
-// These types are aliased to match the unamanaged names used in interop
+using System.Windows.Media.Composition;
 
 namespace System.Windows.Media.Media3D
 {
     /// <summary>
     /// A collection of Material objects.
     /// </summary>
+
     public sealed partial class MaterialCollection : Animatable, IList, IList<Material>
     {
         //------------------------------------------------------
@@ -152,7 +162,7 @@ public bool Remove(Material value)
             // not in the collection.  Therefore we need to first verify the old value exists
             // before calling OnFreezablePropertyChanged.  Since we already need to locate
             // the item in the collection we keep the index and use RemoveAt(...) to do
-            // the work.#1016178)
+            // the work.  (Windows OS #1016178)
 
             // We use the public IndexOf to guard our UIContext since OnFreezablePropertyChanged
             // is only called conditionally.  IList.IndexOf returns -1 if the value is not found.
@@ -241,6 +251,7 @@ public Material this[int index]
 
                 if (!Object.ReferenceEquals(_collection[ index ], value))
                 {
+
                     Material oldValue = _collection[ index ];
                     OnFreezablePropertyChanged(oldValue, value);
 
@@ -617,7 +628,8 @@ protected override void CloneCore(Freezable source)
                 _collection.Add(newValue);
                 OnInsert(newValue);
             }
-}
+
+        }
         /// <summary>
         /// Implementation of Freezable.CloneCurrentValueCore()
         /// </summary>
@@ -638,7 +650,8 @@ protected override void CloneCurrentValueCore(Freezable source)
                 _collection.Add(newValue);
                 OnInsert(newValue);
             }
-}
+
+        }
         /// <summary>
         /// Implementation of Freezable.GetAsFrozenCore()
         /// </summary>
@@ -659,7 +672,8 @@ protected override void GetAsFrozenCore(Freezable source)
                 _collection.Add(newValue);
                 OnInsert(newValue);
             }
-}
+
+        }
         /// <summary>
         /// Implementation of Freezable.GetCurrentValueAsFrozenCore()
         /// </summary>
@@ -680,7 +694,8 @@ protected override void GetCurrentValueAsFrozenCore(Freezable source)
                 _collection.Add(newValue);
                 OnInsert(newValue);
             }
-}
+
+        }
         /// <summary>
         /// Implementation of <see cref="System.Windows.Freezable.FreezeCore">Freezable.FreezeCore</see>.
         /// </summary>
@@ -784,6 +799,7 @@ internal Enumerator(MaterialCollection list)
 
             void IDisposable.Dispose()
             {
+
             }
 
             /// <summary>
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/MaterialGroup.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/MaterialGroup.cs
index 7313b3f9f66..2b68aa6d0f2 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/MaterialGroup.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/MaterialGroup.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -10,11 +10,21 @@
 //
 
 using MS.Internal;
+using MS.Internal.Collections;
+using MS.Utility;
+using System.Collections;
+using System.ComponentModel;
+using System.Globalization;
+using System.Text;
+using System.Windows.Markup;
+using System.Windows.Media.Media3D.Converters;
+using System.Windows.Media.Animation;
 using System.Windows.Media.Composition;
-// These types are aliased to match the unamanaged names used in interop
 
 namespace System.Windows.Media.Media3D
 {
+
+
     sealed partial class MaterialGroup : Material
     {
         //------------------------------------------------------
@@ -56,6 +66,10 @@ sealed partial class MaterialGroup : Material
 
         private static void ChildrenPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
+
+
+
+
             // The first change to the default value of a mutable collection property (e.g. GeometryGroup.Children) 
             // will promote the property value from a default value to a local value. This is technically a sub-property 
             // change because the collection was changed and not a new collection set (GeometryGroup.Children.
@@ -237,8 +251,11 @@ internal override void UpdateResource(DUCE.Channel channel, bool skipOnChannelCh
         }
         internal override DUCE.ResourceHandle AddRefOnChannelCore(DUCE.Channel channel)
         {
+
                 if (_duceResource.CreateOrAddRefOnChannel(this, channel, System.Windows.Media.Composition.DUCE.ResourceType.TYPE_MATERIALGROUP))
                 {
+
+
                     MaterialCollection vChildren = Children;
 
                     if (vChildren != null)
@@ -256,13 +273,17 @@ internal override DUCE.ResourceHandle AddRefOnChannelCore(DUCE.Channel channel)
                 }
 
                 return _duceResource.GetHandle(channel);
-}
+
+        }
         internal override void ReleaseOnChannelCore(DUCE.Channel channel)
         {
+
                 Debug.Assert(_duceResource.IsOnChannel(channel));
 
                 if (_duceResource.ReleaseOnChannel(channel))
                 {
+
+
                     MaterialCollection vChildren = Children;
 
                     if (vChildren != null)
@@ -274,8 +295,10 @@ internal override void ReleaseOnChannelCore(DUCE.Channel channel)
                         }
                     }
                     ReleaseOnChannelAnimations(channel);
-}
-}
+
+                }
+
+        }
         internal override DUCE.ResourceHandle GetHandleCore(DUCE.Channel channel)
         {
             // Note that we are in a lock here already.
@@ -418,7 +441,6 @@ static MaterialGroup()
             // to make sure that they are not mutable, otherwise we will throw
             // if these get touched by more than one thread in the lifetime
             // of your app.
-
             Debug.Assert(s_Children == null || s_Children.IsFrozen,
                 "Detected context bound default value MaterialGroup.s_Children (See OS Bug #947272).");
 
@@ -436,6 +458,8 @@ static MaterialGroup()
                                    /* coerceValueCallback */ null);
         }
 
+
+
         #endregion Constructors
     }
 }
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Matrix3D.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Matrix3D.cs
index 0ee4c29493a..925dc96444e 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Matrix3D.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Matrix3D.cs
@@ -10,13 +10,20 @@
 //
 
 using MS.Internal;
+using MS.Internal.Collections;
+using MS.Utility;
+using System.Collections;
 using System.ComponentModel;
+using System.Globalization;
+using System.Text;
 using System.Windows.Markup;
 using System.Windows.Media.Media3D.Converters;
-// These types are aliased to match the unamanaged names used in interop
+using System.Windows.Media.Animation;
+using System.Windows.Media.Composition;
 
 namespace System.Windows.Media.Media3D
 {
+
     [Serializable]
     [TypeConverter(typeof(Matrix3DConverter))]
     [ValueSerializer(typeof(Matrix3DValueSerializer))] // Used by MarkupWriter
@@ -310,6 +317,7 @@ public static Matrix3D Parse(string source)
         /// </returns>
         public override string ToString()
         {
+
             // Delegate to the internal method which implements all ToString calls.
             return ConvertToString(null /* format string */, null /* format provider */);
         }
@@ -323,6 +331,7 @@ public override string ToString()
         /// </returns>
         public string ToString(IFormatProvider provider)
         {
+
             // Delegate to the internal method which implements all ToString calls.
             return ConvertToString(null /* format string */, provider);
         }
@@ -338,6 +347,7 @@ public string ToString(IFormatProvider provider)
         /// </returns>
         string IFormattable.ToString(string format, IFormatProvider provider)
         {
+
             // Delegate to the internal method which implements all ToString calls.
             return ConvertToString(format, provider);
         }
@@ -381,6 +391,8 @@ internal string ConvertToString(string format, IFormatProvider provider)
                                  _m44);
         }
 
+
+
         #endregion Internal Properties
 
         //------------------------------------------------------
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Matrix3DConverter.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Matrix3DConverter.cs
index 2103dca4703..4452e68dc5d 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Matrix3DConverter.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Matrix3DConverter.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -9,8 +9,17 @@
 // Please see MilCodeGen.html for more information.
 //
 
+using MS.Internal;
+using MS.Internal.Collections;
+using MS.Utility;
+using System.Collections;
 using System.ComponentModel;
 using System.Globalization;
+using System.Text;
+using System.Windows.Markup;
+using System.Windows.Media.Media3D.Converters;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Composition;
 
 namespace System.Windows.Media.Media3D
 {
@@ -75,9 +84,8 @@ public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo c
                 throw GetConvertFromException(value);
             }
 
-            String source = value as string;
 
-            if (source != null)
+            if (value is string source)
             {
                 return Matrix3D.Parse(source);
             }
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/MatrixCamera.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/MatrixCamera.cs
index 7e293e1fd94..66bf2104e29 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/MatrixCamera.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/MatrixCamera.cs
@@ -9,11 +9,22 @@
 // Please see MilCodeGen.html for more information.
 //
 
+using MS.Internal;
+using MS.Internal.Collections;
+using MS.Utility;
+using System.Collections;
+using System.ComponentModel;
+using System.Globalization;
+using System.Text;
+using System.Windows.Markup;
+using System.Windows.Media.Media3D.Converters;
+using System.Windows.Media.Animation;
 using System.Windows.Media.Composition;
-// These types are aliased to match the unamanaged names used in interop
 
 namespace System.Windows.Media.Media3D
 {
+
+
     sealed partial class MatrixCamera : Camera
     {
         //------------------------------------------------------
@@ -176,6 +187,7 @@ internal override void UpdateResource(DUCE.Channel channel, bool skipOnChannelCh
         }
         internal override DUCE.ResourceHandle AddRefOnChannelCore(DUCE.Channel channel)
         {
+
                 if (_duceResource.CreateOrAddRefOnChannel(this, channel, System.Windows.Media.Composition.DUCE.ResourceType.TYPE_MATRIXCAMERA))
                 {
                     Transform3D vTransform = Transform;
@@ -188,9 +200,11 @@ internal override DUCE.ResourceHandle AddRefOnChannelCore(DUCE.Channel channel)
                 }
 
                 return _duceResource.GetHandle(channel);
-}
+
+        }
         internal override void ReleaseOnChannelCore(DUCE.Channel channel)
         {
+
                 Debug.Assert(_duceResource.IsOnChannel(channel));
 
                 if (_duceResource.ReleaseOnChannel(channel))
@@ -199,8 +213,10 @@ internal override void ReleaseOnChannelCore(DUCE.Channel channel)
                     if (vTransform != null) ((DUCE.IResource)vTransform).ReleaseOnChannel(channel);
 
                     ReleaseOnChannelAnimations(channel);
-}
-}
+
+                }
+
+        }
         internal override DUCE.ResourceHandle GetHandleCore(DUCE.Channel channel)
         {
             // Note that we are in a lock here already.
@@ -288,7 +304,6 @@ static MatrixCamera()
             // of your app.
 
 
-
             // Initializations
             Type typeofThis = typeof(MatrixCamera);
             ViewMatrixProperty =
@@ -311,6 +326,8 @@ static MatrixCamera()
                                    /* coerceValueCallback */ null);
         }
 
+
+
         #endregion Constructors
     }
 }
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/MatrixTransform3D.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/MatrixTransform3D.cs
index 1c46bdea358..9e28a4581b7 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/MatrixTransform3D.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/MatrixTransform3D.cs
@@ -9,11 +9,22 @@
 // Please see MilCodeGen.html for more information.
 //
 
+using MS.Internal;
+using MS.Internal.Collections;
+using MS.Utility;
+using System.Collections;
+using System.ComponentModel;
+using System.Globalization;
+using System.Text;
+using System.Windows.Markup;
+using System.Windows.Media.Media3D.Converters;
+using System.Windows.Media.Animation;
 using System.Windows.Media.Composition;
-// These types are aliased to match the unamanaged names used in interop
 
 namespace System.Windows.Media.Media3D
 {
+
+
     sealed partial class MatrixTransform3D : Transform3D
     {
         //------------------------------------------------------
@@ -136,8 +147,11 @@ internal override void UpdateResource(DUCE.Channel channel, bool skipOnChannelCh
         }
         internal override DUCE.ResourceHandle AddRefOnChannelCore(DUCE.Channel channel)
         {
+
                 if (_duceResource.CreateOrAddRefOnChannel(this, channel, System.Windows.Media.Composition.DUCE.ResourceType.TYPE_MATRIXTRANSFORM3D))
                 {
+
+
                     AddRefOnChannelAnimations(channel);
 
 
@@ -145,16 +159,22 @@ internal override DUCE.ResourceHandle AddRefOnChannelCore(DUCE.Channel channel)
                 }
 
                 return _duceResource.GetHandle(channel);
-}
+
+        }
         internal override void ReleaseOnChannelCore(DUCE.Channel channel)
         {
+
                 Debug.Assert(_duceResource.IsOnChannel(channel));
 
                 if (_duceResource.ReleaseOnChannel(channel))
                 {
+
+
                     ReleaseOnChannelAnimations(channel);
-}
-}
+
+                }
+
+        }
         internal override DUCE.ResourceHandle GetHandleCore(DUCE.Channel channel)
         {
             // Note that we are in a lock here already.
@@ -250,7 +270,6 @@ static MatrixTransform3D()
             // of your app.
 
 
-
             // Initializations
             Type typeofThis = typeof(MatrixTransform3D);
             MatrixProperty =
@@ -264,6 +283,8 @@ static MatrixTransform3D()
                                    /* coerceValueCallback */ null);
         }
 
+
+
         #endregion Constructors
     }
 }
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/MeshGeometry3D.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/MeshGeometry3D.cs
index 6cdcdd2efab..19f0918d5f1 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/MeshGeometry3D.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/MeshGeometry3D.cs
@@ -10,11 +10,21 @@
 //
 
 using MS.Internal;
+using MS.Internal.Collections;
+using MS.Utility;
+using System.Collections;
+using System.ComponentModel;
+using System.Globalization;
+using System.Text;
+using System.Windows.Markup;
+using System.Windows.Media.Media3D.Converters;
+using System.Windows.Media.Animation;
 using System.Windows.Media.Composition;
-// These types are aliased to match the unamanaged names used in interop
 
 namespace System.Windows.Media.Media3D
 {
+
+
     sealed partial class MeshGeometry3D : Geometry3D
     {
         //------------------------------------------------------
@@ -56,6 +66,10 @@ sealed partial class MeshGeometry3D : Geometry3D
 
         private static void PositionsPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
+
+
+
+
             MeshGeometry3D target = ((MeshGeometry3D) d);
 
 
@@ -63,6 +77,10 @@ private static void PositionsPropertyChanged(DependencyObject d, DependencyPrope
         }
         private static void NormalsPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
+
+
+
+
             MeshGeometry3D target = ((MeshGeometry3D) d);
 
 
@@ -70,6 +88,10 @@ private static void NormalsPropertyChanged(DependencyObject d, DependencyPropert
         }
         private static void TextureCoordinatesPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
+
+
+
+
             MeshGeometry3D target = ((MeshGeometry3D) d);
 
 
@@ -77,6 +99,10 @@ private static void TextureCoordinatesPropertyChanged(DependencyObject d, Depend
         }
         private static void TriangleIndicesPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
+
+
+
+
             MeshGeometry3D target = ((MeshGeometry3D) d);
 
 
@@ -265,8 +291,11 @@ internal override void UpdateResource(DUCE.Channel channel, bool skipOnChannelCh
         }
         internal override DUCE.ResourceHandle AddRefOnChannelCore(DUCE.Channel channel)
         {
+
                 if (_duceResource.CreateOrAddRefOnChannel(this, channel, System.Windows.Media.Composition.DUCE.ResourceType.TYPE_MESHGEOMETRY3D))
                 {
+
+
                     AddRefOnChannelAnimations(channel);
 
 
@@ -274,16 +303,22 @@ internal override DUCE.ResourceHandle AddRefOnChannelCore(DUCE.Channel channel)
                 }
 
                 return _duceResource.GetHandle(channel);
-}
+
+        }
         internal override void ReleaseOnChannelCore(DUCE.Channel channel)
         {
+
                 Debug.Assert(_duceResource.IsOnChannel(channel));
 
                 if (_duceResource.ReleaseOnChannel(channel))
                 {
+
+
                     ReleaseOnChannelAnimations(channel);
-}
-}
+
+                }
+
+        }
         internal override DUCE.ResourceHandle GetHandleCore(DUCE.Channel channel)
         {
             // Note that we are in a lock here already.
@@ -395,7 +430,6 @@ static MeshGeometry3D()
             // to make sure that they are not mutable, otherwise we will throw
             // if these get touched by more than one thread in the lifetime
             // of your app.
-
             Debug.Assert(s_Positions == null || s_Positions.IsFrozen,
                 "Detected context bound default value MeshGeometry3D.s_Positions (See OS Bug #947272).");
 
@@ -452,6 +486,8 @@ static MeshGeometry3D()
                                    /* coerceValueCallback */ null);
         }
 
+
+
         #endregion Constructors
     }
 }
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Model3D.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Model3D.cs
index 9a43339679b..816f4e2a473 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Model3D.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Model3D.cs
@@ -9,12 +9,22 @@
 // Please see MilCodeGen.html for more information.
 //
 
+using MS.Internal;
+using MS.Internal.Collections;
+using MS.Utility;
+using System.Collections;
+using System.ComponentModel;
+using System.Globalization;
+using System.Text;
+using System.Windows.Markup;
+using System.Windows.Media.Media3D.Converters;
 using System.Windows.Media.Animation;
 using System.Windows.Media.Composition;
-// These types are aliased to match the unamanaged names used in interop
 
 namespace System.Windows.Media.Media3D
 {
+
+
     abstract partial class Model3D : Animatable, IFormattable, DUCE.IResource
     {
         //------------------------------------------------------
@@ -56,6 +66,10 @@ abstract partial class Model3D : Animatable, IFormattable, DUCE.IResource
 
         private static void TransformPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
+
+
+
+
             // The first change to the default value of a mutable collection property (e.g. GeometryGroup.Children) 
             // will promote the property value from a default value to a local value. This is technically a sub-property 
             // change because the collection was changed and not a new collection set (GeometryGroup.Children.
@@ -324,7 +338,6 @@ static Model3D()
             // to make sure that they are not mutable, otherwise we will throw
             // if these get touched by more than one thread in the lifetime
             // of your app.
-
             Debug.Assert(s_Transform == null || s_Transform.IsFrozen,
                 "Detected context bound default value Model3D.s_Transform (See OS Bug #947272).");
 
@@ -342,6 +355,8 @@ static Model3D()
                                    /* coerceValueCallback */ null);
         }
 
+
+
         #endregion Constructors
     }
 }
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Model3DCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Model3DCollection.cs
index 0df553fc146..aa0ba43dcb2 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Model3DCollection.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Model3DCollection.cs
@@ -2,21 +2,31 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+//
+//
 // This file was generated, please do not edit it directly.
+//
 // Please see MilCodeGen.html for more information.
+//
 
+using MS.Internal;
 using MS.Internal.Collections;
 using MS.Utility;
 using System.Collections;
+using System.ComponentModel;
+using System.Globalization;
+using System.Text;
+using System.Windows.Markup;
+using System.Windows.Media.Media3D.Converters;
 using System.Windows.Media.Animation;
-
-// These types are aliased to match the unamanaged names used in interop
+using System.Windows.Media.Composition;
 
 namespace System.Windows.Media.Media3D
 {
     /// <summary>
     /// A collection of Model3D objects.
     /// </summary>
+
     public sealed partial class Model3DCollection : Animatable, IList, IList<Model3D>
     {
         //------------------------------------------------------
@@ -152,7 +162,7 @@ public bool Remove(Model3D value)
             // not in the collection.  Therefore we need to first verify the old value exists
             // before calling OnFreezablePropertyChanged.  Since we already need to locate
             // the item in the collection we keep the index and use RemoveAt(...) to do
-            // the work.#1016178)
+            // the work.  (Windows OS #1016178)
 
             // We use the public IndexOf to guard our UIContext since OnFreezablePropertyChanged
             // is only called conditionally.  IList.IndexOf returns -1 if the value is not found.
@@ -241,6 +251,7 @@ public Model3D this[int index]
 
                 if (!Object.ReferenceEquals(_collection[ index ], value))
                 {
+
                     Model3D oldValue = _collection[ index ];
                     OnFreezablePropertyChanged(oldValue, value);
 
@@ -617,7 +628,8 @@ protected override void CloneCore(Freezable source)
                 _collection.Add(newValue);
                 OnInsert(newValue);
             }
-}
+
+        }
         /// <summary>
         /// Implementation of Freezable.CloneCurrentValueCore()
         /// </summary>
@@ -638,7 +650,8 @@ protected override void CloneCurrentValueCore(Freezable source)
                 _collection.Add(newValue);
                 OnInsert(newValue);
             }
-}
+
+        }
         /// <summary>
         /// Implementation of Freezable.GetAsFrozenCore()
         /// </summary>
@@ -659,7 +672,8 @@ protected override void GetAsFrozenCore(Freezable source)
                 _collection.Add(newValue);
                 OnInsert(newValue);
             }
-}
+
+        }
         /// <summary>
         /// Implementation of Freezable.GetCurrentValueAsFrozenCore()
         /// </summary>
@@ -680,7 +694,8 @@ protected override void GetCurrentValueAsFrozenCore(Freezable source)
                 _collection.Add(newValue);
                 OnInsert(newValue);
             }
-}
+
+        }
         /// <summary>
         /// Implementation of <see cref="System.Windows.Freezable.FreezeCore">Freezable.FreezeCore</see>.
         /// </summary>
@@ -784,6 +799,7 @@ internal Enumerator(Model3DCollection list)
 
             void IDisposable.Dispose()
             {
+
             }
 
             /// <summary>
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Model3DGroup.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Model3DGroup.cs
index 375722336d9..4f32d95dfe6 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Model3DGroup.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Model3DGroup.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -10,11 +10,21 @@
 //
 
 using MS.Internal;
+using MS.Internal.Collections;
+using MS.Utility;
+using System.Collections;
+using System.ComponentModel;
+using System.Globalization;
+using System.Text;
+using System.Windows.Markup;
+using System.Windows.Media.Media3D.Converters;
+using System.Windows.Media.Animation;
 using System.Windows.Media.Composition;
-// These types are aliased to match the unamanaged names used in interop
 
 namespace System.Windows.Media.Media3D
 {
+
+
     sealed partial class Model3DGroup : Model3D
     {
         //------------------------------------------------------
@@ -56,6 +66,10 @@ sealed partial class Model3DGroup : Model3D
 
         private static void ChildrenPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
+
+
+
+
             // The first change to the default value of a mutable collection property (e.g. GeometryGroup.Children) 
             // will promote the property value from a default value to a local value. This is technically a sub-property 
             // change because the collection was changed and not a new collection set (GeometryGroup.Children.
@@ -252,6 +266,7 @@ internal override void UpdateResource(DUCE.Channel channel, bool skipOnChannelCh
         }
         internal override DUCE.ResourceHandle AddRefOnChannelCore(DUCE.Channel channel)
         {
+
                 if (_duceResource.CreateOrAddRefOnChannel(this, channel, System.Windows.Media.Composition.DUCE.ResourceType.TYPE_MODEL3DGROUP))
                 {
                     Transform3D vTransform = Transform;
@@ -274,9 +289,11 @@ internal override DUCE.ResourceHandle AddRefOnChannelCore(DUCE.Channel channel)
                 }
 
                 return _duceResource.GetHandle(channel);
-}
+
+        }
         internal override void ReleaseOnChannelCore(DUCE.Channel channel)
         {
+
                 Debug.Assert(_duceResource.IsOnChannel(channel));
 
                 if (_duceResource.ReleaseOnChannel(channel))
@@ -295,8 +312,10 @@ internal override void ReleaseOnChannelCore(DUCE.Channel channel)
                         }
                     }
                     ReleaseOnChannelAnimations(channel);
-}
-}
+
+                }
+
+        }
         internal override DUCE.ResourceHandle GetHandleCore(DUCE.Channel channel)
         {
             // Note that we are in a lock here already.
@@ -439,7 +458,6 @@ static Model3DGroup()
             // to make sure that they are not mutable, otherwise we will throw
             // if these get touched by more than one thread in the lifetime
             // of your app.
-
             Debug.Assert(s_Children == null || s_Children.IsFrozen,
                 "Detected context bound default value Model3DGroup.s_Children (See OS Bug #947272).");
 
@@ -457,6 +475,8 @@ static Model3DGroup()
                                    /* coerceValueCallback */ null);
         }
 
+
+
         #endregion Constructors
     }
 }
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/OrthographicCamera.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/OrthographicCamera.cs
index 797c6221d2e..5a6f31a14b6 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/OrthographicCamera.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/OrthographicCamera.cs
@@ -9,11 +9,22 @@
 // Please see MilCodeGen.html for more information.
 //
 
+using MS.Internal;
+using MS.Internal.Collections;
+using MS.Utility;
+using System.Collections;
+using System.ComponentModel;
+using System.Globalization;
+using System.Text;
+using System.Windows.Markup;
+using System.Windows.Media.Media3D.Converters;
+using System.Windows.Media.Animation;
 using System.Windows.Media.Composition;
-// These types are aliased to match the unamanaged names used in interop
 
 namespace System.Windows.Media.Media3D
 {
+
+
     sealed partial class OrthographicCamera : ProjectionCamera
     {
         //------------------------------------------------------
@@ -190,6 +201,7 @@ internal override void UpdateResource(DUCE.Channel channel, bool skipOnChannelCh
         }
         internal override DUCE.ResourceHandle AddRefOnChannelCore(DUCE.Channel channel)
         {
+
                 if (_duceResource.CreateOrAddRefOnChannel(this, channel, System.Windows.Media.Composition.DUCE.ResourceType.TYPE_ORTHOGRAPHICCAMERA))
                 {
                     Transform3D vTransform = Transform;
@@ -202,9 +214,11 @@ internal override DUCE.ResourceHandle AddRefOnChannelCore(DUCE.Channel channel)
                 }
 
                 return _duceResource.GetHandle(channel);
-}
+
+        }
         internal override void ReleaseOnChannelCore(DUCE.Channel channel)
         {
+
                 Debug.Assert(_duceResource.IsOnChannel(channel));
 
                 if (_duceResource.ReleaseOnChannel(channel))
@@ -213,8 +227,10 @@ internal override void ReleaseOnChannelCore(DUCE.Channel channel)
                     if (vTransform != null) ((DUCE.IResource)vTransform).ReleaseOnChannel(channel);
 
                     ReleaseOnChannelAnimations(channel);
-}
-}
+
+                }
+
+        }
         internal override DUCE.ResourceHandle GetHandleCore(DUCE.Channel channel)
         {
             // Note that we are in a lock here already.
@@ -297,7 +313,6 @@ static OrthographicCamera()
             // of your app.
 
 
-
             // Initializations
             Type typeofThis = typeof(OrthographicCamera);
             WidthProperty =
@@ -311,6 +326,8 @@ static OrthographicCamera()
                                    /* coerceValueCallback */ null);
         }
 
+
+
         #endregion Constructors
     }
 }
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/PerspectiveCamera.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/PerspectiveCamera.cs
index f761d65363f..ac3eb0caf96 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/PerspectiveCamera.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/PerspectiveCamera.cs
@@ -9,11 +9,22 @@
 // Please see MilCodeGen.html for more information.
 //
 
+using MS.Internal;
+using MS.Internal.Collections;
+using MS.Utility;
+using System.Collections;
+using System.ComponentModel;
+using System.Globalization;
+using System.Text;
+using System.Windows.Markup;
+using System.Windows.Media.Media3D.Converters;
+using System.Windows.Media.Animation;
 using System.Windows.Media.Composition;
-// These types are aliased to match the unamanaged names used in interop
 
 namespace System.Windows.Media.Media3D
 {
+
+
     sealed partial class PerspectiveCamera : ProjectionCamera
     {
         //------------------------------------------------------
@@ -190,6 +201,7 @@ internal override void UpdateResource(DUCE.Channel channel, bool skipOnChannelCh
         }
         internal override DUCE.ResourceHandle AddRefOnChannelCore(DUCE.Channel channel)
         {
+
                 if (_duceResource.CreateOrAddRefOnChannel(this, channel, System.Windows.Media.Composition.DUCE.ResourceType.TYPE_PERSPECTIVECAMERA))
                 {
                     Transform3D vTransform = Transform;
@@ -202,9 +214,11 @@ internal override DUCE.ResourceHandle AddRefOnChannelCore(DUCE.Channel channel)
                 }
 
                 return _duceResource.GetHandle(channel);
-}
+
+        }
         internal override void ReleaseOnChannelCore(DUCE.Channel channel)
         {
+
                 Debug.Assert(_duceResource.IsOnChannel(channel));
 
                 if (_duceResource.ReleaseOnChannel(channel))
@@ -213,8 +227,10 @@ internal override void ReleaseOnChannelCore(DUCE.Channel channel)
                     if (vTransform != null) ((DUCE.IResource)vTransform).ReleaseOnChannel(channel);
 
                     ReleaseOnChannelAnimations(channel);
-}
-}
+
+                }
+
+        }
         internal override DUCE.ResourceHandle GetHandleCore(DUCE.Channel channel)
         {
             // Note that we are in a lock here already.
@@ -297,7 +313,6 @@ static PerspectiveCamera()
             // of your app.
 
 
-
             // Initializations
             Type typeofThis = typeof(PerspectiveCamera);
             FieldOfViewProperty =
@@ -311,6 +326,8 @@ static PerspectiveCamera()
                                    /* coerceValueCallback */ null);
         }
 
+
+
         #endregion Constructors
     }
 }
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Point3D.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Point3D.cs
index 6566a00084e..a32fb94b140 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Point3D.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Point3D.cs
@@ -10,13 +10,20 @@
 //
 
 using MS.Internal;
+using MS.Internal.Collections;
+using MS.Utility;
+using System.Collections;
 using System.ComponentModel;
+using System.Globalization;
+using System.Text;
 using System.Windows.Markup;
 using System.Windows.Media.Media3D.Converters;
-// These types are aliased to match the unamanaged names used in interop
+using System.Windows.Media.Animation;
+using System.Windows.Media.Composition;
 
 namespace System.Windows.Media.Media3D
 {
+
     [Serializable]
     [TypeConverter(typeof(Point3DConverter))]
     [ValueSerializer(typeof(Point3DValueSerializer))] // Used by MarkupWriter
@@ -189,7 +196,8 @@ public double X
             {
                 _x = value;
             }
-}
+
+        }
 
         /// <summary>
         ///     Y - double.  Default value is 0.
@@ -205,7 +213,8 @@ public double Y
             {
                 _y = value;
             }
-}
+
+        }
 
         /// <summary>
         ///     Z - double.  Default value is 0.
@@ -221,7 +230,8 @@ public double Z
             {
                 _z = value;
             }
-}
+
+        }
 
         #endregion Public Properties
 
@@ -274,6 +284,7 @@ public double Z
         /// </returns>
         public override string ToString()
         {
+
             // Delegate to the internal method which implements all ToString calls.
             return ConvertToString(null /* format string */, null /* format provider */);
         }
@@ -287,6 +298,7 @@ public override string ToString()
         /// </returns>
         public string ToString(IFormatProvider provider)
         {
+
             // Delegate to the internal method which implements all ToString calls.
             return ConvertToString(null /* format string */, provider);
         }
@@ -302,6 +314,7 @@ public string ToString(IFormatProvider provider)
         /// </returns>
         string IFormattable.ToString(string format, IFormatProvider provider)
         {
+
             // Delegate to the internal method which implements all ToString calls.
             return ConvertToString(format, provider);
         }
@@ -356,6 +369,9 @@ internal string ConvertToString(string format, IFormatProvider provider)
         internal double _y;
         internal double _z;
 
+
+
+
         #endregion Internal Fields
 
 
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Point3DCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Point3DCollection.cs
index f2eff13c443..ff650f2854c 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Point3DCollection.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Point3DCollection.cs
@@ -2,25 +2,30 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+//
+//
 // This file was generated, please do not edit it directly.
+//
 // Please see MilCodeGen.html for more information.
+//
 
 using MS.Internal;
+using MS.Internal.Collections;
 using MS.Utility;
 using System.Collections;
 using System.ComponentModel;
+using System.Globalization;
 using System.Text;
 using System.Windows.Markup;
 using System.Windows.Media.Media3D.Converters;
-
-// These types are aliased to match the unamanaged names used in interop
+using System.Windows.Media.Animation;
+using System.Windows.Media.Composition;
 
 namespace System.Windows.Media.Media3D
 {
     /// <summary>
     /// A collection of Point3Ds.
     /// </summary>
-
     [TypeConverter(typeof(Point3DCollectionConverter))]
     [ValueSerializer(typeof(Point3DCollectionValueSerializer))] // Used by MarkupWriter
     public sealed partial class Point3DCollection : Freezable, IFormattable, IList, IList<Point3D>
@@ -111,6 +116,8 @@ public int IndexOf(Point3D value)
         /// </summary>
         public void Insert(int index, Point3D value)
         {
+
+
             WritePreamble();
             _collection.Insert(index, value);
 
@@ -188,6 +195,8 @@ public Point3D this[int index]
             }
             set
             {
+
+
                 WritePreamble();
                 _collection[ index ] = value;
 
@@ -524,7 +533,8 @@ protected override void CloneCore(Freezable source)
             {
                 _collection.Add(sourcePoint3DCollection._collection[i]);
             }
-}
+
+        }
         /// <summary>
         /// Implementation of Freezable.CloneCurrentValueCore()
         /// </summary>
@@ -542,7 +552,8 @@ protected override void CloneCurrentValueCore(Freezable source)
             {
                 _collection.Add(sourcePoint3DCollection._collection[i]);
             }
-}
+
+        }
         /// <summary>
         /// Implementation of Freezable.GetAsFrozenCore()
         /// </summary>
@@ -560,7 +571,8 @@ protected override void GetAsFrozenCore(Freezable source)
             {
                 _collection.Add(sourcePoint3DCollection._collection[i]);
             }
-}
+
+        }
         /// <summary>
         /// Implementation of Freezable.GetCurrentValueAsFrozenCore()
         /// </summary>
@@ -578,7 +590,8 @@ protected override void GetCurrentValueAsFrozenCore(Freezable source)
             {
                 _collection.Add(sourcePoint3DCollection._collection[i]);
             }
-}
+
+        }
 
 
         #endregion ProtectedMethods
@@ -772,6 +785,7 @@ internal Enumerator(Point3DCollection list)
 
             void IDisposable.Dispose()
             {
+
             }
 
             /// <summary>
@@ -912,6 +926,7 @@ public Point3DCollection(IEnumerable<Point3D> collection)
 
             ArgumentNullException.ThrowIfNull(collection);
 
+
             ICollection<Point3D> icollectionOfT = collection as ICollection<Point3D>;
 
             if (icollectionOfT != null)
@@ -932,8 +947,11 @@ public Point3DCollection(IEnumerable<Point3D> collection)
 
                     foreach (Point3D item in collection)
                     {
+
                         _collection.Add(item);
                     }
+
+
                 }
             }
 
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Point3DCollectionConverter.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Point3DCollectionConverter.cs
index 333fb7a4108..e5e6a55f196 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Point3DCollectionConverter.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Point3DCollectionConverter.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -9,8 +9,17 @@
 // Please see MilCodeGen.html for more information.
 //
 
+using MS.Internal;
+using MS.Internal.Collections;
+using MS.Utility;
+using System.Collections;
 using System.ComponentModel;
 using System.Globalization;
+using System.Text;
+using System.Windows.Markup;
+using System.Windows.Media.Media3D.Converters;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Composition;
 
 namespace System.Windows.Media.Media3D
 {
@@ -75,9 +84,8 @@ public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo c
                 throw GetConvertFromException(value);
             }
 
-            String source = value as string;
 
-            if (source != null)
+            if (value is string source)
             {
                 return Point3DCollection.Parse(source);
             }
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Point3DConverter.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Point3DConverter.cs
index 03802d85b75..ae652e1bb0e 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Point3DConverter.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Point3DConverter.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -9,8 +9,17 @@
 // Please see MilCodeGen.html for more information.
 //
 
+using MS.Internal;
+using MS.Internal.Collections;
+using MS.Utility;
+using System.Collections;
 using System.ComponentModel;
 using System.Globalization;
+using System.Text;
+using System.Windows.Markup;
+using System.Windows.Media.Media3D.Converters;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Composition;
 
 namespace System.Windows.Media.Media3D
 {
@@ -75,9 +84,8 @@ public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo c
                 throw GetConvertFromException(value);
             }
 
-            String source = value as string;
 
-            if (source != null)
+            if (value is string source)
             {
                 return Point3D.Parse(source);
             }
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Point4D.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Point4D.cs
index 0a80374010e..a027debd420 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Point4D.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Point4D.cs
@@ -10,13 +10,20 @@
 //
 
 using MS.Internal;
+using MS.Internal.Collections;
+using MS.Utility;
+using System.Collections;
 using System.ComponentModel;
+using System.Globalization;
+using System.Text;
 using System.Windows.Markup;
 using System.Windows.Media.Media3D.Converters;
-// These types are aliased to match the unamanaged names used in interop
+using System.Windows.Media.Animation;
+using System.Windows.Media.Composition;
 
 namespace System.Windows.Media.Media3D
 {
+
     [Serializable]
     [TypeConverter(typeof(Point4DConverter))]
     [ValueSerializer(typeof(Point4DValueSerializer))] // Used by MarkupWriter
@@ -193,7 +200,8 @@ public double X
             {
                 _x = value;
             }
-}
+
+        }
 
         /// <summary>
         ///     Y - double.  Default value is 0.
@@ -209,7 +217,8 @@ public double Y
             {
                 _y = value;
             }
-}
+
+        }
 
         /// <summary>
         ///     Z - double.  Default value is 0.
@@ -225,7 +234,8 @@ public double Z
             {
                 _z = value;
             }
-}
+
+        }
 
         /// <summary>
         ///     W - double.  Default value is 0.
@@ -241,7 +251,8 @@ public double W
             {
                 _w = value;
             }
-}
+
+        }
 
         #endregion Public Properties
 
@@ -294,6 +305,7 @@ public double W
         /// </returns>
         public override string ToString()
         {
+
             // Delegate to the internal method which implements all ToString calls.
             return ConvertToString(null /* format string */, null /* format provider */);
         }
@@ -307,6 +319,7 @@ public override string ToString()
         /// </returns>
         public string ToString(IFormatProvider provider)
         {
+
             // Delegate to the internal method which implements all ToString calls.
             return ConvertToString(null /* format string */, provider);
         }
@@ -322,6 +335,7 @@ public string ToString(IFormatProvider provider)
         /// </returns>
         string IFormattable.ToString(string format, IFormatProvider provider)
         {
+
             // Delegate to the internal method which implements all ToString calls.
             return ConvertToString(format, provider);
         }
@@ -378,6 +392,9 @@ internal string ConvertToString(string format, IFormatProvider provider)
         internal double _z;
         internal double _w;
 
+
+
+
         #endregion Internal Fields
 
 
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Point4DConverter.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Point4DConverter.cs
index 2301f6bf9a5..8d7dc060398 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Point4DConverter.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Point4DConverter.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -9,8 +9,17 @@
 // Please see MilCodeGen.html for more information.
 //
 
+using MS.Internal;
+using MS.Internal.Collections;
+using MS.Utility;
+using System.Collections;
 using System.ComponentModel;
 using System.Globalization;
+using System.Text;
+using System.Windows.Markup;
+using System.Windows.Media.Media3D.Converters;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Composition;
 
 namespace System.Windows.Media.Media3D
 {
@@ -75,9 +84,8 @@ public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo c
                 throw GetConvertFromException(value);
             }
 
-            String source = value as string;
 
-            if (source != null)
+            if (value is string source)
             {
                 return Point4D.Parse(source);
             }
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/PointLight.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/PointLight.cs
index 6bd27edb363..c489597139f 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/PointLight.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/PointLight.cs
@@ -9,11 +9,22 @@
 // Please see MilCodeGen.html for more information.
 //
 
+using MS.Internal;
+using MS.Internal.Collections;
+using MS.Utility;
+using System.Collections;
+using System.ComponentModel;
+using System.Globalization;
+using System.Text;
+using System.Windows.Markup;
+using System.Windows.Media.Media3D.Converters;
+using System.Windows.Media.Animation;
 using System.Windows.Media.Composition;
-// These types are aliased to match the unamanaged names used in interop
 
 namespace System.Windows.Media.Media3D
 {
+
+
     sealed partial class PointLight : PointLightBase
     {
         //------------------------------------------------------
@@ -171,6 +182,7 @@ internal override void UpdateResource(DUCE.Channel channel, bool skipOnChannelCh
         }
         internal override DUCE.ResourceHandle AddRefOnChannelCore(DUCE.Channel channel)
         {
+
                 if (_duceResource.CreateOrAddRefOnChannel(this, channel, System.Windows.Media.Composition.DUCE.ResourceType.TYPE_POINTLIGHT))
                 {
                     Transform3D vTransform = Transform;
@@ -183,9 +195,11 @@ internal override DUCE.ResourceHandle AddRefOnChannelCore(DUCE.Channel channel)
                 }
 
                 return _duceResource.GetHandle(channel);
-}
+
+        }
         internal override void ReleaseOnChannelCore(DUCE.Channel channel)
         {
+
                 Debug.Assert(_duceResource.IsOnChannel(channel));
 
                 if (_duceResource.ReleaseOnChannel(channel))
@@ -194,8 +208,10 @@ internal override void ReleaseOnChannelCore(DUCE.Channel channel)
                     if (vTransform != null) ((DUCE.IResource)vTransform).ReleaseOnChannel(channel);
 
                     ReleaseOnChannelAnimations(channel);
-}
-}
+
+                }
+
+        }
         internal override DUCE.ResourceHandle GetHandleCore(DUCE.Channel channel)
         {
             // Note that we are in a lock here already.
@@ -253,6 +269,8 @@ internal override DUCE.Channel GetChannelCore(int index)
 
         internal System.Windows.Media.Composition.DUCE.MultiChannelResource _duceResource = new System.Windows.Media.Composition.DUCE.MultiChannelResource();
 
+
+
         #endregion Internal Fields
 
 
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/PointLightBase.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/PointLightBase.cs
index 20fd891db63..a64dce982ab 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/PointLightBase.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/PointLightBase.cs
@@ -9,9 +9,22 @@
 // Please see MilCodeGen.html for more information.
 //
 
-// These types are aliased to match the unamanaged names used in interop
+using MS.Internal;
+using MS.Internal.Collections;
+using MS.Utility;
+using System.Collections;
+using System.ComponentModel;
+using System.Globalization;
+using System.Text;
+using System.Windows.Markup;
+using System.Windows.Media.Media3D.Converters;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Composition;
+
 namespace System.Windows.Media.Media3D
 {
+
+
     abstract partial class PointLightBase : Light
     {
         //------------------------------------------------------
@@ -282,7 +295,6 @@ static PointLightBase()
             // of your app.
 
 
-
             // Initializations
             Type typeofThis = typeof(PointLightBase);
             PositionProperty =
@@ -332,6 +344,8 @@ static PointLightBase()
                                    /* coerceValueCallback */ null);
         }
 
+
+
         #endregion Constructors
     }
 }
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/ProjectionCamera.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/ProjectionCamera.cs
index 5ee10e68d55..29f8e446e73 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/ProjectionCamera.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/ProjectionCamera.cs
@@ -9,9 +9,22 @@
 // Please see MilCodeGen.html for more information.
 //
 
-// These types are aliased to match the unamanaged names used in interop
+using MS.Internal;
+using MS.Internal.Collections;
+using MS.Utility;
+using System.Collections;
+using System.ComponentModel;
+using System.Globalization;
+using System.Text;
+using System.Windows.Markup;
+using System.Windows.Media.Media3D.Converters;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Composition;
+
 namespace System.Windows.Media.Media3D
 {
+
+
     abstract partial class ProjectionCamera : Camera
     {
         //------------------------------------------------------
@@ -282,7 +295,6 @@ static ProjectionCamera()
             // of your app.
 
 
-
             // Initializations
             Type typeofThis = typeof(ProjectionCamera);
             NearPlaneDistanceProperty =
@@ -332,6 +344,8 @@ static ProjectionCamera()
                                    /* coerceValueCallback */ null);
         }
 
+
+
         #endregion Constructors
     }
 }
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Quaternion.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Quaternion.cs
index 29eab1b7cec..93d8bfe2730 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Quaternion.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Quaternion.cs
@@ -10,13 +10,20 @@
 //
 
 using MS.Internal;
+using MS.Internal.Collections;
+using MS.Utility;
+using System.Collections;
 using System.ComponentModel;
+using System.Globalization;
+using System.Text;
 using System.Windows.Markup;
 using System.Windows.Media.Media3D.Converters;
-// These types are aliased to match the unamanaged names used in interop
+using System.Windows.Media.Animation;
+using System.Windows.Media.Composition;
 
 namespace System.Windows.Media.Media3D
 {
+
     [Serializable]
     [TypeConverter(typeof(QuaternionConverter))]
     [ValueSerializer(typeof(QuaternionValueSerializer))] // Used by MarkupWriter
@@ -262,6 +269,7 @@ public static Quaternion Parse(string source)
         /// </returns>
         public override string ToString()
         {
+
             // Delegate to the internal method which implements all ToString calls.
             return ConvertToString(null /* format string */, null /* format provider */);
         }
@@ -275,6 +283,7 @@ public override string ToString()
         /// </returns>
         public string ToString(IFormatProvider provider)
         {
+
             // Delegate to the internal method which implements all ToString calls.
             return ConvertToString(null /* format string */, provider);
         }
@@ -290,6 +299,7 @@ public string ToString(IFormatProvider provider)
         /// </returns>
         string IFormattable.ToString(string format, IFormatProvider provider)
         {
+
             // Delegate to the internal method which implements all ToString calls.
             return ConvertToString(format, provider);
         }
@@ -321,6 +331,8 @@ internal string ConvertToString(string format, IFormatProvider provider)
                                  _w);
         }
 
+
+
         #endregion Internal Properties
 
         //------------------------------------------------------
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/QuaternionConverter.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/QuaternionConverter.cs
index 4550edeeed1..02a825c9c16 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/QuaternionConverter.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/QuaternionConverter.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -9,8 +9,17 @@
 // Please see MilCodeGen.html for more information.
 //
 
+using MS.Internal;
+using MS.Internal.Collections;
+using MS.Utility;
+using System.Collections;
 using System.ComponentModel;
 using System.Globalization;
+using System.Text;
+using System.Windows.Markup;
+using System.Windows.Media.Media3D.Converters;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Composition;
 
 namespace System.Windows.Media.Media3D
 {
@@ -75,9 +84,8 @@ public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo c
                 throw GetConvertFromException(value);
             }
 
-            String source = value as string;
 
-            if (source != null)
+            if (value is string source)
             {
                 return Quaternion.Parse(source);
             }
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/QuaternionRotation3D.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/QuaternionRotation3D.cs
index 44c826a60f2..9544753a23b 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/QuaternionRotation3D.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/QuaternionRotation3D.cs
@@ -9,11 +9,22 @@
 // Please see MilCodeGen.html for more information.
 //
 
+using MS.Internal;
+using MS.Internal.Collections;
+using MS.Utility;
+using System.Collections;
+using System.ComponentModel;
+using System.Globalization;
+using System.Text;
+using System.Windows.Markup;
+using System.Windows.Media.Media3D.Converters;
+using System.Windows.Media.Animation;
 using System.Windows.Media.Composition;
-// These types are aliased to match the unamanaged names used in interop
 
 namespace System.Windows.Media.Media3D
 {
+
+
     sealed partial class QuaternionRotation3D : Rotation3D
     {
         //------------------------------------------------------
@@ -146,8 +157,11 @@ internal override void UpdateResource(DUCE.Channel channel, bool skipOnChannelCh
         }
         internal override DUCE.ResourceHandle AddRefOnChannelCore(DUCE.Channel channel)
         {
+
                 if (_duceResource.CreateOrAddRefOnChannel(this, channel, System.Windows.Media.Composition.DUCE.ResourceType.TYPE_QUATERNIONROTATION3D))
                 {
+
+
                     AddRefOnChannelAnimations(channel);
 
 
@@ -155,16 +169,22 @@ internal override DUCE.ResourceHandle AddRefOnChannelCore(DUCE.Channel channel)
                 }
 
                 return _duceResource.GetHandle(channel);
-}
+
+        }
         internal override void ReleaseOnChannelCore(DUCE.Channel channel)
         {
+
                 Debug.Assert(_duceResource.IsOnChannel(channel));
 
                 if (_duceResource.ReleaseOnChannel(channel))
                 {
+
+
                     ReleaseOnChannelAnimations(channel);
-}
-}
+
+                }
+
+        }
         internal override DUCE.ResourceHandle GetHandleCore(DUCE.Channel channel)
         {
             // Note that we are in a lock here already.
@@ -260,7 +280,6 @@ static QuaternionRotation3D()
             // of your app.
 
 
-
             // Initializations
             Type typeofThis = typeof(QuaternionRotation3D);
             QuaternionProperty =
@@ -274,6 +293,8 @@ static QuaternionRotation3D()
                                    /* coerceValueCallback */ null);
         }
 
+
+
         #endregion Constructors
     }
 }
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Rect3D.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Rect3D.cs
index 5aa09ae8c58..7c4adb2466f 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Rect3D.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Rect3D.cs
@@ -10,13 +10,20 @@
 //
 
 using MS.Internal;
+using MS.Internal.Collections;
+using MS.Utility;
+using System.Collections;
 using System.ComponentModel;
+using System.Globalization;
+using System.Text;
 using System.Windows.Markup;
 using System.Windows.Media.Media3D.Converters;
-// These types are aliased to match the unamanaged names used in interop
+using System.Windows.Media.Animation;
+using System.Windows.Media.Composition;
 
 namespace System.Windows.Media.Media3D
 {
+
     [Serializable]
     [TypeConverter(typeof(Rect3DConverter))]
     [ValueSerializer(typeof(Rect3DValueSerializer))] // Used by MarkupWriter
@@ -263,6 +270,7 @@ public static Rect3D Parse(string source)
         /// </returns>
         public override string ToString()
         {
+
             // Delegate to the internal method which implements all ToString calls.
             return ConvertToString(null /* format string */, null /* format provider */);
         }
@@ -276,6 +284,7 @@ public override string ToString()
         /// </returns>
         public string ToString(IFormatProvider provider)
         {
+
             // Delegate to the internal method which implements all ToString calls.
             return ConvertToString(null /* format string */, provider);
         }
@@ -291,6 +300,7 @@ public string ToString(IFormatProvider provider)
         /// </returns>
         string IFormattable.ToString(string format, IFormatProvider provider)
         {
+
             // Delegate to the internal method which implements all ToString calls.
             return ConvertToString(format, provider);
         }
@@ -356,6 +366,9 @@ internal string ConvertToString(string format, IFormatProvider provider)
         internal double _sizeY;
         internal double _sizeZ;
 
+
+
+
         #endregion Internal Fields
 
 
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Rect3DConverter.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Rect3DConverter.cs
index 74f8319ce6b..47c7dc1273d 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Rect3DConverter.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Rect3DConverter.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -9,8 +9,17 @@
 // Please see MilCodeGen.html for more information.
 //
 
+using MS.Internal;
+using MS.Internal.Collections;
+using MS.Utility;
+using System.Collections;
 using System.ComponentModel;
 using System.Globalization;
+using System.Text;
+using System.Windows.Markup;
+using System.Windows.Media.Media3D.Converters;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Composition;
 
 namespace System.Windows.Media.Media3D
 {
@@ -75,9 +84,8 @@ public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo c
                 throw GetConvertFromException(value);
             }
 
-            String source = value as string;
 
-            if (source != null)
+            if (value is string source)
             {
                 return Rect3D.Parse(source);
             }
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/RotateTransform3D.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/RotateTransform3D.cs
index e50b0a77a2e..f0a9347268a 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/RotateTransform3D.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/RotateTransform3D.cs
@@ -9,11 +9,22 @@
 // Please see MilCodeGen.html for more information.
 //
 
+using MS.Internal;
+using MS.Internal.Collections;
+using MS.Utility;
+using System.Collections;
+using System.ComponentModel;
+using System.Globalization;
+using System.Text;
+using System.Windows.Markup;
+using System.Windows.Media.Media3D.Converters;
+using System.Windows.Media.Animation;
 using System.Windows.Media.Composition;
-// These types are aliased to match the unamanaged names used in interop
 
 namespace System.Windows.Media.Media3D
 {
+
+
     sealed partial class RotateTransform3D : AffineTransform3D
     {
         //------------------------------------------------------
@@ -82,6 +93,10 @@ private static void CenterZPropertyChanged(DependencyObject d, DependencyPropert
         }
         private static void RotationPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
+
+
+
+
             // The first change to the default value of a mutable collection property (e.g. GeometryGroup.Children) 
             // will promote the property value from a default value to a local value. This is technically a sub-property 
             // change because the collection was changed and not a new collection set (GeometryGroup.Children.
@@ -277,6 +292,7 @@ internal override void UpdateResource(DUCE.Channel channel, bool skipOnChannelCh
         }
         internal override DUCE.ResourceHandle AddRefOnChannelCore(DUCE.Channel channel)
         {
+
                 if (_duceResource.CreateOrAddRefOnChannel(this, channel, System.Windows.Media.Composition.DUCE.ResourceType.TYPE_ROTATETRANSFORM3D))
                 {
                     Rotation3D vRotation = Rotation;
@@ -289,9 +305,11 @@ internal override DUCE.ResourceHandle AddRefOnChannelCore(DUCE.Channel channel)
                 }
 
                 return _duceResource.GetHandle(channel);
-}
+
+        }
         internal override void ReleaseOnChannelCore(DUCE.Channel channel)
         {
+
                 Debug.Assert(_duceResource.IsOnChannel(channel));
 
                 if (_duceResource.ReleaseOnChannel(channel))
@@ -300,8 +318,10 @@ internal override void ReleaseOnChannelCore(DUCE.Channel channel)
                     if (vRotation != null) ((DUCE.IResource)vRotation).ReleaseOnChannel(channel);
 
                     ReleaseOnChannelAnimations(channel);
-}
-}
+
+                }
+
+        }
         internal override DUCE.ResourceHandle GetHandleCore(DUCE.Channel channel)
         {
             // Note that we are in a lock here already.
@@ -400,7 +420,6 @@ static RotateTransform3D()
             // to make sure that they are not mutable, otherwise we will throw
             // if these get touched by more than one thread in the lifetime
             // of your app.
-
             Debug.Assert(s_Rotation == null || s_Rotation.IsFrozen,
                 "Detected context bound default value RotateTransform3D.s_Rotation (See OS Bug #947272).");
 
@@ -445,6 +464,8 @@ static RotateTransform3D()
                                    /* coerceValueCallback */ null);
         }
 
+
+
         #endregion Constructors
     }
 }
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Rotation3D.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Rotation3D.cs
index 8959272393a..4e02524a1d1 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Rotation3D.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Rotation3D.cs
@@ -9,12 +9,22 @@
 // Please see MilCodeGen.html for more information.
 //
 
+using MS.Internal;
+using MS.Internal.Collections;
+using MS.Utility;
+using System.Collections;
+using System.ComponentModel;
+using System.Globalization;
+using System.Text;
+using System.Windows.Markup;
+using System.Windows.Media.Media3D.Converters;
 using System.Windows.Media.Animation;
 using System.Windows.Media.Composition;
-// These types are aliased to match the unamanaged names used in interop
 
 namespace System.Windows.Media.Media3D
 {
+
+
     abstract partial class Rotation3D : Animatable, IFormattable, DUCE.IResource
     {
         //------------------------------------------------------
@@ -218,6 +228,7 @@ internal virtual string ConvertToString(string format, IFormatProvider provider)
             return base.ToString();
         }
 
+
         #endregion Internal Properties
 
         //------------------------------------------------------
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/ScaleTransform3D.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/ScaleTransform3D.cs
index 398caf18f9f..10d7a603a92 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/ScaleTransform3D.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/ScaleTransform3D.cs
@@ -9,11 +9,22 @@
 // Please see MilCodeGen.html for more information.
 //
 
+using MS.Internal;
+using MS.Internal.Collections;
+using MS.Utility;
+using System.Collections;
+using System.ComponentModel;
+using System.Globalization;
+using System.Text;
+using System.Windows.Markup;
+using System.Windows.Media.Media3D.Converters;
+using System.Windows.Media.Animation;
 using System.Windows.Media.Composition;
-// These types are aliased to match the unamanaged names used in interop
 
 namespace System.Windows.Media.Media3D
 {
+
+
     sealed partial class ScaleTransform3D : AffineTransform3D
     {
         //------------------------------------------------------
@@ -301,8 +312,11 @@ internal override void UpdateResource(DUCE.Channel channel, bool skipOnChannelCh
         }
         internal override DUCE.ResourceHandle AddRefOnChannelCore(DUCE.Channel channel)
         {
+
                 if (_duceResource.CreateOrAddRefOnChannel(this, channel, System.Windows.Media.Composition.DUCE.ResourceType.TYPE_SCALETRANSFORM3D))
                 {
+
+
                     AddRefOnChannelAnimations(channel);
 
 
@@ -310,16 +324,22 @@ internal override DUCE.ResourceHandle AddRefOnChannelCore(DUCE.Channel channel)
                 }
 
                 return _duceResource.GetHandle(channel);
-}
+
+        }
         internal override void ReleaseOnChannelCore(DUCE.Channel channel)
         {
+
                 Debug.Assert(_duceResource.IsOnChannel(channel));
 
                 if (_duceResource.ReleaseOnChannel(channel))
                 {
+
+
                     ReleaseOnChannelAnimations(channel);
-}
-}
+
+                }
+
+        }
         internal override DUCE.ResourceHandle GetHandleCore(DUCE.Channel channel)
         {
             // Note that we are in a lock here already.
@@ -432,7 +452,6 @@ static ScaleTransform3D()
             // of your app.
 
 
-
             // Initializations
             Type typeofThis = typeof(ScaleTransform3D);
             ScaleXProperty =
@@ -491,6 +510,8 @@ static ScaleTransform3D()
                                    /* coerceValueCallback */ null);
         }
 
+
+
         #endregion Constructors
     }
 }
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Size3D.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Size3D.cs
index 419a25e070e..42d12dda226 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Size3D.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Size3D.cs
@@ -10,13 +10,20 @@
 //
 
 using MS.Internal;
+using MS.Internal.Collections;
+using MS.Utility;
+using System.Collections;
 using System.ComponentModel;
+using System.Globalization;
+using System.Text;
 using System.Windows.Markup;
 using System.Windows.Media.Media3D.Converters;
-// These types are aliased to match the unamanaged names used in interop
+using System.Windows.Media.Animation;
+using System.Windows.Media.Composition;
 
 namespace System.Windows.Media.Media3D
 {
+
     [Serializable]
     [TypeConverter(typeof(Size3DConverter))]
     [ValueSerializer(typeof(Size3DValueSerializer))] // Used by MarkupWriter
@@ -251,6 +258,7 @@ public static Size3D Parse(string source)
         /// </returns>
         public override string ToString()
         {
+
             // Delegate to the internal method which implements all ToString calls.
             return ConvertToString(null /* format string */, null /* format provider */);
         }
@@ -264,6 +272,7 @@ public override string ToString()
         /// </returns>
         public string ToString(IFormatProvider provider)
         {
+
             // Delegate to the internal method which implements all ToString calls.
             return ConvertToString(null /* format string */, provider);
         }
@@ -279,6 +288,7 @@ public string ToString(IFormatProvider provider)
         /// </returns>
         string IFormattable.ToString(string format, IFormatProvider provider)
         {
+
             // Delegate to the internal method which implements all ToString calls.
             return ConvertToString(format, provider);
         }
@@ -338,6 +348,9 @@ internal string ConvertToString(string format, IFormatProvider provider)
         internal double _y;
         internal double _z;
 
+
+
+
         #endregion Internal Fields
 
 
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Size3DConverter.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Size3DConverter.cs
index 2fe7893e371..9430623b521 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Size3DConverter.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Size3DConverter.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -9,8 +9,17 @@
 // Please see MilCodeGen.html for more information.
 //
 
+using MS.Internal;
+using MS.Internal.Collections;
+using MS.Utility;
+using System.Collections;
 using System.ComponentModel;
 using System.Globalization;
+using System.Text;
+using System.Windows.Markup;
+using System.Windows.Media.Media3D.Converters;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Composition;
 
 namespace System.Windows.Media.Media3D
 {
@@ -75,9 +84,8 @@ public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo c
                 throw GetConvertFromException(value);
             }
 
-            String source = value as string;
 
-            if (source != null)
+            if (value is string source)
             {
                 return Size3D.Parse(source);
             }
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/SpecularMaterial.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/SpecularMaterial.cs
index bd5687871e3..c18428e754d 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/SpecularMaterial.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/SpecularMaterial.cs
@@ -9,11 +9,22 @@
 // Please see MilCodeGen.html for more information.
 //
 
+using MS.Internal;
+using MS.Internal.Collections;
+using MS.Utility;
+using System.Collections;
+using System.ComponentModel;
+using System.Globalization;
+using System.Text;
+using System.Windows.Markup;
+using System.Windows.Media.Media3D.Converters;
+using System.Windows.Media.Animation;
 using System.Windows.Media.Composition;
-// These types are aliased to match the unamanaged names used in interop
 
 namespace System.Windows.Media.Media3D
 {
+
+
     sealed partial class SpecularMaterial : Material
     {
         //------------------------------------------------------
@@ -62,6 +73,10 @@ private static void ColorPropertyChanged(DependencyObject d, DependencyPropertyC
         }
         private static void BrushPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
+
+
+
+
             // The first change to the default value of a mutable collection property (e.g. GeometryGroup.Children) 
             // will promote the property value from a default value to a local value. This is technically a sub-property 
             // change because the collection was changed and not a new collection set (GeometryGroup.Children.
@@ -225,6 +240,7 @@ internal override void UpdateResource(DUCE.Channel channel, bool skipOnChannelCh
         }
         internal override DUCE.ResourceHandle AddRefOnChannelCore(DUCE.Channel channel)
         {
+
                 if (_duceResource.CreateOrAddRefOnChannel(this, channel, System.Windows.Media.Composition.DUCE.ResourceType.TYPE_SPECULARMATERIAL))
                 {
                     Brush vBrush = Brush;
@@ -237,9 +253,11 @@ internal override DUCE.ResourceHandle AddRefOnChannelCore(DUCE.Channel channel)
                 }
 
                 return _duceResource.GetHandle(channel);
-}
+
+        }
         internal override void ReleaseOnChannelCore(DUCE.Channel channel)
         {
+
                 Debug.Assert(_duceResource.IsOnChannel(channel));
 
                 if (_duceResource.ReleaseOnChannel(channel))
@@ -248,8 +266,10 @@ internal override void ReleaseOnChannelCore(DUCE.Channel channel)
                     if (vBrush != null) ((DUCE.IResource)vBrush).ReleaseOnChannel(channel);
 
                     ReleaseOnChannelAnimations(channel);
-}
-}
+
+                }
+
+        }
         internal override DUCE.ResourceHandle GetHandleCore(DUCE.Channel channel)
         {
             // Note that we are in a lock here already.
@@ -353,7 +373,6 @@ static SpecularMaterial()
             // to make sure that they are not mutable, otherwise we will throw
             // if these get touched by more than one thread in the lifetime
             // of your app.
-
             Debug.Assert(s_Brush == null || s_Brush.IsFrozen,
                 "Detected context bound default value SpecularMaterial.s_Brush (See OS Bug #947272).");
 
@@ -389,6 +408,8 @@ static SpecularMaterial()
                                    /* coerceValueCallback */ null);
         }
 
+
+
         #endregion Constructors
     }
 }
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/SpotLight.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/SpotLight.cs
index 880b3e2bcff..dcacb953d61 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/SpotLight.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/SpotLight.cs
@@ -9,11 +9,22 @@
 // Please see MilCodeGen.html for more information.
 //
 
+using MS.Internal;
+using MS.Internal.Collections;
+using MS.Utility;
+using System.Collections;
+using System.ComponentModel;
+using System.Globalization;
+using System.Text;
+using System.Windows.Markup;
+using System.Windows.Media.Media3D.Converters;
+using System.Windows.Media.Animation;
 using System.Windows.Media.Composition;
-// These types are aliased to match the unamanaged names used in interop
 
 namespace System.Windows.Media.Media3D
 {
+
+
     sealed partial class SpotLight : PointLightBase
     {
         //------------------------------------------------------
@@ -252,6 +263,7 @@ internal override void UpdateResource(DUCE.Channel channel, bool skipOnChannelCh
         }
         internal override DUCE.ResourceHandle AddRefOnChannelCore(DUCE.Channel channel)
         {
+
                 if (_duceResource.CreateOrAddRefOnChannel(this, channel, System.Windows.Media.Composition.DUCE.ResourceType.TYPE_SPOTLIGHT))
                 {
                     Transform3D vTransform = Transform;
@@ -264,9 +276,11 @@ internal override DUCE.ResourceHandle AddRefOnChannelCore(DUCE.Channel channel)
                 }
 
                 return _duceResource.GetHandle(channel);
-}
+
+        }
         internal override void ReleaseOnChannelCore(DUCE.Channel channel)
         {
+
                 Debug.Assert(_duceResource.IsOnChannel(channel));
 
                 if (_duceResource.ReleaseOnChannel(channel))
@@ -275,8 +289,10 @@ internal override void ReleaseOnChannelCore(DUCE.Channel channel)
                     if (vTransform != null) ((DUCE.IResource)vTransform).ReleaseOnChannel(channel);
 
                     ReleaseOnChannelAnimations(channel);
-}
-}
+
+                }
+
+        }
         internal override DUCE.ResourceHandle GetHandleCore(DUCE.Channel channel)
         {
             // Note that we are in a lock here already.
@@ -369,7 +385,6 @@ static SpotLight()
             // of your app.
 
 
-
             // Initializations
             Type typeofThis = typeof(SpotLight);
             DirectionProperty =
@@ -401,6 +416,8 @@ static SpotLight()
                                    /* coerceValueCallback */ null);
         }
 
+
+
         #endregion Constructors
     }
 }
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Transform3D.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Transform3D.cs
index 5288b5968f4..0fbb041fde2 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Transform3D.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Transform3D.cs
@@ -9,11 +9,22 @@
 // Please see MilCodeGen.html for more information.
 //
 
+using MS.Internal;
+using MS.Internal.Collections;
+using MS.Utility;
+using System.Collections;
+using System.ComponentModel;
+using System.Globalization;
+using System.Text;
+using System.Windows.Markup;
+using System.Windows.Media.Media3D.Converters;
+using System.Windows.Media.Animation;
 using System.Windows.Media.Composition;
-// These types are aliased to match the unamanaged names used in interop
 
 namespace System.Windows.Media.Media3D
 {
+
+
     abstract partial class Transform3D : GeneralTransform3D, DUCE.IResource
     {
         //------------------------------------------------------
@@ -148,6 +159,7 @@ DUCE.Channel DUCE.IResource.GetChannel(int index)
             return GetChannelCore(index);
         }
 
+
         #endregion Internal Methods
 
         //------------------------------------------------------
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Transform3DCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Transform3DCollection.cs
index 0a8491b8428..0083f05eeb0 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Transform3DCollection.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Transform3DCollection.cs
@@ -2,21 +2,31 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+//
+//
 // This file was generated, please do not edit it directly.
+//
 // Please see MilCodeGen.html for more information.
+//
 
+using MS.Internal;
 using MS.Internal.Collections;
 using MS.Utility;
 using System.Collections;
+using System.ComponentModel;
+using System.Globalization;
+using System.Text;
+using System.Windows.Markup;
+using System.Windows.Media.Media3D.Converters;
 using System.Windows.Media.Animation;
-
-// These types are aliased to match the unamanaged names used in interop
+using System.Windows.Media.Composition;
 
 namespace System.Windows.Media.Media3D
 {
     /// <summary>
     /// A collection of Transform3D objects.
     /// </summary>
+
     public sealed partial class Transform3DCollection : Animatable, IList, IList<Transform3D>
     {
         //------------------------------------------------------
@@ -152,7 +162,7 @@ public bool Remove(Transform3D value)
             // not in the collection.  Therefore we need to first verify the old value exists
             // before calling OnFreezablePropertyChanged.  Since we already need to locate
             // the item in the collection we keep the index and use RemoveAt(...) to do
-            // the work.#1016178)
+            // the work.  (Windows OS #1016178)
 
             // We use the public IndexOf to guard our UIContext since OnFreezablePropertyChanged
             // is only called conditionally.  IList.IndexOf returns -1 if the value is not found.
@@ -241,6 +251,7 @@ public Transform3D this[int index]
 
                 if (!Object.ReferenceEquals(_collection[ index ], value))
                 {
+
                     Transform3D oldValue = _collection[ index ];
                     OnFreezablePropertyChanged(oldValue, value);
 
@@ -617,7 +628,8 @@ protected override void CloneCore(Freezable source)
                 _collection.Add(newValue);
                 OnInsert(newValue);
             }
-}
+
+        }
         /// <summary>
         /// Implementation of Freezable.CloneCurrentValueCore()
         /// </summary>
@@ -638,7 +650,8 @@ protected override void CloneCurrentValueCore(Freezable source)
                 _collection.Add(newValue);
                 OnInsert(newValue);
             }
-}
+
+        }
         /// <summary>
         /// Implementation of Freezable.GetAsFrozenCore()
         /// </summary>
@@ -659,7 +672,8 @@ protected override void GetAsFrozenCore(Freezable source)
                 _collection.Add(newValue);
                 OnInsert(newValue);
             }
-}
+
+        }
         /// <summary>
         /// Implementation of Freezable.GetCurrentValueAsFrozenCore()
         /// </summary>
@@ -680,7 +694,8 @@ protected override void GetCurrentValueAsFrozenCore(Freezable source)
                 _collection.Add(newValue);
                 OnInsert(newValue);
             }
-}
+
+        }
         /// <summary>
         /// Implementation of <see cref="System.Windows.Freezable.FreezeCore">Freezable.FreezeCore</see>.
         /// </summary>
@@ -784,6 +799,7 @@ internal Enumerator(Transform3DCollection list)
 
             void IDisposable.Dispose()
             {
+
             }
 
             /// <summary>
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Transform3DGroup.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Transform3DGroup.cs
index 5821ed2e081..6883d12f8a4 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Transform3DGroup.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Transform3DGroup.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -10,11 +10,21 @@
 //
 
 using MS.Internal;
+using MS.Internal.Collections;
+using MS.Utility;
+using System.Collections;
+using System.ComponentModel;
+using System.Globalization;
+using System.Text;
+using System.Windows.Markup;
+using System.Windows.Media.Media3D.Converters;
+using System.Windows.Media.Animation;
 using System.Windows.Media.Composition;
-// These types are aliased to match the unamanaged names used in interop
 
 namespace System.Windows.Media.Media3D
 {
+
+
     sealed partial class Transform3DGroup : Transform3D
     {
         //------------------------------------------------------
@@ -56,6 +66,10 @@ sealed partial class Transform3DGroup : Transform3D
 
         private static void ChildrenPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
+
+
+
+
             // The first change to the default value of a mutable collection property (e.g. GeometryGroup.Children) 
             // will promote the property value from a default value to a local value. This is technically a sub-property 
             // change because the collection was changed and not a new collection set (GeometryGroup.Children.
@@ -237,8 +251,11 @@ internal override void UpdateResource(DUCE.Channel channel, bool skipOnChannelCh
         }
         internal override DUCE.ResourceHandle AddRefOnChannelCore(DUCE.Channel channel)
         {
+
                 if (_duceResource.CreateOrAddRefOnChannel(this, channel, System.Windows.Media.Composition.DUCE.ResourceType.TYPE_TRANSFORM3DGROUP))
                 {
+
+
                     Transform3DCollection vChildren = Children;
 
                     if (vChildren != null)
@@ -256,13 +273,17 @@ internal override DUCE.ResourceHandle AddRefOnChannelCore(DUCE.Channel channel)
                 }
 
                 return _duceResource.GetHandle(channel);
-}
+
+        }
         internal override void ReleaseOnChannelCore(DUCE.Channel channel)
         {
+
                 Debug.Assert(_duceResource.IsOnChannel(channel));
 
                 if (_duceResource.ReleaseOnChannel(channel))
                 {
+
+
                     Transform3DCollection vChildren = Children;
 
                     if (vChildren != null)
@@ -274,8 +295,10 @@ internal override void ReleaseOnChannelCore(DUCE.Channel channel)
                         }
                     }
                     ReleaseOnChannelAnimations(channel);
-}
-}
+
+                }
+
+        }
         internal override DUCE.ResourceHandle GetHandleCore(DUCE.Channel channel)
         {
             // Note that we are in a lock here already.
@@ -418,7 +441,6 @@ static Transform3DGroup()
             // to make sure that they are not mutable, otherwise we will throw
             // if these get touched by more than one thread in the lifetime
             // of your app.
-
             Debug.Assert(s_Children == null || s_Children.IsFrozen,
                 "Detected context bound default value Transform3DGroup.s_Children (See OS Bug #947272).");
 
@@ -436,6 +458,8 @@ static Transform3DGroup()
                                    /* coerceValueCallback */ null);
         }
 
+
+
         #endregion Constructors
     }
 }
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/TranslateTransform3D.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/TranslateTransform3D.cs
index c56a1b49408..6ec5778b28e 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/TranslateTransform3D.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/TranslateTransform3D.cs
@@ -9,11 +9,22 @@
 // Please see MilCodeGen.html for more information.
 //
 
+using MS.Internal;
+using MS.Internal.Collections;
+using MS.Utility;
+using System.Collections;
+using System.ComponentModel;
+using System.Globalization;
+using System.Text;
+using System.Windows.Markup;
+using System.Windows.Media.Media3D.Converters;
+using System.Windows.Media.Animation;
 using System.Windows.Media.Composition;
-// These types are aliased to match the unamanaged names used in interop
 
 namespace System.Windows.Media.Media3D
 {
+
+
     sealed partial class TranslateTransform3D : AffineTransform3D
     {
         //------------------------------------------------------
@@ -208,8 +219,11 @@ internal override void UpdateResource(DUCE.Channel channel, bool skipOnChannelCh
         }
         internal override DUCE.ResourceHandle AddRefOnChannelCore(DUCE.Channel channel)
         {
+
                 if (_duceResource.CreateOrAddRefOnChannel(this, channel, System.Windows.Media.Composition.DUCE.ResourceType.TYPE_TRANSLATETRANSFORM3D))
                 {
+
+
                     AddRefOnChannelAnimations(channel);
 
 
@@ -217,16 +231,22 @@ internal override DUCE.ResourceHandle AddRefOnChannelCore(DUCE.Channel channel)
                 }
 
                 return _duceResource.GetHandle(channel);
-}
+
+        }
         internal override void ReleaseOnChannelCore(DUCE.Channel channel)
         {
+
                 Debug.Assert(_duceResource.IsOnChannel(channel));
 
                 if (_duceResource.ReleaseOnChannel(channel))
                 {
+
+
                     ReleaseOnChannelAnimations(channel);
-}
-}
+
+                }
+
+        }
         internal override DUCE.ResourceHandle GetHandleCore(DUCE.Channel channel)
         {
             // Note that we are in a lock here already.
@@ -321,7 +341,6 @@ static TranslateTransform3D()
             // of your app.
 
 
-
             // Initializations
             Type typeofThis = typeof(TranslateTransform3D);
             OffsetXProperty =
@@ -353,6 +372,8 @@ static TranslateTransform3D()
                                    /* coerceValueCallback */ null);
         }
 
+
+
         #endregion Constructors
     }
 }
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Vector3D.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Vector3D.cs
index 09c379db60f..f8302c6233a 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Vector3D.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Vector3D.cs
@@ -10,13 +10,20 @@
 //
 
 using MS.Internal;
+using MS.Internal.Collections;
+using MS.Utility;
+using System.Collections;
 using System.ComponentModel;
+using System.Globalization;
+using System.Text;
 using System.Windows.Markup;
 using System.Windows.Media.Media3D.Converters;
-// These types are aliased to match the unamanaged names used in interop
+using System.Windows.Media.Animation;
+using System.Windows.Media.Composition;
 
 namespace System.Windows.Media.Media3D
 {
+
     [Serializable]
     [TypeConverter(typeof(Vector3DConverter))]
     [ValueSerializer(typeof(Vector3DValueSerializer))] // Used by MarkupWriter
@@ -189,7 +196,8 @@ public double X
             {
                 _x = value;
             }
-}
+
+        }
 
         /// <summary>
         ///     Y - double.  Default value is 0.
@@ -205,7 +213,8 @@ public double Y
             {
                 _y = value;
             }
-}
+
+        }
 
         /// <summary>
         ///     Z - double.  Default value is 0.
@@ -221,7 +230,8 @@ public double Z
             {
                 _z = value;
             }
-}
+
+        }
 
         #endregion Public Properties
 
@@ -274,6 +284,7 @@ public double Z
         /// </returns>
         public override string ToString()
         {
+
             // Delegate to the internal method which implements all ToString calls.
             return ConvertToString(null /* format string */, null /* format provider */);
         }
@@ -287,6 +298,7 @@ public override string ToString()
         /// </returns>
         public string ToString(IFormatProvider provider)
         {
+
             // Delegate to the internal method which implements all ToString calls.
             return ConvertToString(null /* format string */, provider);
         }
@@ -302,6 +314,7 @@ public string ToString(IFormatProvider provider)
         /// </returns>
         string IFormattable.ToString(string format, IFormatProvider provider)
         {
+
             // Delegate to the internal method which implements all ToString calls.
             return ConvertToString(format, provider);
         }
@@ -356,6 +369,9 @@ internal string ConvertToString(string format, IFormatProvider provider)
         internal double _y;
         internal double _z;
 
+
+
+
         #endregion Internal Fields
 
 
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Vector3DCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Vector3DCollection.cs
index 402b2598f1e..c1e98e567e8 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Vector3DCollection.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Vector3DCollection.cs
@@ -2,25 +2,30 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+//
+//
 // This file was generated, please do not edit it directly.
+//
 // Please see MilCodeGen.html for more information.
+//
 
 using MS.Internal;
+using MS.Internal.Collections;
 using MS.Utility;
 using System.Collections;
 using System.ComponentModel;
+using System.Globalization;
 using System.Text;
 using System.Windows.Markup;
 using System.Windows.Media.Media3D.Converters;
-
-// These types are aliased to match the unamanaged names used in interop
+using System.Windows.Media.Animation;
+using System.Windows.Media.Composition;
 
 namespace System.Windows.Media.Media3D
 {
     /// <summary>
     /// A collection of Vector3Ds.
     /// </summary>
-
     [TypeConverter(typeof(Vector3DCollectionConverter))]
     [ValueSerializer(typeof(Vector3DCollectionValueSerializer))] // Used by MarkupWriter
     public sealed partial class Vector3DCollection : Freezable, IFormattable, IList, IList<Vector3D>
@@ -111,6 +116,8 @@ public int IndexOf(Vector3D value)
         /// </summary>
         public void Insert(int index, Vector3D value)
         {
+
+
             WritePreamble();
             _collection.Insert(index, value);
 
@@ -188,6 +195,8 @@ public Vector3D this[int index]
             }
             set
             {
+
+
                 WritePreamble();
                 _collection[ index ] = value;
 
@@ -524,7 +533,8 @@ protected override void CloneCore(Freezable source)
             {
                 _collection.Add(sourceVector3DCollection._collection[i]);
             }
-}
+
+        }
         /// <summary>
         /// Implementation of Freezable.CloneCurrentValueCore()
         /// </summary>
@@ -542,7 +552,8 @@ protected override void CloneCurrentValueCore(Freezable source)
             {
                 _collection.Add(sourceVector3DCollection._collection[i]);
             }
-}
+
+        }
         /// <summary>
         /// Implementation of Freezable.GetAsFrozenCore()
         /// </summary>
@@ -560,7 +571,8 @@ protected override void GetAsFrozenCore(Freezable source)
             {
                 _collection.Add(sourceVector3DCollection._collection[i]);
             }
-}
+
+        }
         /// <summary>
         /// Implementation of Freezable.GetCurrentValueAsFrozenCore()
         /// </summary>
@@ -578,7 +590,8 @@ protected override void GetCurrentValueAsFrozenCore(Freezable source)
             {
                 _collection.Add(sourceVector3DCollection._collection[i]);
             }
-}
+
+        }
 
 
         #endregion ProtectedMethods
@@ -772,6 +785,7 @@ internal Enumerator(Vector3DCollection list)
 
             void IDisposable.Dispose()
             {
+
             }
 
             /// <summary>
@@ -912,6 +926,7 @@ public Vector3DCollection(IEnumerable<Vector3D> collection)
 
             ArgumentNullException.ThrowIfNull(collection);
 
+
             ICollection<Vector3D> icollectionOfT = collection as ICollection<Vector3D>;
 
             if (icollectionOfT != null)
@@ -932,8 +947,11 @@ public Vector3DCollection(IEnumerable<Vector3D> collection)
 
                     foreach (Vector3D item in collection)
                     {
+
                         _collection.Add(item);
                     }
+
+
                 }
             }
 
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Vector3DCollectionConverter.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Vector3DCollectionConverter.cs
index 05094a2888a..7e30b4ea481 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Vector3DCollectionConverter.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Vector3DCollectionConverter.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -9,8 +9,17 @@
 // Please see MilCodeGen.html for more information.
 //
 
+using MS.Internal;
+using MS.Internal.Collections;
+using MS.Utility;
+using System.Collections;
 using System.ComponentModel;
 using System.Globalization;
+using System.Text;
+using System.Windows.Markup;
+using System.Windows.Media.Media3D.Converters;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Composition;
 
 namespace System.Windows.Media.Media3D
 {
@@ -75,9 +84,8 @@ public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo c
                 throw GetConvertFromException(value);
             }
 
-            String source = value as string;
 
-            if (source != null)
+            if (value is string source)
             {
                 return Vector3DCollection.Parse(source);
             }
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Vector3DConverter.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Vector3DConverter.cs
index 0e9dce770ad..b38f54b51d6 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Vector3DConverter.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Vector3DConverter.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -9,8 +9,17 @@
 // Please see MilCodeGen.html for more information.
 //
 
+using MS.Internal;
+using MS.Internal.Collections;
+using MS.Utility;
+using System.Collections;
 using System.ComponentModel;
 using System.Globalization;
+using System.Text;
+using System.Windows.Markup;
+using System.Windows.Media.Media3D.Converters;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Composition;
 
 namespace System.Windows.Media.Media3D
 {
@@ -75,9 +84,8 @@ public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo c
                 throw GetConvertFromException(value);
             }
 
-            String source = value as string;
 
-            if (source != null)
+            if (value is string source)
             {
                 return Vector3D.Parse(source);
             }
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Visual3D.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Visual3D.cs
index 243b42b8437..142dc7ea537 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Visual3D.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Visual3D.cs
@@ -1,13 +1,16 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+//
+//
 // This file was generated, please do not edit it directly.
 // 
 // This file was generated from the codegen template located at:
 //     wpf\src\Graphics\codegen\mcg\generators\AnimatableTemplate.cs
 //
 // Please see MilCodeGen.html for more information.
+//
 
 using System.Windows.Media.Animation;