Skip to content

Commit 4afae32

Browse files
committed
feat: move api to other nuget package
1 parent 01e59ad commit 4afae32

File tree

16 files changed

+140
-36
lines changed

16 files changed

+140
-36
lines changed

CacheManager.Database/CacheManager.Database.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
<RepositoryType>public</RepositoryType>
1919
<PackageTags>CacheManager.Database</PackageTags>
2020
<PackageReleaseNotes>CacheManager.Database</PackageReleaseNotes>
21-
<AssemblyVersion>1.2.0</AssemblyVersion>
22-
<FileVersion>1.2.0</FileVersion>
23-
<Version>1.2.0</Version>
21+
<AssemblyVersion>2.0.0</AssemblyVersion>
22+
<FileVersion>2.0.0</FileVersion>
23+
<Version>2.0.0</Version>
2424
<SignAssembly>true</SignAssembly>
2525
<AssemblyOriginatorKeyFile>..\CacheManager\MHKarami97.snk</AssemblyOriginatorKeyFile>
2626
<PublicSign>true</PublicSign>

CacheManager.Redis/CacheManager.Redis.csproj

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
<RepositoryType>public</RepositoryType>
1919
<PackageTags>CacheManager.Redis</PackageTags>
2020
<PackageReleaseNotes>CacheManager.Redis</PackageReleaseNotes>
21-
<AssemblyVersion>1.2.0</AssemblyVersion>
22-
<FileVersion>1.2.0</FileVersion>
23-
<Version>1.2.0</Version>
21+
<AssemblyVersion>2.0.0</AssemblyVersion>
22+
<FileVersion>2.0.0</FileVersion>
23+
<Version>2.0.0</Version>
2424
<SignAssembly>true</SignAssembly>
2525
<AssemblyOriginatorKeyFile>..\CacheManager\MHKarami97.snk</AssemblyOriginatorKeyFile>
2626
<PublicSign>true</PublicSign>
@@ -41,6 +41,7 @@
4141

4242
<ItemGroup>
4343
<PackageReference Include="StackExchange.Redis" Version="2.8.16"/>
44+
<PackageReference Include="System.Text.Json" Version="9.0.0" />
4445
</ItemGroup>
4546

4647
<ItemGroup>

CacheManager.sln

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CacheManager.Database", "Ca
4242
EndProject
4343
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{7735FEB7-0AE9-4365-91C1-FC7325517028}"
4444
EndProject
45+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CacheManagerApi", "CacheManagerApi\CacheManagerApi.csproj", "{02DC18A6-A790-4B2C-922F-AE8A78ACC81A}"
46+
EndProject
4547
Global
4648
GlobalSection(SolutionConfigurationPlatforms) = preSolution
4749
Debug|Any CPU = Debug|Any CPU
@@ -72,6 +74,10 @@ Global
7274
{AE17DE23-0E95-445A-A361-8283479C1218}.Debug|Any CPU.Build.0 = Debug|Any CPU
7375
{AE17DE23-0E95-445A-A361-8283479C1218}.Release|Any CPU.ActiveCfg = Release|Any CPU
7476
{AE17DE23-0E95-445A-A361-8283479C1218}.Release|Any CPU.Build.0 = Release|Any CPU
77+
{02DC18A6-A790-4B2C-922F-AE8A78ACC81A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
78+
{02DC18A6-A790-4B2C-922F-AE8A78ACC81A}.Debug|Any CPU.Build.0 = Debug|Any CPU
79+
{02DC18A6-A790-4B2C-922F-AE8A78ACC81A}.Release|Any CPU.ActiveCfg = Release|Any CPU
80+
{02DC18A6-A790-4B2C-922F-AE8A78ACC81A}.Release|Any CPU.Build.0 = Release|Any CPU
7581
EndGlobalSection
7682
GlobalSection(NestedProjects) = preSolution
7783
{5785ED27-927D-4C46-A6E9-AF8C3123295A} = {7735FEB7-0AE9-4365-91C1-FC7325517028}

CacheManager/CacheBuilder.cs

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -31,28 +31,6 @@ public CacheBuilder AddMemory(MemoryConfig memoryConfig, int priority = 1)
3131
return this;
3232
}
3333

34-
/// <summary>
35-
/// Add Api Cache
36-
/// </summary>
37-
/// <param name="apiConfig">Config</param>
38-
/// <param name="priority">Default is 2</param>
39-
/// <returns>CacheBuilder</returns>
40-
public CacheBuilder AddApi(ApiConfig apiConfig, int priority = 2)
41-
{
42-
#if NET8_0_OR_GREATER
43-
ArgumentNullException.ThrowIfNull(apiConfig);
44-
#else
45-
if (apiConfig is null)
46-
{
47-
throw new ArgumentNullException(nameof(apiConfig));
48-
}
49-
#endif
50-
51-
_cacheSources.Add(new ApiCacheSourceWithGet(apiConfig, priority));
52-
53-
return this;
54-
}
55-
5634
/// <summary>
5735
/// Add custom cache source
5836
/// </summary>

CacheManager/CacheManager.csproj

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
<RepositoryType>public</RepositoryType>
1919
<PackageTags>CacheManager</PackageTags>
2020
<PackageReleaseNotes>CacheManager</PackageReleaseNotes>
21-
<AssemblyVersion>1.2.0</AssemblyVersion>
22-
<FileVersion>1.2.0</FileVersion>
23-
<Version>1.2.0</Version>
21+
<AssemblyVersion>2.0.0</AssemblyVersion>
22+
<FileVersion>2.0.0</FileVersion>
23+
<Version>2.0.0</Version>
2424
<SignAssembly>true</SignAssembly>
2525
<AssemblyOriginatorKeyFile>MHKarami97.snk</AssemblyOriginatorKeyFile>
2626
<PublicSign>true</PublicSign>
@@ -67,7 +67,6 @@
6767

