Skip to content

Commit 8a6c054

Browse files
MichaConradMichaConrad
committed
Package upgrades to support .NET Standard 2 and the new 2.x Stackexchange.Redis client
1 parent b55f652 commit 8a6c054

26 files changed

Lines changed: 80 additions & 120 deletions

File tree

‎README.md‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,12 @@ Linux, Mono | -
1515

1616
## CacheManager Nuget Packages
1717

18+
> **Important:** The 1.2.x version of CacheManager does only upgrade the .NET Standard support and uses the latest StackExchange.Redis package which comes with some breaking changes (dropped .Signed package).
19+
1820
| Package Name | .Net 4.0 | .Net 4.5 | .NET Standard
1921
|--------------| :-------: | :-------: | :-------:
20-
| [CacheManager.Core][Core.nuget] | x | x | 1.2
21-
| [CacheManager.StackExchange.Redis][Redis.nuget] | - | x | 1.5
22+
| [CacheManager.Core][Core.nuget] | x | x | 1.2, 2.0
23+
| [CacheManager.StackExchange.Redis][Redis.nuget] | - | 4.6.1 | 2.0
2224
| [CacheManager.SystemRuntimeCaching][SystemRuntimeCaching.nuget] | x | x | -
2325
| [CacheManager.Microsoft.Extensions.Caching.Memory][MSCache.nuget] | - | x | 1.3
2426
| [CacheManager.Microsoft.Extensions.Configuration][Configuration.nuget] | - | x | 1.2

‎samples/AspnetCore.WebApp/AspnetCore.WebApp.csproj‎

Lines changed: 3 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp1.0</TargetFramework>
4+
<TargetFramework>netcoreapp2.0</TargetFramework>
55
<PreserveCompilationContext>true</PreserveCompilationContext>
66
<AssemblyName>AspnetCore.WebApp</AssemblyName>
77
<OutputType>Exe</OutputType>
88
<PackageId>AspnetCore.WebApp</PackageId>
9-
<RuntimeFrameworkVersion>1.1.1</RuntimeFrameworkVersion>
109
</PropertyGroup>
1110

1211
<ItemGroup>
@@ -24,24 +23,7 @@
2423
</ItemGroup>
2524

2625
<ItemGroup>
27-
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.1.2" />
28-
<PackageReference Include="Microsoft.AspNetCore.Routing" Version="1.1.1" />
29-
<PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="1.1.1" />
30-
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="1.1.1" />
31-
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="1.1.1" />
32-
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="1.1.1" />
33-
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="1.1.1" />
34-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="1.1.1" />
35-
<PackageReference Include="Microsoft.Extensions.Logging" Version="1.1.1" />
36-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.1" />
37-
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="1.1.1" />
38-
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="1.1.1" />
26+
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0" />
3927
<PackageReference Include="Swashbuckle" Version="6.0.0-beta902" />
40-
<PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="1.1.1" />
4128
</ItemGroup>
42-
43-
<ItemGroup>
44-
<DotNetCliToolReference Include="Microsoft.DotNet.Watcher.Tools" Version="1.0.0" />
45-
</ItemGroup>
46-
47-
</Project>
29+
</Project>

‎samples/CacheManager.Examples/CacheManager.Examples.csproj‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<Description>CacheManager.Examples Console Application</Description>
55
<Authors>MICHA</Authors>
6-
<TargetFramework>net451</TargetFramework>
6+
<TargetFramework>net462</TargetFramework>
77
<AssemblyName>CacheManager.Examples</AssemblyName>
88
<OutputType>Exe</OutputType>
99
<PackageId>CacheManager.Examples</PackageId>
@@ -20,23 +20,17 @@
2020
</ItemGroup>
2121

2222
<ItemGroup>
23+
<ProjectReference Include="..\..\src\CacheManager.SystemRuntimeCaching\CacheManager.SystemRuntimeCaching.csproj" />
24+
<Reference Include="System" />
25+
<Reference Include="Microsoft.CSharp" />
2326
<ProjectReference Include="..\..\src\CacheManager.Core\CacheManager.Core.csproj" />
2427
<ProjectReference Include="..\..\src\CacheManager.Microsoft.Extensions.Configuration\CacheManager.Microsoft.Extensions.Configuration.csproj" />
2528
<ProjectReference Include="..\..\src\CacheManager.Microsoft.Extensions.Logging\CacheManager.Microsoft.Extensions.Logging.csproj" />
2629
<ProjectReference Include="..\..\src\CacheManager.Serialization.Json\CacheManager.Serialization.Json.csproj" />
2730
<ProjectReference Include="..\..\src\CacheManager.StackExchange.Redis\CacheManager.StackExchange.Redis.csproj" />
28-
</ItemGroup>
2931

