From 6a38859cf7515342e150baeb8fc689fc1c60d7ce Mon Sep 17 00:00:00 2001
From: Nate McMaster <nate.mcmaster@microsoft.com>
Date: Wed, 1 Feb 2017 16:13:01 -0800
Subject: [PATCH] Upgrade to VS 2017

---
 MetaPackages.sln                              | 13 +++-------
 NuGet.config                                  |  3 ++-
 NuGetPackageVerifier.json                     |  2 +-
 build.ps1                                     |  2 +-
 build.sh                                      |  2 +-
 build/common.props                            | 21 +++++++++++++++
 global.json                                   |  8 ------
 makefile.shade                                |  6 -----
 .../Microsoft.AspNetCore.csproj               | 26 +++++++++++++++++++
 .../Microsoft.AspNetCore.xproj                | 20 --------------
 src/Microsoft.AspNetCore/project.json         | 24 -----------------
 version.props                                 |  7 +++++
 12 files changed, 63 insertions(+), 71 deletions(-)
 create mode 100644 build/common.props
 delete mode 100644 global.json
 delete mode 100644 makefile.shade
 create mode 100644 src/Microsoft.AspNetCore/Microsoft.AspNetCore.csproj
 delete mode 100644 src/Microsoft.AspNetCore/Microsoft.AspNetCore.xproj
 delete mode 100644 src/Microsoft.AspNetCore/project.json
 create mode 100644 version.props

diff --git a/MetaPackages.sln b/MetaPackages.sln
index 320802fac1..6103295817 100644
--- a/MetaPackages.sln
+++ b/MetaPackages.sln
@@ -1,16 +1,11 @@
-
+
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
+# Visual Studio 15
+VisualStudioVersion = 15.0.26127.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{ED834E68-51C3-4ADE-ACC8-6BA6D4207C09}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{8DFE5055-E413-45B8-B584-3FDC84B2D5F2}"
-	ProjectSection(SolutionItems) = preProject
-		global.json = global.json
-	EndProjectSection
-EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore", "src\Microsoft.AspNetCore\Microsoft.AspNetCore.xproj", "{6F3D43F7-9546-4B41-AF04-CF4708B62051}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore", "src\Microsoft.AspNetCore\Microsoft.AspNetCore.csproj", "{6F3D43F7-9546-4B41-AF04-CF4708B62051}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/NuGet.config b/NuGet.config
index 2ad0f8ba84..8e65695611 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -2,6 +2,7 @@
 <configuration>
   <packageSources>
     <add key="AspNetCore" value="https://dotnet.myget.org/F/aspnetcore-ci-dev/api/v3/index.json" />
+    <add key="AspNetCoreTools" value="https://dotnet.myget.org/F/aspnetcore-tools/api/v3/index.json" />
     <add key="NuGet" value="https://api.nuget.org/v3/index.json" />
   </packageSources>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/NuGetPackageVerifier.json b/NuGetPackageVerifier.json
