DotNet Core 5 update

UnivateProperties_API/Context/DataContext.cs

@@ -1,5 +1,5 @@
 using Microsoft.EntityFrameworkCore;
-using System.Data.SqlClient;
+using Microsoft.Data.SqlClient;
 using System.Linq;
 using UnivateProperties_API.Model;
 using UnivateProperties_API.Model.Banks;
@@ -13,6 +13,7 @@ using UnivateProperties_API.Model.Properties;
 using UnivateProperties_API.Model.Region;
 using UnivateProperties_API.Model.Timeshare;
 using UnivateProperties_API.Model.Users;
+using Microsoft.EntityFrameworkCore.SqlServer.Infrastructure.Internal;
 
 namespace UnivateProperties_API.Context
 {
@@ -23,13 +24,9 @@ namespace UnivateProperties_API.Context
         {
             foreach (var extention in options.Extensions)
             {
-                if (extention.GetType().ToString() == "Npgsql.EntityFrameworkCore.PostgreSQL.Infrastructure.Internal.NpgsqlOptionsExtension")
+                if (extention.GetType().ToString() == "Microsoft.EntityFrameworkCore.SqlServer.Infrastructure.Internal.SqlServerOptionsExtension")
                 {
-                    connectionString = ((Npgsql.EntityFrameworkCore.PostgreSQL.Infrastructure.Internal.NpgsqlOptionsExtension)extention).ConnectionString;
-                }
-                else if (extention.GetType().ToString() == "Microsoft.EntityFrameworkCore.SqlServer.Infrastructure.Internal.SqlServerOptionsExtension")
-                {
-                    connectionString = ((Microsoft.EntityFrameworkCore.SqlServer.Infrastructure.Internal.SqlServerOptionsExtension)extention).ConnectionString;
+                    connectionString = ((SqlServerOptionsExtension)extention).ConnectionString;
                 }
             }
         }

UnivateProperties_API/Startup.cs

@@ -1,10 +1,8 @@
 using AutoMapper;
 using Microsoft.AspNetCore.Authentication.JwtBearer;
 using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Cors.Infrastructure;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc.Cors.Internal;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
@@ -14,11 +12,9 @@ using System.Threading.Tasks;
 using UnivateProperties_API.Context;
 using UnivateProperties_API.Helpers;
 using UnivateProperties_API.Model.Banks;
-using UnivateProperties_API.Model.Campaigns;
 using UnivateProperties_API.Model.Communication;
 using UnivateProperties_API.Model.Financial;
 using UnivateProperties_API.Model.Misc;
-using UnivateProperties_API.Model.ProcessFlow;
 using UnivateProperties_API.Model.Properties;
 using UnivateProperties_API.Model.Region;
 using UnivateProperties_API.Model.Timeshare;
@@ -50,13 +46,14 @@ namespace UnivateProperties_API
         public void ConfigureServices(IServiceCollection services)
         {            
             services.AddAutoMapper();
+            services.AddHealthChecks();
+            services.AddControllers();
             services.AddCors(o => o.AddPolicy("MyPolicy", builder =>
             {
                 builder.AllowAnyOrigin()                        
                        .AllowAnyMethod()
                        .AllowAnyHeader();                       
-            }));            
-            services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_2_2);
+            }));
             services.AddDbContext<DataContext>(o => o.UseSqlServer(Configuration.GetConnectionString("DefaultConnection")));
             MyCommon.TenderUrl = Configuration.GetConnectionString("TenderConnection");
             MyCommon.Reservations = Configuration.GetConnectionString("ReservationsURL");
@@ -174,10 +171,6 @@ namespace UnivateProperties_API
             #region Campaign 
             services.AddTransient<ICampaignRepository, CampaignRepository>();
             #endregion
-            services.Configure<MvcOptions>(options =>
-            {
-                options.Filters.Add(new CorsAuthorizationFilterFactory("MyPolicy"));                
-            });
         }
 
         public void Configure(IApplicationBuilder app, IHostingEnvironment env)
@@ -187,13 +180,17 @@ namespace UnivateProperties_API
             //{
             app.UseDeveloperExceptionPage();
             //}
+            app.UseRouting();
             app.UseCors(x => x                
                 .AllowAnyOrigin()
                 .AllowAnyMethod()
                 .AllowAnyHeader());                
             app.UseAuthentication();
             app.UseHttpsRedirection();
-            app.UseMvc();
+            app.UseEndpoints(endpoints =>
+            {
+                endpoints.MapControllers(); //Routes for my API controllers
+            });
         }
 
         private static void UpdateDatabase(IApplicationBuilder app)

UnivateProperties_API/UnivateProperties_API.csproj

@@ -1,9 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
-    <AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
+    <TargetFramework>netcoreapp5.0</TargetFramework>
+    <AspNetCoreHostingModel>OutOfProcess</AspNetCoreHostingModel>
     <TargetLatestRuntimePatch>false</TargetLatestRuntimePatch>
+    <UserSecretsId>af6d5f9c-a077-4393-8907-888822f3e809</UserSecretsId>
   </PropertyGroup>
 
   <ItemGroup>
@@ -17,13 +18,16 @@
     <PackageReference Include="MailKit" Version="2.8.0" />
     <PackageReference Include="Microsoft.AspNet.WebApi.Cors" Version="5.2.7" />
     <PackageReference Include="Microsoft.AspNetCore.App" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="3.0.3" />
     <PackageReference Include="Microsoft.AspNetCore.Razor.Design" Version="2.2.0" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="2.2.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.5" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.5" />
+    <PackageReference Include="Microsoft.Extensions.Caching.SqlServer" Version="5.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />
     <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.2.4" />
     <PackageReference Include="MimeKit" Version="2.9.1" />
-    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="2.2.0" />
     <PackageReference Include="RestSharp" Version="106.11.4" />
-    <PackageReference Include="System.Drawing.Common" Version="4.6.0" />
+    <PackageReference Include="System.Drawing.Common" Version="5.0.2" />
   </ItemGroup>
 
-</Project>
+</Project>