Merge branch 'main' of https://github.com/Kentico/xperience-by-kentic…

…o-universal-migration-tool into feat/github-actions-pipeline
Kentico · Dec 16, 2024 · 5207dd1 · 5207dd1
2 parents 489c8fc + 2008b34
commit 5207dd1
Show file tree

Hide file tree

Showing 35 changed files with 1,909 additions and 1,237 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -179,7 +179,7 @@ jobs:
 
       - name: Print media tree
         if: always()
-        run: tree ${{ env.XBK_DIR}} /f
+        run: tree ${{ github.workspace }} /f
 
       - name: Print content items table
         if: always()

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -5,7 +5,7 @@
     <Authors>$(Company)</Authors>
     <Copyright>Copyright © $(Company) $([System.DateTime]::Now.Year)</Copyright>
     <Trademark>$(Company)™</Trademark>
-    <VersionPrefix>2.0.0</VersionPrefix>
+    <VersionPrefix>3.0.0</VersionPrefix>
     <VersionSuffix></VersionSuffix>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
 

diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -7,32 +7,36 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageVersion Include="coverlet.collector" Version="6.0.2" />
-    <PackageVersion Include="Kentico.Xperience.Core" Version="29.7.0" />
-    <PackageVersion Include="Kentico.Xperience.Admin" Version="29.7.0" />
-    <PackageVersion Include="Kentico.Xperience.ImageProcessing" Version="29.7.0" />
-    <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.0-rc.1.24431.7" />
-    <PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="9.0.0-rc.1.24431.7" />
+    <PackageVersion Include="Kentico.Xperience.Core" Version="30.0.0" />
+    <PackageVersion Include="Kentico.Xperience.Admin" Version="30.0.0" />
+    <PackageVersion Include="Kentico.Xperience.ImageProcessing" Version="30.0.0" />
+    <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.0" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Features" Version="4.12.0" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.Features" Version="4.12.0" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic.Features" Version="4.12.0" />
+    <PackageVersion Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" Version="4.1.0" />
+    <PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="9.0.0" />
     <PackageVersion Include="Microsoft.Playwright" Version="1.47.0" />
     <PackageVersion Include="Microsoft.Playwright.NUnit" Version="1.47.0" />
     <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
     <PackageVersion Include="NUnit" Version="4.2.2" />
     <PackageVersion Include="NUnit.Analyzers" Version="4.3.0" />
     <PackageVersion Include="NUnit3TestAdapter" Version="4.6.0" />
-    <PackageVersion Include="SonarAnalyzer.CSharp" Version="9.32.0.97167">
+    <PackageVersion Include="SonarAnalyzer.CSharp" Version="10.3.0.106239">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageVersion>
-    <PackageVersion Include="Markdig" Version="0.37.0" />
+    <PackageVersion Include="Markdig" Version="0.38.0" />
     <PackageVersion Include="Microsoft.Build.Locator" Version="1.7.8" />
-    <PackageVersion Include="Microsoft.CodeAnalysis" Version="4.11.0" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.11.0" />
-    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0-rc.1.24431.7" />
-    <PackageVersion Include="Microsoft.Extensions.Logging.Configuration" Version="8.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Logging.Debug" Version="9.0.0-rc.1.24431.7" />
-    <PackageVersion Include="NJsonSchema" Version="11.0.2" />
+    <PackageVersion Include="Microsoft.CodeAnalysis" Version="4.12.0" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.12.0" />
+    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Logging.Configuration" Version="9.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Logging.Debug" Version="9.0.0" />
+    <PackageVersion Include="NJsonSchema" Version="11.1.0" />
     <PackageVersion Include="RazorLight" Version="2.3.1" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
-    <PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="9.0.0-rc.1.24431.7" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="9.0.0" />
     <PackageVersion Include="System.Linq.Async" Version="6.0.1" />
   </ItemGroup>
 </Project>
diff --git a/README.md b/README.md
@@ -18,6 +18,7 @@ The Xperience by Kentico: Universal Migration Tool (UMT) is an open-source set o
 
 | Xperience Version | Library Version |
 | ----------------- | --------------- |
+| >= 30.0.0         | >= 3.0.0        |
 | >= 29.7.0         | >= 1.10.0       |
 | >= 29.6.0         | >= 1.9.0        |
 | >= 29.5.0         | >= 1.7.0        |

