Skip to content

Feature/cms13 upgrade #31

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

Open
drazenstankovic wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Feature/cms13 upgrade #31

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c9254e8
code ready for testing
drazenstankovic May 8, 2026
2ef0187
updated connections
drazenstankovic May 27, 2026
58c09a8
fix code reviews
drazenstankovic May 27, 2026
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
9 changes: 9 additions & 0 deletions .claude/settings.local.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"permissions": {
"allow": [
"Bash(dotnet build *)",
"Bash(dotnet restore *)",
"Bash(dotnet test *)"
]
}
}
6 changes: 3 additions & 3 deletions src/Geta.Optimizely.Extensions.Web/Geta.Optimizely.Extensions.Web.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<GenerateRazorSdkCompilation>true</GenerateRazorSdkCompilation>
Expand All @@ -13,10 +13,10 @@
<ProjectReference Include="..\Geta.Optimizely.Extensions\Geta.Optimizely.Extensions.csproj" />
</ItemGroup>

<Import Project="..\..\sub\geta-foundation-core\src\Foundation\modules\ModulesInclude.proj"/>
<Import Project="..\..\sub\geta-foundation-core\src\Foundation\modules\ModulesInclude.proj" />

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="6.0.36" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="10.0.7" />
</ItemGroup>

</Project>
16 changes: 9 additions & 7 deletions src/Geta.Optimizely.Extensions.Web/appsettings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,15 @@
}
},
"AllowedHosts": "*",
"EPiServer": {
"Find": {
"DefaultIndex": "changeme",
"ServiceUrl": "http://changeme",
"TrackingSanitizerEnabled": true,
"TrackingTimeout": 30000
},
"Optimizely": {
"ContentGraph": {
"GatewayAddress": "https://cg.optimizely.com",
"AppKey": "changeme",
"Secret": "changeme",
"SingleKey": "changeme"
}
},
"EPiServer": {
"OdpVisitorGroupOptions": {
"OdpCookieName": "vuid",
"CacheTimeoutSeconds": 1,
Expand Down
2 changes: 1 addition & 1 deletion src/Geta.Optimizely.Extensions/ContentAreaExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ public static class ContentAreaExtensions
/// <returns>Returns true if content area has content and false when not.</returns>
public static bool HasContent(this ContentArea contentArea)
{
return contentArea?.FilteredItems != null && contentArea.FilteredItems.Any();
return contentArea?.Items != null && contentArea.Items.Any();
Comment thread
drazenstankovic marked this conversation as resolved.
Outdated
}
}
}
8 changes: 4 additions & 4 deletions src/Geta.Optimizely.Extensions/Geta.Optimizely.Extensions.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<PackageId>Geta.Optimizely.Extensions</PackageId>
<Title>Extensions and helpers library for Optimizely CMS</Title>
<Authors>Geta Digital</Authors>
Expand All @@ -18,9 +18,9 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="EPiServer.CMS.AspNetCore.HtmlHelpers" Version="12.6.0" />
<PackageReference Include="EPiServer.CMS.UI.Core" Version="12.7.0" />
<PackageReference Include="Geta.Net.Extensions" Version="3.0.0" />
<PackageReference Include="EPiServer.CMS.AspNetCore.HtmlHelpers" Version="13.0.2" />
<PackageReference Include="EPiServer.CMS.UI.Core" Version="13.0.2" />
<PackageReference Include="Geta.Net.Extensions" Version="3.0.1" />
</ItemGroup>

<ItemGroup>
Expand Down
29 changes: 10 additions & 19 deletions src/Geta.Optimizely.Extensions/JsonExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,31 +1,22 @@
using Newtonsoft.Json;
using Newtonsoft.Json.Converters;
using Newtonsoft.Json.Serialization;
using System.Text.Json;
using System.Text.Json.Serialization;

namespace Geta.Optimizely.Extensions
{
/// <summary>
/// Extension methods for working with JSON data
/// </summary>
public static class JsonExtensions
{
/// <summary>
/// Convert object to JSON
/// </summary>
/// <typeparam name="T"></typeparam>
/// <param name="obj">Object to convert</param>
/// <param name="includeNull">Include null property values</param>
/// <returns></returns>
public static string ToJson<T>(this T obj, bool includeNull = true)
{
var settings = new JsonSerializerSettings
var options = new JsonSerializerOptions
{
ContractResolver = new CamelCasePropertyNamesContractResolver(),
Converters = new JsonConverter[] { new StringEnumConverter() },
NullValueHandling = includeNull ? NullValueHandling.Include : NullValueHandling.Ignore
PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
DefaultIgnoreCondition = includeNull
? JsonIgnoreCondition.Never
: JsonIgnoreCondition.WhenWritingNull,
Converters = { new JsonStringEnumConverter() }
};

return JsonConvert.SerializeObject(obj, settings);
return JsonSerializer.Serialize(obj, options);
}
Comment thread
drazenstankovic marked this conversation as resolved.
Outdated
}
}
}
14 changes: 9 additions & 5 deletions src/Geta.Optimizely.Extensions/StringExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using EPiServer.Core.Html;
using Geta.Net.Extensions;
using Geta.Net.Extensions;
using System;
using System.Text.RegularExpressions;
using Microsoft.AspNetCore.Http;

