diff --git a/scripts/dotnet-cli-build/CompileTargets.cs b/scripts/dotnet-cli-build/CompileTargets.cs
index dc20e8946..20c1b63d3 100644
--- a/scripts/dotnet-cli-build/CompileTargets.cs
+++ b/scripts/dotnet-cli-build/CompileTargets.cs
@@ -318,6 +318,7 @@ namespace Microsoft.DotNet.Cli.Build
 
             // We publish to a sub folder of the PublishRoot so tools like heat and zip can generate folder structures easier.
             string SharedFrameworkNameAndVersionRoot = Path.Combine(outputDir, "shared", SharedFrameworkName, SharedFrameworkNugetVersion);
+            c.BuildContext["SharedFrameworkPath"] = SharedFrameworkNameAndVersionRoot;
 
             if (Directory.Exists(SharedFrameworkNameAndVersionRoot))
             {
@@ -342,9 +343,7 @@ namespace Microsoft.DotNet.Cli.Build
                 SharedFrameworkSourceRoot).Execute().EnsureSuccessful();
 
             // Clean up artifacts that dotnet-publish generates which we don't need
-            File.Delete(Path.Combine(SharedFrameworkNameAndVersionRoot, $"framework{Constants.ExeSuffix}"));
-            File.Delete(Path.Combine(SharedFrameworkNameAndVersionRoot, "framework.dll"));
-            File.Delete(Path.Combine(SharedFrameworkNameAndVersionRoot, "framework.pdb"));
+            DeleteMainPublishOutput(SharedFrameworkNameAndVersionRoot, "framework");
             File.Delete(Path.Combine(SharedFrameworkNameAndVersionRoot, "framework.runtimeconfig.json"));
 
             // Rename the .deps file
@@ -390,6 +389,9 @@ namespace Microsoft.DotNet.Cli.Build
             File.Copy(
                 Path.Combine(Dirs.Corehost, CoreHostBaseName),
                 Path.Combine(SharedFrameworkNameAndVersionRoot, $"dotnet{Constants.ExeSuffix}"), true);
+            File.Copy(
+                Path.Combine(Dirs.Corehost, CoreHostBaseName),
+                Path.Combine(SharedFrameworkNameAndVersionRoot, CoreHostBaseName), true);
             File.Copy(
                 Path.Combine(Dirs.Corehost, HostPolicyBaseName),
                 Path.Combine(SharedFrameworkNameAndVersionRoot, HostPolicyBaseName), true);
@@ -436,20 +438,34 @@ namespace Microsoft.DotNet.Cli.Build
 
             FixModeFlags(outputDir);
 
+            string compilersProject = Path.Combine(Dirs.RepoRoot, "src", "compilers");
+            dotnet.Publish(compilersProject,
+                    "--output",
+                    outputDir,
+                    "--framework",
+                    "netstandard1.5") 
+                    .Execute()
+                    .EnsureSuccessful();
+
+            var compilersDeps = Path.Combine(outputDir, "compilers.deps.json");
+            var compilersRuntimeConfig = Path.Combine(outputDir, "compilers.runtimeconfig.json");
+
             // Copy corehost
             File.Copy(Path.Combine(Dirs.Corehost, $"corehost{Constants.ExeSuffix}"), Path.Combine(outputDir, $"corehost{Constants.ExeSuffix}"), overwrite: true);
             File.Copy(Path.Combine(Dirs.Corehost, $"{Constants.DynamicLibPrefix}hostpolicy{Constants.DynamicLibSuffix}"), Path.Combine(outputDir, $"{Constants.DynamicLibPrefix}hostpolicy{Constants.DynamicLibSuffix}"), overwrite: true);
             File.Copy(Path.Combine(Dirs.Corehost, $"{Constants.DynamicLibPrefix}hostfxr{Constants.DynamicLibSuffix}"), Path.Combine(outputDir, $"{Constants.DynamicLibPrefix}hostfxr{Constants.DynamicLibSuffix}"), overwrite: true);
 
+            var binaryToCorehostifyOutDir = Path.Combine(outputDir, "runtimes", "any", "native");
             // Corehostify binaries
             foreach (var binaryToCorehostify in BinariesForCoreHost)
             {
                 try
                 {
                     // Yes, it is .exe even on Linux. This is the managed exe we're working with
-                    File.Copy(Path.Combine(outputDir, $"{binaryToCorehostify}.exe"), Path.Combine(outputDir, $"{binaryToCorehostify}.dll"));
-                    File.Delete(Path.Combine(outputDir, $"{binaryToCorehostify}.exe"));
-                    File.Copy(Path.Combine(outputDir, $"corehost{Constants.ExeSuffix}"), Path.Combine(outputDir, binaryToCorehostify + Constants.ExeSuffix));
+                    File.Copy(Path.Combine(binaryToCorehostifyOutDir, $"{binaryToCorehostify}.exe"), Path.Combine(outputDir, $"{binaryToCorehostify}.dll"));
+                    File.Delete(Path.Combine(binaryToCorehostifyOutDir, $"{binaryToCorehostify}.exe"));
+                    File.Copy(compilersDeps, Path.Combine(outputDir, binaryToCorehostify + ".deps.json"));
+                    File.Copy(compilersRuntimeConfig, Path.Combine(outputDir, binaryToCorehostify + ".runtimeconfig.json"));
                 }
                 catch (Exception ex)
                 {
@@ -457,9 +473,10 @@ namespace Microsoft.DotNet.Cli.Build
                 }
             }
 
