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

yavscd in prod

Browse Source
This commit is contained in:
Paul Schneider
2019-12-11 16:42:07 +00:00
parent 9e742818ef
commit ae5e85bf9d
21 changed files with 75 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/OAuth.AspNet.AuthServer/Makefile
View File

@ -1,7 +1,7 @@
SOURCE_DIR=$(HOME)/workspace/yavsc
MAKEFILE_DIR=$(SOURCE_DIR)/scripts/build/make
include $(MAKEFILE_DIR)/versioning.mk
include $(MAKEFILE_DIR)/dnx.mk
include $(MAKEFILE_DIR)/versioning.mk
all: $(BINTARGETPATH)

2
src/OAuth.AspNet.AuthServer/project.json
View File

@ -26,7 +26,7 @@
"defaultNamespace": "Yavsc"
},
"dependencies": {
"Newtonsoft.Json": "6.0.0",
"Newtonsoft.Json": "6.0.1-beta1",
"Microsoft.AspNet.Identity.EntityFramework": "3.0.0-rc1-*",
"OAuth.AspNet.Token": {
"type": "build",

3
src/OAuth.AspNet.Token/Makefile
View File

@ -1,7 +1,8 @@
SOURCE_DIR=$(HOME)/workspace/yavsc
MAKEFILE_DIR=$(SOURCE_DIR)/scripts/build/make
include $(MAKEFILE_DIR)/versioning.mk
include $(MAKEFILE_DIR)/dnx.mk
include $(MAKEFILE_DIR)/versioning.mk
all: $(BINTARGETPATH)

6
src/Yavsc.Abstract/Makefile
View File

@ -3,14 +3,14 @@ MAKEFILE_DIR=$(SOURCE_DIR)/scripts/build/make
BASERESX=Resources/Yavsc.Attributes.Validation.Resources.resx \
Resources/Yavsc.Models.Messaging.Resources.resx \
Resources/Yavsc.Models.IT.Fixing.Bug.resx\
Resources/Yavsc.ChatHub.resx
Resources/Yavsc.ChatHubLabels.resx
BASERESXGEN=$(BASERESX:.resx=.Designer.cs)
include $(MAKEFILE_DIR)/versioning.mk
include $(MAKEFILE_DIR)/dnx.mk
include $(MAKEFILE_DIR)/versioning.mk
all: $(BASERESXGEN) $(BINTARGETPATH)
%.Designer.cs: %.resx
strotygen -l -p -t -r "Yavsc.Abstract.Resources." $^
strongresbuildercli -l -p -t -r "Yavsc.Abstract.Resources." $^
prepare_code: $(BASERESXGEN)

5
src/Yavsc.Server/Makefile
View File

@ -4,9 +4,8 @@ BASERESX=Resources/Yavsc.Models.Relationship.HyperLink.resx \
Resources/Yavsc.Models.Streaming.LiveFlow.resx
BASERESXGEN=$(BASERESX:.resx=.Designer.cs)
include $(MAKEFILE_DIR)/versioning.mk
include $(MAKEFILE_DIR)/dnx.mk
include $(MAKEFILE_DIR)/versioning.mk
default: all
@ -20,7 +19,7 @@ $(BINTARGETPATH): ../OAuth.AspNet.AuthServer/bin/$(CONFIGURATION)/OAuth.AspNet.A
make -C ../Yavsc.Abstract
%.Designer.cs: %.resx
strotygen -l -p -t -r "Yavsc.Server.Resources." $^
strongresbuildercli -l -p -t -r "Yavsc.Server.Resources." $^
prepare_code: $(BASERESXGEN)

6
src/Yavsc/Makefile
View File

@ -13,8 +13,8 @@ BASERESXGEN=$(BASERESX:.resx=.Designer.cs)
MCS_OPTIONS=-debug
MONO_OPTIONS="--debug"
include $(MAKEFILE_DIR)/versioning.mk
include $(MAKEFILE_DIR)/dnx.mk
include $(MAKEFILE_DIR)/versioning.mk
MINJS=wwwroot/js/bootstrap.min.js wwwroot/js/input-lib.min.js wwwroot/js/jquery.signalR-2.2.1.min.js wwwroot/js/quill.min.js wwwroot/js/chat.min.js wwwroot/js/jquery-2.2.4.min.js wwwroot/js/jquery-ui.min.js wwwroot/js/showdown.min.js wwwroot/js/comment.min.js wwwroot/js/jquery-3.2.1.min.js wwwroot/js/md-helpers.min.js wwwroot/js/site.min.js wwwroot/js/dropzone.min.js wwwroot/js/jquery-migrate-3.0.0.min.js wwwroot/js/parallax.min.js wwwroot/js/str.min.js wwwroot/js/google-geoloc.min.js wwwroot/js/jquery.min.js wwwroot/js/paypalbutton.min.js wwwroot/js/to-markdown.min.js
@ -52,6 +52,7 @@ pushInPre: cleanoutput bin/output/wwwroot/version
sudo service kestrel-pre stop
sudo rm -rf $(DESTDIR)/approot
sudo cp -a bin/output/* $(DESTDIR)
sudo cp ../../yavscd /usr/local/bin/yavscd-pre
sudo sync
sudo service kestrel-pre start
@ -60,6 +61,7 @@ ifeq ($(git_status),0)
sudo service kestrel stop
sudo rm -rf $(PRODDESTDIR)/approot
sudo cp -a bin/output/* $(PRODDESTDIR)
sudo cp ../../yavscd /usr/local/bin/yavscd
sudo sync
sudo service kestrel start
else
@ -76,7 +78,7 @@ cleanPublish: pushInPre pushInProd
jsmin < $^ > $@
%.Designer.cs: %.resx
strotygen -l -p -t -r "Yavsc.Resources." $^
strongresbuildercli -l -p -t -r "Yavsc.Resources." $^
prepare_code: $(BASERESXGEN)

12
src/Yavsc/Resources/Yavsc.YavscLocalisation.Designer.cs → src/Yavsc/Resources/YavscLocalisation.Designer.cs generated
View File

@ -2029,6 +2029,18 @@ namespace Yavsc {
}
}
public static string AccountEmailFactorTitle {
get {
return ResourceManager.GetString("AccountEmailFactorTitle", resourceCulture);
}
}
public static string AccountEmailFactorBody {
get {
return ResourceManager.GetString("AccountEmailFactorBody", resourceCulture);
}
}
public static string ConfirmYourAccountTitle {
get {
return ResourceManager.GetString("ConfirmYourAccountTitle", resourceCulture);

6
src/cli/project.json
View File

@ -61,5 +61,11 @@
"System.Net": {},
"System.Xml": {}
}
},
"scripts": {
"postrestore": [
"grep -v '\\.\\.dll' project.lock.json > new.project.lock.json",
"mv new.project.lock.json project.lock.json"
]
}
}

6
src/sampleWebAsWebApiClient/project.json
View File

@ -29,7 +29,7 @@
"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",
"Newtonsoft.Json": "6.0.0"
"Newtonsoft.Json": "6.0.1-beta1"
},
"commands": {
"web": "Microsoft.AspNet.Server.Kestrel --server.urls=http://*:5002"
@ -59,6 +59,10 @@
"bower install",
"gulp clean",
"gulp min"
],
"postrestore": [
"grep -v '\\.\\.dll' project.lock.json > new.project.lock.json",
"mv new.project.lock.json project.lock.json"
]
}
}

10
src/test/project.json
View File

@ -39,7 +39,7 @@
"EntityFramework.Commands": "7.0.0-rc1-final",
"EntityFramework7.Npgsql": "3.1.0-rc1-3",
"EntityFramework7.Npgsql.Design": "3.1.0-rc1-5",
"Newtonsoft.Json": "6.0.0",
"Newtonsoft.Json": "6.0.1-beta1",
"xunit": "2.1.0",
"xunit.analyzers": "0.9.0",
"xunit.assert": "2.1.0",
@ -62,5 +62,11 @@
"commands": {
"test": "xunit.runner.dnx"
},
"userSecretsId": "aspnet5-YavscWeb-a0dadd21-2ced-43d3-96f9-7e504345102f"
"userSecretsId": "aspnet5-YavscWeb-a0dadd21-2ced-43d3-96f9-7e504345102f",
"scripts": {
"postrestore": [
"grep -v '\\.\\.dll' project.lock.json > new.project.lock.json",
"mv new.project.lock.json project.lock.json"
]
}
}