Merge remote-tracking branch 'refs/remotes/App-vNext/master'

Author: reisenberger

src/Polly.Caching.MemoryCache.Net40Async.Specs/Polly.Caching.MemoryCache.Net40Async.Specs.csproj

@@ -30,7 +30,7 @@
     <PackageReference Include="Microsoft.Bcl" Version="1.1.10" />
     <PackageReference Include="Microsoft.Bcl.Async" Version="1.0.168" />
     <PackageReference Include="Microsoft.Bcl.Build" Version="1.0.21" />
-    <PackageReference Include="Polly.Net40Async" Version="5.3.2-v5-3-x-cachebeta0001" />
+    <PackageReference Include="Polly.Net40Async" Version="5.4.0" />
     <PackageReference Include="xunit" Version="2.1.0" />
     <PackageReference Include="xunit.extensibility.execution" Version="2.1.0" />
   </ItemGroup>

src/Polly.Caching.MemoryCache.Net40Async/Polly.Caching.MemoryCache.Net40Async.csproj

@@ -34,7 +34,7 @@
     <PackageReference Include="Microsoft.Bcl" Version="1.1.10" />
     <PackageReference Include="Microsoft.Bcl.Build" Version="1.0.21" />
     <PackageReference Include="Nito.AsyncEx" Version="3.0.1" />
-    <PackageReference Include="Polly.Net40Async" Version="5.3.2-v5-3-x-cachebeta0001" />
+    <PackageReference Include="Polly.Net40Async" Version="5.4.0" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\GlobalAssemblyInfo.cs">

src/Polly.Caching.MemoryCache.Net45.Specs/Polly.Caching.MemoryCache.Net45.Specs.csproj

@@ -27,7 +27,7 @@
     <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Polly" Version="5.3.2-v5-3-x-cachebeta0001" />
+    <PackageReference Include="Polly" Version="5.4.0" />
     <PackageReference Include="FluentAssertions" Version="4.17.0" />
     <PackageReference Include="GitVersionTask" Version="3.1.2" />
     <PackageReference Include="xunit" Version="2.1.0" />

src/Polly.Caching.MemoryCache.Net45/Polly.Caching.MemoryCache.Net45.csproj

@@ -22,7 +22,7 @@
       <Link>Properties\GlobalAssemblyInfo.cs</Link>
     </Compile>
     <PackageReference Include="GitVersionTask" Version="3.1.2" />
-    <PackageReference Include="Polly" Version="5.3.2-v5-3-x-cachebeta0001" />
+    <PackageReference Include="Polly" Version="5.4.0" />
     <Reference Include="System" />
     <Reference Include="System.Runtime.Caching" />
   </ItemGroup>

src/Polly.Caching.MemoryCache.NetStandard13.Specs/Polly.Caching.MemoryCache.NetStandard13.Specs.csproj

@@ -19,7 +19,7 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
     <PackageReference Include="xunit" Version="2.2.0" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
-    <PackageReference Include="Polly" Version="5.3.2-v5-3-x-cachebeta0001" />
+    <PackageReference Include="Polly" Version="5.4.0" />
 
   </ItemGroup>
   <ItemGroup>

src/Polly.Caching.MemoryCache.NetStandard13/Polly.Caching.MemoryCache.NetStandard13.csproj

@@ -29,7 +29,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="1.1.2" />
-    <PackageReference Include="Polly" Version="5.3.2-v5-3-x-cachebeta0001" />
+    <PackageReference Include="Polly" Version="5.4.0" />
   </ItemGroup>
   <Import Project="..\Polly.Caching.MemoryCache.Shared\Polly.Caching.MemoryCache.Shared.projitems" Label="Shared" />
 </Project>

src/Polly.Caching.MemoryCache.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
+# Visual Studio 15
+VisualStudioVersion = 15.0.26430.16
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{79FE9DBE-1155-4F78-A41F-FE95DEFA19DD}"
 	ProjectSection(SolutionItems) = preProject