diff --git a/BuildTT/Program.cs b/BuildTT/Program.cs index 0c8ecfd6..2566af4f 100644 --- a/BuildTT/Program.cs +++ b/BuildTT/Program.cs @@ -7,7 +7,6 @@ public class Program { static void Main() { - //const string root = "..\\..\\..\\"; const string generatorRoot = "..\\..\\..\\Generator"; const string ttRoot = "..\\..\\..\\EntityFramework.Reverse.POCO.Generator"; const string templatesRoot = "..\\..\\..\\_File based templates"; @@ -16,7 +15,7 @@ static void Main() TemplateFiles.Create(templatesRoot); BuildTT.Create(generatorRoot, ttRoot, version); - //var vs = new VersionSetter(root, version); + //var vs = new VersionSetter("..\\..\\..\\", version); //vs.SetVersions(); Console.WriteLine("Version: " + version); diff --git a/BuildTT/version.txt b/BuildTT/version.txt index d1cc3440..5187acf9 100644 --- a/BuildTT/version.txt +++ b/BuildTT/version.txt @@ -1 +1 @@ -3.6.1 \ No newline at end of file +3.7.0 \ No newline at end of file diff --git a/EntityFramework Reverse POCO Generator/ItemTemplates/CSharp/1033/efrpoco.zip b/EntityFramework Reverse POCO Generator/ItemTemplates/CSharp/1033/efrpoco.zip index dd1d3241..26283a7b 100644 Binary files a/EntityFramework Reverse POCO Generator/ItemTemplates/CSharp/1033/efrpoco.zip and b/EntityFramework Reverse POCO Generator/ItemTemplates/CSharp/1033/efrpoco.zip differ diff --git a/EntityFramework Reverse POCO Generator/ItemTemplates/CSharp/Data/1033/efrpoco.zip b/EntityFramework Reverse POCO Generator/ItemTemplates/CSharp/Data/1033/efrpoco.zip index dd1d3241..26283a7b 100644 Binary files a/EntityFramework Reverse POCO Generator/ItemTemplates/CSharp/Data/1033/efrpoco.zip and b/EntityFramework Reverse POCO Generator/ItemTemplates/CSharp/Data/1033/efrpoco.zip differ diff --git a/EntityFramework Reverse POCO Generator/ItemTemplates/efrpoco.zip b/EntityFramework Reverse POCO Generator/ItemTemplates/efrpoco.zip index dd1d3241..26283a7b 100644 Binary files a/EntityFramework Reverse POCO Generator/ItemTemplates/efrpoco.zip and b/EntityFramework Reverse POCO Generator/ItemTemplates/efrpoco.zip differ diff --git a/EntityFramework Reverse POCO Generator/Properties/AssemblyInfo.cs b/EntityFramework Reverse POCO Generator/Properties/AssemblyInfo.cs index 616ba312..331ad4ce 100644 --- a/EntityFramework Reverse POCO Generator/Properties/AssemblyInfo.cs +++ b/EntityFramework Reverse POCO Generator/Properties/AssemblyInfo.cs @@ -30,5 +30,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("3.6.1.0")] -[assembly: AssemblyFileVersion("3.6.1.0")] +[assembly: AssemblyVersion("3.7.0.0")] +[assembly: AssemblyFileVersion("3.7.0.0")] diff --git a/EntityFramework Reverse POCO Generator/source.extension.vsixmanifest b/EntityFramework Reverse POCO Generator/source.extension.vsixmanifest index a10f5edf..6cea8da8 100644 --- a/EntityFramework Reverse POCO Generator/source.extension.vsixmanifest +++ b/EntityFramework Reverse POCO Generator/source.extension.vsixmanifest @@ -1,7 +1,7 @@ - + EntityFramework Reverse POCO Generator Reverse engineers an existing database and generates EntityFramework Code First POCO classes, Configuration mappings and DbContext. https://github.com/sjh37/EntityFramework-Reverse-POCO-Code-First-Generator diff --git a/EntityFramework.Reverse.POCO.Generator/Database.tt b/EntityFramework.Reverse.POCO.Generator/Database.tt index 49904dbf..35862afa 100644 --- a/EntityFramework.Reverse.POCO.Generator/Database.tt +++ b/EntityFramework.Reverse.POCO.Generator/Database.tt @@ -1,6 +1,6 @@ <#@ include file="EF.Reverse.POCO.v3.ttinclude" #> <# - // v3.6.1 + // v3.7.0 // Please make changes to the settings below. // All you have to do is save this file, and the output file(s) are generated. Compiling does not regenerate the file(s). // A course for the older v2 generator is available on Pluralsight at https://www.pluralsight.com/courses/code-first-entity-framework-legacy-databases diff --git a/EntityFramework.Reverse.POCO.Generator/EF.Reverse.POCO.v3.ttinclude b/EntityFramework.Reverse.POCO.Generator/EF.Reverse.POCO.v3.ttinclude index a0d9c86a..3470d644 100644 --- a/EntityFramework.Reverse.POCO.Generator/EF.Reverse.POCO.v3.ttinclude +++ b/EntityFramework.Reverse.POCO.Generator/EF.Reverse.POCO.v3.ttinclude @@ -1,6 +1,6 @@ <# // Copyright (C) Simon Hughes 2012 -// v3.6.1 +// v3.7.0 // If you want to submit a pull request, please modify the Generator C# project as this file // is automatically constructed from the C# Generator project during the build process. #> @@ -42,7 +42,7 @@ public static DatabaseType DatabaseType = DatabaseType.SqlServer; // SqlServer, SqlCe, PostgreSQL. Coming next: MySql, Oracle public static TemplateType TemplateType = TemplateType.EfCore6; // EfCore6, EfCore5, EfCore3, EfCore2, Ef6, FileBasedCore2, FileBasedCore3. FileBased specify folder using Settings.TemplateFolder public static GeneratorType GeneratorType = GeneratorType.EfCore; // EfCore, Ef6, Custom. Custom edit GeneratorCustom class to provide your own implementation - public static ForeignKeyNamingStrategy ForeignKeyNamingStrategy = ForeignKeyNamingStrategy.Legacy; // Please use Legacy for now (same as versions <= v3.6.1), Latest (not yet ready) + public static ForeignKeyNamingStrategy ForeignKeyNamingStrategy = ForeignKeyNamingStrategy.Legacy; // Please use Legacy for now (same as versions <= v3.7.0), Latest (not yet ready) public static bool UseMappingTables = false; // Can only be set to true for EF6. If true, mapping will be used and no mapping tables will be generated. If false, all tables will be generated. public static FileManagerType FileManagerType = FileManagerType.EfCore; // .NET Core project = EfCore; .NET 4.x project = VisualStudio; No output (testing only) = Null public static string ConnectionString = ""; // This is used by the generator to reverse engineer your database @@ -1516,7 +1516,7 @@ { public static string Version() { - return "v3.6.1"; + return "v3.7.0"; } } @@ -3071,7 +3071,7 @@ } public enum ForeignKeyNamingStrategy { - Legacy, // Same as versions <= v3.6.1 + Legacy, // Same as versions <= v3.7.0 Latest } @@ -3159,7 +3159,7 @@ } } - // v0.0.0 <= v3.6.1 + // v0.0.0 <= v3.7.0 public class LegacyForeignKeyNamingStrategy : BaseForeignKeyNamingStrategy, IForeignKeyNamingStrategy { public List ReverseNavigationUniquePropName; diff --git a/Generator/EfrpgVersion.cs b/Generator/EfrpgVersion.cs index 14446bbb..85dc2415 100644 --- a/Generator/EfrpgVersion.cs +++ b/Generator/EfrpgVersion.cs @@ -4,7 +4,7 @@ public static class EfrpgVersion { public static string Version() { - return "v3.6.1"; + return "v3.7.0"; } } } \ No newline at end of file diff --git a/Generator/ForeignKeyNamingStrategy.cs b/Generator/ForeignKeyNamingStrategy.cs index fd0f694a..c36ebe76 100644 --- a/Generator/ForeignKeyNamingStrategy.cs +++ b/Generator/ForeignKeyNamingStrategy.cs @@ -2,7 +2,7 @@ { public enum ForeignKeyNamingStrategy { - Legacy, // Same as versions <= v3.6.1 + Legacy, // Same as versions <= v3.7.0 Latest } } \ No newline at end of file diff --git a/Generator/ForeignKeyStrategies/LegacyForeignKeyNamingStrategy.cs b/Generator/ForeignKeyStrategies/LegacyForeignKeyNamingStrategy.cs index a63c9419..d193d5f5 100644 --- a/Generator/ForeignKeyStrategies/LegacyForeignKeyNamingStrategy.cs +++ b/Generator/ForeignKeyStrategies/LegacyForeignKeyNamingStrategy.cs @@ -4,7 +4,7 @@ namespace Efrpg.ForeignKeyStrategies { - // v0.0.0 <= v3.6.1 + // v0.0.0 <= v3.7.0 public class LegacyForeignKeyNamingStrategy : BaseForeignKeyNamingStrategy, IForeignKeyNamingStrategy { public List ReverseNavigationUniquePropName; diff --git a/Generator/Properties/AssemblyInfo.cs b/Generator/Properties/AssemblyInfo.cs index 74c4b00c..d7e79072 100644 --- a/Generator/Properties/AssemblyInfo.cs +++ b/Generator/Properties/AssemblyInfo.cs @@ -33,5 +33,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("3.6.1.0")] -[assembly: AssemblyFileVersion("3.6.1.0")] +[assembly: AssemblyVersion("3.7.0.0")] +[assembly: AssemblyFileVersion("3.7.0.0")] diff --git a/Generator/Settings.cs b/Generator/Settings.cs index b7433442..34d5db88 100644 --- a/Generator/Settings.cs +++ b/Generator/Settings.cs @@ -15,7 +15,7 @@ public static class Settings public static DatabaseType DatabaseType = DatabaseType.SqlServer; // SqlServer, SqlCe, PostgreSQL. Coming next: MySql, Oracle public static TemplateType TemplateType = TemplateType.EfCore6; // EfCore6, EfCore5, EfCore3, EfCore2, Ef6, FileBasedCore2, FileBasedCore3. FileBased specify folder using Settings.TemplateFolder public static GeneratorType GeneratorType = GeneratorType.EfCore; // EfCore, Ef6, Custom. Custom edit GeneratorCustom class to provide your own implementation - public static ForeignKeyNamingStrategy ForeignKeyNamingStrategy = ForeignKeyNamingStrategy.Legacy; // Please use Legacy for now (same as versions <= v3.6.1), Latest (not yet ready) + public static ForeignKeyNamingStrategy ForeignKeyNamingStrategy = ForeignKeyNamingStrategy.Legacy; // Please use Legacy for now (same as versions <= v3.7.0), Latest (not yet ready) public static bool UseMappingTables = false; // Can only be set to true for EF6. If true, mapping will be used and no mapping tables will be generated. If false, all tables will be generated. public static FileManagerType FileManagerType = FileManagerType.EfCore; // .NET Core project = EfCore; .NET 4.x project = VisualStudio; No output (testing only) = Null public static string ConnectionString = ""; // This is used by the generator to reverse engineer your database diff --git a/ItemTemplate/ItemTemplates/efrpoco.zip b/ItemTemplate/ItemTemplates/efrpoco.zip index dd1d3241..26283a7b 100644 Binary files a/ItemTemplate/ItemTemplates/efrpoco.zip and b/ItemTemplate/ItemTemplates/efrpoco.zip differ diff --git a/ItemTemplate/MyTemplate.vstemplate b/ItemTemplate/MyTemplate.vstemplate index acc5490f..e2af5244 100644 --- a/ItemTemplate/MyTemplate.vstemplate +++ b/ItemTemplate/MyTemplate.vstemplate @@ -8,7 +8,7 @@ TemplateIcon.ico PreviewImage.png 1 - 3.6.1 + 3.7.0 Database.tt