Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

upgrade of XbyK API to v29.4.3 #247

Merged
merged 1 commit into from
Sep 13, 2024
Merged

upgrade of XbyK API to v29.4.3 #247

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions KVA/Migration.Toolkit.Source/Mappers/ContentItemMapper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
{
Expand Down
4 changes: 2 additions & 2 deletions KVA/Migration.Toolkit.Source/Migration.Toolkit.Source.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion Migration.Toolkit.CLI/Migration.Toolkit.CLI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>
Expand Down
4 changes: 2 additions & 2 deletions Migration.Toolkit.Common/Migration.Toolkit.Common.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>
Expand Down
2 changes: 1 addition & 1 deletion Migration.Toolkit.Core.K11/Migration.Toolkit.Core.K11.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion Migration.Toolkit.Core.KX12/Migration.Toolkit.Core.KX12.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
4 changes: 2 additions & 2 deletions Migration.Toolkit.Core.KX13/Migration.Toolkit.Core.KX13.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
4 changes: 2 additions & 2 deletions Migration.Toolkit.KXP.Api/Migration.Toolkit.KXP.Api.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions Migration.Toolkit.KXP.Extensions/Migration.Toolkit.KXP.Extensions.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion Migration.Toolkit.Tests/Migration.Toolkit.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Loading