Merge pull request #195 from atc-net/feature/maintenance

Feature/maintenance
atc-net · Jul 14, 2024 · 414e20d · 414e20d
2 parents c00fc53 + dd1ca97
commit 414e20d
Show file tree

Hide file tree

Showing 38 changed files with 125 additions and 137 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -43,10 +43,10 @@
   <ItemGroup Label="Code Analyzers">
     <PackageReference Include="AsyncFixer" Version="1.6.0" PrivateAssets="All" />
     <PackageReference Include="Asyncify" Version="0.9.7" PrivateAssets="All" />
-    <PackageReference Include="Meziantou.Analyzer" Version="2.0.159" PrivateAssets="All" />
+    <PackageReference Include="Meziantou.Analyzer" Version="2.0.160" PrivateAssets="All" />
     <PackageReference Include="SecurityCodeScan.VS2019" Version="5.6.7" PrivateAssets="All" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.435" PrivateAssets="All" />
-    <PackageReference Include="SonarAnalyzer.CSharp" Version="9.28.0.94264" PrivateAssets="All" />
+    <PackageReference Include="SonarAnalyzer.CSharp" Version="9.29.0.95321" PrivateAssets="All" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Atc.CodeGeneration.CSharp/Atc.CodeGeneration.CSharp.csproj b/src/Atc.CodeGeneration.CSharp/Atc.CodeGeneration.CSharp.csproj
@@ -6,8 +6,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Atc" Version="2.0.490" />
-    <PackageReference Include="Atc.CodeDocumentation" Version="2.0.490" />
+    <PackageReference Include="Atc" Version="2.0.495" />
+    <PackageReference Include="Atc.CodeDocumentation" Version="2.0.495" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.10.0" />
   </ItemGroup>
 

diff --git a/src/Atc.CodeGeneration.CSharp/Content/Factories/AttributesParametersFactory.cs b/src/Atc.CodeGeneration.CSharp/Content/Factories/AttributesParametersFactory.cs
@@ -38,7 +38,49 @@ public static IList<AttributeParameters> Create(
                     result.Add(new AttributeParameters("MaxLength", maxLengthAttribute.Length.ToString()));
                     break;
                 case RangeAttribute rangeAttribute:
-                    result.Add(new AttributeParameters("Range", $"{rangeAttribute.Minimum}, {rangeAttribute.Maximum}"));
+                    var minimum = rangeAttribute.Minimum;
+                    var maximum = rangeAttribute.Maximum;
+
+                    if (rangeAttribute.OperandType == typeof(double))
+                    {
+                        if (double.MinValue.Equals((double)rangeAttribute.Minimum) ||
+                            rangeAttribute.Minimum is double.NegativeInfinity)
+                        {
+                            minimum = "double.MinValue";
+                        }
+
+                        if (double.MaxValue.Equals((double)rangeAttribute.Maximum) ||
+                            rangeAttribute.Maximum is double.PositiveInfinity)
+                        {
+                            maximum = "double.MaxValue";
+                        }
+                    }
+                    else if (rangeAttribute.OperandType == typeof(int))
+                    {
+                        if (int.MinValue.Equals((int)rangeAttribute.Minimum))
+                        {
+                            minimum = "int.MinValue";
+                        }
+
+                        if (int.MaxValue.Equals((int)rangeAttribute.Maximum))
+                        {
+                            maximum = "int.MaxValue";
+                        }
+                    }
+                    else if (rangeAttribute.OperandType == typeof(long))
+                    {
+                        if (long.MinValue.Equals((long)rangeAttribute.Minimum))
+                        {
+                            minimum = "long.MinValue";
+                        }
+
+                        if (long.MaxValue.Equals((long)rangeAttribute.Maximum))
+                        {
+                            maximum = "long.MaxValue";
+                        }
+                    }
+
+                    result.Add(new AttributeParameters("Range", $"{minimum}, {maximum}"));
                     break;
                 case RegularExpressionAttribute regularExpressionAttribute:
                     result.Add(new AttributeParameters("RegularExpression", regularExpressionAttribute.GetEscapedPattern()));

diff --git a/src/Atc.Rest.ApiGenerator.CLI/ApiOptionsHelper.cs b/src/Atc.Rest.ApiGenerator.CLI/ApiOptionsHelper.cs
@@ -153,8 +153,7 @@ private static void ApplyGeneratorOverrides(
                 apiOptions.Generator.ProjectName = serverCommandSettings.ProjectPrefixName;
             }
 
-            if (!serverCommandSettings.RemoveNamespaceGroupSeparatorInGlobalUsings ||
-                apiOptions.Generator.RemoveNamespaceGroupSeparatorInGlobalUsings)
+            if (serverCommandSettings.RemoveNamespaceGroupSeparatorInGlobalUsings)
             {
                 apiOptions.Generator.RemoveNamespaceGroupSeparatorInGlobalUsings = serverCommandSettings.RemoveNamespaceGroupSeparatorInGlobalUsings;
             }
@@ -175,8 +174,7 @@ private static void ApplyGeneratorOverrides(
                     apiOptions.Generator.ProjectName = clientApiCommandSettings.ProjectPrefixName;
                 }
 
-                if (!clientApiCommandSettings.RemoveNamespaceGroupSeparatorInGlobalUsings ||
-                    apiOptions.Generator.RemoveNamespaceGroupSeparatorInGlobalUsings)
+                if (clientApiCommandSettings.RemoveNamespaceGroupSeparatorInGlobalUsings)
                 {
                     apiOptions.Generator.RemoveNamespaceGroupSeparatorInGlobalUsings = clientApiCommandSettings.RemoveNamespaceGroupSeparatorInGlobalUsings;
                 }
@@ -205,8 +203,7 @@ private static void ApplyGeneratorOverrides(
                     apiOptions.Generator.Client.HttpClientName = $"{baseGenerateCommandSettings.ProjectPrefixName}-ApiClient";
                 }
 
-                apiOptions.Generator.Client.ExcludeEndpointGeneration =
-                    clientApiCommandSettings.ExcludeEndpointGeneration;
+                apiOptions.Generator.Client.ExcludeEndpointGeneration = clientApiCommandSettings.ExcludeEndpointGeneration;
 
                 break;
             }

