yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Carole Rennie Logan
2019-05-20 15:59:27 +01:00
parent 9bac6a4074 cab1462d51
commit 709babc95b
5 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Core/CodeAnnotations/FriendlyNameAttribute.cs → src/Umbraco.Abstractions/CodeAnnotations/FriendlyNameAttribute.cs
View File

@@ -6,7 +6,7 @@ namespace Umbraco.Core.CodeAnnotations
/// Attribute to add a Friendly Name string with an UmbracoObjectType enum value
/// </summary>
[AttributeUsage(AttributeTargets.All, AllowMultiple = false, Inherited = false)]
internal class FriendlyNameAttribute : Attribute
public class FriendlyNameAttribute : Attribute
{
/// <summary>
/// friendly name value

2
src/Umbraco.Core/CodeAnnotations/UmbracoObjectTypeAttribute.cs → src/Umbraco.Abstractions/CodeAnnotations/UmbracoObjectTypeAttribute.cs
View File

@@ -6,7 +6,7 @@ namespace Umbraco.Core.CodeAnnotations
/// Attribute to associate a GUID string and Type with an UmbracoObjectType Enum value
/// </summary>
[AttributeUsage(AttributeTargets.Field, AllowMultiple = false, Inherited = false)]
internal class UmbracoObjectTypeAttribute : Attribute
public class UmbracoObjectTypeAttribute : Attribute
{
public UmbracoObjectTypeAttribute(string objectId)
{

2
src/Umbraco.Core/CodeAnnotations/UmbracoUdiTypeAttribute.cs → src/Umbraco.Abstractions/CodeAnnotations/UmbracoUdiTypeAttribute.cs
View File

@@ -3,7 +3,7 @@
namespace Umbraco.Core.CodeAnnotations
{
[AttributeUsage(AttributeTargets.Field, AllowMultiple = false, Inherited = false)]
internal class UmbracoUdiTypeAttribute : Attribute
public class UmbracoUdiTypeAttribute : Attribute
{
public string UdiType { get; private set; }

0
src/Umbraco.Core/Macros/MacroErrorBehaviour.cs → src/Umbraco.Abstractions/Macros/MacroErrorBehaviour.cs
View File

4
src/Umbraco.Core/Umbraco.Core.csproj
View File

@@ -151,9 +151,6 @@
<Compile Include="Cache\SingleItemsOnlyRepositoryCachePolicy.cs" />
<Compile Include="Cache\DictionaryAppCache.cs" />
<Compile Include="Cache\TypedCacheRefresherBase.cs" />
<Compile Include="CodeAnnotations\FriendlyNameAttribute.cs" />
<Compile Include="CodeAnnotations\UmbracoObjectTypeAttribute.cs" />
<Compile Include="CodeAnnotations\UmbracoUdiTypeAttribute.cs" />
<Compile Include="Collections\CompositeNStringNStringKey.cs" />
<Compile Include="Collections\CompositeStringStringKey.cs" />
<Compile Include="Collections\CompositeIntStringKey.cs" />
@@ -672,7 +669,6 @@
<Compile Include="Logging\ProfilerExtensions.cs" />
<Compile Include="Logging\ProfilingLogger.cs" />
<Compile Include="Logging\VoidProfiler.cs" />
<Compile Include="Macros\MacroErrorBehaviour.cs" />
<Compile Include="MainDom.cs" />
<Compile Include="Manifest\ManifestParser.cs" />
<Compile Include="Manifest\ValueValidatorConverter.cs" />