folder structure update / sln update (#7)

* folder structure update / sln update * fix(UMT/Example): fluent IServiceCollection extensions * bugfixes + WebPageUrlPath requirement for UrlPathHash is removed * documentation update * directory casing fix --------- Co-authored-by: Tomáš Krch <[email protected]> Co-authored-by: Sean G. Wright <[email protected]>
Kentico · Dec 12, 2023 · 7db1fc4 · 7db1fc4
1 parent 613a1c9
commit 7db1fc4
Show file tree

Hide file tree

Showing 103 changed files with 362 additions and 220 deletions.
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -1,33 +1,34 @@
 <Project>
-    <PropertyGroup>
-        <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
-        <CentralPackageVersionOverrideEnabled>false</CentralPackageVersionOverrideEnabled>
-        <RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
-        <DisableImplicitNuGetFallbackFolder>true</DisableImplicitNuGetFallbackFolder>
-    </PropertyGroup>
-    <ItemGroup>
-        <PackageVersion Include="Kentico.Xperience.Core" Version="28.0.1" />
-        <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="7.0.0" />
-        <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
-        <PackageVersion Include="SonarAnalyzer.CSharp" Version="9.6.0.74858" />
-        <PackageVersion Include="Markdig" Version="0.31.0" />
-        <PackageVersion Include="Microsoft.Build.Locator" Version="1.5.5" />
-        <PackageVersion Include="Microsoft.CodeAnalysis" Version="4.7.0-2.final" />
-        <PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.7.0-2.final" />
-        <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.1" />
-        <PackageVersion Include="Microsoft.Extensions.Logging.Configuration" Version="7.0.0" />
-        <PackageVersion Include="Microsoft.Extensions.Logging.Debug" Version="7.0.0" />
-        <PackageVersion Include="NJsonSchema" Version="10.9.0" />
-        <PackageVersion Include="RazorLight" Version="2.3.1" />
-        <PackageVersion Include="FluentAssertions" Version="6.11.0" />
-        <PackageVersion Include="Kentico.Xperience.Libraries.Tests" Version="13.0.118" />
-        <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.7.0" />
-        <PackageVersion Include="NUnit3TestAdapter" Version="4.5.0" />
-        <PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
-        <PackageVersion Include="Kentico.Xperience.Admin" Version="28.0.1" />
-        <PackageVersion Include="xunit.runner.visualstudio" Version="2.4.5" />
-        <PackageVersion Include="coverlet.collector" Version="3.2.0" />
-        <PackageVersion Include="System.Linq.Async" Version="6.0.1" />
-        <PackageVersion Include="xunit" Version="2.4.2" />
-    </ItemGroup>
+  <PropertyGroup>
+    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+    <CentralPackageVersionOverrideEnabled>false</CentralPackageVersionOverrideEnabled>
+    <RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
+    <DisableImplicitNuGetFallbackFolder>true</DisableImplicitNuGetFallbackFolder>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageVersion Include="Kentico.Xperience.Core" Version="28.0.1" />
+    <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="7.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
+    <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
+    <PackageVersion Include="SonarAnalyzer.CSharp" Version="9.6.0.74858" />
+    <PackageVersion Include="Markdig" Version="0.31.0" />
+    <PackageVersion Include="Microsoft.Build.Locator" Version="1.5.5" />
+    <PackageVersion Include="Microsoft.CodeAnalysis" Version="4.7.0-2.final" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.7.0-2.final" />
+    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Logging.Configuration" Version="8.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
+    <PackageVersion Include="NJsonSchema" Version="10.9.0" />
+    <PackageVersion Include="RazorLight" Version="2.3.1" />
+    <PackageVersion Include="FluentAssertions" Version="6.11.0" />
+    <PackageVersion Include="Kentico.Xperience.Libraries.Tests" Version="13.0.118" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.7.0" />
+    <PackageVersion Include="NUnit3TestAdapter" Version="4.5.0" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
+    <PackageVersion Include="Kentico.Xperience.Admin" Version="28.0.1" />
+    <PackageVersion Include="xunit.runner.visualstudio" Version="2.4.5" />
+    <PackageVersion Include="coverlet.collector" Version="3.2.0" />
+    <PackageVersion Include="System.Linq.Async" Version="6.0.1" />
+    <PackageVersion Include="xunit" Version="2.4.2" />
+  </ItemGroup>
 </Project>
diff --git a/Kentico.Xperience.UMT.sln b/Kentico.Xperience.UMT.sln
@@ -2,17 +2,17 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Kentico.Xperience.UMT", "src\Kentico.Xperience.UMT\Kentico.Xperience.UMT.csproj", "{F499DE79-C15E-4ABA-9E42-E0A243E0F598}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Kentico.Xperience.UMT.Example.Console", "Examples\Kentico.Xperience.UMT.Example.Console\Kentico.Xperience.UMT.Example.Console.csproj", "{B34D5B62-F958-48E4-84A3-35343529FCF7}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Kentico.Xperience.UMT.Example.Console", "examples\Kentico.Xperience.UMT.Example.Console\Kentico.Xperience.UMT.Example.Console.csproj", "{B34D5B62-F958-48E4-84A3-35343529FCF7}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Examples", "Examples", "{A22B7345-BFCB-4BB2-85DA-A32BE7024061}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Kentico.Xperience.UMT.Example.AdminApp", "Examples\Kentico.Xperience.UMT.Example.AdminApp\Kentico.Xperience.UMT.Example.AdminApp.csproj", "{4ABF76B5-3ED7-44CF-9FFA-39F299BD947C}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Kentico.Xperience.UMT.Example.AdminApp", "examples\Kentico.Xperience.UMT.Example.AdminApp\Kentico.Xperience.UMT.Example.AdminApp.csproj", "{4ABF76B5-3ED7-44CF-9FFA-39F299BD947C}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Kentico.Xperience.UMT.Examples", "Examples\Kentico.Xperience.UMT.Examples\Kentico.Xperience.UMT.Examples.csproj", "{85138B06-9F3F-40A6-8465-479F591D2845}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Kentico.Xperience.UMT.Examples", "examples\Kentico.Xperience.UMT.Examples\Kentico.Xperience.UMT.Examples.csproj", "{85138B06-9F3F-40A6-8465-479F591D2845}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Utils", "Utils", "{66C1E923-BA9C-4674-8534-F456FE27592A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Kentico.Xperience.UMT.DocUtils", "Utils\Kentico.Xperience.UMT.DocUtils\Kentico.Xperience.UMT.DocUtils.csproj", "{71299533-CB05-4068-B5C3-9BCE76413E26}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Kentico.Xperience.UMT.DocUtils", "utils\Kentico.Xperience.UMT.DocUtils\Kentico.Xperience.UMT.DocUtils.csproj", "{71299533-CB05-4068-B5C3-9BCE76413E26}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/Docs/Class/IImportService.md → docs/Class/IImportService.md b/Docs/Class/IImportService.md → docs/Class/IImportService.md
diff --git a/Docs/Class/ImportStateObserver.md → docs/Class/ImportStateObserver.md b/Docs/Class/ImportStateObserver.md → docs/Class/ImportStateObserver.md
diff --git a/Docs/Enums/ColumnType.md → docs/Enums/ColumnType.md b/Docs/Enums/ColumnType.md → docs/Enums/ColumnType.md
diff --git a/Docs/Enums/FormComponents.md → docs/Enums/FormComponents.md b/Docs/Enums/FormComponents.md → docs/Enums/FormComponents.md
diff --git a/Docs/Model/ChannelModel.md → docs/Model/ChannelModel.md b/Docs/Model/ChannelModel.md → docs/Model/ChannelModel.md
diff --git a/Docs/Model/ContentItemCommonDataModel.md → docs/Model/ContentItemCommonDataModel.md b/Docs/Model/ContentItemCommonDataModel.md → docs/Model/ContentItemCommonDataModel.md
diff --git a/Docs/Model/ContentItemDataModel.md → docs/Model/ContentItemDataModel.md b/Docs/Model/ContentItemDataModel.md → docs/Model/ContentItemDataModel.md
diff --git a/...Model/ContentItemLanguageMetadataModel.md → ...Model/ContentItemLanguageMetadataModel.md b/...Model/ContentItemLanguageMetadataModel.md → ...Model/ContentItemLanguageMetadataModel.md
diff --git a/Docs/Model/ContentItemModel.md → docs/Model/ContentItemModel.md b/Docs/Model/ContentItemModel.md → docs/Model/ContentItemModel.md
diff --git a/Docs/Model/ContentItemReferenceModel.md → docs/Model/ContentItemReferenceModel.md b/Docs/Model/ContentItemReferenceModel.md → docs/Model/ContentItemReferenceModel.md
@@ -7,7 +7,7 @@ Model [discriminator](../UmtModel.md#discriminator): `ContentItemReference`
 |ContentItemReferenceGUID\*||System.Guid?|[UniqueId](../UmtModel.md#UniqueId)|
 |ContentItemReferenceSourceCommonDataGuid\*||System.Guid?|Reference to [ContentItemCommonDataInfo](../References.md#ContentItemCommonDataInfo) on property ContentItemReferenceSourceCommonDataID **required**|
 |ContentItemReferenceTargetItemGuid\*||System.Guid?|Reference to [ContentItemInfo](../References.md#ContentItemInfo) on property ContentItemReferenceTargetItemID **required**|
-|ContentItemReferenceGroupGUID\*||System.Guid?|[UniqueId](../UmtModel.md#UniqueId)|
+|ContentItemReferenceGroupGUID\*||System.Guid?||
 |[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/ContentLanguageModel.md → docs/Model/ContentLanguageModel.md b/Docs/Model/ContentLanguageModel.md → docs/Model/ContentLanguageModel.md
diff --git a/Docs/Model/ContentTypeChannelModel.md → docs/Model/ContentTypeChannelModel.md b/Docs/Model/ContentTypeChannelModel.md → docs/Model/ContentTypeChannelModel.md
diff --git a/Docs/Model/DataClassModel.md → docs/Model/DataClassModel.md b/Docs/Model/DataClassModel.md → docs/Model/DataClassModel.md
@@ -34,12 +34,13 @@ This sample describes how to create class inside XbyK to hold Article data
   "ClassDisplayName": "This is Article example",
   "ClassName": "UMT.Article",
   "ClassTableName": "UMT_Article",
-  "ClassLastModified": "2023-12-08T23:29:12.7097663\u002B01:00",
+  "ClassLastModified": "2023-12-12T23:24:07.834174\u002B01:00",
   "ClassGUID": "06540294-3b56-4cf7-8773-088bb766ac23",
   "ClassResourceGuid": "0e4beef1-989c-4687-80ca-ae21fec09734",
   "ClassHasUnmanagedDbSchema": false,
   "ClassType": "Content",
   "ClassContentTypeType": "Website",
+  "ClassWebPageHasUrl": true,
   "Fields": [
     {
       "AllowEmpty": true,
@@ -121,8 +122,8 @@ This sample describes how to create class inside XbyK to hold Article data
   "ClassDisplayName": "Event",
   "ClassName": "UMT.Event",
   "ClassTableName": "UMT_Event",
-  "ClassLastModified": "2023-12-08T23:29:12.7326949\u002B01:00",
-  "ClassGUID": "8d907871-5a82-4945-a533-1c4024829b64",
+  "ClassLastModified": "2023-12-12T23:24:07.8659387\u002B01:00",
+  "ClassGUID": "2aa8f44a-8839-42a1-ba61-963e2b01ecaf",
   "ClassResourceGuid": "ff8285c1-9d1a-49b3-8c9d-7502e1e533f7",
   "ClassHasUnmanagedDbSchema": false,
   "ClassType": "Content",
@@ -200,7 +201,7 @@ This sample describes how to create class inside XbyK to hold Article data
   "ClassDisplayName": "Faq",
   "ClassName": "UMT.Faq",
   "ClassTableName": "UMT_Faq",
-  "ClassLastModified": "2023-12-08T23:29:12.7333315\u002B01:00",
+  "ClassLastModified": "2023-12-12T23:24:07.8669817\u002B01:00",
   "ClassGUID": "7ed6604e-613b-4ce0-8c21-acfb372c416a",
   "ClassHasUnmanagedDbSchema": false,
   "ClassType": "Content",

diff --git a/Docs/Model/EmailChannelModel.md → docs/Model/EmailChannelModel.md b/Docs/Model/EmailChannelModel.md → docs/Model/EmailChannelModel.md
diff --git a/Docs/Model/MediaFileModel.md → docs/Model/MediaFileModel.md b/Docs/Model/MediaFileModel.md → docs/Model/MediaFileModel.md
@@ -19,7 +19,6 @@ Model [discriminator](../UmtModel.md#discriminator): `Media_File`
 |FileImageHeight||int?||
 |FileCreatedWhen||System.DateTime?||
 |FileModifiedWhen||System.DateTime?||
-|FileCustomData||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/MediaLibraryModel.md → docs/Model/MediaLibraryModel.md b/Docs/Model/MediaLibraryModel.md → docs/Model/MediaLibraryModel.md
@@ -8,7 +8,6 @@ Model [discriminator](../UmtModel.md#discriminator): `Media_Library`
 |LibraryDisplayName\*||string?||
 |LibraryDescription||string?||
 |LibraryFolder\*||string?||
-|LibraryAccess||int?||
 |LibraryGUID\*||System.Guid?|[UniqueId](../UmtModel.md#UniqueId)|
 |LibraryLastModified||System.DateTime?||
 |[customPropertyName]|custom property defined by created [DataClass](./DataClassModel.md)|.NET type defined by data class field||

diff --git a/Docs/Model/UMT.schema.json → docs/Model/UMT.schema.json b/Docs/Model/UMT.schema.json → docs/Model/UMT.schema.json
@@ -811,12 +811,6 @@
                 "string"
               ],
               "format": "date-time"
-            },
-            "FileCustomData": {
-              "type": [
-                "null",
-                "string"
-              ]
             }
           }
         }
@@ -862,13 +856,6 @@
               "type": "string",
               "minLength": 1
             },
-            "LibraryAccess": {
-              "type": [
-                "integer",
-                "null"
-              ],
-              "format": "int32"
-            },
             "LibraryGUID": {
               "type": "string",
               "format": "guid",

diff --git a/Docs/Model/UserInfoModel.md → docs/Model/UserInfoModel.md b/Docs/Model/UserInfoModel.md → docs/Model/UserInfoModel.md
diff --git a/Docs/Model/WebPageItemModel.md → docs/Model/WebPageItemModel.md b/Docs/Model/WebPageItemModel.md → docs/Model/WebPageItemModel.md
diff --git a/Docs/Model/WebPageUrlPathModel.md → docs/Model/WebPageUrlPathModel.md b/Docs/Model/WebPageUrlPathModel.md → docs/Model/WebPageUrlPathModel.md
diff --git a/Docs/Model/WebsiteChannelModel.md → docs/Model/WebsiteChannelModel.md b/Docs/Model/WebsiteChannelModel.md → docs/Model/WebsiteChannelModel.md
diff --git a/Docs/README.md → docs/README.md b/Docs/README.md → docs/README.md
diff --git a/Docs/References.md → docs/References.md b/Docs/References.md → docs/References.md
diff --git a/Docs/Samples/basic.json → docs/Samples/basic.json b/Docs/Samples/basic.json → docs/Samples/basic.json
@@ -74,7 +74,7 @@
     "ClassName": "UMT.Article",
     "ClassTableName": "UMT_Article",
     "ClassShowTemplateSelection": null,
-    "ClassLastModified": "2023-12-08T23:29:13.0056045\u002B01:00",
+    "ClassLastModified": "2023-12-12T23:24:08.1076311\u002B01:00",
     "ClassGUID": "06540294-3b56-4cf7-8773-088bb766ac23",
     "ClassContactMapping": null,
     "ClassContactOverwriteEnabled": null,
@@ -85,7 +85,7 @@
     "ClassHasUnmanagedDbSchema": false,
     "ClassType": "Content",
     "ClassContentTypeType": "Website",
-    "ClassWebPageHasUrl": null,
+    "ClassWebPageHasUrl": true,
     "Fields": [
       {
         "AllowEmpty": true,
@@ -168,7 +168,7 @@
     "ClassName": "UMT.Faq",
     "ClassTableName": "UMT_Faq",
     "ClassShowTemplateSelection": null,
-    "ClassLastModified": "2023-12-08T23:29:13.0056294\u002B01:00",
+    "ClassLastModified": "2023-12-12T23:24:08.1076747\u002B01:00",
     "ClassGUID": "7ed6604e-613b-4ce0-8c21-acfb372c416a",
     "ClassContactMapping": null,
     "ClassContactOverwriteEnabled": null,
@@ -228,9 +228,9 @@
     "ContentItemLanguageMetadataContentItemGuid": "c354427d-3d02-4876-8ed4-4de817fae929",
     "ContentItemLanguageMetadataDisplayName": "Language Metadata Example",
     "ContentItemLanguageMetadataLatestVersionStatus": 0,
-    "ContentItemLanguageMetadataCreatedWhen": "2023-12-06T23:29:13.0060435\u002B01:00",
+    "ContentItemLanguageMetadataCreatedWhen": "2023-12-10T23:24:08.1082307\u002B01:00",
     "ContentItemLanguageMetadataCreatedByUserGuid": "95f42fd4-6a14-4e88-b214-4e136479f788",
-    "ContentItemLanguageMetadataModifiedWhen": "2023-12-08T23:29:13.0060512\u002B01:00",
+    "ContentItemLanguageMetadataModifiedWhen": "2023-12-12T23:24:08.1082408\u002B01:00",
     "ContentItemLanguageMetadataModifiedByUserGuid": "95f42fd4-6a14-4e88-b214-4e136479f788",
     "ContentItemLanguageMetadataHasImageAsset": false,
     "ContentItemLanguageMetadataContentLanguageGuid": "f454e93b-5fe9-42a9-b1af-b572234ed9c4"
@@ -241,9 +241,9 @@
     "ContentItemLanguageMetadataContentItemGuid": "c354427d-3d02-4876-8ed4-4de817fae929",
     "ContentItemLanguageMetadataDisplayName": "Basic Language Metadata Example",
     "ContentItemLanguageMetadataLatestVersionStatus": 0,
-    "ContentItemLanguageMetadataCreatedWhen": "2023-12-06T23:29:13.0062866\u002B01:00",
+    "ContentItemLanguageMetadataCreatedWhen": "2023-12-10T23:24:08.108501\u002B01:00",
     "ContentItemLanguageMetadataCreatedByUserGuid": null,
-    "ContentItemLanguageMetadataModifiedWhen": "2023-12-08T23:29:13.0062944\u002B01:00",
+    "ContentItemLanguageMetadataModifiedWhen": "2023-12-12T23:24:08.1085354\u002B01:00",
     "ContentItemLanguageMetadataModifiedByUserGuid": null,
     "ContentItemLanguageMetadataHasImageAsset": false,
     "ContentItemLanguageMetadataContentLanguageGuid": "f454e93b-5fe9-42a9-b1af-b572234ed9c4"
@@ -264,7 +264,6 @@
     "LibraryDisplayName": "LibraryDisplayedName",
     "LibraryDescription": "TestLibrary",
     "LibraryFolder": "TestFolder",
-    "LibraryAccess": null,
     "LibraryGUID": "e3a9c50c-2b76-4ba8-ac19-2f0aa64c47d5",
     "LibraryLastModified": null
   },
@@ -284,8 +283,7 @@
     "FileImageWidth": null,
     "FileImageHeight": null,
     "FileCreatedWhen": null,
-    "FileModifiedWhen": null,
-    "FileCustomData": null
+    "FileModifiedWhen": null
   },
   {
     "$type": "ContentItem",
@@ -362,6 +360,28 @@
     "ContentItemLanguageMetadataHasImageAsset": false,
     "ContentItemLanguageMetadataContentLanguageGuid": "a6c0a558-8b33-47b6-87a8-491b437c9923"
   },
+  {
+    "$type": "WebPageUrlPath",
+    "WebPageUrlPathGUID": "2bda2458-e262-4825-b51b-5a7b345ed7bd",
+    "WebPageUrlPath": "en-US/creation-of-umt-model",
+    "WebPageUrlPathHash": null,
+    "WebPageUrlPathWebPageItemGuid": "6e995319-77e7-475e-9ebb-607bdbf5af9a",
+    "WebPageUrlPathWebsiteChannelGuid": "a6ba6fcb-9d05-4abe-afb4-74b153c90db7",
+    "WebPageUrlPathContentLanguageGuid": "f454e93b-5fe9-42a9-b1af-b572234ed9c4",
+    "WebPageUrlPathIsLatest": true,
+    "WebPageUrlPathIsDraft": false
+  },
+  {
+    "$type": "WebPageUrlPath",
+    "WebPageUrlPathGUID": "8083fa41-03fe-49c3-87fb-4f7c530b14cf",
+    "WebPageUrlPath": "en-GB/creation-of-umt-model",
+    "WebPageUrlPathHash": null,
+    "WebPageUrlPathWebPageItemGuid": "6e995319-77e7-475e-9ebb-607bdbf5af9a",
+    "WebPageUrlPathWebsiteChannelGuid": "a6ba6fcb-9d05-4abe-afb4-74b153c90db7",
+    "WebPageUrlPathContentLanguageGuid": "a6c0a558-8b33-47b6-87a8-491b437c9923",
+    "WebPageUrlPathIsLatest": true,
+    "WebPageUrlPathIsDraft": false
+  },
   {
     "$type": "WebPageItem",
     "WebPageItemGUID": "6e995319-77e7-475e-9ebb-607bdbf5af9a",

diff --git a/Docs/UmtModel.md → docs/UmtModel.md b/Docs/UmtModel.md → docs/UmtModel.md
diff --git a/...Xperience.UMT.Example.AdminApp/.gitignore → ...Xperience.UMT.Example.AdminApp/.gitignore b/...Xperience.UMT.Example.AdminApp/.gitignore → ...Xperience.UMT.Example.AdminApp/.gitignore
diff --git a/...AdminApp/.images/content-types-sample.png → ...AdminApp/.images/content-types-sample.png b/...AdminApp/.images/content-types-sample.png → ...AdminApp/.images/content-types-sample.png
diff --git a/...mple.AdminApp/.images/expected-result.png → ...mple.AdminApp/.images/expected-result.png b/...mple.AdminApp/.images/expected-result.png → ...mple.AdminApp/.images/expected-result.png
diff --git a/...MT.Example.AdminApp/.images/pick-file.png → ...MT.Example.AdminApp/.images/pick-file.png b/...MT.Example.AdminApp/.images/pick-file.png → ...MT.Example.AdminApp/.images/pick-file.png
diff --git a/....Example.AdminApp/.images/sample-apps.png → ....Example.AdminApp/.images/sample-apps.png b/....Example.AdminApp/.images/sample-apps.png → ....Example.AdminApp/.images/sample-apps.png
diff --git a/....AdminApp/Auxiliary/AsynchronousStream.cs → ....AdminApp/Auxiliary/AsynchronousStream.cs b/....AdminApp/Auxiliary/AsynchronousStream.cs → ....AdminApp/Auxiliary/AsynchronousStream.cs
diff --git a/...Example.AdminApp/Client/babel.config.json → ...Example.AdminApp/Client/babel.config.json b/...Example.AdminApp/Client/babel.config.json → ...Example.AdminApp/Client/babel.config.json
diff --git a/...nt/dist/entry.kxh.6714030b658dd64c29c5.js → ...nt/dist/entry.kxh.6714030b658dd64c29c5.js b/...nt/dist/entry.kxh.6714030b658dd64c29c5.js → ...nt/dist/entry.kxh.6714030b658dd64c29c5.js
diff --git a/...Example.AdminApp/Client/package-lock.json → ...Example.AdminApp/Client/package-lock.json b/...Example.AdminApp/Client/package-lock.json → ...Example.AdminApp/Client/package-lock.json
diff --git a/....UMT.Example.AdminApp/Client/package.json → ....UMT.Example.AdminApp/Client/package.json b/....UMT.Example.AdminApp/Client/package.json → ....UMT.Example.AdminApp/Client/package.json
diff --git a/...rc/custom-layout/CustomLayoutTemplate.tsx → ...rc/custom-layout/CustomLayoutTemplate.tsx b/...rc/custom-layout/CustomLayoutTemplate.tsx → ...rc/custom-layout/CustomLayoutTemplate.tsx
diff --git a/...UMT.Example.AdminApp/Client/src/entry.tsx → ...UMT.Example.AdminApp/Client/src/entry.tsx b/...UMT.Example.AdminApp/Client/src/entry.tsx → ...UMT.Example.AdminApp/Client/src/entry.tsx
diff --git a/...UMT.Example.AdminApp/Client/tsconfig.json → ...UMT.Example.AdminApp/Client/tsconfig.json b/...UMT.Example.AdminApp/Client/tsconfig.json → ...UMT.Example.AdminApp/Client/tsconfig.json
diff --git a/...Example.AdminApp/Client/webpack.config.js → ...Example.AdminApp/Client/webpack.config.js b/...Example.AdminApp/Client/webpack.config.js → ...Example.AdminApp/Client/webpack.config.js
diff --git a/...ce.UMT.Example.AdminApp/Data/Samples.json → ...ce.UMT.Example.AdminApp/Data/Samples.json b/...ce.UMT.Example.AdminApp/Data/Samples.json → ...ce.UMT.Example.AdminApp/Data/Samples.json
diff --git a/...ico.Xperience.UMT.Example.AdminApp.csproj → ...ico.Xperience.UMT.Example.AdminApp.csproj b/...ico.Xperience.UMT.Example.AdminApp.csproj → ...ico.Xperience.UMT.Example.AdminApp.csproj
@@ -19,7 +19,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\..\src\Kentico.Xperience.UMT\Kentico.Xperience.UMT.csproj" />
+        <ProjectReference Include="..\..\src\Kentico.Xperience.UMT\Kentico.Xperience.UMT.csproj" />        
     </ItemGroup>
 
     <ItemGroup>

diff --git a/....Xperience.UMT.Example.AdminApp/README.md → ....Xperience.UMT.Example.AdminApp/README.md b/....Xperience.UMT.Example.AdminApp/README.md → ....Xperience.UMT.Example.AdminApp/README.md
diff --git a/...e.AdminApp/ServiceCollectionExtensions.cs → ...e.AdminApp/ServiceCollectionExtensions.cs b/...e.AdminApp/ServiceCollectionExtensions.cs → ...e.AdminApp/ServiceCollectionExtensions.cs
@@ -17,10 +17,10 @@ public static class ServiceCollectionExtensions
 {
     private const string SOURCE = "UMT.Example";
 
-    public static void AddUmtSample(this IServiceCollection services) => services.AddUniversalMigrationToolkit();
+    public static IServiceCollection AddUmtSample(this IServiceCollection services) => services.AddUniversalMigrationToolkit();
 
 
-    public static void UseUmtSample(this IApplicationBuilder app)
+    public static IApplicationBuilder UseUmtSample(this IApplicationBuilder app)
     {
         app.UseWebSockets();
 
@@ -47,6 +47,8 @@ public static void UseUmtSample(this IApplicationBuilder app)
                 await next(context);
             }
         });
+
+        return app;
     }
 
     private sealed record Message(string Type, HeaderPayload? Payload);
@@ -64,7 +66,7 @@ async Task SendProgressReport(string message)
                 await webSocket.SendAsync(new ArraySegment<byte>(payload, 0, payload.Length), WebSocketMessageType.Text, true, CancellationToken.None);
             }
         }
-        
+
         async Task SendStats(IDictionary<string, int> stats)
         {
             if (webSocket.State == WebSocketState.Open)
@@ -116,7 +118,7 @@ async Task SendConfirmHeader()
                 var observer = new ImportStateObserver();
 
                 var stats = new ConcurrentDictionary<string, int>();
-                
+
                 observer = await importService.StartImportAsync(data!, observer);
                 observer.ImportedInfo += async (model, info) =>
                 {
@@ -164,9 +166,9 @@ async Task SendConfirmHeader()
                     if (buffer[0] == 0x2D && buffer.Take(5).All(x => x.Equals(0X2D)))
                     {
                         ms.Flush();
-                        break;    
+                        break;
                     }
-                    
+
                     ms.Write(data.Array!, data.Offset, receiveResult.Count);
                     ms.Flush();
 

diff --git a/...tomTemplate/UniversalMigrationTemplate.cs → ...tomTemplate/UniversalMigrationTemplate.cs b/...tomTemplate/UniversalMigrationTemplate.cs → ...tomTemplate/UniversalMigrationTemplate.cs
diff --git a/...UMT.Example.AdminApp/UmtWebAdminModule.cs → ...UMT.Example.AdminApp/UmtWebAdminModule.cs b/...UMT.Example.AdminApp/UmtWebAdminModule.cs → ...UMT.Example.AdminApp/UmtWebAdminModule.cs
diff --git a/...e.UMT.Example.AdminApp/packages.lock.json → ...e.UMT.Example.AdminApp/packages.lock.json b/...e.UMT.Example.AdminApp/packages.lock.json → ...e.UMT.Example.AdminApp/packages.lock.json
@@ -647,7 +647,7 @@
       },
       "Microsoft.Extensions.Logging.Abstractions": {
         "type": "CentralTransitive",
-        "requested": "[7.0.1, )",
+        "requested": "[8.0.0, )",
         "resolved": "6.0.4",
         "contentHash": "K14wYgwOfKVELrUh5eBqlC8Wvo9vvhS3ZhIvcswV2uS/ubkTRPSQsN557EZiYUSSoZNxizG+alN4wjtdyLdcyw=="
       }

diff --git a/....Xperience.UMT.Example.Console/.gitignore → ....Xperience.UMT.Example.Console/.gitignore b/....Xperience.UMT.Example.Console/.gitignore → ....Xperience.UMT.Example.Console/.gitignore
diff --git a/...tico.Xperience.UMT.Example.Console.csproj → ...tico.Xperience.UMT.Example.Console.csproj b/...tico.Xperience.UMT.Example.Console.csproj → ...tico.Xperience.UMT.Example.Console.csproj
@@ -6,13 +6,14 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Kentico.Xperience.UMT\Kentico.Xperience.UMT.csproj" />
+    <ProjectReference Include="..\..\src\Kentico.Xperience.UMT\Kentico.Xperience.UMT.csproj" />    
     <ProjectReference Include="..\Kentico.Xperience.UMT.Examples\Kentico.Xperience.UMT.Examples.csproj" />
   </ItemGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" />
     <PackageReference Include="Microsoft.Extensions.Logging.Debug" />
   </ItemGroup>
 

diff --git a/....Xperience.UMT.Example.Console/Program.cs → ....Xperience.UMT.Example.Console/Program.cs b/....Xperience.UMT.Example.Console/Program.cs → ....Xperience.UMT.Example.Console/Program.cs
@@ -25,7 +25,7 @@
 CMSApplication.Init();
 
 var services = new ServiceCollection();
-services.AddLogging(b => b.AddDebug());
+services.AddLogging(b => b.AddDebug().AddSimpleConsole(options => options.SingleLine = true).AddConfiguration(root.GetSection("Logging")));
 services.AddUniversalMigrationToolkit();
 
 var serviceProvider = services.BuildServiceProvider();

diff --git a/...o.Xperience.UMT.Example.Console/README.md → ...o.Xperience.UMT.Example.Console/README.md b/...o.Xperience.UMT.Example.Console/README.md → ...o.Xperience.UMT.Example.Console/README.md
diff --git a/...erience.UMT.Example.Console/SampleJson.cs → ...erience.UMT.Example.Console/SampleJson.cs b/...erience.UMT.Example.Console/SampleJson.cs → ...erience.UMT.Example.Console/SampleJson.cs
diff --git a/...ence.UMT.Example.Console/appsettings.json → ...ence.UMT.Example.Console/appsettings.json b/...ence.UMT.Example.Console/appsettings.json → ...ence.UMT.Example.Console/appsettings.json