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

folder structure update / sln update #7

Merged
merged 6 commits into from
Dec 12, 2023
Merged

folder structure update / sln update #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
45fc9f3
folder structure update / sln update
tkrch Dec 11, 2023
5a4e293
fix(UMT/Example): fluent IServiceCollection extensions
seangwright Dec 11, 2023
99158c4
bugfixes + WebPageUrlPath requirement for UrlPathHash is removed
tkrch Dec 12, 2023
c9a5964
solution structure fixed
tkrch Dec 12, 2023
48a5dad
documentation update
tkrch Dec 12, 2023
ae72541
directory casing fix
tkrch Dec 12, 2023
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
63 changes: 32 additions & 31 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
8 changes: 4 additions & 4 deletions Kentico.Xperience.UMT.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
0 Docs/Class/IImportService.md → docs/Class/IImportService.md
View file
Open in desktop
File renamed without changes.
0 Docs/Class/ImportStateObserver.md → docs/Class/ImportStateObserver.md
View file
Open in desktop
File renamed without changes.
0 Docs/Enums/ColumnType.md → docs/Enums/ColumnType.md
View file
Open in desktop
File renamed without changes.
0 Docs/Enums/FormComponents.md → docs/Enums/FormComponents.md
View file
Open in desktop
File renamed without changes.
0 Docs/Model/ChannelModel.md → docs/Model/ChannelModel.md
View file
Open in desktop
File renamed without changes.
0 Docs/Model/ContentItemCommonDataModel.md → docs/Model/ContentItemCommonDataModel.md
View file
Open in desktop
File renamed without changes.
0 Docs/Model/ContentItemDataModel.md → docs/Model/ContentItemDataModel.md
View file
Open in desktop
File renamed without changes.
0 ...Model/ContentItemLanguageMetadataModel.md → ...Model/ContentItemLanguageMetadataModel.md
View file
Open in desktop
File renamed without changes.
0 Docs/Model/ContentItemModel.md → docs/Model/ContentItemModel.md
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion Docs/Model/ContentItemReferenceModel.md → docs/Model/ContentItemReferenceModel.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
0 Docs/Model/ContentLanguageModel.md → docs/Model/ContentLanguageModel.md
View file
Open in desktop
File renamed without changes.
0 Docs/Model/ContentTypeChannelModel.md → docs/Model/ContentTypeChannelModel.md
View file
Open in desktop
File renamed without changes.
9 changes: 5 additions & 4 deletions Docs/Model/DataClassModel.md → docs/Model/DataClassModel.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
0 Docs/Model/EmailChannelModel.md → docs/Model/EmailChannelModel.md
View file
Open in desktop
File renamed without changes.
1 change: 0 additions & 1 deletion Docs/Model/MediaFileModel.md → docs/Model/MediaFileModel.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 0 additions & 1 deletion Docs/Model/MediaLibraryModel.md → docs/Model/MediaLibraryModel.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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||
Expand Down
13 changes: 0 additions & 13 deletions Docs/Model/UMT.schema.json → docs/Model/UMT.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -811,12 +811,6 @@
"string"
],
"format": "date-time"
},
"FileCustomData": {
"type": [
"null",
"string"
]
}
}
}
Expand Down Expand Up @@ -862,13 +856,6 @@
"type": "string",
"minLength": 1
},
"LibraryAccess": {
"type": [
"integer",
"null"
],
"format": "int32"
},
"LibraryGUID": {
"type": "string",
"format": "guid",
Expand Down
0 Docs/Model/UserInfoModel.md → docs/Model/UserInfoModel.md
View file
Open in desktop
File renamed without changes.
0 Docs/Model/WebPageItemModel.md → docs/Model/WebPageItemModel.md
View file
Open in desktop
File renamed without changes.
0 Docs/Model/WebPageUrlPathModel.md → docs/Model/WebPageUrlPathModel.md
View file
Open in desktop
File renamed without changes.
0 Docs/Model/WebsiteChannelModel.md → docs/Model/WebsiteChannelModel.md
View file
Open in desktop
File renamed without changes.
0 Docs/README.md → docs/README.md
View file
Open in desktop
File renamed without changes.
0 Docs/References.md → docs/References.md
View file
Open in desktop
File renamed without changes.
40 changes: 30 additions & 10 deletions Docs/Samples/basic.json → docs/Samples/basic.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -85,7 +85,7 @@
"ClassHasUnmanagedDbSchema": false,
"ClassType": "Content",
"ClassContentTypeType": "Website",
"ClassWebPageHasUrl": null,
"ClassWebPageHasUrl": true,
"Fields": [
{
"AllowEmpty": true,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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"
Expand All @@ -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"
Expand All @@ -264,7 +264,6 @@
"LibraryDisplayName": "LibraryDisplayedName",
"LibraryDescription": "TestLibrary",
"LibraryFolder": "TestFolder",
"LibraryAccess": null,
"LibraryGUID": "e3a9c50c-2b76-4ba8-ac19-2f0aa64c47d5",
"LibraryLastModified": null
},
Expand All @@ -284,8 +283,7 @@
"FileImageWidth": null,
"FileImageHeight": null,
"FileCreatedWhen": null,
"FileModifiedWhen": null,
"FileCustomData": null
"FileModifiedWhen": null
},
{
"$type": "ContentItem",
Expand Down Expand Up @@ -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",
Expand Down
0 Docs/UmtModel.md → docs/UmtModel.md
View file
Open in desktop
File renamed without changes.
0 ...Xperience.UMT.Example.AdminApp/.gitignore → ...Xperience.UMT.Example.AdminApp/.gitignore
View file
Open in desktop
File renamed without changes.
0 ...AdminApp/.images/content-types-sample.png → ...AdminApp/.images/content-types-sample.png
View file
Open in desktop
File renamed without changes
0 ...mple.AdminApp/.images/expected-result.png → ...mple.AdminApp/.images/expected-result.png
View file
Open in desktop
File renamed without changes
0 ...MT.Example.AdminApp/.images/pick-file.png → ...MT.Example.AdminApp/.images/pick-file.png
View file
Open in desktop
File renamed without changes
0 ....Example.AdminApp/.images/sample-apps.png → ....Example.AdminApp/.images/sample-apps.png
View file
Open in desktop
File renamed without changes
0 ....AdminApp/Auxiliary/AsynchronousStream.cs → ....AdminApp/Auxiliary/AsynchronousStream.cs
View file
Open in desktop
File renamed without changes.
0 ...Example.AdminApp/Client/babel.config.json → ...Example.AdminApp/Client/babel.config.json
View file
Open in desktop
File renamed without changes.
0 ...nt/dist/entry.kxh.6714030b658dd64c29c5.js → ...nt/dist/entry.kxh.6714030b658dd64c29c5.js
View file
Open in desktop
File renamed without changes.
0 ...Example.AdminApp/Client/package-lock.json → ...Example.AdminApp/Client/package-lock.json
View file
Open in desktop
File renamed without changes.
0 ....UMT.Example.AdminApp/Client/package.json → ....UMT.Example.AdminApp/Client/package.json
View file
Open in desktop
File renamed without changes.
0 ...rc/custom-layout/CustomLayoutTemplate.tsx → ...rc/custom-layout/CustomLayoutTemplate.tsx
View file
Open in desktop
File renamed without changes.
0 ...UMT.Example.AdminApp/Client/src/entry.tsx → ...UMT.Example.AdminApp/Client/src/entry.tsx
View file
Open in desktop
File renamed without changes.
0 ...UMT.Example.AdminApp/Client/tsconfig.json → ...UMT.Example.AdminApp/Client/tsconfig.json
View file
Open in desktop
File renamed without changes.
0 ...Example.AdminApp/Client/webpack.config.js → ...Example.AdminApp/Client/webpack.config.js
View file
Open in desktop
File renamed without changes.
0 ...ce.UMT.Example.AdminApp/Data/Samples.json → ...ce.UMT.Example.AdminApp/Data/Samples.json
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...ico.Xperience.UMT.Example.AdminApp.csproj → ...ico.Xperience.UMT.Example.AdminApp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
0 ....Xperience.UMT.Example.AdminApp/README.md → ....Xperience.UMT.Example.AdminApp/README.md
View file
Open in desktop
File renamed without changes.
14 changes: 8 additions & 6 deletions ...e.AdminApp/ServiceCollectionExtensions.cs → ...e.AdminApp/ServiceCollectionExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand All @@ -47,6 +47,8 @@ public static void UseUmtSample(this IApplicationBuilder app)
await next(context);
}
});

