From c007757564508cd94511ae2e408d3b3be474be65 Mon Sep 17 00:00:00 2001
From: Lars-Erik Aabech <lea@markedspartner.no>
Date: Mon, 20 May 2019 16:57:14 +0200
Subject: [PATCH 1/2] Moved code annotations

---
 .../CodeAnnotations/FriendlyNameAttribute.cs                   | 2 +-
 .../CodeAnnotations/UmbracoObjectTypeAttribute.cs              | 2 +-
 .../CodeAnnotations/UmbracoUdiTypeAttribute.cs                 | 2 +-
 src/Umbraco.Core/Umbraco.Core.csproj                           | 3 ---
 4 files changed, 3 insertions(+), 6 deletions(-)
 rename src/{Umbraco.Core => Umbraco.Abstractions}/CodeAnnotations/FriendlyNameAttribute.cs (94%)
 rename src/{Umbraco.Core => Umbraco.Abstractions}/CodeAnnotations/UmbracoObjectTypeAttribute.cs (92%)
 rename src/{Umbraco.Core => Umbraco.Abstractions}/CodeAnnotations/UmbracoUdiTypeAttribute.cs (85%)

diff --git a/src/Umbraco.Core/CodeAnnotations/FriendlyNameAttribute.cs b/src/Umbraco.Abstractions/CodeAnnotations/FriendlyNameAttribute.cs
similarity index 94%
rename from src/Umbraco.Core/CodeAnnotations/FriendlyNameAttribute.cs
rename to src/Umbraco.Abstractions/CodeAnnotations/FriendlyNameAttribute.cs
index 98ff64462f..218891c635 100644
--- a/src/Umbraco.Core/CodeAnnotations/FriendlyNameAttribute.cs
+++ b/src/Umbraco.Abstractions/CodeAnnotations/FriendlyNameAttribute.cs
@@ -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
diff --git a/src/Umbraco.Core/CodeAnnotations/UmbracoObjectTypeAttribute.cs b/src/Umbraco.Abstractions/CodeAnnotations/UmbracoObjectTypeAttribute.cs
similarity index 92%
rename from src/Umbraco.Core/CodeAnnotations/UmbracoObjectTypeAttribute.cs
rename to src/Umbraco.Abstractions/CodeAnnotations/UmbracoObjectTypeAttribute.cs
index 6805038b2f..e4fe2cd504 100644
--- a/src/Umbraco.Core/CodeAnnotations/UmbracoObjectTypeAttribute.cs
+++ b/src/Umbraco.Abstractions/CodeAnnotations/UmbracoObjectTypeAttribute.cs
@@ -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)
         {
diff --git a/src/Umbraco.Core/CodeAnnotations/UmbracoUdiTypeAttribute.cs b/src/Umbraco.Abstractions/CodeAnnotations/UmbracoUdiTypeAttribute.cs
similarity index 85%
rename from src/Umbraco.Core/CodeAnnotations/UmbracoUdiTypeAttribute.cs
rename to src/Umbraco.Abstractions/CodeAnnotations/UmbracoUdiTypeAttribute.cs
index 0666b68166..72af1d9a70 100644
--- a/src/Umbraco.Core/CodeAnnotations/UmbracoUdiTypeAttribute.cs
+++ b/src/Umbraco.Abstractions/CodeAnnotations/UmbracoUdiTypeAttribute.cs
@@ -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; }
 
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index d131442104..14831871c0 100755
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -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" />

From cad3e8a63535c9611a6c2350d309def4e8ac6685 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Mon, 20 May 2019 16:58:47 +0200
Subject: [PATCH 2/2] Moved MacroErrorBehaviour.cs

---
 .../Macros/MacroErrorBehaviour.cs                                | 0
 src/Umbraco.Core/Umbraco.Core.csproj                             | 1 -
 2 files changed, 1 deletion(-)
 rename src/{Umbraco.Core => Umbraco.Abstractions}/Macros/MacroErrorBehaviour.cs (100%)

diff --git a/src/Umbraco.Core/Macros/MacroErrorBehaviour.cs b/src/Umbraco.Abstractions/Macros/MacroErrorBehaviour.cs
similarity index 100%
rename from src/Umbraco.Core/Macros/MacroErrorBehaviour.cs
rename to src/Umbraco.Abstractions/Macros/MacroErrorBehaviour.cs
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index 5cbce8b4aa..057750ef00 100755
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -673,7 +673,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" />