Upgrade XbyK to 30.10.1

Upgrade XbyK to 30.10.1

Author: akfakmot

.editorconfig

@@ -132,7 +132,7 @@ dotnet_style_prefer_is_null_check_over_reference_equality_method          = true
 dotnet_diagnostic.IDE0041.severity                                        = error
 
 dotnet_style_collection_initializer                                       = true : error
-dotnet_diagnostic.IDE0028.severity                                        = error
+dotnet_diagnostic.IDE0028.severity                                        = suggestion
 
 dotnet_style_prefer_auto_properties                                       = true : warning
 dotnet_diagnostic.IDE0032.severity                                        = warning

KVA/Migration.Tool.Source/Helpers/MediaHelper.cs

@@ -42,19 +42,30 @@ public static class MediaHelper
                     case [var mediaLibrary]:
                     {
                         string filePath = path.Replace($"/{mediaLibrary.LibraryFolder}/", "", StringComparison.InvariantCultureIgnoreCase);
-                        return modelFacade.SelectWhere<IMediaFile>("FileLibraryID = @fileLibraryID AND FilePath = @filePath AND FileSiteID = @fileSiteID",
-                                    new SqlParameter("fileLibraryID", mediaLibrary.LibraryID),
-                                    new SqlParameter("filePath", filePath),
-                                    new SqlParameter("fileSiteID", linkSiteId))
-                                .ToList() switch
+
+                        var mediaFiles = modelFacade.SelectWhere<IMediaFile>("FileLibraryID = @fileLibraryID AND FilePath = @filePath AND FileSiteID = @fileSiteID",
+                            new SqlParameter("fileLibraryID", mediaLibrary.LibraryID),
+                            new SqlParameter("filePath", filePath),
+                            new SqlParameter("fileSiteID", linkSiteId))
+                        .ToList();
+
+                        if (mediaFiles.Count == 1)
+                        {
+                            return mediaFiles[0];
+                        }
+                        else if (mediaFiles.Count > 1)
+                        {
+                            throw new InvalidOperationException($"Multiple media file were found for path {path}, site {linkSiteId} and library {libraryDir}");
+                        }
+                        else if (mediaFiles.Count == 0)
+                        {
+                            // this may happen and is valid scenaria
+                            return null;
+                        }
+                        else
                         {
-                            [var mediaFile] => mediaFile,
-                            { Count: > 1 } => throw new InvalidOperationException($"Multiple media file were found for path {path}, site {linkSiteId} and library {libraryDir}"),
-                            { Count: 0 } =>
-                                // this may happen and is valid scenaria
-                                null,
-                            _ => null
-                        };
+                            return null;
+                        }
                     }
                     case { Count: > 1 }:
                     {

KVA/Migration.Tool.Source/Mappers/ContentItemMapper.cs

@@ -1,4 +1,3 @@
-using System.Collections.Concurrent;
 using System.Diagnostics;
 using CMS.ContentEngine;
 using CMS.ContentEngine.Internal;
@@ -634,12 +633,6 @@ private IEnumerable<FormerPageUrlPath> GetFormerUrlPaths(ICmsTree ksNode) => mod
             : (IEnumerable<FormerPageUrlPath>)([]);
 
 
-    private readonly ConcurrentDictionary<string, ContentLanguageInfo> languages = new(StringComparer.InvariantCultureIgnoreCase);
-    private ContentLanguageInfo GetLanguageInfo(string culture) => languages.GetOrAdd(
-                culture,
-                s => ContentLanguageInfoProvider.ProviderObject.Get().WhereEquals(nameof(ContentLanguageInfo.ContentLanguageName), s).SingleOrDefault() ?? throw new InvalidOperationException($"Missing content language '{s}'")
-            );
-
     private ContentItemDirectiveBase GetDirective(ContentItemSource contentItemSource)
     {
         var directiveFacade = new ContentItemActionProvider();

Migration.Tool.Common/Migration.Tool.Common.csproj

@@ -17,7 +17,7 @@
 
     <ItemGroup>
         <PackageReference Include="HtmlAgilityPack.NetCore" Version="1.5.0.1" />
-        <PackageReference Include="Kentico.Xperience.UMT" Version="3.11.0" />
+        <PackageReference Include="Kentico.Xperience.UMT" Version="3.12.0" />
         <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.1" />

Migration.Tool.KXP.Api/Migration.Tool.KXP.Api.csproj

@@ -10,8 +10,8 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Kentico.Xperience.Admin" Version="30.9.0" />
-        <PackageReference Include="Kentico.Xperience.Core" Version="30.9.0" />
+        <PackageReference Include="Kentico.Xperience.Admin" Version="30.10.1" />
+        <PackageReference Include="Kentico.Xperience.Core" Version="30.10.1" />
     </ItemGroup>
 
     <ItemGroup>

Migration.Tool.KXP.Extensions/Migration.Tool.KXP.Extensions.csproj

@@ -7,8 +7,8 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Kentico.Xperience.Core" Version="30.8.0" />
-        <PackageReference Include="Kentico.Xperience.WebApp" Version="30.8.0" />
+        <PackageReference Include="Kentico.Xperience.Core" Version="30.10.1" />
+        <PackageReference Include="Kentico.Xperience.WebApp" Version="30.10.1" />
         <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.3.0" />
         <PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.3.0" />
     </ItemGroup>

README.md

@@ -24,6 +24,7 @@ View all [project releases](https://github.com/Kentico/xperience-by-kentico-kent
 
 | Xperience Version | Library Version |
 | ----------------- | --------------- |
+| 30.10.1           | 3.16.0          |
 | 30.8.0            | 3.12.0          |
 | 30.6.0            | 3.8.0           |
 | 30.5.1            | 3.6.0           |

global.json

@@ -1,7 +1,7 @@
 {
   "sdk": {
     "version": "8.0.100",
-    "rollForward": "latestMajor",
+    "rollForward": "latestFeature",
     "allowPrerelease": false
   }
 }