diff --git a/eng/Signing.props b/eng/Signing.props
index c2aa12452..435899a7a 100644
--- a/eng/Signing.props
+++ b/eng/Signing.props
@@ -14,6 +14,10 @@
       <FileSignInfo Include = "Std.UriTemplate.dll" CertificateName="3PartySHA2"/>
       <FileSignInfo Include = "Spectre.Console.Cli.dll" CertificateName="3PartySHA2"/>
       <FileSignInfo Include = "Spectre.Console.dll" CertificateName="3PartySHA2"/>
+      <FileSignInfo Include = "Serilog.dll" CertificateName="3PartySHA2"/>
+      <FileSignInfo Include = "Serilog.Extensions.Logging.dll" CertificateName="3PartySHA2"/>
+      <FileSignInfo Include = "Serilog.Sinks.Console.dll" CertificateName="3PartySHA2"/>
+      <FileSignInfo Include = "Serilog.Sinks.File.dll" CertificateName="3PartySHA2"/>
   </ItemGroup>
 
   <ItemGroup Label="Code sign exclusions">
diff --git a/eng/Versions.DotNetScaffold.props b/eng/Versions.DotNetScaffold.props
index 280ec8a35..386567b9f 100644
--- a/eng/Versions.DotNetScaffold.props
+++ b/eng/Versions.DotNetScaffold.props
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-<VersionPrefix>9.0.1</VersionPrefix>
+    <VersionPrefix>9.0.1</VersionPrefix>
     <PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
-    <PreReleaseVersionIteration>10</PreReleaseVersionIteration>
+    <PreReleaseVersionIteration>1</PreReleaseVersionIteration>
     <IncludeSourceRevisionInInformationalVersion>False</IncludeSourceRevisionInInformationalVersion>
     <IsServicingBuild Condition="'$(PreReleaseVersionLabel)' == 'servicing'">true</IsServicingBuild>
     <!--
diff --git a/eng/Versions.props b/eng/Versions.props
index 64ba37f8c..02e92b060 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -54,6 +54,8 @@
     <MonoTextTemplatingVersion>3.0.0</MonoTextTemplatingVersion>
     <SpectreConsoleFlowVersion>0.5.638</SpectreConsoleFlowVersion>
     <SpectreConsoleVersion>0.47.0</SpectreConsoleVersion>
+    <SerilogPackageVersion>4.1.0</SerilogPackageVersion>
+    <SerilogExtensionsPackageVersion>8.0.0</SerilogExtensionsPackageVersion>
     <MicrosoftCodeAnalysisPreviewVersion>4.12.0</MicrosoftCodeAnalysisPreviewVersion>
     <MicrosoftCodeAnalysisVersion>4.12.0</MicrosoftCodeAnalysisVersion>
     <SystemCommandLinePackageVersion>2.0.0-beta4.22613.1</SystemCommandLinePackageVersion>
diff --git a/src/dotnet-scaffolding/Directory.Packages.props b/src/dotnet-scaffolding/Directory.Packages.props
index bdb35177b..a2717d2a3 100644
--- a/src/dotnet-scaffolding/Directory.Packages.props
+++ b/src/dotnet-scaffolding/Directory.Packages.props
@@ -24,6 +24,9 @@
     <PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftExtensionsLoggingConsolePackageVersion)" />
     <PackageVersion Include="Mono.TextTemplating" Version="$(MonoTextTemplatingVersion)" />
     <PackageVersion Include="Newtonsoft.Json" Version="$(NewtonsoftJsonPackageVersion)" />
+    <PackageVersion Include="Serilog.Extensions.Logging" Version="$(SerilogExtensionsPackageVersion)" />
+    <PackageVersion Include="Serilog.Sinks.File" Version="$(SerilogPackageVersion)" />
+    <PackageVersion Include="Serilog.Sinks.Console" Version="$(SerilogPackageVersion)" />
     <PackageVersion Include="Spectre.Console.Flow" Version="$(SpectreConsoleFlowVersion)" />
     <PackageVersion Include="Spectre.Console" Version="$(SpectreConsoleVersion)" />
     <PackageVersion Include="Spectre.Console.Cli" Version="$(SpectreConsoleVersion)" />
diff --git a/src/dotnet-scaffolding/Microsoft.DotNet.Scaffolding.Core/Builder/ScaffoldRunnerBuilder.cs b/src/dotnet-scaffolding/Microsoft.DotNet.Scaffolding.Core/Builder/ScaffoldRunnerBuilder.cs
index c45a7ce60..f9a2d5b77 100644
--- a/src/dotnet-scaffolding/Microsoft.DotNet.Scaffolding.Core/Builder/ScaffoldRunnerBuilder.cs
+++ b/src/dotnet-scaffolding/Microsoft.DotNet.Scaffolding.Core/Builder/ScaffoldRunnerBuilder.cs
@@ -2,9 +2,12 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using Microsoft.DotNet.Scaffolding.Core.CommandLine;
+using Microsoft.DotNet.Scaffolding.Core.ComponentModel;
 using Microsoft.DotNet.Scaffolding.Core.Logging;
+using Microsoft.DotNet.Scaffolding.Internal.Shared;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
+using Serilog;
 
 namespace Microsoft.DotNet.Scaffolding.Core.Builder;
 
@@ -20,7 +23,6 @@ internal class ScaffoldRunnerBuilder : IScaffoldRunnerBuilder
     public ScaffoldRunnerBuilder()
     {
         _logging = new LoggingBuilder(Services);
-
         AddDefaultServices();
     }
 
@@ -72,13 +74,49 @@ private void AddDefaultServices()
 
     private void AddCoreServices()
     {
-        Services.AddLogging();
-        Logging.AddCleanConsoleFormatter();
+        var loggerConfig = GetLoggingConfiguration();
+        Services.AddLogging(builder =>
+        {
+            builder.ClearProviders();
+            builder.AddSerilog(loggerConfig.CreateLogger(), dispose: true);
+        });
+
         Logging.AddDebug();
     }
 
+    private LoggerConfiguration GetLoggingConfiguration()
+    {
+        //get some logging properties from environment variables
+        var isVerboseEnabled = EnvironmentHelpers.GetEnvironmentVariableAsBool(ScaffolderConstants.ENABLE_VERBOSE_LOGGING);
+        var isLogToFileEnabled = EnvironmentHelpers.GetEnvironmentVariableAsBool(ScaffolderConstants.LOG_TO_FILE);
+        // Configure Serilog Logger
+        var loggerConfig = new LoggerConfiguration().WriteTo.Sink(new AnsiConsoleSink());
+        loggerConfig.MinimumLevel.Information();
+        if (isVerboseEnabled)
+        {
+            loggerConfig.MinimumLevel.Verbose();
+        }
+
+        if (isLogToFileEnabled)
+        {
+            var loggingDirectory = Path.Combine(EnvironmentHelpers.GetUserProfilePath(), _defaultLogFolder);
+            if (!Directory.Exists(loggingDirectory))
+            {
+                Directory.CreateDirectory(loggingDirectory);
+            }
+
+            var filePath = $"dotnet-scaffold-{DateTime.Now:yyyy-MM-dd_HH-mm}.log";
+            var logPath = StringUtil.GetUniqueFilePath(Path.Combine(loggingDirectory, filePath));
+            loggerConfig.WriteTo.File(logPath, rollingInterval: RollingInterval.Infinite);
+        }
+
+        return loggerConfig;
+    }
+
     private sealed class LoggingBuilder(IServiceCollection services) : ILoggingBuilder
     {
         public IServiceCollection Services { get; } = services;
     }
