Merge branch 'main' of https://github.com/dotnet/sdk into darc-main-729b9814-ef2d-414d-bd53-62e16a898107

Simon Zhao (BEYONDSOFT CONSULTING INC) · Simon Zhao (BEYONDSOFT CONSULTING INC) · commit 0ea0fd896d64 · 2025-07-17T12:15:09.000+08:00
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -189,17 +189,17 @@
       <Uri>https://github.com/nuget/nuget.client</Uri>
       <Sha>c21ba3b47e224cf84490bdc53b89e7f9ebcc1841</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Test.Sdk" Version="17.15.0-preview-25359-101">
-      <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>f451e5d3036a4f140a989e0a7f3f1ae432420e71</Sha>
+    <Dependency Name="Microsoft.NET.Test.Sdk" Version="18.0.0-preview-25366-05">
+      <Uri>https://github.com/microsoft/vstest</Uri>
+      <Sha>ab6e14292ec4aac0c228a6c75e420f0a0461b0e1</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.TestPlatform.CLI" Version="17.15.0-preview-25359-101">
-      <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>f451e5d3036a4f140a989e0a7f3f1ae432420e71</Sha>
+    <Dependency Name="Microsoft.TestPlatform.CLI" Version="18.0.0-preview-25366-05">
+      <Uri>https://github.com/microsoft/vstest</Uri>
+      <Sha>ab6e14292ec4aac0c228a6c75e420f0a0461b0e1</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.TestPlatform.Build" Version="17.15.0-preview-25359-101">
-      <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>f451e5d3036a4f140a989e0a7f3f1ae432420e71</Sha>
+    <Dependency Name="Microsoft.TestPlatform.Build" Version="18.0.0-preview-25366-05">
+      <Uri>https://github.com/microsoft/vstest</Uri>
+      <Sha>ab6e14292ec4aac0c228a6c75e420f0a0461b0e1</Sha>
     </Dependency>
     <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="10.0.0-preview.7.25359.101">
       <Uri>https://github.com/dotnet/dotnet</Uri>
@@ -225,6 +225,39 @@
       <Uri>https://github.com/dotnet/dotnet</Uri>
       <Sha>f451e5d3036a4f140a989e0a7f3f1ae432420e71</Sha>
     </Dependency>
+    <!-- Do not use properties based on:
+         - Microsoft.WindowsDesktop.App.Ref
+         - Microsoft.WindowsDesktop.App.Internal
+         - Microsoft.NET.Sdk.WindowsDesktop
+         - Microsoft.Dotnet.WinForms.ProjectTemplates
+         - Microsoft.DotNet.Wpf.ProjectTemplates
+         In VMR builds on non-Windows, they aren't built. Instead, use the following:
+         - Microsoft.WindowsDesktop.App.Ref - Microsoft.NETCore.App.Ref
+         - Microsoft.WindowsDesktop.App.Internal - Microsoft.NETCore.Platforms
+         - Microsoft.NET.Sdk.WindowsDesktop - Microsoft.NETCore.App.Ref
+         - Microsoft.Dotnet.WinForms.ProjectTemplates - Microsoft.NETCore.Platforms
+         - Microsoft.DotNet.Wpf.ProjectTemplates - Microsoft.NETCore.Platforms
+    -->
+    <Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="10.0.0-preview.7.25359.101">
+      <Uri>https://github.com/dotnet/dotnet</Uri>
+      <Sha>f451e5d3036a4f140a989e0a7f3f1ae432420e71</Sha>
+    </Dependency>
+    <Dependency Name="Microsoft.WindowsDesktop.App.Internal" Version="10.0.0-preview.7.25359.101">
+      <Uri>https://github.com/dotnet/dotnet</Uri>
+      <Sha>f451e5d3036a4f140a989e0a7f3f1ae432420e71</Sha>
+    </Dependency>
+    <Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="10.0.0-preview.7.25359.101">
+      <Uri>https://github.com/dotnet/dotnet</Uri>
+      <Sha>f451e5d3036a4f140a989e0a7f3f1ae432420e71</Sha>
+    </Dependency>
+    <Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="10.0.0-preview.7.25359.101">
+      <Uri>https://github.com/dotnet/dotnet</Uri>
+      <Sha>f451e5d3036a4f140a989e0a7f3f1ae432420e71</Sha>
+    </Dependency>
+    <Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="10.0.0-preview.7.25359.101">
+      <Uri>https://github.com/dotnet/dotnet</Uri>
+      <Sha>f451e5d3036a4f140a989e0a7f3f1ae432420e71</Sha>
+    </Dependency>
     <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="10.0.0-preview.7.25359.101">
       <Uri>https://github.com/dotnet/dotnet</Uri>
       <Sha>f451e5d3036a4f140a989e0a7f3f1ae432420e71</Sha>
