Fix Builds

wemogy · May 16, 2023 · 93187fe · 93187fe
1 parent 9d0357a
commit 93187fe
Show file tree

Hide file tree

Showing 20 changed files with 34 additions and 34 deletions.
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -17,7 +17,7 @@ jobs:
       - name: Build .NET
         uses: ./.github/actions/dotnet
         with:
-          version: ${{ steps.release-version.outputs.next-version }}${{ github.event.inputs.version && 'pre' || '' }}
+          version: "1.0.0-test"
 
       - name: Test .NET Solution
         working-directory: src

diff --git a/src/Wemogy.AspNet.Tests/Middlewares/ErrorHandlerMiddlewareTests.cs b/src/Wemogy.AspNet.Tests/Middlewares/ErrorHandlerMiddlewareTests.cs
@@ -2,7 +2,7 @@
 using System.Net;
 using System.Threading.Tasks;
 using FluentAssertions;
-using Microsoft.AspNet.Http;
+using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.DependencyInjection;
 using Wemogy.AspNet.Middlewares;
 using Wemogy.Core.Errors.Exceptions;

diff --git a/src/Wemogy.AspNet/ActionResults/FileCallbackResult.cs b/src/Wemogy.AspNet/ActionResults/FileCallbackResult.cs
@@ -1,8 +1,8 @@
 using System;
 using System.IO;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Mvc;
-using Microsoft.AspNet.Mvc.Infrastructure;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 

diff --git a/src/Wemogy.AspNet/Auth/Auth0/ServiceCollectionExtensions.cs b/src/Wemogy.AspNet/Auth/Auth0/ServiceCollectionExtensions.cs
@@ -1,6 +1,6 @@
 using System.Threading.Tasks;
-using Microsoft.AspNet.Authentication;
-using Microsoft.AspNet.Authentication.JwtBearer;
+using Microsoft.AspNetCore.Authentication;
+using Microsoft.AspNetCore.Authentication.JwtBearer;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.IdentityModel.Tokens;
 

diff --git a/src/Wemogy.AspNet/Auth/AzureActiveDirectory/ServiceCollectionExtensions.cs b/src/Wemogy.AspNet/Auth/AzureActiveDirectory/ServiceCollectionExtensions.cs
@@ -1,4 +1,4 @@
-using Microsoft.AspNet.Authentication;
+using Microsoft.AspNetCore.Authentication;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.IdentityModel.Tokens;
 

diff --git a/src/Wemogy.AspNet/Auth/Handlers/HasScopeHandler.cs b/src/Wemogy.AspNet/Auth/Handlers/HasScopeHandler.cs
@@ -1,6 +1,6 @@
 using System.Linq;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Authorization;
+using Microsoft.AspNetCore.Authorization;
 using Wemogy.AspNet.Auth.Requirements;
 
 namespace Wemogy.AspNet.Auth.Handlers

diff --git a/src/Wemogy.AspNet/Auth/Requirements/HasScopeRequirement.cs b/src/Wemogy.AspNet/Auth/Requirements/HasScopeRequirement.cs
@@ -1,5 +1,5 @@
 using System;
