wip(Liquid.Cache.Redis, Liquid.Cache.NCache, Liquid.Cache.Memory, Liq…

…uid.Cache.SqlSerrver): Update Liquid framework for net8.
Avanade · Jun 18, 2024 · 532472c · 532472c
1 parent 0adc61b
commit 532472c
Show file tree

Hide file tree

Showing 10 changed files with 66 additions and 87 deletions.
diff --git a/src/Liquid.Cache.Memory/Liquid.Cache.Memory.csproj b/src/Liquid.Cache.Memory/Liquid.Cache.Memory.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
 	  <PackageId>Liquid.Cache.Memory</PackageId>
 	<Nullable>enable</Nullable>
 	  <PackageLicenseExpression>MIT</PackageLicenseExpression>
@@ -11,7 +11,7 @@
 	  <Copyright>Avanade 2019</Copyright>
 	  <PackageProjectUrl>https://github.com/Avanade/Liquid-Application-Framework</PackageProjectUrl>
 	  <PackageIcon>logo.png</PackageIcon>
-	  <Version>6.0.0</Version>
+	  <Version>8.0.0-alpha-01</Version>
 	  <GenerateDocumentationFile>true</GenerateDocumentationFile>
 	  <IsPackable>true</IsPackable>
 	  <DebugType>Full</DebugType>
@@ -29,11 +29,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="6.0.1" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\Liquid.Core\Liquid.Core.csproj" />
+    <PackageReference Include="Liquid.Core" Version="8.0.0-alpha-04" />
+    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="8.0.0" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Liquid.Cache.NCache/Liquid.Cache.NCache.csproj b/src/Liquid.Cache.NCache/Liquid.Cache.NCache.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
 	  <PackageId>Liquid.Cache.NCache</PackageId>
 		<Nullable>enable</Nullable>
 	   <PackageLicenseExpression>MIT</PackageLicenseExpression>
@@ -11,7 +11,7 @@
 	  <Copyright>Avanade 2019</Copyright>
 	  <PackageProjectUrl>https://github.com/Avanade/Liquid-Application-Framework</PackageProjectUrl>
 	  <PackageIcon>logo.png</PackageIcon>
-	  <Version>6.0.0</Version>
+	  <Version>8.0.0-alpha-01</Version>
 	  <GenerateDocumentationFile>true</GenerateDocumentationFile>
 	  <IsPackable>true</IsPackable>
 	  <DebugType>Full</DebugType>
@@ -30,24 +30,9 @@
 
   <ItemGroup>
     <PackageReference Include="Alachisoft.NCache.SDK" Version="5.3.4" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.1" />
+    <PackageReference Include="Liquid.Core" Version="8.0.0-alpha-04" />
     <PackageReference Include="NCache.Microsoft.Extensions.Caching" Version="5.3.3" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageReference Include="System.Data.SqlClient" Version="4.8.6" />
-    <PackageReference Include="System.DirectoryServices.Protocols" Version="6.0.1" />
-    <PackageReference Include="System.Drawing.Common" Version="6.0.0" />
-    <PackageReference Include="System.Private.ServiceModel" Version="4.10.3" />
-    <PackageReference Include="System.Security.Cryptography.Pkcs" Version="6.0.4" />
-    <PackageReference Include="System.ServiceModel.Duplex" Version="4.10.3" />
-    <PackageReference Include="System.ServiceModel.Http" Version="4.10.3" />
-    <PackageReference Include="System.ServiceModel.NetTcp" Version="4.10.3" />
-    <PackageReference Include="System.ServiceModel.Security" Version="4.10.3" />
   </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\Liquid.Core\Liquid.Core.csproj" />
-  </ItemGroup>
-
   <ItemGroup>
     <None Update="client.ncconf">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>

diff --git a/src/Liquid.Cache.Redis/Liquid.Cache.Redis.csproj b/src/Liquid.Cache.Redis/Liquid.Cache.Redis.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
 	  <PackageLicenseExpression>MIT</PackageLicenseExpression>
 	  <Authors>Avanade Brazil</Authors>
@@ -10,7 +10,7 @@
 	  <Copyright>Avanade 2019</Copyright>
 	  <PackageProjectUrl>https://github.com/Avanade/Liquid-Application-Framework</PackageProjectUrl>
 	  <PackageIcon>logo.png</PackageIcon>
-	  <Version>6.0.0</Version>
+	  <Version>8.0.0-alpha-01</Version>
 	  <GenerateDocumentationFile>true</GenerateDocumentationFile>
 	  <IsPackable>true</IsPackable>
 	  <DebugType>Full</DebugType>
