From a8275010bcbbedca15930d1a888bd6a813e5557c Mon Sep 17 00:00:00 2001 From: Damien Date: Wed, 25 Sep 2024 00:16:15 +0200 Subject: [PATCH] test --- TopModel.Generator/Program.cs | 16 +++++++++++----- samples/model/angular.topmodel.lock | 2 +- samples/model/csharp.topmodel.lock | 2 +- samples/model/focus.topmodel.lock | 2 +- samples/model/jpa.topmodel.lock | 2 +- samples/model/pg.topmodel.lock | 2 +- samples/model/php.topmodel.lock | 2 +- samples/model/ssdt.topmodel.lock | 2 +- samples/model/translation.topmodel.lock | 2 +- 9 files changed, 19 insertions(+), 13 deletions(-) diff --git a/TopModel.Generator/Program.cs b/TopModel.Generator/Program.cs index 8f87f3a2..7ebc776e 100644 --- a/TopModel.Generator/Program.cs +++ b/TopModel.Generator/Program.cs @@ -257,11 +257,17 @@ void SearchConfigFile(string dirName, int depth = 0) string GetCgHash() { return GetHash( - Directory - .EnumerateFiles( - Path.GetFullPath(cg, new FileInfo(fullName).DirectoryName!), - "*.cs", - SearchOption.AllDirectories) + new DirectoryInfo(Path.Combine(Path.GetFullPath(cg, new FileInfo(fullName).DirectoryName!), "bin")) + .GetFiles($"*.dll", SearchOption.AllDirectories) + .Where(a => a.FullName.Contains(framework) && !modgenAssemblies.Contains(a.Name)) + .DistinctBy(a => a.Name) + .Select(a => a.FullName) + .Concat( + Directory + .EnumerateFiles( + Path.GetFullPath(cg, new FileInfo(fullName).DirectoryName!), + "*.cs", + SearchOption.AllDirectories)) .Where(f => !f.Contains($"{Path.DirectorySeparatorChar}obj{Path.DirectorySeparatorChar}")), customDir) ?? string.Empty; } diff --git a/samples/model/angular.topmodel.lock b/samples/model/angular.topmodel.lock index bfe27005..c42df51a 100644 --- a/samples/model/angular.topmodel.lock +++ b/samples/model/angular.topmodel.lock @@ -4,7 +4,7 @@ version: 2.1.0 custom: - ../../../TopModel.Generator.Javascript: e39801d826bcb9c740ebb356ac0b7fbb + ../../../TopModel.Generator.Javascript: 74255c5a67bbe523e9e321c8024f1827 generatedFiles: - ../generators/angular/src/appgenerated/api/securite/profil/profil.service.ts - ../generators/angular/src/appgenerated/api/securite/utilisateur/utilisateur.service.ts diff --git a/samples/model/csharp.topmodel.lock b/samples/model/csharp.topmodel.lock index e2874f55..861392ae 100644 --- a/samples/model/csharp.topmodel.lock +++ b/samples/model/csharp.topmodel.lock @@ -4,7 +4,7 @@ version: 2.1.0 custom: - ../../../TopModel.Generator.Csharp: 121e8b5ce6a8be344945262bf8960580 + ../../../TopModel.Generator.Csharp: 8486cfdb798560fbaa4f6806a145d2a3 generatedFiles: - ../generators/csharp/src/Clients/CSharp.Clients.Db/generated/CSharpDbContext.comments.cs - ../generators/csharp/src/Clients/CSharp.Clients.Db/generated/CSharpDbContext.cs diff --git a/samples/model/focus.topmodel.lock b/samples/model/focus.topmodel.lock index 113b0181..d5780613 100644 --- a/samples/model/focus.topmodel.lock +++ b/samples/model/focus.topmodel.lock @@ -4,7 +4,7 @@ version: 2.1.0 custom: - ../../../TopModel.Generator.Javascript: e39801d826bcb9c740ebb356ac0b7fbb + ../../../TopModel.Generator.Javascript: 74255c5a67bbe523e9e321c8024f1827 generatedFiles: - ../generators/focus/src/locale/common.ts - ../generators/focus/src/locale/securite.ts diff --git a/samples/model/jpa.topmodel.lock b/samples/model/jpa.topmodel.lock index 8a2a259a..20e70df7 100644 --- a/samples/model/jpa.topmodel.lock +++ b/samples/model/jpa.topmodel.lock @@ -4,7 +4,7 @@ version: 2.1.0 custom: - ../../../TopModel.Generator.Jpa: 3df4f5992b92ce79d5bfddf465926bd2 + ../../../TopModel.Generator.Jpa: 22a5eddb4f60c62608f14415f6593065 generatedFiles: - ../generators/jpa/src/main/javagen/topmodel/jpa/sample/demo/api/client/securite/profil/ProfilClient.java - ../generators/jpa/src/main/javagen/topmodel/jpa/sample/demo/api/client/securite/utilisateur/UtilisateurClient.java diff --git a/samples/model/pg.topmodel.lock b/samples/model/pg.topmodel.lock index 18d79c98..728ab66a 100644 --- a/samples/model/pg.topmodel.lock +++ b/samples/model/pg.topmodel.lock @@ -4,7 +4,7 @@ version: 2.1.0 custom: - ../../../TopModel.Generator.Sql: a7d6d70714c8ee38aeac8e9447ed12fd + ../../../TopModel.Generator.Sql: 63f10759e9f39920a878628a3707587b generatedFiles: - ../generators/pg/src/01_tables.sql - ../generators/pg/src/02_fk_indexes.sql diff --git a/samples/model/php.topmodel.lock b/samples/model/php.topmodel.lock index 3bd91bbc..c795c51e 100644 --- a/samples/model/php.topmodel.lock +++ b/samples/model/php.topmodel.lock @@ -4,7 +4,7 @@ version: 2.1.0 custom: - ../../../TopModel.Generator.Php: 8029e36a5806c385b25b725c2e00ecdc + ../../../TopModel.Generator.Php: 4bcb73c9190a4fa0cab4618256250e06 generatedFiles: - ../generators/php/src/Entity/Securite/Profil/Droit.php - ../generators/php/src/Entity/Securite/Profil/Profil.php diff --git a/samples/model/ssdt.topmodel.lock b/samples/model/ssdt.topmodel.lock index e769a685..c0b75298 100644 --- a/samples/model/ssdt.topmodel.lock +++ b/samples/model/ssdt.topmodel.lock @@ -4,7 +4,7 @@ version: 2.1.0 custom: - ../../../TopModel.Generator.Sql: a7d6d70714c8ee38aeac8e9447ed12fd + ../../../TopModel.Generator.Sql: 63f10759e9f39920a878628a3707587b generatedFiles: - ../generators/ssdt/src/init/DROIT.insert.sql - ../generators/ssdt/src/init/main.sql diff --git a/samples/model/translation.topmodel.lock b/samples/model/translation.topmodel.lock index bd0338b8..8f828202 100644 --- a/samples/model/translation.topmodel.lock +++ b/samples/model/translation.topmodel.lock @@ -4,7 +4,7 @@ version: 2.1.0 custom: - ../../../TopModel.Generator.Translation: 9f15a161c1cd09a554e17eb18f624495 + ../../../TopModel.Generator.Translation: ef4a52ac3961c997e997e79308991e65 generatedFiles: - ../generators/translation/i18n/de_DE/out/common_de_DE.properties - ../generators/translation/i18n/de_DE/out/securite_de_DE.properties