Merge remote-tracking branch 'upstream/main' into issue-1635

Author: mikeebowen

gen/DocumentFormat.OpenXml.Generator.Models/Editor/TextWriterExtensions.cs

@@ -29,6 +29,7 @@ public static void WriteFileHeader(this TextWriter writer)
         writer.WriteLine(Line2);
         writer.WriteLine();
         writer.WriteLine("#nullable enable");
+        writer.WriteLine("#pragma warning disable CS0618");
         writer.WriteLine();
     }
 

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

@@ -15,10 +15,12 @@ public static class DataModelWriterExtensions
 {
     public static class AttributeStrings
     {
+        public const string ObsoleteClassWarn = "[Obsolete(\"Unused class, will be removed in a future version.\", false)]";
         public const string ObsoletePropertyWarn = "[Obsolete(\"Unused property, will be removed in a future version.\", false)]";
         public const string ObsoletePropertyError = "[Obsolete(\"Unused property, will be removed in a future version.\", true)]";
         public const string ObsoleteAttributeWarn = "[Obsolete(\"Unused attribute, will be removed in a future version.\", false)]";
         public const string ObsoleteAttributeError = "[Obsolete(\"Unused attribute, will be removed in a future version.\", true)]";
+        public const string ObsoleteChildWarn = "[Obsolete(\"Obsolete child element, will be removed in a future version.\", false)]";
         public const string EditorBrowsableAlways = "[System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Always)] ";
         public const string EditorBrowsableAdvanced = "[System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Advanced)] ";
         public const string EditorBrowsableNever = "[System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] ";
@@ -30,6 +32,18 @@ public static class AttributeStrings
         AttributeStrings.EditorBrowsableNever,
     ];
 
+    private static readonly List<string> ObsoleteClassErrorList =
+    [
+        AttributeStrings.ObsoleteClassWarn,
+        AttributeStrings.EditorBrowsableNever,
+    ];
+
+    private static readonly List<string> ObsoleteChildWarnList =
+    [
+        AttributeStrings.ObsoleteChildWarn,
+        AttributeStrings.EditorBrowsableNever,
+    ];
+
     // Use this dictionary to add attributes like ObsoleteAttribute or other directives to classes, child elements or attributes.
     private static readonly Dictionary<TypedQName, Dictionary<TypedQName, List<string>>> _attributeData =
         new Dictionary<TypedQName, Dictionary<TypedQName, List<string>>>()
@@ -117,6 +131,36 @@ public static class AttributeStrings
                     },
                 }
             },
+            {
+                "xlpda:CT_PivotCacheDynamicArray/xlpda:pivotCacheDynamicArray",
+                new Dictionary<TypedQName, List<string>>()
+                {
+                    {
+                      "xlpda:CT_PivotCacheDynamicArray/xlpda:pivotCacheDynamicArray",
+                      ObsoleteClassErrorList
+                    },
+                }
+            },
+            {
+                "xprd:CT_PivotCacheRichInfo/xprd:richInfo",
+                new Dictionary<TypedQName, List<string>>()
+                {
+                    {
+                      "xprd:CT_PivotCacheRichInfo/xprd:richInfo",
+                      ObsoleteClassErrorList
+                    },
+                }
+            },
+            {
+                "x:CT_PivotCacheDefinitionExtension/x:ext",
+                new Dictionary<TypedQName, List<string>>()
+                {
+                    {
+                        "xprd:CT_PivotCacheRichInfo/xprd:richInfo",
+                        ObsoleteChildWarnList
+                    },
+                }
+            },
         };
 
     public static bool GetDataModelSyntax(this IndentedTextWriter writer, OpenXmlGeneratorServices services, SchemaNamespace model)

generated/DocumentFormat.OpenXml.Framework/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/Namespaces.g.cs

@@ -4,6 +4,7 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 #nullable enable
+#pragma warning disable CS0618
 
 using System.Collections.Generic;
 

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

@@ -4,6 +4,7 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 #nullable enable
+#pragma warning disable CS0618
 
 using DocumentFormat.OpenXml;
 using DocumentFormat.OpenXml.Features;

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

@@ -4,6 +4,7 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 #nullable enable
+#pragma warning disable CS0618
 
 using DocumentFormat.OpenXml;
 using DocumentFormat.OpenXml.Features;

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

@@ -4,6 +4,7 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 #nullable enable
+#pragma warning disable CS0618
 
 using DocumentFormat.OpenXml;
 using DocumentFormat.OpenXml.Features;

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

@@ -4,6 +4,7 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 #nullable enable
+#pragma warning disable CS0618
 
 using DocumentFormat.OpenXml;
 using DocumentFormat.OpenXml.Features;

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

@@ -4,6 +4,7 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 #nullable enable
+#pragma warning disable CS0618
 
 using DocumentFormat.OpenXml;
 using DocumentFormat.OpenXml.Features;

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

@@ -4,6 +4,7 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 #nullable enable
+#pragma warning disable CS0618
 
 using DocumentFormat.OpenXml;
 using DocumentFormat.OpenXml.Features;

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

@@ -4,6 +4,7 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 #nullable enable
+#pragma warning disable CS0618
 
 using DocumentFormat.OpenXml;
 using DocumentFormat.OpenXml.Features;