diff --git a/eng/Versions.props b/eng/Versions.props
@@ -161,9 +161,9 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/Microsoft/vstest -->
-    <MicrosoftNETTestSdkPackageVersion>17.15.0-preview-25359-101</MicrosoftNETTestSdkPackageVersion>
-    <MicrosoftTestPlatformCLIPackageVersion>17.15.0-preview-25359-101</MicrosoftTestPlatformCLIPackageVersion>
-    <MicrosoftTestPlatformBuildPackageVersion>17.15.0-preview-25359-101</MicrosoftTestPlatformBuildPackageVersion>
+    <MicrosoftNETTestSdkPackageVersion>18.0.0-preview-25366-05</MicrosoftNETTestSdkPackageVersion>
+    <MicrosoftTestPlatformCLIPackageVersion>18.0.0-preview-25366-05</MicrosoftTestPlatformCLIPackageVersion>
+    <MicrosoftTestPlatformBuildPackageVersion>18.0.0-preview-25366-05</MicrosoftTestPlatformBuildPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/roslyn-analyzers -->
diff --git a/src/Cli/Microsoft.DotNet.Configurer/Microsoft.DotNet.Configurer.csproj b/src/Cli/Microsoft.DotNet.Configurer/Microsoft.DotNet.Configurer.csproj
@@ -21,8 +21,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Microsoft.DotNet.InternalAbstractions\Microsoft.DotNet.InternalAbstractions.csproj" />
-    <ProjectReference Include="..\Microsoft.DotNet.Cli.Utils\Microsoft.DotNet.Cli.Utils.csproj" />
+    <ProjectReference Include="..\Microsoft.DotNet.InternalAbstractions\Microsoft.DotNet.InternalAbstractions.csproj" GlobalPropertiesToRemove="PublishDir" />
+    <ProjectReference Include="..\Microsoft.DotNet.Cli.Utils\Microsoft.DotNet.Cli.Utils.csproj" GlobalPropertiesToRemove="PublishDir" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Cli/Microsoft.TemplateEngine.Cli/Microsoft.TemplateEngine.Cli.csproj b/src/Cli/Microsoft.TemplateEngine.Cli/Microsoft.TemplateEngine.Cli.csproj
@@ -21,8 +21,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="../Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj" />
-    <ProjectReference Include="../Microsoft.DotNet.Configurer/Microsoft.DotNet.Configurer.csproj" />
+    <ProjectReference Include="../Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj" GlobalPropertiesToRemove="PublishDir" />
+    <ProjectReference Include="../Microsoft.DotNet.Configurer/Microsoft.DotNet.Configurer.csproj" GlobalPropertiesToRemove="PublishDir" />
   </ItemGroup>
   
   <ItemGroup>
diff --git a/src/Cli/dotnet/Commands/Test/IPC/PipeNameDescription.cs b/src/Cli/dotnet/Commands/Test/IPC/PipeNameDescription.cs
@@ -12,20 +12,13 @@ internal sealed class PipeNameDescription(string name, bool isDirectory) : IDisp
 
     public string Name { get; } = name;
 
