Update test deps. (#67)

Choc13 · web-flow · commit 106edac09b4b · 2019-01-16T15:09:50.000Z
diff --git a/.travis.yml b/.travis.yml
@@ -11,11 +11,12 @@ env:
 matrix:
   include:
     - os: linux
+      dist: xenial
       sudo: required
-      dotnet: 2.1.403
+      dotnet: 2.2.101
     - os: osx 
       osx_image: xcode9 # OSX 10.12
-      dotnet: 2.1.403
+      dotnet: 2.2.101
       before_install:
         - ulimit -n 4096
 script:
diff --git a/appveyor.yml b/appveyor.yml
@@ -12,7 +12,7 @@ before_build:
 build_script:
     - msbuild /p:GetVersion=True /p:WriteVersionInfoToBuildLog=True
 test_script:
-    - dotnet test test/Winton.Extensions.Configuration.Consul.Test/ --no-build --configuration Release
+    - dotnet test test/Winton.Extensions.Configuration.Consul.Test/ --no-build --no-restore --configuration Release
 artifacts:
 - path: .\**\*.nupkg
   name: NuGet
diff --git a/build.sh b/build.sh
@@ -3,9 +3,10 @@
 set -e
 
 # Build
-dotnet build src/Winton.Extensions.Configuration.Consul --configuration Release --framework netstandard2.0
-dotnet build test/Winton.Extensions.Configuration.Consul.Test --configuration Release --framework netcoreapp2.1
-dotnet build test/Website --configuration Release --framework netcoreapp2.1
+dotnet restore
+dotnet build src/Winton.Extensions.Configuration.Consul --no-restore --configuration Release --framework netstandard2.0
+dotnet build test/Winton.Extensions.Configuration.Consul.Test --no-restore --configuration Release --framework netcoreapp2.2
+dotnet build test/Website --no-restore --configuration Release --framework netcoreapp2.2
 
 # Unit Test
 dotnet test test/Winton.Extensions.Configuration.Consul.Test/ --no-build --no-restore --configuration Release
diff --git a/test/Website/Dockerfile b/test/Website/Dockerfile
@@ -1,6 +1,6 @@
-FROM microsoft/dotnet:2.1.5-aspnetcore-runtime
+FROM microsoft/dotnet:2.2-aspnetcore-runtime
 
-COPY bin/Release/netcoreapp2.1/publish /app
+COPY bin/Release/netcoreapp2.2/publish /app
 WORKDIR /app
  
 EXPOSE 80/tcp
diff --git a/test/Website/IntegrationTests/Dockerfile b/test/Website/IntegrationTests/Dockerfile
diff --git a/test/Website/IntegrationTests/docker-compose.yml b/test/Website/IntegrationTests/docker-compose.yml
@@ -7,7 +7,8 @@ website:
     - consul
 test:
   build: .
-  dockerfile: Dockerfile.test
+  container_name: test
+  dockerfile: Dockerfile
   links:
     - consul
     - website
diff --git a/test/Website/IntegrationTests/run.sh b/test/Website/IntegrationTests/run.sh
@@ -6,9 +6,10 @@ pushd $( dirname $0 )
 
 dotnet publish ../ --configuration Release
 docker-compose rm -f
-docker-compose -f docker-compose.yml -p ci up --build --force-recreate -d
-exitCode=$(docker wait ci_test_1)
-docker logs -f ci_test_1
+docker-compose -p ci up --build --force-recreate -d
+docker container ls
+exitCode=$(docker wait test)
+docker logs -f test
 docker-compose stop -t 1
 
 popd
diff --git a/test/Website/Startup.cs b/test/Website/Startup.cs
@@ -1,4 +1,5 @@
 using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Swashbuckle.AspNetCore.Swagger;
@@ -30,7 +31,8 @@ public void ConfigureServices(IServiceCollection services)
             services
                 .AddSwaggerGen(c => { c.SwaggerDoc(_Version, new Info { Title = _AppTitle, Version = _Version }); })
                 .AddSingleton(_configuration)
-                .AddMvc();
+                .AddMvc()
+                .SetCompatibilityVersion(CompatibilityVersion.Version_2_2);
         }
     }
 }
diff --git a/test/Website/Website.csproj b/test/Website/Website.csproj
@@ -1,11 +1,12 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
+    <AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
     <AssemblyName>Winton.Extensions.Configuration.Consul.Test.Website</AssemblyName>
     <GenerateDocumentationFile>False</GenerateDocumentationFile>
     <NoWarn>$(NoWarn);SA0001;SA1101;SA1309;SA1413;SA1600;SA1633;SA1652</NoWarn>
     <RootNamespace>Winton.Extensions.Configuration.Consul.Website</RootNamespace>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp2.2</TargetFramework>
     <TreatWarningsAsErrors>True</TreatWarningsAsErrors>
   </PropertyGroup>
 
@@ -17,9 +18,9 @@
     <Folder Include="wwwroot\" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.5" />
+    <PackageReference Include="Microsoft.AspNetCore.App" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.0.2" PrivateAssets="All" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="3.0.0" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="4.0.1" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\Winton.Extensions.Configuration.Consul\Winton.Extensions.Configuration.Consul.csproj" />
diff --git a/test/Winton.Extensions.Configuration.Consul.Test/Winton.Extensions.Configuration.Consul.Test.csproj b/test/Winton.Extensions.Configuration.Consul.Test/Winton.Extensions.Configuration.Consul.Test.csproj
@@ -5,7 +5,7 @@
     <IsPackable>False</IsPackable>
     <NoWarn>$(NoWarn);SA0001;SA1101;SA1118;SA1309;SA1413;SA1600;SA1633;SA1652</NoWarn>
     <RootNamespace>Winton.Extensions.Configuration.Consul</RootNamespace>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp2.2</TargetFramework>
     <TreatWarningsAsErrors>True</TreatWarningsAsErrors>
   </PropertyGroup>
   
@@ -18,12 +18,12 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="FluentAssertions" Version="5.4.2" />
+    <PackageReference Include="FluentAssertions" Version="5.6.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
-    <PackageReference Include="Moq" Version="4.10.0" />
+    <PackageReference Include="Moq" Version="4.10.1" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.0.2" PrivateAssets="All" />
-    <PackageReference Include="xunit" Version="2.4.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
+    <PackageReference Include="xunit" Version="2.4.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
   </ItemGroup>
 
 </Project>

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`using Microsoft.AspNetCore.Builder;`
	`2`	`+using Microsoft.AspNetCore.Mvc;`
`2`	`3`	`using Microsoft.Extensions.Configuration;`
`3`	`4`	`using Microsoft.Extensions.DependencyInjection;`
`4`	`5`	`using Swashbuckle.AspNetCore.Swagger;`
`@@ -30,7 +31,8 @@ public void ConfigureServices(IServiceCollection services)`
`30`	`31`	`services`
`31`	`32`	`.AddSwaggerGen(c => { c.SwaggerDoc(_Version, new Info { Title = _AppTitle, Version = _Version }); })`
`32`	`33`	`.AddSingleton(_configuration)`
`33`		`- .AddMvc();`
	`34`	`+ .AddMvc()`
	`35`	`+ .SetCompatibilityVersion(CompatibilityVersion.Version_2_2);`
`34`	`36`	`}`
`35`	`37`	`}`
`36`	`38`	`}`