Migration to net core 3.1

OpenMAVN · Aug 31, 2020 · d9ae2f8 · d9ae2f8
1 parent 3647190
commit d9ae2f8
Show file tree

Hide file tree

Showing 9 changed files with 50 additions and 34 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -51,7 +51,7 @@ jobs:
       - name: Setup .NET Core
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: 2.2.207
+          dotnet-version: 3.1.302
       - name: Install dependencies
         run: dotnet restore
       - name: Build solution
@@ -61,21 +61,21 @@ jobs:
       - name: Build docker image for a job
         if: env.RELEASE_JOB == 'true'
         run: |
-          dotnet publish $JOB_PROJECT --configuration Release --output ../../docker/job --no-build /p:Version=$VERSION
+          dotnet publish $JOB_PROJECT --configuration Release --output ./docker/job --no-build /p:Version=$VERSION
           docker build --tag openmavn/$JOB_DOCKER_IMAGE:$VERSION ./docker/job
       - name: Build docker image for a service
         if: env.RELEASE_SERVICE == 'true'
         run: |
-          dotnet publish $SERVICE_PROJECT --configuration Release --output ../../docker/service --no-build /p:Version=$VERSION
+          dotnet publish $SERVICE_PROJECT --configuration Release --output ./docker/service --no-build /p:Version=$VERSION
           docker build --tag openmavn/$SERVICE_DOCKER_IMAGE:$VERSION ./docker/service
       
       # Pack NuGet packages
       - name: Pack client NuGet package
         if: env.RELEASE_CLIENT == 'true'
-        run: dotnet pack $CLIENT_PROJECT --configuration Release --output ../../packages --no-build --include-symbols --include-source /p:SymbolPackageFormat=snupkg /p:Version=$VERSION
+        run: dotnet pack $CLIENT_PROJECT --configuration Release --output ./packages --no-build --include-symbols --include-source /p:SymbolPackageFormat=snupkg /p:Version=$VERSION
       - name: Pack contract NuGet package
         if: env.RELEASE_CONTRACT == 'true'
-        run: dotnet pack $CONTRACT_PROJECT --configuration Release --output ../../packages --no-build --include-symbols --include-source /p:SymbolPackageFormat=snupkg /p:Version=$VERSION
+        run: dotnet pack $CONTRACT_PROJECT --configuration Release --output ./packages --no-build --include-symbols --include-source /p:SymbolPackageFormat=snupkg /p:Version=$VERSION
 
       # Push Docker Images
       - name: Push job docker image

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -16,7 +16,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 2.2.207
+        dotnet-version: 3.1.302
     - name: Install dependencies
       run: dotnet restore
     - name: Build

diff --git a/client/MAVN.Service.Sessions.Client/MAVN.Service.Sessions.Client.csproj b/client/MAVN.Service.Sessions.Client/MAVN.Service.Sessions.Client.csproj
@@ -11,8 +11,8 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Lykke.Common" Version="7.5.0" />
-    <PackageReference Include="Lykke.HttpClientGenerator" Version="2.5.0" />
-    <PackageReference Include="Lykke.SettingsReader" Version="5.2.0" />
+    <PackageReference Include="Lykke.HttpClientGenerator" Version="3.1.1" />
+    <PackageReference Include="Lykke.SettingsReader" Version="5.3.0" />
     <PackageReference Include="Refit" Version="4.6.107" />
   </ItemGroup>
 </Project>
diff --git a/src/MAVN.Service.Sessions.Core/MAVN.Service.Sessions.Core.csproj b/src/MAVN.Service.Sessions.Core/MAVN.Service.Sessions.Core.csproj
@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <Version>1.0.0</Version>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Lykke.Common" Version="7.5.0" />
-    <PackageReference Include="Lykke.SettingsReader" Version="5.2.0" />
+    <PackageReference Include="Lykke.SettingsReader" Version="5.3.0" />
   </ItemGroup>
 
 </Project>
diff --git a/src/MAVN.Service.Sessions.Services/MAVN.Service.Sessions.Services.csproj b/src/MAVN.Service.Sessions.Services/MAVN.Service.Sessions.Services.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <Version>1.0.0</Version>
   </PropertyGroup>
 
@@ -16,8 +16,8 @@
   <ItemGroup>
     <PackageReference Include="jose-jwt" Version="2.4.0" />
     <PackageReference Include="Lykke.Common.Redis" Version="1.0.2" />
