Merge branch 'release/2.2'

aspnet · Oct 11, 2018 · b7cda01 · b7cda01
2 parents 76c7736 + 3055d01
commit b7cda01
Show file tree

Hide file tree

Showing 16 changed files with 1,333 additions and 2 deletions.
diff --git a/Caching.sln b/Caching.sln
@@ -48,6 +48,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		Directory.Build.targets = Directory.Build.targets
 	EndProjectSection
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Caching.StackExchangeRedis", "src\Microsoft.Extensions.Caching.StackExchangeRedis\Microsoft.Extensions.Caching.StackExchangeRedis.csproj", "{841A5E5E-0129-4BFB-9400-261639AE92CF}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Caching.StackExchangeRedis.Tests", "test\Microsoft.Extensions.Caching.StackExchangeRedis.Tests\Microsoft.Extensions.Caching.StackExchangeRedis.Tests.csproj", "{9D279B70-4EAE-4AE2-A1DE-3871DBE4779B}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -226,6 +230,30 @@ Global
 		{17E332EB-D18D-4BF5-BCA5-989E36C78B79}.Release|x64.Build.0 = Release|Any CPU
 		{17E332EB-D18D-4BF5-BCA5-989E36C78B79}.Release|x86.ActiveCfg = Release|Any CPU
 		{17E332EB-D18D-4BF5-BCA5-989E36C78B79}.Release|x86.Build.0 = Release|Any CPU
+		{841A5E5E-0129-4BFB-9400-261639AE92CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{841A5E5E-0129-4BFB-9400-261639AE92CF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{841A5E5E-0129-4BFB-9400-261639AE92CF}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{841A5E5E-0129-4BFB-9400-261639AE92CF}.Debug|x64.Build.0 = Debug|Any CPU
+		{841A5E5E-0129-4BFB-9400-261639AE92CF}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{841A5E5E-0129-4BFB-9400-261639AE92CF}.Debug|x86.Build.0 = Debug|Any CPU
+		{841A5E5E-0129-4BFB-9400-261639AE92CF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{841A5E5E-0129-4BFB-9400-261639AE92CF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{841A5E5E-0129-4BFB-9400-261639AE92CF}.Release|x64.ActiveCfg = Release|Any CPU
+		{841A5E5E-0129-4BFB-9400-261639AE92CF}.Release|x64.Build.0 = Release|Any CPU
+		{841A5E5E-0129-4BFB-9400-261639AE92CF}.Release|x86.ActiveCfg = Release|Any CPU
+		{841A5E5E-0129-4BFB-9400-261639AE92CF}.Release|x86.Build.0 = Release|Any CPU
+		{9D279B70-4EAE-4AE2-A1DE-3871DBE4779B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9D279B70-4EAE-4AE2-A1DE-3871DBE4779B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9D279B70-4EAE-4AE2-A1DE-3871DBE4779B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9D279B70-4EAE-4AE2-A1DE-3871DBE4779B}.Debug|x64.Build.0 = Debug|Any CPU
+		{9D279B70-4EAE-4AE2-A1DE-3871DBE4779B}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{9D279B70-4EAE-4AE2-A1DE-3871DBE4779B}.Debug|x86.Build.0 = Debug|Any CPU
+		{9D279B70-4EAE-4AE2-A1DE-3871DBE4779B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9D279B70-4EAE-4AE2-A1DE-3871DBE4779B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9D279B70-4EAE-4AE2-A1DE-3871DBE4779B}.Release|x64.ActiveCfg = Release|Any CPU
+		{9D279B70-4EAE-4AE2-A1DE-3871DBE4779B}.Release|x64.Build.0 = Release|Any CPU
+		{9D279B70-4EAE-4AE2-A1DE-3871DBE4779B}.Release|x86.ActiveCfg = Release|Any CPU
+		{9D279B70-4EAE-4AE2-A1DE-3871DBE4779B}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -245,6 +273,8 @@ Global
 		{38EFEDCC-1076-4E1F-89C5-443C7FCCEE6A} = {2E14F082-1A04-4E7C-9162-1675119F9A9E}
 		{CD2A826A-A474-4491-94C8-43C557C68067} = {459E1593-2C11-42CB-AD17-F7597E69E5D2}
 		{17E332EB-D18D-4BF5-BCA5-989E36C78B79} = {459E1593-2C11-42CB-AD17-F7597E69E5D2}
+		{841A5E5E-0129-4BFB-9400-261639AE92CF} = {5A04042D-438D-407B-B239-0CAD6A2BD8C2}
+		{9D279B70-4EAE-4AE2-A1DE-3871DBE4779B} = {2E14F082-1A04-4E7C-9162-1675119F9A9E}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {30FC4CB3-9789-4A49-939D-03398DBE03E0}

diff --git a/build/dependencies.props b/build/dependencies.props
@@ -14,11 +14,12 @@
     <MicrosoftExtensionsPrimitivesPackageVersion>3.0.0-alpha1-10584</MicrosoftExtensionsPrimitivesPackageVersion>
     <MicrosoftNETCoreApp20PackageVersion>2.0.9</MicrosoftNETCoreApp20PackageVersion>
     <MicrosoftNETCoreApp21PackageVersion>2.1.3</MicrosoftNETCoreApp21PackageVersion>
-    <MicrosoftNETCoreApp22PackageVersion>2.2.0-preview2-26905-02</MicrosoftNETCoreApp22PackageVersion>
+    <MicrosoftNETCoreApp22PackageVersion>2.2.0-preview3-27001-02</MicrosoftNETCoreApp22PackageVersion>
     <MicrosoftNETTestSdkPackageVersion>15.6.1</MicrosoftNETTestSdkPackageVersion>
     <MoqPackageVersion>4.9.0</MoqPackageVersion>
     <NETStandardLibrary20PackageVersion>2.0.3</NETStandardLibrary20PackageVersion>
     <StackExchangeRedisStrongNamePackageVersion>1.2.6</StackExchangeRedisStrongNamePackageVersion>
+    <StackExchangeRedisPackageVersion>2.0.513</StackExchangeRedisPackageVersion>
     <SystemDataSqlClientPackageVersion>4.6.0-preview1-26907-04</SystemDataSqlClientPackageVersion>
     <XunitPackageVersion>2.3.1</XunitPackageVersion>
     <XunitRunnerVisualStudioPackageVersion>2.4.0</XunitRunnerVisualStudioPackageVersion>

diff --git a/.../RedisCacheServiceCollectionExtensions.cs → ...eRedisCacheServiceCollectionExtensions.cs b/.../RedisCacheServiceCollectionExtensions.cs → ...eRedisCacheServiceCollectionExtensions.cs
diff --git a/...ensions.Caching.StackExchangeRedis/Microsoft.Extensions.Caching.StackExchangeRedis.csproj b/...ensions.Caching.StackExchangeRedis/Microsoft.Extensions.Caching.StackExchangeRedis.csproj
@@ -0,0 +1,20 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <Description>Distributed cache implementation of Microsoft.Extensions.Caching.Distributed.IDistributedCache using Redis.</Description>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <NoWarn>$(NoWarn);CS1591</NoWarn>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <PackageTags>cache;distributedcache;redis</PackageTags>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Microsoft.Extensions.Caching.Abstractions\Microsoft.Extensions.Caching.Abstractions.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Options" Version="$(MicrosoftExtensionsOptionsPackageVersion)" />
+    <PackageReference Include="StackExchange.Redis" Version="$(StackExchangeRedisPackageVersion)" />
+  </ItemGroup>
+
+</Project>