Add .editorconfig; change tabs back to spaces; add braces for single-line statements.

Author: RichardD2

.editorconfig

@@ -0,0 +1,39 @@
+[*.cs]
+indent_style = space
+indent_size = 4
+
+csharp_new_line_before_else = true
+csharp_new_line_before_finally = true
+csharp_new_line_before_members_in_object_initializers = true
+csharp_new_line_before_open_brace = methods, object_collection_array_initializers, control_blocks, types
+dotnet_sort_system_directives_first = true
+
+csharp_space_after_cast = false
+csharp_space_after_colon_in_inheritance_clause = true
+csharp_space_after_keywords_in_control_flow_statements = true
+csharp_space_before_colon_in_inheritance_clause = true
+csharp_space_between_method_call_empty_parameter_list_parentheses = false
+csharp_space_between_method_call_name_and_opening_parenthesis = false
+csharp_space_between_method_call_parameter_list_parentheses = false
+csharp_space_between_method_declaration_empty_parameter_list_parentheses = false
+csharp_space_between_method_declaration_parameter_list_parentheses = false
+
+csharp_preserve_single_line_blocks = true
+csharp_preserve_single_line_statements = false
+csharp_prefer_braces = true:warning
+
+csharp_style_var_when_type_is_apparent = true:suggestion
+csharp_style_pattern_matching_over_as_with_null_check = true:suggestion
+
+dotnet_style_require_accessibility_modifiers = for_non_interface_members:suggestion
+csharp_preferred_modifier_order = public,private,internal,protected,static,readonly,sealed,async,override,abstract:suggestion
+
+dotnet_style_predefined_type_for_locals_parameters_members = true:suggestion
+dotnet_style_predefined_type_for_member_access = true:suggestion
+dotnet_style_object_initializer = true:suggestion
+dotnet_style_prefer_inferred_tuple_names = true:suggestion
+csharp_prefer_simple_default_expression = true:suggestion
+
+dotnet_style_qualification_for_field = false:suggestion
+dotnet_style_qualification_for_method = false:suggestion
+dotnet_style_qualification_for_property = false:suggestion

EntityFrameworkCore.DataEncryption.sln

@@ -28,6 +28,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "pipelines", "pipelines", "{
 	ProjectSection(SolutionItems) = preProject
 		.azure\pipelines\azure-pipelines.yml = .azure\pipelines\azure-pipelines.yml
 	EndProjectSection
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{5EE4E8BE-6B15-49DB-A4A8-D2CD63D5E90C}"
+	ProjectSection(SolutionItems) = preProject
+		.editorconfig = .editorconfig
+	EndProjectSection
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

samples/AesSample/Program.cs

@@ -6,51 +6,51 @@
 
 namespace AesSample
 {
-	static class Program
-	{
-		static void Main()
-		{
-			var options = new DbContextOptionsBuilder<DatabaseContext>()
-				.UseInMemoryDatabase(databaseName: "MyInMemoryDatabase")
-				.Options;
-
-			// AES key randomly generated at each run.
-			byte[] encryptionKey = AesProvider.GenerateKey(AesKeySize.AES256Bits).Key;
-			var encryptionProvider = new AesProvider(encryptionKey);
-
-			using var context = new DatabaseContext(options, encryptionProvider);
-
-			var user = new UserEntity
-			{
-				FirstName = "John",
-				LastName = "Doe",
-				Email = "john@doe.com",
-				Password = BuildPassword(),
-			};
-
-			context.Users.Add(user);
-			context.SaveChanges();
-
-			Console.WriteLine($"Users count: {context.Users.Count()}");
-
-			user = context.Users.First();
-
-			Console.WriteLine($"User: {user.FirstName} {user.LastName} - {user.Email} ({user.Password.Length})");
-		}
-
-		static SecureString BuildPassword()
-		{
-			SecureString result = new();
-			result.AppendChar('L');
-			result.AppendChar('e');
-			result.AppendChar('t');
-			result.AppendChar('M');
-			result.AppendChar('e');
-			result.AppendChar('I');
-			result.AppendChar('n');
-			result.AppendChar('!');
-			result.MakeReadOnly();
-			return result;
-		}
-	}
+    static class Program
+    {
+        static void Main()
+        {
+            var options = new DbContextOptionsBuilder<DatabaseContext>()
+                .UseInMemoryDatabase(databaseName: "MyInMemoryDatabase")
+                .Options;
+
+            // AES key randomly generated at each run.
+            byte[] encryptionKey = AesProvider.GenerateKey(AesKeySize.AES256Bits).Key;
+            var encryptionProvider = new AesProvider(encryptionKey);
+
+            using var context = new DatabaseContext(options, encryptionProvider);
+
+            var user = new UserEntity
+            {
+                FirstName = "John",
+                LastName = "Doe",
+                Email = "john@doe.com",
+                Password = BuildPassword(),
+            };
+
+            context.Users.Add(user);
+            context.SaveChanges();
+
+            Console.WriteLine($"Users count: {context.Users.Count()}");
+
+            user = context.Users.First();
+
+            Console.WriteLine($"User: {user.FirstName} {user.LastName} - {user.Email} ({user.Password.Length})");
+        }
+
+        static SecureString BuildPassword()
+        {
+            SecureString result = new();
+            result.AppendChar('L');
+            result.AppendChar('e');
+            result.AppendChar('t');
+            result.AppendChar('M');
+            result.AppendChar('e');
+            result.AppendChar('I');
+            result.AppendChar('n');
+            result.AppendChar('!');
+            result.MakeReadOnly();
+            return result;
+        }
+    }
 }