diff --git a/docs/Enums/FormComponents.md b/docs/Enums/FormComponents.md
@@ -71,9 +71,9 @@
 |`string`|`Kentico.Administration.CodeEditor`|`CodeEditorComponent`|`CodeEditorProperties`||
 |`string`|`Kentico.Administration.ConditionBuilder`|`ConditionBuilderComponent`|`ConditionBuilderProperties`||
 |`string`|`Kentico.Administration.DropDownSelector`|`DropDownComponent`|`DropDownProperties`||
+|`string`||`DropDownComponentBase`|`TProperties`|**abstract**|
 |`string`|`Kentico.Administration.ExtensionSelector`|`ExtensionSelectorComponent`|`ExtensionSelectorProperties`||
-|`string`|`Kentico.Administration.IconSelector`|`IconSelectorComponent`|`IconSelectorClientProperties`||
-|`string`|`Kentico.Administration.IconSelector`|`IconSelectorComponent`|`IconSelectorClientProperties`||
+|`string`|`Kentico.Administration.IconSelector`|`IconSelectorComponent`|`IconSelectorProperties`||
 |`string`|`Kentico.Administration.Link`|`LinkComponent`|`LinkProperties`||
 |`string`|`Kentico.Administration.Password`|`PasswordComponent`|`PasswordProperties`||
 |`string`|`Kentico.Administration.RadioGroup`|`RadioGroupComponent`|`RadioGroupProperties`||

