From b95912484691d5bd7764bcadd2ebe69cadcbde94 Mon Sep 17 00:00:00 2001 From: Kevin Jump Date: Thu, 21 Mar 2024 09:28:26 +0000 Subject: [PATCH] beta002 - upgrade --- dist/build-package.ps1 | 2 +- uSync.AutoTemplates/packages.lock.json | 6 +- .../uSync.AutoTemplates.csproj | 2 +- uSync.BackOffice/Expansions/ISyncTreeNode.cs | 95 ---------- .../Expansions/SyncTreeNodeCollection.cs | 29 --- .../Expansions/uSyncTreeController.cs | 130 ------------- uSync.BackOffice/packages.lock.json | 38 ++-- .../uSync.Backoffice.Management.Api.csproj | 4 +- .../assets/package-lock.json | 30 +-- .../assets/package.json | 4 +- .../assets/public/umbraco-package.json | 2 +- .../src/components/usync-results-view.ts | 9 +- .../assets/src/constants.ts | 2 +- uSync.Community.Contrib/packages.lock.json | 38 ++-- .../packages.lock.json | 42 ++--- ...uSync.Community.DataTypeSerializers.csproj | 4 +- uSync.Core/packages.lock.json | 38 ++-- uSync.Core/uSync.Core.csproj | 2 +- uSync.SchemaGenerator/packages.lock.json | 38 ++-- .../appsettings-schema.Umbraco.Cms.json | 19 -- uSync.Tests/uSync.Tests.csproj | 6 +- uSync.Tests/umbraco-package-schema.json | 175 +++++++++++++++--- uSync/packages.lock.json | 118 ++++++------ 23 files changed, 344 insertions(+), 489 deletions(-) delete mode 100644 uSync.BackOffice/Expansions/ISyncTreeNode.cs delete mode 100644 uSync.BackOffice/Expansions/SyncTreeNodeCollection.cs delete mode 100644 uSync.BackOffice/Expansions/uSyncTreeController.cs diff --git a/dist/build-package.ps1 b/dist/build-package.ps1 index 1fd36abc..ebe370f3 100644 --- a/dist/build-package.ps1 +++ b/dist/build-package.ps1 @@ -107,7 +107,7 @@ XCOPY "$outFolder\*.nupkg" "C:\Source\localgit" /Q /Y if ($push) { ""; "##### Pushing to our nighly package feed"; "----------------------------------" ; "" - .\nuget.exe push "$outFolder\*.nupkg" -ApiKey AzureDevOps -src https://pkgs.dev.azure.com/jumoo/Public/_packaging/nightly/nuget/v3/index.json + nuget push "$outFolder\*.nupkg" -ApiKey AzureDevOps -src https://pkgs.dev.azure.com/jumoo/Public/_packaging/nightly/nuget/v3/index.json Remove-Item ".\last-push-*" Out-File -FilePath ".\last-push-$fullVersion.txt" -InputObject $fullVersion diff --git a/uSync.AutoTemplates/packages.lock.json b/uSync.AutoTemplates/packages.lock.json index 0f7adce5..48ce8e9d 100644 --- a/uSync.AutoTemplates/packages.lock.json +++ b/uSync.AutoTemplates/packages.lock.json @@ -4,9 +4,9 @@ "net8.0": { "Umbraco.Cms.Core": { "type": "Direct", - "requested": "[14.0.0-beta001, )", - "resolved": "14.0.0-beta001", - "contentHash": "W+GVz5RhAntIV40cQ6xifO/DWvfP1PopHoomqwgrI214aMajIWTEc64i+Lkd+lpdDCmk2bnDiyIt/sx7mI03IQ==", + "requested": "[14.0.0-beta002, )", + "resolved": "14.0.0-beta002", + "contentHash": "tqx3GZeHRtbDHOd1dzxzkt6cvpaDbn3PPQk0s+8bhPItqT+riUuWEistPz9G3KMSe+daCSM5U+YY1++2CGx0AA==", "dependencies": { "Microsoft.Extensions.Caching.Abstractions": "8.0.0", "Microsoft.Extensions.Caching.Memory": "8.0.0", diff --git a/uSync.AutoTemplates/uSync.AutoTemplates.csproj b/uSync.AutoTemplates/uSync.AutoTemplates.csproj index 569f4e12..237e0eca 100644 --- a/uSync.AutoTemplates/uSync.AutoTemplates.csproj +++ b/uSync.AutoTemplates/uSync.AutoTemplates.csproj @@ -6,7 +6,7 @@ - + diff --git a/uSync.BackOffice/Expansions/ISyncTreeNode.cs b/uSync.BackOffice/Expansions/ISyncTreeNode.cs deleted file mode 100644 index c0c5540a..00000000 --- a/uSync.BackOffice/Expansions/ISyncTreeNode.cs +++ /dev/null @@ -1,95 +0,0 @@ -using System.Collections.Generic; - -using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Mvc; - -using Umbraco.Cms.Core.Trees; - -namespace uSync.BackOffice.Expansions; - -/// -/// add on for uSync that allows you to render a node -/// under the uSync tree. -/// -public interface ISyncTreeNode -{ - /// - /// if the tree node is in-fact enabled. - /// - public bool Disabled { get; } - - /// - /// position in the tree, (higher is lower down the tree) - /// - public int Weight { get; } - - /// - /// Id this will be passed to the controller. - /// - public string Id { get; } - - /// - /// alias for the tree - /// - public string TreeAlias { get; } - - /// - /// alias for the node item - /// - public string Alias { get; } - - /// - /// title of the tree item - /// - public string Title { get; } - - /// - /// icon for the tree item. - /// - public string Icon { get; } - - - /// - /// method to return any additional child nodes under the parent node - /// - public IEnumerable GetChildNodes(string id, FormCollection queryStrings); - - /// - /// to display any context menu. - /// - /// - /// - /// - public ActionResult GetMenuItems(string id, FormCollection queryStrings); -} - -/// -/// Representation of a single tree node -/// -public class uSyncTreeNode -{ - /// - /// Id for this tree node - /// - public string? Id { get; set; } - - /// - /// Alias of the tree item - /// - public string? Alias { get; set; } - - /// - /// title (shown to user) for tree item - /// - public string? Title { get; set; } - - /// - /// Icon to display. - /// - public string? Icon { get; set; } - - /// - /// segment path to this item. - /// - public string? Path { get; set; } -} diff --git a/uSync.BackOffice/Expansions/SyncTreeNodeCollection.cs b/uSync.BackOffice/Expansions/SyncTreeNodeCollection.cs deleted file mode 100644 index a04797a8..00000000 --- a/uSync.BackOffice/Expansions/SyncTreeNodeCollection.cs +++ /dev/null @@ -1,29 +0,0 @@ -//using System; -//using System.Collections.Generic; - -//using Umbraco.Cms.Core.Composing; - -//namespace uSync.BackOffice.Expansions; - -///// -///// collection of UI tree nodes, allows us to dynamically extend the uSync tree -///// -//public class SyncTreeNodeCollection -// : BuilderCollectionBase -//{ -// /// -// public SyncTreeNodeCollection(Func> items) -// : base(items) -// { } -//} - -///// -///// collection builder for UI tree nodes under uSync tree.(subtrees) -///// -//public class SyncTreeNodeCollectionBuilder -// : LazyCollectionBuilderBase -//{ -// /// -// protected override SyncTreeNodeCollectionBuilder This => this; -//} diff --git a/uSync.BackOffice/Expansions/uSyncTreeController.cs b/uSync.BackOffice/Expansions/uSyncTreeController.cs deleted file mode 100644 index d7eb351d..00000000 --- a/uSync.BackOffice/Expansions/uSyncTreeController.cs +++ /dev/null @@ -1,130 +0,0 @@ -//using System.Linq; - -//using Microsoft.AspNetCore.Http; -//using Microsoft.AspNetCore.Mvc; - -//using Umbraco.Cms.Core; -//using Umbraco.Cms.Core.Events; -//using Umbraco.Cms.Core.Services; -//using Umbraco.Cms.Core.Trees; -//using Umbraco.Cms.Web.BackOffice.Trees; -//using Umbraco.Cms.Web.Common.Attributes; -//using Umbraco.Cms.Web.Common.ModelBinders; -//using Umbraco.Extensions; - -//namespace uSync.BackOffice.Expansions -//{ -// /// -// /// Tree controller for the 'uSync' tree -// /// -// [Tree(Constants.Applications.Settings, uSync.Trees.uSync, -// TreeGroup = uSync.Trees.Group, -// TreeTitle = uSync.Name, SortOrder = 35)] -// [PluginController(uSync.Name)] -// public class uSyncTreeController : TreeController -// { -// /// -// /// Collection of nodes underneath uSync tree item -// /// -// public SyncTreeNodeCollection _treeNodes; - -// private readonly IMenuItemCollectionFactory _menuItemsFactory; - -// /// -// public uSyncTreeController( -// ILocalizedTextService localizedTextService, -// UmbracoApiControllerTypeCollection umbracoApiControllerTypeCollection, -// IEventAggregator eventAggregator, -// SyncTreeNodeCollection treeNodes, -// IMenuItemCollectionFactory menuItemsFactory) -// : base(localizedTextService, umbracoApiControllerTypeCollection, eventAggregator) -// { -// _treeNodes = treeNodes; -// _menuItemsFactory = menuItemsFactory; -// } - -// /// -// protected override ActionResult CreateRootNode(FormCollection queryStrings) -// { -// var result = base.CreateRootNode(queryStrings); - -// result.Value.RoutePath = $"{SectionAlias}/{uSync.Trees.uSync}/dashboard"; -// result.Value.Icon = "icon-infinity"; -// result.Value.HasChildren = _treeNodes.Count > 0; -// result.Value.MenuUrl = null; - -// return result.Value; -// } - -// private string getParentId(string id) -// => id.IndexOf('_') < 0 ? id : id.Substring(0, id.IndexOf("_")); - -// /// -// protected override ActionResult GetMenuForNode(string id, [ModelBinder(typeof(HttpQueryStringModelBinder))] FormCollection queryStrings) -// { -// var defaultMenu = _menuItemsFactory.Create(); - -// if (_treeNodes.Count == 0) return defaultMenu; -// if (id == Constants.System.RootString) return defaultMenu; - -// var parentId = getParentId(id); -// var current = _treeNodes.FirstOrDefault(x => x.Id == parentId); -// return current?.GetMenuItems(id, queryStrings) ?? defaultMenu; -// } - -// /// -// protected override ActionResult GetTreeNodes(string id, [ModelBinder(typeof(HttpQueryStringModelBinder))] FormCollection queryStrings) -// { -// if (_treeNodes.Count == 0) return new TreeNodeCollection(); - -// var collection = new TreeNodeCollection(); - -// if (id == Constants.System.RootString) -// { -// foreach (var node in _treeNodes.Where(x => !x.Disabled).OrderBy(x => x.Weight)) -// { -// var treeNode = CreateTreeNode( -// node.Id, -// id, -// queryStrings, -// node.Title, -// node.Icon, -// $"{SectionAlias}/{node.TreeAlias}/{node.Alias}"); - -// var children = node.GetChildNodes(id, queryStrings); -// if (children?.Any() == true) -// treeNode.HasChildren = true; - -// collection.Add(treeNode); - -// } - -// return collection; -// } -// else -// { -// var treeNode = _treeNodes.FirstOrDefault(x => x.Id == getParentId(id)); -// if (treeNode != null) -// { -// var children = treeNode.GetChildNodes(id, queryStrings); -// if (children != null) -// { -// foreach (var child in children) -// { -// collection.Add(CreateTreeNode( -// $"{id}_{child.Id}", -// id, -// queryStrings, -// child.Title, -// child.Icon, -// $"{SectionAlias}/{treeNode.TreeAlias}/{child.Path}")); -// } -// } -// } -// } - -// return collection; - -// } -// } -//} diff --git a/uSync.BackOffice/packages.lock.json b/uSync.BackOffice/packages.lock.json index f67f2463..193f2dad 100644 --- a/uSync.BackOffice/packages.lock.json +++ b/uSync.BackOffice/packages.lock.json @@ -1956,8 +1956,8 @@ }, "Umbraco.Cms.Core": { "type": "Transitive", - "resolved": "14.0.0-beta001", - "contentHash": "W+GVz5RhAntIV40cQ6xifO/DWvfP1PopHoomqwgrI214aMajIWTEc64i+Lkd+lpdDCmk2bnDiyIt/sx7mI03IQ==", + "resolved": "14.0.0-beta002", + "contentHash": "tqx3GZeHRtbDHOd1dzxzkt6cvpaDbn3PPQk0s+8bhPItqT+riUuWEistPz9G3KMSe+daCSM5U+YY1++2CGx0AA==", "dependencies": { "Microsoft.Extensions.Caching.Abstractions": "8.0.0", "Microsoft.Extensions.Caching.Memory": "8.0.0", @@ -1974,18 +1974,18 @@ }, "Umbraco.Cms.Examine.Lucene": { "type": "Transitive", - "resolved": "14.0.0-beta001", - "contentHash": "DDNsvIMKH3w41Ml8ZFHNq3eGbx51jo9rrfpEfZ2Zak/qhtCdf8CotV4Ic13XHvxyx4reIseekEUuL1nVnXhbcg==", + "resolved": "14.0.0-beta002", + "contentHash": "DX2mWTcaCIyFTEeEsV44Zmv2au/W+CNRY3xA/SSHEikcnKn4dptebBy4bChoOlv+OFWSUYFR5+TW/jhYZKlmCw==", "dependencies": { "Examine": "3.2.0", "System.Security.Cryptography.Xml": "8.0.0", - "Umbraco.Cms.Infrastructure": "[14.0.0-beta001, 15.0.0)" + "Umbraco.Cms.Infrastructure": "[14.0.0-beta002, 15.0.0)" } }, "Umbraco.Cms.Infrastructure": { "type": "Transitive", - "resolved": "14.0.0-beta001", - "contentHash": "uO6pwXe49pTCJoPFvS0rB2WBKXDF7mdJzX2z2jeHbwqHd9oZiNOo+mveLjwa1O/uPiSX9M+EerUpzgXzXDJlHQ==", + "resolved": "14.0.0-beta002", + "contentHash": "/F02wd35zWNpOf2YGmd/PtVA7JGmppbu+bhPx9YPQoWrx66j4Z5giCj7wTZKu+FVHIUWLBm1W/9I/Ktk3z0+rw==", "dependencies": { "Examine.Core": "3.2.0", "HtmlAgilityPack": "1.11.57", @@ -2011,25 +2011,25 @@ "Serilog.Sinks.Async": "1.5.0", "Serilog.Sinks.File": "5.0.0", "Serilog.Sinks.Map": "1.0.2", - "Umbraco.Cms.Core": "[14.0.0-beta001, 15.0.0)", + "Umbraco.Cms.Core": "[14.0.0-beta002, 15.0.0)", "ncrontab": "3.3.3" } }, "Umbraco.Cms.PublishedCache.NuCache": { "type": "Transitive", - "resolved": "14.0.0-beta001", - "contentHash": "r7KDkEjVxeVmgNcLmS+D5MnHmxaEhHUUIdy3gIY9c/z/sGwmmiW2WRCquprVe+xLJh7yc7YsYuLSQQ0mO72RFw==", + "resolved": "14.0.0-beta002", + "contentHash": "vTEwrZLYKp8bs1/ipz72rCAjK5nVaUd1/9S6YxgWQy0pvCz2wxhJqwId1htUoeFUldiAz7DSgPeAwekUDKSCbg==", "dependencies": { "K4os.Compression.LZ4": "1.3.6", "MessagePack": "2.5.140", "Umbraco.CSharpTest.Net.Collections": "15.0.0", - "Umbraco.Cms.Infrastructure": "[14.0.0-beta001, 15.0.0)" + "Umbraco.Cms.Infrastructure": "[14.0.0-beta002, 15.0.0)" } }, "Umbraco.Cms.Web.Common": { "type": "Transitive", - "resolved": "14.0.0-beta001", - "contentHash": "Q1dP0q9dP1BmfWw/m69RkM0qyAhRW8ps48fPR68LJSs/wQIukOmvWlMxamyZ4lIq9fJXfzt+q88MI5aXIRCNhg==", + "resolved": "14.0.0-beta002", + "contentHash": "6qtcd2t3rQXyMuhn+1o1Kn+ydLp7aO31FjgU+cZo0NQlzxRRHqqj9VR6KCDi3jcR3Ofo1W7f77CQ4gJTzgsEbQ==", "dependencies": { "Asp.Versioning.Mvc": "8.0.0", "Asp.Versioning.Mvc.ApiExplorer": "8.0.0", @@ -2039,16 +2039,16 @@ "Serilog.AspNetCore": "8.0.1", "System.Net.Http": "4.3.4", "System.Text.RegularExpressions": "4.3.1", - "Umbraco.Cms.Examine.Lucene": "[14.0.0-beta001, 15.0.0)", - "Umbraco.Cms.PublishedCache.NuCache": "[14.0.0-beta001, 15.0.0)" + "Umbraco.Cms.Examine.Lucene": "[14.0.0-beta002, 15.0.0)", + "Umbraco.Cms.PublishedCache.NuCache": "[14.0.0-beta002, 15.0.0)" } }, "Umbraco.Cms.Web.Website": { "type": "Transitive", - "resolved": "14.0.0-beta001", - "contentHash": "tP4eueXTCDtdl0DqMNMaXFSx92IFsrndHPLdnxlJc91LVEnr52Q9bhb1gqzsQJx1Lx3Z28lXJZbfk94PBT9gSg==", + "resolved": "14.0.0-beta002", + "contentHash": "Q8wjqSaog8may4xuLhjDAaXvR7ZZSBRqxxqHRKXwPCWtpzSwzvRzLpcYX49n7/GJl+7fKeNNJ2fXSQUjWRUFGQ==", "dependencies": { - "Umbraco.Cms.Web.Common": "[14.0.0-beta001, 15.0.0)" + "Umbraco.Cms.Web.Common": "[14.0.0-beta002, 15.0.0)" } }, "Umbraco.CSharpTest.Net.Collections": { @@ -2065,7 +2065,7 @@ "usync.core": { "type": "Project", "dependencies": { - "Umbraco.Cms.Web.Website": "[14.0.0-beta001, )" + "Umbraco.Cms.Web.Website": "[14.0.0-beta002, )" } } } diff --git a/uSync.Backoffice.Management.Api/uSync.Backoffice.Management.Api.csproj b/uSync.Backoffice.Management.Api/uSync.Backoffice.Management.Api.csproj index b88ff1c2..47fd2a99 100644 --- a/uSync.Backoffice.Management.Api/uSync.Backoffice.Management.Api.csproj +++ b/uSync.Backoffice.Management.Api/uSync.Backoffice.Management.Api.csproj @@ -9,11 +9,11 @@ - + - + diff --git a/uSync.Backoffice.Management.Client/assets/package-lock.json b/uSync.Backoffice.Management.Client/assets/package-lock.json index 5687805c..0e5bd0f8 100644 --- a/uSync.Backoffice.Management.Client/assets/package-lock.json +++ b/uSync.Backoffice.Management.Client/assets/package-lock.json @@ -1,12 +1,12 @@ { "name": "@jumoo/usync-assets", - "version": "14.0.0-beta001", + "version": "14.0.0-beta002", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@jumoo/usync-assets", - "version": "14.0.0-beta001", + "version": "14.0.0-beta002", "license": "MPL-2.0", "dependencies": { "@microsoft/signalr": "^8.0.0", @@ -16,7 +16,7 @@ "devDependencies": { "@types/diff": "^5.0.9", "@types/node": "^20.11.20", - "@umbraco-cms/backoffice": "^14.0.0-beta001", + "@umbraco-cms/backoffice": "^14.0.0-beta002", "openapi-typescript-codegen": "^0.25.0", "typescript": "^5.2.2", "vite": "^5.0.8", @@ -927,9 +927,9 @@ "peer": true }, "node_modules/@umbraco-cms/backoffice": { - "version": "14.0.0-beta001", - "resolved": "https://www.myget.org/F/umbracoprereleases/npm/@umbraco-cms/backoffice/-/@umbraco-cms/backoffice-14.0.0-beta001.tgz", - "integrity": "sha1-ZTSiJULhGo4Bz6VDM9U+A34B3+E=", + "version": "14.0.0-beta002", + "resolved": "https://www.myget.org/F/umbracoprereleases/npm/@umbraco-cms/backoffice/-/@umbraco-cms/backoffice-14.0.0-beta002.tgz", + "integrity": "sha1-gWmiszTkYPzQyQ2EFOpXBXX07qY=", "dev": true, "license": "MIT", "engines": { @@ -2341,9 +2341,9 @@ } }, "node_modules/dompurify": { - "version": "3.0.9", - "resolved": "https://www.myget.org/F/umbracoprereleases/npm/dompurify/-/dompurify-3.0.9.tgz", - "integrity": "sha1-s/Ni8kuZ9TSYx11D7L14Sws61l4=", + "version": "3.0.10", + "resolved": "https://www.myget.org/F/umbracoprereleases/npm/dompurify/-/dompurify-3.0.10.tgz", + "integrity": "sha1-1It8XO+PNo/KOAxvvZqo2fPKDcs=", "dev": true, "license": "(MPL-2.0 OR Apache-2.0)", "peer": true @@ -2487,9 +2487,9 @@ } }, "node_modules/follow-redirects": { - "version": "1.15.5", - "resolved": "https://www.myget.org/F/umbracoprereleases/npm/follow-redirects/-/follow-redirects-1.15.5.tgz", - "integrity": "sha1-VNTW0GLA+n2dF/6wCEYVUOO6gCA=", + "version": "1.15.6", + "resolved": "https://www.myget.org/F/umbracoprereleases/npm/follow-redirects/-/follow-redirects-1.15.6.tgz", + "integrity": "sha1-f4FcDNpCScdP8J6V75fCO1/QOZs=", "dev": true, "funding": [ { @@ -3276,9 +3276,9 @@ "peer": true }, "node_modules/tinymce-i18n": { - "version": "24.2.26", - "resolved": "https://www.myget.org/F/umbracoprereleases/npm/tinymce-i18n/-/tinymce-i18n-24.2.26.tgz", - "integrity": "sha1-htOjTVrGe7Zf9AlJwi9tGrZmUtI=", + "version": "24.3.11", + "resolved": "https://www.myget.org/F/umbracoprereleases/npm/tinymce-i18n/-/tinymce-i18n-24.3.11.tgz", + "integrity": "sha1-SZwckRjcPXnylBgsDenagSPBx84=", "dev": true, "license": "MIT", "peer": true diff --git a/uSync.Backoffice.Management.Client/assets/package.json b/uSync.Backoffice.Management.Client/assets/package.json index 01eba89b..8bbbd5e3 100644 --- a/uSync.Backoffice.Management.Client/assets/package.json +++ b/uSync.Backoffice.Management.Client/assets/package.json @@ -2,7 +2,7 @@ "name": "@jumoo/usync-assets", "license": "MPL-2.0", "type": "module", - "version": "14.0.0-beta001", + "version": "14.0.0-beta002", "main": "./dist/usync.js", "types": "./dist/index.d.ts", "module": "./dist/usync.js", @@ -47,7 +47,7 @@ "devDependencies": { "@types/diff": "^5.0.9", "@types/node": "^20.11.20", - "@umbraco-cms/backoffice": "^14.0.0-beta001", + "@umbraco-cms/backoffice": "^14.0.0-beta002", "openapi-typescript-codegen": "^0.25.0", "typescript": "^5.2.2", "vite": "^5.0.8", diff --git a/uSync.Backoffice.Management.Client/assets/public/umbraco-package.json b/uSync.Backoffice.Management.Client/assets/public/umbraco-package.json index 19fbf661..59af9f87 100644 --- a/uSync.Backoffice.Management.Client/assets/public/umbraco-package.json +++ b/uSync.Backoffice.Management.Client/assets/public/umbraco-package.json @@ -2,7 +2,7 @@ "$schema": "../umbraco-package-schema.json", "name": "uSync", "id": "usync", - "version": "14.0.0-build.20240307.10", + "version": "14.0.0-beta002", "allowTelemetry": true, "extensions": [ { diff --git a/uSync.Backoffice.Management.Client/assets/src/components/usync-results-view.ts b/uSync.Backoffice.Management.Client/assets/src/components/usync-results-view.ts index 136b7ecf..f01eef17 100644 --- a/uSync.Backoffice.Management.Client/assets/src/components/usync-results-view.ts +++ b/uSync.Backoffice.Management.Client/assets/src/components/usync-results-view.ts @@ -19,7 +19,7 @@ export class uSyncResultsView extends UmbElementMixin(LitElement) { } @property({type: Array}) - results : Array = []; + results : Array | undefined = []; @state() _showAll : boolean = false; @@ -44,10 +44,9 @@ export class uSyncResultsView extends UmbElementMixin(LitElement) { } render() { - this._changeCount = 0; - var rowsHtml = this.results.map((result) => { + var rowsHtml = this.results?.map((result) => { if (this._showAll == false && result.change == 'NoChange') { return nothing; @@ -68,11 +67,11 @@ export class uSyncResultsView extends UmbElementMixin(LitElement) { return this._changeCount == 0 ? html` - ${this.renderResultBar(this.results.length)} + ${this.renderResultBar(this.results?.length || 0)}
Nothing has changed
` : html` - ${this.renderResultBar(this.results.length)} + ${this.renderResultBar(this.results?.length || 0)} Success diff --git a/uSync.Backoffice.Management.Client/assets/src/constants.ts b/uSync.Backoffice.Management.Client/assets/src/constants.ts index 7284f38c..7a56e535 100644 --- a/uSync.Backoffice.Management.Client/assets/src/constants.ts +++ b/uSync.Backoffice.Management.Client/assets/src/constants.ts @@ -5,7 +5,7 @@ const _constants = { path: 'usync', icon: 'icon-infinity', menuName: 'Syncronisation', - version: "14.0.0-beta01", + version: "14.0.0-beta002", workspace: { alias: 'usync.workspace', diff --git a/uSync.Community.Contrib/packages.lock.json b/uSync.Community.Contrib/packages.lock.json index 5f88486d..e2b34d12 100644 --- a/uSync.Community.Contrib/packages.lock.json +++ b/uSync.Community.Contrib/packages.lock.json @@ -1956,8 +1956,8 @@ }, "Umbraco.Cms.Core": { "type": "Transitive", - "resolved": "14.0.0-beta001", - "contentHash": "W+GVz5RhAntIV40cQ6xifO/DWvfP1PopHoomqwgrI214aMajIWTEc64i+Lkd+lpdDCmk2bnDiyIt/sx7mI03IQ==", + "resolved": "14.0.0-beta002", + "contentHash": "tqx3GZeHRtbDHOd1dzxzkt6cvpaDbn3PPQk0s+8bhPItqT+riUuWEistPz9G3KMSe+daCSM5U+YY1++2CGx0AA==", "dependencies": { "Microsoft.Extensions.Caching.Abstractions": "8.0.0", "Microsoft.Extensions.Caching.Memory": "8.0.0", @@ -1974,18 +1974,18 @@ }, "Umbraco.Cms.Examine.Lucene": { "type": "Transitive", - "resolved": "14.0.0-beta001", - "contentHash": "DDNsvIMKH3w41Ml8ZFHNq3eGbx51jo9rrfpEfZ2Zak/qhtCdf8CotV4Ic13XHvxyx4reIseekEUuL1nVnXhbcg==", + "resolved": "14.0.0-beta002", + "contentHash": "DX2mWTcaCIyFTEeEsV44Zmv2au/W+CNRY3xA/SSHEikcnKn4dptebBy4bChoOlv+OFWSUYFR5+TW/jhYZKlmCw==", "dependencies": { "Examine": "3.2.0", "System.Security.Cryptography.Xml": "8.0.0", - "Umbraco.Cms.Infrastructure": "[14.0.0-beta001, 15.0.0)" + "Umbraco.Cms.Infrastructure": "[14.0.0-beta002, 15.0.0)" } }, "Umbraco.Cms.Infrastructure": { "type": "Transitive", - "resolved": "14.0.0-beta001", - "contentHash": "uO6pwXe49pTCJoPFvS0rB2WBKXDF7mdJzX2z2jeHbwqHd9oZiNOo+mveLjwa1O/uPiSX9M+EerUpzgXzXDJlHQ==", + "resolved": "14.0.0-beta002", + "contentHash": "/F02wd35zWNpOf2YGmd/PtVA7JGmppbu+bhPx9YPQoWrx66j4Z5giCj7wTZKu+FVHIUWLBm1W/9I/Ktk3z0+rw==", "dependencies": { "Examine.Core": "3.2.0", "HtmlAgilityPack": "1.11.57", @@ -2011,25 +2011,25 @@ "Serilog.Sinks.Async": "1.5.0", "Serilog.Sinks.File": "5.0.0", "Serilog.Sinks.Map": "1.0.2", - "Umbraco.Cms.Core": "[14.0.0-beta001, 15.0.0)", + "Umbraco.Cms.Core": "[14.0.0-beta002, 15.0.0)", "ncrontab": "3.3.3" } }, "Umbraco.Cms.PublishedCache.NuCache": { "type": "Transitive", - "resolved": "14.0.0-beta001", - "contentHash": "r7KDkEjVxeVmgNcLmS+D5MnHmxaEhHUUIdy3gIY9c/z/sGwmmiW2WRCquprVe+xLJh7yc7YsYuLSQQ0mO72RFw==", + "resolved": "14.0.0-beta002", + "contentHash": "vTEwrZLYKp8bs1/ipz72rCAjK5nVaUd1/9S6YxgWQy0pvCz2wxhJqwId1htUoeFUldiAz7DSgPeAwekUDKSCbg==", "dependencies": { "K4os.Compression.LZ4": "1.3.6", "MessagePack": "2.5.140", "Umbraco.CSharpTest.Net.Collections": "15.0.0", - "Umbraco.Cms.Infrastructure": "[14.0.0-beta001, 15.0.0)" + "Umbraco.Cms.Infrastructure": "[14.0.0-beta002, 15.0.0)" } }, "Umbraco.Cms.Web.Common": { "type": "Transitive", - "resolved": "14.0.0-beta001", - "contentHash": "Q1dP0q9dP1BmfWw/m69RkM0qyAhRW8ps48fPR68LJSs/wQIukOmvWlMxamyZ4lIq9fJXfzt+q88MI5aXIRCNhg==", + "resolved": "14.0.0-beta002", + "contentHash": "6qtcd2t3rQXyMuhn+1o1Kn+ydLp7aO31FjgU+cZo0NQlzxRRHqqj9VR6KCDi3jcR3Ofo1W7f77CQ4gJTzgsEbQ==", "dependencies": { "Asp.Versioning.Mvc": "8.0.0", "Asp.Versioning.Mvc.ApiExplorer": "8.0.0", @@ -2039,16 +2039,16 @@ "Serilog.AspNetCore": "8.0.1", "System.Net.Http": "4.3.4", "System.Text.RegularExpressions": "4.3.1", - "Umbraco.Cms.Examine.Lucene": "[14.0.0-beta001, 15.0.0)", - "Umbraco.Cms.PublishedCache.NuCache": "[14.0.0-beta001, 15.0.0)" + "Umbraco.Cms.Examine.Lucene": "[14.0.0-beta002, 15.0.0)", + "Umbraco.Cms.PublishedCache.NuCache": "[14.0.0-beta002, 15.0.0)" } }, "Umbraco.Cms.Web.Website": { "type": "Transitive", - "resolved": "14.0.0-beta001", - "contentHash": "tP4eueXTCDtdl0DqMNMaXFSx92IFsrndHPLdnxlJc91LVEnr52Q9bhb1gqzsQJx1Lx3Z28lXJZbfk94PBT9gSg==", + "resolved": "14.0.0-beta002", + "contentHash": "Q8wjqSaog8may4xuLhjDAaXvR7ZZSBRqxxqHRKXwPCWtpzSwzvRzLpcYX49n7/GJl+7fKeNNJ2fXSQUjWRUFGQ==", "dependencies": { - "Umbraco.Cms.Web.Common": "[14.0.0-beta001, 15.0.0)" + "Umbraco.Cms.Web.Common": "[14.0.0-beta002, 15.0.0)" } }, "Umbraco.CSharpTest.Net.Collections": { @@ -2059,7 +2059,7 @@ "usync.core": { "type": "Project", "dependencies": { - "Umbraco.Cms.Web.Website": "[14.0.0-beta001, )" + "Umbraco.Cms.Web.Website": "[14.0.0-beta002, )" } } } diff --git a/uSync.Community.DataTypeSerializers/packages.lock.json b/uSync.Community.DataTypeSerializers/packages.lock.json index 6674dea2..5e65805a 100644 --- a/uSync.Community.DataTypeSerializers/packages.lock.json +++ b/uSync.Community.DataTypeSerializers/packages.lock.json @@ -14,9 +14,9 @@ }, "Umbraco.Cms.Core": { "type": "Direct", - "requested": "[14.0.0-beta001, )", - "resolved": "14.0.0-beta001", - "contentHash": "W+GVz5RhAntIV40cQ6xifO/DWvfP1PopHoomqwgrI214aMajIWTEc64i+Lkd+lpdDCmk2bnDiyIt/sx7mI03IQ==", + "requested": "[14.0.0-beta002, )", + "resolved": "14.0.0-beta002", + "contentHash": "tqx3GZeHRtbDHOd1dzxzkt6cvpaDbn3PPQk0s+8bhPItqT+riUuWEistPz9G3KMSe+daCSM5U+YY1++2CGx0AA==", "dependencies": { "Microsoft.Extensions.Caching.Abstractions": "8.0.0", "Microsoft.Extensions.Caching.Memory": "8.0.0", @@ -33,11 +33,11 @@ }, "Umbraco.Cms.Web.Website": { "type": "Direct", - "requested": "[14.0.0-beta001, )", - "resolved": "14.0.0-beta001", - "contentHash": "tP4eueXTCDtdl0DqMNMaXFSx92IFsrndHPLdnxlJc91LVEnr52Q9bhb1gqzsQJx1Lx3Z28lXJZbfk94PBT9gSg==", + "requested": "[14.0.0-beta002, )", + "resolved": "14.0.0-beta002", + "contentHash": "Q8wjqSaog8may4xuLhjDAaXvR7ZZSBRqxxqHRKXwPCWtpzSwzvRzLpcYX49n7/GJl+7fKeNNJ2fXSQUjWRUFGQ==", "dependencies": { - "Umbraco.Cms.Web.Common": "[14.0.0-beta001, 15.0.0)" + "Umbraco.Cms.Web.Common": "[14.0.0-beta002, 15.0.0)" } }, "Asp.Versioning.Abstractions": { @@ -1984,18 +1984,18 @@ }, "Umbraco.Cms.Examine.Lucene": { "type": "Transitive", - "resolved": "14.0.0-beta001", - "contentHash": "DDNsvIMKH3w41Ml8ZFHNq3eGbx51jo9rrfpEfZ2Zak/qhtCdf8CotV4Ic13XHvxyx4reIseekEUuL1nVnXhbcg==", + "resolved": "14.0.0-beta002", + "contentHash": "DX2mWTcaCIyFTEeEsV44Zmv2au/W+CNRY3xA/SSHEikcnKn4dptebBy4bChoOlv+OFWSUYFR5+TW/jhYZKlmCw==", "dependencies": { "Examine": "3.2.0", "System.Security.Cryptography.Xml": "8.0.0", - "Umbraco.Cms.Infrastructure": "[14.0.0-beta001, 15.0.0)" + "Umbraco.Cms.Infrastructure": "[14.0.0-beta002, 15.0.0)" } }, "Umbraco.Cms.Infrastructure": { "type": "Transitive", - "resolved": "14.0.0-beta001", - "contentHash": "uO6pwXe49pTCJoPFvS0rB2WBKXDF7mdJzX2z2jeHbwqHd9oZiNOo+mveLjwa1O/uPiSX9M+EerUpzgXzXDJlHQ==", + "resolved": "14.0.0-beta002", + "contentHash": "/F02wd35zWNpOf2YGmd/PtVA7JGmppbu+bhPx9YPQoWrx66j4Z5giCj7wTZKu+FVHIUWLBm1W/9I/Ktk3z0+rw==", "dependencies": { "Examine.Core": "3.2.0", "HtmlAgilityPack": "1.11.57", @@ -2021,25 +2021,25 @@ "Serilog.Sinks.Async": "1.5.0", "Serilog.Sinks.File": "5.0.0", "Serilog.Sinks.Map": "1.0.2", - "Umbraco.Cms.Core": "[14.0.0-beta001, 15.0.0)", + "Umbraco.Cms.Core": "[14.0.0-beta002, 15.0.0)", "ncrontab": "3.3.3" } }, "Umbraco.Cms.PublishedCache.NuCache": { "type": "Transitive", - "resolved": "14.0.0-beta001", - "contentHash": "r7KDkEjVxeVmgNcLmS+D5MnHmxaEhHUUIdy3gIY9c/z/sGwmmiW2WRCquprVe+xLJh7yc7YsYuLSQQ0mO72RFw==", + "resolved": "14.0.0-beta002", + "contentHash": "vTEwrZLYKp8bs1/ipz72rCAjK5nVaUd1/9S6YxgWQy0pvCz2wxhJqwId1htUoeFUldiAz7DSgPeAwekUDKSCbg==", "dependencies": { "K4os.Compression.LZ4": "1.3.6", "MessagePack": "2.5.140", "Umbraco.CSharpTest.Net.Collections": "15.0.0", - "Umbraco.Cms.Infrastructure": "[14.0.0-beta001, 15.0.0)" + "Umbraco.Cms.Infrastructure": "[14.0.0-beta002, 15.0.0)" } }, "Umbraco.Cms.Web.Common": { "type": "Transitive", - "resolved": "14.0.0-beta001", - "contentHash": "Q1dP0q9dP1BmfWw/m69RkM0qyAhRW8ps48fPR68LJSs/wQIukOmvWlMxamyZ4lIq9fJXfzt+q88MI5aXIRCNhg==", + "resolved": "14.0.0-beta002", + "contentHash": "6qtcd2t3rQXyMuhn+1o1Kn+ydLp7aO31FjgU+cZo0NQlzxRRHqqj9VR6KCDi3jcR3Ofo1W7f77CQ4gJTzgsEbQ==", "dependencies": { "Asp.Versioning.Mvc": "8.0.0", "Asp.Versioning.Mvc.ApiExplorer": "8.0.0", @@ -2049,8 +2049,8 @@ "Serilog.AspNetCore": "8.0.1", "System.Net.Http": "4.3.4", "System.Text.RegularExpressions": "4.3.1", - "Umbraco.Cms.Examine.Lucene": "[14.0.0-beta001, 15.0.0)", - "Umbraco.Cms.PublishedCache.NuCache": "[14.0.0-beta001, 15.0.0)" + "Umbraco.Cms.Examine.Lucene": "[14.0.0-beta002, 15.0.0)", + "Umbraco.Cms.PublishedCache.NuCache": "[14.0.0-beta002, 15.0.0)" } }, "Umbraco.CSharpTest.Net.Collections": { @@ -2074,7 +2074,7 @@ "usync.core": { "type": "Project", "dependencies": { - "Umbraco.Cms.Web.Website": "[14.0.0-beta001, )" + "Umbraco.Cms.Web.Website": "[14.0.0-beta002, )" } } } diff --git a/uSync.Community.DataTypeSerializers/uSync.Community.DataTypeSerializers.csproj b/uSync.Community.DataTypeSerializers/uSync.Community.DataTypeSerializers.csproj index fef6da1a..434bf5bf 100644 --- a/uSync.Community.DataTypeSerializers/uSync.Community.DataTypeSerializers.csproj +++ b/uSync.Community.DataTypeSerializers/uSync.Community.DataTypeSerializers.csproj @@ -18,8 +18,8 @@ - - + + diff --git a/uSync.Core/packages.lock.json b/uSync.Core/packages.lock.json index 36ed7756..ef7e0194 100644 --- a/uSync.Core/packages.lock.json +++ b/uSync.Core/packages.lock.json @@ -14,11 +14,11 @@ }, "Umbraco.Cms.Web.Website": { "type": "Direct", - "requested": "[14.0.0-beta001, )", - "resolved": "14.0.0-beta001", - "contentHash": "tP4eueXTCDtdl0DqMNMaXFSx92IFsrndHPLdnxlJc91LVEnr52Q9bhb1gqzsQJx1Lx3Z28lXJZbfk94PBT9gSg==", + "requested": "[14.0.0-beta002, )", + "resolved": "14.0.0-beta002", + "contentHash": "Q8wjqSaog8may4xuLhjDAaXvR7ZZSBRqxxqHRKXwPCWtpzSwzvRzLpcYX49n7/GJl+7fKeNNJ2fXSQUjWRUFGQ==", "dependencies": { - "Umbraco.Cms.Web.Common": "[14.0.0-beta001, 15.0.0)" + "Umbraco.Cms.Web.Common": "[14.0.0-beta002, 15.0.0)" } }, "Asp.Versioning.Abstractions": { @@ -1965,8 +1965,8 @@ }, "Umbraco.Cms.Core": { "type": "Transitive", - "resolved": "14.0.0-beta001", - "contentHash": "W+GVz5RhAntIV40cQ6xifO/DWvfP1PopHoomqwgrI214aMajIWTEc64i+Lkd+lpdDCmk2bnDiyIt/sx7mI03IQ==", + "resolved": "14.0.0-beta002", + "contentHash": "tqx3GZeHRtbDHOd1dzxzkt6cvpaDbn3PPQk0s+8bhPItqT+riUuWEistPz9G3KMSe+daCSM5U+YY1++2CGx0AA==", "dependencies": { "Microsoft.Extensions.Caching.Abstractions": "8.0.0", "Microsoft.Extensions.Caching.Memory": "8.0.0", @@ -1983,18 +1983,18 @@ }, "Umbraco.Cms.Examine.Lucene": { "type": "Transitive", - "resolved": "14.0.0-beta001", - "contentHash": "DDNsvIMKH3w41Ml8ZFHNq3eGbx51jo9rrfpEfZ2Zak/qhtCdf8CotV4Ic13XHvxyx4reIseekEUuL1nVnXhbcg==", + "resolved": "14.0.0-beta002", + "contentHash": "DX2mWTcaCIyFTEeEsV44Zmv2au/W+CNRY3xA/SSHEikcnKn4dptebBy4bChoOlv+OFWSUYFR5+TW/jhYZKlmCw==", "dependencies": { "Examine": "3.2.0", "System.Security.Cryptography.Xml": "8.0.0", - "Umbraco.Cms.Infrastructure": "[14.0.0-beta001, 15.0.0)" + "Umbraco.Cms.Infrastructure": "[14.0.0-beta002, 15.0.0)" } }, "Umbraco.Cms.Infrastructure": { "type": "Transitive", - "resolved": "14.0.0-beta001", - "contentHash": "uO6pwXe49pTCJoPFvS0rB2WBKXDF7mdJzX2z2jeHbwqHd9oZiNOo+mveLjwa1O/uPiSX9M+EerUpzgXzXDJlHQ==", + "resolved": "14.0.0-beta002", + "contentHash": "/F02wd35zWNpOf2YGmd/PtVA7JGmppbu+bhPx9YPQoWrx66j4Z5giCj7wTZKu+FVHIUWLBm1W/9I/Ktk3z0+rw==", "dependencies": { "Examine.Core": "3.2.0", "HtmlAgilityPack": "1.11.57", @@ -2020,25 +2020,25 @@ "Serilog.Sinks.Async": "1.5.0", "Serilog.Sinks.File": "5.0.0", "Serilog.Sinks.Map": "1.0.2", - "Umbraco.Cms.Core": "[14.0.0-beta001, 15.0.0)", + "Umbraco.Cms.Core": "[14.0.0-beta002, 15.0.0)", "ncrontab": "3.3.3" } }, "Umbraco.Cms.PublishedCache.NuCache": { "type": "Transitive", - "resolved": "14.0.0-beta001", - "contentHash": "r7KDkEjVxeVmgNcLmS+D5MnHmxaEhHUUIdy3gIY9c/z/sGwmmiW2WRCquprVe+xLJh7yc7YsYuLSQQ0mO72RFw==", + "resolved": "14.0.0-beta002", + "contentHash": "vTEwrZLYKp8bs1/ipz72rCAjK5nVaUd1/9S6YxgWQy0pvCz2wxhJqwId1htUoeFUldiAz7DSgPeAwekUDKSCbg==", "dependencies": { "K4os.Compression.LZ4": "1.3.6", "MessagePack": "2.5.140", "Umbraco.CSharpTest.Net.Collections": "15.0.0", - "Umbraco.Cms.Infrastructure": "[14.0.0-beta001, 15.0.0)" + "Umbraco.Cms.Infrastructure": "[14.0.0-beta002, 15.0.0)" } }, "Umbraco.Cms.Web.Common": { "type": "Transitive", - "resolved": "14.0.0-beta001", - "contentHash": "Q1dP0q9dP1BmfWw/m69RkM0qyAhRW8ps48fPR68LJSs/wQIukOmvWlMxamyZ4lIq9fJXfzt+q88MI5aXIRCNhg==", + "resolved": "14.0.0-beta002", + "contentHash": "6qtcd2t3rQXyMuhn+1o1Kn+ydLp7aO31FjgU+cZo0NQlzxRRHqqj9VR6KCDi3jcR3Ofo1W7f77CQ4gJTzgsEbQ==", "dependencies": { "Asp.Versioning.Mvc": "8.0.0", "Asp.Versioning.Mvc.ApiExplorer": "8.0.0", @@ -2048,8 +2048,8 @@ "Serilog.AspNetCore": "8.0.1", "System.Net.Http": "4.3.4", "System.Text.RegularExpressions": "4.3.1", - "Umbraco.Cms.Examine.Lucene": "[14.0.0-beta001, 15.0.0)", - "Umbraco.Cms.PublishedCache.NuCache": "[14.0.0-beta001, 15.0.0)" + "Umbraco.Cms.Examine.Lucene": "[14.0.0-beta002, 15.0.0)", + "Umbraco.Cms.PublishedCache.NuCache": "[14.0.0-beta002, 15.0.0)" } }, "Umbraco.CSharpTest.Net.Collections": { diff --git a/uSync.Core/uSync.Core.csproj b/uSync.Core/uSync.Core.csproj index 93a4a2fc..e792030c 100644 --- a/uSync.Core/uSync.Core.csproj +++ b/uSync.Core/uSync.Core.csproj @@ -22,7 +22,7 @@ - + diff --git a/uSync.SchemaGenerator/packages.lock.json b/uSync.SchemaGenerator/packages.lock.json index c48c0831..f9d57837 100644 --- a/uSync.SchemaGenerator/packages.lock.json +++ b/uSync.SchemaGenerator/packages.lock.json @@ -1983,8 +1983,8 @@ }, "Umbraco.Cms.Core": { "type": "Transitive", - "resolved": "14.0.0-beta001", - "contentHash": "W+GVz5RhAntIV40cQ6xifO/DWvfP1PopHoomqwgrI214aMajIWTEc64i+Lkd+lpdDCmk2bnDiyIt/sx7mI03IQ==", + "resolved": "14.0.0-beta002", + "contentHash": "tqx3GZeHRtbDHOd1dzxzkt6cvpaDbn3PPQk0s+8bhPItqT+riUuWEistPz9G3KMSe+daCSM5U+YY1++2CGx0AA==", "dependencies": { "Microsoft.Extensions.Caching.Abstractions": "8.0.0", "Microsoft.Extensions.Caching.Memory": "8.0.0", @@ -2001,18 +2001,18 @@ }, "Umbraco.Cms.Examine.Lucene": { "type": "Transitive", - "resolved": "14.0.0-beta001", - "contentHash": "DDNsvIMKH3w41Ml8ZFHNq3eGbx51jo9rrfpEfZ2Zak/qhtCdf8CotV4Ic13XHvxyx4reIseekEUuL1nVnXhbcg==", + "resolved": "14.0.0-beta002", + "contentHash": "DX2mWTcaCIyFTEeEsV44Zmv2au/W+CNRY3xA/SSHEikcnKn4dptebBy4bChoOlv+OFWSUYFR5+TW/jhYZKlmCw==", "dependencies": { "Examine": "3.2.0", "System.Security.Cryptography.Xml": "8.0.0", - "Umbraco.Cms.Infrastructure": "[14.0.0-beta001, 15.0.0)" + "Umbraco.Cms.Infrastructure": "[14.0.0-beta002, 15.0.0)" } }, "Umbraco.Cms.Infrastructure": { "type": "Transitive", - "resolved": "14.0.0-beta001", - "contentHash": "uO6pwXe49pTCJoPFvS0rB2WBKXDF7mdJzX2z2jeHbwqHd9oZiNOo+mveLjwa1O/uPiSX9M+EerUpzgXzXDJlHQ==", + "resolved": "14.0.0-beta002", + "contentHash": "/F02wd35zWNpOf2YGmd/PtVA7JGmppbu+bhPx9YPQoWrx66j4Z5giCj7wTZKu+FVHIUWLBm1W/9I/Ktk3z0+rw==", "dependencies": { "Examine.Core": "3.2.0", "HtmlAgilityPack": "1.11.57", @@ -2038,25 +2038,25 @@ "Serilog.Sinks.Async": "1.5.0", "Serilog.Sinks.File": "5.0.0", "Serilog.Sinks.Map": "1.0.2", - "Umbraco.Cms.Core": "[14.0.0-beta001, 15.0.0)", + "Umbraco.Cms.Core": "[14.0.0-beta002, 15.0.0)", "ncrontab": "3.3.3" } }, "Umbraco.Cms.PublishedCache.NuCache": { "type": "Transitive", - "resolved": "14.0.0-beta001", - "contentHash": "r7KDkEjVxeVmgNcLmS+D5MnHmxaEhHUUIdy3gIY9c/z/sGwmmiW2WRCquprVe+xLJh7yc7YsYuLSQQ0mO72RFw==", + "resolved": "14.0.0-beta002", + "contentHash": "vTEwrZLYKp8bs1/ipz72rCAjK5nVaUd1/9S6YxgWQy0pvCz2wxhJqwId1htUoeFUldiAz7DSgPeAwekUDKSCbg==", "dependencies": { "K4os.Compression.LZ4": "1.3.6", "MessagePack": "2.5.140", "Umbraco.CSharpTest.Net.Collections": "15.0.0", - "Umbraco.Cms.Infrastructure": "[14.0.0-beta001, 15.0.0)" + "Umbraco.Cms.Infrastructure": "[14.0.0-beta002, 15.0.0)" } }, "Umbraco.Cms.Web.Common": { "type": "Transitive", - "resolved": "14.0.0-beta001", - "contentHash": "Q1dP0q9dP1BmfWw/m69RkM0qyAhRW8ps48fPR68LJSs/wQIukOmvWlMxamyZ4lIq9fJXfzt+q88MI5aXIRCNhg==", + "resolved": "14.0.0-beta002", + "contentHash": "6qtcd2t3rQXyMuhn+1o1Kn+ydLp7aO31FjgU+cZo0NQlzxRRHqqj9VR6KCDi3jcR3Ofo1W7f77CQ4gJTzgsEbQ==", "dependencies": { "Asp.Versioning.Mvc": "8.0.0", "Asp.Versioning.Mvc.ApiExplorer": "8.0.0", @@ -2066,16 +2066,16 @@ "Serilog.AspNetCore": "8.0.1", "System.Net.Http": "4.3.4", "System.Text.RegularExpressions": "4.3.1", - "Umbraco.Cms.Examine.Lucene": "[14.0.0-beta001, 15.0.0)", - "Umbraco.Cms.PublishedCache.NuCache": "[14.0.0-beta001, 15.0.0)" + "Umbraco.Cms.Examine.Lucene": "[14.0.0-beta002, 15.0.0)", + "Umbraco.Cms.PublishedCache.NuCache": "[14.0.0-beta002, 15.0.0)" } }, "Umbraco.Cms.Web.Website": { "type": "Transitive", - "resolved": "14.0.0-beta001", - "contentHash": "tP4eueXTCDtdl0DqMNMaXFSx92IFsrndHPLdnxlJc91LVEnr52Q9bhb1gqzsQJx1Lx3Z28lXJZbfk94PBT9gSg==", + "resolved": "14.0.0-beta002", + "contentHash": "Q8wjqSaog8may4xuLhjDAaXvR7ZZSBRqxxqHRKXwPCWtpzSwzvRzLpcYX49n7/GJl+7fKeNNJ2fXSQUjWRUFGQ==", "dependencies": { - "Umbraco.Cms.Web.Common": "[14.0.0-beta001, 15.0.0)" + "Umbraco.Cms.Web.Common": "[14.0.0-beta002, 15.0.0)" } }, "Umbraco.CSharpTest.Net.Collections": { @@ -2099,7 +2099,7 @@ "usync.core": { "type": "Project", "dependencies": { - "Umbraco.Cms.Web.Website": "[14.0.0-beta001, )" + "Umbraco.Cms.Web.Website": "[14.0.0-beta002, )" } } } diff --git a/uSync.Tests/appsettings-schema.Umbraco.Cms.json b/uSync.Tests/appsettings-schema.Umbraco.Cms.json index 5074b628..5d3a14df 100644 --- a/uSync.Tests/appsettings-schema.Umbraco.Cms.json +++ b/uSync.Tests/appsettings-schema.Umbraco.Cms.json @@ -54,9 +54,6 @@ "Indexing": { "$ref": "#/definitions/IndexingSettings" }, - "KeepAlive": { - "$ref": "#/definitions/KeepAliveSettings" - }, "Logging": { "$ref": "#/definitions/LoggingSettings" }, @@ -1182,22 +1179,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.", diff --git a/uSync.Tests/uSync.Tests.csproj b/uSync.Tests/uSync.Tests.csproj index 669dfce7..6a0a0e4e 100644 --- a/uSync.Tests/uSync.Tests.csproj +++ b/uSync.Tests/uSync.Tests.csproj @@ -8,7 +8,7 @@ - + @@ -16,8 +16,8 @@ runtime; build; native; contentfiles; analyzers; buildtransitive - - + + diff --git a/uSync.Tests/umbraco-package-schema.json b/uSync.Tests/umbraco-package-schema.json index cb015591..af865b34 100644 --- a/uSync.Tests/umbraco-package-schema.json +++ b/uSync.Tests/umbraco-package-schema.json @@ -82,6 +82,9 @@ { "$ref": "#/definitions/UserPermissionConditionConfig" }, + { + "$ref": "#/definitions/UmbSectionUserPermissionConditionConfig" + }, { "$ref": "#/definitions/UmbConditionConfigBase" } @@ -2664,7 +2667,7 @@ "conditions": { "description": "Set the conditions for when the extension should be loaded", "items": { - "$ref": "#/definitions/UmbConditionConfigBase_1" + "$ref": "#/definitions/ConditionTypes" }, "type": "array" }, @@ -3385,7 +3388,10 @@ "$ref": "#/definitions/ManifestWorkspaceFooterApp" }, { - "$ref": "#/definitions/ManifestWorkspaceView" + "$ref": "#/definitions/ManifestWorkspaceView" + }, + { + "$ref": "#/definitions/ManifestWorkspaceViewContentTypeDesignEditorKind" }, { "$ref": "#/definitions/ManifestEntityUserPermission" @@ -3867,7 +3873,7 @@ ], "type": "object" }, - "ManifestWorkspaceView": { + "ManifestWorkspaceView": { "properties": { "alias": { "description": "The alias of the extension, ensure it is unique", @@ -3899,7 +3905,77 @@ ] }, "meta": { - "$ref": "#/definitions/MetaManifestWithView", + "$ref": "#/definitions/MetaWorkspaceView", + "description": "This contains properties specific to the type of extension" + }, + "name": { + "description": "The friendly name of the extension", + "type": "string" + }, + "overwrites": { + "anyOf": [ + { + "items": { + "type": "string" + }, + "type": "array" + }, + { + "type": "string" + } + ], + "description": "Define one or more extension aliases that this extension should overwrite." + }, + "type": { + "const": "workspaceView", + "description": "The type of extension such as dashboard etc...", + "type": "string" + }, + "weight": { + "description": "Extensions such as dashboards are ordered by weight with lower numbers being first in the list", + "type": "number" + } + }, + "required": [ + "alias", + "meta", + "name", + "type" + ], + "type": "object" + }, + "ManifestWorkspaceViewContentTypeDesignEditorKind": { + "properties": { + "alias": { + "description": "The alias of the extension, ensure it is unique", + "type": "string" + }, + "conditions": { + "description": "Set the conditions for when the extension should be loaded", + "items": { + "$ref": "#/definitions/ConditionTypes" + }, + "type": "array" + }, + "element": { + "description": "The file location of the element javascript file to load", + "type": "string" + }, + "elementName": { + "description": "The HTML web component name to use such as 'my-dashboard'\nNote it is NOT , just the element name.", + "type": "string" + }, + "js": { + "description": "The file location of the javascript file to load", + "type": "string" + }, + "kind": { + "const": "contentTypeDesignEditor", + "description": "The kind of the extension, used to group extensions together", + "type": "string" + }, + "meta": { + "$ref": "#/definitions/MetaWorkspaceViewContentTypeDesignEditorKind", "description": "This contains properties specific to the type of extension" }, "name": { @@ -3932,6 +4008,7 @@ }, "required": [ "alias", + "kind", "meta", "name", "type" @@ -4460,25 +4537,6 @@ ], "type": "object" }, - "MetaManifestWithView": { - "properties": { - "icon": { - "type": "string" - }, - "label": { - "type": "string" - }, - "pathname": { - "type": "string" - } - }, - "required": [ - "icon", - "label", - "pathname" - ], - "type": "object" - }, "MetaMenuItem": { "properties": { "entityType": { @@ -4786,6 +4844,47 @@ "MetaWorkspaceActionMenuItem": { "type": "object" }, + "MetaWorkspaceView": { + "properties": { + "icon": { + "type": "string" + }, + "label": { + "type": "string" + }, + "pathname": { + "type": "string" + } + }, + "required": [ + "icon", + "label", + "pathname" + ], + "type": "object" + }, + "MetaWorkspaceViewContentTypeDesignEditorKind": { + "properties": { + "compositionRepositoryAlias": { + "type": "string" + }, + "icon": { + "type": "string" + }, + "label": { + "type": "string" + }, + "pathname": { + "type": "string" + } + }, + "required": [ + "icon", + "label", + "pathname" + ], + "type": "object" + }, "PropertyEditorSettings": { "properties": { "defaultData": { @@ -4929,6 +5028,18 @@ ], "type": "object" }, + "UmbConditionConfigBase<\"Umb.Condition.SectionUserPermission\">": { + "properties": { + "alias": { + "const": "Umb.Condition.SectionUserPermission", + "type": "string" + } + }, + "required": [ + "alias" + ], + "type": "object" + }, "UmbConditionConfigBase<\"Umb.Condition.Switch\">": { "properties": { "alias": { @@ -5064,6 +5175,24 @@ }, "type": "object" }, + "UmbSectionUserPermissionConditionConfig": { + "allOf": [ + { + "$ref": "#/definitions/UmbConditionConfigBase<\"Umb.Condition.SectionUserPermission\">" + }, + { + "properties": { + "match": { + "type": "string" + } + }, + "required": [ + "match" + ], + "type": "object" + } + ] + }, "UmbracoPackageImportmap": { "properties": { "imports": { diff --git a/uSync/packages.lock.json b/uSync/packages.lock.json index 66c399c2..1760a5ab 100644 --- a/uSync/packages.lock.json +++ b/uSync/packages.lock.json @@ -242,46 +242,46 @@ }, "Microsoft.AspNetCore.Authorization": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "OGIGJMnlWvQgcweHcv1Mq/P24Zx/brUHeEdD05NzqkSXmQSnFomTvVyCuBtCXT4JPfv2m70y1RSocmd9bIbJRg==", + "resolved": "8.0.3", + "contentHash": "9Nic17acgZbysUlhGc+TEd9F8jI01kC6+V31sC7/xI5v2OSWGL8NhdYaB/Iu4KnDRoQEolg6qvepGsVfeYpIYA==", "dependencies": { - "Microsoft.AspNetCore.Metadata": "8.0.0", - "Microsoft.Extensions.Logging.Abstractions": "8.0.0", - "Microsoft.Extensions.Options": "8.0.0" + "Microsoft.AspNetCore.Metadata": "8.0.3", + "Microsoft.Extensions.Logging.Abstractions": "8.0.1", + "Microsoft.Extensions.Options": "8.0.2" } }, "Microsoft.AspNetCore.Components": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "kqspqWo3lT+rrSd39kvrV7SZYl0znYZQbQ8SJaHjDA8ffMPV6BkfVe0i6LvxRPwq/agwSWdIDq2j4x+78Frypg==", + "resolved": "8.0.3", + "contentHash": "q1Da8sfxG+B+BSYpc/3RKNEdzGcLbDTXkTUqekY65kXMMVCTqTAQ0Zs4csmB7FNVTFSjwaw1dGMFD0bQ+erlBw==", "dependencies": { - "Microsoft.AspNetCore.Authorization": "8.0.0", - "Microsoft.AspNetCore.Components.Analyzers": "8.0.0" + "Microsoft.AspNetCore.Authorization": "8.0.3", + "Microsoft.AspNetCore.Components.Analyzers": "8.0.3" } }, "Microsoft.AspNetCore.Components.Analyzers": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "lJMa9kQDw3vkqcMMbuicIpyax7QH6imQFbLRzVqJzrGs5LN954IPaJVkDzRCEXFVAN24Cml6g4mEF3b0D7Oa+Q==" + "resolved": "8.0.3", + "contentHash": "iERLuYM+YFI/K1jkinr1YeAkJYHUcijPiPCKgmgs2ZhJLqiIVJRT08vUtIsfhiFtGiI5MIzK0R1BZHyS3yAQng==" }, "Microsoft.AspNetCore.Components.Forms": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "iiYB/7Sl/vTURO4EiTUCmfIXujlJOl+Gh7nknCFhvFQ+kKMFFXYcrszYwLN9aQSolpswc/A9a78KL59/UIezig==", + "resolved": "8.0.3", + "contentHash": "OxY5NDmePnn6FMb+Fum57YL7LCHk3u2Wg0qSln3uZSayo+oIxYuoGnqH2dUMp1P5vOPfq17NKCIIEbxfU2dirQ==", "dependencies": { - "Microsoft.AspNetCore.Components": "8.0.0" + "Microsoft.AspNetCore.Components": "8.0.3" } }, "Microsoft.AspNetCore.Components.Web": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "aokUKvFoNqxR6bf0+iKrDfQ79OLHWYn5UGYp5MU65/il1vuRK7MAF18oGj7QgiZJUu3cMAZjCFkHbsWLhQxCsA==", + "resolved": "8.0.3", + "contentHash": "bHWJiz/JhjptK3iYzha0Rm73chjFcbMAOD9DdDq2tn1rp4rQa/K7O/zdnZpSYAT3nI33Q0aY6ts6t0PUVu5hCA==", "dependencies": { - "Microsoft.AspNetCore.Components": "8.0.0", - "Microsoft.AspNetCore.Components.Forms": "8.0.0", + "Microsoft.AspNetCore.Components": "8.0.3", + "Microsoft.AspNetCore.Components.Forms": "8.0.3", "Microsoft.Extensions.DependencyInjection": "8.0.0", "Microsoft.Extensions.Primitives": "8.0.0", - "Microsoft.JSInterop": "8.0.0", + "Microsoft.JSInterop": "8.0.3", "System.IO.Pipelines": "8.0.0" } }, @@ -372,8 +372,8 @@ }, "Microsoft.AspNetCore.Metadata": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "OmuSztiZMitRTYlbMNDkBk3BinSsVcOApSNBAsrw+KYNJh6ALarPhWLlKdtvMgrKzpyCY06xtLAjTmQLURHSlQ==" + "resolved": "8.0.3", + "contentHash": "MAdmICjtSckGDutLRMydRI0pvBcGw/WoC4UC+hZ999idVW96l5iJlhyrtakgYkF5Rp0ekNVNWA+onP2gJZUkpw==" }, "Microsoft.AspNetCore.Mvc.Razor.Extensions": { "type": "Transitive", @@ -517,8 +517,8 @@ }, "Microsoft.Extensions.DependencyInjection.Abstractions": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "cjWrLkJXK0rs4zofsK4bSdg+jhDLTaxrkXu4gS6Y7MAlCvRyNNgwY/lJi5RDlQOnSZweHqoyvgvbdvQsRIW+hg==" + "resolved": "8.0.1", + "contentHash": "fGLiCRLMYd00JYpClraLjJTNKLmMJPnqxMaiRzEBIIvevlzxz33mXy39Lkd48hu1G+N21S7QpaO5ZzKsI6FRuA==" }, "Microsoft.Extensions.DependencyModel": { "type": "Transitive", @@ -647,16 +647,16 @@ }, "Microsoft.Extensions.Logging.Abstractions": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "arDBqTgFCyS0EvRV7O3MZturChstm50OJ0y9bDJvAcmEPJm0FFpFyjU/JLYyStNGGey081DvnQYlncNX5SJJGA==", + "resolved": "8.0.1", + "contentHash": "RIFgaqoaINxkM2KTOw72dmilDmTrYA0ns2KW4lDz4gZ2+o6IQ894CzmdL3StM2oh7QQq44nCWiqKqc4qUI9Jmg==", "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0" + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.1" } }, "Microsoft.Extensions.Options": { "type": "Transitive", - "resolved": "8.0.1", - "contentHash": "wmpp+BSU3oGifaev6Z9rrlwHoITLFfpVOSbgBrOXjkbJSCXnZVCsoRGE5c3fJFI4VlNgnNkNlI9y+5jC4fmOEA==", + "resolved": "8.0.2", + "contentHash": "dWGKvhFybsaZpGmzkGCbNNwBD1rVlWzrZKANLW/CcbFJpCEceMCGzT7zZwHOGBCbwM0SzBuceMj5HN1LKV1QqA==", "dependencies": { "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", "Microsoft.Extensions.Primitives": "8.0.0" @@ -728,8 +728,8 @@ }, "Microsoft.JSInterop": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "qQqASbHxWIddssdEBKUQ/49j21SEstiho6VAepPQa9eISLCBCE6wq0m3YaB6cpdF5U+AWX5F3FvDfmssql3xtw==" + "resolved": "8.0.3", + "contentHash": "Oi21Fa7KubCzafwXb2IOdSGg24+/ylYGwrJgAYdWmgXBj04Oj/1b8vr9hrcoFKjQ6K18ryHYh35ZO/CCIEhuzg==" }, "Microsoft.NET.StringTools": { "type": "Transitive", @@ -2269,33 +2269,33 @@ }, "Umbraco.Cms.Api.Common": { "type": "Transitive", - "resolved": "14.0.0-beta001", - "contentHash": "bpbf97stWqg5jzCDJEaGzkWqTJO/mRz3jzVI2iA/b4H7+/M85OIZlJvZ46zBXNl0gGlke4JIIFCblIgkrGyq/Q==", + "resolved": "14.0.0-beta002", + "contentHash": "UbMuy/G4WLOpB/GFS7rlRM9JyY3B6hb3CFb5vqIVhvZBVBBv0HQUhYKeE1Pzlmk0X2op7AIBZtRx5nioAA7e9Q==", "dependencies": { "Asp.Versioning.Mvc": "8.0.0", "Asp.Versioning.Mvc.ApiExplorer": "8.0.0", "OpenIddict.Abstractions": "4.10.1", "OpenIddict.AspNetCore": "4.10.1", "Swashbuckle.AspNetCore": "6.5.0", - "Umbraco.Cms.Core": "[14.0.0-beta001, 15.0.0)", - "Umbraco.Cms.Web.Common": "[14.0.0-beta001, 15.0.0)" + "Umbraco.Cms.Core": "[14.0.0-beta002, 15.0.0)", + "Umbraco.Cms.Web.Common": "[14.0.0-beta002, 15.0.0)" } }, "Umbraco.Cms.Api.Management": { "type": "Transitive", - "resolved": "14.0.0-beta001", - "contentHash": "NUc5WZ/+COvgED4or1PDT1B7BvvrC1KLwZ9EhHHDE2+VTFkp6uH77P90mEhSqMyl1oq3Db/uYrbUwOpeRCncLw==", + "resolved": "14.0.0-beta002", + "contentHash": "fOQJO8V2pTCyk6e86RKK0jceB7I5pXU88fteVXE0sK+a+QRUIksaZhMxFXwnHzg/mW/lUmint3wcr7ayMhdxtQ==", "dependencies": { "JsonPatch.Net": "2.1.0", "Swashbuckle.AspNetCore": "6.5.0", - "Umbraco.Cms.Api.Common": "[14.0.0-beta001, 15.0.0)", - "Umbraco.Cms.Infrastructure": "[14.0.0-beta001, 15.0.0)" + "Umbraco.Cms.Api.Common": "[14.0.0-beta002, 15.0.0)", + "Umbraco.Cms.Infrastructure": "[14.0.0-beta002, 15.0.0)" } }, "Umbraco.Cms.Core": { "type": "Transitive", - "resolved": "14.0.0-beta001", - "contentHash": "W+GVz5RhAntIV40cQ6xifO/DWvfP1PopHoomqwgrI214aMajIWTEc64i+Lkd+lpdDCmk2bnDiyIt/sx7mI03IQ==", + "resolved": "14.0.0-beta002", + "contentHash": "tqx3GZeHRtbDHOd1dzxzkt6cvpaDbn3PPQk0s+8bhPItqT+riUuWEistPz9G3KMSe+daCSM5U+YY1++2CGx0AA==", "dependencies": { "Microsoft.Extensions.Caching.Abstractions": "8.0.0", "Microsoft.Extensions.Caching.Memory": "8.0.0", @@ -2312,18 +2312,18 @@ }, "Umbraco.Cms.Examine.Lucene": { "type": "Transitive", - "resolved": "14.0.0-beta001", - "contentHash": "DDNsvIMKH3w41Ml8ZFHNq3eGbx51jo9rrfpEfZ2Zak/qhtCdf8CotV4Ic13XHvxyx4reIseekEUuL1nVnXhbcg==", + "resolved": "14.0.0-beta002", + "contentHash": "DX2mWTcaCIyFTEeEsV44Zmv2au/W+CNRY3xA/SSHEikcnKn4dptebBy4bChoOlv+OFWSUYFR5+TW/jhYZKlmCw==", "dependencies": { "Examine": "3.2.0", "System.Security.Cryptography.Xml": "8.0.0", - "Umbraco.Cms.Infrastructure": "[14.0.0-beta001, 15.0.0)" + "Umbraco.Cms.Infrastructure": "[14.0.0-beta002, 15.0.0)" } }, "Umbraco.Cms.Infrastructure": { "type": "Transitive", - "resolved": "14.0.0-beta001", - "contentHash": "uO6pwXe49pTCJoPFvS0rB2WBKXDF7mdJzX2z2jeHbwqHd9oZiNOo+mveLjwa1O/uPiSX9M+EerUpzgXzXDJlHQ==", + "resolved": "14.0.0-beta002", + "contentHash": "/F02wd35zWNpOf2YGmd/PtVA7JGmppbu+bhPx9YPQoWrx66j4Z5giCj7wTZKu+FVHIUWLBm1W/9I/Ktk3z0+rw==", "dependencies": { "Examine.Core": "3.2.0", "HtmlAgilityPack": "1.11.57", @@ -2349,25 +2349,25 @@ "Serilog.Sinks.Async": "1.5.0", "Serilog.Sinks.File": "5.0.0", "Serilog.Sinks.Map": "1.0.2", - "Umbraco.Cms.Core": "[14.0.0-beta001, 15.0.0)", + "Umbraco.Cms.Core": "[14.0.0-beta002, 15.0.0)", "ncrontab": "3.3.3" } }, "Umbraco.Cms.PublishedCache.NuCache": { "type": "Transitive", - "resolved": "14.0.0-beta001", - "contentHash": "r7KDkEjVxeVmgNcLmS+D5MnHmxaEhHUUIdy3gIY9c/z/sGwmmiW2WRCquprVe+xLJh7yc7YsYuLSQQ0mO72RFw==", + "resolved": "14.0.0-beta002", + "contentHash": "vTEwrZLYKp8bs1/ipz72rCAjK5nVaUd1/9S6YxgWQy0pvCz2wxhJqwId1htUoeFUldiAz7DSgPeAwekUDKSCbg==", "dependencies": { "K4os.Compression.LZ4": "1.3.6", "MessagePack": "2.5.140", "Umbraco.CSharpTest.Net.Collections": "15.0.0", - "Umbraco.Cms.Infrastructure": "[14.0.0-beta001, 15.0.0)" + "Umbraco.Cms.Infrastructure": "[14.0.0-beta002, 15.0.0)" } }, "Umbraco.Cms.Web.Common": { "type": "Transitive", - "resolved": "14.0.0-beta001", - "contentHash": "Q1dP0q9dP1BmfWw/m69RkM0qyAhRW8ps48fPR68LJSs/wQIukOmvWlMxamyZ4lIq9fJXfzt+q88MI5aXIRCNhg==", + "resolved": "14.0.0-beta002", + "contentHash": "6qtcd2t3rQXyMuhn+1o1Kn+ydLp7aO31FjgU+cZo0NQlzxRRHqqj9VR6KCDi3jcR3Ofo1W7f77CQ4gJTzgsEbQ==", "dependencies": { "Asp.Versioning.Mvc": "8.0.0", "Asp.Versioning.Mvc.ApiExplorer": "8.0.0", @@ -2377,16 +2377,16 @@ "Serilog.AspNetCore": "8.0.1", "System.Net.Http": "4.3.4", "System.Text.RegularExpressions": "4.3.1", - "Umbraco.Cms.Examine.Lucene": "[14.0.0-beta001, 15.0.0)", - "Umbraco.Cms.PublishedCache.NuCache": "[14.0.0-beta001, 15.0.0)" + "Umbraco.Cms.Examine.Lucene": "[14.0.0-beta002, 15.0.0)", + "Umbraco.Cms.PublishedCache.NuCache": "[14.0.0-beta002, 15.0.0)" } }, "Umbraco.Cms.Web.Website": { "type": "Transitive", - "resolved": "14.0.0-beta001", - "contentHash": "tP4eueXTCDtdl0DqMNMaXFSx92IFsrndHPLdnxlJc91LVEnr52Q9bhb1gqzsQJx1Lx3Z28lXJZbfk94PBT9gSg==", + "resolved": "14.0.0-beta002", + "contentHash": "Q8wjqSaog8may4xuLhjDAaXvR7ZZSBRqxxqHRKXwPCWtpzSwzvRzLpcYX49n7/GJl+7fKeNNJ2fXSQUjWRUFGQ==", "dependencies": { - "Umbraco.Cms.Web.Common": "[14.0.0-beta001, 15.0.0)" + "Umbraco.Cms.Web.Common": "[14.0.0-beta002, 15.0.0)" } }, "Umbraco.CSharpTest.Net.Collections": { @@ -2404,8 +2404,8 @@ "usync.backoffice.management.api": { "type": "Project", "dependencies": { - "Microsoft.AspNetCore.Components.Web": "[8.0.0, )", - "Umbraco.Cms.Api.Management": "[14.0.0-beta001, )", + "Microsoft.AspNetCore.Components.Web": "[8.0.3, )", + "Umbraco.Cms.Api.Management": "[14.0.0-beta002, )", "uSync.BackOffice": "[14.0.0, )" } }, @@ -2424,7 +2424,7 @@ "usync.core": { "type": "Project", "dependencies": { - "Umbraco.Cms.Web.Website": "[14.0.0-beta001, )" + "Umbraco.Cms.Web.Website": "[14.0.0-beta002, )" } } }