New slnx format uses forward slash

Author: GrahamTheCoder

CodeConverter/Common/SolutionFileTextEditor.cs

@@ -15,9 +15,21 @@ public class SolutionFileTextEditor : ISolutionFileTextEditor
         var projectReferenceReplacements = new List<(string Find, string Replace, bool FirstOnly)>();
         foreach (var relativeProjPath in relativeProjPaths)
         {
-            var escapedProjPath = Regex.Escape(relativeProjPath);
-            var newProjPath = PathConverter.TogglePathExtension(relativeProjPath);
-            projectReferenceReplacements.Add((escapedProjPath, newProjPath, false));
+            // Add replacements for both backslash and forward-slash variants so .slnx files using either separator are handled
+            var nativeVariant = relativeProjPath;
+            var altVariant = relativeProjPath.Replace(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar);
+
+            // native (likely backslashes on Windows)
+            var escapedNative = Regex.Escape(nativeVariant);
+            var newNative = PathConverter.TogglePathExtension(nativeVariant);
+            projectReferenceReplacements.Add((escapedNative, newNative, false));
+
+            // alternate (forward slashes)
+            if (altVariant != nativeVariant) {
+                var escapedAlt = Regex.Escape(altVariant);
+                var newAlt = PathConverter.TogglePathExtension(altVariant);
+                projectReferenceReplacements.Add((escapedAlt, newAlt, false));
+            }
         }
 
         return projectReferenceReplacements;

Tests/LanguageAgnostic/SolutionFileTextEditorTests.cs

@@ -58,6 +58,31 @@ public void ConvertSolutionFile_WhenInSolutionBaseDirThenUpdated()
         Assert.Equal(expectedSlnFile, Utils.HomogenizeEol(convertedSlnFile));
     }
 
+    [Fact]
+    public void ConvertSlnxSolutionFile_ProjectElementsWithForwardSlashesAreUpdated()
+    {
+        //Arrange
+        var slnxContents = "<Solution>\r\n  <Project Path=\"ConsoleApp1/ConsoleApp1.vbproj\" />\r\n</Solution>";
+        var slnxSln = CreateTestSolution(@"C:\MySolution\MySolution.slnx");
+        var projectId = ProjectId.CreateNewId();
+        var projInfo = ProjectInfo.Create(projectId, VersionStamp.Create(), "ConsoleApp1", "ConsoleApp1",
+            LanguageNames.VisualBasic, @"C:\MySolution\ConsoleApp1\ConsoleApp1.vbproj");
+        slnxSln = slnxSln.AddProject(projInfo);
+        var testProject = slnxSln.GetProject(projectId);
+
+        _fsMock.Setup(mock => mock.File.ReadAllText(It.IsAny<string>())).Returns("");
+
+        var slnConverter = SolutionConverter.CreateFor<VBToCSConversion>(new List<Project> { testProject },
+            fileSystem: _fsMock.Object, solutionContents: slnxContents);
+
+        //Act
+        var convertedSlnFile = slnConverter.ConvertSolutionFile().ConvertedCode;
+
+        //Assert
+        var expectedSlnFile = "<Solution>\r\n  <Project Path=\"ConsoleApp1/ConsoleApp1.csproj\" />\r\n</Solution>";
+        Assert.Equal(expectedSlnFile, Utils.HomogenizeEol(convertedSlnFile));
+    }
+
     [Fact]
     public void ConvertSolutionFile_WhenInProjectFolderThenUpdated()
     {