From 7f202c49f9b9762f16882a6b1e4fe64da01d46cc Mon Sep 17 00:00:00 2001
From: "Pierson Lee (PIE)" <piel@microsoft.com>
Date: Fri, 8 Apr 2016 13:49:03 -0700
Subject: [PATCH 1/2] Enable Microbuild.Core on relevant projects for
 Microbuild v2.

---
 src/DebugEngineHost.Stub/project.json    |  1 +
 src/MICore/project.json                  |  1 +
 src/MIDebugEngine/project.json           |  1 +
 src/MIDebugPackage/MIDebugPackage.csproj | 30 ++++++++----------------
 src/MIDebugPackage/packages.config       |  4 ++++
 5 files changed, 17 insertions(+), 20 deletions(-)
 create mode 100644 src/MIDebugPackage/packages.config

diff --git a/src/DebugEngineHost.Stub/project.json b/src/DebugEngineHost.Stub/project.json
index 8e8e291144..e064f970c9 100644
--- a/src/DebugEngineHost.Stub/project.json
+++ b/src/DebugEngineHost.Stub/project.json
@@ -4,6 +4,7 @@
     "dnxcore50.app": {}
   },
   "dependencies": {
+    "MicroBuild.Core": "0.2.0",
     "Microsoft.NETCore": "5.0.0",
     "Microsoft.NETCore.Portable.Compatibility": "1.0.0",
     "Microsoft.VisualStudio.Debugger.Interop.Portable": "1.0.1"
diff --git a/src/MICore/project.json b/src/MICore/project.json
index da4a7ecbd9..82fa4d08db 100644
--- a/src/MICore/project.json
+++ b/src/MICore/project.json
@@ -4,6 +4,7 @@
     "dnxcore50.app": {}
   },
   "dependencies": {
+    "MicroBuild.Core": "0.2.0",
     "Microsoft.NETCore": "5.0.0",
     "Microsoft.NETCore.Portable.Compatibility": "1.0.0",
     "System.Diagnostics.Process": "4.0.0-beta-23225",
diff --git a/src/MIDebugEngine/project.json b/src/MIDebugEngine/project.json
index 8e8e291144..e064f970c9 100644
--- a/src/MIDebugEngine/project.json
+++ b/src/MIDebugEngine/project.json
@@ -4,6 +4,7 @@
     "dnxcore50.app": {}
   },
   "dependencies": {
+    "MicroBuild.Core": "0.2.0",
     "Microsoft.NETCore": "5.0.0",
     "Microsoft.NETCore.Portable.Compatibility": "1.0.0",
     "Microsoft.VisualStudio.Debugger.Interop.Portable": "1.0.1"
diff --git a/src/MIDebugPackage/MIDebugPackage.csproj b/src/MIDebugPackage/MIDebugPackage.csproj
index 81ddf3fb06..7c1d367061 100644
--- a/src/MIDebugPackage/MIDebugPackage.csproj
+++ b/src/MIDebugPackage/MIDebugPackage.csproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="14.0">
+  <Import Project="..\packages\MicroBuild.Core.0.2.0\build\MicroBuild.Core.props" Condition="Exists('..\packages\MicroBuild.Core.0.2.0\build\MicroBuild.Core.props')" />
   <Import Project="..\..\build\miengine.settings.targets" />
   <PropertyGroup>
     <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
@@ -139,6 +140,7 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
+    <None Include="packages.config" />
     <None Include="source.extension.vsixmanifest">
       <SubType>Designer</SubType>
     </None>
@@ -166,25 +168,6 @@
     </Content>
   </ItemGroup>
   <ItemGroup>
-    <DropUnsignedFile Include="$(OutDir)\Microsoft.Android.natvis" />
-    <DropSignedFile Include="$(OutDir)\Microsoft.AndroidDebugLauncher.dll" />
-    <DropUnsignedFile Include="$(OutDir)\Microsoft.AndroidDebugLauncher.pdb" />
-    <DropUnsignedFile Include="$(OutDir)\Microsoft.AndroidDebugLauncher.pkgdef" />
-    <DropSignedFile Include="$(OutDir)\Microsoft.IOSDebugLauncher.dll" />
-    <DropUnsignedFile Include="$(OutDir)\Microsoft.IOSDebugLauncher.pdb" />
-    <DropUnsignedFile Include="$(OutDir)\Microsoft.IOSDebugLauncher.pkgdef" />
-    <DropSignedFile Include="$(OutDir)\Microsoft.JDbg.dll" />
-    <DropUnsignedFile Include="$(OutDir)\Microsoft.JDbg.pdb" />
-    <DropSignedFile Include="$(OutDir)\Microsoft.MICore.dll" />
-    <DropUnsignedFile Include="$(OutDir)\Microsoft.MICore.pdb" />
-    <DropSignedFile Include="$(OutDir)\Microsoft.MIDebugEngine.dll" />
-    <DropUnsignedFile Include="$(OutDir)\Microsoft.MIDebugEngine.pdb" />
-    <DropUnsignedFile Include="$(OutDir)\Microsoft.MIDebugEngine.pkgdef" />
-    <DropSignedFile Include="$(OutDir)\Microsoft.MIDebugPackage.dll" />
-    <DropUnsignedFile Include="$(OutDir)\Microsoft.MIDebugPackage.pdb" />
-    <DropUnsignedFile Include="$(OutDir)\Microsoft.MIDebugPackage.pkgdef" />
-    <DropSignedFile Include="$(OutDir)\Microsoft.DebugEngineHost.dll" />
-    <DropUnsignedFile Include="$(OutDir)\Microsoft.DebugEngineHost.pdb" />
     <DropUnsignedFile Include="Install.cmd" />
     <DropUnsignedFile Include="$(OutDir)\Microsoft.Android.natvis" />
     <DropSignedFile Include="$(OutDir)\Microsoft.AndroidDebugLauncher.dll" />
@@ -245,12 +228,19 @@
   <Import Project="..\..\build\DropFiles.targets" />
   <Import Project="..\..\build\PackageNuGet.targets" />
   <Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\packages\MicroBuild.Core.0.2.0\build\MicroBuild.Core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MicroBuild.Core.0.2.0\build\MicroBuild.Core.props'))" />
+    <Error Condition="!Exists('..\packages\MicroBuild.Core.0.2.0\build\MicroBuild.Core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MicroBuild.Core.0.2.0\build\MicroBuild.Core.targets'))" />
+  </Target>
+  <Import Project="..\packages\MicroBuild.Core.0.2.0\build\MicroBuild.Core.targets" Condition="Exists('..\packages\MicroBuild.Core.0.2.0\build\MicroBuild.Core.targets')" />
   <!--
   Target to drop the built files into a directory.
   For the official build, we need to drop files to the build share
   For normal builds, we drop files to <enlistment-root>\bin\debug\drop for easy sharing
   -->
-  
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/src/MIDebugPackage/packages.config b/src/MIDebugPackage/packages.config
new file mode 100644
index 0000000000..89a5bc425c
--- /dev/null
+++ b/src/MIDebugPackage/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="MicroBuild.Core" version="0.2.0" targetFramework="net46" />
+</packages>
\ No newline at end of file

From d9ff0adcb5066d4a05b4c2d8d9cddab66d09721d Mon Sep 17 00:00:00 2001
From: "Pierson Lee (PIE)" <piel@microsoft.com>
Date: Fri, 8 Apr 2016 16:51:57 -0700
Subject: [PATCH 2/2] Update Binaries directory for VSTS Microbuild v2 property

---
 build/miengine.settings.targets | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build/miengine.settings.targets b/build/miengine.settings.targets
index 4a67eb2ac3..bb104b1e1e 100644
--- a/build/miengine.settings.targets
+++ b/build/miengine.settings.targets
@@ -31,6 +31,7 @@
     <DropConfigurationName Condition="'$(Configuration)' == 'Lab.Debug'">Debug</DropConfigurationName>
     <DropConfigurationName Condition="'$(Configuration)' == 'Lab.Release'">Release</DropConfigurationName>
     <DropRootDir Condition="'$(TF_BUILD_BINARIESDIRECTORY)'!=''">$(TF_BUILD_BINARIESDIRECTORY)\$(DropConfigurationName)</DropRootDir>
+    <DropRootDir Condition="'$(BUILD_BINARIESDIRECTORY)'!=''">$(BUILD_BINARIESDIRECTORY)\$(DropConfigurationName)</DropRootDir>
     <DropRootDir Condition="'$(DropRootDir)'==''">$(MIEngineRoot)bin\$(DropConfigurationName)\drop</DropRootDir>
   </PropertyGroup>