From 6e6aca44f00852a0cfcdd209b2bcc80858b2f17f Mon Sep 17 00:00:00 2001
From: Paul Schneider <paul@pschneider.fr>
Date: Fri, 4 May 2018 10:45:45 +0200
Subject: [PATCH] still refactoring

---
 Makefile                                      |  28 +++--
 Yavsc.Abstract/Constants.cs                   |   8 --
 Yavsc.Abstract/Makefile                       |  35 +------
 Yavsc.Abstract/Templates/Template.cs          |   2 +
 Yavsc.Abstract/Yavsc.Abstract.nuspec          |   1 +
 Yavsc.Server/Makefile                         |   5 +-
 Yavsc.Server/Services/IEmailSender.cs         |   2 +-
 .../Services/IGoogleCloudMessageSender.cs     |   4 -
 Yavsc.Server/Services/MessageServices.cs      |  34 +++++--
 .../Templates/UserOrientedTemplate.cs         |   3 +-
 Yavsc.Server/Yavsc.Server.nuspec              |   1 +
 Yavsc.Server/project.json                     |  13 +--
 Yavsc.Server/project.lock.json                |  14 +--
 Yavsc.Server/rc-num.txt                       |   1 -
 Yavsc/ApiControllers/BillingController.cs     |   4 +-
 Yavsc/Controllers/AccountController.cs        |  17 ++--
 Yavsc/Controllers/CommandController.cs        |   3 +-
 .../Haircut/HairCutCommandController.cs       |   9 +-
 Yavsc/Makefile                                |  10 +-
 Yavsc/project.json                            |   6 +-
 Yavsc/rc-num.txt                              |   1 -
 ZicMoove/ZicMoove.UWP/project.lock.json       |  28 ++---
 build.sh                                      |  33 +++---
 cli/Makefile                                  |  25 ++---
 cli/Yavsc.1.0.5-rc15.nupkg                    | Bin 0 -> 10005 bytes
 cli/YavscServerFactory.cs                     |   4 +-
 cli/cli.csproj                                |   4 +
 cli/cli.nuspec                                |  26 +++++
 cli/project.json                              |  12 +--
 cli/project.lock.json                         |  96 ++++++++++--------
 common.mk                                     |  87 ----------------
 dnx.mk                                        |  74 +++++++++++++-
 rc-num.txt                                    |   2 +-
 versioning.mk                                 |  13 +++
 wrap/Yavsc.Client/project.json                |  16 ---
 wrap/mscorlib/project.json                    |  10 --
 36 files changed, 305 insertions(+), 326 deletions(-)
 delete mode 100644 Yavsc.Abstract/Constants.cs
 rename {Yavsc => Yavsc.Server}/Templates/UserOrientedTemplate.cs (75%)
 delete mode 100644 Yavsc.Server/rc-num.txt
 delete mode 100644 Yavsc/rc-num.txt
 create mode 100644 cli/Yavsc.1.0.5-rc15.nupkg
 create mode 100644 cli/cli.nuspec
 delete mode 100644 common.mk
 create mode 100644 versioning.mk
 delete mode 100644 wrap/Yavsc.Client/project.json
 delete mode 100644 wrap/mscorlib/project.json

diff --git a/Makefile b/Makefile
index e63c680c..d5e10e95 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
+include versioning.mk
 
-
-all: Yavsc
+all: deploy-pkgs
 
 Yavsc.Abstract:
 	$(MAKE) -C Yavsc.Abstract VERSION=$(VERSION)
@@ -12,13 +12,29 @@ Yavsc: Yavsc.Server
 	make -C Yavsc restore
 	make -C Yavsc VERSION=$(VERSION)
 
-cli-deploy-pkg:
-	make -C cli deploy-pkg VERSION=$(VERSION)
+Yavsc.Server-deploy-pkg:
+	make -C Yavsc.Server deploy-pkg
 
-cli: Yavsc
+Yavsc.Abstract-deploy-pkg:
+	make -C Yavsc.Abstract deploy-pkg
+
+cli-deploy-pkg:
+	make -C cli deploy-pkg
+
+cli: Yavsc.Server-deploy-pkg Yavsc.Abstract-deploy-pkg
+	make -C cli restore
+	make -C cli
+
+deploy-pkgs: cli-deploy-pkg
 
 memo:
-		vim ~/TODO.md
+	vim ~/TODO.md
+
+
+rc-num:
+	@echo echo 1-alpha1  < $<  ^ $^  @ $@
+
 
 .PHONY: all $(SUBDIRS)
 
+
diff --git a/Yavsc.Abstract/Constants.cs b/Yavsc.Abstract/Constants.cs
deleted file mode 100644
index bc3f90ff..00000000
--- a/Yavsc.Abstract/Constants.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-namespace Yavsc.Abstract
-{
-    public class ConstantsFromAbstract
-    {
-        public const string EMailRegexp = @"^\w+([-+.']\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*$";
-
-    }
-}
\ No newline at end of file
diff --git a/Yavsc.Abstract/Makefile b/Yavsc.Abstract/Makefile
index 22349bd3..203ecef7 100644
--- a/Yavsc.Abstract/Makefile
+++ b/Yavsc.Abstract/Makefile
@@ -1,34 +1,3 @@
-CONFIGURATION=Release
-PRJNAME=Yavsc.Abstract
-BINTARGET=$(PRJNAME).dll
-PKGFILENAME=$(PRJNAME).$(VERSION).nupkg
-DESTPATH=.
-PACKAGE=$(DESTPATH)/$(PKGFILENAME)
-BINARY=bin/$(CONFIGURATION)//$(PRJNAME).dll
-FRAMEWORKALIAS=net451
-BINTARGETPATH=bin/$(CONFIGURATION)/$(FRAMEWORKALIAS)/$(BINTARGET)
-NUGETSOURCE=$(HOME)/Nupkgs/
-
-all: $(BINTARGETPATH)
-
-$(BINTARGETPATH):
-	dnu build
-
-
-$(PACKAGE): $(BINARY)
-	nuget pack $(PRJNAME).nuspec -Version $(VERSION) -Properties config=$(CONFIGURATION)
-
-clean:
-	rm $(PACKAGE)
-
-$(BINARY): project.lock.json
-	dnu build --configuration $(CONFIGURATION)
-
-project.lock.json: project.json
-	dnu restore
-
-deploy-pkg: $(PACKAGE)
-	cp $(PACKAGE) $(NUGETSOURCE)
-
-.PHONY: $(PACKAGE)
+include ../versioning.mk
+include ../dnx.mk
 
diff --git a/Yavsc.Abstract/Templates/Template.cs b/Yavsc.Abstract/Templates/Template.cs
index 1e9b0323..d7fff39c 100644
--- a/Yavsc.Abstract/Templates/Template.cs
+++ b/Yavsc.Abstract/Templates/Template.cs
@@ -27,6 +27,8 @@ namespace Yavsc.Abstract.Templates
     public virtual void Init() {
        _buffer = new StringBuilder();
     }
+    
+    public abstract Task ExecuteAsync();
 
   }
 }
diff --git a/Yavsc.Abstract/Yavsc.Abstract.nuspec b/Yavsc.Abstract/Yavsc.Abstract.nuspec
index 3a1af260..c6c36b9a 100644
--- a/Yavsc.Abstract/Yavsc.Abstract.nuspec
+++ b/Yavsc.Abstract/Yavsc.Abstract.nuspec
@@ -18,6 +18,7 @@
 		<tags>yavsc</tags>
 	</metadata>
 	<files>
+		<file src="bin/$config$/dnx451/Yavsc.Abstract.dll" target="lib/dnx451" />
 		<file src="bin/$config$/net451/Yavsc.Abstract.dll" target="lib/portable-net45+win8+wp8+wpa81+Xamarin.Mac+MonoAndroid10+MonoTouch10+Xamarin.iOS10" />
 	</files>
 </package>
diff --git a/Yavsc.Server/Makefile b/Yavsc.Server/Makefile
index c67c2111..060daddc 100644
--- a/Yavsc.Server/Makefile
+++ b/Yavsc.Server/Makefile
@@ -1,2 +1,5 @@
-include ../common.mk
+include ../versioning.mk
+include ../dnx.mk
+
+all: $(BINTARGETPATH)
 
diff --git a/Yavsc.Server/Services/IEmailSender.cs b/Yavsc.Server/Services/IEmailSender.cs
index a759cede..637216d0 100644
--- a/Yavsc.Server/Services/IEmailSender.cs
+++ b/Yavsc.Server/Services/IEmailSender.cs
@@ -5,6 +5,6 @@ namespace Yavsc.Services
 {
     public interface IEmailSender
     {
-        Task<bool> SendEmailAsync(SiteSettings siteSettings, SmtpSettings smtpSettings, string username, string email, string subject, string message);
+        Task<bool> SendEmailAsync(string username, string email, string subject, string message);
     }
 }
diff --git a/Yavsc.Server/Services/IGoogleCloudMessageSender.cs b/Yavsc.Server/Services/IGoogleCloudMessageSender.cs
index f59cab4b..0e92d9fe 100644
--- a/Yavsc.Server/Services/IGoogleCloudMessageSender.cs
+++ b/Yavsc.Server/Services/IGoogleCloudMessageSender.cs
@@ -11,21 +11,17 @@ namespace Yavsc.Services
     public interface IGoogleCloudMessageSender
     {
         Task<MessageWithPayloadResponse> NotifyBookQueryAsync(
-            GoogleAuthSettings googlesettings, 
             IEnumerable<string> registrationId, 
             RdvQueryEvent ev);
 
         Task<MessageWithPayloadResponse> NotifyEstimateAsync(
-            GoogleAuthSettings googlesettings, 
             IEnumerable<string> registrationId, 
             EstimationEvent ev);
 
         Task<MessageWithPayloadResponse> NotifyHairCutQueryAsync(
-            GoogleAuthSettings googlesettings, 
             IEnumerable<string> registrationId, 
             HairCutQueryEvent ev);
         Task<MessageWithPayloadResponse> NotifyAsync(
-            GoogleAuthSettings _googleSettings, 
             IEnumerable<string> regids, 
             IEvent yaev);
     }
diff --git a/Yavsc.Server/Services/MessageServices.cs b/Yavsc.Server/Services/MessageServices.cs
index c85ebfe9..0d2d005c 100755
--- a/Yavsc.Server/Services/MessageServices.cs
+++ b/Yavsc.Server/Services/MessageServices.cs
@@ -15,6 +15,7 @@ using System.Linq;
 using Microsoft.Extensions.Logging;
 using Newtonsoft.Json;
 using Yavsc.Server.Helpers;
