Skip to content

fix(build): force sequential AndroidTestApp builds #4363

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
jpnurmi merged 25 commits into from
Jul 22, 2025
Merged

fix(build): force sequential AndroidTestApp builds #4363

Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
b982335
fix(build): set unique BaseIntermediateOutputPath for AndroidTestApp
jpnurmi Jul 17, 2025
25dbc10
Try without EnsureAndroidTestAppRestored
jpnurmi Jul 17, 2025
bc22db9
Let MSBuild run the default target including Restore
jpnurmi Jul 17, 2025
a7dc820
Revert changes
jpnurmi Jul 17, 2025
d682d99
Try BuildInParallel="false" instead
jpnurmi Jul 17, 2025
7a67449
Merge remote-tracking branch 'upstream/main' into fix/android-test-app
jpnurmi Jul 17, 2025
ba775e0
Switch back to `BaseIntermediateOutputPath`
jpnurmi Jul 18, 2025
1609a9f
Merge remote-tracking branch 'upstream/main' into fix/android-test-app
jpnurmi Jul 18, 2025
fd164e6
Switch to `IntermediateOutputPath` and fix target framework conditions
jpnurmi Jul 18, 2025
7f5533f
restore workflow_dispatch that went accidentally missing
jpnurmi Jul 18, 2025
6a3c2a5
Try MSBuildProjectExtensionsPath + explicit versions
jpnurmi Jul 18, 2025
077562f
Merge remote-tracking branch 'upstream/main' into fix/android-test-app
jpnurmi Jul 21, 2025
a093280
Revert changes, again
jpnurmi Jul 21, 2025
89e8035
Remove EnsureAndroidTestAppRestored
jpnurmi Jul 21, 2025
e237b91
Drop PublishAot=true targets for Windows
jpnurmi Jul 21, 2025
58dddcf
Another non-parallelized attempt
jpnurmi Jul 21, 2025
4bd0eb2
Revert "Remove EnsureAndroidTestAppRestored"
jpnurmi Jul 21, 2025
d5e3c45
Clean up
jpnurmi Jul 21, 2025
81f35c4
fix _TestAPK condition
jpnurmi Jul 21, 2025
32a045c
fix numbering
jpnurmi Jul 21, 2025
b1a5777
Android AOT is not supported on Windows
jpnurmi Jul 21, 2025
45db870
Final clean up
jpnurmi Jul 22, 2025
fbbb84a
Restore net8 checks
jpnurmi Jul 22, 2025
b9f40bb
Minimize changes
jpnurmi Jul 22, 2025
db6e14e
Add link
jpnurmi Jul 22, 2025
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
23 changes: 14 additions & 9 deletions test/Sentry.Android.AssemblyReader.Tests/Sentry.Android.AssemblyReader.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,20 @@
<MSBuild Projects="$(MSBuildProjectFile)" Targets="_InnerBuildTestAPKs" Properties="TargetFramework=net9.0-android" Condition="$(TargetFramework) == 'net9.0'" />
</Target>
<Target Name="_InnerBuildTestAPKs">
<MSBuild Projects="$(MSBuildProjectFile)" Targets="_BuildTestAPK" Properties="_Aot=False;_Store=False;_Compressed=False" />
<MSBuild Projects="$(MSBuildProjectFile)" Targets="_BuildTestAPK" Properties="_Aot=False;_Store=False;_Compressed=True" />
<MSBuild Projects="$(MSBuildProjectFile)" Targets="_BuildTestAPK" Properties="_Aot=False;_Store=True;_Compressed=False" />
<MSBuild Projects="$(MSBuildProjectFile)" Targets="_BuildTestAPK" Properties="_Aot=False;_Store=True;_Compressed=True" />

<MSBuild Projects="$(MSBuildProjectFile)" Targets="_BuildTestAPK" Condition="!$(TargetFramework.StartsWith('net8'))" Properties="_Aot=True;_Store=False;_Compressed=False" />
<MSBuild Projects="$(MSBuildProjectFile)" Targets="_BuildTestAPK" Condition="!$(TargetFramework.StartsWith('net8'))" Properties="_Aot=True;_Store=False;_Compressed=True" />
<MSBuild Projects="$(MSBuildProjectFile)" Targets="_BuildTestAPK" Condition="!$(TargetFramework.StartsWith('net8'))" Properties="_Aot=True;_Store=True;_Compressed=False" />
<MSBuild Projects="$(MSBuildProjectFile)" Targets="_BuildTestAPK" Condition="!$(TargetFramework.StartsWith('net8'))" Properties="_Aot=True;_Store=True;_Compressed=True" />
<!-- https://learn.microsoft.com/visualstudio/msbuild/msbuild-batching -->
<ItemGroup>
Comment thread
jpnurmi marked this conversation as resolved.
<_TestAPK Include="1" Properties="_Aot=False;_Store=False;_Compressed=False" />
<_TestAPK Include="2" Properties="_Aot=False;_Store=False;_Compressed=True" />
<_TestAPK Include="3" Properties="_Aot=False;_Store=True;_Compressed=False" />
<_TestAPK Include="4" Properties="_Aot=False;_Store=True;_Compressed=True" />

<_TestAPK Include="5" Condition="!$(TargetFramework.StartsWith('net8'))" Properties="_Aot=True;_Store=False;_Compressed=False" />
<_TestAPK Include="6" Condition="!$(TargetFramework.StartsWith('net8'))" Properties="_Aot=True;_Store=False;_Compressed=True" />
<_TestAPK Include="7" Condition="!$(TargetFramework.StartsWith('net8'))" Properties="_Aot=True;_Store=True;_Compressed=False" />
<_TestAPK Include="8" Condition="!$(TargetFramework.StartsWith('net8'))" Properties="_Aot=True;_Store=True;_Compressed=True" />
</ItemGroup>

<MSBuild Projects="$(MSBuildProjectFile)" Targets="_BuildTestAPK" Properties="%(_TestAPK.Properties)" BuildInParallel="false" />
Comment thread
Flash0ver marked this conversation as resolved.
</Target>
<Target Name="_BuildTestAPK">
<PropertyGroup>
Expand Down
Loading