diff --git a/src/SolutionInfo.cs b/src/SolutionInfo.cs
index 363677b826..a0d969c1b8 100644
--- a/src/SolutionInfo.cs
+++ b/src/SolutionInfo.cs
@@ -18,5 +18,5 @@ using System.Resources;
[assembly: AssemblyVersion("8.0.0")]
// these are FYI and changed automatically
-[assembly: AssemblyFileVersion("8.6.0")]
-[assembly: AssemblyInformationalVersion("8.6.0")]
+[assembly: AssemblyFileVersion("8.7.0")]
+[assembly: AssemblyInformationalVersion("8.7.0")]
diff --git a/src/Umbraco.ModelsBuilder.Embedded/ImplementPropertyTypeAttribute.cs b/src/Umbraco.ModelsBuilder.Embedded/ImplementPropertyTypeAttribute.cs
index 0359c49654..b7b2695a08 100644
--- a/src/Umbraco.ModelsBuilder.Embedded/ImplementPropertyTypeAttribute.cs
+++ b/src/Umbraco.ModelsBuilder.Embedded/ImplementPropertyTypeAttribute.cs
@@ -7,7 +7,7 @@ namespace Umbraco.ModelsBuilder.Embedded
///
/// And therefore it should not be generated.
[AttributeUsage(AttributeTargets.Property, AllowMultiple = false, Inherited = false)]
- public sealed class ImplementPropertyTypeAttribute : Attribute
+ public class ImplementPropertyTypeAttribute : Attribute
{
public ImplementPropertyTypeAttribute(string alias)
{
diff --git a/src/Umbraco.ModelsBuilder.Embedded/PublishedElementExtensions.cs b/src/Umbraco.ModelsBuilder.Embedded/PublishedElementExtensions.cs
index 29429ba74f..8a0a688942 100644
--- a/src/Umbraco.ModelsBuilder.Embedded/PublishedElementExtensions.cs
+++ b/src/Umbraco.ModelsBuilder.Embedded/PublishedElementExtensions.cs
@@ -17,7 +17,7 @@ namespace Umbraco.Web
///
/// Gets the value of a property.
///
- public static TValue Value(this TModel model, Expression> property, string culture = null, string segment = null, Fallback fallback = default, TValue defaultValue = default)
+ public static TValue ValueFor(this TModel model, Expression> property, string culture = null, string segment = null, Fallback fallback = default, TValue defaultValue = default)
where TModel : IPublishedElement
{
var alias = GetAlias(model, property);
@@ -45,7 +45,7 @@ namespace Umbraco.Web
var attribute = member.GetCustomAttribute();
if (attribute == null)
throw new InvalidOperationException("Property is not marked with ImplementPropertyType attribute.");
-
+
return attribute.Alias;
}
}
diff --git a/src/Umbraco.Web.UI.Client/package-lock.json b/src/Umbraco.Web.UI.Client/package-lock.json
index d69ef62f16..dd58b5ca18 100644
--- a/src/Umbraco.Web.UI.Client/package-lock.json
+++ b/src/Umbraco.Web.UI.Client/package-lock.json
@@ -1099,9 +1099,9 @@
"dev": true
},
"angular": {
- "version": "1.7.5",
- "resolved": "https://registry.npmjs.org/angular/-/angular-1.7.5.tgz",
- "integrity": "sha512-760183yxtGzni740IBTieNuWLtPNAoMqvmC0Z62UoU0I3nqk+VJuO3JbQAXOyvo3Oy/ZsdNQwrSTh/B0OQZjNw=="
+ "version": "1.7.9",
+ "resolved": "https://registry.npmjs.org/angular/-/angular-1.7.9.tgz",
+ "integrity": "sha512-5se7ZpcOtu0MBFlzGv5dsM1quQDoDeUTwZrWjGtTNA7O88cD8TEk5IEKCTDa3uECV9XnvKREVUr7du1ACiWGFQ=="
},
"angular-animate": {
"version": "1.7.5",
@@ -9324,9 +9324,9 @@
"dev": true
},
"nouislider": {
- "version": "14.0.2",
- "resolved": "https://registry.npmjs.org/nouislider/-/nouislider-14.0.2.tgz",
- "integrity": "sha512-N4AQStV4frh+XcLUwMI/hZpBP6tRboDE/4LZ7gzfxMVXFi/2J9URphnm40Ff4KEyrAVGSGaWApvljoMzTNWBlA=="
+ "version": "14.1.1",
+ "resolved": "https://registry.npmjs.org/nouislider/-/nouislider-14.1.1.tgz",
+ "integrity": "sha512-3/+Z/pTBoWoJf2YXSEWRmS27LW2XxOBmGEzkPyRzB/J6QvL+0mS3QwcQp0SmWhgO5CMzbSxPmb1lDDD4HP12bg=="
},
"now-and-later": {
"version": "2.0.1",
@@ -9338,9 +9338,9 @@
}
},
"npm": {
- "version": "6.12.0",
- "resolved": "https://registry.npmjs.org/npm/-/npm-6.12.0.tgz",
- "integrity": "sha512-juj5VkB3/k+PWbJUnXD7A/8oc8zLusDnK/sV9PybSalsbOVOTIp5vSE0rz5rQ7BsmUgQS47f/L2GYQnWXaKgnQ==",
+ "version": "6.13.6",
+ "resolved": "https://registry.npmjs.org/npm/-/npm-6.13.6.tgz",
+ "integrity": "sha512-NomC08kv7HIl1FOyLOe9Hp89kYsOsvx52huVIJ7i8hFW8Xp65lDwe/8wTIrh9q9SaQhA8hTrfXPh3BEL3TmMpw==",
"requires": {
"JSONStream": "^1.3.5",
"abbrev": "~1.1.1",
@@ -9348,12 +9348,12 @@
"ansistyles": "~0.1.3",
"aproba": "^2.0.0",
"archy": "~1.0.0",
- "bin-links": "^1.1.3",
+ "bin-links": "^1.1.6",
"bluebird": "^3.5.5",
"byte-size": "^5.0.1",
"cacache": "^12.0.3",
"call-limit": "^1.1.1",
- "chownr": "^1.1.2",
+ "chownr": "^1.1.3",
"ci-info": "^2.0.0",
"cli-columns": "^3.1.2",
"cli-table3": "^0.5.1",
@@ -9369,9 +9369,9 @@
"find-npm-prefix": "^1.0.2",
"fs-vacuum": "~1.2.10",
"fs-write-stream-atomic": "~1.0.10",
- "gentle-fs": "^2.2.1",
+ "gentle-fs": "^2.3.0",
"glob": "^7.1.4",
- "graceful-fs": "^4.2.2",
+ "graceful-fs": "^4.2.3",
"has-unicode": "~2.0.1",
"hosted-git-info": "^2.8.5",
"iferr": "^1.0.2",
@@ -9384,7 +9384,7 @@
"is-cidr": "^3.0.0",
"json-parse-better-errors": "^1.0.2",
"lazy-property": "~1.0.0",
- "libcipm": "^4.0.4",
+ "libcipm": "^4.0.7",
"libnpm": "^3.0.1",
"libnpmaccess": "^3.0.2",
"libnpmhook": "^5.0.3",
@@ -9418,25 +9418,25 @@
"npm-install-checks": "^3.0.2",
"npm-lifecycle": "^3.1.4",
"npm-package-arg": "^6.1.1",
- "npm-packlist": "^1.4.4",
+ "npm-packlist": "^1.4.7",
"npm-pick-manifest": "^3.0.2",
"npm-profile": "^4.0.2",
- "npm-registry-fetch": "^4.0.0",
+ "npm-registry-fetch": "^4.0.2",
"npm-user-validate": "~1.0.0",
"npmlog": "~4.1.2",
"once": "~1.4.0",
"opener": "^1.5.1",
"osenv": "^0.1.5",
- "pacote": "^9.5.8",
+ "pacote": "^9.5.12",
"path-is-inside": "~1.0.2",
"promise-inflight": "~1.0.1",
"qrcode-terminal": "^0.12.0",
"query-string": "^6.8.2",
"qw": "~1.0.1",
"read": "~1.0.7",
- "read-cmd-shim": "^1.0.4",
+ "read-cmd-shim": "^1.0.5",
"read-installed": "~4.0.3",
- "read-package-json": "^2.1.0",
+ "read-package-json": "^2.1.1",
"read-package-tree": "^5.3.1",
"readable-stream": "^3.4.0",
"readdir-scoped-modules": "^1.1.0",
@@ -9451,7 +9451,7 @@
"sorted-union-stream": "~2.1.3",
"ssri": "^6.0.1",
"stringify-package": "^1.0.1",
- "tar": "^4.4.12",
+ "tar": "^4.4.13",
"text-table": "~0.2.0",
"tiny-relative-date": "^1.3.0",
"uid-number": "0.0.6",
@@ -9459,7 +9459,7 @@
"unique-filename": "^1.1.1",
"unpipe": "~1.0.0",
"update-notifier": "^2.5.0",
- "uuid": "^3.3.2",
+ "uuid": "^3.3.3",
"validate-npm-package-license": "^3.0.4",
"validate-npm-package-name": "~3.0.0",
"which": "^1.3.1",
@@ -9607,13 +9607,14 @@
}
},
"bin-links": {
- "version": "1.1.3",
+ "version": "1.1.6",
"bundled": true,
"requires": {
"bluebird": "^3.5.3",
"cmd-shim": "^3.0.0",
- "gentle-fs": "^2.0.1",
+ "gentle-fs": "^2.3.0",
"graceful-fs": "^4.1.15",
+ "npm-normalize-package-bin": "^1.0.0",
"write-file-atomic": "^2.3.0"
}
},
@@ -9705,7 +9706,7 @@
}
},
"chownr": {
- "version": "1.1.2",
+ "version": "1.1.3",
"bundled": true
},
"ci-info": {
@@ -10266,7 +10267,7 @@
},
"dependencies": {
"minipass": {
- "version": "2.8.6",
+ "version": "2.9.0",
"bundled": true,
"requires": {
"safe-buffer": "^5.1.2",
@@ -10362,11 +10363,12 @@
"bundled": true
},
"gentle-fs": {
- "version": "2.2.1",
+ "version": "2.3.0",
"bundled": true,
"requires": {
"aproba": "^1.1.2",
"chownr": "^1.1.2",
+ "cmd-shim": "^3.0.3",
"fs-vacuum": "^1.2.10",
"graceful-fs": "^4.1.11",
"iferr": "^0.1.5",
@@ -10448,7 +10450,7 @@
}
},
"graceful-fs": {
- "version": "4.2.2",
+ "version": "4.2.3",
"bundled": true
},
"har-schema": {
@@ -10508,7 +10510,7 @@
}
},
"https-proxy-agent": {
- "version": "2.2.2",
+ "version": "2.2.4",
"bundled": true,
"requires": {
"agent-base": "^4.3.0",
@@ -10534,7 +10536,7 @@
"bundled": true
},
"ignore-walk": {
- "version": "3.0.1",
+ "version": "3.0.3",
"bundled": true,
"requires": {
"minimatch": "^3.0.4"
@@ -10748,7 +10750,7 @@
}
},
"libcipm": {
- "version": "4.0.4",
+ "version": "4.0.7",
"bundled": true,
"requires": {
"bin-links": "^1.1.2",
@@ -11017,14 +11019,14 @@
}
},
"make-fetch-happen": {
- "version": "5.0.0",
+ "version": "5.0.2",
"bundled": true,
"requires": {
"agentkeepalive": "^3.4.1",
"cacache": "^12.0.0",
"http-cache-semantics": "^3.8.1",
"http-proxy-agent": "^2.1.0",
- "https-proxy-agent": "^2.2.1",
+ "https-proxy-agent": "^2.2.3",
"lru-cache": "^5.1.1",
"mississippi": "^3.0.0",
"node-fetch-npm": "^2.0.2",
@@ -11070,27 +11072,23 @@
"version": "0.0.8",
"bundled": true
},
- "minipass": {
- "version": "2.3.3",
+ "minizlib": {
+ "version": "1.3.3",
"bundled": true,
"requires": {
- "safe-buffer": "^5.1.2",
- "yallist": "^3.0.0"
+ "minipass": "^2.9.0"
},
"dependencies": {
- "yallist": {
- "version": "3.0.2",
- "bundled": true
+ "minipass": {
+ "version": "2.9.0",
+ "bundled": true,
+ "requires": {
+ "safe-buffer": "^5.1.2",
+ "yallist": "^3.0.0"
+ }
}
}
},
- "minizlib": {
- "version": "1.2.2",
- "bundled": true,
- "requires": {
- "minipass": "^2.2.1"
- }
- },
"mississippi": {
"version": "3.0.0",
"bundled": true,
@@ -11215,8 +11213,11 @@
}
},
"npm-bundled": {
- "version": "1.0.6",
- "bundled": true
+ "version": "1.1.1",
+ "bundled": true,
+ "requires": {
+ "npm-normalize-package-bin": "^1.0.1"
+ }
},
"npm-cache-filename": {
"version": "1.0.2",
@@ -11247,6 +11248,10 @@
"version": "1.2.1",
"bundled": true
},
+ "npm-normalize-package-bin": {
+ "version": "1.0.1",
+ "bundled": true
+ },
"npm-package-arg": {
"version": "6.1.1",
"bundled": true,
@@ -11258,7 +11263,7 @@
}
},
"npm-packlist": {
- "version": "1.4.4",
+ "version": "1.4.7",
"bundled": true,
"requires": {
"ignore-walk": "^3.0.1",
@@ -11284,7 +11289,7 @@
}
},
"npm-registry-fetch": {
- "version": "4.0.0",
+ "version": "4.0.2",
"bundled": true,
"requires": {
"JSONStream": "^1.3.4",
@@ -11292,7 +11297,14 @@
"figgy-pudding": "^3.4.1",
"lru-cache": "^5.1.1",
"make-fetch-happen": "^5.0.0",
- "npm-package-arg": "^6.1.0"
+ "npm-package-arg": "^6.1.0",
+ "safe-buffer": "^5.2.0"
+ },
+ "dependencies": {
+ "safe-buffer": {
+ "version": "5.2.0",
+ "bundled": true
+ }
}
},
"npm-run-path": {
@@ -11409,7 +11421,7 @@
}
},
"pacote": {
- "version": "9.5.8",
+ "version": "9.5.12",
"bundled": true,
"requires": {
"bluebird": "^3.5.3",
@@ -11426,6 +11438,7 @@
"mississippi": "^3.0.0",
"mkdirp": "^0.5.1",
"normalize-package-data": "^2.4.0",
+ "npm-normalize-package-bin": "^1.0.0",
"npm-package-arg": "^6.1.0",
"npm-packlist": "^1.1.12",
"npm-pick-manifest": "^3.0.0",
@@ -11444,7 +11457,7 @@
},
"dependencies": {
"minipass": {
- "version": "2.3.5",
+ "version": "2.9.0",
"bundled": true,
"requires": {
"safe-buffer": "^5.1.2",
@@ -11644,7 +11657,7 @@
}
},
"read-cmd-shim": {
- "version": "1.0.4",
+ "version": "1.0.5",
"bundled": true,
"requires": {
"graceful-fs": "^4.1.2"
@@ -11664,14 +11677,14 @@
}
},
"read-package-json": {
- "version": "2.1.0",
+ "version": "2.1.1",
"bundled": true,
"requires": {
"glob": "^7.1.1",
"graceful-fs": "^4.1.2",
"json-parse-better-errors": "^1.0.1",
"normalize-package-data": "^2.0.0",
- "slash": "^1.0.0"
+ "npm-normalize-package-bin": "^1.0.0"
}
},
"read-package-tree": {
@@ -11824,24 +11837,20 @@
"version": "3.0.2",
"bundled": true
},
- "slash": {
- "version": "1.0.0",
- "bundled": true
- },
"slide": {
"version": "1.1.6",
"bundled": true
},
"smart-buffer": {
- "version": "4.0.2",
+ "version": "4.1.0",
"bundled": true
},
"socks": {
- "version": "2.3.2",
+ "version": "2.3.3",
"bundled": true,
"requires": {
- "ip": "^1.1.5",
- "smart-buffer": "4.0.2"
+ "ip": "1.1.5",
+ "smart-buffer": "^4.1.0"
}
},
"socks-proxy-agent": {
@@ -12056,7 +12065,7 @@
}
},
"tar": {
- "version": "4.4.12",
+ "version": "4.4.13",
"bundled": true,
"requires": {
"chownr": "^1.1.1",
@@ -12069,7 +12078,7 @@
},
"dependencies": {
"minipass": {
- "version": "2.8.6",
+ "version": "2.9.0",
"bundled": true,
"requires": {
"safe-buffer": "^5.1.2",
@@ -12231,7 +12240,7 @@
}
},
"uuid": {
- "version": "3.3.2",
+ "version": "3.3.3",
"bundled": true
},
"validate-npm-package-license": {
diff --git a/src/Umbraco.Web.UI.Client/package.json b/src/Umbraco.Web.UI.Client/package.json
index 0f02aba5e2..beff2b45d1 100644
--- a/src/Umbraco.Web.UI.Client/package.json
+++ b/src/Umbraco.Web.UI.Client/package.json
@@ -11,7 +11,7 @@
},
"dependencies": {
"ace-builds": "1.4.2",
- "angular": "1.7.5",
+ "angular": "1.7.9",
"angular-animate": "1.7.5",
"angular-aria": "1.7.5",
"angular-chart.js": "^1.1.1",
@@ -39,7 +39,7 @@
"moment": "2.22.2",
"ng-file-upload": "12.2.13",
"nouislider": "14.1.1",
- "npm": "6.12.0",
+ "npm": "6.13.6",
"signalr": "2.4.0",
"spectrum-colorpicker": "1.8.0",
"tinymce": "4.9.2",
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index 8f0db76c1d..9914528e58 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -345,9 +345,9 @@
False
True
- 8600
+ 8700
/
- http://localhost:8600
+ http://localhost:8700
False
False