Merge branch 'dev' of github.com:aspnet/Home into devv1.0.0-beta8

4 files changed, 22 insertions, 15 deletions

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 8e83ec74f0..84af527c22 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -23,8 +23,8 @@ Or browse the full list of repos in the [aspnet](https://github.com/aspnet/) org
 ## Other discussions
 Our team members also monitor several other discussion forums:
 
-* [ASP.NET 5 forum](http://forums.asp.net/1255.aspx/1?ASP+NET+5)
-* [StackOverflow](http://stackoverflow.com/questions/tagged/asp.net-5) with the `asp.net-5` or `entity-framework-7` tag
+* [ASP.NET 5 forum](https://forums.asp.net/1255.aspx/1?ASP+NET+5)
+* [StackOverflow](https://stackoverflow.com/questions/tagged/asp.net-5) with the `asp.net-5` or `entity-framework-7` tag
 * [JabbR chat room](https://jabbr.net/#/rooms/aspnetvnext) for real-time discussions with the community and the people who work on the project
 
 
@@ -41,7 +41,7 @@ Here are questions you can answer before you file a bug to make sure you're not
 5. What operating system are you using?
 6. What version of IIS are you using?
 
-GitHub supports [markdown](http://github.github.com/github-flavored-markdown/), so when filing bugs make sure you check the formatting before clicking submit.
+GitHub supports [markdown](https://help.github.com/articles/github-flavored-markdown/), so when filing bugs make sure you check the formatting before clicking submit.
 
 
 ## Contributing code and content
@@ -49,7 +49,7 @@ You will need to sign a [Contributor License Agreement](https://cla2.dotnetfound
 
 Make sure you can build the code. Familiarize yourself with the project workflow and our coding conventions. If you don't know what a pull request is read this article: https://help.github.com/articles/using-pull-requests.
 
-Before submitting a feature or substantial code contribution please discuss it with the team and ensure it follows the product roadmap. You might also read these two blogs posts on contributing code: [Open Source Contribution Etiquette](http://tirania.org/blog/archive/2010/Dec-31.html) by Miguel de Icaza and [Don't "Push" Your Pull Requests](http://www.igvita.com/2011/12/19/dont-push-your-pull-requests/) by Ilya Grigorik. Note that all code submissions will be rigorously reviewed and tested by the ASP.NET and Entity Framework teams, and only those that meet an extremely high bar for both quality and design/roadmap appropriateness will be merged into the source.
+Before submitting a feature or substantial code contribution please discuss it with the team and ensure it follows the product roadmap. You might also read these two blogs posts on contributing code: [Open Source Contribution Etiquette](http://tirania.org/blog/archive/2010/Dec-31.html) by Miguel de Icaza and [Don't "Push" Your Pull Requests](https://www.igvita.com/2011/12/19/dont-push-your-pull-requests/) by Ilya Grigorik. Note that all code submissions will be rigorously reviewed and tested by the ASP.NET and Entity Framework teams, and only those that meet an extremely high bar for both quality and design/roadmap appropriateness will be merged into the source.
 
 Here's a few things you should always do when making changes to the code base:
 
@@ -64,7 +64,7 @@ Summary of the changes (Less than 80 chars)
  - Detail 1
  - Detail 2
 
-#bugnumber (in this specific format)
+Addresses #bugnumber (in this specific format)
 ```
 
 **Tests**
diff --git a/README.md b/README.md
index c2ac0857e4..0310f9b663 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 

 This guide is designed to get you started building applications with the latest development versions ASP.NET 5 and DNX. This means nightly builds and potentially broken or unstable packages.

 

-If you want a more stable, released, experience then you should go to http://www.asp.net/vnext.

+If you want a more stable, released, experience then you should go to https://www.asp.net/vnext.

 

 ## What you need

 

@@ -40,7 +40,7 @@ where dnvm
 

 ## OS X

 

-See the instructions on the ASP.NET 5 Documentation site: [Installing ASP.NET 5 on Mac OS X](http://docs.asp.net/en/latest/getting-started/installing-on-mac.html)

+See the instructions on the ASP.NET 5 Documentation site: [Installing ASP.NET 5 on Mac OS X](https://docs.asp.net/en/latest/getting-started/installing-on-mac.html)

 

 ## Linux

 

@@ -69,13 +69,13 @@ You should also be able to run `dnx` and see the help text of the `dnx` command.
 4. You should see a bunch of output as all the dependencies of the app are downloaded from MyGet.

 5. Run the sample using the appropriate DNX command:

     - For the console app run  `dnx run`.

-    - For the web apps run `dnx web` on Windows or `dnx kestrel` on OS X/Linux.

+    - For the web apps run `dnx kestrel`.

 6. You should see the output of the console app or a message that says the site is now started.

 7. You can navigate to the web apps in a browser by navigating to `http://localhost:5001` or `http://localhost:5004` if running on OS X/Linux.

 

 # Documentation and Further Learning

 

-## [Community Standup](http://www.youtube.com/playlist?list=PL0M0zPgJ3HSftTAAHttA3JQU4vOjXFquF)

+## [Community Standup](https://www.youtube.com/playlist?list=PL0M0zPgJ3HSftTAAHttA3JQU4vOjXFquF)

 The community standup is held every week and streamed live to YouTube. You can view past standups in the linked playlist.

 

 If you have questions you can also jump online during the next standup and have them answered live.

@@ -85,7 +85,7 @@ We have some useful documentation on the wiki of this Repo. This wiki is a centr
 

 If you see errors, or want some extra content, then feel free to create an issue or send a pull request (see feedback section below).

 

-## [ASP.NET/vNext](http://www.asp.net/vnext)

+## [ASP.NET/vNext](https://www.asp.net/vnext)

 The vNext page on the ASP.NET site has links to some TechEd videos and articles with some good information about vNext.

 

 ## Repos and Projects

diff --git a/dnvm.ps1 b/dnvm.ps1
index 62f305b695..153ca7ce66 100644
--- a/dnvm.ps1
+++ b/dnvm.ps1
@@ -67,7 +67,7 @@ function _WriteOut {
 
 ### Constants
 $ProductVersion="1.0.0"
-$BuildVersion="rc1-15523"
+$BuildVersion="rc1-15526"
 $Authors="Microsoft Open Technologies, Inc."
 
 # If the Version hasn't been replaced...
@@ -1848,10 +1848,17 @@ if(Test-Path env:\KRE_HOME) {
 
 $cmd = $args[0]
 
+$cmdargs = @()
 if($args.Length -gt 1) {
-    $cmdargs = @($args[1..($args.Length-1)])
-} else {
-    $cmdargs = @()
+    # Combine arguments, ensuring any containing whitespace or parenthesis are correctly quoted 
+    ForEach ($arg In $args[1..($args.Length-1)]) {
+        if ($arg -match "[\s\(\)]") {
+            $cmdargs += """$arg"""
+        } else {
+            $cmdargs += $arg
+        }
+        $cmdargs += " "
+    }
 }
 
 # Can't add this as script-level arguments because they mask '-a' arguments in subcommands!
diff --git a/dnvm.sh b/dnvm.sh
index 02397d2ecc..f874a4e53a 100644
--- a/dnvm.sh
+++ b/dnvm.sh
@@ -2,7 +2,7 @@
 # Source this file from your .bash-profile or script to use
 
 # "Constants"
-_DNVM_BUILDNUMBER="rc1-15523"
+_DNVM_BUILDNUMBER="rc1-15526"
 _DNVM_AUTHORS="Microsoft Open Technologies, Inc."
 _DNVM_RUNTIME_PACKAGE_NAME="dnx"
 _DNVM_RUNTIME_FRIENDLY_NAME=".NET Execution Environment"