6868
<ItemGroup>
6969
<PackageReference Include="AsyncKeyedLock" Version="7.1.3"/>
70-
<PackageReference Include="Flurl.Http" Version="4.0.2"/>
7170
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="8.0.1"/>
7271
</ItemGroup>
7372

CacheManagerApi/ApiCacheBuilder.cs

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
using CacheManager;
2+
using CacheManagerApi.CacheSource;
3+
using CacheManagerApi.Config;
4+
5+
namespace CacheManagerApi;
6+
7+
/// <summary>
8+
/// Add Api
9+
/// </summary>
10+
public static class ApiCacheBuilder
11+
{
12+
/// <summary>
13+
/// Add Api
14+
/// </summary>
15+
/// <param name="builder">CacheBuilder</param>
16+
/// <param name="apiConfig">Config</param>
17+
/// <param name="priority">Default is 4</param>
18+
/// <returns>CacheBuilder</returns>
19+
public static CacheBuilder AddApi(this CacheBuilder builder, ApiConfig apiConfig, int priority = 4)
20+
{
21+
#if NET8_0_OR_GREATER
22+
ArgumentNullException.ThrowIfNull(builder);
23+
ArgumentNullException.ThrowIfNull(apiConfig);
24+
#else
25+
if (builder is null)
26+
{
27+
throw new ArgumentNullException(nameof(builder));
28+
}
29+
30+
if (apiConfig is null)
31+
{
32+
throw new ArgumentNullException(nameof(apiConfig));
33+
}
34+
#endif
35+
36+
_ = builder.AddCustom(new ApiCacheSourceWithGet(apiConfig, priority));
37+
38+
return builder;
39+
}
40+
}
Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<TargetFrameworks>net8.0;netstandard2.0;net462</TargetFrameworks>
5+
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
6+
<AnalysisMode>All</AnalysisMode>
7+
<LangVersion>12.0</LangVersion>
8+
<ImplicitUsings>enable</ImplicitUsings>
9+
<Nullable>enable</Nullable>
10+
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
11+
<Title>CacheManager.Api</Title>
12+
<Authors>MHKarami97</Authors>
13+
<Description>Easy Cache Manager Api</Description>
14+
<Copyright>https://github.com/MHKarami97/CacheManager</Copyright>
15+
<PackageProjectUrl>https://github.com/MHKarami97/CacheManager</PackageProjectUrl>
16+
<PackageIcon>icon.jpg</PackageIcon>
17+
<RepositoryUrl>https://github.com/MHKarami97/CacheManager</RepositoryUrl>
18+
<RepositoryType>public</RepositoryType>
19+
<PackageTags>CacheManager.Api</PackageTags>
20+
<PackageReleaseNotes>CacheManager.Api</PackageReleaseNotes>
21+
<AssemblyVersion>2.0.0</AssemblyVersion>
22+
<FileVersion>2.0.0</FileVersion>
23+
<Version>2.0.0</Version>
24+
<SignAssembly>true</SignAssembly>
25+
<AssemblyOriginatorKeyFile>..\CacheManager\MHKarami97.snk</AssemblyOriginatorKeyFile>
26+
<PublicSign>true</PublicSign>
27+
<PackageId>EasyMultiCacheManager.Api</PackageId>
28+
<PackageReadmeFile>README.md</PackageReadmeFile>
29+
<ApplicationIcon>..\icon.ico</ApplicationIcon>
30+
<PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
31+
<IncludeContentInPack>true</IncludeContentInPack>
32+
</PropertyGroup>
33+
34+
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
35+
<DocumentationFile>bin\Debug\CacheManager.Api.xml</DocumentationFile>
36+
</PropertyGroup>
37+
38+
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
39+
<DocumentationFile>bin\Release\CacheManager.Api.xml</DocumentationFile>
40+
</PropertyGroup>
41+
42+
<ItemGroup>
43+
<ProjectReference Include="..\CacheManager\CacheManager.csproj"/>
44+
</ItemGroup>
45+
46+
<ItemGroup>
47+
<None Include="..\icon.jpg">
48+
<Pack>true</Pack>
49+
<PackagePath></PackagePath>
50+
<Visible>True</Visible>
51+
</None>
52+
<None Include="..\LICENSE.txt">
53+
<Pack>true</Pack>
54+
<PackagePath></PackagePath>
55+
<Visible>True</Visible>
56+
</None>
57+
<None Include="..\README.md">
58+
<Pack>true</Pack>
59+
<PackagePath></PackagePath>
60+
<Visible>True</Visible>
61+
</None>
62+
</ItemGroup>
63+
64+
<ItemGroup>
65+
<PackageReference Include="Flurl.Http" Version="4.0.2"/>
66+
</ItemGroup>
67+
68+
</Project>

CacheManager/CacheSource/ApiCacheSourceWithGet.cs renamed to CacheManagerApi/CacheSource/ApiCacheSourceWithGet.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1-
using CacheManager.Config;
1+
using CacheManager;
2+
using CacheManager.CacheSource;
3+
using CacheManagerApi.Config;
24
using Flurl.Http;
35

4-
namespace CacheManager.CacheSource;
6+
namespace CacheManagerApi.CacheSource;
57

68
/// <summary>
79
/// Get from Api
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
namespace CacheManager.Config;
1+
namespace CacheManagerApi.Config;
22

33
/// <summary>
44
/// Config of Redis cache
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
namespace CacheManager.Config;
1+
namespace CacheManagerApi.Config;
22

33
/// <summary>
44
/// api type

0 commit comments

Comments
 (0)