From 23807e228b31facf6e4368a0fbd78fb220d44fa6 Mon Sep 17 00:00:00 2001
From: Inga Lovinde <52715130+inga-lovinde@users.noreply.github.com>
Date: Mon, 3 Apr 2017 10:35:41 +0300
Subject: [PATCH] Microsoft.Build updated to v15.1 from NuGet

---
 .../MicroBuildServer.DotNetBuilder.csproj     | 20 +++++++++++--------
 DotNetBuilder/app.config                      |  6 +++++-
 DotNetBuilder/packages.config                 |  5 +++++
 3 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/DotNetBuilder/MicroBuildServer.DotNetBuilder.csproj b/DotNetBuilder/MicroBuildServer.DotNetBuilder.csproj
index 5f71745..5e8043c 100644
--- a/DotNetBuilder/MicroBuildServer.DotNetBuilder.csproj
+++ b/DotNetBuilder/MicroBuildServer.DotNetBuilder.csproj
@@ -40,17 +40,21 @@
     <Reference Include="log4net">
       <HintPath>..\packages\NUnit.Runners.2.6.3\tools\lib\log4net.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Build">
-      <HintPath>C:\Program Files (x86)\MSBuild\14.0\Bin\Microsoft.Build.dll</HintPath>
+    <Reference Include="Microsoft.Build, Version=15.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Build.15.1.548\lib\net46\Microsoft.Build.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="Microsoft.Build.Engine">
-      <HintPath>C:\Program Files (x86)\MSBuild\14.0\Bin\Microsoft.Build.Engine.dll</HintPath>
+    <Reference Include="Microsoft.Build.Framework, Version=15.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Build.Framework.15.1.548\lib\net46\Microsoft.Build.Framework.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="Microsoft.Build.Framework">
-      <HintPath>C:\Program Files (x86)\MSBuild\14.0\Bin\Microsoft.Build.Framework.dll</HintPath>
+    <Reference Include="Microsoft.Build.Tasks.Core, Version=15.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Build.Tasks.Core.15.1.548\lib\net46\Microsoft.Build.Tasks.Core.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="Microsoft.Build.Utilities.Core, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>C:\Program Files (x86)\MSBuild\14.0\Bin\Microsoft.Build.Utilities.Core.dll</HintPath>
+    <Reference Include="Microsoft.Build.Utilities.Core, Version=15.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Build.Utilities.Core.15.1.548\lib\net46\Microsoft.Build.Utilities.Core.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
diff --git a/DotNetBuilder/app.config b/DotNetBuilder/app.config
index f715787..34e429b 100644
--- a/DotNetBuilder/app.config
+++ b/DotNetBuilder/app.config
@@ -9,7 +9,11 @@
       <dependentAssembly>
         <!-- For EntityFramework. Do not redirect other MSBuild assemblies, as NuGet operations will then fail -->
         <assemblyIdentity name="Microsoft.Build.Framework" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-14.0.0.0" newVersion="14.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-15.1.0.0" newVersion="15.1.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Build" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-15.1.0.0" newVersion="15.1.0.0" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
diff --git a/DotNetBuilder/packages.config b/DotNetBuilder/packages.config
index 1f066b0..7d0ffc9 100644
--- a/DotNetBuilder/packages.config
+++ b/DotNetBuilder/packages.config
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="Microsoft.Build" version="15.1.548" targetFramework="net46" />
+  <package id="Microsoft.Build.Framework" version="15.1.548" targetFramework="net46" />
+  <package id="Microsoft.Build.Runtime" version="15.1.548" targetFramework="net46" />
+  <package id="Microsoft.Build.Tasks.Core" version="15.1.548" targetFramework="net46" />
+  <package id="Microsoft.Build.Utilities.Core" version="15.1.548" targetFramework="net46" />
   <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net46" />
   <package id="NuGet.CommandLine" version="2.8.5" targetFramework="net4" />
   <package id="NUnit" version="2.6.3" targetFramework="net4" />