Merge branch 'rel/1.0.0' of https://github.com/dotnet/cli into kestrel-tests2

TestAssets/ProjectModelServer/DthTestProjects/src/EmptyNetCoreApp/Program.cs

@@ -0,0 +1,13 @@
+using System;
+
+namespace Misc.DthTestProjects.SimpleConsoleApp
+{
+    public class Program
+    {
+        public int Main(string[] args)
+        {
+            Console.WriteLine("Hello, world.");
+            return 0;
+        }
+    }
+}

TestAssets/ProjectModelServer/DthTestProjects/src/EmptyNetCoreApp/project.json

@@ -0,0 +1,15 @@
+{
+  "dependencies": {},
+  "frameworks": {
+    "netcoreapp1.0": {
+      "imports": "dnxcore50",
+      "dependencies": {
+        "Microsoft.NETCore.App": {
+          "type": "platform",
+          "version": "1.0.0-rc2-23931"
+        },
+        "Newtonsoft.Json": "8.0.3"
+      }
+    }
+  }
+}

TestAssets/TestProjects/DependencyContextValidator/DependencyContextValidator/Validator.cs

@@ -44,6 +44,7 @@ namespace Microsoft.Extensions.DependencyModel
                     var resolvedPaths = compilationLibrary.ResolveReferencePaths();
                     foreach (var resolvedPath in resolvedPaths)
                     {
+                        Console.WriteLine($"Compilation {compilationLibrary.Name}:{Path.GetFileName(resolvedPath)}");
                         if (!File.Exists(resolvedPath))
                         {
                             Error($"Compilataion library resolved to non existent path {resolvedPath}");
@@ -55,8 +56,10 @@ namespace Microsoft.Extensions.DependencyModel
             foreach (var runtimeLibrary in context.RuntimeLibraries)
             {
                 CheckMetadata(runtimeLibrary);
-                foreach (var assembly in runtimeLibrary.GetDefaultNativeAssets(context)) {}
+                foreach (var native in runtimeLibrary.GetDefaultNativeAssets(context)) {}
-                foreach (var native in runtimeLibrary.GetDefaultAssemblyNames(context)) {}
+                foreach (var assembly in runtimeLibrary.GetDefaultAssemblyNames(context)) {
+                    Console.WriteLine($"Runtime {runtimeLibrary.Name}:{assembly.Name}");
+                }
             }
 
             foreach (var native in context.GetDefaultNativeAssets()) {}

TestAssets/TestProjects/DependencyContextValidator/DependencyContextValidator/project.json

@@ -1,15 +1,19 @@
 {
   "version": "1.0.0-*",
   "dependencies": {
-    "NETStandard.Library": "1.5.0-rc2-23931",
     "Microsoft.Extensions.DependencyModel": {
       "target": "project",
       "version": "1.0.0-*"
     }
   },
   "frameworks": {
-    "netstandardapp1.5": {
+    "netstandard1.5": {
-      "imports": "dnxcore50"
+      "imports": "dnxcore50",
+      "dependencies": {
+        "NETStandard.Library": "1.5.0-rc2-23931",
+      }
+    },
+    "net451": {
     }
   }
 }

TestAssets/TestProjects/DependencyContextValidator/TestAppFullClr/Program.cs

@@ -0,0 +1,16 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+using System.Diagnostics;
+
+namespace TestApp
+{
+    public class Program
+    {
+        public static void Main(string[] args)
+        {
+            Microsoft.Extensions.DependencyModel.DependencyContextValidator.Validate(true);
+        }
+    }
+}

TestAssets/TestProjects/DependencyContextValidator/TestAppFullClr/project.json

@@ -0,0 +1,14 @@
+{
+  "version": "1.0.0-*",
+  "compilationOptions": {
+    "emitEntryPoint": true,
+    "preserveCompilationContext": true
+  },
+  "dependencies": {
+    "DependencyContextValidator": "1.0.0-*"
+  },
+  "frameworks": {
+    "net451": {
+    }
+  }
+}

TestAssets/TestProjects/DependencyContextValidator/TestAppPortable/Program.cs

@@ -0,0 +1,16 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+using System.Diagnostics;
+
+namespace TestApp
+{
+    public class Program
+    {
+        public static void Main(string[] args)
+        {
+            Microsoft.Extensions.DependencyModel.DependencyContextValidator.Validate(true);
+        }
+    }
+}

TestAssets/TestProjects/DependencyContextValidator/TestAppPortable/project.json

@@ -0,0 +1,19 @@
+{
+  "version": "1.0.0-*",
+  "compilationOptions": {
+    "emitEntryPoint": true,
+    "preserveCompilationContext": true
+  },
+  "dependencies": {
+    "Microsoft.NETCore.App": {
+        "type": "platform",
+        "version": "1.0.0-rc2-23931"
+    },
+    "DependencyContextValidator": "1.0.0-*"
+  },
+  "frameworks": {
+    "netstandard1.5": {
+      "imports" : "dnxcore50"
+    }
+  }
+}

TestAssets/TestProjects/DependencyContextValidator/TestAppPortableDeps/Program.cs

@@ -0,0 +1,16 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+using System.Diagnostics;
+
+namespace TestApp
+{
+    public class Program
+    {
+        public static void Main(string[] args)
+        {
+            Microsoft.Extensions.DependencyModel.DependencyContextValidator.Validate(true);
+        }
+    }
+}

TestAssets/TestProjects/DependencyContextValidator/TestAppPortableDeps/project.json

@@ -0,0 +1,18 @@
+{
+  "version": "1.0.0-*",
+  "compilationOptions": {
+    "emitEntryPoint": true,
+  },
+  "dependencies": {
+    "Microsoft.NETCore.App": {
+        "type": "platform",
+        "version": "1.0.0-rc2-23931"
+    },
+    "DependencyContextValidator": "1.0.0-*"
+  },
+  "frameworks": {
+    "netstandard1.5": {
+      "imports" : "dnxcore50"
+    }
+  }
+}

TestAssets/TestProjects/PortableTests/PortableAppCompilationContext/Program.cs

@@ -0,0 +1,12 @@
+using System;
+
+namespace PortableApp
+{
+    public static class Program
+    {
+        public static void Main(string[] args)
+        {
+            Console.WriteLine("Hello, World!");
+        }
+    }
+}

TestAssets/TestProjects/PortableTests/PortableAppCompilationContext/project.json

@@ -0,0 +1,21 @@
+{
+  "compilationOptions": {
+    "emitEntryPoint": true,
+    "preserveCompilationContext": true
+  },
+  "dependencies": {},
+  "frameworks": {
+    "netstandard1.5": {
+      "imports": [
+        "dnxcore50",
+        "portable-net45+win8"
+      ],
+      "dependencies": {
+        "Microsoft.NETCore.App": {
+          "type": "platform",
+          "version": "1.0.0-rc2-23931"
+        }
+      }
+    }
+  }
+}

packaging/windows/clisdk/bundle.wxs

@@ -4,6 +4,7 @@
      xmlns:swid="http://schemas.microsoft.com/wix/TagExtension"
      xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
   <?include "Variables.wxi" ?>
+  <?include "..\inc\crtvariables.wxi" ?>
 
   <Bundle Name="$(var.ProductName)" Manufacturer="$(var.Manufacturer)"
           Version="$(var.DisplayVersion)" UpgradeCode="$(var.UpgradeCode)"
@@ -32,6 +33,22 @@
     <util:DirectorySearch Path="[PreviousInstallFolder]" Variable="DOTNETHOME" After="PreviousInstallFolderSearch" Condition="PreviousInstallFolder" />
 
     <Chain DisableSystemRestore="yes" ParallelCache="yes">
+      <ExePackage Name="VC_redist.$(var.Platform).exe"
+                  DownloadUrl="$(var.Crt_DownloadUrl)"
+                  DetectCondition='(VCRedist_KeyExists AND VCRedist_KeyValue &gt;= "v14.0.23506.00")'
+                  InstallCommand="/q /norestart"
+                  PerMachine="yes"
+                  Vital="yes"
+                  Permanent="yes"
+                  Compressed="no">
+        <RemotePayload CertificatePublicKey="$(var.Crt_CertificatePublicKey)" 
+                       CertificateThumbprint="$(var.Crt_CertificateThumbprint)" 
+                       Description="$(var.Crt_Description)" 
+                       Hash="$(var.Crt_Hash)" 
+                       ProductName="$(var.Crt_ProductName)" 
+                       Size="$(var.Crt_Size)" 
+                       Version="$(var.Crt_Version)" />
+      </ExePackage>
       <MsiPackage SourceFile="$(var.CLISDKMsiSourcePath)">
         <MsiProperty Name="DOTNETHOME" Value="[DOTNETHOME]" />
       </MsiPackage>
@@ -45,6 +62,23 @@
   </Bundle>
 
   <Fragment>
+    <util:RegistrySearch
+       Id="VCRedist_KeyExists"
+       Variable="VCRedist_KeyExists"
+       Root="HKLM"
+       Key="SOFTWARE\Microsoft\VisualStudio\14.0\VC\Runtimes\$(var.Platform)"
+       Value="Version"
+       Win64="no"
+       Result="exists" />
+    <util:RegistrySearch
+       Id="VCRedist_KeyValue"
+       Variable="VCRedist_KeyValue"
+       Root="HKLM"
+       Key="SOFTWARE\Microsoft\VisualStudio\14.0\VC\Runtimes\$(var.Platform)"
+       Value="Version"
+       Win64="no"
+       Result="value" />
+
     <PayloadGroup Id="DotnetCoreBAPayloads">
       <Payload Name="thm.xml" Compressed="yes" SourceFile="bundle.thm" />
       <Payload Name="thm.wxl" Compressed="yes" SourceFile="bundle.wxl" />

packaging/windows/inc/crtvariables.wxi

@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<Include xmlns="http://schemas.microsoft.com/wix/2006/wi">
+
+  <!-- These values were generated by running 'heat payload' against the CRTs downloaded from the fwlinks -->
+
+  <?define Crt_CertificatePublicKey="52868DFCA6E3AF2632389E6C1EE7D0468D3797D0"?>
+  <?define Crt_CertificateThumbprint="3BDA323E552DB1FDE5F4FBEE75D6D5B2B187EEDC"?>
+  <?define Crt_Description="Microsoft Visual C++ 2015 Redistributable ($(var.Platform)) - 14.0.23506"?>
+  <?define Crt_ProductName="Microsoft Visual C++ 2015 Redistributable ($(var.Platform)) - 14.0.23506"?>
+  <?define Crt_Version="14.0.23506.0"?>
+  <?define Crt_VersionRegistyKeyValue="v14.0.23506.00"?>
+
+  <?if $(var.Platform)=x86?>
+  <?define Crt_DownloadUrl="http://go.microsoft.com/fwlink/?LinkID=615459&amp;clcid=0x409"?>
+  <?define Crt_Hash="17B381D3ADB22F00E4AB47CBD91CE0A5B1CCBC70"?>
+  <?define Crt_Size="13977352"?>
+  <?elseif $(var.Platform)=x64?>
+  <?define Crt_DownloadUrl="http://go.microsoft.com/fwlink/?LinkID=615460&amp;clcid=0x409"?>
+  <?define Crt_Hash="9A19A51D1F40CD5CD5ECB6E4E4F978F18DA8212A"?>
+  <?define Crt_Size="14773216"?>
+  <?else?>
+  <?error Invalid Platform ($(var.Platform))?>
+  <?endif?>  
+
+</Include>

packaging/windows/sharedframework/bundle.wxs

@@ -4,6 +4,7 @@
      xmlns:swid="http://schemas.microsoft.com/wix/TagExtension"
      xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
   <?include "Variables.wxi" ?>
+  <?include "..\inc\crtvariables.wxi" ?>
 
   <Bundle Name="$(var.ProductName)" Manufacturer="$(var.Manufacturer)"
           Version="$(var.DisplayVersion)" UpgradeCode="$(var.UpgradeCode)"
@@ -28,6 +29,22 @@
     <util:DirectorySearch Path="[PreviousInstallFolder]" Variable="DOTNETHOME" After="PreviousInstallFolderSearch" Condition="PreviousInstallFolder" />
 
     <Chain DisableSystemRestore="yes" ParallelCache="yes">
+      <ExePackage Name="VC_redist.$(var.Platform).exe"
+                  DownloadUrl="$(var.Crt_DownloadUrl)"
+                  DetectCondition='(VCRedist_KeyExists AND VCRedist_KeyValue &gt;= "v14.0.23506.00")'
+                  InstallCommand="/q /norestart"
+                  PerMachine="yes"
+                  Vital="yes"
+                  Permanent="yes"
+                  Compressed="no">
+        <RemotePayload CertificatePublicKey="$(var.Crt_CertificatePublicKey)" 
+                       CertificateThumbprint="$(var.Crt_CertificateThumbprint)" 
+                       Description="$(var.Crt_Description)" 
+                       Hash="$(var.Crt_Hash)" 
+                       ProductName="$(var.Crt_ProductName)" 
+                       Size="$(var.Crt_Size)" 
+                       Version="$(var.Crt_Version)" />
+      </ExePackage>
       <MsiPackage SourceFile="$(var.SharedFXMsiSourcePath)">
         <MsiProperty Name="DOTNETHOME" Value="[DOTNETHOME]" />
       </MsiPackage>
@@ -38,6 +55,23 @@
   </Bundle>
 
   <Fragment>
+    <util:RegistrySearch
+       Id="VCRedist_KeyExists"
+       Variable="VCRedist_KeyExists"
+       Root="HKLM"
+       Key="SOFTWARE\Microsoft\VisualStudio\14.0\VC\Runtimes\$(var.Platform)"
+       Value="Version"
+       Win64="no"
+       Result="exists" />
+    <util:RegistrySearch
+       Id="VCRedist_KeyValue"
+       Variable="VCRedist_KeyValue"
+       Root="HKLM"
+       Key="SOFTWARE\Microsoft\VisualStudio\14.0\VC\Runtimes\$(var.Platform)"
+       Value="Version"
+       Win64="no"
+       Result="value" />
+
     <PayloadGroup Id="DotnetCoreBAPayloads">
       <Payload Name="thm.xml" Compressed="yes" SourceFile="bundle.thm" />
       <Payload Name="thm.wxl" Compressed="yes" SourceFile="bundle.wxl" />

scripts/dotnet-cli-build/CompileTargets.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using System.Runtime.InteropServices;
 using Microsoft.DotNet.Cli.Build.Framework;
 using Microsoft.Extensions.PlatformAbstractions;
@@ -9,6 +10,8 @@ using static Microsoft.DotNet.Cli.Build.FS;
 using static Microsoft.DotNet.Cli.Build.Framework.BuildHelpers;
 using System.Text.RegularExpressions;
 using System.Reflection.PortableExecutable;
+using Newtonsoft.Json.Linq;
+using Newtonsoft.Json;
 
 namespace Microsoft.DotNet.Cli.Build
 {
@@ -243,6 +246,9 @@ namespace Microsoft.DotNet.Cli.Build
                 outputDir: Dirs.Stage1);
 
             CleanOutputDir(Path.Combine(Dirs.Stage1, "sdk"));
+            FS.CopyRecursive(Dirs.Stage1, Dirs.Stage1Symbols);
+
+            RemovePdbsFromDir(Path.Combine(Dirs.Stage1, "sdk"));
 
             return result;
         }
@@ -293,13 +299,23 @@ namespace Microsoft.DotNet.Cli.Build
             }
 
             CleanOutputDir(Path.Combine(Dirs.Stage2, "sdk"));
+            FS.CopyRecursive(Dirs.Stage2, Dirs.Stage2Symbols);
+
+            RemovePdbsFromDir(Path.Combine(Dirs.Stage2, "sdk"));
 
             return c.Success();
         }
 
         private static void CleanOutputDir(string directory)
         {
-            FS.RmFilesInDirRecursive(directory, "vbc.exe");
+            foreach (var file in FilesToClean)
+            {
+                FS.RmFilesInDirRecursive(directory, file);
+            }
+        }
+
+        private static void RemovePdbsFromDir(string directory)
+        {
             FS.RmFilesInDirRecursive(directory, "*.pdb");
         }
 