+
+    private readonly string _defaultLogFolder = Path.Combine(".dotnet-scaffold", ".logs");
 }
diff --git a/src/dotnet-scaffolding/Microsoft.DotNet.Scaffolding.Core/CommandLine/DotnetCommands.cs b/src/dotnet-scaffolding/Microsoft.DotNet.Scaffolding.Core/CommandLine/DotnetCommands.cs
index 7ead12911..f5aa4ad2b 100644
--- a/src/dotnet-scaffolding/Microsoft.DotNet.Scaffolding.Core/CommandLine/DotnetCommands.cs
+++ b/src/dotnet-scaffolding/Microsoft.DotNet.Scaffolding.Core/CommandLine/DotnetCommands.cs
@@ -1,6 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
-using Microsoft.DotNet.Scaffolding.Internal.CliHelpers;
+using Microsoft.DotNet.Scaffolding.Internal.Shared;
 using Microsoft.Extensions.Logging;
 
 namespace Microsoft.DotNet.Scaffolding.Core.CommandLine;
@@ -28,7 +28,7 @@ public static bool AddPackage(string packageName, ILogger logger, string? projec
                 arguments.Add("--prerelease");
             }
 
-            logger.LogInformation(string.Format("\nAdding package '{0}'...", packageName));
+            logger.LogInformation(string.Format("Adding package '{0}'...", packageName));
             var runner = DotnetCliRunner.CreateDotNet("add", arguments);
 
             // Buffer the output here because we'll only display it in the failure scenario
diff --git a/src/dotnet-scaffolding/Microsoft.DotNet.Scaffolding.Core/ComponentModel/ScaffolderConstants.cs b/src/dotnet-scaffolding/Microsoft.DotNet.Scaffolding.Core/ComponentModel/ScaffolderConstants.cs
index 435057178..813d2e404 100644
--- a/src/dotnet-scaffolding/Microsoft.DotNet.Scaffolding.Core/ComponentModel/ScaffolderConstants.cs
+++ b/src/dotnet-scaffolding/Microsoft.DotNet.Scaffolding.Core/ComponentModel/ScaffolderConstants.cs
@@ -4,5 +4,8 @@ namespace Microsoft.DotNet.Scaffolding.Core.ComponentModel;
 
 internal static class ScaffolderConstants
 {
+    internal const string LAUNCHED_BY_DOTNET_SCAFFOLD = "LAUNCHED_BY_DOTNET_SCAFFOLD";
     internal const string DEFAULT_CATEGORY = "All";
+    internal const string ENABLE_VERBOSE_LOGGING = "ENABLE_VERBOSE_LOGGING";
+    internal const string LOG_TO_FILE = "LOG_TO_FILE";
 }
diff --git a/src/dotnet-scaffolding/Microsoft.DotNet.Scaffolding.Core/Logging/AnsiConsoleSink.cs b/src/dotnet-scaffolding/Microsoft.DotNet.Scaffolding.Core/Logging/AnsiConsoleSink.cs
new file mode 100644
index 000000000..1d63253e9
--- /dev/null
+++ b/src/dotnet-scaffolding/Microsoft.DotNet.Scaffolding.Core/Logging/AnsiConsoleSink.cs
@@ -0,0 +1,43 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+using Microsoft.DotNet.Scaffolding.Core.ComponentModel;
+using Microsoft.DotNet.Scaffolding.Internal.Shared;
+using Serilog.Core;
+using Serilog.Events;
+using Spectre.Console;
+
+namespace Microsoft.DotNet.Scaffolding.Core.Logging;
+
+public class AnsiConsoleSink : ILogEventSink
+{
+    public void Emit(LogEvent logEvent)
+    {
+        //LAUNCHED_BY_DOTNET_SCAFFOLD should be "true", or some other value. "true" indicates being launched by dotnet-scaffold.
+        bool isLaunchedByDotnetScaffold = EnvironmentHelpers.GetEnvironmentVariableAsBool(ScaffolderConstants.LAUNCHED_BY_DOTNET_SCAFFOLD);
+        var formattedMessage = FormatMessage(logEvent.Level, logEvent.RenderMessage());
+        if (isLaunchedByDotnetScaffold && (Console.IsOutputRedirected || Console.IsErrorRedirected))
+        {
+            // Output plain markup for main app to handle
+            AnsiConsole.WriteLine(formattedMessage);
+        }
+        else
+        {
+            // Render colored output directly
+            AnsiConsole.MarkupLine(formattedMessage);
+        }
+    }
+
+    private string FormatMessage(LogEventLevel level, string message)
+    {
+        return level switch
+        {
+            LogEventLevel.Verbose => $"[gray]{message}[/]",
+            LogEventLevel.Debug => $"[gray]{message}[/]",
+            LogEventLevel.Information => $"[default]{message}[/]",
+            LogEventLevel.Warning => $"[yellow]{message}[/]",
+            LogEventLevel.Error => $"[red]{message}[/]",
+            LogEventLevel.Fatal => $"[bold red]{message}[/]",
+            _ => message
+        };
+    }
+}
diff --git a/src/dotnet-scaffolding/Microsoft.DotNet.Scaffolding.Core/Logging/CleanConsoleFormatter.cs b/src/dotnet-scaffolding/Microsoft.DotNet.Scaffolding.Core/Logging/CleanConsoleFormatter.cs
deleted file mode 100644
index 425b3c9ea..000000000
--- a/src/dotnet-scaffolding/Microsoft.DotNet.Scaffolding.Core/Logging/CleanConsoleFormatter.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Logging.Abstractions;
-using Microsoft.Extensions.Logging.Console;
-
-namespace Microsoft.DotNet.Scaffolding.Core.Logging;
-
-internal class CleanConsoleFormatter : ConsoleFormatter
-{
-    public CleanConsoleFormatter()
-        :base(nameof(CleanConsoleFormatter))
-    {
-
-    }
-
-    public override void Write<TState>(in LogEntry<TState> logEntry, IExternalScopeProvider? scopeProvider, TextWriter textWriter)
-    {
-        string? message = logEntry.Formatter?.Invoke(logEntry.State, logEntry.Exception);
-
-        if (message is not null)
-        {
-            textWriter.WriteLine(message);
-        }
-    }
-}
diff --git a/src/dotnet-scaffolding/Microsoft.DotNet.Scaffolding.Core/Logging/CleanConsoleFormatterOptions.cs b/src/dotnet-scaffolding/Microsoft.DotNet.Scaffolding.Core/Logging/CleanConsoleFormatterOptions.cs
deleted file mode 100644
index 2505ba8e9..000000000
--- a/src/dotnet-scaffolding/Microsoft.DotNet.Scaffolding.Core/Logging/CleanConsoleFormatterOptions.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using Microsoft.Extensions.Logging.Console;
-
-namespace Microsoft.DotNet.Scaffolding.Core.Logging;
-
-internal class CleanConsoleFormatterOptions : ConsoleFormatterOptions
-{
-    // No extra options for now
-}
diff --git a/src/dotnet-scaffolding/Microsoft.DotNet.Scaffolding.Core/Logging/ConsoleLoggerExtensions.cs b/src/dotnet-scaffolding/Microsoft.DotNet.Scaffolding.Core/Logging/ConsoleLoggerExtensions.cs
deleted file mode 100644
index 524e4f0d9..000000000
--- a/src/dotnet-scaffolding/Microsoft.DotNet.Scaffolding.Core/Logging/ConsoleLoggerExtensions.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using Microsoft.Extensions.Logging;
-
-namespace Microsoft.DotNet.Scaffolding.Core.Logging;
-
-internal static class ConsoleLoggerExtensions
-{
-    public static ILoggingBuilder AddCleanConsoleFormatter(this ILoggingBuilder builder)
-        => builder.AddConsole(options => options.FormatterName = nameof(CleanConsoleFormatter))
-                  .AddConsoleFormatter<CleanConsoleFormatter, CleanConsoleFormatterOptions>();
-}
diff --git a/src/dotnet-scaffolding/Microsoft.DotNet.Scaffolding.Core/Microsoft.DotNet.Scaffolding.Core.csproj b/src/dotnet-scaffolding/Microsoft.DotNet.Scaffolding.Core/Microsoft.DotNet.Scaffolding.Core.csproj
index 0b272058c..e8aad60d7 100644
--- a/src/dotnet-scaffolding/Microsoft.DotNet.Scaffolding.Core/Microsoft.DotNet.Scaffolding.Core.csproj
+++ b/src/dotnet-scaffolding/Microsoft.DotNet.Scaffolding.Core/Microsoft.DotNet.Scaffolding.Core.csproj
@@ -1,20 +1,25 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFrameworks>$(BuildTfm)</TargetFrameworks>
     <PackageTags>dotnet;scaffold;</PackageTags>
     <PackageReadmeFile>README.md</PackageReadmeFile>