diff --git a/src/Atc.Rest.ApiGenerator.CLI/Atc.Rest.ApiGenerator.CLI.csproj b/src/Atc.Rest.ApiGenerator.CLI/Atc.Rest.ApiGenerator.CLI.csproj
@@ -13,8 +13,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Atc" Version="2.0.490" />
-    <PackageReference Include="Atc.Console.Spectre" Version="2.0.490" />
+    <PackageReference Include="Atc" Version="2.0.495" />
+    <PackageReference Include="Atc.Console.Spectre" Version="2.0.495" />
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
   </ItemGroup>
 

diff --git a/src/Atc.Rest.ApiGenerator.CLI/Commands/GenerateServerAllCommand.cs b/src/Atc.Rest.ApiGenerator.CLI/Commands/GenerateServerAllCommand.cs
@@ -64,16 +64,6 @@ private async Task<int> ExecuteInternalAsync(
         var shouldScaffoldCodingRules = CodingRulesHelper.ShouldScaffoldCodingRules(outputSlnPath, settings.DisableCodingRules);
         var isUsingCodingRules = CodingRulesHelper.IsUsingCodingRules(outputSlnPath, settings.DisableCodingRules);
 
-        if (settings.AspNetOutputType.IsSet)
-        {
-            apiOptions.Generator.AspNetOutputType = settings.AspNetOutputType.Value;
-        }
-
-        if (settings.SwaggerThemeMode.IsSet)
-        {
-            apiOptions.Generator.SwaggerThemeMode = settings.SwaggerThemeMode.Value;
-        }
-
         if (shouldScaffoldCodingRules &&
             !NetworkInformationHelper.HasHttpConnection())
         {
@@ -100,8 +90,7 @@ private async Task<int> ExecuteInternalAsync(
                 outputTestPath,
                 apiDocumentContainer,
                 apiOptions,
-                isUsingCodingRules,
-                settings.RemoveNamespaceGroupSeparatorInGlobalUsings))
+                isUsingCodingRules))
             {
                 return ConsoleExitStatusCodes.Failure;
             }
