Merge pull request #58 from teekayarezee/master

Fix issue with string builder removing too much raw sln data on Unix platforms
3F · Jul 12, 2023 · 8d847f0 · 8d847f0
2 parents 8dd3956 + e12a2a9
commit 8d847f0
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 6 deletions.
diff --git a/.version b/.version
@@ -1 +1 @@
-2.6.1
+2.6.2
diff --git a/MvsSln/Core/ObjHandlers/WProject.cs b/MvsSln/Core/ObjHandlers/WProject.cs
@@ -54,7 +54,7 @@ public override string Extract(object data)
             }
 
             if(sb.Length > 1) {
-                return sb.ToString(0, sb.Length - 2);
+                return sb.ToString(0, sb.Length - Environment.NewLine.Length);
             }
             return String.Empty;
         }

diff --git a/MvsSln/Core/ObjHandlers/WProjectSolutionItems.cs b/MvsSln/Core/ObjHandlers/WProjectSolutionItems.cs
@@ -46,7 +46,7 @@ public override string Extract(object data)
             }
 
             if(sb.Length > 1) {
-                return sb.ToString(0, sb.Length - 2);
+                return sb.ToString(0, sb.Length - Environment.NewLine.Length);
             }
             return String.Empty;
         }

diff --git a/MvsSln/Core/ObjHandlers/WVisualStudioVersion.cs b/MvsSln/Core/ObjHandlers/WVisualStudioVersion.cs
@@ -41,7 +41,7 @@ public override string Extract(object data)
                 sb.AppendLine($"MinimumVisualStudioVersion = {header.MinimumVisualStudioVersion.ToString()}");
             }
 
-            return sb.ToString(0, sb.Length - 2);
+            return sb.ToString(0, sb.Length - Environment.NewLine.Length);
         }
 
         public WVisualStudioVersion(SlnHeader header)

diff --git a/MvsSln/MvsSln.csproj b/MvsSln/MvsSln.csproj
@@ -3,7 +3,7 @@
   <Import Project="..\common.props" />
 
   <PropertyGroup>
-    <Version>2.6.1</Version>
+    <Version>2.6.2</Version>
     <BuildInfoVSSBE></BuildInfoVSSBE>
   </PropertyGroup>
 

diff --git a/MvsSln/MvsSlnVersion.cs b/MvsSln/MvsSlnVersion.cs
@@ -8,7 +8,7 @@ public struct MvsSlnVersion
     {
         public static readonly Version number = new Version(S_NUM_REV);
 
-        public const string S_NUM = "2.6.1";
+        public const string S_NUM = "2.6.2";
         public const string S_REV = "0";
 
         public const string S_NUM_REV = S_NUM + "." + S_REV;

diff --git a/changelog.txt b/changelog.txt
@@ -2,6 +2,12 @@
 MvsSln - https://github.com/3F/MvsSln
 - - - - - - - - - - - - - - - - - - - 
 
+[v2.6.2] 2023.07.12
+
+    * FIXED: Fix issue with string builder removing too much raw sln data on Unix platforms.
+             Related issue: https://github.com/3F/MvsSln/issues/57
+             Related PR: https://github.com/3F/MvsSln/pull/58
+
 [v2.6.1] 2022.02.01
 
     * FIXED: Incorrect project instances for the active solution configuration in XProject Environment.