fix merge conflict

Author: mikeebowen

Directory.Packages.props

@@ -4,7 +4,7 @@
     <PackageVersion Include="BenchmarkDotNet" Version="0.14.0" />
     <PackageVersion Include="BenchmarkDotNet.Diagnostics.Windows" Version="0.14.0" />
     <PackageVersion Include="coverlet.collector" Version="6.0.4" />
-    <PackageVersion Include="Microsoft.Bcl.Memory" Version="9.0.0" />
+    <PackageVersion Include="Microsoft.Bcl.Memory" Version="9.0.4" />
     <PackageVersion Include="Microsoft.DotNet.BuildTools.GenAPI" Version="3.0.0-preview4-06015-01" />
     <PackageVersion Include="Microsoft.CodeAnalysis" Version="4.11.0" />
     <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.8.0" />

gen/DocumentFormat.OpenXml.Generator.Models/Generators/Elements/DataModelWriterExtensions.cs

@@ -360,9 +360,13 @@ private static void WriteMetadata(this IndentedTextWriter writer, OpenXmlGenerat
             {
                 foreach (var child in containingType.KnownChildren)
                 {
-                    writer.Write("builder.AddChild<");
-                    writer.Write(services.FindClassName(child));
-                    writer.WriteLine(">();");
+                    var className = services.FindClassName(child);
+
+                    writer.Write("builder.AddChild(");
+                    writer.Write(className);
+                    writer.Write(".ElementType, static () => new ");
+                    writer.Write(className);
+                    writer.WriteLine("());");
                 }
             }
 

gen/DocumentFormat.OpenXml.Generator.Models/Generators/Parts/PartWriter.cs

@@ -22,6 +22,7 @@ public static class PartWriter
         "DocumentFormat.OpenXml.Framework",
         "System",
         "System.Collections.Generic",
+        "System.Diagnostics.CodeAnalysis",
     };
 
     private static readonly BlockOptions _options = new()
@@ -410,7 +411,7 @@ private static IEnumerable<Item> GetSchemaTypedParts(OpenXmlGeneratorServices se
             writer.WriteDocumentationComment("Gets or sets the root element of this part.");
             writer.Write("public ");
             writer.Write(apiName);
-            writer.Write(" ");
+            writer.Write("? ");
             writer.WriteLine(api.Class);
 
             using (writer.AddBlock(_options))

generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/Part_AlternativeFormatImportPart.g.cs

@@ -9,6 +9,7 @@
 using DocumentFormat.OpenXml.Framework;
 using System;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 
 namespace DocumentFormat.OpenXml.Packaging
 {

generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/Part_CalculationChainPart.g.cs

@@ -9,6 +9,7 @@
 using DocumentFormat.OpenXml.Framework;
 using System;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 
 namespace DocumentFormat.OpenXml.Packaging
 {
@@ -32,7 +33,7 @@ internal CalculationChainPart()
         /// <summary>
         /// Gets or sets the root element of this part.
         /// </summary>
-        public DocumentFormat.OpenXml.Spreadsheet.CalculationChain CalculationChain
+        public DocumentFormat.OpenXml.Spreadsheet.CalculationChain? CalculationChain
         {
             get
             {

generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/Part_CellMetadataPart.g.cs

@@ -9,6 +9,7 @@
 using DocumentFormat.OpenXml.Framework;
 using System;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 
 namespace DocumentFormat.OpenXml.Packaging
 {
@@ -48,7 +49,7 @@ private protected override OpenXmlPartRootElement? InternalRootElement
         /// <summary>
         /// Gets or sets the root element of this part.
         /// </summary>
-        public DocumentFormat.OpenXml.Spreadsheet.Metadata Metadata
+        public DocumentFormat.OpenXml.Spreadsheet.Metadata? Metadata
         {
             get
             {

generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/Part_ChartColorStylePart.g.cs

@@ -9,6 +9,7 @@
 using DocumentFormat.OpenXml.Framework;
 using System;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 
 namespace DocumentFormat.OpenXml.Packaging
 {
@@ -32,7 +33,7 @@ internal ChartColorStylePart()
         /// <summary>
         /// Gets or sets the root element of this part.
         /// </summary>
-        public DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.ColorStyle ColorStyle
+        public DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.ColorStyle? ColorStyle
         {
             get
             {

generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/Part_ChartDrawingPart.g.cs

@@ -9,6 +9,7 @@
 using DocumentFormat.OpenXml.Framework;
 using System;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 
 namespace DocumentFormat.OpenXml.Packaging
 {
@@ -69,7 +70,7 @@ private protected override OpenXmlPartRootElement? InternalRootElement
         /// <summary>
         /// Gets or sets the root element of this part.
         /// </summary>
-        public DocumentFormat.OpenXml.Drawing.Charts.UserShapes UserShapes
+        public DocumentFormat.OpenXml.Drawing.Charts.UserShapes? UserShapes
         {
             get
             {

generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/Part_ChartPart.g.cs

@@ -9,6 +9,7 @@
 using DocumentFormat.OpenXml.Framework;
 using System;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 
 namespace DocumentFormat.OpenXml.Packaging
 {
@@ -44,7 +45,7 @@ internal ChartPart()
         /// <summary>
         /// Gets or sets the root element of this part.
         /// </summary>
-        public DocumentFormat.OpenXml.Drawing.Charts.ChartSpace ChartSpace
+        public DocumentFormat.OpenXml.Drawing.Charts.ChartSpace? ChartSpace
         {
             get
             {

generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/Part_ChartStylePart.g.cs

@@ -9,6 +9,7 @@
 using DocumentFormat.OpenXml.Framework;
 using System;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 
 namespace DocumentFormat.OpenXml.Packaging
 {
@@ -32,7 +33,7 @@ internal ChartStylePart()
         /// <summary>
         /// Gets or sets the root element of this part.
         /// </summary>
-        public DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.ChartStyle ChartStyle
+        public DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.ChartStyle? ChartStyle
         {
             get
             {