From 1630be3dbd786acd9cd1b80ca6304ad32dcfbf31 Mon Sep 17 00:00:00 2001 From: Jarl Gullberg Date: Wed, 29 Jul 2020 11:52:06 +0200 Subject: [PATCH 1/9] Increment version. --- RateLimiter/RateLimiter.csproj | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/RateLimiter/RateLimiter.csproj b/RateLimiter/RateLimiter.csproj index 5c4d2f8..85f10dd 100644 --- a/RateLimiter/RateLimiter.csproj +++ b/RateLimiter/RateLimiter.csproj @@ -1,4 +1,4 @@ - + netstandard2;net472 @@ -7,7 +7,7 @@ RateLimiter RateLimiter David Desmaisons - 2.1.0 + 2.1.1 https://github.com/David-Desmaisons/RateLimiter https://github.com/David-Desmaisons/RateLimiter/blob/master/LICENSE @@ -22,8 +22,8 @@ Features: RateLimiter true Asynchronous, Task, Rate limiting - 2.1.0.0 - 2.1.0.0 + 2.1.1.0 + 2.1.1.0 .NET Standard support From 347af81941313140aea957f4e13ef4fe32f42846 Mon Sep 17 00:00:00 2001 From: Jarl Gullberg Date: Wed, 29 Jul 2020 11:52:13 +0200 Subject: [PATCH 2/9] Enable targeting .NET Standard 2.1. --- RateLimiter/RateLimiter.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RateLimiter/RateLimiter.csproj b/RateLimiter/RateLimiter.csproj index 85f10dd..c536e46 100644 --- a/RateLimiter/RateLimiter.csproj +++ b/RateLimiter/RateLimiter.csproj @@ -1,7 +1,7 @@ - netstandard2;net472 + netstandard2.1;netstandard2.0;net472 full true RateLimiter From 4f25de7631909acea8e2876f6052eb573767ab9b Mon Sep 17 00:00:00 2001 From: Jarl Gullberg Date: Wed, 29 Jul 2020 11:52:51 +0200 Subject: [PATCH 3/9] Enable building on non-windows platforms. This change pulls in the required references assemblies when building on a non-windows, non-netframework platform. --- RateLimiter.Tests/RateLimiter.Tests.csproj | 4 ++++ RateLimiter/RateLimiter.csproj | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/RateLimiter.Tests/RateLimiter.Tests.csproj b/RateLimiter.Tests/RateLimiter.Tests.csproj index b7b7bab..a5fe60b 100644 --- a/RateLimiter.Tests/RateLimiter.Tests.csproj +++ b/RateLimiter.Tests/RateLimiter.Tests.csproj @@ -34,4 +34,8 @@ + + + + diff --git a/RateLimiter/RateLimiter.csproj b/RateLimiter/RateLimiter.csproj index c536e46..6f1b555 100644 --- a/RateLimiter/RateLimiter.csproj +++ b/RateLimiter/RateLimiter.csproj @@ -1,4 +1,4 @@ - + netstandard2.1;netstandard2.0;net472 @@ -31,4 +31,8 @@ Features: + + + + From 88cdf144b5ffc3d7b42fb1e21e6cf474bb75cdcd Mon Sep 17 00:00:00 2001 From: Jarl Gullberg Date: Wed, 29 Jul 2020 12:57:55 +0200 Subject: [PATCH 4/9] Rework example project file to use the new project format. --- .../RateLimiter.Example.csproj | 77 ++++--------------- 1 file changed, 14 insertions(+), 63 deletions(-) diff --git a/RateLimiter.Example/RateLimiter.Example.csproj b/RateLimiter.Example/RateLimiter.Example.csproj index 8c91eb5..46dd395 100644 --- a/RateLimiter.Example/RateLimiter.Example.csproj +++ b/RateLimiter.Example/RateLimiter.Example.csproj @@ -1,72 +1,23 @@ - - - + + - Debug - AnyCPU - {DBDA5E30-34CE-4738-BC0A-5DFD7FB0CE16} Exe - RateLimiter.Example - RateLimiter.Example - v4.7.2 - 512 - true - true - - - AnyCPU - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - AnyCPU - pdbonly - true - bin\Release\ - TRACE - prompt - 4 + net472 + false + - - ..\packages\ComposableAsync.Core.1.1.0\lib\net472\ComposableAsync.Core.dll - - - ..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll - - - - - - ..\packages\Microsoft.AspNet.WebApi.Client.5.2.7\lib\net45\System.Net.Http.Formatting.dll - - - - - - - + + + + - - - - + - - - - - - - {eb70fcc6-051a-4b84-bd28-6b8a14353fa5} - RateLimiter - + + + - + \ No newline at end of file From 7009ef85ded008d1b12bb8c54a265dd8fe30bf7d Mon Sep 17 00:00:00 2001 From: Jarl Gullberg Date: Wed, 29 Jul 2020 12:58:16 +0200 Subject: [PATCH 5/9] Ensure documentation has access to the reference assemblies. --- RateLimiter.Documentation/RateLimiter.Documentation.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/RateLimiter.Documentation/RateLimiter.Documentation.csproj b/RateLimiter.Documentation/RateLimiter.Documentation.csproj index ca28d53..d5f1fcc 100644 --- a/RateLimiter.Documentation/RateLimiter.Documentation.csproj +++ b/RateLimiter.Documentation/RateLimiter.Documentation.csproj @@ -11,4 +11,8 @@ + + + + From a2801a0861825296781784efee208339c25df81b Mon Sep 17 00:00:00 2001 From: Jarl Gullberg Date: Wed, 29 Jul 2020 12:58:23 +0200 Subject: [PATCH 6/9] Remove redundant files. --- RateLimiter.Example/App.config | 6 ---- .../Properties/AssemblyInfo.cs | 36 ------------------- RateLimiter.Example/packages.config | 6 ---- 3 files changed, 48 deletions(-) delete mode 100644 RateLimiter.Example/App.config delete mode 100644 RateLimiter.Example/Properties/AssemblyInfo.cs delete mode 100644 RateLimiter.Example/packages.config diff --git a/RateLimiter.Example/App.config b/RateLimiter.Example/App.config deleted file mode 100644 index 56efbc7..0000000 --- a/RateLimiter.Example/App.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/RateLimiter.Example/Properties/AssemblyInfo.cs b/RateLimiter.Example/Properties/AssemblyInfo.cs deleted file mode 100644 index cf45e02..0000000 --- a/RateLimiter.Example/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("RateLimiter.Example")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("RateLimiter.Example")] -[assembly: AssemblyCopyright("Copyright © 2019")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("dbda5e30-34ce-4738-bc0a-5dfd7fb0ce16")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/RateLimiter.Example/packages.config b/RateLimiter.Example/packages.config deleted file mode 100644 index e91121e..0000000 --- a/RateLimiter.Example/packages.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file From e44302aa8527d6ba46fab16cd12a3f2aebeebf2f Mon Sep 17 00:00:00 2001 From: Jarl Gullberg Date: Wed, 29 Jul 2020 13:04:21 +0200 Subject: [PATCH 7/9] Disable DocFx when not building with Mono or .NET Framework. --- RateLimiter.Documentation/RateLimiter.Documentation.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/RateLimiter.Documentation/RateLimiter.Documentation.csproj b/RateLimiter.Documentation/RateLimiter.Documentation.csproj index d5f1fcc..24fa32d 100644 --- a/RateLimiter.Documentation/RateLimiter.Documentation.csproj +++ b/RateLimiter.Documentation/RateLimiter.Documentation.csproj @@ -15,4 +15,8 @@ + + false + + From eeb37b55f1c3e1860e025ab094a3bf30cc213307 Mon Sep 17 00:00:00 2001 From: David Date: Thu, 29 Oct 2020 19:30:07 -0300 Subject: [PATCH 8/9] Improving test --- RateLimiter.Tests/Sample.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RateLimiter.Tests/Sample.cs b/RateLimiter.Tests/Sample.cs index 52ed75b..0115776 100644 --- a/RateLimiter.Tests/Sample.cs +++ b/RateLimiter.Tests/Sample.cs @@ -121,7 +121,7 @@ public async Task UsageWithFactory() await cancellable.Should().ThrowAsync(); var res = await timeLimited.GetValue(); - res.Should().Be(56); + res.Should().BeLessOrEqualTo(56); } [Fact(Skip = "for demo purpose only")] From d97c849cfc7ced91935985c09b9c8a42c64fe04d Mon Sep 17 00:00:00 2001 From: Desmaisons Date: Mon, 2 Nov 2020 18:36:24 -0300 Subject: [PATCH 9/9] Updating references --- RateLimiter.Example/RateLimiter.Example.csproj | 2 +- RateLimiter.Tests/RateLimiter.Tests.csproj | 4 ++-- RateLimiter/RateLimiter.csproj | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/RateLimiter.Example/RateLimiter.Example.csproj b/RateLimiter.Example/RateLimiter.Example.csproj index 46dd395..62c26ec 100644 --- a/RateLimiter.Example/RateLimiter.Example.csproj +++ b/RateLimiter.Example/RateLimiter.Example.csproj @@ -7,7 +7,7 @@ - + diff --git a/RateLimiter.Tests/RateLimiter.Tests.csproj b/RateLimiter.Tests/RateLimiter.Tests.csproj index a5fe60b..ccd0365 100644 --- a/RateLimiter.Tests/RateLimiter.Tests.csproj +++ b/RateLimiter.Tests/RateLimiter.Tests.csproj @@ -7,8 +7,8 @@ - - + + 5.6.0 diff --git a/RateLimiter/RateLimiter.csproj b/RateLimiter/RateLimiter.csproj index 6f1b555..0135b87 100644 --- a/RateLimiter/RateLimiter.csproj +++ b/RateLimiter/RateLimiter.csproj @@ -28,7 +28,7 @@ Features: - +