Skip to content

Commit

Permalink
Merge pull request #17 from opiethehokie/beta7
Browse files Browse the repository at this point in the history
handle beta7 breaking dnx change
  • Loading branch information
jgawor committed Sep 15, 2015
2 parents 376234c + c2f7ef0 commit f3c5417
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 22 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -65,4 +65,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
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.5.0
0.6.0
2 changes: 1 addition & 1 deletion lib/buildpack/compile/release_yml_writer.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
24 changes: 6 additions & 18 deletions spec/buildpack/compile/release_yml_writer_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand All @@ -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
Expand Down

0 comments on commit f3c5417

Please sign in to comment.