Support spaces in pre- post and refactor log paths (#704)

* Support spaces in pre- post and refactor log paths

* fix up

Author: ErikEJ

src/MSBuild.Sdk.SqlProj/Sdk/Sdk.targets

@@ -163,8 +163,8 @@
   <Target Name="GetIncludedFiles" DependsOnTargets="ValidateEnvironment">
     <!-- Build arguments for the command line tool  -->
     <PropertyGroup>
-      <PreDeploymentScriptArgument>@(PreDeploy->'--predeploy %(Identity)', ' ')</PreDeploymentScriptArgument>
-      <PostDeploymentScriptArgument>@(PostDeploy->'--postdeploy %(Identity)', ' ')</PostDeploymentScriptArgument>
+      <PreDeploymentScriptArgument>@(PreDeploy->'--predeploy &quot;%(Identity)&quot;', ' ')</PreDeploymentScriptArgument>
+      <PostDeploymentScriptArgument>@(PostDeploy->'--postdeploy &quot;%(Identity)&quot;', ' ')</PostDeploymentScriptArgument>
       <DebugArgument Condition="'$(MSBuildSdkSqlProjDebug)' == 'True'">--debug</DebugArgument>
       <DacpacToolCommand>dotnet &quot;$(DacpacToolExe)&quot; collect-includes $(PreDeploymentScriptArgument) $(PostDeploymentScriptArgument) $(DebugArgument)</DacpacToolCommand>
     </PropertyGroup>
@@ -225,9 +225,9 @@
       <BuildPropertyArguments>@(BuildPropertyNames->'-bp %(Identity)=%(PropertyValue)', ' ')</BuildPropertyArguments>
       <DeployPropertyArguments>@(DeployPropertyNames->'-dp %(Identity)=%(PropertyValue)', ' ')</DeployPropertyArguments>
       <SqlCmdVariableArguments>@(SqlCmdVariable->'-sc %(Identity)=&quot;%(DefaultValue)&quot;', ' ')</SqlCmdVariableArguments>
-      <PreDeploymentScriptArgument>@(PreDeploy->'--predeploy %(Identity)', ' ')</PreDeploymentScriptArgument>
-      <PostDeploymentScriptArgument>@(PostDeploy->'--postdeploy %(Identity)', ' ')</PostDeploymentScriptArgument>
-      <RefactorLogScriptArgument>@(RefactorLog->'--refactorlog %(Identity)', ' ')</RefactorLogScriptArgument>
+      <PreDeploymentScriptArgument>@(PreDeploy->'--predeploy &quot;%(Identity)&quot;', ' ')</PreDeploymentScriptArgument>
+      <PostDeploymentScriptArgument>@(PostDeploy->'--postdeploy &quot;%(Identity)&quot;', ' ')</PostDeploymentScriptArgument>
+      <RefactorLogScriptArgument>@(RefactorLog->'--refactorlog &quot;%(Identity)&quot;', ' ')</RefactorLogScriptArgument>
       <RunSqlCodeAnalysisArgument Condition="'$(RunSqlCodeAnalysis)' == 'True'">-an</RunSqlCodeAnalysisArgument>
       <CodeAnalysisAssemblyLookupPathsArgument Condition="'$(RunSqlCodeAnalysis)' == 'True'">@(Analyzer->'-aa &quot;%(Identity)&quot;', ' ')</CodeAnalysisAssemblyLookupPathsArgument>
       <CodeAnalysisRulesArgument Condition="'$(CodeAnalysisRules)'!=''">-ar &quot;$(CodeAnalysisRules)&quot;</CodeAnalysisRulesArgument>

test/DacpacTool.Tests/PackageBuilderTests.cs

@@ -299,7 +299,7 @@ public void AddPreDeployment_FilesExist()
                 tempFile);
 
             packageBuilder.AddPostDeploymentScript(
-                new FileInfo("../../../../TestProjectWithPrePost/Post-Deployment/Script.PostDeployment.sql"),
+                new FileInfo("../../../../TestProjectWithPrePost/Post-Deployment/Script.Post Deployment.sql"),
                 tempFile);
 
             // Assert

test/DacpacTool.Tests/ScriptParserTests.cs

@@ -17,7 +17,7 @@ public class ScriptParserTests
         public void CanParseFileWithoutIncludes()
         {
             // Arrange
-            var collector = new ScriptParser($"{TEST_PROJECT_PATH}/Post-Deployment/Script.PostDeployment.sql", _variableResolver);
+            var collector = new ScriptParser($"{TEST_PROJECT_PATH}/Post-Deployment/Script.Post Deployment.sql", _variableResolver);
 
             // Act
             var result = collector.CollectFileNames();

test/TestProjectWithPrePost/Post-Deployment/Script.PostDeployment.sql test/TestProjectWithPrePost/Post-Deployment/Script.Post Deployment.sql

@@ -1,4 +1,4 @@
-<Project>
+<Project>
   <Import Project="$(MSBuildThisFileDirectory)..\..\src\MSBuild.Sdk.SqlProj\Sdk\Sdk.props" />
 
   <PropertyGroup>
@@ -12,7 +12,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PostDeploy Include="Post-Deployment\Script.PostDeployment.sql" />
+    <PostDeploy Include="Post-Deployment\Script.Post Deployment.sql" />
     <PreDeploy Include="Pre-Deployment\Script.PreDeployment.SimpleInclude.sql" />
     <RefactorLog Include="RefactorLog\TestProjectWithPrePost.refactorlog" />
   </ItemGroup>