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 c94751a7844..524aa968f7d 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
@@ -18,7 +18,6 @@ namespace System.Windows
///
/// A collection of TextDecoration objects.
///
-
public sealed partial class TextDecorationCollection : Animatable, IList, IList
{
//------------------------------------------------------
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 bcd7980cdcc..1854c4a31fe 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
@@ -17,7 +17,6 @@ namespace System.Windows.Media.Animation
///
/// A collection of Timeline objects.
///
-
public sealed partial class TimelineCollection : Animatable, IList, IList
{
//------------------------------------------------------
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 cbe475f7493..0acfe5bb312 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
@@ -20,7 +20,6 @@ namespace System.Windows.Media.Effects
///
/// A collection of BitmapEffect objects.
///
-
public sealed partial class BitmapEffectCollection : Animatable, IList, IList
{
//------------------------------------------------------
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 42f6e588839..9881459e390 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
@@ -24,7 +24,6 @@
namespace System.Windows.Media
{
-
[TypeConverter(typeof(BrushConverter))]
[ValueSerializer(typeof(BrushValueSerializer))] // Used by MarkupWriter
public abstract partial class Brush : Animatable, IFormattable, DUCE.IResource
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 f9e2e33db06..96034cfe595 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
@@ -24,7 +24,6 @@
namespace System.Windows.Media
{
-
[TypeConverter(typeof(CacheModeConverter))]
[ValueSerializer(typeof(CacheModeValueSerializer))] // Used by MarkupWriter
public abstract partial class CacheMode : Animatable, DUCE.IResource
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 ffca46ec862..8fa5fe9bff9 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
@@ -27,7 +27,6 @@ namespace System.Windows.Media
///
/// A collection of Drawing objects.
///
-
public sealed partial class DrawingCollection : Animatable, IList, IList
{
//------------------------------------------------------
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 32d28cce9ec..e3866096edd 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
@@ -27,7 +27,6 @@ namespace System.Windows.Media
///
/// A collection of GeneralTransform objects.
///
-
public sealed partial class GeneralTransformCollection : Animatable, IList, IList
{
//------------------------------------------------------
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 252720487ae..6fbeebb1cbe 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
@@ -24,7 +24,6 @@
namespace System.Windows.Media
{
-
[TypeConverter(typeof(GeometryConverter))]
[ValueSerializer(typeof(GeometryValueSerializer))] // Used by MarkupWriter
public abstract partial class Geometry : Animatable, IFormattable, DUCE.IResource
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 7ba076d3e48..c032b5fb724 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
@@ -27,7 +27,6 @@ namespace System.Windows.Media
///
/// A collection of Geometry objects.
///
-
public sealed partial class GeometryCollection : Animatable, IList, IList
{
//------------------------------------------------------
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 a438fb4514c..6cfeb53d748 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
@@ -27,7 +27,6 @@ namespace System.Windows.Media
///
/// A collection of GradientStop objects.
///
-
public sealed partial class GradientStopCollection : Animatable, IFormattable, IList, IList
{
//------------------------------------------------------
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 ed90deed1dd..104e0892cee 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
@@ -27,7 +27,6 @@ namespace System.Windows.Media
///
/// A collection of PathSegment objects.
///
-
public sealed partial class PathSegmentCollection : Animatable, IList, IList
{
//------------------------------------------------------
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 8f4bed204d8..ee68a7fcb45 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
@@ -27,7 +27,6 @@ namespace System.Windows.Media
///
/// A collection of TextEffect objects.
///
-
public sealed partial class TextEffectCollection : Animatable, IList, IList
{
//------------------------------------------------------
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 88f91e7299e..73037042ec8 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
@@ -24,7 +24,6 @@
namespace System.Windows.Media
{
-
[TypeConverter(typeof(TransformConverter))]
[ValueSerializer(typeof(TransformValueSerializer))] // Used by MarkupWriter
public 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 f55bc227681..baa59403b81 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
@@ -27,7 +27,6 @@ namespace System.Windows.Media
///
/// A collection of Transform objects.
///
-
public sealed partial class TransformCollection : Animatable, IList, IList
{
//------------------------------------------------------
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 a31745955f6..c25ba8086f7 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
@@ -25,7 +25,6 @@ namespace System.Windows.Media.Media3D
///
/// A collection of GeneralTransform3D objects.
///
-
public sealed partial class GeneralTransform3DCollection : Animatable, IList, IList
{
//------------------------------------------------------
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 19e136af19f..ab3d690f0b2 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
@@ -25,7 +25,6 @@ namespace System.Windows.Media.Media3D
///
/// A collection of Material objects.
///
-
public sealed partial class MaterialCollection : Animatable, IList, IList
{
//------------------------------------------------------
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 6b9662b751e..3db927132f8 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
@@ -22,7 +22,6 @@
namespace System.Windows.Media.Media3D
{
-
[Serializable]
[TypeConverter(typeof(Matrix3DConverter))]
[ValueSerializer(typeof(Matrix3DValueSerializer))] // Used by MarkupWriter
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 bc66e66ab0d..4cb46e929aa 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
@@ -25,7 +25,6 @@ namespace System.Windows.Media.Media3D
///
/// A collection of Model3D objects.
///
-
public sealed partial class Model3DCollection : Animatable, IList, IList
{
//------------------------------------------------------
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 84b1d3950a1..564056a3cde 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
@@ -22,7 +22,6 @@
namespace System.Windows.Media.Media3D
{
-
[Serializable]
[TypeConverter(typeof(Point3DConverter))]
[ValueSerializer(typeof(Point3DValueSerializer))] // Used by MarkupWriter
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 f5cdf6e27ed..31a365edbf2 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
@@ -22,7 +22,6 @@
namespace System.Windows.Media.Media3D
{
-
[Serializable]
[TypeConverter(typeof(Point4DConverter))]
[ValueSerializer(typeof(Point4DValueSerializer))] // Used by MarkupWriter
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 df034c6c5f5..cb02673c682 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
@@ -22,7 +22,6 @@
namespace System.Windows.Media.Media3D
{
-
[Serializable]
[TypeConverter(typeof(QuaternionConverter))]
[ValueSerializer(typeof(QuaternionValueSerializer))] // Used by MarkupWriter
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 d7089f8f815..bea07138199 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
@@ -22,7 +22,6 @@
namespace System.Windows.Media.Media3D
{
-
[Serializable]
[TypeConverter(typeof(Rect3DConverter))]
[ValueSerializer(typeof(Rect3DValueSerializer))] // Used by MarkupWriter
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 8be93cda490..8bdb13fda34 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
@@ -22,7 +22,6 @@
namespace System.Windows.Media.Media3D
{
-
[Serializable]
[TypeConverter(typeof(Size3DConverter))]
[ValueSerializer(typeof(Size3DValueSerializer))] // Used by MarkupWriter
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 11f925f8a92..02a826ddc26 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
@@ -25,7 +25,6 @@ namespace System.Windows.Media.Media3D
///
/// A collection of Transform3D objects.
///
-
public sealed partial class Transform3DCollection : Animatable, IList, IList
{
//------------------------------------------------------
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 31e735152cc..57eefbfa867 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
@@ -22,7 +22,6 @@
namespace System.Windows.Media.Media3D
{
-
[Serializable]
[TypeConverter(typeof(Vector3DConverter))]
[ValueSerializer(typeof(Vector3DValueSerializer))] // Used by MarkupWriter
diff --git a/src/Microsoft.DotNet.Wpf/src/WindowsBase/System/Windows/Generated/Int32Rect.cs b/src/Microsoft.DotNet.Wpf/src/WindowsBase/System/Windows/Generated/Int32Rect.cs
index 1855f9172f9..1872365fef7 100644
--- a/src/Microsoft.DotNet.Wpf/src/WindowsBase/System/Windows/Generated/Int32Rect.cs
+++ b/src/Microsoft.DotNet.Wpf/src/WindowsBase/System/Windows/Generated/Int32Rect.cs
@@ -16,7 +16,6 @@
namespace System.Windows
{
-
[Serializable]
[TypeConverter(typeof(Int32RectConverter))]
[ValueSerializer(typeof(Int32RectValueSerializer))] // Used by MarkupWriter
diff --git a/src/Microsoft.DotNet.Wpf/src/WindowsBase/System/Windows/Generated/Point.cs b/src/Microsoft.DotNet.Wpf/src/WindowsBase/System/Windows/Generated/Point.cs
index 9fe73b62a6f..adb53127f0c 100644
--- a/src/Microsoft.DotNet.Wpf/src/WindowsBase/System/Windows/Generated/Point.cs
+++ b/src/Microsoft.DotNet.Wpf/src/WindowsBase/System/Windows/Generated/Point.cs
@@ -16,7 +16,6 @@
namespace System.Windows
{
-
[Serializable]
[TypeConverter(typeof(PointConverter))]
[ValueSerializer(typeof(PointValueSerializer))] // Used by MarkupWriter
diff --git a/src/Microsoft.DotNet.Wpf/src/WindowsBase/System/Windows/Generated/Rect.cs b/src/Microsoft.DotNet.Wpf/src/WindowsBase/System/Windows/Generated/Rect.cs
index 69e2c18dc1d..7c45d390f61 100644
--- a/src/Microsoft.DotNet.Wpf/src/WindowsBase/System/Windows/Generated/Rect.cs
+++ b/src/Microsoft.DotNet.Wpf/src/WindowsBase/System/Windows/Generated/Rect.cs
@@ -16,7 +16,6 @@
namespace System.Windows
{
-
[Serializable]
[TypeConverter(typeof(RectConverter))]
[ValueSerializer(typeof(RectValueSerializer))] // Used by MarkupWriter
diff --git a/src/Microsoft.DotNet.Wpf/src/WindowsBase/System/Windows/Generated/Size.cs b/src/Microsoft.DotNet.Wpf/src/WindowsBase/System/Windows/Generated/Size.cs
index 01fc36c0936..9c868e2f6f0 100644
--- a/src/Microsoft.DotNet.Wpf/src/WindowsBase/System/Windows/Generated/Size.cs
+++ b/src/Microsoft.DotNet.Wpf/src/WindowsBase/System/Windows/Generated/Size.cs
@@ -16,7 +16,6 @@
namespace System.Windows
{
-
[Serializable]
[TypeConverter(typeof(SizeConverter))]
[ValueSerializer(typeof(SizeValueSerializer))] // Used by MarkupWriter
diff --git a/src/Microsoft.DotNet.Wpf/src/WindowsBase/System/Windows/Generated/Vector.cs b/src/Microsoft.DotNet.Wpf/src/WindowsBase/System/Windows/Generated/Vector.cs
index 15452bf480d..f4efa5fe927 100644
--- a/src/Microsoft.DotNet.Wpf/src/WindowsBase/System/Windows/Generated/Vector.cs
+++ b/src/Microsoft.DotNet.Wpf/src/WindowsBase/System/Windows/Generated/Vector.cs
@@ -16,7 +16,6 @@
namespace System.Windows
{
-
[Serializable]
[TypeConverter(typeof(VectorConverter))]
[ValueSerializer(typeof(VectorValueSerializer))] // Used by MarkupWriter
diff --git a/src/Microsoft.DotNet.Wpf/src/WindowsBase/System/Windows/Media/Generated/Matrix.cs b/src/Microsoft.DotNet.Wpf/src/WindowsBase/System/Windows/Media/Generated/Matrix.cs
index 5d1259f6510..f4359ac42cf 100644
--- a/src/Microsoft.DotNet.Wpf/src/WindowsBase/System/Windows/Media/Generated/Matrix.cs
+++ b/src/Microsoft.DotNet.Wpf/src/WindowsBase/System/Windows/Media/Generated/Matrix.cs
@@ -16,7 +16,6 @@
namespace System.Windows.Media
{
-
[Serializable]
[TypeConverter(typeof(MatrixConverter))]
[ValueSerializer(typeof(MatrixValueSerializer))] // Used by MarkupWriter
diff --git a/src/Microsoft.DotNet.Wpf/src/WpfGfx/codegen/mcg/generators/ManagedResource.cs b/src/Microsoft.DotNet.Wpf/src/WpfGfx/codegen/mcg/generators/ManagedResource.cs
index 5c5834f8061..b32f1103a7d 100644
--- a/src/Microsoft.DotNet.Wpf/src/WpfGfx/codegen/mcg/generators/ManagedResource.cs
+++ b/src/Microsoft.DotNet.Wpf/src/WpfGfx/codegen/mcg/generators/ManagedResource.cs
@@ -159,13 +159,35 @@ public override void Go()
);
}
- csFile.WriteBlock(
+ csFile.Write(
[[inline]]
namespace [[resource.ManagedNamespace]]
{
- [[Helpers.CollectionHelper.WriteCollectionSummary(resource)]]
- [[attributes]]
+ [[/inline]]
+ );
+
+ string collectionSummary = Helpers.CollectionHelper.WriteCollectionSummary(resource);
+ if (!string.IsNullOrEmpty(collectionSummary))
+ {
+ csFile.Write(
+ [[inline]]
+ [[collectionSummary]]
+ [[/inline]]
+ );
+ }
+
+ if (!string.IsNullOrEmpty(attributes))
+ {
+ csFile.Write(
+ [[inline]]
+ [[attributes]]
+ [[/inline]]
+ );
+ }
+
+ csFile.WriteBlock(
+ [[inline]]
[[WriteClassDeclaration(resource.Name, !resource.IsValueType, modifiers, extends)]]
{
[[Helpers.ManagedStyle.WriteSection("Public Methods")]]