Merge branch 'release/0.17.0'

binarymash · Dec 24, 2018 · 1fcd383 · 1fcd383
2 parents 0db3699 + 9e7b3a0
commit 1fcd383
Show file tree

Hide file tree

Showing 25 changed files with 98 additions and 80 deletions.
diff --git a/releasenotes.md b/releasenotes.md
@@ -1,5 +1,13 @@
 # Release Notes
 
+## Version 0.17.0 (2018-12-24)
+
+ - [#153](https://github.com/binarymash/evelyn/pull/153) - [#150](https://github.com/binarymash/evelyn/issues/150) - Upgrade to dotnet core 2.2 contributed by Philip Wood ([binarymash](https://github.com/binarymash))
+ - [#152](https://github.com/binarymash/evelyn/pull/152) - [#151](https://github.com/binarymash/evelyn/issues/151) - Package updates contributed by Philip Wood ([binarymash](https://github.com/binarymash))
+
+Commits: e9b59d7a8f...44356cad3f
+
+
 ## Version 0.16.0 (2018-12-24)
 
  - [#148](https://github.com/binarymash/evelyn/pull/148) - [#147](https://github.com/binarymash/evelyn/issues/147) - fix optimistic concurrency contributed by Philip Wood ([binarymash](https://github.com/binarymash))
@@ -14,6 +22,7 @@ Commits: 1cbc773440...af2cba437e
 
 Commits: fd28cb04f3...d00b5ae02d
 
+
 ## Version 0.14.0 (2018-11-26)
 
  - [#142](https://github.com/binarymash/evelyn/pull/142) - [#141](https://github.com/binarymash/evelyn/issues/141) - package update contributed by Philip Wood ([binarymash](https://github.com/binarymash))
@@ -22,6 +31,7 @@ Commits: fd28cb04f3...d00b5ae02d
 
 Commits: f9968e6c33...235d2c06c0
 
+
 ## Version 0.13.0 (2018-09-09)
 
  - [#134](https://github.com/binarymash/evelyn/pull/134) - [#131](https://github.com/binarymash/evelyn/issues/131) - run hosts via docker compose contributed by Philip Wood ([binarymash](https://github.com/binarymash))

diff --git a/src/Evelyn.Client.Host/Dockerfile b/src/Evelyn.Client.Host/Dockerfile
@@ -1,7 +1,7 @@
-FROM microsoft/dotnet:2.1-runtime AS base
+FROM microsoft/dotnet:2.2-runtime AS base
 WORKDIR /app
 
-FROM microsoft/dotnet:2.1-sdk AS build
+FROM microsoft/dotnet:2.2-sdk AS build
 WORKDIR /src
 COPY Evelyn.Client.Host/Evelyn.Client.Host.csproj Evelyn.Client.Host/
 COPY Evelyn.Client.Rest/Evelyn.Client.Rest.csproj Evelyn.Client.Rest/

diff --git a/src/Evelyn.Client.Host/Evelyn.Client.Host.csproj b/src/Evelyn.Client.Host/Evelyn.Client.Host.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp2.2</TargetFramework>
     <CodeAnalysisRuleSet>..\codeanalysis.ruleset</CodeAnalysisRuleSet>
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
     <Version>0.0.0-dev</Version>
@@ -31,8 +31,8 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.DotNet.Analyzers.Compatibility" Version="0.1.2-alpha" />
-    <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="2.1.1" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.1.1" />
+    <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="2.2.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.2.0" />
     <PackageReference Include="Serilog" Version="2.7.1" />
     <PackageReference Include="Serilog.Extensions.Logging" Version="2.0.2" />
     <PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />

diff --git a/src/Evelyn.Client.Rest/Evelyn.Client.Rest.csproj b/src/Evelyn.Client.Rest/Evelyn.Client.Rest.csproj
@@ -36,9 +36,9 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.DotNet.Analyzers.Compatibility" Version="0.1.2-alpha" />
-    <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="2.1.1" />
-    <PackageReference Include="Microsoft.Extensions.Options" Version="2.1.1" />
-    <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
+    <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="2.2.0" />
+    <PackageReference Include="Microsoft.Extensions.Options" Version="2.2.0" />
+    <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.0.2">
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

diff --git a/src/Evelyn.Client.Tests/Evelyn.Client.Tests.csproj b/src/Evelyn.Client.Tests/Evelyn.Client.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp2.2</TargetFramework>
     <IsPackable>false</IsPackable>
     <CodeAnalysisRuleSet>..\codeanalysis.ruleset</CodeAnalysisRuleSet>
     <Version>0.0.0-dev</Version>
@@ -25,10 +25,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AutoFixture" Version="4.5.0" />
+    <PackageReference Include="AutoFixture" Version="4.6.0" />
     <PackageReference Include="FluentAssertions" Version="5.5.3" />
     <PackageReference Include="Microsoft.DotNet.Analyzers.Compatibility" Version="0.1.2-alpha" />
-    <PackageReference Include="Microsoft.Extensions.Options" Version="2.1.1" />
+    <PackageReference Include="Microsoft.Extensions.Options" Version="2.2.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
     <PackageReference Include="NSubstitute" Version="3.1.0" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.0.2" />

diff --git a/src/Evelyn.Client/Evelyn.Client.csproj b/src/Evelyn.Client/Evelyn.Client.csproj
@@ -37,8 +37,8 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.DotNet.Analyzers.Compatibility" Version="0.1.2-alpha" />
-    <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="2.1.1" />
-    <PackageReference Include="Microsoft.Extensions.Options" Version="2.1.1" />
+    <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="2.2.0" />
+    <PackageReference Include="Microsoft.Extensions.Options" Version="2.2.0" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.0.2" />
   </ItemGroup>
 

diff --git a/src/Evelyn.Core.Tests/Evelyn.Core.Tests.csproj b/src/Evelyn.Core.Tests/Evelyn.Core.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp2.2</TargetFramework>
     <IsPackable>false</IsPackable>
     <CodeAnalysisRuleSet>..\codeanalysis.ruleset</CodeAnalysisRuleSet>
     <Version>0.0.0-dev</Version>
@@ -25,14 +25,14 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AutoFixture" Version="4.5.0" />
+    <PackageReference Include="AutoFixture" Version="4.6.0" />
     <PackageReference Include="CompareNETObjects" Version="4.57.0" />
     <PackageReference Include="FluentAssertions" Version="5.5.3" />
     <PackageReference Include="Microsoft.DotNet.Analyzers.Compatibility" Version="0.1.2-alpha" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.1.1" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.2.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
     <PackageReference Include="NSubstitute" Version="3.1.0" />
-    <PackageReference Include="Polly" Version="6.1.1" />
+    <PackageReference Include="Polly" Version="6.1.2" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.0.2" />
     <PackageReference Include="TestStack.BDDfy" Version="4.3.2" />
     <PackageReference Include="xunit" Version="2.4.1" />

diff --git a/src/Evelyn.Core.Tests/WriteModel/Account/CreateProject/ValidatorSpecs.cs b/src/Evelyn.Core.Tests/WriteModel/Account/CreateProject/ValidatorSpecs.cs
@@ -37,7 +37,7 @@ public void ProjectNameWhenNullIsInvalid()
             var errors = _validator.ShouldHaveValidationErrorFor(c => c.Name, command).ToList();
             errors.Should().Contain(error =>
                 error.ErrorCode == ErrorCodes.PropertyNotSet &&
-                error.ErrorMessage == "'Name' should not be empty.");
+                error.ErrorMessage == "'Name' must not be empty.");
         }
 
         [Fact]
@@ -49,7 +49,7 @@ public void ProjectNameWhenEmptyIsInvalid()
             var errors = _validator.ShouldHaveValidationErrorFor(c => c.Name, command).ToList();
             errors.Should().Contain(error =>
                 error.ErrorCode == ErrorCodes.PropertyNotSet &&
-                error.ErrorMessage == "'Name' should not be empty.");
+                error.ErrorMessage == "'Name' must not be empty.");
         }
 
         [Fact]
@@ -61,7 +61,7 @@ public void ProjectNameWhenWhitespaceIsInvalid()
             var errors = _validator.ShouldHaveValidationErrorFor(c => c.Name, command).ToList();
             errors.Should().Contain(error =>
                 error.ErrorCode == ErrorCodes.PropertyNotSet &&
-                error.ErrorMessage == "'Name' should not be empty.");
+                error.ErrorMessage == "'Name' must not be empty.");
         }
 
         [Fact]
