Merge branch 'vx/feature/unicore' of https://github.com/umbraco/Umbraco-CMS into vx/feature/unicore

This commit is contained in:
Carole Rennie Logan
2019-05-20 16:06:21 +01:00
9 changed files with 1 additions and 12 deletions

View File

@@ -1,7 +1,4 @@
using Newtonsoft.Json;
using Umbraco.Core.Manifest;
namespace Umbraco.Core.Dashboards
namespace Umbraco.Core.Dashboards
{
/// <summary>
/// Represents an access rule.

View File

@@ -199,7 +199,6 @@
<Compile Include="Composing\HideFromTypeFinderAttribute.cs" />
<Compile Include="Composing\IBuilderCollection.cs" />
<Compile Include="Composing\ICollectionBuilder.cs" />
<Compile Include="Composing\IDiscoverable.cs" />
<Compile Include="Composing\IFactory.cs" />
<Compile Include="Composing\IRegister.cs" />
<Compile Include="Composing\LazyCollectionBuilderBase.cs" />
@@ -319,14 +318,7 @@
<Compile Include="Constants.cs" />
<Compile Include="RegisterExtensions.cs" />
<Compile Include="ContentVariationExtensions.cs" />
<Compile Include="Dashboards\AccessRule.cs" />
<Compile Include="Dashboards\AccessRuleType.cs" />
<Compile Include="Dashboards\DashboardSlim.cs" />
<Compile Include="Dashboards\IAccessRule.cs" />
<Compile Include="Dashboards\IDashboard.cs" />
<Compile Include="Dashboards\IDashboardSlim.cs" />
<Compile Include="Deploy\IDataTypeConfigurationConnector.cs" />
<Compile Include="DisposableObjectSlim.cs" />
<Compile Include="EnumExtensions.cs" />
<Compile Include="Events\CancellableEnumerableObjectEventArgs.cs" />
<Compile Include="Events\CancellableObjectEventArgsOfTEventObject.cs" />