+using Microsoft.Extensions.OptionsModel;
 
 namespace Yavsc.Services
 {
@@ -24,13 +25,25 @@ namespace Yavsc.Services
     public class MessageSender : IEmailSender, IGoogleCloudMessageSender
     {
         private ILogger _logger;
+        SiteSettings siteSettings;
+        SmtpSettings smtpSettings;
+        GoogleAuthSettings googleSettings;
 
-        public MessageSender(ILoggerFactory loggerFactory)
+        public MessageSender(
+            ILoggerFactory loggerFactory, 
+            IOptions<SiteSettings> sitesOptions, 
+            IOptions<SmtpSettings> smtpOptions,
+            IOptions<GoogleAuthSettings> googleOptions
+            )
         {
             _logger = loggerFactory.CreateLogger<MessageSender>();
+            siteSettings = sitesOptions.Value;
+            smtpSettings = smtpOptions.Value;
+            googleSettings = googleOptions.Value;
         }
+
         public  async Task <MessageWithPayloadResponse> NotifyEvent<Event>
-         ( GoogleAuthSettings googleSettings, IEnumerable<string> regids, Event ev)
+         (  IEnumerable<string> regids, Event ev)
            where Event : IEvent
         {
             if (ev == null)
@@ -69,23 +82,23 @@ namespace Yavsc.Services
         /// <returns>a MessageWithPayloadResponse,
         /// <c>bool somethingsent = (response.failure == 0 &amp;&amp; response.success > 0)</c>
         /// </returns>
-        public async Task<MessageWithPayloadResponse> NotifyBookQueryAsync(GoogleAuthSettings googleSettings, IEnumerable<string> registrationIds, RdvQueryEvent ev)
+        public async Task<MessageWithPayloadResponse> NotifyBookQueryAsync( IEnumerable<string> registrationIds, RdvQueryEvent ev)
         {
-            return await NotifyEvent<RdvQueryEvent>(googleSettings,registrationIds, ev);
+            return await NotifyEvent<RdvQueryEvent>(registrationIds, ev);
         }
 
-        public async Task<MessageWithPayloadResponse> NotifyEstimateAsync(GoogleAuthSettings googleSettings, IEnumerable<string> registrationIds, EstimationEvent ev)
+        public async Task<MessageWithPayloadResponse> NotifyEstimateAsync(IEnumerable<string> registrationIds, EstimationEvent ev)
         {
-            return await NotifyEvent<EstimationEvent>(googleSettings,registrationIds, ev);
+            return await NotifyEvent<EstimationEvent>(registrationIds, ev);
         }
 
-        public async Task<MessageWithPayloadResponse> NotifyHairCutQueryAsync(GoogleAuthSettings googleSettings,
+        public async Task<MessageWithPayloadResponse> NotifyHairCutQueryAsync(
          IEnumerable<string> registrationIds, HairCutQueryEvent ev)
         {
-            return await NotifyEvent<HairCutQueryEvent>(googleSettings, registrationIds, ev);
+            return await NotifyEvent<HairCutQueryEvent>(registrationIds, ev);
         }
 
-        public Task<bool> SendEmailAsync(SiteSettings siteSettings, SmtpSettings smtpSettings, string username, string email, string subject, string message)
+        public Task<bool> SendEmailAsync(string username, string email, string subject, string message)
         {
             try
             {
@@ -120,7 +133,8 @@ namespace Yavsc.Services
             throw new NotImplementedException();
         }
 
-        public Task<MessageWithPayloadResponse> NotifyAsync(GoogleAuthSettings _googleSettings, IEnumerable<string> regids, IEvent yaev)
+        public Task<MessageWithPayloadResponse> NotifyAsync(
+            IEnumerable<string> regids, IEvent yaev)
         {
             throw new NotImplementedException();
         }
diff --git a/Yavsc/Templates/UserOrientedTemplate.cs b/Yavsc.Server/Templates/UserOrientedTemplate.cs
similarity index 75%
rename from Yavsc/Templates/UserOrientedTemplate.cs
rename to Yavsc.Server/Templates/UserOrientedTemplate.cs
index 91ede7fb..5bea13aa 100644
--- a/Yavsc/Templates/UserOrientedTemplate.cs
+++ b/Yavsc.Server/Templates/UserOrientedTemplate.cs
@@ -4,8 +4,9 @@ using System.Threading.Tasks;
 
 namespace Yavsc.Templates
 {
-    public class UserOrientedTemplate: Template
+    public abstract class UserOrientedTemplate: Template
     {
         public ApplicationUser User { get; set; }
+
     }
 }
diff --git a/Yavsc.Server/Yavsc.Server.nuspec b/Yavsc.Server/Yavsc.Server.nuspec
index dc4a700b..75588bcf 100644
--- a/Yavsc.Server/Yavsc.Server.nuspec
+++ b/Yavsc.Server/Yavsc.Server.nuspec
@@ -25,6 +25,7 @@
 		</dependencies>
 	</metadata>
 	<files>
+		<file src="bin/$config$/dnx451/Yavsc.Server.dll" target="lib/dnx451" />
 		<file src="bin/$config$/net451/Yavsc.Server.dll" target="lib/portable-net45+win8+wp8+wpa81+Xamarin.Mac+MonoAndroid10+MonoTouch10+Xamarin.iOS10" />
 	</files>
 </package>
diff --git a/Yavsc.Server/project.json b/Yavsc.Server/project.json
index 010f971d..77cd79b9 100644
--- a/Yavsc.Server/project.json
+++ b/Yavsc.Server/project.json
@@ -1,5 +1,5 @@
 {
-    "version": "1.0.0-*",
+    "version": "1.0.5-*",
     "description": "Yavsc server common library",
     "authors": [
         "Paul Schneider <paul@pschneider.fr>"
@@ -63,10 +63,7 @@
         "EntityFramework7.Npgsql": "3.1.0-rc1-3",
         "EntityFramework7.Npgsql.Design": "3.1.0-rc1-5",
         "Microsoft.CodeAnalysis.CSharp": "1.1.0-rc1-20151109-01",
-        "Yavsc.Abstract": {
-            "target": "project",
-            "type": "build"
-        }
+        "Yavsc.Abstract": "1.0.5-rc17"
     },
     "frameworks": {
         "dnx451": {
@@ -79,9 +76,9 @@
                 "System.ComponentModel.DataAnnotations": "4.0.0",
                 "System.Json": "4.0.0",
                 "System.Net": "4.0.0.0",
-                "System.Net.Http": "4.0.0.0",
-                "System.Xml": "4.0.0.0",
-                "System": "4.0.0.0"
+                "System.Net.Http": "4.0.0",
+                "System.Xml": "4.0.0",
+                "System": "4.0.0"
             }
         }
     },
diff --git a/Yavsc.Server/project.lock.json b/Yavsc.Server/project.lock.json
index 853fbcc3..4f08bb6a 100644
--- a/Yavsc.Server/project.lock.json
+++ b/Yavsc.Server/project.lock.json
@@ -12816,15 +12816,16 @@
   },
   "projectFileDependencyGroups": {
     "": [
-      "Newtonsoft.Json >= 9.0.1",
-      "Yavsc.Abstract ",
-      "Microsoft.AspNet.Identity >= 3.0.0-rc1-final",
-      "Microsoft.AspNet.Identity.EntityFramework >= 3.0.0-rc1-final",
       "Microsoft.AspNet.Authentication.Facebook >= 1.0.0-rc1-final",
       "Microsoft.AspNet.Authentication.Twitter >= 1.0.0-rc1-final",
       "Microsoft.AspNet.Authentication.OAuth >= 1.0.0-rc1-final",
       "Microsoft.AspNet.Authentication.Cookies >= 1.0.0-rc1-final",
       "Microsoft.AspNet.Hosting >= 1.0.0-rc1-final",
+      "Microsoft.AspNet.Http.Extensions >= 1.0.0-rc1-final",
+      "Microsoft.AspNet.Identity >= 3.0.0-rc1-final",
+      "Microsoft.AspNet.Identity.EntityFramework >= 3.0.0-rc1-final",
+      "Microsoft.AspNet.Mvc.TagHelpers >= 6.0.0-rc1-final",
+      "Newtonsoft.Json >= 9.0.1",
       "Gapi.net45 >= 1.0.0",
       "PayPalMerchant-net451 >= 2.7.109",
       "MailKit >= 1.12.0",
@@ -12832,9 +12833,8 @@
       "Microsoft.AspNet.Localization >= 1.0.0-rc1-final",
       "EntityFramework7.Npgsql >= 3.1.0-rc1-3",
       "EntityFramework7.Npgsql.Design >= 3.1.0-rc1-5",
-      "Microsoft.AspNet.Mvc.TagHelpers >= 6.0.0-rc1-final",
-      "Microsoft.AspNet.Http.Extensions >= 1.0.0-rc1-final",
-      "Microsoft.CodeAnalysis.CSharp >= 1.1.0-rc1-20151109-01"
+      "Microsoft.CodeAnalysis.CSharp >= 1.1.0-rc1-20151109-01",
+      "Yavsc.Abstract >= 1.0.5-rc17"
     ],
     "DNX,Version=v4.5.1": [
       "fx/System.Json >= 4.0.0"
diff --git a/Yavsc.Server/rc-num.txt b/Yavsc.Server/rc-num.txt
deleted file mode 100644
index 60d3b2f4..00000000
--- a/Yavsc.Server/rc-num.txt
+++ /dev/null
@@ -1 +0,0 @@
-15
diff --git a/Yavsc/ApiControllers/BillingController.cs b/Yavsc/ApiControllers/BillingController.cs
index 1e7e25a0..d63417ae 100644
--- a/Yavsc/ApiControllers/BillingController.cs
+++ b/Yavsc/ApiControllers/BillingController.cs
@@ -130,7 +130,7 @@ namespace Yavsc.ApiControllers
             var regids = estimate.Client.Devices.Select(d => d.GCMRegistrationId).ToArray();
             bool gcmSent = false;
             if (regids.Length>0) {
-                var grep = await _GCMSender.NotifyEstimateAsync(_googleSettings,regids,yaev);
+                var grep = await _GCMSender.NotifyEstimateAsync(regids,yaev);
                 gcmSent = grep.success>0;
             }
             return Ok (new { ProviderValidationDate = estimate.ProviderValidationDate, GCMSent = gcmSent });
@@ -187,4 +187,4 @@ namespace Yavsc.ApiControllers
             return File(fi.OpenRead(), "application/x-pdf", filename); ;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/Yavsc/Controllers/AccountController.cs b/Yavsc/Controllers/AccountController.cs
index 064c56a0..af0ef249 100644
--- a/Yavsc/Controllers/AccountController.cs
+++ b/Yavsc/Controllers/AccountController.cs
@@ -30,7 +30,6 @@ namespace Yavsc.Controllers
         // private readonly ISmsSender _smsSender;
         private readonly ILogger _logger;
         SiteSettings _siteSettings;
-        SmtpSettings _smtpSettings;
         TwilioSettings _twilioSettings;
 
         IStringLocalizer _localizer;
@@ -43,8 +42,7 @@ namespace Yavsc.Controllers
             UserManager<ApplicationUser> userManager,
             SignInManager<ApplicationUser> signInManager,
             IEmailSender emailSender,
-        IOptions<SiteSettings> siteSettings,
-       IOptions<SmtpSettings> smtpSettings,
+            IOptions<SiteSettings> siteSettings,
             ILoggerFactory loggerFactory, IOptions<TwilioSettings> twilioSettings,
             IStringLocalizer<Yavsc.Resources.YavscLocalisation> localizer,
             ApplicationDbContext dbContext)
@@ -55,7 +53,6 @@ namespace Yavsc.Controllers
             // _userManager.RegisterTokenProvider("Phone", new UserTokenProvider());
             _emailSender = emailSender;
             _siteSettings = siteSettings.Value;
-            _smtpSettings = smtpSettings.Value;
             _twilioSettings = twilioSettings.Value;
             _logger = loggerFactory.CreateLogger<AccountController>();
             _localizer = localizer;
@@ -212,7 +209,7 @@ namespace Yavsc.Controllers
                 if (result.Succeeded)
                 {
                     _logger.LogInformation(3, "User created a new account with password.");
-                    await _emailSender.SendEmailAsync(_siteSettings, _smtpSettings, Startup.SiteSetup.Owner.Name, Startup.SiteSetup.Owner.EMail,
+                    await _emailSender.SendEmailAsync(Startup.SiteSetup.Owner.Name, Startup.SiteSetup.Owner.EMail,
                      $"[{_siteSettings.Title}] Inscription avec mot de passe: {user.UserName} ", $"{user.Id}/{user.UserName}/{user.Email}");
 
                     // TODO user.DiskQuota = Startup.SiteSetup.UserFiles.Quota;
@@ -220,7 +217,7 @@ namespace Yavsc.Controllers
                     // Send an email with this link
                     var code = await _userManager.GenerateEmailConfirmationTokenAsync(user);
                     var callbackUrl = Url.Action("ConfirmEmail", "Account", new { userId = user.Id, code = code }, protocol: HttpContext.Request.Scheme);
-                    var emailSent = await _emailSender.SendEmailAsync(_siteSettings, _smtpSettings, model.UserName, model.Email, _localizer["ConfirmYourAccountTitle"],
+                    var emailSent = await _emailSender.SendEmailAsync(model.UserName, model.Email, _localizer["ConfirmYourAccountTitle"],
                       string.Format(_localizer["ConfirmYourAccountBody"], _siteSettings.Title, callbackUrl, _siteSettings.Slogan, _siteSettings.Audience));
                     await _signInManager.SignInAsync(user, isPersistent: false);
                     if (!emailSent)
@@ -258,7 +255,7 @@ namespace Yavsc.Controllers
         {
             var code = await _userManager.GenerateEmailConfirmationTokenAsync(user);
             var callbackUrl = Url.Action("ConfirmEmail", "Account", new { userId = user.Id, code = code }, protocol: HttpContext.Request.Scheme);
-            var res = await _emailSender.SendEmailAsync(_siteSettings, _smtpSettings, user.UserName, user.Email, "Confirm your account",
+            var res = await _emailSender.SendEmailAsync(user.UserName, user.Email, "Confirm your account",
                    "Please confirm your account by clicking this link: <a href=\"" + callbackUrl + "\">link</a>");
             return res;
         }
@@ -371,7 +368,7 @@ namespace Yavsc.Controllers
                         await _signInManager.SignInAsync(user, isPersistent: false);
 
 
-                        await _emailSender.SendEmailAsync(_siteSettings, _smtpSettings, Startup.SiteSetup.Owner.Name, Startup.SiteSetup.Owner.EMail,
+                        await _emailSender.SendEmailAsync(Startup.SiteSetup.Owner.Name, Startup.SiteSetup.Owner.EMail,
                          $"[{_siteSettings.Title}] Inscription via {info.LoginProvider}: {user.UserName} ", $"{user.Id}/{user.UserName}/{user.Email}");
 
                         _logger.LogInformation(6, "User created an account using {Name} provider.", info.LoginProvider);
@@ -450,7 +447,7 @@ namespace Yavsc.Controllers
                 // Send an email with this link
                 var code = await _userManager.GeneratePasswordResetTokenAsync(user);
                 var callbackUrl = Url.Action("ResetPassword", "Account", new { userId = user.Id, code = code }, protocol: HttpContext.Request.Scheme);
-                await _emailSender.SendEmailAsync(_siteSettings, _smtpSettings, user.UserName, user.Email, _localizer["Reset Password"],
+                await _emailSender.SendEmailAsync(user.UserName, user.Email, _localizer["Reset Password"],
                    _localizer["Please reset your password by following this link:"] + " <" + callbackUrl + ">");
                 return View("ForgotPasswordConfirmation");
             }
@@ -565,7 +562,7 @@ namespace Yavsc.Controllers
             }
             else // if (model.SelectedProvider == Constants.EMailFactor || model.SelectedProvider == "Default" )
             {
-                await _emailSender.SendEmailAsync(_siteSettings, _smtpSettings,user.UserName, await _userManager.GetEmailAsync(user), "Security Code", message);
+                await _emailSender.SendEmailAsync(user.UserName, await _userManager.GetEmailAsync(user), "Security Code", message);
             }
             return RedirectToAction(nameof(VerifyCode), new { Provider = model.SelectedProvider, ReturnUrl = model.ReturnUrl, RememberMe = model.RememberMe });
         }
diff --git a/Yavsc/Controllers/CommandController.cs b/Yavsc/Controllers/CommandController.cs
index 6b78a55e..2e62940c 100644
--- a/Yavsc/Controllers/CommandController.cs
+++ b/Yavsc/Controllers/CommandController.cs
@@ -172,7 +172,7 @@ namespace Yavsc.Controllers
                     if (pro.Performer.Devices.Count > 0) {
                         var regids = command.PerformerProfile.Performer
                         .Devices.Select(d => d.GCMRegistrationId);
-                        grep = await _GCMSender.NotifyBookQueryAsync(_googleSettings,regids,yaev);
+                        grep = await _GCMSender.NotifyBookQueryAsync(regids,yaev);
                     }
                     
                     // TODO setup a profile choice to allow notifications
@@ -181,7 +181,6 @@ namespace Yavsc.Controllers
                     ViewBag.GooglePayload=grep;
 
                     ViewBag.EmailSent = await _emailSender.SendEmailAsync(
-                        _siteSettings, _smtpSettings,
                         command.PerformerProfile.Performer.UserName,
                         command.PerformerProfile.Performer.Email,
                          $"{command.Client.UserName} (un client) vous demande un rendez-vous",
diff --git a/Yavsc/Controllers/Haircut/HairCutCommandController.cs b/Yavsc/Controllers/Haircut/HairCutCommandController.cs
index 9f726ce4..d4cf2d83 100644
--- a/Yavsc/Controllers/Haircut/HairCutCommandController.cs
+++ b/Yavsc/Controllers/Haircut/HairCutCommandController.cs
@@ -103,7 +103,7 @@ namespace Yavsc.Controllers
                         var regids = command.PerformerProfile.Performer
                         .Devices.Select(d => d.GCMRegistrationId);
                         
-                        grep = await _GCMSender.NotifyAsync(_googleSettings, regids, yaev);
+                        grep = await _GCMSender.NotifyAsync(regids, yaev);
                     }
                     // TODO setup a profile choice to allow notifications
                     // both on mailbox and mobile
@@ -112,7 +112,6 @@ namespace Yavsc.Controllers
                 }
 
                 ViewBag.EmailSent = await _emailSender.SendEmailAsync(
-                    _siteSettings, _smtpSettings,
                     command.PerformerProfile.Performer.UserName,
                     command.PerformerProfile.Performer.Email,
                     yaev.Topic,
@@ -275,7 +274,7 @@ namespace Yavsc.Controllers
                         if (pro.Performer.Devices.Count > 0)
                         {
                             var regids = pro.Performer.Devices.Select(d => d.GCMRegistrationId);
-                            grep = await _GCMSender.NotifyHairCutQueryAsync(_googleSettings, regids, yaev);
+                            grep = await _GCMSender.NotifyHairCutQueryAsync(regids, yaev);
                         }
                         // TODO setup a profile choice to allow notifications
                         // both on mailbox and mobile
@@ -300,7 +299,6 @@ namespace Yavsc.Controllers
                     else _logger.LogWarning($"Calendar: {pro.Performer.DedicatedGoogleCalendar != null}\nEventDate: {yaev.EventDate != null}");
 
                     await _emailSender.SendEmailAsync(
-                        _siteSettings, _smtpSettings,
                          pro.Performer.UserName,
                         pro.Performer.Email,
                         $"{yaev.Client.UserName}: {yaev.Reason}",
@@ -436,7 +434,7 @@ namespace Yavsc.Controllers
                     {
                         var regids = command.PerformerProfile.Performer
                         .Devices.Select(d => d.GCMRegistrationId);
-                        grep = await _GCMSender.NotifyHairCutQueryAsync(_googleSettings, regids, yaev);
+                        grep = await _GCMSender.NotifyHairCutQueryAsync(regids, yaev);
                     }
                     // TODO setup a profile choice to allow notifications
                     // both on mailbox and mobile, and to allow calendar event insertion.
@@ -458,7 +456,6 @@ namespace Yavsc.Controllers
                     }
 
                     await _emailSender.SendEmailAsync(
-                        _siteSettings, _smtpSettings,
                         command.PerformerProfile.Performer.UserName,
                         command.PerformerProfile.Performer.Email,
                         yaev.Topic + " " + yaev.Sender,
diff --git a/Yavsc/Makefile b/Yavsc/Makefile
index c77a41ab..980f0ad4 100644
--- a/Yavsc/Makefile
+++ b/Yavsc/Makefile
@@ -3,7 +3,13 @@ PRODDESTDIR=/srv/www/yavsc
 HOSTING=localhost
 HOSTADMIN=root
 
-include ../common.mk
+include ../versioning.mk
+include ../dnx.mk
+
+all: $(BINTARGETPATH)
+
+web: project.lock.json
+	ASPNET_ENV=$(ASPNET_ENV) dnx web --configuration=$(CONFIGURATION)
 
 status:
 ifeq ($(git_status),0)
@@ -32,7 +38,7 @@ ifeq ($(git_status),0)
 	ssh $(HOSTADMIN)@$(HOSTING) sudo sync
 	ssh $(HOSTADMIN)@$(HOSTING) sudo service kestrel start
 else
-	@echo EPRODANDGITSTATUS! Refus de pousser en production: des changements doivent être validés auprès du contrôle de versions.
+	$(error EPRODANDGITSTATUS! Refus de pousser en production: des changements doivent être validés auprès du contrôle de versions.)
 	git status
 endif
 
diff --git a/Yavsc/project.json b/Yavsc/project.json
index cbec79af..6cc1dbad 100755
--- a/Yavsc/project.json
+++ b/Yavsc/project.json
@@ -126,19 +126,15 @@
         "Microsoft.Extensions.CodeGenerators.Mvc": "1.0.0-rc1-final",
         "System.Json": "4.0.20126.16343",
         "Yavsc.Abstract": {
-            "target": "project",
             "type": "default"
         },
         "Yavsc.Server": {
-            "target": "project",
             "type": "default"
         },
         "OAuth.AspNet.Token": {
-            "target": "project",
             "type": "build"
         },
         "OAuth.AspNet.AuthServer": {
-            "target": "project",
             "type": "build"
         },
         "PayPalMerchant-net451": {
@@ -179,4 +175,4 @@
         "prepublish": "gulp min"
     },
     "embed": "Views/**/*.cshtml"
-}
+}
\ No newline at end of file
diff --git a/Yavsc/rc-num.txt b/Yavsc/rc-num.txt
deleted file mode 100644
index 60d3b2f4..00000000
--- a/Yavsc/rc-num.txt
+++ /dev/null
@@ -1 +0,0 @@
-15
diff --git a/ZicMoove/ZicMoove.UWP/project.lock.json b/ZicMoove/ZicMoove.UWP/project.lock.json
index 01718844..2b4063d2 100644
--- a/ZicMoove/ZicMoove.UWP/project.lock.json
+++ b/ZicMoove/ZicMoove.UWP/project.lock.json
@@ -7,14 +7,14 @@
         "type": "package",
         "compile": {
           "lib/uap10.0/Xamarin.Forms.Core.dll": {},
-          "lib/uap10.0/Xamarin.Forms.Platform.UAP.dll": {},
           "lib/uap10.0/Xamarin.Forms.Platform.dll": {},
+          "lib/uap10.0/Xamarin.Forms.Platform.UAP.dll": {},
           "lib/uap10.0/Xamarin.Forms.Xaml.dll": {}
         },
         "runtime": {
           "lib/uap10.0/Xamarin.Forms.Core.dll": {},
-          "lib/uap10.0/Xamarin.Forms.Platform.UAP.dll": {},
           "lib/uap10.0/Xamarin.Forms.Platform.dll": {},
+          "lib/uap10.0/Xamarin.Forms.Platform.UAP.dll": {},
           "lib/uap10.0/Xamarin.Forms.Xaml.dll": {}
         }
       }
@@ -24,14 +24,14 @@
         "type": "package",
         "compile": {
           "lib/uap10.0/Xamarin.Forms.Core.dll": {},
-          "lib/uap10.0/Xamarin.Forms.Platform.UAP.dll": {},
           "lib/uap10.0/Xamarin.Forms.Platform.dll": {},
+          "lib/uap10.0/Xamarin.Forms.Platform.UAP.dll": {},
           "lib/uap10.0/Xamarin.Forms.Xaml.dll": {}
         },
         "runtime": {
           "lib/uap10.0/Xamarin.Forms.Core.dll": {},
-          "lib/uap10.0/Xamarin.Forms.Platform.UAP.dll": {},
           "lib/uap10.0/Xamarin.Forms.Platform.dll": {},
+          "lib/uap10.0/Xamarin.Forms.Platform.UAP.dll": {},
           "lib/uap10.0/Xamarin.Forms.Xaml.dll": {}
         }
       }
@@ -41,14 +41,14 @@
         "type": "package",
         "compile": {
           "lib/uap10.0/Xamarin.Forms.Core.dll": {},
-          "lib/uap10.0/Xamarin.Forms.Platform.UAP.dll": {},
           "lib/uap10.0/Xamarin.Forms.Platform.dll": {},
+          "lib/uap10.0/Xamarin.Forms.Platform.UAP.dll": {},
           "lib/uap10.0/Xamarin.Forms.Xaml.dll": {}
         },
         "runtime": {
           "lib/uap10.0/Xamarin.Forms.Core.dll": {},
-          "lib/uap10.0/Xamarin.Forms.Platform.UAP.dll": {},
           "lib/uap10.0/Xamarin.Forms.Platform.dll": {},
+          "lib/uap10.0/Xamarin.Forms.Platform.UAP.dll": {},
           "lib/uap10.0/Xamarin.Forms.Xaml.dll": {}
         }
       }
@@ -58,14 +58,14 @@
         "type": "package",
         "compile": {
           "lib/uap10.0/Xamarin.Forms.Core.dll": {},
-          "lib/uap10.0/Xamarin.Forms.Platform.UAP.dll": {},
           "lib/uap10.0/Xamarin.Forms.Platform.dll": {},
+          "lib/uap10.0/Xamarin.Forms.Platform.UAP.dll": {},
           "lib/uap10.0/Xamarin.Forms.Xaml.dll": {}
         },
         "runtime": {
           "lib/uap10.0/Xamarin.Forms.Core.dll": {},
-          "lib/uap10.0/Xamarin.Forms.Platform.UAP.dll": {},
           "lib/uap10.0/Xamarin.Forms.Platform.dll": {},
+          "lib/uap10.0/Xamarin.Forms.Platform.UAP.dll": {},
           "lib/uap10.0/Xamarin.Forms.Xaml.dll": {}
         }
       }
@@ -75,14 +75,14 @@
         "type": "package",
         "compile": {
           "lib/uap10.0/Xamarin.Forms.Core.dll": {},
-          "lib/uap10.0/Xamarin.Forms.Platform.UAP.dll": {},
           "lib/uap10.0/Xamarin.Forms.Platform.dll": {},
+          "lib/uap10.0/Xamarin.Forms.Platform.UAP.dll": {},
           "lib/uap10.0/Xamarin.Forms.Xaml.dll": {}
         },
         "runtime": {
           "lib/uap10.0/Xamarin.Forms.Core.dll": {},
-          "lib/uap10.0/Xamarin.Forms.Platform.UAP.dll": {},
           "lib/uap10.0/Xamarin.Forms.Platform.dll": {},
+          "lib/uap10.0/Xamarin.Forms.Platform.UAP.dll": {},
           "lib/uap10.0/Xamarin.Forms.Xaml.dll": {}
         }
       }
@@ -92,14 +92,14 @@
         "type": "package",
         "compile": {
           "lib/uap10.0/Xamarin.Forms.Core.dll": {},
-          "lib/uap10.0/Xamarin.Forms.Platform.UAP.dll": {},
           "lib/uap10.0/Xamarin.Forms.Platform.dll": {},
+          "lib/uap10.0/Xamarin.Forms.Platform.UAP.dll": {},
           "lib/uap10.0/Xamarin.Forms.Xaml.dll": {}
         },
         "runtime": {
           "lib/uap10.0/Xamarin.Forms.Core.dll": {},
-          "lib/uap10.0/Xamarin.Forms.Platform.UAP.dll": {},
           "lib/uap10.0/Xamarin.Forms.Platform.dll": {},
+          "lib/uap10.0/Xamarin.Forms.Platform.UAP.dll": {},
           "lib/uap10.0/Xamarin.Forms.Xaml.dll": {}
         }
       }
@@ -109,14 +109,14 @@
         "type": "package",
         "compile": {
           "lib/uap10.0/Xamarin.Forms.Core.dll": {},
-          "lib/uap10.0/Xamarin.Forms.Platform.UAP.dll": {},
           "lib/uap10.0/Xamarin.Forms.Platform.dll": {},
+          "lib/uap10.0/Xamarin.Forms.Platform.UAP.dll": {},
           "lib/uap10.0/Xamarin.Forms.Xaml.dll": {}
         },
         "runtime": {
           "lib/uap10.0/Xamarin.Forms.Core.dll": {},
-          "lib/uap10.0/Xamarin.Forms.Platform.UAP.dll": {},
           "lib/uap10.0/Xamarin.Forms.Platform.dll": {},
+          "lib/uap10.0/Xamarin.Forms.Platform.UAP.dll": {},
           "lib/uap10.0/Xamarin.Forms.Xaml.dll": {}
         }
       }
