bump

.gitlab-ci.yml

@@ -60,8 +60,9 @@ deploy_staging:
   script:
     - echo "Deploy to staging server"
     - make strip_yavscd
+    - make packages
     - cd src/Yavsc.Abstract
-    - make push ISNSOURCE=$ISNSOURCE NUGETSOURCEAPIKEY=$NUGETSOURCEAPIKEY
+    - isn push -s $ISNSOURCE -k $NUGETSOURCEAPIKEY *.nupkg
   environment:
     name: staging
     url: https://yavscpre.pschneider.fr

scripts/make/dnx.mk

@@ -15,9 +15,6 @@ BINTARGET=$(PRJNAME).dll
 BINTARGETPATH=bin/$(CONFIGURATION)/$(FRAMEWORKALIAS)/$(BINTARGET)
 PKGFILENAME=$(PRJNAME).$(VERSION).nupkg
 dnu=dnu
-ifndef ISNSOURCE
-ISNSOURCE=$(HOME)/Nupkgs
-endif
 
 # OBS SUBDIRS=Yavsc.Server Yavsc.Abstract Yavsc cli
 #
@@ -57,18 +54,17 @@ $(BINTARGETPATH): project.lock.json rc-num.txt-check
 # Default target, from one level sub dirs
 
 bin/output:
-	@$(dnu) publish
+	$(dnu) publish
 
 bin/output/wwwroot/version: bin/output
 	@echo $(version) > bin/output/wwwroot/version
 
 pack: $(BINTARGETPATH) ../../version.txt
-	@nuget pack $(PRJNAME).nuspec -Version $(VERSION) -Properties config=$(CONFIGURATION) -OutputDirectory bin 
+	dnu pack --configuration $(CONFIGURATION)
 
 push: pack
 	@echo push to source: $(ISNSOURCE)
-	@nuget setApiKey $(NUGETSOURCEAPIKEY) -Source $(ISNSOURCE)
+	isn push -s $(ISNSOURCE) -k $(NUGETSOURCEAPIKEY) src/$(PRJNAME)/bin/$(CONFIGURATION)/$(PRJNAME).*.nupkg
-	@nuget push bin/$(PRJNAME).$(VERSION).nupkg -src $(ISNSOURCE) -SkipDuplicate
 
 .PHONY: rc-num.txt-check 
 

src/Yavsc.Abstract/project.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.0.6-*",
+  "version": "1.0.7-*",
   "title": "Yavsc - l'abstrait",
   "description": "Yavsc common objects",
   "authors": [

version.txt

@@ -1 +1 @@
-1.0.6-rc19
+1.0.7