From b973d34ebaf13a3f5207d267bfdd4ba3ee4f4d72 Mon Sep 17 00:00:00 2001 From: Paul Schneider Date: Thu, 26 Apr 2018 21:02:11 +0200 Subject: [PATCH] pushing <3 --- Makefile | 4 ++-- Yavsc.Abstract/Makefile | 22 +++++++++++++++++----- Yavsc/Makefile | 9 ++++++--- Yavsc/Models/EMailing/MailingTemplate.cs | 2 +- Yavsc/Templates/UserOrientedTemplate.cs | 3 ++- Yavsc/project.json | 4 ++-- cli/Makefile | 9 ++++++--- cli/Services/EMailer.cs | 3 ++- cli/project.json | 2 +- cli/project.lock.json | 10 +++++----- 10 files changed, 44 insertions(+), 24 deletions(-) diff --git a/Makefile b/Makefile index 396d99a4..22d2633e 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ MAKE=make SUBDIRS=Yavsc.Abstract Yavsc cli -VERSION=1.0.5-rc11 +VERSION=1.0.5-rc12 all: $(SUBDIRS) @@ -9,7 +9,7 @@ $(SUBDIRS): $(MAKE) -C $@ VERSION=$(VERSION) deploy-pkgs: - $(MAKE) -C Yavsc.Abstract deploy VERSION=$(VERSION) + $(MAKE) -C Yavsc.Abstract deploy-pkg VERSION=$(VERSION) $(MAKE) -C Yavsc deploy-pkg VERSION=$(VERSION) .PHONY: all $(SUBDIRS) diff --git a/Yavsc.Abstract/Makefile b/Yavsc.Abstract/Makefile index 58b2f105..22349bd3 100644 --- a/Yavsc.Abstract/Makefile +++ b/Yavsc.Abstract/Makefile @@ -1,22 +1,34 @@ -CONFIG=Release +CONFIGURATION=Release PRJNAME=Yavsc.Abstract +BINTARGET=$(PRJNAME).dll PKGFILENAME=$(PRJNAME).$(VERSION).nupkg DESTPATH=. PACKAGE=$(DESTPATH)/$(PKGFILENAME) -BINARY=bin/$(CONFIG)/net451/$(PRJNAME).dll +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=$(CONFIG) + nuget pack $(PRJNAME).nuspec -Version $(VERSION) -Properties config=$(CONFIGURATION) clean: rm $(PACKAGE) $(BINARY): project.lock.json - dnu build --configuration $(CONFIG) + dnu build --configuration $(CONFIGURATION) project.lock.json: project.json dnu restore -deploy: $(PACKAGE) +deploy-pkg: $(PACKAGE) cp $(PACKAGE) $(NUGETSOURCE) + +.PHONY: $(PACKAGE) + diff --git a/Yavsc/Makefile b/Yavsc/Makefile index b95a097a..e5b5576c 100644 --- a/Yavsc/Makefile +++ b/Yavsc/Makefile @@ -6,9 +6,9 @@ CONFIGURATION=Release ASPNET_LOG_LEVEL=info #warn HOSTING=localhost HOSTADMIN=root -FRMWRK=dnx451 -BINTARGET=Yavsc.dll -BINTARGETPATH=bin/$(CONFIGURATION)/$(FRMWRK)/$(BINTARGET) +FRAMEWORKALIAS=dnx451 +BINTARGET=$(PRJNAME).dll +BINTARGETPATH=bin/$(CONFIGURATION)/$(FRAMEWORKALIAS)/$(BINTARGET) PKGFILENAME=$(PRJNAME).$(VERSION).nupkg DESTPATH=. @@ -16,6 +16,8 @@ PACKAGE=$(DESTPATH)/$(PKGFILENAME) NUGETSOURCE=$(HOME)/Nupkgs/ all: $(BINTARGETPATH) + +$(BINTARGETPATH): dnu build deploy: clean pushInPre pushInProd @@ -92,5 +94,6 @@ project.lock.json: project.json deploy-pkg: $(PACKAGE) cp $(PACKAGE) $(NUGETSOURCE) +.PHONY: $(PACKAGE) $(BINTARGETPATH) diff --git a/Yavsc/Models/EMailing/MailingTemplate.cs b/Yavsc/Models/EMailing/MailingTemplate.cs index 4fdfcb71..9699a125 100644 --- a/Yavsc/Models/EMailing/MailingTemplate.cs +++ b/Yavsc/Models/EMailing/MailingTemplate.cs @@ -27,7 +27,7 @@ namespace Yavsc.Server.Models.EMailing [Key,DatabaseGenerated(DatabaseGeneratedOption.Identity)] public long Id { get; set; } - [MaxLengthAttribute(128)] + [MaxLengthAttribute(128),MinLength(3)] public string ShortName { get; set; } /// diff --git a/Yavsc/Templates/UserOrientedTemplate.cs b/Yavsc/Templates/UserOrientedTemplate.cs index 141e734f..26ab7e81 100644 --- a/Yavsc/Templates/UserOrientedTemplate.cs +++ b/Yavsc/Templates/UserOrientedTemplate.cs @@ -8,7 +8,8 @@ namespace Yavsc.Templates { public ApplicationUser User { get; set; } - public override Task ExecuteAsync () + + public override async Task ExecuteAsync () { throw new System.NotImplementedException(); } diff --git a/Yavsc/project.json b/Yavsc/project.json index 3f5c0b71..c58e6d82 100755 --- a/Yavsc/project.json +++ b/Yavsc/project.json @@ -1,5 +1,5 @@ { - "version": "1.0.5-rc11", + "version": "1.0.5-rc12", "authors": [ "Paul Schneider" ], @@ -177,4 +177,4 @@ "prepublish": "gulp min" }, "embed": "Views/**/*.cshtml" -} \ No newline at end of file +} diff --git a/cli/Makefile b/cli/Makefile index 29552695..c25c1b56 100644 --- a/cli/Makefile +++ b/cli/Makefile @@ -6,9 +6,12 @@ build: project.lock.json dnu build project.lock.json: project.json - -bin/output/approot/run: project.lock.json dnu restore -run: bin/output/approot/run +run: ../Yavsc/bin/Debug/dnx451/Yavsc.dll ASPNET_ENV=Development ASPNET_LOG_LEVEL=Debug dnx run + +../Yavsc/bin/Debug/dnx451/Yavsc.dll: + make -C ../Yavsc + + diff --git a/cli/Services/EMailer.cs b/cli/Services/EMailer.cs index c98e67a8..5eed953c 100644 --- a/cli/Services/EMailer.cs +++ b/cli/Services/EMailer.cs @@ -147,7 +147,8 @@ namespace cli.Services logger.LogInformation(user.ToString()); generatedtemplate.User = user; - generatedtemplate.ExecuteAsync(); + generatedtemplate.ExecuteAsync().Wait(); + logger.LogInformation (generatedtemplate.GeneratedText); } diff --git a/cli/project.json b/cli/project.json index e992865a..4fe95447 100644 --- a/cli/project.json +++ b/cli/project.json @@ -38,7 +38,7 @@ "Microsoft.Extensions.Logging.Console": "1.0.0-rc1-final", "Microsoft.AspNet.Identity.EntityFramework": "3.0.0-rc1-*", "Microsoft.AspNet.Identity": "3.0.0-rc1-*", - "Yavsc": "1.0.5-rc11", + "Yavsc": "1.0.5-rc12", "Microsoft.Extensions.DependencyInjection.Abstractions": "1.0.0-rc1-final", "Microsoft.Extensions.Logging.Debug": "1.0.0-rc1-final", "Microsoft.CodeAnalysis": "1.0.0-rc1" diff --git a/cli/project.lock.json b/cli/project.lock.json index 4c631d39..06263a6e 100644 --- a/cli/project.lock.json +++ b/cli/project.lock.json @@ -2906,7 +2906,7 @@ "lib/WebGrease.dll": {} } }, - "Yavsc/1.0.5-rc11": { + "Yavsc/1.0.5-rc12": { "type": "project", "framework": "DNX,Version=v4.5.1", "dependencies": { @@ -5897,7 +5897,7 @@ "lib/WebGrease.dll": {} } }, - "Yavsc/1.0.5-rc11": { + "Yavsc/1.0.5-rc12": { "type": "project", "framework": "DNX,Version=v4.5.1", "dependencies": { @@ -8888,7 +8888,7 @@ "lib/WebGrease.dll": {} } }, - "Yavsc/1.0.5-rc11": { + "Yavsc/1.0.5-rc12": { "type": "project", "framework": "DNX,Version=v4.5.1", "dependencies": { @@ -8985,7 +8985,7 @@ "type": "project", "path": "../OAuth.AspNet.Token/project.json" }, - "Yavsc/1.0.5-rc11": { + "Yavsc/1.0.5-rc12": { "type": "project", "path": "../Yavsc/project.json" }, @@ -12024,7 +12024,7 @@ "Microsoft.Extensions.Logging.Console >= 1.0.0-rc1-final", "Microsoft.AspNet.Identity.EntityFramework >= 3.0.0-rc1-*", "Microsoft.AspNet.Identity >= 3.0.0-rc1-*", - "Yavsc >= 1.0.5-rc11", + "Yavsc >= 1.0.5-rc12", "Microsoft.Extensions.DependencyInjection.Abstractions >= 1.0.0-rc1-final", "Microsoft.Extensions.Logging.Debug >= 1.0.0-rc1-final", "Microsoft.CodeAnalysis >= 1.0.0-rc1"