From 2b5cf41ee970b008d66f81d5c12307a16b742c80 Mon Sep 17 00:00:00 2001 From: Mike Lorbetske Date: Fri, 3 Aug 2018 14:16:44 -0700 Subject: [PATCH] Update several of the tests to look for netcoreapp2.2 rather than 2.1 with the new templates --- test/EndToEnd/GivenDotNetUsesMSBuild.cs | 2 +- test/dotnet-new.Tests/GivenThatIWantANewApp.cs | 2 +- .../GivenDotnetPublishPublishesProjects.cs | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/EndToEnd/GivenDotNetUsesMSBuild.cs b/test/EndToEnd/GivenDotNetUsesMSBuild.cs index 7e15e25b8..eade05c5c 100644 --- a/test/EndToEnd/GivenDotNetUsesMSBuild.cs +++ b/test/EndToEnd/GivenDotNetUsesMSBuild.cs @@ -19,7 +19,7 @@ namespace Microsoft.DotNet.Tests.EndToEnd { string projectDirectory = directory.Path; - string newArgs = "console -f netcoreapp2.1 --debug:ephemeral-hive --no-restore"; + string newArgs = "console -f netcoreapp2.2 --debug:ephemeral-hive --no-restore"; new NewCommandShim() .WithWorkingDirectory(projectDirectory) .Execute(newArgs) diff --git a/test/dotnet-new.Tests/GivenThatIWantANewApp.cs b/test/dotnet-new.Tests/GivenThatIWantANewApp.cs index a438cd063..1bbcc0eb1 100644 --- a/test/dotnet-new.Tests/GivenThatIWantANewApp.cs +++ b/test/dotnet-new.Tests/GivenThatIWantANewApp.cs @@ -76,7 +76,7 @@ namespace Microsoft.DotNet.New.Tests // Remove the expectedVersion parameter once we have templates targetting netcoreapp2.2. [Theory] - [InlineData("console", "microsoft.netcore.app", "2.1.0")] + [InlineData("console", "microsoft.netcore.app", "2.2.0")] [InlineData("classlib", "netstandard.library", "2.0.3")] // FIXME: This is pinned to 2.0.3 due to https://github.com/dotnet/sdk/issues/2410 public void NewProjectRestoresCorrectPackageVersion(string type, string packageName, string expectedVersion) { diff --git a/test/dotnet-publish.Tests/GivenDotnetPublishPublishesProjects.cs b/test/dotnet-publish.Tests/GivenDotnetPublishPublishesProjects.cs index ba51449fe..cf4a29a33 100644 --- a/test/dotnet-publish.Tests/GivenDotnetPublishPublishesProjects.cs +++ b/test/dotnet-publish.Tests/GivenDotnetPublishPublishesProjects.cs @@ -208,7 +208,7 @@ namespace Microsoft.DotNet.Cli.Publish.Tests var configuration = Environment.GetEnvironmentVariable("CONFIGURATION") ?? "Debug"; var outputProgram = rootDir - .GetDirectory("bin", configuration, "netcoreapp2.1", "publish", $"{rootDir.Name}.dll") + .GetDirectory("bin", configuration, "netcoreapp2.2", "publish", $"{rootDir.Name}.dll") .FullName; new TestCommand(outputProgram) @@ -270,7 +270,7 @@ namespace Microsoft.DotNet.Cli.Publish.Tests var configuration = Environment.GetEnvironmentVariable("CONFIGURATION") ?? "Debug"; var outputProgram = rootDir - .GetDirectory("bin", configuration, "netcoreapp2.1", rid, "publish", $"{rootDir.Name}.dll") + .GetDirectory("bin", configuration, "netcoreapp2.2", rid, "publish", $"{rootDir.Name}.dll") .FullName; new TestCommand(outputProgram)