upgrade of XbyK API to v29.4.3

Kentico · Sep 13, 2024 · d1f79e9 · d1f79e9
1 parent a4f72e6
commit d1f79e9
Show file tree

Hide file tree

Showing 10 changed files with 21 additions and 18 deletions.
diff --git a/KVA/Migration.Toolkit.Source/Mappers/ContentItemMapper.cs b/KVA/Migration.Toolkit.Source/Mappers/ContentItemMapper.cs
@@ -700,9 +700,10 @@ private async Task ConvertToAsset(Dictionary<string, object?> target, ICmsTree c
                     {
                         if (configuration.MigrateMediaToMediaLibrary)
                         {
-                            if (entityIdentityFacade.Translate(sourceMediaFile) is { } mf && mediaFileFacade.GetMediaFile(mf.Identity) is { } mfi)
+                            if (entityIdentityFacade.Translate(sourceMediaFile) is { } mf && mediaFileFacade.GetMediaFile(mf.Identity) is { } x)
                             {
-                                mfis = [mfi];
+                                mfis = [new AssetRelatedItem { Identifier = x.FileGUID, Dimensions = new AssetDimensions { Height = x.FileImageHeight, Width = x.FileImageWidth }, Name = x.FileName, Size = x.FileSize }];
+                                hasMigratedAsset = true;
                             }
                         }
                         else
@@ -1013,8 +1014,10 @@ private void WalkProperties(int siteId, JObject properties, List<EditingFormCont
                                 var nv = new List<object>();
                                 foreach (var asi in items)
                                 {
-                                    var attachment = modelFacade.SelectWhere<ICmsAttachment>("AttachmentSiteID = @siteId AND AttachmentGUID = @attachmentGUID", new SqlParameter("attachmentSiteID", siteId),
-                                            new SqlParameter("attachmentGUID", asi.FileGuid))
+                                    var attachment = modelFacade.SelectWhere<ICmsAttachment>("AttachmentSiteID = @attachmentSiteId AND AttachmentGUID = @attachmentGUID",
+                                            new SqlParameter("attachmentSiteID", siteId),
+                                            new SqlParameter("attachmentGUID", asi.FileGuid)
+                                        )
                                         .FirstOrDefault();
                                     if (attachment != null)
                                     {

diff --git a/KVA/Migration.Toolkit.Source/Migration.Toolkit.Source.csproj b/KVA/Migration.Toolkit.Source/Migration.Toolkit.Source.csproj
@@ -13,8 +13,8 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Kentico.Xperience.UMT" Version="1.6.1" />
-        <PackageReference Include="MediatR" Version="12.4.0" />
+        <PackageReference Include="Kentico.Xperience.UMT" Version="1.6.2" />
+        <PackageReference Include="MediatR" Version="12.4.1" />
     </ItemGroup>
 
     <PropertyGroup>

diff --git a/Migration.Toolkit.CLI/Migration.Toolkit.CLI.csproj b/Migration.Toolkit.CLI/Migration.Toolkit.CLI.csproj
@@ -18,7 +18,7 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="MediatR" Version="12.4.0" />
+        <PackageReference Include="MediatR" Version="12.4.1" />
         <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0"/>
         <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0"/>
         <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0"/>

diff --git a/Migration.Toolkit.Common/Migration.Toolkit.Common.csproj b/Migration.Toolkit.Common/Migration.Toolkit.Common.csproj
@@ -16,8 +16,8 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Kentico.Xperience.UMT" Version="1.6.1" />
-        <PackageReference Include="MediatR" Version="12.4.0" />
+        <PackageReference Include="Kentico.Xperience.UMT" Version="1.6.2" />
+        <PackageReference Include="MediatR" Version="12.4.1" />
         <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0"/>
         <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0"/>
         <PackageReference Include="Newtonsoft.Json" Version="13.0.3"/>

diff --git a/Migration.Toolkit.Core.K11/Migration.Toolkit.Core.K11.csproj b/Migration.Toolkit.Core.K11/Migration.Toolkit.Core.K11.csproj
@@ -8,7 +8,7 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="MediatR" Version="12.4.0" />
+        <PackageReference Include="MediatR" Version="12.4.1" />
         <PackageReference Include="Newtonsoft.Json" Version="13.0.3"/>
     </ItemGroup>
 

diff --git a/Migration.Toolkit.Core.KX12/Migration.Toolkit.Core.KX12.csproj b/Migration.Toolkit.Core.KX12/Migration.Toolkit.Core.KX12.csproj
@@ -8,7 +8,7 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="MediatR" Version="12.4.0" />
+        <PackageReference Include="MediatR" Version="12.4.1" />
         <PackageReference Include="Newtonsoft.Json" Version="13.0.3"/>
     </ItemGroup>
 

diff --git a/Migration.Toolkit.Core.KX13/Migration.Toolkit.Core.KX13.csproj b/Migration.Toolkit.Core.KX13/Migration.Toolkit.Core.KX13.csproj
@@ -12,8 +12,8 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Kentico.Xperience.UMT" Version="1.6.1" />
-        <PackageReference Include="MediatR" Version="12.4.0" />
+        <PackageReference Include="Kentico.Xperience.UMT" Version="1.6.2" />
+        <PackageReference Include="MediatR" Version="12.4.1" />
         <PackageReference Include="Newtonsoft.Json" Version="13.0.3"/>
     </ItemGroup>
 

diff --git a/Migration.Toolkit.KXP.Api/Migration.Toolkit.KXP.Api.csproj b/Migration.Toolkit.KXP.Api/Migration.Toolkit.KXP.Api.csproj
@@ -10,8 +10,8 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Kentico.Xperience.Admin" Version="29.4.1" />
-        <PackageReference Include="Kentico.Xperience.Core" Version="29.4.1" />
+        <PackageReference Include="Kentico.Xperience.Admin" Version="29.4.3" />
+        <PackageReference Include="Kentico.Xperience.Core" Version="29.4.3" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/Migration.Toolkit.KXP.Extensions/Migration.Toolkit.KXP.Extensions.csproj b/Migration.Toolkit.KXP.Extensions/Migration.Toolkit.KXP.Extensions.csproj
@@ -7,8 +7,8 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Kentico.Xperience.Core" Version="29.4.1" />
-        <PackageReference Include="Kentico.Xperience.WebApp" Version="29.4.1" />
+        <PackageReference Include="Kentico.Xperience.Core" Version="29.4.3" />
+        <PackageReference Include="Kentico.Xperience.WebApp" Version="29.4.3" />
         <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.2.0"/>
         <PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.2.5"/>
     </ItemGroup>

diff --git a/Migration.Toolkit.Tests/Migration.Toolkit.Tests.csproj b/Migration.Toolkit.Tests/Migration.Toolkit.Tests.csproj
@@ -5,7 +5,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
         <PackageReference Include="xunit" Version="2.9.0" />
         <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>