Merge branch 'release/3.30.0'

VirtoCommerce · Nov 16, 2021 · 7e6397c · 7e6397c
2 parents 54940f8 + 61527e8
commit 7e6397c
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 11 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?><Project>
   <!-- These properties will be shared for all projects -->
   <PropertyGroup>
-    <VersionPrefix>3.29.0</VersionPrefix>
+    <VersionPrefix>3.30.0</VersionPrefix>
     <VersionSuffix>
     </VersionSuffix>
     <VersionSuffix Condition=" '$(VersionSuffix)' != '' AND '$(BuildNumber)' != '' ">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>

diff --git a/src/VirtoCommerce.MarketingModule.Core/VirtoCommerce.MarketingModule.Core.csproj b/src/VirtoCommerce.MarketingModule.Core/VirtoCommerce.MarketingModule.Core.csproj
@@ -15,6 +15,6 @@
     <ItemGroup>
         <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
         <PackageReference Include="VirtoCommerce.CoreModule.Core" Version="3.1.0" />
-        <PackageReference Include="VirtoCommerce.Platform.Core" Version="3.78.0" />
+        <PackageReference Include="VirtoCommerce.Platform.Core" Version="3.81.0" />
     </ItemGroup>
 </Project>
diff --git a/src/VirtoCommerce.MarketingModule.Data/VirtoCommerce.MarketingModule.Data.csproj b/src/VirtoCommerce.MarketingModule.Data/VirtoCommerce.MarketingModule.Data.csproj
@@ -30,8 +30,8 @@
         <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
         <PackageReference Include="VirtoCommerce.CoreModule.Core" Version="3.1.0" />
         <PackageReference Include="VirtoCommerce.OrdersModule.Core" Version="3.1.0" />
-        <PackageReference Include="VirtoCommerce.Platform.Data" Version="3.78.0" />
-        <PackageReference Include="VirtoCommerce.Platform.Security" Version="3.78.0" />
+        <PackageReference Include="VirtoCommerce.Platform.Data" Version="3.81.0" />
+        <PackageReference Include="VirtoCommerce.Platform.Security" Version="3.81.0" />
     </ItemGroup>
     <ItemGroup>
         <ProjectReference Include="..\VirtoCommerce.MarketingModule.Core\VirtoCommerce.MarketingModule.Core.csproj" />

diff --git a/src/VirtoCommerce.MarketingModule.Web/Controllers/Api/MarketingModulePromotionController.cs b/src/VirtoCommerce.MarketingModule.Web/Controllers/Api/MarketingModulePromotionController.cs
@@ -15,7 +15,7 @@
 using VirtoCommerce.MarketingModule.Data.Authorization;
 using VirtoCommerce.MarketingModule.Data.Repositories;
 using VirtoCommerce.MarketingModule.Web.ExportImport;
-using VirtoCommerce.Platform.Core.Assets;
+using VirtoCommerce.AssetsModule.Core.Assets;
 using VirtoCommerce.Platform.Core.Common;
 using VirtoCommerce.Platform.Core.ExportImport;
 using VirtoCommerce.Platform.Core.PushNotifications;

diff --git a/...rce.MarketingModule.Web/Scripts/dynamicContent/blades/placeholders/placeholder-details.js b/...rce.MarketingModule.Web/Scripts/dynamicContent/blades/placeholders/placeholder-details.js
@@ -12,7 +12,7 @@ angular.module('virtoCommerce.marketingModule')
             var uploader = $scope.uploader = new FileUploader({
                 scope: $scope,
                 headers: { Accept: 'application/json' },
-                url: 'api/platform/assets?folderUrl=placeholders-images',
+                url: 'api/assets?folderUrl=placeholders-images',
                 autoUpload: true,
                 removeAfterUpload: true
             });

diff --git a/src/VirtoCommerce.MarketingModule.Web/Scripts/promotion/blades/coupon-import.js b/src/VirtoCommerce.MarketingModule.Web/Scripts/promotion/blades/coupon-import.js
@@ -8,7 +8,7 @@ angular.module('virtoCommerce.marketingModule')
         var uploader = $scope.uploader = new FileUploader({
             scope: $scope,
             headers: { Accept: 'application/json' },
-            url: 'api/platform/assets?folderUrl=tmp',
+            url: 'api/assets?folderUrl=tmp',
             method: 'POST',
             autoUpload: true,
             removeAfterUpload: true

diff --git a/src/VirtoCommerce.MarketingModule.Web/VirtoCommerce.MarketingModule.Web.csproj b/src/VirtoCommerce.MarketingModule.Web/VirtoCommerce.MarketingModule.Web.csproj
@@ -21,7 +21,8 @@
     <PackageReference Include="Hangfire" Version="1.7.9" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.2" />
     <PackageReference Include="VirtoCommerce.CoreModule.Core" Version="3.1.0" />
-    <PackageReference Include="VirtoCommerce.Platform.Security" Version="3.78.0" />
+    <PackageReference Include="VirtoCommerce.Platform.Security" Version="3.81.0" />
+    <PackageReference Include="VirtoCommerce.AssetsModule.Core" Version="1.0.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\VirtoCommerce.MarketingModule.Core\VirtoCommerce.MarketingModule.Core.csproj" />

diff --git a/src/VirtoCommerce.MarketingModule.Web/module.manifest b/src/VirtoCommerce.MarketingModule.Web/module.manifest
@@ -1,9 +1,9 @@
 <?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.Marketing</id>
-  <version>3.29.0</version>
+  <version>3.30.0</version>
   <version-tag />
-  <platformVersion>3.61.0-alpha.11922</platformVersion>
+  <platformVersion>3.81.0</platformVersion>
   <title>Marketing module</title>
   <description>Marketing system with dynamic contents and promotions management</description>
   <authors>
@@ -26,6 +26,7 @@
     <dependency id="VirtoCommerce.Orders" version="3.0.0" />
     <dependency id="VirtoCommerce.Shipping" version="3.4.0" />
     <dependency id="VirtoCommerce.Payment" version="3.4.0" />
+    <dependency id="VirtoCommerce.Assets" version="1.0.0" />
   </dependencies>
   <groups>
     <group>commerce</group>

diff --git a/tests/VirtoCommerce.MarketingModule.Test/MarketingModulePromotionControllerTests.cs b/tests/VirtoCommerce.MarketingModule.Test/MarketingModulePromotionControllerTests.cs
@@ -12,7 +12,7 @@
 using System.Security.Claims;
 using VirtoCommerce.MarketingModule.Core.Services;
 using VirtoCommerce.Platform.Core.PushNotifications;
-using VirtoCommerce.Platform.Core.Assets;
+using VirtoCommerce.AssetsModule.Core.Assets;
 using System.Collections.Generic;
 using System.Linq;
 using FluentAssertions;