Merge pull request #50 from tecnocrata/feature/net6-migration

Migration to .net 6
CodelyTV · Mar 28, 2022 · ccaf073 · ccaf073
2 parents 6917270 + fafa74c
commit ccaf073
Show file tree

Hide file tree

Showing 25 changed files with 97 additions and 84 deletions.
diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
@@ -14,7 +14,7 @@ jobs:
       - name: Setup .NET Core
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: 3.1.100  
+          dotnet-version: 6.0.x  
 
       - name: Build with dotnet
         run: dotnet build --configuration Release

diff --git a/.gitignore b/.gitignore
@@ -33,6 +33,9 @@ msbuild.log
 msbuild.err
 msbuild.wrn
 
+# SQL Server Data
+database/data
+
 # Visual Studio 2015
 .vs/
 

diff --git a/apps/Backoffice/Backend/Backend.csproj b/apps/Backoffice/Backend/Backend.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
     <PropertyGroup>
-        <TargetFramework>netcoreapp3.1</TargetFramework>
+        <TargetFramework>net6.0</TargetFramework>
         <AssemblyName>CodelyTv.Apps.Backoffice.Backend</AssemblyName>
         <RootNamespace>CodelyTv.Apps.Backoffice.Backend</RootNamespace>
     </PropertyGroup>

diff --git a/apps/Backoffice/Frontend/Extension/DependencyInjection/Infrastructure.cs b/apps/Backoffice/Frontend/Extension/DependencyInjection/Infrastructure.cs
@@ -49,12 +49,12 @@ public static IServiceCollection AddInfrastructure(this IServiceCollection servi
 
             services.AddScoped<DbContext, BackofficeContext>();
             services.AddDbContext<BackofficeContext>(options =>
-                    options.UseSqlServer(configuration.GetConnectionString("BackofficeDatabase")),
+                    options.UseSqlServer(configuration.GetConnectionString("BackofficeDatabase"), options => options.EnableRetryOnFailure()),
                 ServiceLifetime.Transient);
 
             services.AddScoped<MoocContext, MoocContext>();
             services.AddDbContext<MoocContext>(options =>
-                options.UseSqlServer(configuration.GetConnectionString("MoocDatabase")), ServiceLifetime.Transient);
+                options.UseSqlServer(configuration.GetConnectionString("MoocDatabase"), options => options.EnableRetryOnFailure()), ServiceLifetime.Transient);
 
             services.AddRabbitMq(configuration);
             services.AddScoped<DomainEventJsonDeserializer, DomainEventJsonDeserializer>();

diff --git a/apps/Backoffice/Frontend/Extension/Validators/SummaryByPropertyValidatorHtml.cs b/apps/Backoffice/Frontend/Extension/Validators/SummaryByPropertyValidatorHtml.cs
@@ -1,3 +1,4 @@
+using System.Globalization;
 using System.Text;
 using Microsoft.AspNetCore.Html;
 using Microsoft.AspNetCore.Mvc.ModelBinding;
@@ -14,7 +15,7 @@ public static IHtmlContent ValidationSummaryByProperty<TModel>(this IHtmlHelper<
 
             if (dictionary[property] != null)
                 foreach (var modelState in dictionary[property].Errors)
-                    builder.Append($"<p class='{className}'>{modelState.ErrorMessage}</p>");
+                    builder.Append(CultureInfo.CurrentCulture, $"<p class='{className}'>{modelState.ErrorMessage}</p>");
 
             return new HtmlString(builder.ToString());
         }

diff --git a/apps/Backoffice/Frontend/Frontend.csproj b/apps/Backoffice/Frontend/Frontend.csproj
@@ -1,15 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
     <PropertyGroup>
-        <TargetFramework>netcoreapp3.1</TargetFramework>
+        <TargetFramework>net6.0</TargetFramework>
         <AssemblyName>CodelyTv.Apps.Backoffice.Frontend</AssemblyName>
         <RootNamespace>CodelyTv.Apps.Backoffice.Frontend</RootNamespace>
     </PropertyGroup>    
 
     <ItemGroup>
-      <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="3.1.4" />
-      <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.1.5" />
-      <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="3.1.4" />
+      <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="6.0.2" />
+      <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.2" />
+      <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="6.0.2" />
     </ItemGroup>    
 
     <ItemGroup>