@@ -28,12 +28,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="6.0.31" />
-    <PackageReference Include="System.Drawing.Common" Version="6.0.0" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\Liquid.Core\Liquid.Core.csproj" />
+    <PackageReference Include="Liquid.Core" Version="8.0.0-alpha-04" />
+    <PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="8.0.6" />
+    <PackageReference Include="System.Drawing.Common" Version="8.0.6" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Liquid.Cache.SqlServer/Liquid.Cache.SqlServer.csproj b/src/Liquid.Cache.SqlServer/Liquid.Cache.SqlServer.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
      <PackageId>Liquid.Cache.SqlServer</PackageId>
 	  <Nullable>enable</Nullable>
 	  <PackageLicenseExpression>MIT</PackageLicenseExpression>
@@ -11,7 +11,7 @@
 	  <Copyright>Avanade 2019</Copyright>
 	  <PackageProjectUrl>https://github.com/Avanade/Liquid-Application-Framework</PackageProjectUrl>
 	  <PackageIcon>logo.png</PackageIcon>
-	  <Version>6.0.0</Version>
+	  <Version>8.0.0-alpha-01</Version>
 	  <GenerateDocumentationFile>true</GenerateDocumentationFile>
 	  <IsPackable>true</IsPackable>
 	  <DebugType>Full</DebugType>
@@ -29,13 +29,11 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="Azure.Identity" Version="1.12.0" />
+    <PackageReference Include="Liquid.Core" Version="8.0.0-alpha-04" />
     <PackageReference Include="Microsoft.Data.SqlClient" Version="5.2.1" />
-    <PackageReference Include="Microsoft.Extensions.Caching.SqlServer" Version="6.0.8" />
+    <PackageReference Include="Microsoft.Extensions.Caching.SqlServer" Version="8.0.6" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.1" />
   </ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\Liquid.Core\Liquid.Core.csproj" />
-  </ItemGroup>
-
 </Project>
diff --git a/test/Liquid.Cache.Memory.Tests/Liquid.Cache.Memory.Tests.csproj b/test/Liquid.Cache.Memory.Tests/Liquid.Cache.Memory.Tests.csproj
@@ -1,22 +1,22 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
     <PackageReference Include="NSubstitute" Version="5.1.0" />
-    <PackageReference Include="xunit" Version="2.5.3" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">
+    <PackageReference Include="xunit" Version="2.8.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.1">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="6.0.0">
+    <PackageReference Include="coverlet.collector" Version="6.0.2">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

diff --git a/test/Liquid.Cache.NCache.Tests/IServiceCollectionExtensionTest.cs b/test/Liquid.Cache.NCache.Tests/IServiceCollectionExtensionTest.cs
@@ -1,4 +1,5 @@
 using Liquid.Cache.NCache.Extensions.DependencyInjection;
+using Liquid.Core.Interfaces;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using NSubstitute;
@@ -22,37 +23,37 @@ private void SetCollection()
         [Fact]
         public void AddLiquidNCacheDistributedCache_WhenWithTelemetryTrue_GetServicesReturnLiqudCache()
         {
-            //SetCollection();
-            //_sut.AddLogging();
-            //_sut.AddLiquidNCacheDistributedCache(configuration =>
-            //{
-            //    configuration.CacheName = "myCache";
-            //    configuration.EnableLogs = false;
-            //    configuration.ExceptionsEnabled = true;
-            //}, true);
+            SetCollection();
+            _sut.AddLogging();
+            _sut.AddLiquidNCacheDistributedCache(configuration =>
+            {
+                configuration.CacheName = "myCache";
+                configuration.EnableLogs = false;
+                configuration.ExceptionsEnabled = true;
+            }, true);
 
-            //var provider = _sut.BuildServiceProvider();
+            var provider = _sut.BuildServiceProvider();
 
-            //Assert.NotNull(provider.GetService<ILiquidCache>());
-            //Assert.NotNull(_sut.FirstOrDefault(x => x.ServiceType == typeof(ILiquidCache) && x.Lifetime == ServiceLifetime.Scoped));
+            Assert.NotNull(provider.GetService<ILiquidCache>());
+            Assert.NotNull(_sut.FirstOrDefault(x => x.ServiceType == typeof(ILiquidCache) && x.Lifetime == ServiceLifetime.Scoped));
 
         }
 
         [Fact]
         public void AddLiquidNCacheDistributedCache_WhenWithTelemetryfalse_GetServicesReturnLiqudCache()
         {
-            //SetCollection();
-            //_sut.AddLiquidNCacheDistributedCache(configuration =>
-            //{
-            //    configuration.CacheName = "myCache";
-            //    configuration.EnableLogs = false;
-            //    configuration.ExceptionsEnabled = true;
-            //}, false);
-
-            //var provider = _sut.BuildServiceProvider();
-
-            //Assert.NotNull(provider.GetService<ILiquidCache>());
-            //Assert.NotNull(_sut.FirstOrDefault(x => x.ServiceType == typeof(ILiquidCache) && x.Lifetime == ServiceLifetime.Scoped));
+            SetCollection();
+            _sut.AddLiquidNCacheDistributedCache(configuration =>
+            {
+                configuration.CacheName = "myCache";
+                configuration.EnableLogs = false;
+                configuration.ExceptionsEnabled = true;
+            }, false);
+
+            var provider = _sut.BuildServiceProvider();
+
+            Assert.NotNull(provider.GetService<ILiquidCache>());
+            Assert.NotNull(_sut.FirstOrDefault(x => x.ServiceType == typeof(ILiquidCache) && x.Lifetime == ServiceLifetime.Scoped));
 
         }
     }

