Merge branch 'UpdateBeta'v1.0.0-beta1

Conflicts:
	NuGet.Config
	README.md
	kvm.ps1
	kvm.sh
	samples/HelloMvc/project.json
	samples/HelloWeb/project.json

 Merging beta release changes

7 files changed, 19 insertions, 22 deletions

diff --git a/NuGet.Config b/NuGet.Config
deleted file mode 100644
index e6d5e4fce7..0000000000
--- a/NuGet.Config
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <packageSources>
-    <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 3bd82b5969..3d2e50a04b 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@ The Home repository is the starting point for people to learn about ASP.NET vNex
 

 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/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).

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

 

 ## Contents

 

@@ -31,7 +31,7 @@ These are the current minimum requirements for the latest preview release. They
 

 ## Getting Started

 

-The easiest way to get started with ASP.NET vNext is to try out the latest preview of Visual Studio "14". You can find installation instructions and getting started documentation at http://www.asp.net/vnext.

+The easiest way to get started with ASP.NET vNext is to try out the latest preview of Visual Studio 2015 Preview. You can find installation instructions and getting started documentation at http://www.asp.net/vnext.

 

 That said, you can also try out ASP.NET vNext with just a command-prompt and a text editor. The following instructions will walk you through getting your dev environment setup.

 

@@ -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. If you had already tapped the repo for previous releases, run `brew untap aspnet/k` to delete the old commands and tap again to get the updated brew scripts.

- * 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 `brew install kvm` to install KVM. This also automatically install the latest KRE package from https://www.nuget.org/api/v2 feed.

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

 

 #### Linux:

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

 if (!$feed)

 {

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

+ $feed = "https://www.nuget.org/api/v2";

 }

 

 $scriptPath = $myInvocation.MyCommand.Definition

diff --git a/kvm.sh b/kvm.sh
index e7da7ba579..30aff8491f 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/aspnetmaster/api/v2"
+    KRE_FEED="https://www.nuget.org/api/v2"
 fi
 
 _kvm_find_latest() {
diff --git a/samples/ConsoleApp/project.json b/samples/ConsoleApp/project.json
index 4545d53671..9c297e5bc9 100644
--- a/samples/ConsoleApp/project.json
+++ b/samples/ConsoleApp/project.json
@@ -1,9 +1,13 @@
 {

   "dependencies": {

-    "System.Console": "4.0.0.0"

+    

   },

   "frameworks": {

-    "net45": {},

-    "k10": {}

+    "aspnet50": {},

+    "aspnetcore50": {

+	"dependencies": {

+                "System.Console": "4.0.0-beta-*"

+            }

+}

   }

 }
\ No newline at end of file
diff --git a/samples/HelloMvc/project.json b/samples/HelloMvc/project.json
index 113405c293..612a8101b2 100644
--- a/samples/HelloMvc/project.json
+++ b/samples/HelloMvc/project.json
@@ -10,8 +10,8 @@
         "web": "Microsoft.AspNet.Hosting --server Microsoft.AspNet.Server.WebListener --server.urls http://localhost:5001",

         "kestrel": "Microsoft.AspNet.Hosting --server Kestrel --server.urls http://localhost:5004"

     },

-    "frameworks": { 

-         "aspnet50": { }, 

-         "aspnetcore50": { } 

-    }

+	 "frameworks": {

+        "aspnet50": {},

+        "aspnetcore50": {}

+  }

 }
\ No newline at end of file
diff --git a/samples/HelloWeb/project.json b/samples/HelloWeb/project.json
index a3a0e50b28..531862c90f 100644
--- a/samples/HelloWeb/project.json
+++ b/samples/HelloWeb/project.json
@@ -11,7 +11,7 @@
         "kestrel": "Microsoft.AspNet.Hosting --server Kestrel --server.urls http://localhost:5004"

     },

     "frameworks": {

-        "aspnet50": { }, 

-         "aspnetcore50": { } 

-    }

+	"aspnet50": {},

+        "aspnetcore50": {}

+	}

 }
\ No newline at end of file