Fixed unit tests. Cleanup...

Author: macmade

ColorSetKit/ColorSet.cs

@@ -45,7 +45,9 @@ public static ColorSet Shared
                 {
                     if( SharedInstance == null )
                     {
-                        if( !( Assembly.GetEntryAssembly() is Assembly assembly ) )
+                        Assembly assembly = Assembly.GetEntryAssembly() ?? Assembly.GetExecutingAssembly();
+
+                        if( assembly == null )
                         {
                             throw new ApplicationException( "Cannot get entry assembly" );
                         }
@@ -65,14 +67,7 @@ public static ColorSet Shared
                         {
                             System.Resources.ResourceManager manager = new System.Resources.ResourceManager( name.Name + ".Properties.Resources", assembly );
 
-                            if( !( manager.GetObject( "Colors" ) is byte[] data ) || data.Length == 0 )
-                            {
-                                SharedInstance = new ColorSet();
-                            }
-                            else
-                            {
-                                SharedInstance = new ColorSet( new Data( data ) );
-                            }
+                            SharedInstance = !( manager.GetObject( "Colors" ) is byte[] data ) || data.Length == 0 ? new ColorSet() : new ColorSet( new Data( data ) );
                         }
                     }
 
@@ -166,10 +161,7 @@ public ColorSet( Data data )
 
         public ColorPair this[ string key ]
         {
-            get
-            {
-                return this.ColorNamed( key );
-            }
+            get => this.ColorNamed( key );
         }
 
         public ColorPair ColorNamed( string name )

ColorSetKit/Data.cs

@@ -34,10 +34,7 @@ public partial class Data
     {
         public ulong Count
         {
-            get
-            {
-                return ( ulong )( this.Bytes.Count );
-            }
+            get => ( ulong )( this.Bytes.Count );
         }
 
         private List< byte > Bytes