diff --git a/AspNetCoreSdkTests/Templates/AngularTemplate.cs b/AspNetCoreSdkTests/Templates/AngularTemplate.cs
index dfaf51ce10..b92579f0fd 100644
--- a/AspNetCoreSdkTests/Templates/AngularTemplate.cs
+++ b/AspNetCoreSdkTests/Templates/AngularTemplate.cs
@@ -10,20 +10,22 @@ namespace AspNetCoreSdkTests.Templates
 
         public override string Name => "angular";
 
-        public override IEnumerable<string> ExpectedFilesAfterPublish => Enumerable.Concat(base.ExpectedFilesAfterPublish, new[]
-        {
-            Path.Combine("wwwroot", "favicon.ico"),
-            Path.Combine("ClientApp", "dist", "3rdpartylicenses.txt"),
-            Path.Combine("ClientApp", "dist", "glyphicons-halflings-regular.448c34a56d699c29117a.woff2"),
-            Path.Combine("ClientApp", "dist", "glyphicons-halflings-regular.89889688147bd7575d63.svg"),
-            Path.Combine("ClientApp", "dist", "glyphicons-halflings-regular.e18bbf611f2a2e43afc0.ttf"),
-            Path.Combine("ClientApp", "dist", "glyphicons-halflings-regular.f4769f9bdb7466be6508.eot"),
-            Path.Combine("ClientApp", "dist", "glyphicons-halflings-regular.fa2772327f55d8198301.woff"),
-            Path.Combine("ClientApp", "dist", "index.html"),
-            Path.Combine("ClientApp", "dist", "inline.318b50c57b4eba3d437b.bundle.js"),
-            Path.Combine("ClientApp", "dist", "main.d2eed1593a6df639e365.bundle.js"),
-            Path.Combine("ClientApp", "dist", "polyfills.bf95165a1d5098766b92.bundle.js"),
-            Path.Combine("ClientApp", "dist", "styles.2727681ffee5a66f9fe6.bundle.css"),
-        });
+        public override IEnumerable<string> ExpectedFilesAfterPublish => 
+            base.ExpectedFilesAfterPublish
+            .Concat(new[]
+            {
+                Path.Combine("wwwroot", "favicon.ico"),
+                Path.Combine("ClientApp", "dist", "3rdpartylicenses.txt"),
+                Path.Combine("ClientApp", "dist", "glyphicons-halflings-regular.448c34a56d699c29117a.woff2"),
+                Path.Combine("ClientApp", "dist", "glyphicons-halflings-regular.89889688147bd7575d63.svg"),
+                Path.Combine("ClientApp", "dist", "glyphicons-halflings-regular.e18bbf611f2a2e43afc0.ttf"),
+                Path.Combine("ClientApp", "dist", "glyphicons-halflings-regular.f4769f9bdb7466be6508.eot"),
+                Path.Combine("ClientApp", "dist", "glyphicons-halflings-regular.fa2772327f55d8198301.woff"),
+                Path.Combine("ClientApp", "dist", "index.html"),
+                Path.Combine("ClientApp", "dist", "inline.318b50c57b4eba3d437b.bundle.js"),
+                Path.Combine("ClientApp", "dist", "main.d2eed1593a6df639e365.bundle.js"),
+                Path.Combine("ClientApp", "dist", "polyfills.bf95165a1d5098766b92.bundle.js"),
+                Path.Combine("ClientApp", "dist", "styles.2727681ffee5a66f9fe6.bundle.css"),
+            });
     }
 }
diff --git a/AspNetCoreSdkTests/Templates/ClassLibraryTemplate.cs b/AspNetCoreSdkTests/Templates/ClassLibraryTemplate.cs
index 95c0880c1f..ad8e54f94f 100644
--- a/AspNetCoreSdkTests/Templates/ClassLibraryTemplate.cs
+++ b/AspNetCoreSdkTests/Templates/ClassLibraryTemplate.cs
@@ -14,17 +14,19 @@ namespace AspNetCoreSdkTests.Templates
 
         public override TemplateType Type => TemplateType.ClassLibrary;
 