namespace Geta.Optimizely.Extensions
Expand All @@ -18,9 +18,13 @@ public static class StringExtensions
/// <returns>A string with text.</returns>
public static string StripHtml(this string htmlText, int maxLength = 0)
{
return string.IsNullOrWhiteSpace(htmlText)
? htmlText
: TextIndexer.StripHtml(htmlText, maxLength);
if (string.IsNullOrWhiteSpace(htmlText))
return htmlText;

var stripped = Regex.Replace(htmlText, "<[^>]*>", string.Empty);
Comment thread
drazenstankovic marked this conversation as resolved.
Outdated
return maxLength > 0 && stripped.Length > maxLength
? stripped[..maxLength]
: stripped;
}

/// <summary>
Expand Down
2 changes: 1 addition & 1 deletion src/Geta.Optimizely.Extensions/TypeExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public static class TypeExtensions
/// <returns>PageType instance if found.</returns>
public static PageType GetPageType(this Type pageType)
{
return ServiceLocator.Current.GetInstance<IContentTypeRepository<PageType>>().Load(pageType);
return ServiceLocator.Current.GetInstance<IContentTypeRepository>().Load(pageType) as PageType;
}
}
}
5 changes: 2 additions & 3 deletions src/Geta.Optimizely.Extensions/UrlHelperExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using Castle.Core.Internal;
using EPiServer;
using EPiServer;
using EPiServer.Core;
using EPiServer.ServiceLocation;
using EPiServer.Web.Mvc.Html;
Expand Down Expand Up @@ -30,7 +29,7 @@ public static class UrlHelperExtensions
public static IHtmlContent PageLinkUrl(this IUrlHelper urlHelper, PageReference pageLink, string defaultValue)
{
var url = urlHelper.PageLinkUrl(pageLink) as HtmlString;
return url == null || url.Value.IsNullOrEmpty() ? new HtmlString(defaultValue) : url;
return url == null || string.IsNullOrEmpty(url.Value) ? new HtmlString(defaultValue) : url;
}

/// <summary>
Expand Down
2 changes: 1 addition & 1 deletion sub/geta-foundation-core
Open in desktop
Submodule geta-foundation-core updated 386 files
19 changes: 9 additions & 10 deletions test/Geta.Optimizely.Extensions.Tests/Geta.Optimizely.Extensions.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,25 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<IsPackable>false</IsPackable>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Castle.Core" Version="4.4.1" />
<PackageReference Include="coverlet.msbuild" Version="3.1.2">
<PackageReference Include="Castle.Core" Version="5.2.1" />
<PackageReference Include="coverlet.msbuild" Version="6.0.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="FluentAssertions" Version="5.10.3" />
<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
<PackageReference Include="Moq" Version="4.16.1" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="coverlet.collector" Version="3.1.2">
<PackageReference Include="FluentAssertions" Version="6.12.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
<PackageReference Include="Moq" Version="4.20.72" />
<PackageReference Include="xunit" Version="2.9.3" />
<PackageReference Include="coverlet.collector" Version="6.0.2">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
Loading