Updating master branch to have master feedv1.0.0-alpha4

8 files changed, 25 insertions, 25 deletions

diff --git a/NuGet.Config b/NuGet.Config
index 600a375c7e..e6d5e4fce7 100644
--- a/NuGet.Config
+++ b/NuGet.Config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <packageSources>
-    <add key="AspNetVNext" value="https://www.myget.org/F/aspnetvnext/api/v2" />
+    <add key="AspNetVNext" value="https://www.myget.org/F/aspnetmaster/api/v2" />
     <add key="NuGet.org" value="https://nuget.org/api/v2/" />
   </packageSources>
 </configuration>
\ No newline at end of file
diff --git a/README.md b/README.md
index d705a8835e..66d934275d 100644
--- a/README.md
+++ b/README.md
@@ -1,12 +1,12 @@
 # ASP.NET vNext Home

 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>

-Latest master version: [![master version](http://img.shields.io/myget/aspnetmaster/v/KRE-svr50-x64.svg?style=flat)](https://www.myget.org/gallery/aspnetmaster)

+Latest master version: [![master version](http://img.shields.io/myget/aspnetmaster/v/KRE-CLR-x86.svg?style=flat)](https://www.myget.org/gallery/aspnetmaster)

 

 The Home repository is the starting point for people to learn about ASP.NET vNext. 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 vNext.

 

 ASP.NET vNext 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.

 

-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. The NuGet.config file in the repo points to a MyGet feed (https://www.myget.org/F/aspnetvnext/) that has all the packages being developed. This feed is updated with each preview release. To try out the latest bits under development use the dev feed instead (https://www.myget.org/F/aspnetvnext).

+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. The NuGet.config file in the repo points to a MyGet feed (https://www.myget.org/F/aspnetmaster/) that has all the packages being developed. This feed is updated with each preview release. To try out the latest bits under development use the dev feed instead (https://www.myget.org/F/aspnetvnext).

 

 ## Contents

 

@@ -42,7 +42,7 @@ The first thing we need to do is setup the tools required to build and run an ap
 #### Windows

 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):

 ```powershell

-@powershell -NoProfile -ExecutionPolicy unrestricted -Command "iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/aspnet/Home/dev/kvminstall.ps1'))"

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

 ```

 After the script has run open a new command prompt to start using KVM.

 

@@ -52,7 +52,7 @@ To install KVM and the correct version of Mono on OS X using [Homebrew](http://b
 

  * Install [Homebrew](http://brew.sh) if it is not already installed.

  * Run command `brew tap aspnet/k` to tap the ASP.NET vNext related git repositories. 

- * Run command `brew install kvm` to install KVM. This also automatically install the latest KRE package from https://www.myget.org/f/aspnetvnext/api/v2 feed.

+ * Run command `brew install kvm` to install KVM. This also automatically install the latest KRE package from https://www.myget.org/f/aspnetmaster/api/v2 feed.

  * Run command `source kvm.sh` on your terminal if your terminal cannot understand kvm. 

 

 #### Linux:

@@ -60,7 +60,7 @@ To install KVM and the correct version of Mono on OS X using [Homebrew](http://b
 To install KVM on Linux run the following command:

 

 ```

-curl https://raw.githubusercontent.com/aspnet/Home/dev/kvminstall.sh | sh && source ~/.kre/kvm/kvm.sh

+curl https://raw.githubusercontent.com/aspnet/Home/master/kvminstall.sh | sh && source ~/.kre/kvm/kvm.sh

 ```

 

 Note that on Linux you need to also install [Mono](http://mono-project.com) 3.4.1 or later.

@@ -75,9 +75,9 @@ This command will download the specified version of the K Runtime Environment (K
 

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

 

-+ [ConsoleApp](https://github.com/aspnet/Home/tree/dev/samples/ConsoleApp). This is just basic console app if you want to use it as a starting point.

-+ [HelloWeb](https://github.com/aspnet/Home/tree/dev/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.

-+ [HelloMvc](https://github.com/aspnet/Home/tree/dev/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.

++ [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.

++ [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.

++ [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.

 + [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 vNext. Each of these samples have their own separate repositories that you can look at.

 

 ### Running the samples

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

 ## Feedback

 

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

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

diff --git a/kvm.ps1 b/kvm.ps1
index 2367bebffe..c38bfa7c76 100644
--- a/kvm.ps1
+++ b/kvm.ps1
@@ -38,7 +38,7 @@ function String-IsEmptyOrWhitespace([string]$str) {
 

 if (!$feed)

 {

-    $feed = "https://www.myget.org/F/aspnetvnext/api/v2";

+    $feed = "https://www.myget.org/F/aspnetmaster/api/v2";

 }

 

 $scriptPath = $myInvocation.MyCommand.Definition

diff --git a/kvm.sh b/kvm.sh
index c3a222cee1..e7da7ba579 100644
--- a/kvm.sh
+++ b/kvm.sh
@@ -15,7 +15,7 @@ fi
 
 KRE_USER_PACKAGES="$KRE_USER_HOME/packages"
 if [ -z "$KRE_FEED" ]; then
-    KRE_FEED="https://www.myget.org/F/aspnetvnext/api/v2"
+    KRE_FEED="https://www.myget.org/F/aspnetmaster/api/v2"
 fi
 
 _kvm_find_latest() {
diff --git a/kvminstall.ps1 b/kvminstall.ps1
index d269318876..22c2422627 100644
--- a/kvminstall.ps1
+++ b/kvminstall.ps1
@@ -8,8 +8,8 @@ if (!(Test-Path $tempPath)) { md $tempPath | Out-Null }
 

 $webClient = New-Object System.Net.WebClient

 Write-Host "Downloading KVM.ps1 to $kvmPs1Path"

-$webClient.DownloadFile('https://raw.githubusercontent.com/aspnet/Home/dev/kvm.ps1', $kvmPs1Path)

+$webClient.DownloadFile('https://raw.githubusercontent.com/aspnet/Home/master/kvm.ps1', $kvmPs1Path)

 Write-Host "Downloading KVM.cmd to $kvmCmdPath"

-$webClient.DownloadFile('https://raw.githubusercontent.com/aspnet/Home/dev/kvm.cmd', $kvmCmdPath)

+$webClient.DownloadFile('https://raw.githubusercontent.com/aspnet/Home/master/kvm.cmd', $kvmCmdPath)

 Write-Host "Installing KVM"

 & $kvmCmdPath setup
\ No newline at end of file
diff --git a/kvminstall.sh b/kvminstall.sh
index 65e93363b6..ab98cf8001 100644
--- a/kvminstall.sh
+++ b/kvminstall.sh
@@ -27,7 +27,7 @@ if ! _kvmsetup_has "curl"; then
 fi
 
 if [ -z "$KVM_SOURCE" ]; then
-    KVM_SOURCE="https://raw.githubusercontent.com/aspnet/Home/dev/kvm.sh"
+    KVM_SOURCE="https://raw.githubusercontent.com/aspnet/Home/master/kvm.sh"
 fi
 
 # Downloading to $KVM_DIR
diff --git a/samples/HelloMvc/project.json b/samples/HelloMvc/project.json
index 36082d31f8..113405c293 100644
--- a/samples/HelloMvc/project.json
+++ b/samples/HelloMvc/project.json
@@ -1,10 +1,10 @@
 {

     "dependencies": {

-        "Kestrel": "1.0.0-*",

-        "Microsoft.AspNet.Diagnostics": "1.0.0-*",

-        "Microsoft.AspNet.Hosting": "1.0.0-*",

-        "Microsoft.AspNet.Mvc": "6.0.0-*",

-        "Microsoft.AspNet.Server.WebListener": "1.0.0-*"

+        "Kestrel": "1.0.0-alpha4",

+        "Microsoft.AspNet.Diagnostics": "1.0.0-alpha4",

+        "Microsoft.AspNet.Hosting": "1.0.0-alpha4",

+        "Microsoft.AspNet.Mvc": "6.0.0-alpha4",

+        "Microsoft.AspNet.Server.WebListener": "1.0.0-alpha4"

     },

     "commands": {

         "web": "Microsoft.AspNet.Hosting --server Microsoft.AspNet.Server.WebListener --server.urls http://localhost:5001",

diff --git a/samples/HelloWeb/project.json b/samples/HelloWeb/project.json
index 583d9546b5..a3a0e50b28 100644
--- a/samples/HelloWeb/project.json
+++ b/samples/HelloWeb/project.json
@@ -1,10 +1,10 @@
 {

     "dependencies": {

-        "Kestrel": "1.0.0-*",

-        "Microsoft.AspNet.Diagnostics": "1.0.0-*",

-        "Microsoft.AspNet.Hosting": "1.0.0-*",

-        "Microsoft.AspNet.Server.WebListener": "1.0.0-*",

-        "Microsoft.AspNet.StaticFiles": "1.0.0-*"

+        "Kestrel": "1.0.0-alpha4",

+        "Microsoft.AspNet.Diagnostics": "1.0.0-alpha4",

+        "Microsoft.AspNet.Hosting": "1.0.0-alpha4",

+        "Microsoft.AspNet.Server.WebListener": "1.0.0-alpha4",

+        "Microsoft.AspNet.StaticFiles": "1.0.0-alpha4"

     },

     "commands": {

         "web": "Microsoft.AspNet.Hosting --server Microsoft.AspNet.Server.WebListener --server.urls http://localhost:5001",