Merge pull request #17 from sa-es-ir/feature/upgrade-to-dotnet8

Upgrade to version 1.0.8 to support .NET 8
sa-es-ir · Dec 26, 2023 · 25da204 · 25da204
2 parents e095167 + 23befe2
commit 25da204
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 17 deletions.
diff --git a/demo/DotNet.RateLimiter.Demo/DotNet.RateLimiter.Demo.csproj b/demo/DotNet.RateLimiter.Demo/DotNet.RateLimiter.Demo.csproj
@@ -1,16 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
 	<PropertyGroup>
-		<TargetFramework>net7.0</TargetFramework>
+		<TargetFramework>net8.0</TargetFramework>
 		<AssemblyName>DotNet.RateLimiter.Demo</AssemblyName>
 		<RootNamespace>DotNet.RateLimiter.Demo</RootNamespace>
 		<Nullable>disable</Nullable>
 		<ImplicitUsings>enable</ImplicitUsings>
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="DotNetRateLimiter" Version="1.0.7" />
-		<PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />
+		<PackageReference Include="DotNetRateLimiter" Version="1.0.8" />
+		<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
 	</ItemGroup>
 
 	<!--<ItemGroup>

diff --git a/src/DotNet.RateLimiter/DotNet.RateLimiter.csproj b/src/DotNet.RateLimiter/DotNet.RateLimiter.csproj
@@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFrameworks>netstandard2.1;netstandard2.0;netcoreapp3.1;net5.0;net6.0;net7.0</TargetFrameworks>
+		<TargetFrameworks>netstandard2.1;netstandard2.0;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0</TargetFrameworks>
 		<AssemblyName>DotNet.RateLimiter</AssemblyName>
 		<RootNamespace>DotNet.RateLimiter</RootNamespace>
 		<GenerateDocumentationFile>true</GenerateDocumentationFile>
 		<NoWarn>$(NoWarn);1591</NoWarn>
-		<Version>1.0.7</Version>
+		<Version>1.0.8</Version>
 		<LangVersion>preview</LangVersion>
 		<Authors>Saeed Esmaeelinejad</Authors>
 		<PackageId>DotNetRateLimiter</PackageId>
@@ -33,6 +33,11 @@
 		<PackageReference Include="Microsoft.Extensions.Hosting" Version="3.1.0" />
 	</ItemGroup>
 
+	<ItemGroup Condition="$(TargetFramework) == 'net8.0'">
+		<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="8.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
+	</ItemGroup>
+
 	<ItemGroup Condition="$(TargetFramework) == 'net7.0'">
 		<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="7.0.0" />
 		<PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.0" />
@@ -53,15 +58,16 @@
 		<PackageReference Include="Microsoft.Extensions.Hosting" Version="3.1.0" />
 	</ItemGroup>
 
-	<ItemGroup Condition="$(TargetFramework) == 'netcoreapp3.1' Or $(TargetFramework) == 'net5.0' Or $(TargetFramework) == 'net6.0' Or $(TargetFramework) == 'net7.0'">
+	<ItemGroup
+		Condition="$(TargetFramework) == 'netcoreapp3.1' Or $(TargetFramework) == 'net5.0' Or $(TargetFramework) == 'net6.0' Or $(TargetFramework) == 'net7.0' Or $(TargetFramework) == 'net8.0'">
 		<FrameworkReference Include="Microsoft.AspNetCore.App" />
 	</ItemGroup>
 
 	<ItemGroup>
 		<PackageReference Include="AsyncKeyedLock" Version="6.2.4" />
 		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
 		<PackageReference Include="RedLock.net" Version="2.3.2" />
-		<PackageReference Include="StackExchange.Redis" Version="2.6.104" />
+		<PackageReference Include="StackExchange.Redis" Version="2.7.10" />
 	</ItemGroup>
 
 </Project>
diff --git a/test/DotNet.RateLimiter.Test/DotNet.RateLimiter.Test.csproj b/test/DotNet.RateLimiter.Test/DotNet.RateLimiter.Test.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFramework>net6.0</TargetFramework>
+		<TargetFramework>net8.0</TargetFramework>
 		<Nullable>enable</Nullable>
 
 		<IsPackable>false</IsPackable>
@@ -14,9 +14,9 @@
 
 	<ItemGroup>
 		<Content Include="appsettings_redis.json">
-		  <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		  <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
-		  <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+			<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
+			<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
 		</Content>
 		<Content Include="appsettings.json">
 			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
@@ -26,15 +26,15 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="FluentAssertions" Version="6.0.0" />
-		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
-		<PackageReference Include="xunit" Version="2.4.1" />
-		<PackageReference Include="Xunit.DependencyInjection" Version="8.3.0" />
-		<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+		<PackageReference Include="FluentAssertions" Version="6.12.0" />
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+		<PackageReference Include="xunit" Version="2.6.3" />
+		<PackageReference Include="Xunit.DependencyInjection" Version="8.9.1" />
+		<PackageReference Include="xunit.runner.visualstudio" Version="2.5.5">
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 			<PrivateAssets>all</PrivateAssets>
 		</PackageReference>
-		<PackageReference Include="coverlet.collector" Version="3.1.0">
+		<PackageReference Include="coverlet.collector" Version="6.0.0">
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 			<PrivateAssets>all</PrivateAssets>
 		</PackageReference>