.editorconfig

@@ -7,9 +7,9 @@ root = true
 #### Core EditorConfig Options ####
 
 # Indentation and spacing
-indent_size = 3
+indent_size = 4
 indent_style = tab
-tab_width = 3
+tab_width = 4
 
 # New line preferences
 end_of_line = crlf

src/Connected.Caching/SR.Designer.cs

@@ -39,7 +39,7 @@ namespace Connected.Caching {
         internal static global::System.Resources.ResourceManager ResourceManager {
             get {
                 if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Connected.Caching.SR", typeof(SR).Assembly);
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Server.Caching.SR", typeof(SR).Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;

src/Connected.Collections/SR.Designer.cs

@@ -39,7 +39,7 @@ namespace Connected.Collections {
         internal static global::System.Resources.ResourceManager ResourceManager {
             get {
                 if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Connected.Collections.SR", typeof(SR).Assembly);
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Server.Collections.SR", typeof(SR).Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;

src/Connected.Entities/SR.Designer.cs

@@ -39,7 +39,7 @@ namespace Connected.Entities {
         internal static global::System.Resources.ResourceManager ResourceManager {
             get {
                 if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Connected.Entities.SR", typeof(SR).Assembly);
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Server.Entities.SR", typeof(SR).Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;

src/Connected.Hosting/SR.Designer.cs

@@ -39,7 +39,7 @@ namespace Connected.Hosting {
         internal static global::System.Resources.ResourceManager ResourceManager {
             get {
                 if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Connected.Hosting.SR", typeof(SR).Assembly);
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Server.Hosting.SR", typeof(SR).Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;

src/Connected.Interop/Merging/ObjectMerger.cs

@@ -1,4 +1,5 @@
-using System.Collections;
+using Connected.ServiceModel;
+using System.Collections;
 using System.Reflection;
 
 namespace Connected.Interop.Merging
@@ -10,7 +11,7 @@ namespace Connected.Interop.Merging
 			if (destination is null || !HasSource(sources))
 				return;
 
-			var sourceProperties = PropertyAggregator.Aggregate(sources);
+			var sourceProperties = AggregateProperties(sources);
 
 			foreach (var property in Properties.GetImplementedProperties(destination))
 				MergeProperty(destination, sourceProperties, property);
@@ -27,6 +28,42 @@ namespace Connected.Interop.Merging
 			return false;
 		}
 
+		private static Dictionary<string, object> AggregateProperties(params object[] sources)
+		{
+			var result = new Dictionary<string, object>();
+
+			for (var i = sources.Length - 1; i >= 0; i--)
+			{
+				var source = sources[i];
+
+				if (source is null)
+					continue;
+
+				var props = Properties.GetImplementedProperties(source);
+
+				foreach (var property in props)
+				{
+					if (result.ContainsKey(property.Name))
+						continue;
+
+					result.Add(property.Name, source);
+				}
+
+				if (source is IPropertyProvider provider)
+				{
+					foreach (var property in provider.Properties)
+					{
+						if (result.ContainsKey(property.Key))
+							continue;
+
+						result.Add(property.Key, property.Value);
+					}
+				}
+			}
+
+			return result;
+		}
+
 		private void MergeProperty(object destination, Dictionary<string, object> sourceProperties, PropertyInfo property)
 		{
 			if (property.PropertyType.IsTypePrimitive())
@@ -37,8 +74,7 @@ namespace Connected.Interop.Merging
 				if (!sourceProperties.TryGetValue(property.Name, out object? source))
 					return;
 
-				if (source.GetType() is Type propertyType && PropertyResolver.Resolve(propertyType, property.Name) is PropertyInfo propertyInfo)
-					property.SetValue(destination, propertyInfo.GetValue(source));
+				property.SetValue(destination, source.GetType().GetProperty(property.Name).GetValue(source));
 			}
 			else if (IsArray(property))
 				MergeEnumerable(destination, sourceProperties, property);

src/Connected.Interop/Merging/PropertyAggregator.cs

@@ -1,68 +0,0 @@
-using Connected.ServiceModel;
-
-namespace Connected.Interop.Merging;
-internal static class PropertyAggregator
-{
-	public static Dictionary<string, object> Aggregate(params object[] values)
-	{
-		var result = new Dictionary<string, object>(StringComparer.OrdinalIgnoreCase);
-
-		for (var i = values.Length - 1; i >= 0; i--)
-		{
-			if (values[i] is not object value)
-				continue;
-
-			foreach (var property in GetImplementedProperties(value))
-			{
-				if (result.ContainsKey(property.Key))
-					continue;
-
-				result.Add(property.Key, property.Value);
-			}
-
-			if (value is IPropertyProvider provider)
-			{
-				foreach (var property in provider.Properties)
-				{
-					if (result.ContainsKey(property.Key))
-						continue;
-
-					result.Add(property.Key, property.Value);
-				}
-			}
-		}
-
-		return result;
-	}
-
-	private static Dictionary<string, object> GetImplementedProperties(object value)
-	{
-		if (value is null)
-			return new();
-
-		if (value is object[] objectArray)
-		{
-			var result = new Dictionary<string, object>();
-
-			for (var i = objectArray.Length - 1; i >= 0; i--)
-			{
-				var implementations = Properties.GetImplementedProperties(objectArray[i]);
-
-				foreach (var property in implementations)
-					result.Add(property.Name, objectArray[i]);
-			}
-
-			return result;
-		}
-		else
-		{
-			var implementations = Properties.GetImplementedProperties(value);
-			var result = new Dictionary<string, object>();
-
-			foreach (var property in implementations)
-				result.Add(property.Name, value);
-
-			return result;
-		}
-	}
-}

src/Connected.Interop/Merging/PropertyResolver.cs

@@ -1,19 +0,0 @@
-using System.Reflection;
-
-namespace Connected.Interop.Merging;
-internal static class PropertyResolver
-{
-	public static PropertyInfo? Resolve(Type type, string propertyName)
-	{
-		if (type.GetProperty(propertyName) is PropertyInfo property)
-			return property;
-
-		if (type.GetProperty(propertyName.ToCamelCase()) is PropertyInfo camelProperty)
-			return camelProperty;
-
-		if (type.GetProperty(propertyName.ToPascalCase()) is PropertyInfo pascalProperty)
-			return pascalProperty;
-
-		return null;
-	}
-}

src/Connected.Interop/SR.Designer.cs

@@ -39,7 +39,7 @@ namespace Connected.Interop {
         internal static global::System.Resources.ResourceManager ResourceManager {
             get {
                 if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Connected.Interop.SR", typeof(SR).Assembly);
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Server.Interop.SR", typeof(SR).Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;

src/Connected.Net/SR.Designer.cs

@@ -39,7 +39,7 @@ namespace Connected.Net {
         internal static global::System.Resources.ResourceManager ResourceManager {
             get {
                 if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Connected.Net.SR", typeof(SR).Assembly);
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Server.Net.SR", typeof(SR).Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;

src/Connected.Security/SR.Designer.cs

@@ -39,7 +39,7 @@ namespace Connected.Security {
         internal static global::System.Resources.ResourceManager ResourceManager {
             get {
                 if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Connected.Security.SR", typeof(SR).Assembly);
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Server.Security.SR", typeof(SR).Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;

src/Connected.Services/SR.Designer.cs

@@ -39,7 +39,7 @@ namespace Connected.Services {
         internal static global::System.Resources.ResourceManager ResourceManager {
             get {
                 if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Connected.Services.SR", typeof(SR).Assembly);
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Server.Services.SR", typeof(SR).Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;

src/Connected.Services/ServicesExtensions.cs

@@ -51,14 +51,4 @@ public static class ServicesExtensions
 		return (f is not null && type.GetInterface(f) is not null)
 			|| (nf is not null && type.GetInterface(nf) is not null);
 	}
-
-	public static string AsUrlFriendly(this string value)
-	{
-		return UrlGenerator.Generate(value);
-	}
-
-	public static string AsUrlFriendly(this string value, IEnumerable<string> existing)
-	{
-		return UrlGenerator.Generate(value, existing);
-	}
 }

src/Connected.Services/UrlGenerator.cs

@@ -1,112 +0,0 @@
-using System.Text;
-
-namespace Connected.Services;
-internal static class UrlGenerator
-{
-	private const string ValidCharacters = "abcdefghijklmnopqrstuvzxyw-";
-	private const string MinusReplacements = "_ .\t\r\n";
-	static UrlGenerator()
-	{
-		Replacements = new(StringComparer.OrdinalIgnoreCase)
-		{
-			{"č", "c"},
-			{"š", "s"},
-			{"ž", "z"},
-			{"đ", "d"},
-			{"ć", "c"}
-		};
-	}
-
-	private static Dictionary<string, string> Replacements { get; }
-
-	public static string Generate(string text)
-	{
-		if (string.IsNullOrEmpty(text))
-			throw new NullReferenceException(nameof(text));
-
-		var result = new StringBuilder();
-		/*
-		 * Analyze each character.
-		 */
-		foreach (var s in text.Trim())
-		{
-			/*
-			 * If it's in a ValidCharacters collection that's fine, we just copy it
-			 * into the result.
-			 */
-			if (ValidCharacters.Contains(s, StringComparison.OrdinalIgnoreCase))
-			{
-				result.Append(s);
-				continue;
-			}
-			/*
-			 * Look if it's in the MinusReplacements collection which means we'll
-			 * replace the character with the minus sign.
-			 */
-			if (MinusReplacements.Contains(s, StringComparison.OrdinalIgnoreCase))
-			{
-				result.Append('-');
-				continue;
-			}
-			/*
-			 * Last chance for the character to be included in the result is to 
-			 * resolve the hardcoded character replacements.
-			 */
-			if (Replacements.TryGetValue(s.ToString(), out var replacement))
-				result.Append(replacement);
-		}
-		/*
-		 * It's possible that no characters are included in the result. If that's
-		 * the case we are going to include an a character just for the sake of
-		 * being a valid string.
-		 */
-		if (result.Length == 0)
-			result.Append('a');
-		/*
-		 * Remove any redundant minus characters and we are done.
-		 */
-		var sb = new StringBuilder();
-		var active = false;
-
-		for (var i = 0; i < result.Length; i++)
-		{
-			if (result[i] == '-')
-			{
-				if (active)
-					continue;
-
-				active = true;
-				sb.Append(result[i]);
-			}
-			else
-			{
-				active = false;
-				sb.Append(result[i]);
-			}
-		}
-		/*
-		 * Remove trailing minus if exists.
-		 */
-		return sb.ToString().Trim().Trim('-').ToLowerInvariant();
-	}
-
-	public static string Generate(string text, IEnumerable<string> existing)
-	{
-		var prepared = Generate(text);
-
-		if (!existing.Any())
-			return prepared;
-
-		var idx = 0;
-
-		while (true)
-		{
-			var key = $"{prepared}-{idx}";
-
-			if (!existing.Contains(key, StringComparer.OrdinalIgnoreCase))
-				return key;
-
-			idx++;
-		}
-	}
-}

src/Connected.Threading/SR.Designer.cs

@@ -39,7 +39,7 @@ namespace Connected.Threading {
         internal static global::System.Resources.ResourceManager ResourceManager {
             get {
                 if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Connected.Threading.SR", typeof(SR).Assembly);
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Server.Threading.SR", typeof(SR).Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;