Skip to content

Commit

Permalink
Merge pull request #51 from Kentico/feat/update-to-kentico-v29.0.0
Browse files Browse the repository at this point in the history
Feat/update to kentico v29.0.0
  • Loading branch information
michalJakubis committed Apr 22, 2024
2 parents 3e6bd71 + d9a9364 commit bb2a499
Show file tree
Hide file tree
Showing 11 changed files with 209 additions and 214 deletions.
2 changes: 1 addition & 1 deletion Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<Authors>$(Company)</Authors>
<Copyright>Copyright © $(Company) $([System.DateTime]::Now.Year)</Copyright>
<Trademark>$(Company)™</Trademark>
<VersionPrefix>6.0.0</VersionPrefix>
<VersionPrefix>6.1.0</VersionPrefix>
<VersionSuffix></VersionSuffix>
<PackageLicenseExpression>MIT</PackageLicenseExpression>

Expand Down
14 changes: 7 additions & 7 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
<DisableImplicitNuGetFallbackFolder>true</DisableImplicitNuGetFallbackFolder>
</PropertyGroup>
<ItemGroup>
<PackageVersion Include="Kentico.Xperience.Admin" Version="28.4.3" />
<PackageVersion Include="Kentico.Xperience.Azurestorage" Version="28.4.3" />
<PackageVersion Include="Kentico.Xperience.Cloud" Version="28.4.3" />
<PackageVersion Include="Kentico.Xperience.Core" Version="28.4.3" />
<PackageVersion Include="Kentico.Xperience.Imageprocessing" Version="28.4.3" />
<PackageVersion Include="Kentico.Xperience.WebApp" Version="28.4.3" />
<PackageVersion Include="Kentico.Xperience.Core.Tests" Version="28.4.3" />
<PackageVersion Include="Kentico.Xperience.Admin" Version="29.0.0" />
<PackageVersion Include="Kentico.Xperience.Azurestorage" Version="29.0.0" />
<PackageVersion Include="Kentico.Xperience.Cloud" Version="29.0.0" />
<PackageVersion Include="Kentico.Xperience.Core" Version="29.0.0" />
<PackageVersion Include="Kentico.Xperience.Imageprocessing" Version="29.0.0" />
<PackageVersion Include="Kentico.Xperience.WebApp" Version="29.0.0" />
<PackageVersion Include="Kentico.Xperience.Core.Tests" Version="29.0.0" />
<PackageVersion Include="Kentico.Xperience.Lucene" Version="" Condition="'$(LOCAL_NUGET)' == 'true'" />
<PackageVersion Include="Lucene.Net" Version="4.8.0-beta00016" />
<PackageVersion Include="Lucene.Net.Analysis.Common" Version="4.8.0-beta00016" />
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ Use `Kentico.Xperience.Lucene.Admin` in your Xperience by Kentico Administration

| Xperience Version | Library Version |
| ------------------- | --------------- |
| >= 29.0.0 | >= 6.1.x |
| >= 28.4.3, < 29.0.0 | >= 5.x.x |
| >= 28.0.0 | >= 3.x.x |
| >= 26.2.0, < 27.0.0 | >= 2.x, < 3.x.x |
Expand Down
4 changes: 4 additions & 0 deletions examples/DancingGoat/Search/AdvancedSearchIndexingStrategy.cs
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
using CMS.ContentEngine;
using CMS.Websites;

using DancingGoat.Models;
using DancingGoat.Search.Services;

using Kentico.Xperience.Lucene.Core.Indexing;

using Lucene.Net.Documents;
using Lucene.Net.Facet;

using Microsoft.IdentityModel.Tokens;

namespace DancingGoat.Search;
Expand Down
4 changes: 4 additions & 0 deletions examples/DancingGoat/Search/SimpleSearchIndexingStrategy.cs
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
using CMS.ContentEngine;
using CMS.Websites;

using DancingGoat.Models;

using Kentico.Xperience.Lucene.Core.Indexing;

using Lucene.Net.Documents;

using Microsoft.IdentityModel.Tokens;