30-
<ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
31-
<ProjectReference Include="..\..\src\CacheManager.SystemRuntimeCaching\CacheManager.SystemRuntimeCaching.csproj" />
32-
<Reference Include="System" />
33-
<Reference Include="Microsoft.CSharp" />
34-
</ItemGroup>
35-
36-
<ItemGroup>
3732
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="1.0.2" />
3833
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.0.2" />
39-
<PackageReference Include="Unity" Version="4.0.1" />
34+
<PackageReference Include="Unity" Version="5.8.11" />
4035
</ItemGroup>
41-
42-
</Project>
36+
</Project>

‎samples/CacheManager.Examples/Program.cs‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,9 @@
22
using System.Threading;
33
using CacheManager.Core;
44
using Microsoft.Extensions.Logging;
5-
#if NET451
6-
using Microsoft.Practices.Unity;
7-
#else
85
using Unity;
9-
#endif
6+
using Unity.Injection;
7+
using Unity.Lifetime;
108

119
namespace CacheManager.Examples
1210
{
@@ -361,4 +359,4 @@ public void PutSomethingIntoTheCache()
361359
_cache.Put("myKey", "something");
362360
}
363361
}
364-
}
362+
}

‎src/CacheManager.Core/CacheManager.Core.csproj‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Import Project="..\..\tools\common.props" />
33
<PropertyGroup>
44
<Description>CacheManager is an open source caching abstraction layer for .NET written in C#. It supports various cache providers and implements many advanced features. The Core library contains all base interfaces and tools. You should install at least one other CacheManager package to get cache handle implementations.</Description>
5-
<TargetFrameworks>net40;net45;netstandard1.2</TargetFrameworks>
5+
<TargetFrameworks>net40;net45;netstandard1.2;netstandard2</TargetFrameworks>
66
<GeneratePackageOnBuild>False</GeneratePackageOnBuild>
77
<PackageTags>Caching;Cache;CacheManager;Distributed Cache;StackExchange Redis;Azure AppFabric;Memcached</PackageTags>
88
</PropertyGroup>
@@ -15,6 +15,7 @@
1515
<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.2' ">
1616
<DefineConstants>$(DefineConstants);NETSTANDARD</DefineConstants>
1717
</PropertyGroup>
18-
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.2' ">
19-
</ItemGroup>
18+
<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2' ">
19+
<DefineConstants>$(DefineConstants);NETSTANDARD</DefineConstants>
20+
</PropertyGroup>
2021
</Project>

‎src/CacheManager.Couchbase/CacheManager.Couchbase.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Import Project="..\..\tools\common.props" />
33
<PropertyGroup>
44
<Description>CacheManager extension package to work with Couchbase as a distributed cache. CacheManager is an open source caching abstraction layer for .NET written in C#. It supports various cache providers and implements many advanced features.</Description>
5-
<TargetFrameworks>net45;netstandard1.5</TargetFrameworks>
5+
<TargetFrameworks>net452;netstandard1.5</TargetFrameworks>
66
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
77
<GenerateDocumentationFile>true</GenerateDocumentationFile>
88
<PackageTags>Caching;Cache;CacheManager;Distributed Cache;StackExchange Redis;Azure AppFabric;Memcached</PackageTags>
@@ -11,9 +11,9 @@
1111
<ProjectReference Include="..\CacheManager.Core\CacheManager.Core.csproj" />
1212
</ItemGroup>
1313
<ItemGroup>
14-
<PackageReference Include="CouchbaseNetClient" Version="2.4.4" />
14+
<PackageReference Include="CouchbaseNetClient" Version="2.5.0" />
1515
</ItemGroup>
16-
<ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
16+
<ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
1717
<Reference Include="System.Configuration" />
1818
</ItemGroup>
1919
</Project>

‎src/CacheManager.Microsoft.Extensions.Caching.Memory/CacheManager.Microsoft.Extensions.Caching.Memory.csproj‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,18 @@
33
<PropertyGroup>
44
<Description>CacheManager is an open source caching abstraction layer for .NET written in C#. It supports various cache providers and implements many advanced features. This package contains the specific cache handle for Microsoft.Extensions.Caching.Memory.</Description>
55
<Authors>MichaConrad;AuroraDysis</Authors>
6-
<TargetFrameworks>net451;netstandard1.3</TargetFrameworks>
6+
<TargetFrameworks>net451;netstandard1.3;netstandard2</TargetFrameworks>
77
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
88
<GenerateDocumentationFile>true</GenerateDocumentationFile>
99
<PackageTags>Caching;Cache;CacheManager;Distributed Cache;StackExchange Redis;Azure AppFabric;Memcached</PackageTags>
1010
</PropertyGroup>
1111
<ItemGroup>
1212
<ProjectReference Include="..\CacheManager.Core\CacheManager.Core.csproj" />
1313
</ItemGroup>
14-
<ItemGroup>
14+
<ItemGroup Condition=" '$(TargetFramework)' != 'netstandard2' ">
1515
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="1.0.2" />
1616
</ItemGroup>
17-
<ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
18-
</ItemGroup>
19-
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
17+
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2' ">
18+
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="2.0.0" />
2019
</ItemGroup>
2120
</Project>