diff --git a/apps/Backoffice/Frontend/appsettings.json b/apps/Backoffice/Frontend/appsettings.json
@@ -8,8 +8,8 @@
   },
   "AllowedHosts": "*",
   "ConnectionStrings": {
-    "BackofficeDatabase": "Server=localhost;Database=backoffice;User=sa;Password=Your_password123;MultipleActiveResultSets=true;",
-    "MoocDatabase": "Server=localhost;Database=mooc;User=sa;Password=Your_password123;MultipleActiveResultSets=true;"
+    "BackofficeDatabase": "Server=localhost;Database=backoffice;User=sa;Password=Your_password123;Encrypt=yes;TrustServerCertificate=yes;MultipleActiveResultSets=true;",
+    "MoocDatabase": "Server=localhost;Database=mooc;User=sa;Password=Your_password123;Encrypt=yes;TrustServerCertificate=yes;MultipleActiveResultSets=true;"
   },
   "RabbitMq": {
     "Username": "codelytv",

diff --git a/apps/Mooc/Backend/Backend.csproj b/apps/Mooc/Backend/Backend.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
     <PropertyGroup>
-        <TargetFramework>netcoreapp3.1</TargetFramework>
+        <TargetFramework>net6.0</TargetFramework>
         <RootNamespace>CodelyTv.Apps.Mooc.Backend</RootNamespace>
         <AssemblyName>CodelyTv.Apps.Mooc.Backend</AssemblyName>
     </PropertyGroup>
@@ -12,6 +12,6 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.1.2" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.2" />
     </ItemGroup>   
 </Project>
diff --git a/apps/Mooc/Backend/Extension/DependencyInjection/Infrastructure.cs b/apps/Mooc/Backend/Extension/DependencyInjection/Infrastructure.cs
@@ -41,7 +41,7 @@ public static IServiceCollection AddInfrastructure(this IServiceCollection servi
 
             services.AddScoped<DbContext, MoocContext>();
             services.AddDbContext<MoocContext>(options =>
-                options.UseSqlServer(configuration.GetConnectionString("MoocDatabase")), ServiceLifetime.Transient);
+                options.UseSqlServer(configuration.GetConnectionString("MoocDatabase"), options => options.EnableRetryOnFailure()), ServiceLifetime.Transient);
 
             services.AddRabbitMq(configuration);
 

diff --git a/apps/Mooc/Backend/appsettings.json b/apps/Mooc/Backend/appsettings.json
@@ -6,12 +6,18 @@
   },
   "AllowedHosts": "*",
   "ConnectionStrings": {
-    "MoocDatabase": "Server=localhost;Database=mooc;User=sa;Password=Your_password123;MultipleActiveResultSets=true;"
+    "MoocDatabase": "Server=localhost;Database=mooc;User=sa;Password=Your_password123;Encrypt=yes;TrustServerCertificate=yes;MultipleActiveResultSets=true;"
   },
   "RabbitMq": {
     "Username": "codelytv",
     "Password": "c0d3ly",
     "Hostname": "localhost",
     "port": "5630"
+  },
+  "Elasticsearch": 
+  {
+    "Host": "http://localhost",
+    "Port": "9200",
+    "IndexPrefix": "backoffice"
   }
 }
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -3,16 +3,21 @@ version: '3.0'
 services:
   mssql:
     container_name: codelytv-chsarp_ddd_skeleton-mssql
-    image: mcr.microsoft.com/mssql/server:2019-latest    
+    image: mcr.microsoft.com/mssql/server:2019-latest
+    user: root
     ports:
       - 1433:1433
     environment:
       - ACCEPT_EULA=Y
       - SA_PASSWORD=Your_password123
+      - MSSQL_SA_PASSWORD=Your_password123
     volumes:
       - ./database/init.sql:/init.sql
       - ./database/mooc.sql:/mooc.sql
       - ./database/backoffice.sql:/backoffice.sql
+      - ./database/data/data:/var/opt/mssql/data
+      - ./database/data/log:/var/opt/mssql/log
+      - ./database/data/secrets:/var/opt/mssql/secrets 
   rabbitmq:
     container_name: codelytv-chsarp_ddd_skeleton-rabbitmq
     image: 'rabbitmq:3.7-management'

diff --git a/src/Backoffice/Backoffice.csproj b/src/Backoffice/Backoffice.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>netcoreapp3.1</TargetFramework>
+        <TargetFramework>net6.0</TargetFramework>
         <AssemblyName>CodelyTv.Backoffice</AssemblyName>
         <RootNamespace>CodelyTv.Backoffice</RootNamespace>
     </PropertyGroup>