return app;
}

private sealed record Message(string Type, HeaderPayload? Payload);
Expand All @@ -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)
Expand Down Expand Up @@ -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) =>
{
Expand Down Expand Up @@ -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();

Expand Down
0 ...tomTemplate/UniversalMigrationTemplate.cs → ...tomTemplate/UniversalMigrationTemplate.cs
View file
Open in desktop
File renamed without changes.
0 ...UMT.Example.AdminApp/UmtWebAdminModule.cs → ...UMT.Example.AdminApp/UmtWebAdminModule.cs
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...e.UMT.Example.AdminApp/packages.lock.json → ...e.UMT.Example.AdminApp/packages.lock.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=="
}
Expand Down
0 ....Xperience.UMT.Example.Console/.gitignore → ....Xperience.UMT.Example.Console/.gitignore
View file
Open in desktop
File renamed without changes.
3 changes: 2 additions & 1 deletion ...tico.Xperience.UMT.Example.Console.csproj → ...tico.Xperience.UMT.Example.Console.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion ....Xperience.UMT.Example.Console/Program.cs → ....Xperience.UMT.Example.Console/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
0 ...o.Xperience.UMT.Example.Console/README.md → ...o.Xperience.UMT.Example.Console/README.md
View file
Open in desktop
File renamed without changes.
0 ...erience.UMT.Example.Console/SampleJson.cs → ...erience.UMT.Example.Console/SampleJson.cs
View file
Open in desktop
File renamed without changes.
0 ...ence.UMT.Example.Console/appsettings.json → ...ence.UMT.Example.Console/appsettings.json
View file
Open in desktop
File renamed without changes.
Loading