Merge branch 'v2.0' of https://github.com/coderrapp/codeRR.Server into v2.0

# Conflicts:
#	src/Server/Coderr.Server.Web/Controllers/ReportReceiverController.cs

Author: jgauffin

src/Server/Coderr.Server.SqlServer/Migrations/MigrationScripts.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using System.Reflection;
 
 namespace Coderr.Server.SqlServer.Migrations
@@ -9,6 +10,9 @@ public class MigrationScripts
     {
         internal const string SchemaNamespace = "Coderr.Server.SqlServer.Schema";
         private readonly Dictionary<int, VersionMigration> _versions = new Dictionary<int, VersionMigration>();
+        private bool _isEmpty;
+
+        public bool IsEmpty => _versions.Count == 0;
 
         public void AddScript(int version, string scriptName)
         {
@@ -38,5 +42,10 @@ public IEnumerable<string> GetScripts(int version)
                 yield return new StreamReader(res).ReadToEnd();
             }
         }
+
+        public int GetHighestVersion()
+        {
+            return _versions.Max(x => x.Key);
+        }
     }
 }

src/Server/Coderr.Server.SqlServer/Migrations/SchemaManager.cs

@@ -78,6 +78,10 @@ public int GetCurrentSchemaVersion()
 
         public int GetLatestSchemaVersion()
         {
+            if (!_migrationScripts.IsEmpty)
+            {
+                return _migrationScripts.GetHighestVersion();
+            }
             var highestVersion = 0;
             var names =
                 Assembly.GetExecutingAssembly()

src/Server/Coderr.Server.SqlServer/Schema/Update.v14.sql

@@ -1,3 +1,3 @@
---alter table ApplicationVersions alter column Version varchar(20) not null;
+alter table ApplicationVersions alter column Version varchar(20) not null;
 
---UPDATE DatabaseSchema SET Version = 14;
+UPDATE DatabaseSchema SET Version = 14;

src/Server/Coderr.Server.Web/Boot/Cqs/RegisterCqsServices.cs

@@ -88,6 +88,10 @@ public void Stop()
             {
                 _log.Debug("Shutting down");
                 _messagingQueueListenerTask.Wait(10000);
+            }
+            catch (TaskCanceledException)
+            {
+                
             }
             catch (Exception ex)
             {