@@ -352,6 +368,7 @@ namespace Microsoft.DotNet.Cli.Build
             // Rename the .deps file
             var destinationDeps = Path.Combine(SharedFrameworkNameAndVersionRoot, $"{SharedFrameworkName}.deps.json");
             File.Move(Path.Combine(SharedFrameworkNameAndVersionRoot, "framework.deps.json"), destinationDeps);
+            ChangeEntryPointLibraryName(destinationDeps, null);
 
             // Generate RID fallback graph
             string runtimeGraphGeneratorRuntime = null;
@@ -468,6 +485,7 @@ namespace Microsoft.DotNet.Cli.Build
                     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"));
+                    ChangeEntryPointLibraryName(Path.Combine(outputDir, binaryToCorehostify + ".deps.json"), binaryToCorehostify);
                 }
                 catch (Exception ex)
                 {
@@ -577,6 +595,42 @@ namespace Microsoft.DotNet.Cli.Build
             return c.Success();
         }
 
+        private static void ChangeEntryPointLibraryName(string depsFile, string newName)
+        {
+            JToken deps;
+            using (var file = File.OpenText(depsFile))
+            using (JsonTextReader reader = new JsonTextReader(file))
+            {
+                deps = JObject.ReadFrom(reader);
+            }
+
+            var target = deps["targets"][deps["runtimeTarget"]["name"].Value<string>()];
+            var library = target.Children<JProperty>().First();
+            var version = library.Name.Substring(library.Name.IndexOf('/') + 1);
+            if (newName == null)
+            {
+                library.Remove();
+            }
+            else
+            {
+                library.Replace(new JProperty(newName + '/' + version, library.Value));
+            }
+            library = deps["libraries"].Children<JProperty>().First();
+            if (newName == null)
+            {
+                library.Remove();
+            }
+            else
+            {
+                library.Replace(new JProperty(newName + '/' + version, library.Value));
+            }
+            using (var file = File.CreateText(depsFile))
+            using (var writer = new JsonTextWriter(file) { Formatting = Formatting.Indented})
+            {
+                deps.WriteTo(writer);
+            }
+        }
+
         private static void DeleteMainPublishOutput(string path, string name)
         {
             File.Delete(Path.Combine(path, $"{name}{Constants.ExeSuffix}"));

scripts/dotnet-cli-build/MsiTargets.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.IO.Compression;
+using System.Net.Http;
 using System.Runtime.InteropServices;
 using Microsoft.DotNet.Cli.Build.Framework;
 using Microsoft.Extensions.PlatformAbstractions;
@@ -14,11 +15,13 @@ namespace Microsoft.DotNet.Cli.Build
     {
         private const string ENGINE = "engine.exe";
 
+        private const string WixVersion = "3.10.2";
+
         private static string WixRoot
         {
             get
             {
-                return Path.Combine(Dirs.Output, "WixTools");
+                return Path.Combine(Dirs.Output, $"WixTools.{WixVersion}");
             }
         }
 
@@ -54,14 +57,24 @@ namespace Microsoft.DotNet.Cli.Build
             Directory.CreateDirectory(WixRoot);
 
             c.Info("Downloading WixTools..");
-            // Download Wix version 3.10.2 - https://wix.codeplex.com/releases/view/619491
+
-            Cmd("powershell", "-NoProfile", "-NoLogo",
+            DownloadFile($"https://dotnetcli.blob.core.windows.net/build/wix/wix.{WixVersion}.zip", Path.Combine(WixRoot, "WixTools.zip"));
-                $"Invoke-WebRequest -Uri https://wix.codeplex.com/downloads/get/1540241 -Method Get -OutFile {WixRoot}\\WixTools.zip")
-                    .Execute()
-                    .EnsureSuccessful();
 
             c.Info("Extracting WixTools..");
-            ZipFile.ExtractToDirectory($"{WixRoot}\\WixTools.zip", WixRoot);
+            ZipFile.ExtractToDirectory(Path.Combine(WixRoot, "WixTools.zip"), WixRoot);
+        }
+
+        private static void DownloadFile(string uri, string destinationPath)
+        {
+            using (var httpClient = new HttpClient())
+            {
+                var getTask = httpClient.GetStreamAsync(uri);
+
+                using (var outStream = File.OpenWrite(destinationPath))
+                {
+                    getTask.Result.CopyTo(outStream);
+                }
+            }
         }
 
         [Target]

scripts/dotnet-cli-build/PackageTargets.cs

@@ -175,6 +175,8 @@ namespace Microsoft.DotNet.Cli.Build
             CreateZipFromDirectory(c.BuildContext.Get<string>("CombinedFrameworkSDKHostRoot"), c.BuildContext.Get<string>("CombinedFrameworkSDKHostCompressedFile"));
             CreateZipFromDirectory(c.BuildContext.Get<string>("CombinedFrameworkHostRoot"), c.BuildContext.Get<string>("CombinedFrameworkHostCompressedFile"));
 
+            CreateZipFromDirectory(Path.Combine(Dirs.Stage2Symbols, "sdk"), c.BuildContext.Get<string>("SdkSymbolsCompressedFile"));
+
             return c.Success();
         }
 