+    <NoWarn>$(NoWarn);8002</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Hosting" />
+    <PackageReference Include="Serilog.Extensions.Logging" />
+    <PackageReference Include="Serilog.Sinks.File" />
+    <PackageReference Include="Serilog.Sinks.Console" />
+    <PackageReference Include="Spectre.Console.Cli" />
     <PackageReference Include="System.CommandLine" />
     <PackageReference Include="System.CommandLine.NamingConventionBinder" />
   </ItemGroup>
 
   <ItemGroup>
-    <Compile Include="$(RepoRoot)src\dotnet-scaffolding\Microsoft.DotNet.Scaffolding.Internal\CliHelpers\*.cs">
-      <Link>CliHelpers\%(Filename)%(Extension)</Link>
+    <Compile Include="$(RepoRoot)src\dotnet-scaffolding\Microsoft.DotNet.Scaffolding.Internal\Shared\*.cs">
+      <Link>Shared\%(Filename)%(Extension)</Link>
     </Compile>
   </ItemGroup>
 
diff --git a/src/dotnet-scaffolding/Microsoft.DotNet.Scaffolding.Internal/Constants.cs b/src/dotnet-scaffolding/Microsoft.DotNet.Scaffolding.Internal/Constants.cs
index 616084b35..66c368b97 100644
--- a/src/dotnet-scaffolding/Microsoft.DotNet.Scaffolding.Internal/Constants.cs
+++ b/src/dotnet-scaffolding/Microsoft.DotNet.Scaffolding.Internal/Constants.cs
@@ -3,16 +3,6 @@ namespace Microsoft.DotNet.Scaffolding.Internal;
 
 internal static class Constants
 {
-    public static class EnvironmentVariables
-    {
-        public const string MSBuildExtensionsPath32 = nameof(MSBuildExtensionsPath32);
-        public const string MSBuildExtensionsPath = nameof(MSBuildExtensionsPath);
-        public const string MSBUILD_EXE_PATH = nameof(MSBUILD_EXE_PATH);
-        public const string MSBuildSDKsPath = nameof(MSBuildSDKsPath);
-        public const string USERPROFILE = nameof(USERPROFILE);
-        public const string VSINSTALLDIR = nameof(VSINSTALLDIR);
-    }
-
     public static class StepConstants
     {
         public const string BaseProjectPath = nameof(BaseProjectPath);
diff --git a/src/dotnet-scaffolding/Microsoft.DotNet.Scaffolding.Internal/Services/EnvironmentService.cs b/src/dotnet-scaffolding/Microsoft.DotNet.Scaffolding.Internal/Services/EnvironmentService.cs
index 8c653a9de..3cd3d993e 100644
--- a/src/dotnet-scaffolding/Microsoft.DotNet.Scaffolding.Internal/Services/EnvironmentService.cs
+++ b/src/dotnet-scaffolding/Microsoft.DotNet.Scaffolding.Internal/Services/EnvironmentService.cs
@@ -1,5 +1,5 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-using System.Runtime.InteropServices;
+using Microsoft.DotNet.Scaffolding.Internal.Shared;
 
 namespace Microsoft.DotNet.Scaffolding.Internal.Services;
 /// <summary>
@@ -33,16 +33,7 @@ public static string LocalNugetCachePath
         }
     }
 
-    public static string LocalUserProfilePath
-    {
-        get
-        {
-            return System.Environment.GetEnvironmentVariable(
-                    RuntimeInformation.IsOSPlatform(OSPlatform.Windows)
-                        ? "USERPROFILE"
-                        : "HOME") ?? "USERPROFILE";
-        }
-    }
+    public static string LocalUserProfilePath => EnvironmentHelpers.GetUserProfilePath();
 
     public const string DotnetProfileDirectoryName = ".dotnet";
 
