Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 12 additions & 0 deletions src/Tasks/Microsoft.NET.Build.Tasks/RunReadyToRunCompiler.cs
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ public class RunReadyToRunCompiler : ToolTask
public bool ShowCompilerWarnings { get; set; }
public bool UseCrossgen2 { get; set; }
public string Crossgen2ExtraCommandLineArgs { get; set; }
public string Crossgen2CompositeExtraCommandLineArgs { get; set; }
public ITaskItem[] Crossgen2PgoFiles { get; set; }
public string Crossgen2ContainerFormat { get; set; }

Expand Down Expand Up @@ -362,6 +363,17 @@ private string GenerateCrossgen2ResponseFile()
}
}

// Arguments that are only valid for full composite builds (e.g. --strip-il-bodies).
// These arguments will not be applied to any assemblies that have been excluded from the composite image.
if (_createCompositeImage && !_partialCompile
&& !string.IsNullOrEmpty(Crossgen2CompositeExtraCommandLineArgs))
{
foreach (string extraArg in Crossgen2CompositeExtraCommandLineArgs.Split([';'], StringSplitOptions.RemoveEmptyEntries))
{
result.AppendLine(extraArg);
}
}

if (_partialCompile)
{
result.AppendLine("--partial");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,12 @@ Copyright (c) .NET Foundation. All rights reserved.
<PublishReadyToRunCrossgen2ExtraArgs Condition="'$(PublishReadyToRunStripDebugInfo)' != 'false' and $(RuntimeIdentifier.StartsWith('iossimulator-'))">$(PublishReadyToRunCrossgen2ExtraArgs);--strip-debug-info</PublishReadyToRunCrossgen2ExtraArgs>
<PublishReadyToRunCrossgen2ExtraArgs Condition="'$(PublishReadyToRunStripDebugInfo)' != 'false' and $(RuntimeIdentifier.StartsWith('tvossimulator-'))">$(PublishReadyToRunCrossgen2ExtraArgs);--strip-debug-info</PublishReadyToRunCrossgen2ExtraArgs>
<PublishReadyToRunCrossgen2ExtraArgs Condition="'$(PublishReadyToRunStripDebugInfo)' != 'false' and $(RuntimeIdentifier.StartsWith('maccatalyst-'))">$(PublishReadyToRunCrossgen2ExtraArgs);--strip-debug-info</PublishReadyToRunCrossgen2ExtraArgs>

<PublishReadyToRunCrossgen2CompositeExtraArgs Condition="'$(PublishReadyToRunStripILBodies)' != 'false' and '$(PublishReadyToRunComposite)' == 'true' and '@(PublishReadyToRunPartialAssemblies)' == '' and '@(PublishReadyToRunCompositeExclusions)' == '' and $(RuntimeIdentifier.StartsWith('ios-'))">$(PublishReadyToRunCrossgen2CompositeExtraArgs);--strip-il-bodies</PublishReadyToRunCrossgen2CompositeExtraArgs>
<PublishReadyToRunCrossgen2CompositeExtraArgs Condition="'$(PublishReadyToRunStripILBodies)' != 'false' and '$(PublishReadyToRunComposite)' == 'true' and '@(PublishReadyToRunPartialAssemblies)' == '' and '@(PublishReadyToRunCompositeExclusions)' == '' and $(RuntimeIdentifier.StartsWith('tvos-'))">$(PublishReadyToRunCrossgen2CompositeExtraArgs);--strip-il-bodies</PublishReadyToRunCrossgen2CompositeExtraArgs>
<PublishReadyToRunCrossgen2CompositeExtraArgs Condition="'$(PublishReadyToRunStripILBodies)' != 'false' and '$(PublishReadyToRunComposite)' == 'true' and '@(PublishReadyToRunPartialAssemblies)' == '' and '@(PublishReadyToRunCompositeExclusions)' == '' and $(RuntimeIdentifier.StartsWith('iossimulator-'))">$(PublishReadyToRunCrossgen2CompositeExtraArgs);--strip-il-bodies</PublishReadyToRunCrossgen2CompositeExtraArgs>
<PublishReadyToRunCrossgen2CompositeExtraArgs Condition="'$(PublishReadyToRunStripILBodies)' != 'false' and '$(PublishReadyToRunComposite)' == 'true' and '@(PublishReadyToRunPartialAssemblies)' == '' and '@(PublishReadyToRunCompositeExclusions)' == '' and $(RuntimeIdentifier.StartsWith('tvossimulator-'))">$(PublishReadyToRunCrossgen2CompositeExtraArgs);--strip-il-bodies</PublishReadyToRunCrossgen2CompositeExtraArgs>
<PublishReadyToRunCrossgen2CompositeExtraArgs Condition="'$(PublishReadyToRunStripILBodies)' != 'false' and '$(PublishReadyToRunComposite)' == 'true' and '@(PublishReadyToRunPartialAssemblies)' == '' and '@(PublishReadyToRunCompositeExclusions)' == '' and $(RuntimeIdentifier.StartsWith('maccatalyst-'))">$(PublishReadyToRunCrossgen2CompositeExtraArgs);--strip-il-bodies</PublishReadyToRunCrossgen2CompositeExtraArgs>
</PropertyGroup>

<PropertyGroup>
Expand Down Expand Up @@ -505,6 +511,7 @@ Copyright (c) .NET Foundation. All rights reserved.
Crossgen2PgoFiles="@(_ReadyToRunPgoFiles)"
Crossgen2ContainerFormat="$(PublishReadyToRunContainerFormat)"
Crossgen2ExtraCommandLineArgs="$(PublishReadyToRunCrossgen2ExtraArgs)"
Crossgen2CompositeExtraCommandLineArgs="$(PublishReadyToRunCrossgen2CompositeExtraArgs)"
ImplementationAssemblyReferences="@(_ReadyToRunAssembliesToReference)"
ShowCompilerWarnings="$(PublishReadyToRunShowWarnings)"
CompilationEntry="@(_ReadyToRunCompileList)"
Expand Down
Loading