@@ -185,6 +187,8 @@ namespace Microsoft.DotNet.Cli.Build
             CreateTarBallFromDirectory(c.BuildContext.Get<string>("CombinedFrameworkSDKHostRoot"), c.BuildContext.Get<string>("CombinedFrameworkSDKHostCompressedFile"));
             CreateTarBallFromDirectory(c.BuildContext.Get<string>("CombinedFrameworkHostRoot"), c.BuildContext.Get<string>("CombinedFrameworkHostCompressedFile"));
 
+            CreateTarBallFromDirectory(Path.Combine(Dirs.Stage2Symbols, "sdk"), c.BuildContext.Get<string>("SdkSymbolsCompressedFile"));
+
             return c.Success();
         }
 

scripts/dotnet-cli-build/PrepareTargets.cs

@@ -130,6 +130,7 @@ namespace Microsoft.DotNet.Cli.Build
             AddInstallerArtifactToContext(c, "dotnet-sharedframework", "SharedFramework", sharedFrameworkVersion);
             AddInstallerArtifactToContext(c, "dotnet-dev", "CombinedFrameworkSDKHost", cliVersion);
             AddInstallerArtifactToContext(c, "dotnet", "CombinedFrameworkHost", sharedFrameworkVersion);
+            AddInstallerArtifactToContext(c, "dotnet-sdk-debug", "SdkSymbols", cliVersion);
 
             return c.Success();
         }
@@ -205,8 +206,8 @@ namespace Microsoft.DotNet.Cli.Build
         {
             var dotnet = DotNetCli.Stage0;
 
-            dotnet.Restore("--verbosity", "verbose").WorkingDirectory(Path.Combine(c.BuildContext.BuildDirectory, "src")).Execute().EnsureSuccessful();
+            dotnet.Restore("--verbosity", "verbose", "--disable-parallel", "--infer-runtimes").WorkingDirectory(Path.Combine(c.BuildContext.BuildDirectory, "src")).Execute().EnsureSuccessful();
-            dotnet.Restore("--verbosity", "verbose", "--infer-runtimes").WorkingDirectory(Path.Combine(c.BuildContext.BuildDirectory, "tools")).Execute().EnsureSuccessful();
+            dotnet.Restore("--verbosity", "verbose", "--disable-parallel", "--infer-runtimes").WorkingDirectory(Path.Combine(c.BuildContext.BuildDirectory, "tools")).Execute().EnsureSuccessful();
 
             return c.Success();
         }

scripts/dotnet-cli-build/PublishTargets.cs

@@ -68,7 +68,8 @@ namespace Microsoft.DotNet.Cli.Build
 
         [Target(
             nameof(PublishTargets.PublishCombinedHostFrameworkArchiveToAzure),
-            nameof(PublishTargets.PublishCombinedHostFrameworkSdkArchiveToAzure))]
+            nameof(PublishTargets.PublishCombinedHostFrameworkSdkArchiveToAzure),
+            nameof(PublishTargets.PublishSDKSymbolsArchiveToAzure))]
         public static BuildTargetResult PublishArchivesToAzure(BuildTargetContext c) => c.Success();
 
         [Target(
@@ -176,6 +177,17 @@ namespace Microsoft.DotNet.Cli.Build
             return c.Success();
         }
 
+        [Target]
+        public static BuildTargetResult PublishSDKSymbolsArchiveToAzure(BuildTargetContext c)
+        {
+            var version = CliNuGetVersion;
+            var archiveFile = c.BuildContext.Get<string>("SdkSymbolsCompressedFile");
+
+            AzurePublisherTool.PublishArchiveAndLatest(archiveFile, Channel, version);
+
+            return c.Success();
+        }
+
         [Target]
         public static BuildTargetResult PublishCombinedHostFrameworkArchiveToAzure(BuildTargetContext c)
         {

scripts/dotnet-cli-build/Utils/Dirs.cs

@@ -17,8 +17,10 @@ namespace Microsoft.DotNet.Cli.Build
         public static readonly string Packages = Path.Combine(Output, "packages");
         public static readonly string Stage1 = Path.Combine(Output, "stage1");
         public static readonly string Stage1Compilation = Path.Combine(Output, "stage1compilation");
+        public static readonly string Stage1Symbols = Path.Combine(Output, "stage1symbols");
         public static readonly string Stage2 = Path.Combine(Output, "stage2");
         public static readonly string Stage2Compilation = Path.Combine(Output, "stage2compilation");
+        public static readonly string Stage2Symbols = Path.Combine(Output, "stage2symbols");
         public static readonly string Corehost = Path.Combine(Output, "corehost");
         public static readonly string TestOutput = Path.Combine(Output, "tests");
         public static readonly string TestArtifacts = Path.Combine(TestOutput, "artifacts");

scripts/dotnet-cli-build/Utils/FS.cs

@@ -111,7 +111,7 @@ namespace Microsoft.DotNet.Cli.Build
                 if (string.Equals(Path.GetFileName(candidate), "bin") ||
                     string.Equals(Path.GetFileName(candidate), "obj"))
                 {
-                    Directory.Delete(candidate, recursive: true);
+                    Utils.DeleteDirectory(candidate);
                 }
                 else
                 {

scripts/dotnet-cli-build/Utils/Utils.cs

@@ -96,8 +96,24 @@ namespace Microsoft.DotNet.Cli.Build
                     File.SetAttributes(file, FileAttributes.Normal);
                     File.Delete(file);
                 }
-                System.Threading.Thread.Sleep(1); 
+                var retry = 5;
-                Directory.Delete(path, true);
+                while (retry >= 0)
+                {
+                    try
+                    {
+                        Directory.Delete(path, true);
+                        return;
+                    }
+                    catch (IOException ex)
+                    {
+                        if (retry == 0)
+                        {
+                            throw;
+                        }
+                        System.Threading.Thread.Sleep(200);
+                        retry--;
+                    }
+                }
             }
         }
 

scripts/update-dependencies/BuildContextProperties.cs

@@ -0,0 +1,30 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System.Collections.Generic;
+using Microsoft.DotNet.Cli.Build.Framework;
+
+namespace Microsoft.DotNet.Scripts
+{
+    public static class BuildContextProperties
+    {
+        public static List<DependencyInfo> GetDependencyInfos(this BuildTargetContext c)
+        {
+            const string propertyName = "DependencyInfos";
+
+            List<DependencyInfo> dependencyInfos;
+            object dependencyInfosObj;
+            if (c.BuildContext.Properties.TryGetValue(propertyName, out dependencyInfosObj))
+            {
+                dependencyInfos = (List<DependencyInfo>)dependencyInfosObj;
+            }
+            else
+            {
+                dependencyInfos = new List<DependencyInfo>();
+                c.BuildContext[propertyName] = dependencyInfos;
+            }
+
+            return dependencyInfos;
+        }
+    }
+}

scripts/update-dependencies/Config.cs

@@ -23,6 +23,7 @@ namespace Microsoft.DotNet.Scripts
     /// GITHUB_UPSTREAM_OWNER - The owner of the GitHub base repo to create the PR to. (ex. "dotnet")
     /// GITHUB_PROJECT - The repo name under the ORIGIN and UPSTREAM owners. (ex. "cli")
     /// GITHUB_UPSTREAM_BRANCH - The branch in the GitHub base repo to create the PR to. (ex. "rel/1.0.0")
