Skip to content

Commit

Permalink
Upgrade dependencies to v14 final
Browse files Browse the repository at this point in the history
  • Loading branch information
@nul800sebastiaan
nul800sebastiaan committed May 30, 2024
1 parent 7fbf348 commit a323378
Show file tree
Hide file tree
Showing 4 changed files with 2,238 additions and 774 deletions.
2 changes: 1 addition & 1 deletion Cultiv.Hangfire.Web/Cultiv.Hangfire.Web.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Umbraco.Cms" Version="14.0.0-beta001" />
<PackageReference Include="Umbraco.Cms" Version="14.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down
10 changes: 5 additions & 5 deletions Cultiv.Hangfire/Cultiv.Hangfire.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@

<ItemGroup>
<!-- Next lines specifies that you need at least v14 beta1 installed to be able to install this package -->
<PackageReference Include="Umbraco.Cms" Version="14.0.0-beta001" />
<PackageReference Include="Umbraco.Cms.Persistence.SqlServer" Version="14.0.0-beta001" />
<PackageReference Include="Umbraco.Cms.Web.Website" Version="14.0.0-beta001"/>
<PackageReference Include="Hangfire" Version="1.8.9"/>
<PackageReference Include="Umbraco.Cms" Version="14.0.0" />
<PackageReference Include="Umbraco.Cms.Persistence.SqlServer" Version="14.0.0" />
<PackageReference Include="Umbraco.Cms.Web.Website" Version="14.0.0"/>
<PackageReference Include="Hangfire" Version="1.8.12" />
<PackageReference Include="Hangfire.Console" Version="1.4.3"/>
<PackageReference Include="Microsoft.AspNet.Identity.Owin" Version="2.2.4"/>
<PackageReference Include="Hangfire.Storage.SQLite" Version="0.3.4"/>
<PackageReference Include="Hangfire.Storage.SQLite" Version="0.4.2" />
</ItemGroup>

