diff --git a/TestAssets/TestProjects/TestAppWithContentPackage/NuGet.Config b/TestAssets/TestProjects/NuGet.Config
similarity index 100%
rename from TestAssets/TestProjects/TestAppWithContentPackage/NuGet.Config
rename to TestAssets/TestProjects/NuGet.Config
diff --git a/TestAssets/TestProjects/TestAppWithContentPackage/Packages/SharedContentA.1.0.0.nupkg b/TestAssets/TestProjects/Packages/SharedContentA.1.0.0.nupkg
similarity index 100%
rename from TestAssets/TestProjects/TestAppWithContentPackage/Packages/SharedContentA.1.0.0.nupkg
rename to TestAssets/TestProjects/Packages/SharedContentA.1.0.0.nupkg
diff --git a/src/Microsoft.DotNet.ProjectModel/project.json b/src/Microsoft.DotNet.ProjectModel/project.json
index 29752a4e7..82b9ecbe2 100644
--- a/src/Microsoft.DotNet.ProjectModel/project.json
+++ b/src/Microsoft.DotNet.ProjectModel/project.json
@@ -6,7 +6,7 @@
     "description": "Types to model a .NET Project",
     "dependencies": {
         "System.Reflection.Metadata": "1.2.0-rc2-23901",
-        "NuGet.Packaging": "3.4.0-beta-632",
+        "NuGet.Packaging": "3.4.0-rtm-0724",
         "Microsoft.Extensions.FileSystemGlobbing": "1.0.0-rc2-15996",
         "Microsoft.Extensions.JsonParser.Sources": {
             "type": "build",
diff --git a/src/dotnet/commands/dotnet-restore/Program.cs b/src/dotnet/commands/dotnet-restore/Program.cs
index 8ca6057a1..a42330263 100644
--- a/src/dotnet/commands/dotnet-restore/Program.cs
+++ b/src/dotnet/commands/dotnet-restore/Program.cs
@@ -180,7 +180,7 @@ namespace Microsoft.DotNet.Tools.Restore
             Console.WriteLine($"Restoring Tool '{tooldep.Name}' for '{projectPath}' in '{tempPath}'");
 
             File.WriteAllText(projectPath, GenerateProjectJsonContents(new[] {"netstandardapp1.5"}, tooldep));
-            return NuGet3.Restore(new [] { $"{projectPath}", "--runtime", $"{DefaultRid}"}.Concat(args), quiet) == 0;
+            return NuGet3.Restore(new[] { $"{projectPath}" }.Concat(args), quiet) == 0;
         }
 
         private static string GenerateProjectJsonContents(IEnumerable<string> frameworks, LibraryRange tooldep)
@@ -194,9 +194,11 @@ namespace Microsoft.DotNet.Tools.Restore
             foreach (var framework in frameworks)
             {
                 var importsStatement = "\"imports\": [ \"dnxcore50\", \"portable-net452+win81\" ]";
-                
                 sb.AppendLine($"        \"{framework}\": {{ {importsStatement} }}");
             }
+            sb.AppendLine("    },");
+            sb.AppendLine("    \"runtimes\": { ");
+            sb.AppendLine($"        \"{DefaultRid}\": {{}}");
             sb.AppendLine("    }");
             sb.AppendLine("}");
             var pjContents = sb.ToString();
diff --git a/src/dotnet/project.json b/src/dotnet/project.json
index b98fab4ff..dcc0b0182 100644
--- a/src/dotnet/project.json
+++ b/src/dotnet/project.json
@@ -3,16 +3,16 @@
     "compilationOptions": {
         "emitEntryPoint": true
     },
-    "compileExclude": [ 
-        "commands/dotnet-new/CSharp_Console/**", 
-        "commands/dotnet-new/FSharp_Console/**" 
+    "compileExclude": [
+        "commands/dotnet-new/CSharp_Console/**",
+        "commands/dotnet-new/FSharp_Console/**"
     ],
-    "resource": [ 
-        "commands/dotnet-new/CSharp_Console/NuGet.Config", 
-        "commands/dotnet-new/CSharp_Console/Program.cs", 
-        "commands/dotnet-new/CSharp_Console/project.json.template", 
-        "commands/dotnet-new/FSharp_Console/NuGet.config", 
-        "commands/dotnet-new/FSharp_Console/Program.fs", 
+    "resource": [
+        "commands/dotnet-new/CSharp_Console/NuGet.Config",
+        "commands/dotnet-new/CSharp_Console/Program.cs",
+        "commands/dotnet-new/CSharp_Console/project.json.template",
+        "commands/dotnet-new/FSharp_Console/NuGet.config",
+        "commands/dotnet-new/FSharp_Console/Program.fs",
         "commands/dotnet-new/FSharp_Console/project.json.template"
     ],
     "dependencies": {
@@ -24,7 +24,7 @@
         "Microsoft.CodeAnalysis.CSharp": "1.3.0-beta1-20160225-02",
         "Microsoft.DiaSymReader.Native": "1.3.3",
 
-        "NuGet.CommandLine.XPlat": "3.4.0-beta-632",
+        "NuGet.CommandLine.XPlat": "3.4.0-rtm-0724",
         "System.CommandLine": "0.1.0-e160119-1",
 
         "Microsoft.DotNet.ProjectModel": "1.0.0-*",
diff --git a/test/Installer/testmsi.ps1 b/test/Installer/testmsi.ps1
index 2a11669be..3f4f0d3cc 100644
--- a/test/Installer/testmsi.ps1
+++ b/test/Installer/testmsi.ps1
@@ -14,7 +14,7 @@ function CopyInstaller([string]$destination)
     # Copy both the .msi and the .exe to the testBin directory so
     # the tests running in the docker container have access to them.
     Copy-Item $inputMsi -Destination:$destination
-    
+
     $BundlePath = [System.IO.Path]::ChangeExtension($inputMsi, "exe")
     Copy-Item $BundlePath -Destination:$destination
 }
@@ -22,7 +22,7 @@ function CopyInstaller([string]$destination)
 function CopyTestXUnitRunner([string]$destination)
 {
     $XUnitRunnerDir = Join-Path $env:NUGET_PACKAGES xunit.runner.console\2.1.0\tools
-    
+
     Copy-Item $XUnitRunnerDir\xunit.console.exe -Destination:$destination
     Copy-Item $XUnitRunnerDir\xunit.runner.utility.desktop.dll -Destination:$destination
 }
@@ -42,7 +42,6 @@ pushd "$Stage2Dir\bin"
 
 try {
     .\dotnet restore `
-        --runtime win-anycpu `
         $testDir `
         -f https://www.myget.org/F/dotnet-buildtools/api/v3/index.json | Out-Host
 
@@ -53,7 +52,6 @@ try {
 
     .\dotnet publish `
         --framework net46 `
-        --runtime win-anycpu `
         --output $testBin `
         $testDir | Out-Host
 
@@ -68,7 +66,7 @@ try {
         CopyTestXUnitRunner $testBin
 
         Write-Host "Running installer tests in Windows Container"
-        
+
         # --net="none" works around a networking issue on the containers on the CI machines.
         # Since our installer tests don't require the network, it is fine to shut it off.
         $MsiFileName = [System.IO.Path]::GetFileName($inputMsi)