@@ -116,7 +105,6 @@ private async Task<int> ExecuteInternalAsync(
                     apiDocumentContainer,
                     apiOptions,
                     isUsingCodingRules,
-                    settings.RemoveNamespaceGroupSeparatorInGlobalUsings,
                     outputSrcPath))
             {
                 return ConsoleExitStatusCodes.Failure;
@@ -132,7 +120,6 @@ private async Task<int> ExecuteInternalAsync(
                     apiDocumentContainer,
                     apiOptions,
                     isUsingCodingRules,
-                    settings.RemoveNamespaceGroupSeparatorInGlobalUsings,
                     outputSrcPath,
                     outputSrcPath))
             {

diff --git a/src/Atc.Rest.ApiGenerator.CLI/Commands/GenerateServerApiCommand.cs b/src/Atc.Rest.ApiGenerator.CLI/Commands/GenerateServerApiCommand.cs
@@ -57,11 +57,6 @@ private async Task<int> ExecuteInternalAsync(
         var shouldScaffoldCodingRules = CodingRulesHelper.ShouldScaffoldCodingRules(settings.OutputPath, settings.DisableCodingRules);
         var isUsingCodingRules = CodingRulesHelper.IsUsingCodingRules(settings.OutputPath, settings.DisableCodingRules);
 
-        if (settings.AspNetOutputType.IsSet)
-        {
-            apiOptions.Generator.AspNetOutputType = settings.AspNetOutputType.Value;
-        }
-
         if (shouldScaffoldCodingRules &&
             !NetworkInformationHelper.HasHttpConnection())
         {
@@ -88,8 +83,7 @@ private async Task<int> ExecuteInternalAsync(
                     outputTestPath,
                     apiDocumentContainer,
                     apiOptions,
-                    isUsingCodingRules,
-                    settings.RemoveNamespaceGroupSeparatorInGlobalUsings))
+                    isUsingCodingRules))
             {
                 return ConsoleExitStatusCodes.Failure;
             }

