From 296ca05ab004ab98eab4e256f78cafafb07728b7 Mon Sep 17 00:00:00 2001
From: Charles Betros <charles.betros@gmail.com>
Date: Sun, 22 Jan 2017 09:07:37 -0600
Subject: [PATCH] Get references.

---
 Cosmos.sln                                    |   3 +
 Demos/Guess/Cosmos.targets                    |  57 ++++++++
 Demos/Guess/GuessBoot.Cosmos                  |  85 +++++------
 Demos/Guess/GuessBoot.project.json            |   8 ++
 Demos/Guess/GuessKernel.xproj                 |   4 +-
 Demos/Guess/project.json                      |  16 +++
 Tests/BoxingTests/BoxingTests.xproj           |   3 +-
 Tests/BoxingTests/BoxingTestsBoot.Cosmos      |  10 +-
 .../BoxingTests/BoxingTestsBoot.project.json  |   8 ++
 Tests/BoxingTests/project.json                |   1 -
 .../Cosmos.Compiler.Tests.Bcl.xproj           |   3 +-
 .../Cosmos.Compiler.Tests.BclBoot.Cosmos      |  10 +-
 ...Cosmos.Compiler.Tests.BclBoot.project.json |   8 ++
 Tests/Cosmos.Compiler.Tests.Bcl/project.json  |   5 +-
 .../Cosmos.Compiler.Tests.Encryption.xproj    |   3 +-
 ...osmos.Compiler.Tests.EncryptionBoot.Cosmos |   8 +-
 ...Compiler.Tests.EncryptionBoot.project.json |   8 ++
 .../project.json                              |  30 ++--
 .../Cosmos.Compiler.Tests.Exceptions.xproj    |   5 +-
 ...osmos.Compiler.Tests.ExceptionsBoot.Cosmos |   8 +-
 ...Compiler.Tests.ExceptionsBoot.project.json |   8 ++
 .../project.json                              |   5 -
 .../Cosmos.Compiler.Tests.Interfaces.xproj    |   5 +-
 ...osmos.Compiler.Tests.InterfacesBoot.Cosmos |  10 +-
 ...Compiler.Tests.InterfacesBoot.project.json |   8 ++
 .../project.json                              |   5 -
 .../Cosmos.Compiler.Tests.LinqTests.xproj     |   3 +-
 ...Cosmos.Compiler.Tests.LinqTestsBoot.Cosmos |   8 +-
 ....Compiler.Tests.LinqTestsBoot.project.json |   8 ++
 .../project.json                              |   5 -
 .../Cosmos.Compiler.Tests.MethodTests.xproj   |   3 +-
 ...smos.Compiler.Tests.MethodTestsBoot.Cosmos |  11 +-
 ...ompiler.Tests.MethodTestsBoot.project.json |   8 ++
 .../project.json                              |   5 -
 .../AssemblyInfo.cs                           |  36 -----
 ...mpiler.Tests.MultidimensionalArrays.csproj |  41 ------
 ...er.Tests.MultidimensionalArraysBoot.Cosmos |  48 -------
 .../Kernel.cs                                 |  27 ----
 ...osmos.Compiler.Tests.SimpleWriteLine.xproj |   5 +-
 ....Compiler.Tests.SimpleWriteLineBoot.Cosmos |   8 +-
 ...ler.Tests.SimpleWriteLineBoot.project.json |   8 ++
 .../project.json                              |   5 -
 ...Cosmos.Compiler.Tests.SingleEchoTest.xproj |   3 +-
 ...s.Compiler.Tests.SingleEchoTestBoot.Cosmos |   8 +-
 ...iler.Tests.SingleEchoTestBoot.project.json |   8 ++
 .../Kernel.cs                                 |   1 -
 .../project.json                              |   2 +-
 .../Cosmos.Kernel.Tests.Fat.xproj             |   3 +-
 .../Cosmos.Kernel.Tests.FatBoot.Cosmos        |   5 +
 .../Cosmos.Kernel.Tests.FatBoot.project.json  |   8 ++
 Tests/Cosmos.Kernel.Tests.Fat/project.json    |   5 -
 .../Cosmos.Kernel.Tests.IO.xproj              |   5 +-
 .../Cosmos.Kernel.Tests.IOBoot.Cosmos         |   8 +-
 .../Cosmos.Kernel.Tests.IOBoot.project.json   |   8 ++
 Tests/Cosmos.Kernel.Tests.IO/project.json     |   5 -
 Tests/Cosmos.TestRunner.Core/project.json     | 133 +++++++++---------
 .../project.json                              |   1 -
 Tests/Cosmos.TestRunner/project.json          |   3 +-
 .../SimpleStructsAndArraysTest.xproj          |   1 +
 .../SimpleStructsAndArraysTestBoot.Cosmos     |   8 +-
 ...impleStructsAndArraysTestBoot.project.json |   8 ++
 Tests/SimpleStructsAndArraysTest/project.json |   5 -
 Tests/VGACompilerCrash/VGACompilerCrash.xproj |   3 +-
 .../VGACompilerCrashBoot.Cosmos               |   8 +-
 .../VGACompilerCrashBoot.project.json         |   8 ++
 Tests/VGACompilerCrash/project.json           |   5 -
 Tools/Cosmos.IL2CPU.Profiler/project.json     |   1 -
 Tools/Cosmos.NetCore.TestApp/project.json     |  21 +--
 global.json                                   |   6 +
 .../Cosmos.Build.MSBuild.csproj               |   3 +-
 .../Cosmos.Build.MSBuild.project.json         |  12 ++
 .../Cosmos.Build.MSBuild.xproj                |   3 +
 source/Cosmos.Build.MSBuild/project.json      |  25 ++--
 source/Cosmos.Common/project.json             |  13 +-
 source/Cosmos.Core.Common/project.json        |  19 +--
 source/Cosmos.Core/project.json               |  31 ++--
 .../Cosmos.Debug.Hosts.csproj                 |   8 --
 .../Cosmos.Debug.Hosts.project.json           |   2 +
 source/Cosmos.Debug.Hosts/project.json        |  19 +--
 .../Cosmos.Debug.Symbols.nuget.props          |   2 +-
 source/Cosmos.HAL/project.json                |  37 ++---
 source/Cosmos.IL2CPU/project.json             |   1 -
 source/Cosmos.System/project.json             |  31 ++--
 source/IL2CPU/project.json                    |  12 +-
 source/XSharp.Common/project.json             |  13 +-
 source/XSharp.Compiler/project.json           |   2 +-
 86 files changed, 544 insertions(+), 522 deletions(-)
 create mode 100644 Demos/Guess/Cosmos.targets
 create mode 100644 Demos/Guess/GuessBoot.project.json
 create mode 100644 Tests/BoxingTests/BoxingTestsBoot.project.json
 create mode 100644 Tests/Cosmos.Compiler.Tests.Bcl/Cosmos.Compiler.Tests.BclBoot.project.json
 create mode 100644 Tests/Cosmos.Compiler.Tests.Encryption/Cosmos.Compiler.Tests.EncryptionBoot.project.json
 create mode 100644 Tests/Cosmos.Compiler.Tests.Exceptions/Cosmos.Compiler.Tests.ExceptionsBoot.project.json
 create mode 100644 Tests/Cosmos.Compiler.Tests.Interfaces/Cosmos.Compiler.Tests.InterfacesBoot.project.json
 create mode 100644 Tests/Cosmos.Compiler.Tests.LinqTests/Cosmos.Compiler.Tests.LinqTestsBoot.project.json
 create mode 100644 Tests/Cosmos.Compiler.Tests.MethodTests/Cosmos.Compiler.Tests.MethodTestsBoot.project.json
 delete mode 100644 Tests/Cosmos.Compiler.Tests.MultidimensionalArrays/AssemblyInfo.cs
 delete mode 100644 Tests/Cosmos.Compiler.Tests.MultidimensionalArrays/Cosmos.Compiler.Tests.MultidimensionalArrays.csproj
 delete mode 100644 Tests/Cosmos.Compiler.Tests.MultidimensionalArrays/Cosmos.Compiler.Tests.MultidimensionalArraysBoot.Cosmos
 delete mode 100644 Tests/Cosmos.Compiler.Tests.MultidimensionalArrays/Kernel.cs
 create mode 100644 Tests/Cosmos.Compiler.Tests.SimpleWriteLine/Cosmos.Compiler.Tests.SimpleWriteLineBoot.project.json
 create mode 100644 Tests/Cosmos.Compiler.Tests.SingleEchoTest/Cosmos.Compiler.Tests.SingleEchoTestBoot.project.json
 create mode 100644 Tests/Cosmos.Kernel.Tests.Fat/Cosmos.Kernel.Tests.FatBoot.project.json
 create mode 100644 Tests/Cosmos.Kernel.Tests.IO/Cosmos.Kernel.Tests.IOBoot.project.json
 create mode 100644 Tests/SimpleStructsAndArraysTest/SimpleStructsAndArraysTestBoot.project.json
 create mode 100644 Tests/VGACompilerCrash/VGACompilerCrashBoot.project.json
 create mode 100644 global.json
 create mode 100644 source/Cosmos.Build.MSBuild/Cosmos.Build.MSBuild.project.json

