2.0.5.6

- The project item templates for the model file had wandered away. They're back again.
msawczyn · Sep 14, 2020 · 9462cee · 9462cee
1 parent f32fa9c
commit 9462cee
Show file tree

Hide file tree

Showing 27 changed files with 128 additions and 50 deletions.
diff --git a/README.md b/README.md
@@ -53,10 +53,17 @@ to <a href="https://www.jetbrains.com/?from=EFDesigner"><img src="https://msawcz
 
 ### Change Log
 
-**2.0.5.5**
+**2.0.5.6**
+   - The project item templates for the model file had wandered away. They're back again.
+
+<details>
+<summary><b>2.0.5.5</b></summary>
+
    - Fix: Foreign key crashes when reference is on the derived table (See https://github.com/msawczyn/EFDesigner/issues/212)
    - Fixed a edge condition where an error would be thrown when deleting an association
 
+</details>
+
 <details>
 <summary><b>2.0.5.3</b></summary>
 
@@ -66,6 +73,8 @@ to <a href="https://www.jetbrains.com/?from=EFDesigner"><img src="https://msawcz
    - Cleaned up some ambiguities in how copy/paste was handled with multiple diagrams
    - Performance improvements
 
+</details>
+
 <details>
 <summary><b>2.0.4.1</b></summary>
 

diff --git a/VSMarketplace blurb.md b/VSMarketplace blurb.md
@@ -30,6 +30,9 @@ For comprehensive documentation, please visit [the project's documentation site]
 
 **ChangeLog**
 
+**2.0.5.6**
+   - The project item templates for the model file had wandered away. They're back again.
+
 **2.0.5.5**
    - Fix: Foreign key crashes when reference is on the derived table (See https://github.com/msawczyn/EFDesigner/issues/212)
    - Fixed a edge condition where an error would be thrown when deleting an association

diff --git a/changelog.txt b/changelog.txt
@@ -1,5 +1,8 @@
+2.0.5.6
+   - The project item templates for the model file had wandered away. They're back again.
+
 2.0.5.5
-    - Fix: Foreign key crashes when reference is on the derived table (See https://github.com/msawczyn/EFDesigner/issues/212)
+   - Fix: Foreign key crashes when reference is on the derived table (See https://github.com/msawczyn/EFDesigner/issues/212)
    - Fixed a edge condition where an error would be thrown when deleting an association
 
 2.0.5.3

diff --git a/dist/Sawczyn.EFDesigner.EFModel.DslPackage.vsix b/dist/Sawczyn.EFDesigner.EFModel.DslPackage.vsix
diff --git a/src/Dsl/DslDefinition.dsl b/src/Dsl/DslDefinition.dsl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Dsl xmlns:dm0="http://schemas.microsoft.com/VisualStudio/2008/DslTools/Core" dslVersion="1.0.0.0" Id="9987f227-3d05-49b7-b151-857879f5dfb8" Description="Entity Framework visual editor for EF6, EFCore and beyond." Name="EFModel" DisplayName="Entity Framework Visual Editor" Namespace="Sawczyn.EFDesigner.EFModel" MajorVersion="2" Build="5" Revision="5" ProductName="EFDesigner" CompanyName="Michael Sawczyn" PackageGuid="56bbe1ba-aaee-4883-848f-e3c8656f8db2" PackageNamespace="Sawczyn.EFDesigner.EFModel" xmlns="http://schemas.microsoft.com/VisualStudio/2005/DslTools/DslDefinitionModel">
+<Dsl xmlns:dm0="http://schemas.microsoft.com/VisualStudio/2008/DslTools/Core" dslVersion="1.0.0.0" Id="9987f227-3d05-49b7-b151-857879f5dfb8" Description="Entity Framework visual editor for EF6, EFCore and beyond." Name="EFModel" DisplayName="Entity Framework Visual Editor" Namespace="Sawczyn.EFDesigner.EFModel" MajorVersion="2" Build="5" Revision="6" ProductName="EFDesigner" CompanyName="Michael Sawczyn" PackageGuid="56bbe1ba-aaee-4883-848f-e3c8656f8db2" PackageNamespace="Sawczyn.EFDesigner.EFModel" xmlns="http://schemas.microsoft.com/VisualStudio/2005/DslTools/DslDefinitionModel">
   <Classes>
     <DomainClass Id="95532cb8-3452-4b09-a654-aeb2e2d0b3ad" Description="" Name="ModelRoot" DisplayName="Entity Model" Namespace="Sawczyn.EFDesigner.EFModel">
       <CustomTypeDescriptor>

diff --git a/src/Dsl/GeneratedCode/DomainClasses.cs b/src/Dsl/GeneratedCode/DomainClasses.cs
@@ -11474,6 +11474,6 @@ namespace Sawczyn.EFDesigner.EFModel
 {
 	partial class ModelRoot
 	{
-		public const string DSLVersion = "2.0.5.5";
+		public const string DSLVersion = "2.0.5.6";
 	}
 }
diff --git a/src/Dsl/GeneratedCode/SerializationHelper.cs b/src/Dsl/GeneratedCode/SerializationHelper.cs
@@ -1168,7 +1168,7 @@ public virtual void WriteRootElement(DslModeling::SerializationContext serializa
 				// Only model has schema, diagram has no schema.
 				rootElementSettings.SchemaTargetNamespace = "http://schemas.microsoft.com/dsltools/EFModel";
 			}
-			rootElementSettings.Version = new global::System.Version("2.0.5.5");
+			rootElementSettings.Version = new global::System.Version("2.0.5.6");
 
 			// Carry out the normal serialization.
 			rootSerializer.Write(serializationContext, rootElement, writer, rootElementSettings);
@@ -1190,7 +1190,7 @@ protected virtual void CheckVersion(DslModeling::SerializationContext serializat
 				throw new global::System.ArgumentNullException("reader");
 			#endregion
 
-			global::System.Version expectedVersion = new global::System.Version("2.0.5.5");
+			global::System.Version expectedVersion = new global::System.Version("2.0.5.6");
 			string dslVersionStr = reader.GetAttribute("dslVersion");
 			if (dslVersionStr != null)
 			{

diff --git a/src/Dsl/Properties/AssemblyInfo.cs b/src/Dsl/Properties/AssemblyInfo.cs
@@ -22,8 +22,8 @@
 [assembly: AssemblyCulture("")]
 [assembly: System.Resources.NeutralResourcesLanguage("en")]
 
-[assembly: AssemblyVersion("2.0.5.5")]
-[assembly: AssemblyFileVersion("2.0.5.5")]
+[assembly: AssemblyVersion("2.0.5.6")]
+[assembly: AssemblyFileVersion("2.0.5.6")]
 [assembly: ComVisible(false)]
 [assembly: CLSCompliant(true)]
 [assembly: ReliabilityContract(Consistency.MayCorruptProcess, Cer.None)]
@@ -34,3 +34,11 @@
 
 
 
+
+
+
+
+
+
+
+
diff --git a/src/DslPackage/DslPackage.csproj b/src/DslPackage/DslPackage.csproj
@@ -193,11 +193,6 @@
       <DesignTime>True</DesignTime>
       <DependentUpon>PackageExtensionEnablement.tt</DependentUpon>
     </Compile>
-    <Compile Include="MefExtension\ValidationExtensionEnablement.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>ValidationExtensionEnablement.tt</DependentUpon>
-    </Compile>
     <Compile Include="MefExtension\ValidationExtensionRegistrar.cs">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
@@ -208,13 +203,6 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
-    <Content Include="MefExtension\CommandExtensionVSCT.vsct">
-      <Generator>VsctGenerator</Generator>
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>CommandExtensionVSCT.tt</DependentUpon>
-      <LastGenOutput>CommandExtensionVSCT.cs</LastGenOutput>
-    </Content>
     <Content Include="MefExtension\PackageExtensionEnablement.tt">
       <Generator>TextTemplatingFileGenerator</Generator>
       <LastGenOutput>PackageExtensionEnablement.cs</LastGenOutput>
@@ -250,11 +238,6 @@
     <Content Include="Parsers\EFCore3Parser.exe">
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
-    <Content Include="ProjectItemTemplates\CSharp.vstemplate">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>CSharp.tt</DependentUpon>
-    </Content>
     <Content Include="ProjectItemTemplates\EFModel.xsd">
       <SubType>Designer</SubType>
       <IncludeInVSIX>true</IncludeInVSIX>
@@ -264,13 +247,6 @@
       <SubType>Designer</SubType>
     </None>
     <None Include="ReadMe - Build Events.txt" />
-    <None Include="source.extension.vsixmanifest">
-      <Generator>VsixManifestGenerator</Generator>
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>source.extension.tt</DependentUpon>
-      <LastGenOutput>source.extension.cs</LastGenOutput>
-    </None>
     <Content Include="System.Spatial.dll">
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
@@ -281,6 +257,11 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
+    <None Include="MefExtension\CommandExtensionVSCT.vsct">
+      <DependentUpon>CommandExtensionVSCT.tt</DependentUpon>
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+    </None>
     <None Include="ProjectItemTemplates\efmodel.tt">
       <Parameters>
             &lt;%3fxml version="1.0" encoding="utf-16"%3f&gt;
@@ -291,6 +272,12 @@
       <Generator>TextTemplatingFileGenerator</Generator>
       <LastGenOutput>source.extension.vsixmanifest</LastGenOutput>
     </None>
+    <None Include="source.extension.vsixmanifest">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>source.extension.tt</DependentUpon>
+      <SubType>Designer</SubType>
+    </None>
     <None Include="GeneratedCode\Constants.tt">
       <Generator>TextTemplatingFileGenerator</Generator>
       <LastGenOutput>Constants.cs</LastGenOutput>
@@ -328,6 +315,11 @@
       <Generator>TextTemplatingFileGenerator</Generator>
       <LastGenOutput>ModelExplorer.cs</LastGenOutput>
     </None>
+    <Compile Include="MefExtension\ValidationExtensionEnablement.cs">
+      <DependentUpon>ValidationExtensionEnablement.tt</DependentUpon>
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+    </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
     <None Include="GeneratedCode\EditorFactory.tt">
       <Generator>TextTemplatingFileGenerator</Generator>
@@ -397,6 +389,13 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
+    <VSItemTemplate Include="ProjectItemTemplates\CSharp.vstemplate">
+      <OutputName>EFModel</OutputName>
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>CSharp.tt</DependentUpon>
+      <SubType>Designer</SubType>
+    </VSItemTemplate>
     <Content Include="Resources\File.ico">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <IncludeInVSIX>true</IncludeInVSIX>