From b9ed1e073af826432a6145a5233d89aca4f8eb09 Mon Sep 17 00:00:00 2001
From: Justin Kotalik <jukotali@microsoft.com>
Date: Tue, 7 Nov 2017 13:56:01 -0800
Subject: [PATCH] Require Microsoft.VisualStudio.Component.VC.Tools.x86.x64 to
 be installed before compiling ANCM (#238)

---
 build/repo.targets | 26 +++++++++-----------------
 korebuild.json     | 14 ++++++++++++++
 2 files changed, 23 insertions(+), 17 deletions(-)
 create mode 100644 korebuild.json

diff --git a/build/repo.targets b/build/repo.targets
index 0faa63a2b7..43afd316c8 100644
--- a/build/repo.targets
+++ b/build/repo.targets
@@ -4,26 +4,18 @@
     <VerifyDependsOn>$(VerifyDependsOn);PublishPackage</VerifyDependsOn>
   </PropertyGroup>
 
-  <Target Name="_LocateMSBuildExe">
-    <ItemGroup>
-      <MSBuild15ExePaths Include="$(MSBuildProgramFiles32)\Microsoft Visual Studio\**\MSBuild\15.0\Bin\MSBuild.exe" />
-    </ItemGroup>
-
-    <Error
-      Text="Unable to locate MSBuild 15.0 under $(MSBuildProgramFiles32)\Microsoft Visual Studio"
-      Condition="'@(MSBuild15ExePaths)'==''"/>
-
-    <PropertyGroup Condition="'@(MSBuild15ExePaths)'!=''">
-      <MSBuildExePath>%(MSBuild15ExePaths.FullPath)</MSBuildExePath>
-    </PropertyGroup>
-  </Target>
-
-  <Target Name="BuildNativeAssets" DependsOnTargets="_LocateMSBuildExe" BeforeTargets="Compile">
+  <Target Name="BuildNativeAssets" DependsOnTargets="GetToolsets" BeforeTargets="Compile" >
     <ItemGroup>
       <BuildConfigurations Include="/p:Configuration=Release /p:platform=Win32" />
       <BuildConfigurations Include="/p:Configuration=Release /p:platform=x64" />
     </ItemGroup>
-    <Exec Command="&quot;$(MSBuildExePath)&quot; &quot;$(RepositoryRoot)src\AspNetCore\AspNetCore.vcxproj&quot; %(BuildConfigurations.Identity)" />
+
+    <Error
+      Text="Could not find an installation of Visual Studio with the C++ development tools."
+      Condition="'$(VisualStudioMSBuildx86Path)' == ''" />
+      
+    <Exec Command="&quot;$(VisualStudioMSBuildx86Path)&quot; &quot;$(RepositoryRoot)src\AspNetCore\AspNetCore.vcxproj&quot; %(BuildConfigurations.Identity)"
+      Condition="'$(VisualStudioMSBuildx86Path)' != ''" />
   </Target>
 
   <Target Name="PackageProjects">
@@ -48,4 +40,4 @@
       ApiKey="$(APIKey)" />
   </Target>
 
-</Project>
+</Project>
\ No newline at end of file
diff --git a/korebuild.json b/korebuild.json
new file mode 100644
index 0000000000..80e6e41c09
--- /dev/null
+++ b/korebuild.json
@@ -0,0 +1,14 @@
+{
+    "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/dev/tools/korebuild.schema.json",
+    "channel": "dev",
+    "toolsets": {
+      "visualstudio": {
+        "required": ["Windows"],
+        "includePrerelease": true,
+        "minVersion": "15.0.26730.03",
+        "requiredWorkloads": [
+          "Microsoft.VisualStudio.Component.VC.Tools.x86.x64"
+        ]
+      }
+    }
+  }
\ No newline at end of file