Skip MSBuild and call only CSC for simple file-based apps

Directory.Packages.props

@@ -18,6 +18,7 @@
     <PackageVersion Include="Microsoft.Build.NuGetSdkResolver" Version="$(MicrosoftBuildNuGetSdkResolverPackageVersion)" />
     <PackageVersion Include="Microsoft.CodeAnalysis" Version="$(MicrosoftCodeAnalysisPackageVersion)" />
     <PackageVersion Include="Microsoft.CodeAnalysis.Analyzer.Testing" Version="$(MicrosoftCodeAnalysisAnalyzerTestingVersion)" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.BuildClient" Version="$(MicrosoftCodeAnalysisBuildClientVersion)" />
     <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="$(MicrosoftCodeAnalysisCSharpPackageVersion)" />
     <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="$(MicrosoftCodeAnalysisPackageVersion)" />
     <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Features" Version="$(MicrosoftCodeAnalysisCSharpPackageVersion)" />

eng/Version.Details.xml

@@ -96,6 +96,10 @@
       <Uri>https://github.com/dotnet/dotnet</Uri>
       <Sha>1add0c55b8beeb1b1de4d81e362fad8978c4c8c8</Sha>
     </Dependency>
+    <Dependency Name="Microsoft.CodeAnalysis.BuildClient" Version="5.0.0-2.25373.106">
+      <Uri>https://github.com/dotnet/dotnet</Uri>
+      <Sha>1add0c55b8beeb1b1de4d81e362fad8978c4c8c8</Sha>
+    </Dependency>
     <Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="5.0.0-2.25373.106">
       <Uri>https://github.com/dotnet/dotnet</Uri>
       <Sha>1add0c55b8beeb1b1de4d81e362fad8978c4c8c8</Sha>

eng/Versions.props

@@ -218,6 +218,7 @@
     <MicrosoftNetCompilersToolsetVersion>5.0.0-2.25373.106</MicrosoftNetCompilersToolsetVersion>
     <MicrosoftNetCompilersToolsetFrameworkPackageVersion>5.0.0-2.25373.106</MicrosoftNetCompilersToolsetFrameworkPackageVersion>
     <MicrosoftCodeAnalysisPackageVersion>5.0.0-2.25373.106</MicrosoftCodeAnalysisPackageVersion>
+    <MicrosoftCodeAnalysisBuildClientVersion>5.0.0-2.25373.106</MicrosoftCodeAnalysisBuildClientVersion>
     <MicrosoftCodeAnalysisCSharpPackageVersion>5.0.0-2.25373.106</MicrosoftCodeAnalysisCSharpPackageVersion>
     <MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>5.0.0-2.25373.106</MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>
     <MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>5.0.0-2.25373.106</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>

src/Cli/Microsoft.DotNet.Cli.Utils/ArgumentEscaper.cs

@@ -86,12 +86,12 @@ private static IEnumerable<string> EscapeArgArrayForCmd(IEnumerable<string> argu
         return escapedArgs;
     }
 
-    public static string EscapeSingleArg(string arg)
+    public static string EscapeSingleArg(string arg, Func<string, bool>? additionalShouldSurroundWithQuotes = null)
     {
         var sb = new StringBuilder();
 
         var length = arg.Length;
-        var needsQuotes = length == 0 || ShouldSurroundWithQuotes(arg);
+        var needsQuotes = length == 0 || ShouldSurroundWithQuotes(arg) || additionalShouldSurroundWithQuotes?.Invoke(arg) == true;
         var isQuoted = needsQuotes || IsSurroundedWithQuotes(arg);
 
         if (needsQuotes) sb.Append("\"");

src/Cli/Microsoft.DotNet.Cli.Utils/Product.cs

@@ -5,18 +5,32 @@
 
 namespace Microsoft.DotNet.Cli.Utils;
 
-public class Product
+public static class Product
 {
     public static string LongName => LocalizableStrings.DotNetSdkInfo;
-    public static readonly string Version = GetProductVersion();
+    public static readonly string Version;
+    public static readonly string TargetFrameworkVersion;
 
-    private static string GetProductVersion()
+    static Product()
     {
         DotnetVersionFile versionFile = DotnetFiles.VersionFileObject;
-        return versionFile.BuildNumber ??
+        Version = versionFile.BuildNumber ??
                 System.Diagnostics.FileVersionInfo.GetVersionInfo(
                         typeof(Product).GetTypeInfo().Assembly.Location)
                     .ProductVersion ??
                 string.Empty;
+
+        int firstDotIndex = Version.IndexOf('.');
+        if (firstDotIndex >= 0)
+        {
+            int secondDotIndex = Version.IndexOf('.', firstDotIndex + 1);
+            TargetFrameworkVersion = secondDotIndex >= 0
+                ? Version.Substring(0, secondDotIndex)
+                : Version;
+        }
+        else
+        {
+            TargetFrameworkVersion = string.Empty;
+        }
     }
 }

src/Cli/dotnet/Commands/CliCommandStrings.resx

@@ -1611,9 +1611,13 @@ Tool '{1}' (version '{2}') was successfully installed. Entry is added to the man
     <comment>{0} is an option name like '--source'.</comment>
   </data>
   <data name="NoBinaryLogBecauseUpToDate" xml:space="preserve">
-    <value>Warning: Binary log option was specified but build will be skipped because output is up to date, specify '--no-cache' to force build.</value>
+    <value>Warning: Binary log option was specified but build will be skipped because output is up to date. Specify '--no-cache' to force build.</value>
     <comment>{Locked="--no-cache"}</comment>
   </data>
+  <data name="NoBinaryLogBecauseRunningJustCsc" xml:space="preserve">
+    <value>Warning: Binary log option was specified but MSBuild will be skipped because running just csc is enough. Specify '--no-cache' to force full build.</value>
+    <comment>{Locked="--no-cache"}{Locked="MSBuild"}{Locked="csc"}</comment>
+  </data>
   <data name="PublishAppDescription" xml:space="preserve">
     <value>Publisher for the .NET Platform</value>
   </data>