Skip to content

Commit

Permalink
Fix build, remove end-of-support target frameworks
Browse files Browse the repository at this point in the history
  • Loading branch information
cristipufu committed Dec 3, 2022
1 parent 4a7b74e commit 7226be8
Show file tree
Hide file tree
Showing 6 changed files with 95 additions and 130 deletions.
77 changes: 37 additions & 40 deletions src/AspNetCoreRateLimit.Redis/AspNetCoreRateLimit.Redis.csproj
Original file line number Diff line number Diff line change
@@ -1,44 +1,41 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netcoreapp3.1;netstandard2.0;net5.0;net6.0;</TargetFrameworks>
<Description>StackExchange Redis support for ASP.NET Core rate limiting middleware</Description>
<Authors>Nick Cromwell, Cristi Pufu</Authors>
<AssemblyName>AspNetCoreRateLimit.Redis</AssemblyName>
<PackageId>AspNetCoreRateLimit.Redis</PackageId>
<PackageTags>aspnetcore;rate-limit;throttle;redis</PackageTags>
<PackageProjectUrl>https://github.com/stefanprodan/AspNetCoreRateLimit</PackageProjectUrl>
<PackageLicense>http://opensource.org/licenses/MIT</PackageLicense>
<RepositoryType>git</RepositoryType>
<RepositoryUrl>https://github.com/stefanprodan/AspNetCoreRateLimit</RepositoryUrl>
<LangVersion>9</LangVersion>
<Version>1.0.1</Version>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>../../sgKey.snk</AssemblyOriginatorKeyFile>
<DelaySign>false</DelaySign>
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<EmbedUntrackedSources>true</EmbedUntrackedSources>
<DebugType>embedded</DebugType>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="StackExchange.Redis" Version="2.6.80" />
</ItemGroup>

<ItemGroup Condition="'$(Configuration)' == 'Release'">
<PackageReference Include="AspNetCoreRateLimit" Version="4.0.2" />
</ItemGroup>

<ItemGroup Condition="'$(Configuration)' == 'Debug' or '$(APPVEYOR)' == 'true'">
<ProjectReference Include="..\AspNetCoreRateLimit\AspNetCoreRateLimit.csproj" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
</ItemGroup>
<PropertyGroup>
<TargetFrameworks>net6.0</TargetFrameworks>
<Description>StackExchange Redis support for ASP.NET Core rate limiting middleware</Description>
<Authors>Nick Cromwell, Cristi Pufu</Authors>
<AssemblyName>AspNetCoreRateLimit.Redis</AssemblyName>
<PackageId>AspNetCoreRateLimit.Redis</PackageId>
<PackageTags>aspnetcore;rate-limit;throttle;redis</PackageTags>
<PackageProjectUrl>https://github.com/stefanprodan/AspNetCoreRateLimit</PackageProjectUrl>
<PackageLicense>http://opensource.org/licenses/MIT</PackageLicense>
<RepositoryType>git</RepositoryType>
<RepositoryUrl>https://github.com/stefanprodan/AspNetCoreRateLimit</RepositoryUrl>
<Version>2.0.0</Version>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>../../sgKey.snk</AssemblyOriginatorKeyFile>
<DelaySign>false</DelaySign>
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<EmbedUntrackedSources>true</EmbedUntrackedSources>
<DebugType>embedded</DebugType>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="StackExchange.Redis" Version="2.6.80" />
</ItemGroup>
<ItemGroup Condition="'$(Configuration)' == 'Release'">
<PackageReference Include="AspNetCoreRateLimit" Version="5.0.0" />
</ItemGroup>
<ItemGroup Condition="'$(Configuration)' == 'Debug' or '$(APPVEYOR)' == 'true'">
<ProjectReference Include="..\AspNetCoreRateLimit\AspNetCoreRateLimit.csproj" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
</ItemGroup>

<PropertyGroup Condition="'$(APPVEYOR)' == 'true'">
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
</PropertyGroup>

<PropertyGroup Condition="'$(APPVEYOR)' == 'true'">
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
</PropertyGroup>

</Project>
3 changes: 2 additions & 1 deletion src/AspNetCoreRateLimit.Redis/RedisProcessingStrategy.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using Microsoft.Extensions.Logging;
using AspNetCoreRateLimit;
using Microsoft.Extensions.Logging;
using StackExchange.Redis;
using System;
using System.Threading;
Expand Down
107 changes: 38 additions & 69 deletions src/AspNetCoreRateLimit/AspNetCoreRateLimit.csproj
Original file line number Diff line number Diff line change
@@ -1,73 +1,42 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netcoreapp3.1;netstandard2.0;net5.0;net6.0</TargetFrameworks>
<Description>ASP.NET Core rate limiting middleware</Description>
<Authors>Stefan Prodan, Cristi Pufu</Authors>
<AssemblyName>AspNetCoreRateLimit</AssemblyName>
<PackageId>AspNetCoreRateLimit</PackageId>
<PackageTags>aspnetcore;rate-limit;throttle</PackageTags>
<PackageProjectUrl>https://github.com/stefanprodan/AspNetCoreRateLimit</PackageProjectUrl>
<PackageLicense>http://opensource.org/licenses/MIT</PackageLicense>
<RepositoryType>git</RepositoryType>
<RepositoryUrl>https://github.com/stefanprodan/AspNetCoreRateLimit</RepositoryUrl>
<LangVersion>9</LangVersion>
<Version>4.0.2</Version>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>../../sgKey.snk</AssemblyOriginatorKeyFile>
<DelaySign>false</DelaySign>
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<EmbedUntrackedSources>true</EmbedUntrackedSources>
<DebugType>embedded</DebugType>
</PropertyGroup>

