yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Post merge

Browse Source
This commit is contained in:
Bjarke Berg
2023-11-14 09:39:39 +01:00
parent cea6c3f20e
commit 162a6a0085
5 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
global.json
View File

@@ -1,7 +1,7 @@
{
"sdk": {
"version": "7.0.400",
"version": "8.0.100",
"rollForward": "latestFeature",
"allowPrerelease": false
"allowPrerelease": true
}
}

4
src/Umbraco.Infrastructure/PropertyEditors/RichTextPropertyIndexValueFactory.cs
View File

@@ -57,6 +57,10 @@ internal class RichTextPropertyIndexValueFactory : NestedPropertyIndexValueFacto
public IEnumerable<KeyValuePair<string, IEnumerable<object?>>> GetIndexValues(IProperty property, string? culture, string? segment, bool published)
=> GetIndexValues(property, culture, segment, published, Enumerable.Empty<string>());
protected override IContentType? GetContentTypeOfNestedItem(BlockItemData nestedItem, IDictionary<Guid, IContentType> contentTypeDictionary)
=> contentTypeDictionary.TryGetValue(nestedItem.ContentTypeKey, out var result) ? result : null;
[Obsolete("Use non-obsolete overload. Scheduled for removal in Umbraco 14.")]
protected override IContentType? GetContentTypeOfNestedItem(BlockItemData nestedItem)
=> _contentTypeService.Get(nestedItem.ContentTypeKey);

1
src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj
View File

@@ -29,7 +29,6 @@
<PackageReference Include="OpenIddict.Abstractions" Version="4.9.0" />
<PackageReference Include="MailKit" Version="4.1.0" />
<PackageReference Include="HtmlAgilityPack" Version="1.11.54" />
<PackageReference Include="IPNetwork2" Version="2.6.618" />
<PackageReference Include="Markdown" Version="2.2.1" />
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="7.0.0" />

6
tests/Umbraco.Tests.Integration/Umbraco.Core/Services/WebhookRequestServiceTests.cs
View File

@@ -19,7 +19,7 @@ public class WebhookRequestServiceTests : UmbracoIntegrationTest
public async Task Can_Create_And_Get()
{
var createdWebhook = await WebhookService.CreateAsync(new Webhook("https://example.com", true, new[] { Guid.NewGuid() }, new[] { Constants.WebhookEvents.Aliases.ContentPublish }));
var created = await WebhookRequestService.CreateAsync(createdWebhook.Key, Constants.WebhookEvents.Aliases.ContentPublish, null);
var created = await WebhookRequestService.CreateAsync(createdWebhook.Result.Key, Constants.WebhookEvents.Aliases.ContentPublish, null);
var webhooks = await WebhookRequestService.GetAllAsync();
var webhook = webhooks.First(x => x.Id == created.Id);
@@ -38,7 +38,7 @@ public class WebhookRequestServiceTests : UmbracoIntegrationTest
{
var newRetryCount = 4;
var createdWebhook = await WebhookService.CreateAsync(new Webhook("https://example.com", true, new[] { Guid.NewGuid() }, new[] { Constants.WebhookEvents.Aliases.ContentPublish }));
var created = await WebhookRequestService.CreateAsync(createdWebhook.Key, Constants.WebhookEvents.Aliases.ContentPublish, null);
var created = await WebhookRequestService.CreateAsync(createdWebhook.Result.Key, Constants.WebhookEvents.Aliases.ContentPublish, null);
created.RetryCount = newRetryCount;
await WebhookRequestService.UpdateAsync(created);
var webhooks = await WebhookRequestService.GetAllAsync();
@@ -54,7 +54,7 @@ public class WebhookRequestServiceTests : UmbracoIntegrationTest
public async Task Can_Delete()
{
var createdWebhook = await WebhookService.CreateAsync(new Webhook("https://example.com", true, new[] { Guid.NewGuid() }, new[] { Constants.WebhookEvents.Aliases.ContentPublish }));
var created = await WebhookRequestService.CreateAsync(createdWebhook.Key, Constants.WebhookEvents.Aliases.ContentPublish, null);
var created = await WebhookRequestService.CreateAsync(createdWebhook.Result.Key, Constants.WebhookEvents.Aliases.ContentPublish, null);
await WebhookRequestService.DeleteAsync(created);
var webhooks = await WebhookRequestService.GetAllAsync();
var webhook = webhooks.FirstOrDefault(x => x.Id == created.Id);

1
tests/Umbraco.Tests.UnitTests/Umbraco.Tests.UnitTests.csproj
View File

@@ -6,7 +6,6 @@
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
<PackageReference Include="AngleSharp" Version="1.0.4" />
<PackageReference Include="AngleSharp" Version="1.0.6" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />