Skip to content

Commit 20552d0

Browse files
author
Boris Kapustík
committed
feat(Refresh): Update to Kentico version 30.0.0
1 parent 75de78b commit 20552d0

File tree

12 files changed

+974
-1107
lines changed

12 files changed

+974
-1107
lines changed

‎Directory.Build.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
</ItemGroup>
2323

2424
<PropertyGroup>
25-
<TargetFramework>net6.0</TargetFramework>
25+
<TargetFramework>net8.0</TargetFramework>
2626
<LangVersion>latest</LangVersion>
2727
<ImplicitUsings>enable</ImplicitUsings>
2828
<Nullable>enable</Nullable>

‎Directory.Packages.props‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
<DisableImplicitNuGetFallbackFolder>true</DisableImplicitNuGetFallbackFolder>
77
</PropertyGroup>
88
<ItemGroup>
9-
<PackageVersion Include="Kentico.Xperience.Admin" Version="29.5.3" />
10-
<PackageVersion Include="Kentico.Xperience.WebApp" Version="29.5.3" />
11-
<PackageVersion Include="kentico.xperience.azurestorage" Version="29.5.3" />
12-
<PackageVersion Include="kentico.xperience.imageprocessing" Version="29.5.3" />
9+
<PackageVersion Include="Kentico.Xperience.Admin" Version="30.0.0" />
10+
<PackageVersion Include="Kentico.Xperience.WebApp" Version="30.0.0" />
11+
<PackageVersion Include="kentico.xperience.azurestorage" Version="30.0.0" />
12+
<PackageVersion Include="kentico.xperience.imageprocessing" Version="30.0.0" />
1313
<PackageVersion Include="Kentico.Xperience.TagManager" Version="" Condition="'$(LOCAL_NUGET)' == 'true'" />
14-
<PackageVersion Include="Microsoft.Extensions.Configuration.UserSecrets" Version="6.0.1" />
15-
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
14+
<PackageVersion Include="Microsoft.Extensions.Configuration.UserSecrets" Version="8.0.1" />
15+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
1616
<PackageVersion Include="SonarAnalyzer.CSharp" Version="9.25.0.90414" />
1717
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
1818
<PackageVersion Include="NUnit" Version="4.1.0" />

‎examples/DancingGoat/packages.lock.json‎

Lines changed: 344 additions & 376 deletions
Large diffs are not rendered by default.

‎src/Kentico.Xperience.TagManager/Admin/InfoModels/ChannelCodeSnippetItem/ChannelCodeSnippetItemInfo.generated.cs‎

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
using System.Data;
2-
using System.Runtime.Serialization;
32

43
using CMS;
54
using CMS.DataEngine;
@@ -17,7 +16,7 @@ namespace Kentico.Xperience.TagManager.Admin;
1716
/// Data container class for <see cref="ChannelCodeSnippetItemInfo"/>.
1817
/// </summary>
1918
[Serializable]
20-
public partial class ChannelCodeSnippetItemInfo : AbstractInfo<ChannelCodeSnippetItemInfo, IChannelCodeSnippetItemInfoProvider>
19+
public partial class ChannelCodeSnippetItemInfo : AbstractInfo<ChannelCodeSnippetItemInfo, IInfoProvider<ChannelCodeSnippetItemInfo>>
2120
{
2221
/// <summary>
2322
/// Object type.
@@ -28,7 +27,7 @@ public partial class ChannelCodeSnippetItemInfo : AbstractInfo<ChannelCodeSnippe
2827
/// <summary>
2928
/// Type information.
3029
/// </summary>
31-
public static readonly ObjectTypeInfo TYPEINFO = new ObjectTypeInfo(typeof(ChannelCodeSnippetItemInfoProvider), OBJECT_TYPE, "KenticoTagManager.ChannelCodeSnippetItem", nameof(ChannelCodeSnippetItemID), nameof(ChannelCodeSnippetItemLastModified), nameof(ChannelCodeSnippetItemGuid), null, nameof(ChannelCodeSnippetItemName), null, null, null)
30+
public static readonly ObjectTypeInfo TYPEINFO = new ObjectTypeInfo(typeof(IInfoProvider<ChannelCodeSnippetItemInfo>), OBJECT_TYPE, "KenticoTagManager.ChannelCodeSnippetItem", nameof(ChannelCodeSnippetItemID), nameof(ChannelCodeSnippetItemLastModified), nameof(ChannelCodeSnippetItemGuid), null, nameof(ChannelCodeSnippetItemName), null, null, null)
3231
{
3332
TouchCacheDependencies = true,
3433
ContinuousIntegrationSettings =
@@ -191,17 +190,6 @@ protected override void SetObject()
191190
}
192191

193192

194-
/// <summary>
195-
/// Constructor for de-serialization.
196-
/// </summary>
197-
/// <param name="info">Serialization info.</param>
198-
/// <param name="context">Streaming context.</param>
199-
protected ChannelCodeSnippetItemInfo(SerializationInfo info, StreamingContext context)
200-
: base(info, context)
201-
{
202-
}
203-
204-
205193
/// <summary>
206194
/// Creates an empty instance of the <see cref="ChannelCodeSnippetItemInfo"/> class.
207195
/// </summary>

‎src/Kentico.Xperience.TagManager/Admin/InfoModels/ChannelCodeSnippetItem/ChannelCodeSnippetItemInfoProvider.generated.cs‎

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎src/Kentico.Xperience.TagManager/Admin/InfoModels/ChannelCodeSnippetItem/IChannelCodeSnippetItemInfoProvider.cs‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎src/Kentico.Xperience.TagManager/Admin/InfoModels/ChannelCodeSnippetItem/IChannelCodeSnippetItemInfoProvider.generated.cs‎

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎src/Kentico.Xperience.TagManager/Admin/UIPages/CodeSnippetCreatePage.cs‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using CMS.Membership;
1+
using CMS.DataEngine;
2+
using CMS.Membership;
23

34
using Kentico.Xperience.Admin.Base;
45
using Kentico.Xperience.Admin.Base.Forms;
@@ -21,14 +22,14 @@ internal class CodeSnippetCreatePage : ModelEditPage<CodeSnippetConfigurationMod
2122
{
2223
private CodeSnippetConfigurationModel? model;
2324
protected override CodeSnippetConfigurationModel Model => model ??= new CodeSnippetConfigurationModel();
24-
private readonly IChannelCodeSnippetItemInfoProvider channelCodeSnippetInfoProvider;
25+
private readonly IInfoProvider<ChannelCodeSnippetItemInfo> channelCodeSnippetInfoProvider;
2526
private readonly IPageLinkGenerator pageLinkGenerator;
2627
private readonly IWebsiteChannelPermissionService websiteChannelPermissionService;
2728

2829
public CodeSnippetCreatePage(
2930
IFormItemCollectionProvider formItemCollectionProvider,
3031
IFormDataBinder formDataBinder,
31-
IChannelCodeSnippetItemInfoProvider channelCodeSnippetInfoProvider,
32+
IInfoProvider<ChannelCodeSnippetItemInfo> channelCodeSnippetInfoProvider,
3233
IPageLinkGenerator pageLinkGenerator,
3334
IWebsiteChannelPermissionService websiteChannelPermissionService)
3435
: base(formItemCollectionProvider, formDataBinder)

‎src/Kentico.Xperience.TagManager/Admin/UIPages/CodeSnippetEditPage.cs‎

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using CMS.Membership;
1+
using CMS.DataEngine;
2+
using CMS.Membership;
23

34
using Kentico.Xperience.Admin.Base;
45
using Kentico.Xperience.Admin.Base.Forms;
@@ -30,7 +31,12 @@ protected override CodeSnippetConfigurationModel Model
3031
return model;
3132
}
3233

33-
var info = channelCodeSnippetInfoProvider.Get(ObjectID);
34+
var info = channelCodeSnippetInfoProvider
35+
.Get()
36+
.WhereEquals(nameof(ChannelCodeSnippetItemInfo.ChannelCodeSnippetItemID), ObjectID)
37+
.GetEnumerableTypedResult()
38+
.Single();
39+
3440
if (info == null)
3541
{
3642
return new CodeSnippetConfigurationModel();
@@ -53,7 +59,7 @@ protected override CodeSnippetConfigurationModel Model
5359
}
5460
}
5561

