Fix build

.gitignore

@@ -9,3 +9,4 @@ docs/_site
 /c-o-s-space differences.txt
 /docs/api/Working
 *.bak
+/dist/Sawczyn.EFDesigner.EFModel.DslPackage.vsix

src/DslPackage/DslPackage.csproj

@@ -445,7 +445,9 @@
 </PostBuildEvent>
   </PropertyGroup>
   <PropertyGroup>
-    <PreBuildEvent>dotnet tool install -g dotnet-warp
+    <PreBuildEvent>copy /y "$(SolutionDir)Dsl\GeneratedCode\EFModelSchema.xsd" "$(ProjectDir)ProjectItemTemplates\EFModel.xsd"
+
+dotnet tool install -g dotnet-warp
 del /S /Q "$(ProjectDir)Parsers\*.*"
 
 set EFVER=EF6

src/DslPackage/GeneratedCode/Package.cs

@@ -174,19 +174,20 @@ protected override object GetToolboxItemData(string itemId, DataFormats.Format f
 	}
 
 }
-//
-// Package attributes which may need to change are placed on the partial class below, rather than in the main include file.
-//
-namespace Sawczyn.EFDesigner.EFModel
-{
-   /// <summary>
-   /// Double-derived class to allow easier code customization.
-   /// </summary>
-   [VSShell::ProvideMenuResource("1000.ctmenu", version: 25)]
-   [VSShell::ProvideToolboxItems(1)]
-   [global::Microsoft.VisualStudio.TextTemplating.VSHost.ProvideDirectiveProcessor(typeof(global::Sawczyn.EFDesigner.EFModel.EFModelDirectiveProcessor), global::Sawczyn.EFDesigner.EFModel.EFModelDirectiveProcessor.EFModelDirectiveProcessorName, "A directive processor that provides access to EFModel files")]
-   [global::System.Runtime.InteropServices.Guid(Constants.EFModelPackageId)]
-   internal sealed partial class EFModelPackage : EFModelPackageBase
-   {
-   }
+
+//
+// Package attributes which may need to change are placed on the partial class below, rather than in the main include file.
+//
+namespace Sawczyn.EFDesigner.EFModel
+{
+   /// <summary>
+   /// Double-derived class to allow easier code customization.
+   /// </summary>
+   [VSShell::ProvideMenuResource("1000.ctmenu", version: 25)]
+   [VSShell::ProvideToolboxItems(1)]
+   [global::Microsoft.VisualStudio.TextTemplating.VSHost.ProvideDirectiveProcessor(typeof(global::Sawczyn.EFDesigner.EFModel.EFModelDirectiveProcessor), global::Sawczyn.EFDesigner.EFModel.EFModelDirectiveProcessor.EFModelDirectiveProcessorName, "A directive processor that provides access to EFModel files")]
+   [global::System.Runtime.InteropServices.Guid(Constants.EFModelPackageId)]
+   internal sealed partial class EFModelPackage : EFModelPackageBase
+   {
+   }
 }

src/Testing/ParserTest.cmd

@@ -22,12 +22,9 @@ set input[8]=.\EFCoreV3\EFCore3NetCore3\bin\Debug\netcoreapp3.1\EFCore3NetCore3.
 set input[9]=.\EFCoreV3\EFCore3NetFramework\bin\Debug\EFCore3NetFramework.dll
 set input[10]=.\EFCoreV3\EFCore3NetStandard\bin\Debug\netstandard2.1\EFCore3NetStandard.dll
 
-for %%p in (0,1,2,3,4,5,6,7) do (
-   for %%i in (0,1,2,3,4,5,6,7,8,9,10) do (
+for /L %%p in (0,1,7) do (
+   for /L %%i in (0,1,10) do (
       "!parser[%%p]!" "!input[%%i]!" parsertest.txt
       echo %ERRORLEVEL% - "!parser[%%p]!" "!input[%%i]!" 
-
-      REM echo !parser[%%p]!
-      REM echo !input[%%i]!
    )
 )