Skip to content

Commit dccaea6

Browse files
Respect the value of SkipCompilerExecution (#17145)
Check it instead of DesignTimeBuild
1 parent 1e34a78 commit dccaea6

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

packages/Avalonia/AvaloniaBuildTasks.targets

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@
133133
DependsOnTargets="$(CompileAvaloniaXamlDependsOn)"
134134
Inputs="@(CompileAvaloniaXamlInputs)"
135135
Outputs="@(CompileAvaloniaXamlOutputs)"
136-
Condition="'@(AvaloniaResource)@(AvaloniaXaml)' != '' AND $(DesignTimeBuild) != true AND $(EnableAvaloniaXamlCompilation) != false">
136+
Condition="'@(AvaloniaResource)@(AvaloniaXaml)' != '' AND $(EnableAvaloniaXamlCompilation) != false AND '$(SkipCompilerExecution)' != 'true'">
137137

138138
<!--
139139
$(IntermediateOutputPath)/Avalonia/references is using from AvaloniaVS for retrieve library references.
@@ -161,7 +161,7 @@
161161
</Target>
162162

163163
<Target Name="InjectAvaloniaXamlOutput" DependsOnTargets="PrepareToCompileAvaloniaXaml" AfterTargets="CompileAvaloniaXaml" BeforeTargets="CopyFilesToOutputDirectory;BuiltProjectOutputGroup;ComputeResolvedFilesToPublishList"
164-
Condition="'@(AvaloniaResource)@(AvaloniaXaml)' != '' AND $(EnableAvaloniaXamlCompilation) != false">
164+
Condition="'@(AvaloniaResource)@(AvaloniaXaml)' != '' AND $(EnableAvaloniaXamlCompilation) != false AND '$(SkipCompilerExecution)' != 'true'">
165165
<ItemGroup>
166166
<_AvaloniaXamlCompiledAssembly Include="@(IntermediateAssembly->Metadata('AvaloniaCompileOutput'))"/>
167167
<IntermediateAssembly Remove="@(IntermediateAssembly)"/>
@@ -192,7 +192,7 @@
192192
DependsOnTargets="InjectAvaloniaXamlOutput"
193193
AfterTargets="ComputeIlcCompileInputs"
194194
BeforeTargets="PrepareForILLink"
195-
Condition="$([MSBuild]::VersionLessThan($(TargetFrameworkVersion), '9.0')) AND '@(AvaloniaResource)@(AvaloniaXaml)' != '' AND $(EnableAvaloniaXamlCompilation) != false">
195+
Condition="$([MSBuild]::VersionLessThan($(TargetFrameworkVersion), '9.0')) AND '@(AvaloniaResource)@(AvaloniaXaml)' != '' AND $(EnableAvaloniaXamlCompilation) != false AND '$(SkipCompilerExecution)' != 'true'">
196196
<ItemGroup>
197197
<ManagedBinary Remove="$(IntermediateOutputPath)$(TargetName)$(TargetExt)" />
198198
<ManagedBinary Include="@(_AvaloniaXamlCompiledAssembly)" />

0 commit comments

Comments
 (0)