diff --git a/src/BuildScriptGenerator/DotNetCore/DotnetCorePlatform.cs b/src/BuildScriptGenerator/DotNetCore/DotnetCorePlatform.cs
index fcf5be45e1..0d78770397 100644
--- a/src/BuildScriptGenerator/DotNetCore/DotnetCorePlatform.cs
+++ b/src/BuildScriptGenerator/DotNetCore/DotnetCorePlatform.cs
@@ -90,11 +90,12 @@ public BuildScriptSnippet GenerateBashBuildScriptSnippet(BuildScriptGeneratorCon
                 .AppendLine("set -e")
                 .AppendLine()
                 .AddScriptToCopyToIntermediateDirectory(
-                    sourceDir: sourceDir,
+                    sourceDir: ref sourceDir,
                     intermediateDir: intermediateDir,
-                    GetDirectoriesToExcludeFromCopyToIntermediateDir(context));
+                    GetDirectoriesToExcludeFromCopyToIntermediateDir(context))
+                .AppendFormatWithLine("cd \"{0}\"", sourceDir)
+                .AppendLine();
 
-            sourceDir = intermediateDir;
             scriptBuilder
                 .AddScriptToSetupSourceAndDestinationDirectories(
                     sourceDir: sourceDir,
diff --git a/src/BuildScriptGenerator/DotNetCore/ScriptBuilderExtensions.cs b/src/BuildScriptGenerator/DotNetCore/ScriptBuilderExtensions.cs
index 96d48a3765..030fd54643 100644
--- a/src/BuildScriptGenerator/DotNetCore/ScriptBuilderExtensions.cs
+++ b/src/BuildScriptGenerator/DotNetCore/ScriptBuilderExtensions.cs
@@ -15,7 +15,7 @@ internal static class ScriptBuilderExtensions
     {
         public static StringBuilder AddScriptToCopyToIntermediateDirectory(
             this StringBuilder scriptBuilder,
-            string sourceDir,
+            ref string sourceDir,
             string intermediateDir,
             IEnumerable<string> excludeDirs)
         {
@@ -33,7 +33,6 @@ public static StringBuilder AddScriptToCopyToIntermediateDirectory(
             }
 
             var excludeDirsSwitch = string.Join(" ", excludeDirs.Select(dir => $"--exclude \"{dir}\""));
-
             scriptBuilder
                 .AppendLine()
                 .AppendFormatWithLine("cd \"{0}\"", sourceDir)
@@ -42,7 +41,8 @@ public static StringBuilder AddScriptToCopyToIntermediateDirectory(
                     "rsync --delete -rt {0} . \"{1}\"",
                     excludeDirsSwitch,
                     intermediateDir)
-                .AppendFormatWithLine("cd \"{0}\"", intermediateDir);
+                .AppendLine();
+            sourceDir = intermediateDir;
             return scriptBuilder;
         }
 
@@ -92,7 +92,8 @@ public static StringBuilder AddScriptToSetupSourceAndDestinationDirectories(
         {
             scriptBuilder
                 .AppendFormatWithLine("SOURCE_DIR=\"{0}\"", sourceDir)
-                .AppendLine("export SOURCE_DIR");
+                .AppendLine("export SOURCE_DIR")
+                .AppendLine();
 
             if (hasUserSuppliedDestinationDir)
             {
@@ -223,7 +224,8 @@ public static StringBuilder AddScriptToBuildProject(this StringBuilder scriptBui
                 .AppendLine("echo")
                 .AppendFormatWithLine("echo \"Building project '{0}'\"", projectFile)
                 // Use the default build configuration 'Debug' here.
-                .AppendFormatWithLine("dotnet build \"{0}\"", projectFile);
+                .AppendFormatWithLine("dotnet build \"{0}\"", projectFile)
+                .AppendLine();
             return scriptBuilder;
         }
 
diff --git a/src/BuildScriptGenerator/ScriptBuilderExtensions.cs b/src/BuildScriptGenerator/ScriptBuilderExtensions.cs
index 95e57ac68b..303684118a 100644
--- a/src/BuildScriptGenerator/ScriptBuilderExtensions.cs
+++ b/src/BuildScriptGenerator/ScriptBuilderExtensions.cs
@@ -12,7 +12,9 @@ internal static class ScriptBuilderExtensions
     {
         public static StringBuilder AppendSourceDirectoryInfo(this StringBuilder stringBuilder, string sourceDir)
         {
-            stringBuilder.AppendFormatWithLine("echo Source directory     : {0}", sourceDir);
+            stringBuilder
+                .AppendFormatWithLine("echo Source directory     : {0}", sourceDir)
+                .AppendLine();
             return stringBuilder;
         }
 
@@ -20,7 +22,9 @@ public static StringBuilder AppendDestinationDirectoryInfo(
             this StringBuilder stringBuilder,
             string destinationDir)
         {
-            stringBuilder.AppendFormatWithLine("echo Destination directory : {0}", destinationDir);
+            stringBuilder
+                .AppendFormatWithLine("echo Destination directory : {0}", destinationDir)
+                .AppendLine();
             return stringBuilder;
         }
 
@@ -29,7 +33,9 @@ public static StringBuilder AppendBenvCommand(this StringBuilder stringBuilder,
             var benvPath = Path.Combine("/", "usr", "local", "bin", "benv");
             if (File.Exists(benvPath))
             {
-                stringBuilder.AppendFormatWithLine("source {0} {1}", benvPath, benvArgs);
+                stringBuilder
+                    .AppendFormatWithLine("source {0} {1}", benvPath, benvArgs)
+                    .AppendLine();
             }
 
             return stringBuilder;