+    /// GITHUB_PULL_REQUEST_NOTIFICATIONS - A semi-colon ';' separated list of GitHub users to notify on the PR.
     /// </remarks>
     public class Config
     {
@@ -36,6 +37,7 @@ namespace Microsoft.DotNet.Scripts
         public string GitHubUpstreamOwner { get; set; }
         public string GitHubProject { get; set; }
         public string GitHubUpstreamBranch { get; set; }
+        public string[] GitHubPullRequestNotifications { get; set; }
 
         private static Config Read()
         {
@@ -52,18 +54,20 @@ namespace Microsoft.DotNet.Scripts
                 GitHubUpstreamOwner = GetEnvironmentVariable("GITHUB_UPSTREAM_OWNER", "dotnet"),
                 GitHubProject = GetEnvironmentVariable("GITHUB_PROJECT", "cli"),
                 GitHubUpstreamBranch = GetEnvironmentVariable("GITHUB_UPSTREAM_BRANCH", "rel/1.0.0"),
+                GitHubPullRequestNotifications = GetEnvironmentVariable("GITHUB_PULL_REQUEST_NOTIFICATIONS", "")
+                    .Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries)
             };
         }
 
         private static string GetEnvironmentVariable(string name, string defaultValue = null)
         {
             string value = Environment.GetEnvironmentVariable(name);
-            if (string.IsNullOrEmpty(value))
+            if (value == null)
             {
                 value = defaultValue;
             }
 
-            if (string.IsNullOrEmpty(value))
+            if (value == null)
             {
                 throw new BuildFailureException($"Can't find environment variable '{name}'.");
             }

scripts/update-dependencies/DependencyInfo.cs

@@ -0,0 +1,15 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+namespace Microsoft.DotNet.Scripts
+{
+    public class DependencyInfo
+    {
+        public string Name { get; set; }
+        public string IdPattern { get; set; }
+        public string IdExclusionPattern { get; set; }
+        public string NewReleaseVersion { get; set; }
+
+        public bool IsUpdated { get; set; }
+    }
+}

scripts/update-dependencies/PushPRTargets.cs

@@ -2,6 +2,7 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using System;
+using System.Linq;
 using Microsoft.DotNet.Cli.Build.Framework;
 using Octokit;
 
@@ -14,8 +15,6 @@ namespace Microsoft.DotNet.Scripts
     /// </summary>
     public static class PushPRTargets
     {
-        private const string PullRequestTitle = "Updating dependencies from last known good builds";
-
         private static readonly Config s_config = Config.Instance;
 
         [Target(nameof(CommitChanges), nameof(CreatePR))]
@@ -28,14 +27,31 @@ namespace Microsoft.DotNet.Scripts
         [Target]
         public static BuildTargetResult CommitChanges(BuildTargetContext c)
         {
-            Cmd("git", "add", ".")
+            CommandResult statusResult = Cmd("git", "status", "--porcelain")
-                .Execute()
+                .CaptureStdOut()
-                .EnsureSuccessful();
+                .Execute();
+            statusResult.EnsureSuccessful();
+
+            bool hasModifiedFiles = !string.IsNullOrWhiteSpace(statusResult.StdOut);
+            bool hasUpdatedDependencies = c.GetDependencyInfos().Where(d => d.IsUpdated).Any();
+
+            if (hasModifiedFiles != hasUpdatedDependencies)
+            {
+                return c.Failed($"'git status' does not match DependencyInfo information. Git has modified files: {hasModifiedFiles}. DependencyInfo is updated: {hasUpdatedDependencies}.");
+            }
+
+            if (!hasUpdatedDependencies)
+            {
+                c.Warn("Dependencies are currently up to date");
+                return c.Success();
+            }
 
             string userName = s_config.UserName;
             string email = s_config.Email;
 
-            Cmd("git", "commit", "-m", PullRequestTitle, "--author", $"{userName} <{email}>")
+            string commitMessage = GetCommitMessage(c);
+
+            Cmd("git", "commit", "-a", "-m", commitMessage, "--author", $"{userName} <{email}>")
                 .EnvironmentVariable("GIT_COMMITTER_NAME", userName)
                 .EnvironmentVariable("GIT_COMMITTER_EMAIL", email)
                 .Execute()
@@ -79,12 +95,19 @@ namespace Microsoft.DotNet.Scripts
         public static BuildTargetResult CreatePR(BuildTargetContext c)
         {
             string remoteBranchName = c.GetRemoteBranchName();
+            string commitMessage = c.GetCommitMessage();
 
             NewPullRequest prInfo = new NewPullRequest(
-                PullRequestTitle,
+                commitMessage,
                 s_config.GitHubOriginOwner + ":" + remoteBranchName,
                 s_config.GitHubUpstreamBranch);
 
+            string[] prNotifications = s_config.GitHubPullRequestNotifications;
+            if (prNotifications.Length > 0)
+            {
+                prInfo.Body = $"/cc @{string.Join(" @", prNotifications)}";
+            }
+
             GitHubClient gitHub = new GitHubClient(new ProductHeaderValue("dotnetDependencyUpdater"));
 
             gitHub.Credentials = new Credentials(s_config.Password);
@@ -104,5 +127,36 @@ namespace Microsoft.DotNet.Scripts
         {
             c.BuildContext["RemoteBranchName"] = value;
         }
+
+        private static string GetCommitMessage(this BuildTargetContext c)
+        {
+            const string commitMessagePropertyName = "CommitMessage";
+
+            string message;
+            object messageObject;
+            if (c.BuildContext.Properties.TryGetValue(commitMessagePropertyName, out messageObject))
+            {
+                message = (string)messageObject;
+            }
+            else
+            {
+                DependencyInfo[] updatedDependencies = c.GetDependencyInfos()
+                    .Where(d => d.IsUpdated)
+                    .ToArray();
+
+                string updatedDependencyNames = string.Join(", ", updatedDependencies.Select(d => d.Name));
+                string updatedDependencyVersions = string.Join(", ", updatedDependencies.Select(d => d.NewReleaseVersion));
+
+                message = $"Updating {updatedDependencyNames} to {updatedDependencyVersions}";
+                if (updatedDependencies.Count() > 1)
+                {
+                    message += " respectively";
+                }
+
+                c.BuildContext[commitMessagePropertyName] = message;
+            }
+
+            return message;
+        }
     }
 }

scripts/update-dependencies/UpdateFilesTargets.cs

@@ -34,7 +34,7 @@ namespace Microsoft.DotNet.Scripts
             const string coreFxIdPattern = @"^(?i)((System\..*)|(NETStandard\.Library)|(Microsoft\.CSharp)|(Microsoft\.NETCore.*)|(Microsoft\.TargetingPack\.Private\.(CoreCLR|NETNative))|(Microsoft\.Win32\..*)|(Microsoft\.VisualBasic))$";
             const string coreFxIdExclusionPattern = @"System.CommandLine";
 
-            List<DependencyInfo> dependencyInfos = c.GetDependencyInfo();
+            List<DependencyInfo> dependencyInfos = c.GetDependencyInfos();
             dependencyInfos.Add(new DependencyInfo()
             {
                 Name = "CoreFx",
@@ -46,26 +46,7 @@ namespace Microsoft.DotNet.Scripts
             return c.Success();
         }
 
-        private static List<DependencyInfo> GetDependencyInfo(this BuildTargetContext c)
+        [Target(nameof(ReplaceProjectJson), nameof(ReplaceCrossGen), nameof(ReplaceCoreHostPackaging))]
-        {
-            const string propertyName = "DependencyInfo";
-
-            List<DependencyInfo> dependencyInfos;
-            object dependencyInfosObj;
-            if (c.BuildContext.Properties.TryGetValue(propertyName, out dependencyInfosObj))
-            {
-                dependencyInfos = (List<DependencyInfo>)dependencyInfosObj;
-            }
-            else
-            {
-                dependencyInfos = new List<DependencyInfo>();
-                c.BuildContext[propertyName] = dependencyInfos;
-            }
-
-            return dependencyInfos;
-        }
-
-        [Target(nameof(ReplaceProjectJson), nameof(ReplaceCrossGen))]
         public static BuildTargetResult ReplaceVersions(BuildTargetContext c) => c.Success();
 
         /// <summary>
@@ -74,7 +55,7 @@ namespace Microsoft.DotNet.Scripts
         [Target]
         public static BuildTargetResult ReplaceProjectJson(BuildTargetContext c)
         {
-            List<DependencyInfo> dependencyInfos = c.GetDependencyInfo();
+            List<DependencyInfo> dependencyInfos = c.GetDependencyInfos();
 
             IEnumerable<string> projectJsonFiles = Enumerable.Union(
                 Directory.GetFiles(Dirs.RepoRoot, "project.json", SearchOption.AllDirectories),
@@ -157,6 +138,9 @@ namespace Microsoft.DotNet.Scripts
                                 dependencyProperty.Value = newVersion;
                             }
 
+                            // mark the DependencyInfo as updated so we can tell which dependencies were updated
+                            dependencyInfo.IsUpdated = true;
+
                             return true;
                         }
                     }
@@ -194,40 +178,68 @@ namespace Microsoft.DotNet.Scripts
                 .SelectMany(o => o.Children<JProperty>());
         }
 
-        private class DependencyInfo
-        {
-            public string Name { get; set; }
-            public string IdPattern { get; set; }
-            public string IdExclusionPattern { get; set; }
-            public string NewReleaseVersion { get; set; }
-        }
-
         /// <summary>
         /// Replaces version number that is hard-coded in the CrossGen script.
         /// </summary>
         [Target]
         public static BuildTargetResult ReplaceCrossGen(BuildTargetContext c)
         {
-            DependencyInfo coreFXInfo = c.GetDependencyInfo().Single(d => d.Name == "CoreFx");
+            ReplaceFileContents(@"scripts\dotnet-cli-build\CompileTargets.cs", compileTargetsContent =>
-
-            string compileTargetsPath = Path.Combine(Dirs.RepoRoot, @"scripts\dotnet-cli-build\CompileTargets.cs");
-            string compileTargetsContent = File.ReadAllText(compileTargetsPath);
-
-            Regex regex = new Regex(@"CoreCLRVersion = ""(?<version>\d.\d.\d)-(?<release>.*)"";");
-            compileTargetsContent = regex.Replace(compileTargetsContent, m =>
             {
-                string replacedValue = m.Value;
+                DependencyInfo coreFXInfo = c.GetCoreFXDependency();
-                Group releaseGroup = m.Groups["release"];
+                Regex regex = new Regex(@"CoreCLRVersion = ""(?<version>\d.\d.\d)-(?<release>.*)"";");
 
-                replacedValue = replacedValue.Remove(releaseGroup.Index - m.Index, releaseGroup.Length);
+                return regex.ReplaceGroupValue(compileTargetsContent, "release", coreFXInfo.NewReleaseVersion);
-                replacedValue = replacedValue.Insert(releaseGroup.Index - m.Index, coreFXInfo.NewReleaseVersion);
-
-                return replacedValue;
             });
 
-            File.WriteAllText(compileTargetsPath, compileTargetsContent, Encoding.UTF8);
-
             return c.Success();
         }
+
+        /// <summary>
+        /// Replaces version number that is hard-coded in the corehost packaging dir.props file.
+        /// </summary>
+        [Target]
+        public static BuildTargetResult ReplaceCoreHostPackaging(BuildTargetContext c)
+        {
+            ReplaceFileContents(@"src\corehost\packaging\dir.props", contents =>
+            {
+                DependencyInfo coreFXInfo = c.GetCoreFXDependency();
+                Regex regex = new Regex(@"Microsoft\.NETCore\.Platforms\\(?<version>\d\.\d\.\d)-(?<release>.*)\\runtime\.json");
+
+                return regex.ReplaceGroupValue(contents, "release", coreFXInfo.NewReleaseVersion);
+            });
+
+            return c.Success();
+        }
+
+        private static DependencyInfo GetCoreFXDependency(this BuildTargetContext c)
+        {
+            return c.GetDependencyInfos().Single(d => d.Name == "CoreFx");
+        }
+
+        private static void ReplaceFileContents(string repoRelativePath, Func<string, string> replacement)
+        {
+            string fullPath = Path.Combine(Dirs.RepoRoot, repoRelativePath);
+            string contents = File.ReadAllText(fullPath);
+
+            contents = replacement(contents);
+
+            File.WriteAllText(fullPath, contents, Encoding.UTF8);
+        }
+
+        private static string ReplaceGroupValue(this Regex regex, string input, string groupName, string newValue)
+        {
+            return regex.Replace(input, m =>
+            {
+                string replacedValue = m.Value;
+                Group group = m.Groups[groupName];
+                int startIndex = group.Index - m.Index;
+
+                replacedValue = replacedValue.Remove(startIndex, group.Length);
+                replacedValue = replacedValue.Insert(startIndex, newValue);
+
+                return replacedValue;
+            });
+        }
     }
 }

