Move DbOnConfiguring.hbs, DbContext.hbs to samples.

Anthony Sneed · Anthony Sneed · commit 27f25af0e8f1 · 2020-06-27T17:24:27.000-05:00
diff --git a/sample/ScaffoldingSample.TypeScript/CodeTemplates/TypeScriptDbContext/DbContext.hbs b/sample/ScaffoldingSample.TypeScript/CodeTemplates/TypeScriptDbContext/DbContext.hbs
@@ -0,0 +1,21 @@
+﻿{{> dbimports}}
+
+namespace {{namespace}}
+{ // Comment
+    public partial class {{class}} : DbContext
+    {
+{{{> dbsets}}}
+{{#if entity-type-errors}}
+{{#each entity-type-errors}}
+{{spaces 8}}{{{entity-type-error}}}
+{{/each}}
+
+{{/if}}
+
+{{{> dbconstructor}}}
+
+{{{> dbonconfiguring}}}
+
+{{{on-model-creating}}}
+    }
+}
diff --git a/sample/ScaffoldingSample.TypeScript/CodeTemplates/TypeScriptDbContext/Partials/DbOnConfiguring.hbs b/sample/ScaffoldingSample.TypeScript/CodeTemplates/TypeScriptDbContext/Partials/DbOnConfiguring.hbs
diff --git a/sample/ScaffoldingSample.TypeScript/ScaffoldingSample.TypeScript.csproj b/sample/ScaffoldingSample.TypeScript/ScaffoldingSample.TypeScript.csproj
@@ -7,10 +7,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.1.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="3.1.0">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="3.1.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/sample/ScaffoldingSample/CodeTemplates/CSharpDbContext/DbContext.hbs b/sample/ScaffoldingSample/CodeTemplates/CSharpDbContext/DbContext.hbs
@@ -14,6 +14,8 @@ namespace {{namespace}}
 
 {{{> dbconstructor}}}
 
+{{{> dbonconfiguring}}}
+
 {{{on-model-creating}}}
     }
 }
diff --git a/sample/ScaffoldingSample/CodeTemplates/CSharpDbContext/Partials/DbOnConfiguring.hbs b/sample/ScaffoldingSample/CodeTemplates/CSharpDbContext/Partials/DbOnConfiguring.hbs
diff --git a/sample/ScaffoldingSample/ScaffoldingSample.csproj b/sample/ScaffoldingSample/ScaffoldingSample.csproj
@@ -8,10 +8,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.1.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="3.1.0">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="3.1.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/EntityFrameworkCore.Scaffolding.Handlebars/CodeTemplates/CSharpDbContext/DbContext.hbs b/src/EntityFrameworkCore.Scaffolding.Handlebars/CodeTemplates/CSharpDbContext/DbContext.hbs
@@ -14,8 +14,6 @@ namespace {{namespace}}
 
 {{{> dbconstructor}}}
 
-{{{> dbonconfiguring}}}
-
 {{{on-model-creating}}}
     }
 }
diff --git a/src/EntityFrameworkCore.Scaffolding.Handlebars/CodeTemplates/TypeScriptDbContext/DbContext.hbs b/src/EntityFrameworkCore.Scaffolding.Handlebars/CodeTemplates/TypeScriptDbContext/DbContext.hbs
@@ -14,8 +14,6 @@ namespace {{namespace}}
 
 {{{> dbconstructor}}}
 
-{{{> dbonconfiguring}}}
-
 {{{on-model-creating}}}
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,8 @@ namespace {{namespace}}`
`14`	`14`
`15`	`15`	`{{{> dbconstructor}}}`
`16`	`16`
	`17`	`+{{{> dbonconfiguring}}}`
	`18`	`+`
`17`	`19`	`{{{on-model-creating}}}`
`18`	`20`	`}`
`19`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,8 +14,6 @@ namespace {{namespace}}`
`14`	`14`
`15`	`15`	`{{{> dbconstructor}}}`
`16`	`16`
`17`		`-{{{> dbonconfiguring}}}`
`18`		`-`
`19`	`17`	`{{{on-model-creating}}}`
`20`	`18`	`}`
`21`	`19`	`}`