NUGETSOURCE

.gitlab-ci.yml

@@ -53,7 +53,8 @@ deploy_staging:
   script:
     - echo "Deploy to staging server"
     - make strip_yavscd
+    - cd src/Yavsc.Abstract
+    - make push NUGETSOURCE=$(NUGETSOURCE) $(NUGETSOURCEAPIKEY)
   environment:
     name: staging
     url: https://yavscpre.pschneider.fr
-

.nuget/NuGet.Config

@@ -3,7 +3,7 @@
   <apikeys>
   </apikeys>
   <packageSources>
-      <add key="opt" value="/opt/nuget/pkgs/" /> 
+    <add key="opt" value="/opt/nuget/pkgs/" /> 
     <add key="Official NuGet Gallery" value="https://www.nuget.org/api/v2/" /> 
     <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" /> 
     <add key="xamarin-forms-ci" value="https://www.myget.org/F/xamarinforms-ci/api/v2" /> 

Makefile

@@ -5,7 +5,6 @@ DNXLIBS=Microsoft.Dnx.Host.Mono.dll Microsoft.Dnx.Host.dll Microsoft.Dnx.Applica
 DNXLIBFP:=$(addprefix $(DNX_USER_HOME)/runtimes/dnx-mono.1.0.0-rc1-update2/bin/, $(DNXLIBS))
 CONFIG=Debug
 
-git_status := $(shell git status -s --porcelain |wc -l)
 yavscd=binaries/$(CONFIG)/yavscd
 yavsccli=binaries/$(CONFIG)/yavsccli
 
@@ -50,6 +49,9 @@ pushInProd: yavscd
 packages:
 	make -C src/Yavsc.Abstract pack
 
+push_packages:
+	make -C src/Yavsc.Abstract push
+
 findResources:
 	find src -name "*.resx" |sort
  
@@ -79,13 +81,11 @@ $(yavscd): yavscassemblies updatedeps
 	mkdir -p binaries/$(CONFIG)
 	mkbundle --static $(DNXLIBS) src/Yavsc/bin/$(CONFIG)/dnx451/Yavsc.dll src/Yavsc/bin/$(CONFIG)/dnx451/pt/Yavsc.resources.dll src/Yavsc/bin/$(CONFIG)/dnx451/en/Yavsc.resources.dll src/Yavsc.Server/bin/$(CONFIG)/dnx451/Yavsc.Server.dll src/Yavsc.Server/bin/$(CONFIG)/dnx451/en/Yavsc.Server.resources.dll src/Yavsc.Abstract/bin/$(CONFIG)/dnx451/Yavsc.Abstract.dll src/Yavsc.Abstract/bin/$(CONFIG)/dnx451/en/Yavsc.Abstract.resources.dll src/Yavsc.Abstract/bin/$(CONFIG)/dnx451/pt/Yavsc.Abstract.resources.dll src/OAuth.AspNet.AuthServer/bin/$(CONFIG)/dnx451/OAuth.AspNet.AuthServer.dll src/OAuth.AspNet.Token/bin/$(CONFIG)/dnx451/OAuth.AspNet.Token.dll $(shell ls private/lib/*.dll) -L $(DNX_USER_HOME)/runtimes/dnx-mono.1.0.0-rc1-update2/bin --machine-config $(MONO_PREFIX)/etc/mono/4.5/machine.config -o $(yavscd)
 
-
 strip_yavscd: $(yavscd)
 	strip $(yavscd)
 
 cliassemblies: src/cli/bin/$(CONFIG)/dnx451/cli.dll src/cli/bin/$(CONFIG)/dnx451/fr/cli.resources.dll src/Yavsc/bin/$(CONFIG)/dnx451/Yavsc.dll src/Yavsc/bin/$(CONFIG)/dnx451/pt/Yavsc.resources.dll src/Yavsc.Server/bin/$(CONFIG)/dnx451/Yavsc.Server.dll src/Yavsc.Abstract/bin/$(CONFIG)/dnx451/Yavsc.Abstract.dll src/OAuth.AspNet.AuthServer/bin/$(CONFIG)/dnx451/OAuth.AspNet.AuthServer.dll src/OAuth.AspNet.Token/bin/$(CONFIG)/dnx451/OAuth.AspNet.Token.dll
 
-
 yavsccli: cliassemblies 	
 	mkdir -p binaries/$(CONFIG)
 	mkbundle --static $(DNXLIBS) src/cli/bin/$(CONFIG)/dnx451/cli.dll src/cli/bin/$(CONFIG)/dnx451/fr/cli.resources.dll src/Yavsc/bin/$(CONFIG)/dnx451/Yavsc.dll src/Yavsc/bin/$(CONFIG)/dnx451/pt/Yavsc.resources.dll src/Yavsc/bin/$(CONFIG)/dnx451/en/Yavsc.resources.dll src/Yavsc.Server/bin/$(CONFIG)/dnx451/Yavsc.Server.dll src/Yavsc.Server/bin/$(CONFIG)/dnx451/en/Yavsc.Server.resources.dll src/Yavsc.Abstract/bin/$(CONFIG)/dnx451/Yavsc.Abstract.dll src/Yavsc.Abstract/bin/$(CONFIG)/dnx451/en/Yavsc.Abstract.resources.dll src/Yavsc.Abstract/bin/$(CONFIG)/dnx451/pt/Yavsc.Abstract.resources.dll src/OAuth.AspNet.AuthServer/bin/$(CONFIG)/dnx451/OAuth.AspNet.AuthServer.dll src/OAuth.AspNet.Token/bin/$(CONFIG)/dnx451/OAuth.AspNet.Token.dll  $(shell ls private/lib/*.dll) -L $(DNX_USER_HOME)/runtimes/dnx-mono.1.0.0-rc1-update2/bin --machine-config $(MONO_PREFIX)/etc/mono/4.5/machine.config -o $(yavsccli)

scripts/make/dnx.mk

@@ -15,6 +15,9 @@ BINTARGET=$(PRJNAME).dll
 BINTARGETPATH=bin/$(CONFIGURATION)/$(FRAMEWORKALIAS)/$(BINTARGET)
 PKGFILENAME=$(PRJNAME).$(VERSION).nupkg
 dnu=dnu
+ifndef NUGETSOURCE
+NUGETSOURCE=$(HOME)/Nupkgs
+endif
 
 # OBS SUBDIRS=Yavsc.Server Yavsc.Abstract Yavsc cli
 #
@@ -59,17 +62,11 @@ bin/output:
 bin/output/wwwroot/version: bin/output
 	echo $(version) > bin/output/wwwroot/version
 
-#	@git log -1 --pretty=format:%h > bin/output/wwwroot/version
-
-pack: $(NUGETSOURCE)/$(PKGFILENAME)
-
-git_status_msg := $(shell git status -s)
-
-$(NUGETSOURCE)/$(PKGFILENAME): $(BINTARGETPATH) ../../version.txt
+pack: $(BINTARGETPATH) ../../version.txt
 	nuget pack $(PRJNAME).nuspec -Version $(VERSION) -Properties config=$(CONFIGURATION) -OutputDirectory bin 
 
-deploy-pkg: pack
-	@mv bin/$(PKGFILENAME) $(NUGETSOURCE)
+push: pack
+	nuget push bin/$(PRJNAME).$(VERSION).nupkg $(NUGETSOURCEAPIKEY) -src $(NUGETSOURCE) 
 
 .PHONY: rc-num.txt-check