Skip to content

Commit 159034e

Browse files
acoumbacoumb
authored
Merge pull request #12 from umbraco/release/17.0.0
Release/17.0.0
2 parents a923ca5 + da40871 commit 159034e

20 files changed

+1613
-619
lines changed

‎src/Umbraco.UIBuilder.Demo.Web/Startup.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
6969
})
7070
.WithEndpoints(u =>
7171
{
72+
//u.UseInstallerEndpoints();
7273
u.UseBackOfficeEndpoints();
7374
u.UseWebsiteEndpoints();
7475
});

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

Lines changed: 7 additions & 8 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>net9.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="Umbraco.Cms" Version="16.0.0" />
9-
<PackageReference Include="Umbraco.UIBuilder" Version="16.0.0" />
8+
<PackageReference Include="Umbraco.Cms" Version="17.0.0" />
9+
<PackageReference Include="Umbraco.UIBuilder" Version="17.0.0" />
1010
</ItemGroup>
1111

1212
<ItemGroup>
@@ -18,10 +18,9 @@
1818
<PackageReference Include="Microsoft.ICU.ICU4C.Runtime" Version="68.2.0.9" />
1919
<RuntimeHostConfigurationOption Include="System.Globalization.AppLocalIcu" Value="68.2" />
2020
</ItemGroup>
21-
22-
<ItemGroup>
23-
<Folder Include="wwwroot\" />
24-
</ItemGroup>
21+
<ItemGroup>
22+
<None Include="wwwroot\media\d2efjxka\import.csv" />
23+
</ItemGroup>
2524

2625
<PropertyGroup>
2726
<CopyRazorGenerateFilesToPublishDirectory>true</CopyRazorGenerateFilesToPublishDirectory>
@@ -31,7 +30,7 @@
3130
<PropertyGroup>
3231
<RazorCompileOnBuild>false</RazorCompileOnBuild>
3332
<RazorCompileOnPublish>false</RazorCompileOnPublish>
34-
<UserSecretsId>5540c7df-4459-4c3c-863b-e374725ceb32</UserSecretsId>
33+
<UserSecretsId>a82cfb48-b51e-43f1-a3b2-79a65195ce2a</UserSecretsId>
3534
</PropertyGroup>
3635

3736
</Project>

‎src/Umbraco.UIBuilder.Demo.Web/Views/_ViewImports.cshtml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,3 @@
55
@using Umbraco.Cms.Core.Models.PublishedContent
66
@using Microsoft.AspNetCore.Html
77
@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
8-
@addTagHelper *, Smidge
9-
@inject Smidge.SmidgeHelper SmidgeHelper

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

