Merged PR 699127: Upgrade to AnyBuild SDK 0.2.0

Newer SDK including interleaved stdout,err outputs (we still squash to single blocks) and faster AB startup.
This commit is contained in:
Erik Mavrinac 2023-01-30 18:14:42 +00:00
Родитель 2d29e15010
Коммит 7b9ff3e5da
4 изменённых файлов: 16 добавлений и 10 удалений

Просмотреть файл

@ -159,15 +159,21 @@ namespace BuildXL.Processes.Remoting
Tracing.Logger.Log.FindOrStartAnyBuildDaemon(m_loggingContext, extraParams, logDir); Tracing.Logger.Log.FindOrStartAnyBuildDaemon(m_loggingContext, extraParams, logDir);
var options = new AnyBuildClientFindDaemonOptions
{
LogDirectory = logDir,
AdditionalAnyBuildParameters = extraParams,
InheritHandlesOnProcessCreation = false,
// TODO: Use available ports instead of the defaults. It may address the issue with /server-.
// DaemonPort = GetUnusedPort(),
// ShimPort = GetUnusedPort(),
};
daemonManager = await abClient.FindOrStartAnyBuildDaemonAsync( daemonManager = await abClient.FindOrStartAnyBuildDaemonAsync(
closeDaemonOnDispose: true, closeDaemonOnDispose: true,
m_executionContext.CancellationToken, m_executionContext.CancellationToken,
logDirectory: logDir, options);
additionalAnyBuildParameters: extraParams,
// TODO: Use available ports instead of the defaults. It may address the issue with /server-.
// daemonPort: GetUnusedPort(),
// shimPort: GetUnusedPort(),
inheritHandlesOnProcessCreation: false);
} }
catch (Exception e) catch (Exception e)
{ {

Просмотреть файл

@ -38,8 +38,8 @@ namespace BuildXL.Processes.Remoting.AnyBuild
{ {
ShouldRunLocally = result.ShouldRunLocally, ShouldRunLocally = result.ShouldRunLocally,
ExitCode = result.ExitCode, ExitCode = result.ExitCode,
StdOut = result.StdOut, StdOut = result.GetStdOut(),
StdErr = result.StdErr, StdErr = result.GetStdErr(),
Disposition = result.ExecutionDisposition switch Disposition = result.ExecutionDisposition switch
{ {
CommandExecutionDisposition.CacheHit => RemoteResultDisposition.CacheHit, CommandExecutionDisposition.CacheHit => RemoteResultDisposition.CacheHit,

Просмотреть файл

@ -15,7 +15,7 @@
"Type": "NuGet", "Type": "NuGet",
"NuGet": { "NuGet": {
"Name": "AnyBuild.SDK", "Name": "AnyBuild.SDK",
"Version": "0.1.16" "Version": "0.2.0"
} }
} }
}, },

Просмотреть файл

@ -75,7 +75,7 @@ export const pkgs = isMicrosoftInternal ? [
{ id: "Microsoft.Bcl.HashCode", version: "1.1.1" }, { id: "Microsoft.Bcl.HashCode", version: "1.1.1" },
// Process remoting // Process remoting
{ id: "AnyBuild.SDK", version: "0.1.16" }, { id: "AnyBuild.SDK", version: "0.2.0" },
// Part of VSSDK used by IDE/VsIntegration // Part of VSSDK used by IDE/VsIntegration
{ id: "Microsoft.Internal.VisualStudio.Interop", version: "17.2.32405.191" }, { id: "Microsoft.Internal.VisualStudio.Interop", version: "17.2.32405.191" },