From a8c664ba67722286e29aa57191cc9e472801d7d2 Mon Sep 17 00:00:00 2001
From: Daniel Plaisted <daplaist@microsoft.com>
Date: Mon, 26 Nov 2018 18:58:37 -0800
Subject: [PATCH] Enable targeting .NET Core 2.2

---
 build/MSBuildExtensions.targets                     | 13 +++++++++++++
 .../GivenAspNetAppsResolveImplicitVersions.cs       |  3 +--
 test/EndToEnd/SupportedNetCoreAppVersions.cs        |  3 +--
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/build/MSBuildExtensions.targets b/build/MSBuildExtensions.targets
index b07fe4628..81d3b1c4e 100644
--- a/build/MSBuildExtensions.targets
+++ b/build/MSBuildExtensions.targets
@@ -71,6 +71,10 @@
                                TargetFrameworkVersion="2.1"
                                DefaultVersion="2.1.0"
                                LatestVersion="2.1.6" />
+      <ImplicitPackageVariable Include="Microsoft.NETCore.App"
+                               TargetFrameworkVersion="2.2"
+                               DefaultVersion="2.2.0"
+                               LatestVersion="2.2.0" />
       <ImplicitPackageVariable Include="Microsoft.NETCore.App"
                                TargetFrameworkVersion="3.0"
                                DefaultVersion="$(_NETCoreAppPackageVersion)"
@@ -84,6 +88,15 @@
                                TargetFrameworkVersion="2.1"
                                DefaultVersion="2.1.1"
                                LatestVersion="2.1.6"/>
+
+      <ImplicitPackageVariable Include="Microsoft.AspNetCore.App"
+                               TargetFrameworkVersion="2.2"
+                               DefaultVersion="2.2.0"
+                               LatestVersion="2.2.0"/>
+      <ImplicitPackageVariable Include="Microsoft.AspNetCore.All"
+                               TargetFrameworkVersion="2.2"
+                               DefaultVersion="2.2.0"
+                               LatestVersion="2.2.0"/>
     </ItemGroup>
     
     <ItemGroup>
diff --git a/test/EndToEnd/GivenAspNetAppsResolveImplicitVersions.cs b/test/EndToEnd/GivenAspNetAppsResolveImplicitVersions.cs
index f8b781be6..fe419ab54 100644
--- a/test/EndToEnd/GivenAspNetAppsResolveImplicitVersions.cs
+++ b/test/EndToEnd/GivenAspNetAppsResolveImplicitVersions.cs
@@ -216,8 +216,7 @@ namespace EndToEnd
             get
             {
                 yield return new object[] { "2.1" };
-                //  2.2 not yet stable
-                //yield return new object[] { "2.2" };
+                yield return new object[] { "2.2" };
                 yield return new object[] { LatestSupportedAspNetCoreAppVersion };
             }
         }
diff --git a/test/EndToEnd/SupportedNetCoreAppVersions.cs b/test/EndToEnd/SupportedNetCoreAppVersions.cs
index 5010a4d42..6c9adff95 100644
--- a/test/EndToEnd/SupportedNetCoreAppVersions.cs
+++ b/test/EndToEnd/SupportedNetCoreAppVersions.cs
@@ -20,8 +20,7 @@ namespace EndToEnd
                     "1.1",
                     "2.0",
                     "2.1",
-                    //  2.2 currently disabled in master: https://github.com/dotnet/cli/issues/10125
-                    // "2.2",
+                    "2.2",
                     "3.0"
                 };
             }