Skip to content

Enable com support for clr4 in task host #13033

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
YuliiaKovalova merged 2 commits into from
Jan 20, 2026
Merged

Enable com support for clr4 in task host #13033

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
78bf092
enable com support for clr4 in task host
YuliiaKovalova Jan 15, 2026
7964cd7
Merge branch 'main' into dev/ykovalova/enable_com_in_out_of_proc_task…
YuliiaKovalova Jan 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions src/Shared/CommunicationsUtilities.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,8 +220,6 @@ internal class Handshake
// The number is selected as an arbitrary value that is unlikely to conflict with any future sdk version.
public const int NetTaskHostHandshakeVersion = 99;

public const HandshakeOptions NetTaskHostFlags = HandshakeOptions.NET | HandshakeOptions.TaskHost;

protected readonly HandshakeComponents _handshakeComponents;

/// <summary>
Expand Down Expand Up @@ -259,7 +257,7 @@ protected Handshake(HandshakeOptions nodeType, bool includeSessionId, string pre
CommunicationsUtilities.Trace("Building handshake for node type {0}, (version {1}): options {2}.", nodeType, handshakeVersion, options);

// Calculate salt from environment and tools directory
bool isNetTaskHost = IsHandshakeOptionEnabled(nodeType, NetTaskHostFlags);
bool isNetTaskHost = IsHandshakeOptionEnabled(nodeType, HandshakeOptions.NET | HandshakeOptions.TaskHost);
string handshakeSalt = Environment.GetEnvironmentVariable("MSBUILDNODEHANDSHAKESALT") ?? "";
string toolsDirectory = GetToolsDirectory(isNetTaskHost, predefinedToolsDirectory);
int salt = CommunicationsUtilities.GetHashCode($"{handshakeSalt}{toolsDirectory}");
Expand Down
2 changes: 1 addition & 1 deletion src/Shared/INodePacket.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,7 @@ internal static class NodePacketTypeExtensions
/// <returns>True if extended header flag was set, false otherwise.</returns>
public static bool TryCreateExtendedHeaderType(HandshakeOptions handshakeOptions, NodePacketType type, out byte extendedheader)
{
if (Handshake.IsHandshakeOptionEnabled(handshakeOptions, Handshake.NetTaskHostFlags))
if (Handshake.IsHandshakeOptionEnabled(handshakeOptions, HandshakeOptions.TaskHost))
{
extendedheader = (byte)((byte)type | ExtendedHeaderFlag);
return true;
Expand Down
Loading