From cc0472d00042fe2258443ee6b5f65e8f92e8dcce Mon Sep 17 00:00:00 2001
From: Tanner Gooding <tagoo@microsoft.com>
Date: Tue, 27 Dec 2016 14:47:07 -0800
Subject: [PATCH] Cleaning up some of the project.json

---
 src/Interactive/HostTest/project.json                     | 3 +--
 .../DeployCoreClrTestRuntime.csproj                       | 8 ++++++--
 src/Tools/BuildBoss/project.json                          | 3 +--
 src/Tools/RepoUtil/project.json                           | 3 +--
 .../Source/BoundTreeGenerator/project.json                | 6 +++---
 .../Source/CSharpErrorFactsGenerator/project.json         | 6 +++---
 .../Source/CSharpSyntaxGenerator/project.json             | 6 +++---
 .../Source/VisualBasicErrorFactsGenerator/project.json    | 6 +++---
 .../Source/VisualBasicSyntaxGenerator/project.json        | 6 +++---
 9 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/src/Interactive/HostTest/project.json b/src/Interactive/HostTest/project.json
index d176fe2959e..b400c8f9650 100644
--- a/src/Interactive/HostTest/project.json
+++ b/src/Interactive/HostTest/project.json
@@ -4,7 +4,6 @@
     "net46": { }
   },
   "runtimes": {
-    "win7-x86": { },
-    "win7-x64": { }
+    "win7-x86": { }
   }
 }
diff --git a/src/Test/DeployCoreClrTestRuntime/DeployCoreClrTestRuntime.csproj b/src/Test/DeployCoreClrTestRuntime/DeployCoreClrTestRuntime.csproj
index b024f33bfd9..213e92436e4 100644
--- a/src/Test/DeployCoreClrTestRuntime/DeployCoreClrTestRuntime.csproj
+++ b/src/Test/DeployCoreClrTestRuntime/DeployCoreClrTestRuntime.csproj
@@ -20,8 +20,12 @@
     <RoslynProjectType>DeploymentTest</RoslynProjectType>
     <OutDir>$(OutDir)CoreClrTest</OutDir>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <PlatformTarget>x64</PlatformTarget>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <PlatformTarget>x64</PlatformTarget>
+  </PropertyGroup>
   <ItemGroup>
     <Compile Include="Class1.cs" />
   </ItemGroup>
diff --git a/src/Tools/BuildBoss/project.json b/src/Tools/BuildBoss/project.json
index ebda26b600a..660d2ccb30b 100644
--- a/src/Tools/BuildBoss/project.json
+++ b/src/Tools/BuildBoss/project.json
@@ -5,10 +5,9 @@
     "System.Collections.Immutable": "1.3.0"
   },
   "frameworks": {
-    ".NETFramework,Version=v4.6": { }
+    "net46": { }
   },
   "runtimes": {
-    "win": { },
     "win7": { }
   }
 }
\ No newline at end of file
diff --git a/src/Tools/RepoUtil/project.json b/src/Tools/RepoUtil/project.json
index ebda26b600a..660d2ccb30b 100644
--- a/src/Tools/RepoUtil/project.json
+++ b/src/Tools/RepoUtil/project.json
@@ -5,10 +5,9 @@
     "System.Collections.Immutable": "1.3.0"
   },
   "frameworks": {
-    ".NETFramework,Version=v4.6": { }
+    "net46": { }
   },
   "runtimes": {
-    "win": { },
     "win7": { }
   }
 }
\ No newline at end of file
diff --git a/src/Tools/Source/CompilerGeneratorTools/Source/BoundTreeGenerator/project.json b/src/Tools/Source/CompilerGeneratorTools/Source/BoundTreeGenerator/project.json
index fd816fd6ab2..387fa2ac7f3 100644
--- a/src/Tools/Source/CompilerGeneratorTools/Source/BoundTreeGenerator/project.json
+++ b/src/Tools/Source/CompilerGeneratorTools/Source/BoundTreeGenerator/project.json
@@ -11,8 +11,8 @@
     "NETCoreApp1.0": { }
   },
   "runtimes": {
-    "win7-x64": { },
-    "ubuntu.14.04-x64": { },
-    "osx.10.10-x64": { }
+    "win7": { },
+    "ubuntu.14.04": { },
+    "osx.10.10": { }
   }
 }
