Access schema resources in BinarySdbSchemaDatas (#347)

Author: twsouthwick

DocumentFormat.OpenXml/Validation/Schema/BinarySdbSchemaDatas.cs

@@ -7,6 +7,7 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
+using System.Reflection;
 
 using SdbIndex = System.UInt16;
 
@@ -23,12 +24,33 @@ public BinarySdbSchemaDatas(FileFormatVersions fileFormat)
             this.SdbDataHead = new SdbDataHead();
             this._fileFormat = fileFormat;
 
-            using (var schema = ValidationResources.GetSchemaStream(this._fileFormat))
+            using (var schema = GetSchemaStream(fileFormat))
             {
                 this.Load(schema);
             }
         }
 
+        private static Stream GetSchemaStream(FileFormatVersions fileFormat)
+        {
+            Stream GetEmbeddedResource(string name)
+            {
+                return typeof(ValidationResources).GetTypeInfo().Assembly.GetManifestResourceStream($"DocumentFormat.OpenXml.src.GeneratedCode.{name}.bin");
+            }
+
+            switch (fileFormat)
+            {
+                case FileFormatVersions.Office2007:
+                    return GetEmbeddedResource("O12SchemaConstraintDatas");
+                case FileFormatVersions.Office2010:
+                    return GetEmbeddedResource("O14SchemaConstraintDatas");
+                case FileFormatVersions.Office2013:
+                    return GetEmbeddedResource("O15SchemaConstraintDatas");
+                default:
+                    Debug.Assert(fileFormat.Any());
+                    return GetEmbeddedResource("O12SchemaConstraintDatas");
+            }
+        }
+
         /// <summary>
         /// Load the schema constraint data from the stream.
         /// </summary>

DocumentFormat.OpenXml/Validation/ValidationResources.Designer.cs

@@ -1,18 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (c) Microsoft Open Technologies, Inc.  All rights reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information. -->
 <root>
-  <!--
-    Microsoft ResX Schema
-
+  <!-- 
+    Microsoft ResX Schema 
+    
     Version 2.0
-
-    The primary goals of this format is to allow a simple XML format
-    that is mostly human readable. The generation and parsing of the
-    various data types are done through the TypeConverter classes
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
     associated with the data types.
-
+    
     Example:
-
+    
     ... ado.net/XML headers & schema ...
     <resheader name="resmimetype">text/microsoft-resx</resheader>
     <resheader name="version">2.0</resheader>
@@ -27,36 +26,36 @@
         <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
         <comment>This is a comment</comment>
     </data>
-
-    There are any number of "resheader" rows that contain simple
+                
+    There are any number of "resheader" rows that contain simple 
     name/value pairs.
-
-    Each data row contains a name, and value. The row also contains a
-    type or mimetype. Type corresponds to a .NET class that support
-    text/value conversion through the TypeConverter architecture.
-    Classes that don't support this are serialized and stored with the
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
     mimetype set.
-
-    The mimetype is used for serialized objects, and tells the
-    ResXResourceReader how to depersist the object. This is currently not
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
     extensible. For a given mimetype the value must be set accordingly:
-
-    Note - application/x-microsoft.net.object.binary.base64 is the format
-    that the ResXResourceWriter will generate, however the reader can
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
     read any of the formats listed below.
-
+    
     mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with
+    value   : The object must be serialized with 
             : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
             : and then encoded with base64 encoding.
-
+    
     mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with
+    value   : The object must be serialized with 
             : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
             : and then encoded with base64 encoding.
 
     mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array
+    value   : The object must be serialized into a byte array 
             : using a System.ComponentModel.TypeConverter
             : and then encoded with base64 encoding.
     -->
@@ -337,4 +336,4 @@
   <data name="Pkg_DataPartReferenceIsNotAllowed" xml:space="preserve">
     <value>The package/part '{0}' cannot have a relationship that targets '{1}'.</value>
   </data>
-</root>
+</root>