Skip to content

AppDomain configuration is serialized without using BinFmt #9320

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
merged 25 commits into from
Oct 18, 2023
Merged

AppDomain configuration is serialized without using BinFmt #9320

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
2f93aea
AppDomain configuration is serialized without using BinFmt
MichalPavlik Oct 11, 2023
c4f8cf1
Added new unit tests. Fixed 'null' bug.
MichalPavlik Oct 17, 2023
3ee6aef
Fix CG alerts caused by RoslynTools.MSBuild 17.7.2 (#9310)
GangWang01 Oct 9, 2023
87b844b
Fix policheck error (#9311)
JaynieBai Oct 10, 2023
64dfc0c
Mention unification in RAR found-conflicts message (#9226)
rainersigwald Oct 10, 2023
7098c57
Correct success for /preprocess /targets builds (#8908)
Forgind Oct 10, 2023
e4cb483
Enable Windows Disabled Drive Enumeration Tests (#9266)
JaynieBai Oct 10, 2023
f79b38f
Packages sourcing doc (#8475)
JanKrivanek Oct 10, 2023
4aec098
Catch the illegal argument exception in Net Framework! (#8839)
JaynieBai Oct 10, 2023
d374923
Remove stale .vsconfig components (#8862)
rainersigwald Oct 10, 2023
9de0dd8
Update dependencies from https://github.com/dotnet/roslyn build 20231…
dotnet-maestro[bot] Oct 11, 2023
56cb905
Re-enable IdenticalSubmissionsShouldCompleteAndNotHangTheBuildOnMissi…
ladipro Oct 11, 2023
48b97b2
Delete ExcludeFromStyleCop (#9247)
ladipro Oct 11, 2023
cb02c2c
Make repo buildable with VS 17.8.0 Preview 3.0 (#9319)
ladipro Oct 12, 2023
98ac0d8
Add a job for experimental Framework MSBuild insertion to a pipeline …
AR-May Oct 12, 2023
f471b78
Localized file check-in by OneLocBuild Task: Build definition ID 9434…
dotnet-bot Oct 13, 2023
8f7335f
Update dependencies from https://github.com/dotnet/roslyn build 20231…
dotnet-maestro[bot] Oct 17, 2023
619dca4
Cleanup: Delete NGen of T (#9263)
ladipro Oct 17, 2023
96dd579
Merge branch 'main' of https://github.com/dotnet/msbuild
MichalPavlik Oct 17, 2023
0348063
Added change wave with checks
MichalPavlik Oct 17, 2023
3e69ceb
Type member changed to local variable
MichalPavlik Oct 17, 2023
30f830f
Update src/Build/BackEnd/Node/NodeConfiguration.cs
MichalPavlik Oct 18, 2023
0df3f80
Update src/Shared/TaskHostConfiguration.cs
MichalPavlik Oct 18, 2023
2f6635e
Renamed local variable
MichalPavlik Oct 18, 2023
1d689c8
Added record to change waves docs
MichalPavlik Oct 18, 2023
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
15 changes: 14 additions & 1 deletion src/Build/BackEnd/Node/NodeConfiguration.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,11 @@ internal class NodeConfiguration : INodePacket
private BuildParameters _buildParameters;

#if FEATURE_APPDOMAIN
/// <summary>
/// The app domain configuration bytes sent via RPC.
/// </summary>
private byte[] _appDomainConfigBytes;

/// <summary>
/// The app domain information needed for setting up AppDomain-isolated tasks.
/// </summary>
Expand Down Expand Up @@ -66,6 +71,7 @@ public NodeConfiguration(
_buildParameters = buildParameters;
_forwardingLoggers = forwardingLoggers;
#if FEATURE_APPDOMAIN
_appDomainConfigBytes = appDomainSetup?.GetConfigurationBytes();
_appDomainSetup = appDomainSetup;
#endif
_loggingNodeConfiguration = loggingNodeConfiguration;
Expand Down Expand Up @@ -161,7 +167,7 @@ public void Translate(ITranslator translator)
translator.Translate(ref _buildParameters, BuildParameters.FactoryForDeserialization);
translator.TranslateArray(ref _forwardingLoggers, LoggerDescription.FactoryForTranslation);
#if FEATURE_APPDOMAIN
translator.TranslateDotNet(ref _appDomainSetup);
translator.Translate(ref _appDomainConfigBytes);
#endif
translator.Translate(ref _loggingNodeConfiguration);
}
Expand All @@ -173,6 +179,13 @@ internal static INodePacket FactoryForDeserialization(ITranslator translator)
{
NodeConfiguration configuration = new NodeConfiguration();
configuration.Translate(translator);
#if FEATURE_APPDOMAIN
if (configuration._appDomainConfigBytes != null)
{
configuration._appDomainSetup = new AppDomainSetup();
configuration._appDomainSetup.SetConfigurationBytes(configuration._appDomainConfigBytes);
}
#endif
return configuration;
}
#endregion
Expand Down
15 changes: 14 additions & 1 deletion src/Shared/TaskHostConfiguration.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,11 @@ internal class TaskHostConfiguration : INodePacket
private CultureInfo _uiCulture = CultureInfo.CurrentUICulture;

#if FEATURE_APPDOMAIN
/// <summary>
/// The app domain configuration bytes sent via RPC.
/// </summary>
private byte[] _appDomainConfigBytes;

/// <summary>
/// The AppDomainSetup that we may want to use on AppDomainIsolated tasks.
/// </summary>
Expand Down Expand Up @@ -182,6 +187,7 @@ public TaskHostConfiguration(
_culture = culture;
_uiCulture = uiCulture;
#if FEATURE_APPDOMAIN
_appDomainConfigBytes = appDomainSetup?.GetConfigurationBytes();
_appDomainSetup = appDomainSetup;
#endif
_lineNumberOfTask = lineNumberOfTask;
Expand Down Expand Up @@ -417,7 +423,7 @@ public void Translate(ITranslator translator)
translator.TranslateCulture(ref _culture);
translator.TranslateCulture(ref _uiCulture);
#if FEATURE_APPDOMAIN
translator.TranslateDotNet(ref _appDomainSetup);
translator.Translate(ref _appDomainConfigBytes);
#endif
translator.Translate(ref _lineNumberOfTask);
translator.Translate(ref _columnNumberOfTask);
Expand Down Expand Up @@ -458,6 +464,13 @@ internal static INodePacket FactoryForDeserialization(ITranslator translator)
{
TaskHostConfiguration configuration = new TaskHostConfiguration();
configuration.Translate(translator);
#if FEATURE_APPDOMAIN
if (configuration._appDomainConfigBytes != null)
{
configuration._appDomainSetup = new AppDomainSetup();
configuration._appDomainSetup.SetConfigurationBytes(configuration._appDomainConfigBytes);
}
#endif
return configuration;
}
}
Expand Down