paul/yavsc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pushing <3

Browse Source
This commit is contained in:
Paul Schneider
2018-04-26 21:02:11 +02:00
parent 96e250e0cd
commit b973d34eba
10 changed files with 44 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -1,7 +1,7 @@
MAKE=make MAKE=make
SUBDIRS=Yavsc.Abstract Yavsc cli SUBDIRS=Yavsc.Abstract Yavsc cli
VERSION=1.0.5-rc11 VERSION=1.0.5-rc12
all: $(SUBDIRS) all: $(SUBDIRS)
@ -9,7 +9,7 @@ $(SUBDIRS):
$(MAKE) -C $@ VERSION=$(VERSION) $(MAKE) -C $@ VERSION=$(VERSION)
deploy-pkgs: deploy-pkgs:
$(MAKE) -C Yavsc.Abstract deploy VERSION=$(VERSION) $(MAKE) -C Yavsc.Abstract deploy-pkg VERSION=$(VERSION)
$(MAKE) -C Yavsc deploy-pkg VERSION=$(VERSION) $(MAKE) -C Yavsc deploy-pkg VERSION=$(VERSION)
.PHONY: all $(SUBDIRS) .PHONY: all $(SUBDIRS)

22
Yavsc.Abstract/Makefile
View File

@ -1,22 +1,34 @@
CONFIG=Release CONFIGURATION=Release
PRJNAME=Yavsc.Abstract PRJNAME=Yavsc.Abstract
BINTARGET=$(PRJNAME).dll
PKGFILENAME=$(PRJNAME).$(VERSION).nupkg PKGFILENAME=$(PRJNAME).$(VERSION).nupkg
DESTPATH=. DESTPATH=.
PACKAGE=$(DESTPATH)/$(PKGFILENAME) PACKAGE=$(DESTPATH)/$(PKGFILENAME)
BINARY=bin/$(CONFIG)/net451/$(PRJNAME).dll BINARY=bin/$(CONFIGURATION)//$(PRJNAME).dll
FRAMEWORKALIAS=net451
BINTARGETPATH=bin/$(CONFIGURATION)/$(FRAMEWORKALIAS)/$(BINTARGET)
NUGETSOURCE=$(HOME)/Nupkgs/ NUGETSOURCE=$(HOME)/Nupkgs/
all: $(BINTARGETPATH)
$(BINTARGETPATH):
dnu build
$(PACKAGE): $(BINARY) $(PACKAGE): $(BINARY)
nuget pack $(PRJNAME).nuspec -Version $(VERSION) -Properties config=$(CONFIG) nuget pack $(PRJNAME).nuspec -Version $(VERSION) -Properties config=$(CONFIGURATION)
clean: clean:
rm $(PACKAGE) rm $(PACKAGE)
$(BINARY): project.lock.json $(BINARY): project.lock.json
dnu build --configuration $(CONFIG) dnu build --configuration $(CONFIGURATION)
project.lock.json: project.json project.lock.json: project.json
dnu restore dnu restore
deploy: $(PACKAGE) deploy-pkg: $(PACKAGE)
cp $(PACKAGE) $(NUGETSOURCE) cp $(PACKAGE) $(NUGETSOURCE)
.PHONY: $(PACKAGE)

9
Yavsc/Makefile
View File

@ -6,9 +6,9 @@ CONFIGURATION=Release
ASPNET_LOG_LEVEL=info #warn ASPNET_LOG_LEVEL=info #warn
HOSTING=localhost HOSTING=localhost
HOSTADMIN=root HOSTADMIN=root
FRMWRK=dnx451 FRAMEWORKALIAS=dnx451
BINTARGET=Yavsc.dll BINTARGET=$(PRJNAME).dll
BINTARGETPATH=bin/$(CONFIGURATION)/$(FRMWRK)/$(BINTARGET) BINTARGETPATH=bin/$(CONFIGURATION)/$(FRAMEWORKALIAS)/$(BINTARGET)
PKGFILENAME=$(PRJNAME).$(VERSION).nupkg PKGFILENAME=$(PRJNAME).$(VERSION).nupkg
DESTPATH=. DESTPATH=.
@ -16,6 +16,8 @@ PACKAGE=$(DESTPATH)/$(PKGFILENAME)
NUGETSOURCE=$(HOME)/Nupkgs/ NUGETSOURCE=$(HOME)/Nupkgs/
all: $(BINTARGETPATH) all: $(BINTARGETPATH)
$(BINTARGETPATH):
dnu build dnu build
deploy: clean pushInPre pushInProd deploy: clean pushInPre pushInProd
@ -92,5 +94,6 @@ project.lock.json: project.json
deploy-pkg: $(PACKAGE) deploy-pkg: $(PACKAGE)
cp $(PACKAGE) $(NUGETSOURCE) cp $(PACKAGE) $(NUGETSOURCE)
.PHONY: $(PACKAGE) $(BINTARGETPATH)

2
Yavsc/Models/EMailing/MailingTemplate.cs
View File

@ -27,7 +27,7 @@ namespace Yavsc.Server.Models.EMailing
[Key,DatabaseGenerated(DatabaseGeneratedOption.Identity)] [Key,DatabaseGenerated(DatabaseGeneratedOption.Identity)]
public long Id { get; set; } public long Id { get; set; }
[MaxLengthAttribute(128)] [MaxLengthAttribute(128),MinLength(3)]
public string ShortName { get; set; } public string ShortName { get; set; }
/// <summary> /// <summary>

