From c2f7ef0611930ee2535e18b9ef89ee8869a2befc Mon Sep 17 00:00:00 2001
From: Michael Peters <mtpeters@us.ibm.com>
Date: Thu, 10 Sep 2015 11:36:36 -0400
Subject: [PATCH] handle beta7 breaking dnx change

---
 CHANGELOG.md                                  |  3 +++
 README.md                                     |  4 ++--
 VERSION                                       |  2 +-
 lib/buildpack/compile/release_yml_writer.rb   |  2 +-
 .../compile/release_yml_writer_spec.rb        | 24 +++++--------------
 5 files changed, 13 insertions(+), 22 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c3f32d1a9..98423d8eb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## v0.6.0 Sep 10, 2015
+- Add support for beta7 apps
+
 ## v0.5.0 Aug 17, 2015
 
 - Removed Nowin server, replaced with use of Kestrel which allows the buildpack to run beta4 - beta6 apps.
diff --git a/README.md b/README.md
index 8fb1426b4..24bf72277 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Cloud Foundry buildpack: ASP.NET 5
 
-A Cloud Foundry buildpack for ASP.NET 5 applications (tested with [beta6][] applications). For more information about ASP.NET 5 see:
+A Cloud Foundry buildpack for ASP.NET 5 applications (tested with [beta7][] applications). For more information about ASP.NET 5 see:
 
 * https://github.com/aspnet/home
 * http://docs.asp.net/en/latest/conceptual-overview/aspnet.html
@@ -61,4 +61,4 @@ Open an issue on this project.
 
 
 [Hello World sample]: https://github.com/IBM-Bluemix/asp.net5-helloworld
-[beta6]: https://github.com/aspnet/Home/releases/tag/v1.0.0-beta6
+[beta7]: https://github.com/aspnet/Home/releases/tag/v1.0.0-beta7
diff --git a/VERSION b/VERSION
index 8f0916f76..a918a2aa1 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.5.0
+0.6.0
diff --git a/lib/buildpack/compile/release_yml_writer.rb b/lib/buildpack/compile/release_yml_writer.rb
index 9257ce814..2fb78f5ff 100644
--- a/lib/buildpack/compile/release_yml_writer.rb
+++ b/lib/buildpack/compile/release_yml_writer.rb
@@ -47,7 +47,7 @@ def write_yml(ymlPath, web_dir)
         f.write <<EOT
 ---
 default_process_types:
-  web: cd #{web_dir}; sleep 999999 | dnx . #{CFWEB_CMD} --server.urls http://${VCAP_APP_HOST}:${PORT}
+  web: sleep 999999 | dnx --project #{web_dir} #{CFWEB_CMD} --server.urls http://${VCAP_APP_HOST}:${PORT}
 EOT
       end
     end
diff --git a/spec/buildpack/compile/release_yml_writer_spec.rb b/spec/buildpack/compile/release_yml_writer_spec.rb
index 00b907d7f..2a277c3b1 100644
--- a/spec/buildpack/compile/release_yml_writer_spec.rb
+++ b/spec/buildpack/compile/release_yml_writer_spec.rb
@@ -131,12 +131,8 @@
           yml.fetch('default_process_types').fetch('web')
         end
 
-        it 'changes directory to that directory' do
-          expect(web_process).to match('cd foo;')
-        end
-
-        it "runs 'dnx . kestrel'" do
-          expect(web_process).to match('dnx . kestrel')
+        it "runs 'dnx kestrel'" do
+          expect(web_process).to match('dnx --project foo kestrel')
         end
       end
     end
@@ -165,12 +161,8 @@
         yml.fetch('default_process_types').fetch('web')
       end
 
-      it 'changes directory to the correct directory' do
-        expect(web_process).to match('cd src/proj2;')
-      end
-
-      it "runs 'dnx . kestrel'" do
-        expect(web_process).to match('dnx . kestrel')
+      it "runs 'dnx kestrel'" do
+        expect(web_process).to match('dnx --project src/proj2 kestrel')
       end
     end
 
@@ -187,12 +179,8 @@
         yml.fetch('default_process_types').fetch('web')
       end
 
-      it 'changes directory to the correct directory' do
-        expect(web_process).to match('cd .;')
-      end
-
-      it "runs 'dnx . kestrel'" do
-        expect(web_process).to match('dnx . kestrel')
+      it "runs 'dnx kestrel'" do
+        expect(web_process).to match('dnx --project . kestrel')
       end
     end
   end