Merge branch 'release/3.800.0'

VirtoCommerce · Jan 11, 2024 · bcafecc · bcafecc
2 parents 6160547 + 5e3654d
commit bcafecc
Show file tree

Hide file tree

Showing 11 changed files with 105 additions and 109 deletions.
diff --git a/.nuke b/.nuke
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project>
-    <!-- These properties will be shared for all projects -->
-    <PropertyGroup>
-        <VersionPrefix>3.206.0</VersionPrefix>
-        <VersionSuffix>
-        </VersionSuffix>
-        <VersionSuffix Condition=" '$(VersionSuffix)' != '' AND '$(BuildNumber)' != '' ">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
-    </PropertyGroup>
-    <PropertyGroup>
-        <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    </PropertyGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>
+<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.ExportModule.Core/VirtoCommerce.ExportModule.Core.csproj b/src/VirtoCommerce.ExportModule.Core/VirtoCommerce.ExportModule.Core.csproj
@@ -1,19 +1,19 @@
 <Project Sdk="Microsoft.NET.Sdk">
-    <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
-        <GenerateDocumentationFile>true</GenerateDocumentationFile>
-        <IsPackable>True</IsPackable>
-        <noWarn>1591</noWarn>
-        <PublishRepositoryUrl>true</PublishRepositoryUrl>
-        <EmbedUntrackedSources>true</EmbedUntrackedSources>
-        <IncludeSymbols>true</IncludeSymbols>
-        <SymbolPackageFormat>snupkg</SymbolPackageFormat>
-    </PropertyGroup>
-    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-        <NoWarn>1701;1702;1705;1591</NoWarn>
-    </PropertyGroup>
-    <ItemGroup>
-        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
-        <PackageReference Include="VirtoCommerce.Platform.Core" Version="3.210.0" />
-    </ItemGroup>
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <IsPackable>True</IsPackable>
+    <noWarn>1591</noWarn>
+    <PublishRepositoryUrl>true</PublishRepositoryUrl>
+    <EmbedUntrackedSources>true</EmbedUntrackedSources>
+    <IncludeSymbols>true</IncludeSymbols>
+    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <NoWarn>1701;1702;1705;1591</NoWarn>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
+    <PackageReference Include="VirtoCommerce.Platform.Core" Version="3.800.0" />
+  </ItemGroup>
 </Project>
diff --git a/src/VirtoCommerce.ExportModule.CsvProvider/CsvExportProvider.cs b/src/VirtoCommerce.ExportModule.CsvProvider/CsvExportProvider.cs
@@ -15,18 +15,16 @@ public sealed class CsvExportProvider : IExportProvider
         public string TypeName => nameof(CsvExportProvider);
         public ExportedTypePropertyInfo[] IncludedProperties { get; private set; }
         public string ExportedFileExtension => "csv";
-        public bool IsTabular => true;
+        public bool IsTabular => true;
+
         [JsonIgnore]
         public IExportProviderConfiguration Configuration { get; }
 
         private CsvWriter _csvWriter;
 
         public CsvExportProvider(ExportDataRequest exportDataRequest)
-        {
-            if (exportDataRequest == null)
-            {
-                throw new ArgumentNullException(nameof(exportDataRequest));
-            }
+        {
+            ArgumentNullException.ThrowIfNull(exportDataRequest);
 
             Configuration = exportDataRequest.ProviderConfig as CsvProviderConfiguration ?? new CsvProviderConfiguration();
             IncludedProperties = exportDataRequest.DataQuery?.IncludedProperties;
@@ -57,10 +55,9 @@ private void EnsureWriterCreated(TextWriter textWriter)
                 {
                     Delimiter = csvProviderConfiguration.Delimiter,
                     Encoding = Encoding.GetEncoding(csvProviderConfiguration.Encoding),
-                    LeaveOpen = true
                 };
 
-                _csvWriter = new CsvWriter(textWriter, csvConfiguration);
+                _csvWriter = new CsvWriter(textWriter, csvConfiguration, leaveOpen: true);
             }
         }
 
