Skip to content

Commit 0932640

Browse files
committed
apply PR 9476, update BuildXL and DetouredNodeLauncher which uses it
1 parent 7b45100 commit 0932640

File tree

2 files changed

+11
-2
lines changed

2 files changed

+11
-2
lines changed

eng/dependabot/Packages.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<PackageVersion Include="LargeAddressAware" Version="1.0.5" />
2020
<PackageVersion Update="LargeAddressAware" Condition="'$(LargeAddressAwareVersion)' != ''" Version="$(LargeAddressAwareVersion)" />
2121

22-
<PackageVersion Include="Microsoft.BuildXL.Processes" Version="0.1.0-20230929.2" />
22+
<PackageVersion Include="Microsoft.BuildXL.Processes" Version="0.1.0-20231128.3" />
2323
<PackageVersion Update="Microsoft.BuildXL.Processes" Condition="'$(BuildXLProcessesVersion)' != ''" Version="$(BuildXLProcessesVersion)" />
2424

2525
<PackageVersion Include="Microsoft.VisualStudio.Setup.Configuration.Interop" Version="3.2.2146" PrivateAssets="All" />

src/Build/BackEnd/Components/Communications/DetouredNodeLauncher.cs

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
using Microsoft.Build.Internal;
1616
using Microsoft.Build.Shared;
1717
using Microsoft.Build.Shared.FileSystem;
18+
using static BuildXL.Processes.FileAccessManifest;
1819

1920
#nullable disable
2021

@@ -106,7 +107,15 @@ public Process Start(string msbuildLocation, string commandLineArgs, int nodeId)
106107
FileAccessPolicy.AllowAll | FileAccessPolicy.ReportAccess);
107108

108109
// Support shared compilation
109-
info.FileAccessManifest.ChildProcessesToBreakawayFromSandbox = new string[] { NativeMethodsShared.IsWindows ? "VBCSCompiler.exe" : "VBCSCompiler" };
110+
info.FileAccessManifest.ChildProcessesToBreakawayFromSandbox =
111+
[
112+
#if RUNTIME_TYPE_NETCORE
113+
new BreakawayChildProcess(NativeMethodsShared.IsWindows ? "dotnet.exe" : "dotnet", "vbcscompiler.dll", CommandLineArgsSubstringContainmentIgnoreCase: true)
114+
#else
115+
new BreakawayChildProcess(NativeMethodsShared.IsWindows ? "VBCSCompiler.exe" : "VBCSCompiler")
116+
#endif
117+
];
118+
110119
info.FileAccessManifest.MonitorChildProcesses = true;
111120
info.FileAccessManifest.IgnoreReparsePoints = true;
112121
info.FileAccessManifest.UseExtraThreadToDrainNtClose = false;

0 commit comments

Comments
 (0)