From 934549bbcb9565fd39ee81d09a93d40328c22528 Mon Sep 17 00:00:00 2001 From: reisenberger Date: Fri, 25 Jan 2019 18:11:32 +0000 Subject: [PATCH 1/5] Update copyright year --- src/GlobalAssemblyInfo.cs | 2 +- src/Polly.Caching.Distributed.nuspec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/GlobalAssemblyInfo.cs b/src/GlobalAssemblyInfo.cs index ca500b5..d9e6868 100644 --- a/src/GlobalAssemblyInfo.cs +++ b/src/GlobalAssemblyInfo.cs @@ -3,7 +3,7 @@ [assembly: AssemblyProduct("Polly.Caching.Distributed")] [assembly: AssemblyCompany("App vNext")] [assembly: AssemblyDescription("Polly.Caching.Distributed is a IDistributedCache plug-in for the Polly CachePolicy. Polly is a library that allows developers to express resilience and transient fault handling policies such as Retry, Circuit Breaker, Timeout, Bulkhead Isolation, and Fallback in a fluent and thread-safe manner.")] -[assembly: AssemblyCopyright("Copyright (c) 2017, App vNext")] +[assembly: AssemblyCopyright("Copyright (c) 2019, App vNext")] #if DEBUG [assembly: AssemblyConfiguration("Debug")] diff --git a/src/Polly.Caching.Distributed.nuspec b/src/Polly.Caching.Distributed.nuspec index 149790b..8a55ed3 100644 --- a/src/Polly.Caching.Distributed.nuspec +++ b/src/Polly.Caching.Distributed.nuspec @@ -11,7 +11,7 @@ https://raw.github.com/App-vNext/Polly/master/Polly.png https://github.com/App-vNext/Polly.Caching.IDistributedCache Polly Cache Caching Cache-aside - Copyright © 2017, App vNext + Copyright © 2019, App vNext 2.0.0 --------------------- From 5e7a3bae84fdb7fbc059311969f4a96196781d83 Mon Sep 17 00:00:00 2001 From: reisenberger Date: Fri, 25 Jan 2019 18:26:15 +0000 Subject: [PATCH 2/5] Update license element in Nuspec. Fixes #11 --- src/Polly.Caching.Distributed.nuspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Polly.Caching.Distributed.nuspec b/src/Polly.Caching.Distributed.nuspec index 8a55ed3..1f52aa6 100644 --- a/src/Polly.Caching.Distributed.nuspec +++ b/src/Polly.Caching.Distributed.nuspec @@ -7,7 +7,7 @@ Polly.Caching.Distributed is a plug-in for the .NET OSS resilience library Polly, supporting Microsoft.Extensions.Caching.Distributed.IDistributedCache as a provider for Polly's CachePolicy. en-US - https://raw.github.com/App-vNext/Polly/master/LICENSE.txt + BSD-3-Clause https://raw.github.com/App-vNext/Polly/master/Polly.png https://github.com/App-vNext/Polly.Caching.IDistributedCache Polly Cache Caching Cache-aside From d22687ff2968124165ee0195059407d371b4eb1e Mon Sep 17 00:00:00 2001 From: reisenberger Date: Fri, 25 Jan 2019 18:27:46 +0000 Subject: [PATCH 3/5] Remove explicit statement of NetStandard.Library 2.0 dependency, for netstandard2.0 tfm Fixes #9 --- src/Polly.Caching.Distributed.nuspec | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Polly.Caching.Distributed.nuspec b/src/Polly.Caching.Distributed.nuspec index 1f52aa6..a6b5a60 100644 --- a/src/Polly.Caching.Distributed.nuspec +++ b/src/Polly.Caching.Distributed.nuspec @@ -34,7 +34,6 @@ - From 0062de0870b84f7ccf345378c8962bcada81d8a1 Mon Sep 17 00:00:00 2001 From: reisenberger Date: Fri, 25 Jan 2019 18:28:34 +0000 Subject: [PATCH 4/5] Readme improvements --- README.md | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index a21d837..6baa93d 100644 --- a/README.md +++ b/README.md @@ -26,17 +26,18 @@ This project, Polly.Caching.Distributed, allows you to use Polly's `CachePolicy` Polly.Caching.Distributed supports .NET Standard 1.1 and .NET Standard 2.0. -## Dependencies +## Versions and Dependencies + +Polly.Caching.Distributed >=v2.0 and <v3 requires: + ++ [Polly](nuget.org/packages/polly) >= v6.0.1 and <v7. ++ [Microsoft.Extensions.Caching.Abstractions](https://www.nuget.org/packages/Microsoft.Extensions.Caching.Abstractions/) v2.0.2 or above. Polly.Caching.IDistributedCache <v2.0 requires: + [Polly](nuget.org/packages/polly) v5.4.0 or above. + [Microsoft.Extensions.Caching.Abstractions](https://www.nuget.org/packages/Microsoft.Extensions.Caching.Abstractions/) v1.1.2 or above. -Polly.Caching.Distributed >=v2.0 requires: - -+ [Polly](nuget.org/packages/polly) v6.0.1 or above. -+ [Microsoft.Extensions.Caching.Abstractions](https://www.nuget.org/packages/Microsoft.Extensions.Caching.Abstractions/) v2.0.2 or above. # How to use the Polly.Caching.Distributed plugin @@ -84,7 +85,7 @@ public class Startup services.AddSingleton>(serviceProvider => serviceProvider.GetRequiredService().AsAsyncCacheProvider()); - services.AddSingleton, Polly.Registry.PolicyRegistry>((serviceProvider) => + services.AddSingleton, Polly.Registry.PolicyRegistry>((serviceProvider) => { PolicyRegistry registry = new PolicyRegistry(); registry.Add("myCachePolicy", Policy.CacheAsync(serviceProvider.GetRequiredService>(), TimeSpan.FromMinutes(5))); @@ -98,7 +99,7 @@ public class Startup // In a controller, inject the policyRegistry and retrieve the policy: // (magic string "myCachePolicy" hard-coded here only to keep the example simple) -public MyController(IPolicyRegistry policyRegistry) +public MyController(IReadOnlyPolicyRegistry policyRegistry) { var _cachePolicy = policyRegistry.Get>("myCachePolicy"); // ... @@ -109,7 +110,7 @@ Usage: ```csharp string productId = // ... from somewhere -string productDescription = await cachePolicy.ExecuteAsync(context => getProductDescription(productId), +string productDescription = await _cachePolicy.ExecuteAsync(context => getProductDescription(productId), new Context(productId) // productId will also be the cache key used in this execution. ); ``` From b7919d92f41d73c5730e73e09dddabd17653f36c Mon Sep 17 00:00:00 2001 From: reisenberger Date: Fri, 25 Jan 2019 18:31:24 +0000 Subject: [PATCH 5/5] Add v2.0.1 release notes --- CHANGELOG.md | 4 ++++ GitVersionConfig.yaml | 2 +- .../Properties/AssemblyInfo.cs | 4 ++-- .../Properties/AssemblyInfo.cs | 4 ++-- src/Polly.Caching.Distributed.nuspec | 9 +++++++-- 5 files changed, 16 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f0c9fb6..b8c39e5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Polly.Caching.Distributed change log +## 2.0.1 +- No functional changes +- Indicate compatibility with Polly < v7 + ## 2.0.0 - Provide a single signed package only. - Update Polly to V6.0.1. diff --git a/GitVersionConfig.yaml b/GitVersionConfig.yaml index 49572ad..376e301 100644 --- a/GitVersionConfig.yaml +++ b/GitVersionConfig.yaml @@ -1 +1 @@ -next-version: 2.0.0 +next-version: 2.0.1 diff --git a/src/Polly.Caching.Distributed.NetStandard11/Properties/AssemblyInfo.cs b/src/Polly.Caching.Distributed.NetStandard11/Properties/AssemblyInfo.cs index 49f7a37..32bce5d 100644 --- a/src/Polly.Caching.Distributed.NetStandard11/Properties/AssemblyInfo.cs +++ b/src/Polly.Caching.Distributed.NetStandard11/Properties/AssemblyInfo.cs @@ -4,8 +4,8 @@ [assembly: AssemblyTitle("Polly.Caching.Distributed")] [assembly: AssemblyVersion("2.0.0.0")] -[assembly: AssemblyFileVersion("2.0.0.0")] -[assembly: AssemblyInformationalVersion("2.0.0.0")] +[assembly: AssemblyFileVersion("2.0.1.0")] +[assembly: AssemblyInformationalVersion("2.0.1.0")] [assembly: CLSCompliant(false)] // Because Microsoft.Extensions.Caching.Memory.IDistributedCache, on which Polly.Caching.IDistributedCache.NetStandard11 depends, is not CLSCompliant. [assembly: InternalsVisibleTo("Polly.Caching.Distributed.NetStandard11.Specs")] \ No newline at end of file diff --git a/src/Polly.Caching.Distributed.NetStandard20/Properties/AssemblyInfo.cs b/src/Polly.Caching.Distributed.NetStandard20/Properties/AssemblyInfo.cs index 9e8a3da..d96bc35 100644 --- a/src/Polly.Caching.Distributed.NetStandard20/Properties/AssemblyInfo.cs +++ b/src/Polly.Caching.Distributed.NetStandard20/Properties/AssemblyInfo.cs @@ -4,8 +4,8 @@ [assembly: AssemblyTitle("Polly.Caching.Distributed")] [assembly: AssemblyVersion("2.0.0.0")] -[assembly: AssemblyFileVersion("2.0.0.0")] -[assembly: AssemblyInformationalVersion("2.0.0.0")] +[assembly: AssemblyFileVersion("2.0.1.0")] +[assembly: AssemblyInformationalVersion("2.0.1.0")] [assembly: CLSCompliant(false)] // Because Microsoft.Extensions.Caching.Memory.IDistributedCache, on which Polly.Caching.IDistributedCache.NetStandard11 depends, is not CLSCompliant. [assembly: InternalsVisibleTo("Polly.Caching.Distributed.NetStandard20.Specs")] \ No newline at end of file diff --git a/src/Polly.Caching.Distributed.nuspec b/src/Polly.Caching.Distributed.nuspec index a6b5a60..fa3d8a1 100644 --- a/src/Polly.Caching.Distributed.nuspec +++ b/src/Polly.Caching.Distributed.nuspec @@ -13,6 +13,11 @@ Polly Cache Caching Cache-aside Copyright © 2019, App vNext + 2.0.1 + --------------------- + - No functional changes + - Indicate compatibility with Polly < v7 + 2.0.0 --------------------- - Provide a single signed package only. @@ -30,11 +35,11 @@ - + - +