From 30bc3b17a5bbf52875ccccc72c2ce90f9d05ce84 Mon Sep 17 00:00:00 2001
From: Arun Mahapatra <codito@users.noreply.github.com>
Date: Sat, 10 Dec 2016 07:50:21 +0530
Subject: [PATCH] Include microbuild.core as a dependency for signing. (#267)

---
 TestPlatform.sln           |  2 +-
 src/package/package.csproj | 39 ++++++++++++++------------------------
 2 files changed, 15 insertions(+), 26 deletions(-)

diff --git a/TestPlatform.sln b/TestPlatform.sln
index 68aa06fac9..c04bbb6760 100644
--- a/TestPlatform.sln
+++ b/TestPlatform.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.25928.4
+VisualStudioVersion = 15.0.26008.9
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{ED0C35EB-7F31-4841-A24F-8EB708FFA959}"
 EndProject
diff --git a/src/package/package.csproj b/src/package/package.csproj
index 98200e0ca6..ff33057d19 100644
--- a/src/package/package.csproj
+++ b/src/package/package.csproj
@@ -1,9 +1,15 @@
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <!--<Target Name="WorkAroundToSkipPreprocessingBinaries" BeforeTargets="RunProduceContentAssets">
+    <ItemGroup>
+        <FileDependencies>
+         <codeLanguage Condition="'%(FileDependencies.codeLanguage)' == 'any' and '%(FileDependencies.Extension)' == '.dll'">binary</codeLanguage>
+        </FileDependencies>  
+    </ItemGroup>
+  </Target>-->
   <PropertyGroup>
     <TestPlatformRoot Condition="$(TestPlatformRoot) == ''">../../</TestPlatformRoot>
   </PropertyGroup>
   <Import Project="$(TestPlatformRoot)scripts/build/TestPlatform.Settings.targets" />
-  
   <PropertyGroup>
     <TargetFrameworks>net46;netcoreapp1.0</TargetFrameworks>
     <AssemblyName>package</AssemblyName>
@@ -21,13 +27,11 @@
   <PropertyGroup Condition="'$(TargetFramework)' != 'netcoreapp1.0'">
     <RuntimeIdentifier>win7-x64</RuntimeIdentifier>
   </PropertyGroup>
-
   <ItemGroup>
     <Content Include="[Content_Types].xml;extension.vsixmanifest;License.rtf;TestPlatform.ObjectModel.manifest;TestPlatform.ObjectModel.x86.manifest">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>    
+    </Content>
   </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\Microsoft.TestPlatform.Client\Microsoft.TestPlatform.Client.csproj" />
     <ProjectReference Include="..\Microsoft.TestPlatform.Common\Microsoft.TestPlatform.Common.csproj" />
@@ -42,16 +46,7 @@
       <FromP2P>true</FromP2P>
     </ProjectReference>
   </ItemGroup>
-
   <ItemGroup Condition=" '$(TargetFramework)' == 'net46' ">
-    <!--<PackageReference Include="Microsoft.Internal.TestPlatform.Extensions">
-      <Version>15.0.0</Version>
-      <PrivateAssets>All</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="Microsoft.Internal.Dia">
-      <Version>14.0.0</Version>
-      <PrivateAssets>All</PrivateAssets>
-    </PackageReference>-->
     <PackageReference Include="NuGet.CommandLine">
       <Version>3.4.3</Version>
       <PrivateAssets>All</PrivateAssets>
@@ -60,26 +55,20 @@
       <Version>0.1.2</Version>
       <PrivateAssets>All</PrivateAssets>
     </PackageReference>
+    <PackageReference Include="MicroBuild.Core">
+      <Version>0.2.0</Version>
+      <PrivateAssets>All</PrivateAssets>
+    </PackageReference>
     <Reference Include="System" />
     <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
-
   <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
     <PackageReference Include="Microsoft.NETCore.App">
       <Version>1.0.0</Version>
     </PackageReference>
   </ItemGroup>
-
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
     <DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
   </PropertyGroup>
-  
-  <!--<Target Name="WorkAroundToSkipPreprocessingBinaries" BeforeTargets="RunProduceContentAssets">
-    <ItemGroup>
-        <FileDependencies>
-         <codeLanguage Condition="'%(FileDependencies.codeLanguage)' == 'any' and '%(FileDependencies.Extension)' == '.dll'">binary</codeLanguage>
-        </FileDependencies>  
-    </ItemGroup>
-  </Target>-->
   <Import Project="$(TestPlatformRoot)scripts\build\TestPlatform.targets" />
-</Project>
+</Project>
\ No newline at end of file