From b0b65a530a0bbf6e4af323a48cd52a5c6e7d1ad6 Mon Sep 17 00:00:00 2001
From: Nate McMaster <natemcmaster@users.noreply.github.com>
Date: Thu, 4 Oct 2018 11:07:06 -0700
Subject: [PATCH] Support using Internal.AspNetCore.Sdk as an MSBuild SDK
 (#1452)

* Add Microsoft.AspNetCore.BuildTools.ApiCheck as an external dependency
* Move the global.json files temporarily to avoid loading the wrong version of Internal.AspNetCore.Sdk
---
 build/dependencies.props          | 1 +
 build/external-dependencies.props | 1 +
 build/repo.targets                | 7 +++++++
 global.json                       | 2 +-
 korebuild-lock.txt                | 4 ++--
 modules/Scaffolding               | 2 +-
 6 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/build/dependencies.props b/build/dependencies.props
index 1399f7c92e..1289db7e62 100644
--- a/build/dependencies.props
+++ b/build/dependencies.props
@@ -14,6 +14,7 @@
     <MicrosoftNETCoreApp22PackageVersion Condition="'$(MicrosoftNETCoreAppPackageVersion)' != ''">$(MicrosoftNETCoreAppPackageVersion)</MicrosoftNETCoreApp22PackageVersion>
 
     <!-- Determined by build tools -->
+    <MicrosoftAspNetCoreBuildToolsApiCheckPackageVersion>$(KoreBuildVersion)</MicrosoftAspNetCoreBuildToolsApiCheckPackageVersion>
     <InternalAspNetCoreSdkPackageVersion>$(KoreBuildVersion)</InternalAspNetCoreSdkPackageVersion>
     <InternalAspNetCoreSiteExtensionSdkPackageVersion>$(KoreBuildVersion)</InternalAspNetCoreSiteExtensionSdkPackageVersion>
   </PropertyGroup>
diff --git a/build/external-dependencies.props b/build/external-dependencies.props
index 536acd2990..61ad8e80bb 100644
--- a/build/external-dependencies.props
+++ b/build/external-dependencies.props
@@ -19,6 +19,7 @@
     <ExternalDependency Include="FSharp.Core" Version="$(FSharpCorePackageVersion)" />
     <ExternalDependency Include="Google.Protobuf" Version="$(GoogleProtobufPackageVersion)" />
     <ExternalDependency Include="Internal.AspNetCore.Sdk" Version="$(InternalAspNetCoreSdkPackageVersion)" />
+    <ExternalDependency Include="Microsoft.AspNetCore.BuildTools.ApiCheck" Version="$(MicrosoftAspNetCoreBuildToolsApiCheckPackageVersion)" />
     <ExternalDependency Include="Internal.AspNetCore.SiteExtension.Sdk" Version="$(InternalAspNetCoreSiteExtensionSdkPackageVersion)" />
     <ExternalDependency Include="Libuv" Version="$(LibuvPackageVersion)" />
     <ExternalDependency Include="Microsoft.ApplicationInsights.AspNetCore" Version="$(MicrosoftApplicationInsightsAspNetCorePackageVersion)" />
diff --git a/build/repo.targets b/build/repo.targets
index 63af8766c3..db936bb97c 100644
--- a/build/repo.targets
+++ b/build/repo.targets
@@ -79,6 +79,8 @@
       <PackageArtifact Remove="@(PackageArtifact)" />
     </ItemGroup>
 
+    <Move SourceFiles="%(SubmoduleGlobalJsonFiles.BackupPath)" DestinationFiles="%(SubmoduleGlobalJsonFiles.Identity)" Condition="Exists(%(SubmoduleGlobalJsonFiles.BackupPath))" />
+
     <!-- Join required because shipping category is stored in universe (PackageArtifact), but information about package ID and version comes from repos (ArtifactInfo). -->
     <RepoTasks.JoinItems
       Left="@(_Temp)"
@@ -208,7 +210,12 @@
     <ItemGroup>
       <Repository Update="%(Identity)" RootPath="$(SubmoduleRoot)%(Identity)\" />
       <ShippedRepository Update="%(Identity)" RootPath="$(SubmoduleRoot)%(Identity)\" Condition="'%(Identity)' != ''" />
+
+      <SubmoduleGlobalJsonFiles Include="%(Repository.RootPath)global.json" BackupPath="$(IntermediateDir)%(Repository.Identity)-global.json" Condition="'%(Repository.Identity)' != ''"/>
+      <SubmoduleGlobalJsonFiles Include="%(ShippedRepository.RootPath)global.json" BackupPath="$(IntermediateDir)%(ShippedRepository.Identity)-global.json" Condition="'%(ShippedRepository.Identity)' != ''"/>
     </ItemGroup>
+
+    <Move SourceFiles="%(SubmoduleGlobalJsonFiles.Identity)" DestinationFiles="%(SubmoduleGlobalJsonFiles.BackupPath)" Condition="Exists(%(SubmoduleGlobalJsonFiles.Identity))" />
   </Target>
 
   <Target Name="BuildRepositories"
diff --git a/global.json b/global.json
index b5a5299b58..ac7ef8966b 100644
--- a/global.json
+++ b/global.json
@@ -3,6 +3,6 @@
         "version": "2.2.100-preview2-009404"
     },
     "msbuild-sdks": {
-        "Internal.AspNetCore.Sdk": "2.2.0-preview2-20181003.2"
+        "Internal.AspNetCore.Sdk": "2.2.0-preview2-20181004.1"
     }
 }
diff --git a/korebuild-lock.txt b/korebuild-lock.txt
index 783131ae5e..163fbc3e27 100644
--- a/korebuild-lock.txt
+++ b/korebuild-lock.txt
@@ -1,2 +1,2 @@
-version:2.2.0-preview2-20181003.2
-commithash:41935e62d7853060283c801f49992e2c73a95927
+version:2.2.0-preview2-20181004.1
+commithash:20538607213e0d70ee0b3ae39c35e6d55cec8eda
diff --git a/modules/Scaffolding b/modules/Scaffolding
index 5103fe7aee..ba6e9f51fc 160000
--- a/modules/Scaffolding
+++ b/modules/Scaffolding
@@ -1 +1 @@
-Subproject commit 5103fe7aee4b7d105fd88e7917c74804268aa676
+Subproject commit ba6e9f51fc7b0faf97b4b2d96f4c07dd365b229f