From e9024ed9b6e4d915a843a6f6118fae1c4be89709 Mon Sep 17 00:00:00 2001
From: Paul Schneider <paul@pschneider.fr>
Date: Fri, 27 Apr 2018 15:05:18 +0200
Subject: [PATCH] =?UTF-8?q?vers=20une=20incr=C3=A9mentation=20d'un=20num?=
 =?UTF-8?q?=C3=A9ro=20de=20candidat=20=C3=A0=20la=20production?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Makefile       | 14 ++++++++++++--
 Yavsc/Makefile |  7 +++++--
 cli/Makefile   |  5 +++++
 rc-num.txt     |  1 +
 4 files changed, 23 insertions(+), 4 deletions(-)
 create mode 100644 rc-num.txt

diff --git a/Makefile b/Makefile
index 22d2633e..61180ee6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,16 +1,26 @@
 
+
 MAKE=make
 SUBDIRS=Yavsc.Abstract Yavsc cli
-VERSION=1.0.5-rc12
+git_status := $(shell git status -s --porcelain |wc -l)
+rc_num := $(shell cat rc-num.txt)
+VERSION=1.0.5-rc$(rc_num)
 
 all: $(SUBDIRS)
 
 $(SUBDIRS):
 	$(MAKE) -C $@ VERSION=$(VERSION)
 
-deploy-pkgs:
+Yavsc.Abstract-deploy:
 	$(MAKE) -C Yavsc.Abstract deploy-pkg VERSION=$(VERSION)
+
+Yavsc.Abstract-deploy: Yavsc
 	$(MAKE) -C Yavsc deploy-pkg VERSION=$(VERSION)
 
+Yavsc: Yavsc.Abstract-deploy
+	make -C Yavsc restore
+
+cli: Yavsc
+
 .PHONY: all $(SUBDIRS)
 
diff --git a/Yavsc/Makefile b/Yavsc/Makefile
index e5b5576c..45f5174c 100644
--- a/Yavsc/Makefile
+++ b/Yavsc/Makefile
@@ -17,7 +17,7 @@ NUGETSOURCE=$(HOME)/Nupkgs/
 
 all: $(BINTARGETPATH)
 
-$(BINTARGETPATH):
+$(BINTARGETPATH): 
 	dnu build
 
 deploy: clean pushInPre pushInProd
@@ -34,6 +34,10 @@ endif
 
 default: pushInPre
 
+restore:
+	touch project.json
+	dnu restore
+
 project.lock.json: project.json
 	dnu restore
 
@@ -96,4 +100,3 @@ deploy-pkg: $(PACKAGE)
 
 .PHONY: $(PACKAGE) $(BINTARGETPATH)
 
-
diff --git a/cli/Makefile b/cli/Makefile
index c25c1b56..129e4752 100644
--- a/cli/Makefile
+++ b/cli/Makefile
@@ -5,6 +5,11 @@ all: build
 build: project.lock.json
 	dnu build
 
+
+restore:
+	touch project.json
+	dnu restore
+	
 project.lock.json: project.json
 	dnu restore
 
diff --git a/rc-num.txt b/rc-num.txt
new file mode 100644
index 00000000..b1bd38b6
--- /dev/null
+++ b/rc-num.txt
@@ -0,0 +1 @@
+13