Merge branch 'dev'

Author: SimonCropp

.editorconfig

@@ -0,0 +1,47 @@
+root = true
+
+[*]
+trim_trailing_whitespace = true
+insert_final_newline = true
+indent_style = space
+indent_size = 4
+charset = utf-8
+end_of_line = lf
+
+[*.{csproj,json,config,yml,props}]
+indent_size = 2
+
+[*.sh]
+end_of_line = lf
+
+[*.{cmd, bat}]
+end_of_line = crlf
+
+# C# formatting settings - Namespace options
+csharp_style_namespace_declarations = file_scoped:suggestion
+
+csharp_style_prefer_switch_expression = true:suggestion
+
+# C# formatting settings - Spacing options
+csharp_space_after_cast = false
+csharp_space_after_keywords_in_control_flow_statements = true
+csharp_space_between_parentheses = false
+csharp_space_before_colon_in_inheritance_clause = true
+csharp_space_after_colon_in_inheritance_clause = true
+csharp_space_around_binary_operators = before_and_after
+csharp_space_between_method_declaration_parameter_list_parentheses = false
+csharp_space_between_method_declaration_empty_parameter_list_parentheses = false
+csharp_space_between_method_declaration_name_and_open_parenthesis = false
+csharp_space_between_method_call_parameter_list_parentheses = false
+csharp_space_between_method_call_empty_parameter_list_parentheses = false
+csharp_space_between_method_call_name_and_opening_parenthesis = false
+csharp_space_after_comma = true
+csharp_space_before_comma = false
+csharp_space_after_dot = false
+csharp_space_before_dot = false
+csharp_space_after_semicolon_in_for_statement = true
+csharp_space_before_semicolon_in_for_statement = false
+csharp_space_around_declaration_statements = false
+csharp_space_before_open_square_brackets = false
+csharp_space_between_empty_square_brackets = false
+csharp_space_between_square_brackets = false

.gitignore

@@ -194,3 +194,5 @@ FakesAssemblies/
 
 # Visual Studio 6 workspace options file
 *.opt
+
+.idea/

Build.ps1

@@ -16,7 +16,7 @@ $commitHash = $(git rev-parse --short HEAD)
 $buildSuffix = @{ $true = "$($suffix)-$($commitHash)"; $false = "$($branch)-$($commitHash)" }[$suffix -ne ""]
 
 echo "build: Package version suffix is $suffix"
