Merge pull request #313 from atc-net/feature/upgrade-deprecated-ms-pa…

…ckages Feature/upgrade deprecated ms packages
atc-net · Apr 6, 2024 · 406862f · 406862f
2 parents 9cf1811 + 7e0b3db
commit 406862f
Show file tree

Hide file tree

Showing 33 changed files with 91 additions and 115 deletions.
diff --git a/docs/CodeDoc/Atc.DotNet/Atc.DotNet.md b/docs/CodeDoc/Atc.DotNet/Atc.DotNet.md
@@ -172,8 +172,8 @@
 | 16384 | UwpLibrary | Uwp Library |  | 
 | 32768 | WpfLibrary | Wpf Library |  | 
 | 61440 | Libraries | Libraries |  | 
-| 65536 | Modules | Azure Iot Edge Module |  | 
-| 65536 | AzureIotEdgeModule | Azure Iot Edge Module |  | 
+| 65536 | AzureIotEdgeModule | Modules |  | 
+| 65536 | Modules | Modules |  | 
 | 131072 | VisualStudioExtension | Visual Studio Extension |  | 
 | 262144 | WebApi | Web Api |  | 
 | 524288 | WorkerService | Worker Service |  | 

diff --git a/docs/CodeDoc/Atc.Rest.Extended/Atc.Rest.Extended.Versioning.md b/docs/CodeDoc/Atc.Rest.Extended/Atc.Rest.Extended.Versioning.md
@@ -31,19 +31,4 @@
 >```csharp
 >string ApiVersionQueryParameterShort
 >```
-
-<br />
-
-## VersionErrorResponseProvider
-
->```csharp
->public class VersionErrorResponseProvider : IErrorResponseProvider
->```
-
-### Methods
-
-#### CreateResponse
->```csharp
->IActionResult CreateResponse(ErrorResponseContext context)
->```
 <hr /><div style='text-align: right'><i>Generated by MarkdownCodeDoc version 1.2</i></div>
