Skip to content

Commit ce21c16

Browse files
acoumbacoumb
authored
Merge pull request #9 from umbraco/feature/13.x
Upgrade demo project to v13.
2 parents 8433082 + 1a042df commit ce21c16

File tree

3 files changed

+155
-12
lines changed

3 files changed

+155
-12
lines changed

‎src/Umbraco.UIBuilder.Demo.Web/Umbraco.UIBuilder.Demo.Web.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>net7.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="Umbraco.Cms" Version="12.2.0" />
9-
<PackageReference Include="Umbraco.UIBuilder" Version="12.0.0" />
8+
<PackageReference Include="Umbraco.Cms" Version="13.1.0" />
9+
<PackageReference Include="Umbraco.UIBuilder" Version="13.0.2" />
1010
</ItemGroup>
1111

1212
<ItemGroup>

‎src/Umbraco.UIBuilder.Demo.Web/appsettings-schema.Umbraco.Cms.json‎

Lines changed: 147 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,9 @@
116116
},
117117
"Marketplace": {
118118
"$ref": "#/definitions/MarketplaceSettings"
119+
},
120+
"Webhook": {
121+
"$ref": "#/definitions/WebhookSettings"
119122
}
120123
}
121124
},
@@ -173,12 +176,17 @@
173176
"LoginBackgroundImage": {
174177
"type": "string",
175178
"description": "Gets or sets a value for the path to the login screen background image.\n ",
176-
"default": "assets/img/login.svg"
179+
"default": "assets/img/login.jpg"
177180
},
178181
"LoginLogoImage": {
179182
"type": "string",
180-
"description": "Gets or sets a value for the path to the login screen logo image.\n ",
181-
"default": "assets/img/application/umbraco_logo_white.svg"
183+
"description": "Gets or sets a value for the path to the login screen logo image\nshown on top of the background image set in LoginBackgroundImage.\n ",
184+
"default": "assets/img/application/umbraco_logo_blue.svg"
185+
},
186+
"LoginLogoImageAlternative": {
187+
"type": "string",
188+
"description": "Gets or sets a value for the path to the login screen logo image when shown on top\nof a light background (e.g. in mobile resolutions).\n ",
189+
"default": "assets/img/application/umbraco_logo_blue.svg"
182190
},
183191
"HideBackOfficeLogo": {
184192
"type": "boolean",
@@ -417,6 +425,25 @@
417425
"$ref": "#/definitions/MediaSettings"
418426
}
419427
]
428+
},
429+
"MemberAuthorization": {
430+
"description": "Gets or sets the member authorization settings for the Delivery API.\n ",
431+
"oneOf": [
432+
{
433+
"type": "null"
434+
},
435+
{
436+
"$ref": "#/definitions/MemberAuthorizationSettings"
437+
}
438+
]
439+
},
440+
"OutputCache": {
441+
"description": "Gets or sets the settings for the Delivery API output cache.\n ",
442+
"oneOf": [
443+
{
444+
"$ref": "#/definitions/OutputCacheSettings"
445+
}
446+
]
420447
}
421448
}
422449
},
@@ -436,6 +463,73 @@
436463
}
437464
}
438465
},
466+
"MemberAuthorizationSettings": {
467+
"type": "object",
468+
"description": "Typed configuration options for member authorization settings for the Delivery API.\n ",
469+
"properties": {
470+
"AuthorizationCodeFlow": {
471+
"description": "Gets or sets the Authorization Code Flow configuration for the Delivery API.\n ",
472+
"oneOf": [
473+
{
474+
"type": "null"
475+
},
476+
{
477+
"$ref": "#/definitions/AuthorizationCodeFlowSettings"
478+
}
479+
]
480+
}
481+
}
482+
},
483+
"AuthorizationCodeFlowSettings": {
484+
"type": "object",
485+
"description": "Typed configuration options for the Authorization Code Flow settings for the Delivery API.\n ",
486+
"properties": {
487+
"Enabled": {
488+
"type": "boolean",
489+
"description": "Gets or sets a value indicating whether Authorization Code Flow should be enabled for the Delivery API.\n ",
490+
"default": false
491+
},
492+
"LoginRedirectUrls": {
493+
"type": "array",
494+
"description": "Gets or sets the URLs allowed to use as redirect targets after a successful login (session authorization).\n ",
495+
"items": {
496+
"type": "string",
497+
"format": "uri"
498+
}
499+
},
500+
"LogoutRedirectUrls": {
501+
"type": "array",
502+
"description": "Gets or sets the URLs allowed to use as redirect targets after a successful logout (session termination).\n ",
503+
"items": {
504+
"type": "string",
505+
"format": "uri"
506+
}
507+
}
508+
}
509+
},
510+
"OutputCacheSettings": {
511+
"type": "object",
512+
"description": "Typed configuration options for output caching of the Delivery API.\n ",
513+
"properties": {
514+
"Enabled": {
515+
"type": "boolean",
516+
"description": "Gets or sets a value indicating whether the Delivery API output should be cached.\n ",
517+
"default": false
518+
},
519+
"ContentDuration": {
520+
"type": "string",
521+
"description": "Gets or sets a value indicating how long the Content Delivery API output should be cached.\n ",
522+
"format": "duration",
523+
"default": "00:01:00"
524+
},
525+
"MediaDuration": {
526+
"type": "string",
527+
"description": "Gets or sets a value indicating how long the Media Delivery API output should be cached.\n ",
528+
"format": "duration",
529+
"default": "00:01:00"
530+
}
531+
}
532+
},
439533
"CoreDebugSettings": {
440534
"type": "object",
441535
"description": "Typed configuration options for core debug settings.\n ",
@@ -1109,7 +1203,7 @@
11091203
"ExplicitlyIndexEachNestedProperty": {
11101204
"type": "boolean",
11111205
"description": "Gets or sets a value for whether each nested property should have it's own indexed value. Requires a rebuild of indexes when changed.",
1112-
"default": true
1206+
"default": false
11131207
}
11141208
}
11151209
},
@@ -1181,6 +1275,10 @@
11811275
},
11821276
"UnPublishedContentCompression": {
11831277
"type": "boolean"
1278+
},
1279+
"UsePagedSqlQuery": {
1280+
"type": "boolean",
1281+
"default": true
11841282
}
11851283
}
11861284
},
@@ -1346,6 +1444,11 @@
13461444
"description": "Gets or sets a value for how long (in minutes) a user is locked out when a lockout occurs.\n ",
13471445
"format": "int32",
13481446
"default": 43200
1447+
},
1448+
"AllowConcurrentLogins": {
1449+
"type": "boolean",
1450+
"description": "Gets or sets a value indicating whether to allow concurrent logins.\n ",
1451+
"default": false
13491452
}
13501453
}
13511454
},
@@ -1548,6 +1651,13 @@
15481651
"type": "string",
15491652
"description": "Invalid HTML elements for RichText Editor.\n ",
15501653
"default": "font"
1654+
},
1655+
"CloudApiKey": {
1656+
"type": [
1657+
"null",
1658+
"string"
1659+
],
1660+
"description": "Cloud API Key for TinyMCE. This is required to use TinyMCE premium plugins.\n "
15511661
}
15521662
}
15531663
},
@@ -1811,6 +1921,39 @@
18111921
}
18121922
}
18131923
}
1924+
},
1925+
"WebhookSettings": {
1926+
"type": "object",
1927+
"properties": {
1928+
"Enabled": {
1929+
"type": "boolean",
1930+
"description": "Gets or sets a value indicating whether webhooks are enabled.\n ",
1931+
"default": true
1932+
},
1933+
"MaximumRetries": {
1934+
"type": "integer",
1935+
"description": "Gets or sets a value indicating the maximum number of retries for all webhooks.\n ",
1936+
"format": "int32",
1937+
"default": 5
1938+
},
1939+
"Period": {
1940+
"type": "string",
1941+
"description": "Gets or sets a value for the period of the webhook firing.\n ",
1942+
"format": "duration",
1943+
"default": "00:00:10"
1944+
},
1945+
"EnableLoggingCleanup": {
1946+
"type": "boolean",
1947+
"description": "Gets or sets a value indicating whether cleanup of webhook logs are enabled.\n ",
1948+
"default": true
1949+
},
1950+
"KeepLogsForDays": {
1951+
"type": "integer",
1952+
"description": "Gets or sets a value indicating number of days to keep logs for.\n ",
1953+
"format": "int32",
1954+
"default": 30
1955+
}
1956+
}
18141957
}
18151958
}
18161959
}

‎src/Umbraco.UIBuilder.Demo/Umbraco.UIBuilder.Demo.csproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net7.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="Umbraco.Cms.Core" Version="12.2.0" />
9-
<PackageReference Include="Umbraco.Cms.Infrastructure" Version="12.2.0" />
10-
<PackageReference Include="Umbraco.Cms.Web.Website" Version="12.2.0" />
11-
<PackageReference Include="Umbraco.UIBuilder.Startup" Version="12.0.0" />
8+
<PackageReference Include="Umbraco.Cms.Core" Version="13.1.0" />
9+
<PackageReference Include="Umbraco.Cms.Infrastructure" Version="13.1.0" />
10+
<PackageReference Include="Umbraco.Cms.Web.Website" Version="13.1.0" />
11+
<PackageReference Include="Umbraco.UIBuilder.Startup" Version="13.0.2" />
1212
</ItemGroup>
1313

1414
</Project>

0 commit comments

Comments
 (0)