From 2f774a3e965a92a35afe245b4de311b4e2e2a71f Mon Sep 17 00:00:00 2001
From: Toby Hu <tobyhu@microsoft.com>
Date: Thu, 14 Apr 2016 14:37:19 -0700
Subject: [PATCH 1/4] test

---
 .../VS.ConfigurationManager.Support.csproj                      | 2 +-
 src/VS.ConfigurationManager/VS.ConfigurationManager.csproj      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/VS.ConfigurationManager.Support/VS.ConfigurationManager.Support.csproj b/src/VS.ConfigurationManager.Support/VS.ConfigurationManager.Support.csproj
index 79ecf08..b6f625d 100644
--- a/src/VS.ConfigurationManager.Support/VS.ConfigurationManager.Support.csproj
+++ b/src/VS.ConfigurationManager.Support/VS.ConfigurationManager.Support.csproj
@@ -56,7 +56,7 @@
     <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <FilesToSign Include="$(OutDir)\VS.ConfigurationManager.Support.dll">
+    <FilesToSign Include="bin\Release\VS.ConfigurationManager.Support.dll">
       <Authenticode>Microsoft</Authenticode>
     </FilesToSign>
   </ItemGroup>
diff --git a/src/VS.ConfigurationManager/VS.ConfigurationManager.csproj b/src/VS.ConfigurationManager/VS.ConfigurationManager.csproj
index 4fdbf83..e6031b0 100644
--- a/src/VS.ConfigurationManager/VS.ConfigurationManager.csproj
+++ b/src/VS.ConfigurationManager/VS.ConfigurationManager.csproj
@@ -60,7 +60,7 @@
     <Content Include="External\wix.dll" />
   </ItemGroup>
   <ItemGroup>
-    <FilesToSign Include="$(OutDir)\VS.ConfigurationManager.dll">
+    <FilesToSign Include="$(OutDir)\Setup.VS.ConfigurationManager.dll">
       <Authenticode>Microsoft</Authenticode>
     </FilesToSign>
   </ItemGroup>

From 8dcc32f2d62e7dfdd0448fbeec6f804c9c2caaaa Mon Sep 17 00:00:00 2001
From: Toby Hu <tobyhu@microsoft.com>
Date: Thu, 14 Apr 2016 14:48:20 -0700
Subject: [PATCH 2/4] enable signing

---
 lib/Common.csproj.targets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Common.csproj.targets b/lib/Common.csproj.targets
index 9461d8f..8d55119 100644
--- a/lib/Common.csproj.targets
+++ b/lib/Common.csproj.targets
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <SignAssembly>false</SignAssembly>
+    <SignAssembly>true</SignAssembly>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="Branding.targets" />

From b925e3b726eab282298121c18064c60c1f4a0938 Mon Sep 17 00:00:00 2001
From: Toby Hu <tobyhu@microsoft.com>
Date: Thu, 14 Apr 2016 15:28:27 -0700
Subject: [PATCH 3/4] Add MicroBuild support

---
 src/Uninstall_Wrapper/Uninstall_Wrapper.csproj     | 10 ++++++++++
 src/Uninstall_Wrapper/packages.config              |  4 ++++
 .../VS.ConfigurationManager.Support.csproj         | 14 ++++++++++++++
 .../packages.config                                |  4 ++++
 .../VS.ConfigurationManager.csproj                 | 14 ++++++++++++++
 src/VS.ConfigurationManager/packages.config        |  4 ++++
 6 files changed, 50 insertions(+)
 create mode 100644 src/Uninstall_Wrapper/packages.config
 create mode 100644 src/VS.ConfigurationManager.Support/packages.config
 create mode 100644 src/VS.ConfigurationManager/packages.config

diff --git a/src/Uninstall_Wrapper/Uninstall_Wrapper.csproj b/src/Uninstall_Wrapper/Uninstall_Wrapper.csproj
index cf66f23..ab55c66 100644
--- a/src/Uninstall_Wrapper/Uninstall_Wrapper.csproj
+++ b/src/Uninstall_Wrapper/Uninstall_Wrapper.csproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <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="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), Uninstaller.sln))\lib\Common.props" />
   <PropertyGroup>
     <ApplicationManifest>app.manifest</ApplicationManifest>