diff --git a/build.sh b/build.sh
index 51531e72..cfe5dd37 100644
--- a/build.sh
+++ b/build.sh
@@ -1,27 +1,22 @@
 #!/bin/sh
+PRJS="YavscLib/YavscLib ZicMoove/ZicMoove/ZicMoove ZicMoove/ZicMoove.Droid/ZicMoove.Droid"
+MSB=msbuild.exe
 
-BUILDCMD=MSBuild.exe
-
-PATH+=':/cygdrive/c/cygwin64/bin'
-
-for p in 'C:\Program Files (x86)\MSBuild\14.0\Bin' 'C:\Users\paul\bin' 'C:\Users\paul\.dnx\runtimes\dnx-clr-win-x86.1.0.0-rc1-update2\bin' 'C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\Tools' 'C:\Program Files (x86)\Microsoft Visual Studio14.0\Common7\IDE\' 'C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\BIN' 'C:\Windows\Microsoft.NET\Framework\v4.0.30319' 'C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\VCPackages'  'C:\Program Files (x86)\HTML Help Workshop' 'C:\Program Files (x86)\Microsoft Visual Studio 14.0\Team Tools\Performance Tools' 'C:\Program Files (x86)\Windows Kits\10\bin\x86' 'C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.6.1 Tools\' 'C:\ProgramData\Oracle\Java\javapath' 'C:\Program Files\dotnet' 'C:\Program Files (x86)\Microsoft VS Code\bin'
-do
-	PATH+=:`cygpath $p`
-done
-
-
-if [[ "$BUILDCONFIG" == "" ]]
-then
-	BUILDCONFIG="Lua Yavsc ZicMoove Debug"
+if [ "clean" = "$1" ]; then
+		echo \< $1
+ rm -rf YavscLib/YavscLib/obj ZicMoove/*/obj
 fi
-echo "Building $BUILDCONFIG ..."
 
-for conf in $BUILDCONFIG
+for p in $PRJS
 do
-	$BUILDCMD /p:Configuration=$conf /t:SignAndroidPackage ZicMoove/ZicMoove.Droid/ZicMoove.Droid.csproj /logger:"Kobush.Build.Logging.XmlLogger,Kobush.Build.dll;build-$conf-result.xml"
-	xsltproc -o "build-$conf-result.html" "msbuild.xsl" "build-$conf-result.xml"
+
+nuget restore $p.csproj -PackagesDirectory packages
+
 done
 
+$MSB /t:UpdateAndroidResources /p:Configuration=Debug ZicMoove/ZicMoove.Droid/ZicMoove.Droid.csproj
 
-# ;C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\IDE\CommonExtensions\Microsoft\TestWindow
-#  \;;;;;;;;;;C:\Program Files (x86)\PHP\;C:\csvn\bin\;C:\csvn\Python25\;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Program Files\TortoiseSVN\bin;C:\Program Files\MiKTeX 2.9\miktex\bin\x64\;C:\Program Files (x86)\GtkSharp\2.12\bin;C:\Program Files\Microsoft SQL Server\110\Tools\Binn\;C:\Program Files\Microsoft SQL Server\120\Tools\Binn\;C:\Program Files\Microsoft SQL Server\130\Tools\Binn\;C:\Program Files (x86)\Windows Kits\10\Windows Performance Toolkit\;C:\Program Files\Git\cmd;\;
+for p in $PRJS
+do
+$MSB /t:Build /p:Configuration=Debug $p.csproj
+done
diff --git a/cli/Makefile b/cli/Makefile
index a3ade719..348bbbac 100644
--- a/cli/Makefile
+++ b/cli/Makefile
@@ -1,28 +1,19 @@
-include ../common.mk
+include ../versioning.mk
+include ../dnx.mk
 
 MSBUILD=msbuild
 
-
-all: build
-
-build: project.lock.json
-	ASPNET_ENV=$(ASPNET_ENV) ASPNET_LOG_LEVEL=$(ASPNET_LOG_LEVEL) dnu build --configuration=$(CONFIGURATION)
-
-restore:
-	touch project.json
-	dnu restore
+all: $(BINTARGETPATH)
 
 msbuild-restore:
 	$(MSBUILD) cli.csproj /t:Restore
 
-project.lock.json: project.json
-	dnu restore
-
 run: project.lock.json
-	ASPNET_ENV=Development ASPNET_LOG_LEVEL=$(ASPNET_LOG_LEVEL) dnx run --configuration=$(CONFIGURATION)
+	ASPNET_ENV=$(ASPNET_ENV) dnx run --configuration=$(CONFIGURATION)
+
+info:
+	@echo $(PRJNAME)
+
 
-deploy-pkg: $(PACKAGE)
-	cp $(PACKAGE) $(NUGETSOURCE)
 
-.PHONY: $(BINARY)
 
diff --git a/cli/Yavsc.1.0.5-rc15.nupkg b/cli/Yavsc.1.0.5-rc15.nupkg
new file mode 100644
index 0000000000000000000000000000000000000000..63350c5acd64f049453612d1ae93311813dc1c3c
GIT binary patch
literal 10005
zcmchdbyQp1*68t4yttGStUw_IcPUUDTC6~eHG}|xKmrL?q_oA|ic2Zfa4Al4X_4YC
zCAbtT?qAw_&$;KGckdYQdw;y0k-f%TYucW3?L9KGe|p;Z1hhE6jt~AhI=OKl2{LhU
zaDIJBv2#|gP&f)C`0Kn~*C?mx=>!M3LtRlYgtI({u%Hl!qJo?O6b?pXCs6h<Bnp7l
za7M{<*rU-%84w5sv4=W=QGy60)ET>Ci*R)Uqp_l^9S8}AID+k<AQ2%U2@p2GzkG1~
zyH9|ojXZ||REPs$1a`H9qUAY2kHGFIh@i6@3JHZ^r@fHS|0ALk4C0DFA#Blt5QNh|
zgTb8bu;GM-KthrrC$KZj7K%c106_mSobX@5{gEmP>go=IKv5tkC>m@7MuR~Rgew$?
zbj4ntD;kDf5EewDoNOS-|B}@Isto@%%I}mx|5kPdz29xb!y*3N#^zZY;zVo<@8RR%
zkYU^S*Lr0b=td6<k$v7S4tZ+1&NpbOcRQcs(4WA%jf6c4HV?zsHK6uTI6laYrzIj7
zbU^Ix?d_r9e$UD{WuJs})H#g|r>$E~?`Y;B%G49%1fBDr+dn0w8u2&om}I8&+4s(S
zRTWdyaj@e$B-Rga>UB|mnDwTpjT|z~p$XI!R3eF_w_0SsL$UTM+xl+q<-tt&>r`0^
z{zN7l`?d<fYtrm?%swI3JS(yCdCl1aj8X-jwkJ8Q&tgc@rE~OGIs8a+Oo^~*&h`s=
zKzrEyC|BBX&^g<4b36BtE(F`IFemX~{*(e)!YevDd8MNTm9yoGR@J4v59g^rx1>j-
zIw3omP2->XlOG){p6;Ki3U6FHS4i`R#u@XaYsdt?Xo<Lanf7gjIfumd4HOL2epi4_
zjqG3-jS~9tR#`36LasD~-6<(>BDPfXyjEtTU79aI^rhQHS@itD>X}*P*^Xzo0;F?t
zW(rNBZG9k=J+zw8jA!xE&UU}DcE5N^&>$u(Pf@VZ-0~ow@4WB}=7?|4^_bTW@8A2U
zll7LxkrmrGWgHww>;Q*ZgOCVUG}syr1v*2~V&dE)${sLhsb2%~A7`+XFjg`JJAqwc
z&VssN2v*WXI3tvtZCnvB8)2b;%0>t`i2ZNr4_(*;L+m{Pfx`rC;P6dvN3{8p+p0pe
zmliYZn;h4PwBMHqxSU3Z96Tb@M$;7VsFJG@5alB#lXxw9IifEm7AQ*;Nz>xWBFPS%
zRt=v@7Kp3n@9z&#eyZa7$oz47QzUGG$~34ge+;JUtfi6qDR+2n_AFhLG7_$Fg?5{X
z5<8nJ-ab35I=VbOVuiiCD(dqmz!7P9w#VXc*Zg#bi0wSJ!{Z6YifGQU!GvC(fB$ot
zy{A=I1eDx&T93zCQ#^hERjLoPT@)=fx;-i`M4Q&%`RSfT#<P#|9f{8V3Q8{&!!H*F
z?WWn9=S?H~iAw0NSGCtc7+x?o90^S{RohRH>p5Uh^jVhF)9#8N2N55E66dE$894Y)
zBG33-4pm26p3MawdUb1n2GhD$@7<S8$T=u39jmCc@tC0UrVfH}HCH-Cf9`jC^^`Gx
ziaIE9G`_NM=+Lz4;hNhwvAszP<GRqg>eo)vP1@ISa4#Xn((kS{HTskatXV44hq$m+
zWJ@q@5#5rsKaGU|5=R_~9dDD7A8mXw%f3dOuipO#l6&rA{*|OL(E43bNX|9m>a;Ck
zdi^S1+YlEX>s=~c(Un=DzB{_XKx*}bfe@JU$~6CEu6=Brt`<Gt6jv2awgkg@%~IFv
z3NpT1O4WmqA0134)e$$~F-(O|tZB={4eCo@NJr@wma<`{X;#^@x$kV~e$q3qzbZ{s
z)68nsh+ip9v^|0VQT5U7D}!+ZH=I$oz<Xa!8Xss|+#MeZdGvXn^oCdmL~NSl%|;33
z6sWn+lkKiv7)b4FnJ4gMBY3ffTjPw|V>)o_(@D}zzsSYVx=>JtDrcZ4>CYah*uJ<}
z7}`C)ReoyY$!;}wsueBfi**g}td<n>GUdjtTNjq*8PjEDE)$;_(I;hfDfHgJK)+Nj
z7m#B+jj>18$ouTFzMJbq9ljdW2%e>-PlrmfJosf5^;S~d;l&)RHdYS`Lx^n`!*cA4
z1#YqPn)$s=D67@NbGL}hePxn7BB`gXkceS*G@F#>=u(##i{ZCac{xvQv#0j6VpRgc
zAzIk>Ic0#I*@HZ1A;6k$hpiAIOT1pCm&?ZSRYsyB;_T#64XCHf7iC=ZpkR@?F4Tp;
z@cEjWuRLZ@pN+|8w};#&JMAbul(797;}d5yPU2MwhD|4($5r2ftmK3KJjlD!vr0_d
zx7dpr-`kTEC|}B`h9TN2jpdXDMH<5Kig{+2jxFSr%hzWTG-T5gL@t>s=H){I7hn4v
zx*K#D?XPUzCf8AIJS(V5cJt7)D&zFyiS;Eoh2^K4_Q(qHDyj`wD4jtAojMxl3AQ+g
z*9;*a7J*E;h-}@GSIh39>R<4cl7e$=;W0@4ms~DWtq}m8)zRPrX5_tjX1%5kPaGwm
zaVA=~$^pMQksHPiAa!Ikar5M{J9971ccn;=txza@=TY<mu`ds9!HnPAEms@qgO8-0
z+hq=4CwhYQ9cA*LF;*;>=PN`^rk77pX4C%^58S1TRBHuuBc)$3iApl+t%KC314h(y
zP%V-A2G`R(Q2J-YO01t35QB<gLV3|K+UH7$g;09_u*}XE4X+g&f{(@DY3Ztz+#YXg
zO*k=P<JK2q%tZ}8Lww=mBuR=TG*auRj)>v9^*YBMbf9PagY?d+R5rV8ePg&1yllf$
zD0jR3{1#c@0d4lKx773Eyu585(Ayh6>omNdPUqxk5=656@+Cf)Zzxf#tSLs{h7_DT
zTD@rv39i`d=wkO)!gLV=1%SLh?Sz4L<s#;vM1BbHdIu7|`e+Q~HEVb+c}3v_vKkWD
zun(D~8KKmZCy`hsD%G9b<8e`@WVj)(-XrJaS@2Vt*P0<zGmbU);GPK?LCz_=GK-V9
zRd(U{hX?v&QS;_EE`%g`rL70p%1PMG=mw(c#dAhU8umvApV0P3PqM@A);D)pgwzS#
z9AcGGu(fDx2*!yFwETz;=DJ+a$O#p)Dq0-+jK9bFt#3}z|8Dz{V$a-Fa-W3%vpWks
zI&vj5LufHUEAD|!Fkup$D<aDvr8X%fKsxIauYMvTY5y!{%qPQY@I5Tpf<93_iSluq
zRwGc=mb0)BwHkH5xq)>sJwBhtDRg712=U%qAQOl2*)h@R5VsWN+v(f&EI_6%rjI?<
zn#>b#(e)gNDXPW!Q4621n^R9qds=v6wpx@+az%B$M;^T|fnXpCY?=K#j+mz*k3EJK
zjyuNj-$@AMdcSw8TFfu*Uao`Rs_>h#e8XVs!SP{*Nnx|Xcp=Df#)`Z;I~pTBR(V%G
zos#M*ZiA_jW!m`#Cnnrd@!WTD&ka{<`@4Q|Q?YOHNl6lVU?XS*ubFVxV`F9~si>If
z&5q4QRRC{&0Ft8qp*M4Pk5%BAd^jd@XR1p?YT-)05s&6_%%>at!QIIT&!>fA`{uFx
z;-@Kc#r&F83qnNq#z1B{a=@F@M+_bQjLw|q5t}LL6;9Q04pM5~$&@ghdp<y}>Uga6
z{`ar1S^V_M%}fa^Fm}orI}OKbzC3baCD&?IKBnF}Cbi1zAO|*_&1CGvH?bUeG*N@!
zF9yZmJ-n*$sOrB?8GIBpvr~*D*i{ddT+i8gz2O(ID}zwMnQf~;1Qm}QdP}rIPh_@j
zk0Z8awndKJTenYEnl74$JV9wMg-D*!p4!;sPT%-(MAl+^!scQjpBX;8SyFr`{@tR4
z<2d!fbC)(nl31b^N6z9C>K)aao#cDwHhm2JRXIDX`(H&osZaDhD-Nkn4+#Uj!Hm-0
z82ioF8@G-dBNQJ`F|!7`w;=+~sB8fNiHt&#NV>KGlb2NVQN+%k-=7WC(OZ73BlPa2
zdz_<xY&e#`b%0bn+W~Z5l;51FbI4TsJ{xs@5M#TR$Q(BtJa~X)+q1%X;kCAuda%Q=
zBl7f^;#+X|&G7E*gXg!7Uuj%g(Q#ZU{@Ch3ZKq|<*ni!NwL8z);Znb2ex`QubhXLl
zHfFh&G_!RlVS{}Uq5hGjq3wqBI(KiDu#YL=5{S1;>ei+yeDevf2(80)zgG3sVx&*2
zc$=`YcWcIuVtoSsf>N26*QP3hM-IdJG5lZy4->;Odh+F)BOb%&_#GMZ9kjC8DG?$Y
zJbM@KO021vgL14FWbl2jVUAtPcAZq5e#thE`{xUuXwQ(3R$~fO$<aoPxvJzys?Kyu
zTzdjd`#DwxwiiNGI`5j~7Vq6l;wN@`Ly0L4kO^1`xEXa6KKWYPU&e$0W9HT?7`(Uk
zg=1`VO)(Kw;&!SW^7?k%rEV<!SY(N+y_+hA$TW0^YI@PN)yoBcPd1kGE@ev{m2)<a
z`*A69{4-(aG}w@oQ`Vg02Y5YRceC0NI^H?lii}4TYZt}T%+=8^S<FjE4Iic4@kAVo
z0S*#J`p)j^G8a~V8Gbn%>_7oHFf==~=~YU)cKJ0?-egZWceV<ua3!3?@ENL)x}XF+
zgc$Ojc)y`cP&IDM`FTBwavA6<a8}SwxdJ4)Pk7n?kW|qWuAgR}g&Jv&)Yft&ZgEmw
z=g0m+PJEn-kKt5itc5#7ZKo9xr#mg3q&kzFBTOKHJj@umZUqXKIqn3DvX77*3lqaY
zTha48c)~K1h)c~#F;TvUsMy3XqrvD}$>0NIS?2v$@d_<{BQ!lV#YBy?>=%YNTCODS
z>gBUj>~bGx?WdCzm+#*gJ@1s6Z@dMwr<&tVIbLZGA{ywJY9Uzr$=Ad{NE%i`+*fw!
z?|=Epc<|Pa3V#ccy`883Ni;EmBe?Jr&Zy8z!jopZmhKx3dg?oS;+w>0ZDtrT+eI}`
zt>c$>K|U7Aw34lREzyogO-vZ>?*#RC3icM~+%PMc9OCc0H0Lx&`kn-qhdwt2iP>VK
zTVL+@1|$WDV`z2+`wlWovM(udvTiQL_grx-Jn#n`hW06!d+M&Lj+3w*HAWoY9{b+J
zu^T)Xoo$iZ;Mn%!n4(3I{EE3UOx!a1by%O*Mxe#~z1-`2Z{<rK1J)j6{Etnx7#^YS
zCU>6mxl~={C@aB}jz~M(7c$dJ=)QSJ6DN&R;!UX?^Th7ie!$%=?jm>?J9oZw9n4pB
z%%!Ec!TxO_yN|T^&1F)6A$*D({Lqy8LHNpNg#n)Fg-YWYK*KdFq<C0g_>5b4dvQ33
zWGu|CZCk_X%LJ9h%N?U?GanNlW9GZ{>eHdfd=D~Abqw9hL3|9&_=aQbLcf6CO{+ld
z`J{IDwUul;)zn><c@E6fyo)I(Hzz2>?5$h1C_`wUsvlr0?*3VnO5IM;equGzSwnC?
zr<;~z03QO>qU1t_x!Rirx)C=nFvlDGcuqPvu=9Bk7i=|`@G0tIIi8^=GqLuy^v=5g
z%BI*XO+t(+Mv68-Z7pe#sd>YTP5QmBV9g`HJ~Pg$t__a9u(~<M(G+~V2`@F%d0(qq
zu8RsD-uD3@_0%Pc!R{8kfZihLPv(<=Y6CyY#L>dUV6VjJ9RbJ=!1lh9Opr&&Ld$e*
z#!nYaU*L@zfRif1-2c5031KsX?pH#L)p{l!K2@;#5{^0Pv!D`kKYt`Y%AMVuV60Wf
z1JC0SWPV)^G^;Mfu*_k1T|l)OZ*qpUAV)+%=v+1kK$XDQ!6*p!WNDQrd(Y$-g}Jgm
z<_rQNsT!^iwZy;Zk?eHK-1AKF$z4__&MK}6L1te$1rVOF7MwdzAK`gYh0V1y3(gg}
zvu~+q`d4~W6|3IL)FxJyn{l8jR%d)p*Fu2-V|eEK+Ckdi<1Z~I0f@M&uAk^NBFE2`
zI|&zsELOGYr4POjZp56Y8}v@;TlJ#o4zxsl920jlDUA30q)4|nA1$+{1s(;LPplLk
z%PQ=RUduah-Zj~C*0VhvS#lFxF`lm{`N?uHQg0O5>R9U4$hn=6x3YR<)aNo_R(O<J
zoVt?IezcqFFblgx1iydb5!roerKY)ewA5*rQe|AUym{b%QD8W4v18PEURfeu9O1Rm
zF^yi>s%1JFb@%xm={IrhGxFAVh9}nqXtp}MH;KC*>%AwOibv|4(;UAzW<6FMq-HEP
z|Kxm;8XJ3987pBr7JDBdD!$+jEcYA66h4TGK)>yQKhBs;Hr5?lw$6IE8Q?T5>TS5-
zrNS~8@zuyc^kY7E*)``Z=-lBv)uzd<H>?sXLohe7!cAE4?3Rw7vgl0*M@!Ln@Hc0A
zqy0LfZ|!1MHI@Z(J#@Mk4QlvOlQlLbDjz(^TN?(4Ln%{+QkcIOJcxIzxG7<gV>~4*
z9NRZw&Ki_`pFM{sOLOZHp@)Ov)Ck&g>diYcE^pBq7L%dcCl-wgi4Pn%!1i4|Fq+U=
z+*Ly!wN9gCq4?U^`;l>0tZQoW8KdJ4qR(#)Mi@~ORTMZc)*7sPs!5{0F!E>51b?zo
zc<+{Mn8NkLfTx!$!m%cHR(N%2M0k~v<)vGihPdeL%gd>P`}P}0(GlppuNQ4vu(i^-
zzK5w*kL41&z+$c^KLp-{n$xS6f0fze3y?La@x?zem&mFUeZ_=N<Fqk&n0JDX(h)9q
zFnBptk<JP)tCEB)50lNakn8rsRLiWoKSCVtvko6R1gWJ1SLwn6mhfA&L|pOCD1#ZN
zK19R(XWQ$0VLDPAw<Rbx4I_W_8{K|?i&;V}GO|NpgwnY?dEHW?gbk&|>VdvC(pszJ
zdp6wTnR)y<Mbo#D=xu#~<s@(I*JFWZ;PMUHat5Nk<Xjr&GemqU6Mrdk_iUf39`mul
z7S(@uYZ$Uh!<{(tF-|?BODZusbRb@<{A^q3fNbI7V{UfZ>8v@njrY5g;ci(93Q;#Y
zUfJl(tk1ocItEZUMBZx-yoHZZni=n-Rc+H$x^0`wz0#p`Yi%GC+Hybr{>X6kDXsU!
z3u+YY!#LG2qP1^2@5tmupF{n<ZZ?BuxobtMc_WhL>vWlOtrsd+o^&eofFeXj;^u$$
zv#33axB;Rs6#=<}w{90?hR*g_s)(c16jC7E6tsn;1-UMG_@54OIRlLyAyF0enSSE0
z)C|MxBTw(qUpUjE8aRWwooTi4Yn{Xt6~1xjf7uYyb+Q(dS1p|^VxpaPV1N9Pg~ptA
z82u_yoKyQ+#iyqs!sT35<q5-jVqwe6@3aga<Bw@4+l;4aE*Y3du&PsRt1v`hm<MJw
zGh!`KyzdPzEyShy_*fJ8tzYDY+j5mqIl@E-oX)<be31|X7sqgo`vyCVe{fTac%)9m
z5{2nCJsY=8Ef?07a8I7-eJlumKQ`h)uO6QGgk4PJ)m=`-W=)~omB?H*@YI{-!%|N@
z(G-{nPs;t~n0K3YDj6^4Z5%3ezcnW(#}3&v>x`B-Z1If2#e|GkU-1`F?a97pN*3$)
z1z2U9R6aQiSbA;RNg#6DAXqy3^pob|{9|g!n%Mqh78`p9YoiB!)4r125_X-v_^`6^
zj?;?kGs!JN_Ui=jQiXAA)^J9I><_sm`W~w;m&xzG)qTNb4n$vS?!gCoX@ldF-)fV>
za~F7>pqE1Q7i3SAq2p`S4~0X-u0Gf%ICGS!ayz2v<nq!y%a*!KGd@N*=)4ksDqA)o
zR-5_`uY&A-yPmBGI71V97W=}e(#!7XS$j6+=U2HIOVFF;Vetj8i(-cBy#&Z-6QSs(
z1eMX*QbGK${FD=Kp%rAeov6Eq<SXBl$5wnk+|^2wXwXZzZ@#+O92PcGnGUsfjaUL&
zmuGIYTjxDGD>&0LSRf#@^LB&T4r)LZb5&^2QFv@!wAbs}M8jMJSp1!DuvR~O*F#Iu
z9BZ@90J8XTLLK-hM71A~FcQWfq+NV(@_w_90*<jNbKBEACZPh>u89u|x6!ROVT>O>
z*mbN02$a?CbB*1yG>)B`YMpqPo3Djyb)``%5Ex!hVj?}wbT(OYB|BfF|3fvav5Yjh
z^?P=t!Gw#(*&B&_nlD7%9y}@aAkHfte{7epn_Cz}NeB<O%d%iNITq1-GAViE@aaTq
zvdN{V{^XAl6XUM8`&=g}hIy%tC=QEW0mZf=bCi?xQgC3e&lg-2QHG$kIg9QYc9YkU
zt4MZbh1i=U>hGJ1e>LTRDLLoqENCajhrC^3h+pA<ug#wuf|>zQr!P_HAE2f7s64im
zRBP4%qvFJ4>O4`8SXp$I3Tzh*xX$J_E!?xFi<tRpEmB5Pq)8iPY-`LVz+;@<_j-Bb
z5=GO~GE_VwtdECnigcbZ1m3(#8WrG47ikJ`h)6Txm3rt=NRYAnEn(F6`iHoO0u76_
zB?#cdkxCutp_6>R!^tjET)qy^To<Ya=8re^2*_th6LCA+?Z~62>&~M<r&J&F>JQ(c
zF}@_v)@hP<&>hJc%)G;pNVk7)E$WHoh0I!RFIg{B#RAD=lb%b;Q4r-)uwK@Z(G_3_
zM(SHVGBI{VS=mxUVQg=#SU03lW!T@~4gM-wp=CVb)^j7_tPSJ#AU7SK99>uFX+M$s
zwp0M@5Fx{uwTHgR!}{$<V3J4eh1`d!3tI(cvk~#EwqeQVCg8c!m&~_my=BM@fR_VA
z#agwo3!BeZ0H#&Xncn6do6x_vA&)SC7o$(uO?FTK%QP}k$tU9-WzhnhVM(?m%_Z5^
z(@4946qCw<uFQpQPpG;(;rAbJ)XC+$X|25Xf|}#P64-_hZtk>`GDw@AcH`(0o)PbF
z#829udR7}6UN1ftrA3W@jTjKkM7@75vZvKk%8~fVtX}rb!E21S>B@SuA$lD`KW}c8
zUKeGd`ok<r<=}D6Qq0W?twgs~4*YPgg!}6pj-!f>{=NbCamCzm6($yB$z^Q7c%@{E
zIC7ecxj2ujo`=fe6YXS_y=9JQ7HYZvBbMluG}R9!FQV_ae?Z8o?ylp-RL*%5&!uwq
z6REQkd9>cJSBC>D^GoFM#zf5{k&;aubn3l73#8Apg?HDOsgab*tbF#L<ATIhQr;nm
z-@;j~X+og5>t}irQHsWjjH~l>AM7bltU=aZ=5+6bqGOdT<LuZSHVdZN+sN$d_0%g6
z#s;AI+!*x+rh8w(i%bt|Z{MAv(gCMIt_w^D#%bopSC>8dl-9j;A+^k?PQ%S##HD!`
zw7_JkL}B+b+pjIoKKfh3RQNOj8ju;-`(tHY;rgmz&eM|Ot`k(uSOwc$t^VOxH;t8v
zBZ6Xl{-<K`-#&$UQkxOad|Pmoi+cqvDa(?NFk=8_DL+^N(=IrAHFoul8AUx&<+5D~
zjQ2=}P}?4>b-~p+VcvF5`m#ZsHZcq;g+HZ%k?y1ZfeFAf{XvMjd->)|f^}<x<;3}$
zDqHNbEHESFOsEf%Jm!5a!4{k2?BFqS1`#hV)zXrZ&(qf~lsI}$#cZP+M&y-Ve$C3T
zukoU-2BGO2?Wb(MI<?ci{qiOaK`||UbD)NhhD{TT{-o+#)tY8j8f9f-o9NeK>_s|_
z%*d+i{)Imn5{OL522f;HNjDraiIhzJftqQ=AKLV5>0X6AmJHD#xaZNd6pQ!VpOip<
zZRv9R&2`*_Yj}GrUP^i-`y2QJ%6c^1d*^_OPZ}8{3RUVxm3&jv<KX-<I+NFM(qm?%
zUT%VM>YgzktDLovX-GdY7eB$u2)#b`PmC5VX#SW3DgVYKK?_G0frMl~Kpj|Yuhm6I
z6X>OTa41Lbfg5u_EGb+^(nC&<w36h8C701Tj2m@B$s~ugzha1RA9#OgBU0%e-##gB
z)yUk7HY#<E+*RHa@Pl}2Qi2ylNBl#buhwX~_Fs1Gt2{sH+UM-r*My!LAy0Sb_SZC!
zr`MYUclg9yPGQi~jT_KY>GV~vl_S+O7oukqRk&if!R=H}o-Ft7m2=nif0&^qNH3rw
zdlGW~0{}GD7}0}M@De`c(?O>H+|vtgH*9Vh5ZR?&AnX_cJSA6e$QsOj{RY!{;rHCa
zbQ~y=jl|XUQJ!1&OBBEvSmM!kuoeMU?@*<NSBAhH0sT0Ft}hIv0ukm4zFbmGC%Xjg
z)jPDO8=nk3C!K2Aolc;J1^UGFmTi|(15E5x0`(kk*t#qj1nQXu()Y^bs0Hc;-waCM
z0Qws8nd^}-ylUZoyJI-Zz@rM1lnQ%UzX~Xpz@PN(O1%cGFbf->PiA<TL+khGydog*
zD50g1uTzL4+K}tZZL+ji{zHA`S*9+}xjF6VF4~^TweBf|adb!%Sn}W^(}HkxDR?`5
zEMx3tzh$X^lQ9k!@)TGN4fT7rV=8**o5yaYr*%X4XvlT{P;Di_+nxJNc6p-T2<(L1
zqJh+S=>tP{AMWgIecf9H&e~Btv+>?rXJb85*gg1|X7=63HM;7;OcL>IzN1&tv#|`k
z*f1x3^>};h`$bR9#?#BqaIFIj^Hqstg5$F^*E=<@%yws<ZyWn~EXXc32kL<7RL*%D
z_Kq`GP_o=j5Cn2yQ@z>1%s-p`K?QH&^W+Z&Mvv2F!UFFnKVSoyICInHQ@>%2aHpE=
zvd@nY^2eo0uzZ{4aXxyQEWlfrFdI_FQpe|DK?ZRj7SYxJNPU8zyp7kJW+1kO#<?z{
z7N&Cda6X+thWL|~C9x;r*;E4Q>PzNUYjkk7t>h4@_M&qH;~V7HPpj8=N)0W<$vnJg
zHXlUbE3SjXK!a0ufg3trG-$^$D)SwfvE;T{<mzCP<BWbgbZ+wWGOO<0ZX@05K^pzd
z9NbIoMgq&b@dv`EBnmZ!PV^0XGXojkdX|S5BN8s+Et{TfZyto9A$KS-7jT?yHqLS9
zjx*wC8}ym+-)rEJoJKy@&r~Lkp4#~VtHLWP7mS6%j#4eBAEKjQj~Q%<_f$oYIln?r
zIJG|YRlOv8c35_9X)bS&>NXjsn7^Aiq9*;E{<`Xg;B1uUEgm!B2NAx@z@eFMZcPG1
zuugA%mIlP!=)iV`W5DymF!>BK7XO3c_@?=o<?Y996Nw55k>$&3ep;#4jvc%AQ_DB2
zQ#x5oPWZgdJBxbgIuQ$f4hYQD4&!Y1YLGOF?yb1gUjOIm#W?Y<s`>GUr=}a1+hflL
z9m5YkCpU;+ZH8U3SzS^5<DD<|_3rO?_UBE;nXz~{IKRFk*t!2bbnu@E4FJ>`g0R7&
z5AqxjjnsfrzmSbz*n-}l)WScQ4H+BApAZGo%@zI|(y)Pmpm3-Y)EWJYZ4d@={HcqE
zx;p)f^Z2X5@0C9_JyEbf-FkR<2zrSAc8sMygh8gdI)=Xi5g^PNg$6rAp#Sv$r^Wv*
zKl0yz3@l1w1CfEaLcwT+tAZZb4GzFYbcVugpssSDzbySyvw@-@t}x^;mPJ7cfW=0z
zjED^Y4s(VAV9wa9vIRq+05k&do2CH#f<d6J09Q9>G|UP5+u2_o{Bnqmf?c$QL0uJo
z+x%Ag%cPtm)XM|mYJ*Zxh9m3*0D2D$1pp>cYk-oTrX1+cML9Sah1SLP5bMcC*-PQR
zn>rLNsDkaG0KoX4Fph|zu!x|LppXDS#SM;jbA`$~L*3A>U^v#Rn>8E;(S~{%AsnI3
z^3HB>xa>n`m?uC?P#S9@Au9*^TYz7=qhV+`^e<`uLzep|{G)(ne+0#Wt`K2yInW<-
za=&qyf9<QkK`C;%xS)3I#xBN!DKyy8Oa+0hsx#W^7r%qD5XAC98L`3?Ekb0f#nez$
zClY*ohi;r{f6{v&Vf=$_VKXG(I+|ju@v=*BsPh;%x33z2-v!5feAf#Y0eTx2>?^R_
zW6%ag&X|y}9A$}~YJ)Hx{ET<QoYfz0`mBm|iVTxfNUt*wb95(md3Mf8VXmnpp3qa&
zRtZS-UE*74MB1C>NC)LLKV<7)B-FtlcL_?RhtXfl9naucs(~A6l8Cdnun_s})n-!l
zG;VcG!baJunAiZ#R3lA5AFJTuheVx>;+Hw~_<Gv7*jxC&Gga72|I6_g!s-vh|3>lr
zvclF5dvs!lzcM|4xBNRl^4sY5DHuxx{ePrM{z&Xs>|cD@-yd@SO3a)6|K*YQhyOoH
i_V+#Z%l|)0X3q5=cbuL!A<-`-LhPpyt7*XfOZp$}_*tR=

literal 0
HcmV?d00001

diff --git a/cli/YavscServerFactory.cs b/cli/YavscServerFactory.cs
index a1a6c5c6..36b0c9da 100644
--- a/cli/YavscServerFactory.cs
+++ b/cli/YavscServerFactory.cs
@@ -7,7 +7,7 @@ using Yavsc.Models;
 
 namespace Yavsc.Server
 {
-    public class YavscServerFactory : IServerFactory
+    public class cliServerFactory : IServerFactory
     {
         public IFeatureCollection Initialize(IConfiguration configuration)
         {
@@ -21,4 +21,4 @@ namespace Yavsc.Server
             return task;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/cli/cli.csproj b/cli/cli.csproj
index dd3481e9..44ff6d22 100644
--- a/cli/cli.csproj
+++ b/cli/cli.csproj
@@ -107,6 +107,10 @@
     <PackageReference Include="Microsoft.Dnx.Compilation.Abstractions" Version="1.0.0-rc1-final" />
     <PackageReference Include="Microsoft.Dnx.Compilation.CSharp.Abstractions" Version="1.0.0-rc1-final" />
     <PackageReference Include="Microsoft.Dnx.Compilation.CSharp.Common" Version="1.0.0-rc1-final" />
+    <PackageReference Include="Microsoft.Dnx.Compilation.CSharp.Common" Version="1.0.0-rc1-final" />
+    <PackageReference Include="Yavsc.Server" Version="1.0.5-rc17" />
+    <PackageReference Include="Yavsc.Abstract" Version="1.0.5-rc17" />
+    
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Services\" />
diff --git a/cli/cli.nuspec b/cli/cli.nuspec
new file mode 100644
index 00000000..4f076750
--- /dev/null
+++ b/cli/cli.nuspec
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<package xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+		<id>cli</id>
+		<title>Yavsc - cli</title>
+		<version>$version$</version>
+		<authors>Paul Schneider</authors>
+		<owners>Paul Schneider</owners>
+		<licenseUrl>https://github.com/pazof/yavsc/blob/vnext/Yavsc/License.md</licenseUrl>
+		<projectUrl>https://github.com/pazof/yavsc/README.md</projectUrl>
+		<iconUrl>https://github.com/pazof/yavsc/blob/vnext/Yavsc/wwwroot/images/yavsc.png</iconUrl>
+		<requireLicenseAcceptance>true</requireLicenseAcceptance>
+		<description>
+      A command line interface to Yavsc server runtime
+		</description>
+		<summary>
+		</summary>
+		<tags>Blog, POS, Web API</tags>
+		<dependencies>
+			<dependency id="Yavsc.Server" version="$version$"></dependency>
+    </dependencies>
+	</metadata>
+	<files>
+		<file src="bin/$config$/dnx451/cli.dll" target="lib/portable-net45+win8+wp8+wpa81+Xamarin.Mac+MonoAndroid10+MonoTouch10+Xamarin.iOS10" />
+	</files>
+</package>
diff --git a/cli/project.json b/cli/project.json
index baa4d4f6..a23274c4 100644
--- a/cli/project.json
+++ b/cli/project.json
@@ -44,13 +44,13 @@
         "Microsoft.Framework.Configuration.Json": "1.0.0-beta8",
         "Microsoft.Framework.ConfigurationModel.Json": "1.0.0-beta4",
         "Newtonsoft.Json": "9.0.1",
-        "Yavsc": {
-            "version": "1.0.5-rc14",
-            "target": "package"
-        },
         "Yavsc.Abstract": {
-            "version": "1.0.5-rc14",
-            "target": "package"
+            "target": "package",
+            "version": "1.0.5-rc17"
+        },
+        "Yavsc.Server": {
+            "target": "package",
+            "version": "1.0.5-rc17"
         }
     },
     "frameworks": {
diff --git a/cli/project.lock.json b/cli/project.lock.json
index 69373f78..7f087117 100644
--- a/cli/project.lock.json
+++ b/cli/project.lock.json
@@ -2108,25 +2108,29 @@
           "lib/net45/_._": {}
         }
       },
-      "Yavsc/1.0.5-rc14": {
+      "Yavsc.Abstract/1.0.5-rc17": {
         "type": "package",
-        "dependencies": {
-          "Yavsc.Abstract": "1.0.5-rc14"
-        },
         "compile": {
-          "lib/portable-net45+win8+wp8+wpa81+Xamarin.Mac+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Yavsc.dll": {}
+          "lib/dnx451/Yavsc.Abstract.dll": {}
         },
         "runtime": {
-          "lib/portable-net45+win8+wp8+wpa81+Xamarin.Mac+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Yavsc.dll": {}
+          "lib/dnx451/Yavsc.Abstract.dll": {}
         }
       },
-      "Yavsc.Abstract/1.0.5-rc14": {
+      "Yavsc.Server/1.0.5-rc17": {
         "type": "package",
+        "dependencies": {
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "1.0.0-rc1-final",
+          "Microsoft.Extensions.Logging": "1.0.0-rc1-final",
+          "Microsoft.Extensions.Logging.Console": "1.0.0-rc1-final",
+          "Microsoft.Extensions.Logging.Debug": "1.0.0-rc1-final",
+          "Yavsc.Abstract": "1.0.5-rc17"
+        },
         "compile": {
-          "lib/portable-net45+win8+wp8+wpa81+Xamarin.Mac+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Yavsc.Abstract.dll": {}
+          "lib/dnx451/Yavsc.Server.dll": {}
         },
         "runtime": {
-          "lib/portable-net45+win8+wp8+wpa81+Xamarin.Mac+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Yavsc.Abstract.dll": {}
+          "lib/dnx451/Yavsc.Server.dll": {}
         }
       }
     },
@@ -4236,25 +4240,29 @@
           "lib/net45/_._": {}
         }
       },
-      "Yavsc/1.0.5-rc14": {
+      "Yavsc.Abstract/1.0.5-rc17": {
         "type": "package",
-        "dependencies": {
-          "Yavsc.Abstract": "1.0.5-rc14"
-        },
         "compile": {
-          "lib/portable-net45+win8+wp8+wpa81+Xamarin.Mac+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Yavsc.dll": {}
+          "lib/dnx451/Yavsc.Abstract.dll": {}
         },
         "runtime": {
-          "lib/portable-net45+win8+wp8+wpa81+Xamarin.Mac+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Yavsc.dll": {}
+          "lib/dnx451/Yavsc.Abstract.dll": {}
         }
       },
-      "Yavsc.Abstract/1.0.5-rc14": {
+      "Yavsc.Server/1.0.5-rc17": {
         "type": "package",
+        "dependencies": {
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "1.0.0-rc1-final",
+          "Microsoft.Extensions.Logging": "1.0.0-rc1-final",
+          "Microsoft.Extensions.Logging.Console": "1.0.0-rc1-final",
+          "Microsoft.Extensions.Logging.Debug": "1.0.0-rc1-final",
+          "Yavsc.Abstract": "1.0.5-rc17"
+        },
         "compile": {
-          "lib/portable-net45+win8+wp8+wpa81+Xamarin.Mac+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Yavsc.Abstract.dll": {}
+          "lib/dnx451/Yavsc.Server.dll": {}
         },
         "runtime": {
-          "lib/portable-net45+win8+wp8+wpa81+Xamarin.Mac+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Yavsc.Abstract.dll": {}
+          "lib/dnx451/Yavsc.Server.dll": {}
         }
       }
     },
@@ -6364,25 +6372,29 @@
           "lib/net45/_._": {}
         }
       },
-      "Yavsc/1.0.5-rc14": {
+      "Yavsc.Abstract/1.0.5-rc17": {
         "type": "package",
-        "dependencies": {
-          "Yavsc.Abstract": "1.0.5-rc14"
-        },
         "compile": {
-          "lib/portable-net45+win8+wp8+wpa81+Xamarin.Mac+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Yavsc.dll": {}
+          "lib/dnx451/Yavsc.Abstract.dll": {}
         },
         "runtime": {
-          "lib/portable-net45+win8+wp8+wpa81+Xamarin.Mac+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Yavsc.dll": {}
+          "lib/dnx451/Yavsc.Abstract.dll": {}
         }
       },
-      "Yavsc.Abstract/1.0.5-rc14": {
+      "Yavsc.Server/1.0.5-rc17": {
         "type": "package",
+        "dependencies": {
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "1.0.0-rc1-final",
+          "Microsoft.Extensions.Logging": "1.0.0-rc1-final",
+          "Microsoft.Extensions.Logging.Console": "1.0.0-rc1-final",
+          "Microsoft.Extensions.Logging.Debug": "1.0.0-rc1-final",
+          "Yavsc.Abstract": "1.0.5-rc17"
+        },
         "compile": {
-          "lib/portable-net45+win8+wp8+wpa81+Xamarin.Mac+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Yavsc.Abstract.dll": {}
+          "lib/dnx451/Yavsc.Server.dll": {}
         },
         "runtime": {
-          "lib/portable-net45+win8+wp8+wpa81+Xamarin.Mac+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Yavsc.Abstract.dll": {}
+          "lib/dnx451/Yavsc.Server.dll": {}
         }
       }
     }
@@ -8509,24 +8521,26 @@
         "system.threading.nuspec"
       ]
     },
-    "Yavsc/1.0.5-rc14": {
+    "Yavsc.Abstract/1.0.5-rc17": {
       "type": "package",
-      "sha512": "qh7XoqBfHICTJuu7nwwOh9Wu7D8vntKvbpKPyiV9F61cXxssRBU0mlhmAfWfVmMeDOadTJMePXP43RDDjSxWpA==",
+      "sha512": "/uGlH4QFDBlr7wrmZERcuhKaGhRS+SEONqI+zWpwKXctWkMSbX/QauqIsrrWLWke/6JiC2yxSfo5HWpETy3L0w==",
       "files": [
-        "lib/portable-net45+win8+wp8+wpa81+Xamarin.Mac+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Yavsc.dll",
-        "Yavsc.1.0.5-rc14.nupkg",
-        "Yavsc.1.0.5-rc14.nupkg.sha512",
-        "Yavsc.nuspec"
+        "lib/dnx451/Yavsc.Abstract.dll",
+        "lib/portable-net45+win8+wp8+wpa81+Xamarin.Mac+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Yavsc.Abstract.dll",
+        "Yavsc.Abstract.1.0.5-rc17.nupkg",
+        "Yavsc.Abstract.1.0.5-rc17.nupkg.sha512",
+        "Yavsc.Abstract.nuspec"
       ]
     },
-    "Yavsc.Abstract/1.0.5-rc14": {
+    "Yavsc.Server/1.0.5-rc17": {
       "type": "package",
-      "sha512": "89rsGd4JcnNZkiEQEZU1hYj4YqxrPsDgePE+7U9XZJf28lmhCyFU86bOQHJiAoTow3q4dbVP/Wp2lDxNpMKuLA==",
+      "sha512": "QSqJadauqDNl7JwdKIjUiBGjRRGhgD5EP8uH1O/E9O0yk86xUnpdNDdCYybkM5DsWnQROUjmtTn0IrTb1eZegg==",
       "files": [
-        "lib/portable-net45+win8+wp8+wpa81+Xamarin.Mac+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Yavsc.Abstract.dll",
-        "Yavsc.Abstract.1.0.5-rc14.nupkg",
-        "Yavsc.Abstract.1.0.5-rc14.nupkg.sha512",
-        "Yavsc.Abstract.nuspec"
+        "lib/dnx451/Yavsc.Server.dll",
+        "lib/portable-net45+win8+wp8+wpa81+Xamarin.Mac+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Yavsc.Server.dll",
+        "Yavsc.Server.1.0.5-rc17.nupkg",
+        "Yavsc.Server.1.0.5-rc17.nupkg.sha512",
+        "Yavsc.Server.nuspec"
       ]
     }
   },
@@ -8558,8 +8572,8 @@
       "Microsoft.Framework.Configuration.Json >= 1.0.0-beta8",
       "Microsoft.Framework.ConfigurationModel.Json >= 1.0.0-beta4",
       "Newtonsoft.Json >= 9.0.1",
-      "Yavsc >= 1.0.5-rc14",
-      "Yavsc.Abstract >= 1.0.5-rc14"
+      "Yavsc.Abstract >= 1.0.5-rc17",
+      "Yavsc.Server >= 1.0.5-rc17"
     ],
     "DNX,Version=v4.5.1": []
   }
diff --git a/common.mk b/common.mk
deleted file mode 100644
index 7067ec1a..00000000
--- a/common.mk
+++ /dev/null
@@ -1,87 +0,0 @@
-# Common defs
-
-MAKE=make
-FRAMEWORK=dnx451
-rc_num := $(shell cat rc-num.txt)
-VERSION=1.0.5-rc$(rc_num)
-CONFIGURATION=Release
-PRJNAME := $(shell basename `pwd -P` .dll)
-PKGFILENAME=$(PRJNAME).$(VERSION).nupkg
-BINARY=bin/$(CONFIGURATION)/$(FRAMEWORK)/$(PRJNAME).dll
-NUGETSOURCE=$(HOME)/Nupkgs/
-ASPNET_ENV=Development
-ASPNET_LOG_LEVEL=Debug
-# nuget package destination, at generation time
-HOSTING=localhost
-HOSTADMIN=root
-FRAMEWORKALIAS=dnx451
-BINTARGET=$(PRJNAME).dll
-BINTARGETPATH=bin/$(CONFIGURATION)/$(FRAMEWORKALIAS)/$(BINTARGET)
-
-# OBS SUBDIRS=Yavsc.Server Yavsc.Abstract Yavsc cli
-#
-
-# Git commit hash, in order to not publish some uncrontrolled code in production environment
-#
-
-git_status := $(shell git status -s --porcelain |wc -l)
-
-all: build
-
-rc-num.txt: 
-ifndef rc-num	
-	@echo Generating rc-num.txt with: $(shell cat ../rc-num.txt || echo 1) > $@
-	@echo $(shell cat ../rc-num.txt || echo 1) > $@
-rc_num := $(shell cat rc-num.txt)
-else 
-	@echo 'Got rc num : $(rc_num)'	
-endif
-
-rc-num.txt-check: rc-num.txt
-ifndef rc_num
-	@echo no rc num ... please, run 'make rc-num.txt' before. 
-else
-	@echo 'Got rc num : $(rc_num)'
-endif
-
-restore:
-	touch project.json
-	dnu restore
-
-project.lock.json: project.json
-	dnu restore
-
-watch: project.lock.json
-	ASPNET_ENV=$(ASPNET_ENV) ASPNET_LOG_LEVEL=$(ASPNET_LOG_LEVEL) dnx-watch web --configuration=$(CONFIGURATION)
-
-run: project.lock.json
-	ASPNET_ENV=$(ASPNET_ENV) dnx web --configuration=$(CONFIGURATION)
-
-clean:
-	rm -rf bin obj
-
-cleanoutput:
-	rm -rf bin/$(CONFIGURATION)
-	rm -rf bin/output
-
-$(BINTARGETPATH): project.lock.json
-	dnu build --configuration=$(CONFIGURATION)
-
-build: $(BINTARGETPATH)
-
-bin/output:
-	@dnu publish
-
-bin/output/wwwroot/version: bin/output
-	@git log -1 --pretty=format:%h > bin/output/wwwroot/version
-
-$(PKGFILENAME): $(BINARY) rc-num.txt
-	nuget pack $(PRJNAME).nuspec -Version $(VERSION) -Properties config=$(CONFIGURATION)
-
-$(NUGETSOURCE)/$(PRJNAME):
-	mkdir -P $^
-
-deploy-pkg: $(PKGFILENAME)
-	cp $(PKGFILENAME) $(NUGETSOURCE)
-
-.PHONY: rc-num.txt-check
diff --git a/dnx.mk b/dnx.mk
index 5acd31b9..ab04f305 100644
--- a/dnx.mk
+++ b/dnx.mk
@@ -1,9 +1,73 @@
-include common.mk
+# Common defs
+# assumes SOLUTIONDIR already defined
+#
 
-$(BINTARGETPATH): 
-	dnu build
+PRJNAME := $(shell basename `pwd -P`)
+FRAMEWORK=dnx451
+ASPNET_ENV=Development
+ASPNET_LOG_LEVEL=Debug
+HOSTING=localhost
+HOSTADMIN=root
+FRAMEWORKALIAS=dnx451
+BINTARGET=$(PRJNAME).dll
+BINTARGETPATH=bin/$(CONFIGURATION)/$(FRAMEWORKALIAS)/$(BINTARGET)
 
-build: project.
-	$(DNU) build
+# OBS SUBDIRS=Yavsc.Server Yavsc.Abstract Yavsc cli
+#
+
+# Git commit hash, in order to not publish some uncrontrolled code in production environment
+#
+
+git_status := $(shell git status -s --porcelain |wc -l)
+
+all: $(BINTARGETPATH)
+
+rc-num.txt-check:
+ifndef rc_num
+	@echo no rc num ... please, could you try and run 'make rc-num.txt' ?. 
+else
+	@echo 'Got rc num : $(rc_num)'
+endif
+
+
+restore:
+	touch project.json
+	dnu restore
+
+project.lock.json: project.json
+	dnu restore
+
+watch: project.lock.json
+	ASPNET_ENV=$(ASPNET_ENV) ASPNET_LOG_LEVEL=$(ASPNET_LOG_LEVEL) dnx-watch web --configuration=$(CONFIGURATION)
+
+clean:
+	rm -rf bin obj
+
+cleanoutput:
+	rm -rf bin/$(CONFIGURATION)
+	rm -rf bin/output
+
+$(BINTARGETPATH): project.json rc-num.txt-check
+	dnu build --configuration=$(CONFIGURATION)
+
+# Default target, from one level sub dirs
+
+bin/output:
+	@dnu publish
+
+bin/output/wwwroot/version: bin/output
+	@git log -1 --pretty=format:%h > bin/output/wwwroot/version
+
+$(NUGETSOURCE)/$(PRJNAME)/$(PKGFILENAME): $(NUGETSOURCE)/$(PRJNAME) $(BINTARGETPATH) $(SOLUTIONDIR)/rc-num.txt
+	nuget pack $(PRJNAME).nuspec -Version $(VERSION) -Properties config=$(CONFIGURATION) -OutputDirectory $(NUGETSOURCE)/$(PRJNAME)
+
+$(NUGETSOURCE)/$(PRJNAME):
+	mkdir -p $@
+
+deploy-pkg: $(NUGETSOURCE)/$(PRJNAME)/$(PKGFILENAME)
+
+.PHONY: rc-num.txt-check $(BINTARGETPATH)
+
+.DEFAULT_GOAL :=
 
 
diff --git a/rc-num.txt b/rc-num.txt
index 60d3b2f4..46bd236c 100644
--- a/rc-num.txt
+++ b/rc-num.txt
@@ -1 +1 @@
-15
+18-alpha1
diff --git a/versioning.mk b/versioning.mk
new file mode 100644
index 00000000..377fed9b
--- /dev/null
+++ b/versioning.mk
@@ -0,0 +1,13 @@
+
+PRJNAME := $(shell basename `pwd -P`)
+SOLUTIONDIR=$(HOME)/workspace/yavsc
+rc_num := $(shell cat $(SOLUTIONDIR)/rc-num.txt)
+DESTDIR=$(SOLUTIONDIR)/build
+MAKE=make
+VERSION=1.0.5-rc$(rc_num)
+CONFIGURATION=Release
+# nuget package destination, at generation time
+NUGETSOURCE=$(HOME)/Nupkgs
+PKGFILENAME=$(PRJNAME).$(VERSION).nupkg
+
+
diff --git a/wrap/Yavsc.Client/project.json b/wrap/Yavsc.Client/project.json
deleted file mode 100644
index cbd22f76..00000000
--- a/wrap/Yavsc.Client/project.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "version": "1.0.0-*",
-  "frameworks": {
-    "net45+win+wpa81+MonoAndroid10+Xamarin.iOS10+MonoTouch10": {
-      "wrappedProject": "../../Yavsc.Client/Yavsc.Client.csproj",
-      "bin": {
-        "assembly": "../../Yavsc.Client/obj/{configuration}/Yavsc.Client.dll",
-        "pdb": "../../Yavsc.Client/obj/{configuration}/Yavsc.Client.pdb"
-      },
-      "dependencies": {
-        "Json.NET.Web": "1.0.49",
-        "Newtonsoft.Json": "9.0.1"
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/wrap/mscorlib/project.json b/wrap/mscorlib/project.json
deleted file mode 100644
index d1d3a4c9..00000000
--- a/wrap/mscorlib/project.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "version": "1.0.0-*",
-  "frameworks": {
-    "net45+win+wpa81+MonoAndroid10+Xamarin.iOS10+MonoTouch10": {
-      "bin": {
-        "assembly": "../../../../../../../Program Files (x86)/Reference Assemblies/Microsoft/Framework/MonoAndroid/v1.0/mscorlib.dll"
-      }
-    }
-  }
-}
\ No newline at end of file