Skip to content

Commit f5af136

Browse files
pianiomarpianiomar
committed
Repository and XmlRepository now targeting .Net Standard 1.5,
2 parents 71b1fb9 + d577ad4 commit f5af136

170 files changed

Lines changed: 3370 additions & 1918 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎SharpRepository.AzureBlobRepository/app.config‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<runtime>
44
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
55
<dependentAssembly>
6-
<assemblyIdentity name="Microsoft.Data.Edm" publicKeyToken="31bf3856ad364e35" culture="neutral" />
7-
<bindingRedirect oldVersion="0.0.0.0-5.6.1.0" newVersion="5.6.1.0" />
6+
<assemblyIdentity name="Microsoft.Data.Edm" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
7+
<bindingRedirect oldVersion="0.0.0.0-5.6.1.0" newVersion="5.6.1.0"/>
88
</dependentAssembly>
99
<dependentAssembly>
10-
<assemblyIdentity name="Microsoft.Data.Services.Client" publicKeyToken="31bf3856ad364e35" culture="neutral" />
11-
<bindingRedirect oldVersion="0.0.0.0-5.6.1.0" newVersion="5.6.1.0" />
10+
<assemblyIdentity name="Microsoft.Data.Services.Client" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
11+
<bindingRedirect oldVersion="0.0.0.0-5.6.1.0" newVersion="5.6.1.0"/>
1212
</dependentAssembly>
1313
<dependentAssembly>
14-
<assemblyIdentity name="Microsoft.Data.OData" publicKeyToken="31bf3856ad364e35" culture="neutral" />
15-
<bindingRedirect oldVersion="0.0.0.0-5.6.1.0" newVersion="5.6.1.0" />
14+
<assemblyIdentity name="Microsoft.Data.OData" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
15+
<bindingRedirect oldVersion="0.0.0.0-5.6.1.0" newVersion="5.6.1.0"/>
1616
</dependentAssembly>
1717
<dependentAssembly>
1818
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />

‎SharpRepository.CacheRepository/packages.config‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<packages>
3+
<package id="Microsoft.Extensions.Caching.Abstractions" version="1.1.1" targetFramework="net451" />
4+
<package id="Microsoft.Extensions.Primitives" version="1.1.0" targetFramework="net451" />
5+
<package id="Microsoft.NETCore.Platforms" version="1.1.0" targetFramework="net451" />
6+
<package id="NETStandard.Library" version="1.6.1" targetFramework="net451" />
7+
<package id="System.Collections" version="4.3.0" targetFramework="net451" />
8+
<package id="System.Collections.Concurrent" version="4.3.0" targetFramework="net451" />
9+
<package id="System.Diagnostics.Debug" version="4.3.0" targetFramework="net451" />
10+
<package id="System.Diagnostics.Tools" version="4.3.0" targetFramework="net451" />
11+
<package id="System.Diagnostics.Tracing" version="4.3.0" targetFramework="net451" />
12+
<package id="System.Globalization" version="4.3.0" targetFramework="net451" />
13+
<package id="System.IO" version="4.3.0" targetFramework="net451" />
14+
<package id="System.IO.Compression" version="4.3.0" targetFramework="net451" />
15+
<package id="System.Linq" version="4.3.0" targetFramework="net451" />
16+
<package id="System.Linq.Expressions" version="4.3.0" targetFramework="net451" />
17+
<package id="System.Net.Http" version="4.3.0" targetFramework="net451" />
18+
<package id="System.Net.Primitives" version="4.3.0" targetFramework="net451" />
19+
<package id="System.ObjectModel" version="4.3.0" targetFramework="net451" />
20+
<package id="System.Reflection" version="4.3.0" targetFramework="net451" />
21+
<package id="System.Reflection.Extensions" version="4.3.0" targetFramework="net451" />
22+
<package id="System.Reflection.Primitives" version="4.3.0" targetFramework="net451" />
23+
<package id="System.Resources.ResourceManager" version="4.3.0" targetFramework="net451" />
24+
<package id="System.Runtime" version="4.3.0" targetFramework="net451" />
25+
<package id="System.Runtime.CompilerServices.Unsafe" version="4.3.0" targetFramework="net451" />
26+
<package id="System.Runtime.Extensions" version="4.3.0" targetFramework="net451" />
27+
<package id="System.Runtime.InteropServices" version="4.3.0" targetFramework="net451" />
28+
<package id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" targetFramework="net451" />
29+
<package id="System.Runtime.Numerics" version="4.3.0" targetFramework="net451" />
30+
<package id="System.Text.Encoding" version="4.3.0" targetFramework="net451" />
31+
<package id="System.Text.Encoding.Extensions" version="4.3.0" targetFramework="net451" />
32+
<package id="System.Text.RegularExpressions" version="4.3.0" targetFramework="net451" />
33+
<package id="System.Threading" version="4.3.0" targetFramework="net451" />
34+
<package id="System.Threading.Tasks" version="4.3.0" targetFramework="net451" />
35+
<package id="System.Threading.Timer" version="4.3.0" targetFramework="net451" />
36+
<package id="System.Xml.ReaderWriter" version="4.3.0" targetFramework="net451" />
37+
<package id="System.Xml.XDocument" version="4.3.0" targetFramework="net451" />
38+
</packages>