diff --git a/src/Atc.Rest.ApiGenerator.CLI/Commands/GenerateServerDomainCommand.cs b/src/Atc.Rest.ApiGenerator.CLI/Commands/GenerateServerDomainCommand.cs
@@ -57,11 +57,6 @@ private async Task<int> ExecuteInternalAsync(
         var shouldScaffoldCodingRules = CodingRulesHelper.ShouldScaffoldCodingRules(settings.OutputPath, settings.DisableCodingRules);
         var isUsingCodingRules = CodingRulesHelper.IsUsingCodingRules(settings.OutputPath, settings.DisableCodingRules);
 
-        if (settings.AspNetOutputType.IsSet)
-        {
-            apiOptions.Generator.AspNetOutputType = settings.AspNetOutputType.Value;
-        }
-
         if (shouldScaffoldCodingRules &&
             !NetworkInformationHelper.HasHttpConnection())
         {
@@ -89,7 +84,6 @@ private async Task<int> ExecuteInternalAsync(
                     apiDocumentContainer,
                     apiOptions,
                     isUsingCodingRules,
-                    settings.RemoveNamespaceGroupSeparatorInGlobalUsings,
                     new DirectoryInfo(settings.ApiPath)))
             {
                 return ConsoleExitStatusCodes.Failure;

diff --git a/src/Atc.Rest.ApiGenerator.CLI/Commands/GenerateServerHostCommand.cs b/src/Atc.Rest.ApiGenerator.CLI/Commands/GenerateServerHostCommand.cs
@@ -57,16 +57,6 @@ private async Task<int> ExecuteInternalAsync(
         var shouldScaffoldCodingRules = CodingRulesHelper.ShouldScaffoldCodingRules(settings.OutputPath, settings.DisableCodingRules);
         var isUsingCodingRules = CodingRulesHelper.IsUsingCodingRules(settings.OutputPath, settings.DisableCodingRules);
 
-        if (settings.AspNetOutputType.IsSet)
-        {
-            apiOptions.Generator.AspNetOutputType = settings.AspNetOutputType.Value;
-        }
-
-        if (settings.SwaggerThemeMode.IsSet)
-        {
-            apiOptions.Generator.SwaggerThemeMode = settings.SwaggerThemeMode.Value;
-        }
-
         if (shouldScaffoldCodingRules &&
             !NetworkInformationHelper.HasHttpConnection())
         {
@@ -94,7 +84,6 @@ private async Task<int> ExecuteInternalAsync(
                     apiDocumentContainer,
                     apiOptions,
                     isUsingCodingRules,
-                    settings.RemoveNamespaceGroupSeparatorInGlobalUsings,
                     new DirectoryInfo(settings.ApiPath),
                     new DirectoryInfo(settings.DomainPath)))
             {

diff --git a/src/Atc.Rest.ApiGenerator.CodingRules/Atc.Rest.ApiGenerator.CodingRules.csproj b/src/Atc.Rest.ApiGenerator.CodingRules/Atc.Rest.ApiGenerator.CodingRules.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Atc" Version="2.0.490" />
+    <PackageReference Include="Atc" Version="2.0.495" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
   </ItemGroup>
 

diff --git a/src/Atc.Rest.ApiGenerator.Contracts/Atc.Rest.ApiGenerator.Contracts.csproj b/src/Atc.Rest.ApiGenerator.Contracts/Atc.Rest.ApiGenerator.Contracts.csproj
@@ -6,8 +6,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Atc" Version="2.0.490" />
-    <PackageReference Include="Atc.CodeDocumentation" Version="2.0.490" />
+    <PackageReference Include="Atc" Version="2.0.495" />
+    <PackageReference Include="Atc.CodeDocumentation" Version="2.0.495" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Atc.Rest.ApiGenerator.Contracts/Extensions/ApiOperationResponseModelExtensions.cs b/src/Atc.Rest.ApiGenerator.Contracts/Extensions/ApiOperationResponseModelExtensions.cs
@@ -19,7 +19,8 @@ public static class ApiOperationResponseModelExtensions
             return dataType;
         }
 
-        if (responseModel.Namespace.EndsWith(responseModel.DataType, StringComparison.Ordinal))
+        if (responseModel.Namespace.EndsWith($".{responseModel.DataType}", StringComparison.Ordinal) ||
+            responseModel.Namespace.Contains($"{responseModel.DataType}.", StringComparison.Ordinal))
         {
             return $"{responseModel.Namespace}.{dataType}";
         }

diff --git a/src/Atc.Rest.ApiGenerator.Framework.Minimal/Atc.Rest.ApiGenerator.Framework.Minimal.csproj b/src/Atc.Rest.ApiGenerator.Framework.Minimal/Atc.Rest.ApiGenerator.Framework.Minimal.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Atc" Version="2.0.490" />
+    <PackageReference Include="Atc" Version="2.0.495" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Atc.Rest.ApiGenerator.Framework.Mvc/Atc.Rest.ApiGenerator.Framework.Mvc.csproj b/src/Atc.Rest.ApiGenerator.Framework.Mvc/Atc.Rest.ApiGenerator.Framework.Mvc.csproj
@@ -6,8 +6,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Atc" Version="2.0.490" />
-    <PackageReference Include="Atc.Rest" Version="2.0.490" />
+    <PackageReference Include="Atc" Version="2.0.495" />
+    <PackageReference Include="Atc.Rest" Version="2.0.495" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Atc.Rest.ApiGenerator.Framework/Atc.Rest.ApiGenerator.Framework.csproj b/src/Atc.Rest.ApiGenerator.Framework/Atc.Rest.ApiGenerator.Framework.csproj
@@ -26,9 +26,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Atc" Version="2.0.490" />
-    <PackageReference Include="Atc.DotNet" Version="2.0.490" />
-    <PackageReference Include="Atc.OpenApi" Version="2.0.490" />
+    <PackageReference Include="Atc" Version="2.0.495" />
+    <PackageReference Include="Atc.DotNet" Version="2.0.495" />
+    <PackageReference Include="Atc.OpenApi" Version="2.0.495" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
   </ItemGroup>
 

diff --git a/src/Atc.Rest.ApiGenerator.Nuget/Atc.Rest.ApiGenerator.Nuget.csproj b/src/Atc.Rest.ApiGenerator.Nuget/Atc.Rest.ApiGenerator.Nuget.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Atc" Version="2.0.490" />
+    <PackageReference Include="Atc" Version="2.0.495" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
   </ItemGroup>
 

diff --git a/src/Atc.Rest.ApiGenerator.OpenApi/Atc.Rest.ApiGenerator.OpenApi.csproj b/src/Atc.Rest.ApiGenerator.OpenApi/Atc.Rest.ApiGenerator.OpenApi.csproj
@@ -6,9 +6,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Atc" Version="2.0.490" />
-    <PackageReference Include="Atc.CodeDocumentation" Version="2.0.490" />
-    <PackageReference Include="Atc.OpenApi" Version="2.0.490" />
+    <PackageReference Include="Atc" Version="2.0.495" />
+    <PackageReference Include="Atc.CodeDocumentation" Version="2.0.495" />
+    <PackageReference Include="Atc.OpenApi" Version="2.0.495" />
     <PackageReference Include="Microsoft.OpenApi" Version="1.6.15" />
     <PackageReference Include="Microsoft.OpenApi.Readers" Version="1.6.15" />
   </ItemGroup>

diff --git a/src/Atc.Rest.ApiGenerator/Atc.Rest.ApiGenerator.csproj b/src/Atc.Rest.ApiGenerator/Atc.Rest.ApiGenerator.csproj
@@ -8,12 +8,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Atc" Version="2.0.490" />
-    <PackageReference Include="Atc.CodeAnalysis.CSharp" Version="2.0.490" />
-    <PackageReference Include="Atc.Console.Spectre" Version="2.0.490" />
-    <PackageReference Include="Atc.DotNet" Version="2.0.490" />
-    <PackageReference Include="Atc.OpenApi" Version="2.0.490" />
-    <PackageReference Include="Atc.Rest.Client" Version="1.0.74" />
+    <PackageReference Include="Atc" Version="2.0.495" />
+    <PackageReference Include="Atc.CodeAnalysis.CSharp" Version="2.0.495" />
+    <PackageReference Include="Atc.Console.Spectre" Version="2.0.495" />
+    <PackageReference Include="Atc.DotNet" Version="2.0.495" />
+    <PackageReference Include="Atc.OpenApi" Version="2.0.495" />
+    <PackageReference Include="Atc.Rest.Client" Version="1.0.79" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.10.0" />
     <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0" />
     <PackageReference Include="Microsoft.OpenApi.Readers" Version="1.6.15" />

diff --git a/src/Atc.Rest.ApiGenerator/Generators/ServerApiGenerator.cs b/src/Atc.Rest.ApiGenerator/Generators/ServerApiGenerator.cs
@@ -80,7 +80,7 @@ public async Task<bool> Generate()
 
             serverApiGeneratorMvc.MaintainApiSpecification(projectOptions.DocumentFile);
             serverApiGeneratorMvc.MaintainGlobalUsings(
-                projectOptions.RemoveNamespaceGroupSeparatorInGlobalUsings);
+                projectOptions.ApiOptions.Generator.RemoveNamespaceGroupSeparatorInGlobalUsings);
         }
         else
         {
@@ -95,7 +95,7 @@ public async Task<bool> Generate()
 
             serverApiGeneratorMinimalApi.MaintainApiSpecification(projectOptions.DocumentFile);
             serverApiGeneratorMinimalApi.MaintainGlobalUsings(
-                projectOptions.RemoveNamespaceGroupSeparatorInGlobalUsings);
+                projectOptions.ApiOptions.Generator.RemoveNamespaceGroupSeparatorInGlobalUsings);
         }
 
         return true;

