Merge pull request #178 from Avanade/feature/updateTargetFramework

feat: update Liquid.Cache target framework to net6.0.
Avanade · Oct 18, 2023 · 8b95c0a · 8b95c0a
2 parents 9cfa45e + 10bb68b
commit 8b95c0a
Show file tree

Hide file tree

Showing 16 changed files with 127 additions and 33 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>netstandard2.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
 	  <PackageId>Liquid.Cache.Memory</PackageId>
 	<Nullable>enable</Nullable>
 	  <PackageLicenseExpression>MIT</PackageLicenseExpression>

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>netstandard2.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
 	  <PackageId>Liquid.Cache.NCache</PackageId>
 		<Nullable>enable</Nullable>
 	   <PackageLicenseExpression>MIT</PackageLicenseExpression>
@@ -31,13 +31,19 @@
   <ItemGroup>
     <PackageReference Include="Liquid.Cache" Version="2.0.0-preview-2022090901-02" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
-    <PackageReference Include="NCache.Microsoft.Extensions.Caching" Version="5.3.0" />
+    <PackageReference Include="NCache.Microsoft.Extensions.Caching" Version="5.3.1" />
   </ItemGroup>
 
   <ItemGroup>
+    <None Update="client.ncconf">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Update="config.ncconf">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Update="tls.ncconf">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
 
 </Project>
diff --git a/src/Liquid.Cache.NCache/client.ncconf b/src/Liquid.Cache.NCache/client.ncconf
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+  <configuration>
+    <ncache-server connection-retries="3" retry-connection-delay="0" retry-interval="1" command-retries="3" command-retry-interval="0.1" client-request-timeout="90" connection-timeout="5" port="9800"/>
+    <cache id="myReplicatedCache" client-cache-id="" client-cache-syncmode="optimistic" default-readthru-provider="" default-writethru-provider="" load-balance="True" enable-client-logs="False" log-level="error">
+      <server name="10.0.5.1"/>
+    </cache>
+  </configuration>
diff --git a/src/Liquid.Cache.NCache/config.ncconf b/src/Liquid.Cache.NCache/config.ncconf
@@ -0,0 +1,25 @@
+<configuration>
+  <cache-config cache-name="myCache" alias="" config-id="e097c2c0-88af-4aa2-8a8a-c6432eeaa3fe" config-version="0" store-type="distributed-cache">
+    <cache-settings inproc="True" last-modified="" auto-start="False" data-format="Binary">
+      <logging enable-logs="True" trace-errors="True" trace-notices="False" trace-warnings="False" trace-debug="False" log-path=""/>
+      <performance-counters enable-counters="True" snmp-port="0"/>
+      <data-load-balancing enabled="False" auto-balancing-threshold="60%" auto-balancing-interval="30sec"/>
+      <compression enable-compression="False" threshold="100kb"/>
+      <client-death-detection/>
+      <client-activity-notification enabled="False" retention-period="5sec"/>
+      <cache-notifications item-remove="False" item-add="False" item-update="False"/>
+      <cleanup interval="15sec"/>
+      <storage type="heap" cache-size="1024mb"/>
+      <eviction-policy enabled-eviction="True" default-priority="normal" policy="lru" eviction-ratio="5%"/>
+      <expiration-policy enabled="False">
+        <absolute-expiration longer-enabled="False" longer-value="0" default-enabled="False" default-value="0"/>
+        <sliding-expiration longer-enabled="False" longer-value="0" default-enabled="False" default-value="0"/>
+      </expiration-policy>
+      <cache-topology topology="local-cache"/>
+      <tasks-config max-tasks="10" chunk-size="100" communicate-stats="False" queue-size="10" max-avoidable-exceptions="10"/>
+      <split-brain-recovery enable="False" detection-interval="60"/>
+    </cache-settings>
+  </cache-config>
+
+
+</configuration>
diff --git a/src/Liquid.Cache.NCache/tls.ncconf b/src/Liquid.Cache.NCache/tls.ncconf
@@ -0,0 +1,6 @@
+<tls-info>
+	<certificate-name>certificate-name</certificate-name>	
+	<certificate-thumbprint>your-thumbprint</certificate-thumbprint>	
+	<enabled>false</enabled>	
+	<require-client-certificate>false</require-client-certificate>
+</tls-info>
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>netstandard2.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
 	  <PackageLicenseExpression>MIT</PackageLicenseExpression>
 	  <Authors>Avanade Brazil</Authors>

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>netstandard2.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
      <PackageId>Liquid.Cache.SqlServer</PackageId>
 	  <Nullable>enable</Nullable>
 	  <PackageLicenseExpression>MIT</PackageLicenseExpression>

diff --git a/src/Liquid.Cache/Liquid.Cache.csproj b/src/Liquid.Cache/Liquid.Cache.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <PackageId>Liquid.Cache</PackageId>
     <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>2.0.0-preview-2022090901-02</Version>
+    <Version>6.0.0-preview-20231130-01</Version>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <IsPackable>true</IsPackable>
     <DebugType>Full</DebugType>
@@ -22,7 +22,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Liquid.Core" Version="2.2.0-preview-20220901-01" />
+    <PackageReference Include="Liquid.Core" Version="6.0.0-preview-20231131-01" />
     <PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="6.0.0" />
   </ItemGroup>
 
@@ -33,4 +33,16 @@
     </None>
   </ItemGroup>
 
+  <ItemGroup>
+    <None Update="client.ncconf">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Update="config.ncconf">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Update="tls.ncconf">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
 </Project>