Lines changed: 74 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,9 @@
107107
},
108108
"Cache": {
109109
"$ref": "#/definitions/CacheSettings"
110+
},
111+
"DistributedJobSettings": {
112+
"$ref": "#/definitions/DistributedJobSettings"
110113
}
111114
}
112115
},
@@ -579,13 +582,9 @@
579582
"description": "Typed configuration options for models builder settings.\n ",
580583
"properties": {
581584
"ModelsMode": {
585+
"type": "string",
582586
"description": "Gets or sets a value for the models mode.\n ",
583-
"default": "InMemoryAuto",
584-
"oneOf": [
585-
{
586-
"$ref": "#/definitions/ModelsMode"
587-
}
588-
]
587+
"default": "InMemoryAuto"
589588
},
590589
"ModelsNamespace": {
591590
"type": "string",
@@ -616,25 +615,14 @@
616615
"type": "boolean",
617616
"description": "Gets or sets a value indicating whether the version number should be included in generated models.\n ",
618617
"default": true
618+
},
619+
"GenerateVirtualProperties": {
620+
"type": "boolean",
621+
"description": "Gets or sets a value indicating whether to mark all properties in the generated models as virtual.\n ",
622+
"default": true
619623
}
620624
}
621625
},
622-
"ModelsMode": {
623-
"type": "string",
624-
"description": "Defines the models generation modes.\n ",
625-
"x-enumNames": [
626-
"Nothing",
627-
"InMemoryAuto",
628-
"SourceCodeManual",
629-
"SourceCodeAuto"
630-
],
631-
"enum": [
632-
"Nothing",
633-
"InMemoryAuto",
634-
"SourceCodeManual",
635-
"SourceCodeAuto"
636-
]
637-
},
638626
"GlobalSettings": {
639627
"type": "object",
640628
"description": "Typed configuration options for global settings.\n ",
@@ -715,7 +703,7 @@
715703
},
716704
"MainDomKeyDiscriminator": {
717705
"type": "string",
718-
"description": "Gets or sets a value to discriminate MainDom boundaries.\n\n Generally the default should suffice but useful for advanced scenarios e.g. azure deployment slot based zero\n downtime deployments.\n\n "
706+
"description": "Gets or sets a value to discriminate MainDom boundaries.\nGenerally the default should suffice but useful for advanced scenarios e.g. azure deployment slot based zero\ndowntime deployments.\n "
719707
},
720708
"MainDomReleaseSignalPollingInterval": {
721709
"type": "integer",
@@ -1273,7 +1261,7 @@
12731261
},
12741262
"NuCacheSerializerType": {
12751263
"type": "string",
1276-
"description": "The serializer type that nucache uses to persist documents in the database.\n ",
1264+
"description": "The serializer type that the published content cache uses to persist documents in the database.\n ",
12771265
"x-enumNames": [
12781266
"MessagePack",
12791267
"JSON"
@@ -1545,6 +1533,7 @@
15451533
},
15461534
"DisableFindContentByIdentifierPath": {
15471535
"type": "boolean",
1536+
"description": "Gets or sets a value indicating whether the content finder by a path of the content key (ContentFinderByKeyPath) is disabled.\n ",
15481537
"default": false
15491538
},
15501539
"DisableRedirectUrlTracking": {
@@ -1564,6 +1553,11 @@
15641553
"UmbracoApplicationUrl": {
15651554
"type": "string",
15661555
"description": "Gets or sets a value for the Umbraco application URL.\n "
1556+
},
1557+
"UseStrictDomainMatching": {
1558+
"type": "boolean",
1559+
"description": "Gets or sets a value indicating whether strict domain matching is used when finding content to match the request.\n ",
1560+
"default": false
15671561
}
15681562
}
15691563
},
@@ -1635,9 +1629,32 @@
16351629
"string"
16361630
],
16371631
"description": "Gets or sets a value to use for creating a user with a password for Unattended Installs\n "
1632+
},
1633+
"UnattendedTelemetryLevel": {
1634+
"description": "Gets or sets a telemetry level to use for Unattended Installs\n ",
1635+
"default": "Detailed",
1636+
"oneOf": [
1637+
{
1638+
"$ref": "#/definitions/TelemetryLevel"
1639+
}
1640+
]
16381641
}
16391642
}
16401643
},
1644+
"TelemetryLevel": {
1645+
"type": "string",
1646+
"description": "",
1647+
"x-enumNames": [
1648+
"Minimal",
1649+
"Basic",
1650+
"Detailed"
1651+
],
1652+
"enum": [
1653+
"Minimal",
1654+
"Basic",
1655+
"Detailed"
1656+
]
1657+
},
16411658
"BasicAuthSettings": {
16421659
"type": "object",
16431660
"description": "Typed configuration options for basic authentication settings.",
@@ -1874,19 +1891,33 @@
18741891
"properties": {
18751892
"ContentTypeKeys": {
18761893
"type": "array",
1877-
"description": "Gets or sets a value for the collection of content type ids to always have in the cache.\n ",
1894+
"description": "Gets or sets a value for the collection of content type ids to always have in the cache.",
18781895
"items": {
18791896
"type": "string",
18801897
"format": "guid"
18811898
}
18821899
},
18831900
"DocumentBreadthFirstSeedCount": {
18841901
"type": "integer",
1902+
"description": "Gets or sets a value for the document breadth first seed count.",
18851903
"format": "int32",
18861904
"default": 100
18871905
},
18881906
"MediaBreadthFirstSeedCount": {
18891907
"type": "integer",
1908+
"description": "Gets or sets a value for the media breadth first seed count.",
1909+
"format": "int32",
1910+
"default": 100
1911+
},
1912+
"DocumentSeedBatchSize": {
1913+
"type": "integer",
1914+
"description": "Gets or sets a value for the document seed batch size.",
1915+
"format": "int32",
1916+
"default": 100
1917+
},
1918+
"MediaSeedBatchSize": {
1919+
"type": "integer",
1920+
"description": "Gets or sets a value for the media seed batch size.",
18901921
"format": "int32",
18911922
"default": 100
18921923
},
@@ -1925,6 +1956,24 @@
19251956
"default": "365.00:00:00"
19261957
}
19271958
}
1959+
},
1960+
"DistributedJobSettings": {
1961+
"type": "object",
1962+
"description": "Settings for distributed jobs.",
1963+
"properties": {
1964+
"Period": {
1965+
"type": "string",
1966+
"description": "Gets or sets a value for the period of checking if there are any runnable distributed jobs.\n ",
1967+
"format": "duration",
1968+
"default": "00:00:05"
1969+
},
1970+
"Delay": {
1971+
"type": "string",
1972+
"description": "Gets or sets a value for the delay of when to start checking for distributed jobs.\n ",
1973+
"format": "duration",
1974+
"default": "00:01:00"
1975+
}
1976+
}
19281977
}
19291978
}
19301979
}

‎src/Umbraco.UIBuilder.Demo.Web/appsettings.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
}
1212
},
1313
"ConnectionStrings": {
14-
"umbracoDbDSN": "Data Source=|DataDirectory|/Umbraco.sqlite.db;Cache=Shared;Foreign Keys=True;Pooling=True",
15-
"umbracoDbDSN_ProviderName": "Microsoft.Data.SQLite"
14+
"umbracoDbDSN": "Data Source=|DataDirectory|/Umbraco.sqlite.db;Cache=Shared;Foreign Keys=True;Pooling=True;",
15+
"umbracoDbDSN_ProviderName": "Microsoft.Data.Sqlite"
1616
},
1717
"Umbraco": {
1818
"CMS": {

0 commit comments

Comments
 (0)