diff --git a/TestAssets/TestPackages/dotnet-portable/dotnet-portable.csproj b/TestAssets/TestPackages/dotnet-portable/dotnet-portable.csproj index dc66976a1..13267b228 100644 --- a/TestAssets/TestPackages/dotnet-portable/dotnet-portable.csproj +++ b/TestAssets/TestPackages/dotnet-portable/dotnet-portable.csproj @@ -1,6 +1,7 @@  - netcoreapp3.0 + + netcoreapp2.2 Exe diff --git a/TestAssets/TestPackages/dotnet-prefercliruntime/dotnet-prefercliruntime.csproj b/TestAssets/TestPackages/dotnet-prefercliruntime/dotnet-prefercliruntime.csproj index 0ae5735e3..366c75abe 100644 --- a/TestAssets/TestPackages/dotnet-prefercliruntime/dotnet-prefercliruntime.csproj +++ b/TestAssets/TestPackages/dotnet-prefercliruntime/dotnet-prefercliruntime.csproj @@ -1,6 +1,7 @@  - netcoreapp3.0 + + netcoreapp2.2 Exe diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9bcb75232..6e426c4b0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -46,9 +46,9 @@ https://github.com/dotnet/templating 42a212514e375a0821baab69fbac462e39590cfb - + https://github.com/dotnet/toolset - 451276038744a1883f8a9f15206ecef734c0c21c + a30f447cf8d6f2627c80376fdc8a00c8eb7c6ddb https://github.com/dotnet/standard diff --git a/eng/Versions.props b/eng/Versions.props index 0ac02aa11..e9b7fe9ca 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview4.19169.3 + 3.0.100-preview4.19179.11 diff --git a/test/EndToEnd/ProjectToolsTests.cs b/test/EndToEnd/ProjectToolsTests.cs deleted file mode 100644 index be6c1a93a..000000000 --- a/test/EndToEnd/ProjectToolsTests.cs +++ /dev/null @@ -1,156 +0,0 @@ -// 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.IO; -using System.Linq; -using System.Xml.Linq; -using Microsoft.DotNet.TestFramework; -using Microsoft.DotNet.Tools.Test.Utilities; -using Xunit; - -[assembly: CollectionBehavior(DisableTestParallelization = true)] - -namespace Microsoft.DotNet.Tests.EndToEnd -{ - public class ProjectToolsTests : TestBase, IClassFixture - { - public string TestPackagesDirectory { get; private set; } - public string TestNuGetCache { get; private set; } - - - public ProjectToolsTests(TestPackagesFixture testPackagesFixture) - { - TestPackagesDirectory = testPackagesFixture.TestPackagesDirectory; - TestNuGetCache = testPackagesFixture.TestNuGetCache; - } - - - [Fact] - public void ItCanRunToolsInACSProj() - { - var testInstance = TestAssets.Get("MSBuildTestApp") - .CreateInstance() - .WithSourceFiles(); - - var testProjectDirectory = testInstance.Root; - - new RestoreCommand() - .WithWorkingDirectory(testProjectDirectory) - .WithEnvironmentVariable("NUGET_PACKAGES", TestNuGetCache) - .WithEnvironmentVariable("TEST_PACKAGES", TestPackagesDirectory) - .Execute() - .Should() - .Pass(); - - new DotnetCommand() - .WithWorkingDirectory(testInstance.Root) - .WithEnvironmentVariable("NUGET_PACKAGES", TestNuGetCache) - .WithEnvironmentVariable("TEST_PACKAGES", TestPackagesDirectory) - .ExecuteWithCapturedOutput("-d portable") - .Should() - .Pass() - .And - .HaveStdOutContaining("Hello Portable World!");; - } - - [Fact] - public void ItCanRunToolsThatPrefersTheCliRuntimeEvenWhenTheToolItselfDeclaresADifferentRuntime() - { - var testInstance = TestAssets.Get("MSBuildTestApp") - .CreateInstance() - .WithSourceFiles(); - - var testProjectDirectory = testInstance.Root; - - new RestoreCommand() - .WithWorkingDirectory(testProjectDirectory) - .WithEnvironmentVariable("NUGET_PACKAGES", TestNuGetCache) - .WithEnvironmentVariable("TEST_PACKAGES", TestPackagesDirectory) - .Execute() - .Should() - .Pass(); - - - new DotnetCommand() - .WithWorkingDirectory(testInstance.Root) - .WithEnvironmentVariable("NUGET_PACKAGES", TestNuGetCache) - .WithEnvironmentVariable("TEST_PACKAGES", TestPackagesDirectory) - .ExecuteWithCapturedOutput("-d prefercliruntime") - .Should().Pass() - .And.HaveStdOutContaining("Hello I prefer the cli runtime World!");; - } - - public class TestPackagesFixture - { - public string TestPackagesDirectory { get; private set; } - public string TestNuGetCache { get; private set; } - - public TestPackagesFixture() - { - TestPackagesDirectory = SetupTestPackages(); - - TestNuGetCache = TestAssets.CreateTestDirectory(testProjectName: string.Empty, - callingMethod: "packages", - identifier: string.Empty) - .FullName; - - } - - private string SetupTestPackages() - { - var directory = TestAssets.CreateTestDirectory( - testProjectName: string.Empty, - callingMethod: "TestPackages", - identifier: string.Empty); - - string testPackagesDirectory = Path.Combine(directory.FullName, "testPackages"); - - if (!Directory.Exists(testPackagesDirectory)) - { - new DirectoryInfo(testPackagesDirectory).Create(); - } - - var testPackageNames = new[] - { - "dotnet-portable", - "dotnet-prefercliruntime" - }; - - foreach (var testPackageName in testPackageNames) - { - - - var assetInfo = TestAssets.Get(TestAssetKinds.TestPackages, testPackageName); - - var testProjectDirectory = new DirectoryInfo(Path.Combine(directory.FullName, testPackageName)); - - if (!testProjectDirectory.Exists) - { - testProjectDirectory.Create(); - } - - var testInstance = new TestAssetInstance(assetInfo, testProjectDirectory) - .WithSourceFiles() - .WithRestoreFiles(); - - new PackCommand() - .WithWorkingDirectory(testProjectDirectory) - .Execute() - .Should() - .Pass(); - - string nupkgFilePathInOutput = Directory.GetFiles(Path.Combine(testProjectDirectory.FullName, "bin", "Debug"), "*.nupkg") - .Single(); - - string nupkgFile = Path.Combine(testPackagesDirectory, Path.GetFileName(nupkgFilePathInOutput)); - - File.Copy(nupkgFilePathInOutput, nupkgFile); - - } - - return testPackagesDirectory; - } - } - } -}