diff --git a/Cosmos.sln b/Cosmos.sln
index b64d4be39..4ee47a364 100644
--- a/Cosmos.sln
+++ b/Cosmos.sln
@@ -184,6 +184,7 @@ Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "Docs", "Docs\", "{67E7DEF0-
 		Release.AspNetCompiler.FixedNames = "false"
 		Release.AspNetCompiler.Debug = "False"
 		VWDPort = "8987"
+		SlnRelativePath = "Docs\"
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Unit Tests", "Unit Tests", "{9637A680-F8E9-4925-A4E4-00045205EC04}"
@@ -207,7 +208,9 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{57B83EE4-164F-4BB2-8AFA-76445333A0E4}"
 	ProjectSection(SolutionItems) = preProject
 		..\Demos\zMachine\Frotz.Net\source\ColorPicker.dll = ..\Demos\zMachine\Frotz.Net\source\ColorPicker.dll
+		global.json = global.json
 		..\Demos\zMachine\Frotz.Net\source\Notes.txt = ..\Demos\zMachine\Frotz.Net\source\Notes.txt
+		nuget.config = nuget.config
 		..\Demos\zMachine\Frotz.Net\source\todos.txt = ..\Demos\zMachine\Frotz.Net\source\todos.txt
 	EndProjectSection
 EndProject
diff --git a/Demos/Guess/Cosmos.targets b/Demos/Guess/Cosmos.targets
new file mode 100644
index 000000000..9b6957357
--- /dev/null
+++ b/Demos/Guess/Cosmos.targets
@@ -0,0 +1,57 @@
+<?xml version="1.0"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="14.0">
+  <PropertyGroup>
+    <DebugMode Condition="$(DebugMode) == ''">Source</DebugMode>
+    <DebugEnabled Condition="$(DebugEnabled) == ''">True</DebugEnabled>
+    <StackCorruptionDetectionEnabled Condition="$(StackCorruptionDetectionEnabled) == ''">True</StackCorruptionDetectionEnabled>
+    <StackCorruptionDetectionLevel Condition="$(StackCorruptionDetectionLevel) == ''">All</StackCorruptionDetectionLevel>
+    <IgnoreDebugStubAttribute Condition="$(IgnoreDebugStubAttribute) == ''">False</IgnoreDebugStubAttribute>
+    <TraceAssemblies Condition="$(TraceAssemblies) == ''">All</TraceAssemblies>
+    <CosmosDir Condition="$(CosmosDir) == ''">$([MSBuild]::GetRegistryValue("HKEY_LOCAL_MACHINE\Software\Cosmos", "UserKit"))</CosmosDir>
+    <BuildToolsDir Condition="$(BuildToolsDir) == ''">$(CosmosDir)\Build\Tools</BuildToolsDir>
+    <VSIPDir Condition="$(VSIPDir) == ''">$(CosmosDir)\Build\VSIP</VSIPDir>
+    <NasmFile Condition="'$(NasmFile)' == ''">$(BuildToolsDir)\Nasm\nasm.exe</NasmFile>
+    <PlatformTarget Condition="'$(PlatformTarget)' == ''">AnyCPU</PlatformTarget>
+    <BinFormat Condition="$(BinFormat) == ''">bin</BinFormat>
+    <CosmosBuildTaskAssemblyFile Condition="'$(CosmosBuildTaskAssemblyFile)' == ''">$(VSIPDir)\Cosmos.Build.MSBuild.dll</CosmosBuildTaskAssemblyFile>
+  </PropertyGroup>
+
+  <UsingTask TaskName="Cosmos.Build.MSBuild.IL2CPU" AssemblyFile="$(CosmosBuildTaskAssemblyFile)"/>
+  <UsingTask TaskName="Cosmos.Build.MSBuild.NAsm" AssemblyFile="$(CosmosBuildTaskAssemblyFile)"/>
+  <UsingTask TaskName="Cosmos.Build.MSBuild.MakeISO" AssemblyFile="$(CosmosBuildTaskAssemblyFile)"/>
+  <UsingTask TaskName="Cosmos.Build.MSBuild.Ld" AssemblyFile="$(CosmosBuildTaskAssemblyFile)"/>
+  <UsingTask TaskName="Cosmos.Build.MSBuild.ReadNAsmMapToDebugInfo" AssemblyFile="$(CosmosBuildTaskAssemblyFile)"/>
+
+  <Target Name="CosmosDetectDependencies" Outputs="@(CosmosReferences)">
+    <CreateItem Include="$(TargetDir)$(Configuration)\$(TargetFramework)\*.dll">
+      <Output TaskParameter="Include" ItemName="CosmosReferences"/>
+    </CreateItem>
+  </Target>
+
+  <Target Name="CosmosCompile" DependsOnTargets="CosmosDetectDependencies" AfterTargets="Build">
+    <Error Text="File %(Compile.Identity) is set to compile, but .Cosmos projects don't compile any source themselves!" Condition="$(Compile) != ''"/>
+    <CreateProperty Value="true" Condition="$(BinFormat) == 'elf'">
+      <Output PropertyName="IsELF" TaskParameter="Value"/>
+    </CreateProperty>
+    <CreateProperty Value="false" Condition="$(BinFormat) == 'bin'">
+      <Output PropertyName="IsELF" TaskParameter="Value"/>
+    </CreateProperty>
+    <Cosmos.Build.MSBuild.IL2CPU DebugMode="$(DebugMode)" DebugEnabled="$(DebugEnabled)" StackCorruptionDetectionEnabled="$(StackCorruptionDetectionEnabled)" StackCorruptionDetectionLevel="$(StackCorruptionDetectionLevel)" TraceAssemblies="$(TraceAssemblies)" IgnoreDebugStubAttribute="$(IgnoreDebugStubAttribute)" DebugCom="1" UseNAsm="true" References="@(CosmosReferences)" OutputFilename="$(TargetDir)$(MSBuildProjectName).asm" EnableLogging="true" EmitDebugSymbols="$(DebugSymbols)" CosmosBuildDir="$(CosmosDir)\Build" WorkingDir="$(TargetDir)"/>
+    <Cosmos.Build.MSBuild.NAsm InputFile="$(TargetDir)$(MSBuildProjectName).asm" OutputFile="$(TargetDir)$(MSBuildProjectName).obj" IsELF="$(IsELF)" ExePath="$(NasmFile)"/>
+    <!-- ELF only -->
+    <!-- 16 MB 0x1000000 as per hpa (syslinux) is a good spot. For now just put some dummy values. 16 and 32 MB. Later size better. -->
+    <Cosmos.Build.MSBuild.Ld CosmosBuildDir="$(CosmosDir)\Build" WorkingDir="$(TargetDir)" Arguments="-Ttext 0x2000000 -Tdata 0x1000000 -e Kernel_Start -o '$(TargetDir)$(MSBuildProjectName).bin' '$(TargetDir)$(MSBuildProjectName).obj'" Condition="$(IsELF) == 'true'"/>
+    <Cosmos.Build.MSBuild.ExtractMapFromElfFile InputFile="$(TargetDir)$(MSBuildProjectName).bin" DebugInfoFile="$(TargetDir)$(MSBuildProjectName).cdb" WorkingDir="$(TargetDir)" CosmosBuildDir="$(CosmosDir)\Build" Condition="$(IsELF) == 'true'"/>
+    <CreateItem Include="$(TargetDir)$(MSBuildProjectName).bin" Condition="$(IsELF) == 'true'">
+      <Output TaskParameter="Include" ItemName="TempFilesToCopy"/>
+    </CreateItem>
+    <!--End of ELF only-->
+    <!--binary only-->
+    <Cosmos.Build.MSBuild.ReadNAsmMapToDebugInfo InputBaseDir="$(TargetDir)" DebugInfoFile="$(TargetDir)$(MSBuildProjectName).cdb" Condition="$(IsELF) == 'false'"/>
+    <Move SourceFiles="$(TargetDir)$(MSBuildProjectName).obj" DestinationFiles="$(TargetDir)$(MSBuildProjectName).bin" Condition="$(IsELF) == 'false'"/>
+    <!--end of binary only-->
+    <!-- We dont build ISO in MSBuild any more because not all targets need it and it takes time. But we do delete it, so we dont have out of date outputs. -->
+    <!-- <MakeISO InputFile="$(TargetDir)$(MSBuildProjectName).bin" OutputFile="$(TargetDir)$(MSBuildProjectName).iso" CosmosBuildDir="$(CosmosDir)\Build" /> -->
+    <Delete Files="$(TargetDir)$(MSBuildProjectName).iso"/>
+  </Target>
+</Project>
diff --git a/Demos/Guess/GuessBoot.Cosmos b/Demos/Guess/GuessBoot.Cosmos
index 678e7e89a..8d5bec53a 100644
--- a/Demos/Guess/GuessBoot.Cosmos
+++ b/Demos/Guess/GuessBoot.Cosmos
@@ -1,67 +1,64 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
+    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0.25420</VisualStudioVersion>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+  </PropertyGroup>
+  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
+  <PropertyGroup Label="Globals">
     <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectGuid>{5b2c0369-7a84-4113-892c-f71b50e1da12}</ProjectGuid>
-    <Name>GuessBoot</Name>
-    <OutputType>Library</OutputType>
-    <DefaultLanguage>en-US</DefaultLanguage>
-    <FileAlignment>512</FileAlignment>
-    <TargetFrameworkProfile>
-    </TargetFrameworkProfile>
-    <TargetFrameworkVersion>v5.0</TargetFrameworkVersion>
-    <BinFormat>elf</BinFormat>
-    <ResolveNuGetPackages>False</ResolveNuGetPackages>
+    <TargetFrameworkIdentifier>.NETStandard</TargetFrameworkIdentifier>
+    <TargetFrameworkVersion>v1.6</TargetFrameworkVersion>
+    <TargetFramework>netstandard1.6</TargetFramework>
+    <BaseNuGetRuntimeIdentifier>win</BaseNuGetRuntimeIdentifier>
+    <NoStdLib>true</NoStdLib>
+    <NoWarn>$(NoWarn);1701</NoWarn>
+    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj\</BaseIntermediateOutputPath>
+    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <Profile>VMware</Profile>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
     <DebugEnabled>True</DebugEnabled>
     <DebugMode>Source</DebugMode>
     <TraceMode>User</TraceMode>
     <EnableGDB>False</EnableGDB>
     <StartCosmosGDB>False</StartCosmosGDB>
-    <VMWareEdition>Workstation</VMWareEdition>
-    <OutputPath>bin\Debug\</OutputPath>
-    <Name>GuessBoot</Name>
-    <Description>Use VMware Player or Workstation to deploy and debug.</Description>
     <Deployment>ISO</Deployment>
-    <Launch>VMware</Launch>
     <VisualStudioDebugPort>Pipe: Cosmos\Serial</VisualStudioDebugPort>
-    <TraceAssemblies>All</TraceAssemblies>
-    <VMware_Name>PlaygroundBoot</VMware_Name>
-    <VMware_Description>Use VMware Player or Workstation to deploy and debug.</VMware_Description>
-    <VMware_Deployment>ISO</VMware_Deployment>
-    <VMware_Launch>VMware</VMware_Launch>
-    <VMware_DebugEnabled>True</VMware_DebugEnabled>
-    <VMware_DebugMode>Source</VMware_DebugMode>
-    <VMware_VisualStudioDebugPort>Pipe: Cosmos\Serial</VMware_VisualStudioDebugPort>
-    <VMware_VMwareEdition>Workstation</VMware_VMwareEdition>
-    <VMware_OutputPath>bin\Debug\</VMware_OutputPath>
-    <VMware_TraceAssemblies>All</VMware_TraceAssemblies>
-    <VMware_EnableGDB>False</VMware_EnableGDB>
-    <VMware_StartCosmosGDB>False</VMware_StartCosmosGDB>
     <StackCorruptionDetectionEnabled>True</StackCorruptionDetectionEnabled>
-    <VMware_StackCorruptionDetectionEnabled>True</VMware_StackCorruptionDetectionEnabled>
+    <StackCorruptionDetectionLevel>MethodFooters</StackCorruptionDetectionLevel>
+    <IgnoreDebugStubAttribute>False</IgnoreDebugStubAttribute>
     <CosmosDebugPort>Serial: COM1</CosmosDebugPort>
-    <VMware_CosmosDebugPort>Serial: COM1</VMware_CosmosDebugPort>
+    <Launch>VMware</Launch>
+    <Profile>VMware</Profile>
+    <Description>Use VMware Player or Workstation to deploy and debug.</Description>
   </PropertyGroup>
+  <ItemGroup>
+    <None Include="GuessBoot.project.json" />
+  </ItemGroup>
   <ItemGroup>
     <Content Include="Cosmos.bxrc">
       <SubType>Content</SubType>
     </Content>
+    <None Include="Cosmos.targets" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\source\Cosmos.Core.Plugs\Cosmos.Core.Plugs.csproj">
-      <Name>Cosmos.Core.Plugs</Name>
-      <Project>{09273ea1-d3ea-4ccf-aabc-4a209eb367b7}</Project>
+    <ProjectReference Include="..\..\source\Cosmos.Core.Plugs.Asm\Cosmos.Core.Plugs.Asm.xproj">
+      <Name>Cosmos.Core.Plugs.Asm</Name>
+      <Project>{2a24da41-0d3a-48a6-83d5-8584a1d4ca94}</Project>
       <Private>True</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\source\Cosmos.System.Plugs\Cosmos.System.Plugs.csproj">
-      <Name>Cosmos.System.Plugs</Name>
-      <Project>{e52f6162-5094-49f4-a685-d08e5480bac2}</Project>
+    <ProjectReference Include="..\..\source\Cosmos.Debug.Kernel.Plugs.Asm\Cosmos.Debug.Kernel.Plugs.Asm.xproj">
+      <Name>Cosmos.Debug.Kernel.Plugs.Asm</Name>
+      <Project>{7549d7f8-58a3-4f4f-8544-def2abf79a0b}</Project>
       <Private>True</Private>
     </ProjectReference>
     <ProjectReference Include="..\Guess\GuessKernel.xproj">
@@ -70,10 +67,16 @@
       <Private>True</Private>
     </ProjectReference>
   </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
-  <Import Project="$(MSBuildExtensionsPath)\Cosmos\Cosmos.targets" />
+  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
+  <Import Project="Cosmos.targets" />
+  <!--<Import Project="$(MSBuildExtensionsPath)\Cosmos\Cosmos.targets" />-->
   <PropertyGroup>
-    <NoStdLib>true</NoStdLib>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.0;.NETStandard,Version=v1.0;.NETStandard,Version=v1.1;.NETStandard,Version=v1.2;.NETStandard,Version=v1.3;.NETStandard,Version=v1.4;.NETStandard,Version=v1.5;.NETStandard,Version=v1.6;.NETCoreApp,Version=v1.0</NuGetTargetMoniker>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.6</NuGetTargetMoniker>
+    <!-- We don't use any of MSBuild's resolution logic for resolving the framework, so just set these two
+            properties to any folder that exists to skip the GetReferenceAssemblyPaths task (not target) and
+            to prevent it from outputting a warning (MSB3644).
+        -->
+    <_TargetFrameworkDirectories>$(MSBuildThisFileDirectory)</_TargetFrameworkDirectories>
+    <_FullFrameworkReferenceAssemblyPaths>$(MSBuildThisFileDirectory)</_FullFrameworkReferenceAssemblyPaths>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/Demos/Guess/GuessBoot.project.json b/Demos/Guess/GuessBoot.project.json
new file mode 100644
index 000000000..b388d70ef
--- /dev/null
+++ b/Demos/Guess/GuessBoot.project.json
@@ -0,0 +1,8 @@
+{
+  "runtimes": {
+    "win": {}
+  },
+  "frameworks": {
+    "netstandard1.6": {}
+  }
+}
diff --git a/Demos/Guess/GuessKernel.xproj b/Demos/Guess/GuessKernel.xproj
index 5cc174676..b921184f0 100644
--- a/Demos/Guess/GuessKernel.xproj
+++ b/Demos/Guess/GuessKernel.xproj
@@ -16,7 +16,9 @@
   </PropertyGroup>
   <ItemGroup>
     <DnxInvisibleContent Include="Cosmos.bxrc" />
+    <DnxInvisibleContent Include="Cosmos.targets" />
     <DnxInvisibleContent Include="GuessBoot.Cosmos" />
+    <DnxInvisibleContent Include="GuessBoot.project.json" />
   </ItemGroup>
   <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
+</Project>
\ No newline at end of file
diff --git a/Demos/Guess/project.json b/Demos/Guess/project.json
index b9cd79ad5..29a48ca69 100644
--- a/Demos/Guess/project.json
+++ b/Demos/Guess/project.json
@@ -10,6 +10,22 @@
         },
         "Cosmos.System": {
           "target": "project"
+        },
+        "Cosmos.Debug.Kernel.Plugs.Asm": {
+          "target": "project",
+          "type": "build"
+        },
+        "Cosmos.Core.Plugs": {
+          "target": "project",
+          "type": "build"
+        },
+        "Cosmos.Core.Plugs.Asm": {
+          "target": "project",
+          "type": "build"
+        },
+        "Cosmos.System.Plugs": {
+          "target": "project",
+          "type": "build"
         }
       }
     }
