Merge pull request #2 from VirtoCommerce/feat/PT-14740-net8

feat: Update to .NET 8
VirtoCommerce · Jan 12, 2024 · ae40d68 · ae40d68
2 parents 3e2b145 + 520f40b
commit ae40d68
Show file tree

Hide file tree

Showing 8 changed files with 198 additions and 204 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project>
-    <!-- These properties will be shared for all projects -->
-    <PropertyGroup>
-        <VersionPrefix>3.401.0</VersionPrefix>
-        <VersionSuffix>
-        </VersionSuffix>
-        <VersionSuffix Condition=" '$(VersionSuffix)' != '' AND '$(BuildNumber)' != '' ">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
-    </PropertyGroup>
-    <PropertyGroup>
-        <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    </PropertyGroup>
-</Project>
+  <!-- These properties will be shared for all projects -->
+  <PropertyGroup>
+    <VersionPrefix>3.800.0</VersionPrefix>
+    <VersionSuffix></VersionSuffix>
+    <VersionSuffix Condition=" '$(VersionSuffix)' != '' AND '$(BuildNumber)' != '' ">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
+  </PropertyGroup>
+  <PropertyGroup>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+  </PropertyGroup>
+</Project>
diff --git a/src/VirtoCommerce.Hotjar.Core/VirtoCommerce.Hotjar.Core.csproj b/src/VirtoCommerce.Hotjar.Core/VirtoCommerce.Hotjar.Core.csproj
@@ -1,17 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
-
   <PropertyGroup>
     <!-- Project is not a test project -->
     <SonarQubeTestProject>false</SonarQubeTestProject>
   </PropertyGroup>
-
   <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
-    <PackageReference Include="VirtoCommerce.Platform.Core" Version="3.400.0" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
+    <PackageReference Include="VirtoCommerce.Platform.Core" Version="3.800.0" />
   </ItemGroup>
-
-</Project>
+</Project>
diff --git a/src/VirtoCommerce.Hotjar.Data/Services/HotjarSettingsManager.cs b/src/VirtoCommerce.Hotjar.Data/Services/HotjarSettingsManager.cs
@@ -3,6 +3,7 @@
 using VirtoCommerce.Platform.Core.Common;
 using VirtoCommerce.Platform.Core.Settings;
 using VirtoCommerce.StoreModule.Core.Services;
+using HotjarSettingsConstants = VirtoCommerce.Hotjar.Core.ModuleConstants.Settings.General;
 
 namespace VirtoCommerce.Hotjar.Data.Services
 {
@@ -23,10 +24,10 @@ public virtual async Task<HotjarSettings> GetAsync(string storeId)
             if (store == null)
                 return retVal;
 
-            retVal.SiteId = store.Settings.GetSettingValue("Hotjar.SiteId", string.Empty);
+            retVal.SiteId = store.Settings.GetValue<string>(HotjarSettingsConstants.SiteId);
             if (!string.IsNullOrEmpty(retVal.SiteId))
             {
-                retVal.EnableTracking = store.Settings.GetSettingValue("Hotjar.EnableTracking", false);
+                retVal.EnableTracking = store.Settings.GetValue<bool>(HotjarSettingsConstants.EnableTracking);
             }
 
             return retVal;

diff --git a/src/VirtoCommerce.Hotjar.Data/VirtoCommerce.Hotjar.Data.csproj b/src/VirtoCommerce.Hotjar.Data/VirtoCommerce.Hotjar.Data.csproj
@@ -1,26 +1,21 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
-
   <PropertyGroup>
     <!-- Project is not a test project -->
     <SonarQubeTestProject>false</SonarQubeTestProject>
   </PropertyGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\VirtoCommerce.Hotjar.Core\VirtoCommerce.Hotjar.Core.csproj" />
   </ItemGroup>
-
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.0">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
-    <PackageReference Include="VirtoCommerce.StoreModule.Core" Version="3.400.0" />
-    <PackageReference Include="VirtoCommerce.Platform.Data" Version="3.400.0" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
+    <PackageReference Include="VirtoCommerce.StoreModule.Core" Version="3.800.0" />
+    <PackageReference Include="VirtoCommerce.Platform.Data" Version="3.800.0" />
   </ItemGroup>
-
-</Project>
+</Project>
diff --git a/src/VirtoCommerce.Hotjar.Web/VirtoCommerce.Hotjar.Web.csproj b/src/VirtoCommerce.Hotjar.Web/VirtoCommerce.Hotjar.Web.csproj
@@ -1,18 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
-
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <OutputType>Library</OutputType>
   </PropertyGroup>
-
   <PropertyGroup>
     <!-- Project is not a test project -->
     <SonarQubeTestProject>false</SonarQubeTestProject>
   </PropertyGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\VirtoCommerce.Hotjar.Core\VirtoCommerce.Hotjar.Core.csproj" />
     <ProjectReference Include="..\VirtoCommerce.Hotjar.Data\VirtoCommerce.Hotjar.Data.csproj" />
   </ItemGroup>
-
-</Project>
+</Project>
diff --git a/src/VirtoCommerce.Hotjar.Web/module.manifest b/src/VirtoCommerce.Hotjar.Web/module.manifest
@@ -1,12 +1,14 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <module>
   <id>VirtoCommerce.Hotjar</id>
-  <version>3.401.0</version>
-  <version-tag></version-tag>
-  <platformVersion>3.200.0</platformVersion>
+  <version>3.800.0</version>
+  <version-tag />
+
+  <platformVersion>3.800.0</platformVersion>
   <dependencies>
-    <dependency id="VirtoCommerce.Store" version="3.200.0" />
+    <dependency id="VirtoCommerce.Store" version="3.800.0" />
   </dependencies>
+
   <title>Hotjar</title>
   <description>Allows to assign Hotjar Site Id for a Store and get insights about the shopping behaviour of your users with Heatmaps, Recordings, Feedback and etc.</description>
   <apps>
@@ -29,7 +31,7 @@
   <assemblyFile>VirtoCommerce.Hotjar.Web.dll</assemblyFile>
   <moduleType>VirtoCommerce.Hotjar.Web.Module, VirtoCommerce.Hotjar.Web</moduleType>
   <releaseNotes>First version.</releaseNotes>
-  <copyright>Copyright © 2023 VirtoCommerce. All rights reserved</copyright>
+  <copyright>Copyright © 2011-2024 Virto Commerce. All rights reserved</copyright>
   <tags>extension module</tags>
   <useFullTypeNameInSwagger>false</useFullTypeNameInSwagger>
-</module>
+</module>