-            // dotnet.exe is from stage0. But we must be using the newly built corehost in stage1
-            File.Delete(Path.Combine(outputDir, $"dotnet{Constants.ExeSuffix}"));
-            File.Copy(Path.Combine(outputDir, $"corehost{Constants.ExeSuffix}"), Path.Combine(outputDir, $"dotnet{Constants.ExeSuffix}"));
+            // cleanup compilers project output we don't need
+            DeleteMainPublishOutput(outputDir, "compilers");
+            File.Delete(compilersDeps);
+            File.Delete(compilersRuntimeConfig);
 
             // Crossgen Roslyn
             var result = CrossgenCliSdk(c, outputDir);
@@ -561,7 +578,13 @@ namespace Microsoft.DotNet.Cli.Build
             foreach (var assemblyToCrossgen in AssembliesToCrossGen)
             {
                 c.Info($"Crossgenning {assemblyToCrossgen}");
-                ExecInSilent(outputDir, crossgen, "-readytorun", "-nologo", "-platform_assemblies_paths", outputDir, assemblyToCrossgen);
+                ExecInSilent(outputDir, 
+                    crossgen, 
+                    "-readytorun",
+                    "-nologo",
+                    "-platform_assemblies_paths",
+                    $"{outputDir}{Path.PathSeparator}{c.BuildContext["SharedFrameworkPath"]}",
+                    assemblyToCrossgen);
             }
 
             c.Info("Crossgen complete");
@@ -615,6 +638,13 @@ namespace Microsoft.DotNet.Cli.Build
             return c.Success();
         }
 
+        private static void DeleteMainPublishOutput(string path, string name)
+        {
+            File.Delete(Path.Combine(path, $"{name}{Constants.ExeSuffix}"));
+            File.Delete(Path.Combine(path, $"{name}.dll"));
+            File.Delete(Path.Combine(path, $"{name}.pdb"));
+        }
+
         private static bool HasMetadata(string pathToFile)
         {
             try
diff --git a/scripts/dotnet-cli-build/Utils/Utils.cs b/scripts/dotnet-cli-build/Utils/Utils.cs
index b94343249..bd7e5ad71 100644
--- a/scripts/dotnet-cli-build/Utils/Utils.cs
+++ b/scripts/dotnet-cli-build/Utils/Utils.cs
@@ -96,7 +96,7 @@ namespace Microsoft.DotNet.Cli.Build
                     File.SetAttributes(file, FileAttributes.Normal);
                     File.Delete(file);
                 }
-
+                System.Threading.Thread.Sleep(1); 
                 Directory.Delete(path, true);
             }
         }
diff --git a/scripts/use-dev.ps1 b/scripts/use-dev.ps1
index 162ee4061..acd2fff86 100644
--- a/scripts/use-dev.ps1
+++ b/scripts/use-dev.ps1
@@ -4,7 +4,7 @@
 #
 
 # Put the stage2 output on the front of the path
-$stage2 = "$PSScriptRoot\..\artifacts\win10-x64\stage2\bin"
+$stage2 = "$PSScriptRoot\..\artifacts\win10-x64\stage2"
 if (Test-Path $stage2) {
     $splat = $env:PATH.Split(";")
     $stage2 = Convert-Path $stage2
diff --git a/src/Microsoft.DotNet.Cli.Utils/CommandResolution/AppBaseDllCommandResolver.cs b/src/Microsoft.DotNet.Cli.Utils/CommandResolution/AppBaseDllCommandResolver.cs
new file mode 100644
index 000000000..8d613038e
--- /dev/null
+++ b/src/Microsoft.DotNet.Cli.Utils/CommandResolution/AppBaseDllCommandResolver.cs
@@ -0,0 +1,34 @@
+using System.IO;
+using System.Linq;
+using Microsoft.DotNet.ProjectModel;
+using Microsoft.Extensions.PlatformAbstractions;
+
+namespace Microsoft.DotNet.Cli.Utils
+{
+    public class AppBaseDllCommandResolver : ICommandResolver
+    {
+        public CommandSpec Resolve(CommandResolverArguments commandResolverArguments)
+        {
+            if (commandResolverArguments.CommandName == null)
+            {
+                return null;
+            }
+            if (commandResolverArguments.CommandName.EndsWith(FileNameSuffixes.DotNet.DynamicLib))
+            {
+                var localPath = Path.Combine(PlatformServices.Default.Application.ApplicationBasePath,
+                    commandResolverArguments.CommandName);
+                if (File.Exists(localPath))
+                {
+                    var escapedArgs = ArgumentEscaper.EscapeAndConcatenateArgArrayForProcessStart(
+                        new[] { localPath }
+                        .Concat(commandResolverArguments.CommandArguments.OrEmptyIfNull()));
+                    return new CommandSpec(
+                        new Muxer().MuxerPath,
+                        escapedArgs,
+                        CommandResolutionStrategy.RootedPath);
+                }
+            }
+            return null;
+        }
+    }
+}
diff --git a/src/Microsoft.DotNet.Cli.Utils/CommandResolution/DefaultCommandResolverPolicy.cs b/src/Microsoft.DotNet.Cli.Utils/CommandResolution/DefaultCommandResolverPolicy.cs
index af4244158..b094663e2 100644
--- a/src/Microsoft.DotNet.Cli.Utils/CommandResolution/DefaultCommandResolverPolicy.cs
+++ b/src/Microsoft.DotNet.Cli.Utils/CommandResolution/DefaultCommandResolverPolicy.cs
@@ -38,11 +38,13 @@ namespace Microsoft.DotNet.Cli.Utils
         {
             var compositeCommandResolver = new CompositeCommandResolver();
 
+            compositeCommandResolver.AddCommandResolver(new MuxerCommandResolver());
             compositeCommandResolver.AddCommandResolver(new RootedCommandResolver());
             compositeCommandResolver.AddCommandResolver(new ProjectToolsCommandResolver(packagedCommandSpecFactory));
+            compositeCommandResolver.AddCommandResolver(new AppBaseDllCommandResolver());
             compositeCommandResolver.AddCommandResolver(new AppBaseCommandResolver(environment, platformCommandSpecFactory));
             compositeCommandResolver.AddCommandResolver(new PathCommandResolver(environment, platformCommandSpecFactory));
-            
+
             return compositeCommandResolver;
         }
     }
