Fix warnings in project.json

PR #2493 introduced the new project.json schema. The tree has 118 files with the old schema, which added several hundred warnings. This change can't go in until PR #2864 does - it relies on those bug fixes.
2016-05-12 19:03:08 -07:00 · 2016-05-12 19:03:08 -07:00 · ed3bd312cf
commit ed3bd312cf
parent 9af3edfeda
122 changed files with 847 additions and 594 deletions
--- a/TestAssets/DesktopTestProjects/AppWithDirectDependencyDesktopAndPortable/project.json
+++ b/TestAssets/DesktopTestProjects/AppWithDirectDependencyDesktopAndPortable/project.json
@ -1,6 +1,6 @@
 {
  "version": "1.0.0-*",
-  "compilationOptions": {
+  "buildOptions": {
    "emitEntryPoint": true
  },
  "dependencies": {
--- a/TestAssets/DesktopTestProjects/BindingRedirectSample/AppWithRedirectsAndConfig/project.json
+++ b/TestAssets/DesktopTestProjects/BindingRedirectSample/AppWithRedirectsAndConfig/project.json
@ -1,11 +1,13 @@
 {
  "version": "1.0.0-*",
-  "compilationOptions": {
-    "emitEntryPoint": true
-  },
-  "compile": [
+  "buildOptions": {
+    "emitEntryPoint": true,
+    "compile": {
+      "include": [
        "../src/*.cs"
-  ],
+      ]
+    }
+  },
  "dependencies": {
    "Newtonsoft.Json": "8.0.3",
    "Microsoft.AspNet.Mvc": "3.0.50813.1",
--- a/TestAssets/DesktopTestProjects/BindingRedirectSample/AppWithRedirectsNoConfig/project.json
+++ b/TestAssets/DesktopTestProjects/BindingRedirectSample/AppWithRedirectsNoConfig/project.json
@ -1,11 +1,13 @@
 {
  "version": "1.0.0-*",
-  "compilationOptions": {
-    "emitEntryPoint": true
-  },
-  "compile": [
+  "buildOptions": {
+    "emitEntryPoint": true,
+    "compile": {
+      "include": [
        "../src/*.cs"
-  ],
+      ]
+    }
+  },
  "dependencies": {
    "Newtonsoft.Json": "8.0.3",
    "Microsoft.AspNet.Mvc": "3.0.50813.1",
--- a/TestAssets/DesktopTestProjects/DesktopAppWhichCallsDotnet/project.json
+++ b/TestAssets/DesktopTestProjects/DesktopAppWhichCallsDotnet/project.json
@ -1,9 +1,11 @@
 {
  "version": "1.0.0-*",
  "dependencies": {
-    "Microsoft.DotNet.Cli.Utils": { "target": "project" }
+    "Microsoft.DotNet.Cli.Utils": {
+      "target": "project"
+    }
  },
-  "compilationOptions": {
+  "buildOptions": {
    "emitEntryPoint": true
  },
  "frameworks": {
--- a/TestAssets/DesktopTestProjects/DesktopAppWithNativeDep/project.json
+++ b/TestAssets/DesktopTestProjects/DesktopAppWithNativeDep/project.json
@ -4,7 +4,7 @@
    "PackageWithFakeNativeDep": "1.0.0-*",
    "Microsoft.NETCore.Platforms": "1.0.0-rc2-24027"
  },
-  "compilationOptions": {
+  "buildOptions": {
    "emitEntryPoint": true
  },
  "frameworks": {
--- a/TestAssets/DesktopTestProjects/DesktopAppWithRuntimes/project.json
+++ b/TestAssets/DesktopTestProjects/DesktopAppWithRuntimes/project.json
@ -3,14 +3,13 @@
  "dependencies": {
    "Microsoft.NETCore.Windows.ApiSets": "1.0.1-rc2-*"
  },
-  "compilationOptions": {
+  "buildOptions": {
    "emitEntryPoint": true
  },
  "frameworks": {
    "net451": {}
  },
-  "runtimes":
-  {
+  "runtimes": {
    "win7-x64": {}
  }
 }
--- a/TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktop/project.json
+++ b/TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktop/project.json
@ -6,12 +6,14 @@
    "Microsoft.Extensions.Logging.Console": "1.0.0-rc2-20254",
    "Microsoft.NETCore.Platforms": "1.0.0-rc2-24027"
  },
-  "compilationOptions": {
-    "emitEntryPoint": true
-  },
-  "compile": [
+  "buildOptions": {
+    "emitEntryPoint": true,
+    "compile": {
+      "include": [
        "../src/*.cs"
-  ],
+      ]
+    }
+  },
  "frameworks": {
    "net451": {}
  }
--- a/TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktopForce32/project.json
+++ b/TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktopForce32/project.json
@ -6,13 +6,15 @@
    "Microsoft.Extensions.Logging.Console": "1.0.0-rc2-20254",
    "Microsoft.NETCore.Platforms": "1.0.0-rc2-24027"
  },
-  "compilationOptions": {
+  "buildOptions": {
    "platform": "anycpu32bitpreferred",
-    "emitEntryPoint": true
-  },
-  "compile": [
+    "emitEntryPoint": true,
+    "compile": {
+      "include": [
        "../src/*.cs"
-  ],
+      ]
+    }
+  },
  "frameworks": {
    "net451": {}
  }
--- a/TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktopWithRuntimes/project.json
+++ b/TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktopWithRuntimes/project.json
@ -6,12 +6,14 @@
    "Microsoft.Extensions.Logging.Console": "1.0.0-rc2-20254",
    "Microsoft.NETCore.Platforms": "1.0.0-rc2-24027"
  },
-  "compilationOptions": {
-    "emitEntryPoint": true
-  },
-  "compile": [
+  "buildOptions": {
+    "emitEntryPoint": true,
+    "compile": {
+      "include": [
        "../src/*.cs"
-  ],
+      ]
+    }
+  },
  "frameworks": {
    "net451": {}
  },
--- a/TestAssets/DesktopTestProjects/LibraryWithDirectDependencyDesktopAndPortable/project.json
+++ b/TestAssets/DesktopTestProjects/LibraryWithDirectDependencyDesktopAndPortable/project.json
@ -1,6 +1,6 @@
 {
  "version": "1.0.0-*",
-  "compilationOptions": {
+  "buildOptions": {
    "emitEntryPoint": false
  },
  "dependencies": {
--- a/TestAssets/LockFiles/ExportFiles/invalid_missing-exports/project.json
+++ b/TestAssets/LockFiles/ExportFiles/invalid_missing-exports/project.json
@ -1,9 +1,8 @@
-{
+{
  "version": "1.0.0-*",
-    "compilationOptions": {
+  "buildOptions": {
    "emitEntryPoint": true
  },
-
  "frameworks": {
    "net46": {
      "dependencies": {
--- a/TestAssets/LockFiles/ExportFiles/invalid_missmatching-versions/project.json
+++ b/TestAssets/LockFiles/ExportFiles/invalid_missmatching-versions/project.json
@ -1,9 +1,8 @@
-{
+{
  "version": "1.0.0-*",
-    "compilationOptions": {
+  "buildOptions": {
    "emitEntryPoint": true
  },
-
  "frameworks": {
    "net46": {
      "dependencies": {
--- a/TestAssets/LockFiles/ExportFiles/invalid_nofragment/project.json
+++ b/TestAssets/LockFiles/ExportFiles/invalid_nofragment/project.json
@ -1,9 +1,8 @@
-{
+{
  "version": "1.0.0-*",
-    "compilationOptions": {
+  "buildOptions": {
    "emitEntryPoint": true
  },
-
  "frameworks": {
    "net46": {
      "dependencies": {
--- a/TestAssets/LockFiles/ExportFiles/valid/project.json
+++ b/TestAssets/LockFiles/ExportFiles/valid/project.json
@ -1,9 +1,8 @@
-{
+{
  "version": "1.0.0-*",
-    "compilationOptions": {
+  "buildOptions": {
    "emitEntryPoint": true
  },
-
  "frameworks": {
    "net46": {
      "dependencies": {
--- a/TestAssets/LockFiles/ExportFiles/valid_staleFragment/project.json
+++ b/TestAssets/LockFiles/ExportFiles/valid_staleFragment/project.json
@ -1,9 +1,8 @@
-{
+{
  "version": "1.0.0-*",
-    "compilationOptions": {
+  "buildOptions": {
    "emitEntryPoint": true
  },
-
  "frameworks": {
    "net46": {}
  }
--- a/TestAssets/NonRestoredTestProjects/TestProjectWithUnresolvedDependency/project.json
+++ b/TestAssets/NonRestoredTestProjects/TestProjectWithUnresolvedDependency/project.json
@ -1,6 +1,6 @@
 {
  "version": "1.0.0-*",
-  "compilationOptions": {
+  "buildOptions": {
    "emitEntryPoint": true
  },
  "dependencies": {
@ -8,7 +8,9 @@
      "type": "platform",
      "version": "1.0.0-rc2-*"
    },
-    "ThisIsNotARealDependencyAndIfSomeoneGoesAndAddsAProjectWithThisNameIWillFindThemAndPunishThem": { "target": "project" }
+    "ThisIsNotARealDependencyAndIfSomeoneGoesAndAddsAProjectWithThisNameIWillFindThemAndPunishThem": {
+      "target": "project"
+    }
  },
  "frameworks": {
    "netcoreapp1.0": {
--- a/TestAssets/NonRestoredTestProjects/TestProjectWithUnresolvedPlatformDependency/project.json
+++ b/TestAssets/NonRestoredTestProjects/TestProjectWithUnresolvedPlatformDependency/project.json
@ -1,6 +1,6 @@
 {
  "version": "1.0.0-*",
-  "compilationOptions": {
+  "buildOptions": {
    "emitEntryPoint": true
  },
  "dependencies": {
--- a/TestAssets/ProjectModelServer/IncorrectGlobalJson/src/Project1/project.json
+++ b/TestAssets/ProjectModelServer/IncorrectGlobalJson/src/Project1/project.json
@ -1,6 +1,6 @@
 {
  "version": "1.0.0-*",
-  "compilationOptions": {
+  "buildOptions": {
    "emitEntryPoint": true
  },
  "dependencies": {
--- a/TestAssets/ProjectModelServer/MSBuildReferencesProjects/ValidCase01/src/MainApp/project.json
+++ b/TestAssets/ProjectModelServer/MSBuildReferencesProjects/ValidCase01/src/MainApp/project.json
@ -1,9 +1,8 @@
-{
+{
  "version": "1.0.0-*",
-    "compilationOptions": {
+  "buildOptions": {
    "emitEntryPoint": true
  },
-
  "frameworks": {
    "net46": {
      "dependencies": {
--- a/TestAssets/TestPackages/PackageWithFakeNativeDep/project.json
+++ b/TestAssets/TestPackages/PackageWithFakeNativeDep/project.json
@ -1,9 +1,13 @@
 {
  "version": "1.0.0",
-  "packInclude": {
-      "runtimes/": "runtimes/"
-  },
  "frameworks": {
    "net45": {}
+  },
+  "packOptions": {
+    "files": {
+      "mappings": {
+        "runtimes/": "runtimes/"
+      }
+    }
  }
 }
--- a/TestAssets/TestPackages/ToolWithOutputName/project.json
+++ b/TestAssets/TestPackages/ToolWithOutputName/project.json
@ -1,6 +1,6 @@
 {
  "version": "1.0.0",
-  "compilationOptions": {
+  "buildOptions": {
    "outputName": "dotnet-tool-with-output-name",
    "emitEntryPoint": true
  },
--- a/TestAssets/TestPackages/dotnet-dependency-context-test/project.json
+++ b/TestAssets/TestPackages/dotnet-dependency-context-test/project.json
@ -1,6 +1,6 @@
 {
  "version": "1.0.0-rc-*",
-  "compilationOptions": {
+  "buildOptions": {
    "emitEntryPoint": true
  },
  "dependencies": {
@ -8,7 +8,9 @@
      "type": "platform",
      "version": "1.0.0-rc3-*"
    },
-    "Microsoft.Extensions.DependencyModel": { "target": "project" }
+    "Microsoft.Extensions.DependencyModel": {
+      "target": "project"
+    }
  },
  "frameworks": {
    "netcoreapp1.0": {
--- a/TestAssets/TestPackages/dotnet-dependency-tool-invoker/project.json
+++ b/TestAssets/TestPackages/dotnet-dependency-tool-invoker/project.json
@ -1,20 +1,28 @@
 {
  "version": "1.0.0-rc-*",
-  "compilationOptions": {
-    "emitEntryPoint": true
-  },
-  "compile": [
+  "buildOptions": {
+    "emitEntryPoint": true,
+    "compile": {
+      "include": [
        "**/*.cs",
        "../../../src/dotnet/CommandLine/*.cs"
-  ],
+      ]
+    }
+  },
  "dependencies": {
    "Microsoft.NETCore.App": {
      "type": "platform",
      "version": "1.0.0-rc3-*"
    },
-    "Microsoft.DotNet.Cli.Utils": { "target": "project" },
-    "Microsoft.DotNet.ProjectModel": { "target": "project" },
-    "Microsoft.DotNet.Compiler.Common": { "target": "project" }
+    "Microsoft.DotNet.Cli.Utils": {
+      "target": "project"
+    },
+    "Microsoft.DotNet.ProjectModel": {
+      "target": "project"
+    },
+    "Microsoft.DotNet.Compiler.Common": {
+      "target": "project"
+    }
  },
  "frameworks": {
    "netcoreapp1.0": {
--- a/TestAssets/TestPackages/dotnet-desktop-and-portable/project.json
+++ b/TestAssets/TestPackages/dotnet-desktop-and-portable/project.json
@ -1,6 +1,6 @@
 {
  "version": "1.0.0-rc-*",
-  "compilationOptions": {
+  "buildOptions": {
    "emitEntryPoint": true
  },
  "frameworks": {
--- a/TestAssets/TestPackages/dotnet-desktop-binding-redirects/project.json
+++ b/TestAssets/TestPackages/dotnet-desktop-binding-redirects/project.json
@ -1,6 +1,6 @@
 {
  "version": "1.0.0-rc-*",
-  "compilationOptions": {
+  "buildOptions": {
    "emitEntryPoint": true
  },
  "dependencies": {
@ -15,4 +15,3 @@
    }
  }
 }
-
--- a/TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/project.json
+++ b/TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/project.json
@ -1,6 +1,6 @@
 {
  "version": "1.0.0",
-  "compilationOptions": {
+  "buildOptions": {
    "emitEntryPoint": true
  },
  "dependencies": {
--- a/TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/project.json
+++ b/TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/project.json
@ -1,6 +1,6 @@
 {
  "version": "2.0.0",
-  "compilationOptions": {
+  "buildOptions": {
    "emitEntryPoint": true
  },
  "dependencies": {
--- a/TestAssets/TestPackages/dotnet-portable/project.json
+++ b/TestAssets/TestPackages/dotnet-portable/project.json
@ -1,6 +1,6 @@
 {
  "version": "1.0.0",
-  "compilationOptions": {
+  "buildOptions": {
    "emitEntryPoint": true
  },
  "frameworks": {
--- a/TestAssets/TestProjects/AppWithBomGlobalJson/project.json
+++ b/TestAssets/TestProjects/AppWithBomGlobalJson/project.json
@ -1,6 +1,6 @@
 {
  "version": "1.0.0-*",
-  "compilationOptions": {
+  "buildOptions": {
    "emitEntryPoint": true
  },
  "dependencies": {
--- a/TestAssets/TestProjects/AppWithDependencyOnToolWithOutputName/project.json
+++ b/TestAssets/TestProjects/AppWithDependencyOnToolWithOutputName/project.json
@ -1,6 +1,6 @@
 {
  "version": "1.0.0-*",
-  "compilationOptions": {
+  "buildOptions": {
    "emitEntryPoint": true
  },
  "dependencies": {
@ -12,7 +12,6 @@
  "frameworks": {
    "netcoreapp1.0": {}
  },
-
  "tools": {
    "ToolWithOutputName": {
      "version": "1.0.0",
--- a/TestAssets/TestProjects/AppWithDirectAndToolDependency/project.json
+++ b/TestAssets/TestProjects/AppWithDirectAndToolDependency/project.json
@ -1,6 +1,6 @@
 {
  "version": "1.0.0-*",
-  "compilationOptions": {
+  "buildOptions": {
    "emitEntryPoint": true
  },
  "dependencies": {
@ -13,7 +13,6 @@
  "frameworks": {
    "netcoreapp1.0": {}
  },
-
  "tools": {
    "dotnet-portable": {
      "version": "1.0.0",
--- a/TestAssets/TestProjects/AppWithDirectDependency/project.json
+++ b/TestAssets/TestProjects/AppWithDirectDependency/project.json
@ -1,9 +1,8 @@
 {
  "version": "1.0.0-*",
-  "compilationOptions": {
+  "buildOptions": {
    "emitEntryPoint": true
  },
-
  "dependencies": {
    "Microsoft.NETCore.App": "1.0.0-rc3-*",
    "dotnet-hello": {
--- a/TestAssets/TestProjects/AppWithDirectDependencyAndTypeBuild/project.json
+++ b/TestAssets/TestProjects/AppWithDirectDependencyAndTypeBuild/project.json
@ -1,9 +1,8 @@
 {
  "version": "1.0.0-*",
-  "compilationOptions": {
+  "buildOptions": {
    "emitEntryPoint": true
  },
-
  "dependencies": {
    "Microsoft.NETCore.App": {
      "version": "1.0.0-rc3-*",
@ -17,7 +16,9 @@
  },
  "frameworks": {
    "netcoreapp1.0": {
-        "imports": [ "portable-net451+win8" ]
+      "imports": [
+        "portable-net451+win8"
+      ]
    }
  }
 }
--- a/TestAssets/TestProjects/AppWithDirectDependencyWithOutputName/project.json
+++ b/TestAssets/TestProjects/AppWithDirectDependencyWithOutputName/project.json
@ -1,5 +1,5 @@
 {
-  "compilationOptions": {
+  "buildOptions": {
    "emitEntryPoint": true
  },
  "dependencies": {
--- a/TestAssets/TestProjects/AppWithOutputAssemblyName/project.json
+++ b/TestAssets/TestProjects/AppWithOutputAssemblyName/project.json
@ -1,5 +1,5 @@
 {
-  "compilationOptions": {
+  "buildOptions": {
    "outputName": "MyApp",
    "emitEntryPoint": true
  },
--- a/TestAssets/TestProjects/AppWithToolDependency/project.json
+++ b/TestAssets/TestProjects/AppWithToolDependency/project.json
@ -1,6 +1,6 @@
 {
  "version": "1.0.0-*",
-  "compilationOptions": {
+  "buildOptions": {
    "emitEntryPoint": true
  },
  "dependencies": {
--- a/TestAssets/TestProjects/CompileFail/project.json
+++ b/TestAssets/TestProjects/CompileFail/project.json
@ -1,6 +1,6 @@
 {
  "version": "1.0.0-*",
-  "compilationOptions": {
+  "buildOptions": {
    "emitEntryPoint": true
  },
  "dependencies": {
--- a/TestAssets/TestProjects/DependencyChangeTest/PortableApp_Standalone/project.json
+++ b/TestAssets/TestProjects/DependencyChangeTest/PortableApp_Standalone/project.json
@ -1,5 +1,5 @@
 {
-  "compilationOptions": {
+  "buildOptions": {
    "emitEntryPoint": true
  },
  "dependencies": {},
@ -14,4 +14,3 @@
    }
  }
 }
-
--- a/TestAssets/TestProjects/DependencyContextFromTool/project.json
+++ b/TestAssets/TestProjects/DependencyContextFromTool/project.json
@ -1,5 +1,5 @@
 {
-  "compilationOptions": {
+  "buildOptions": {
    "emitEntryPoint": true
  },
  "dependencies": {},
@ -20,7 +20,9 @@
  "tools": {
    "dotnet-dependency-context-test": {
      "version": "1.0.0-*",
-        "imports": [ "dnxcore50" ]
+      "imports": [
+        "dnxcore50"
+      ]
    }
  }
 }
--- a/TestAssets/TestProjects/DependencyContextValidator/TestApp/project.json
+++ b/TestAssets/TestProjects/DependencyContextValidator/TestApp/project.json
@ -1,6 +1,6 @@
 {
  "version": "1.0.0-*",
-  "compilationOptions": {
+  "buildOptions": {
    "emitEntryPoint": true,
    "preserveCompilationContext": true
  },
@ -9,6 +9,11 @@
    "DependencyContextValidator": "1.0.0-*"
  },
  "frameworks": {
-    "netcoreapp1.0": { "imports": ["dnxcore50", "portable-net45+win8"] }
+    "netcoreapp1.0": {
+      "imports": [
+        "dnxcore50",
+        "portable-net45+win8"
+      ]
+    }
  }
 }
--- a/TestAssets/TestProjects/DependencyContextValidator/TestAppDeps/project.json
+++ b/TestAssets/TestProjects/DependencyContextValidator/TestAppDeps/project.json
@ -1,6 +1,6 @@
 {
  "version": "1.0.0-*",
-  "compilationOptions": {
+  "buildOptions": {
    "emitEntryPoint": true
  },
  "dependencies": {
@ -8,6 +8,11 @@
    "DependencyContextValidator": "1.0.0-*"
  },
  "frameworks": {
-    "netcoreapp1.0": { "imports": ["dnxcore50", "portable-net45+win8"] }
+    "netcoreapp1.0": {
+      "imports": [
+        "dnxcore50",
+        "portable-net45+win8"
+      ]
+    }
  }
 }
--- a/TestAssets/TestProjects/DependencyContextValidator/TestAppFullClr/project.json
+++ b/TestAssets/TestProjects/DependencyContextValidator/TestAppFullClr/project.json
@ -1,6 +1,6 @@
 {
  "version": "1.0.0-*",
-  "compilationOptions": {
+  "buildOptions": {
    "emitEntryPoint": true,
    "preserveCompilationContext": true
  },
@ -8,7 +8,6 @@
    "DependencyContextValidator": "1.0.0-*"
  },
  "frameworks": {
-    "net451": {
-    }
+    "net451": {}
  }
 }
--- a/TestAssets/TestProjects/DependencyContextValidator/TestAppPortable/project.json
+++ b/TestAssets/TestProjects/DependencyContextValidator/TestAppPortable/project.json
@ -1,6 +1,6 @@
 {
  "version": "1.0.0-*",
-  "compilationOptions": {
+  "buildOptions": {
    "emitEntryPoint": true,
    "preserveCompilationContext": true
  },
@ -12,6 +12,11 @@
    "DependencyContextValidator": "1.0.0-*"
  },
  "frameworks": {
-    "netcoreapp1.0": { "imports": ["dnxcore50", "portable-net45+win8"] }
+    "netcoreapp1.0": {
+      "imports": [
+        "dnxcore50",
+        "portable-net45+win8"
+      ]
+    }
  }
 }
--- a/TestAssets/TestProjects/DependencyContextValidator/TestAppPortableDeps/project.json
+++ b/TestAssets/TestProjects/DependencyContextValidator/TestAppPortableDeps/project.json
@ -1,6 +1,6 @@
 {
  "version": "1.0.0-*",
-  "compilationOptions": {
+  "buildOptions": {
    "emitEntryPoint": true
  },
  "dependencies": {
@ -11,6 +11,11 @@
    "DependencyContextValidator": "1.0.0-*"
  },
  "frameworks": {
-    "netcoreapp1.0": { "imports": ["dnxcore50", "portable-net45+win8"] }
+    "netcoreapp1.0": {
+      "imports": [
+        "dnxcore50",
+        "portable-net45+win8"
+      ]
+    }
  }
 }
--- a/TestAssets/TestProjects/FSharpTestProjects/CompileFailApp/project.json
+++ b/TestAssets/TestProjects/FSharpTestProjects/CompileFailApp/project.json
@ -1,12 +1,14 @@
 {
  "version": "1.0.0-*",
-  "compilationOptions": {
-    "emitEntryPoint": true
-  },
+  "buildOptions": {
+    "emitEntryPoint": true,
    "compilerName": "fsc",
-  "compileFiles": [
+    "compile": {
+      "includeFiles": [
        "Program.fs"
-  ],
+      ]
+    }
+  },
  "dependencies": {
    "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221",
    "Microsoft.NETCore.App": "1.0.0-rc3-*"
--- a/TestAssets/TestProjects/FSharpTestProjects/TestApp/project.json
+++ b/TestAssets/TestProjects/FSharpTestProjects/TestApp/project.json
@ -1,12 +1,14 @@
 {
  "version": "1.0.0-*",
-  "compilationOptions": {
-    "emitEntryPoint": true
-  },
+  "buildOptions": {
+    "emitEntryPoint": true,
    "compilerName": "fsc",
-  "compileFiles": [
+    "compile": {
+      "includeFiles": [
        "Program.fs"
-  ],
+      ]
+    }
+  },
  "dependencies": {
    "TestLibrary": {
      "version": "1.0.0-*",
--- a/TestAssets/TestProjects/FSharpTestProjects/TestAppWithArgs/project.json
+++ b/TestAssets/TestProjects/FSharpTestProjects/TestAppWithArgs/project.json
@ -1,12 +1,14 @@
 {
  "version": "1.0.0-*",
-  "compilationOptions": {
-    "emitEntryPoint": true
-  },
+  "buildOptions": {
+    "emitEntryPoint": true,
    "compilerName": "fsc",
-  "compileFiles": [
+    "compile": {
+      "includeFiles": [
        "Program.fs"
-  ],
+      ]
+    }
+  },
  "dependencies": {
    "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221",
    "Microsoft.NETCore.App": "1.0.0-rc3-*"
--- a/TestAssets/TestProjects/FSharpTestProjects/TestLibrary/project.json
+++ b/TestAssets/TestProjects/FSharpTestProjects/TestLibrary/project.json
@ -4,11 +4,6 @@
    "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221",
    "NETStandard.Library": "1.5.0-rc2-24027"
  },
-  "compilerName": "fsc",
-  "compileFiles": [
-    "Helper2.fs",
-    "Helper.fs"
-  ],
  "tools": {
    "dotnet-compile-fsc": {
      "version": "1.0.0-*",
@ -23,5 +18,14 @@
    "netcoreapp1.0": {
      "imports": "dnxcore50"
    }
+  },
+  "buildOptions": {
+    "compilerName": "fsc",
+    "compile": {
+      "includeFiles": [
+        "Helper2.fs",
+        "Helper.fs"
+      ]
+    }
  }
 }
--- a/TestAssets/TestProjects/KestrelSample/KestrelPortable/project.json
+++ b/TestAssets/TestProjects/KestrelSample/KestrelPortable/project.json
@ -5,12 +5,14 @@
    "Microsoft.AspNetCore.Hosting": "1.0.0-rc2-20113",
    "Microsoft.Extensions.Logging.Console": "1.0.0-rc2-20254"
  },
-  "compilationOptions": {
-    "emitEntryPoint": true
-  },
-  "compile": [
+  "buildOptions": {
+    "emitEntryPoint": true,
+    "compile": {
+      "include": [
        "../src/*.cs"
-  ],
+      ]
+    }
+  },
  "frameworks": {
    "netcoreapp1.0": {
      "dependencies": {
--- a/TestAssets/TestProjects/KestrelSample/KestrelStandalone/project.json
+++ b/TestAssets/TestProjects/KestrelSample/KestrelStandalone/project.json
@ -5,12 +5,14 @@
    "Microsoft.AspNetCore.Hosting": "1.0.0-rc2-20113",
    "Microsoft.Extensions.Logging.Console": "1.0.0-rc2-20254"
  },
-  "compilationOptions": {
-    "emitEntryPoint": true
-  },
-  "compile": [
+  "buildOptions": {
+    "emitEntryPoint": true,
+    "compile": {
+      "include": [
        "../src/*.cs"
-  ],
+      ]
+    }
+  },
  "frameworks": {
    "netcoreapp1.0": {
      "dependencies": {
--- a/TestAssets/TestProjects/LibraryWithOutputAssemblyName/project.json
+++ b/TestAssets/TestProjects/LibraryWithOutputAssemblyName/project.json
@ -1,5 +1,5 @@
 {
-  "compilationOptions": {
+  "buildOptions": {
    "outputName": "MyLibrary"
  },
  "dependencies": {
--- a/TestAssets/TestProjects/OutputStandardOutputAndError/project.json
+++ b/TestAssets/TestProjects/OutputStandardOutputAndError/project.json
@ -1,6 +1,6 @@
 {
  "version": "1.0.0-*",
-  "compilationOptions": {
+  "buildOptions": {
    "emitEntryPoint": true
  },
  "dependencies": {
--- a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetApp/project.json
+++ b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetApp/project.json
@ -1,6 +1,6 @@
 {
  "version": "1.0.0-*",
-  "compilationOptions": {
+  "buildOptions": {
    "emitEntryPoint": true
  },
  "dependencies": {
--- a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP0/project.json
+++ b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP0/project.json
@ -1,6 +1,6 @@
 {
  "version": "1.0.0-*",
-  "compilationOptions": {
+  "buildOptions": {
    "emitEntryPoint": true
  },
  "dependencies": {
--- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetApp/project.json
+++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetApp/project.json
@ -1,6 +1,6 @@
 {
  "version": "1.0.0-*",
-  "compilationOptions": {
+  "buildOptions": {
    "emitEntryPoint": true
  },
  "dependencies": {
--- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP0/project.json
+++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP0/project.json
@ -1,6 +1,6 @@
 {
  "version": "1.0.0-*",
-  "compilationOptions": {
+  "buildOptions": {
    "emitEntryPoint": true
  },
  "dependencies": {
--- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP0/project.json
+++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP0/project.json
@ -1,6 +1,6 @@
 {
  "version": "1.0.0-*",
-  "compilationOptions": {
+  "buildOptions": {
    "emitEntryPoint": true
  },
  "dependencies": {
--- a/TestAssets/TestProjects/PortableTests/PortableApp/project.json
+++ b/TestAssets/TestProjects/PortableTests/PortableApp/project.json
@ -1,5 +1,5 @@
 {
-  "compilationOptions": {
+  "buildOptions": {
    "emitEntryPoint": true
  },
  "dependencies": {},
--- a/TestAssets/TestProjects/PortableTests/PortableAppCompilationContext/project.json
+++ b/TestAssets/TestProjects/PortableTests/PortableAppCompilationContext/project.json
@ -1,5 +1,5 @@
 {
-  "compilationOptions": {
+  "buildOptions": {
    "emitEntryPoint": true,
    "preserveCompilationContext": true
  },
--- a/TestAssets/TestProjects/PortableTests/PortableAppWithIntentionalManagedDowngrade/project.json
+++ b/TestAssets/TestProjects/PortableTests/PortableAppWithIntentionalManagedDowngrade/project.json
@ -1,5 +1,5 @@
 {
-  "compilationOptions": {
+  "buildOptions": {
    "emitEntryPoint": true
  },
  "dependencies": {},
--- a/TestAssets/TestProjects/PortableTests/PortableAppWithNative/project.json
+++ b/TestAssets/TestProjects/PortableTests/PortableAppWithNative/project.json
@ -1,5 +1,5 @@
 {
-  "compilationOptions": {
+  "buildOptions": {
    "emitEntryPoint": true
  },
  "frameworks": {
--- a/TestAssets/TestProjects/PortableTests/StandaloneApp/project.json
+++ b/TestAssets/TestProjects/PortableTests/StandaloneApp/project.json
@ -1,5 +1,5 @@
 {
-  "compilationOptions": {
+  "buildOptions": {
    "emitEntryPoint": true
  },
  "frameworks": {
--- a/TestAssets/TestProjects/ResourcesTests/TestApp/project.json
+++ b/TestAssets/TestProjects/ResourcesTests/TestApp/project.json
@ -1,6 +1,6 @@
 {
  "version": "1.0.0-*",
-  "compilationOptions": {
+  "buildOptions": {
    "emitEntryPoint": true
  },
  "dependencies": {
@ -9,11 +9,15 @@
      "type": "platform",
      "version": "1.0.0-rc3-*"
    },
-    "TestLibraryWithResources": { "target": "project" }
+    "TestLibraryWithResources": {
+      "target": "project"
+    }
  },
  "frameworks": {
    "netcoreapp1.0": {
-        "imports": [ "portable-net45+win8" ]
+      "imports": [
+        "portable-net45+win8"
+      ]
    }
  }
 }
--- a/TestAssets/TestProjects/RunTestsApps/TestAppFullClr/project.json
+++ b/TestAssets/TestProjects/RunTestsApps/TestAppFullClr/project.json
@ -1,9 +1,8 @@
 {
  "version": "1.0.0-*",
-    "compilationOptions": {
+  "buildOptions": {
    "emitEntryPoint": true
  },
-
  "frameworks": {
    "net451": {}
  }
--- a/TestAssets/TestProjects/RunTestsApps/TestAppMultiTarget/project.json
+++ b/TestAssets/TestProjects/RunTestsApps/TestAppMultiTarget/project.json
@ -1,6 +1,6 @@
 {
  "version": "1.0.0-*",
-  "compilationOptions": {
+  "buildOptions": {
    "emitEntryPoint": true
  },
  "frameworks": {
--- a/TestAssets/TestProjects/RunTestsApps/TestAppMultiTargetNoCoreClr/project.json
+++ b/TestAssets/TestProjects/RunTestsApps/TestAppMultiTargetNoCoreClr/project.json
@ -1,9 +1,8 @@
 {
  "version": "1.0.0-*",
-    "compilationOptions": {
+  "buildOptions": {
    "emitEntryPoint": true
  },
-
  "frameworks": {
    "net451": {},
    "net45": {}
--- a/TestAssets/TestProjects/TestAppCompilationContext/TestApp/project.json
+++ b/TestAssets/TestProjects/TestAppCompilationContext/TestApp/project.json
@ -1,6 +1,6 @@
 {
  "version": "1.0.0-*",
-  "compilationOptions": {
+  "buildOptions": {
    "emitEntryPoint": true,
    "preserveCompilationContext": true
  },
--- a/TestAssets/TestProjects/TestAppCompilationContext/TestLibrary/project.json
+++ b/TestAssets/TestProjects/TestAppCompilationContext/TestLibrary/project.json
@ -1,6 +1,6 @@
 {
  "version": "1.0.0-*",
-  "compilationOptions": {
+  "buildOptions": {
    "nowarn": [
      "CS1591"
    ],
--- a/TestAssets/TestProjects/TestAppSimple/project.json
+++ b/TestAssets/TestProjects/TestAppSimple/project.json
@ -1,6 +1,6 @@
 {
  "version": "1.0.0-*",
-  "compilationOptions": {
+  "buildOptions": {
    "emitEntryPoint": true
  },
  "dependencies": {
--- a/TestAssets/TestProjects/TestAppWithArgs/project.json
+++ b/TestAssets/TestProjects/TestAppWithArgs/project.json
@ -1,6 +1,6 @@
 {
  "version": "1.0.0-*",
-  "compilationOptions": {
+  "buildOptions": {
    "emitEntryPoint": true
  },
  "dependencies": {
--- a/TestAssets/TestProjects/TestAppWithBuildDependency/App/project.json
+++ b/TestAssets/TestProjects/TestAppWithBuildDependency/App/project.json
@ -1,6 +1,6 @@
 {
  "version": "1.0.0-*",
-  "compilationOptions": {
+  "buildOptions": {
    "emitEntryPoint": true
  },
  "dependencies": {
@ -8,7 +8,9 @@
      "type": "platform",
      "version": "1.0.0-rc3-*"
    },
-    "LibraryWithBuildDependency": { "target": "project" }
+    "LibraryWithBuildDependency": {
+      "target": "project"
+    }
  },
  "frameworks": {
    "netcoreapp1.0": {
--- a/TestAssets/TestProjects/TestAppWithContentPackage/project.json
+++ b/TestAssets/TestProjects/TestAppWithContentPackage/project.json
@ -1,6 +1,6 @@
 {
  "version": "1.0.0-*",
-  "compilationOptions": {
+  "buildOptions": {
    "emitEntryPoint": true,
    "outputName": "AppWithContentPackage"
  },
@ -9,6 +9,11 @@
    "SharedContentA": "1.0.0-*"
  },
  "frameworks": {
-    "netcoreapp1.0": { "imports": ["netstandardapp1.5", "dnxcore50"] }
+    "netcoreapp1.0": {
+      "imports": [
+        "netstandardapp1.5",
+        "dnxcore50"
+      ]
+    }
  }
 }
--- a/TestAssets/TestProjects/TestAppWithContents/project.json
+++ b/TestAssets/TestProjects/TestAppWithContents/project.json
@ -1,13 +1,18 @@
 {
  "version": "1.0.0-*",
-  "compilationOptions": {
-    "emitEntryPoint": true
+  "buildOptions": {
+    "emitEntryPoint": true,
+    "copyToOutput": {
+      "include": "testcontentfile.txt"
+    }
  },
  "dependencies": {
    "Microsoft.NETCore.App": "1.0.0-rc3-*"
  },
-  "content": "testcontentfile.txt",
  "frameworks": {
    "netcoreapp1.0": {}
+  },
+  "publishOptions": {
+    "include": "testcontentfile.txt"
  }
 }
--- a/TestAssets/TestProjects/TestAppWithLibrary/TestApp/project.json
+++ b/TestAssets/TestProjects/TestAppWithLibrary/TestApp/project.json
@ -1,6 +1,6 @@
 {
  "version": "1.0.0-*",
-  "compilationOptions": {
+  "buildOptions": {
    "emitEntryPoint": true,
    "preserveCompilationContext": true
  },
--- a/TestAssets/TestProjects/TestAppWithLibrary/TestLibrary/project.json
+++ b/TestAssets/TestProjects/TestAppWithLibrary/TestLibrary/project.json
@ -1,6 +1,6 @@
 {
  "version": "1.0.0-*",
-  "compilationOptions": {
+  "buildOptions": {
    "nowarn": [
      "CS1591"
    ],
--- a/TestAssets/TestProjects/TestAppWithScripts/project.json
+++ b/TestAssets/TestProjects/TestAppWithScripts/project.json
@ -1,6 +1,6 @@
 {
  "version": "1.0.0-*",
-  "compilationOptions": {
+  "buildOptions": {
    "emitEntryPoint": true
  },
  "dependencies": {
--- a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestApp/project.json
+++ b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestApp/project.json
@ -1,6 +1,6 @@
 {
  "version": "1.0.0-*",
-  "compilationOptions": {
+  "buildOptions": {
    "emitEntryPoint": true,
    "preserveCompilationContext": true
  },
--- a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary/project.json
+++ b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary/project.json
@ -1,6 +1,6 @@
 {
  "version": "1.0.0-*",
-  "compilationOptions": {
+  "buildOptions": {
    "nowarn": [
      "CS1591"
    ],
--- a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary2/project.json
+++ b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary2/project.json
@ -1,6 +1,6 @@
 {
  "version": "1.0.0-*",
-  "compilationOptions": {
+  "buildOptions": {
    "emitEntryPoint": true
  },
  "dependencies": {
--- a/TestAssets/TestProjects/TestAppWithUnicodéPath/project.json
+++ b/TestAssets/TestProjects/TestAppWithUnicodéPath/project.json
@ -1,6 +1,6 @@
 {
  "version": "1.0.0-*",
-  "compilationOptions": {
+  "buildOptions": {
    "emitEntryPoint": true
  },
  "dependencies": {
--- a/TestAssets/TestProjects/TestAppWithWrapperProjectDependency/TestApp/project.json
+++ b/TestAssets/TestProjects/TestAppWithWrapperProjectDependency/TestApp/project.json
@ -1,6 +1,6 @@
 {
  "version": "1.0.0-*",
-  "compilationOptions": {
+  "buildOptions": {
    "emitEntryPoint": true,
    "preserveCompilationContext": true
  },
--- a/TestAssets/TestProjects/TestLibraryWithConfiguration/project.json
+++ b/TestAssets/TestProjects/TestLibraryWithConfiguration/project.json
@ -1,6 +1,6 @@
 {
  "version": "1.0.0-*",
-  "compilationOptions": {
+  "buildOptions": {
    "nowarn": [
      "CS1591"
    ],
--- a/TestAssets/TestProjects/TestLibraryWithMultipleFrameworks/project.json
+++ b/TestAssets/TestProjects/TestLibraryWithMultipleFrameworks/project.json
@ -1,6 +1,6 @@
 {
  "version": "1.0.0-*",
-  "compilationOptions": {
+  "buildOptions": {
    "emitEntryPoint": false
  },
  "dependencies": {},
--- a/TestAssets/TestProjects/TestLibraryWithXmlDoc/project.json
+++ b/TestAssets/TestProjects/TestLibraryWithXmlDoc/project.json
@ -1,6 +1,6 @@
 {
  "version": "1.0.0-*",
-  "compilationOptions": {
+  "buildOptions": {
    "xmlDoc": true
  },
  "dependencies": {
--- a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L0/project.json
+++ b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L0/project.json
@ -1,6 +1,6 @@
 {
  "version": "1.0.0-*",
-  "compilationOptions": {
+  "buildOptions": {
    "emitEntryPoint": true
  },
  "dependencies": {
--- a/TestAssets/TestProjects/TestProjectWithCultureSpecificResource/project.json
+++ b/TestAssets/TestProjects/TestProjectWithCultureSpecificResource/project.json
@ -1,6 +1,6 @@
 {
  "version": "1.0.0-*",
-  "compilationOptions": {
+  "buildOptions": {
    "emitEntryPoint": true
  },
  "dependencies": {
--- a/TestAssets/TestProjects/TestProjectWithResource/project.json
+++ b/TestAssets/TestProjects/TestProjectWithResource/project.json
@ -1,6 +1,6 @@
 {
  "version": "1.0.0-*",
-  "compilationOptions": {
+  "buildOptions": {
    "emitEntryPoint": true
  },
  "dependencies": {
--- a/TestAssets/TestProjects/TestSimpleIncrementalApp/project.json
+++ b/TestAssets/TestProjects/TestSimpleIncrementalApp/project.json
@ -1,6 +1,6 @@
 {
  "version": "1.0.0-*",
-  "compilationOptions": {
+  "buildOptions": {
    "emitEntryPoint": true,
    "xmlDoc": true
  },
--- a/src/Microsoft.DotNet.Cli.Utils/project.json
+++ b/src/Microsoft.DotNet.Cli.Utils/project.json
@ -1,11 +1,13 @@
 {
  "version": "1.0.0-preview2-*",
-  "compilationOptions": {
+  "buildOptions": {
    "keyFile": "../../tools/Key.snk",
    "warningsAsErrors": true
  },
  "dependencies": {
-    "Microsoft.DotNet.ProjectModel": { "target": "project" },
+    "Microsoft.DotNet.ProjectModel": {
+      "target": "project"
+    },
    "NuGet.Versioning": "3.5.0-rc-1285",
    "NuGet.Packaging": "3.5.0-rc-1285",
    "NuGet.Frameworks": "3.5.0-rc-1285",
--- a/src/Microsoft.DotNet.Compiler.Common/project.json
+++ b/src/Microsoft.DotNet.Compiler.Common/project.json
@ -1,13 +1,19 @@
 {
  "version": "1.0.0-preview2-*",
-  "compilationOptions": {
+  "buildOptions": {
    "keyFile": "../../tools/Key.snk"
  },
  "dependencies": {
    "Microsoft.CodeAnalysis.CSharp": "1.3.0-beta1-20160429-01",
-    "Microsoft.DotNet.ProjectModel": { "target": "project" },
-    "Microsoft.DotNet.Cli.Utils": { "target": "project" },
-    "Microsoft.DotNet.Files": { "target": "project" }
+    "Microsoft.DotNet.ProjectModel": {
+      "target": "project"
+    },
+    "Microsoft.DotNet.Cli.Utils": {
+      "target": "project"
+    },
+    "Microsoft.DotNet.Files": {
+      "target": "project"
+    }
  },
  "frameworks": {
    "net451": {
--- a/src/Microsoft.DotNet.Files/project.json
+++ b/src/Microsoft.DotNet.Files/project.json
@ -1,12 +1,16 @@
 {
  "version": "1.0.0-preview2-*",
-  "compilationOptions": {
+  "buildOptions": {
    "keyFile": "../../tools/Key.snk"
  },
  "description": "Abstraction to interact with the file system and file paths.",
  "dependencies": {
-    "Microsoft.DotNet.Cli.Utils": { "target": "project" },
-    "Microsoft.DotNet.ProjectModel": { "target": "project" },
+    "Microsoft.DotNet.Cli.Utils": {
+      "target": "project"
+    },
+    "Microsoft.DotNet.ProjectModel": {
+      "target": "project"
+    },
    "System.Linq.Expressions": "4.0.11-rc2-24027"
  },
  "frameworks": {
--- a/src/Microsoft.DotNet.InternalAbstractions/project.json
+++ b/src/Microsoft.DotNet.InternalAbstractions/project.json
@ -1,11 +1,7 @@
 {
  "description": "Abstractions for making code that uses file system and environment testable.",
  "version": "1.0.0-rc3-*",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/dotnet/cli"
-  },
-  "compilationOptions": {
+  "buildOptions": {
    "warningsAsErrors": true,
    "keyFile": "../../tools/Key.snk",
    "allowUnsafe": true
@ -25,5 +21,11 @@
      }
    }
  },
-  "scripts": { }
+  "scripts": {},
+  "packOptions": {
+    "repository": {
+      "type": "git",
+      "url": "git://github.com/dotnet/cli"
+    }
+  }
 }
--- a/src/Microsoft.DotNet.ProjectModel.Loader/project.json
+++ b/src/Microsoft.DotNet.ProjectModel.Loader/project.json
@ -1,10 +1,12 @@
 {
  "version": "1.0.0-preview2-*",
-  "compilationOptions": {
+  "buildOptions": {
    "keyFile": "../../tools/Key.snk"
  },
  "dependencies": {
-    "Microsoft.DotNet.ProjectModel": { "target": "project" },
+    "Microsoft.DotNet.ProjectModel": {
+      "target": "project"
+    },
    "System.Runtime.Loader": "4.0.0-rc2-24027"
  },
  "frameworks": {
--- a/src/Microsoft.DotNet.ProjectModel.Workspaces/project.json
+++ b/src/Microsoft.DotNet.ProjectModel.Workspaces/project.json
@ -1,11 +1,15 @@
 {
  "version": "1.0.0-preview2-*",
-  "compilationOptions": {
+  "buildOptions": {
    "keyFile": "../../tools/Key.snk"
  },
  "dependencies": {
-    "Microsoft.DotNet.ProjectModel": { "target": "project" },
-    "Microsoft.DotNet.Compiler.Common": { "target": "project" },
+    "Microsoft.DotNet.ProjectModel": {
+      "target": "project"
+    },
+    "Microsoft.DotNet.Compiler.Common": {
+      "target": "project"
+    },
    "Microsoft.CodeAnalysis.CSharp.Workspaces": "1.3.0-beta1-20160429-01"
  },
  "frameworks": {
--- a/src/Microsoft.DotNet.ProjectModel/project.json
+++ b/src/Microsoft.DotNet.ProjectModel/project.json
@ -1,11 +1,13 @@
 {
  "version": "1.0.0-rc3-*",
-  "compilationOptions": {
+  "buildOptions": {
    "keyFile": "../../tools/Key.snk"
  },
  "description": "Types to model a .NET Project",
  "dependencies": {
-    "Microsoft.Extensions.DependencyModel": { "target": "project" },
+    "Microsoft.Extensions.DependencyModel": {
+      "target": "project"
+    },
    "Newtonsoft.Json": "7.0.1",
    "NuGet.Packaging": "3.5.0-rc-1285",
    "NuGet.RuntimeModel": "3.5.0-rc-1285",
--- a/src/Microsoft.DotNet.TestFramework/project.json
+++ b/src/Microsoft.DotNet.TestFramework/project.json
@ -1,16 +1,13 @@
 {
  "version": "1.0.0-preview2-*",
  "description": "Microsoft.DotNet.TestFramework Class Library",
-  "tags": [
-    ""
-  ],
-  "compilationOptions": {
+  "buildOptions": {
    "keyFile": "../../tools/Key.snk"
  },
-  "projectUrl": "",
-  "licenseUrl": "",
  "dependencies": {
-    "Microsoft.DotNet.Cli.Utils": { "target": "project" }
+    "Microsoft.DotNet.Cli.Utils": {
+      "target": "project"
+    }
  },
  "frameworks": {
    "netstandard1.5": {
@ -19,5 +16,12 @@
      ]
    },
    "net451": {}
+  },
+  "packOptions": {
+    "projectUrl": "",
+    "licenseUrl": "",
+    "tags": [
+      ""
+    ]
  }
 }
--- a/src/Microsoft.Extensions.DependencyModel/project.json
+++ b/src/Microsoft.Extensions.DependencyModel/project.json
@ -1,11 +1,7 @@
 {
  "description": "Abstractions for reading `.deps` files.",
  "version": "1.0.0-rc3-*",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/dotnet/cli"
-  },
-  "compilationOptions": {
+  "buildOptions": {
    "warningsAsErrors": true,
    "keyFile": "../../tools/Key.snk"
  },
@ -26,5 +22,11 @@
      }
    }
  },
-  "scripts": {}
+  "scripts": {},
+  "packOptions": {
+    "repository": {
+      "type": "git",
+      "url": "git://github.com/dotnet/cli"
+    }
+  }
 }
--- a/src/Microsoft.Extensions.Testing.Abstractions/project.json
+++ b/src/Microsoft.Extensions.Testing.Abstractions/project.json
@ -1,18 +1,16 @@
 {
  "description": "Abstractions for test runners to communicate to a tool, such as Visual Studio.",
  "version": "1.0.0-preview2-*",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/dotnet/cli"
-  },
-  "compilationOptions": {
+  "buildOptions": {
    "warningsAsErrors": true,
    "allowUnsafe": true,
    "keyFile": "../../tools/Key.snk"
  },
  "dependencies": {
    "Newtonsoft.Json": "7.0.1",
-    "Microsoft.DotNet.ProjectModel": { "target": "project" },
+    "Microsoft.DotNet.ProjectModel": {
+      "target": "project"
+    },
    "Microsoft.DiaSymReader": "1.0.6",
    "Microsoft.DiaSymReader.Native": "1.3.3"
  },
@ -29,5 +27,11 @@
      }
    }
  },
-  "scripts": {}
+  "scripts": {},
+  "packOptions": {
+    "repository": {
+      "type": "git",
+      "url": "git://github.com/dotnet/cli"
+    }
+  }
 }
--- a/src/compilers/project.json
+++ b/src/compilers/project.json
@ -1,6 +1,6 @@
 {
  "version": "1.0.0-*",
-  "compilationOptions": {
+  "buildOptions": {
    "emitEntryPoint": true
  },
  "dependencies": {
--- a/src/dotnet-compile-fsc/project.json
+++ b/src/dotnet-compile-fsc/project.json
@ -1,19 +1,27 @@
 {
  "version": "1.0.0-preview2-*",
-  "compilationOptions": {
-    "emitEntryPoint": true
-  },
-  "compile": [
+  "buildOptions": {
+    "emitEntryPoint": true,
+    "compile": {
+      "include": [
        "**/*.cs",
        "../dotnet/CommandLine/*.cs",
        "../dotnet/commands/dotnet-compile-csc/AssemblyInfoOptionsCommandLine.cs",
        "../dotnet/commands/dotnet-compile-csc/CommonCompilerOptionsCommandLine.cs"
-  ],
+      ]
+    }
+  },
  "dependencies": {
    "Microsoft.FSharp.Compiler.netcore": "1.0.0-alpha-160318",
-    "Microsoft.DotNet.ProjectModel": { "target": "project" },
-    "Microsoft.DotNet.Compiler.Common": { "target": "project" },
-    "Microsoft.DotNet.Cli.Utils": { "target": "project" },
+    "Microsoft.DotNet.ProjectModel": {
+      "target": "project"
+    },
+    "Microsoft.DotNet.Compiler.Common": {
+      "target": "project"
+    },
+    "Microsoft.DotNet.Cli.Utils": {
+      "target": "project"
+    },
    "Microsoft.NETCore.App": {
      "type": "platform",
      "version": "1.0.0-rc3-*"
--- a/Show more
+++ b/Show more