@@ -57,6 +58,7 @@
     <EmbeddedResource Include="DataFile.bin">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </EmbeddedResource>
+    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
@@ -84,4 +86,12 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(SolutionDir)lib\Common.targets" />
+  <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')" />
 </Project>
\ No newline at end of file
diff --git a/src/Uninstall_Wrapper/packages.config b/src/Uninstall_Wrapper/packages.config
new file mode 100644
index 0000000..f6142aa
--- /dev/null
+++ b/src/Uninstall_Wrapper/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="MicroBuild.Core" version="0.2.0" targetFramework="net40" developmentDependency="true" />
+</packages>
\ No newline at end of file
diff --git a/src/VS.ConfigurationManager.Support/VS.ConfigurationManager.Support.csproj b/src/VS.ConfigurationManager.Support/VS.ConfigurationManager.Support.csproj
index b6f625d..14eead3 100644
--- a/src/VS.ConfigurationManager.Support/VS.ConfigurationManager.Support.csproj
+++ b/src/VS.ConfigurationManager.Support/VS.ConfigurationManager.Support.csproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <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="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), Uninstaller.sln))\lib\Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -12,6 +13,8 @@
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -60,5 +63,16 @@
       <Authenticode>Microsoft</Authenticode>
     </FilesToSign>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
   <Import Project="$(SolutionDir)lib\Common.targets" />
+  <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')" />
 </Project>
\ No newline at end of file
diff --git a/src/VS.ConfigurationManager.Support/packages.config b/src/VS.ConfigurationManager.Support/packages.config
new file mode 100644
index 0000000..f6142aa
--- /dev/null
+++ b/src/VS.ConfigurationManager.Support/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="MicroBuild.Core" version="0.2.0" targetFramework="net40" developmentDependency="true" />
+</packages>
\ No newline at end of file
diff --git a/src/VS.ConfigurationManager/VS.ConfigurationManager.csproj b/src/VS.ConfigurationManager/VS.ConfigurationManager.csproj
index e6031b0..f901651 100644
--- a/src/VS.ConfigurationManager/VS.ConfigurationManager.csproj
+++ b/src/VS.ConfigurationManager/VS.ConfigurationManager.csproj
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <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="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), Uninstaller.sln))\lib\Common.props" />
   <PropertyGroup>
     <ProjectGuid>{CACCC6E1-FCB8-4DBE-9159-0F8EAA69D27A}</ProjectGuid>
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <TargetFrameworkProfile />
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup>
     <OutputType>Library</OutputType>
@@ -70,5 +73,16 @@
       <Name>VS.ConfigurationManager.Support</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
   <Import Project="$(SolutionDir)lib\Common.targets" />
+  <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')" />
 </Project>
\ No newline at end of file
diff --git a/src/VS.ConfigurationManager/packages.config b/src/VS.ConfigurationManager/packages.config
new file mode 100644
index 0000000..f6142aa
--- /dev/null
+++ b/src/VS.ConfigurationManager/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="MicroBuild.Core" version="0.2.0" targetFramework="net40" developmentDependency="true" />
+</packages>
\ No newline at end of file

From 49fb5217c8d21490a1f53183b4fba50fa7d8fb2a Mon Sep 17 00:00:00 2001
From: Toby Hu <tobyhu@microsoft.com>
Date: Thu, 14 Apr 2016 15:29:56 -0700
Subject: [PATCH 4/4] use outdir

---
 .../VS.ConfigurationManager.Support.csproj                      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/VS.ConfigurationManager.Support/VS.ConfigurationManager.Support.csproj b/src/VS.ConfigurationManager.Support/VS.ConfigurationManager.Support.csproj
index 14eead3..e6e2d85 100644
--- a/src/VS.ConfigurationManager.Support/VS.ConfigurationManager.Support.csproj
+++ b/src/VS.ConfigurationManager.Support/VS.ConfigurationManager.Support.csproj
@@ -59,7 +59,7 @@
     <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <FilesToSign Include="bin\Release\VS.ConfigurationManager.Support.dll">
+    <FilesToSign Include="$(OutDir)\VS.ConfigurationManager.Support.dll">
       <Authenticode>Microsoft</Authenticode>
     </FilesToSign>
   </ItemGroup>