3 files changed, 27 insertions, 136 deletions

diff --git a/src/WixToolset.Data/WixDataStrings.Designer.cs b/src/WixToolset.Data/WixDataStrings.Designer.cs
index 23555d3c..de26156a 100644
--- a/src/WixToolset.Data/WixDataStrings.Designer.cs
+++ b/src/WixToolset.Data/WixDataStrings.Designer.cs
@@ -1,4 +1,12 @@
-// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
 
 namespace WixToolset.Data {
     using System;
@@ -11,7 +19,7 @@ namespace WixToolset.Data {
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     public class WixDataStrings {
@@ -28,7 +36,7 @@ namespace WixToolset.Data {
         ///   Returns the cached ResourceManager instance used by this class.
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Resources.ResourceManager ResourceManager {
+        public static global::System.Resources.ResourceManager ResourceManager {
             get {
                 if (object.ReferenceEquals(resourceMan, null)) {
                     global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("WixToolset.Data.WixDataStrings", typeof(WixDataStrings).Assembly);
@@ -43,7 +51,7 @@ namespace WixToolset.Data {
         ///   resource lookups using this strongly typed resource class.
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Globalization.CultureInfo Culture {
+        public static global::System.Globalization.CultureInfo Culture {
             get {
                 return resourceCulture;
             }
@@ -62,96 +70,6 @@ namespace WixToolset.Data {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to A Merge table FileCompression column cannot be set to the invalid value &apos;{0}&apos;..
-        /// </summary>
-        public static string EXP_CannotSetMergeTableFileCompressionColumnToInvalidValue {
-            get {
-                return ResourceManager.GetString("EXP_CannotSetMergeTableFileCompressionColumnToInvalidValue", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Collection has {0} elements. Must have at least one..
-        /// </summary>
-        internal static string EXP_CollectionMustHaveAtLeastOneElement {
-            get {
-                return ResourceManager.GetString("EXP_CollectionMustHaveAtLeastOneElement", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Element must be a subclass of {0}, but was of type {1}..
-        /// </summary>
-        internal static string EXP_ElementIsSubclassOfDifferentType {
-            get {
-                return ResourceManager.GetString("EXP_ElementIsSubclassOfDifferentType", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Element of type {0} found in enumerator. Must be ChoiceItem or SequenceItem..
-        /// </summary>
-        internal static string EXP_ElementMustBeChoiceItemOrSequenceItem {
-            get {
-                return ResourceManager.GetString("EXP_ElementMustBeChoiceItemOrSequenceItem", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Element of type {0} is not valid for this collection..
-        /// </summary>
-        internal static string EXP_ElementOfTypeIsNotValidForThisCollection {
-            get {
-                return ResourceManager.GetString("EXP_ElementOfTypeIsNotValidForThisCollection", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to ISchemaElement with name {0} does not implement ICreateChildren..
-        /// </summary>
-        internal static string EXP_ISchemaElementDoesnotImplementICreateChildren {
-            get {
-                return ResourceManager.GetString("EXP_ISchemaElementDoesnotImplementICreateChildren", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to ISchemaElement with name {0} does not implement ISetAttributes..
-        /// </summary>
-        internal static string EXP_ISchemaElementDoesnotImplementISetAttribute {
-            get {
-                return ResourceManager.GetString("EXP_ISchemaElementDoesnotImplementISetAttribute", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to A Merge table FileCompression column contains an invalid value &apos;{0}&apos;..
-        /// </summary>
-        public static string EXP_MergeTableFileCompressionColumnContainsInvalidValue {
-            get {
-                return ResourceManager.GetString("EXP_MergeTableFileCompressionColumnContainsInvalidValue", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Multiple root elements found in file..
-        /// </summary>
-        internal static string EXP_MultipleRootElementsFoundInFile {
-            get {
-                return ResourceManager.GetString("EXP_MultipleRootElementsFoundInFile", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Type {0} is not valid for this collection..
-        /// </summary>
-        internal static string EXP_TypeIsNotValidForThisCollection {
-            get {
-                return ResourceManager.GetString("EXP_TypeIsNotValidForThisCollection", resourceCulture);
-            }
-        }
-        
-        /// <summary>
         ///   Looks up a localized string similar to Unknown column type: {0}.
         /// </summary>
         public static string EXP_UnknownColumnType {
@@ -168,14 +86,5 @@ namespace WixToolset.Data {
                 return ResourceManager.GetString("EXP_UnsupportedTable", resourceCulture);
             }
         }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to XmlElement with name {0} does not have a corresponding ISchemaElement..
-        /// </summary>
-        internal static string EXP_XmlElementDoesnotHaveISchemaElement {
-            get {
-                return ResourceManager.GetString("EXP_XmlElementDoesnotHaveISchemaElement", resourceCulture);
-            }
-        }
     }
 }
diff --git a/src/WixToolset.Data/WixDataStrings.resx b/src/WixToolset.Data/WixDataStrings.resx
index 19cdc3c7..999f5057 100644
--- a/src/WixToolset.Data/WixDataStrings.resx
+++ b/src/WixToolset.Data/WixDataStrings.resx
@@ -120,43 +120,10 @@
   <data name="EXP_UnsupportedTable" xml:space="preserve">
     <value>The table {0} is not supported.</value>
   </data>
-  <data name="EXP_MergeTableFileCompressionColumnContainsInvalidValue" xml:space="preserve">
-    <value>A Merge table FileCompression column contains an invalid value '{0}'.</value>
-  </data>
-  <data name="EXP_CannotSetMergeTableFileCompressionColumnToInvalidValue" xml:space="preserve">
-    <value>A Merge table FileCompression column cannot be set to the invalid value '{0}'.</value>
-  </data>
   <data name="EXP_CannotModularizeIllegalID" xml:space="preserve">
     <value>The value '{0}' is not a legal identifier and therefore cannot be modularized.</value>
   </data>
   <data name="EXP_UnknownColumnType" xml:space="preserve">
     <value>Unknown column type: {0}</value>
   </data>
-  <data name="EXP_MultipleRootElementsFoundInFile" xml:space="preserve">
-    <value>Multiple root elements found in file.</value>
-  </data>
-  <data name="EXP_ISchemaElementDoesnotImplementICreateChildren" xml:space="preserve">
-    <value>ISchemaElement with name {0} does not implement ICreateChildren.</value>
-  </data>
-  <data name="EXP_ISchemaElementDoesnotImplementISetAttribute" xml:space="preserve">
-    <value>ISchemaElement with name {0} does not implement ISetAttributes.</value>
-  </data>
-  <data name="EXP_XmlElementDoesnotHaveISchemaElement" xml:space="preserve">
-    <value>XmlElement with name {0} does not have a corresponding ISchemaElement.</value>
-  </data>
-  <data name="EXP_CollectionMustHaveAtLeastOneElement" xml:space="preserve">
-    <value>Collection has {0} elements. Must have at least one.</value>
-  </data>
-  <data name="EXP_ElementIsSubclassOfDifferentType" xml:space="preserve">
-    <value>Element must be a subclass of {0}, but was of type {1}.</value>
-  </data>
-  <data name="EXP_ElementOfTypeIsNotValidForThisCollection" xml:space="preserve">
-    <value>Element of type {0} is not valid for this collection.</value>
-  </data>
-  <data name="EXP_TypeIsNotValidForThisCollection" xml:space="preserve">
-    <value>Type {0} is not valid for this collection.</value>
-  </data>
-  <data name="EXP_ElementMustBeChoiceItemOrSequenceItem" xml:space="preserve">
-    <value>Element of type {0} found in enumerator. Must be ChoiceItem or SequenceItem.</value>
-  </data>
 </root>
\ No newline at end of file
diff --git a/src/WixToolset.Data/WixToolset.Data.csproj b/src/WixToolset.Data/WixToolset.Data.csproj
index 9f57e2e7..598803fe 100644
--- a/src/WixToolset.Data/WixToolset.Data.csproj
+++ b/src/WixToolset.Data/WixToolset.Data.csproj
@@ -20,4 +20,19 @@
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
     <PackageReference Include="Nerdbank.GitVersioning" Version="3.1.91" PrivateAssets="all" />
   </ItemGroup>
+
+  <ItemGroup>
+    <Compile Update="WixDataStrings.Designer.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>WixDataStrings.resx</DependentUpon>
+    </Compile>
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Update="WixDataStrings.resx">
+      <Generator>PublicResXFileCodeGenerator</Generator>
+      <LastGenOutput>WixDataStrings.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+  </ItemGroup>
 </Project>