Skip to content

Commit e972759

Browse files
committed
Merging release branch over to master
1 parent 98828c9 commit e972759

File tree

6 files changed

+529
-520
lines changed

6 files changed

+529
-520
lines changed

README.md

+27-15
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
# ASP.NET 5 Home
2-
Latest dev version: [![dev version](http://img.shields.io/myget/aspnetvnext/v/KRE-CLR-x86.svg?style=flat)](https://www.myget.org/gallery/aspnetvnext)<br>
3-
Latest master version: [![master version](http://img.shields.io/myget/aspnetmaster/v/KRE-CLR-x86.svg?style=flat)](https://www.myget.org/gallery/aspnetmaster)
2+
Latest dev version: [![dev version](http://img.shields.io/myget/aspnetvnext/v/kre-clr-win-x86.svg?style=flat)](https://www.myget.org/gallery/aspnetvnext)<br>
3+
Latest master version: [![master version](http://img.shields.io/myget/aspnetmaster/v/kre-clr-win-x86.svg?style=flat)](https://www.myget.org/gallery/aspnetmaster)
44

55
The Home repository is the starting point for people to learn about ASP.NET 5. This repo contains samples and [documentation](https://github.com/aspnet/Home/wiki) to help folks get started and learn more about what's coming in ASP.NET 5.
66

77
ASP.NET 5 is being actively developed by the ASP.NET team assigned to the Microsoft Open Tech Hub and in collaboration with a community of open source developers. Together we are dedicated to creating the best possible platform for web development.
88

9-
The samples provided in this repo are designed to show some of the features of the new framework and to provide a starting point for further exploration. All the component packages are available on Nuget. To try out the latest bits under development switch to the dev branch of the Home repo and use the dev feed in Nuget.config (https://www.myget.org/F/aspnetvnext).
9+
The samples provided in this repo are designed to show some of the features of the new framework and to provide a starting point for further exploration. All the component packages are available on NuGet. To try out the latest bits under development switch to the dev branch of the Home repo and use the dev feed in NuGet.config (https://www.myget.org/F/aspnetvnext).
1010

1111
## Contents
1212

@@ -37,16 +37,22 @@ That said, you can also try out ASP.NET 5 with just a command-prompt and a text
3737

3838
### Install the K Version Manager (KVM)
3939

40-
The first thing we need to do is setup the tools required to build and run an application. We will start out by getting the [K Version Manager (KVM)](https://github.com/aspnet/Home/wiki/version-manager). You use the K Version Manager to install different versions of the ASP.NET 5 runtime and switch between them.
40+
The first thing we need to do is setup the tools required to build and run an application. We will start out by getting the [K Version Manager (KVM)](https://github.com/aspnet/Home/wiki/version-manager). We use the K Version Manager to install different versions of the ASP.NET 5 runtime and switch between them.
4141

4242
#### Windows
43-
To install KVM on Windows run the following command, which will download and run a script that installs KVM for the current user (requires admin privileges):
43+
To install KVM on Windows run the following command, which will download and run a script that installs KVM for the current user (requires admin privileges for Powershell). This will use the currently released version of `kvm` (from the `release` branch of this repo).
4444

4545
```
46-
@powershell -NoProfile -ExecutionPolicy unrestricted -Command "iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/aspnet/Home/master/kvminstall.ps1'))"
46+
@powershell -NoProfile -ExecutionPolicy unrestricted -Command "iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/aspnet/Home/release/kvminstall.ps1'))"
4747
4848
```
4949

50+
If you want to run on the bleeding edge and install the latest development version of KVM, run the following command:
51+
52+
```
53+
@powershell -NoProfile -ExecutionPolicy unrestricted -Command "&{$Branch='dev';iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/aspnet/Home/release/kvminstall.ps1'))}"
54+
```
55+
5056
After the script has run open a new command prompt to start using KVM.
5157

5258
#### OS X:
@@ -60,10 +66,16 @@ To install KVM and the correct version of Mono on OS X using [Homebrew](http://b
6066

6167
#### Linux:
6268

63-
To install KVM on Linux run the following command:
69+
Installing KVM requires `curl`. Do verify if that is installed on the machine. Next install KVM on Linux run the following command:
70+
71+
```
72+
curl -sSL https://raw.githubusercontent.com/aspnet/Home/release/kvminstall.sh | sh && source ~/.k/kvm/kvm.sh
73+
```
74+
75+
If you want to run on the bleeding edge and install the latest development version of KVM, use this command:
6476

6577
```
66-
curl -sSL https://raw.githubusercontent.com/aspnet/Home/master/kvminstall.sh | sh && source ~/.kre/kvm/kvm.sh
78+
curl -sSL https://raw.githubusercontent.com/aspnet/Home/release/kvminstall.sh | KVM_BRANCH=dev sh && source ~/.k/kvm/kvm.sh
6779
```
6880

6981
Note that on Linux you need to also install [Mono](http://mono-project.com) 3.4.1 or later.
@@ -78,9 +90,9 @@ This command will download the specified version of the K Runtime Environment (K
7890

7991
The samples in this repo are basic starting points for you to experiment with.
8092

81-
+ [ConsoleApp](https://github.com/aspnet/Home/tree/master/samples/ConsoleApp). This is just basic console app if you want to use it as a starting point.
82-
+ [HelloWeb](https://github.com/aspnet/Home/tree/master/samples/HelloWeb). This is a minimal startup class that shows welcome page and static file middleware. This is mostly for you to run through the steps in the readme and make sure you have everything setup and working correctly.
83-
+ [HelloMvc](https://github.com/aspnet/Home/tree/master/samples/HelloMvc). This sample is a basic MVC app. It is not designed to show all the functionality of the new web stack, but to give you a starting point to play with features.
93+
+ [ConsoleApp](https://github.com/aspnet/Home/tree/release/samples/ConsoleApp). This is just basic console app if you want to use it as a starting point.
94+
+ [HelloWeb](https://github.com/aspnet/Home/tree/release/samples/HelloWeb). This is a minimal startup class that shows welcome page and static file middleware. This is mostly for you to run through the steps in the readme and make sure you have everything setup and working correctly.
95+
+ [HelloMvc](https://github.com/aspnet/Home/tree/release/samples/HelloMvc). This sample is a basic MVC app. It is not designed to show all the functionality of the new web stack, but to give you a starting point to play with features.
8496
+ [MVC Music Store](https://github.com/aspnet/MusicStore) and [BugTracker](https://github.com/aspnet/BugTracker) are application samples that are both being ported to ASP.NET 5. Each of these samples have their own separate repositories that you can look at.
8597

8698
### Running the samples
@@ -115,13 +127,13 @@ The community standup is held every week and streamed live to YouTube. You can v
115127

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

118-
### [Wiki Documentation] (https://github.com/aspnet/Home/wiki)
130+
### [Wiki Documentation](https://github.com/aspnet/Home/wiki)
119131
We have some useful documentation on the wiki of this Repo. This wiki is a central spot for docs from any part of the stack.
120132

121133
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).
122134

123-
### [ASP.NET/5](http://www.asp.net/vnext)
124-
The 5 page on the ASP.NET site has links to some TechEd videos and articles with some good information about ASP.NET 5.
135+
### [ASP.NET/vNext](http://www.asp.net/vnext)
136+
The vNext page on the ASP.NET site has links to some TechEd videos and articles with some good information about ASP.NET 5.
125137

126138
## Repos and Projects
127139

@@ -138,4 +150,4 @@ A description of all the repos is [here](https://github.com/aspnet/Home/wiki/Rep
138150

139151
## Feedback
140152

141-
Check out the [contributing](https://github.com/aspnet/Home/blob/master/CONTRIBUTING.md) page to see the best places to log issues and start discussions.
153+
Check out the [contributing](https://github.com/aspnet/Home/blob/release/CONTRIBUTING.md) page to see the best places to log issues and start discussions.

kvm.cmd

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

33
PowerShell -NoProfile -NoLogo -ExecutionPolicy unrestricted -Command "[System.Threading.Thread]::CurrentThread.CurrentCulture = ''; [System.Threading.Thread]::CurrentThread.CurrentUICulture = '';& '%~dp0kvm.ps1' %*"
44

5-
IF EXIST "%USERPROFILE%\.kre\run-once.cmd" (
6-
CALL "%USERPROFILE%\.kre\run-once.cmd"
7-
DEL "%USERPROFILE%\.kre\run-once.cmd"
5+
IF EXIST "%USERPROFILE%\.k\temp-set-envvars.cmd" (
6+
CALL "%USERPROFILE%\.k\temp-set-envvars.cmd"
7+
DEL "%USERPROFILE%\.k\temp-set-envvars.cmd"
88
)

0 commit comments

Comments
 (0)