src/EntityFrameworkCore.DataEncryption/Attributes/EncryptedAttribute.cs

@@ -1,32 +1,32 @@
 namespace System.ComponentModel.DataAnnotations
 {
-	/// <summary>
-	/// Specifies that the data field value should be encrypted.
-	/// </summary>
-	[AttributeUsage(AttributeTargets.Property, AllowMultiple = false, Inherited = false)]
-	public sealed class EncryptedAttribute : Attribute
-	{
-		/// <summary>
-		/// Initializes a new instance of the <see cref="EncryptedAttribute"/> class.
-		/// </summary>
-		/// <param name="format">
-		/// The storage format.
-		/// </param>
-		public EncryptedAttribute(StorageFormat format)
-		{
-			Format = format;
-		}
+    /// <summary>
+    /// Specifies that the data field value should be encrypted.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Property, AllowMultiple = false, Inherited = false)]
+    public sealed class EncryptedAttribute : Attribute
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="EncryptedAttribute"/> class.
+        /// </summary>
+        /// <param name="format">
+        /// The storage format.
+        /// </param>
+        public EncryptedAttribute(StorageFormat format)
+        {
+            Format = format;
+        }
 
-		/// <summary>
-		/// Initializes a new instance of the <see cref="EncryptedAttribute"/> class.
-		/// </summary>
-		public EncryptedAttribute() : this(StorageFormat.Default)
-		{
-		}
+        /// <summary>
+        /// Initializes a new instance of the <see cref="EncryptedAttribute"/> class.
+        /// </summary>
+        public EncryptedAttribute() : this(StorageFormat.Default)
+        {
+        }
 
-		/// <summary>
-		/// Returns the storage format for the database value.
-		/// </summary>
-		public StorageFormat Format { get; }
-	}
+        /// <summary>
+        /// Returns the storage format for the database value.
+        /// </summary>
+        public StorageFormat Format { get; }
+    }
 }

src/EntityFrameworkCore.DataEncryption/Attributes/StorageFormat.cs

@@ -1,26 +1,26 @@
 namespace System.ComponentModel.DataAnnotations
 {
-	/// <summary>
-	/// Represents the storage format for an encrypted value.
-	/// </summary>
-	public enum StorageFormat
-	{
-		/// <summary>
-		/// The format is determined by the model data type.
-		/// </summary>
-		Default,
-		/// <summary>
-		/// The value is stored in binary.
-		/// </summary>
-		Binary,
-		/// <summary>
-		/// The value is stored in a Base64-encoded string.
-		/// </summary>
-		/// <remarks>
-		/// <b>NB:</b> If the source property is a <see cref="string"/>,
-		/// and no encryption provider is configured,
-		/// the string will not be modified.
-		/// </remarks>
-		Base64,
-	}
+    /// <summary>
+    /// Represents the storage format for an encrypted value.
+    /// </summary>
+    public enum StorageFormat
+    {
+        /// <summary>
+        /// The format is determined by the model data type.
+        /// </summary>
+        Default,
+        /// <summary>
+        /// The value is stored in binary.
+        /// </summary>
+        Binary,
+        /// <summary>
+        /// The value is stored in a Base64-encoded string.
+        /// </summary>
+        /// <remarks>
+        /// <b>NB:</b> If the source property is a <see cref="string"/>,
+        /// and no encryption provider is configured,
+        /// the string will not be modified.
+        /// </remarks>
+        Base64,
+    }
 }

src/EntityFrameworkCore.DataEncryption/IEncryptionProvider.cs