index 45b04454bf..b153ab1515 100644
--- a/NuGetPackageVerifier.json
+++ b/NuGetPackageVerifier.json
@@ -1,5 +1,5 @@
 {
-    "Default": { // Rules to run for packages not listed in any other set.
+    "Default": {
         "rules": [
             "DefaultCompositeRule"
         ]
diff --git a/build.ps1 b/build.ps1
index 8f2f99691a..0605b59c01 100644
--- a/build.ps1
+++ b/build.ps1
@@ -33,7 +33,7 @@ cd $PSScriptRoot
 $repoFolder = $PSScriptRoot
 $env:REPO_FOLDER = $repoFolder
 
-$koreBuildZip="https://github.com/aspnet/KoreBuild/archive/dev.zip"
+$koreBuildZip="https://github.com/aspnet/KoreBuild/archive/feature/msbuild.zip"
 if ($env:KOREBUILD_ZIP)
 {
     $koreBuildZip=$env:KOREBUILD_ZIP
diff --git a/build.sh b/build.sh
index 4fd7ede788..07997d6c83 100755
--- a/build.sh
+++ b/build.sh
@@ -2,7 +2,7 @@
 repoFolder="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 cd $repoFolder
 
-koreBuildZip="https://github.com/aspnet/KoreBuild/archive/dev.zip"
+koreBuildZip="https://github.com/aspnet/KoreBuild/archive/feature/msbuild.zip"
 if [ ! -z $KOREBUILD_ZIP ]; then
     koreBuildZip=$KOREBUILD_ZIP
 fi
diff --git a/build/common.props b/build/common.props
new file mode 100644
index 0000000000..e9627f2b22
--- /dev/null
+++ b/build/common.props
@@ -0,0 +1,21 @@
+<Project>
+  <Import Project="..\version.props" />
+
+  <PropertyGroup>
+    <Product>Microsoft ASP.NET Core</Product>
+    <RepositoryUrl>https://github.com/aspnet/MetaPackages</RepositoryUrl>
+    <RepositoryType>git</RepositoryType>
+    <NetCoreAppImplicitPackageVersion>1.2.0-*</NetCoreAppImplicitPackageVersion>
+    <NetStandardImplicitPackageVersion>1.6.2-*</NetStandardImplicitPackageVersion>
+    <VersionSuffix Condition="'$(VersionSuffix)'!='' AND '$(BuildNumber)' != ''">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Internal.AspNetCore.Sdk" Version="1.0.1-*" PrivateAssets="All" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFrameworkIdentifier)'=='.NETFramework' AND '$(OutputType)'=='library'">
+    <PackageReference Include="NETStandard.Library" Version="$(NetStandardImplicitPackageVersion)" />
+  </ItemGroup>
+
+</Project>
diff --git a/global.json b/global.json
deleted file mode 100644
index 0ad1995dd2..0000000000
--- a/global.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "projects": [
-    "src"
-  ],
-  "sdk": {
-    "version": "1.0.0-preview2-1-003180"
-  }
-}
\ No newline at end of file
diff --git a/makefile.shade b/makefile.shade
deleted file mode 100644
index 3b0f5f69bf..0000000000
--- a/makefile.shade
+++ /dev/null
@@ -1,6 +0,0 @@
-var AUTHORS='Microsoft Open Technologies, Inc.'
-
-use-standard-lifecycle
-k-standard-goals
-
--Environment.SetEnvironmentVariable("KOREBUILD_ADD_ASSEMBLY_INFO", "0");
\ No newline at end of file
diff --git a/src/Microsoft.AspNetCore/Microsoft.AspNetCore.csproj b/src/Microsoft.AspNetCore/Microsoft.AspNetCore.csproj
new file mode 100644
index 0000000000..27ac376b0f
--- /dev/null
+++ b/src/Microsoft.AspNetCore/Microsoft.AspNetCore.csproj
@@ -0,0 +1,26 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <Import Project="..\..\build\common.props" />
+
+  <PropertyGroup>
+    <IncludeBuildOutput>false</IncludeBuildOutput>
+    <TargetFrameworks>netstandard1.3;net451</TargetFrameworks>
+    <PackageTags>aspnetcore</PackageTags>
+    <Description>Microsoft.AspNetCore</Description>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="1.2.0-*" />
+    <PackageReference Include="Microsoft.AspNetCore.Hosting" Version="1.2.0-*" />
+    <PackageReference Include="Microsoft.AspNetCore.Routing" Version="1.2.0-*" />
+    <PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="1.2.0-*" />
+    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="1.2.0-*" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="1.2.0-*" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="1.2.0-*" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="1.2.0-*" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="1.2.0-*" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.2.0-*" />
+    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="1.2.0-*" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Microsoft.AspNetCore/Microsoft.AspNetCore.xproj b/src/Microsoft.AspNetCore/Microsoft.AspNetCore.xproj
deleted file mode 100644
index 669a5002d7..0000000000
--- a/src/Microsoft.AspNetCore/Microsoft.AspNetCore.xproj
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>6f3d43f7-9546-4b41-af04-cf4708b62051</ProjectGuid>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
-    <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <SchemaVersion>2.0</SchemaVersion>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
diff --git a/src/Microsoft.AspNetCore/project.json b/src/Microsoft.AspNetCore/project.json
deleted file mode 100644
index 105eafeb72..0000000000
--- a/src/Microsoft.AspNetCore/project.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  "version": "1.2.0-*",
-  "tags": [
-    "aspnetcore"
-  ],
-  "dependencies": {
-    "Microsoft.AspNetCore.Diagnostics": "1.2.0-*",
-    "Microsoft.AspNetCore.Hosting": "1.2.0-*",
-    "Microsoft.AspNetCore.Routing": "1.2.0-*",
-    "Microsoft.AspNetCore.Server.IISIntegration": "1.2.0-*",
-    "Microsoft.AspNetCore.Server.Kestrel": "1.2.0-*",
-    "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.2.0-*",
-    "Microsoft.Extensions.Configuration.FileExtensions": "1.2.0-*",
-    "Microsoft.Extensions.Configuration.Json": "1.2.0-*",
-    "Microsoft.Extensions.Logging": "1.2.0-*",
-    "Microsoft.Extensions.Logging.Console": "1.2.0-*",
-    "Microsoft.Extensions.Options.ConfigurationExtensions": "1.2.0-*",
-    "NETStandard.Library": "1.6.2-*"
-  },
-  "frameworks": {
-    "netstandard1.3": {},
-    "net451": {}
-  }
-}
\ No newline at end of file
diff --git a/version.props b/version.props
new file mode 100644
index 0000000000..17fd5ac36d
--- /dev/null
+++ b/version.props
@@ -0,0 +1,7 @@
+<!-- This file may be overwritten by automation. Only values allowed here are VersionPrefix and VersionSuffix.  -->
+<Project>
+  <PropertyGroup>
+    <VersionPrefix>1.2.0</VersionPrefix>
+    <VersionSuffix>preview1</VersionSuffix>
+  </PropertyGroup>
+</Project>