-        public override IEnumerable<string> ExpectedObjFilesAfterBuild => Enumerable.Concat(base.ExpectedObjFilesAfterBuild, new[]
-        {
-            $"{Name}.AssemblyInfo.cs",
-            $"{Name}.AssemblyInfoInputs.cache",
-            $"{Name}.assets.cache",
-            $"{Name}.csproj.CoreCompileInputs.cache",
-            $"{Name}.csproj.FileListAbsolute.txt",
-            $"{Name}.csprojAssemblyReference.cache",
-            $"{Name}.dll",
-            $"{Name}.pdb",
-        }.Select(p => Path.Combine(OutputPath, p)));
+        public override IEnumerable<string> ExpectedObjFilesAfterBuild => 
+            base.ExpectedObjFilesAfterBuild
+            .Concat(new[]
+            {
+                $"{Name}.AssemblyInfo.cs",
+                $"{Name}.AssemblyInfoInputs.cache",
+                $"{Name}.assets.cache",
+                $"{Name}.csproj.CoreCompileInputs.cache",
+                $"{Name}.csproj.FileListAbsolute.txt",
+                $"{Name}.csprojAssemblyReference.cache",
+                $"{Name}.dll",
+                $"{Name}.pdb",
+            }.Select(p => Path.Combine(OutputPath, p)));
 
         public override IEnumerable<string> ExpectedBinFilesAfterBuild => new[]
         {
diff --git a/AspNetCoreSdkTests/Templates/ConsoleApplicationTemplate.cs b/AspNetCoreSdkTests/Templates/ConsoleApplicationTemplate.cs
index 8728bc7a80..7e0610b06f 100644
--- a/AspNetCoreSdkTests/Templates/ConsoleApplicationTemplate.cs
+++ b/AspNetCoreSdkTests/Templates/ConsoleApplicationTemplate.cs
@@ -27,7 +27,8 @@ namespace AspNetCoreSdkTests.Templates
             };
 
         public override IEnumerable<string> ExpectedObjFilesAfterBuild =>
-            Enumerable.Concat(base.ExpectedObjFilesAfterBuild, _additionalObjFilesAfterBuild[RuntimeIdentifier]());
+            base.ExpectedObjFilesAfterBuild
+            .Concat(_additionalObjFilesAfterBuild[RuntimeIdentifier]());
 
         private IDictionary<RuntimeIdentifier, Func<IEnumerable<string>>> _additionalBinFilesAfterBuild =>
             new Dictionary<RuntimeIdentifier, Func<IEnumerable<string>>>()
@@ -38,7 +39,9 @@ namespace AspNetCoreSdkTests.Templates
                         $"{Name}.runtimeconfig.json",
                     }.Select(p => Path.Combine(OutputPath, p))
                 },
