Adding net46 to some of our libraries back, so that we can run binding-redirect tests again. We need those tests for tool and we need to keep them running.

TestAssets/TestPackages/dotnet-dependency-tool-invoker/project.json

@@ -23,7 +23,7 @@
     "Microsoft.DotNet.Compiler.Common": {
       "target": "project"
     },
-    "NuGet.Frameworks": "3.6.0-rc-1979"
+    "NuGet.Frameworks": "3.6.0-rc-1984"
   },
   "frameworks": {
     "netcoreapp1.0": {

build_projects/dotnet-cli-build/dotnet-cli-build.csproj

@@ -39,7 +39,7 @@
       <Version>6.2.2-preview</Version>
     </PackageReference>
     <PackageReference Include="NuGet.CommandLine.XPlat">
-      <Version>3.6.0-rc-1979</Version>
+      <Version>3.6.0-rc-1984</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.Build.Utilities.Core">
       <Version>0.1.0-preview-00043-160929</Version>

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

@@ -26,6 +26,8 @@
       "dependencies": {
         "System.Diagnostics.Process": "4.1.0"
       }
+    },
+    "net46": {
     }
   }
 }

src/Microsoft.DotNet.TestFramework/project.json

@@ -14,6 +14,8 @@
       "imports": [
         "portable-net45+wp80+win8+wpa81+dnxcore50"
       ]
+    },
+    "net46": {
     }
   },
   "packOptions": {

test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectDependencyCommandResolverBeingUsedWithMSBuild.cs

@@ -43,7 +43,6 @@ namespace Microsoft.DotNet.Cli.Utils.Tests
             Environment.SetEnvironmentVariable(
                 Constants.MSBUILD_EXE_PATH,
                 Path.Combine(_repoDirectoriesProvider.Stage2Sdk, "MSBuild.exe"));
-            Environment.SetEnvironmentVariable("DOTNET_CLI_CONTEXT_VERBOSE", "true");
         }
 
         [Fact]

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

@@ -1,6 +1,7 @@
 using System;
 using System.IO;
 using System.Linq;
+using Microsoft.DotNet.PlatformAbstractions;
 
 namespace Microsoft.DotNet.Tools.Test.Utilities
 {
@@ -61,7 +62,7 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
             string corehostPackages = null,
             string corehostDummyPackages = null)
         {
-            var currentRid = DotnetLegacyRuntimeIdentifiers.InferLegacyRestoreRuntimeIdentifier();
+            var currentRid = RuntimeEnvironment.GetRuntimeIdentifier();
 
             _artifacts = artifacts ?? Path.Combine(RepoRoot, "artifacts", currentRid);
             _nugetPackages = nugetPackages ?? Path.Combine(RepoRoot, ".nuget", "packages");

test/Microsoft.DotNet.Tools.Tests.Utilities/project.json

@@ -36,6 +36,13 @@
       "System.Runtime.Serialization.Primitives": "4.1.1-rc2-24022",
       "System.Collections.Immutable": "1.2.0-rc2-24022",
       "System.Net.NetworkInformation": "4.1.0-rc2-24022"
+    },
+    "net46": {
+      "frameworkAssemblies": {
+        "System.Runtime": {
+          "type": "build"
+        }
+      }
     }
   }
 }

test/binding-redirects.Tests/BindingRedirectTests.cs

@@ -8,6 +8,7 @@ using System.IO;
 using System.Linq;
 using System.Xml.Linq;
 using FluentAssertions;
+using Microsoft.DotNet.Tools.Test.Utilities;
 using Xunit;
 
 namespace Microsoft.DotNet.Tests

test/binding-redirects.Tests/TestSetupFixture.cs

@@ -4,6 +4,7 @@
 using System.IO;
 using Microsoft.DotNet.InternalAbstractions;
 using Microsoft.DotNet.TestFramework;
+using Microsoft.DotNet.Tools.Test.Utilities;
 
 namespace Microsoft.DotNet.Tests
 {

test/binding-redirects.Tests/project.json

@@ -3,7 +3,10 @@
   "dependencies": {
     "xunit": "2.2.0-beta3-build3330",
     "dotnet-test-xunit": "1.0.0-rc2-350904-49",
-    "Microsoft.NETCore.Platforms": "1.0.1"
+    "Microsoft.NETCore.Platforms": "1.0.1",
+    "Microsoft.DotNet.Tools.Tests.Utilities": {
+      "target": "project"
+    }
   },
   "frameworks": {
     "net46": {