Merge branch 'release/0.18.0'

binarymash · Mar 15, 2019 · a9a9a4d · a9a9a4d
2 parents 1fcd383 + 361fbeb
commit a9a9a4d
Show file tree

Hide file tree

Showing 72 changed files with 2,192 additions and 2,267 deletions.
diff --git a/build.cake b/build.cake
@@ -1,5 +1,5 @@
 #tool "nuget:?package=GitVersion.CommandLine"
-#tool "nuget:?package=OpenCover&version=4.6.832"
+#tool "nuget:?package=OpenCover&version=4.7.922"
 #tool "nuget:?package=ReportGenerator"
 #tool "nuget:?package=GitReleaseNotes"
 #addin "nuget:?package=Cake.DoInDirectory"
@@ -30,7 +30,7 @@ var netFrameworkUnitTestAssemblies = new []
 	@"./src/Evelyn.Storage.EventStore.Tests/bin/"+compileConfig+"/net461/Evelyn.Storage.EventStore.Tests.dll",
 };
 var openCoverSettings = new OpenCoverSettings();
-var minCodeCoverage =87d;
+var minCodeCoverage =89d;
 var coverallsRepoToken = "coveralls-repo-token-evelyn";
 
 // integration testing

diff --git a/build.sh b/build.sh
@@ -54,9 +54,9 @@ fi
 # Make sure that packages.config exist.
 if [ ! -f "$TOOLS_DIR/packages.config" ]; then
     echo "Downloading packages.config..."
-    curl -Lsfo "$TOOLS_DIR/packages.config" http://cakebuild.net/download/bootstrapper/packages
+    curl -Lsfo "$TOOLS_DIR/packages.config" https://cakebuild.net/download/bootstrapper/packages
     if [ $? -ne 0 ]; then
-        echo "An error occured while downloading packages.config."
+        echo "An error occurred while downloading packages.config."
         exit 1
     fi
 fi
@@ -66,14 +66,14 @@ if [ ! -f "$NUGET_EXE" ]; then
     echo "Downloading NuGet..."
     curl -Lsfo "$NUGET_EXE" https://dist.nuget.org/win-x86-commandline/latest/nuget.exe
     if [ $? -ne 0 ]; then
-        echo "An error occured while downloading nuget.exe."
+        echo "An error occurred while downloading nuget.exe."
         exit 1
     fi
 fi
 
 # Restore tools from NuGet.
 pushd "$TOOLS_DIR" >/dev/null
-if [ ! -f "$PACKAGES_CONFIG_MD5" ] || [ "$( cat "$PACKAGES_CONFIG_MD5" | sed 's/\r$//' )" != "$( $MD5_EXE "$PACKAGES_CONFIG" | awk '{ print $1 }' )" ]; then
+if [ ! -f $PACKAGES_CONFIG_MD5 ] || [ "$( cat $PACKAGES_CONFIG_MD5 | sed 's/\r$//' )" != "$( $MD5_EXE $PACKAGES_CONFIG | awk '{ print $1 }' )" ]; then
     find . -type d ! -name . | xargs rm -rf
 fi
 
@@ -83,7 +83,7 @@ if [ $? -ne 0 ]; then
     exit 1
 fi
 
-$MD5_EXE "$PACKAGES_CONFIG" | awk '{ print $1 }' >| "$PACKAGES_CONFIG_MD5"
+$MD5_EXE $PACKAGES_CONFIG | awk '{ print $1 }' >| $PACKAGES_CONFIG_MD5
 
 popd >/dev/null
 

diff --git a/cake.config b/cake.config
@@ -1,4 +1 @@
 ; The configuration file for Cake.
-
-[Nuget]
-Source=https://www.myget.org/F/binarymash-unstable/api/v2;https://api.nuget.org/v3/index.json
diff --git a/docs/contributing/building.rst b/docs/contributing/building.rst
@@ -3,6 +3,13 @@ Building the code
 
 Evelyn can be built on the command line on any environment that supports the .NET Core SDK and, if you're running on Windows, in any version of Visual Studio 2017.
 
+Prerequisites
+-------------
+
+- .NET Core 2.2 SDK
+- if you're running on linux or MacOS the evelyn build scripts require you to have mono 5.12.0 or later installed
+
+
 Building on the command line
 ----------------------------
 

diff --git a/docs/getting-started/running.rst b/docs/getting-started/running.rst
@@ -7,12 +7,14 @@ Prerequisites
 -------------
 
 - `Docker <https://www.docker.com/>`_ is installed on your computer. Note that if you're already running in a virtualised environment - for example, Windows running in Parallels on a Mac, then you probably can't use the docker files as Docker doesn't play nicely with nested virtualisation.