diff --git a/docs/Model/ContentFolderModel.md b/docs/Model/ContentFolderModel.md
@@ -8,6 +8,7 @@ Model [discriminator](../UmtModel.md#discriminator): `ContentFolder`
 |---|---|---|---|
 |ContentFolderGUID\*||System.Guid?|[UniqueId](../UmtModel.md#UniqueId)|
 |ContentFolderParentFolderGUID|parent folder guid. If null is specified, folder is created directly under root|System.Guid?|Reference to [ContentFolderInfo](../References.md#ContentFolderInfo) on property ContentFolderParentFolderID|
+|ContentFolderWorkspaceGUID|workspace guid. If null is specified, default workspace is used|System.Guid?|Reference to [ContentFolderInfo](../References.md#ContentFolderInfo) on property ContentFolderWorkspaceID|
 |ContentFolderName\*||string?||
 |ContentFolderDisplayName\*||string?||
 |ContentFolderTreePath\*||string?||

diff --git a/docs/Model/ContentItemCommonDataModel.md b/docs/Model/ContentItemCommonDataModel.md
@@ -9,8 +9,8 @@ Model [discriminator](../UmtModel.md#discriminator): `ContentItemCommonData`
 |ContentItemCommonDataContentLanguageGuid\*||System.Guid?|Reference to [ContentLanguageInfo](../References.md#ContentLanguageInfo) on property ContentItemCommonDataContentLanguageID **required**|
 |ContentItemCommonDataVersionStatus\*||CMS.ContentEngine.VersionStatus?||
 |ContentItemCommonDataIsLatest\*||bool?||
-|ContentItemCommonDataPageBuilderWidgets||string?||
-|ContentItemCommonDataPageTemplateConfiguration||string?||
+|ContentItemCommonDataVisualBuilderWidgets||string?||
+|ContentItemCommonDataVisualBuilderTemplateConfiguration||string?||
 |[customPropertyName]|custom property defined by created [DataClass](./DataClassModel.md)|.NET type defined by data class field||
 
 <p>*) value is required</p>

diff --git a/docs/Model/ContentItemModel.md b/docs/Model/ContentItemModel.md
@@ -6,6 +6,7 @@ Model [discriminator](../UmtModel.md#discriminator): `ContentItem`
 |---|---|---|---|
 |ContentItemGUID\*||System.Guid?|[UniqueId](../UmtModel.md#UniqueId)|
 |ContentItemContentFolderGUID|reference to content folder|System.Guid?|Reference to [ContentFolderInfo](../References.md#ContentFolderInfo) on property ContentItemContentFolderID|
+|ContentItemWorkspaceGUID|reference to workspace|System.Guid?|Reference to [WorkspaceInfo](../References.md#WorkspaceInfo) on property ContentItemWorkspaceID|
 |ContentItemName\*||string?||
 |ContentItemIsReusable\*||bool?||
 |ContentItemIsSecured||bool?||

diff --git a/docs/Model/ContentItemSimplifiedModel.md b/docs/Model/ContentItemSimplifiedModel.md
@@ -6,6 +6,7 @@ Model [discriminator](../UmtModel.md#discriminator): `ContentItemSimplified`
 |---|---|---|---|
 |ContentItemGUID\*||System.Guid?|[UniqueId](../UmtModel.md#UniqueId)|
 |ContentItemContentFolderGUID|Reference to content folder|System.Guid?||
+|ContentItemWorkspaceGUID|Reference to workspace|System.Guid?||
 |IsSecured||bool?||
 |ContentTypeName\*|Content item type name.|string?||
 |Name\*|Code name of the content item.|string?||

diff --git a/docs/Model/UMT.schema.json b/docs/Model/UMT.schema.json
@@ -119,13 +119,13 @@
             "ContentItemCommonDataIsLatest": {
               "type": "boolean"
             },
-            "ContentItemCommonDataPageBuilderWidgets": {
+            "ContentItemCommonDataVisualBuilderWidgets": {
               "type": [
                 "null",
                 "string"
               ]
             },
-            "ContentItemCommonDataPageTemplateConfiguration": {
+            "ContentItemCommonDataVisualBuilderTemplateConfiguration": {
               "type": [
                 "null",
                 "string"
@@ -323,6 +323,14 @@
               "description": "reference to content folder",
               "format": "guid"
             },
+            "ContentItemWorkspaceGUID": {
+              "type": [
+                "null",
+                "string"
+              ],
+              "description": "reference to workspace",
+              "format": "guid"
+            },
             "ContentItemName": {
               "type": "string",
               "minLength": 1
@@ -445,6 +453,14 @@
               "description": "parent folder guid. If null is specified, folder is created directly under root",
               "format": "guid"
             },
+            "ContentFolderWorkspaceGUID": {
+              "type": [
+                "null",
+                "string"
+              ],
+              "description": "workspace guid. If null is specified, default workspace is used",
+              "format": "guid"
+            },
             "ContentFolderName": {
               "type": "string",
               "minLength": 1

diff --git a/docs/Samples/basic.json b/docs/Samples/basic.json
@@ -478,6 +478,7 @@
     "$type": "ContentItem",
     "ContentItemGUID": "c354427d-3d02-4876-8ed4-4de817fae929",
     "ContentItemContentFolderGUID": null,
+    "ContentItemWorkspaceGUID": null,
     "ContentItemName": "NewsLetterExampleName",
     "ContentItemIsReusable": true,
     "ContentItemIsSecured": true,
@@ -556,6 +557,7 @@
     "$type": "ContentItem",
     "ContentItemGUID": "b64b3e3e-f5a9-4d02-8cdb-6d81805c0fee",
     "ContentItemContentFolderGUID": null,
+    "ContentItemWorkspaceGUID": null,
     "ContentItemName": "SampleReusableFaq",
     "ContentItemIsReusable": true,
     "ContentItemIsSecured": true,
@@ -569,8 +571,8 @@
     "ContentItemCommonDataContentLanguageGuid": "f454e93b-5fe9-42a9-b1af-b572234ed9c4",
     "ContentItemCommonDataVersionStatus": 2,
     "ContentItemCommonDataIsLatest": true,
-    "ContentItemCommonDataPageBuilderWidgets": null,
-    "ContentItemCommonDataPageTemplateConfiguration": null
+    "ContentItemCommonDataVisualBuilderWidgets": null,
+    "ContentItemCommonDataVisualBuilderTemplateConfiguration": null
   },
   {
     "$type": "ContentItemCommonData",
@@ -579,8 +581,8 @@
     "ContentItemCommonDataContentLanguageGuid": "a6c0a558-8b33-47b6-87a8-491b437c9923",
     "ContentItemCommonDataVersionStatus": 2,
     "ContentItemCommonDataIsLatest": true,
-    "ContentItemCommonDataPageBuilderWidgets": null,
-    "ContentItemCommonDataPageTemplateConfiguration": null
+    "ContentItemCommonDataVisualBuilderWidgets": null,
+    "ContentItemCommonDataVisualBuilderTemplateConfiguration": null
   },
   {
     "$type": "ContentItemData",
@@ -632,6 +634,7 @@
     "$type": "ContentItem",
     "ContentItemGUID": "df81215e-1414-4d87-befd-ae123f4e5653",
     "ContentItemContentFolderGUID": null,
+    "ContentItemWorkspaceGUID": null,
     "ContentItemName": "CreationOfUmtModel",
     "ContentItemIsReusable": false,
     "ContentItemIsSecured": false,
@@ -645,8 +648,8 @@
     "ContentItemCommonDataContentLanguageGuid": "f454e93b-5fe9-42a9-b1af-b572234ed9c4",
     "ContentItemCommonDataVersionStatus": 2,
     "ContentItemCommonDataIsLatest": true,
-    "ContentItemCommonDataPageBuilderWidgets": null,
-    "ContentItemCommonDataPageTemplateConfiguration": null
+    "ContentItemCommonDataVisualBuilderWidgets": null,
+    "ContentItemCommonDataVisualBuilderTemplateConfiguration": null
   },
   {
     "$type": "ContentItemCommonData",
@@ -655,8 +658,8 @@
     "ContentItemCommonDataContentLanguageGuid": "a6c0a558-8b33-47b6-87a8-491b437c9923",
     "ContentItemCommonDataVersionStatus": 2,
     "ContentItemCommonDataIsLatest": true,
-    "ContentItemCommonDataPageBuilderWidgets": null,
-    "ContentItemCommonDataPageTemplateConfiguration": null
+    "ContentItemCommonDataVisualBuilderWidgets": null,
+    "ContentItemCommonDataVisualBuilderTemplateConfiguration": null
   },
   {
     "$type": "ContentItemData",
@@ -765,6 +768,7 @@
     "$type": "ContentItem",
     "ContentItemGUID": "e09121ad-dd97-472f-b8f6-85fe5428ed6a",
     "ContentItemContentFolderGUID": null,
+    "ContentItemWorkspaceGUID": null,
     "ContentItemName": "Content-item-with-relations",
     "ContentItemIsReusable": false,
     "ContentItemIsSecured": true,
@@ -778,8 +782,8 @@
     "ContentItemCommonDataContentLanguageGuid": "f454e93b-5fe9-42a9-b1af-b572234ed9c4",
     "ContentItemCommonDataVersionStatus": 0,
     "ContentItemCommonDataIsLatest": true,
-    "ContentItemCommonDataPageBuilderWidgets": null,
-    "ContentItemCommonDataPageTemplateConfiguration": null
+    "ContentItemCommonDataVisualBuilderWidgets": null,
+    "ContentItemCommonDataVisualBuilderTemplateConfiguration": null
   },
   {
     "$type": "ContentItemCommonData",
@@ -788,8 +792,8 @@
     "ContentItemCommonDataContentLanguageGuid": "a6c0a558-8b33-47b6-87a8-491b437c9923",
     "ContentItemCommonDataVersionStatus": 2,
     "ContentItemCommonDataIsLatest": true,
-    "ContentItemCommonDataPageBuilderWidgets": null,
-    "ContentItemCommonDataPageTemplateConfiguration": null
+    "ContentItemCommonDataVisualBuilderWidgets": null,
+    "ContentItemCommonDataVisualBuilderTemplateConfiguration": null
   },
   {
     "$type": "ContentItemData",
@@ -904,6 +908,7 @@
     "$type": "ContentFolder",
     "ContentFolderGUID": "7665a8fc-53a2-4aff-86e8-99b009104ff2",
     "ContentFolderParentFolderGUID": null,
+    "ContentFolderWorkspaceGUID": null,
     "ContentFolderName": "articles",
     "ContentFolderDisplayName": "Articles",
     "ContentFolderTreePath": "/articles"
@@ -912,6 +917,7 @@
     "$type": "ContentFolder",
     "ContentFolderGUID": "ae29c1d1-217a-45da-8b30-585d1881387e",
     "ContentFolderParentFolderGUID": "7665a8fc-53a2-4aff-86e8-99b009104ff2",
+    "ContentFolderWorkspaceGUID": null,
     "ContentFolderName": "obsolete",
     "ContentFolderDisplayName": "Obsolete",
     "ContentFolderTreePath": "/articles/obsolete"
@@ -920,6 +926,7 @@
     "$type": "ContentItemSimplified",
     "ContentItemGUID": "37c3f5dd-6f2a-4eff-b46e-a36eddebf572",
     "ContentItemContentFolderGUID": null,
+    "ContentItemWorkspaceGUID": null,
     "IsSecured": false,
     "ContentTypeName": "UMT.Article",
     "Name": "SimplifiedModelSample",
@@ -990,6 +997,7 @@
     "$type": "ContentItemSimplified",
     "ContentItemGUID": "9ed8de86-859c-4f6c-94f2-cdd6baed99fe",
     "ContentItemContentFolderGUID": null,
+    "ContentItemWorkspaceGUID": null,
     "IsSecured": false,
     "ContentTypeName": "UMT.Article",
     "Name": "SimplifiedModelSampleAsSubPage",
@@ -1058,6 +1066,7 @@
     "$type": "ContentItemSimplified",
     "ContentItemGUID": "017edc1e-95c6-43e4-89d5-716c6ae594b2",
     "ContentItemContentFolderGUID": null,
+    "ContentItemWorkspaceGUID": null,
     "IsSecured": false,
     "ContentTypeName": "UMT.Article",
     "Name": "SimplifiedModelSampleAsSubPage2_Draft",
@@ -1168,6 +1177,7 @@
     "$type": "ContentItemSimplified",
     "ContentItemGUID": "73298f71-0bb1-4083-a674-a876769e3dd9",
     "ContentItemContentFolderGUID": null,
+    "ContentItemWorkspaceGUID": null,
     "IsSecured": false,
     "ContentTypeName": "UMT.Article",
     "Name": "SimplifiedModelSampleAsSubPage3_Draft",
@@ -1278,6 +1288,7 @@
     "$type": "ContentItemSimplified",
     "ContentItemGUID": "8e957ecc-083b-4c86-b761-8db516c13737",
     "ContentItemContentFolderGUID": null,
+    "ContentItemWorkspaceGUID": null,
     "IsSecured": false,
     "ContentTypeName": "UMT.Article",
     "Name": "SimplifiedModelSampleAsSubPage4",
@@ -1331,6 +1342,7 @@
     "$type": "ContentItemSimplified",
     "ContentItemGUID": "bb5c0eb4-e688-4a97-99c7-fa97cad8f1d5",
     "ContentItemContentFolderGUID": null,
+    "ContentItemWorkspaceGUID": null,
     "IsSecured": false,
     "ContentTypeName": "UMT.Article",
     "Name": "SimplifiedModelSampleAsSubPage5",
@@ -1384,6 +1396,7 @@
     "$type": "ContentItemSimplified",
     "ContentItemGUID": "1d542076-dd88-4c13-a8aa-0ffecdabba69",
     "ContentItemContentFolderGUID": null,
+    "ContentItemWorkspaceGUID": null,
     "IsSecured": false,
     "ContentTypeName": "UMT.Article",
     "Name": "SimplifiedModelSampleAsSubPage6",
@@ -1437,6 +1450,7 @@
     "$type": "ContentItemSimplified",
     "ContentItemGUID": "fb66242f-4186-4f71-b0b8-fc68b51d52c1",
     "ContentItemContentFolderGUID": null,
+    "ContentItemWorkspaceGUID": null,
     "IsSecured": false,
     "ContentTypeName": "UMT.Article",
     "Name": "SimplifiedModelSampleAsSubPage7",
@@ -1490,6 +1504,7 @@
     "$type": "ContentItemSimplified",
     "ContentItemGUID": "f9cb9484-ce90-460f-a5c8-ad953e2b9286",
     "ContentItemContentFolderGUID": "ae29c1d1-217a-45da-8b30-585d1881387e",
+    "ContentItemWorkspaceGUID": null,
     "IsSecured": false,
     "ContentTypeName": "UMT.Faq",
     "Name": "SimplifiedModelSampleReusable",
@@ -1529,6 +1544,7 @@
     "$type": "ContentItemSimplified",
     "ContentItemGUID": "c82cdc96-65ec-4f4c-aec2-3d657e6d5ce1",
     "ContentItemContentFolderGUID": null,
+    "ContentItemWorkspaceGUID": null,
     "IsSecured": false,
     "ContentTypeName": "UMT.Event",
     "Name": "SimplifiedModelSampleEventWithAssets",
@@ -1556,7 +1572,9 @@
             "Name": "byteArraySample.jpg",
             "Extension": ".jpg",
             "Size": null,
-            "LastModified": null
+            "LastModified": null,
+            "ImageWidth": null,
+            "ImageHeight": null
           }
         }
       },
@@ -1581,7 +1599,9 @@
             "Name": "urlSourceSample.jpg",
             "Extension": ".jpg",
             "Size": null,
-            "LastModified": null
+            "LastModified": null,
+            "ImageWidth": null,
+            "ImageHeight": null
           }
         }
       }