scripts/update-dependencies/project.json

@@ -9,7 +9,7 @@
     "Microsoft.CSharp": "4.0.1-rc2-23931",
     "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23931",
     "Microsoft.DotNet.Cli.Build.Framework": "1.0.0-*",
-    "NuGet.Versioning": "3.5.0-beta-1123",
+    "NuGet.Versioning": "3.5.0-beta-1130",
     "Newtonsoft.Json": "7.0.1",
     "Octokit": "0.18.0",
     "Microsoft.Net.Http": "2.2.29"

src/Microsoft.DotNet.Cli.Utils/project.json

@@ -7,10 +7,10 @@
   "dependencies": {
     "Microsoft.DotNet.ProjectModel": "1.0.0-*",
     "Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc2-20100",
-    "NuGet.Versioning": "3.5.0-beta-1123",
+    "NuGet.Versioning": "3.5.0-beta-1130",
-    "NuGet.Packaging": "3.5.0-beta-1123",
+    "NuGet.Packaging": "3.5.0-beta-1130",
-    "NuGet.Frameworks": "3.5.0-beta-1123",
+    "NuGet.Frameworks": "3.5.0-beta-1130",
-    "NuGet.ProjectModel": "3.5.0-beta-1123"
+    "NuGet.ProjectModel": "3.5.0-beta-1130"
   },
   "frameworks": {
     "net451": {

src/Microsoft.DotNet.ProjectModel/Compilation/LibraryExporter.cs

@@ -424,7 +424,7 @@ namespace Microsoft.DotNet.ProjectModel.Compilation
 
         private IEnumerable<LibraryAsset> PopulateAssets(TargetLibraryWithAssets library, IEnumerable<LockFileItem> section)
         {
-            foreach (var assemblyPath in section)
+            foreach (var assemblyPath in section.Where(a => !PackageDependencyProvider.IsPlaceholderFile(a.Path)))
             {
                 yield return LibraryAsset.CreateFromRelativePath(library.Path, assemblyPath.Path);
             }

src/Microsoft.DotNet.ProjectModel/Project.cs

@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using Microsoft.DotNet.ProjectModel.Files;
 using Microsoft.DotNet.ProjectModel.Graph;
 using NuGet.Frameworks;

src/Microsoft.DotNet.ProjectModel/ProjectContext.cs

@@ -146,10 +146,7 @@ namespace Microsoft.DotNet.ProjectModel
                 return this;
             }
             
-            // Check if there are any runtime targets (i.e. are we portable)
+            var standalone = !ProjectFile.Dependencies.Any(d => d.Type.Equals(LibraryDependencyType.Platform));
-            var standalone = LockFile.Targets
-                .Where(t => t.TargetFramework.Equals(TargetFramework))
-                .Any(t => !string.IsNullOrEmpty(t.RuntimeIdentifier));
 
             var context = CreateBuilder(ProjectFile.ProjectFilePath, TargetFramework)
                 .WithRuntimeIdentifiers(standalone ? runtimeIdentifiers : Enumerable.Empty<string>())

src/Microsoft.DotNet.ProjectModel/project.json

@@ -6,7 +6,7 @@
   "description": "Types to model a .NET Project",
   "dependencies": {
     "System.Reflection.Metadata": "1.3.0-rc2-23931",
-    "NuGet.Packaging": "3.5.0-beta-1123",
+    "NuGet.Packaging": "3.5.0-beta-1130",
     "Microsoft.Extensions.FileSystemGlobbing": "1.0.0-rc2-15996",
     "Microsoft.Extensions.JsonParser.Sources": {
       "type": "build",
@@ -32,9 +32,6 @@
         "System.IO": {
           "type": "build"
         }
-      },
-      "dependencies": {
-        "System.Linq": "4.0.1-rc3-23727"
       }
     },
     "netstandard1.5": {

src/Microsoft.Extensions.DependencyModel/DependencyContextExtensions.cs

@@ -12,41 +12,101 @@ namespace Microsoft.Extensions.DependencyModel
 
         public static IEnumerable<string> GetDefaultNativeAssets(this DependencyContext self)
         {
+            if (self == null)
+            {
+                throw new ArgumentNullException(nameof(self));
+            }
             return self.RuntimeLibraries.SelectMany(library => library.GetDefaultNativeAssets(self));
         }
 
         public static IEnumerable<string> GetRuntimeNativeAssets(this DependencyContext self, string runtimeIdentifier)
         {
+            if (self == null)
+            {
+                throw new ArgumentNullException(nameof(self));
+            }
+            if (runtimeIdentifier == null)
+            {
+                throw new ArgumentNullException(nameof(runtimeIdentifier));
+            }
             return self.RuntimeLibraries.SelectMany(library => library.GetRuntimeNativeAssets(self, runtimeIdentifier));
         }
 
         public static IEnumerable<string> GetDefaultNativeAssets(this RuntimeLibrary self, DependencyContext context)
         {
+            if (self == null)
+            {
+                throw new ArgumentNullException(nameof(self));
+            }
             return ResolveAssets(context, string.Empty, self.NativeLibraryGroups);
         }
 
         public static IEnumerable<string> GetRuntimeNativeAssets(this RuntimeLibrary self, DependencyContext context, string runtimeIdentifier)
         {
+            if (self == null)
+            {
+                throw new ArgumentNullException(nameof(self));
+            }
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+            if (runtimeIdentifier == null)
+            {
+                throw new ArgumentNullException(nameof(runtimeIdentifier));
+            }
             return ResolveAssets(context, runtimeIdentifier, self.NativeLibraryGroups);
         }
 
         public static IEnumerable<AssemblyName> GetDefaultAssemblyNames(this DependencyContext self)
         {
+            if (self == null)
+            {
+                throw new ArgumentNullException(nameof(self));
+            }
             return self.RuntimeLibraries.SelectMany(library => library.GetDefaultAssemblyNames(self));
         }
 
         public static IEnumerable<AssemblyName> GetRuntimeAssemblyNames(this DependencyContext self, string runtimeIdentifier)
         {
+            if (self == null)
+            {
+                throw new ArgumentNullException(nameof(self));
+            }
+            if (runtimeIdentifier == null)
+            {
+                throw new ArgumentNullException(nameof(runtimeIdentifier));
+            }
             return self.RuntimeLibraries.SelectMany(library => library.GetRuntimeAssemblyNames(self, runtimeIdentifier));
         }
 
         public static IEnumerable<AssemblyName> GetDefaultAssemblyNames(this RuntimeLibrary self, DependencyContext context)
         {
+            if (self == null)
+            {
+                throw new ArgumentNullException(nameof(self));
+            }
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
             return ResolveAssets(context, string.Empty, self.RuntimeAssemblyGroups).Select(GetAssemblyName);
         }
 
         public static IEnumerable<AssemblyName> GetRuntimeAssemblyNames(this RuntimeLibrary self, DependencyContext context, string runtimeIdentifier)
         {
+            if (self == null)
+            {
+                throw new ArgumentNullException(nameof(self));
+            }
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+            if (runtimeIdentifier == null)
+            {
+                throw new ArgumentNullException(nameof(runtimeIdentifier));
+            }
             return ResolveAssets(context, runtimeIdentifier, self.RuntimeAssemblyGroups).Select(GetAssemblyName);
         }
 

src/Microsoft.Extensions.DependencyModel/DependencyContextJsonReader.cs

@@ -141,7 +141,8 @@ namespace Microsoft.Extensions.DependencyModel
             }
 
             return new CompilationOptions(
-                compilationOptionsObject[DependencyContextStrings.DefinesPropertyName]?.Values<string>() ?? Enumerable.Empty<string>(),
+                compilationOptionsObject[DependencyContextStrings.DefinesPropertyName]?.Values<string>().ToArray() ?? Enumerable.Empty<string>(),
+                // ToArray is here to prevent IEnumerable<string> holding to json object graph
                 compilationOptionsObject[DependencyContextStrings.LanguageVersionPropertyName]?.Value<string>(),
                 compilationOptionsObject[DependencyContextStrings.PlatformPropertyName]?.Value<string>(),
                 compilationOptionsObject[DependencyContextStrings.AllowUnsafePropertyName]?.Value<bool>(),

src/dotnet/commands/dotnet-projectmodel-server/Models/DependencyDescription.cs

@@ -5,6 +5,7 @@ using System.Collections.Generic;
 using System.Linq;
 using Microsoft.DotNet.ProjectModel.Compilation;
 using Microsoft.DotNet.ProjectModel.Graph;
+using NuGet.Versioning;
 
 namespace Microsoft.DotNet.ProjectModel.Server.Models
 {
@@ -60,7 +61,7 @@ namespace Microsoft.DotNet.ProjectModel.Server.Models
             {
                 Name = library.Identity.Name,
                 DisplayName = library.Identity.Name,
-                Version = library.Identity.Version?.ToNormalizedString(),
+                Version = (library.Identity.Version ?? new NuGetVersion("1.0.0")).ToNormalizedString(),
                 Type = library.Identity.Type.Value,
                 Resolved = library.Resolved,
                 Path = library.Path,

src/dotnet/commands/dotnet-publish/PublishCommand.cs

@@ -131,22 +131,26 @@ namespace Microsoft.DotNet.Tools.Publish
             var isPortable = string.IsNullOrEmpty(context.RuntimeIdentifier);
 
             // Collect all exports and organize them
-            var exports = exporter.GetAllExports()
+            var packageExports = exporter.GetAllExports()
                 .Where(e => e.Library.Identity.Type.Equals(LibraryType.Package))
                 .ToDictionary(e => e.Library.Identity.Name);
-            var collectExclusionList = isPortable ? GetExclusionList(context, exports) : new HashSet<string>();
+            var collectExclusionList = isPortable ? GetExclusionList(context, packageExports) : new HashSet<string>();
 
-            foreach (var export in exporter.GetAllExports().Where(e => !collectExclusionList.Contains(e.Library.Identity.Name)))
+            var exports = exporter.GetAllExports();
+            foreach (var export in exports.Where(e => !collectExclusionList.Contains(e.Library.Identity.Name)))
             {
                 Reporter.Verbose.WriteLine($"Publishing {export.Library.Identity.ToString().Green().Bold()} ...");
 
                 PublishAssetGroups(export.RuntimeAssemblyGroups, outputPath, nativeSubdirectories: false, includeRuntimeGroups: isPortable);
                 PublishAssetGroups(export.NativeLibraryGroups, outputPath, nativeSubdirectories, includeRuntimeGroups: isPortable);
                 export.RuntimeAssets.StructuredCopyTo(outputPath, outputPaths.IntermediateOutputDirectoryPath);
+            }
 
-                if (options.PreserveCompilationContext.GetValueOrDefault())
+            if (options.PreserveCompilationContext.GetValueOrDefault())
+            {
+                foreach (var export in exports)
                 {
-                    PublishRefs(export, outputPath);
+                    PublishRefs(export, outputPath, !collectExclusionList.Contains(export.Library.Identity.Name));
                 }
             }
 
@@ -248,7 +252,7 @@ namespace Microsoft.DotNet.Tools.Publish
             }
         }
 
-        private static void PublishRefs(LibraryExport export, string outputPath)
+        private static void PublishRefs(LibraryExport export, string outputPath, bool deduplicate)
         {
             var refsPath = Path.Combine(outputPath, "refs");
             if (!Directory.Exists(refsPath))
@@ -260,7 +264,7 @@ namespace Microsoft.DotNet.Tools.Publish
             var runtimeAssemblies = new HashSet<LibraryAsset>(export.RuntimeAssemblyGroups.GetDefaultAssets());
             foreach (var compilationAssembly in export.CompilationAssemblies)
             {
-                if (!runtimeAssemblies.Contains(compilationAssembly))
+                if (!deduplicate || !runtimeAssemblies.Contains(compilationAssembly))
                 {
                     var destFileName = Path.Combine(refsPath, Path.GetFileName(compilationAssembly.ResolvedPath));
                     File.Copy(compilationAssembly.ResolvedPath, destFileName, overwrite: true);
@@ -358,65 +362,14 @@ namespace Microsoft.DotNet.Tools.Publish
 
         private IEnumerable<ProjectContext> SelectContexts(string projectPath, NuGetFramework framework, string runtime)
         {
-            var allContexts = ProjectContext.CreateContextForEachTarget(projectPath).ToList();
+            var allContexts = framework == null ?
-            var frameworks = framework == null ?
+                ProjectContext.CreateContextForEachFramework(projectPath) :
-                allContexts.Select(c => c.TargetFramework).Distinct().ToArray() :
+                new[] { ProjectContext.Create(projectPath, framework) };
-                new[] { framework };
 
-            if (string.IsNullOrEmpty(runtime))
+            var runtimes = !string.IsNullOrEmpty(runtime) ? 
-            {
+                new [] {runtime} :
-                // For each framework, find the best matching RID item
+                PlatformServices.Default.Runtime.GetAllCandidateRuntimeIdentifiers();
-                var candidates = PlatformServices.Default.Runtime.GetAllCandidateRuntimeIdentifiers();
+            return allContexts.Select(c => c.CreateRuntimeContext(runtimes));
-                return frameworks.Select(f => FindBestTarget(f, allContexts, candidates));
-            }
-            else
-            {
-                return frameworks.SelectMany(f => allContexts.Where(c =>
-                    Equals(c.TargetFramework, f) &&
-                    string.Equals(c.RuntimeIdentifier, runtime, StringComparison.Ordinal)));
-            }
-        }
-
-        private ProjectContext FindBestTarget(NuGetFramework f, List<ProjectContext> allContexts, IEnumerable<string> candidates)
-        {
-            foreach (var candidate in candidates)
-            {
-                var target = allContexts.FirstOrDefault(c =>
-                    Equals(c.TargetFramework, f) &&
-                    string.Equals(c.RuntimeIdentifier, candidate, StringComparison.Ordinal));
-                if (target != null)
-                {
-                    return target;
-                }
-            }
-
-            // No RID-specific target found, use the RID-less target and publish portable
-            return allContexts.FirstOrDefault(c =>
-                Equals(c.TargetFramework, f) &&
-                string.IsNullOrEmpty(c.RuntimeIdentifier));
-        }
-
-        /// <summary>
-        /// Return the matching framework/runtime ProjectContext.
-        /// If 'framework' or 'runtimeIdentifier' is null or empty then it matches with any.
-        /// </summary>
-        private static IEnumerable<ProjectContext> GetMatchingProjectContexts(IEnumerable<ProjectContext> contexts, NuGetFramework framework, string runtimeIdentifier)
-        {
-            foreach (var context in contexts)
-            {
-                if (context.TargetFramework == null || string.IsNullOrEmpty(context.RuntimeIdentifier))
-                {
-                    continue;
-                }
-
-                if (string.IsNullOrEmpty(runtimeIdentifier) || string.Equals(runtimeIdentifier, context.RuntimeIdentifier, StringComparison.OrdinalIgnoreCase))
-                {
-                    if (framework == null || framework.Equals(context.TargetFramework))
-                    {
-                        yield return context;
-                    }
-                }
-            }
         }
         
         private static void CopyContents(ProjectContext context, string outputPath)

src/dotnet/project.json

@@ -17,10 +17,10 @@
   ],
   "dependencies": {
     "NuGet.Commands": {
-      "version": "3.5.0-beta-1123",
+      "version": "3.5.0-beta-1130",
       "exclude": "compile"
     },
-    "NuGet.CommandLine.XPlat": "3.5.0-beta-1123",
+    "NuGet.CommandLine.XPlat": "3.5.0-beta-1130",
     "Newtonsoft.Json": "7.0.1",
     "System.Text.Encoding.CodePages": "4.0.1-rc2-23931",
     "System.Diagnostics.FileVersionInfo": "4.0.0-rc2-23931",

test/Installer/testmsi.ps1

@@ -42,6 +42,7 @@ pushd "$Stage2Dir"
 
 try {
     .\dotnet restore `
+        --infer-runtimes `
         $testDir `
         -f https://www.myget.org/F/dotnet-buildtools/api/v3/index.json | Out-Host
 

test/Microsoft.DotNet.Cli.Utils.Tests/project.json

@@ -6,10 +6,10 @@
   "dependencies": {
     "Microsoft.NETCore.App": "1.0.0-rc2-23931",
     "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23931",
-    "NuGet.Versioning": "3.5.0-beta-1123",
+    "NuGet.Versioning": "3.5.0-beta-1130",
-    "NuGet.Packaging": "3.5.0-beta-1123",
+    "NuGet.Packaging": "3.5.0-beta-1130",
-    "NuGet.Frameworks": "3.5.0-beta-1123",
+    "NuGet.Frameworks": "3.5.0-beta-1130",
-    "NuGet.ProjectModel": "3.5.0-beta-1123",
+    "NuGet.ProjectModel": "3.5.0-beta-1130",
     "Microsoft.DotNet.ProjectModel": {
       "target": "project"
     },

test/Microsoft.DotNet.Tools.Tests.Utilities/TestBase.cs

@@ -103,7 +103,7 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
                 string.Equals("on", val, StringComparison.OrdinalIgnoreCase));
         }
 
-        protected void TestExecutable(string outputDir,
+        protected CommandResult TestExecutable(string outputDir,
             string executableName,
             string expectedOutput)
         {
@@ -123,9 +123,13 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
 
             var result = executableCommand.ExecuteWithCapturedOutput(string.Join(" ", args));
 
-            result.Should().HaveStdOut(expectedOutput);
+            if (!string.IsNullOrEmpty(expectedOutput))
+            { 
+                result.Should().HaveStdOut(expectedOutput);
+            }
             result.Should().NotHaveStdErr();
             result.Should().Pass();
+            return result;
         }
 
         protected void TestOutputExecutable(

test/Microsoft.Extensions.DependencyModel.Tests/FunctionalTests.cs

@@ -0,0 +1,133 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.DotNet.Cli.Utils;
+using Microsoft.DotNet.TestFramework;
+using Microsoft.DotNet.Tools.Test.Utilities;
+using FluentAssertions;
+using Xunit;
+
+namespace Microsoft.Extensions.DependencyModel
+{
+    public class FunctionalTests : TestBase
+    {
+        private readonly string _testProjectsRoot;
+
+        public FunctionalTests()
+        {
+            _testProjectsRoot = Path.Combine(AppContext.BaseDirectory, "TestAssets", "TestProjects");
+        }
+
+        [Theory]
+        [InlineData("TestApp", true)]
+        [InlineData("TestAppPortable", true)]
+        [InlineData("TestAppDeps", false)]
+        [InlineData("TestAppPortableDeps", false)]
+        public void RunTest(string appname, bool checkCompilation)
+        {
+            var testProjectPath = Path.Combine(RepoRoot, "TestAssets", "TestProjects", "DependencyContextValidator", appname);
+            var testProject = Path.Combine(testProjectPath, "project.json");
+
+            var runCommand = new RunCommand(testProject);
+            var result = runCommand.ExecuteWithCapturedOutput();
+            result.Should().Pass();
+            ValidateRuntimeLibrarites(result, appname);
+            if (checkCompilation)
+            {
+                ValidateCompilationLibraries(result, appname);
+            }
+        }
+
+        [Theory]
+        [InlineData("TestApp", false, true)]
+        [InlineData("TestAppPortable", true, true)]
+        [InlineData("TestAppDeps", false, false)]
+        [InlineData("TestAppPortableDeps", true, false)]
+        public void PublishTest(string appname, bool portable, bool checkCompilation)
+        {
+            var testProjectPath = Path.Combine(RepoRoot, "TestAssets", "TestProjects", "DependencyContextValidator", appname);
+            var testProject = Path.Combine(testProjectPath, "project.json");
+
+            var publishCommand = new PublishCommand(testProject);
+            publishCommand.Execute().Should().Pass();
+
+            var exeName = portable ? publishCommand.GetPortableOutputName() : publishCommand.GetOutputExecutable();
+
+            var result = TestExecutable(publishCommand.GetOutputDirectory(portable).FullName, exeName, string.Empty);
+            ValidateRuntimeLibrarites(result, appname);
+            if (checkCompilation)
+            {
+                ValidateCompilationLibraries(result, appname);
+            }
+        }
+
+        [WindowsOnlyFact]
+        public void RunTestFullClr()
+        {
+            var testProjectPath = Path.Combine(RepoRoot, "TestAssets", "TestProjects", "DependencyContextValidator", "TestAppFullClr");
+            var testProject = Path.Combine(testProjectPath, "project.json");
+
+            var runCommand = new RunCommand(testProject);
+            var result = runCommand.ExecuteWithCapturedOutput();
+            result.Should().Pass();
+            ValidateRuntimeLibraritesFullClr(result, "TestAppFullClr");
+            ValidateCompilationLibrariesFullClr(result, "TestAppFullClr");
+        }
+
+        [WindowsOnlyFact]
+        public void PublishTestFullClr()
+        {
+            var testProjectPath = Path.Combine(RepoRoot, "TestAssets", "TestProjects", "DependencyContextValidator", "TestAppFullClr");
+            var testProject = Path.Combine(testProjectPath, "project.json");
+
+            var publishCommand = new PublishCommand(testProject);
+            publishCommand.Execute().Should().Pass();
+
+            var result = TestExecutable(publishCommand.GetOutputDirectory().FullName, publishCommand.GetOutputExecutable(), string.Empty);
+            ValidateRuntimeLibraritesFullClr(result, "TestAppFullClr");
+            ValidateCompilationLibrariesFullClr(result, "TestAppFullClr");
+        }
+
+        private void ValidateRuntimeLibraritesFullClr(CommandResult result, string appname)
+        {
+            // entry assembly
+            result.Should().HaveStdOutContaining($"Runtime {appname}:{appname}");
+            // project dependency
+            result.Should().HaveStdOutContaining("Runtime DependencyContextValidator:DependencyContextValidator");
+        }
+
+        private void ValidateCompilationLibrariesFullClr(CommandResult result, string appname)
+        {
+            // entry assembly
+            result.Should().HaveStdOutContaining($"Compilation {appname}:{appname}.exe");
+            // project dependency
+            result.Should().HaveStdOutContaining("Compilation DependencyContextValidator:DependencyContextValidator.dll");
+            // system assembly
+            result.Should().HaveStdOutContaining("Compilation mscorlib:mscorlib.dll");
+        }
+
+
+        private void ValidateRuntimeLibrarites(CommandResult result, string appname)
+        {
+            // entry assembly
+            result.Should().HaveStdOutContaining($"Runtime {appname}:{appname}");
+            // project dependency
+            result.Should().HaveStdOutContaining("Runtime DependencyContextValidator:DependencyContextValidator");
+            // system assembly
+            result.Should().HaveStdOutContaining("Runtime System.Linq:System.Linq");
+        }
+
+        private void ValidateCompilationLibraries(CommandResult result, string appname)
+        {
+            // entry assembly
+            result.Should().HaveStdOutContaining($"Compilation {appname}:{appname}.dll");
+            // project dependency
+            result.Should().HaveStdOutContaining("Compilation DependencyContextValidator:DependencyContextValidator.dll");
+            // system assembly
+            result.Should().HaveStdOutContaining("Compilation System.Linq:System.Linq.dll");
+        }
+
+    }
+}

test/Microsoft.Extensions.DependencyModel.Tests/project.json

@@ -9,6 +9,9 @@
     "Microsoft.DotNet.Tools.Tests.Utilities": {
       "target": "project"
     },
+    "Microsoft.DotNet.Cli.Utils": {
+      "target": "project"
+    },
     "FluentAssertions": "4.0.0",
     "moq.netcore": "4.4.0-beta8",
     "xunit": "2.1.0",

test/dotnet-compile.Tests/CompilerTests.cs

@@ -147,26 +147,6 @@ namespace Microsoft.DotNet.Tools.Compiler.Tests
             result.StdOut.Should().Contain("MyNamespace.Util");
         }
 
-        [Fact]
-        public void EmbeddedDependencyContextIsValidOnBuild()
-        {
-            var testProjectPath = Path.Combine(RepoRoot, "TestAssets", "TestProjects", "DependencyContextValidator", "TestApp");
-            var testProject = Path.Combine(testProjectPath, "project.json");
-
-            var runCommand = new RunCommand(testProject);
-            runCommand.Execute().Should().Pass();
-        }
-
-        [Fact]
-        public void DepsDependencyContextIsValidOnBuild()
-        {
-                var testProjectPath = Path.Combine(RepoRoot, "TestAssets", "TestProjects", "DependencyContextValidator", "TestAppDeps");
-                var testProject = Path.Combine(testProjectPath, "project.json");
-
-                var runCommand = new RunCommand(testProject);
-                runCommand.Execute().Should().Pass();
-        }
-
         [Fact]
         public void CanSetOutputAssemblyNameForLibraries()
         {

test/dotnet-projectmodel-server.Tests/DthTests.cs

@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Threading;
@@ -413,6 +414,40 @@ namespace Microsoft.DotNet.ProjectModel.Server.Tests
             }
         }
 
+        [Fact]
+        public void AddMSBuildReferenceBeforeRestore()
+        {
+            var tam = new TestAssetsManager(
+                Path.Combine(RepoRoot, "TestAssets", "ProjectModelServer", "MSBuildReferencesProjects"));
+
+            // var appName = "EmptyNetCoreApp";
+            var projectPath = tam.CreateTestInstance("ValidCase01").WithLockFiles().TestRoot;
+            projectPath = Path.Combine(projectPath, "src", "MainApp");
+
+            var projectFilePath = Path.Combine(projectPath, Project.FileName);
+            var projectJson = JsonConvert.DeserializeObject<JObject>(File.ReadAllText(projectFilePath));
+
+            ((JObject)projectJson["frameworks"]["net46"]["dependencies"])
+                .Add("ClassLibrary4", JToken.FromObject(new { target = "project" }));
+
+            File.WriteAllText(projectFilePath, JsonConvert.SerializeObject(projectJson));
+
+            using (var server = new DthTestServer(_loggerFactory))
+            using (var client = new DthTestClient(server, _loggerFactory))
+            {
+                client.Initialize(projectPath);
+                var messages = client.DrainAllMessages();
+                messages.AssertDoesNotContain(MessageTypes.Error);
+                // PrintAllMessages(new[] { messages.RetrieveSingleMessage(MessageTypes.Dependencies) });
+                messages.RetrieveSingleMessage(MessageTypes.Dependencies)
+                        .RetrieveDependency("ClassLibrary4")
+                        .AssertProperty<object>(
+                            "Version",
+                            v => !string.IsNullOrEmpty(v.ToString()),
+                            v => $"Version string shouldn't be empty. Value [{v.ToString()}]");
+            }
+        }
+
         [Fact]
         public void MSBuildReferenceTest()
         {
@@ -467,9 +502,111 @@ namespace Microsoft.DotNet.ProjectModel.Server.Tests
             }
         }
 
+        [Fact]
+        public void RemovePackageDependencyFromProjectJson()
+        {
+            // Remove a package dependency from project.json and then request refreshing dependency before
+            // restore.
+
+            var appName = "EmptyNetCoreApp";
+            var projectPath = _testAssetsManager.CreateTestInstance(appName)
+                                                .WithLockFiles()
+                                                .TestRoot;
+
+            using (var server = new DthTestServer(_loggerFactory))
+            using (var client = new DthTestClient(server, _loggerFactory))
+            {
+                client.Initialize(projectPath);
+
+                client.DrainAllMessages()
+                      .AssertDoesNotContain(MessageTypes.Error)
+                      .RetrieveSingleMessage(MessageTypes.Dependencies)
+                      .RetrieveDependency(appName)
+                      .RetrievePropertyAs<JArray>("Dependencies")
+                      .AssertJArrayCount(2);
+
+                var projectFilePath = Path.Combine(projectPath, Project.FileName);
+                var projectJson = JsonConvert.DeserializeObject<JObject>(File.ReadAllText(projectFilePath));
+
+                // Remove newtonsoft.json dependency
+                var dependencies = projectJson["frameworks"]["netcoreapp1.0"]["dependencies"] as JObject;
+                dependencies.Remove("Newtonsoft.Json");
+
+                File.WriteAllText(projectFilePath, JsonConvert.SerializeObject(projectJson));
+
+                client.SendPayLoad(projectPath, MessageTypes.RefreshDependencies);
+
+                var afterDependencies = client.DrainTillFirst(MessageTypes.Dependencies);
+                afterDependencies.RetrieveDependency(appName)
+                                 .RetrievePropertyAs<JArray>("Dependencies")
+                                 .AssertJArrayCount(1)
+                                 .RetrieveArraryElementAs<JObject>(0)
+                                 .AssertProperty("Name", "Microsoft.NETCore.App");
+                afterDependencies.RetrieveDependency("Newtonsoft.Json");
+            }
+        }
+
+        [Fact]
+        public void RemoveMSBuildDependencyFromProjectJson()
+        {
+            // Remove a msbuild project dependency from project.json and then request refreshing dependency before
+            // restore.
+
+            var tam = new TestAssetsManager(
+                Path.Combine(RepoRoot, "TestAssets", "ProjectModelServer", "MSBuildReferencesProjects"));
+
+            // var appName = "EmptyNetCoreApp";
+            var projectPath = tam.CreateTestInstance("ValidCase01").WithLockFiles().TestRoot;
+            projectPath = Path.Combine(projectPath, "src", "MainApp");
+
+            using (var server = new DthTestServer(_loggerFactory))
+            using (var client = new DthTestClient(server, _loggerFactory))
+            {
+                client.Initialize(projectPath);
+
+                client.DrainAllMessages()
+                      .AssertDoesNotContain(MessageTypes.Error)
+                      .RetrieveSingleMessage(MessageTypes.Dependencies)
+                      .RetrieveDependency("MainApp")
+                      .RetrievePropertyAs<JArray>("Dependencies")
+                      .AssertJArrayContains<JObject>(dep => dep["Name"].Value<string>() == "ClassLibrary1")
+                      .AssertJArrayContains<JObject>(dep => dep["Name"].Value<string>() == "ClassLibrary2")
+                      .AssertJArrayContains<JObject>(dep => dep["Name"].Value<string>() == "ClassLibrary3");
+
+                var projectFilePath = Path.Combine(projectPath, Project.FileName);
+                var projectJson = JsonConvert.DeserializeObject<JObject>(File.ReadAllText(projectFilePath));
+
+                // Remove ClassLibrary2 and ClassLibrary3 dependency
+                var dependencies = projectJson["frameworks"]["net46"]["dependencies"] as JObject;
+                dependencies.Remove("ClassLibrary2");
+                dependencies.Remove("ClassLibrary3");
+
+                File.WriteAllText(projectFilePath, JsonConvert.SerializeObject(projectJson));
+
+                client.SendPayLoad(projectPath, MessageTypes.RefreshDependencies);
+
+                var afterDependencies = client.DrainTillFirst(MessageTypes.Dependencies);
+                afterDependencies.RetrieveDependency("MainApp")
+                                 .RetrievePropertyAs<JArray>("Dependencies")
+                                 .AssertJArrayNotContains<JObject>(dep => dep["Name"].Value<string>() == "ClassLibrary2")
+                                 .AssertJArrayNotContains<JObject>(dep => dep["Name"].Value<string>() == "ClassLibrary3");
+
+                afterDependencies.RetrieveDependency("ClassLibrary2");
+                afterDependencies.RetrieveDependency("ClassLibrary3");
+            }
+        }
+
         private static string NormalizePathString(string original)
         {
             return original.Replace('/', Path.DirectorySeparatorChar).Replace('\\', Path.DirectorySeparatorChar);
         }
+
+        private static void PrintAllMessages(IEnumerable<DthMessage> messages)
+        {
+            foreach (var message in messages)
+            {
+                Console.WriteLine($"{message.MessageType} => {message.Payload.ToString()}");
+            }
+        }
     }
 }

test/dotnet-projectmodel-server.Tests/Helpers/JArrayExtensions.cs

@@ -70,6 +70,21 @@ namespace Microsoft.DotNet.ProjectModel.Server.Tests
             return array;
         }
 
+        public static JArray AssertJArrayNotContains<T>(this JArray array, Func<T, bool> critiera)
+        {
+            foreach (var element in array)
+            {
+                var value = element.Value<T>();
+
+                if (critiera(value))
+                {
+                    Assert.True(false, "JArray contains unexpected element.");
+                }
+            }
+
+            return array;
+        }
+
         public static T RetrieveArraryElementAs<T>(this JArray json, int index)
             where T : JToken
         {

test/dotnet-publish.Tests/PublishPortableTests.cs

@@ -81,6 +81,24 @@ namespace Microsoft.DotNet.Tools.Publish.Tests
             publishDir.Should().NotHaveFile("PortableAppWithNative.runtimeconfig.dev.json");
         }
 
+        [Fact]
+        public void RefsPublishTest()
+        {
+            TestInstance instance = TestAssetsManager.CreateTestInstance("PortableTests")
+                                                     .WithLockFiles();
+
+            var publishCommand = new PublishCommand(Path.Combine(instance.TestRoot, "PortableAppCompilationContext"));
+            publishCommand.Execute().Should().Pass();
+
+            publishCommand.GetOutputDirectory(true).Should().HaveFile("PortableAppCompilationContext.dll");
+
+            var refsDirectory = new DirectoryInfo(Path.Combine(publishCommand.GetOutputDirectory(true).FullName, "refs"));
+            // Should have compilation time assemblies
+            refsDirectory.Should().HaveFile("System.IO.dll");
+            // Libraries in which lib==ref should be deduped
+            refsDirectory.Should().NotHaveFile("PortableAppCompilationContext.dll");
+        }
+
         private DirectoryInfo Publish(TestInstance testInstance)
         {
             var publishCommand = new PublishCommand(Path.Combine(testInstance.TestRoot, "PortableAppWithNative"));

tools/RuntimeGraphGenerator/project.json

@@ -4,8 +4,8 @@
     "emitEntryPoint": true
   },
   "dependencies": {
-    "NuGet.RuntimeModel": "3.5.0-beta-1123",
+    "NuGet.RuntimeModel": "3.5.0-beta-1130",
-    "NuGet.Versioning": "3.5.0-beta-1123",
+    "NuGet.Versioning": "3.5.0-beta-1130",
     "System.CommandLine": "0.1.0-e160119-1",
     "System.Runtime.Serialization.Json": "4.0.2-rc2-23931",
     "Microsoft.DotNet.ProjectModel": "1.0.0-*",