Merge develop into master

Author: cf-buildpacks-eng

.bundle/config

@@ -1,2 +1,3 @@
 ---
-BUNDLE_GEMFILE: cf.Gemfile
+BUNDLE_GEMFILE: "cf.Gemfile"
+BUNDLE_BIN: ".bin"

.envrc

@@ -0,0 +1 @@
+export PATH=$PWD/.bin:$PATH

.gitignore

@@ -1,3 +1,4 @@
 dependencies/
 dotnet-core_buildpack-*.zip
 log/
+/.bin/

CHANGELOG

@@ -1,3 +1,12 @@
+v1.0.24 Aug 07, 2017
+=====================
+
+* Add support for multi buildpack
+  (https://www.pivotaltracker.com/story/show/142852043)
+
+* Add node 6.11.2, remove node 6.11.1
+  (https://www.pivotaltracker.com/story/show/149837609)
+
 v1.0.23 Jul 21, 2017
 =====================
 

VERSION

@@ -1 +1 @@
-1.0.23
+1.0.24

bin/compile

@@ -15,10 +15,16 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-`dirname $0`/compile.rb "$@" | tee -a staging_task.log
-exit_status=${PIPESTATUS[0]}
-if [ $exit_status -ne 0 ]; then
-  exit $exit_status
-fi
-mkdir -p $1/logs
-cp -f staging_task.log $1/logs/staging_task.log
+#!/bin/bash
+set -euo pipefail
+
+BUILD_DIR=$1
+CACHE_DIR=$2
+export BUILDPACK_DIR=`dirname $(readlink -f ${BASH_SOURCE%/*})`
+export DEPS_DIR="$BUILD_DIR/.cloudfoundry"
+mkdir -p "$DEPS_DIR/0"
+mkdir -p "$BUILD_DIR/.profile.d"
+echo "export DEPS_DIR=\$HOME/.cloudfoundry" > "$BUILD_DIR/.profile.d/0000_set-deps-dir.sh"
+
+$BUILDPACK_DIR/bin/supply "$BUILD_DIR" "$CACHE_DIR" "$DEPS_DIR" 0
+$BUILDPACK_DIR/bin/finalize "$BUILD_DIR" "$CACHE_DIR" "$DEPS_DIR" 0

bin/finalize

@@ -0,0 +1,24 @@
+#!/bin/bash
+# Encoding: utf-8
+# ASP.NET Core Buildpack
+# Copyright 2017 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+`dirname $0`/finalize.rb "$@" | tee -a staging_task.log
+exit_status=${PIPESTATUS[0]}
+if [ $exit_status -ne 0 ]; then
+  exit $exit_status
+fi
+mkdir -p $1/logs
+cp -f staging_task.log $1/logs/staging_task.log

bin/finalize.rb

@@ -0,0 +1,54 @@
+#!/usr/bin/env ruby
+# Encoding: utf-8
+# ASP.NET Core Buildpack
+# Copyright 2014-2016 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+build_dir = ARGV[0]
+cache_dir = ARGV[1]
+deps_dir = ARGV[2]
+deps_idx = ARGV[3]
+buildpack_dir = File.join(File.dirname(__FILE__), '..')
+$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
+
+require 'buildpack'
+require 'open3'
+
+if deps_dir
+  stdout, stderr, status = Open3.capture3("#{buildpack_dir}/compile-extensions/bin/build_path_from_supply #{deps_dir}")
+
+  if status.exitstatus.nonzero?
+    puts "build_path_from_supply script failed: #{stdout} \n====\n #{stderr}"
+    exit 1
+  end
+
+  stdout.split("\n").each do |line|
+    var, val = line.split('=')
+    ENV[var] = val
+  end
+end
+
+if AspNetCoreBuildpack.finalize(build_dir, cache_dir, deps_dir, deps_idx)
+  system("#{buildpack_dir}/compile-extensions/bin/store_buildpack_metadata #{buildpack_dir} #{cache_dir}")
+  if deps_dir
+    stdout, stderr, status = Open3.capture3("#{buildpack_dir}/compile-extensions/bin/write_profiled_from_supply #{deps_dir} #{build_dir}")
+    if status.exitstatus.nonzero?
+      puts "write_profiled_from_supply failed: #{stdout} \n====\n #{stderr}"
+      exit 1
+    end
+  end
+  exit 0
+else
+  exit 1
+end

bin/release

@@ -17,10 +17,9 @@
 
 $stdout.sync = true
 $stderr.sync = true
-$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 
-require 'buildpack'
+require 'pathname'
 
 build_dir = ARGV[0]
-
-puts AspNetCoreBuildpack.release(build_dir)
+release = Pathname.new(build_dir).join('tmp/dotnet-core-buildpack-release-step.yml')
+puts release.read if release.exist?

bin/supply

@@ -0,0 +1,24 @@
+#!/bin/bash
+# Encoding: utf-8
+# ASP.NET Core Buildpack
+# Copyright 2017 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+`dirname $0`/supply.rb "$@" | tee -a staging_task.log
+exit_status=${PIPESTATUS[0]}
+if [ $exit_status -ne 0 ]; then
+  exit $exit_status
+fi
+mkdir -p $1/logs
+cp -f staging_task.log $1/logs/staging_task.log