From 543795002b9bbc3238f9362ff300e73007a97f0a Mon Sep 17 00:00:00 2001 From: Paul Schneider Date: Tue, 10 Aug 2021 22:24:52 +0100 Subject: [PATCH] ISNSOURCE --- scripts/make/dnx.mk | 10 +++++----- scripts/make/msbuild.mk | 2 +- scripts/make/versioning.mk | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/scripts/make/dnx.mk b/scripts/make/dnx.mk index 821648dc..84ca2ec3 100644 --- a/scripts/make/dnx.mk +++ b/scripts/make/dnx.mk @@ -15,8 +15,8 @@ BINTARGET=$(PRJNAME).dll BINTARGETPATH=bin/$(CONFIGURATION)/$(FRAMEWORKALIAS)/$(BINTARGET) PKGFILENAME=$(PRJNAME).$(VERSION).nupkg dnu=dnu -ifndef NUGETSOURCE -NUGETSOURCE=$(HOME)/Nupkgs +ifndef ISNSOURCE +ISNSOURCE=$(HOME)/Nupkgs endif # OBS SUBDIRS=Yavsc.Server Yavsc.Abstract Yavsc cli @@ -66,9 +66,9 @@ pack: $(BINTARGETPATH) ../../version.txt @nuget pack $(PRJNAME).nuspec -Version $(VERSION) -Properties config=$(CONFIGURATION) -OutputDirectory bin push: pack - @echo push to source: $(NUGETSOURCE) - @nuget setApiKey $(NUGETSOURCEAPIKEY) -Source $(NUGETSOURCE) - @nuget push bin/$(PRJNAME).$(VERSION).nupkg -src $(NUGETSOURCE) -SkipDuplicate + @echo push to source: $(ISNSOURCE) + @nuget setApiKey $(NUGETSOURCEAPIKEY) -Source $(ISNSOURCE) + @nuget push bin/$(PRJNAME).$(VERSION).nupkg -src $(ISNSOURCE) -SkipDuplicate .PHONY: rc-num.txt-check diff --git a/scripts/make/msbuild.mk b/scripts/make/msbuild.mk index c21b833d..d6d260f8 100644 --- a/scripts/make/msbuild.mk +++ b/scripts/make/msbuild.mk @@ -11,6 +11,6 @@ VERSION=1.0.5-rc$(rc_num) BINTARGET=$(PRJNAME).$(BINTYPE) BINTARGETPATH=bin/$(CONFIGURATION)/$(BINTARGET) -NUGETSOURCE=$(HOME)/Nupkgs +ISNSOURCE=$(HOME)/Nupkgs PKGFILENAME=$(PRJNAME).$(VERSION).nupkg diff --git a/scripts/make/versioning.mk b/scripts/make/versioning.mk index 3b2cfdb9..2adc45d2 100644 --- a/scripts/make/versioning.mk +++ b/scripts/make/versioning.mk @@ -4,7 +4,7 @@ PRJNAME := $(shell basename `pwd -P`) endif version := $(shell cat ../../version.txt) MAKE=make -NUGETSOURCE=$(HOME)/Nupkgs +ISNSOURCE=$(HOME)/Nupkgs VERSION=$(version) CONFIGURATION=Debug