@@ -141,7 +141,7 @@ public void ProjectIdWhenEmptyGuidIsInvalid()
             var errors = _validator.ShouldHaveValidationErrorFor(c => c.ProjectId, command).ToList();
             errors.Should().Contain(error =>
                 error.ErrorCode == ErrorCodes.PropertyNotSet &&
-                error.ErrorMessage == "'Project Id' should not be empty.");
+                error.ErrorMessage == "'Project Id' must not be empty.");
         }
     }
 }
diff --git a/src/Evelyn.Core.Tests/WriteModel/Project/AddEnvironment/ValidatorSpecs.cs b/src/Evelyn.Core.Tests/WriteModel/Project/AddEnvironment/ValidatorSpecs.cs
@@ -38,7 +38,7 @@ public void KeyWhenNullIsInvalid()
             var errors = _validator.ShouldHaveValidationErrorFor(c => c.Key, command).ToList();
             errors.Should().Contain(error =>
                 error.ErrorCode == ErrorCodes.PropertyNotSet &&
-                error.ErrorMessage == "'Key' should not be empty.");
+                error.ErrorMessage == "'Key' must not be empty.");
         }
 
         [Fact]
@@ -50,7 +50,7 @@ public void KeyWhenEmptyIsInvalid()
             var errors = _validator.ShouldHaveValidationErrorFor(c => c.Key, command).ToList();
             errors.Should().Contain(error =>
                 error.ErrorCode == ErrorCodes.PropertyNotSet &&
-                error.ErrorMessage == "'Key' should not be empty.");
+                error.ErrorMessage == "'Key' must not be empty.");
         }
 
         [Fact]
