platform update

danielgerlag · Dec 15, 2019 · 2f88198 · 2f88198
1 parent 63078f1
commit 2f88198
Show file tree

Hide file tree

Showing 8 changed files with 34 additions and 23 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,10 +1,10 @@
-FROM microsoft/dotnet:2.2-aspnetcore-runtime AS base
+FROM mcr.microsoft.com/dotnet/core/aspnet:3.1 AS base
 ENV DBHOST mongodb://10.225.2.96:27017/
 WORKDIR /app
 EXPOSE 80
 EXPOSE 443
 
-FROM microsoft/dotnet:2.2-sdk AS build
+FROM mcr.microsoft.com/dotnet/core/sdk:3.1 AS build
 WORKDIR /src
 COPY src .
 RUN dotnet restore "Conductor/Conductor.csproj"

diff --git a/src/Conductor.Domain/Conductor.Domain.csproj b/src/Conductor.Domain/Conductor.Domain.csproj
@@ -5,11 +5,13 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CSharp" Version="4.5.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
+    <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.0" />
+    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="SharpYaml" Version="1.6.5" />
     <PackageReference Include="StackExchange.Redis" Version="2.0.601" />
-    <PackageReference Include="WorkflowCore" Version="1.9.4" />
+    <PackageReference Include="WorkflowCore" Version="2.2.0" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Conductor.Steps/Conductor.Steps.csproj b/src/Conductor.Steps/Conductor.Steps.csproj
@@ -5,8 +5,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="RestSharp" Version="106.6.9" />
-    <PackageReference Include="WorkflowCore" Version="1.9.4" />
+    <PackageReference Include="RestSharp" Version="106.6.10" />
+    <PackageReference Include="WorkflowCore" Version="2.2.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Conductor.Storage/Conductor.Storage.csproj b/src/Conductor.Storage/Conductor.Storage.csproj
@@ -5,7 +5,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="MongoDB.Driver" Version="2.8.1" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.0" />
+    <PackageReference Include="MongoDB.Driver" Version="2.10.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Conductor/Conductor.csproj b/src/Conductor/Conductor.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
     <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
     <UserSecretsId>0b178d89-9937-49c8-b1f1-efb5f96e516d</UserSecretsId>
@@ -14,13 +14,16 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="AutoMapper" Version="8.1.1" />
-    <PackageReference Include="Microsoft.AspNetCore.App" />
-    <PackageReference Include="Microsoft.AspNetCore.Razor.Design" Version="2.2.0" PrivateAssets="All" />
+    <PackageReference Include="AutoMapper" Version="9.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore" Version="2.2.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="3.1.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.0" />
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.4.10" />
     <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.2.3" />
-    <PackageReference Include="WorkflowCore" Version="1.9.4" />
-    <PackageReference Include="WorkflowCore.Providers.Redis" Version="1.9.1" />
+    <PackageReference Include="WorkflowCore" Version="2.2.0" />
+    <PackageReference Include="WorkflowCore.Providers.Redis" Version="2.2.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Conductor/Properties/launchSettings.json b/src/Conductor/Properties/launchSettings.json
@@ -20,7 +20,7 @@
     "Conductor": {
       "commandName": "Project",
       "launchBrowser": true,
-      "launchUrl": "api/values",
+      "launchUrl": "api/info",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       },

diff --git a/src/Conductor/Startup.cs b/src/Conductor/Startup.cs
@@ -49,8 +49,9 @@ public void ConfigureServices(IServiceCollection services)
             {
                 options.InputFormatters.Add(new YamlRequestBodyInputFormatter());
                 options.OutputFormatters.Add(new YamlRequestBodyOutputFormatter());
+                options.EnableEndpointRouting = false;
             })
-            .SetCompatibilityVersion(CompatibilityVersion.Version_2_2);
+            .SetCompatibilityVersion(CompatibilityVersion.Latest);
 
             services.AddWorkflow(cfg =>
             {

diff --git a/tests/Conductor.IntegrationTests/Conductor.IntegrationTests.csproj b/tests/Conductor.IntegrationTests/Conductor.IntegrationTests.csproj
@@ -1,18 +1,21 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Ductus.FluentDocker" Version="2.6.8" />
-    <PackageReference Include="FluentAssertions" Version="5.7.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
-    <PackageReference Include="RestSharp" Version="106.6.9" />
-    <PackageReference Include="xunit" Version="2.4.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
+    <PackageReference Include="Ductus.FluentDocker" Version="2.7.3" />
+    <PackageReference Include="FluentAssertions" Version="5.9.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
+    <PackageReference Include="RestSharp" Version="106.6.10" />
+    <PackageReference Include="xunit" Version="2.4.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
   </ItemGroup>
 
   <ItemGroup>