-                { RuntimeIdentifier.Win_x64, () => Enumerable.Concat(_additionalBinFilesAfterBuild[RuntimeIdentifier.None](), new[] 
+                { RuntimeIdentifier.Win_x64, () => 
+                    _additionalBinFilesAfterBuild[RuntimeIdentifier.None]()
+                    .Concat(new[] 
                     {
                         $"{Name}.exe",
                         "hostfxr.dll",
@@ -48,7 +51,8 @@ namespace AspNetCoreSdkTests.Templates
             };
 
         public override IEnumerable<string> ExpectedBinFilesAfterBuild =>
-            Enumerable.Concat(base.ExpectedBinFilesAfterBuild, _additionalBinFilesAfterBuild[RuntimeIdentifier]());
+            base.ExpectedBinFilesAfterBuild
+            .Concat(_additionalBinFilesAfterBuild[RuntimeIdentifier]());
 
         private IDictionary<RuntimeIdentifier, Func<IEnumerable<string>>> _additionalFilesAfterPublish =>
             new Dictionary<RuntimeIdentifier, Func<IEnumerable<string>>>()
@@ -58,7 +62,9 @@ namespace AspNetCoreSdkTests.Templates
                         $"{Name}.runtimeconfig.json",
                     }
                 },
-                { RuntimeIdentifier.Win_x64, () => Enumerable.Concat(_additionalFilesAfterPublish[RuntimeIdentifier.None](), new[]
+                { RuntimeIdentifier.Win_x64, () =>
+                    _additionalFilesAfterPublish[RuntimeIdentifier.None]()
+                    .Concat(new[]
                     {
                         $"{Name}.exe",
                         "api-ms-win-core-console-l1-1-0.dll",
@@ -278,7 +284,8 @@ namespace AspNetCoreSdkTests.Templates
             };
 
         public override IEnumerable<string> ExpectedFilesAfterPublish =>
-            Enumerable.Concat(base.ExpectedFilesAfterPublish, _additionalFilesAfterPublish[RuntimeIdentifier]());
+            base.ExpectedFilesAfterPublish
+            .Concat(_additionalFilesAfterPublish[RuntimeIdentifier]());
     }
 }
 
diff --git a/AspNetCoreSdkTests/Templates/MvcTemplate.cs b/AspNetCoreSdkTests/Templates/MvcTemplate.cs
index d33a3ab626..998422b6be 100644
--- a/AspNetCoreSdkTests/Templates/MvcTemplate.cs
+++ b/AspNetCoreSdkTests/Templates/MvcTemplate.cs
@@ -12,17 +12,19 @@ namespace AspNetCoreSdkTests.Templates
 
         protected override string RazorPath => "Views";
 
-        public override IEnumerable<string> ExpectedObjFilesAfterBuild => Enumerable.Concat(base.ExpectedObjFilesAfterBuild, new[]
-        {
-            Path.Combine("Razor", RazorPath, "_ViewStart.g.cshtml.cs"),
-            Path.Combine("Razor", RazorPath, "Home", "About.g.cshtml.cs"),
-            Path.Combine("Razor", RazorPath, "Home", "Contact.g.cshtml.cs"),
-            Path.Combine("Razor", RazorPath, "Home", "Index.g.cshtml.cs"),
-            Path.Combine("Razor", RazorPath, "Home", "Privacy.g.cshtml.cs"),
-            Path.Combine("Razor", RazorPath, "Shared", "_CookieConsentPartial.g.cshtml.cs"),
-            Path.Combine("Razor", RazorPath, "Shared", "_Layout.g.cshtml.cs"),
-            Path.Combine("Razor", RazorPath, "Shared", "_ValidationScriptsPartial.g.cshtml.cs"),
-            Path.Combine("Razor", RazorPath, "Shared", "Error.g.cshtml.cs"),
-        }.Select(p => Path.Combine(OutputPath, p)));
+        public override IEnumerable<string> ExpectedObjFilesAfterBuild =>
+            base.ExpectedObjFilesAfterBuild
+            .Concat(new[]
+            {
+                Path.Combine("Razor", RazorPath, "_ViewStart.g.cshtml.cs"),
+                Path.Combine("Razor", RazorPath, "Home", "About.g.cshtml.cs"),
+                Path.Combine("Razor", RazorPath, "Home", "Contact.g.cshtml.cs"),
+                Path.Combine("Razor", RazorPath, "Home", "Index.g.cshtml.cs"),
+                Path.Combine("Razor", RazorPath, "Home", "Privacy.g.cshtml.cs"),
+                Path.Combine("Razor", RazorPath, "Shared", "_CookieConsentPartial.g.cshtml.cs"),
+                Path.Combine("Razor", RazorPath, "Shared", "_Layout.g.cshtml.cs"),
+                Path.Combine("Razor", RazorPath, "Shared", "_ValidationScriptsPartial.g.cshtml.cs"),
+                Path.Combine("Razor", RazorPath, "Shared", "Error.g.cshtml.cs"),
+            }.Select(p => Path.Combine(OutputPath, p)));
     }
 }
diff --git a/AspNetCoreSdkTests/Templates/RazorApplicationBaseTemplate.cs b/AspNetCoreSdkTests/Templates/RazorApplicationBaseTemplate.cs
index b7564e8bfd..ee20b3a0ca 100644
--- a/AspNetCoreSdkTests/Templates/RazorApplicationBaseTemplate.cs
+++ b/AspNetCoreSdkTests/Templates/RazorApplicationBaseTemplate.cs
@@ -17,7 +17,9 @@ namespace AspNetCoreSdkTests.Templates
                         Path.Combine("Razor", RazorPath, "_ViewImports.g.cshtml.cs"),
                     }.Select(p => Path.Combine(OutputPath, p))
                 },