diff --git a/src/Atc.Rest.ApiGenerator/Generators/ServerDomainGenerator.cs b/src/Atc.Rest.ApiGenerator/Generators/ServerDomainGenerator.cs
@@ -87,7 +87,7 @@ public async Task<bool> Generate()
             serverDomainGeneratorMvc.GenerateAssemblyMarker();
 
             serverDomainGeneratorMvc.MaintainGlobalUsings(
-                projectOptions.RemoveNamespaceGroupSeparatorInGlobalUsings);
+                projectOptions.ApiOptions.Generator.RemoveNamespaceGroupSeparatorInGlobalUsings);
         }
         else
         {
@@ -98,7 +98,7 @@ public async Task<bool> Generate()
             serverDomainGeneratorMinimalApi.GenerateServiceCollectionExtensions();
 
             serverDomainGeneratorMinimalApi.MaintainGlobalUsings(
-                projectOptions.RemoveNamespaceGroupSeparatorInGlobalUsings);
+                projectOptions.ApiOptions.Generator.RemoveNamespaceGroupSeparatorInGlobalUsings);
         }
 
         if (serverDomainTestGenerator is not null &&
@@ -112,7 +112,7 @@ public async Task<bool> Generate()
 
             serverDomainTestGenerator.MaintainGlobalUsings(
                 projectOptions.UsingCodingRules,
-                projectOptions.RemoveNamespaceGroupSeparatorInGlobalUsings);
+                projectOptions.ApiOptions.Generator.RemoveNamespaceGroupSeparatorInGlobalUsings);
         }
 
         return true;