diff --git a/Tests/BoxingTests/BoxingTests.xproj b/Tests/BoxingTests/BoxingTests.xproj
index 05756f479..311e84fdd 100644
--- a/Tests/BoxingTests/BoxingTests.xproj
+++ b/Tests/BoxingTests/BoxingTests.xproj
@@ -16,6 +16,7 @@
   </PropertyGroup>
   <ItemGroup>
     <DnxInvisibleContent Include="BoxingTestsBoot.Cosmos" />
+    <DnxInvisibleContent Include="BoxingTestsBoot.project.json" />
   </ItemGroup>
   <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
+</Project>
\ No newline at end of file
diff --git a/Tests/BoxingTests/BoxingTestsBoot.Cosmos b/Tests/BoxingTests/BoxingTestsBoot.Cosmos
index 94fd90b36..c277e5c5e 100644
--- a/Tests/BoxingTests/BoxingTestsBoot.Cosmos
+++ b/Tests/BoxingTests/BoxingTestsBoot.Cosmos
@@ -68,11 +68,9 @@
     <Reference Include="Cosmos.Debug.Kernel.Plugs, Version=1.0.0.0, Culture=neutral, PublicKeyToken=5ae71220097cb983" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\BoxingTests\BoxingTests.xproj">
-      <Name>BoxingTests</Name>
-      <Project>{f8889473-5866-4913-86ac-8072a1a2558c}</Project>
-      <Private>True</Private>
-    </ProjectReference>
+    <Content Include="BoxingTestsBoot.project.json">
+      <SubType>Content</SubType>
+    </Content>
   </ItemGroup>
   <!--<ItemGroup>
     <Content Include="Cosmos.bxrc">
@@ -80,4 +78,4 @@
     </Content>
   </ItemGroup>-->
   <Import Project="$(MSBuildExtensionsPath)\Cosmos\Cosmos.targets" />
