Skip to content

Remove BinFmt opt-in for un-exposed data transfers #10741

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
JanKrivanek merged 2 commits into from
Oct 7, 2024
Merged

Remove BinFmt opt-in for un-exposed data transfers #10741

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
01c67b2
Remove BinFmt opt-in
JanKrivanek Oct 2, 2024
cc69372
Further clean
JanKrivanek Oct 2, 2024
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
27 changes: 10 additions & 17 deletions src/Build/BackEnd/Node/NodeConfiguration.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,27 +162,20 @@ public void Translate(ITranslator translator)
translator.Translate(ref _buildParameters, BuildParameters.FactoryForDeserialization);
translator.TranslateArray(ref _forwardingLoggers, LoggerDescription.FactoryForTranslation);
#if FEATURE_APPDOMAIN
if (ChangeWaves.AreFeaturesEnabled(ChangeWaves.Wave17_10) || !Traits.Instance.EscapeHatches.IsBinaryFormatterSerializationAllowed)
{
byte[] appDomainConfigBytes = null;
byte[] appDomainConfigBytes = null;

// Set the configuration bytes just before serialization in case the SetConfigurationBytes was invoked during lifetime of this instance.
if (translator.Mode == TranslationDirection.WriteToStream)
{
appDomainConfigBytes = _appDomainSetup?.GetConfigurationBytes();
}
// Set the configuration bytes just before serialization in case the SetConfigurationBytes was invoked during lifetime of this instance.
if (translator.Mode == TranslationDirection.WriteToStream)
{
appDomainConfigBytes = _appDomainSetup?.GetConfigurationBytes();
}

translator.Translate(ref appDomainConfigBytes);
translator.Translate(ref appDomainConfigBytes);

if (translator.Mode == TranslationDirection.ReadFromStream)
{
_appDomainSetup = new AppDomainSetup();
_appDomainSetup.SetConfigurationBytes(appDomainConfigBytes);
}
}
else
if (translator.Mode == TranslationDirection.ReadFromStream)
{
translator.TranslateDotNet(ref _appDomainSetup);
_appDomainSetup = new AppDomainSetup();
_appDomainSetup.SetConfigurationBytes(appDomainConfigBytes);
}
#endif
translator.Translate(ref _loggingNodeConfiguration);
Expand Down
20 changes: 0 additions & 20 deletions src/Framework/Traits.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -423,26 +423,6 @@ public bool UnquoteTargetSwitchParameters
}
}

private bool? _isBinaryFormatterSerializationAllowed;
public bool IsBinaryFormatterSerializationAllowed
{
get
{
if (!_isBinaryFormatterSerializationAllowed.HasValue)
{
#if RUNTIME_TYPE_NETCORE
AppContext.TryGetSwitch("System.Runtime.Serialization.EnableUnsafeBinaryFormatterSerialization",
out bool enabled);
_isBinaryFormatterSerializationAllowed = enabled;
#else
_isBinaryFormatterSerializationAllowed = true;
#endif
}

return _isBinaryFormatterSerializationAllowed.Value;
}
}


private static bool? ParseNullableBoolFromEnvironmentVariable(string environmentVariable)
{
Expand Down
27 changes: 10 additions & 17 deletions src/Shared/TaskHostConfiguration.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,27 +417,20 @@ public void Translate(ITranslator translator)
translator.TranslateCulture(ref _culture);
translator.TranslateCulture(ref _uiCulture);
#if FEATURE_APPDOMAIN
if (ChangeWaves.AreFeaturesEnabled(ChangeWaves.Wave17_10) || !Traits.Instance.EscapeHatches.IsBinaryFormatterSerializationAllowed)
{
byte[] appDomainConfigBytes = null;
byte[] appDomainConfigBytes = null;

// Set the configuration bytes just before serialization in case the SetConfigurationBytes was invoked during lifetime of this instance.
if (translator.Mode == TranslationDirection.WriteToStream)
{
appDomainConfigBytes = _appDomainSetup?.GetConfigurationBytes();
}
// Set the configuration bytes just before serialization in case the SetConfigurationBytes was invoked during lifetime of this instance.
if (translator.Mode == TranslationDirection.WriteToStream)
{
appDomainConfigBytes = _appDomainSetup?.GetConfigurationBytes();
}

translator.Translate(ref appDomainConfigBytes);
translator.Translate(ref appDomainConfigBytes);

if (translator.Mode == TranslationDirection.ReadFromStream)
{
_appDomainSetup = new AppDomainSetup();
_appDomainSetup.SetConfigurationBytes(appDomainConfigBytes);
}
}
else
if (translator.Mode == TranslationDirection.ReadFromStream)
{
translator.TranslateDotNet(ref _appDomainSetup);
_appDomainSetup = new AppDomainSetup();
_appDomainSetup.SetConfigurationBytes(appDomainConfigBytes);
}
#endif
translator.Translate(ref _lineNumberOfTask);
Expand Down