@@ -123,25 +114,7 @@ public string GetMachineName()
     /// <inheritdoc />
     public bool GetEnvironmentVariableAsBool(string name, bool defaultValue = false)
     {
-        var str = Environment.GetEnvironmentVariable(name);
-        if (string.IsNullOrEmpty(str))
-        {
-            return defaultValue;
-        }
-
-        switch (str.ToLowerInvariant())
-        {
-            case "true":
-            case "1":
-            case "yes":
-                return true;
-            case "false":
-            case "0":
-            case "no":
-                return false;
-            default:
-                return defaultValue;
-        }
+        return EnvironmentHelpers.GetEnvironmentVariableAsBool(name, defaultValue);
     }
 
     /// <inheritdoc />
diff --git a/src/dotnet-scaffolding/Microsoft.DotNet.Scaffolding.Internal/Services/MacAddressGetter.cs b/src/dotnet-scaffolding/Microsoft.DotNet.Scaffolding.Internal/Services/MacAddressGetter.cs
index f37c6ac97..b5c357161 100644
--- a/src/dotnet-scaffolding/Microsoft.DotNet.Scaffolding.Internal/Services/MacAddressGetter.cs
+++ b/src/dotnet-scaffolding/Microsoft.DotNet.Scaffolding.Internal/Services/MacAddressGetter.cs
@@ -4,7 +4,7 @@
 using System.Net.NetworkInformation;
 using System.Runtime.InteropServices;
 using System.Text.RegularExpressions;
-using Microsoft.DotNet.Scaffolding.Internal.CliHelpers;
+using Microsoft.DotNet.Scaffolding.Internal.Shared;
 
 namespace Microsoft.DotNet.Scaffolding.Internal.Services;
 
diff --git a/src/dotnet-scaffolding/Microsoft.DotNet.Scaffolding.Internal/CliHelpers/ArgumentEscaper.cs b/src/dotnet-scaffolding/Microsoft.DotNet.Scaffolding.Internal/Shared/ArgumentEscaper.cs
similarity index 98%
rename from src/dotnet-scaffolding/Microsoft.DotNet.Scaffolding.Internal/CliHelpers/ArgumentEscaper.cs
rename to src/dotnet-scaffolding/Microsoft.DotNet.Scaffolding.Internal/Shared/ArgumentEscaper.cs
index 32e4e87b3..0f1475e2e 100644
--- a/src/dotnet-scaffolding/Microsoft.DotNet.Scaffolding.Internal/CliHelpers/ArgumentEscaper.cs
+++ b/src/dotnet-scaffolding/Microsoft.DotNet.Scaffolding.Internal/Shared/ArgumentEscaper.cs
@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System.Text;
 