-using Microsoft.AspNet.Authorization;
+using Microsoft.AspNetCore.Authorization;
 
 namespace Wemogy.AspNet.Auth.Requirements
 {

diff --git a/src/Wemogy.AspNet/Auth/ServiceCollectionExtensions.cs b/src/Wemogy.AspNet/Auth/ServiceCollectionExtensions.cs
@@ -1,5 +1,5 @@
-using Microsoft.AspNet.Authentication.JwtBearer;
-using Microsoft.AspNet.Authorization;
+using Microsoft.AspNetCore.Authentication.JwtBearer;
+using Microsoft.AspNetCore.Authorization;
 using Microsoft.Extensions.DependencyInjection;
 using Wemogy.AspNet.Auth.Handlers;
 using Wemogy.AspNet.Auth.Requirements;

diff --git a/src/Wemogy.AspNet/Controllers/ApiControllerBase.cs b/src/Wemogy.AspNet/Controllers/ApiControllerBase.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Security.Claims;
-using Microsoft.AspNet.Mvc;
+using Microsoft.AspNetCore.Mvc;
 
 namespace Wemogy.AspNet.Controllers
 {

diff --git a/src/Wemogy.AspNet/Controllers/ApiGatewayBase.cs b/src/Wemogy.AspNet/Controllers/ApiGatewayBase.cs
@@ -5,8 +5,8 @@
 using System.Text.Json;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Http;
-using Microsoft.AspNet.Mvc;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
 using RestSharp;
 using RestSharp.Serializers.Json;
 using Wemogy.AspNet.Exceptions;

diff --git a/src/Wemogy.AspNet/FluentValidation/FluentValidationExceptionFilter.cs b/src/Wemogy.AspNet/FluentValidation/FluentValidationExceptionFilter.cs
@@ -1,6 +1,6 @@
 using FluentValidation;
-using Microsoft.AspNet.Mvc;
-using Microsoft.AspNet.Mvc.Filters;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Filters;
 
 namespace Wemogy.AspNet.FluentValidation
 {

diff --git a/src/Wemogy.AspNet/Formatters/RawBodyInputFormatter.cs b/src/Wemogy.AspNet/Formatters/RawBodyInputFormatter.cs
@@ -2,7 +2,7 @@
 using System;
 using System.IO;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Mvc.Formatters;
+using Microsoft.AspNetCore.Mvc.Formatters;
 using Microsoft.Net.Http.Headers;
 
 namespace Wemogy.AspNet.Formatters;

diff --git a/src/Wemogy.AspNet/Middlewares/DependencyInjection.cs b/src/Wemogy.AspNet/Middlewares/DependencyInjection.cs
@@ -1,4 +1,4 @@
-using Microsoft.AspNet.Builder;
+using Microsoft.AspNetCore.Builder;
 
 namespace Wemogy.AspNet.Middlewares
 {

diff --git a/src/Wemogy.AspNet/Middlewares/ErrorHandlerMiddleware.cs b/src/Wemogy.AspNet/Middlewares/ErrorHandlerMiddleware.cs
@@ -1,6 +1,6 @@
 using System.Net;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Http;
+using Microsoft.AspNetCore.Http;
 using Wemogy.Core.Errors.Exceptions;
 
 namespace Wemogy.AspNet.Middlewares

diff --git a/src/Wemogy.AspNet/Monitoring/MonitoringExtensions.cs b/src/Wemogy.AspNet/Monitoring/MonitoringExtensions.cs
@@ -1,5 +1,5 @@
 using Microsoft.ApplicationInsights.Extensibility;
-using Microsoft.AspNet.Builder;
+using Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.DependencyInjection;
 using Prometheus;
 

diff --git a/src/Wemogy.AspNet/Refit/ApiExceptionFilter.cs b/src/Wemogy.AspNet/Refit/ApiExceptionFilter.cs
@@ -1,6 +1,6 @@
 using System;
-using Microsoft.AspNet.Mvc;
-using Microsoft.AspNet.Mvc.Filters;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Filters;
 using Refit;
 
 namespace Wemogy.AspNet.Refit

diff --git a/src/Wemogy.AspNet/Startup/StartupExtensions.cs b/src/Wemogy.AspNet/Startup/StartupExtensions.cs
@@ -1,6 +1,6 @@
 using System;
-using Microsoft.AspNet.Builder;
-using Microsoft.AspNet.Mvc;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;

diff --git a/src/Wemogy.AspNet/Swagger/OpenApiEnvironment.cs b/src/Wemogy.AspNet/Swagger/OpenApiEnvironment.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.OpenApi.Models;
-using Swashbuckle.AspNet.SwaggerGen;
+using Swashbuckle.AspNetCore.SwaggerGen;
 using Wemogy.AspNet.Swagger;
 
 namespace Wemogy.AspNet.Swagger

diff --git a/src/Wemogy.AspNet/Swagger/SwaggerExtensions.cs b/src/Wemogy.AspNet/Swagger/SwaggerExtensions.cs
@@ -1,8 +1,8 @@
 using System.Collections.Generic;
-using Microsoft.AspNet.Builder;
+using Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.OpenApi.Models;
-using Swashbuckle.AspNet.SwaggerGen;
+using Swashbuckle.AspNetCore.SwaggerGen;
 using Wemogy.Core.Extensions;
 
 namespace Wemogy.AspNet.Swagger

diff --git a/src/Wemogy.AspNet/Wemogy.AspNet.csproj b/src/Wemogy.AspNet/Wemogy.AspNet.csproj
@@ -13,19 +13,19 @@
 
   <ItemGroup>
     <PackageReference Include="prometheus-net" Version="8.0.0" />
-    <PackageReference Include="prometheus-net.AspNet" Version="8.0.0" />
-    <PackageReference Include="Microsoft.ApplicationInsights.AspNet" Version="2.21.0" />
-    <PackageReference Include="Microsoft.AspNet.Authentication" Version="2.2.0" />
-    <PackageReference Include="Microsoft.AspNet.Authentication.JwtBearer" Version="5.0.3" />
-    <PackageReference Include="Microsoft.AspNet.Authorization" Version="6.0.5" />
+    <PackageReference Include="prometheus-net.AspNetCore" Version="8.0.0" />
+    <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.21.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication" Version="2.2.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="5.0.3" />
+    <PackageReference Include="Microsoft.AspNetCore.Authorization" Version="6.0.5" />
     <PackageReference Include="Microsoft.Azure.Services.AppAuthentication" Version="1.6.1" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.AzureKeyVault" Version="3.1.14" />
     <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="6.0.1" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
     <PackageReference Include="RestSharp" Version="107.3.0" />
-    <PackageReference Include="Swashbuckle.AspNet" Version="6.4.0" />
-    <PackageReference Include="Swashbuckle.AspNet.Swagger" Version="6.4.0" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0" />
+    <PackageReference Include="Swashbuckle.AspNetCore.Swagger" Version="6.4.0" />
     <PackageReference Include="Wemogy.Core" Version="1.0.0" />
   </ItemGroup>
 </Project>