From 822cb356242daabd8e5261adcd8b7d9da5b02724 Mon Sep 17 00:00:00 2001
From: Nate McMaster <nate.mcmaster@microsoft.com>
Date: Wed, 18 Jan 2017 14:57:41 -0800
Subject: [PATCH] Prepare 1.1.0 release and pin floating versions

---
 build.ps1     | 2 +-
 build.sh      | 2 +-
 version.props | 5 +++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/build.ps1 b/build.ps1
index 32de239258..2acf6cd799 100644
--- a/build.ps1
+++ b/build.ps1
@@ -33,7 +33,7 @@ cd $PSScriptRoot
 $repoFolder = $PSScriptRoot
 $env:REPO_FOLDER = $repoFolder
 
-$koreBuildZip="https://github.com/aspnet/KoreBuild/archive/rel/1.0.0-msbuild3.zip"
+$koreBuildZip="https://github.com/aspnet/KoreBuild/archive/rel/1.0.0-msbuild-rtm.zip"
 if ($env:KOREBUILD_ZIP)
 {
     $koreBuildZip=$env:KOREBUILD_ZIP
diff --git a/build.sh b/build.sh
index 9d4dfee12f..3bc0d49e7e 100755
--- a/build.sh
+++ b/build.sh
@@ -2,7 +2,7 @@
 repoFolder="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 cd $repoFolder
 
-koreBuildZip="https://github.com/aspnet/KoreBuild/archive/rel/1.0.0-msbuild3.zip"
+koreBuildZip="https://github.com/aspnet/KoreBuild/archive/rel/1.0.0-msbuild-rtm.zip"
 if [ ! -z $KOREBUILD_ZIP ]; then
     koreBuildZip=$KOREBUILD_ZIP
 fi
diff --git a/version.props b/version.props
index 3b55ecf128..a1285c53c6 100644
--- a/version.props
+++ b/version.props
@@ -1,7 +1,8 @@
 <!-- This file may be overwritten by automation. Only values allowed here are VersionPrefix and VersionSuffix.  -->
 <Project>
     <PropertyGroup>
-        <Version>1.1.0-msbuild3-update1</Version>
-        <PackageVersion>1.1.0-msbuild3-update1</PackageVersion>
+        <Version>1.1.0-rtm</Version>
+        <Version Condition="'$(BuildNumber)'!=''">$(Version)-$(BuildNumber)</Version>
+        <PackageVersion>1.1.0</PackageVersion>
     </PropertyGroup>
 </Project>
\ No newline at end of file