From a4bc876da7503e6aaf52e9efa562322168ca40e9 Mon Sep 17 00:00:00 2001 From: Sergei Calabonga Date: Sat, 11 May 2024 08:24:25 +0700 Subject: [PATCH 1/5] Derundant configuration for modules removed --- AspNetCore v8.0/module1.json | 22 ---------------------- AspNetCore v8.0/module2.json | 22 ---------------------- 2 files changed, 44 deletions(-) delete mode 100644 AspNetCore v8.0/module1.json delete mode 100644 AspNetCore v8.0/module2.json diff --git a/AspNetCore v8.0/module1.json b/AspNetCore v8.0/module1.json deleted file mode 100644 index e6b306d..0000000 --- a/AspNetCore v8.0/module1.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "TemplateOptions": [ - { - "PatternDefinitions": [ - { - "FileExtension": ".cs", - "ContentType": "Csharp file", - "SearchTextForReplace": "using Calabonga.Microservice.IdentityModule", - "ReplaceTextWith": "using $ext_projectname$" - }, - { - "FileExtension": ".csproj", - "ContentType": "Project file", - "SearchTextForReplace": "Calabonga.Microservice.IdentityModule.", - "ReplaceTextWith": "$ext_projectname$." - } - ], - "RootDirectoryPath": "C:\\Projects\\Calabonga\\Microservice-Template\\AspNetCore v8.0\\1", - "ProjectName": "Calabonga.Microservice.IdentityModule" - } - ] -} \ No newline at end of file diff --git a/AspNetCore v8.0/module2.json b/AspNetCore v8.0/module2.json deleted file mode 100644 index a4e9566..0000000 --- a/AspNetCore v8.0/module2.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "TemplateOptions": [ - { - "PatternDefinitions": [ - { - "FileExtension": ".cs", - "ContentType": "Csharp file", - "SearchTextForReplace": "using Calabonga.Microservice.Module", - "ReplaceTextWith": "using $ext_projectname$" - }, - { - "FileExtension": ".csproj", - "ContentType": "Project file", - "SearchTextForReplace": "Calabonga.Microservice.Module.", - "ReplaceTextWith": "$ext_projectname$." - } - ], - "RootDirectoryPath": "C:\\Projects\\Calabonga\\Microservice-Template\\AspNetCore v8.0\\2", - "ProjectName": "Calabonga.Microservice.Module" - } - ] -} \ No newline at end of file From e39714bcd7ed310658c7867237383cae8d886d26 Mon Sep 17 00:00:00 2001 From: Sergei Calabonga Date: Sat, 11 May 2024 08:25:02 +0700 Subject: [PATCH 2/5] IdentityModule nugets bumped --- ...abonga.Microservice.IdentityModule.Infrastructure.csproj | 2 +- .../Calabonga.Microservice.IdentityModule.Web.csproj | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/AspNetCore v8.0/Calabonga.Microservice.IdentityModule.Template/content/Calabonga.Microservice.IdentityModule.Infrastructure/Calabonga.Microservice.IdentityModule.Infrastructure.csproj b/AspNetCore v8.0/Calabonga.Microservice.IdentityModule.Template/content/Calabonga.Microservice.IdentityModule.Infrastructure/Calabonga.Microservice.IdentityModule.Infrastructure.csproj index 9f2d763..a22032b 100644 --- a/AspNetCore v8.0/Calabonga.Microservice.IdentityModule.Template/content/Calabonga.Microservice.IdentityModule.Infrastructure/Calabonga.Microservice.IdentityModule.Infrastructure.csproj +++ b/AspNetCore v8.0/Calabonga.Microservice.IdentityModule.Template/content/Calabonga.Microservice.IdentityModule.Infrastructure/Calabonga.Microservice.IdentityModule.Infrastructure.csproj @@ -17,7 +17,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/AspNetCore v8.0/Calabonga.Microservice.IdentityModule.Template/content/Calabonga.Microservice.IdentityModule.Web/Calabonga.Microservice.IdentityModule.Web.csproj b/AspNetCore v8.0/Calabonga.Microservice.IdentityModule.Template/content/Calabonga.Microservice.IdentityModule.Web/Calabonga.Microservice.IdentityModule.Web.csproj index 7b47c96..38412c9 100644 --- a/AspNetCore v8.0/Calabonga.Microservice.IdentityModule.Template/content/Calabonga.Microservice.IdentityModule.Web/Calabonga.Microservice.IdentityModule.Web.csproj +++ b/AspNetCore v8.0/Calabonga.Microservice.IdentityModule.Template/content/Calabonga.Microservice.IdentityModule.Web/Calabonga.Microservice.IdentityModule.Web.csproj @@ -19,9 +19,9 @@ - + - + @@ -29,7 +29,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + From 4f4938dcdf83f101e2049edb2f0fd16084f27e0e Mon Sep 17 00:00:00 2001 From: Sergei Calabonga Date: Sat, 11 May 2024 08:31:58 +0700 Subject: [PATCH 3/5] version bumped --- .../Calabonga.Microservice.IdentityModule.Template.csproj | 2 +- .../Definitions/Swagger/SwaggerDefinition.cs | 2 +- .../Calabonga.Microservice.IdentityModule.Web/Program.cs | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/AspNetCore v8.0/Calabonga.Microservice.IdentityModule.Template/Calabonga.Microservice.IdentityModule.Template.csproj b/AspNetCore v8.0/Calabonga.Microservice.IdentityModule.Template/Calabonga.Microservice.IdentityModule.Template.csproj index e7c3934..2a6484c 100644 --- a/AspNetCore v8.0/Calabonga.Microservice.IdentityModule.Template/Calabonga.Microservice.IdentityModule.Template.csproj +++ b/AspNetCore v8.0/Calabonga.Microservice.IdentityModule.Template/Calabonga.Microservice.IdentityModule.Template.csproj @@ -4,7 +4,7 @@ Calabonga.Microservice.IdentityModule.Template - 8.0.2 + 8.0.3 Microservice template with OpenIddict Calabonga Calabonga SOFT © 2001 - $([System.DateTime]::Now.ToString(yyyy)) diff --git a/AspNetCore v8.0/Calabonga.Microservice.IdentityModule.Template/content/Calabonga.Microservice.IdentityModule.Web/Definitions/Swagger/SwaggerDefinition.cs b/AspNetCore v8.0/Calabonga.Microservice.IdentityModule.Template/content/Calabonga.Microservice.IdentityModule.Web/Definitions/Swagger/SwaggerDefinition.cs index 451f324..d2eb118 100644 --- a/AspNetCore v8.0/Calabonga.Microservice.IdentityModule.Template/content/Calabonga.Microservice.IdentityModule.Web/Definitions/Swagger/SwaggerDefinition.cs +++ b/AspNetCore v8.0/Calabonga.Microservice.IdentityModule.Template/content/Calabonga.Microservice.IdentityModule.Web/Definitions/Swagger/SwaggerDefinition.cs @@ -16,7 +16,7 @@ public class SwaggerDefinition : AppDefinition // Otherwise, you can change versions of your API by manually. // If you are not going to use git-versioning, do not forget install package "GitInfo" // private const string AppVersion = $"{ThisAssembly.Git.SemVer.Major}.{ThisAssembly.Git.SemVer.Minor}.{ThisAssembly.Git.SemVer.Patch}"; - public const string AppVersion = "8.0.2"; + public const string AppVersion = "8.0.3"; private const string _swaggerConfig = "/swagger/v1/swagger.json"; diff --git a/AspNetCore v8.0/Calabonga.Microservice.IdentityModule.Template/content/Calabonga.Microservice.IdentityModule.Web/Program.cs b/AspNetCore v8.0/Calabonga.Microservice.IdentityModule.Template/content/Calabonga.Microservice.IdentityModule.Web/Program.cs index 0d5a34c..83f818d 100644 --- a/AspNetCore v8.0/Calabonga.Microservice.IdentityModule.Template/content/Calabonga.Microservice.IdentityModule.Web/Program.cs +++ b/AspNetCore v8.0/Calabonga.Microservice.IdentityModule.Template/content/Calabonga.Microservice.IdentityModule.Web/Program.cs @@ -2,10 +2,10 @@ // Name: Template for Micro service on ASP.NET Core API with // OpenIddict (OAuth2.0) // Author: Calabonga © 2005-2024 Calabonga SOFT -// Version: 8.0.2 +// Version: 8.0.3 // Based on: .NET 8.0.x // Created Date: 2023-11-19 -// Updated Date: 2024-02-05 +// Updated Date: 2024-05-11 // -------------------------------------------------------------------- // Contacts // -------------------------------------------------------------------- From 3fda759e795cd241f2bc8432569fdfdae6d0ea02 Mon Sep 17 00:00:00 2001 From: Sergei Calabonga Date: Sat, 11 May 2024 08:35:20 +0700 Subject: [PATCH 4/5] nuget version bumped --- .../Calabonga.Microservice.Module.Template.csproj | 2 +- .../Calabonga.Microservice.Module.Web.csproj | 6 +++--- .../Definitions/Swagger/SwaggerDefinition.cs | 2 +- .../content/Calabonga.Microservice.Module.Web/Program.cs | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/AspNetCore v8.0/Calabonga.Microservice.Module.Template/Calabonga.Microservice.Module.Template.csproj b/AspNetCore v8.0/Calabonga.Microservice.Module.Template/Calabonga.Microservice.Module.Template.csproj index f63c92c..9bdcd43 100644 --- a/AspNetCore v8.0/Calabonga.Microservice.Module.Template/Calabonga.Microservice.Module.Template.csproj +++ b/AspNetCore v8.0/Calabonga.Microservice.Module.Template/Calabonga.Microservice.Module.Template.csproj @@ -4,7 +4,7 @@ Calabonga.Microservice.Module.Template - 8.0.2 + 8.0.3 Microservice template Calabonga Calabonga SOFT © 2001 - $([System.DateTime]::Now.ToString(yyyy)) diff --git a/AspNetCore v8.0/Calabonga.Microservice.Module.Template/content/Calabonga.Microservice.Module.Web/Calabonga.Microservice.Module.Web.csproj b/AspNetCore v8.0/Calabonga.Microservice.Module.Template/content/Calabonga.Microservice.Module.Web/Calabonga.Microservice.Module.Web.csproj index d5a9ac6..eb0defb 100644 --- a/AspNetCore v8.0/Calabonga.Microservice.Module.Template/content/Calabonga.Microservice.Module.Web/Calabonga.Microservice.Module.Web.csproj +++ b/AspNetCore v8.0/Calabonga.Microservice.Module.Template/content/Calabonga.Microservice.Module.Web/Calabonga.Microservice.Module.Web.csproj @@ -12,8 +12,8 @@ - - + + @@ -24,7 +24,7 @@ runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/AspNetCore v8.0/Calabonga.Microservice.Module.Template/content/Calabonga.Microservice.Module.Web/Definitions/Swagger/SwaggerDefinition.cs b/AspNetCore v8.0/Calabonga.Microservice.Module.Template/content/Calabonga.Microservice.Module.Web/Definitions/Swagger/SwaggerDefinition.cs index a94e82f..11cacbb 100644 --- a/AspNetCore v8.0/Calabonga.Microservice.Module.Template/content/Calabonga.Microservice.Module.Web/Definitions/Swagger/SwaggerDefinition.cs +++ b/AspNetCore v8.0/Calabonga.Microservice.Module.Template/content/Calabonga.Microservice.Module.Web/Definitions/Swagger/SwaggerDefinition.cs @@ -16,7 +16,7 @@ public class SwaggerDefinition : AppDefinition // Otherwise, you can change versions of your API by manually. // If you are not going to use git-versioning, do not forget install package "GitInfo" // private const string _appVersion = $"{ThisAssembly.Git.SemVer.Major}.{ThisAssembly.Git.SemVer.Minor}.{ThisAssembly.Git.SemVer.Patch}"; - private const string _appVersion = "8.0.2"; + private const string _appVersion = "8.0.3"; private const string _swaggerConfig = "/swagger/v1/swagger.json"; diff --git a/AspNetCore v8.0/Calabonga.Microservice.Module.Template/content/Calabonga.Microservice.Module.Web/Program.cs b/AspNetCore v8.0/Calabonga.Microservice.Module.Template/content/Calabonga.Microservice.Module.Web/Program.cs index ce20d71..b51c28d 100644 --- a/AspNetCore v8.0/Calabonga.Microservice.Module.Template/content/Calabonga.Microservice.Module.Web/Program.cs +++ b/AspNetCore v8.0/Calabonga.Microservice.Module.Template/content/Calabonga.Microservice.Module.Web/Program.cs @@ -2,10 +2,10 @@ // Name: Template for Micro service on ASP.NET Core API with // OpenIddict (OAuth2.0) // Author: Calabonga © 2005-2023 Calabonga SOFT -// Version: 8.0.2 +// Version: 8.0.3 // Based on: .NET 8.0.x // Created Date: 2023-11-19 -// Updated Date: 2024-02-06 +// Updated Date: 2024-05-11 // -------------------------------------------------------------------- // Contacts // -------------------------------------------------------------------- From c6fdd450e5ca2e9974aee25218a9c3404f00911e Mon Sep 17 00:00:00 2001 From: Sergei Calabonga Date: Sat, 11 May 2024 08:35:28 +0700 Subject: [PATCH 5/5] Readme updated --- README.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/README.md b/README.md index 01281e5..651ed46 100644 --- a/README.md +++ b/README.md @@ -19,6 +19,14 @@ To install version 8.x please, read [wiki](https://github.com/Calabonga/Microser ## История Nimble Framework +### 2024-05-11 Версия 8.0.3 + +* Обновились nuget-пакеты в проекте `IdentityModule` +* Обновились nuget-пакеты в проекте `Module`. +* Исправлена ошибка генерации решения из шаблона: дублирование sln-файла. Спасибо [andrew-moiseyev](https://github.com/andrew-moiseyev). +* Обновлены проекты nuget-templates для обоих tool CLI. + + ### 2024-04-22 Версия 8.0.2 * Обновились nuget-пакеты