Merge pull request #17238 from dotnet-maestro-bot/merge/release/2.1-to-release/2.2

wtgodbe · web-flow · commit 30eec7d2ae99 · 2019-11-22T12:57:34.000-08:00
[automated] Merge branch 'release/2.1' =&gt; 'release/2.2'
diff --git a/eng/PatchConfig.props b/eng/PatchConfig.props
@@ -83,4 +83,8 @@ Later on, this will be checked using this condition:
       Microsoft.AspNetCore.DataProtection.EntityFrameworkCore;
     </PackagesInPatch>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(VersionPrefix)' == '2.1.15' ">
+    <PackagesInPatch>
+    </PackagesInPatch>
+  </PropertyGroup>
 </Project>
diff --git a/src/PackageArchive/Archive.CiServer.Patch.Compat/ArchiveBaseline.2.1.14.txt b/src/PackageArchive/Archive.CiServer.Patch.Compat/ArchiveBaseline.2.1.14.txt
@@ -0,0 +1 @@
+
diff --git a/src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.1.14.txt b/src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.1.14.txt
@@ -0,0 +1 @@
+