-    <PackageReference Include="Lykke.RabbitMqBroker" Version="7.13.1" />
-    <PackageReference Include="StackExchange.Redis" Version="2.0.601" />
+    <PackageReference Include="Lykke.RabbitMqBroker" Version="7.13.3" />
+    <PackageReference Include="StackExchange.Redis" Version="2.1.58" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/MAVN.Service.Sessions/Dockerfile b/src/MAVN.Service.Sessions/Dockerfile
@@ -1,4 +1,4 @@
-FROM microsoft/dotnet:2.2-aspnetcore-runtime
+FROM microsoft/dotnet:3.1-aspnetcore-runtime
 WORKDIR /app
 COPY . .
 ENTRYPOINT ["dotnet", "MAVN.Service.Sessions.dll"]
diff --git a/src/MAVN.Service.Sessions/MAVN.Service.Sessions.csproj b/src/MAVN.Service.Sessions/MAVN.Service.Sessions.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <Version>1.0.0</Version>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
@@ -12,12 +12,12 @@
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="AutoMapper" Version="9.0.0" />
-    <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="7.0.0" />
+    <PackageReference Include="AutoMapper" Version="10.0.0" />
+    <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="8.0.1" />
     <PackageReference Include="Lykke.Common.Validation" Version="1.3.1" />
-    <PackageReference Include="Lykke.Sdk" Version="5.17.0" />
-    <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.13.1" />
-    <PackageReference Include="StackExchange.Redis" Version="2.0.601" />
+    <PackageReference Include="LykkeBiz.Sdk" Version="5.18.0" />
+    <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.14.0" />
+    <PackageReference Include="StackExchange.Redis" Version="2.1.58" />
   </ItemGroup>
   <ItemGroup>
     <DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="1.0.0" />

diff --git a/src/MAVN.Service.Sessions/Startup.cs b/src/MAVN.Service.Sessions/Startup.cs
@@ -1,12 +1,15 @@
-using System;
 using System.Text.RegularExpressions;
+using Autofac;
 using AutoMapper;
 using JetBrains.Annotations;
 using Lykke.Logs.Loggers.LykkeSanitizing;
 using Lykke.Sdk;
+using Lykke.SettingsReader;
 using MAVN.Service.Sessions.MappingProfiles;
 using MAVN.Service.Sessions.Settings;
 using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace MAVN.Service.Sessions
@@ -19,10 +22,13 @@ public class Startup
             ApiVersion = "v1"
         };
 
+        private IConfigurationRoot _configurationRoot;
+        private IReloadingManager<AppSettings> _settingsManager;
+
         [UsedImplicitly]
-        public IServiceProvider ConfigureServices(IServiceCollection services)
+        public void ConfigureServices(IServiceCollection services)
         {
-            return services.BuildServiceProvider<AppSettings>(options =>
+            (_configurationRoot, _settingsManager) = services.BuildServiceProvider<AppSettings>(options =>
             {
                 options.Extend = (serviceCollection, settings) =>
                 {
@@ -53,13 +59,23 @@ public IServiceProvider ConfigureServices(IServiceCollection services)
             });
         }
 
+        [UsedImplicitly]
+        public void ConfigureContainer(ContainerBuilder builder)
+        {
+            builder.ConfigureLykkeContainer(
+                _configurationRoot,
+                _settingsManager);
+        }
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
-        public void Configure(IApplicationBuilder app, IMapper mapper)
+        public void Configure(
+            IApplicationBuilder app,
+            IApplicationLifetime appLifetime,
+            IMapper mapper)
         {
             mapper.ConfigurationProvider.AssertConfigurationIsValid();
 
-            app.UseLykkeConfiguration(options => { options.SwaggerOptions = _swaggerOptions; });
+            app.UseLykkeConfiguration(appLifetime, options => { options.SwaggerOptions = _swaggerOptions; });
         }
     }
 }
diff --git a/tests/MAVN.Service.Sessions.Tests/MAVN.Service.Sessions.Tests.csproj b/tests/MAVN.Service.Sessions.Tests/MAVN.Service.Sessions.Tests.csproj
@@ -1,21 +1,21 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>    
-    <TargetFramework>netcoreapp2.2</TargetFramework>
-	<Version>1.0.0</Version>
+  <PropertyGroup>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <Version>1.0.0</Version>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="coverlet.msbuild" Version="2.8.1">
+    <PackageReference Include="coverlet.msbuild" Version="2.9.0">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
-    <PackageReference Include="Moq" Version="4.13.1" />
-    <PackageReference Include="NSubstitute" Version="4.0.0" />
-    <PackageReference Include="StackExchange.Redis" Version="2.0.601" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
+    <PackageReference Include="Moq" Version="4.14.5" />
+    <PackageReference Include="NSubstitute" Version="4.2.2" />
+    <PackageReference Include="StackExchange.Redis" Version="2.1.58" />
     <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</IncludeAssets>
     </PackageReference>