From c752a712585b32250d6479d2132f301e0fc88040 Mon Sep 17 00:00:00 2001
From: billhie <billhie@Microsoft.com>
Date: Tue, 9 Aug 2016 09:24:55 -0700
Subject: [PATCH] Add json.net dependency, fix incremental build

---
 build/Targets/ProducesNoOutput.Imports.targets  |  5 +++--
 build/Targets/ProducesNoOutput.Settings.targets |  9 ++++++---
 build/Targets/References.targets                |  5 ++++-
 src/Dependencies/Json.net/Json.net.csproj       | 16 ++++++++++++++++
 src/Dependencies/Json.net/project.json          |  9 +++++++++
 src/ProjectSystem.sln                           |  9 ++++++++-
 6 files changed, 46 insertions(+), 7 deletions(-)
 create mode 100644 src/Dependencies/Json.net/Json.net.csproj
 create mode 100644 src/Dependencies/Json.net/project.json

diff --git a/build/Targets/ProducesNoOutput.Imports.targets b/build/Targets/ProducesNoOutput.Imports.targets
index 888e631e8fa..d43516ff7d2 100644
--- a/build/Targets/ProducesNoOutput.Imports.targets
+++ b/build/Targets/ProducesNoOutput.Imports.targets
@@ -7,8 +7,9 @@
     <TargetPath></TargetPath>    <!-- Prevent projects referencing this from trying to pass us to the compiler -->
   </PropertyGroup>
   
-  <Target Name="CoreCompile" />                               <!-- Prevent Csc from being called -->  
-  <Target Name="GenerateTargetFrameworkMonikerAttribute" />   <!-- Don't generate TFM attribute -->  
+  <!-- Return this back when up-to-date bug is fixed (projects are being build everytime) -->
+  <!-- <Target Name="CoreCompile" /> -->                               <!-- Prevent Csc from being called -->  
+  <!-- <Target Name="GenerateTargetFrameworkMonikerAttribute" /> -->  <!-- Don't generate TFM attribute -->    
   <Target Name="RuntimeImplementationProjectOutputGroup" />   <!-- Group always attempts resolve runtime, regardless of <CopyNuGetImplementations>-->
   
 </Project>
\ No newline at end of file
diff --git a/build/Targets/ProducesNoOutput.Settings.targets b/build/Targets/ProducesNoOutput.Settings.targets
index 751d3fb2c32..8e2350988bb 100644
--- a/build/Targets/ProducesNoOutput.Settings.targets
+++ b/build/Targets/ProducesNoOutput.Settings.targets
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
-  <Import Project="Settings.targets" />
+ <!-- Return this back when up-to-date bug is fixed (projects are being build everytime) -->
+  <!--<Import Project="Settings.targets" />-->
+  <Import Project="VSL.Settings.targets" />
 
   <PropertyGroup>
     <IsDeployment Condition="'$(IsDeployment)' == ''">false</IsDeployment>
@@ -14,8 +16,9 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <CopyBuildOutputToOutputDirectory>false</CopyBuildOutputToOutputDirectory>
-    <CopyOutputSymbolsToOutputDirectory>false</CopyOutputSymbolsToOutputDirectory>
+    <!-- Return this back when up-to-date bug is fixed (projects are being build everytime) -->
+    <!--<CopyBuildOutputToOutputDirectory>false</CopyBuildOutputToOutputDirectory>
+        <CopyOutputSymbolsToOutputDirectory>false</CopyOutputSymbolsToOutputDirectory>-->
     <OutputType>Library</OutputType>
   </PropertyGroup>
 
diff --git a/build/Targets/References.targets b/build/Targets/References.targets
index 3c531a58824..1b3c5e2ca9d 100644
--- a/build/Targets/References.targets
+++ b/build/Targets/References.targets
@@ -78,7 +78,10 @@
           <Project>{e6796b97-d5c6-45b2-ae46-351d15dcfc71}</Project>
           <Name>Metadata</Name>
         </ProjectReference>