-                { RuntimeIdentifier.Win_x64, () => Enumerable.Concat(_additionalObjFilesAfterBuild[RuntimeIdentifier.None](), new[]
+                { RuntimeIdentifier.Win_x64, () =>
+                    _additionalObjFilesAfterBuild[RuntimeIdentifier.None]()
+                    .Concat(new[]
                     {
                         Path.Combine("netcoreapp2.1", RuntimeIdentifier.Path, "host", $"{Name}.exe"),
                     })
diff --git a/AspNetCoreSdkTests/Templates/RazorBootstrapJQueryTemplate.cs b/AspNetCoreSdkTests/Templates/RazorBootstrapJQueryTemplate.cs
index 9091939f4a..4a8d096a4b 100644
--- a/AspNetCoreSdkTests/Templates/RazorBootstrapJQueryTemplate.cs
+++ b/AspNetCoreSdkTests/Templates/RazorBootstrapJQueryTemplate.cs
@@ -6,49 +6,51 @@ namespace AspNetCoreSdkTests.Templates
 {
     public abstract class RazorBootstrapJQueryTemplate : RazorApplicationBaseTemplate
     {
-        public override IEnumerable<string> ExpectedFilesAfterPublish => Enumerable.Concat(base.ExpectedFilesAfterPublish, new[]
-        {
-            Path.Combine("wwwroot", "favicon.ico"),
-            Path.Combine("wwwroot", "css", "site.css"),
-            Path.Combine("wwwroot", "css", "site.min.css"),
-            Path.Combine("wwwroot", "images", "banner1.svg"),
-            Path.Combine("wwwroot", "images", "banner2.svg"),
-            Path.Combine("wwwroot", "images", "banner3.svg"),
-            Path.Combine("wwwroot", "js", "site.js"),
-            Path.Combine("wwwroot", "js", "site.min.js"),
-            Path.Combine("wwwroot", "lib", "bootstrap", ".bower.json"),
-            Path.Combine("wwwroot", "lib", "bootstrap", "LICENSE"),
-            Path.Combine("wwwroot", "lib", "bootstrap", "dist", "css", "bootstrap-theme.css"),
-            Path.Combine("wwwroot", "lib", "bootstrap", "dist", "css", "bootstrap-theme.css.map"),
-            Path.Combine("wwwroot", "lib", "bootstrap", "dist", "css", "bootstrap-theme.min.css"),
-            Path.Combine("wwwroot", "lib", "bootstrap", "dist", "css", "bootstrap-theme.min.css.map"),
-            Path.Combine("wwwroot", "lib", "bootstrap", "dist", "css", "bootstrap.css"),
-            Path.Combine("wwwroot", "lib", "bootstrap", "dist", "css", "bootstrap.css.map"),
-            Path.Combine("wwwroot", "lib", "bootstrap", "dist", "css", "bootstrap.min.css"),
-            Path.Combine("wwwroot", "lib", "bootstrap", "dist", "css", "bootstrap.min.css.map"),
-            Path.Combine("wwwroot", "lib", "bootstrap", "dist", "fonts", "glyphicons-halflings-regular.eot"),
-            Path.Combine("wwwroot", "lib", "bootstrap", "dist", "fonts", "glyphicons-halflings-regular.svg"),
-            Path.Combine("wwwroot", "lib", "bootstrap", "dist", "fonts", "glyphicons-halflings-regular.ttf"),
-            Path.Combine("wwwroot", "lib", "bootstrap", "dist", "fonts", "glyphicons-halflings-regular.woff"),
-            Path.Combine("wwwroot", "lib", "bootstrap", "dist", "fonts", "glyphicons-halflings-regular.woff2"),
-            Path.Combine("wwwroot", "lib", "bootstrap", "dist", "js", "bootstrap.js"),
-            Path.Combine("wwwroot", "lib", "bootstrap", "dist", "js", "bootstrap.min.js"),
-            Path.Combine("wwwroot", "lib", "bootstrap", "dist", "js", "npm.js"),
-            Path.Combine("wwwroot", "lib", "jquery", ".bower.json"),
-            Path.Combine("wwwroot", "lib", "jquery", "LICENSE.txt"),
-            Path.Combine("wwwroot", "lib", "jquery", "dist", "jquery.js"),
-            Path.Combine("wwwroot", "lib", "jquery", "dist", "jquery.min.js"),
-            Path.Combine("wwwroot", "lib", "jquery", "dist", "jquery.min.map"),
-            Path.Combine("wwwroot", "lib", "jquery-validation", ".bower.json"),
-            Path.Combine("wwwroot", "lib", "jquery-validation", "LICENSE.md"),
-            Path.Combine("wwwroot", "lib", "jquery-validation", "dist", "additional-methods.js"),
-            Path.Combine("wwwroot", "lib", "jquery-validation", "dist", "additional-methods.min.js"),
-            Path.Combine("wwwroot", "lib", "jquery-validation", "dist", "jquery.validate.js"),
-            Path.Combine("wwwroot", "lib", "jquery-validation", "dist", "jquery.validate.min.js"),
-            Path.Combine("wwwroot", "lib", "jquery-validation-unobtrusive", ".bower.json"),
-            Path.Combine("wwwroot", "lib", "jquery-validation-unobtrusive", "jquery.validate.unobtrusive.js"),
-            Path.Combine("wwwroot", "lib", "jquery-validation-unobtrusive", "jquery.validate.unobtrusive.min.js"),
-            Path.Combine("wwwroot", "lib", "jquery-validation-unobtrusive", "LICENSE.txt"),
-        });
+        public override IEnumerable<string> ExpectedFilesAfterPublish => 
+            base.ExpectedFilesAfterPublish
+            .Concat(new[]
+            {
+                Path.Combine("wwwroot", "favicon.ico"),
+                Path.Combine("wwwroot", "css", "site.css"),
+                Path.Combine("wwwroot", "css", "site.min.css"),
+                Path.Combine("wwwroot", "images", "banner1.svg"),
+                Path.Combine("wwwroot", "images", "banner2.svg"),
+                Path.Combine("wwwroot", "images", "banner3.svg"),
+                Path.Combine("wwwroot", "js", "site.js"),
+                Path.Combine("wwwroot", "js", "site.min.js"),
+                Path.Combine("wwwroot", "lib", "bootstrap", ".bower.json"),
+                Path.Combine("wwwroot", "lib", "bootstrap", "LICENSE"),
+                Path.Combine("wwwroot", "lib", "bootstrap", "dist", "css", "bootstrap-theme.css"),
+                Path.Combine("wwwroot", "lib", "bootstrap", "dist", "css", "bootstrap-theme.css.map"),
+                Path.Combine("wwwroot", "lib", "bootstrap", "dist", "css", "bootstrap-theme.min.css"),
+                Path.Combine("wwwroot", "lib", "bootstrap", "dist", "css", "bootstrap-theme.min.css.map"),
+                Path.Combine("wwwroot", "lib", "bootstrap", "dist", "css", "bootstrap.css"),
+                Path.Combine("wwwroot", "lib", "bootstrap", "dist", "css", "bootstrap.css.map"),
+                Path.Combine("wwwroot", "lib", "bootstrap", "dist", "css", "bootstrap.min.css"),
+                Path.Combine("wwwroot", "lib", "bootstrap", "dist", "css", "bootstrap.min.css.map"),
+                Path.Combine("wwwroot", "lib", "bootstrap", "dist", "fonts", "glyphicons-halflings-regular.eot"),
+                Path.Combine("wwwroot", "lib", "bootstrap", "dist", "fonts", "glyphicons-halflings-regular.svg"),
+                Path.Combine("wwwroot", "lib", "bootstrap", "dist", "fonts", "glyphicons-halflings-regular.ttf"),
+                Path.Combine("wwwroot", "lib", "bootstrap", "dist", "fonts", "glyphicons-halflings-regular.woff"),
+                Path.Combine("wwwroot", "lib", "bootstrap", "dist", "fonts", "glyphicons-halflings-regular.woff2"),
+                Path.Combine("wwwroot", "lib", "bootstrap", "dist", "js", "bootstrap.js"),
+                Path.Combine("wwwroot", "lib", "bootstrap", "dist", "js", "bootstrap.min.js"),
+                Path.Combine("wwwroot", "lib", "bootstrap", "dist", "js", "npm.js"),
+                Path.Combine("wwwroot", "lib", "jquery", ".bower.json"),
+                Path.Combine("wwwroot", "lib", "jquery", "LICENSE.txt"),
+                Path.Combine("wwwroot", "lib", "jquery", "dist", "jquery.js"),
+                Path.Combine("wwwroot", "lib", "jquery", "dist", "jquery.min.js"),
+                Path.Combine("wwwroot", "lib", "jquery", "dist", "jquery.min.map"),
+                Path.Combine("wwwroot", "lib", "jquery-validation", ".bower.json"),
+                Path.Combine("wwwroot", "lib", "jquery-validation", "LICENSE.md"),
+                Path.Combine("wwwroot", "lib", "jquery-validation", "dist", "additional-methods.js"),
+                Path.Combine("wwwroot", "lib", "jquery-validation", "dist", "additional-methods.min.js"),
+                Path.Combine("wwwroot", "lib", "jquery-validation", "dist", "jquery.validate.js"),
+                Path.Combine("wwwroot", "lib", "jquery-validation", "dist", "jquery.validate.min.js"),
+                Path.Combine("wwwroot", "lib", "jquery-validation-unobtrusive", ".bower.json"),
+                Path.Combine("wwwroot", "lib", "jquery-validation-unobtrusive", "jquery.validate.unobtrusive.js"),
+                Path.Combine("wwwroot", "lib", "jquery-validation-unobtrusive", "jquery.validate.unobtrusive.min.js"),
+                Path.Combine("wwwroot", "lib", "jquery-validation-unobtrusive", "LICENSE.txt"),
+            });
     }
 }
diff --git a/AspNetCoreSdkTests/Templates/RazorClassLibraryTemplate.cs b/AspNetCoreSdkTests/Templates/RazorClassLibraryTemplate.cs
index 0475f471d3..2fb23f4c55 100644
--- a/AspNetCoreSdkTests/Templates/RazorClassLibraryTemplate.cs
+++ b/AspNetCoreSdkTests/Templates/RazorClassLibraryTemplate.cs
@@ -256,7 +256,9 @@ namespace AspNetCoreSdkTests.Templates
         private IDictionary<RuntimeIdentifier, Func<IEnumerable<string>>> _additionalFilesAfterPublish =>
             new Dictionary<RuntimeIdentifier, Func<IEnumerable<string>>>()
             {
-                { RuntimeIdentifier.None, () => Enumerable.Concat(_commonAdditionalFilesAfterPublish, new[]
+                { RuntimeIdentifier.None, () => 
+                    _commonAdditionalFilesAfterPublish
+                    .Concat(new[]
                     {
                         Path.Combine("runtimes", "debian.8-x64", "native", "System.Security.Cryptography.Native.OpenSsl.so"),
                         Path.Combine("runtimes", "fedora.23-x64", "native", "System.Security.Cryptography.Native.OpenSsl.so"),
@@ -295,7 +297,9 @@ namespace AspNetCoreSdkTests.Templates
                         Path.Combine("runtimes", "win", "lib", "netstandard2.0", "System.Security.Cryptography.Pkcs.dll"),
                     })
                 },
-                { RuntimeIdentifier.Win_x64, () => Enumerable.Concat(_commonAdditionalFilesAfterPublish, new[]
+                { RuntimeIdentifier.Win_x64, () => 
+                    _commonAdditionalFilesAfterPublish
+                    .Concat(new[]
                     {
                         "System.Collections.dll",
                         "System.Console.dll",
diff --git a/AspNetCoreSdkTests/Templates/RazorTemplate.cs b/AspNetCoreSdkTests/Templates/RazorTemplate.cs
index c5da18e38d..f32afebcca 100644
--- a/AspNetCoreSdkTests/Templates/RazorTemplate.cs
+++ b/AspNetCoreSdkTests/Templates/RazorTemplate.cs
@@ -12,17 +12,19 @@ namespace AspNetCoreSdkTests.Templates
 
         protected override string RazorPath => "Pages";
 
-        public override IEnumerable<string> ExpectedObjFilesAfterBuild => Enumerable.Concat(base.ExpectedObjFilesAfterBuild, new[]
-        {
-            Path.Combine("Razor", RazorPath, "_ViewStart.g.cshtml.cs"),
-            Path.Combine("Razor", RazorPath, "About.g.cshtml.cs"),
-            Path.Combine("Razor", RazorPath, "Contact.g.cshtml.cs"),
-            Path.Combine("Razor", RazorPath, "Error.g.cshtml.cs"),
-            Path.Combine("Razor", RazorPath, "Index.g.cshtml.cs"),
-            Path.Combine("Razor", RazorPath, "Privacy.g.cshtml.cs"),
-            Path.Combine("Razor", RazorPath, "Shared", "_CookieConsentPartial.g.cshtml.cs"),
-            Path.Combine("Razor", RazorPath, "Shared", "_Layout.g.cshtml.cs"),
-            Path.Combine("Razor", RazorPath, "Shared", "_ValidationScriptsPartial.g.cshtml.cs"),
-        }.Select(p => Path.Combine(OutputPath, p)));
+        public override IEnumerable<string> ExpectedObjFilesAfterBuild => 
+            base.ExpectedObjFilesAfterBuild
+            .Concat(new[]
+            {
+                Path.Combine("Razor", RazorPath, "_ViewStart.g.cshtml.cs"),
+                Path.Combine("Razor", RazorPath, "About.g.cshtml.cs"),
+                Path.Combine("Razor", RazorPath, "Contact.g.cshtml.cs"),
+                Path.Combine("Razor", RazorPath, "Error.g.cshtml.cs"),
+                Path.Combine("Razor", RazorPath, "Index.g.cshtml.cs"),
+                Path.Combine("Razor", RazorPath, "Privacy.g.cshtml.cs"),
+                Path.Combine("Razor", RazorPath, "Shared", "_CookieConsentPartial.g.cshtml.cs"),
+                Path.Combine("Razor", RazorPath, "Shared", "_Layout.g.cshtml.cs"),
+                Path.Combine("Razor", RazorPath, "Shared", "_ValidationScriptsPartial.g.cshtml.cs"),
+            }.Select(p => Path.Combine(OutputPath, p)));
     }
 }
diff --git a/AspNetCoreSdkTests/Templates/ReactTemplate.cs b/AspNetCoreSdkTests/Templates/ReactTemplate.cs
index e8b4f21b23..20b5203279 100644
--- a/AspNetCoreSdkTests/Templates/ReactTemplate.cs
+++ b/AspNetCoreSdkTests/Templates/ReactTemplate.cs
@@ -10,22 +10,24 @@ namespace AspNetCoreSdkTests.Templates
 
         public override string Name => "react";
 
-        public override IEnumerable<string> ExpectedFilesAfterPublish => Enumerable.Concat(base.ExpectedFilesAfterPublish, new[]
-        {
-            Path.Combine("ClientApp", "build", "asset-manifest.json"),
-            Path.Combine("ClientApp", "build", "favicon.ico"),
-            Path.Combine("ClientApp", "build", "index.html"),
-            Path.Combine("ClientApp", "build", "manifest.json"),
-            Path.Combine("ClientApp", "build", "service-worker.js"),
-            Path.Combine("ClientApp", "build", "static", "css", "main.8302bbea.css"),
-            Path.Combine("ClientApp", "build", "static", "css", "main.8302bbea.css.map"),
-            Path.Combine("ClientApp", "build", "static", "js", "main.31eb739b.js"),
-            Path.Combine("ClientApp", "build", "static", "js", "main.31eb739b.js.map"),
-            Path.Combine("ClientApp", "build", "static", "media", "glyphicons-halflings-regular.448c34a5.woff2"),
-            Path.Combine("ClientApp", "build", "static", "media", "glyphicons-halflings-regular.89889688.svg"),
-            Path.Combine("ClientApp", "build", "static", "media", "glyphicons-halflings-regular.e18bbf61.ttf"),
-            Path.Combine("ClientApp", "build", "static", "media", "glyphicons-halflings-regular.f4769f9b.eot"),
-            Path.Combine("ClientApp", "build", "static", "media", "glyphicons-halflings-regular.fa277232.woff"),
-        });
+        public override IEnumerable<string> ExpectedFilesAfterPublish =>
+            base.ExpectedFilesAfterPublish
+            .Concat(new[]
+            {
+                Path.Combine("ClientApp", "build", "asset-manifest.json"),
+                Path.Combine("ClientApp", "build", "favicon.ico"),
+                Path.Combine("ClientApp", "build", "index.html"),
+                Path.Combine("ClientApp", "build", "manifest.json"),
+                Path.Combine("ClientApp", "build", "service-worker.js"),
+                Path.Combine("ClientApp", "build", "static", "css", "main.8302bbea.css"),
+                Path.Combine("ClientApp", "build", "static", "css", "main.8302bbea.css.map"),
+                Path.Combine("ClientApp", "build", "static", "js", "main.31eb739b.js"),
+                Path.Combine("ClientApp", "build", "static", "js", "main.31eb739b.js.map"),
+                Path.Combine("ClientApp", "build", "static", "media", "glyphicons-halflings-regular.448c34a5.woff2"),
+                Path.Combine("ClientApp", "build", "static", "media", "glyphicons-halflings-regular.89889688.svg"),
+                Path.Combine("ClientApp", "build", "static", "media", "glyphicons-halflings-regular.e18bbf61.ttf"),
+                Path.Combine("ClientApp", "build", "static", "media", "glyphicons-halflings-regular.f4769f9b.eot"),
+                Path.Combine("ClientApp", "build", "static", "media", "glyphicons-halflings-regular.fa277232.woff"),
+            });
     }
 }
diff --git a/AspNetCoreSdkTests/Templates/SpaBaseTemplate.cs b/AspNetCoreSdkTests/Templates/SpaBaseTemplate.cs
index 5745f3effc..b4694dc6f5 100644
--- a/AspNetCoreSdkTests/Templates/SpaBaseTemplate.cs
+++ b/AspNetCoreSdkTests/Templates/SpaBaseTemplate.cs
@@ -8,9 +8,11 @@ namespace AspNetCoreSdkTests.Templates
     {
         protected override string RazorPath => "Pages";
 
-        public override IEnumerable<string> ExpectedObjFilesAfterBuild => Enumerable.Concat(base.ExpectedObjFilesAfterBuild, new[]
-        {
-            Path.Combine("Razor", RazorPath, "Error.g.cshtml.cs"),
-        }.Select(p => Path.Combine(OutputPath, p)));
+        public override IEnumerable<string> ExpectedObjFilesAfterBuild =>
+            base.ExpectedObjFilesAfterBuild
+            .Concat(new[]
+            {
+                Path.Combine("Razor", RazorPath, "Error.g.cshtml.cs"),
+            }.Select(p => Path.Combine(OutputPath, p)));
     }
 }
diff --git a/AspNetCoreSdkTests/Templates/WebApiTemplate.cs b/AspNetCoreSdkTests/Templates/WebApiTemplate.cs
index f318940e7d..7a60537c2a 100644
--- a/AspNetCoreSdkTests/Templates/WebApiTemplate.cs
+++ b/AspNetCoreSdkTests/Templates/WebApiTemplate.cs
@@ -11,10 +11,12 @@ namespace AspNetCoreSdkTests.Templates
 
         public override string RelativeUrl => "/api/values";
 
-        public override IEnumerable<string> ExpectedFilesAfterPublish => Enumerable.Concat(base.ExpectedFilesAfterPublish, new[]
-        {
-            "appsettings.Development.json",
-            "appsettings.json",
-        });
+        public override IEnumerable<string> ExpectedFilesAfterPublish =>
+            base.ExpectedFilesAfterPublish
+            .Concat(new[]
+            {
+                "appsettings.Development.json",
+                "appsettings.json",
+            });
     }
 }
diff --git a/AspNetCoreSdkTests/Templates/WebTemplate.cs b/AspNetCoreSdkTests/Templates/WebTemplate.cs
index 2cc6d32e35..a48313ba54 100644
--- a/AspNetCoreSdkTests/Templates/WebTemplate.cs
+++ b/AspNetCoreSdkTests/Templates/WebTemplate.cs
@@ -13,12 +13,14 @@ namespace AspNetCoreSdkTests.Templates
 
         public override TemplateType Type => TemplateType.WebApplication;
 
-        public override IEnumerable<string> ExpectedObjFilesAfterBuild => Enumerable.Concat(base.ExpectedObjFilesAfterBuild, new[]
-        {
-            $"{Name}.RazorAssemblyInfo.cache",
-            $"{Name}.RazorAssemblyInfo.cs",
-            $"{Name}.RazorTargetAssemblyInfo.cache",
-        }.Select(p => Path.Combine(OutputPath, p)));
+        public override IEnumerable<string> ExpectedObjFilesAfterBuild => 
+            base.ExpectedObjFilesAfterBuild
+            .Concat(new[]
+            {
+                $"{Name}.RazorAssemblyInfo.cache",
+                $"{Name}.RazorAssemblyInfo.cs",
+                $"{Name}.RazorTargetAssemblyInfo.cache",
+            }.Select(p => Path.Combine(OutputPath, p)));
 
         private IDictionary<RuntimeIdentifier, Func<IEnumerable<string>>> _additionalFilesAfterPublish =>
             new Dictionary<RuntimeIdentifier, Func<IEnumerable<string>>>()
@@ -30,7 +32,9 @@ namespace AspNetCoreSdkTests.Templates
                         "web.config",
                     }
                 },
-                { RuntimeIdentifier.Win_x64, () => Enumerable.Concat(_additionalFilesAfterPublish[RuntimeIdentifier.None](), new[]
+                { RuntimeIdentifier.Win_x64, () =>
+                    _additionalFilesAfterPublish[RuntimeIdentifier.None]()
+                    .Concat(new[]
                     {
                         "Microsoft.AspNetCore.Antiforgery.dll",
                         "Microsoft.AspNetCore.Authentication.Abstractions.dll",
@@ -204,6 +208,7 @@ namespace AspNetCoreSdkTests.Templates
             };
 
         public override IEnumerable<string> ExpectedFilesAfterPublish =>
-            Enumerable.Concat(base.ExpectedFilesAfterPublish, _additionalFilesAfterPublish[RuntimeIdentifier]());
+            base.ExpectedFilesAfterPublish
+            .Concat(_additionalFilesAfterPublish[RuntimeIdentifier]());
     }
 }