Skip to content
Open
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
1 change: 1 addition & 0 deletions eng/pipelines/coreclr/runtime-nativeaot-outerloop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ schedules:

variables:
- template: /eng/pipelines/common/variables.yml
- template: /eng/pipelines/helix-platforms.yml

extends:
template: /eng/pipelines/common/templates/pipeline-with-resources.yml
Expand Down
2 changes: 1 addition & 1 deletion eng/pipelines/runtime.yml
Original file line number Diff line number Diff line change
Expand Up @@ -605,7 +605,7 @@ extends:
- template: /eng/pipelines/coreclr/nativeaot-post-build-steps.yml
parameters:
creator: dotnet-bot
testBuildArgs: 'nativeaot tree ";nativeaot;Loader;Interop;" /p:BuildNativeAotFrameworkObjects=true'
testBuildArgs: 'nativeaot tree ";nativeaot;Loader;Interop;async;" /p:BuildNativeAotFrameworkObjects=true'
liveLibrariesBuildConfig: Release
testRunNamePrefixSuffix: NativeAOT_$(_BuildConfig)
extraVariablesTemplates:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,10 @@ public override bool ShouldSkipEmittingObjectNode(NodeFactory factory)
}
#endif

public override ObjectNodeSection GetSection(NodeFactory factory) => ObjectNodeSection.ReadOnlyDataSection;
// TODO: (async) This should stay RO everywhere: https://github.com/dotnet/runtime/issues/121871
public override ObjectNodeSection GetSection(NodeFactory factory)
=> factory.Target.IsWindows ? ObjectNodeSection.ReadOnlyDataSection : ObjectNodeSection.DataSection;

public override bool StaticDependenciesAreComputed => _data != null;

public void AppendMangledName(NameMangler nameMangler, Utf8StringBuilder sb)
Expand Down
12 changes: 10 additions & 2 deletions src/tests/async/Directory.Build.targets
Original file line number Diff line number Diff line change
@@ -1,12 +1,20 @@
<Project>
<PropertyGroup>
<!-- disable building for configurations that do not yet support runtime async. -->
<DisableProjectBuild Condition="'$(RuntimeFlavor)' == 'mono' or '$(TestBuildMode)' == 'nativeaot' or '$(TargetArchitecture)' == 'wasm'">true</DisableProjectBuild>
<DisableProjectBuild Condition="'$(RuntimeFlavor)' == 'mono' or '$(TargetArchitecture)' == 'wasm'">true</DisableProjectBuild>
</PropertyGroup>

<PropertyGroup>
<!-- https://github.com/dotnet/runtime/issues/121872 -->
<DisableProjectBuild Condition="'$(TestBuildMode)' == 'nativeaot' and '$(TargetArchitecture)' == 'x86'">true</DisableProjectBuild>

<!-- https://github.com/dotnet/runtime/issues/121878 -->
<DisableProjectBuild Condition="'$(TestBuildMode)' == 'nativeaot' and '$(TargetArchitecture)' == 'arm64' and ('$(TargetOS)' == 'linux' or '$(TargetOS)' == 'android')">true</DisableProjectBuild>
</PropertyGroup>

<PropertyGroup>
<!-- runtime async testing in main repo NYI -->
<DisableProjectBuild>true</DisableProjectBuild>
<DisableProjectBuild Condition="'$(TestBuildMode)' != 'nativeaot'">true</DisableProjectBuild>
</PropertyGroup>

<Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets, $(MSBuildThisFileDirectory)..))" />
Expand Down
Loading