From 201dfd581bdf631e481c43293cd47e549f7b3757 Mon Sep 17 00:00:00 2001
From: Mike Lorbetske <mike.lorbetske@n3-p.com>
Date: Fri, 3 Aug 2018 20:02:55 -0700
Subject: [PATCH] Fix tests

---
 test/EndToEnd/SupportedNetCoreAppVersions.cs            | 3 ++-
 test/dotnet-build.Tests/GivenDotnetBuildBuildsCsproj.cs | 4 ++--
 test/dotnet-new.Tests/GivenThatIWantANewApp.cs          | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/test/EndToEnd/SupportedNetCoreAppVersions.cs b/test/EndToEnd/SupportedNetCoreAppVersions.cs
index fe1eb44e2..97e8262b9 100644
--- a/test/EndToEnd/SupportedNetCoreAppVersions.cs
+++ b/test/EndToEnd/SupportedNetCoreAppVersions.cs
@@ -18,7 +18,8 @@ namespace EndToEnd
                     "1.0",
                     "1.1",
                     "2.0",
-                    "2.1"
+                    "2.1",
+                    "2.2"
                 }.Select(version => new object[] { version });
             }
         }
diff --git a/test/dotnet-build.Tests/GivenDotnetBuildBuildsCsproj.cs b/test/dotnet-build.Tests/GivenDotnetBuildBuildsCsproj.cs
index 15f8527c8..d06967edd 100644
--- a/test/dotnet-build.Tests/GivenDotnetBuildBuildsCsproj.cs
+++ b/test/dotnet-build.Tests/GivenDotnetBuildBuildsCsproj.cs
@@ -93,7 +93,7 @@ namespace Microsoft.DotNet.Cli.Build.Tests
             string dir = "pkgs";
             string args = $"--packages {dir}";
 
-            string newArgs = $"console -f netcoreapp2.1 -o \"{rootPath}\" --debug:ephemeral-hive --no-restore";
+            string newArgs = $"console -f netcoreapp2.2 -o \"{rootPath}\" --debug:ephemeral-hive --no-restore";
             new NewCommandShim()
                 .WithWorkingDirectory(rootPath)
                 .Execute(newArgs)
@@ -115,7 +115,7 @@ namespace Microsoft.DotNet.Cli.Build.Tests
             var configuration = Environment.GetEnvironmentVariable("CONFIGURATION") ?? "Debug";
 
             var outputDll = Directory.EnumerateFiles(
-                Path.Combine(rootPath, "bin", configuration, "netcoreapp2.1"), "*.dll", 
+                Path.Combine(rootPath, "bin", configuration, "netcoreapp2.2"), "*.dll", 
                 SearchOption.TopDirectoryOnly)
                 .Single();
 
diff --git a/test/dotnet-new.Tests/GivenThatIWantANewApp.cs b/test/dotnet-new.Tests/GivenThatIWantANewApp.cs
index 1bbcc0eb1..505eddfcb 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.2.0")]
+        [InlineData("console", "microsoft.netcore.app", null)]
         [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)
         {