From c2db08e3a758042f0e586ca63065f86867ab32ef Mon Sep 17 00:00:00 2001
From: Nate McMaster <nate.mcmaster@microsoft.com>
Date: Wed, 16 Sep 2015 16:35:48 -0700
Subject: [PATCH] Update build-template

---
 build-template/NuGet.Config         |  4 ++--
 build-template/NuGet.master.config  |  3 +--
 build-template/NuGet.release.config |  8 --------
 build-template/build.cmd            | 18 ++++++++++--------
 build-template/build.sh             |  2 +-
 build-template/makefile.shade       |  2 +-
 6 files changed, 15 insertions(+), 22 deletions(-)
 delete mode 100644 build-template/NuGet.release.config

diff --git a/build-template/NuGet.Config b/build-template/NuGet.Config
index 46c3b3e36c..b20b7336fc 100644
--- a/build-template/NuGet.Config
+++ b/build-template/NuGet.Config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <packageSources>
-    <add key="AspNetVNext" value="https://www.myget.org/F/aspnetvnext/api/v2" />
-    <add key="NuGet" value="https://nuget.org/api/v2/" />
+    <add key="AspNetVNext" value="https://www.myget.org/F/aspnetlitedev/api/v2" />
+    <add key="NuGet" value="https://api.nuget.org/v3/index.json" />
   </packageSources>
 </configuration>
diff --git a/build-template/NuGet.master.config b/build-template/NuGet.master.config
index 4f7d6eca7f..b004e5cc74 100644
--- a/build-template/NuGet.master.config
+++ b/build-template/NuGet.master.config
@@ -2,7 +2,6 @@
 <configuration>
   <packageSources>
     <clear />
-    <add key="NuGet" value="https://nuget.org/api/v2/" />
-    <add key="AspNetMaster" value="https://www.myget.org/F/aspnetmaster/api/v2" />
+    <add key="NuGet" value="https://api.nuget.org/v3/index.json" />
   </packageSources>
 </configuration>
\ No newline at end of file
diff --git a/build-template/NuGet.release.config b/build-template/NuGet.release.config
deleted file mode 100644
index 0e74a4912d..0000000000
--- a/build-template/NuGet.release.config
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <packageSources>
-    <clear />
-    <add key="AspNetVNext" value="https://www.myget.org/F/aspnetrelease/api/v2" />
-    <add key="NuGet" value="https://nuget.org/api/v2/" />
-  </packageSources>
-</configuration>
diff --git a/build-template/build.cmd b/build-template/build.cmd
index 5a69c96e86..b54d91cf74 100644
--- a/build-template/build.cmd
+++ b/build-template/build.cmd
@@ -3,6 +3,8 @@ cd %~dp0
 
 SETLOCAL
 SET CACHED_NUGET=%LocalAppData%\NuGet\NuGet.exe
+SET BUILDCMD_KOREBUILD_VERSION=""
+SET BUILDCMD_DNX_VERSION=""
 
 IF EXIST %CACHED_NUGET% goto copynuget
 echo Downloading latest version of NuGet.exe...
@@ -16,21 +18,21 @@ copy %CACHED_NUGET% .nuget\nuget.exe > nul
 
 :restore
 IF EXIST packages\KoreBuild goto run
-IF DEFINED BUILDCMD_RELEASE (
-	.nuget\NuGet.exe install KoreBuild -version 0.2.1-%BUILDCMD_RELEASE% -ExcludeVersion -o packages -nocache -pre
-) ELSE (
+IF %BUILDCMD_KOREBUILD_VERSION%=="" (
 	.nuget\NuGet.exe install KoreBuild -ExcludeVersion -o packages -nocache -pre
+) ELSE (
+	.nuget\NuGet.exe install KoreBuild -version %BUILDCMD_KOREBUILD_VERSION% -ExcludeVersion -o packages -nocache -pre
 )
-.nuget\NuGet.exe install Sake -version 0.2 -o packages -ExcludeVersion
+.nuget\NuGet.exe install Sake -ExcludeVersion -Source https://www.nuget.org/api/v2/ -Out packages
 
 IF "%SKIP_DNX_INSTALL%"=="1" goto run
-IF DEFINED BUILDCMD_RELEASE (
-	CALL packages\KoreBuild\build\dnvm install 1.0.0-%BUILDCMD_RELEASE% -runtime CLR -arch x86 -a default
+IF %BUILDCMD_DNX_VERSION%=="" (
+	CALL packages\KoreBuild\build\dnvm upgrade -runtime CLR -arch x86
 ) ELSE (
-	CALL packages\KoreBuild\build\dnvm upgrade -runtime CLR -arch x86 
+	CALL packages\KoreBuild\build\dnvm install %BUILDCMD_DNX_VERSION% -runtime CLR -arch x86 -a default
 )
 CALL packages\KoreBuild\build\dnvm install default -runtime CoreCLR -arch x86
 
 :run
 CALL packages\KoreBuild\build\dnvm use default -runtime CLR -arch x86
-packages\Sake\tools\Sake.exe -I packages\KoreBuild\build -f makefile.shade %*
+packages\Sake\tools\Sake.exe -I packages\KoreBuild\build -f makefile.shade %*
\ No newline at end of file
diff --git a/build-template/build.sh b/build-template/build.sh
index 203b034a33..fd756bc44b 100644
--- a/build-template/build.sh
+++ b/build-template/build.sh
@@ -24,7 +24,7 @@ fi
 
 if test ! -d packages/KoreBuild; then
     mono .nuget/nuget.exe install KoreBuild -ExcludeVersion -o packages -nocache -pre
-    mono .nuget/nuget.exe install Sake -version 0.2 -o packages -ExcludeVersion
+    mono .nuget/nuget.exe install Sake -ExcludeVersion -Source https://www.nuget.org/api/v2/ -Out packages
 fi
 
 if ! type dnvm > /dev/null 2>&1; then
diff --git a/build-template/makefile.shade b/build-template/makefile.shade
index 4131e6502e..562494d144 100644
--- a/build-template/makefile.shade
+++ b/build-template/makefile.shade
@@ -1,7 +1,7 @@
 
 var VERSION='0.1'
 var FULL_VERSION='0.1'
-var AUTHORS='.NET Foundation'
+var AUTHORS='Microsoft Open Technologies, Inc.'
 
 use-standard-lifecycle
 k-standard-goals