From f732dfd2bef2f6fde135a2c8bf60674a65b5fd4a Mon Sep 17 00:00:00 2001 From: Matt Sylvia Date: Fri, 2 Jun 2017 16:05:15 -0400 Subject: [PATCH 1/3] Bumping version for d15-3 --- Make.config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Make.config b/Make.config index e3214b162f..f7ace5fd62 100644 --- a/Make.config +++ b/Make.config @@ -40,7 +40,7 @@ IOS_PRODUCT=Xamarin.iOS IOS_PACKAGE_NAME=Xamarin.iOS IOS_PACKAGE_NAME_LOWER=$(shell echo $(IOS_PACKAGE_NAME) | tr "[:upper:]" "[:lower:]") # NEVER customize IOS_PACKAGE_VERSION itself, other parts (mtouch, web updater) are using the IOS_PACKAGE_VERSION_* variables -IOS_PACKAGE_VERSION=10.11.1.$(IOS_COMMIT_DISTANCE) +IOS_PACKAGE_VERSION=10.12.0.$(IOS_COMMIT_DISTANCE) IOS_PACKAGE_VERSION_MAJOR=$(word 1, $(subst ., ,$(IOS_PACKAGE_VERSION))) IOS_PACKAGE_VERSION_MINOR=$(word 2, $(subst ., ,$(IOS_PACKAGE_VERSION))) IOS_PACKAGE_VERSION_REV=$(word 3, $(subst ., ,$(IOS_PACKAGE_VERSION))) @@ -248,7 +248,7 @@ MAC_PRODUCT=Xamarin.Mac MAC_PACKAGE_NAME=xamarin.mac MAC_PACKAGE_NAME_LOWER=$(shell echo $(MAC_PACKAGE_NAME) | tr "[:upper:]" "[:lower:]") -MAC_PACKAGE_VERSION=3.5.1.$(MAC_COMMIT_DISTANCE) +MAC_PACKAGE_VERSION=3.7.0.$(MAC_COMMIT_DISTANCE) MAC_PACKAGE_VERSION_MAJOR=$(word 1, $(subst ., ,$(MAC_PACKAGE_VERSION))) MAC_PACKAGE_VERSION_MINOR=$(word 2, $(subst ., ,$(MAC_PACKAGE_VERSION))) MAC_PACKAGE_VERSION_REV=$(word 3, $(subst ., ,$(MAC_PACKAGE_VERSION))) From 27afd5b9afd9be3d399e781968f29a22f29ad35c Mon Sep 17 00:00:00 2001 From: Matt Sylvia Date: Fri, 2 Jun 2017 16:07:35 -0400 Subject: [PATCH 2/3] 3.6 ... not 3.7 --- Make.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Make.config b/Make.config index f7ace5fd62..b7f853e831 100644 --- a/Make.config +++ b/Make.config @@ -248,7 +248,7 @@ MAC_PRODUCT=Xamarin.Mac MAC_PACKAGE_NAME=xamarin.mac MAC_PACKAGE_NAME_LOWER=$(shell echo $(MAC_PACKAGE_NAME) | tr "[:upper:]" "[:lower:]") -MAC_PACKAGE_VERSION=3.7.0.$(MAC_COMMIT_DISTANCE) +MAC_PACKAGE_VERSION=3.6.0.$(MAC_COMMIT_DISTANCE) MAC_PACKAGE_VERSION_MAJOR=$(word 1, $(subst ., ,$(MAC_PACKAGE_VERSION))) MAC_PACKAGE_VERSION_MINOR=$(word 2, $(subst ., ,$(MAC_PACKAGE_VERSION))) MAC_PACKAGE_VERSION_REV=$(word 3, $(subst ., ,$(MAC_PACKAGE_VERSION))) From 7d100d658aafd9ce289110322884bca6e089132b Mon Sep 17 00:00:00 2001 From: Matt Sylvia Date: Fri, 2 Jun 2017 16:20:39 -0400 Subject: [PATCH 3/3] Update PACKAGE_HEAD_BRANCH as well --- Make.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Make.config b/Make.config index b7f853e831..5138cdc442 100644 --- a/Make.config +++ b/Make.config @@ -29,7 +29,7 @@ PACKAGE_HEAD_REV=$(shell git rev-parse HEAD) # on wrench, because wrench technically builds hashes, not branches) # # -PACKAGE_HEAD_BRANCH=master +PACKAGE_HEAD_BRANCH=d15-3 ifeq ($(BUILD_REVISION),) CURRENT_BRANCH:=$(shell git rev-parse --abbrev-ref HEAD) else