-    public void Dispose() => Dispose(true);
-
-    public void Dispose(bool disposing)
+    public void Dispose()
     {
         if (_disposed)
         {
             return;
         }
 
-        if (disposing)
-        {
-            // TODO: dispose managed state (managed objects).
-        }
-
         if (_isDirectory)
         {
             try
diff --git a/src/Cli/dotnet/dotnet.csproj b/src/Cli/dotnet/dotnet.csproj
@@ -38,15 +38,15 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="../Microsoft.DotNet.Configurer/Microsoft.DotNet.Configurer.csproj" />
-    <ProjectReference Include="../Microsoft.DotNet.InternalAbstractions/Microsoft.DotNet.InternalAbstractions.csproj" />
-    <ProjectReference Include="../Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj" />
+    <ProjectReference Include="../Microsoft.DotNet.Configurer/Microsoft.DotNet.Configurer.csproj" GlobalPropertiesToRemove="PublishDir" />
+    <ProjectReference Include="../Microsoft.DotNet.InternalAbstractions/Microsoft.DotNet.InternalAbstractions.csproj" GlobalPropertiesToRemove="PublishDir" />
+    <ProjectReference Include="../Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj" GlobalPropertiesToRemove="PublishDir" />
     <!-- override the Microsoft.TemplateEngine.Cli's dependency with the latest Microsoft.DotNet.TemplateLocator -->
-    <ProjectReference Include="../../Microsoft.DotNet.TemplateLocator\Microsoft.DotNet.TemplateLocator.csproj" />
-    <ProjectReference Include="../../Resolvers\Microsoft.DotNet.NativeWrapper\Microsoft.DotNet.NativeWrapper.csproj" />
-    <ProjectReference Include="../../Microsoft.Win32.Msi/Microsoft.Win32.Msi.csproj" />
-    <ProjectReference Include="..\Microsoft.TemplateEngine.Cli\Microsoft.TemplateEngine.Cli.csproj" />
-    <ProjectReference Include="..\..\System.CommandLine.StaticCompletions\System.CommandLine.StaticCompletions.csproj" />
+    <ProjectReference Include="../../Microsoft.DotNet.TemplateLocator\Microsoft.DotNet.TemplateLocator.csproj" GlobalPropertiesToRemove="PublishDir" />
+    <ProjectReference Include="../../Resolvers\Microsoft.DotNet.NativeWrapper\Microsoft.DotNet.NativeWrapper.csproj" GlobalPropertiesToRemove="PublishDir" />
+    <ProjectReference Include="../../Microsoft.Win32.Msi/Microsoft.Win32.Msi.csproj" GlobalPropertiesToRemove="PublishDir" />
+    <ProjectReference Include="..\Microsoft.TemplateEngine.Cli\Microsoft.TemplateEngine.Cli.csproj" GlobalPropertiesToRemove="PublishDir" />
+    <ProjectReference Include="..\..\System.CommandLine.StaticCompletions\System.CommandLine.StaticCompletions.csproj" GlobalPropertiesToRemove="PublishDir" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Compatibility/ApiDiff/Microsoft.DotNet.ApiDiff/FileOutputDiffGenerator.cs b/src/Compatibility/ApiDiff/Microsoft.DotNet.ApiDiff/FileOutputDiffGenerator.cs
@@ -155,8 +155,6 @@ public async Task RunAsync(CancellationToken cancellationToken)
             _log.LogMessage($"Wrote '{filePath}'.");
         }
 
-        tableOfContents.AppendLine();
-
         string tableOfContentsFilePath = Path.Combine(_outputFolderPath, $"{_tableOfContentsTitle}.md");
 
         if (_writeToDisk)
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Microsoft.NET.Build.Containers.csproj b/src/Containers/Microsoft.NET.Build.Containers/Microsoft.NET.Build.Containers.csproj
@@ -25,7 +25,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\Cli\Microsoft.DotNet.Cli.Utils\Microsoft.DotNet.Cli.Utils.csproj" Condition="'$(TargetFramework)' != 'net472'">
+    <ProjectReference Include="..\..\Cli\Microsoft.DotNet.Cli.Utils\Microsoft.DotNet.Cli.Utils.csproj"
+                      Condition="'$(TargetFramework)' != 'net472'"
+                      GlobalPropertiesToRemove="PublishDir">
       <!-- This is referenced by the core CLI as well so it doesn't need to be redistributed
            in the containers task folder. -->
       <IncludeAssets>build</IncludeAssets>
diff --git a/src/Containers/containerize/containerize.csproj b/src/Containers/containerize/containerize.csproj
@@ -17,8 +17,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Microsoft.NET.Build.Containers\Microsoft.NET.Build.Containers.csproj" />
-    <ProjectReference Include="..\..\Cli\Microsoft.DotNet.Cli.Utils\Microsoft.DotNet.Cli.Utils.csproj" />
+    <ProjectReference Include="..\Microsoft.NET.Build.Containers\Microsoft.NET.Build.Containers.csproj" GlobalPropertiesToRemove="PublishDir" />
+    <ProjectReference Include="..\..\Cli\Microsoft.DotNet.Cli.Utils\Microsoft.DotNet.Cli.Utils.csproj" GlobalPropertiesToRemove="PublishDir" />
   </ItemGroup>
 
   <!-- Copy to TestExecutionDirectory for using in integration tests. -->
diff --git a/src/Containers/packaging/package.csproj b/src/Containers/packaging/package.csproj
@@ -26,13 +26,21 @@
     <ItemGroup>
         <ProjectReference Include="../Microsoft.NET.Build.Containers/Microsoft.NET.Build.Containers.csproj"
                           SetTargetFramework="TargetFramework=$(TargetFramework)"
-                          OutputItemType="ContainerLibraryOutput"/>
+                          OutputItemType="ContainerLibraryOutput"
+                          GlobalPropertiesToRemove="PublishDir"/>
 
         <ProjectReference Include="../Microsoft.NET.Build.Containers/Microsoft.NET.Build.Containers.csproj"
                           SetTargetFramework="TargetFramework=$(VSCompatTargetFramework)"
-                          OutputItemType="ContainerLibraryOutputNet472" Condition="'$(DotNetBuildSourceOnly)' != 'true'" />
+                          OutputItemType="ContainerLibraryOutputNet472"
+                          Condition="'$(DotNetBuildSourceOnly)' != 'true'"
+                          GlobalPropertiesToRemove="PublishDir" />
 
-        <ProjectReference Include="../containerize/containerize.csproj" PrivateAssets="all" IncludeAssets="runtime" ReferenceOutputAssembly="true" Condition="'$(DotNetBuildSourceOnly)' != 'true'" />
+        <ProjectReference Include="../containerize/containerize.csproj"
+                          PrivateAssets="all"
+                          IncludeAssets="runtime"
+                          ReferenceOutputAssembly="true"
+                          Condition="'$(DotNetBuildSourceOnly)' != 'true'"
+                          GlobalPropertiesToRemove="PublishDir" />
     </ItemGroup>
 
     <Target Name="PreparePackageReleaseNotesFromFile" BeforeTargets="GenerateNuspec">
@@ -53,7 +61,7 @@
                                 $([MSBuild]::ValueOrDefault('%(_AllNet472ContainerTaskDependencies.NuGetPackageId)', '').Contains('Microsoft.Extensions'))
                             ) and
                             %(_AllNet472ContainerTaskDependencies.NuGetIsFrameworkReference) != true" />
