Merge pull request #8 from AutSoft/develop

0.5.0

Author: KuraiAndras

.vscode/spellright.dict

@@ -1,2 +1,3 @@
 unrecoverably
 parameterless
+Roslynator

CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.5.0
+- Normalize line endings to Windows CLRF
+- Add Roslynator suppression to line endings
+
 # 0.4.1
 - Add license URL to package
 

UnityResourceGenerator/Assets/AutSoft.UnityResourceGenerator.Sample/ResourcePaths.cs

@@ -6,6 +6,8 @@ namespace AutSoft.UnityResourceGenerator.Sample
     // ReSharper disable PartialTypeWithSinglePart
     // ReSharper disable InconsistentNaming
     // ReSharper disable IncorrectBlankLinesNearBraces
+#pragma warning disable IDE0079 // Remove unnecessary suppression
+#pragma warning disable RCS1036 // Remove redundant empty line.
     public static partial class ResourcePaths
     {
         public static partial class Scenes

UnityResourceGenerator/Assets/AutSoft.UnityResourceGenerator/Editor/Generation/ResourceFileGenerator.cs

@@ -2,11 +2,14 @@
 using System;
 using System.Linq;
 using System.Text;
+using System.Text.RegularExpressions;
 
 namespace AutSoft.UnityResourceGenerator.Editor.Generation
 {
     public static class ResourceFileGenerator
     {
+        private static readonly Regex NormalizedLineEndings = new Regex(@"\r\n|\n\r|\n|\r", RegexOptions.Compiled, TimeSpan.FromSeconds(10));
+
         public static string CreateResourceFile(ResourceContext context)
         {
             // ReSharper disable once MissingIndent
@@ -17,6 +20,8 @@ namespace {0}
     // ReSharper disable PartialTypeWithSinglePart
     // ReSharper disable InconsistentNaming
     // ReSharper disable IncorrectBlankLinesNearBraces
+#pragma warning disable IDE0079 // Remove unnecessary suppression
+#pragma warning disable RCS1036 // Remove redundant empty line.
     public static partial class {1}
     {";
 
@@ -31,6 +36,8 @@ public static partial class {1}
 // ReSharper disable PartialTypeWithSinglePart
 // ReSharper disable InconsistentNaming
 // ReSharper disable IncorrectBlankLinesNearBraces
+#pragma warning disable IDE0079 // Remove unnecessary suppression
+#pragma warning disable RCS1036 // Remove redundant empty line.
 public static partial class {1}
 {";
 
@@ -63,6 +70,8 @@ public static partial class {1}
                 .OrderByDescending(p => p.PostProcessPriority)
                 .Aggregate(fileContent, (current, processor) => processor.PostProcess(context, current));
 
+            fileContent = NormalizedLineEndings.Replace(fileContent, "\r\n");
+
             return fileContent;
         }
     }

UnityResourceGenerator/Assets/AutSoft.UnityResourceGenerator/package.json

@@ -1,6 +1,6 @@
 {
     "name": "com.autsoft.unityresourcegenerator",
-    "version": "0.4.1",
+    "version": "0.5.0",
     "displayName": "Unity Resource Generator",
     "description": "Generate path strings for Resources.Load",
     "license": "MIT",