-namespace Microsoft.DotNet.Scaffolding.Internal.CliHelpers;
+namespace Microsoft.DotNet.Scaffolding.Internal.Shared;
 
 internal static class ArgumentEscaper
 {
diff --git a/src/dotnet-scaffolding/Microsoft.DotNet.Scaffolding.Internal/CliHelpers/DotnetCliRunner.cs b/src/dotnet-scaffolding/Microsoft.DotNet.Scaffolding.Internal/Shared/DotnetCliRunner.cs
similarity index 98%
rename from src/dotnet-scaffolding/Microsoft.DotNet.Scaffolding.Internal/CliHelpers/DotnetCliRunner.cs
rename to src/dotnet-scaffolding/Microsoft.DotNet.Scaffolding.Internal/Shared/DotnetCliRunner.cs
index 514795019..7998af5e9 100644
--- a/src/dotnet-scaffolding/Microsoft.DotNet.Scaffolding.Internal/CliHelpers/DotnetCliRunner.cs
+++ b/src/dotnet-scaffolding/Microsoft.DotNet.Scaffolding.Internal/Shared/DotnetCliRunner.cs
@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System.Diagnostics;
 
-namespace Microsoft.DotNet.Scaffolding.Internal.CliHelpers;
+namespace Microsoft.DotNet.Scaffolding.Internal.Shared;
 
 /// <summary>
 /// To run 'dotnet' or any processes and capture consequent stdout and stderr (using 'ExecuteAndCaptureOutput'
diff --git a/src/dotnet-scaffolding/Microsoft.DotNet.Scaffolding.Internal/Shared/EnvironmentHelpers.cs b/src/dotnet-scaffolding/Microsoft.DotNet.Scaffolding.Internal/Shared/EnvironmentHelpers.cs
new file mode 100644
index 000000000..4c1ed7fe8
--- /dev/null
+++ b/src/dotnet-scaffolding/Microsoft.DotNet.Scaffolding.Internal/Shared/EnvironmentHelpers.cs
@@ -0,0 +1,39 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+using System.Runtime.InteropServices;
+
+namespace Microsoft.DotNet.Scaffolding.Internal.Shared;
+
+internal static class EnvironmentHelpers
+{
+    public static bool GetEnvironmentVariableAsBool(string name, bool defaultValue = false)
+    {
+        var str = Environment.GetEnvironmentVariable(name);
+        if (string.IsNullOrEmpty(str))
+        {
+            return defaultValue;
+        }
+
+        switch (str.ToLowerInvariant())
+        {
+            case "true":
+            case "1":
+            case "yes":
+                return true;
+            case "false":
+            case "0":
+            case "no":
+                return false;
+            default:
+                return defaultValue;
+        }
+    }
+
+    public static string GetUserProfilePath()
+    {
+        return Environment.GetEnvironmentVariable(
+            RuntimeInformation.IsOSPlatform(OSPlatform.Windows)
+                ? "USERPROFILE"
+                : "HOME") ?? "USERPROFILE";
+    }
+}
diff --git a/src/dotnet-scaffolding/Microsoft.DotNet.Scaffolding.Internal/CliHelpers/ProcessOutputStreamReader.cs b/src/dotnet-scaffolding/Microsoft.DotNet.Scaffolding.Internal/Shared/ProcessOutputStreamReader.cs
similarity index 97%
rename from src/dotnet-scaffolding/Microsoft.DotNet.Scaffolding.Internal/CliHelpers/ProcessOutputStreamReader.cs
rename to src/dotnet-scaffolding/Microsoft.DotNet.Scaffolding.Internal/Shared/ProcessOutputStreamReader.cs
index b53a06ac1..597b0b26d 100644
--- a/src/dotnet-scaffolding/Microsoft.DotNet.Scaffolding.Internal/CliHelpers/ProcessOutputStreamReader.cs
+++ b/src/dotnet-scaffolding/Microsoft.DotNet.Scaffolding.Internal/Shared/ProcessOutputStreamReader.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 using System.Text;
 
-namespace Microsoft.DotNet.Scaffolding.Internal.CliHelpers;
+namespace Microsoft.DotNet.Scaffolding.Internal.Shared;
 
 internal sealed class ProcessOutputStreamReader : IDisposable
 {
diff --git a/src/dotnet-scaffolding/Microsoft.DotNet.Scaffolding.Internal/StringUtil.cs b/src/dotnet-scaffolding/Microsoft.DotNet.Scaffolding.Internal/Shared/StringUtil.cs
similarity index 98%
rename from src/dotnet-scaffolding/Microsoft.DotNet.Scaffolding.Internal/StringUtil.cs
rename to src/dotnet-scaffolding/Microsoft.DotNet.Scaffolding.Internal/Shared/StringUtil.cs
index b400dcec0..c53774140 100644
--- a/src/dotnet-scaffolding/Microsoft.DotNet.Scaffolding.Internal/StringUtil.cs
+++ b/src/dotnet-scaffolding/Microsoft.DotNet.Scaffolding.Internal/Shared/StringUtil.cs
@@ -1,6 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
-namespace Microsoft.DotNet.Scaffolding.Internal;
+namespace Microsoft.DotNet.Scaffolding.Internal.Shared;
 
 internal static class StringUtil
 {
@@ -203,7 +203,7 @@ public static string GetUniqueFilePath(string filePath)
         string newFilePath;
         do
         {
-            newFilePath = Path.Combine(directory, $"{fileNameWithoutExtension}{count}{fileExtension}");
+            newFilePath = Path.Combine(directory, $"{fileNameWithoutExtension}-{count}{fileExtension}");
             count++;
         } while (File.Exists(newFilePath));
 
diff --git a/src/dotnet-scaffolding/Microsoft.DotNet.Scaffolding.Roslyn/Services/CodeService.cs b/src/dotnet-scaffolding/Microsoft.DotNet.Scaffolding.Roslyn/Services/CodeService.cs
index 8dbce6ad3..a0f8dc961 100644
--- a/src/dotnet-scaffolding/Microsoft.DotNet.Scaffolding.Roslyn/Services/CodeService.cs
+++ b/src/dotnet-scaffolding/Microsoft.DotNet.Scaffolding.Roslyn/Services/CodeService.cs
@@ -75,7 +75,6 @@ public bool TryApplyChanges(Solution? solution)
     private async Task<MSBuildWorkspace?> GetMsBuildWorkspaceAsync(bool refresh = false)
     {
         EnsureInitialized();
-
         if (_workspace is not null && !refresh)
         {
             return _workspace;
@@ -140,10 +139,9 @@ public async Task ReloadWorkspaceAsync()
         await GetMsBuildWorkspaceAsync(refresh: true);
     }
 
-    //TODO add a debug option to logging.
     private void OnWorkspaceFailed(object? sender, WorkspaceDiagnosticEventArgs e)
     {
-        var diagnostic = e.Diagnostic!;
+        _logger.LogDebug(e.Diagnostic.Message);
     }
 
     public void Dispose()
diff --git a/src/dotnet-scaffolding/Microsoft.DotNet.Scaffolding.Roslyn/Services/MsBuildInitializer.cs b/src/dotnet-scaffolding/Microsoft.DotNet.Scaffolding.Roslyn/Services/MsBuildInitializer.cs
index 0f9178cc9..c0ae0d79b 100644
--- a/src/dotnet-scaffolding/Microsoft.DotNet.Scaffolding.Roslyn/Services/MsBuildInitializer.cs
+++ b/src/dotnet-scaffolding/Microsoft.DotNet.Scaffolding.Roslyn/Services/MsBuildInitializer.cs
@@ -27,11 +27,12 @@ private void RegisterMsbuild()
     {
         if (!MSBuildLocator.IsRegistered)
         {
+            _logger.LogTrace($"Initializing MSBuild in '{nameof(MsBuildInitializer)}.Initialize()...'");
             // Path to the directory containing the SDKs
             string sdkBasePath = GetDefaultSdkPath();
             if (!Directory.Exists(sdkBasePath))
             {
-                _logger.LogInformation($"Could not find a .NET SDK at the default locations.");
+                _logger.LogDebug($"Could not find a .NET SDK at the default locations.");
                 MSBuildLocator.RegisterDefaults();
                 return;
             }
@@ -45,7 +46,7 @@ private void RegisterMsbuild()
 
             if (!sdkPaths.Any())
             {
-                _logger.LogInformation($"Could not find a .NET SDK at the default locations.");
+                _logger.LogDebug($"No sdk locations found, using MSBuildLocator.RegisterDefaults()");
                 MSBuildLocator.RegisterDefaults();
                 return;
             }
@@ -56,10 +57,19 @@ private void RegisterMsbuild()
                 if (File.Exists(msbuildPath))
                 {
                     // Register the latest SDK
+                    _logger.LogTrace($"Registering MSBuild at path '{sdkPath}'");
                     MSBuildLocator.RegisterMSBuildPath(sdkPath);
                     break;
                 }
             }
+
+            if (!MSBuildLocator.IsRegistered)
+            {
+                _logger.LogDebug($"MSBuild.dll not found at default locations.");
+                MSBuildLocator.RegisterDefaults();
+            }
+
+            _logger.LogTrace("Done");
         }
     }
 
diff --git a/src/dotnet-scaffolding/Microsoft.DotNet.Scaffolding.TextTemplating/TextTemplatingStep.cs b/src/dotnet-scaffolding/Microsoft.DotNet.Scaffolding.TextTemplating/TextTemplatingStep.cs
index 416bcbdec..4970cd57f 100644
--- a/src/dotnet-scaffolding/Microsoft.DotNet.Scaffolding.TextTemplating/TextTemplatingStep.cs
+++ b/src/dotnet-scaffolding/Microsoft.DotNet.Scaffolding.TextTemplating/TextTemplatingStep.cs
@@ -77,7 +77,7 @@ public override Task<bool> ExecuteAsync(ScaffolderContext context, CancellationT
             }
         }
 
-        _logger.LogInformation("Done\n");
+        _logger.LogInformation("Done");
         return Task.FromResult(true);
     }
 }
diff --git a/src/dotnet-scaffolding/dotnet-scaffold-aspire/Helpers/ValidationHelper.cs b/src/dotnet-scaffolding/dotnet-scaffold-aspire/Helpers/ValidationHelper.cs
index f7792efc6..241c49698 100644
--- a/src/dotnet-scaffolding/dotnet-scaffold-aspire/Helpers/ValidationHelper.cs
+++ b/src/dotnet-scaffolding/dotnet-scaffold-aspire/Helpers/ValidationHelper.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using Microsoft.DotNet.Scaffolding.Core.Scaffolders;
 using Microsoft.DotNet.Scaffolding.Internal;
+using Microsoft.DotNet.Scaffolding.Internal.Shared;
 using Microsoft.DotNet.Scaffolding.TextTemplating.DbContext;
 using Microsoft.Extensions.Logging;
 
