PT-14740: .net 8 (#86)

feat: Update to .NET 8
VirtoCommerce · Jan 12, 2024 · 9c9edec · 9c9edec
1 parent 4297d20
commit 9c9edec
Show file tree

Hide file tree

Showing 9 changed files with 260 additions and 260 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,8 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?><Project>
+<?xml version="1.0" encoding="utf-8"?>
+<Project>
   <!-- These properties will be shared for all projects -->
   <PropertyGroup>
-    <VersionPrefix>3.402.0</VersionPrefix>
+    <VersionPrefix>3.800.0</VersionPrefix>
     <VersionSuffix />
     <VersionSuffix Condition=" '$(VersionSuffix)' != '' AND '$(BuildNumber)' != '' ">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
   </PropertyGroup>
-</Project>
+</Project>
diff --git a/...erce.CustomerExportImportModule.Core/VirtoCommerce.CustomerExportImportModule.Core.csproj b/...erce.CustomerExportImportModule.Core/VirtoCommerce.CustomerExportImportModule.Core.csproj
@@ -1,26 +1,24 @@
 <Project Sdk="Microsoft.NET.Sdk">
-    <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
-        <noWarn>1591</noWarn>
-        <IsPackable>True</IsPackable>
-        <PublishRepositoryUrl>true</PublishRepositoryUrl>
-        <EmbedUntrackedSources>true</EmbedUntrackedSources>
-        <IncludeSymbols>true</IncludeSymbols>
-        <SymbolPackageFormat>snupkg</SymbolPackageFormat>
-    </PropertyGroup>
-
-    <ItemGroup>
-        <PackageReference Include="CsvHelper" Version="27.1.1" />
-        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
-        <PackageReference Include="Nager.Country" Version="3.1.0" />
-        <PackageReference Include="VirtoCommerce.AssetsModule.Core" Version="3.400.0" />
-        <PackageReference Include="VirtoCommerce.CustomerModule.Core" Version="3.400.0" />
-        <PackageReference Include="VirtoCommerce.Platform.Core" Version="3.400.0" />
-        <PackageReference Include="VirtoCommerce.StoreModule.Core" Version="3.400.0" />
-    </ItemGroup>
-
-    <ItemGroup>
-        <Folder Include="Events\" />
-        <Folder Include="Notifications\" />
-    </ItemGroup>
-</Project>
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <noWarn>1591</noWarn>
+    <IsPackable>True</IsPackable>
+    <PublishRepositoryUrl>true</PublishRepositoryUrl>
+    <EmbedUntrackedSources>true</EmbedUntrackedSources>
+    <IncludeSymbols>true</IncludeSymbols>
+    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="CsvHelper" Version="30.0.1" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
+    <PackageReference Include="Nager.Country" Version="4.0.0" />
+    <PackageReference Include="VirtoCommerce.AssetsModule.Core" Version="3.800.0" />
+    <PackageReference Include="VirtoCommerce.CustomerModule.Core" Version="3.800.0" />
+    <PackageReference Include="VirtoCommerce.Platform.Core" Version="3.800.0" />
+    <PackageReference Include="VirtoCommerce.StoreModule.Core" Version="3.800.0" />
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Events\" />
+    <Folder Include="Notifications\" />
+  </ItemGroup>
+</Project>
diff --git a/...ustomerExportImportModule.Data/Repositories/VirtoCommerceCustomerExportImportDbContext.cs b/...ustomerExportImportModule.Data/Repositories/VirtoCommerceCustomerExportImportDbContext.cs
@@ -1,9 +1,10 @@
 using EntityFrameworkCore.Triggers;
 using Microsoft.EntityFrameworkCore;
+using VirtoCommerce.Platform.Data.Infrastructure;
 
 namespace VirtoCommerce.CustomerExportImportModule.Data.Repositories
 {
-    public class VirtoCommerceCustomerExportImportDbContext : DbContextWithTriggers
+    public class VirtoCommerceCustomerExportImportDbContext : DbContextBase
     {
         public VirtoCommerceCustomerExportImportDbContext(DbContextOptions<VirtoCommerceCustomerExportImportDbContext> options)
           : base(options)

diff --git a/src/VirtoCommerce.CustomerExportImportModule.Data/Services/CustomerImportPagedDataSource.cs b/src/VirtoCommerce.CustomerExportImportModule.Data/Services/CustomerImportPagedDataSource.cs
@@ -4,9 +4,9 @@
 using System.Threading.Tasks;
 using CsvHelper;
 using CsvHelper.Configuration;
+using VirtoCommerce.AssetsModule.Core.Assets;
 using VirtoCommerce.CustomerExportImportModule.Core.Models;
 using VirtoCommerce.CustomerExportImportModule.Core.Services;
-using VirtoCommerce.AssetsModule.Core.Assets;
 
 namespace VirtoCommerce.CustomerExportImportModule.Data.Services
 {
@@ -26,8 +26,7 @@ public CustomerImportPagedDataSource(string filePath, IBlobStorageProvider blobS
             _streamReader = new StreamReader(stream);
 
             _configuration = configuration;
-            _configuration.LeaveOpen = true;
-            _csvReader = new CsvReader(_streamReader, configuration);
+            _csvReader = new CsvReader(_streamReader, configuration, true);
             _csvReader.Context.RegisterClassMap(map);
 
             PageSize = pageSize;

diff --git a/...erce.CustomerExportImportModule.Data/VirtoCommerce.CustomerExportImportModule.Data.csproj b/...erce.CustomerExportImportModule.Data/VirtoCommerce.CustomerExportImportModule.Data.csproj
@@ -1,35 +1,32 @@
 <Project Sdk="Microsoft.NET.Sdk">
-    <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
-        <noWarn>1591</noWarn>
-        <IsPackable>True</IsPackable>
-        <PublishRepositoryUrl>true</PublishRepositoryUrl>
-        <EmbedUntrackedSources>true</EmbedUntrackedSources>
-        <IncludeSymbols>true</IncludeSymbols>
-        <SymbolPackageFormat>snupkg</SymbolPackageFormat>
-    </PropertyGroup>
-
-    <ItemGroup>
-        <ProjectReference Include="..\VirtoCommerce.CustomerExportImportModule.Core\VirtoCommerce.CustomerExportImportModule.Core.csproj" />
-    </ItemGroup>
-
-    <ItemGroup>
-        <Folder Include="Caching\" />
-        <Folder Include="Handlers\" />
-        <Folder Include="Models\" />
-        <Folder Include="Repositories\" />
-    </ItemGroup>
-
-    <ItemGroup>
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.0">
-          <PrivateAssets>all</PrivateAssets>
-          <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-        </PackageReference>
-        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
-        <PackageReference Include="VirtoCommerce.AssetsModule.Data" Version="3.400.0" />
-        <PackageReference Include="VirtoCommerce.CustomerModule.Data" Version="3.400.0" />
-        <PackageReference Include="VirtoCommerce.Platform.Data" Version="3.400.0" />
-        <PackageReference Include="VirtoCommerce.Platform.Data.SqlServer" Version="3.400.0" />
-        <PackageReference Include="VirtoCommerce.Platform.Hangfire" Version="3.400.0" />
-    </ItemGroup>
-</Project>
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <noWarn>1591</noWarn>
+    <IsPackable>True</IsPackable>
+    <PublishRepositoryUrl>true</PublishRepositoryUrl>
+    <EmbedUntrackedSources>true</EmbedUntrackedSources>
+    <IncludeSymbols>true</IncludeSymbols>
+    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\VirtoCommerce.CustomerExportImportModule.Core\VirtoCommerce.CustomerExportImportModule.Core.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Caching\" />
+    <Folder Include="Handlers\" />
+    <Folder Include="Models\" />
+    <Folder Include="Repositories\" />
+  </ItemGroup>
+  <ItemGroup>
+    <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="8.0.0" PrivateAssets="All" />
+    <PackageReference Include="VirtoCommerce.AssetsModule.Data" Version="3.800.0" />
+    <PackageReference Include="VirtoCommerce.CustomerModule.Data" Version="3.800.0" />
+    <PackageReference Include="VirtoCommerce.Platform.Data" Version="3.800.0" />
+    <PackageReference Include="VirtoCommerce.Platform.Data.SqlServer" Version="3.800.0" />
+    <PackageReference Include="VirtoCommerce.Platform.Hangfire" Version="3.800.0" />
+  </ItemGroup>
+</Project>
diff --git a/...mmerce.CustomerExportImportModule.Web/VirtoCommerce.CustomerExportImportModule.Web.csproj b/...mmerce.CustomerExportImportModule.Web/VirtoCommerce.CustomerExportImportModule.Web.csproj
@@ -1,27 +1,24 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
-    <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
-        <noWarn>1591</noWarn>
-        <OutputType>Library</OutputType>
-    </PropertyGroup>
-
-    <ItemGroup>
-        <Compile Remove="dist\**" />
-        <Compile Remove="node_modules\**" />
-        <EmbeddedResource Remove="dist\**" />
-        <EmbeddedResource Remove="node_modules\**" />
-        <None Remove="dist\**" />
-        <None Remove="node_modules\**" />
-    </ItemGroup>
-
-    <ItemGroup>
-        <ProjectReference Include="..\VirtoCommerce.CustomerExportImportModule.Data\VirtoCommerce.CustomerExportImportModule.Data.csproj" />
-    </ItemGroup>
-
-    <ItemGroup>
-      <Folder Include="Content\css\" />
-      <Folder Include="Controllers\Api\" />
-      <Folder Include="Properties\" />
-      <Folder Include="Scripts\resources\" />
-    </ItemGroup>
-</Project>
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <noWarn>1591</noWarn>
+    <OutputType>Library</OutputType>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Remove="dist\**" />
+    <Compile Remove="node_modules\**" />
+    <EmbeddedResource Remove="dist\**" />
+    <EmbeddedResource Remove="node_modules\**" />
+    <None Remove="dist\**" />
+    <None Remove="node_modules\**" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\VirtoCommerce.CustomerExportImportModule.Data\VirtoCommerce.CustomerExportImportModule.Data.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Content\css\" />
+    <Folder Include="Controllers\Api\" />
+    <Folder Include="Properties\" />
+    <Folder Include="Scripts\resources\" />
+  </ItemGroup>
+</Project>
diff --git a/src/VirtoCommerce.CustomerExportImportModule.Web/module.manifest b/src/VirtoCommerce.CustomerExportImportModule.Web/module.manifest
@@ -1,9 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <module>
   <id>VirtoCommerce.CustomerExportImport</id>
-  <version>3.402.0</version>
+  <version>3.800.0</version>
   <version-tag />
-  <platformVersion>3.400.0</platformVersion>
+
+  <platformVersion>3.800.0</platformVersion>
+  <dependencies>
+    <dependency id="VirtoCommerce.Assets" version="3.800.0" />
+    <dependency id="VirtoCommerce.Customer" version="3.800.0" />
+    <dependency id="VirtoCommerce.Store" version="3.800.0" />
+  </dependencies>
+
   <title>Customer Export Import</title>
   <description>This module adds customers export and import functionality. Use it for customer management.</description>
   <authors>
@@ -16,14 +23,9 @@
   <iconUrl>Modules/$(VirtoCommerce.CustomerExportImport)/Content/logo.png</iconUrl>
   <requireLicenseAcceptance>false</requireLicenseAcceptance>
   <releaseNotes>First version.</releaseNotes>
-  <copyright>Copyright © 2011-2023 Virto Commerce. All rights reserved</copyright>
+  <copyright>Copyright © 2011-2024 Virto Commerce. All rights reserved</copyright>
   <tags>customer export import</tags>
   <assemblyFile>VirtoCommerce.CustomerExportImportModule.Web.dll</assemblyFile>
-  <moduleType>VirtoCommerce.CustomerExportImportModule.Web.Module, VirtoCommerce.CustomerExportImportModule.Web</moduleType>
-  <dependencies>
-    <dependency id="VirtoCommerce.Assets" version="3.400.0" />
-    <dependency id="VirtoCommerce.Customer" version="3.400.0" />
-    <dependency id="VirtoCommerce.Store" version="3.400.0" />
-  </dependencies>
+  <moduleType>VirtoCommerce.CustomerExportImportModule.Web.Module, VirtoCommerce.CustomerExportImportModule.Web</moduleType>  
   <useFullTypeNameInSwagger>false</useFullTypeNameInSwagger>
 </module>