<ItemGroup Condition="$(TargetFramework) == 'netstandard2.0'">
<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.1.0" />
<PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="2.1.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.1.0" />
<PackageReference Include="Microsoft.Extensions.Options" Version="2.1.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
</ItemGroup>

<ItemGroup Condition="$(TargetFramework) == 'netcoreapp3.1'">
<PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="3.1.9" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.9" />
<PackageReference Include="Microsoft.Extensions.Options" Version="3.1.9" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
</ItemGroup>

<ItemGroup Condition="$(TargetFramework) == 'net5.0'">
<PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="5.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="5.0.0" />
<PackageReference Include="Microsoft.Extensions.Options" Version="5.0.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
</ItemGroup>

<ItemGroup Condition="$(TargetFramework) == 'net6.0'">
<PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.1" />
<PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
</ItemGroup>

<ItemGroup Condition="$(TargetFramework) == 'netcoreapp3.1'">
<FrameworkReference Include="Microsoft.AspNetCore.App" />
</ItemGroup>

<ItemGroup Condition="$(TargetFramework) == 'net5.0'">
<FrameworkReference Include="Microsoft.AspNetCore.App" />
</ItemGroup>

<ItemGroup Condition="$(TargetFramework) == 'net6.0'">
<FrameworkReference Include="Microsoft.AspNetCore.App" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
</ItemGroup>

<PropertyGroup Condition="'$(APPVEYOR)' == 'true'">
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
</PropertyGroup>
<PropertyGroup>
<TargetFrameworks>net6.0</TargetFrameworks>
<Description>ASP.NET Core rate limiting middleware</Description>
<Authors>Stefan Prodan, Cristi Pufu</Authors>
<AssemblyName>AspNetCoreRateLimit</AssemblyName>
<PackageId>AspNetCoreRateLimit</PackageId>
<PackageTags>aspnetcore;rate-limit;throttle</PackageTags>
<PackageProjectUrl>https://github.com/stefanprodan/AspNetCoreRateLimit</PackageProjectUrl>
<PackageLicense>http://opensource.org/licenses/MIT</PackageLicense>
<RepositoryType>git</RepositoryType>
<RepositoryUrl>https://github.com/stefanprodan/AspNetCoreRateLimit</RepositoryUrl>
<Version>5.0.0</Version>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>../../sgKey.snk</AssemblyOriginatorKeyFile>
<DelaySign>false</DelaySign>
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<EmbedUntrackedSources>true</EmbedUntrackedSources>
<DebugType>embedded</DebugType>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.3" />
<PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
</ItemGroup>

<ItemGroup>
<FrameworkReference Include="Microsoft.AspNetCore.App" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
</ItemGroup>

<PropertyGroup Condition="'$(APPVEYOR)' == 'true'">
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
</PropertyGroup>

</Project>
31 changes: 16 additions & 15 deletions test/AspNetCoreRateLimit.Demo/AspNetCoreRateLimit.Demo.csproj
Original file line number Diff line number Diff line change
@@ -1,20 +1,21 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
<LangVersion>9</LangVersion>
</PropertyGroup>
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Ben.BlockingDetector" Version="0.0.4" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.10" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Ben.BlockingDetector" Version="0.0.4" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\src\AspNetCoreRateLimit.Redis\AspNetCoreRateLimit.Redis.csproj" />
<ProjectReference Include="..\..\src\AspNetCoreRateLimit\AspNetCoreRateLimit.csproj" />
</ItemGroup>
<ItemGroup Condition="'$(Configuration)' == 'Release'">
<PackageReference Include="AspNetCoreRateLimit" Version="5.0.0" />
<PackageReference Include="AspNetCoreRateLimit.Redis" Version="2.0.0" />
</ItemGroup>

<ItemGroup Condition="'$(Configuration)' == 'Debug' or '$(APPVEYOR)' == 'true'">
<ProjectReference Include="..\..\src\AspNetCoreRateLimit.Redis\AspNetCoreRateLimit.Redis.csproj" />
<ProjectReference Include="..\..\src\AspNetCoreRateLimit\AspNetCoreRateLimit.csproj" />
</ItemGroup>

</Project>
3 changes: 1 addition & 2 deletions test/AspNetCoreRateLimit.Demo/Startup.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
using AspNetCoreRateLimit.Redis;
using Ben.Diagnostics;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
Expand Down Expand Up @@ -39,7 +38,7 @@ public void ConfigureServices(IServiceCollection services)
{
options.EnableEndpointRouting = false;
}).AddNewtonsoftJson();
});


// configure the resolvers
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
<TargetFramework>net6.0</TargetFramework>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
<LangVersion>9.0</LangVersion>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
Expand All @@ -14,8 +13,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="6.0.10" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.10" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="6.0.11" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
<PackageReference Include="xunit" Version="2.4.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
Expand Down

0 comments on commit 7226be8

Please sign in to comment.