diff --git a/src/dotnet-scaffolding/dotnet-scaffold-aspnet/Helpers/AspNetDbContextHelper.cs b/src/dotnet-scaffolding/dotnet-scaffold-aspnet/Helpers/AspNetDbContextHelper.cs
index eed8f9b34..66bc332a7 100644
--- a/src/dotnet-scaffolding/dotnet-scaffold-aspnet/Helpers/AspNetDbContextHelper.cs
+++ b/src/dotnet-scaffolding/dotnet-scaffold-aspnet/Helpers/AspNetDbContextHelper.cs
@@ -1,6 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
-using Microsoft.DotNet.Scaffolding.Internal;
+using Microsoft.DotNet.Scaffolding.Internal.Shared;
 using Microsoft.DotNet.Scaffolding.TextTemplating.DbContext;
 using Microsoft.DotNet.Tools.Scaffold.AspNet.Common;
 using Constants = Microsoft.DotNet.Scaffolding.Internal.Constants;
diff --git a/src/dotnet-scaffolding/dotnet-scaffold-aspnet/Helpers/BlazorIdentityHelper.cs b/src/dotnet-scaffolding/dotnet-scaffold-aspnet/Helpers/BlazorIdentityHelper.cs
index 2e7119b99..3a2f07e59 100644
--- a/src/dotnet-scaffolding/dotnet-scaffold-aspnet/Helpers/BlazorIdentityHelper.cs
+++ b/src/dotnet-scaffolding/dotnet-scaffold-aspnet/Helpers/BlazorIdentityHelper.cs
@@ -1,7 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 using System.Reflection;
-using Microsoft.DotNet.Scaffolding.Internal;
+using Microsoft.DotNet.Scaffolding.Internal.Shared;
 using Microsoft.DotNet.Scaffolding.TextTemplating;
 using Microsoft.DotNet.Tools.Scaffold.AspNet.Models;
 using Microsoft.DotNet.Tools.Scaffold.AspNet.Templates.Files;
diff --git a/src/dotnet-scaffolding/dotnet-scaffold-aspnet/Helpers/CommandHelpers.cs b/src/dotnet-scaffolding/dotnet-scaffold-aspnet/Helpers/CommandHelpers.cs
index aef6a86e4..71c9f9403 100644
--- a/src/dotnet-scaffolding/dotnet-scaffold-aspnet/Helpers/CommandHelpers.cs
+++ b/src/dotnet-scaffolding/dotnet-scaffold-aspnet/Helpers/CommandHelpers.cs
@@ -1,6 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
-using Microsoft.DotNet.Scaffolding.Internal;
+using Microsoft.DotNet.Scaffolding.Internal.Shared;
 
 namespace Microsoft.DotNet.Tools.Scaffold.AspNet.Helpers;
 
diff --git a/src/dotnet-scaffolding/dotnet-scaffold-aspnet/Helpers/IdentityHelper.cs b/src/dotnet-scaffolding/dotnet-scaffold-aspnet/Helpers/IdentityHelper.cs
index adf90007a..3a2b4f97b 100644
--- a/src/dotnet-scaffolding/dotnet-scaffold-aspnet/Helpers/IdentityHelper.cs
+++ b/src/dotnet-scaffolding/dotnet-scaffold-aspnet/Helpers/IdentityHelper.cs
@@ -1,10 +1,10 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
-using Microsoft.DotNet.Scaffolding.Internal;
+using System.Reflection;
+using Microsoft.DotNet.Scaffolding.Internal.Shared;
 using Microsoft.DotNet.Scaffolding.TextTemplating;
 using Microsoft.DotNet.Tools.Scaffold.AspNet.Models;
 using Microsoft.DotNet.Tools.Scaffold.AspNet.Templates.Files;
-using System.Reflection;
 
 namespace Microsoft.DotNet.Tools.Scaffold.AspNet.Helpers;
 
diff --git a/src/dotnet-scaffolding/dotnet-scaffold-aspnet/ScaffoldSteps/DotnetNewScaffolderStep.cs b/src/dotnet-scaffolding/dotnet-scaffold-aspnet/ScaffoldSteps/DotnetNewScaffolderStep.cs
index 5e94c62ca..adefecd08 100644
--- a/src/dotnet-scaffolding/dotnet-scaffold-aspnet/ScaffoldSteps/DotnetNewScaffolderStep.cs
+++ b/src/dotnet-scaffolding/dotnet-scaffold-aspnet/ScaffoldSteps/DotnetNewScaffolderStep.cs
@@ -3,8 +3,8 @@
 using System.Globalization;
 using Microsoft.DotNet.Scaffolding.Core.Scaffolders;
 using Microsoft.DotNet.Scaffolding.Core.Steps;
-using Microsoft.DotNet.Scaffolding.Internal.CliHelpers;
 using Microsoft.DotNet.Scaffolding.Internal.Services;
+using Microsoft.DotNet.Scaffolding.Internal.Shared;
 using Microsoft.DotNet.Scaffolding.Internal.Telemetry;
 using Microsoft.DotNet.Tools.Scaffold.AspNet.Common;
 using Microsoft.DotNet.Tools.Scaffold.AspNet.ScaffoldSteps.Settings;
diff --git a/src/dotnet-scaffolding/dotnet-scaffold-aspnet/ScaffoldSteps/EmptyControllerScaffolderStep.cs b/src/dotnet-scaffolding/dotnet-scaffold-aspnet/ScaffoldSteps/EmptyControllerScaffolderStep.cs
index 1ebfad0be..7e025b05e 100644
--- a/src/dotnet-scaffolding/dotnet-scaffold-aspnet/ScaffoldSteps/EmptyControllerScaffolderStep.cs
+++ b/src/dotnet-scaffolding/dotnet-scaffold-aspnet/ScaffoldSteps/EmptyControllerScaffolderStep.cs
@@ -3,8 +3,8 @@
 using System.Globalization;
 using Microsoft.DotNet.Scaffolding.Core.Scaffolders;
 using Microsoft.DotNet.Scaffolding.Core.Steps;
-using Microsoft.DotNet.Scaffolding.Internal.CliHelpers;
 using Microsoft.DotNet.Scaffolding.Internal.Services;
+using Microsoft.DotNet.Scaffolding.Internal.Shared;
 using Microsoft.DotNet.Scaffolding.Internal.Telemetry;
 using Microsoft.DotNet.Tools.Scaffold.AspNet.ScaffoldSteps.Settings;
 using Microsoft.DotNet.Tools.Scaffold.AspNet.Telemetry;
