Skip to content
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.

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

[ios][tests] Run functional tests with Mono and Native AOT on Helix #87773

Merged
merged 106 commits into from
Aug 11, 2023
Merged
Changes from 1 commit
Commits
Show all changes
106 commits
Select commit Hold shift + click to select a range
74481af
Initial commit
kotlarmilos Jun 19, 2023
ca86967
Add Native AOT library pipeline for iOS and disable other tests
kotlarmilos Jun 19, 2023
98522fd
Disable other tests
kotlarmilos Jun 19, 2023
6ade906
Disable other tests
kotlarmilos Jun 19, 2023
0e7a920
Test build configuration
kotlarmilos Jun 19, 2023
1aca721
Test build configuration
kotlarmilos Jun 19, 2023
774ed6b
Test build configuration
kotlarmilos Jun 19, 2023
034fff1
Add properties to the proxy AOT project
kotlarmilos Jun 20, 2023
a12779b
Merge branch 'main' into feature/ios-functional-tests
kotlarmilos Jun 20, 2023
abfe7c1
Add AppName to the proxy props
kotlarmilos Jun 20, 2023
09c6097
Remove AppName from the proxy props
kotlarmilos Jun 20, 2023
063995d
Merge branch 'main' into feature/ios-functional-tests
kotlarmilos Jun 21, 2023
3693155
Add ILC payload to Helix
kotlarmilos Jun 21, 2023
5344255
Update the Helix targets to support Native AOT tests
kotlarmilos Jun 23, 2023
7c426a5
Fix ILLink and ILC paths on Helix
kotlarmilos Jun 23, 2023
30ae9eb
Import Directory.Build.props/targets to initialize local applebuild p…
kotlarmilos Jun 23, 2023
fff4849
Remove the SDK reference to test the CI
kotlarmilos Jun 23, 2023
df51223
Update run script to include Native AOT params
kotlarmilos Jun 24, 2023
0e7325e
Update sendtohelix conditions to use runtimeFlavor
kotlarmilos Jun 24, 2023
ce43877
Add TargetFramework property to AppleBuild on Helix
kotlarmilos Jun 24, 2023
6304c83
Use AppendTargetFrameworkToOutputPath to fix the Native AOT publish path
kotlarmilos Jun 24, 2023
6eb91b7
Add exit code for functional tests
kotlarmilos Jun 24, 2023
228ba32
Add exit code for functional tests
kotlarmilos Jun 24, 2023
f42f06a
Fix mono sample to output executable
kotlarmilos Jun 24, 2023
a667de7
Add publish path to the mono sample
kotlarmilos Jun 24, 2023
e0ec3aa
Disable size optimization in mono app
kotlarmilos Jun 25, 2023
a681087
Update ExpectedExitCode to be 42
kotlarmilos Jun 25, 2023
eb23036
Optimize bundle size in mono sample
kotlarmilos Jun 25, 2023
a811966
Update ExpectedExitCode property
kotlarmilos Jun 25, 2023
9374010
Use filename to set ExpectedExitCode
kotlarmilos Jun 25, 2023
44f40ca
Use filename to set ExpectedExitCode
kotlarmilos Jun 25, 2023
8d47870
Merge branch 'main' into feature/ios-functional-tests
kotlarmilos Jun 25, 2023
2eecc7e
Tests return 0 when run on iOS
kotlarmilos Jun 25, 2023
ae8ea04
Exclude unnecessary files from the bundle for SOD measurements
kotlarmilos Jun 25, 2023
f168689
Run AddTestRunnersToPublishedFiles when MainLibraryFileName is null
kotlarmilos Jun 26, 2023
72053e0
Merge branch 'main' of github.com:kotlarmilos/runtime into feature/io…
kotlarmilos Jun 27, 2023
a5c8f8b
Merge branch 'main' into feature/ios-functional-tests
kotlarmilos Jun 29, 2023
5ac774f
Simplify the build process for Native AOT sample app
kotlarmilos Jun 29, 2023
9b5641c
Revert disabled tests
kotlarmilos Jun 30, 2023
048a5b9
Merge branch 'main' into feature/ios-functional-tests
kotlarmilos Jul 10, 2023
13fa800
Merge branch 'main' into feature/ios-functional-tests
kotlarmilos Jul 12, 2023
8a46827
Use cross build for Native AOT tests
kotlarmilos Jul 12, 2023
c8515cd
Enable functional tests and fix ilc path
kotlarmilos Jul 12, 2023
d715082
Enable functional tests
kotlarmilos Jul 12, 2023
99cc75b
Run functional test on the CI
kotlarmilos Jul 13, 2023
d0911d3
Use AssemblyName as the MainLibraryFileName
kotlarmilos Jul 13, 2023
7a9cace
Set UseConsoleUITemplate for the functional tests
kotlarmilos Jul 13, 2023
fd39b23
Merge branch 'main' into feature/ios-functional-tests
kotlarmilos Jul 14, 2023
a826dbe
Use predefined MainLibraryFileName in functional tests
kotlarmilos Jul 14, 2023
4438806
Merge branch 'main' into feature/ios-functional-tests
kotlarmilos Jul 15, 2023
9e06c1f
Disable trimming of the sample apps
kotlarmilos Jul 15, 2023
29911b9
Parametrize xharness apple command with test and run options
kotlarmilos Jul 15, 2023
6a420d3
Add --expected-exit-code for apple run command
kotlarmilos Jul 15, 2023
d2d83b0
Run Native AOT functional test on the CI
kotlarmilos Jul 15, 2023
917ce00
Use cross-compiler dir for ilc
kotlarmilos Jul 16, 2023
dc52f2f
Don't use MainLibraryFileName in Native AOT app bundle
kotlarmilos Jul 16, 2023
9bb44e6
Make console template compatible with Native AOT
kotlarmilos Jul 16, 2023
cd8a7f1
Remove redundant props
kotlarmilos Jul 16, 2023
e7e4d1a
Add native dependencies to the app bundle
kotlarmilos Jul 16, 2023
77f7cf4
Run Native AOT tests on simulators and maccatalyst
kotlarmilos Jul 16, 2023
b7b285e
Remove maccatalyst tests
kotlarmilos Jul 16, 2023
486c1a3
Enable iOS.Device.Aot-Llvm.Test.csproj test
kotlarmilos Jul 16, 2023
0d7d88b
Add targets and props from the libraries CI
kotlarmilos Jul 16, 2023
8470e8f
Run functional test on tvos
kotlarmilos Jul 16, 2023
454f40f
Merge branch 'dotnet:main' into feature/ios-functional-tests
kotlarmilos Jul 17, 2023
e260892
Merge branch 'main' into feature/ios-functional-tests
kotlarmilos Jul 18, 2023
e50a647
Run tvOS sample on the CI
kotlarmilos Jul 19, 2023
f3d9b25
Fix IncludesTestRunner property
kotlarmilos Jul 19, 2023
f14e668
Add Native AOT specific props
kotlarmilos Jul 19, 2023
297c69f
Use DirectPInvoke in Native AOT run
kotlarmilos Jul 19, 2023
751a911
Remove unused props
kotlarmilos Jul 19, 2023
3f28fd1
Merge branch 'main' into feature/ios-functional-tests
kotlarmilos Jul 21, 2023
1ff7d9d
Merge branch 'main' into feature/ios-functional-tests
kotlarmilos Jul 25, 2023
bbcc827
Don't run _ScanAssembliesDecideLightweightMarshaler with Native AOT
kotlarmilos Jul 25, 2023
d8e7ebd
Don't run _ScanAssembliesDecideLightweightMarshaler with Native AOT
kotlarmilos Jul 26, 2023
25a057c
Remove redundant props
kotlarmilos Jul 26, 2023
cedc3f0
Update apple build targets with Native AOT props
kotlarmilos Jul 26, 2023
a2d57da
Remove redundant props
kotlarmilos Jul 26, 2023
c06f211
Add IncludesTestRunner property to the Helix payload
kotlarmilos Jul 26, 2023
161e45f
Simplify sample app to use AppleBuild targets
kotlarmilos Jul 27, 2023
d992084
Import ilc targets with UseNativeAOTRuntime prop
kotlarmilos Jul 27, 2023
6d13f76
Merge branch 'dotnet:main' into feature/ios-functional-tests
kotlarmilos Jul 28, 2023
3517646
Remove redundant props
kotlarmilos Aug 1, 2023
a35bbb7
Revert simulator changes
kotlarmilos Aug 1, 2023
05170f9
Merge branch 'feature/ios-functional-tests' of github.com:kotlarmilos…
kotlarmilos Aug 1, 2023
295d640
Merge branch 'dotnet:main' into feature/ios-functional-tests
kotlarmilos Aug 1, 2023
5d7af31
Merge branch 'feature/ios-functional-tests' of github.com:kotlarmilos…
kotlarmilos Aug 1, 2023
989cbca
Add native libs for globalization
kotlarmilos Aug 1, 2023
3b20520
Remove redundant props and fix MainLibraryFileName for non-device sce…
kotlarmilos Aug 1, 2023
d092326
Rename functional tests and include additional ios test
kotlarmilos Aug 1, 2023
d4a3a56
Include more functional tests
kotlarmilos Aug 1, 2023
3b62fc8
Remove redundant Directory.Build files
kotlarmilos Aug 2, 2023
36368e2
Add IsTestProject property
kotlarmilos Aug 2, 2023
496acec
Revert the Directory.Build files
kotlarmilos Aug 2, 2023
aa66bb1
Enable aggressive trimming for Mono builds
kotlarmilos Aug 3, 2023
e47d986
Simplify the sample app and disable aggressive trimming
kotlarmilos Aug 3, 2023
cf56983
Remove redundant props
kotlarmilos Aug 4, 2023
26955e0
Add globalization static libraries for Native AOT builds
kotlarmilos Aug 4, 2023
7637762
Add MonoForceInterpreter property to the functional tests
kotlarmilos Aug 8, 2023
e152e73
Merge branch 'main' into feature/ios-functional-tests
kotlarmilos Aug 8, 2023
4af46f8
Don't use runtime components for Native AOT builds
kotlarmilos Aug 9, 2023
8a59bca
Resolve PR comments
kotlarmilos Aug 9, 2023
7dd5b27
Merge branch 'dotnet:main' into feature/ios-functional-tests
kotlarmilos Aug 11, 2023
8663185
Use item group for native dependencies
kotlarmilos Aug 11, 2023
2238ba2
Add conditions to the CI jobs
kotlarmilos Aug 11, 2023
cc5313a
Update formatting
kotlarmilos Aug 11, 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
3 changes: 2 additions & 1 deletion src/mono/msbuild/common/LibraryBuilder.targets
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
AssemblyFile="$(LibraryBuilderTasksAssemblyPath)" />

<Target Name="_BuildNativeLibrary"
Condition="'$(_IsLibraryMode)' == 'true' and '$(RunAOTCompilation)' == 'true' and '$(UseNativeAOTRuntime)' != 'true'">
Condition="'$(_IsLibraryMode)' == 'true' and '$(RunAOTCompilation)' == 'true' and '$(UseNativeAOTRuntime)' != 'true'"
DependsOnTargets="_GenerateBundle">
kotlarmilos marked this conversation as resolved.
Show resolved Hide resolved

<PropertyGroup>
<_IsSharedLibrary>false</_IsSharedLibrary>
Expand Down
Loading
You are viewing a condensed version of this merge commit. You can view the full changes here.