‎SharpRepository.Caching.AppFabric/AppFabricCachingProvider.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using System;
2-
using System.Runtime.Caching;
32
using Microsoft.ApplicationServer.Caching;
43
using SharpRepository.Repository.Caching;
4+
using Microsoft.Extensions.Caching.Memory;
55

66
// Reference: http://stackoverflow.com/questions/4739548/appfabric-caching-examples-using-c-sharp
77

@@ -52,7 +52,7 @@ public AppFabricCachingProvider(DataCacheFactory cacheFactory, string cacheName
5252
Cache = String.IsNullOrEmpty(cacheName) ? cacheFactory.GetDefaultCache() : cacheFactory.GetCache(cacheName);
5353
}
5454

55-
public void Set<T>(string key, T value, CacheItemPriority priority = CacheItemPriority.Default, int? cacheTime = null)
55+
public void Set<T>(string key, T value, CacheItemPriority priority = CacheItemPriority.Normal, int? cacheTime = null)
5656
{
5757
if (String.IsNullOrEmpty(key)) throw new ArgumentNullException("key");
5858

@@ -102,7 +102,7 @@ public bool Get<T>(string key, out T value)
102102
return true;
103103
}
104104

105-
public int Increment(string key, int defaultValue, int value, CacheItemPriority priority = CacheItemPriority.Default)
105+
public int Increment(string key, int defaultValue, int value, CacheItemPriority priority = CacheItemPriority.Normal)
106106
{
107107
if (String.IsNullOrEmpty(key)) throw new ArgumentNullException("key");
108108

‎SharpRepository.Caching.Memcached/MemCachedCachingProvider.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
using System;
2-
using System.Runtime.Caching;
32
using Enyim.Caching;
43
using Enyim.Caching.Configuration;
54
using Enyim.Caching.Memcached;
65
using SharpRepository.Repository.Caching;
6+
using Microsoft.Extensions.Caching.Memory;
77

88
namespace SharpRepository.Caching.Memcached
99
{
@@ -92,7 +92,7 @@ public MemcachedCachingProvider(string host, int port, string username = null, s
9292
/// <param name="key">Name of item</param>
9393
/// <param name="priority"></param>
9494
/// <param name="timeoutInSeconds">Seconds to cache</param>
95-
public void Set<T>(string key, T value, CacheItemPriority priority = CacheItemPriority.Default, int? timeoutInSeconds = null)
95+
public void Set<T>(string key, T value, CacheItemPriority priority = CacheItemPriority.Normal, int? timeoutInSeconds = null)
9696
{
9797
if (String.IsNullOrEmpty(key)) throw new ArgumentNullException("key");
9898

@@ -160,7 +160,7 @@ public bool Get<T>(string key, out T value)
160160
return true;
161161
}
162162

163-
public int Increment(string key, int defaultValue, int value, CacheItemPriority priority = CacheItemPriority.Default)
163+
public int Increment(string key, int defaultValue, int value, CacheItemPriority priority = CacheItemPriority.Normal)
164164
{
165165
if (String.IsNullOrEmpty(key)) throw new ArgumentNullException("key");
166166

‎SharpRepository.Caching.Redis/RedisCachingProvider.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using System;
2-
using System.Runtime.Caching;
32
using SharpRepository.Repository.Caching;
43
using StackExchange.Redis;
4+
using Microsoft.Extensions.Caching.Memory;
55

66
namespace SharpRepository.Caching.Redis
77
{
@@ -89,7 +89,7 @@ private void Initialize(ConfigurationOptions configOptions)
8989
/// <param name="key">Name of item</param>
9090
/// <param name="priority"></param>
9191
/// <param name="timeoutInSeconds">Seconds to cache</param>
92-
public void Set<T>(string key, T value, CacheItemPriority priority = CacheItemPriority.Default, int? timeoutInSeconds = null)
92+
public void Set<T>(string key, T value, CacheItemPriority priority = CacheItemPriority.Normal, int? timeoutInSeconds = null)
9393
{
9494
if (String.IsNullOrEmpty(key)) throw new ArgumentNullException("key");
9595

@@ -156,7 +156,7 @@ public bool Get<T>(string key, out T value)
156156
return true;
157157
}
158158

159-
public int Increment(string key, int defaultValue, int value, CacheItemPriority priority = CacheItemPriority.Default)
159+
public int Increment(string key, int defaultValue, int value, CacheItemPriority priority = CacheItemPriority.Normal)
160160
{
161161
if (String.IsNullOrEmpty(key)) throw new ArgumentNullException("key");
162162

‎SharpRepository.Caching.Redis/SharpRepository.Caching.Redis.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@
5454
</PropertyGroup>
5555
<ItemGroup>
5656
<Reference Include="System" />
57+
<Reference Include="System.ComponentModel.Composition" />
5758
<Reference Include="System.Configuration" />
5859
<Reference Include="System.Core" />
5960
<Reference Include="System.Net" />

‎SharpRepository.Caching.WindowsAzure/WindowsAzureCachingProvider.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using System;
2-
using System.Runtime.Caching;
32
using Microsoft.ApplicationServer.Caching;
43
using SharpRepository.Repository.Caching;
4+
using Microsoft.Extensions.Caching.Memory;
55

66
namespace SharpRepository.Caching.WindowsAzure
77
{
@@ -47,7 +47,7 @@ public WindowsAzureCachingProvider(DataCacheFactory cacheFactory, string cacheNa
4747
Cache = String.IsNullOrEmpty(cacheName) ? cacheFactory.GetDefaultCache() : cacheFactory.GetCache(cacheName);
4848
}
4949

50-
public void Set<T>(string key, T value, CacheItemPriority priority = CacheItemPriority.Default, int? cacheTime = null)
50+
public void Set<T>(string key, T value, CacheItemPriority priority = CacheItemPriority.Normal, int? cacheTime = null)
5151
{
5252
if (String.IsNullOrEmpty(key)) throw new ArgumentNullException("key");
5353

@@ -97,7 +97,7 @@ public bool Get<T>(string key, out T value)
9797
return true;
9898
}
9999

100-
public int Increment(string key, int defaultValue, int value, CacheItemPriority priority = CacheItemPriority.Default)
100+
public int Increment(string key, int defaultValue, int value, CacheItemPriority priority = CacheItemPriority.Normal)
101101
{
102102
if (String.IsNullOrEmpty(key)) throw new ArgumentNullException("key");
103103

0 commit comments

Comments
 (0)