@@ -3,65 +3,65 @@
 
 namespace Microsoft.EntityFrameworkCore.DataEncryption
 {
-	/// <summary>
-	/// Provides a mechanism for implementing a custom encryption provider.
-	/// </summary>
-	public interface IEncryptionProvider
-	{
-		/// <summary>
-		/// Encrypts a value.
-		/// </summary>
-		/// <typeparam name="TStore">
-		/// The type of data stored in the database.
-		/// </typeparam>
-		/// <typeparam name="TModel">
-		/// The type of value stored in the model.
-		/// </typeparam>
-		/// <param name="dataToEncrypt">
-		/// Input data to encrypt.
-		/// </param>
-		/// <param name="converter">
-		/// Function which converts the model value to a byte array.
-		/// </param>
-		/// <param name="encoder">
-		/// Function which encodes the value for storing the the database.
-		/// </param>
-		/// <returns>
-		/// Encrypted data.
-		/// </returns>
-		/// <exception cref="ArgumentNullException">
-		/// <para><paramref name="converter"/> is <see langword="null"/>.</para>
-		/// <para>-or-</para>
-		/// <para><paramref name="encoder"/> is <see langword="null"/>.</para>
-		/// </exception>
-		TStore Encrypt<TStore, TModel>(TModel dataToEncrypt, Func<TModel, byte[]> converter, Func<Stream, TStore> encoder);
+    /// <summary>
+    /// Provides a mechanism for implementing a custom encryption provider.
+    /// </summary>
+    public interface IEncryptionProvider
+    {
+        /// <summary>
+        /// Encrypts a value.
+        /// </summary>
+        /// <typeparam name="TStore">
+        /// The type of data stored in the database.
+        /// </typeparam>
+        /// <typeparam name="TModel">
+        /// The type of value stored in the model.
+        /// </typeparam>
+        /// <param name="dataToEncrypt">
+        /// Input data to encrypt.
+        /// </param>
+        /// <param name="converter">
+        /// Function which converts the model value to a byte array.
+        /// </param>
+        /// <param name="encoder">
+        /// Function which encodes the value for storing the the database.
+        /// </param>
+        /// <returns>
+        /// Encrypted data.
+        /// </returns>
+        /// <exception cref="ArgumentNullException">
+        /// <para><paramref name="converter"/> is <see langword="null"/>.</para>
+        /// <para>-or-</para>
+        /// <para><paramref name="encoder"/> is <see langword="null"/>.</para>
+        /// </exception>
+        TStore Encrypt<TStore, TModel>(TModel dataToEncrypt, Func<TModel, byte[]> converter, Func<Stream, TStore> encoder);
 
-		/// <summary>
-		/// Decrypts a value.
-		/// </summary>
-		/// <typeparam name="TStore">
-		/// The type of data stored in the database.
-		/// </typeparam>
-		/// <typeparam name="TModel">
-		/// The type of value stored in the model.
-		/// </typeparam>
-		/// <param name="dataToDecrypt">
-		/// Encrypted data to decrypt.
-		/// </param>
-		/// <param name="decoder">
-		/// Function which converts the stored data to a byte array.
-		/// </param>
-		/// <param name="converter">
-		/// Function which converts the decrypted <see cref="Stream"/> to the return value.
-		/// </param>
-		/// <returns>
-		/// Decrypted data.
-		/// </returns>
-		/// <exception cref="ArgumentNullException">
-		/// <para><paramref name="decoder"/> is <see langword="null"/>.</para>
-		/// <para>-or-</para>
-		/// <para><paramref name="converter"/> is <see langword="null"/>.</para>
-		/// </exception>
-		TModel Decrypt<TStore, TModel>(TStore dataToDecrypt, Func<TStore, byte[]> decoder, Func<Stream, TModel> converter);
-	}
+        /// <summary>
+        /// Decrypts a value.
+        /// </summary>
+        /// <typeparam name="TStore">
+        /// The type of data stored in the database.
+        /// </typeparam>
+        /// <typeparam name="TModel">
+        /// The type of value stored in the model.
+        /// </typeparam>
+        /// <param name="dataToDecrypt">
+        /// Encrypted data to decrypt.
+        /// </param>
+        /// <param name="decoder">
+        /// Function which converts the stored data to a byte array.
+        /// </param>
+        /// <param name="converter">
+        /// Function which converts the decrypted <see cref="Stream"/> to the return value.
+        /// </param>
+        /// <returns>
+        /// Decrypted data.
+        /// </returns>
+        /// <exception cref="ArgumentNullException">
+        /// <para><paramref name="decoder"/> is <see langword="null"/>.</para>
+        /// <para>-or-</para>
+        /// <para><paramref name="converter"/> is <see langword="null"/>.</para>
+        /// </exception>
+        TModel Decrypt<TStore, TModel>(TStore dataToDecrypt, Func<TStore, byte[]> decoder, Func<Stream, TModel> converter);
+    }
 }