@@ -62,7 +62,7 @@ public void KeyWhenWhitespaceIsInvalid()
             var errors = _validator.ShouldHaveValidationErrorFor(c => c.Key, command).ToList();
             errors.Should().Contain(error =>
                 error.ErrorCode == ErrorCodes.PropertyNotSet &&
-                error.ErrorMessage == "'Key' should not be empty.");
+                error.ErrorMessage == "'Key' must not be empty.");
         }
 
         [Fact]
@@ -154,7 +154,7 @@ public void ProjectIdWhenEmptyGuidIsInvalid()
             var errors = _validator.ShouldHaveValidationErrorFor(c => c.ProjectId, command).ToList();
             errors.Should().Contain(error =>
                 error.ErrorCode == ErrorCodes.PropertyNotSet &&
-                error.ErrorMessage == "'Project Id' should not be empty.");
+                error.ErrorMessage == "'Project Id' must not be empty.");
         }
 
         [Fact]
@@ -174,7 +174,7 @@ public void NameWhenNullIsInvalid()
             var errors = _validator.ShouldHaveValidationErrorFor(c => c.Name, command).ToList();
             errors.Should().Contain(error =>
                 error.ErrorCode == ErrorCodes.PropertyNotSet &&
-                error.ErrorMessage == "'Name' should not be empty.");
+                error.ErrorMessage == "'Name' must not be empty.");
         }
 
         [Fact]
@@ -186,7 +186,7 @@ public void NameWhenEmptyIsInvalid()
             var errors = _validator.ShouldHaveValidationErrorFor(c => c.Name, command).ToList();
             errors.Should().Contain(error =>
                 error.ErrorCode == ErrorCodes.PropertyNotSet &&
-                error.ErrorMessage == "'Name' should not be empty.");
+                error.ErrorMessage == "'Name' must not be empty.");
         }
 
         [Fact]