diff --git a/src/Tools/Source/CompilerGeneratorTools/Source/CSharpErrorFactsGenerator/project.json b/src/Tools/Source/CompilerGeneratorTools/Source/CSharpErrorFactsGenerator/project.json
index 550cdc7fc70..446e939d9e4 100644
--- a/src/Tools/Source/CompilerGeneratorTools/Source/CSharpErrorFactsGenerator/project.json
+++ b/src/Tools/Source/CompilerGeneratorTools/Source/CSharpErrorFactsGenerator/project.json
@@ -9,8 +9,8 @@
     "NETCoreApp1.0": { }
   },
   "runtimes": {
-    "win7-x64": { },
-    "ubuntu.14.04-x64": { },
-    "osx.10.10-x64": { }
+    "win7": { },
+    "ubuntu.14.04": { },
+    "osx.10.10": { }
   }
 }
diff --git a/src/Tools/Source/CompilerGeneratorTools/Source/CSharpSyntaxGenerator/project.json b/src/Tools/Source/CompilerGeneratorTools/Source/CSharpSyntaxGenerator/project.json
index fd816fd6ab2..387fa2ac7f3 100644
--- a/src/Tools/Source/CompilerGeneratorTools/Source/CSharpSyntaxGenerator/project.json
+++ b/src/Tools/Source/CompilerGeneratorTools/Source/CSharpSyntaxGenerator/project.json
@@ -11,8 +11,8 @@
     "NETCoreApp1.0": { }
   },
   "runtimes": {
-    "win7-x64": { },
-    "ubuntu.14.04-x64": { },
-    "osx.10.10-x64": { }
+    "win7": { },
+    "ubuntu.14.04": { },
+    "osx.10.10": { }
   }
 }
diff --git a/src/Tools/Source/CompilerGeneratorTools/Source/VisualBasicErrorFactsGenerator/project.json b/src/Tools/Source/CompilerGeneratorTools/Source/VisualBasicErrorFactsGenerator/project.json
index 8039beea823..318974ee0bb 100644
--- a/src/Tools/Source/CompilerGeneratorTools/Source/VisualBasicErrorFactsGenerator/project.json
+++ b/src/Tools/Source/CompilerGeneratorTools/Source/VisualBasicErrorFactsGenerator/project.json
@@ -9,8 +9,8 @@
     "NETCoreApp1.0": { }
   },
   "runtimes": {
-    "win7-x64": { },
-    "ubuntu.14.04-x64": { },
-    "osx.10.10-x64": { }
+    "win7": { },
+    "ubuntu.14.04": { },
+    "osx.10.10": { }
   }
 }
diff --git a/src/Tools/Source/CompilerGeneratorTools/Source/VisualBasicSyntaxGenerator/project.json b/src/Tools/Source/CompilerGeneratorTools/Source/VisualBasicSyntaxGenerator/project.json
index 507e5187710..824f0663c7a 100644
--- a/src/Tools/Source/CompilerGeneratorTools/Source/VisualBasicSyntaxGenerator/project.json
+++ b/src/Tools/Source/CompilerGeneratorTools/Source/VisualBasicSyntaxGenerator/project.json
@@ -11,8 +11,8 @@
     "NETCoreApp1.0": { }
   },
   "runtimes": {
-    "win7-x64": { },
-    "ubuntu.14.04-x64": { },
-    "osx.10.10-x64": { }
+    "win7": { },
+    "ubuntu.14.04": { },
+    "osx.10.10": { }
   }
 }
-- 
GitLab