From b035e31dc74cba2459a201aa607281983ea61e8e Mon Sep 17 00:00:00 2001 From: Pranav K Date: Fri, 14 Oct 2016 15:06:05 -0700 Subject: [PATCH 1/4] Specify the publish feed in Universe makefile --- makefile.shade | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/makefile.shade b/makefile.shade index 0cf14769f1..57428a8d42 100644 --- a/makefile.shade +++ b/makefile.shade @@ -213,6 +213,11 @@ var buildTarget = "compile" } } + if (Environment.GetEnvironmentVariable("UNIVERSE_PUSH_TO_VOLATILE") == "true") + { + Environment.SetEnvironmentVariable("NUGET_PUBLISH_FEED", "https://dotnet.myget.org/F/aspnetcore-volatile-release/api/v2/package"); + } + foreach (var batch in batchedRepos) { Parallel.ForEach(batch.ToArray(), new ParallelOptions { MaxDegreeOfParallelism = threads }, repo => From 5be73be4debced353ee9f4e0becb65aaaafec118 Mon Sep 17 00:00:00 2001 From: Pranav K Date: Fri, 14 Oct 2016 16:02:25 -0700 Subject: [PATCH 2/4] Pin to 1.1.0-preview1 KoreBuild --- build.ps1 | 2 +- build.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.ps1 b/build.ps1 index 8f2f99691a..787f63ac02 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/dev.zip" +$koreBuildZip="https://github.com/aspnet/KoreBuild/archive/rel/1.1.0-preview1.zip" if ($env:KOREBUILD_ZIP) { $koreBuildZip=$env:KOREBUILD_ZIP diff --git a/build.sh b/build.sh index f4208100eb..355c682856 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/dev.zip" +koreBuildZip="https://github.com/aspnet/KoreBuild/archive/rel/1.1.0-preview1.zip" if [ ! -z $KOREBUILD_ZIP ]; then koreBuildZip=$KOREBUILD_ZIP fi From 0f4701dd9271f97bfd1d3e27f5ef8e6fa851073d Mon Sep 17 00:00:00 2001 From: Pranav K Date: Mon, 17 Oct 2016 08:50:04 -0700 Subject: [PATCH 3/4] Clone to rel/1.1.0-preview1 --- makefile.shade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/makefile.shade b/makefile.shade index 57428a8d42..77713e6cf2 100644 --- a/makefile.shade +++ b/makefile.shade @@ -19,7 +19,7 @@ use import="Json" functions @{ - const string DefaultBuildBranch = "dev"; + const string DefaultBuildBranch = "rel/1.1.0-preview1"; const string DefaultCoherenceCacheDir = ".coherence-cache"; const string UniverseCommitsFileName = "commits-universe"; const string CoherenceCacheVersionFileName = "coherence-version"; From 5bb405b58538046bbf779eaf0f012f4ce74a732e Mon Sep 17 00:00:00 2001 From: Pranav K Date: Mon, 17 Oct 2016 09:16:34 -0700 Subject: [PATCH 4/4] Clone rel/1.1.0-preview1 --- makefile.shade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/makefile.shade b/makefile.shade index 77713e6cf2..1434d96c5e 100644 --- a/makefile.shade +++ b/makefile.shade @@ -29,7 +29,7 @@ functions static string baseDir = Directory.GetCurrentDirectory(); static string targetDir = Path.Combine(baseDir, "artifacts", "build"); - static string buildBranch = GetEnvironmentParameter("BUILD_BRANCH") ?? DefaultBuildBranch; + static string buildBranch = DefaultBuildBranch; static string coherencePath = GetEnvironmentParameter("COHERENCE_PATH"); static string dropsShare = GetEnvironmentParameter("ASPNETCI_DROPS_SHARE", DefaultDropsShare); static string kBuildVersion = GetEnvironmentParameter("DNX_BUILD_VERSION");