Skip to content

Commit 86c7501

Browse files
committed
Merge branch 'dev' of github.com:aspnet/Home into dev
2 parents 01a13ed + 82fb0cf commit 86c7501

File tree

4 files changed

+22
-15
lines changed

4 files changed

+22
-15
lines changed

CONTRIBUTING.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ Or browse the full list of repos in the [aspnet](https://github.com/aspnet/) org
2323
## Other discussions
2424
Our team members also monitor several other discussion forums:
2525

26-
* [ASP.NET 5 forum](http://forums.asp.net/1255.aspx/1?ASP+NET+5)
27-
* [StackOverflow](http://stackoverflow.com/questions/tagged/asp.net-5) with the `asp.net-5` or `entity-framework-7` tag
26+
* [ASP.NET 5 forum](https://forums.asp.net/1255.aspx/1?ASP+NET+5)
27+
* [StackOverflow](https://stackoverflow.com/questions/tagged/asp.net-5) with the `asp.net-5` or `entity-framework-7` tag
2828
* [JabbR chat room](https://jabbr.net/#/rooms/aspnetvnext) for real-time discussions with the community and the people who work on the project
2929

3030

@@ -41,15 +41,15 @@ Here are questions you can answer before you file a bug to make sure you're not
4141
5. What operating system are you using?
4242
6. What version of IIS are you using?
4343

44-
GitHub supports [markdown](http://github.github.com/github-flavored-markdown/), so when filing bugs make sure you check the formatting before clicking submit.
44+
GitHub supports [markdown](https://help.github.com/articles/github-flavored-markdown/), so when filing bugs make sure you check the formatting before clicking submit.
4545

4646

4747
## Contributing code and content
4848
You will need to sign a [Contributor License Agreement](https://cla2.dotnetfoundation.org/) before submitting your pull request. To complete the Contributor License Agreement (CLA), you will need to submit a request via the form and then electronically sign the Contributor License Agreement when you receive the email containing the link to the document. This needs to only be done once for any .NET Foundation OSS project.
4949

5050
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.
5151

52-
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.
52+
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.
5353

5454
Here's a few things you should always do when making changes to the code base:
5555

@@ -64,7 +64,7 @@ Summary of the changes (Less than 80 chars)
6464
- Detail 1
6565
- Detail 2
6666
67-
#bugnumber (in this specific format)
67+
Addresses #bugnumber (in this specific format)
6868
```
6969

7070
**Tests**

README.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
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.
44

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

77
## What you need
88

@@ -40,7 +40,7 @@ where dnvm
4040
4141
## OS X
4242

43-
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)
43+
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)
4444

4545
## Linux
4646

@@ -69,13 +69,13 @@ You should also be able to run `dnx` and see the help text of the `dnx` command.
6969
4. You should see a bunch of output as all the dependencies of the app are downloaded from MyGet.
7070
5. Run the sample using the appropriate DNX command:
7171
- For the console app run `dnx run`.
72-
- For the web apps run `dnx web` on Windows or `dnx kestrel` on OS X/Linux.
72+
- For the web apps run `dnx kestrel`.
7373
6. You should see the output of the console app or a message that says the site is now started.
7474
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.
7575

7676
# Documentation and Further Learning
7777

78-
## [Community Standup](http://www.youtube.com/playlist?list=PL0M0zPgJ3HSftTAAHttA3JQU4vOjXFquF)
78+
## [Community Standup](https://www.youtube.com/playlist?list=PL0M0zPgJ3HSftTAAHttA3JQU4vOjXFquF)
7979
The community standup is held every week and streamed live to YouTube. You can view past standups in the linked playlist.
8080

8181
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
8585

8686
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).
8787

88-
## [ASP.NET/vNext](http://www.asp.net/vnext)
88+
## [ASP.NET/vNext](https://www.asp.net/vnext)
8989
The vNext page on the ASP.NET site has links to some TechEd videos and articles with some good information about vNext.
9090

9191
## Repos and Projects

dnvm.ps1

+11-4
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ function _WriteOut {
6767

6868
### Constants
6969
$ProductVersion="1.0.0"
70-
$BuildVersion="rc1-15523"
70+
$BuildVersion="rc1-15526"
7171
$Authors="Microsoft Open Technologies, Inc."
7272

7373
# If the Version hasn't been replaced...
@@ -1848,10 +1848,17 @@ if(Test-Path env:\KRE_HOME) {
18481848

18491849
$cmd = $args[0]
18501850

1851+
$cmdargs = @()
18511852
if($args.Length -gt 1) {
1852-
$cmdargs = @($args[1..($args.Length-1)])
1853-
} else {
1854-
$cmdargs = @()
1853+
# Combine arguments, ensuring any containing whitespace or parenthesis are correctly quoted
1854+
ForEach ($arg In $args[1..($args.Length-1)]) {
1855+
if ($arg -match "[\s\(\)]") {
1856+
$cmdargs += """$arg"""
1857+
} else {
1858+
$cmdargs += $arg
1859+
}
1860+
$cmdargs += " "
1861+
}
18551862
}
18561863

18571864
# Can't add this as script-level arguments because they mask '-a' arguments in subcommands!

dnvm.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Source this file from your .bash-profile or script to use
33

44
# "Constants"
5-
_DNVM_BUILDNUMBER="rc1-15523"
5+
_DNVM_BUILDNUMBER="rc1-15526"
66
_DNVM_AUTHORS="Microsoft Open Technologies, Inc."
77
_DNVM_RUNTIME_PACKAGE_NAME="dnx"
88
_DNVM_RUNTIME_FRIENDLY_NAME=".NET Execution Environment"

0 commit comments

Comments
 (0)