diff --git a/docs/CodeDoc/Atc.Rest.Extended/Index.md b/docs/CodeDoc/Atc.Rest.Extended/Index.md
@@ -30,7 +30,6 @@
 ## [Atc.Rest.Extended.Versioning](Atc.Rest.Extended.Versioning.md)
 
 - [ApiVersionConstants](Atc.Rest.Extended.Versioning.md#apiversionconstants)
-- [VersionErrorResponseProvider](Atc.Rest.Extended.Versioning.md#versionerrorresponseprovider)
 
 ## [Microsoft.AspNetCore.Builder](Microsoft.AspNetCore.Builder.md)
 

diff --git a/docs/CodeDoc/Atc.Rest.Extended/IndexExtended.md b/docs/CodeDoc/Atc.Rest.Extended/IndexExtended.md
@@ -58,9 +58,6 @@
      - string ApiVersionMediaTypeParameter
      - string ApiVersionQueryParameter
      - string ApiVersionQueryParameterShort
-- [VersionErrorResponseProvider](Atc.Rest.Extended.Versioning.md#versionerrorresponseprovider)
-  -  Methods
-     - CreateResponse(ErrorResponseContext context)
 
 ## [Microsoft.AspNetCore.Builder](Microsoft.AspNetCore.Builder.md)
 

diff --git a/docs/CodeDoc/Atc.Rest/Atc.Rest.Extensions.md b/docs/CodeDoc/Atc.Rest/Atc.Rest.Extensions.md
@@ -22,10 +22,10 @@
 
 <br />
 
-## EndpointRouteBuilderExtensions
+## EndpointRouteBuilderExExtensions
 
 >```csharp
->public static class EndpointRouteBuilderExtensions
+>public static class EndpointRouteBuilderExExtensions
 >```
 
 ### Static Methods

diff --git a/docs/CodeDoc/Atc.Rest/Index.md b/docs/CodeDoc/Atc.Rest/Index.md
@@ -13,7 +13,7 @@
 ## [Atc.Rest.Extensions](Atc.Rest.Extensions.md)
 
 - [AllowAnonymousAccessForDevelopmentHandler](Atc.Rest.Extensions.md#allowanonymousaccessfordevelopmenthandler)
-- [EndpointRouteBuilderExtensions](Atc.Rest.Extensions.md#endpointroutebuilderextensions)
+- [EndpointRouteBuilderExExtensions](Atc.Rest.Extensions.md#endpointroutebuilderexextensions)
 
 ## [Atc.Rest.Helpers](Atc.Rest.Helpers.md)
 
@@ -61,8 +61,8 @@
 - [AnonymousAccessExtensions](Microsoft.AspNetCore.Http.md#anonymousaccessextensions)
 - [FormFileExtensions](Microsoft.AspNetCore.Http.md#formfileextensions)
 - [HeaderDictionaryExtensions](Microsoft.AspNetCore.Http.md#headerdictionaryextensions)
-- [HttpContextExtensions](Microsoft.AspNetCore.Http.md#httpcontextextensions)
-- [HttpRequestExtensions](Microsoft.AspNetCore.Http.md#httprequestextensions)
+- [HttpContextExExtensions](Microsoft.AspNetCore.Http.md#httpcontextexextensions)
+- [HttpRequestExExtensions](Microsoft.AspNetCore.Http.md#httprequestexextensions)
 - [WellKnownHttpHeaders](Microsoft.AspNetCore.Http.md#wellknownhttpheaders)
 
 ## [Microsoft.AspNetCore.Mvc.Filters](Microsoft.AspNetCore.Mvc.Filters.md)

diff --git a/docs/CodeDoc/Atc.Rest/IndexExtended.md b/docs/CodeDoc/Atc.Rest/IndexExtended.md
@@ -27,7 +27,7 @@
 - [AllowAnonymousAccessForDevelopmentHandler](Atc.Rest.Extensions.md#allowanonymousaccessfordevelopmenthandler)
   -  Methods
      - HandleAsync(AuthorizationHandlerContext context)
-- [EndpointRouteBuilderExtensions](Atc.Rest.Extensions.md#endpointroutebuilderextensions)
+- [EndpointRouteBuilderExExtensions](Atc.Rest.Extensions.md#endpointroutebuilderexextensions)
   -  Static Methods
      - MapApiAssemblyInformations(this IEndpointRouteBuilder endpoints, string pattern)
      - MapApiManagementAssemblyInformations(this IEndpointRouteBuilder endpoints)
@@ -208,11 +208,11 @@
      - GetCallingOnBehalfOfIdentity(this IHeaderDictionary headers)
      - GetOrAddCorrelationId(this IHeaderDictionary headers)
      - GetOrAddRequestId(this IHeaderDictionary headers)
-- [HttpContextExtensions](Microsoft.AspNetCore.Http.md#httpcontextextensions)
+- [HttpContextExExtensions](Microsoft.AspNetCore.Http.md#httpcontextexextensions)
   -  Static Methods
      - GetCorrelationId(this HttpContext context)
      - GetRequestId(this HttpContext context)
-- [HttpRequestExtensions](Microsoft.AspNetCore.Http.md#httprequestextensions)
+- [HttpRequestExExtensions](Microsoft.AspNetCore.Http.md#httprequestexextensions)
   -  Static Methods
      - GetRawBodyBytesAsync(this HttpRequest request)
      - GetRawBodyStringAsync(this HttpRequest request, Encoding encoding = null)

diff --git a/docs/CodeDoc/Atc.Rest/Microsoft.AspNetCore.Http.md b/docs/CodeDoc/Atc.Rest/Microsoft.AspNetCore.Http.md
@@ -70,10 +70,10 @@
 
 <br />
 
-## HttpContextExtensions
+## HttpContextExExtensions
 
 >```csharp
->public static class HttpContextExtensions
+>public static class HttpContextExExtensions
 >```
 
 ### Static Methods
@@ -89,10 +89,10 @@
 
 <br />
 
-## HttpRequestExtensions
+## HttpRequestExExtensions
 
 >```csharp
->public static class HttpRequestExtensions
+>public static class HttpRequestExExtensions
 >```
 
 ### Static Methods

diff --git a/src/Atc.CodeAnalysis.CSharp/Atc.CodeAnalysis.CSharp.csproj b/src/Atc.CodeAnalysis.CSharp/Atc.CodeAnalysis.CSharp.csproj
@@ -8,7 +8,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.2.5" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.9.2" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
   </ItemGroup>

diff --git a/src/Atc.DotNet/DotnetNugetHelper.cs b/src/Atc.DotNet/DotnetNugetHelper.cs
@@ -35,7 +35,7 @@ public static List<DotnetNugetPackageMetadataBase> GetAllPackageReferences(strin
 
         if (!fileContent.StartsWith('<'))
         {
-            throw new UnsupportedContentTypeException("Expect xml content");
+            throw new DataException("Expect xml content");
         }
 
         var data = new List<DotnetNugetPackageMetadataBase>();

diff --git a/src/Atc.DotNet/GlobalUsings.cs b/src/Atc.DotNet/GlobalUsings.cs
@@ -1,4 +1,5 @@
 global using System.Collections.ObjectModel;
+global using System.Data;
 global using System.Diagnostics;
 global using System.Diagnostics.CodeAnalysis;
 global using System.Globalization;
@@ -11,6 +12,5 @@
 global using Atc.DotNet.Models;
 global using Atc.Helpers;
 
-global using Microsoft.AspNetCore.Mvc.ModelBinding;
 global using Microsoft.Extensions.Logging;
 global using Microsoft.Extensions.Logging.Abstractions;
diff --git a/src/Atc.OpenApi/Extensions/OpenApiResponsesExtensions.cs b/src/Atc.OpenApi/Extensions/OpenApiResponsesExtensions.cs
@@ -151,7 +151,7 @@ public static bool IsSchemaTypePaginationForStatusCode(this OpenApiResponses res
 
     public static bool IsSchemaTypeProblemDetailsForStatusCode(this OpenApiResponses responses, HttpStatusCode httpStatusCode)
     {
-        return string.Equals(responses.GetSchemaForStatusCode(httpStatusCode)?.Reference?.Id, nameof(ProblemDetails), StringComparison.Ordinal);
+        return string.Equals(responses.GetSchemaForStatusCode(httpStatusCode)?.Reference?.Id, "ProblemDetails", StringComparison.Ordinal);
     }
 
     public static bool IsSchemaUsingBinaryFormatForOkResponse(this OpenApiResponses responses)

diff --git a/src/Atc.OpenApi/GlobalUsings.cs b/src/Atc.OpenApi/GlobalUsings.cs
@@ -2,6 +2,4 @@
 global using System.Globalization;
 global using System.Net;
 global using System.Net.Mime;
-global using System.Text.RegularExpressions;
-
-global using Microsoft.AspNetCore.Mvc;
+global using System.Text.RegularExpressions;
diff --git a/src/Atc.Rest.Extended/Atc.Rest.Extended.csproj b/src/Atc.Rest.Extended/Atc.Rest.Extended.csproj
@@ -8,11 +8,10 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Asp.Versioning.Mvc.ApiExplorer" Version="8.1.0" />
     <PackageReference Include="FluentValidation.AspNetCore" Version="11.3.0" />
     <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.22.0" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.3" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning" Version="5.1.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning.ApiExplorer" Version="5.1.0" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
   </ItemGroup>
 

diff --git a/src/Atc.Rest.Extended/Extensions/ServiceCollection/RestApiExtendedExtensions.cs b/src/Atc.Rest.Extended/Extensions/ServiceCollection/RestApiExtendedExtensions.cs
@@ -30,8 +30,17 @@ public static IServiceCollection AddRestApi<TStartup>(
         if (restApiOptions.UseApiVersioning)
         {
             services.ConfigureOptions<ConfigureApiVersioningOptions>();
-            services.AddApiVersioning();
-            services.AddVersionedApiExplorer(o => o.GroupNameFormat = "'v'VV");
+            services.AddApiVersioning(options =>
+                {
+                    options.DefaultApiVersion = new ApiVersion(1, 0);
+                    options.AssumeDefaultVersionWhenUnspecified = true;
+                    options.ReportApiVersions = true;
+                })
+                .AddApiExplorer(options =>
+                {
+                    options.GroupNameFormat = "'v'VV";
+                    options.SubstituteApiVersionInUrl = true;
+                });
         }
 
         if (restApiOptions.UseOpenApiSpec)

diff --git a/src/Atc.Rest.Extended/GlobalUsings.cs b/src/Atc.Rest.Extended/GlobalUsings.cs
@@ -3,8 +3,9 @@
 global using System.Net.Mime;
 global using System.Reflection;
 global using System.Text;
-global using System.Text.Json;
 
+global using Asp.Versioning;
+global using Asp.Versioning.ApiExplorer;
 global using Atc.Rest.Extended.Extensions;
 global using Atc.Rest.Extended.Filters;
 global using Atc.Rest.Extended.Options;
@@ -24,7 +25,6 @@
 global using Microsoft.AspNetCore.Mvc.ApiExplorer;
 global using Microsoft.AspNetCore.Mvc.Controllers;
 global using Microsoft.AspNetCore.Mvc.ModelBinding;
-global using Microsoft.AspNetCore.Mvc.Versioning;
 global using Microsoft.Extensions.Configuration;
 global using Microsoft.Extensions.DependencyInjection;
 global using Microsoft.Extensions.Hosting;

diff --git a/src/Atc.Rest.Extended/Options/ConfigureApiVersioningOptions.cs b/src/Atc.Rest.Extended/Options/ConfigureApiVersioningOptions.cs
@@ -31,7 +31,5 @@ public void Configure(ApiVersioningOptions options)
             new QueryStringApiVersionReader(ApiVersionConstants.ApiVersionQueryParameter),
             new QueryStringApiVersionReader(ApiVersionConstants.ApiVersionQueryParameterShort),
             new UrlSegmentApiVersionReader());
-
-        options.ErrorResponses = new VersionErrorResponseProvider(telemetry);
     }
 }
diff --git a/src/Atc.Rest.Extended/Versioning/VersionErrorResponseProvider.cs b/src/Atc.Rest.Extended/Versioning/VersionErrorResponseProvider.cs
diff --git a/...ensions/EndpointRouteBuilderExtensions.cs → ...sions/EndpointRouteBuilderExExtensions.cs b/...ensions/EndpointRouteBuilderExtensions.cs → ...sions/EndpointRouteBuilderExExtensions.cs
@@ -1,6 +1,6 @@
 namespace Atc.Rest.Extensions;
 
-public static class EndpointRouteBuilderExtensions
+public static class EndpointRouteBuilderExExtensions
 {
     private static readonly Dictionary<string, string> YamlCache = new(StringComparer.Ordinal);
 
@@ -25,9 +25,9 @@ public static void MapApiSpecificationEndpoint(
             endpoints.Map(yamlEndpoint, async context =>
             {
                 string yaml;
-                if (YamlCache.ContainsKey(yamlEndpoint))
+                if (YamlCache.TryGetValue(yamlEndpoint, out var value))
                 {
-                    yaml = YamlCache[yamlEndpoint];
+                    yaml = value;
                 }
                 else
                 {

diff --git a/....Rest/Extensions/HttpContextExtensions.cs → ...est/Extensions/HttpContextExExtensions.cs b/....Rest/Extensions/HttpContextExtensions.cs → ...est/Extensions/HttpContextExExtensions.cs
@@ -1,7 +1,7 @@
 // ReSharper disable once CheckNamespace
 namespace Microsoft.AspNetCore.Http;
 
-public static class HttpContextExtensions
+public static class HttpContextExExtensions
 {
     public static string? GetCorrelationId(this HttpContext context)
     {

diff --git a/....Rest/Extensions/HttpRequestExtensions.cs → ...est/Extensions/HttpRequestExExtensions.cs b/....Rest/Extensions/HttpRequestExtensions.cs → ...est/Extensions/HttpRequestExExtensions.cs
@@ -1,7 +1,7 @@
 // ReSharper disable CheckNamespace
 namespace Microsoft.AspNetCore.Http;
 
-public static class HttpRequestExtensions
+public static class HttpRequestExExtensions
 {
     /// <summary>
     /// Retrieve the raw body as a string from the Request.Body stream

diff --git a/src/Atc.XUnit/Internal/AssemblyAnalyzerHelper.cs b/src/Atc.XUnit/Internal/AssemblyAnalyzerHelper.cs
@@ -143,7 +143,9 @@ private static Type[] CollectFilteredAssemblyTypes(Assembly assembly, List<Type>
             var firstParameterType = method.GetParameters()[0].ParameterType;
             var firstParameterNameSimplified = GetSimpleTypeName(firstParameterType);
             if (classNamePrefixSimplified.Equals(firstParameterNameSimplified, StringComparison.Ordinal) ||
-                ("I" + classNamePrefixSimplified).Equals(firstParameterNameSimplified, StringComparison.Ordinal))
+                ("I" + classNamePrefixSimplified).Equals(firstParameterNameSimplified, StringComparison.Ordinal) ||
+                classNamePrefixSimplified.Equals(firstParameterNameSimplified + "Ex", StringComparison.Ordinal) ||
+                ("I" + classNamePrefixSimplified).Equals(firstParameterNameSimplified + "Ex", StringComparison.Ordinal))
             {
                 // Ok
                 return null;

diff --git a/src/Atc/Atc.csproj b/src/Atc/Atc.csproj
@@ -8,8 +8,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.DataAnnotations" Version="2.2.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
+    <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
     <PackageReference Include="System.Text.Json" Version="8.0.3" />
   </ItemGroup>
 

diff --git a/src/Atc/Attributes/DataAnnotations/ValidationAttributes/IPAddressAttribute.cs b/src/Atc/Attributes/DataAnnotations/ValidationAttributes/IPAddressAttribute.cs
@@ -73,9 +73,16 @@ public static bool TryIsValid(
             return true;
         }
 
-        errorMessage = attribute.ErrorMessage
-            .Replace("field {0}", "value", StringComparison.Ordinal)
-            .Replace("{0} field", "value", StringComparison.Ordinal);
+        if (attribute.ErrorMessage is null)
+        {
+            errorMessage = "The value is not a valid IPAddress.";
+        }
+        else
+        {
+            errorMessage = attribute.ErrorMessage
+                .Replace("field {0}", "value", StringComparison.Ordinal)
+                .Replace("{0} field", "value", StringComparison.Ordinal);
+        }
 
         return false;
     }

diff --git a/src/Atc/Attributes/DataAnnotations/ValidationAttributes/KeyStringAttribute.cs b/src/Atc/Attributes/DataAnnotations/ValidationAttributes/KeyStringAttribute.cs
@@ -74,9 +74,16 @@ public static bool TryIsValid(
             return true;
         }
 
-        errorMessage = attribute.ErrorMessage
-            .Replace("field {0}", "value", StringComparison.Ordinal)
-            .Replace("{0} field", "value", StringComparison.Ordinal);
+        if (attribute.ErrorMessage is null)
+        {
+            errorMessage = "The value is not a valid KeyString.";
+        }
+        else
+        {
+            errorMessage = attribute.ErrorMessage
+                .Replace("field {0}", "value", StringComparison.Ordinal)
+                .Replace("{0} field", "value", StringComparison.Ordinal);
+        }
 
         return false;
     }

diff --git a/src/Atc/Attributes/DataAnnotations/ValidationAttributes/StringAttribute.cs b/src/Atc/Attributes/DataAnnotations/ValidationAttributes/StringAttribute.cs
@@ -155,9 +155,16 @@ public static bool TryIsValid(
             return true;
         }
 
-        errorMessage = attribute.ErrorMessage
-            .Replace("field {0}", "value", StringComparison.Ordinal)
-            .Replace("{0} field", "value", StringComparison.Ordinal);
+        if (attribute.ErrorMessage is null)
+        {
+            errorMessage = "The value is invalid.";
+        }
+        else
+        {
+            errorMessage = attribute.ErrorMessage
+                .Replace("field {0}", "value", StringComparison.Ordinal)
+                .Replace("{0} field", "value", StringComparison.Ordinal);
+        }
 
         return false;
     }