Skip to content

Commit 8cd45e3

Browse files
authored
Remove BinFmt opt-in for un-exposed data transfers (#10741)
* Remove BinFmt opt-in * Further clean
1 parent 2e87605 commit 8cd45e3

File tree

3 files changed

+20
-54
lines changed

3 files changed

+20
-54
lines changed

src/Build/BackEnd/Node/NodeConfiguration.cs

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -162,27 +162,20 @@ public void Translate(ITranslator translator)
162162
translator.Translate(ref _buildParameters, BuildParameters.FactoryForDeserialization);
163163
translator.TranslateArray(ref _forwardingLoggers, LoggerDescription.FactoryForTranslation);
164164
#if FEATURE_APPDOMAIN
165-
if (ChangeWaves.AreFeaturesEnabled(ChangeWaves.Wave17_10) || !Traits.Instance.EscapeHatches.IsBinaryFormatterSerializationAllowed)
166-
{
167-
byte[] appDomainConfigBytes = null;
165+
byte[] appDomainConfigBytes = null;
168166

169-
// Set the configuration bytes just before serialization in case the SetConfigurationBytes was invoked during lifetime of this instance.
170-
if (translator.Mode == TranslationDirection.WriteToStream)
171-
{
172-
appDomainConfigBytes = _appDomainSetup?.GetConfigurationBytes();
173-
}
167+
// Set the configuration bytes just before serialization in case the SetConfigurationBytes was invoked during lifetime of this instance.
168+
if (translator.Mode == TranslationDirection.WriteToStream)
169+
{
170+
appDomainConfigBytes = _appDomainSetup?.GetConfigurationBytes();
171+
}
174172

175-
translator.Translate(ref appDomainConfigBytes);
173+
translator.Translate(ref appDomainConfigBytes);
176174

177-
if (translator.Mode == TranslationDirection.ReadFromStream)
178-
{
179-
_appDomainSetup = new AppDomainSetup();
180-
_appDomainSetup.SetConfigurationBytes(appDomainConfigBytes);
181-
}
182-
}
183-
else
175+
if (translator.Mode == TranslationDirection.ReadFromStream)
184176
{
185-
translator.TranslateDotNet(ref _appDomainSetup);
177+
_appDomainSetup = new AppDomainSetup();
178+
_appDomainSetup.SetConfigurationBytes(appDomainConfigBytes);
186179
}
187180
#endif
188181
translator.Translate(ref _loggingNodeConfiguration);

src/Framework/Traits.cs

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -423,26 +423,6 @@ public bool UnquoteTargetSwitchParameters
423423
}
424424
}
425425

426-
private bool? _isBinaryFormatterSerializationAllowed;
427-
public bool IsBinaryFormatterSerializationAllowed
428-
{
429-
get
430-
{
431-
if (!_isBinaryFormatterSerializationAllowed.HasValue)
432-
{
433-
#if RUNTIME_TYPE_NETCORE
434-
AppContext.TryGetSwitch("System.Runtime.Serialization.EnableUnsafeBinaryFormatterSerialization",
435-
out bool enabled);
436-
_isBinaryFormatterSerializationAllowed = enabled;
437-
#else
438-
_isBinaryFormatterSerializationAllowed = true;
439-
#endif
440-
}
441-
442-
return _isBinaryFormatterSerializationAllowed.Value;
443-
}
444-
}
445-
446426

447427
private static bool? ParseNullableBoolFromEnvironmentVariable(string environmentVariable)
448428
{

src/Shared/TaskHostConfiguration.cs

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -417,27 +417,20 @@ public void Translate(ITranslator translator)
417417
translator.TranslateCulture(ref _culture);
418418
translator.TranslateCulture(ref _uiCulture);
419419
#if FEATURE_APPDOMAIN
420-
if (ChangeWaves.AreFeaturesEnabled(ChangeWaves.Wave17_10) || !Traits.Instance.EscapeHatches.IsBinaryFormatterSerializationAllowed)
421-
{
422-
byte[] appDomainConfigBytes = null;
420+
byte[] appDomainConfigBytes = null;
423421

424-
// Set the configuration bytes just before serialization in case the SetConfigurationBytes was invoked during lifetime of this instance.
425-
if (translator.Mode == TranslationDirection.WriteToStream)
426-
{
427-
appDomainConfigBytes = _appDomainSetup?.GetConfigurationBytes();
428-
}
422+
// Set the configuration bytes just before serialization in case the SetConfigurationBytes was invoked during lifetime of this instance.
423+
if (translator.Mode == TranslationDirection.WriteToStream)
424+
{
425+
appDomainConfigBytes = _appDomainSetup?.GetConfigurationBytes();
426+
}
429427

430-
translator.Translate(ref appDomainConfigBytes);
428+
translator.Translate(ref appDomainConfigBytes);
431429

432-
if (translator.Mode == TranslationDirection.ReadFromStream)
433-
{
434-
_appDomainSetup = new AppDomainSetup();
435-
_appDomainSetup.SetConfigurationBytes(appDomainConfigBytes);
436-
}
437-
}
438-
else
430+
if (translator.Mode == TranslationDirection.ReadFromStream)
439431
{
440-
translator.TranslateDotNet(ref _appDomainSetup);
432+
_appDomainSetup = new AppDomainSetup();
433+
_appDomainSetup.SetConfigurationBytes(appDomainConfigBytes);
441434
}
442435
#endif
443436
translator.Translate(ref _lineNumberOfTask);

0 commit comments

Comments
 (0)