-            
+
             <!-- containerize folder -->
             <Content Include="$(OutDir)containerize.dll" Pack="true" PackagePath="containerize/" />
             <Content Include="$(OutDir)containerize.runtimeconfig.json" Pack="true" PackagePath="containerize/" />
diff --git a/src/Resolvers/Microsoft.DotNet.MSBuildSdkResolver/MSBuildSdkResolver.cs b/src/Resolvers/Microsoft.DotNet.MSBuildSdkResolver/MSBuildSdkResolver.cs
@@ -196,9 +196,9 @@ private sealed class CachedState
                         minimumVSDefinedSDKVersion);
                 }
 
-                string? dotnetExe = dotnetRoot != null ?
-                    Path.Combine(dotnetRoot, Constants.DotNetExe) :
-                    null;
+                string? dotnetExe =
+                    TryResolveDotnetExeFromSdkResolution(resolverResult)
+                    ?? Path.Combine(dotnetRoot, RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? Constants.DotNetExe : Constants.DotNet);
                 if (File.Exists(dotnetExe))
                 {
                     propertiesToAdd ??= new Dictionary<string, string?>();
@@ -288,6 +288,25 @@ private sealed class CachedState
             return factory.IndicateSuccess(msbuildSdkDir, netcoreSdkVersion, propertiesToAdd, itemsToAdd, warnings);
         }
 
+        /// <summary>Try to find the dotnet binary from the SDK resolution result upwards</summary>
+        private static string? TryResolveDotnetExeFromSdkResolution(SdkResolutionResult resolverResult)
+        {
+            var expectedFileName = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? Constants.DotNetExe : Constants.DotNet;
+            var currentDir = resolverResult.ResolvedSdkDirectory;
+            while (currentDir != null)
+            {
+                var dotnetExe = Path.Combine(currentDir, expectedFileName);
+                if (File.Exists(dotnetExe))
+                {
+                    return dotnetExe;
+                }
+
+                currentDir = Path.GetDirectoryName(currentDir);
+            }
+
+            return null;
+        }
+
         private static string? GetMSbuildRuntimeVersion(string sdkDirectory, string dotnetRoot)
         {
             // 1. Get the runtime version from the MSBuild.runtimeconfig.json file
diff --git a/src/Resolvers/Microsoft.DotNet.SdkResolver/VSSettings.cs b/src/Resolvers/Microsoft.DotNet.SdkResolver/VSSettings.cs
@@ -63,7 +63,7 @@ private VSSettings()
         }
 
         // Test constructor