diff --git a/src/Microsoft.DotNet.Cli.Utils/CommandResolution/MuxerCommandResolver.cs b/src/Microsoft.DotNet.Cli.Utils/CommandResolution/MuxerCommandResolver.cs
new file mode 100644
index 000000000..132efca13
--- /dev/null
+++ b/src/Microsoft.DotNet.Cli.Utils/CommandResolution/MuxerCommandResolver.cs
@@ -0,0 +1,17 @@
+namespace Microsoft.DotNet.Cli.Utils
+{
+    public class MuxerCommandResolver : ICommandResolver
+    {
+        public CommandSpec Resolve(CommandResolverArguments commandResolverArguments)
+        {
+            if (commandResolverArguments.CommandName == Muxer.MuxerName)
+            {
+                var muxer = new Muxer();
+                var escapedArgs = ArgumentEscaper.EscapeAndConcatenateArgArrayForProcessStart(
+                    commandResolverArguments.CommandArguments.OrEmptyIfNull());
+                return new CommandSpec(muxer.MuxerPath, escapedArgs, CommandResolutionStrategy.RootedPath);
+            }
+            return null;
+        }
+    }
+}
diff --git a/src/Microsoft.DotNet.Cli.Utils/CommandResolution/PackagedCommandSpecFactory.cs b/src/Microsoft.DotNet.Cli.Utils/CommandResolution/PackagedCommandSpecFactory.cs
index c07f75e65..93268b293 100644
--- a/src/Microsoft.DotNet.Cli.Utils/CommandResolution/PackagedCommandSpecFactory.cs
+++ b/src/Microsoft.DotNet.Cli.Utils/CommandResolution/PackagedCommandSpecFactory.cs
@@ -105,7 +105,7 @@ namespace Microsoft.DotNet.Cli.Utils
             }
             else
             {
-                host = CoreHost.LocalHostExePath;
+                host = CoreHost.HostExePath;
             }
 
             arguments.Add(commandPath);
diff --git a/src/Microsoft.DotNet.Cli.Utils/CommandResolution/ScriptCommandResolverPolicy.cs b/src/Microsoft.DotNet.Cli.Utils/CommandResolution/ScriptCommandResolverPolicy.cs
index cb18e0f8e..4fa2b456f 100644
--- a/src/Microsoft.DotNet.Cli.Utils/CommandResolution/ScriptCommandResolverPolicy.cs
+++ b/src/Microsoft.DotNet.Cli.Utils/CommandResolution/ScriptCommandResolverPolicy.cs
@@ -37,10 +37,11 @@ namespace Microsoft.DotNet.Cli.Utils
             var compositeCommandResolver = new CompositeCommandResolver();
 
             compositeCommandResolver.AddCommandResolver(new RootedCommandResolver());
+            compositeCommandResolver.AddCommandResolver(new MuxerCommandResolver());
             compositeCommandResolver.AddCommandResolver(new ProjectPathCommandResolver(environment, platformCommandSpecFactory));
             compositeCommandResolver.AddCommandResolver(new AppBaseCommandResolver(environment, platformCommandSpecFactory));
             compositeCommandResolver.AddCommandResolver(new PathCommandResolver(environment, platformCommandSpecFactory));
-        
+
             return compositeCommandResolver;
         }
     }
diff --git a/src/Microsoft.DotNet.Cli.Utils/CoreHost.cs b/src/Microsoft.DotNet.Cli.Utils/CoreHost.cs
index 5808c5140..6e4640554 100644
--- a/src/Microsoft.DotNet.Cli.Utils/CoreHost.cs
+++ b/src/Microsoft.DotNet.Cli.Utils/CoreHost.cs
@@ -1,5 +1,6 @@
 using System;
 using System.IO;