56-
private readonly IChannelCodeSnippetItemInfoProvider channelCodeSnippetInfoProvider;
62+
private readonly IInfoProvider<ChannelCodeSnippetItemInfo> channelCodeSnippetInfoProvider;
5763
private readonly IWebsiteChannelPermissionService websiteChannelPermissionService;
5864

5965
[PageParameter(typeof(IntPageModelBinder))]
@@ -62,7 +68,7 @@ protected override CodeSnippetConfigurationModel Model
6268
public CodeSnippetEditPage(
6369
IFormItemCollectionProvider formItemCollectionProvider,
6470
IFormDataBinder formDataBinder,
65-
IChannelCodeSnippetItemInfoProvider channelCodeSnippetInfoProvider,
71+
IInfoProvider<ChannelCodeSnippetItemInfo> channelCodeSnippetInfoProvider,
6672
IWebsiteChannelPermissionService websiteChannelPermissionService)
6773
: base(formItemCollectionProvider, formDataBinder)
6874
{
@@ -96,7 +102,11 @@ protected override async Task<ICommandResponse> ProcessFormData(
96102
CodeSnippetConfigurationModel model,
97103
ICollection<IFormItem> formItems)
98104
{
99-
var info = await channelCodeSnippetInfoProvider.GetAsync(ObjectID);
105+
var info = (await channelCodeSnippetInfoProvider
106+
.Get()
107+
.WhereEquals(nameof(ChannelCodeSnippetItemInfo.ChannelCodeSnippetItemID), ObjectID)
108+
.GetEnumerableTypedResultAsync())
109+
.Single();
100110

101111
model.MapToChannelCodeSnippetInfo(info);
102112

‎src/Kentico.Xperience.TagManager/Rendering/DefaultChannelCodeSnippetsService.cs‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
using CMS.Base;
44
using CMS.ContactManagement;
55
using CMS.ContentEngine;
6+
using CMS.DataEngine;
67
using CMS.DataProtection;
78
using CMS.Helpers;
89
using CMS.Websites;
@@ -17,14 +18,14 @@ internal class DefaultChannelCodeSnippetsService : IChannelCodeSnippetsService
1718
{
1819
private readonly IConsentAgreementService consentAgreementService;
1920
private readonly IWebsiteChannelContext channelContext;
20-
21-
private readonly IChannelCodeSnippetItemInfoProvider codeSnippetInfoProvider;
21+
22+
private readonly IInfoProvider<ChannelCodeSnippetItemInfo> codeSnippetInfoProvider;
2223
private readonly IProgressiveCache cache;
2324

2425
public DefaultChannelCodeSnippetsService(
2526
IConsentAgreementService consentAgreementService,
2627
IWebsiteChannelContext channelContext,
27-
IChannelCodeSnippetItemInfoProvider codeSnippetInfoProvider,
28+
IInfoProvider<ChannelCodeSnippetItemInfo> codeSnippetInfoProvider,
2829
IProgressiveCache cache)
2930
{
3031
this.consentAgreementService = consentAgreementService;

0 commit comments

Comments
 (0)