@@ -72,7 +69,7 @@ private void AddClassMap(Type objectType)
             if (mapForType == null)
             {
                 var constructor = typeof(MetadataFilteredMap<>).MakeGenericType(objectType).GetConstructor(IncludedProperties != null
-                    ? new[] { typeof(ExportedTypePropertyInfo[]) }
+                    ? [typeof(ExportedTypePropertyInfo[])]
                     : Array.Empty<Type>());
                 var classMap = (ClassMap)constructor.Invoke(IncludedProperties != null ? new[] { IncludedProperties } : null);
 

diff --git a/src/VirtoCommerce.ExportModule.CsvProvider/VirtoCommerce.ExportModule.CsvProvider.csproj b/src/VirtoCommerce.ExportModule.CsvProvider/VirtoCommerce.ExportModule.CsvProvider.csproj
@@ -1,20 +1,20 @@
 <Project Sdk="Microsoft.NET.Sdk">
-    <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
-        <GenerateDocumentationFile>true</GenerateDocumentationFile>
-        <IsPackable>True</IsPackable>
-        <noWarn>1591</noWarn>
-        <PublishRepositoryUrl>true</PublishRepositoryUrl>
-        <EmbedUntrackedSources>true</EmbedUntrackedSources>
-        <IncludeSymbols>true</IncludeSymbols>
-        <SymbolPackageFormat>snupkg</SymbolPackageFormat>
-    </PropertyGroup>
-    <ItemGroup>
-        <PackageReference Include="CsvHelper" Version="27.1.1" />
-    </ItemGroup>
-    <ItemGroup>
-        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
-        <ProjectReference Include="..\VirtoCommerce.ExportModule.Core\VirtoCommerce.ExportModule.Core.csproj" />
-        <ProjectReference Include="..\VirtoCommerce.ExportModule.Data\VirtoCommerce.ExportModule.Data.csproj" />
-    </ItemGroup>
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <IsPackable>True</IsPackable>
+    <noWarn>1591</noWarn>
+    <PublishRepositoryUrl>true</PublishRepositoryUrl>
+    <EmbedUntrackedSources>true</EmbedUntrackedSources>
+    <IncludeSymbols>true</IncludeSymbols>
+    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="CsvHelper" Version="30.0.1" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
+    <ProjectReference Include="..\VirtoCommerce.ExportModule.Core\VirtoCommerce.ExportModule.Core.csproj" />
+    <ProjectReference Include="..\VirtoCommerce.ExportModule.Data\VirtoCommerce.ExportModule.Data.csproj" />
+  </ItemGroup>
 </Project>
diff --git a/src/VirtoCommerce.ExportModule.Data/Services/ExportFileStorage.cs b/src/VirtoCommerce.ExportModule.Data/Services/ExportFileStorage.cs
@@ -31,7 +31,7 @@ public ExportFileStorage(
     public string GenerateFileName(DateTime timestamp, string fileExtension)
     {
         var setting = ModuleConstants.Settings.General.ExportFileNameTemplate;
-        var fileNameTemplate = _settingsManager.GetValue(setting.Name, setting.DefaultValue?.ToString());
+        var fileNameTemplate = _settingsManager.GetValue<string>(setting);
 
         if (string.IsNullOrEmpty(fileNameTemplate))
         {

diff --git a/src/VirtoCommerce.ExportModule.Data/VirtoCommerce.ExportModule.Data.csproj b/src/VirtoCommerce.ExportModule.Data/VirtoCommerce.ExportModule.Data.csproj
@@ -1,21 +1,21 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
-    <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
-        <GenerateDocumentationFile>true</GenerateDocumentationFile>
-        <IsPackable>True</IsPackable>
-        <OutputType>Library</OutputType>
-        <noWarn>1591</noWarn>
-        <PublishRepositoryUrl>true</PublishRepositoryUrl>
-        <EmbedUntrackedSources>true</EmbedUntrackedSources>
-        <IncludeSymbols>true</IncludeSymbols>
-        <SymbolPackageFormat>snupkg</SymbolPackageFormat>
-    </PropertyGroup>
-    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-        <NoWarn>1701;1702;1705;1591</NoWarn>
-    </PropertyGroup>
-    <ItemGroup>
-        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
-        <PackageReference Include="VirtoCommerce.AssetsModule.Core" Version="3.200.0" />
-        <ProjectReference Include="..\VirtoCommerce.ExportModule.Core\VirtoCommerce.ExportModule.Core.csproj" />
-    </ItemGroup>
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <IsPackable>True</IsPackable>
+    <OutputType>Library</OutputType>
+    <noWarn>1591</noWarn>
+    <PublishRepositoryUrl>true</PublishRepositoryUrl>
+    <EmbedUntrackedSources>true</EmbedUntrackedSources>
+    <IncludeSymbols>true</IncludeSymbols>
+    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <NoWarn>1701;1702;1705;1591</NoWarn>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
+    <PackageReference Include="VirtoCommerce.AssetsModule.Core" Version="3.800.0" />
+    <ProjectReference Include="..\VirtoCommerce.ExportModule.Core\VirtoCommerce.ExportModule.Core.csproj" />
+  </ItemGroup>
 </Project>
diff --git a/src/VirtoCommerce.ExportModule.JsonProvider/VirtoCommerce.ExportModule.JsonProvider.csproj b/src/VirtoCommerce.ExportModule.JsonProvider/VirtoCommerce.ExportModule.JsonProvider.csproj
@@ -1,16 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk">
-    <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
-        <GenerateDocumentationFile>true</GenerateDocumentationFile>
-        <IsPackable>True</IsPackable>
-        <noWarn>1591</noWarn>
-        <PublishRepositoryUrl>true</PublishRepositoryUrl>
-        <EmbedUntrackedSources>true</EmbedUntrackedSources>
-        <IncludeSymbols>true</IncludeSymbols>
-        <SymbolPackageFormat>snupkg</SymbolPackageFormat>
-    </PropertyGroup>
-    <ItemGroup>
-        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
-        <ProjectReference Include="..\VirtoCommerce.ExportModule.Core\VirtoCommerce.ExportModule.Core.csproj" />
-    </ItemGroup>
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <IsPackable>True</IsPackable>
+    <noWarn>1591</noWarn>
+    <PublishRepositoryUrl>true</PublishRepositoryUrl>
+    <EmbedUntrackedSources>true</EmbedUntrackedSources>
+    <IncludeSymbols>true</IncludeSymbols>
+    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
+    <ProjectReference Include="..\VirtoCommerce.ExportModule.Core\VirtoCommerce.ExportModule.Core.csproj" />
+  </ItemGroup>
 </Project>
diff --git a/src/VirtoCommerce.ExportModule.Web/VirtoCommerce.ExportModule.Web.csproj b/src/VirtoCommerce.ExportModule.Web/VirtoCommerce.ExportModule.Web.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <IsPackable>False</IsPackable>
     <OutputType>Library</OutputType>
@@ -21,9 +21,9 @@
     <None Remove="node_modules\**" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="FluentValidation" Version="10.3.4" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.0" />
-    <PackageReference Include="VirtoCommerce.Platform.Hangfire" Version="3.210.0" />
+    <PackageReference Include="FluentValidation" Version="11.8.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.0" />
+    <PackageReference Include="VirtoCommerce.Platform.Hangfire" Version="3.800.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\VirtoCommerce.ExportModule.Core\VirtoCommerce.ExportModule.Core.csproj" />

diff --git a/src/VirtoCommerce.ExportModule.Web/module.manifest b/src/VirtoCommerce.ExportModule.Web/module.manifest
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <id>VirtoCommerce.Export</id>
-  <version>3.206.0</version>
+  <version>3.800.0</version>
   <version-tag />
-  <platformVersion>3.210.0</platformVersion>
+  <platformVersion>3.800.0</platformVersion>
   <title>Generic Export</title>
   <description>Generic export functionality</description>
   <authors>
@@ -14,15 +14,15 @@
   </owners>
   <iconUrl>Modules/$(VirtoCommerce.Export)/Content/logo.png</iconUrl>
   <requireLicenseAcceptance>false</requireLicenseAcceptance>
-  <copyright>Copyright © 2011-2023 Virto Commerce. All rights reserved</copyright>
+  <copyright>Copyright © 2011-2024 Virto Commerce. All rights reserved</copyright>
   <tags>export</tags>
   <assemblyFile>VirtoCommerce.ExportModule.Web.dll</assemblyFile>
   <moduleType>VirtoCommerce.ExportModule.Web.Module, VirtoCommerce.ExportModule.Web</moduleType>
   <dependencies>
-    <dependency id="VirtoCommerce.Assets" version="3.200.0" />
+    <dependency id="VirtoCommerce.Assets" version="3.800.0" />
   </dependencies>
   <groups>
     <group>commerce</group>
   </groups>
   <useFullTypeNameInSwagger>false</useFullTypeNameInSwagger>
-</module>
+</module>
diff --git a/tests/VirtoCommerce.ExportModule.Tests/VirtoCommerce.ExportModule.Tests.csproj b/tests/VirtoCommerce.ExportModule.Tests/VirtoCommerce.ExportModule.Tests.csproj
@@ -1,22 +1,22 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <IsPackable>False</IsPackable>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <OutputPath>bin\</OutputPath>
     <NoWarn>1701;1702;1705;1591</NoWarn>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="coverlet.collector" Version="3.2.0">
+    <PackageReference Include="coverlet.collector" Version="6.0.0">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
-    <PackageReference Include="Moq" Version="4.13.1" />
-    <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+    <PackageReference Include="Moq" Version="4.20.70" />
+    <PackageReference Include="xunit" Version="2.6.2" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.4" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\VirtoCommerce.ExportModule.Core\VirtoCommerce.ExportModule.Core.csproj" />