React to @nagilson's review feedback

Author: baronfel

Directory.Build.props

@@ -67,8 +67,6 @@
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
     <CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
 
-    <SkipBuildingInstallers Condition="'$(SkipBuildingInstallers)' == ''">true</SkipBuildingInstallers>
-
     <!-- https://github.com/dotnet/source-build/issues/4115. -->
     <PublishWindowsPdb>false</PublishWindowsPdb>
   </PropertyGroup>

src/Cli/dotnet/ToolPackage/ToolPackageDownloaderBase.cs

@@ -343,10 +343,7 @@ public bool TryGetDownloadedTool(
             {
                 return new PackageId(p.Id);
             }
-            else
-            {
-                return null;
-            }
+            return null;
         }
 
         return null;

src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.PackTool.targets

@@ -48,6 +48,8 @@ NOTE: This file is imported from the following contexts, so be aware when writin
     <SelfContained Condition="'$(RuntimeIdentifier)' == ''">false</SelfContained>
     <PublishTrimmed Condition="'$(RuntimeIdentifier)' == ''">false</PublishTrimmed>
     <PublishReadyToRun Condition="'$(RuntimeIdentifier)' == ''">false</PublishReadyToRun>
+    <PublishSingleFile Condition="'$(RuntimeIdentifier)' == ''">false</PublishSingleFile>
+
     <!-- We need to know if the inner builds are _intended_ to be AOT even if we then explicitly disable AOT for the outer builds.
          Knowing this lets us correctly decide to create the RID-specific inner tools or not when packaging the outer tool. -->
     <_InnerToolsPublishAot>false</_InnerToolsPublishAot>

test/Microsoft.DotNet.PackageInstall.Tests/TestToolBuilder.cs

@@ -94,15 +94,15 @@ public string CreateTestTool(ITestOutputHelper log, TestToolSettings toolSetting
             {
                 new DotnetPackCommand(log)
                     .WithWorkingDirectory(targetDirectory)
-                    .Execute("/bl:{}")
+                    .Execute()
                     .Should().Pass();
 
                 if (toolSettings.NativeAOT)
                 {
                     //  For Native AOT tools, we need to repack the tool to include the runtime-specific files that were generated during publish
                     new DotnetPackCommand(log, "-r", RuntimeInformation.RuntimeIdentifier)
                         .WithWorkingDirectory(targetDirectory)
-                        .Execute("/bl:{}")
+                        .Execute()
                         .Should().Pass();
                 }
 

test/Microsoft.NET.ToolPack.Tests/GivenThatWeWantToPackAToolProjectWithPackagedShim.cs

@@ -155,9 +155,7 @@ public void It_uses_customized_PackagedShimOutputRootDirectory(bool multiTarget,
 
             _testRoot = helloWorldAsset.TestRoot;
 
-            var packCommand = new PackCommand(Log, helloWorldAsset.TestRoot);
-
-            var result = packCommand.Execute().Should().Pass();
+            new PackCommand(Log, helloWorldAsset.TestRoot).Execute().Should().Pass();
 
             string windowShimPath = Path.Combine(shimoutputPath, $"shims/{targetFramework}/win-x64/{_customToolCommandName}.exe");
             File.Exists(windowShimPath).Should().BeTrue($"Shim {windowShimPath} should exist");