-echo "build: Build version suffix is $buildSuffix" 
+echo "build: Build version suffix is $buildSuffix"
 
 foreach ($src in ls src/*) {
 	Push-Location $src
@@ -28,14 +28,14 @@ foreach ($src in ls src/*) {
 	} else {
 		& dotnet build -c Release
 	}
-	if($LASTEXITCODE -ne 0) { exit 1 }    
+	if($LASTEXITCODE -ne 0) { exit 1 }
 
 	if ($suffix) {
 		& dotnet pack -c Release --include-symbols -o ..\..\artifacts --version-suffix=$suffix --no-build
 	} else {
 		& dotnet pack -c Release --include-symbols -o ..\..\artifacts --no-build
 	}
-	if($LASTEXITCODE -ne 0) { exit 1 }    
+	if($LASTEXITCODE -ne 0) { exit 1 }
 
 	Pop-Location
 }

Directory.Build.props

@@ -7,5 +7,6 @@
     <DebugSymbols>true</DebugSymbols>
     <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)key.snk</AssemblyOriginatorKeyFile>
     <SignAssembly>true</SignAssembly>
+    <Nullable>enable</Nullable>
   </PropertyGroup>
 </Project>

README.md

@@ -33,7 +33,7 @@ Apply the `LogWithName` attribute:
 public class PersonalData
 {
     [LogWithName("FullName")]
-    public string Name { get; set; }
+    public string? Name { get; set; }
 }
 ```
 <sup><a href='/test/Destructurama.Attributed.Tests/LogWithNameAttributedTests.cs#L37-L43' title='Snippet source file'>snippet source</a> | <a href='#snippet-logwithname' title='Start of snippet'>anchor</a></sup>
@@ -49,10 +49,10 @@ Apply the `NotLogged` attribute:
 ```cs
 public class LoginCommand
 {
-    public string Username { get; set; }
+    public string? Username { get; set; }
 
     [NotLogged]
-    public string Password { get; set; }
+    public string? Password { get; set; }
 }
 ```
 <sup><a href='/test/Destructurama.Attributed.Tests/Snippets.cs#L29-L37' title='Snippet source file'>snippet source</a> | <a href='#snippet-logincommand' title='Start of snippet'>anchor</a></sup>
@@ -98,106 +98,112 @@ public class CustomizedMaskedLogs
     /// 123456789 results in "***"
     /// </summary>
     [LogMasked]
-    public string DefaultMasked { get; set; }
+    public string? DefaultMasked { get; set; }
 
     /// <summary>
     /// [123456789,123456789,123456789] results in [***,***,***]
     /// </summary>
     [LogMasked]
-    public string[] DefaultMaskedArray { get; set; }
+    public string[]? DefaultMaskedArray { get; set; }
 
     /// <summary>
     /// 123456789 results in "*********"
     /// </summary>
     [LogMasked(PreserveLength = true)]
-    public string DefaultMaskedPreserved { get; set; }
+    public string? DefaultMaskedPreserved { get; set; }
 
     /// <summary>
     ///  123456789 results in "#"
     /// </summary>
     [LogMasked(Text = "_REMOVED_")]
-    public string CustomMasked { get; set; }
+    public string? CustomMasked { get; set; }
+
+    /// <summary>
+    ///  123456789 results in "#"
+    /// </summary>
+    [LogMasked(Text = "")]
+    public string? CustomMaskedWithEmptyString { get; set; }
 
     /// <summary>
     ///  123456789 results in "#########"
     /// </summary>
     [LogMasked(Text = "#", PreserveLength = true)]
-    public string CustomMaskedPreservedLength { get; set; }
+    public string? CustomMaskedPreservedLength { get; set; }
 
     /// <summary>
     ///  123456789 results in "123******"
     /// </summary>
     [LogMasked(ShowFirst = 3)]
-    public string ShowFirstThreeThenDefaultMasked { get; set; }
+    public string? ShowFirstThreeThenDefaultMasked { get; set; }
 
     /// <summary>
     /// 123456789 results in "123******"
     /// </summary>
     [LogMasked(ShowFirst = 3, PreserveLength = true)]
-    public string ShowFirstThreeThenDefaultMaskedPreservedLength { get; set; }
+    public string? ShowFirstThreeThenDefaultMaskedPreservedLength { get; set; }
 
     /// <summary>
     /// 123456789 results in "***789"
     /// </summary>
     [LogMasked(ShowLast = 3)]
-    public string ShowLastThreeThenDefaultMasked { get; set; }
+    public string? ShowLastThreeThenDefaultMasked { get; set; }
 
     /// <summary>
     /// 123456789 results in "******789"
     /// </summary>
     [LogMasked(ShowLast = 3, PreserveLength = true)]
-    public string ShowLastThreeThenDefaultMaskedPreservedLength { get; set; }
+    public string? ShowLastThreeThenDefaultMaskedPreservedLength { get; set; }
 
     /// <summary>
     ///  123456789 results in "123REMOVED"
     /// </summary>
     [LogMasked(Text = "_REMOVED_", ShowFirst = 3)]
-    public string ShowFirstThreeThenCustomMask { get; set; }
+    public string? ShowFirstThreeThenCustomMask { get; set; }
 
     /// <summary>
     ///  123456789 results in "123_REMOVED_"
     /// </summary>
     [LogMasked(Text = "_REMOVED_", ShowFirst = 3, PreserveLength = true)]
-    public string ShowFirstThreeThenCustomMaskPreservedLengthIgnored { get; set; }
+    public string? ShowFirstThreeThenCustomMaskPreservedLengthIgnored { get; set; }
 
     /// <summary>
     ///  123456789 results in "_REMOVED_789"
     /// </summary>
     [LogMasked(Text = "_REMOVED_", ShowLast = 3)]
-    public string ShowLastThreeThenCustomMask { get; set; }
+    public string? ShowLastThreeThenCustomMask { get; set; }
 
     /// <summary>
     ///  123456789 results in "_REMOVED_789"
     /// </summary>
     [LogMasked(Text = "_REMOVED_", ShowLast = 3, PreserveLength = true)]
-    public string ShowLastThreeThenCustomMaskPreservedLengthIgnored { get; set; }
+    public string? ShowLastThreeThenCustomMaskPreservedLengthIgnored { get; set; }
 
     /// <summary>
     /// 123456789 results in "123***789"
     /// </summary>
     [LogMasked(ShowFirst = 3, ShowLast = 3)]
-    public string ShowFirstAndLastThreeAndDefaultMaskInTheMiddle { get; set; }
+    public string? ShowFirstAndLastThreeAndDefaultMaskInTheMiddle { get; set; }
 
     /// <summary>
     /// 123456789 results in "123***789"
     /// </summary>
     [LogMasked(ShowFirst = 3, ShowLast = 3, PreserveLength = true)]
-    public string ShowFirstAndLastThreeAndDefaultMaskInTheMiddlePreservedLength { get; set; }
+    public string? ShowFirstAndLastThreeAndDefaultMaskInTheMiddlePreservedLength { get; set; }
 
     /// <summary>
     ///  123456789 results in "123_REMOVED_789"
     /// </summary>
     [LogMasked(Text = "_REMOVED_", ShowFirst = 3, ShowLast = 3)]
-    public string ShowFirstAndLastThreeAndCustomMaskInTheMiddle { get; set; }
+    public string? ShowFirstAndLastThreeAndCustomMaskInTheMiddle { get; set; }
 
     /// <summary>
     ///  123456789 results in "123_REMOVED_789". PreserveLength is ignored"
     /// </summary>
     [LogMasked(Text = "_REMOVED_", ShowFirst = 3, ShowLast = 3, PreserveLength = true)]
-    public string ShowFirstAndLastThreeAndCustomMaskInTheMiddlePreservedLengthIgnored { get; set; }
+    public string? ShowFirstAndLastThreeAndCustomMaskInTheMiddlePreservedLengthIgnored { get; set; }
 }
 ```
-<sup><a href='/test/Destructurama.Attributed.Tests/MaskedAttributeTests.cs#L9-L116' title='Snippet source file'>snippet source</a> | <a href='#snippet-customizedmaskedlogs' title='Start of snippet'>anchor</a></sup>
+<sup><a href='/test/Destructurama.Attributed.Tests/MaskedAttributeTests.cs#L9-L122' title='Snippet source file'>snippet source</a> | <a href='#snippet-customizedmaskedlogs' title='Start of snippet'>anchor</a></sup>
 <!-- endSnippet -->
 
 
@@ -226,6 +232,7 @@ __Constructor arguments__:
 
 __Available properties__:
  - **Options:** The [RegexOptions](https://docs.microsoft.com/en-us/dotnet/api/system.text.regularexpressions.regexoptions?view=netcore-3.1) that will be applied. Defaults to __RegexOptions.None__
+ - **Timeout:** A time-out interval to evaluate regular expression. Defaults to __Regex.InfiniteMatchTimeout__
 
 
 ### Examples
@@ -241,13 +248,13 @@ public class WithRegex
     /// 123|456|789 results in "***|456|789"
     /// </summary>
     [LogReplaced(RegexWithVerticalBars, "***|$2|$3")]
-    public string RegexReplaceFirst { get; set; }
+    public string? RegexReplaceFirst { get; set; }
 
     /// <summary>
     /// 123|456|789 results in "123|***|789"
     /// </summary>
     [LogReplaced(RegexWithVerticalBars, "$1|***|$3")]
-    public string RegexReplaceSecond { get; set; }
+    public string? RegexReplaceSecond { get; set; }
 }
 ```
 <sup><a href='/test/Destructurama.Attributed.Tests/Snippets.cs#L6-L25' title='Snippet source file'>snippet source</a> | <a href='#snippet-withregex' title='Start of snippet'>anchor</a></sup>

appveyor.yml

@@ -1,6 +1,6 @@
 version: '{build}'
 skip_tags: true
-image: Visual Studio 2019
+image: Visual Studio 2022
 configuration: Release
 test: off
 build_script:

destructurama-attributed.sln

@@ -17,6 +17,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "global", "global", "{A195B0
 		Directory.Build.props = Directory.Build.props
 		LICENSE = LICENSE
 		README.md = README.md
+		global.json = global.json
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{677924A1-EB38-4E04-9D13-3DD4C3C9C514}"