+using System.Reflection;
 using Microsoft.Extensions.PlatformAbstractions;
 
 namespace Microsoft.DotNet.Cli.Utils
@@ -9,11 +10,6 @@ namespace Microsoft.DotNet.Cli.Utils
         internal static string _hostDir;
         internal static string _hostExePath;
 
-        /// <summary>
-        /// Gets the path to the version of corehost that was shipped with this command
-        /// </summary>
-        public static string LocalHostExePath => Path.Combine(PlatformServices.Default.Application.ApplicationBasePath, Constants.HostExecutableName);
-
         public static string HostExePath
         {
             get
@@ -32,8 +28,7 @@ namespace Microsoft.DotNet.Cli.Utils
             {
                 if (_hostDir == null)
                 {
-                    _hostDir = Path.GetDirectoryName(Env.GetCommandPath(
-                        Constants.HostExecutableName, new[] { string.Empty }));
+                    _hostDir = Path.GetDirectoryName(typeof(object).GetTypeInfo().Assembly.Location);
                 }
 
                 return _hostDir;
diff --git a/src/Microsoft.DotNet.Cli.Utils/Muxer.cs b/src/Microsoft.DotNet.Cli.Utils/Muxer.cs
index c279f3e5a..08e57b9d8 100644
--- a/src/Microsoft.DotNet.Cli.Utils/Muxer.cs
+++ b/src/Microsoft.DotNet.Cli.Utils/Muxer.cs
@@ -1,13 +1,15 @@
 using System;
 using System.IO;
 using Microsoft.Extensions.PlatformAbstractions;
+using System.Diagnostics;
+using System.Reflection;
 
 namespace Microsoft.DotNet.Cli.Utils
 {
     public class Muxer
     {
-            private static readonly string s_muxerName = "dotnet";
-        private static readonly string s_muxerFileName = s_muxerName + Constants.ExeSuffix;
+        public static readonly string MuxerName = "dotnet";
+        private static readonly string s_muxerFileName = MuxerName + Constants.ExeSuffix;
 
         private string _muxerPath;
 
@@ -15,6 +17,10 @@ namespace Microsoft.DotNet.Cli.Utils
         {
             get
             {
+                if (_muxerPath == null)
+                {
+                    throw new InvalidOperationException("Unable to locate dotnet multiplexer");
+                }
                 return _muxerPath;
             }
         }
@@ -29,8 +35,8 @@ namespace Microsoft.DotNet.Cli.Utils
 
         private bool TryResolveMuxerFromParentDirectories()
         {
-            var appBase = new DirectoryInfo(PlatformServices.Default.Application.ApplicationBasePath);
-            var muxerDir = appBase.Parent?.Parent;
+            var appBase = new FileInfo(typeof(object).GetTypeInfo().Assembly.Location);
+            var muxerDir = appBase.Directory?.Parent?.Parent?.Parent;
 
             if (muxerDir == null)
             {
@@ -50,7 +56,7 @@ namespace Microsoft.DotNet.Cli.Utils
 
         private bool TryResolverMuxerFromPath()
         {
-            var muxerPath = Env.GetCommandPath(s_muxerName, Constants.ExeSuffix);
+            var muxerPath = Env.GetCommandPath(MuxerName, Constants.ExeSuffix);
 
             if (muxerPath == null || !File.Exists(muxerPath))
             {
diff --git a/src/Microsoft.DotNet.ProjectModel/RuntimeConfig/RuntimeConfig.cs b/src/Microsoft.DotNet.ProjectModel/RuntimeConfig/RuntimeConfig.cs
index 0d2d7431d..5a8bf2136 100644
--- a/src/Microsoft.DotNet.ProjectModel/RuntimeConfig/RuntimeConfig.cs
+++ b/src/Microsoft.DotNet.ProjectModel/RuntimeConfig/RuntimeConfig.cs
@@ -24,6 +24,17 @@ namespace Microsoft.DotNet.ProjectModel
             IsPortable = Framework != null;
         }
 
+        public static bool IsApplicationPortable(string entryAssemblyPath)
+        {
+            var runtimeConfigFile = Path.ChangeExtension(entryAssemblyPath, FileNameSuffixes.RuntimeConfigJson);
+            if (File.Exists(runtimeConfigFile))
+            {
+                var runtimeConfig = new RuntimeConfig(runtimeConfigFile);
+                return runtimeConfig.IsPortable;
+            }
+            return false;
+        }
+
         private JObject OpenRuntimeConfig(string runtimeConfigPath)
         {
             return JObject.Parse(File.ReadAllText(runtimeConfigPath));
diff --git a/src/compilers/Program.cs b/src/compilers/Program.cs
new file mode 100644
index 000000000..4aa370b90
--- /dev/null
+++ b/src/compilers/Program.cs
@@ -0,0 +1,11 @@
+using System;
+
+namespace ConsoleApplication
+{
+    public class Program
+    {
+        public static void Main(string[] args)
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/compilers/project.json b/src/compilers/project.json
new file mode 100644
index 000000000..c53142656
--- /dev/null
+++ b/src/compilers/project.json
@@ -0,0 +1,26 @@
+{
+    "version": "1.0.0-*",
+    "compilationOptions": {
+        "emitEntryPoint": true
+    },
+
+    "dependencies": {
+      "Microsoft.NETCore.App": {
+        "type":"platform",
+        "version":"1.0.0-rc2-23928"
+      },
+      "Microsoft.CodeAnalysis.CSharp": "1.3.0-beta1-20160321-04",
+      "Microsoft.Net.Compilers.netcore": "1.3.0-beta1-20160321-04",
+      "Microsoft.Net.CSharp.Interactive.netcore": "1.3.0-beta1-20160321-04",
+      "Microsoft.FSharp.Compiler.netcore": "1.0.0-alpha-160318",
+      "Microsoft.DiaSymReader.Native": "1.3.3",
+    },
+    "frameworks": {
+      "netstandard1.5": {
+        "imports": [
+          "dnxcore50",
+          "portable-net45+win8"
+        ]
+      }
+    }
+}
\ No newline at end of file
diff --git a/src/dotnet/commands/dotnet-compile-csc/Program.cs b/src/dotnet/commands/dotnet-compile-csc/Program.cs
index 1f4386119..2413b1934 100644
--- a/src/dotnet/commands/dotnet-compile-csc/Program.cs
+++ b/src/dotnet/commands/dotnet-compile-csc/Program.cs
@@ -243,7 +243,7 @@ namespace Microsoft.DotNet.Tools.Compiler.Csc
         private static Command RunCsc(string[] cscArgs)
         {
             // Locate CoreRun
-            return Command.Create("csc", cscArgs);
+            return Command.Create("csc.dll", cscArgs);
         }
     }
 }
diff --git a/src/dotnet/project.json b/src/dotnet/project.json
index d63e3c662..6e0fc57d7 100644
--- a/src/dotnet/project.json
+++ b/src/dotnet/project.json
@@ -22,13 +22,8 @@
     },
     "NuGet.CommandLine.XPlat": "3.5.0-beta-1083",
     "Newtonsoft.Json": "7.0.1",
-    "Microsoft.CodeAnalysis.CSharp": "1.3.0-beta1-20160321-04",
-    "Microsoft.Net.Compilers.netcore": "1.3.0-beta1-20160321-04",
-    "Microsoft.Net.CSharp.Interactive.netcore": "1.3.0-beta1-20160321-04",
-    "Microsoft.FSharp.Compiler.netcore": "1.0.0-alpha-160318",
     "System.Text.Encoding.CodePages": "4.0.1-rc2-23928",
     "System.Diagnostics.FileVersionInfo": "4.0.0-rc2-23928",
-    "Microsoft.DiaSymReader.Native": "1.3.3",
     "System.CommandLine": "0.1.0-e160323-1",
     "Microsoft.DotNet.ProjectModel": "1.0.0-*",
     "Microsoft.DotNet.Compiler.Common": "1.0.0-*",
@@ -52,7 +47,10 @@
     "Microsoft.Extensions.Testing.Abstractions": "1.0.0-*",
     "Microsoft.NETCore.ConsoleHost": "1.0.0-rc2-23928",
     "Microsoft.NETCore.TestHost": "1.0.0-rc2-23928",
-    "Microsoft.NETCore.App": "1.0.0-rc2-23928",
+    "Microsoft.NETCore.App": {
+      "type":"platform",
+      "version":"1.0.0-rc2-23928"
+    },
     "System.Diagnostics.TraceSource": "4.0.0-rc2-23928",
     "System.Diagnostics.TextWriterTraceListener": "4.0.0-rc2-23928",
     "System.Resources.ReaderWriter": "4.0.0-rc2-23928",
@@ -64,9 +62,10 @@
     }
   },
   "frameworks": {
-    "netstandardapp1.5": {
+    "netstandard1.5": {
       "imports": [
         "dnxcore50",
+        "netstandardapp1.5",
         "portable-net45+win8"
       ]
     }
diff --git a/src/sharedframework/rid-fallbacks/windows.json b/src/sharedframework/rid-fallbacks/windows.json
deleted file mode 100644
index aff335e39..000000000
--- a/src/sharedframework/rid-fallbacks/windows.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "runtimes": {
-        "win10-x64": [ "win10", "win81-x64", "win81", "win8-x64", "win8", "win7-x64", "win7", "win-x64", "win", "any", "base" ],
-        "win10-x86": [ "win10", "win81-x86", "win81", "win8-x86", "win8", "win7-x86", "win7", "win-x86", "win", "any", "base" ],
-        "win81-x64": [ "win81", "win8-x64", "win8", "win7-x64", "win7", "win-x64", "win", "any", "base" ],
-        "win81-x86": [ "win81", "win8-x86", "win8", "win7-x86", "win7", "win-x86", "win", "any", "base" ],
-        "win8-x64": [ "win8", "win7-x64", "win7", "win-x64", "win", "any", "base" ],
-        "win8-x86": [ "win8", "win7-x86", "win7", "win-x86", "win", "any", "base" ],
-        "win7-x64": [ "win7", "win-x64", "win", "any", "base" ],
-        "win7-x86": [ "win7", "win-x86", "win", "any", "base" ]
-    }
-}
diff --git a/test/ArgumentForwardingTests/project.json b/test/ArgumentForwardingTests/project.json
index ffc696285..a810b011e 100644
--- a/test/ArgumentForwardingTests/project.json
+++ b/test/ArgumentForwardingTests/project.json
@@ -4,7 +4,7 @@
     "emitEntryPoint": true
   },
   "dependencies": {
-    "NETStandard.Library": "1.5.0-rc2-23928",
+    "Microsoft.NETCore.App": "1.0.0-rc2-23928",
     "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23928",
     "Microsoft.DotNet.ProjectModel": {
       "target": "project"
@@ -28,6 +28,6 @@
   },
   "testRunner": "xunit",
   "scripts": {
-    "precompile": "dotnet build ../ArgumentsReflector/project.json --framework netstandardapp1.5 --runtime %compile:RuntimeIdentifier% --output %compile:RuntimeOutputDir%"
+    "precompile": "dotnet publish ../ArgumentsReflector/project.json --framework netstandardapp1.5 --runtime %compile:RuntimeIdentifier% --output %compile:RuntimeOutputDir%"
   }
 }
diff --git a/test/ArgumentsReflector/project.json b/test/ArgumentsReflector/project.json
index 483f70e97..f34d997c5 100644
--- a/test/ArgumentsReflector/project.json
+++ b/test/ArgumentsReflector/project.json
@@ -4,7 +4,7 @@
     "emitEntryPoint": true
   },
   "dependencies": {
-    "NETStandard.Library": "1.5.0-rc2-23928"
+    "Microsoft.NETCore.App": "1.0.0-rc2-23928"
   },
   "frameworks": {
     "netstandardapp1.5": {
diff --git a/test/EndToEnd/project.json b/test/EndToEnd/project.json
index 4e7984e88..af419fa70 100644
--- a/test/EndToEnd/project.json
+++ b/test/EndToEnd/project.json
@@ -4,7 +4,7 @@
     "emitEntryPoint": true
   },
   "dependencies": {
-    "NETStandard.Library": "1.5.0-rc2-23928",
+    "Microsoft.NETCore.App": "1.0.0-rc2-23928",
     "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23928",
     "Microsoft.DotNet.ProjectModel": {
       "target": "project"
diff --git a/test/Microsoft.DotNet.Cli.Utils.Tests/GivenADefaultCommandResolver.cs b/test/Microsoft.DotNet.Cli.Utils.Tests/GivenADefaultCommandResolver.cs
index 5c1a5a5ec..23cc2c4fc 100644
--- a/test/Microsoft.DotNet.Cli.Utils.Tests/GivenADefaultCommandResolver.cs
+++ b/test/Microsoft.DotNet.Cli.Utils.Tests/GivenADefaultCommandResolver.cs
@@ -28,14 +28,16 @@ namespace Microsoft.DotNet.Cli.Utils.Tests
 
             var resolvers = defaultCommandResolver.OrderedCommandResolvers;
 
-            resolvers.Should().HaveCount(4);
+            resolvers.Should().HaveCount(6);
 
             resolvers.Select(r => r.GetType())
                 .Should()
                 .ContainInOrder(
                     new []{
+                        typeof(MuxerCommandResolver),
                         typeof(RootedCommandResolver),
                         typeof(ProjectToolsCommandResolver),
+                        typeof(AppBaseDllCommandResolver),
                         typeof(AppBaseCommandResolver),
                         typeof(PathCommandResolver)
                     });
diff --git a/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAScriptCommandResolver.cs b/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAScriptCommandResolver.cs
index 3dd23c6e5..b8c8d996f 100644
--- a/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAScriptCommandResolver.cs
+++ b/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAScriptCommandResolver.cs
@@ -28,13 +28,14 @@ namespace Microsoft.DotNet.Cli.Utils.Tests
 
             var resolvers = scriptCommandResolver.OrderedCommandResolvers;
 
-            resolvers.Should().HaveCount(4);
+            resolvers.Should().HaveCount(5);
 
             resolvers.Select(r => r.GetType())
                 .Should()
                 .ContainInOrder(
                     new []{
                         typeof(RootedCommandResolver),
+                        typeof(MuxerCommandResolver),
                         typeof(ProjectPathCommandResolver),
                         typeof(AppBaseCommandResolver),
                         typeof(PathCommandResolver)
diff --git a/test/Microsoft.DotNet.Cli.Utils.Tests/project.json b/test/Microsoft.DotNet.Cli.Utils.Tests/project.json
index 3e104633b..4eee75cf3 100644
--- a/test/Microsoft.DotNet.Cli.Utils.Tests/project.json
+++ b/test/Microsoft.DotNet.Cli.Utils.Tests/project.json
@@ -4,7 +4,7 @@
     "emitEntryPoint": true
   },
   "dependencies": {
-    "NETStandard.Library": "1.5.0-rc2-23928",
+    "Microsoft.NETCore.App": "1.0.0-rc2-23928",
     "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23928",
     "NuGet.Versioning": "3.5.0-beta-1083",
     "NuGet.Packaging": "3.5.0-beta-1083",
diff --git a/test/Microsoft.DotNet.Compiler.Common.Tests/project.json b/test/Microsoft.DotNet.Compiler.Common.Tests/project.json
index 3609af4c0..b75a07920 100644
--- a/test/Microsoft.DotNet.Compiler.Common.Tests/project.json
+++ b/test/Microsoft.DotNet.Compiler.Common.Tests/project.json
@@ -1,7 +1,7 @@
 {
   "version": "1.0.0-*",
   "dependencies": {
-    "NETStandard.Library": "1.5.0-rc2-23928",
+    "Microsoft.NETCore.App": "1.0.0-rc2-23928",
     "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23928",
     "Microsoft.DotNet.Tools.Tests.Utilities": {
       "target": "project"
diff --git a/test/Microsoft.DotNet.ProjectModel.Tests/project.json b/test/Microsoft.DotNet.ProjectModel.Tests/project.json
index 0b0d21a34..eb6394f9b 100644
--- a/test/Microsoft.DotNet.ProjectModel.Tests/project.json
+++ b/test/Microsoft.DotNet.ProjectModel.Tests/project.json
@@ -1,7 +1,7 @@
 {
   "version": "1.0.0-*",
   "dependencies": {
-    "NETStandard.Library": "1.5.0-rc2-23928",
+    "Microsoft.NETCore.App": "1.0.0-rc2-23928",
     "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23928",
     "Microsoft.DotNet.ProjectModel": {
       "target": "project"
diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/project.json b/test/Microsoft.DotNet.Tools.Tests.Utilities/project.json
index f6a90f095..af596a380 100644
--- a/test/Microsoft.DotNet.Tools.Tests.Utilities/project.json
+++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/project.json
@@ -5,7 +5,7 @@
     "keyFile": "../../tools/Key.snk"
   },
   "dependencies": {
-    "NETStandard.Library": "1.5.0-rc2-23928",
+    "Microsoft.NETCore.App": "1.0.0-rc2-23928",
     "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23928",
     "System.Collections.Immutable": "1.2.0-rc2-23928",
     "FluentAssertions": "4.0.0",
diff --git a/test/Microsoft.Extensions.DependencyModel.Tests/project.json b/test/Microsoft.Extensions.DependencyModel.Tests/project.json
index 36ab8ed2e..13da0d447 100644
--- a/test/Microsoft.Extensions.DependencyModel.Tests/project.json
+++ b/test/Microsoft.Extensions.DependencyModel.Tests/project.json
@@ -5,7 +5,7 @@
     "keyFile": "../../tools/Key.snk"
   },
   "dependencies": {
-    "NETStandard.Library": "1.5.0-rc2-23928",
+    "Microsoft.NETCore.App": "1.0.0-rc2-23928",
     "Microsoft.DotNet.Tools.Tests.Utilities": {
       "target": "project"
     },
diff --git a/test/ScriptExecutorTests/project.json b/test/ScriptExecutorTests/project.json
index a44bd9e55..132bc87de 100644
--- a/test/ScriptExecutorTests/project.json
+++ b/test/ScriptExecutorTests/project.json
@@ -1,7 +1,7 @@
 {
   "version": "1.0.0-*",
   "dependencies": {
-    "NETStandard.Library": "1.5.0-rc2-23928",
+    "Microsoft.NETCore.App": "1.0.0-rc2-23928",
     "Microsoft.DotNet.ProjectModel": {
       "target": "project"
     },
diff --git a/test/dotnet-build.Tests/project.json b/test/dotnet-build.Tests/project.json
index 51511fca1..d1696d856 100644
--- a/test/dotnet-build.Tests/project.json
+++ b/test/dotnet-build.Tests/project.json
@@ -1,7 +1,7 @@
 {
   "version": "1.0.0-*",
   "dependencies": {
-    "NETStandard.Library": "1.5.0-rc2-23928",
+    "Microsoft.NETCore.App": "1.0.0-rc2-23928",
     "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23928",
     "Microsoft.DotNet.Tools.Tests.Utilities": {
       "target": "project"
diff --git a/test/dotnet-compile.Tests/project.json b/test/dotnet-compile.Tests/project.json
index 67a711ee9..bb4c302e7 100644
--- a/test/dotnet-compile.Tests/project.json
+++ b/test/dotnet-compile.Tests/project.json
@@ -1,7 +1,7 @@
 {
   "version": "1.0.0-*",
   "dependencies": {
-    "NETStandard.Library": "1.5.0-rc2-23928",
+    "Microsoft.NETCore.App": "1.0.0-rc2-23928",
     "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23928",
     "Microsoft.DotNet.Tools.Tests.Utilities": {
       "target": "project"
diff --git a/test/dotnet-compile.UnitTests/project.json b/test/dotnet-compile.UnitTests/project.json
index 99dea1ac8..ee937fc6c 100644
--- a/test/dotnet-compile.UnitTests/project.json
+++ b/test/dotnet-compile.UnitTests/project.json
@@ -1,7 +1,6 @@
 {
   "version": "1.0.0-*",
   "dependencies": {
-    "NETStandard.Library": "1.5.0-rc2-23928",
     "Microsoft.DotNet.Cli.Utils": {
       "target": "project"
     },
diff --git a/test/dotnet-pack.Tests/project.json b/test/dotnet-pack.Tests/project.json
index bc8bb0a20..485b15a30 100644
--- a/test/dotnet-pack.Tests/project.json
+++ b/test/dotnet-pack.Tests/project.json
@@ -1,7 +1,7 @@
 {
   "version": "1.0.0-*",
   "dependencies": {
-    "NETStandard.Library": "1.5.0-rc2-23928",
+    "Microsoft.NETCore.App": "1.0.0-rc2-23928",
     "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23928",
     "System.IO.Compression.ZipFile": "4.0.1-rc2-23928",
     "Microsoft.DotNet.Tools.Tests.Utilities": {
diff --git a/test/dotnet-projectmodel-server.Tests/project.json b/test/dotnet-projectmodel-server.Tests/project.json
index 80255cffc..12c4d770e 100644
--- a/test/dotnet-projectmodel-server.Tests/project.json
+++ b/test/dotnet-projectmodel-server.Tests/project.json
@@ -1,5 +1,6 @@
 {
   "dependencies": {
+    "Microsoft.NETCore.App": "1.0.0-rc2-23925",
     "dotnet": {
       "target": "project"
     },
@@ -7,10 +8,10 @@
       "version": "4.0.0-rc2-23928",
       "exclude": "Compile"
     },
-    "Microsoft.DotNet.ProjectModel": {
+    "Microsoft.DotNet.Tools.Tests.Utilities": {
       "target": "project"
     },
-    "Microsoft.DotNet.Tools.Tests.Utilities": {
+    "Microsoft.DotNet.ProjectModel": {
       "target": "project"
     },
     "xunit": "2.1.0",
diff --git a/test/dotnet-publish.Tests/project.json b/test/dotnet-publish.Tests/project.json
index 97d476f6e..a79ced311 100644
--- a/test/dotnet-publish.Tests/project.json
+++ b/test/dotnet-publish.Tests/project.json
@@ -1,7 +1,7 @@
 {
   "version": "1.0.0-*",
   "dependencies": {
-    "NETStandard.Library": "1.5.0-rc2-23928",
+    "Microsoft.NETCore.App": "1.0.0-rc2-23928",
     "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23928",
     "Microsoft.DotNet.TestFramework": "1.0.0-*",
     "Microsoft.DotNet.Tools.Tests.Utilities": {
diff --git a/test/dotnet-resgen.Tests/project.json b/test/dotnet-resgen.Tests/project.json
index 6a38ba566..5c8dacdb9 100644
--- a/test/dotnet-resgen.Tests/project.json
+++ b/test/dotnet-resgen.Tests/project.json
@@ -1,7 +1,7 @@
 {
   "version": "1.0.0-*",
   "dependencies": {
-    "NETStandard.Library": "1.5.0-rc2-23928",
+    "Microsoft.NETCore.App": "1.0.0-rc2-23928",
     "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23928",
     "Microsoft.DotNet.Tools.Tests.Utilities": {
       "target": "project"
diff --git a/test/dotnet-run.Tests/project.json b/test/dotnet-run.Tests/project.json
index 78e867722..7a89082f7 100644
--- a/test/dotnet-run.Tests/project.json
+++ b/test/dotnet-run.Tests/project.json
@@ -1,7 +1,7 @@
 {
   "version": "1.0.0-*",
   "dependencies": {
-    "NETStandard.Library": "1.5.0-rc2-23928",
+    "Microsoft.NETCore.App": "1.0.0-rc2-23928",
     "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23928",
     "Microsoft.DotNet.Tools.Tests.Utilities": {
       "target": "project"
diff --git a/test/dotnet-test.Tests/project.json b/test/dotnet-test.Tests/project.json
index 35c1d731d..4c69fa5f2 100644
--- a/test/dotnet-test.Tests/project.json
+++ b/test/dotnet-test.Tests/project.json
@@ -1,8 +1,8 @@
 {
   "version": "1.0.0-*",
   "dependencies": {
+    "Microsoft.NETCore.App": "1.0.0-rc2-23928",
     "Newtonsoft.Json": "7.0.1",
-    "NETStandard.Library": "1.5.0-rc2-23928",
     "Microsoft.DotNet.Tools.Tests.Utilities": {
       "target": "project"
     },
diff --git a/test/dotnet-test.UnitTests/project.json b/test/dotnet-test.UnitTests/project.json
index 4b91ab53c..c0e7a672d 100644
--- a/test/dotnet-test.UnitTests/project.json
+++ b/test/dotnet-test.UnitTests/project.json
@@ -1,8 +1,8 @@
 {
   "version": "1.0.0-*",
   "dependencies": {
+    "Microsoft.NETCore.App": "1.0.0-rc2-23928",
     "Newtonsoft.Json": "7.0.1",
-    "NETStandard.Library": "1.5.0-rc2-23928",
     "dotnet": {
       "target": "project"
     },
diff --git a/test/dotnet.Tests/project.json b/test/dotnet.Tests/project.json
index ffe169ac1..47c97f606 100644
--- a/test/dotnet.Tests/project.json
+++ b/test/dotnet.Tests/project.json
@@ -1,7 +1,7 @@
 {
   "version": "1.0.0-*",
   "dependencies": {
-    "NETStandard.Library": "1.5.0-rc2-23928",
+    "Microsoft.NETCore.App": "1.0.0-rc2-23928",
     "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23928",
     "Microsoft.DotNet.Tools.Tests.Utilities": {
       "target": "project"