@@ -198,7 +198,7 @@ public void NameWhenWhitespaceIsInvalid()
             var errors = _validator.ShouldHaveValidationErrorFor(c => c.Name, command).ToList();
             errors.Should().Contain(error =>
                 error.ErrorCode == ErrorCodes.PropertyNotSet &&
-                error.ErrorMessage == "'Name' should not be empty.");
+                error.ErrorMessage == "'Name' must not be empty.");
         }
 
         [Fact]

diff --git a/src/Evelyn.Core.Tests/WriteModel/Project/AddToggle/ValidatorSpecs.cs b/src/Evelyn.Core.Tests/WriteModel/Project/AddToggle/ValidatorSpecs.cs
@@ -37,7 +37,7 @@ public void ProjectIdWhenEmptyGuidIsInvalid()
             var errors = _validator.ShouldHaveValidationErrorFor(c => c.ProjectId, command).ToList();
             errors.Should().Contain(error =>
                 error.ErrorCode == ErrorCodes.PropertyNotSet &&
-                error.ErrorMessage == "'Project Id' should not be empty.");
+                error.ErrorMessage == "'Project Id' must not be empty.");
         }
 
         [Fact]
@@ -58,7 +58,7 @@ public void KeyWhenNullIsInvalid()
             var errors = _validator.ShouldHaveValidationErrorFor(c => c.Key, command).ToList();
             errors.Should().Contain(error =>
                 error.ErrorCode == ErrorCodes.PropertyNotSet &&
-                error.ErrorMessage == "'Key' should not be empty.");
+                error.ErrorMessage == "'Key' must not be empty.");
         }
 
         [Fact]
@@ -70,7 +70,7 @@ public void KeyWhenEmptyIsInvalid()
             var errors = _validator.ShouldHaveValidationErrorFor(c => c.Key, command).ToList();
             errors.Should().Contain(error =>
                 error.ErrorCode == ErrorCodes.PropertyNotSet &&
-                error.ErrorMessage == "'Key' should not be empty.");
+                error.ErrorMessage == "'Key' must not be empty.");
         }
 
         [Fact]
@@ -82,7 +82,7 @@ public void KeyWhenWhitespaceIsInvalid()
             var errors = _validator.ShouldHaveValidationErrorFor(c => c.Key, command).ToList();
             errors.Should().Contain(error =>
                 error.ErrorCode == ErrorCodes.PropertyNotSet &&
-                error.ErrorMessage == "'Key' should not be empty.");
+                error.ErrorMessage == "'Key' must not be empty.");
         }
 
         [Fact]
@@ -174,7 +174,7 @@ public void NameWhenNullIsInvalid()
             var errors = _validator.ShouldHaveValidationErrorFor(c => c.Name, command).ToList();
             errors.Should().Contain(error =>
                 error.ErrorCode == ErrorCodes.PropertyNotSet &&
-                error.ErrorMessage == "'Name' should not be empty.");
+                error.ErrorMessage == "'Name' must not be empty.");
         }
 
         [Fact]
@@ -186,7 +186,7 @@ public void NameWhenEmptyIsInvalid()
             var errors = _validator.ShouldHaveValidationErrorFor(c => c.Name, command).ToList();
             errors.Should().Contain(error =>
                 error.ErrorCode == ErrorCodes.PropertyNotSet &&
-                error.ErrorMessage == "'Name' should not be empty.");
+                error.ErrorMessage == "'Name' must not be empty.");
         }
 
         [Fact]
@@ -198,7 +198,7 @@ public void NameWhenWhitespaceIsInvalid()
             var errors = _validator.ShouldHaveValidationErrorFor(c => c.Name, command).ToList();
             errors.Should().Contain(error =>
                 error.ErrorCode == ErrorCodes.PropertyNotSet &&
-                error.ErrorMessage == "'Name' should not be empty.");
+                error.ErrorMessage == "'Name' must not be empty.");
         }
 
         [Fact]

