Apply R# clean-up for reliability (#877)

* Apply R# clean-up for reliability

- Migrate to NUnit4 Assert.That
- Update dependencise versions
- Fix LangVersion to 9.0 (until net core migration)
- Reformat code
- Apply 'var' style (easier for refactoring)
- Remove redundant parentheses
- Add braces on every condition blocks (1 line)
- Uses new null checking patterns
- Uses AutoProperties when possible
- Uses string scalar type instead of class
- Clean usings
- Add .orig files in git ignore
- Rename some properties to respect defined conventions and US format definition
	- ID -> Id
	- BPM -> Bpm
	- Finish -> End

* Update R# settings according to the clean-up made
This commit is contained in:
Quentin Bray authored and GitHub committed 2026-06-22 19:52:06 +02:00
1 parent b9b0f7c8df
commit 6ffa63b923
236 files changed
+14194 -7278

No files matched your search

+76 -24
View File
@@ -17,7 +17,6 @@
using System;
using System.Collections;
using System.Collections.Generic;
using System.Diagnostics;
using System.Globalization;
using System.IO;
@@ -49,11 +48,11 @@ namespace VocaluxeLib.Xml
/// Uniform settings for writing XML files. ALWAYS use this!
/// </summary>
private readonly XmlWriterSettings _XmlSettings = new XmlWriterSettings
{
Indent = true,
Encoding = Encoding.UTF8,
ConformanceLevel = ConformanceLevel.Document
};
{
Indent = true,
Encoding = Encoding.UTF8,
ConformanceLevel = ConformanceLevel.Document
};
/// <summary>
/// Writes a value as a node or attribute
@@ -69,10 +68,13 @@ namespace VocaluxeLib.Xml
{
if (!isAttribute && _GetCommentCallback != null)
{
string comment = _GetCommentCallback(name);
var comment = _GetCommentCallback(name);
if (!string.IsNullOrEmpty(comment))
{
writer.WriteComment(comment);
}
}
if (type.IsEnum || type == typeof(string) || type.IsPrimitive)
{
string strVal;
@@ -84,15 +86,24 @@ namespace VocaluxeLib.Xml
{
throw new XmlException("Cannot convert value of type " + type.Name + " to string in node " + name + " (" + e.Message + ")");
}
if (isAttribute)
{
writer.WriteAttributeString(name, strVal);
}
else
{
writer.WriteStartElement(name);
if (nameAttribute != null)
{
writer.WriteAttributeString("name", nameAttribute);
}
if (!string.IsNullOrEmpty(strVal))
{
writer.WriteValue(strVal);
}
writer.WriteEndElement();
}
}
@@ -101,18 +112,26 @@ namespace VocaluxeLib.Xml
writer.WriteElementString(name, value.ToString());
}
else if (type.IsNullable())
{
_WriteValue(writer, name, type.GetGenericArguments()[0], value, isAttribute, arrayItemName, nameAttribute);
}
else if (type.IsList() || type.IsArray)
{
Debug.Assert(!isAttribute, "Lists cannot be attributes");
writer.WriteStartElement(name);
if (nameAttribute != null)
{
writer.WriteAttributeString("name", nameAttribute);
Type subType = type.IsArray ? type.GetElementType() : type.GetGenericArguments()[0];
String subName = arrayItemName ?? subType.GetTypeName();
IEnumerable list = (IEnumerable)value;
foreach (object subValue in list)
}
var subType = type.IsArray ? type.GetElementType() : type.GetGenericArguments()[0];
var subName = arrayItemName ?? subType.GetTypeName();
var list = (IEnumerable)value;
foreach (var subValue in list)
{
_WriteValue(writer, subName, subType, subValue, false);
}
writer.WriteEndElement();
}
else if (type.IsDictionary())
@@ -120,9 +139,12 @@ namespace VocaluxeLib.Xml
Debug.Assert(!isAttribute, "Dictionaries cannot be attributes");
writer.WriteStartElement(name);
if (nameAttribute != null)
{
writer.WriteAttributeString("name", nameAttribute);
Type subType = type.GetGenericArguments()[1];
IDictionary dict = (IDictionary)value;
}
var subType = type.GetGenericArguments()[1];
var dict = (IDictionary)value;
foreach (DictionaryEntry entry in dict)
{
string subName;
@@ -137,8 +159,10 @@ namespace VocaluxeLib.Xml
subName = arrayItemName;
subNameAttribute = (string)entry.Key;
}
_WriteValue(writer, subName, subType, entry.Value, false, null, subNameAttribute);
}
writer.WriteEndElement();
}
else
@@ -146,9 +170,15 @@ namespace VocaluxeLib.Xml
Debug.Assert(!isAttribute, "Complex types cannot be attributes");
writer.WriteStartElement(name);
if (nameAttribute != null)
{
writer.WriteAttributeString("name", nameAttribute);
}
if (value != null)
{
_WriteFields(writer, value);
}
writer.WriteEndElement();
}
}
@@ -160,28 +190,38 @@ namespace VocaluxeLib.Xml
/// <param name="o">Object to process</param>
private void _WriteFields(XmlWriter writer, object o)
{
IEnumerable<SFieldInfo> fields = o.GetType().GetFieldInfos();
foreach (SFieldInfo field in fields)
var fields = o.GetType().GetFieldInfos();
foreach (var field in fields)
{
object value = field.GetValue(o);
var value = field.GetValue(o);
if (!_WriteDefaults && field.HasDefaultValue && Equals(value, field.DefaultValue))
{
continue;
}
if (field.IsEmbeddedList)
{
IEnumerable values = (IEnumerable)value;
bool empty = true;
foreach (object subValue in values)
var values = (IEnumerable)value;
var empty = true;
foreach (var subValue in values)
{
_WriteValue(writer, field.Name, field.SubType, subValue, field.IsAttribute);
empty = false;
}
if (empty && _WriteDefaults)
{
writer.WriteElementString(field.Name, "");
}
}
else if (field.IsByteArray)
{
writer.WriteElementString(field.Name, Convert.ToBase64String((byte[])value));
}
else
{
_WriteValue(writer, field.Name, field.Type, value, field.IsAttribute, field.ArrayItemName);
}
}
}
@@ -195,18 +235,25 @@ namespace VocaluxeLib.Xml
{
if (string.IsNullOrEmpty(rootNodeName))
{
XmlRootAttribute root = o.GetType().GetAttribute<XmlRootAttribute>();
var root = o.GetType().GetAttribute<XmlRootAttribute>();
if (root != null && !string.IsNullOrEmpty(root.ElementName))
{
rootNodeName = root.ElementName;
}
else
{
XmlTypeAttribute typeAtt = o.GetType().GetAttribute<XmlTypeAttribute>();
var typeAtt = o.GetType().GetAttribute<XmlTypeAttribute>();
if (typeAtt != null && !string.IsNullOrEmpty(typeAtt.TypeName))
{
rootNodeName = typeAtt.TypeName;
}
else
{
rootNodeName = "root";
}
}
}
try
{
writer.WriteStartDocument();
@@ -227,8 +274,10 @@ namespace VocaluxeLib.Xml
/// <param name="rootNodeName">Name of the root node (overwrites default value specified by XmlRoot/XmlTypeAttributes which defaults to "root")</param>
public void Serialize(string filePath, object o, string rootNodeName = null)
{
using (XmlWriter writer = XmlWriter.Create(filePath, _XmlSettings))
using (var writer = XmlWriter.Create(filePath, _XmlSettings))
{
_Serialize(writer, o, rootNodeName);
}
}
/// <summary>
@@ -239,9 +288,12 @@ namespace VocaluxeLib.Xml
/// <returns>Serialized object</returns>
public string Serialize(object o, string rootNodeName = null)
{
MemoryStream result = new MemoryStream();
using (XmlWriter writer = XmlWriter.Create(result, _XmlSettings))
var result = new MemoryStream();
using (var writer = XmlWriter.Create(result, _XmlSettings))
{
_Serialize(writer, o, rootNodeName);
}
result.Position = 0;
return new StreamReader(result).ReadToEnd();
}