<ItemGroup>
Expand Down
184 changes: 16 additions & 168 deletions Cultiv.Hangfire/appsettings-schema.Umbraco.Cms.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,6 @@
"Indexing": {
"$ref": "#/definitions/IndexingSettings"
},
"KeepAlive": {
"$ref": "#/definitions/KeepAliveSettings"
},
"Logging": {
"$ref": "#/definitions/LoggingSettings"
},
Expand All @@ -72,9 +69,6 @@
"Security": {
"$ref": "#/definitions/SecuritySettings"
},
"Tours": {
"$ref": "#/definitions/TourSettings"
},
"TypeFinder": {
"$ref": "#/definitions/TypeFinderSettings"
},
Expand All @@ -87,12 +81,6 @@
"Unattended": {
"$ref": "#/definitions/UnattendedSettings"
},
"RichTextEditor": {
"$ref": "#/definitions/RichTextEditorSettings"
},
"RuntimeMinification": {
"$ref": "#/definitions/RuntimeMinificationSettings"
},
"BasicAuth": {
"$ref": "#/definitions/BasicAuthSettings"
},
Expand Down Expand Up @@ -157,7 +145,7 @@
"PreviewBadge": {
"type": "string",
"description": "Gets or sets a value for the preview badge mark-up.\n ",
"default": "\n <div id=\"umbracoPreviewBadge\" class=\"umbraco-preview-badge\">\n <span class=\"umbraco-preview-badge__header\">Preview mode</span>\n <a href=\"{0}/preview/?id={2}\" class=\"umbraco-preview-badge__a open\" title=\"Open preview in BackOffice\">\n …\n </a>\n <a href=\"{0}/preview/end?redir={1}\" class=\"umbraco-preview-badge__a end\" title=\"End preview mode\">\n <svg viewBox=\"0 0 100 100\" xmlns=\"http://www.w3.org/2000/svg\"><title>Click to end preview mode</title><path fill=\"#fff\" d=\"M5273.1 2400.1v-2c0-2.8-5-4-9.7-4s-9.7 1.3-9.7 4v2a7 7 0 002 4.9l5 4.9c.3.3.4.6.4 1v6.4c0 .4.2.7.6.8l2.9.9c.5.1 1-.2 1-.8v-7.2c0-.4.2-.7.4-1l5.1-5a7 7 0 002-4.9zm-9.7-.1c-4.8 0-7.4-1.3-7.5-1.8.1-.5 2.7-1.8 7.5-1.8s7.3 1.3 7.5 1.8c-.2.5-2.7 1.8-7.5 1.8z\"/><path fill=\"#fff\" d=\"M5268.4 2410.3c-.6 0-1 .4-1 1s.4 1 1 1h4.3c.6 0 1-.4 1-1s-.4-1-1-1h-4.3zM5272.7 2413.7h-4.3c-.6 0-1 .4-1 1s.4 1 1 1h4.3c.6 0 1-.4 1-1s-.4-1-1-1zM5272.7 2417h-4.3c-.6 0-1 .4-1 1s.4 1 1 1h4.3c.6 0 1-.4 1-1 0-.5-.4-1-1-1z\"/><path fill=\"#fff\" d=\"M78.2 13l-8.7 11.7a32.5 32.5 0 11-51.9 25.8c0-10.3 4.7-19.7 12.9-25.8L21.8 13a47 47 0 1056.4 0z\"/><path fill=\"#fff\" d=\"M42.7 2.5h14.6v49.4H42.7z\"/></svg>\n </a>\n </div>\n <style type=\"text/css\">\n .umbraco-preview-badge {{\n position: fixed;\n bottom: 0;\n display: inline-flex;\n background: rgba(27, 38, 79, 0.9);\n color: #fff;\n font-size: 12px;\n z-index: 99999999;\n justify-content: center;\n align-items: center;\n box-shadow: 0 5px 10px rgba(0, 0, 0, .2), 0 1px 2px rgba(0, 0, 0, .2);\n line-height: 1;\n pointer-events:none;\n left: 50%;\n transform: translate(-50%, 40px);\n animation: umbraco-preview-badge--effect 10s 1.2s ease both;\n border-radius: 3px 3px 0 0;\n }}\n @keyframes umbraco-preview-badge--effect {{\n 0% {{\n transform: translate(-50%, 40px);\n animation-timing-function: ease-out;\n }}\n 1.5% {{\n transform: translate(-50%, -20px);\n animation-timing-function: ease-in;\n }}\n 5.0% {{\n transform: translate(-50%, -8px);\n animation-timing-function: ease-in;\n }}\n 7.5% {{\n transform: translate(-50%, -4px);\n animation-timing-function: ease-in;\n }}\n 9.2% {{\n transform: translate(-50%, -2px);\n animation-timing-function: ease-in;\n }}\n 3.5%,\n 6.5%,\n 8.5% {{\n transform: translate(-50%, 0);\n animation-timing-function: ease-out;\n }}\n 9.7% {{\n transform: translate(-50%, 0);\n animation-timing-function: ease-out;\n }}\n 10.0% {{\n transform: translate(-50%, 0);\n }}\n\n\n 60% {{\n transform: translate(-50%, 0);\n animation-timing-function: ease-out;\n }}\n 61.5% {{\n transform: translate(-50%, -20px);\n animation-timing-function: ease-in;\n }}\n 65.0% {{\n transform: translate(-50%, -8px);\n animation-timing-function: ease-in;\n }}\n 67.5% {{\n transform: translate(-50%, -4px);\n animation-timing-function: ease-in;\n }}\n 69.2% {{\n transform: translate(-50%, -2px);\n animation-timing-function: ease-in;\n }}\n 63.5%,\n 66.5%,\n 68.5% {{\n transform: translate(-50%, 0);\n animation-timing-function: ease-out;\n }}\n 69.7% {{\n transform: translate(-50%, 0);\n animation-timing-function: ease-out;\n }}\n 70.0% {{\n transform: translate(-50%, 0);\n }}\n 100.0% {{\n transform: translate(-50%, 0);\n }}\n }}\n .umbraco-preview-badge__header {{\n padding: 1em;\n font-weight: bold;\n pointer-events:none;\n }}\n .umbraco-preview-badge__a {{\n width: 3em;\n padding: 1em;\n display: flex;\n flex-shrink: 0;\n align-items: center;\n align-self: stretch;\n color:white;\n text-decoration:none;\n font-weight: bold;\n border-left: 1px solid hsla(0,0%,100%,.25);\n pointer-events:all;\n }}\n .umbraco-preview-badge__a svg {{\n width: 1em;\n height:1em;\n }}\n .umbraco-preview-badge__a:hover {{\n background: #202d5e;\n }}\n .umbraco-preview-badge__end svg {{\n fill: #fff;\n width:1em;\n }}\n </style>\n <script type=\"text/javascript\" data-umbraco-path=\"{0}\" src=\"{0}/js/umbraco.websitepreview.min.js\"></script>"
"default": "\n<script src=\"{0}/website/preview.js\"></script>\n<umb-website-preview path=\"{0}\" url=\"{1}\" unique=\"{2}\"></umb-website-preview>"
},
"ShowDeprecatedPropertyEditors": {
"type": "boolean",
Expand All @@ -172,12 +160,12 @@
"LoginLogoImage": {
"type": "string",
"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 ",
"default": "login/logo_dark.svg"
"default": "login/logo_light.svg"
},
"LoginLogoImageAlternative": {
"type": "string",
"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 ",
"default": "login/logo_light.svg"
"default": "login/logo_dark.svg"
},
"HideBackOfficeLogo": {
"type": "boolean",
Expand Down Expand Up @@ -717,11 +705,6 @@
}
]
},
"SanitizeTinyMce": {
"type": "boolean",
"description": "Gets or sets a value indicating whether TinyMCE scripting sanitization should be applied.\n ",
"default": false
},
"DistributedLockingReadLockDefaultTimeout": {
"type": "string",
"description": "Gets or sets a value representing the maximum time to wait whilst attempting to obtain a distributed read lock.\n ",
Expand Down Expand Up @@ -1182,22 +1165,6 @@
}
}
},
"KeepAliveSettings": {
"type": "object",
"description": "Typed configuration options for keep alive settings.\n ",
"properties": {
"DisableKeepAliveTask": {
"type": "boolean",
"description": "Gets or sets a value indicating whether the keep alive task is disabled.\n ",
"default": false
},
"KeepAlivePingUrl": {
"type": "string",
"description": "Gets or sets a value for the keep alive ping URL.\n ",
"default": "~/api/keepalive/ping"
}
}
},
"LoggingSettings": {
"type": "object",
"description": "Typed configuration options for logging settings.",
Expand Down Expand Up @@ -1441,19 +1408,18 @@
},
"AuthorizeCallbackPathName": {
"type": "string",
"description": "The path to use for authorization callback. Will be appended to the BackOfficeHost.\n ",
"default": "/umbraco"
}
}
},
"TourSettings": {
"type": "object",
"description": "Typed configuration options for tour settings.\n ",
"properties": {
"EnableTours": {
"type": "boolean",
"description": "Gets or sets a value indicating whether back-office tours are enabled.\n ",
"default": true
"description": "Gets or sets the path to use for authorization callback. Will be appended to the BackOfficeHost.\n ",
"default": "/umbraco/oauth_complete"
},
"AuthorizeCallbackLogoutPathName": {
"type": "string",
"description": "Gets or sets the path to use for authorization callback logout. Will be appended to the BackOfficeHost.\n ",
"default": "/umbraco/logout"
},
"AuthorizeCallbackErrorPathName": {
"type": "string",
"description": "Gets or sets the path to use for authorization callback error. Will be appended to the BackOfficeHost.\n ",
"default": "/umbraco/error"
}
}
},
Expand Down Expand Up @@ -1517,9 +1483,8 @@
"description": "Gets or sets a value indicating whether the use of alternative templates should be validated.\n ",
"default": false
},
"DisableFindContentByIdPath": {
"DisableFindContentByIdentifierPath": {
"type": "boolean",
"description": "Gets or sets a value indicating whether find content ID by path is disabled.\n ",
"default": false
},
"DisableRedirectUrlTracking": {
Expand Down Expand Up @@ -1613,123 +1578,6 @@
}
}
},
"RichTextEditorSettings": {
"type": "object",
"properties": {
"Commands": {
"type": "array",
"description": "HTML RichText Editor TinyMCE Commands.\n ",
"items": {
"$ref": "#/definitions/RichTextEditorCommand"
}
},
"Plugins": {
"type": "array",
"description": "HTML RichText Editor TinyMCE Plugins.\n ",
"items": {
"type": "string"
}
},
"CustomConfig": {
"type": "object",
"description": "HTML RichText Editor TinyMCE Custom Config.\n ",
"additionalProperties": {
"type": "string"
}
},
"ValidElements": {
"type": "string",
"default": "+a[id|style|rel|data-id|data-udi|rev|charset|hreflang|dir|lang|tabindex|accesskey|type|name|href|target|title|class|onfocus|onblur|onclick|ondblclick|onmousedown|onmouseup|onmouseover|onmousemove|onmouseout|onkeypress|onkeydown|onkeyup],-strong/-b[class|style],-em/-i[class|style],-strike[class|style],-s[class|style],-u[class|style],#p[id|style|dir|class|align],-ol[class|reversed|start|style|type],-ul[class|style],-li[class|style],br[class],img[id|dir|lang|longdesc|usemap|style|class|src|onmouseover|onmouseout|border|alt=|title|hspace|vspace|width|height|align|umbracoorgwidth|umbracoorgheight|onresize|onresizestart|onresizeend|rel|data-id],-sub[style|class],-sup[style|class],-blockquote[dir|style|class],-table[border=0|cellspacing|cellpadding|width|height|class|align|summary|style|dir|id|lang|bgcolor|background|bordercolor],-tr[id|lang|dir|class|rowspan|width|height|align|valign|style|bgcolor|background|bordercolor],tbody[id|class],thead[id|class],tfoot[id|class],#td[id|lang|dir|class|colspan|rowspan|width|height|align|valign|style|bgcolor|background|bordercolor|scope],-th[id|lang|dir|class|colspan|rowspan|width|height|align|valign|style|scope],caption[id|lang|dir|class|style],-div[id|dir|class|align|style],-span[class|align|style],-pre[class|align|style],address[class|align|style],-h1[id|dir|class|align|style],-h2[id|dir|class|align|style],-h3[id|dir|class|align|style],-h4[id|dir|class|align|style],-h5[id|dir|class|align|style],-h6[id|style|dir|class|align|style],hr[class|style],small[class|style],dd[id|class|title|style|dir|lang],dl[id|class|title|style|dir|lang],dt[id|class|title|style|dir|lang],object[class|id|width|height|codebase|*],param[name|value|_value|class],embed[type|width|height|src|class|*],map[name|class],area[shape|coords|href|alt|target|class],bdo[class],button[class],iframe[*],figure,figcaption,cite,video[*],audio[*],picture[*],source[*],canvas[*]"
},
"InvalidElements": {
"type": "string",
"description": "Invalid HTML elements for RichText Editor.\n ",
"default": "font"
},
"CloudApiKey": {
"type": [
"null",
"string"
],
"description": "Cloud API Key for TinyMCE. This is required to use TinyMCE premium plugins.\n "
}
}
},
"RichTextEditorCommand": {
"type": "object",
"required": [
"Alias",
"Name",
"Mode"
],
"properties": {
"Alias": {
"type": "string",
"minLength": 1
},
"Name": {
"type": "string",
"minLength": 1
},
"Mode": {
"$ref": "#/definitions/RichTextEditorCommandMode"
}
}
},
"RichTextEditorCommandMode": {
"type": "string",
"description": "",
"x-enumNames": [
"Insert",
"Selection",
"All"
],
"enum": [
"Insert",
"Selection",
"All"
]
},
"RuntimeMinificationSettings": {
"type": "object",
"properties": {
"UseInMemoryCache": {
"type": "boolean",
"description": "Use in memory cache\n ",
"default": false
},
"CacheBuster": {
"description": "The cache buster type to use\n ",
"default": "Version",
"oneOf": [
{
"$ref": "#/definitions/RuntimeMinificationCacheBuster"
}
]
},
"Version": {
"type": [
"null",
"string"
],
"description": "The unique version string used if CacheBuster is 'Version'.\n "
}
}
},
"RuntimeMinificationCacheBuster": {
"type": "string",
"description": "",
"x-enumNames": [
"Version",
"AppDomain",
"Timestamp"
],
"enum": [
"Version",
"AppDomain",
"Timestamp"
]
},
"BasicAuthSettings": {
"type": "object",
"description": "Typed configuration options for basic authentication settings.",
Expand Down
Loading

0 comments on commit a323378

Please sign in to comment.