diff --git a/src/Evelyn.Core.Tests/WriteModel/Project/ChangeToggleState/ValidatorSpecs.cs b/src/Evelyn.Core.Tests/WriteModel/Project/ChangeToggleState/ValidatorSpecs.cs
@@ -37,7 +37,7 @@ public void ProjectIdWhenEmptyGuidIsInvalid()
             var errors = _validator.ShouldHaveValidationErrorFor(c => c.ProjectId, command).ToList();
             errors.Should().Contain(error =>
                 error.ErrorCode == ErrorCodes.PropertyNotSet &&
-                error.ErrorMessage == "'Project Id' should not be empty.");
+                error.ErrorMessage == "'Project Id' must not be empty.");
         }
 
         [Fact]
@@ -58,7 +58,7 @@ public void ToggleKeyWhenNullIsInvalid()
             var errors = _validator.ShouldHaveValidationErrorFor(c => c.ToggleKey, command).ToList();
             errors.Should().Contain(error =>
                 error.ErrorCode == ErrorCodes.PropertyNotSet &&
-                error.ErrorMessage == "'Toggle Key' should not be empty.");
+                error.ErrorMessage == "'Toggle Key' must not be empty.");
         }
 
         [Fact]
@@ -70,7 +70,7 @@ public void ToggleKeyWhenEmptyIsInvalid()
             var errors = _validator.ShouldHaveValidationErrorFor(c => c.ToggleKey, command).ToList();
             errors.Should().Contain(error =>
                 error.ErrorCode == ErrorCodes.PropertyNotSet &&
-                error.ErrorMessage == "'Toggle Key' should not be empty.");
+                error.ErrorMessage == "'Toggle Key' must not be empty.");
         }
 
         [Fact]
@@ -91,7 +91,7 @@ public void EnvironmentKeyWhenNullIsInvalid()
             var errors = _validator.ShouldHaveValidationErrorFor(c => c.EnvironmentKey, command).ToList();
             errors.Should().Contain(error =>
                 error.ErrorCode == ErrorCodes.PropertyNotSet &&
-                error.ErrorMessage == "'Environment Key' should not be empty.");
+                error.ErrorMessage == "'Environment Key' must not be empty.");
         }
 
         [Fact]
@@ -103,7 +103,7 @@ public void EnvironmentKeyWhenEmptyIsInvalid()
             var errors = _validator.ShouldHaveValidationErrorFor(c => c.EnvironmentKey, command).ToList();
             errors.Should().Contain(error =>
                 error.ErrorCode == ErrorCodes.PropertyNotSet &&
-                error.ErrorMessage == "'Environment Key' should not be empty.");
+                error.ErrorMessage == "'Environment Key' must not be empty.");
         }
 
         [Fact]
@@ -172,7 +172,7 @@ public void ValueWhenNullIsInvalid()
             var errors = _validator.ShouldHaveValidationErrorFor(c => c.Value, command).ToList();
             errors.Should().Contain(error =>
                 error.ErrorCode == ErrorCodes.PropertyNotSet &&
-                error.ErrorMessage == "'Value' should not be empty.");
+                error.ErrorMessage == "'Value' must not be empty.");
         }
 
         [Fact]
@@ -184,7 +184,7 @@ public void ValueWhenEmptyIsInvalid()
             var errors = _validator.ShouldHaveValidationErrorFor(c => c.Value, command).ToList();
             errors.Should().Contain(error =>
                 error.ErrorCode == ErrorCodes.PropertyNotSet &&
-                error.ErrorMessage == "'Value' should not be empty.");
+                error.ErrorMessage == "'Value' must not be empty.");
         }
 
         [Fact]
@@ -196,7 +196,7 @@ public void ValueWhenWhitespaceIsInvalid()
             var errors = _validator.ShouldHaveValidationErrorFor(c => c.Value, command).ToList();
             errors.Should().Contain(error =>
                 error.ErrorCode == ErrorCodes.PropertyNotSet &&
-                error.ErrorMessage == "'Value' should not be empty.");
+                error.ErrorMessage == "'Value' must not be empty.");
         }
 
         [Fact]