diff --git a/src/dotnet-scaffolding/dotnet-scaffold-aspnet/ScaffoldSteps/ValidateBlazorCrudStep.cs b/src/dotnet-scaffolding/dotnet-scaffold-aspnet/ScaffoldSteps/ValidateBlazorCrudStep.cs
index 98d957f2e..a1bc70df0 100644
--- a/src/dotnet-scaffolding/dotnet-scaffold-aspnet/ScaffoldSteps/ValidateBlazorCrudStep.cs
+++ b/src/dotnet-scaffolding/dotnet-scaffold-aspnet/ScaffoldSteps/ValidateBlazorCrudStep.cs
@@ -65,6 +65,7 @@ public override async Task<bool> ExecuteAsync(ScaffolderContext context, Cancell
         else
         {
             context.Properties.Add(nameof(BlazorCrudModel), blazorCrudModel);
+            _logger.LogInformation("Done");
         }
 
         //Install packages and add a DbContext (if needed)
diff --git a/src/dotnet-scaffolding/dotnet-scaffold-aspnet/ScaffoldSteps/ValidateMinimalApiStep.cs b/src/dotnet-scaffolding/dotnet-scaffold-aspnet/ScaffoldSteps/ValidateMinimalApiStep.cs
index 8769d3de7..7e8bc1688 100644
--- a/src/dotnet-scaffolding/dotnet-scaffold-aspnet/ScaffoldSteps/ValidateMinimalApiStep.cs
+++ b/src/dotnet-scaffolding/dotnet-scaffold-aspnet/ScaffoldSteps/ValidateMinimalApiStep.cs
@@ -3,8 +3,8 @@
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.DotNet.Scaffolding.Core.Scaffolders;
 using Microsoft.DotNet.Scaffolding.Core.Steps;
-using Microsoft.DotNet.Scaffolding.Internal;
 using Microsoft.DotNet.Scaffolding.Internal.Services;
+using Microsoft.DotNet.Scaffolding.Internal.Shared;
 using Microsoft.DotNet.Scaffolding.Internal.Telemetry;
 using Microsoft.DotNet.Scaffolding.TextTemplating.DbContext;
 using Microsoft.DotNet.Tools.Scaffold.AspNet.Common;
diff --git a/src/dotnet-scaffolding/dotnet-scaffold/AppBuilder/TypeRegistrar.cs b/src/dotnet-scaffolding/dotnet-scaffold/AppBuilder/TypeRegistrar.cs
index 1599f52fe..75981e913 100644
--- a/src/dotnet-scaffolding/dotnet-scaffold/AppBuilder/TypeRegistrar.cs
+++ b/src/dotnet-scaffolding/dotnet-scaffold/AppBuilder/TypeRegistrar.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 
-using Microsoft.DotNet.Scaffolding.Core.Logging;
 using Microsoft.DotNet.Tools.Scaffold.AspNet.AppBuilder;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
@@ -11,14 +10,11 @@ namespace Microsoft.DotNet.Tools.Scaffold.AppBuilder;
 internal sealed class TypeRegistrar : ITypeRegistrar
 {
     private readonly IServiceCollection _services;
-    private readonly ILoggingBuilder _logging;
 
     public TypeRegistrar()
     {
         _services = new ServiceCollection();
-        _logging = new LoggingBuilder(_services);
         _services.AddLogging();
-        _logging.AddCleanConsoleFormatter();
     }
 
     public ITypeResolver Build()
diff --git a/src/dotnet-scaffolding/dotnet-scaffold/Command/ScaffoldCommand.cs b/src/dotnet-scaffolding/dotnet-scaffold/Command/ScaffoldCommand.cs
index c677bcc3a..900bdf5ce 100644
--- a/src/dotnet-scaffolding/dotnet-scaffold/Command/ScaffoldCommand.cs
+++ b/src/dotnet-scaffolding/dotnet-scaffold/Command/ScaffoldCommand.cs
@@ -42,6 +42,12 @@ public class Settings : CommandSettings
 
         [CommandOption("--non-interactive")]
         public bool NonInteractive { get; init; }
+
+        [CommandOption("--verbose")]
+        public bool Verbose { get; init; }
+
+        [CommandOption("--log-to-file")]
+        public bool LogToFile { get; init; }
     }
 
     public override async Task<int> ExecuteAsync(CommandContext context, Settings settings)
@@ -51,7 +57,7 @@ public override async Task<int> ExecuteAsync(CommandContext context, Settings se
             new StartupFlowStep(_dotnetToolService, _environmentService, _fileSystem, _logger, _firstTimeUseNoticeSentinel),
             new CategoryPickerFlowStep(_logger, _dotnetToolService),
             new CommandPickerFlowStep(_logger, _dotnetToolService, _environmentService, _fileSystem),
-            new CommandExecuteFlowStep(TelemetryService)
+            new CommandExecuteFlowStep(TelemetryService, logToFile: settings.LogToFile, verboseOutput: settings.Verbose)
         ];
 
         var flowResult = await RunFlowAsync(flowSteps, settings, context.Remaining, settings.NonInteractive, showSelectedOptions: false);
diff --git a/src/dotnet-scaffolding/dotnet-scaffold/Flow/Steps/CommandExecuteFlowStep.cs b/src/dotnet-scaffolding/dotnet-scaffold/Flow/Steps/CommandExecuteFlowStep.cs
index 143f74d14..1c9b3b681 100644
--- a/src/dotnet-scaffolding/dotnet-scaffold/Flow/Steps/CommandExecuteFlowStep.cs
+++ b/src/dotnet-scaffolding/dotnet-scaffold/Flow/Steps/CommandExecuteFlowStep.cs
@@ -1,8 +1,8 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 using Microsoft.DotNet.Scaffolding.Core.ComponentModel;
-using Microsoft.DotNet.Scaffolding.Internal.CliHelpers;
 using Microsoft.DotNet.Scaffolding.Internal.Services;
+using Microsoft.DotNet.Scaffolding.Internal.Shared;
 using Microsoft.DotNet.Scaffolding.Internal.Telemetry;
 using Microsoft.DotNet.Tools.Scaffold.Telemetry;
 using Spectre.Console;
@@ -17,9 +17,16 @@ namespace Microsoft.DotNet.Tools.Scaffold.Flow.Steps
     internal class CommandExecuteFlowStep : IFlowStep
     {
         private readonly ITelemetryService _telemetryService;
-        public CommandExecuteFlowStep(ITelemetryService telemetryService)
+        private readonly bool _logToFile;
+        private readonly bool _verboseOutput;
+        public CommandExecuteFlowStep(
+            ITelemetryService telemetryService,
+            bool logToFile,
+            bool verboseOutput)
         {
             _telemetryService = telemetryService;
+            _logToFile = logToFile;
+            _verboseOutput = verboseOutput;
         }
 
         public string Id => nameof(CommandExecuteFlowStep);
@@ -47,7 +54,18 @@ public ValueTask<FlowStepResult> ValidateUserInputAsync(IFlowContext context, Ca
             }
 
             var parameterValues = GetAllParameterValues(context, commandObj);
-            var envVars = context.GetTelemetryEnvironmentVariables();
+            var envVars = context.GetTelemetryEnvironmentVariables() ?? new Dictionary<string, string>();
+            envVars.Add(ScaffolderConstants.LAUNCHED_BY_DOTNET_SCAFFOLD, "true");
+            if (_verboseOutput)
+            {
+                envVars.Add(ScaffolderConstants.ENABLE_VERBOSE_LOGGING, "true");
+            }
+
+            if (_logToFile)
+            {
+                envVars.Add(ScaffolderConstants.LOG_TO_FILE, "true");
+            }
+
             var chosenCategory = context.GetChosenCategory();
             if (!string.IsNullOrEmpty(dotnetToolInfo.Command) && parameterValues.Count != 0 && !string.IsNullOrEmpty(commandObj.Name))
             {
@@ -60,8 +78,8 @@ public ValueTask<FlowStepResult> ValidateUserInputAsync(IFlowContext context, Ca
                             DotnetCliRunner.Create(dotnetToolInfo.Command, parameterValues, envVars) :
                             DotnetCliRunner.CreateDotNet(dotnetToolInfo.Command, parameterValues, envVars);
                         exitCode = cliRunner.ExecuteWithCallbacks(
-                            (s) => AnsiConsole.Console.MarkupLineInterpolated($"[green]{s}[/]"),
-                            (s) => AnsiConsole.Console.MarkupLineInterpolated($"[red]{s}[/]"));
+                            (s) => AnsiConsole.Console.MarkupLine($"{s}"),
+                            (s) => AnsiConsole.Console.MarkupLine($"{s}"));
                     });
 
                 _telemetryService.TrackEvent(new CommandExecuteTelemetryEvent(dotnetToolInfo, commandObj, exitCode, chosenCategory));
diff --git a/src/dotnet-scaffolding/dotnet-scaffold/Flow/Steps/ParameterDiscovery.cs b/src/dotnet-scaffolding/dotnet-scaffold/Flow/Steps/ParameterDiscovery.cs
index 04b23bbc1..ae8aa342a 100644
--- a/src/dotnet-scaffolding/dotnet-scaffold/Flow/Steps/ParameterDiscovery.cs
+++ b/src/dotnet-scaffolding/dotnet-scaffold/Flow/Steps/ParameterDiscovery.cs
@@ -3,9 +3,9 @@
 using System.Text.RegularExpressions;
 using Microsoft.CodeAnalysis;
 using Microsoft.DotNet.Scaffolding.Core.ComponentModel;
-using Microsoft.DotNet.Scaffolding.Internal;
 using Microsoft.DotNet.Scaffolding.Internal.Extensions;
 using Microsoft.DotNet.Scaffolding.Internal.Services;
+using Microsoft.DotNet.Scaffolding.Internal.Shared;
 using Microsoft.DotNet.Scaffolding.Roslyn.Services;
 using Spectre.Console;
 using Spectre.Console.Flow;
diff --git a/src/dotnet-scaffolding/dotnet-scaffold/Flow/Steps/StartupFlowStep.cs b/src/dotnet-scaffolding/dotnet-scaffold/Flow/Steps/StartupFlowStep.cs
index a0e46bd16..92541879b 100644
--- a/src/dotnet-scaffolding/dotnet-scaffold/Flow/Steps/StartupFlowStep.cs
+++ b/src/dotnet-scaffolding/dotnet-scaffold/Flow/Steps/StartupFlowStep.cs
@@ -64,7 +64,7 @@ public ValueTask<FlowStepResult> ValidateUserInputAsync(IFlowContext context, Ca
                 //initialize 1st party components (dotnet tools)
                 statusContext.Status = "Getting ready";
                 new FirstPartyComponentInitializer(_logger, _dotnetToolService).Initialize(envVars);
-                statusContext.Status = "Done\n";
+                statusContext.Status = "Done";
                 //parse args passed
                 statusContext.Status = "Parsing args.";
                 var remainingArgs = context.GetRemainingArgs();
@@ -77,7 +77,7 @@ public ValueTask<FlowStepResult> ValidateUserInputAsync(IFlowContext context, Ca
                     }
                 }
 
-                statusContext.Status = "Done\n";
+                statusContext.Status = "Done";
             });
 
         return new ValueTask<FlowStepResult>(FlowStepResult.Success);