-        public VSSettings(string settingsFilePath, bool disallowPrereleaseByDefault)
+        public VSSettings(string? settingsFilePath, bool disallowPrereleaseByDefault)
         {
             _settingsFilePath = settingsFilePath;
             _disallowPrereleaseByDefault = disallowPrereleaseByDefault;
diff --git a/src/Resolvers/Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver/Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver.csproj b/src/Resolvers/Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver/Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver.csproj
@@ -18,8 +18,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Microsoft.NET.Sdk.WorkloadManifestReader\Microsoft.NET.Sdk.WorkloadManifestReader.csproj" />
-    <ProjectReference Include="..\Microsoft.DotNet.NativeWrapper\Microsoft.DotNet.NativeWrapper.csproj" />
+    <ProjectReference Include="..\Microsoft.NET.Sdk.WorkloadManifestReader\Microsoft.NET.Sdk.WorkloadManifestReader.csproj" GlobalPropertiesToRemove="PublishDir" />
+    <ProjectReference Include="..\Microsoft.DotNet.NativeWrapper\Microsoft.DotNet.NativeWrapper.csproj" GlobalPropertiesToRemove="PublishDir" />
     <Compile Include="..\..\Cli\dotnet\Commands\Workload\Install\WorkloadInstallRecords\**\*.cs"
              Exclude="..\..\Cli\dotnet\Commands\Workload\Install\WorkloadInstallRecords\RegistryWorkloadInstallationRecordRepository.cs"
              LinkBase="WorkloadInstallRecords" />
@@ -28,11 +28,11 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETFramework'">
-    <ProjectReference Include="..\..\Cli\Microsoft.DotNet.Cli.Utils\Microsoft.DotNet.Cli.Utils.csproj" />
+    <ProjectReference Include="..\..\Cli\Microsoft.DotNet.Cli.Utils\Microsoft.DotNet.Cli.Utils.csproj" GlobalPropertiesToRemove="PublishDir" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
-    <ProjectReference Include="..\Microsoft.DotNet.SdkResolver\Microsoft.DotNet.SdkResolver.csproj" />
+    <ProjectReference Include="..\Microsoft.DotNet.SdkResolver\Microsoft.DotNet.SdkResolver.csproj" GlobalPropertiesToRemove="PublishDir" />
     <PackageReference Include="System.Collections.Immutable" VersionOverride="$(SystemCollectionsImmutableToolsetPackageVersion)" />
   </ItemGroup>
 
diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/GenerateBundle.cs b/src/Tasks/Microsoft.NET.Build.Tasks/GenerateBundle.cs
@@ -30,6 +30,7 @@ public class GenerateBundle : TaskBase
         public bool ShowDiagnosticOutput { get; set; }
         [Required]
         public bool EnableCompressionInSingleFile { get; set; }
+        public bool EnableMacOsCodeSign { get; set; } = true;
 
         [Output]
         public ITaskItem[] ExcludedFiles { get; set; }
@@ -66,7 +67,8 @@ protected override void ExecuteCore()
                 targetOS,
                 targetArch,
                 version,
-                ShowDiagnosticOutput);
+                ShowDiagnosticOutput,
+                macosCodesign: EnableMacOsCodeSign);
 
             var fileSpec = new List<FileSpec>(FilesToBundle.Length);
 
diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Publish.targets b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Publish.targets
@@ -1138,7 +1138,8 @@ Copyright (c) .NET Foundation. All rights reserved.
                     TargetFrameworkVersion="$(_TargetFrameworkVersionWithoutV)"
                     RuntimeIdentifier="$(RuntimeIdentifier)"
                     OutputDir="$(PublishDir)"
-                    ShowDiagnosticOutput="$(TraceSingleFileBundler)">
+                    ShowDiagnosticOutput="$(TraceSingleFileBundler)"
+                    EnableMacOSCodeSign="$(_EnableMacOSCodeSign)">
       <Output TaskParameter="ExcludedFiles" ItemName="_FilesExcludedFromBundle"/>
     </GenerateBundle>
 