3
Yavsc/Templates/UserOrientedTemplate.cs
View File

@ -8,7 +8,8 @@ namespace Yavsc.Templates
{ {
public ApplicationUser User { get; set; } public ApplicationUser User { get; set; }
public override Task ExecuteAsync ()
public override async Task ExecuteAsync ()
{ {
throw new System.NotImplementedException(); throw new System.NotImplementedException();
} }

4
Yavsc/project.json
View File

@ -1,5 +1,5 @@
{ {
"version": "1.0.5-rc11", "version": "1.0.5-rc12",
"authors": [ "authors": [
"Paul Schneider" "Paul Schneider"
], ],
@ -177,4 +177,4 @@
"prepublish": "gulp min" "prepublish": "gulp min"
}, },
"embed": "Views/**/*.cshtml" "embed": "Views/**/*.cshtml"
} }

9
cli/Makefile
View File

@ -6,9 +6,12 @@ build: project.lock.json
dnu build dnu build
project.lock.json: project.json project.lock.json: project.json
bin/output/approot/run: project.lock.json
dnu restore dnu restore
run: bin/output/approot/run run: ../Yavsc/bin/Debug/dnx451/Yavsc.dll
ASPNET_ENV=Development ASPNET_LOG_LEVEL=Debug dnx run ASPNET_ENV=Development ASPNET_LOG_LEVEL=Debug dnx run
../Yavsc/bin/Debug/dnx451/Yavsc.dll:
make -C ../Yavsc

3
cli/Services/EMailer.cs
View File

@ -147,7 +147,8 @@ namespace cli.Services
logger.LogInformation(user.ToString()); logger.LogInformation(user.ToString());
generatedtemplate.User = user; generatedtemplate.User = user;
generatedtemplate.ExecuteAsync(); generatedtemplate.ExecuteAsync().Wait();
logger.LogInformation (generatedtemplate.GeneratedText); logger.LogInformation (generatedtemplate.GeneratedText);
} }

2
cli/project.json
View File

@ -38,7 +38,7 @@
"Microsoft.Extensions.Logging.Console": "1.0.0-rc1-final", "Microsoft.Extensions.Logging.Console": "1.0.0-rc1-final",
"Microsoft.AspNet.Identity.EntityFramework": "3.0.0-rc1-*", "Microsoft.AspNet.Identity.EntityFramework": "3.0.0-rc1-*",
"Microsoft.AspNet.Identity": "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.DependencyInjection.Abstractions": "1.0.0-rc1-final",
"Microsoft.Extensions.Logging.Debug": "1.0.0-rc1-final", "Microsoft.Extensions.Logging.Debug": "1.0.0-rc1-final",
"Microsoft.CodeAnalysis": "1.0.0-rc1" "Microsoft.CodeAnalysis": "1.0.0-rc1"

10
cli/project.lock.json
View File

@ -2906,7 +2906,7 @@
"lib/WebGrease.dll": {} "lib/WebGrease.dll": {}
} }
}, },
"Yavsc/1.0.5-rc11": { "Yavsc/1.0.5-rc12": {
"type": "project", "type": "project",
"framework": "DNX,Version=v4.5.1", "framework": "DNX,Version=v4.5.1",
"dependencies": { "dependencies": {
@ -5897,7 +5897,7 @@
"lib/WebGrease.dll": {} "lib/WebGrease.dll": {}
} }
}, },
"Yavsc/1.0.5-rc11": { "Yavsc/1.0.5-rc12": {
"type": "project", "type": "project",
"framework": "DNX,Version=v4.5.1", "framework": "DNX,Version=v4.5.1",
"dependencies": { "dependencies": {
@ -8888,7 +8888,7 @@
"lib/WebGrease.dll": {} "lib/WebGrease.dll": {}
} }
}, },
"Yavsc/1.0.5-rc11": { "Yavsc/1.0.5-rc12": {
"type": "project", "type": "project",
"framework": "DNX,Version=v4.5.1", "framework": "DNX,Version=v4.5.1",
"dependencies": { "dependencies": {
@ -8985,7 +8985,7 @@
"type": "project", "type": "project",
"path": "../OAuth.AspNet.Token/project.json" "path": "../OAuth.AspNet.Token/project.json"
}, },
"Yavsc/1.0.5-rc11": { "Yavsc/1.0.5-rc12": {
"type": "project", "type": "project",
"path": "../Yavsc/project.json" "path": "../Yavsc/project.json"
}, },
@ -12024,7 +12024,7 @@
"Microsoft.Extensions.Logging.Console >= 1.0.0-rc1-final", "Microsoft.Extensions.Logging.Console >= 1.0.0-rc1-final",
"Microsoft.AspNet.Identity.EntityFramework >= 3.0.0-rc1-*", "Microsoft.AspNet.Identity.EntityFramework >= 3.0.0-rc1-*",
"Microsoft.AspNet.Identity >= 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.DependencyInjection.Abstractions >= 1.0.0-rc1-final",
"Microsoft.Extensions.Logging.Debug >= 1.0.0-rc1-final", "Microsoft.Extensions.Logging.Debug >= 1.0.0-rc1-final",
"Microsoft.CodeAnalysis >= 1.0.0-rc1" "Microsoft.CodeAnalysis >= 1.0.0-rc1"