Remove cli patch 11: use PVP to set aspnet version

Author: dagood

patches/cli/0011-Set-AspNetCore-version-to-final.patch

@@ -40,6 +40,15 @@
     <OrchestratedManifestBuildName>N/A</OrchestratedManifestBuildName>
   </PropertyGroup>
 
+  <ItemGroup>
+    <ExtraPackageVersionPropsPackageInfo
+      Include="
+        Microsoft.AspNetCore.All;
+        Microsoft.AspNetCore.App;
+        Microsoft.NET.Sdk.Razor"
+      Version="2.1.0-preview2-final" />
+  </ItemGroup>
+
   <ItemGroup>
     <RepositoryReference Include="application-insights" />
     <RepositoryReference Include="cli-migrate" />

repos/cli.proj

@@ -157,6 +157,7 @@
       <_PreviouslySourceBuiltPackages Include="$(SourceBuiltPackagesPath)*.nupkg" />
     </ItemGroup>
     <WriteBuildOutputProps NuGetPackages="@(_PreviouslySourceBuiltPackages)"
+                           ExtraPackageInfo="@(ExtraPackageVersionPropsPackageInfo)"
                            OutputPath="$(PackageVersionPropsPath)" />
 
     <ReadLinesFromFile File="$(PackageVersionPropsPath)">

repos/dir.targets

@@ -6,6 +6,8 @@
 using Microsoft.Build.Utilities;
 using NuGet.Packaging;
 using NuGet.Packaging.Core;
+using NuGet.Versioning;
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Text;
@@ -21,6 +23,20 @@ public class WriteBuildOutputProps : Task
         [Required]
         public string OutputPath { get; set; }
 
+        /// <summary>
+        /// Package id/versions to add to the build output props, which may not exist as nupkgs.
+        /// 
+        /// %(Identity): Package identity.
+        /// %(Version): Package version.
+        /// </summary>
+        public ITaskItem[] ExtraPackageInfo { get; set; }
+
+        private IEnumerable<PackageIdentity> ExtraPackageIdentities => ExtraPackageInfo
+            ?.Select(item => new PackageIdentity(
+                item.GetMetadata("Identity"),
+                NuGetVersion.Parse(item.GetMetadata("Version"))))
+            ?? Enumerable.Empty<PackageIdentity>();
+
         public override bool Execute()
         {
             PackageIdentity[] latestPackages = NuGetPackages
@@ -31,6 +47,7 @@ public override bool Execute()
                         return reader.GetIdentity();
                     }
                 })
+                .Concat(ExtraPackageIdentities)
                 .GroupBy(identity => identity.Id)
                 .Select(g => g.OrderBy(id => id.Version).Last())
                 .OrderBy(id => id.Id)