diff --git a/test/Liquid.Cache.NCache.Tests/Liquid.Cache.NCache.Tests.csproj b/test/Liquid.Cache.NCache.Tests/Liquid.Cache.NCache.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 
@@ -15,8 +15,8 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
     <PackageReference Include="NSubstitute" Version="5.1.0" />
-    <PackageReference Include="xunit" Version="2.5.3" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">
+    <PackageReference Include="xunit" Version="2.8.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.1">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

diff --git a/test/Liquid.Cache.Redis.Tests/IServiceCollectionExtensionTest.cs b/test/Liquid.Cache.Redis.Tests/IServiceCollectionExtensionTest.cs
@@ -1,4 +1,5 @@
 using Liquid.Cache.Redis.Extensions.DependencyInjection;
+using Liquid.Core.Implementations;
 using Liquid.Core.Interfaces;
 using Microsoft.Extensions.Caching.StackExchangeRedis;
 using Microsoft.Extensions.Configuration;
@@ -37,7 +38,7 @@ public void AddLiquidRedisDistributedCache_WhenWithTelemetryTrue_GetServicesRetu
 
             Assert.NotNull(provider.GetService<ILiquidCache>());
             Assert.NotNull(_sut.FirstOrDefault(x => x.ServiceType == typeof(ILiquidCache) && x.Lifetime == ServiceLifetime.Scoped));
-            Assert.NotNull(_sut.FirstOrDefault(x => x.ImplementationType == typeof(RedisCache)));
+            Assert.NotNull(_sut.FirstOrDefault(x => x.ImplementationType == typeof(LiquidCache)));
 
         }
 
@@ -55,7 +56,7 @@ public void AddLiquidRedisDistributedCache_WhenWithTelemetryfalse_GetServicesRet
 
             Assert.NotNull(provider.GetService<ILiquidCache>());
             Assert.NotNull(_sut.FirstOrDefault(x => x.ServiceType == typeof(ILiquidCache) && x.Lifetime == ServiceLifetime.Scoped));
-            Assert.NotNull(_sut.FirstOrDefault(x => x.ImplementationType == typeof(RedisCache)));
+            Assert.NotNull(_sut.FirstOrDefault(x => x.ImplementationType == typeof(LiquidCache)));
 
         }
     }

diff --git a/test/Liquid.Cache.Redis.Tests/Liquid.Cache.Redis.Tests.csproj b/test/Liquid.Cache.Redis.Tests/Liquid.Cache.Redis.Tests.csproj
@@ -1,22 +1,22 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
     <PackageReference Include="NSubstitute" Version="5.1.0" />
-    <PackageReference Include="xunit" Version="2.5.3" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">
+    <PackageReference Include="xunit" Version="2.8.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.1">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="6.0.0">
+    <PackageReference Include="coverlet.collector" Version="6.0.2">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

diff --git a/test/Liquid.Cache.SqlServer.Tests/Liquid.Cache.SqlServer.Tests.csproj b/test/Liquid.Cache.SqlServer.Tests/Liquid.Cache.SqlServer.Tests.csproj
@@ -1,24 +1,24 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
     <PackageReference Include="NSubstitute" Version="5.1.0" />
-    <PackageReference Include="xunit" Version="2.5.3" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">
+    <PackageReference Include="xunit" Version="2.8.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.1">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="6.0.0">
+    <PackageReference Include="coverlet.collector" Version="6.0.2">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>