diff --git a/src/Liquid.Cache/client.ncconf b/src/Liquid.Cache/client.ncconf
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+  <configuration>
+    <ncache-server connection-retries="3" retry-connection-delay="0" retry-interval="1" command-retries="3" command-retry-interval="0.1" client-request-timeout="90" connection-timeout="5" port="9800"/>
+    <cache id="myReplicatedCache" client-cache-id="" client-cache-syncmode="optimistic" default-readthru-provider="" default-writethru-provider="" load-balance="True" enable-client-logs="False" log-level="error">
+      <server name="10.0.5.1"/>
+    </cache>
+  </configuration>
diff --git a/src/Liquid.Cache/config.ncconf b/src/Liquid.Cache/config.ncconf
@@ -0,0 +1,25 @@
+<configuration>
+  <cache-config cache-name="myCache" alias="" config-id="e097c2c0-88af-4aa2-8a8a-c6432eeaa3fe" config-version="0" store-type="distributed-cache">
+    <cache-settings inproc="True" last-modified="" auto-start="False" data-format="Binary">
+      <logging enable-logs="True" trace-errors="True" trace-notices="False" trace-warnings="False" trace-debug="False" log-path=""/>
+      <performance-counters enable-counters="True" snmp-port="0"/>
+      <data-load-balancing enabled="False" auto-balancing-threshold="60%" auto-balancing-interval="30sec"/>
+      <compression enable-compression="False" threshold="100kb"/>
+      <client-death-detection/>
+      <client-activity-notification enabled="False" retention-period="5sec"/>
+      <cache-notifications item-remove="False" item-add="False" item-update="False"/>
+      <cleanup interval="15sec"/>
+      <storage type="heap" cache-size="1024mb"/>
+      <eviction-policy enabled-eviction="True" default-priority="normal" policy="lru" eviction-ratio="5%"/>
+      <expiration-policy enabled="False">
+        <absolute-expiration longer-enabled="False" longer-value="0" default-enabled="False" default-value="0"/>
+        <sliding-expiration longer-enabled="False" longer-value="0" default-enabled="False" default-value="0"/>
+      </expiration-policy>
+      <cache-topology topology="local-cache"/>
+      <tasks-config max-tasks="10" chunk-size="100" communicate-stats="False" queue-size="10" max-avoidable-exceptions="10"/>
+      <split-brain-recovery enable="False" detection-interval="60"/>
+    </cache-settings>
+  </cache-config>
+
+
+</configuration>
diff --git a/src/Liquid.Cache/tls.ncconf b/src/Liquid.Cache/tls.ncconf
@@ -0,0 +1,6 @@
+<tls-info>
+	<certificate-name>certificate-name</certificate-name>	
+	<certificate-thumbprint>your-thumbprint</certificate-thumbprint>	
+	<enabled>false</enabled>	
+	<require-client-certificate>false</require-client-certificate>
+</tls-info>
diff --git a/test/Liquid.Cache.Memory.Tests/Liquid.Cache.Memory.Tests.csproj b/test/Liquid.Cache.Memory.Tests/Liquid.Cache.Memory.Tests.csproj
@@ -9,14 +9,14 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
-    <PackageReference Include="NSubstitute" Version="4.4.0" />
-    <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
+    <PackageReference Include="NSubstitute" Version="5.1.0" />
+    <PackageReference Include="xunit" Version="2.5.3" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="3.1.0">
+    <PackageReference Include="coverlet.collector" Version="6.0.0">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

diff --git a/test/Liquid.Cache.NCache.Tests/Liquid.Cache.NCache.Tests.csproj b/test/Liquid.Cache.NCache.Tests/Liquid.Cache.NCache.Tests.csproj
@@ -9,14 +9,14 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
-    <PackageReference Include="NSubstitute" Version="4.4.0" />
-    <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
+    <PackageReference Include="NSubstitute" Version="5.1.0" />
+    <PackageReference Include="xunit" Version="2.5.3" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="3.1.2">
+    <PackageReference Include="coverlet.collector" Version="6.0.0">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

diff --git a/test/Liquid.Cache.Redis.Tests/Liquid.Cache.Redis.Tests.csproj b/test/Liquid.Cache.Redis.Tests/Liquid.Cache.Redis.Tests.csproj
@@ -9,14 +9,14 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.1" />
-    <PackageReference Include="NSubstitute" Version="4.4.0" />
-    <PackageReference Include="xunit" Version="2.4.2" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
+    <PackageReference Include="NSubstitute" Version="5.1.0" />
+    <PackageReference Include="xunit" Version="2.5.3" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="3.1.2">
+    <PackageReference Include="coverlet.collector" Version="6.0.0">
       <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
@@ -12,14 +12,14 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="6.0.0" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
-    <PackageReference Include="NSubstitute" Version="4.4.0" />
-    <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
+    <PackageReference Include="NSubstitute" Version="5.1.0" />
+    <PackageReference Include="xunit" Version="2.5.3" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="3.1.2">
+    <PackageReference Include="coverlet.collector" Version="6.0.0">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

diff --git a/test/Liquid.Cache.Tests/Liquid.Cache.Tests.csproj b/test/Liquid.Cache.Tests/Liquid.Cache.Tests.csproj
@@ -9,14 +9,14 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.1" />
-    <PackageReference Include="NSubstitute" Version="4.4.0" />
-    <PackageReference Include="xunit" Version="2.4.2" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
+    <PackageReference Include="NSubstitute" Version="5.1.0" />
+    <PackageReference Include="xunit" Version="2.5.3" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="3.1.2">
+    <PackageReference Include="coverlet.collector" Version="6.0.0">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>