namespace DancingGoat.Search;
Expand Down
116 changes: 57 additions & 59 deletions examples/DancingGoat/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,53 +4,53 @@
"net6.0": {
"Kentico.Xperience.Admin": {
"type": "Direct",
"requested": "[28.4.3, )",
"resolved": "28.4.3",
"contentHash": "TZnv+XpEtH8gWR+UFkJANBS1bZQ+ZP2ZQQgQXPJz9OlowPwVRkB+aAu9yOfqiXXjEudpmvpAP/SB6o3lxHG+3A==",
"requested": "[29.0.0, )",
"resolved": "29.0.0",
"contentHash": "0PZqIlNEjpE5GHPtTMHzd5KkO428oRJlYEDx2YmLLYkm+UDMsRIwaS91UtmZTP5FYlDzv7yq0zgB4hqbcdsZTA==",
"dependencies": {
"Kentico.Aira.Client": "1.0.25",
"Kentico.Xperience.WebApp": "[28.4.3]",
"Microsoft.AspNetCore.SpaServices.Extensions": "6.0.28",
"Microsoft.Extensions.FileProviders.Embedded": "6.0.28"
"Kentico.Xperience.WebApp": "[29.0.0]",
"Microsoft.AspNetCore.SpaServices.Extensions": "6.0.29",
"Microsoft.Extensions.FileProviders.Embedded": "6.0.29"
}
},
"Kentico.Xperience.AzureStorage": {
"type": "Direct",
"requested": "[28.4.3, )",
"resolved": "28.4.3",
"contentHash": "YFcsT4whAbQDPIal9zzINpKNiq4G2RSTOvlUwRCB363nJJbHIF+AYMIBTq4hzzqP25PdddvslYtfCf5BoDV1uw==",
"requested": "[29.0.0, )",
"resolved": "29.0.0",
"contentHash": "oss8WcxBjJpkg8WiaOmAUUViNp++9GgpNQixnAvYtwbHG96nGobMiakkwecYOcnHe9cj4KggkbS1d6LyXpVFpw==",
"dependencies": {
"Azure.Storage.Blobs": "12.19.1",
"Azure.Storage.Queues": "12.17.1",
"Kentico.Xperience.Core": "28.4.3",
"Kentico.Xperience.Core": "29.0.0",
"Newtonsoft.Json": "13.0.3"
}
},
"Kentico.Xperience.ImageProcessing": {
"type": "Direct",
"requested": "[28.4.3, )",
"resolved": "28.4.3",
"contentHash": "a+KR0AY9AR6O2hKa5WvZ/O6VgC55ljBbdvwYbHnOrinUP4wwuBTFmm4NuLmYq920K+olL+Mbx8VDz8dC8ohLKw==",
"requested": "[29.0.0, )",
"resolved": "29.0.0",
"contentHash": "aXsCEfvnEpPQQn3wQGwC51f6WT3O5NZzcjReTBSmCCYraHPF87aoqSz+VKS1MI8Pj9u4i1Vt1bRcCC/zrlYJYQ==",
"dependencies": {
"Kentico.Xperience.Core": "28.4.3",
"SkiaSharp": "2.88.7",
"SkiaSharp.NativeAssets.Linux.NoDependencies": "2.88.7"
"Kentico.Xperience.Core": "29.0.0",
"SkiaSharp": "2.88.8",
"SkiaSharp.NativeAssets.Linux.NoDependencies": "2.88.8"
}
},
"Kentico.Xperience.WebApp": {
"type": "Direct",
"requested": "[28.4.3, )",
"resolved": "28.4.3",
"contentHash": "tFsbmisfYQrLdKtH35z9LL/D9UeqIb9T3o8WqKuIWOaZlOZDlxpaohzlh0raUuTGtJ14OE7kYgln1vGg4lvonw==",
"requested": "[29.0.0, )",
"resolved": "29.0.0",
"contentHash": "LXTK6WPoEThc+K2cSGa3GbKg1Zute0tjELazK6JURnGEF7xdoRiVE8ty6WeWFxmK6Cd+FwId10Q49C6SXlLL2A==",
"dependencies": {
"CommandLineParser": "2.9.1",
"HotChocolate.AspNetCore": "13.9.0",
"HotChocolate.Data": "13.9.0",
"HtmlSanitizer": "8.0.843",
"Kentico.Xperience.Core": "[28.4.3]",
"Kentico.Xperience.Core": "[29.0.0]",
"Microsoft.Extensions.Caching.Memory": "6.0.1",
"Microsoft.Extensions.FileProviders.Embedded": "6.0.28",
"Microsoft.Extensions.Localization": "6.0.28"
"Microsoft.Extensions.FileProviders.Embedded": "6.0.29",
"Microsoft.Extensions.Localization": "6.0.29"
}
},
"SonarAnalyzer.CSharp": {
Expand Down Expand Up @@ -452,16 +452,16 @@
},
"MailKit": {
"type": "Transitive",
"resolved": "4.4.0",
"contentHash": "cv+oiAOn2+LhhGUVvxpJjEOIZOTZBFDIDO9ebOfxqqU1f/PllHpKr5VjWOBsqeLrb+zLisxWSQDzM5C64XrRNA==",
"resolved": "4.5.0",
"contentHash": "EaXHODUdIV5oPdWvBJGazwaEpKt1LI/H/S//EEozANYCsfOSKHntX+Skk2kW616lSQp+fkRTmSjk0CYxEuOyEA==",
"dependencies": {
"MimeKit": "4.4.0"
"MimeKit": "4.5.0"
}
},
"Microsoft.AspNetCore.SpaServices.Extensions": {
"type": "Transitive",
"resolved": "6.0.28",
"contentHash": "IyI3A40jIxHWKT0BcjxGWHaU24zT3NUrexMwWxWdDxTYHteH97OVHf5dNc0eY4RKybCrAi9C+IWAZ2l7NEFEGg==",
"resolved": "6.0.29",
"contentHash": "2LeomoSAHbVBEffWwZS4cFLAQsPw2UK4gfNcajssV/cMM5/i61d8LwAdTcGHVmgF5e0zOz/25B06fk3iymD4VA==",
"dependencies": {
"Microsoft.Extensions.FileProviders.Physical": "6.0.0"
}
Expand Down Expand Up @@ -560,8 +560,8 @@
},
"Microsoft.Extensions.FileProviders.Embedded": {
"type": "Transitive",
"resolved": "6.0.28",
"contentHash": "vlMC8FYEU4BB7W5NXIalaVf9i1qlKIGJSCvB7n1RQLKSwQMhCIKjKvzeyvRbWUdmZwOJRCZm5fidKqnRI71bQQ==",
"resolved": "6.0.29",
"contentHash": "ih7lIqCUXsG4+CNNcPs67TBOe3Yd/HMdBBVP3BhvdZkJEUilhvUK69FB7ZPsiZKel08GkOh2qFXqZsWWPa/lPQ==",
"dependencies": {
"Microsoft.Extensions.FileProviders.Abstractions": "6.0.0"
}
Expand Down Expand Up @@ -604,19 +604,19 @@
},
"Microsoft.Extensions.Localization": {
"type": "Transitive",
"resolved": "6.0.28",
"contentHash": "uuD1hdAFK+JqLOOQBMBEIA1aHPLZ1iomXDiAO7ffssDpRCK23tUuQKvl+IGPI3WM9CUsmnAxwXNJg7YKFtUiMA==",
"resolved": "6.0.29",
"contentHash": "cZ5Tx6NtTZFzk+PWW2icApat7agQiMIFIsohsmHmz/scKRfAI/5XTa9lpZMwKowQBZm+ap0RwAJmQ2/5xoL+VQ==",
"dependencies": {
"Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0",
"Microsoft.Extensions.Localization.Abstractions": "6.0.28",
"Microsoft.Extensions.Localization.Abstractions": "6.0.29",
"Microsoft.Extensions.Logging.Abstractions": "6.0.4",
"Microsoft.Extensions.Options": "6.0.0"
}
},
"Microsoft.Extensions.Localization.Abstractions": {
"type": "Transitive",
"resolved": "6.0.28",
"contentHash": "LFbRKw+TOPiU3eFyuklwCoNCpVb3bYZjvgyCFjmL7GsWLjZg1quyKgUCunLS2Sq5m/4nhppM5VR91alKaRz1wQ=="
"resolved": "6.0.29",
"contentHash": "4HVhh+V/7H2VMgFI8EP1kLgLpeRqm1kQOlXjHk4MHCVD5/pgWOTTbLEz9pdXymQQf/eRg1vNK8tG2MZstBHhlw=="
},
"Microsoft.Extensions.Logging": {
"type": "Transitive",
Expand Down Expand Up @@ -746,13 +746,11 @@
},
"MimeKit": {
"type": "Transitive",
"resolved": "4.4.0",
"contentHash": "pKvznVpvK35cJb21LdjvhB3MW2FrlAqG3PH36uVKHhlgnfMS5tIRsKJEMgo0hiPyJJhN2f1llHptu2w8CvF9Vg==",
"resolved": "4.5.0",
"contentHash": "OYn8b8b66J4mgtDzoImepiUtdkJOAVGoTj/ghzJ+az4wVixA5L5Z8GmgFhRvQ1btAIwZh/d9zvZLCALndQdz5w==",
"dependencies": {
"BouncyCastle.Cryptography": "2.3.0",
"System.Runtime.CompilerServices.Unsafe": "6.0.0",
"System.Security.Cryptography.Pkcs": "8.0.0",
"System.Text.Encoding.CodePages": "8.0.0"
"System.Security.Cryptography.Pkcs": "8.0.0"
}
},
"Mono.Cecil": {
Expand All @@ -767,30 +765,30 @@
},
"SkiaSharp": {
"type": "Transitive",
"resolved": "2.88.7",
"contentHash": "LJHAMrbWO00J7jXWLWehyjqFo29T4VzABimfJb4nICqpEe3c/KvQGWL4ItON8ymzhxYOeFgyxeRzuNzO4GHSug==",
"resolved": "2.88.8",
"contentHash": "bRkp3uKp5ZI8gXYQT57uKwil1uobb2p8c69n7v5evlB/2JNcMAXVcw9DZAP5Ig3WSvgzGm2YSn27UVeOi05NlA==",
"dependencies": {
"SkiaSharp.NativeAssets.Win32": "2.88.7",
"SkiaSharp.NativeAssets.macOS": "2.88.7"
"SkiaSharp.NativeAssets.Win32": "2.88.8",
"SkiaSharp.NativeAssets.macOS": "2.88.8"
}
},
"SkiaSharp.NativeAssets.Linux.NoDependencies": {
"type": "Transitive",
"resolved": "2.88.7",
"contentHash": "KkMftfAz1lGPnuhyecuLJzeyvMjXtHp9cYVQc/oeLhF8KYrxtUxRy5LOX5oROhyLHy/CyqEl9MoAhqmSH7cV7g==",
"resolved": "2.88.8",
"contentHash": "/DoKtdyvRgCC5GR/SH+ps3ZiOjmf0BYpAyrhWQELFOO1hdcqddrDVJjDNCOJ41vV+NlS5b3kcDoZZ7jLhFjyXg==",
"dependencies": {
"SkiaSharp": "2.88.7"
"SkiaSharp": "2.88.8"
}
},
"SkiaSharp.NativeAssets.macOS": {
"type": "Transitive",
"resolved": "2.88.7",
"contentHash": "3jNzco4VjcYPFNxR9aNWcgweFXbTSdM1VpNRzCS4X0i1A1OuNqcaulrAvmntNpujeWxHo9e6WGh6FN8Jf5+XhA=="
"resolved": "2.88.8",
"contentHash": "6Kn5TSkKlfyS6azWHF3Jk2sW5C4jCE5uSshM/5AbfFrR+5n6qM5XEnz9h4VaVl7LTxBvHvMkuPb/3bpbq0vxTw=="
},
"SkiaSharp.NativeAssets.Win32": {
"type": "Transitive",
"resolved": "2.88.7",
"contentHash": "BCXmWdQ0oVck9vRwC8U3ocSaTHEx28VB+6qw9OxGIMQ86iO5bp4Flqk3IXH0l9Pbr7vWAUOpI212iaL9mTaUZQ=="
"resolved": "2.88.8",
"contentHash": "O9QXoWEXA+6cweR4h3BOnwMz+pO9vL9mXdjLrpDd0w1QzCgWmLQBxa1VgySDITiH7nQndrDG1h6937zm9pLj1Q=="
},
"System.Buffers": {
"type": "Transitive",
Expand Down Expand Up @@ -939,8 +937,8 @@
},
"System.Text.Encoding.CodePages": {
"type": "Transitive",
"resolved": "8.0.0",
"contentHash": "OZIsVplFGaVY90G2SbpgU7EnCoOO5pw1t4ic21dBF3/1omrJFpAGoNAVpPyMVOC90/hvgkGG3VFqR13YgZMQfg==",
"resolved": "6.0.0",
"contentHash": "ZFCILZuOvtKPauZ/j/swhvw68ZRi9ATCfvGbk1QfydmcXBkIWecWKn/250UH7rahZ5OoDBaiAudJtPvLwzw85A==",
"dependencies": {
"System.Runtime.CompilerServices.Unsafe": "6.0.0"
}
Expand Down Expand Up @@ -998,35 +996,35 @@
"kentico.xperience.lucene.admin": {
"type": "Project",
"dependencies": {
"Kentico.Xperience.Admin": "[28.4.3, )",
"Kentico.Xperience.Admin": "[29.0.0, )",
"Kentico.Xperience.Lucene.Core": "[5.0.0-prerelease-1, )"
}
},
"kentico.xperience.lucene.core": {
"type": "Project",
"dependencies": {
"Kentico.Xperience.Core": "[28.4.3, )",
"Kentico.Xperience.Core": "[29.0.0, )",
"Lucene.Net": "[4.8.0-beta00016, )",
"Lucene.Net.Analysis.Common": "[4.8.0-beta00016, )",
"Lucene.Net.Facet": "[4.8.0-beta00016, )"
}
},
"Kentico.Xperience.Core": {
"type": "CentralTransitive",
"requested": "[28.4.3, )",
"resolved": "28.4.3",
"contentHash": "yyQHoVfiABFk7iFrIH81kHqsytzN45/UsSvpNEu3cS7nW1B09nU8GKzwy8Ov4/vKcB8kWZjOSk4g6OG6OydJzA==",
"requested": "[29.0.0, )",
"resolved": "29.0.0",
"contentHash": "jG0gkDLE4H7ZNEdxdyZEzPxoAMlfx24oVdPeRa8RCUriOhBtleNREInbR9kYoMWwo456EaUaf3RPngArmZdy1g==",
"dependencies": {
"AngleSharp": "0.17.1",
"MailKit": "4.4.0",
"MailKit": "4.5.0",
"Microsoft.Data.SqlClient": "5.2.0",
"Microsoft.Extensions.Caching.Memory": "6.0.1",
"Microsoft.Extensions.Configuration": "6.0.1",
"Microsoft.Extensions.Configuration.Binder": "6.0.0",
"Microsoft.Extensions.DependencyInjection": "6.0.1",
"Microsoft.Extensions.FileProviders.Physical": "6.0.0",
"Microsoft.Extensions.Hosting.Abstractions": "6.0.0",
"Microsoft.Extensions.Localization": "6.0.28",
"Microsoft.Extensions.Localization": "6.0.29",
"Microsoft.Extensions.Options.ConfigurationExtensions": "6.0.0",
"Mono.Cecil": "0.11.5",
"Newtonsoft.Json": "13.0.3",
Expand Down

0 comments on commit bb2a499

Please sign in to comment.