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 @@ yavsc + 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 SendEmailAsync(SiteSettings siteSettings, SmtpSettings smtpSettings, string username, string email, string subject, string message); + Task 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 NotifyBookQueryAsync( - GoogleAuthSettings googlesettings, IEnumerable registrationId, RdvQueryEvent ev); Task NotifyEstimateAsync( - GoogleAuthSettings googlesettings, IEnumerable registrationId, EstimationEvent ev); Task NotifyHairCutQueryAsync( - GoogleAuthSettings googlesettings, IEnumerable registrationId, HairCutQueryEvent ev); Task NotifyAsync( - GoogleAuthSettings _googleSettings, IEnumerable 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 sitesOptions, + IOptions smtpOptions, + IOptions googleOptions + ) { _logger = loggerFactory.CreateLogger(); + siteSettings = sitesOptions.Value; + smtpSettings = smtpOptions.Value; + googleSettings = googleOptions.Value; } + public async Task NotifyEvent - ( GoogleAuthSettings googleSettings, IEnumerable regids, Event ev) + ( IEnumerable regids, Event ev) where Event : IEvent { if (ev == null) @@ -69,23 +82,23 @@ namespace Yavsc.Services /// a MessageWithPayloadResponse, /// bool somethingsent = (response.failure == 0 && response.success > 0) /// - public async Task NotifyBookQueryAsync(GoogleAuthSettings googleSettings, IEnumerable registrationIds, RdvQueryEvent ev) + public async Task NotifyBookQueryAsync( IEnumerable registrationIds, RdvQueryEvent ev) { - return await NotifyEvent(googleSettings,registrationIds, ev); + return await NotifyEvent(registrationIds, ev); } - public async Task NotifyEstimateAsync(GoogleAuthSettings googleSettings, IEnumerable registrationIds, EstimationEvent ev) + public async Task NotifyEstimateAsync(IEnumerable registrationIds, EstimationEvent ev) { - return await NotifyEvent(googleSettings,registrationIds, ev); + return await NotifyEvent(registrationIds, ev); } - public async Task NotifyHairCutQueryAsync(GoogleAuthSettings googleSettings, + public async Task NotifyHairCutQueryAsync( IEnumerable registrationIds, HairCutQueryEvent ev) { - return await NotifyEvent(googleSettings, registrationIds, ev); + return await NotifyEvent(registrationIds, ev); } - public Task SendEmailAsync(SiteSettings siteSettings, SmtpSettings smtpSettings, string username, string email, string subject, string message) + public Task SendEmailAsync(string username, string email, string subject, string message) { try { @@ -120,7 +133,8 @@ namespace Yavsc.Services throw new NotImplementedException(); } - public Task NotifyAsync(GoogleAuthSettings _googleSettings, IEnumerable regids, IEvent yaev) + public Task NotifyAsync( + IEnumerable 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 @@ + 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 " @@ -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 userManager, SignInManager signInManager, IEmailSender emailSender, - IOptions siteSettings, - IOptions smtpSettings, + IOptions siteSettings, ILoggerFactory loggerFactory, IOptions twilioSettings, IStringLocalizer 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(); _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: link"); 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 b/build deleted file mode 100644 index cfe5dd37..00000000 --- a/build +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/sh -PRJS="YavscLib/YavscLib ZicMoove/ZicMoove/ZicMoove ZicMoove/ZicMoove.Droid/ZicMoove.Droid" -MSB=msbuild.exe - -if [ "clean" = "$1" ]; then - echo \< $1 - rm -rf YavscLib/YavscLib/obj ZicMoove/*/obj -fi - -for p in $PRJS -do - -nuget restore $p.csproj -PackagesDirectory packages - -done - -$MSB /t:UpdateAndroidResources /p:Configuration=Debug ZicMoove/ZicMoove.Droid/ZicMoove.Droid.csproj - -for p in $PRJS -do -$MSB /t:Build /p:Configuration=Debug $p.csproj -done 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/build/Yavsc.1.0.5-rc17.nupkg b/build/Yavsc.1.0.5-rc17.nupkg new file mode 100644 index 00000000..d18b5b71 Binary files /dev/null and b/build/Yavsc.1.0.5-rc17.nupkg differ diff --git a/build/Yavsc.Abstract.1.0.5-rc17.nupkg b/build/Yavsc.Abstract.1.0.5-rc17.nupkg new file mode 100644 index 00000000..14ff0c18 Binary files /dev/null and b/build/Yavsc.Abstract.1.0.5-rc17.nupkg differ diff --git a/build/Yavsc.Server.1.0.5-rc17.nupkg b/build/Yavsc.Server.1.0.5-rc17.nupkg new file mode 100644 index 00000000..7a5df5d5 Binary files /dev/null and b/build/Yavsc.Server.1.0.5-rc17.nupkg differ 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 00000000..63350c5a Binary files /dev/null and b/cli/Yavsc.1.0.5-rc15.nupkg differ 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 @@ + + + + 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 @@ + + + + cli + Yavsc - cli + $version$ + Paul Schneider + Paul Schneider + https://github.com/pazof/yavsc/blob/vnext/Yavsc/License.md + https://github.com/pazof/yavsc/README.md + https://github.com/pazof/yavsc/blob/vnext/Yavsc/wwwroot/images/yavsc.png + true + + A command line interface to Yavsc server runtime + + + + Blog, POS, Web API + + + + + + + + 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