Merged PR 2582: Fixing merge conflict between release/2.2 and interna…

…l/release/2.2 Changes were made to the `PatchConfig.props` files in the internal and public branches. The change to the internal branch was made before the change in the public branch which caused the conflict and broke mirroring.
dotnet · Aug 12, 2019 · e1426f6 · e1426f6
1 parent fc65b4f
commit e1426f6
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/eng/PatchConfig.props b/eng/PatchConfig.props
@@ -76,6 +76,7 @@ Later on, this will be checked using this condition:
   <PropertyGroup Condition=" '$(VersionPrefix)' == '2.2.7' ">
     <PackagesInPatch>
       Microsoft.AspNetCore.DataProtection.AzureStorage;
+      Microsoft.AspNetCore.Hosting;
     </PackagesInPatch>
   </PropertyGroup>
 </Project>