-</Project>
+</Project>
\ No newline at end of file
diff --git a/Tests/BoxingTests/BoxingTestsBoot.project.json b/Tests/BoxingTests/BoxingTestsBoot.project.json
new file mode 100644
index 000000000..a28cb8fe6
--- /dev/null
+++ b/Tests/BoxingTests/BoxingTestsBoot.project.json
@@ -0,0 +1,8 @@
+{
+    "runtimes": {
+        "win": {}
+    },
+    "frameworks": {
+        "net462": {}
+    }
+}
diff --git a/Tests/BoxingTests/project.json b/Tests/BoxingTests/project.json
index 1101cc7b8..36328eca0 100644
--- a/Tests/BoxingTests/project.json
+++ b/Tests/BoxingTests/project.json
@@ -1,5 +1,4 @@
 {
-  "version": "1.0.0-*",
   "dependencies": {
     "NETStandard.Library": "1.6.1"
   },
diff --git a/Tests/Cosmos.Compiler.Tests.Bcl/Cosmos.Compiler.Tests.Bcl.xproj b/Tests/Cosmos.Compiler.Tests.Bcl/Cosmos.Compiler.Tests.Bcl.xproj
index c81e4e71e..41a5315f9 100644
--- a/Tests/Cosmos.Compiler.Tests.Bcl/Cosmos.Compiler.Tests.Bcl.xproj
+++ b/Tests/Cosmos.Compiler.Tests.Bcl/Cosmos.Compiler.Tests.Bcl.xproj
@@ -16,6 +16,7 @@
   </PropertyGroup>
   <ItemGroup>
     <DnxInvisibleContent Include="Cosmos.Compiler.Tests.BclBoot.Cosmos" />
+    <DnxInvisibleContent Include="Cosmos.Compiler.Tests.BclBoot.project.json" />
   </ItemGroup>
   <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
+</Project>
\ No newline at end of file
diff --git a/Tests/Cosmos.Compiler.Tests.Bcl/Cosmos.Compiler.Tests.BclBoot.Cosmos b/Tests/Cosmos.Compiler.Tests.Bcl/Cosmos.Compiler.Tests.BclBoot.Cosmos
index ab3c7f5fb..dc0c3b984 100644
--- a/Tests/Cosmos.Compiler.Tests.Bcl/Cosmos.Compiler.Tests.BclBoot.Cosmos
+++ b/Tests/Cosmos.Compiler.Tests.Bcl/Cosmos.Compiler.Tests.BclBoot.Cosmos
@@ -59,11 +59,9 @@
     <Reference Include="Cosmos.Debug.Kernel.Plugs, Version=1.0.0.0, Culture=neutral, PublicKeyToken=5ae71220097cb983" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Cosmos.Compiler.Tests.Bcl\Cosmos.Compiler.Tests.Bcl.xproj">
-      <Name>Cosmos.Compiler.Tests.Bcl</Name>
-      <Project>{31e3f8e2-7cc0-426c-accb-77b3319af5d3}</Project>
-      <Private>True</Private>
-    </ProjectReference>
+    <Content Include="Cosmos.Compiler.Tests.BclBoot.project.json">
+      <SubType>Content</SubType>
+    </Content>
   </ItemGroup>
   <!--<ItemGroup>
     <Content Include="Cosmos.bxrc">
@@ -71,4 +69,4 @@
     </Content>
   </ItemGroup>-->
   <Import Project="$(MSBuildExtensionsPath)\Cosmos\Cosmos.targets" />
-</Project>
+</Project>
\ No newline at end of file
diff --git a/Tests/Cosmos.Compiler.Tests.Bcl/Cosmos.Compiler.Tests.BclBoot.project.json b/Tests/Cosmos.Compiler.Tests.Bcl/Cosmos.Compiler.Tests.BclBoot.project.json
new file mode 100644
index 000000000..a28cb8fe6
--- /dev/null
+++ b/Tests/Cosmos.Compiler.Tests.Bcl/Cosmos.Compiler.Tests.BclBoot.project.json
@@ -0,0 +1,8 @@
+{
+    "runtimes": {
+        "win": {}
+    },
+    "frameworks": {
+        "net462": {}
+    }
+}
diff --git a/Tests/Cosmos.Compiler.Tests.Bcl/project.json b/Tests/Cosmos.Compiler.Tests.Bcl/project.json
index 9a8ecee9f..54b4a8df6 100644
--- a/Tests/Cosmos.Compiler.Tests.Bcl/project.json
+++ b/Tests/Cosmos.Compiler.Tests.Bcl/project.json
@@ -1,9 +1,6 @@
 {
-  "version": "1.0.0-*",
   "buildOptions": {
-    "allowUnsafe": true,
-    "publicSign": true,
-    "keyFile": "../../Cosmos.snk"
+    "allowUnsafe": true
   },
   "dependencies": {
     "NETStandard.Library": "1.6.1"
diff --git a/Tests/Cosmos.Compiler.Tests.Encryption/Cosmos.Compiler.Tests.Encryption.xproj b/Tests/Cosmos.Compiler.Tests.Encryption/Cosmos.Compiler.Tests.Encryption.xproj
index 51cfc4d8a..1a8ca2f62 100644
--- a/Tests/Cosmos.Compiler.Tests.Encryption/Cosmos.Compiler.Tests.Encryption.xproj
+++ b/Tests/Cosmos.Compiler.Tests.Encryption/Cosmos.Compiler.Tests.Encryption.xproj
@@ -16,6 +16,7 @@
   </PropertyGroup>
   <ItemGroup>
     <DnxInvisibleContent Include="Cosmos.Compiler.Tests.EncryptionBoot.Cosmos" />
+    <DnxInvisibleContent Include="Cosmos.Compiler.Tests.EncryptionBoot.project.json" />
   </ItemGroup>
   <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
+</Project>
\ No newline at end of file
diff --git a/Tests/Cosmos.Compiler.Tests.Encryption/Cosmos.Compiler.Tests.EncryptionBoot.Cosmos b/Tests/Cosmos.Compiler.Tests.Encryption/Cosmos.Compiler.Tests.EncryptionBoot.Cosmos
index 395e205e4..05a0a344b 100644
--- a/Tests/Cosmos.Compiler.Tests.Encryption/Cosmos.Compiler.Tests.EncryptionBoot.Cosmos
+++ b/Tests/Cosmos.Compiler.Tests.Encryption/Cosmos.Compiler.Tests.EncryptionBoot.Cosmos
@@ -31,11 +31,9 @@
     <Reference Include="Cosmos.Debug.Kernel.Plugs, Version=1.0.0.0, Culture=neutral, PublicKeyToken=5ae71220097cb983" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Cosmos.Compiler.Tests.Encryption\Cosmos.Compiler.Tests.Encryption.xproj">
-      <Name>Cosmos.Compiler.Tests.Encryption</Name>
-      <Project>{48ebdeb2-6a6a-4df2-b5f1-db6d299401f2}</Project>
-      <Private>True</Private>
-    </ProjectReference>
+    <Content Include="Cosmos.Compiler.Tests.EncryptionBoot.project.json">
+      <SubType>Content</SubType>
+    </Content>
   </ItemGroup>
   <!--<ItemGroup>
     <Content Include="Cosmos.bxrc">
diff --git a/Tests/Cosmos.Compiler.Tests.Encryption/Cosmos.Compiler.Tests.EncryptionBoot.project.json b/Tests/Cosmos.Compiler.Tests.Encryption/Cosmos.Compiler.Tests.EncryptionBoot.project.json
new file mode 100644
index 000000000..a28cb8fe6
--- /dev/null
+++ b/Tests/Cosmos.Compiler.Tests.Encryption/Cosmos.Compiler.Tests.EncryptionBoot.project.json
@@ -0,0 +1,8 @@
+{
+    "runtimes": {
+        "win": {}
+    },
+    "frameworks": {
+        "net462": {}
+    }
+}
diff --git a/Tests/Cosmos.Compiler.Tests.Encryption/project.json b/Tests/Cosmos.Compiler.Tests.Encryption/project.json
index 8bfc7e628..2d3849604 100644
--- a/Tests/Cosmos.Compiler.Tests.Encryption/project.json
+++ b/Tests/Cosmos.Compiler.Tests.Encryption/project.json
@@ -1,25 +1,17 @@
 {
-  "version": "1.0.0-*",
-  "buildOptions": {
-    "publicSign": true,
-    "keyFile": "../../Cosmos.snk"
-  },
   "dependencies": {
-    "NETStandard.Library": "1.6.1"
+    "NETStandard.Library": "1.6.1",
+    "Cosmos.Debug.Kernel": {
+      "target": "project"
+    },
+    "Cosmos.System": {
+      "target": "project"
+    },
+    "Cosmos.TestRunner.TestController": {
+      "target": "project"
+    }
   },
   "frameworks": {
-    "netstandard1.6": {
-      "dependencies": {
-        "Cosmos.Debug.Kernel": {
-          "target": "project"
-        },
-        "Cosmos.System": {
-          "target": "project"
-        },
-        "Cosmos.TestRunner.TestController": {
-          "target": "project"
-        }
-      }
-    }
+    "netstandard1.6": {}
   }
 }
diff --git a/Tests/Cosmos.Compiler.Tests.Exceptions/Cosmos.Compiler.Tests.Exceptions.xproj b/Tests/Cosmos.Compiler.Tests.Exceptions/Cosmos.Compiler.Tests.Exceptions.xproj
index 55ab197af..bcd457e16 100644
--- a/Tests/Cosmos.Compiler.Tests.Exceptions/Cosmos.Compiler.Tests.Exceptions.xproj
+++ b/Tests/Cosmos.Compiler.Tests.Exceptions/Cosmos.Compiler.Tests.Exceptions.xproj
@@ -15,7 +15,10 @@
     <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>
   <ItemGroup>
+    <DnxInvisibleContent Include="Cosmos.Compiler.Tests.EncryptionBoot.project.json" />
+    <DnxInvisibleContent Include="Cosmos.Compiler.Tests.ExceptionBoot.project.json" />
     <DnxInvisibleContent Include="Cosmos.Compiler.Tests.ExceptionsBoot.Cosmos" />
+    <DnxInvisibleContent Include="Cosmos.Compiler.Tests.ExceptionsBoot.project.json" />
   </ItemGroup>
   <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
+</Project>
\ No newline at end of file
diff --git a/Tests/Cosmos.Compiler.Tests.Exceptions/Cosmos.Compiler.Tests.ExceptionsBoot.Cosmos b/Tests/Cosmos.Compiler.Tests.Exceptions/Cosmos.Compiler.Tests.ExceptionsBoot.Cosmos
index 560116405..11b304901 100644
--- a/Tests/Cosmos.Compiler.Tests.Exceptions/Cosmos.Compiler.Tests.ExceptionsBoot.Cosmos
+++ b/Tests/Cosmos.Compiler.Tests.Exceptions/Cosmos.Compiler.Tests.ExceptionsBoot.Cosmos
@@ -33,11 +33,9 @@
     <Reference Include="Cosmos.Debug.Kernel.Plugs, Version=1.0.0.0, Culture=neutral, PublicKeyToken=5ae71220097cb983" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Cosmos.Compiler.Tests.Exceptions\Cosmos.Compiler.Tests.Exceptions.xproj">
-      <Name>Cosmos.Compiler.Tests.Exceptions</Name>
-      <Project>{9df5c0a9-b91c-4647-b939-e47513743a0c}</Project>
-      <Private>True</Private>
-    </ProjectReference>
+    <Content Include="Cosmos.Compiler.Tests.ExceptionsBoot.project.json">
+      <SubType>Content</SubType>
+    </Content>
   </ItemGroup>
   <!--<ItemGroup>
     <Content Include="Cosmos.bxrc">
diff --git a/Tests/Cosmos.Compiler.Tests.Exceptions/Cosmos.Compiler.Tests.ExceptionsBoot.project.json b/Tests/Cosmos.Compiler.Tests.Exceptions/Cosmos.Compiler.Tests.ExceptionsBoot.project.json
new file mode 100644
index 000000000..a28cb8fe6
--- /dev/null
+++ b/Tests/Cosmos.Compiler.Tests.Exceptions/Cosmos.Compiler.Tests.ExceptionsBoot.project.json
@@ -0,0 +1,8 @@
+{
+    "runtimes": {
+        "win": {}
+    },
+    "frameworks": {
+        "net462": {}
+    }
+}
diff --git a/Tests/Cosmos.Compiler.Tests.Exceptions/project.json b/Tests/Cosmos.Compiler.Tests.Exceptions/project.json
index 8bfc7e628..36328eca0 100644
--- a/Tests/Cosmos.Compiler.Tests.Exceptions/project.json
+++ b/Tests/Cosmos.Compiler.Tests.Exceptions/project.json
@@ -1,9 +1,4 @@
 {
-  "version": "1.0.0-*",
-  "buildOptions": {
-    "publicSign": true,
-    "keyFile": "../../Cosmos.snk"
-  },
   "dependencies": {
     "NETStandard.Library": "1.6.1"
   },
diff --git a/Tests/Cosmos.Compiler.Tests.Interfaces/Cosmos.Compiler.Tests.Interfaces.xproj b/Tests/Cosmos.Compiler.Tests.Interfaces/Cosmos.Compiler.Tests.Interfaces.xproj
index 3390ad962..726173470 100644
--- a/Tests/Cosmos.Compiler.Tests.Interfaces/Cosmos.Compiler.Tests.Interfaces.xproj
+++ b/Tests/Cosmos.Compiler.Tests.Interfaces/Cosmos.Compiler.Tests.Interfaces.xproj
@@ -15,7 +15,8 @@
     <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>
   <ItemGroup>
-    <DnxInvisibleContent Include="Cosmos.Compiler.Tests.Interfaces.KernelBoot.Cosmos" />
+    <DnxInvisibleContent Include="Cosmos.Compiler.Tests.InterfacesBoot.Cosmos" />
+    <DnxInvisibleContent Include="Cosmos.Compiler.Tests.InterfacesBoot.project.json" />
   </ItemGroup>
   <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
+</Project>
\ No newline at end of file
diff --git a/Tests/Cosmos.Compiler.Tests.Interfaces/Cosmos.Compiler.Tests.InterfacesBoot.Cosmos b/Tests/Cosmos.Compiler.Tests.Interfaces/Cosmos.Compiler.Tests.InterfacesBoot.Cosmos
index acc5205a9..51163b36f 100644
--- a/Tests/Cosmos.Compiler.Tests.Interfaces/Cosmos.Compiler.Tests.InterfacesBoot.Cosmos
+++ b/Tests/Cosmos.Compiler.Tests.Interfaces/Cosmos.Compiler.Tests.InterfacesBoot.Cosmos
@@ -55,11 +55,9 @@
     <Reference Include="Cosmos.Debug.Kernel.Plugs, Version=1.0.0.0, Culture=neutral, PublicKeyToken=5ae71220097cb983" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Cosmos.Compiler.Tests.Interfaces\Cosmos.Compiler.Tests.Interfaces.xproj">
-      <Name>Cosmos.Compiler.Tests.Interfaces.Kernel</Name>
-      <Project>{bdc011be-6041-4a58-a6e7-0f592e78cb27}</Project>
-      <Private>True</Private>
-    </ProjectReference>
+    <Content Include="Cosmos.Compiler.Tests.InterfacesBoot.project.json">
+      <SubType>Content</SubType>
+    </Content>
   </ItemGroup>
   <!--<ItemGroup>
     <Content Include="Cosmos.bxrc">
@@ -67,4 +65,4 @@
     </Content>
   </ItemGroup>-->
   <Import Project="$(MSBuildExtensionsPath)\Cosmos\Cosmos.targets" />
-</Project>
+</Project>
\ No newline at end of file
diff --git a/Tests/Cosmos.Compiler.Tests.Interfaces/Cosmos.Compiler.Tests.InterfacesBoot.project.json b/Tests/Cosmos.Compiler.Tests.Interfaces/Cosmos.Compiler.Tests.InterfacesBoot.project.json
new file mode 100644
index 000000000..a28cb8fe6
--- /dev/null
+++ b/Tests/Cosmos.Compiler.Tests.Interfaces/Cosmos.Compiler.Tests.InterfacesBoot.project.json
@@ -0,0 +1,8 @@
+{
+    "runtimes": {
+        "win": {}
+    },
+    "frameworks": {
+        "net462": {}
+    }
+}
diff --git a/Tests/Cosmos.Compiler.Tests.Interfaces/project.json b/Tests/Cosmos.Compiler.Tests.Interfaces/project.json
index 8bfc7e628..36328eca0 100644
--- a/Tests/Cosmos.Compiler.Tests.Interfaces/project.json
+++ b/Tests/Cosmos.Compiler.Tests.Interfaces/project.json
@@ -1,9 +1,4 @@
 {
-  "version": "1.0.0-*",
-  "buildOptions": {
-    "publicSign": true,
-    "keyFile": "../../Cosmos.snk"
-  },
   "dependencies": {
     "NETStandard.Library": "1.6.1"
   },
diff --git a/Tests/Cosmos.Compiler.Tests.LinqTests/Cosmos.Compiler.Tests.LinqTests.xproj b/Tests/Cosmos.Compiler.Tests.LinqTests/Cosmos.Compiler.Tests.LinqTests.xproj
index 8f2c8b1bd..ce8b0d49b 100644
--- a/Tests/Cosmos.Compiler.Tests.LinqTests/Cosmos.Compiler.Tests.LinqTests.xproj
+++ b/Tests/Cosmos.Compiler.Tests.LinqTests/Cosmos.Compiler.Tests.LinqTests.xproj
@@ -16,6 +16,7 @@
   </PropertyGroup>
   <ItemGroup>
     <DnxInvisibleContent Include="Cosmos.Compiler.Tests.LinqTestsBoot.Cosmos" />
+    <DnxInvisibleContent Include="Cosmos.Compiler.Tests.LinqTestsBoot.project.json" />
   </ItemGroup>
   <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
+</Project>
\ No newline at end of file
diff --git a/Tests/Cosmos.Compiler.Tests.LinqTests/Cosmos.Compiler.Tests.LinqTestsBoot.Cosmos b/Tests/Cosmos.Compiler.Tests.LinqTests/Cosmos.Compiler.Tests.LinqTestsBoot.Cosmos
index c1a2a9bc0..ff2826869 100644
--- a/Tests/Cosmos.Compiler.Tests.LinqTests/Cosmos.Compiler.Tests.LinqTestsBoot.Cosmos
+++ b/Tests/Cosmos.Compiler.Tests.LinqTests/Cosmos.Compiler.Tests.LinqTestsBoot.Cosmos
@@ -33,11 +33,9 @@
     <Reference Include="Cosmos.Debug.Kernel.Plugs, Version=1.0.0.0, Culture=neutral, PublicKeyToken=5ae71220097cb983" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Cosmos.Kernel.Tests.LinqTests\Cosmos.Compiler.Tests.LinqTests.xproj">
-      <Name>Cosmos.Compiler.Tests.LinqTests</Name>
-      <Project>{85b11f78-39bc-4cfc-9033-fc84ab14cd03}</Project>
-      <Private>True</Private>
-    </ProjectReference>
+    <Content Include="Cosmos.Compiler.Tests.LinqTestsBoot.project.json">
+      <SubType>Content</SubType>
+    </Content>
   </ItemGroup>
   <!--<ItemGroup>
     <Content Include="Cosmos.bxrc">
diff --git a/Tests/Cosmos.Compiler.Tests.LinqTests/Cosmos.Compiler.Tests.LinqTestsBoot.project.json b/Tests/Cosmos.Compiler.Tests.LinqTests/Cosmos.Compiler.Tests.LinqTestsBoot.project.json
new file mode 100644
index 000000000..a28cb8fe6
--- /dev/null
+++ b/Tests/Cosmos.Compiler.Tests.LinqTests/Cosmos.Compiler.Tests.LinqTestsBoot.project.json
@@ -0,0 +1,8 @@
+{
+    "runtimes": {
+        "win": {}
+    },
+    "frameworks": {
+        "net462": {}
+    }
+}
diff --git a/Tests/Cosmos.Compiler.Tests.LinqTests/project.json b/Tests/Cosmos.Compiler.Tests.LinqTests/project.json
index 8bfc7e628..36328eca0 100644
--- a/Tests/Cosmos.Compiler.Tests.LinqTests/project.json
+++ b/Tests/Cosmos.Compiler.Tests.LinqTests/project.json
@@ -1,9 +1,4 @@
 {
-  "version": "1.0.0-*",
-  "buildOptions": {
-    "publicSign": true,
-    "keyFile": "../../Cosmos.snk"
-  },
   "dependencies": {
     "NETStandard.Library": "1.6.1"
   },
diff --git a/Tests/Cosmos.Compiler.Tests.MethodTests/Cosmos.Compiler.Tests.MethodTests.xproj b/Tests/Cosmos.Compiler.Tests.MethodTests/Cosmos.Compiler.Tests.MethodTests.xproj
index 311cf9db2..ecb35af8a 100644
--- a/Tests/Cosmos.Compiler.Tests.MethodTests/Cosmos.Compiler.Tests.MethodTests.xproj
+++ b/Tests/Cosmos.Compiler.Tests.MethodTests/Cosmos.Compiler.Tests.MethodTests.xproj
@@ -16,6 +16,7 @@
   </PropertyGroup>
   <ItemGroup>
     <DnxInvisibleContent Include="Cosmos.Compiler.Tests.MethodTestsBoot.Cosmos" />
+    <DnxInvisibleContent Include="Cosmos.Compiler.Tests.MethodTestsBoot.project.json" />
   </ItemGroup>
   <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
+</Project>
\ No newline at end of file
diff --git a/Tests/Cosmos.Compiler.Tests.MethodTests/Cosmos.Compiler.Tests.MethodTestsBoot.Cosmos b/Tests/Cosmos.Compiler.Tests.MethodTests/Cosmos.Compiler.Tests.MethodTestsBoot.Cosmos
index 024992f94..75031b165 100644
--- a/Tests/Cosmos.Compiler.Tests.MethodTests/Cosmos.Compiler.Tests.MethodTestsBoot.Cosmos
+++ b/Tests/Cosmos.Compiler.Tests.MethodTests/Cosmos.Compiler.Tests.MethodTestsBoot.Cosmos
@@ -51,17 +51,16 @@
     <TraceAssemblies>Cosmos</TraceAssemblies>
     <Bochs_TraceAssemblies>Cosmos</Bochs_TraceAssemblies>
   </PropertyGroup>
-  <ItemGroup>
-    <ProjectReference Include=".\Cosmos.Compiler.Tests.MethodTests.xproj">
-      <Name>Cosmos.Compiler.Tests.MethodTests</Name>
-      <Project>{fe8b9f39-7c96-4866-9a18-386735895cee}</Project>
-    </ProjectReference>
-  </ItemGroup>
   <ItemGroup>
     <Reference Include="Cosmos.Core.Plugs, Version=1.0.0.0, Culture=neutral, PublicKeyToken=5ae71220097cb983" />
     <Reference Include="Cosmos.System.Plugs, Version=1.0.0.0, Culture=neutral, PublicKeyToken=5ae71220097cb983" />
     <Reference Include="Cosmos.Debug.Kernel.Plugs, Version=1.0.0.0, Culture=neutral, PublicKeyToken=5ae71220097cb983" />
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="Cosmos.Compiler.Tests.MethodTestsBoot.project.json">
+      <SubType>Content</SubType>
+    </Content>
+  </ItemGroup>
   <!--<ItemGroup>
     <Content Include="Cosmos.bxrc">
       <SubType>Content</SubType>
diff --git a/Tests/Cosmos.Compiler.Tests.MethodTests/Cosmos.Compiler.Tests.MethodTestsBoot.project.json b/Tests/Cosmos.Compiler.Tests.MethodTests/Cosmos.Compiler.Tests.MethodTestsBoot.project.json
new file mode 100644
index 000000000..a28cb8fe6
--- /dev/null
+++ b/Tests/Cosmos.Compiler.Tests.MethodTests/Cosmos.Compiler.Tests.MethodTestsBoot.project.json
@@ -0,0 +1,8 @@
+{
+    "runtimes": {
+        "win": {}
+    },
+    "frameworks": {
+        "net462": {}
+    }
+}
diff --git a/Tests/Cosmos.Compiler.Tests.MethodTests/project.json b/Tests/Cosmos.Compiler.Tests.MethodTests/project.json
index 8bfc7e628..36328eca0 100644
--- a/Tests/Cosmos.Compiler.Tests.MethodTests/project.json
+++ b/Tests/Cosmos.Compiler.Tests.MethodTests/project.json
@@ -1,9 +1,4 @@
 {
-  "version": "1.0.0-*",
-  "buildOptions": {
-    "publicSign": true,
-    "keyFile": "../../Cosmos.snk"
-  },
   "dependencies": {
     "NETStandard.Library": "1.6.1"
   },
diff --git a/Tests/Cosmos.Compiler.Tests.MultidimensionalArrays/AssemblyInfo.cs b/Tests/Cosmos.Compiler.Tests.MultidimensionalArrays/AssemblyInfo.cs
deleted file mode 100644
index 6848b03ad..000000000
--- a/Tests/Cosmos.Compiler.Tests.MultidimensionalArrays/AssemblyInfo.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System;
-using System.Reflection;
-using System.Resources;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("Package Name")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Company")]
-[assembly: AssemblyProduct("Package Name")]
-[assembly: AssemblyCopyright("")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-[assembly: ComVisible(false)]
-[assembly: CLSCompliant(false)]
-[assembly: NeutralResourcesLanguage("en-US")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Revision and Build Numbers 
-// by using the '*' as shown below:
-
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
-
-
-
diff --git a/Tests/Cosmos.Compiler.Tests.MultidimensionalArrays/Cosmos.Compiler.Tests.MultidimensionalArrays.csproj b/Tests/Cosmos.Compiler.Tests.MultidimensionalArrays/Cosmos.Compiler.Tests.MultidimensionalArrays.csproj
deleted file mode 100644
index 37aafbc52..000000000
--- a/Tests/Cosmos.Compiler.Tests.MultidimensionalArrays/Cosmos.Compiler.Tests.MultidimensionalArrays.csproj
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{C885ADA0-1015-4892-AD29-6B374A33751D}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Compiler.Tests.MultidimensionalArrays</RootNamespace>
-    <AssemblyName>Compiler.Tests.MultidimensionalArrays</AssemblyName>
-    <FileAlignment>512</FileAlignment>
-    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-    <Reference Include="Cosmos.System, Version=1.0.0.0, Culture=neutral, PublicKeyToken=5ae71220097cb983, processorArchitecture=MSIL" />
-    <Reference Include="Cosmos.Debug.Kernel, Version=1.0.0.0, Culture=neutral, PublicKeyToken=5ae71220097cb983, processorArchitecture=MSIL" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Kernel.cs" />
-    <Compile Include="AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Cosmos.TestRunner.TestController\Cosmos.TestRunner.TestController.csproj">
-      <Project>{e6d3b644-c487-472d-a978-c1a82d0c099b}</Project>
-      <Name>Cosmos.TestRunner.TestController</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/Tests/Cosmos.Compiler.Tests.MultidimensionalArrays/Cosmos.Compiler.Tests.MultidimensionalArraysBoot.Cosmos b/Tests/Cosmos.Compiler.Tests.MultidimensionalArrays/Cosmos.Compiler.Tests.MultidimensionalArraysBoot.Cosmos
deleted file mode 100644
index 3565a26be..000000000
--- a/Tests/Cosmos.Compiler.Tests.MultidimensionalArrays/Cosmos.Compiler.Tests.MultidimensionalArraysBoot.Cosmos
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{1995b1dd-c504-48e3-972f-fb8a5fe1d8dd}</ProjectGuid>
-    <EnableUnmanagedDebugging>false</EnableUnmanagedDebugging>
-    <Name>Compiler.Tests.MultidimensionalArraysBoot</Name>
-    <BinFormat>elf</BinFormat>
-    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <Profile>VMware</Profile>
-    <!-- Looks like this was a mispelled attribute. Replaced by DebugEnabled below.
-    <DebugEnable>true</DebugEnable>
-    -->
-    <DebugEnabled>true</DebugEnabled>
-    <DebugMode>Source</DebugMode>
-    <TraceMode>User</TraceMode>
-    <EnableGDB>False</EnableGDB>
-    <StartCosmosGDB>false</StartCosmosGDB>
-    <VMWareEdition>Player</VMWareEdition>
-    <OutputPath>bin\Debug\</OutputPath>
-    <Name>Cosmos.Compiler.Tests.MultidimensionalArraysBoot</Name>
-    <Description>Use VMware Player or Workstation to deploy and debug.</Description>
-    <Deployment>ISO</Deployment>
-    <Launch>VMware</Launch>
-    <VisualStudioDebugPort>Pipe: Cosmos\Serial</VisualStudioDebugPort>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Cosmos.Core.Plugs, Version=1.0.0.0, Culture=neutral, PublicKeyToken=5ae71220097cb983" />
-    <Reference Include="Cosmos.System.Plugs, Version=1.0.0.0, Culture=neutral, PublicKeyToken=5ae71220097cb983" />
-    <Reference Include="Cosmos.Debug.Kernel.Plugs, Version=1.0.0.0, Culture=neutral, PublicKeyToken=5ae71220097cb983" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Cosmos.Compiler.Tests.MultidimensionalArrays\Cosmos.Compiler.Tests.MultidimensionalArrays.csproj">
-      <Name>Cosmos.Compiler.Tests.MultidimensionalArrays</Name>
-      <Project>{c885ada0-1015-4892-ad29-6b374a33751d}</Project>
-      <Private>True</Private>
-    </ProjectReference>
-  </ItemGroup>
-  <!--<ItemGroup>
-    <Content Include="Cosmos.bxrc">
-      <SubType>Content</SubType>
-    </Content>
-  </ItemGroup>-->
-  <Import Project="$(MSBuildExtensionsPath)\Cosmos\Cosmos.targets" />
-</Project>
\ No newline at end of file
diff --git a/Tests/Cosmos.Compiler.Tests.MultidimensionalArrays/Kernel.cs b/Tests/Cosmos.Compiler.Tests.MultidimensionalArrays/Kernel.cs
deleted file mode 100644
index a22bf419f..000000000
--- a/Tests/Cosmos.Compiler.Tests.MultidimensionalArrays/Kernel.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using System;
-using Cosmos.TestRunner;
-using Sys = Cosmos.System;
-
-namespace Cosmos.Compiler.Tests.MultidimensionalArrays
-{
-    public class Kernel : Sys.Kernel
-    {
-        protected override void BeforeRun()
-        {
-            Console.WriteLine("Cosmos booted successfully. This is multidimensional test.");
-        }
-        void For(int[,] x)
-       {
-        	for (int i = 0; i < 10; i++)
-                for (int o = 0; o < 10; o++)
-                    x[i,o] = i+1 * 10 + o;
-       }
-        protected override void Run()
-        {
-            int[,] numbers = new int[10, 10];
-            For(numbers);
-            Assert.AreEqual(10, numbers[0,0], "Wrong:Multdimensional arrays doesnt work!");
-            TestController.Completed();
-        }
-    }
-}
diff --git a/Tests/Cosmos.Compiler.Tests.SimpleWriteLine/Cosmos.Compiler.Tests.SimpleWriteLine.xproj b/Tests/Cosmos.Compiler.Tests.SimpleWriteLine/Cosmos.Compiler.Tests.SimpleWriteLine.xproj
index e303fc2e4..0f27b3848 100644
--- a/Tests/Cosmos.Compiler.Tests.SimpleWriteLine/Cosmos.Compiler.Tests.SimpleWriteLine.xproj
+++ b/Tests/Cosmos.Compiler.Tests.SimpleWriteLine/Cosmos.Compiler.Tests.SimpleWriteLine.xproj
@@ -15,7 +15,8 @@
     <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>
   <ItemGroup>
-    <DnxInvisibleContent Include="Cosmos.Compiler.Tests.SimpleWriteLine.KernelBoot.Cosmos" />
+    <DnxInvisibleContent Include="Cosmos.Compiler.Tests.SimpleWriteLineBoot.Cosmos" />
+    <DnxInvisibleContent Include="Cosmos.Compiler.Tests.SimpleWriteLineBoot.project.json" />
   </ItemGroup>
   <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
+</Project>
\ No newline at end of file
diff --git a/Tests/Cosmos.Compiler.Tests.SimpleWriteLine/Cosmos.Compiler.Tests.SimpleWriteLineBoot.Cosmos b/Tests/Cosmos.Compiler.Tests.SimpleWriteLine/Cosmos.Compiler.Tests.SimpleWriteLineBoot.Cosmos
index 85f7e2352..d28245aac 100644
--- a/Tests/Cosmos.Compiler.Tests.SimpleWriteLine/Cosmos.Compiler.Tests.SimpleWriteLineBoot.Cosmos
+++ b/Tests/Cosmos.Compiler.Tests.SimpleWriteLine/Cosmos.Compiler.Tests.SimpleWriteLineBoot.Cosmos
@@ -73,11 +73,9 @@
     <ISO_EnableBochsDebug>True</ISO_EnableBochsDebug>
   </PropertyGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Cosmos.Compiler.Tests.SimpleWriteLine.Kernel\Cosmos.Compiler.Tests.SimpleWriteLine.xproj">
-      <Name>Cosmos.Compiler.Tests.SimpleWriteLine.Kernel</Name>
-      <Project>{57045fe8-b0fe-4fc1-810f-7c3914aef1de}</Project>
-      <Private>True</Private>
-    </ProjectReference>
+    <Content Include="Cosmos.Compiler.Tests.SimpleWriteLineBoot.project.json">
+      <SubType>Content</SubType>
+    </Content>
   </ItemGroup>
   <!--<ItemGroup>
     <Content Include="Cosmos.bxrc">
diff --git a/Tests/Cosmos.Compiler.Tests.SimpleWriteLine/Cosmos.Compiler.Tests.SimpleWriteLineBoot.project.json b/Tests/Cosmos.Compiler.Tests.SimpleWriteLine/Cosmos.Compiler.Tests.SimpleWriteLineBoot.project.json
new file mode 100644
index 000000000..a28cb8fe6
--- /dev/null
+++ b/Tests/Cosmos.Compiler.Tests.SimpleWriteLine/Cosmos.Compiler.Tests.SimpleWriteLineBoot.project.json
@@ -0,0 +1,8 @@
+{
+    "runtimes": {
+        "win": {}
+    },
+    "frameworks": {
+        "net462": {}
+    }
+}
diff --git a/Tests/Cosmos.Compiler.Tests.SimpleWriteLine/project.json b/Tests/Cosmos.Compiler.Tests.SimpleWriteLine/project.json
index 8bfc7e628..36328eca0 100644
--- a/Tests/Cosmos.Compiler.Tests.SimpleWriteLine/project.json
+++ b/Tests/Cosmos.Compiler.Tests.SimpleWriteLine/project.json
@@ -1,9 +1,4 @@
 {
-  "version": "1.0.0-*",
-  "buildOptions": {
-    "publicSign": true,
-    "keyFile": "../../Cosmos.snk"
-  },
   "dependencies": {
     "NETStandard.Library": "1.6.1"
   },
diff --git a/Tests/Cosmos.Compiler.Tests.SingleEchoTest/Cosmos.Compiler.Tests.SingleEchoTest.xproj b/Tests/Cosmos.Compiler.Tests.SingleEchoTest/Cosmos.Compiler.Tests.SingleEchoTest.xproj
index 052728724..60a2d956a 100644
--- a/Tests/Cosmos.Compiler.Tests.SingleEchoTest/Cosmos.Compiler.Tests.SingleEchoTest.xproj
+++ b/Tests/Cosmos.Compiler.Tests.SingleEchoTest/Cosmos.Compiler.Tests.SingleEchoTest.xproj
@@ -16,6 +16,7 @@
   </PropertyGroup>
   <ItemGroup>
     <DnxInvisibleContent Include="Cosmos.Compiler.Tests.SingleEchoTestBoot.Cosmos" />
+    <DnxInvisibleContent Include="Cosmos.Compiler.Tests.SingleEchoTestBoot.project.json" />
   </ItemGroup>
   <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
+</Project>
\ No newline at end of file
diff --git a/Tests/Cosmos.Compiler.Tests.SingleEchoTest/Cosmos.Compiler.Tests.SingleEchoTestBoot.Cosmos b/Tests/Cosmos.Compiler.Tests.SingleEchoTest/Cosmos.Compiler.Tests.SingleEchoTestBoot.Cosmos
index 16d4370f2..be3bd70f6 100644
--- a/Tests/Cosmos.Compiler.Tests.SingleEchoTest/Cosmos.Compiler.Tests.SingleEchoTestBoot.Cosmos
+++ b/Tests/Cosmos.Compiler.Tests.SingleEchoTest/Cosmos.Compiler.Tests.SingleEchoTestBoot.Cosmos
@@ -28,11 +28,9 @@
     <VisualStudioDebugPort>Pipe: Cosmos\Serial</VisualStudioDebugPort>
   </PropertyGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Cosmos.Compiler.Tests.SingleEchoTest\Cosmos.Compiler.Tests.SingleEchoTest.xproj">
-      <Name>Cosmos.Compiler.Tests.SingleEchoTest</Name>
-      <Project>{3e28cfd9-25d4-4ebb-86e3-4a4a8a8936fe}</Project>
-      <Private>True</Private>
-    </ProjectReference>
+    <Content Include="Cosmos.Compiler.Tests.SingleEchoTestBoot.project.json">
+      <SubType>Content</SubType>
+    </Content>
   </ItemGroup>
   <!--<ItemGroup>
     <Content Include="Cosmos.bxrc">
diff --git a/Tests/Cosmos.Compiler.Tests.SingleEchoTest/Cosmos.Compiler.Tests.SingleEchoTestBoot.project.json b/Tests/Cosmos.Compiler.Tests.SingleEchoTest/Cosmos.Compiler.Tests.SingleEchoTestBoot.project.json
new file mode 100644
index 000000000..a28cb8fe6
--- /dev/null
+++ b/Tests/Cosmos.Compiler.Tests.SingleEchoTest/Cosmos.Compiler.Tests.SingleEchoTestBoot.project.json
@@ -0,0 +1,8 @@
+{
+    "runtimes": {
+        "win": {}
+    },
+    "frameworks": {
+        "net462": {}
+    }
+}
diff --git a/Tests/Cosmos.Compiler.Tests.SingleEchoTest/Kernel.cs b/Tests/Cosmos.Compiler.Tests.SingleEchoTest/Kernel.cs
index fff3e1741..acbd2491b 100644
--- a/Tests/Cosmos.Compiler.Tests.SingleEchoTest/Kernel.cs
+++ b/Tests/Cosmos.Compiler.Tests.SingleEchoTest/Kernel.cs
@@ -10,7 +10,6 @@ namespace Cosmos.Compiler.Tests.SingleEchoTest
 {
     public class Kernel : Sys.Kernel
     {
-        internal static Debugger mDebugger = new Debugger("Common", "Console");
         protected override void BeforeRun()
         {
             Console.WriteLine("Cosmos booted successfully. Type a line of text to get it echoed back.");
diff --git a/Tests/Cosmos.Compiler.Tests.SingleEchoTest/project.json b/Tests/Cosmos.Compiler.Tests.SingleEchoTest/project.json
index 8bfc7e628..b529a5f37 100644
--- a/Tests/Cosmos.Compiler.Tests.SingleEchoTest/project.json
+++ b/Tests/Cosmos.Compiler.Tests.SingleEchoTest/project.json
@@ -1,5 +1,4 @@
 {
-  "version": "1.0.0-*",
   "buildOptions": {
     "publicSign": true,
     "keyFile": "../../Cosmos.snk"
@@ -23,3 +22,4 @@
     }
   }
 }
+
diff --git a/Tests/Cosmos.Kernel.Tests.Fat/Cosmos.Kernel.Tests.Fat.xproj b/Tests/Cosmos.Kernel.Tests.Fat/Cosmos.Kernel.Tests.Fat.xproj
index e71d9e54d..6f1e5fb3a 100644
--- a/Tests/Cosmos.Kernel.Tests.Fat/Cosmos.Kernel.Tests.Fat.xproj
+++ b/Tests/Cosmos.Kernel.Tests.Fat/Cosmos.Kernel.Tests.Fat.xproj
@@ -16,6 +16,7 @@
   </PropertyGroup>
   <ItemGroup>
     <DnxInvisibleContent Include="Cosmos.Kernel.Tests.FatBoot.Cosmos" />
+    <DnxInvisibleContent Include="Cosmos.Kernel.Tests.FatBoot.project.json" />
   </ItemGroup>
   <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
+</Project>
\ No newline at end of file
diff --git a/Tests/Cosmos.Kernel.Tests.Fat/Cosmos.Kernel.Tests.FatBoot.Cosmos b/Tests/Cosmos.Kernel.Tests.Fat/Cosmos.Kernel.Tests.FatBoot.Cosmos
index b38d22c36..b04e6310f 100644
--- a/Tests/Cosmos.Kernel.Tests.Fat/Cosmos.Kernel.Tests.FatBoot.Cosmos
+++ b/Tests/Cosmos.Kernel.Tests.Fat/Cosmos.Kernel.Tests.FatBoot.Cosmos
@@ -86,6 +86,11 @@
       <Private>True</Private>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="Cosmos.Kernel.Tests.FatBoot.project.json">
+      <SubType>Content</SubType>
+    </Content>
+  </ItemGroup>
   <!--<ItemGroup>
     <Content Include="Cosmos.bxrc">
       <SubType>Content</SubType>
diff --git a/Tests/Cosmos.Kernel.Tests.Fat/Cosmos.Kernel.Tests.FatBoot.project.json b/Tests/Cosmos.Kernel.Tests.Fat/Cosmos.Kernel.Tests.FatBoot.project.json
new file mode 100644
index 000000000..a28cb8fe6
--- /dev/null
+++ b/Tests/Cosmos.Kernel.Tests.Fat/Cosmos.Kernel.Tests.FatBoot.project.json
@@ -0,0 +1,8 @@
+{
+    "runtimes": {
+        "win": {}
+    },
+    "frameworks": {
+        "net462": {}
+    }
+}
diff --git a/Tests/Cosmos.Kernel.Tests.Fat/project.json b/Tests/Cosmos.Kernel.Tests.Fat/project.json
index 8bfc7e628..36328eca0 100644
--- a/Tests/Cosmos.Kernel.Tests.Fat/project.json
+++ b/Tests/Cosmos.Kernel.Tests.Fat/project.json
@@ -1,9 +1,4 @@
 {
-  "version": "1.0.0-*",
-  "buildOptions": {
-    "publicSign": true,
-    "keyFile": "../../Cosmos.snk"
-  },
   "dependencies": {
     "NETStandard.Library": "1.6.1"
   },
diff --git a/Tests/Cosmos.Kernel.Tests.IO/Cosmos.Kernel.Tests.IO.xproj b/Tests/Cosmos.Kernel.Tests.IO/Cosmos.Kernel.Tests.IO.xproj
index 0d2e570f0..427453de6 100644
--- a/Tests/Cosmos.Kernel.Tests.IO/Cosmos.Kernel.Tests.IO.xproj
+++ b/Tests/Cosmos.Kernel.Tests.IO/Cosmos.Kernel.Tests.IO.xproj
@@ -15,7 +15,8 @@
     <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>
   <ItemGroup>
-    <DnxInvisibleContent Include="Cosmos.Compiler.Tests.IOBoot.Cosmos" />
+    <DnxInvisibleContent Include="Cosmos.Kernel.Tests.IOBoot.Cosmos" />
+    <DnxInvisibleContent Include="Cosmos.Kernel.Tests.IOBoot.project.json" />
   </ItemGroup>
   <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
+</Project>
\ No newline at end of file
diff --git a/Tests/Cosmos.Kernel.Tests.IO/Cosmos.Kernel.Tests.IOBoot.Cosmos b/Tests/Cosmos.Kernel.Tests.IO/Cosmos.Kernel.Tests.IOBoot.Cosmos
index b718eb47b..cc32ebe90 100644
--- a/Tests/Cosmos.Kernel.Tests.IO/Cosmos.Kernel.Tests.IOBoot.Cosmos
+++ b/Tests/Cosmos.Kernel.Tests.IO/Cosmos.Kernel.Tests.IOBoot.Cosmos
@@ -50,11 +50,9 @@
     <Bochs_IgnoreDebugStubAttribute>False</Bochs_IgnoreDebugStubAttribute>
   </PropertyGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Cosmos.Kernel.Tests.IO\Cosmos.Kernel.Tests.IO.xproj">
-      <Name>Cosmos.Kernel.Tests.IO</Name>
-      <Project>{47b1a772-4a53-4a53-9bad-31df119b1725}</Project>
-      <Private>True</Private>
-    </ProjectReference>
+    <Content Include="Cosmos.Kernel.Tests.IOBoot.project.json">
+      <SubType>Content</SubType>
+    </Content>
   </ItemGroup>
   <!--<ItemGroup>
     <Content Include="Cosmos.bxrc">
diff --git a/Tests/Cosmos.Kernel.Tests.IO/Cosmos.Kernel.Tests.IOBoot.project.json b/Tests/Cosmos.Kernel.Tests.IO/Cosmos.Kernel.Tests.IOBoot.project.json
new file mode 100644
index 000000000..a28cb8fe6
--- /dev/null
+++ b/Tests/Cosmos.Kernel.Tests.IO/Cosmos.Kernel.Tests.IOBoot.project.json
@@ -0,0 +1,8 @@
+{
+    "runtimes": {
+        "win": {}
+    },
+    "frameworks": {
+        "net462": {}
+    }
+}
diff --git a/Tests/Cosmos.Kernel.Tests.IO/project.json b/Tests/Cosmos.Kernel.Tests.IO/project.json
index 8bfc7e628..36328eca0 100644
--- a/Tests/Cosmos.Kernel.Tests.IO/project.json
+++ b/Tests/Cosmos.Kernel.Tests.IO/project.json
@@ -1,9 +1,4 @@
 {
-  "version": "1.0.0-*",
-  "buildOptions": {
-    "publicSign": true,
-    "keyFile": "../../Cosmos.snk"
-  },
   "dependencies": {
     "NETStandard.Library": "1.6.1"
   },
diff --git a/Tests/Cosmos.TestRunner.Core/project.json b/Tests/Cosmos.TestRunner.Core/project.json
index e96820c56..7798703fe 100644
--- a/Tests/Cosmos.TestRunner.Core/project.json
+++ b/Tests/Cosmos.TestRunner.Core/project.json
@@ -1,5 +1,4 @@
 {
-  "version": "1.0.0-*",
   "buildOptions": {
     "publicSign": true,
     "keyFile": "../../Cosmos.snk"
@@ -8,74 +7,76 @@
     "NETStandard.Library": "1.6.1",
     "System.Xml.XmlDocument": "4.3.0",
     "System.Xml.XPath.XmlDocument": "4.3.0",
-    "Microsoft.Win32.Registry": "4.3.0",
-    "Cosmos.Build.Common": {
-      "target": "project"
-    },
-    "Cosmos.Build.MSBuild": {
-      "target": "project"
-    },
-    "Cosmos.Debug.DebugConnectors": {
-      "target": "project"
-    },
-    "Cosmos.Debug.Hosts": {
-      "target": "project"
-    },
-    "Cosmos.IL2CPU": {
-      "target": "project"
-    },
-    "IL2CPU": {
-      "target": "project"
-    },
-    "Cosmos.Core.Plugs": {
-      "target": "project"
-    },
-    "Cosmos.IL2CPU.Plugs": {
-      "target": "project"
-    },
-    "Cosmos.System.Plugs": {
-      "target": "project"
-    },
-    "BoxingTests": {
-      "target": "project"
-    },
-    "Cosmos.Compiler.Tests.Bcl": {
-      "target": "project"
-    },
-    "Cosmos.Compiler.Tests.Encryption": {
-      "target": "project"
-    },
-    "Cosmos.Compiler.Tests.Exceptions": {
-      "target": "project"
-    },
-    "Cosmos.Compiler.Tests.LinqTests": {
-      "target": "project"
-    },
-    "Cosmos.Compiler.Tests.MethodTests": {
-      "target": "project"
-    },
-    "Cosmos.Compiler.Tests.SimpleWriteLine": {
-      "target": "project"
-    },
-    "Cosmos.Compiler.Tests.SingleEchoTest": {
-      "target": "project"
-    },
-    "Cosmos.Kernel.Tests.Fat": {
-      "target": "project"
-    },
-    "Cosmos.Kernel.Tests.IO": {
-      "target": "project"
-    },
-    "SimpleStructsAndArraysTest": {
-      "target": "project"
-    },
-    "VGACompilerCrash": {
-      "target": "project"
-    }
+    "Microsoft.Win32.Registry": "4.3.0"
   },
   "frameworks": {
     "netstandard1.6": {
-      "imports": "netcoreapp1.0"
+      "imports": "netcoreapp1.0",
+      "dependencies": {
+        "Cosmos.Build.Common": {
+          "target": "project"
+        },
+        "Cosmos.Build.MSBuild": {
+          "target": "project"
+        },
+        "Cosmos.Debug.DebugConnectors": {
+          "target": "project"
+        },
+        "Cosmos.Debug.Hosts": {
+          "target": "project"
+        },
+        "Cosmos.IL2CPU": {
+          "target": "project"
+        },
+        "IL2CPU": {
+          "target": "project"
+        },
+        "Cosmos.Core.Plugs": {
+          "target": "project"
+        },
+        "Cosmos.IL2CPU.Plugs": {
+          "target": "project"
+        },
+        "Cosmos.System.Plugs": {
+          "target": "project"
+        },
+        "BoxingTests": {
+          "target": "project"
+        },
+        "Cosmos.Compiler.Tests.Bcl": {
+          "target": "project"
+        },
+        "Cosmos.Compiler.Tests.Encryption": {
+          "target": "project"
+        },
+        "Cosmos.Compiler.Tests.Exceptions": {
+          "target": "project"
+        },
+        "Cosmos.Compiler.Tests.LinqTests": {
+          "target": "project"
+        },
+        "Cosmos.Compiler.Tests.MethodTests": {
+          "target": "project"
+        },
+        "Cosmos.Compiler.Tests.SimpleWriteLine": {
+          "target": "project"
+        },
+        "Cosmos.Compiler.Tests.SingleEchoTest": {
+          "target": "project"
+        },
+        "Cosmos.Kernel.Tests.Fat": {
+          "target": "project"
+        },
+        "Cosmos.Kernel.Tests.IO": {
+          "target": "project"
+        },
+        "SimpleStructsAndArraysTest": {
+          "target": "project"
+        },
+        "VGACompilerCrash": {
+          "target": "project"
+        }
+      }
     }
   }
 }
diff --git a/Tests/Cosmos.TestRunner.TestController/project.json b/Tests/Cosmos.TestRunner.TestController/project.json
index bb933dff1..7859a6738 100644
--- a/Tests/Cosmos.TestRunner.TestController/project.json
+++ b/Tests/Cosmos.TestRunner.TestController/project.json
@@ -1,5 +1,4 @@
 {
-  "version": "1.0.0-*",
   "buildOptions": {
     "publicSign": true,
     "keyFile": "../../Cosmos.snk"
diff --git a/Tests/Cosmos.TestRunner/project.json b/Tests/Cosmos.TestRunner/project.json
index 3407a37ae..369a0d813 100644
--- a/Tests/Cosmos.TestRunner/project.json
+++ b/Tests/Cosmos.TestRunner/project.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.0.0-*",
+
   "buildOptions": {
     "emitEntryPoint": true,
     "publicSign": true,
@@ -13,7 +13,6 @@
   },
   "frameworks": {
     "netcoreapp1.0": {
-      "imports": "dnxcore50",
       "dependencies": {
         "Cosmos.TestRunner.Core": {
           "target": "project"
diff --git a/Tests/SimpleStructsAndArraysTest/SimpleStructsAndArraysTest.xproj b/Tests/SimpleStructsAndArraysTest/SimpleStructsAndArraysTest.xproj
index c68f40293..3c6845c4b 100644
--- a/Tests/SimpleStructsAndArraysTest/SimpleStructsAndArraysTest.xproj
+++ b/Tests/SimpleStructsAndArraysTest/SimpleStructsAndArraysTest.xproj
@@ -16,6 +16,7 @@
   </PropertyGroup>
   <ItemGroup>
     <DnxInvisibleContent Include="SimpleStructsAndArraysTestBoot.Cosmos" />
+    <DnxInvisibleContent Include="SimpleStructsAndArraysTestBoot.project.json" />
   </ItemGroup>
   <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
 </Project>
diff --git a/Tests/SimpleStructsAndArraysTest/SimpleStructsAndArraysTestBoot.Cosmos b/Tests/SimpleStructsAndArraysTest/SimpleStructsAndArraysTestBoot.Cosmos
index 0c16b010d..6dd12e73c 100644
--- a/Tests/SimpleStructsAndArraysTest/SimpleStructsAndArraysTestBoot.Cosmos
+++ b/Tests/SimpleStructsAndArraysTest/SimpleStructsAndArraysTestBoot.Cosmos
@@ -52,11 +52,9 @@
     <Bochs_StartCosmosGDB>false</Bochs_StartCosmosGDB>
   </PropertyGroup>
   <ItemGroup>
-    <ProjectReference Include="..\SimpleStructsAndArraysTest\SimpleStructsAndArraysTest.xproj">
-      <Name>SimpleStructsAndArraysTest</Name>
-      <Project>{839edc9d-6d2e-4892-a7f0-17861ba9fa0c}</Project>
-      <Private>True</Private>
-    </ProjectReference>
+    <Content Include="SimpleStructsAndArraysTestBoot.project.json">
+      <SubType>Content</SubType>
+    </Content>
   </ItemGroup>
   <!--<ItemGroup>
     <Content Include="Cosmos.bxrc">
diff --git a/Tests/SimpleStructsAndArraysTest/SimpleStructsAndArraysTestBoot.project.json b/Tests/SimpleStructsAndArraysTest/SimpleStructsAndArraysTestBoot.project.json
new file mode 100644
index 000000000..a28cb8fe6
--- /dev/null
+++ b/Tests/SimpleStructsAndArraysTest/SimpleStructsAndArraysTestBoot.project.json
@@ -0,0 +1,8 @@
+{
+    "runtimes": {
+        "win": {}
+    },
+    "frameworks": {
+        "net462": {}
+    }
+}
diff --git a/Tests/SimpleStructsAndArraysTest/project.json b/Tests/SimpleStructsAndArraysTest/project.json
index 8bfc7e628..36328eca0 100644
--- a/Tests/SimpleStructsAndArraysTest/project.json
+++ b/Tests/SimpleStructsAndArraysTest/project.json
@@ -1,9 +1,4 @@
 {
-  "version": "1.0.0-*",
-  "buildOptions": {
-    "publicSign": true,
-    "keyFile": "../../Cosmos.snk"
-  },
   "dependencies": {
     "NETStandard.Library": "1.6.1"
   },
diff --git a/Tests/VGACompilerCrash/VGACompilerCrash.xproj b/Tests/VGACompilerCrash/VGACompilerCrash.xproj
index 3df17f387..ca9066b95 100644
--- a/Tests/VGACompilerCrash/VGACompilerCrash.xproj
+++ b/Tests/VGACompilerCrash/VGACompilerCrash.xproj
@@ -16,6 +16,7 @@
   </PropertyGroup>
   <ItemGroup>
     <DnxInvisibleContent Include="VGACompilerCrashBoot.Cosmos" />
+    <DnxInvisibleContent Include="VGACompilerCrashBoot.project.json" />
   </ItemGroup>
   <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
+</Project>
\ No newline at end of file
diff --git a/Tests/VGACompilerCrash/VGACompilerCrashBoot.Cosmos b/Tests/VGACompilerCrash/VGACompilerCrashBoot.Cosmos
index e6ca440fe..1c7f5518e 100644
--- a/Tests/VGACompilerCrash/VGACompilerCrashBoot.Cosmos
+++ b/Tests/VGACompilerCrash/VGACompilerCrashBoot.Cosmos
@@ -30,11 +30,9 @@
     <Reference Include="Cosmos.Debug.Kernel.Plugs, Version=1.0.0.0, Culture=neutral, PublicKeyToken=5ae71220097cb983" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\VGACompilerCrash\VGACompilerCrash.xproj">
-      <Name>VGACompilerCrash</Name>
-      <Project>{21915a7e-cc84-4836-8b87-857b6149d496}</Project>
-      <Private>True</Private>
-    </ProjectReference>
+    <Content Include="VGACompilerCrashBoot.project.json">
+      <SubType>Content</SubType>
+    </Content>
   </ItemGroup>
   <!--<ItemGroup>
     <Content Include="Cosmos.bxrc">
diff --git a/Tests/VGACompilerCrash/VGACompilerCrashBoot.project.json b/Tests/VGACompilerCrash/VGACompilerCrashBoot.project.json
new file mode 100644
index 000000000..a28cb8fe6
--- /dev/null
+++ b/Tests/VGACompilerCrash/VGACompilerCrashBoot.project.json
@@ -0,0 +1,8 @@
+{
+    "runtimes": {
+        "win": {}
+    },
+    "frameworks": {
+        "net462": {}
+    }
+}
diff --git a/Tests/VGACompilerCrash/project.json b/Tests/VGACompilerCrash/project.json
index 8bfc7e628..36328eca0 100644
--- a/Tests/VGACompilerCrash/project.json
+++ b/Tests/VGACompilerCrash/project.json
@@ -1,9 +1,4 @@
 {
-  "version": "1.0.0-*",
-  "buildOptions": {
-    "publicSign": true,
-    "keyFile": "../../Cosmos.snk"
-  },
   "dependencies": {
     "NETStandard.Library": "1.6.1"
   },
diff --git a/Tools/Cosmos.IL2CPU.Profiler/project.json b/Tools/Cosmos.IL2CPU.Profiler/project.json
index 3be405e5e..3bc46036d 100644
--- a/Tools/Cosmos.IL2CPU.Profiler/project.json
+++ b/Tools/Cosmos.IL2CPU.Profiler/project.json
@@ -1,5 +1,4 @@
 {
-  "version": "1.0.0-*",
   "buildOptions": {
     "emitEntryPoint": true,
     "publicSign": true,
diff --git a/Tools/Cosmos.NetCore.TestApp/project.json b/Tools/Cosmos.NetCore.TestApp/project.json
index 5370a9e9d..6d9dbca5e 100644
--- a/Tools/Cosmos.NetCore.TestApp/project.json
+++ b/Tools/Cosmos.NetCore.TestApp/project.json
@@ -1,17 +1,22 @@
 {
   "buildOptions": {
-    "emitEntryPoint": true
-  },
-  "runtimes": {
-    "win7-x64": {}
+    "emitEntryPoint": true,
+    "publicSign": true,
+    "keyFile": "../../Cosmos.snk"
   },
   "dependencies": {
-    "Microsoft.NETCore.App": "1.1.0",
-    "IL2CPU": {
-      "target": "project"
+    "Microsoft.NETCore.App": {
+      "type": "platform",
+      "version": "1.1.0"
     }
   },
   "frameworks": {
-    "netcoreapp1.0": {}
+    "netcoreapp1.0": {
+      "dependencies": {
+        "IL2CPU": {
+          "target": "project"
+        }
+      }
+    }
   }
 }
diff --git a/global.json b/global.json
new file mode 100644
index 000000000..fffa289ef
--- /dev/null
+++ b/global.json
@@ -0,0 +1,6 @@
+{
+  "sdk": {
+    "version": "1.0.0-preview2-1-003177"
+  },
+  "projects": ["source", "Tests"]
+}
diff --git a/source/Cosmos.Build.MSBuild/Cosmos.Build.MSBuild.csproj b/source/Cosmos.Build.MSBuild/Cosmos.Build.MSBuild.csproj
index 7c502ada3..8435d19bc 100644
--- a/source/Cosmos.Build.MSBuild/Cosmos.Build.MSBuild.csproj
+++ b/source/Cosmos.Build.MSBuild/Cosmos.Build.MSBuild.csproj
@@ -34,8 +34,6 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Microsoft.Build.Framework" />
-    <Reference Include="Microsoft.Build.Utilities.v4.0" />
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.configuration" />
@@ -77,6 +75,7 @@
     </None>
     <None Include=".editorconfig" />
     <None Include="App.config" />
+    <None Include="Cosmos.Build.MSBuild.project.json" />
     <None Include="Cosmos.targets">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
       <SubType>Designer</SubType>
diff --git a/source/Cosmos.Build.MSBuild/Cosmos.Build.MSBuild.project.json b/source/Cosmos.Build.MSBuild/Cosmos.Build.MSBuild.project.json
new file mode 100644
index 000000000..a997fa25f
--- /dev/null
+++ b/source/Cosmos.Build.MSBuild/Cosmos.Build.MSBuild.project.json
@@ -0,0 +1,12 @@
+{
+  "runtimes": {
+    "win": {}
+  },
+  "dependencies": {
+    "Microsoft.Build.Framework": "14.3.0",
+    "Microsoft.Build.Utilities.Core": "14.3.0"
+  },
+  "frameworks": {
+    "net462": {}
+  }
+}
diff --git a/source/Cosmos.Build.MSBuild/Cosmos.Build.MSBuild.xproj b/source/Cosmos.Build.MSBuild/Cosmos.Build.MSBuild.xproj
index 6bade7f8b..b2610bf8b 100644
--- a/source/Cosmos.Build.MSBuild/Cosmos.Build.MSBuild.xproj
+++ b/source/Cosmos.Build.MSBuild/Cosmos.Build.MSBuild.xproj
@@ -15,5 +15,8 @@
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>
+  <ItemGroup>
+    <DnxInvisibleContent Include="Cosmos.Build.MSBuild.project.json" />
+  </ItemGroup>
   <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
 </Project>
\ No newline at end of file
diff --git a/source/Cosmos.Build.MSBuild/project.json b/source/Cosmos.Build.MSBuild/project.json
index 361f69b11..7bd8b3a19 100644
--- a/source/Cosmos.Build.MSBuild/project.json
+++ b/source/Cosmos.Build.MSBuild/project.json
@@ -7,18 +7,21 @@
   "dependencies": {
     "NETStandard.Library": "1.6.1",
     "Microsoft.Build.Framework": "14.3.0",
-    "Microsoft.Build.Utilities.Core": "14.3.0",
-    "Cosmos.Build.Common": {
-      "target": "project"
-    },
-    "Cosmos.Debug.Common": {
-      "target": "project"
-    },
-    "Cosmos.Debug.Symbols": {
-      "target": "project"
-    }
+    "Microsoft.Build.Utilities.Core": "14.3.0"
   },
   "frameworks": {
-    "netstandard1.6": {}
+    "netstandard1.6": {
+      "dependencies": {
+        "Cosmos.Build.Common": {
+          "target": "project"
+        },
+        "Cosmos.Debug.Common": {
+          "target": "project"
+        },
+        "Cosmos.Debug.Symbols": {
+          "target": "project"
+        }
+      }
+    }
   }
 }
diff --git a/source/Cosmos.Common/project.json b/source/Cosmos.Common/project.json
index 0559f0896..7859a6738 100644
--- a/source/Cosmos.Common/project.json
+++ b/source/Cosmos.Common/project.json
@@ -4,12 +4,15 @@
     "keyFile": "../../Cosmos.snk"
   },
   "dependencies": {
-    "NETStandard.Library": "1.6.1",
-    "Cosmos.Debug.Kernel": {
-      "target": "project"
-    }
+    "NETStandard.Library": "1.6.1"
   },
   "frameworks": {
-    "netstandard1.6": {}
+    "netstandard1.6": {
+      "dependencies": {
+        "Cosmos.Debug.Kernel": {
+          "target": "project"
+        }
+      }
+    }
   }
 }
diff --git a/source/Cosmos.Core.Common/project.json b/source/Cosmos.Core.Common/project.json
index 0150c5ad4..4921f54ea 100644
--- a/source/Cosmos.Core.Common/project.json
+++ b/source/Cosmos.Core.Common/project.json
@@ -5,15 +5,18 @@
     "keyFile": "../../Cosmos.snk"
   },
   "dependencies": {
-    "NETStandard.Library": "1.6.1",
-    "Cosmos.Common": {
-      "target": "project"
-    },
-    "Cosmos.IL2CPU.Plugs": {
-      "target": "project"
-    }
+    "NETStandard.Library": "1.6.1"
   },
   "frameworks": {
-    "netstandard1.6": {}
+    "netstandard1.6": {
+      "dependencies": {
+        "Cosmos.Common": {
+          "target": "project"
+        },
+        "Cosmos.IL2CPU.Plugs": {
+          "target": "project"
+        }
+      }
+    }
   }
 }
diff --git a/source/Cosmos.Core/project.json b/source/Cosmos.Core/project.json
index 185cc74ed..973cc480f 100644
--- a/source/Cosmos.Core/project.json
+++ b/source/Cosmos.Core/project.json
@@ -5,21 +5,24 @@
     "keyFile": "../../Cosmos.snk"
   },
   "dependencies": {
-    "NETStandard.Library": "1.6.1",
-    "Cosmos.Common": {
-      "target": "project"
-    },
-    "Cosmos.Core.Common": {
-      "target": "project"
-    },
-    "Cosmos.Debug.Kernel": {
-      "target": "project"
-    },
-    "Cosmos.IL2CPU.Plugs": {
-      "target": "project"
-    }
+    "NETStandard.Library": "1.6.1"
   },
   "frameworks": {
-    "netstandard1.6": {}
+    "netstandard1.6": {
+      "dependencies": {
+        "Cosmos.Common": {
+          "target": "project"
+        },
+        "Cosmos.Core.Common": {
+          "target": "project"
+        },
+        "Cosmos.Debug.Kernel": {
+          "target": "project"
+        },
+        "Cosmos.IL2CPU.Plugs": {
+          "target": "project"
+        }
+      }
+    }
   }
 }
diff --git a/source/Cosmos.Debug.Hosts/Cosmos.Debug.Hosts.csproj b/source/Cosmos.Debug.Hosts/Cosmos.Debug.Hosts.csproj
index fdbe8afad..50477bf4f 100644
--- a/source/Cosmos.Debug.Hosts/Cosmos.Debug.Hosts.csproj
+++ b/source/Cosmos.Debug.Hosts/Cosmos.Debug.Hosts.csproj
@@ -65,14 +65,6 @@
       <Project>{ab24e403-54f3-4f67-b5e0-119a7227aac1}</Project>
       <Name>Cosmos.Debug.Common</Name>
     </ProjectReference>
-    <Reference Include="System.IO.FileSystem, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.IO.FileSystem.4.3.0\lib\net46\System.IO.FileSystem.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.IO.FileSystem.Primitives, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.IO.FileSystem.Primitives.4.3.0\lib\net46\System.IO.FileSystem.Primitives.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/source/Cosmos.Debug.Hosts/Cosmos.Debug.Hosts.project.json b/source/Cosmos.Debug.Hosts/Cosmos.Debug.Hosts.project.json
index 326ad4575..2ca4b5dfc 100644
--- a/source/Cosmos.Debug.Hosts/Cosmos.Debug.Hosts.project.json
+++ b/source/Cosmos.Debug.Hosts/Cosmos.Debug.Hosts.project.json
@@ -4,6 +4,8 @@
   },
   "dependencies": {
     "System.Diagnostics.Process": "4.3.0",
+    "System.IO.FileSystem": "4.3.0",
+    "System.IO.FileSystem.Primitives": "4.3.0",
     "System.IO.Pipes": "4.3.0",
     "System.Threading.Thread": "4.3.0"
   },
diff --git a/source/Cosmos.Debug.Hosts/project.json b/source/Cosmos.Debug.Hosts/project.json
index 66035bcab..3831dc99e 100644
--- a/source/Cosmos.Debug.Hosts/project.json
+++ b/source/Cosmos.Debug.Hosts/project.json
@@ -5,15 +5,18 @@
     "keyFile": "../../Cosmos.snk"
   },
   "dependencies": {
-    "NETStandard.Library": "1.6.1",
-    "Cosmos.Build.Common": {
-      "target": "project"
-    },
-    "Cosmos.Debug.Common": {
-      "target": "project"
-    }
+    "NETStandard.Library": "1.6.1"
   },
   "frameworks": {
-    "netstandard1.6": {}
+    "netstandard1.6": {
+      "dependencies": {
+        "Cosmos.Build.Common": {
+          "target": "project"
+        },
+        "Cosmos.Debug.Common": {
+          "target": "project"
+        }
+      }
+    }
   }
 }
diff --git a/source/Cosmos.Debug.Symbols/Cosmos.Debug.Symbols.nuget.props b/source/Cosmos.Debug.Symbols/Cosmos.Debug.Symbols.nuget.props
index c816f77d1..2fd45449d 100644
--- a/source/Cosmos.Debug.Symbols/Cosmos.Debug.Symbols.nuget.props
+++ b/source/Cosmos.Debug.Symbols/Cosmos.Debug.Symbols.nuget.props
@@ -4,6 +4,6 @@
     <NuGetPackageRoot>$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
   </PropertyGroup>
   <ImportGroup>
-    <Import Project="$(NuGetPackageRoot)sqlite\3.13.0\build\net45\SQLite.props" Condition="Exists('$(NuGetPackageRoot)sqlite\3.13.0\build\net45\SQLite.props')" />
+    <Import Project="$(NuGetPackageRoot)\SQLite\3.13.0\build\net45\SQLite.props" Condition="Exists('$(NuGetPackageRoot)\SQLite\3.13.0\build\net45\SQLite.props')" />
   </ImportGroup>
 </Project>
\ No newline at end of file
diff --git a/source/Cosmos.HAL/project.json b/source/Cosmos.HAL/project.json
index 20ddc8fa3..0e2b61c7c 100644
--- a/source/Cosmos.HAL/project.json
+++ b/source/Cosmos.HAL/project.json
@@ -4,24 +4,27 @@
     "keyFile": "../../Cosmos.snk"
   },
   "dependencies": {
-    "NETStandard.Library": "1.6.1",
-    "Cosmos.Common": {
-      "target": "project"
-    },
-    "Cosmos.Core": {
-      "target": "project"
-    },
-    "Cosmos.Core.Common": {
-      "target": "project"
-    },
-    "Cosmos.Debug.Kernel": {
-      "target": "project"
-    },
-    "Cosmos.IL2CPU.Plugs": {
-      "target": "project"
-    }
+    "NETStandard.Library": "1.6.1"
   },
   "frameworks": {
-    "netstandard1.6": {}
+    "netstandard1.6": {
+      "dependencies": {
+        "Cosmos.Common": {
+          "target": "project"
+        },
+        "Cosmos.Core": {
+          "target": "project"
+        },
+        "Cosmos.Core.Common": {
+          "target": "project"
+        },
+        "Cosmos.Debug.Kernel": {
+          "target": "project"
+        },
+        "Cosmos.IL2CPU.Plugs": {
+          "target": "project"
+        }
+      }
+    }
   }
 }
diff --git a/source/Cosmos.IL2CPU/project.json b/source/Cosmos.IL2CPU/project.json
index 33392f553..884f33719 100644
--- a/source/Cosmos.IL2CPU/project.json
+++ b/source/Cosmos.IL2CPU/project.json
@@ -45,7 +45,6 @@
         "XSharp.Common": {
           "target": "project"
         }
-
       }
     }
   }
diff --git a/source/Cosmos.System/project.json b/source/Cosmos.System/project.json
index 288e81e3b..9335a6636 100644
--- a/source/Cosmos.System/project.json
+++ b/source/Cosmos.System/project.json
@@ -4,21 +4,24 @@
     "keyFile": "../../Cosmos.snk"
   },
   "dependencies": {
-    "NETStandard.Library": "1.6.1",
-    "Cosmos.Common": {
-      "target": "project"
-    },
-    "Cosmos.Debug.Kernel": {
-      "target": "project"
-    },
-    "Cosmos.HAL": {
-      "target": "project"
-    },
-    "Cosmos.IL2CPU.Plugs": {
-      "target": "project"
-    }
+    "NETStandard.Library": "1.6.1"
   },
   "frameworks": {
-    "netstandard1.6": {}
+    "netstandard1.6": {
+      "dependencies": {
+        "Cosmos.Common": {
+          "target": "project"
+        },
+        "Cosmos.Debug.Kernel": {
+          "target": "project"
+        },
+        "Cosmos.HAL": {
+          "target": "project"
+        },
+        "Cosmos.IL2CPU.Plugs": {
+          "target": "project"
+        }
+      }
+    }
   }
 }
diff --git a/source/IL2CPU/project.json b/source/IL2CPU/project.json
index 141fb63ad..9e222c35c 100644
--- a/source/IL2CPU/project.json
+++ b/source/IL2CPU/project.json
@@ -1,5 +1,4 @@
 {
-  "version": "1.0.0-*",
   "buildOptions": {
     "emitEntryPoint": true,
     "publicSign": true,
@@ -9,12 +8,15 @@
     "Microsoft.NETCore.App": {
       "type": "platform",
       "version": "1.1.0"
-    },
-    "Cosmos.IL2CPU": {
-      "target": "project"
     }
   },
   "frameworks": {
-    "netcoreapp1.0": {}
+    "netcoreapp1.0": {
+      "dependencies": {
+        "Cosmos.IL2CPU": {
+          "target": "project"
+        }
+      }
+    }
   }
 }
diff --git a/source/XSharp.Common/project.json b/source/XSharp.Common/project.json
index 15e35ba32..42f335948 100644
--- a/source/XSharp.Common/project.json
+++ b/source/XSharp.Common/project.json
@@ -4,12 +4,15 @@
     "keyFile": "../../Cosmos.snk"
   },
   "dependencies": {
-    "NETStandard.Library": "1.6.1",
-    "Cosmos.Assembler": {
-      "target": "project"
-    }
+    "NETStandard.Library": "1.6.1"
   },
   "frameworks": {
-    "netstandard1.6": {}
+    "netstandard1.6": {
+      "dependencies": {
+        "Cosmos.Assembler": {
+          "target": "project"
+        }
+      }
+    }
   }
 }
diff --git a/source/XSharp.Compiler/project.json b/source/XSharp.Compiler/project.json
index 6437fa642..4f63bcf01 100644
--- a/source/XSharp.Compiler/project.json
+++ b/source/XSharp.Compiler/project.json
@@ -10,7 +10,7 @@
       "type": "platform",
       "version": "1.1.0"
     }
-    },
+  },
   "frameworks": {
     "netcoreapp1.0": {
       "dependencies": {