From a259f0d14508542e83f7137a210e3f36356b4b2f Mon Sep 17 00:00:00 2001
From: Paul Schneider <paulschneider@free.fr>
Date: Tue, 10 Aug 2021 23:03:53 +0100
Subject: [PATCH] bump

---
 .gitlab-ci.yml                  |  3 ++-
 scripts/make/dnx.mk             | 10 +++-------
 src/Yavsc.Abstract/project.json |  2 +-
 version.txt                     |  2 +-
 4 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c1815f23..80785659 100644
--- a/.gitlab-ci.yml
+++ b/.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
diff --git a/scripts/make/dnx.mk b/scripts/make/dnx.mk
index 84ca2ec3..9a5a8a58 100644
--- a/scripts/make/dnx.mk
+++ b/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)
-	@nuget push bin/$(PRJNAME).$(VERSION).nupkg -src $(ISNSOURCE) -SkipDuplicate
+	isn push -s $(ISNSOURCE) -k $(NUGETSOURCEAPIKEY) src/$(PRJNAME)/bin/$(CONFIGURATION)/$(PRJNAME).*.nupkg
 
 .PHONY: rc-num.txt-check 
 
diff --git a/src/Yavsc.Abstract/project.json b/src/Yavsc.Abstract/project.json
index 46f5ac62..2013134c 100644
--- a/src/Yavsc.Abstract/project.json
+++ b/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": [
diff --git a/version.txt b/version.txt
index bec1ae31..238d6e88 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-1.0.6-rc19
+1.0.7