From 1bdec6075ca2fb2e9aea4f61376339c1bbf02e1d Mon Sep 17 00:00:00 2001
From: Nate McMaster <nate.mcmaster@microsoft.com>
Date: Wed, 11 Jan 2017 14:27:57 -0800
Subject: [PATCH] React to aspnet/KoreBuild#155

This converts to using Internal.AspNetCore.Sdk instead of importing from the KoreBuild folder directly
---
 NuGet.config       |  5 +++--
 build/common.props | 29 +++++++++++++----------------
 2 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index 2ad0f8ba84..93f1ac47df 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -1,7 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <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/build/common.props b/build/common.props
index 5aaaae4eac..8553d1a3f0 100644
--- a/build/common.props
+++ b/build/common.props
@@ -1,20 +1,17 @@
 <Project ToolsVersion="15.0">
-    <Import Project="..\version.props" />
-    <Import Project="..\.build\common.props" Condition="Exists('..\.build\common.props')" />
+  <Import Project="..\version.props" />
 
-    <PropertyGroup>
-        <RepositoryUrl>https://github.com/aspnet/StaticFiles</RepositoryUrl>
-        <RepositoryType>git</RepositoryType>
-        <Product>Microsoft ASP.NET Core</Product>
-        <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)Key.snk</AssemblyOriginatorKeyFile>
-        <SignAssembly>true</SignAssembly>
-        <PublicSign Condition="'$(OS)' != 'Windows_NT'">true</PublicSign>
-    </PropertyGroup>
+  <PropertyGroup>
+    <Product>Microsoft ASP.NET Core</Product>
+    <RepositoryUrl>https://github.com/aspnet/StaticFiles</RepositoryUrl>
+    <RepositoryType>git</RepositoryType>
+    <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)Key.snk</AssemblyOriginatorKeyFile>
+    <SignAssembly>true</SignAssembly>
+    <PublicSign Condition="'$(OS)' != 'Windows_NT'">true</PublicSign>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Internal.AspNetCore.Sdk" Version="1.0.0-*" PrivateAssets="All" />
+  </ItemGroup>
 
-    <Target Name="EnsureInitialized"
-            BeforeTargets="Build"
-            Condition="!Exists('$(MSBuildThisFileDirectory)..\.build\common.props')">
-        <Error File="$(MSBuildProjectFile)"
-            Text="Project has not been initialized. Run 'build initialize' in the solution directory '$(MSBuildThisFileDirectory)'" />
-    </Target>
 </Project>
\ No newline at end of file