Merge pull request #416 from nclient/main

[Release] 0.12.1

Author: smolchanovsky

.github/actions/release-info/action.yml

@@ -24,7 +24,7 @@ runs:
   steps:
     - id: version-prefix-generator
       env:
-        default-version-prefix: 0.12.0
+        default-version-prefix: 0.12.1
       run: |
         if [[ "${{ inputs.version-prefix || '' }}" != "" ]]; then
           echo "::set-output name=version-prefix::${{ inputs.version-prefix }}"

.github/workflows/notifications.yml

@@ -2,9 +2,10 @@ name: 'Notifications'
 
 on:
   workflow_dispatch:
-  push:
   pull_request:
-  issues:
+    types: [ opened, closed, reopened, ready_for_review, review_requested ]
+  issues: 
+    types: [ opened, edited, deleted, closed, reopened ]
   fork:
   watch:
 
@@ -14,7 +15,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: telegram-notify
-        uses: cofob/telegram-actions@v1.3
-        env:
-          BOT_TOKEN: ${{ secrets.TELEGRAM_BOT_API }}
-          BOT_CHAT_ID: ${{ secrets.TELEGRAM_CHAT_ID }}
+        uses: appleboy/telegram-action@master
+        with:
+          to: ${{ secrets.TELEGRAM_CHAT_ID }}
+          token: ${{ secrets.TELEGRAM_BOT_API }}
+          message: |
+            Hello there,
+            There is new ${{ github.event_name }} in NClient by ${{ github.actor }}.

.github/workflows/sonarcloud-analysis.yml

@@ -5,7 +5,6 @@ on:
     branches: [ main ]
   pull_request:
     types: [ assigned, review_requested, auto_merge_enabled ]
-    branches: [ main, alpha-release, beta-release, release ]
 
 env:
   solution: NClient.sln

README.md

@@ -110,7 +110,7 @@ dotnet tool install --global dotnet-nclient
 ```
 #### Step 3: Generate the interface describing the API of the web service
 ```
-dotnet nclient facade generate --api path/to/product-service-swagger.json --output MyProject/Client.cs
+dotnet nclient generate facade --api path/to/product-service-swagger.json --output MyProject/Client.cs
 ```
 This command will generate an interface for the API using the OpenAPI (Swagger) specification:
 ```C#

src/NClient.CodeGeneration/NClient.CodeGeneration.Facades.NSwag/CSharpFacadeGenerator.cs

@@ -30,7 +30,7 @@ protected override IEnumerable<CodeArtifact> GenerateClientTypes(string facadeNa
             var notAvailableOperations = allOperations.Where(o => o.Consumes.Contains("multipart"));
             foreach (var notAvailableOperation in notAvailableOperations)
             {
-                _logger?.LogWarning($"Multipart content currently not supported. Operation {notAvailableOperation.Summary ?? notAvailableOperation.ActualOperationName} was skipped!");
+                _logger?.LogWarning("Multipart content currently not supported. Operation {OperationName} was skipped!", notAvailableOperation.Summary ?? notAvailableOperation.ActualOperationName);
             }
             var model = new CSharpFacadeTemplateModel(facadeDefinitionName, availableOperations, _document, (CSharpFacadeGeneratorSettings) Settings);
             var template = Settings.CodeGeneratorSettings.TemplateFactory.CreateTemplate("CSharp", "Facade", model);

src/NClient.CodeGeneration/NClient.CodeGeneration.Facades.NSwag/Templates/Facade.liquid

@@ -5,7 +5,7 @@
 {%     if GenerateFacades -%}
 public partial interface I{{ FacadeName }}Client : I{{ FacadeName }}Facade
 {%     else %}
-[{{ NClientAnnotationsHttpNamespace }}.Facade]
+[{{ NClientAnnotationsNamespace }}.Facade]
 {%         if HasBasePath -%}
 [{{ NClientAnnotationsNamespace }}.Path("{{ BasePath }}")]
 {%         endif -%}

src/NClient.Tools/NClient.DotNetTool/FacadeGenerator.cs

@@ -30,8 +30,10 @@ public Task<string> GenerateAsync(InterfaceGenerationOptions generationOptions,
                 ?? (generationOptions as GenerationOptions.FacadeOptions)?.FacadeName
                 ?? "{controller}", 
                 generationOptions.Namespace,
-                generateClients: (generationOptions as GenerationOptions.FacadeOptions)?.GenerateClients ?? false,
-                generateFacades: (generationOptions as GenerationOptions.ClientOptions)?.GenerateFacades ?? false,
+                generateClients: generationOptions is GenerationOptions.ClientOptions 
+                || ((generationOptions as GenerationOptions.FacadeOptions)?.GenerateClients ?? false),
+                generateFacades: generationOptions is GenerationOptions.FacadeOptions 
+                || ((generationOptions as GenerationOptions.ClientOptions)?.GenerateFacades ?? false),
                 generationOptions.UseModelValidationAttributes,
                 generationOptions.UseNullableReferenceTypes,
                 generationOptions.UseCancellationToken,

src/NClient.Tools/NClient.DotNetTool/Loaders/FileLoader.cs

@@ -11,7 +11,7 @@ public FileLoader(string path)
             _path = path;
         }
 
-        public Task<string> Load()
+        public Task<string> LoadAsync()
         {
             #if NETFRAMEWORK
             return Task.FromResult(File.ReadAllText(_path));

src/NClient.Tools/NClient.DotNetTool/Loaders/ISpecificationLoader.cs

@@ -4,6 +4,6 @@ namespace NClient.DotNetTool.Loaders
 {
     public interface ISpecificationLoader
     {
-        Task<string> Load();
+        Task<string> LoadAsync();
     }
 }

src/NClient.Tools/NClient.DotNetTool/Loaders/NetworkLoader.cs

@@ -13,7 +13,7 @@ public NetworkLoader(Uri uri)
             _uri = uri;
         }
 
-        public async Task<string> Load()
+        public async Task<string> LoadAsync()
         {
             using var client = new HttpClient();
             using var responseMessage = await client.GetAsync(_uri);