@@ -11,7 +11,8 @@
     </ItemGroup>
 
     <ItemGroup>
-      <PackageReference Include="NEST" Version="7.8.2" />
+      <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.2" />
+      <PackageReference Include="NEST" Version="7.17.0" />
     </ItemGroup>
 
 </Project>
diff --git a/src/Backoffice/Courses/Domain/BackofficeCourse.cs b/src/Backoffice/Courses/Domain/BackofficeCourse.cs
@@ -34,8 +34,7 @@ public Dictionary<string, object> ToPrimitives()
 
         public static BackofficeCourse FromPrimitives(Dictionary<string, object> body)
         {
-            return new BackofficeCourse(Convert.ToString(body["id"]), Convert.ToString(body["name"]),
-                Convert.ToString(body["duration"]));
+            return new BackofficeCourse(body["id"].ToString(), body["name"].ToString(), body["duration"].ToString());
         }
 
         public override bool Equals(object obj)

diff --git a/...urses/Infrastructure/Persistence/Elasticsearch/ElasticsearchBackofficeCourseRepository.cs b/...urses/Infrastructure/Persistence/Elasticsearch/ElasticsearchBackofficeCourseRepository.cs
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Globalization;
 using System.Linq;
 using System.Threading.Tasks;
 using CodelyTv.Backoffice.Courses.Domain;
@@ -34,7 +35,7 @@ public async Task<IEnumerable<BackofficeCourse>> SearchAll()
 
         protected override string ModuleName()
         {
-            return nameof(BackofficeCourse).ToLower();
+            return nameof(BackofficeCourse).ToLower(CultureInfo.CurrentCulture);
         }
     }
 }
diff --git a/src/Mooc/Mooc.csproj b/src/Mooc/Mooc.csproj
@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>netcoreapp3.1</TargetFramework>
+        <TargetFramework>net6.0</TargetFramework>
         <AssemblyName>CodelyTv.Mooc</AssemblyName>
         <RootNamespace>CodelyTv.Mooc</RootNamespace>
     </PropertyGroup>
@@ -11,17 +11,13 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.8">
+        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.2" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.2">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.2" />
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="3.1.2">
-            <PrivateAssets>all</PrivateAssets>
-            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-        </PackageReference>
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="3.1.2" />
-        <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.2" />
+        <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/src/Retention/Retention.csproj b/src/Retention/Retention.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>netcoreapp3.1</TargetFramework>
+        <TargetFramework>net6.0</TargetFramework>
     </PropertyGroup>    
 
 </Project>
