thompson-tomo · pull · Dec 9, 2025 · Dec 9, 2025 · Dec 9, 2025 · Dec 9, 2025
diff --git a/.vsts-dotnet.yml b/.vsts-dotnet.yml
@@ -49,7 +49,7 @@ variables:
     - name: SkipApplyOptimizationData
       value: true
   - name: EnableReleaseOneLocBuild
-    value: false # Temp DISABLE to localize vs 17.14
+    value: true
   - name: Codeql.Enabled
     value: true
   - group: DotNet-MSBuild-SDLValidation-Params

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -84,10 +84,6 @@ ates https://learn.microsoft.com/en-gb/dotnet/fundamentals/syslib-diagnostics/sy
 
     <DisableImplicitNuGetFallbackFolder>true</DisableImplicitNuGetFallbackFolder>
 
-    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
-    <CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
-    <DirectoryPackagesPropsPath>$([MSBuild]::NormalizePath('$(MSBuildThisFileDirectory)', 'eng', 'Packages.props'))</DirectoryPackagesPropsPath>
-
     <AccelerateBuildsInVisualStudio>true</AccelerateBuildsInVisualStudio>
   </PropertyGroup>
 

diff --git a/Directory.Build.targets b/Directory.Build.targets
@@ -18,8 +18,7 @@
   </ItemGroup>
 
   <!-- Global Analyzer Config -->
-  <ItemGroup Condition="'$(ProjectIsDeprecated)' != 'true'">
-    <!-- Include Common.globalconfig for non-deprecated projects-->
+  <ItemGroup>
     <EditorConfigFiles Include="$(MSBuildThisFileDirectory)eng/Common.globalconfig" />
   </ItemGroup>
 

diff --git a/eng/Packages.props → Directory.Packages.props b/eng/Packages.props → Directory.Packages.props
@@ -1,7 +1,13 @@
 <Project>
+
   <!-- Import references updated by Dependabot.
        This file is for package references updated manually or by Darc/Maestro. -->
-  <Import Project="dependabot\Packages.props" />
+  <Import Project="$(RepositoryEngineeringDir)dependabot\Directory.Packages.props" />
+
+  <PropertyGroup>
+    <ManagePackageVersionsCentrally Condition="'$(ManagePackageVersionsCentrally)' == ''">true</ManagePackageVersionsCentrally>
+    <CentralPackageTransitivePinningEnabled Condition="'$(CentralPackageTransitivePinningEnabled)' == ''">true</CentralPackageTransitivePinningEnabled>
+  </PropertyGroup>
 
   <!--
     Make sure to update the binding redirects (in src\MSBuild\app.config and src\MSBuild\app.amd64.config) for any changes to
@@ -43,6 +49,7 @@
     <PackageVersion Include="Microsoft.VisualStudio.OpenTelemetry.Collector" Version="$(MicrosoftVisualStudioOpenTelemetryVersion)" />
     <PackageVersion Include="Microsoft.VisualStudio.OpenTelemetry.ClientExtensions" Version="$(MicrosoftVisualStudioOpenTelemetryVersion)" />
 
-    <!-- Microsoft.VisualStudio.SolutionPersistence is maintained in eng/dependabot/Packages.props -->
+    <!-- Microsoft.VisualStudio.SolutionPersistence is maintained in eng/dependabot/Directory.Packages.props -->
   </ItemGroup>
+
 </Project>
diff --git a/eng/Versions.props b/eng/Versions.props
@@ -60,7 +60,7 @@
 
   <PropertyGroup>
     <MicrosoftVisualStudioOpenTelemetryVersion>0.2.104-beta</MicrosoftVisualStudioOpenTelemetryVersion>
-    <!-- Microsoft.VisualStudio.SolutionPersistence is maintained in eng/dependabot/Packages.props -->
+    <!-- Microsoft.VisualStudio.SolutionPersistence is maintained in eng/dependabot/Directory.Packages.props -->
   </PropertyGroup>
 
   <!-- Toolset Dependencies -->

diff --git a/eng/dependabot/Packages.props → eng/dependabot/Directory.Packages.props b/eng/dependabot/Packages.props → eng/dependabot/Directory.Packages.props
@@ -49,10 +49,9 @@
 
     <PackageVersion Include="Verify.Xunit" Version="19.14.1" />
     <PackageVersion Update="Verify.XUnit" Condition="'$(VerifyXUnitVersion)' != ''" Version="$(VerifyXUnitVersion)" />
-
   </ItemGroup>
 
-  <ItemGroup Condition="'$(DotNetBuildSourceOnly)' != 'true' AND $(ProjectIsDeprecated) != 'true'">
+  <ItemGroup Condition="'$(DotNetBuildSourceOnly)' != 'true'">
     <GlobalPackageReference Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="3.3.4" />
     <GlobalPackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.556" PrivateAssets="all"/>
     <GlobalPackageReference Include="Microsoft.VisualStudio.SDK.EmbedInteropTypes" Version="15.0.36" PrivateAssets="All" Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'" />

diff --git a/eng/dependabot/dependabot.csproj b/eng/dependabot/dependabot.csproj
diff --git a/eng/dependabot/global.json b/eng/dependabot/global.json
@@ -0,0 +1 @@
+{}
diff --git a/src/Build/BackEnd/Components/Communications/NodeProviderInProc.cs b/src/Build/BackEnd/Components/Communications/NodeProviderInProc.cs
@@ -370,7 +370,7 @@ private bool InstantiateNode(int nodeId, INodePacketFactory factory)
                 InProcNodeThreadProc(nodeContext._inProcNode);
             });
 #endif
-            nodeContext._inProcNodeThread.Name = $"In-proc Node ({_componentHost.Name})";
+            nodeContext._inProcNodeThread.Name = $"In-proc Node {nodeId} ({_componentHost.Name})";
             nodeContext._inProcNodeThread.IsBackground = true;
 #if FEATURE_THREAD_CULTURE
             nodeContext._inProcNodeThread.CurrentCulture = _componentHost.BuildParameters.Culture;

diff --git a/src/Shared/EmptyDirectoryBuildFiles/Directory.Packages.props b/src/Shared/EmptyDirectoryBuildFiles/Directory.Packages.props
@@ -0,0 +1,3 @@
+<Project>
+  <!-- Empty file to stop tests from using Directory.Packages.props at repo root -->
+</Project>