Skip to content

Commit 2b5be59

Browse files
committed
Update README.md
1 parent cb55fcc commit 2b5be59

File tree

2 files changed

+34
-11
lines changed

2 files changed

+34
-11
lines changed

.gitattributes

+9-8
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,12 @@
66
# checkin and prevent conversion to CRLF when they are checked out
77
# (this is required in order to prevent newline related issues like,
88
# for example, after the build script is run)
9-
.* text eol=lf
10-
*.cs text eol=lf
11-
*.css text eol=lf
12-
*.html text eol=lf
13-
*.js text eol=lf
14-
*.json text eol=lf
15-
*.md text eol=lf
16-
*.txt text eol=lf
9+
.* text eol=lf
10+
*.cs text eol=lf
11+
*.cshtml text eol=lf
12+
*.css text eol=lf
13+
*.html text eol=lf
14+
*.js text eol=lf
15+
*.json text eol=lf
16+
*.md text eol=lf
17+
*.txt text eol=lf

README.md

+25-3
Original file line numberDiff line numberDiff line change
@@ -63,18 +63,25 @@ $ git clone -o aspnet-starter-kit -b master --single-branch \
6363
$ cd MyApp
6464
```
6565

66+
Alternatively, scaffold your project with [Yeoman](http://yeoman.io/):
67+
68+
```shell
69+
$ npm install -g yo
70+
$ npm install -g generator-aspnetcore
71+
$ yo aspnetcore
72+
```
73+
6674
`2`. Install project dependencies listed in [`project.json`](./server/project.json) and
6775
[`package.json`](./package.json) files:
6876

6977
```shell
70-
$ dotnet restore # Installs .NET dependencies listed in project.json
71-
$ npm install # Installs Node.js dependencies listed in package.json
78+
$ npm install # Install both Node.js and .NET Core dependencies
7279
```
7380

7481
`3`. Finally, launch the web app:
7582

7683
```shell
77-
$ npm start # Compiles and lanches the app
84+
$ npm start # Compile and lanch the app
7885
```
7986

8087
The app should become available at [http://localhost:5000/](http://localhost:5000/)
@@ -92,6 +99,21 @@ app into a distributable format and upload that to Windows Azure App Service, si
9299
$ npm run deploy # Same as running: node tools/deploy --production
93100
```
94101

102+
### How to Update
103+
104+
We work hard on keeping the project up to date and adding new features. After starting a new web
105+
application project based on this boilerplate, you can alwasy fetch and merge the latest changes
106+
from this (upstream) repo back into your project by running:
107+
108+
```shell
109+
$ git checkout master
110+
$ git fetch aspnet-starter-kit
111+
$ git merge aspnet-starter-kit/master
112+
```
113+
114+
Alternatively, you can pull the updates into a separate folder and and compare that folder with your
115+
project by using a diff tool such as [Beyond Compare](http://www.scootersoftware.com/).
116+
95117

96118
### References
97119

0 commit comments

Comments
 (0)