@@ -1288,7 +1289,7 @@ Copyright (c) .NET Foundation. All rights reserved.
     </ItemGroup>
 
     <GetEmbeddedApphostPaths
-      PackagedShimOutputDirectory="$(PackagedShimOutputRootDirectory)/shims/$(TargetFramework)"
+      PackagedShimOutputDirectory="$([System.IO.Path]::Combine($(PackagedShimOutputRootDirectory), 'shims', $(TargetFramework)))"
       ShimRuntimeIdentifiers="@(_PackAsToolShimRuntimeIdentifiers)"
       ToolCommandName="$(ToolCommandName)"
       >
diff --git a/test/Microsoft.DotNet.ApiDiff.Tests/Diff.Disk.Tests.cs b/test/Microsoft.DotNet.ApiDiff.Tests/Diff.Disk.Tests.cs
@@ -25,7 +25,6 @@ Lines preceded by a '+' are additions and a '-' indicates removal.
 
         * [{DefaultAssemblyName}]({DefaultTableOfContentsTitle}_{DefaultAssemblyName}.md)
 
-
         """;
 
     private const string ExpectedEmptyTableOfContents = $"""
@@ -35,7 +34,6 @@ API listing follows standard diff formatting.
         Lines preceded by a '+' are additions and a '-' indicates removal.
 
 
-
         """;
 
     private const string BeforeCode = """
@@ -239,7 +237,6 @@ Lines preceded by a '+' are additions and a '-' indicates removal.
 
 * [Assembly1]({DefaultTableOfContentsTitle}_Assembly1.md)
 * [Assembly2]({DefaultTableOfContentsTitle}_Assembly2.md)
-
 ";
 
         using TempDirectory inputFolderPath = new();
diff --git a/test/Microsoft.DotNet.MSBuildSdkResolver.Tests/GivenAnMSBuildSdkResolver.cs b/test/Microsoft.DotNet.MSBuildSdkResolver.Tests/GivenAnMSBuildSdkResolver.cs
diff --git a/test/Microsoft.NET.Build.Tests/AppHostTests.cs b/test/Microsoft.NET.Build.Tests/AppHostTests.cs
diff --git a/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishASingleFileApp.cs b/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishASingleFileApp.cs
diff --git a/test/Microsoft.NET.TestFramework/Utilities/BitConverterExtensions.cs b/test/Microsoft.NET.TestFramework/Utilities/BitConverterExtensions.cs
diff --git a/test/Microsoft.NET.TestFramework/Utilities/MachOSignature.cs b/test/Microsoft.NET.TestFramework/Utilities/MachOSignature.cs
diff --git a/test/Microsoft.NET.TestFramework/Utilities/StreamExtensions.cs b/test/Microsoft.NET.TestFramework/Utilities/StreamExtensions.cs

Original file line number	Diff line number	Diff line change
`@@ -12,20 +12,13 @@ internal sealed class PipeNameDescription(string name, bool isDirectory) : IDisp`
`12`	`12`
`13`	`13`	`public string Name { get; } = name;`
`14`	`14`
`15`		`- public void Dispose() => Dispose(true);`
`16`		`-`
`17`		`- public void Dispose(bool disposing)`
	`15`	`+ public void Dispose()`
`18`	`16`	`{`
`19`	`17`	`if (_disposed)`
`20`	`18`	`{`
`21`	`19`	`return;`
`22`	`20`	`}`
`23`	`21`
`24`		`- if (disposing)`
`25`		`- {`
`26`		`- // TODO: dispose managed state (managed objects).`
`27`		`- }`
`28`		`-`
`29`	`22`	`if (_isDirectory)`
`30`	`23`	`{`
`31`	`24`	`try`
Original file line number	Diff line number	Diff line change
`@@ -155,8 +155,6 @@ public async Task RunAsync(CancellationToken cancellationToken)`
`155`	`155`	`_log.LogMessage($"Wrote '{filePath}'.");`
`156`	`156`	`}`
`157`	`157`
`158`		`- tableOfContents.AppendLine();`
`159`		`-`
`160`	`158`	`string tableOfContentsFilePath = Path.Combine(_outputFolderPath, $"{_tableOfContentsTitle}.md");`
`161`	`159`
`162`	`160`	`if (_writeToDisk)`