diff --git a/src/Shared/Infrastructure/Bus/Event/RabbitMq/RabbitMqDomainEventsConsumer.cs b/src/Shared/Infrastructure/Bus/Event/RabbitMq/RabbitMqDomainEventsConsumer.cs
@@ -50,8 +50,7 @@ public void ConsumeMessages(string queue, ushort prefetchCount = 10)
             var consumer = new EventingBasicConsumer(channel);
             consumer.Received += async (model, ea) =>
             {
-                var body = ea.Body;
-                var message = Encoding.UTF8.GetString(body);
+                var message = Encoding.UTF8.GetString(ea.Body.Span);
                 var @event = _deserializer.Deserialize(message);
 
                 var subscriber = DomainEventSubscribers.ContainsKey(queue)

diff --git a/src/Shared/Shared.csproj b/src/Shared/Shared.csproj
@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>netcoreapp3.1</TargetFramework>
+        <TargetFramework>net6.0</TargetFramework>
         <AssemblyName>CodelyTv.Shared</AssemblyName>
         <RootNamespace>CodelyTv.Shared</RootNamespace>
     </PropertyGroup>
@@ -11,17 +11,17 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.8">
-            <PrivateAssets>all</PrivateAssets>
-            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        <PackageReference Include="Microsoft.Data.SqlClient" Version="4.1.0" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.2" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.2">
+          <PrivateAssets>all</PrivateAssets>
+          <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Microsoft.Data.SqlClient" Version="1.1.1" />
-        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.2" />
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="3.1.2" />
-        <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.2" />
-        <PackageReference Include="NEST" Version="7.8.2" />
-        <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-        <PackageReference Include="RabbitMQ.Client" Version="5.1.2" />
-        <PackageReference Include="System.Linq.Dynamic.Core" Version="1.2.1" />
+        <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="6.0.0" />
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
+        <PackageReference Include="NEST" Version="7.17.0" />
+        <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+        <PackageReference Include="RabbitMQ.Client" Version="6.2.4" />
+        <PackageReference Include="System.Linq.Dynamic.Core" Version="1.2.17" />
     </ItemGroup>
 </Project>
diff --git a/test/apps/Mooc/Mooc.csproj b/test/apps/Mooc/Mooc.csproj
@@ -1,19 +1,19 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>netcoreapp3.1</TargetFramework>
+        <TargetFramework>net6.0</TargetFramework>
         <IsPackable>false</IsPackable>
         <AssemblyName>MoocTest.apps</AssemblyName>
         <RootNamespace>MoocTest.apps</RootNamespace>
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="3.1.2" />
-        <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.8">
-            <PrivateAssets>all</PrivateAssets>
-            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="6.0.2" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
+        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+          <PrivateAssets>all</PrivateAssets>
+          <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
         <PackageReference Include="xunit" Version="2.4.1" />
     </ItemGroup>
 

diff --git a/test/src/Backoffice/Backoffice.csproj b/test/src/Backoffice/Backoffice.csproj
@@ -1,17 +1,24 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>netcoreapp3.1</TargetFramework>
+        <TargetFramework>net6.0</TargetFramework>
         <IsPackable>false</IsPackable>
         <AssemblyName>CodelyTv.Test.Backoffice</AssemblyName>
         <RootNamespace>CodelyTv.Test.Backoffice</RootNamespace>
+        <PublishWithAspNetCoreTargetManifest>false</PublishWithAspNetCoreTargetManifest>
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
         <PackageReference Include="xunit" Version="2.4.1" />
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
-        <PackageReference Include="coverlet.collector" Version="1.2.0" />
+        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+          <PrivateAssets>all</PrivateAssets>
+          <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
+        <PackageReference Include="coverlet.collector" Version="3.1.2">
+          <PrivateAssets>all</PrivateAssets>
+          <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
     </ItemGroup>
 
     <ItemGroup>

diff --git a/test/src/Mooc/Mooc.csproj b/test/src/Mooc/Mooc.csproj
@@ -1,20 +1,24 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>netcoreapp3.1</TargetFramework>
+        <TargetFramework>net6.0</TargetFramework>
         <IsPackable>false</IsPackable>
         <AssemblyName>CodelyTv.Test.Mooc</AssemblyName>
         <RootNamespace>CodelyTv.Test.Mooc</RootNamespace>
+        <PublishWithAspNetCoreTargetManifest>false</PublishWithAspNetCoreTargetManifest>
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.2" />
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="3.1.2" />
-        <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="3.1.2" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
-        <PackageReference Include="Moq" Version="4.13.1" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.2" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.2">
+          <PrivateAssets>all</PrivateAssets>
+          <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
+        <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="6.0.2" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
+        <PackageReference Include="Moq" Version="4.17.1" />
         <PackageReference Include="xunit" Version="2.4.1" />
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
+        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>

diff --git a/test/src/Mooc/MoocContextInfrastructureTestCase.cs b/test/src/Mooc/MoocContextInfrastructureTestCase.cs
@@ -55,7 +55,7 @@ protected override Action<IServiceCollection> Services()
                 services.AddQueryServices(AssemblyHelper.GetInstance(Assemblies.Mooc));
 
                 services.AddDbContext<MoocContext>(options =>
-                    options.UseSqlServer(configuration.GetConnectionString("MoocDatabase")));
+                    options.UseSqlServer(configuration.GetConnectionString("MoocDatabase"), options => options.EnableRetryOnFailure()));
 
                 services.Configure<RabbitMqConfig>(configuration.GetSection("RabbitMq"));
             };

diff --git a/test/src/Shared/Infrastructure/EntityFramework/DatabaseCleaner.cs b/test/src/Shared/Infrastructure/EntityFramework/DatabaseCleaner.cs
@@ -11,7 +11,7 @@ public void Invoke(DbContext context)
         {
             var tables = Tables(context);
             var truncateTablesSql = TruncateDatabaseSql(tables);
-            context.Database.ExecuteSqlCommand(truncateTablesSql);
+            context.Database.ExecuteSqlRaw(truncateTablesSql);
         }
 
         private string TruncateDatabaseSql(List<string> tables)