‎src/CacheManager.Microsoft.Extensions.Configuration/CacheManager.Microsoft.Extensions.Configuration.csproj‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,26 @@
22
<Import Project="..\..\tools\common.props" />
33
<PropertyGroup>
44
<Description>CacheManager extension package to use Microsoft.Extensions.Configuration to configure the CacheManager instance. CacheManager is an open source caching abstraction layer for .NET written in C#. This is the ASP.NET Core configuration integration package.</Description>
5-
<TargetFrameworks>net45;netstandard1.2</TargetFrameworks>
5+
<TargetFrameworks>net45;netstandard1.2;netstandard2</TargetFrameworks>
66
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
77
<GenerateDocumentationFile>true</GenerateDocumentationFile>
88
<PackageTags>Caching;Cache;CacheManager;Distributed Cache;StackExchange Redis;Azure AppFabric;Memcached</PackageTags>
99
</PropertyGroup>
1010
<ItemGroup>
1111
<ProjectReference Include="..\CacheManager.Core\CacheManager.Core.csproj" />
1212
</ItemGroup>
13-
<ItemGroup>
13+
<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.2' ">
14+
<DefineConstants>$(DefineConstants);NETSTANDARD</DefineConstants>
15+
</PropertyGroup>
16+
17+
<ItemGroup Condition=" '$(TargetFramework)' != 'netstandard2' ">
1418
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="1.0.2" />
1519
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="1.0.2" />
1620
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="1.0.2" />
1721
</ItemGroup>
18-
<ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
19-
</ItemGroup>
20-
<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.2' ">
21-
<DefineConstants>$(DefineConstants);NETSTANDARD</DefineConstants>
22-
</PropertyGroup>
23-
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.2' ">
22+
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2' ">
23+
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="2.0.0" />
24+
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="2.0.0" />
25+
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="2.0.0" />
2426
</ItemGroup>
2527
</Project>

‎src/CacheManager.Microsoft.Extensions.Logging/CacheManager.Microsoft.Extensions.Logging.csproj‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,18 @@
22
<Import Project="..\..\tools\common.props" />
33
<PropertyGroup>
44
<Description>CacheManager extension package to work with Microsoft.Extensions.Logging as logging provider. CacheManager is an open source caching abstraction layer for .NET written in C#. The ASP.NET Core logging provides a bridge to the Microsoft.Extensions.Logging framework.</Description>
5-
<TargetFrameworks>net45;netstandard1.2</TargetFrameworks>
5+
<TargetFrameworks>net45;netstandard1.2;netstandard2</TargetFrameworks>
66
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
77
<GenerateDocumentationFile>true</GenerateDocumentationFile>
88
<PackageTags>Caching;Cache;CacheManager;Distributed Cache;StackExchange Redis;Azure AppFabric;Memcached</PackageTags>
99
</PropertyGroup>
1010
<ItemGroup>
1111
<ProjectReference Include="..\CacheManager.Core\CacheManager.Core.csproj" />
1212
</ItemGroup>
13-
<ItemGroup>
13+
<ItemGroup Condition=" '$(TargetFramework)' != 'netstandard2' ">
1414
<PackageReference Include="Microsoft.Extensions.Logging" Version="1.0.2" />
1515
</ItemGroup>
16-
<ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
17-
</ItemGroup>
18-
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.2' ">
16+
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2' ">
17+
<PackageReference Include="Microsoft.Extensions.Logging" Version="2.0.0" />
1918
</ItemGroup>
2019
</Project>

‎src/CacheManager.Serialization.Json/CacheManager.Serialization.Json.csproj‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,18 @@
22
<Import Project="..\..\tools\common.props" />
33
<PropertyGroup>
44
<Description>CacheManager extension package providing JSON serialization for distributed caches. CacheManager is an open source caching abstraction layer for .NET written in C#. It supports various cache providers and implements many advanced features. The Core library contains a Newtonsoft.Json based serializer implementation which can be used instead of the default binary serializer.</Description>
5-
<TargetFrameworks>netstandard1.2;net40;net45</TargetFrameworks>
5+
<TargetFrameworks>netstandard2;netstandard1.2;net40;net45</TargetFrameworks>
66
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
77
<GenerateDocumentationFile>true</GenerateDocumentationFile>
88
<PackageTags>Caching;Cache;CacheManager;Distributed Cache;StackExchange Redis;Azure AppFabric;Memcached</PackageTags>
99
</PropertyGroup>
1010
<ItemGroup>
11-
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
1211
<ProjectReference Include="..\CacheManager.Core\CacheManager.Core.csproj" />
1312
</ItemGroup>
14-
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.2' ">
15-
</ItemGroup>
16-
<ItemGroup Condition=" '$(TargetFramework)' == 'net40' ">
13+
<ItemGroup Condition=" '$(TargetFramework)' != 'netstandard2' ">
14+
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
1715
</ItemGroup>
18-
<ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
16+
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2' ">
17+
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
1918
</ItemGroup>
2019
</Project>

0 commit comments

Comments
 (0)