+- .NET Core 2.2 SDK
+- if you're running on linux or macOS the evelyn build scripts require you to have mono 5.12.0 or later installed
 
 Running in Docker using the command line
 ----------------------------------------
 
-Run the ``./runSample.ps1`` script. This will kick off Cake scripts which will build and then run the Docker containers.
+Run the ``./runSample.ps1`` script (Windows) or ``./runSample.sh`` (Linux/macOS). This will kick off Cake scripts which will build and then run the Docker containers.
 
-Running in Docker using Visual Studio
--------------------------------------
+Running in Docker using Visual Studio (Windows)
+-----------------------------------------------
 Ensure that the startup project is ``docker-compose``, then run the solution.
diff --git a/releasenotes.md b/releasenotes.md
@@ -1,5 +1,18 @@
 # Release Notes
 
+## Version 0.28.0 (2019-03-15)
+
+ - [#162](https://github.com/binarymash/evelyn/pull/162)  - [#159](https://github.com/binarymash/evelyn/issues/159) - package update contributed by Philip Wood ([binarymash](https://github.com/binarymash))
+ - [#161](https://github.com/binarymash/evelyn/pull/161) - Increase test coverage contributed by Philip Wood ([binarymash](https://github.com/binarymash))
+ - [#158](https://github.com/binarymash/evelyn/pull/158) - [#89](https://github.com/binarymash/evelyn/issues/89) - add toggle states projection contributed by Philip Wood ([binarymash](https://github.com/binarymash))
+ - [#157](https://github.com/binarymash/evelyn/pull/157) - [#89](https://github.com/binarymash/evelyn/issues/89) - add toggle states projection contributed by Philip Wood ([binarymash](https://github.com/binarymash))
+ - [#155](https://github.com/binarymash/evelyn/pull/155) - Update to latest build.sh. Fix runSample.sh. Update docs. contributed by Philip Wood ([binarymash](https://github.com/binarymash))
+ - [#154](https://github.com/binarymash/evelyn/pull/154)  - [#39](https://github.com/binarymash/evelyn/issues/39) - Implement client endpoint contributed by Philip Wood ([binarymash](https://github.com/binarymash))
+ - [#50](https://github.com/binarymash/evelyn/issues/50) - Fix MacOS build
+
+
+Commits: 837bb34aef...da2eb61a83
+
 ## 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))

diff --git a/runSample.sh b/runSample.sh
@@ -1,2 +1,2 @@
 #!/usr/bin/env bash
-./build.sh -target RunSample
+./build.sh --target "RunSample"
diff --git a/src/Evelyn.Client.Host/Evelyn.Client.Host.csproj b/src/Evelyn.Client.Host/Evelyn.Client.Host.csproj
@@ -33,7 +33,7 @@
     <PackageReference Include="Microsoft.DotNet.Analyzers.Compatibility" Version="0.1.2-alpha" />
     <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" Version="2.8.0" />
     <PackageReference Include="Serilog.Extensions.Logging" Version="2.0.2" />
     <PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.0.2">

diff --git a/src/Evelyn.Client.Rest/EnvironmentStateRestProvider.cs b/src/Evelyn.Client.Rest/EnvironmentStateRestProvider.cs
@@ -10,12 +10,12 @@
 
     public class EnvironmentStateRestProvider : IEnvironmentStateProvider
     {
-        private readonly Client _client;
+        private readonly EvelynRestClient _client;
         private readonly ILogger<EnvironmentStateRestProvider> _logger;
 
         public EnvironmentStateRestProvider(IOptions<EnvironmentStateRestProviderOptions> options, ILogger<EnvironmentStateRestProvider> logger)
         {
-            _client = new Client(options.Value.BaseUrl);
+            _client = new EvelynRestClient(options.Value.BaseUrl);
             _logger = logger;
         }
 
@@ -24,7 +24,7 @@ public Domain.EnvironmentState Invoke(Guid projectId, string environmentKey)
             try
             {
                 var dto = _client
-                    .ApiStatesAsync(projectId, environmentKey)
+                    .GetAsync(projectId, environmentKey)
                     .GetAwaiter().GetResult();
 
                 var toggleStates = new List<Domain.ToggleState>();

diff --git a/src/Evelyn.Client.Rest/Evelyn.Client.Rest.csproj b/src/Evelyn.Client.Rest/Evelyn.Client.Rest.csproj
@@ -48,8 +48,4 @@
     <ProjectReference Include="..\Evelyn.Client\Evelyn.Client.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Folder Include="Generated\" />
-  </ItemGroup>
-
 </Project>