-        
+        <ProjectReference Include="$(MSBuildThisFileDirectory)..\..\src\Dependencies\Json.net\Json.net.csproj">
+          <Project>{ca374af1-c983-4019-8fd0-01fa510c6e56}</Project>
+          <Name>Json.net</Name>
+        </ProjectReference>
       </ItemGroup>
     </When>
   </Choose>
diff --git a/src/Dependencies/Json.net/Json.net.csproj b/src/Dependencies/Json.net/Json.net.csproj
new file mode 100644
index 00000000000..f8524e2f985
--- /dev/null
+++ b/src/Dependencies/Json.net/Json.net.csproj
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <IsPortable>false</IsPortable>
+  </PropertyGroup>
+  <Import Project="..\..\..\build\Targets\ProducesNoOutput.Settings.targets" />
+  <PropertyGroup>
+    <ProjectGuid>{CA374AF1-C983-4019-8FD0-01FA510C6E56}</ProjectGuid>
+    <ProjectTypeGuids>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <ProjectSystemLayer>Dependency</ProjectSystemLayer>
+  </PropertyGroup>
+  <ItemGroup>
+    <Content Include="project.json" />
+  </ItemGroup>
+  <Import Project="..\..\..\build\Targets\ProducesNoOutput.Imports.targets" />
+</Project>
\ No newline at end of file
diff --git a/src/Dependencies/Json.net/project.json b/src/Dependencies/Json.net/project.json
new file mode 100644
index 00000000000..ca3b3470ac4
--- /dev/null
+++ b/src/Dependencies/Json.net/project.json
@@ -0,0 +1,9 @@
+{
+  "supports": { },
+  "dependencies": {
+     "Newtonsoft.Json": "8.0.3"
+  },
+  "frameworks": {
+    ".NETFramework,Version=v4.6": { }
+  }
+}
\ No newline at end of file
diff --git a/src/ProjectSystem.sln b/src/ProjectSystem.sln
index d1d840cd9cf..e8ef3145745 100644
--- a/src/ProjectSystem.sln
+++ b/src/ProjectSystem.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.25424.0
+VisualStudioVersion = 15.0.25422.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DeployTestDependencies", "DeployTestDependencies\DeployTestDependencies.csproj", "{37BA82E6-9ABD-4ACA-AA26-2DFD39A359A5}"
 EndProject
@@ -81,6 +81,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Targets", "Targets", "{573B
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProjectSystemDogfoodSetup", "ProjectSystemDogfoodSetup\ProjectSystemDogfoodSetup.csproj", "{F9522F27-B9AC-4D6F-8F54-6A8BD4D33574}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Json.net", "Dependencies\Json.net\Json.net.csproj", "{CA374AF1-C983-4019-8FD0-01FA510C6E56}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -204,6 +206,10 @@ Global
 		{F9522F27-B9AC-4D6F-8F54-6A8BD4D33574}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F9522F27-B9AC-4D6F-8F54-6A8BD4D33574}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F9522F27-B9AC-4D6F-8F54-6A8BD4D33574}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CA374AF1-C983-4019-8FD0-01FA510C6E56}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CA374AF1-C983-4019-8FD0-01FA510C6E56}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CA374AF1-C983-4019-8FD0-01FA510C6E56}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CA374AF1-C983-4019-8FD0-01FA510C6E56}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -218,5 +224,6 @@ Global
 		{CF97A73F-F2F1-4893-960C-9C2B95738870} = {FD7E1AB8-9A44-4C31-A126-D6AF289C2C95}
 		{4D52C1E5-6F4B-4CDE-8149-AC374F018245} = {FD7E1AB8-9A44-4C31-A126-D6AF289C2C95}
 		{03AB838C-1B9D-4ECA-856F-476616C35F0C} = {FD7E1AB8-9A44-4C31-A126-D6AF289C2C95}
+		{CA374AF1-C983-4019-8FD0-01FA510C6E56} = {FD7E1AB8-9A44-4C31-A126-D6AF289C2C95}
 	EndGlobalSection
 EndGlobal