diff --git a/src/dotnet-scaffolding/dotnet-scaffold/Services/DotNetToolService.cs b/src/dotnet-scaffolding/dotnet-scaffold/Services/DotNetToolService.cs
index 774f16d52..99d0d31ac 100644
--- a/src/dotnet-scaffolding/dotnet-scaffold/Services/DotNetToolService.cs
+++ b/src/dotnet-scaffolding/dotnet-scaffold/Services/DotNetToolService.cs
@@ -4,8 +4,8 @@
 using System.Text.Json;
 using System.Text.RegularExpressions;
 using Microsoft.DotNet.Scaffolding.Core.ComponentModel;
-using Microsoft.DotNet.Scaffolding.Internal.CliHelpers;
 using Microsoft.DotNet.Scaffolding.Internal.Services;
+using Microsoft.DotNet.Scaffolding.Internal.Shared;
 using Microsoft.Extensions.Logging;
 
 namespace Microsoft.DotNet.Tools.Scaffold.Services;
diff --git a/src/dotnet-scaffolding/dotnet-scaffold/dotnet-scaffold.csproj b/src/dotnet-scaffolding/dotnet-scaffold/dotnet-scaffold.csproj
index b760deb3b..25f74c76b 100644
--- a/src/dotnet-scaffolding/dotnet-scaffold/dotnet-scaffold.csproj
+++ b/src/dotnet-scaffolding/dotnet-scaffold/dotnet-scaffold.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <Description>Scaffolding tool for .NET projects. </Description>
     <TargetFrameworks>$(BuildTfm)</TargetFrameworks>
@@ -16,9 +16,6 @@
       TODO: Find a better place for these files to live that is shared between .Core and dotnet-scaffold. Linking them like this is temporary
       to get around the fact that dotnet-scaffold doesn't (and likely won't) have a dependency on .Core.
     -->
-    <Compile Include="$(RepoRoot)src\dotnet-scaffolding\Microsoft.DotNet.Scaffolding.Core\Logging\CleanConsoleFormatter.cs" Link="Logging\CleanConsoleFormatter.cs" />
-    <Compile Include="$(RepoRoot)src\dotnet-scaffolding\Microsoft.DotNet.Scaffolding.Core\Logging\CleanConsoleFormatterOptions.cs" Link="Logging\CleanConsoleFormatterOptions.cs" />
-    <Compile Include="$(RepoRoot)src\dotnet-scaffolding\Microsoft.DotNet.Scaffolding.Core\Logging\ConsoleLoggerExtensions.cs" Link="Logging\ConsoleLoggerExtensions.cs" />
     <Compile Include="$(RepoRoot)src\dotnet-scaffolding\Microsoft.DotNet.Scaffolding.Core\ComponentModel\*.cs">
       <Link>ComponentModel\%(Filename)%(Extension)</Link>
     </Compile>