Fix issue when project filenames contains whitespaces (#1093)

NuKeeperDotNet · Sep 20, 2021 · fd7b5e5 · fd7b5e5
1 parent a87453e
commit fd7b5e5
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/NuKeeper.Integration.Tests/NuGet/Process/DotNetUpdatePackageCommandTests.cs b/NuKeeper.Integration.Tests/NuGet/Process/DotNetUpdatePackageCommandTests.cs
@@ -109,6 +109,13 @@ public async Task ShouldUpdateDotnetClassicWithPackageReference()
             await ExecuteValidUpdateTest(_testDotNetClassicProject, PackageReferenceType.ProjectFileOldStyle);
         }
 
+        [Test]
+        public async Task ShouldUpdateProjectFilenameWithSpaces()
+        {
+            await ExecuteValidUpdateTest(_testDotNetClassicProject, PackageReferenceType.ProjectFileOldStyle, "Project With Spaces.csproj");
+        }
+
+
         private async Task ExecuteValidUpdateTest(
             string testProjectContents,
             PackageReferenceType packageReferenceType,

diff --git a/NuKeeper.Update/Process/DotNetUpdatePackageCommand.cs b/NuKeeper.Update/Process/DotNetUpdatePackageCommand.cs
@@ -37,20 +37,20 @@ public async Task Invoke(PackageInProject currentPackage,
             }
 
             var projectPath = currentPackage.Path.Info.DirectoryName;
-            var projectFileName = currentPackage.Path.Info.Name;
+            var projectFileNameCommandLine = ArgumentEscaper.EscapeAndConcatenate(new string[] { currentPackage.Path.Info.Name });
             var sourceUrl = UriEscapedForArgument(packageSource.SourceUri);
             var sources = allSources.CommandLine("-s");
 
-            var restoreCommand = $"restore {projectFileName} {sources}";
+            var restoreCommand = $"restore {projectFileNameCommandLine} {sources}";
             await _externalProcess.Run(projectPath, "dotnet", restoreCommand, true);
 
             if (currentPackage.Path.PackageReferenceType == PackageReferenceType.ProjectFileOldStyle)
             {
-                var removeCommand = $"remove {projectFileName} package {currentPackage.Id}";
+                var removeCommand = $"remove {projectFileNameCommandLine} package {currentPackage.Id}";
                 await _externalProcess.Run(projectPath, "dotnet", removeCommand, true);
             }
 
-            var addCommand = $"add {projectFileName} package {currentPackage.Id} -v {newVersion} -s {sourceUrl}";
+            var addCommand = $"add {projectFileNameCommandLine} package {currentPackage.Id} -v {newVersion} -s {sourceUrl}";
             await _externalProcess.Run(projectPath, "dotnet", addCommand, true);
         }