Merge remote-tracking branch 'origin/MetLife_v5.4' into MetLife_v5.4.2

# Conflicts:
#	CHANGELOG.md
#	ICD.Common.Utils/Properties/AssemblyInfo.cs
This commit is contained in:
Chris Cameron
2019-05-24 09:59:07 -04:00
4 changed files with 12 additions and 1 deletions

View File

@@ -5,7 +5,7 @@ namespace ICD.Common.Utils.Attributes
/// <summary>
/// AbstractIcdAttribute is the base class for all ICD attributes.
/// </summary>
public abstract class AbstractIcdAttribute : Attribute
public abstract class AbstractIcdAttribute : Attribute, IIcdAttribute
{
}
}

View File

@@ -0,0 +1,6 @@
namespace ICD.Common.Utils.Attributes
{
public interface IIcdAttribute
{
}
}

View File

@@ -75,6 +75,7 @@
</ItemGroup>
<ItemGroup>
<Compile Include="Attributes\AbstractIcdAttribute.cs" />
<Compile Include="Attributes\IIcdAttribute.cs" />
<Compile Include="Attributes\RangeAttribute.cs" />
<Compile Include="Collections\BiDictionary.cs" />
<Compile Include="Collections\AsyncEventQueue.cs" />