From 391d04c67a0721decb0a271ac268cdff6b653072 Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Sat, 15 Oct 2016 18:34:03 -0700 Subject: [PATCH] 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. --- .../dotnet-dependency-tool-invoker/project.json | 2 +- build_projects/dotnet-cli-build/dotnet-cli-build.csproj | 2 +- src/Microsoft.DotNet.Cli.Utils/project.json | 2 ++ src/Microsoft.DotNet.TestFramework/project.json | 2 ++ ...ProjectDependencyCommandResolverBeingUsedWithMSBuild.cs | 1 - .../RepoDirectoriesProvider.cs | 3 ++- test/Microsoft.DotNet.Tools.Tests.Utilities/project.json | 7 +++++++ test/binding-redirects.Tests/BindingRedirectTests.cs | 1 + test/binding-redirects.Tests/TestSetupFixture.cs | 1 + test/binding-redirects.Tests/project.json | 5 ++++- 10 files changed, 21 insertions(+), 5 deletions(-) diff --git a/TestAssets/TestPackages/dotnet-dependency-tool-invoker/project.json b/TestAssets/TestPackages/dotnet-dependency-tool-invoker/project.json index f02530564..5540f2d1d 100644 --- a/TestAssets/TestPackages/dotnet-dependency-tool-invoker/project.json +++ b/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": { diff --git a/build_projects/dotnet-cli-build/dotnet-cli-build.csproj b/build_projects/dotnet-cli-build/dotnet-cli-build.csproj index fd7a3dce1..c246e4c04 100644 --- a/build_projects/dotnet-cli-build/dotnet-cli-build.csproj +++ b/build_projects/dotnet-cli-build/dotnet-cli-build.csproj @@ -39,7 +39,7 @@ 6.2.2-preview - 3.6.0-rc-1979 + 3.6.0-rc-1984 0.1.0-preview-00043-160929 diff --git a/src/Microsoft.DotNet.Cli.Utils/project.json b/src/Microsoft.DotNet.Cli.Utils/project.json index 146c552e9..91bdf7f93 100644 --- a/src/Microsoft.DotNet.Cli.Utils/project.json +++ b/src/Microsoft.DotNet.Cli.Utils/project.json @@ -26,6 +26,8 @@ "dependencies": { "System.Diagnostics.Process": "4.1.0" } + }, + "net46": { } } } diff --git a/src/Microsoft.DotNet.TestFramework/project.json b/src/Microsoft.DotNet.TestFramework/project.json index 144b0b3a8..d2fc22f88 100644 --- a/src/Microsoft.DotNet.TestFramework/project.json +++ b/src/Microsoft.DotNet.TestFramework/project.json @@ -14,6 +14,8 @@ "imports": [ "portable-net45+wp80+win8+wpa81+dnxcore50" ] + }, + "net46": { } }, "packOptions": { diff --git a/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectDependencyCommandResolverBeingUsedWithMSBuild.cs b/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectDependencyCommandResolverBeingUsedWithMSBuild.cs index f5852ead5..8cf2fd547 100644 --- a/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectDependencyCommandResolverBeingUsedWithMSBuild.cs +++ b/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] diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/RepoDirectoriesProvider.cs b/test/Microsoft.DotNet.Tools.Tests.Utilities/RepoDirectoriesProvider.cs index b4b75b8b1..ab5ccb5ec 100644 --- a/test/Microsoft.DotNet.Tools.Tests.Utilities/RepoDirectoriesProvider.cs +++ b/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"); diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/project.json b/test/Microsoft.DotNet.Tools.Tests.Utilities/project.json index 1e6be6860..7c562d133 100644 --- a/test/Microsoft.DotNet.Tools.Tests.Utilities/project.json +++ b/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" + } + } } } } diff --git a/test/binding-redirects.Tests/BindingRedirectTests.cs b/test/binding-redirects.Tests/BindingRedirectTests.cs index e4da31af4..566b48060 100644 --- a/test/binding-redirects.Tests/BindingRedirectTests.cs +++ b/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 diff --git a/test/binding-redirects.Tests/TestSetupFixture.cs b/test/binding-redirects.Tests/TestSetupFixture.cs index b6ac63d99..e0c29f6e3 100644 --- a/test/binding-redirects.Tests/TestSetupFixture.cs +++ b/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 { diff --git a/test/binding-redirects.Tests/project.json b/test/binding-redirects.Tests/project.json index 8603be7a5..4ef020d2b 100644 --- a/test/binding-redirects.Tests/project.json +++ b/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": {