Skip to content

Commit a9a6811

Browse files
fix: Builds failing intermittently on Windows (#4146)
* fix: Builds failing intermittently on Windows Resolves #4091: - #4091 #skip-changelog
1 parent a04a10a commit a9a6811

File tree

1 file changed

+12
-4
lines changed

1 file changed

+12
-4
lines changed

test/Sentry.Android.AssemblyReader.Tests/Sentry.Android.AssemblyReader.Tests.csproj

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,19 @@
1616
<Folder Include="TestAPKs\" />
1717
</ItemGroup>
1818

19+
<!-- Target to ensure AndroidTestApp is restored -->
20+
<Target Name="EnsureAndroidTestAppRestored" Condition="'$(TargetPlatformIdentifier)' != 'android' and '$(AndroidTestAppRestored)' != 'true'">
21+
<!-- Only restore once. Spawn as a separate process to escape any "no-restore" arguments to the build -->
22+
<Exec Command="dotnet restore ../AndroidTestApp/AndroidTestApp.csproj --nologo" />
23+
<PropertyGroup>
24+
<AndroidTestAppRestored>true</AndroidTestAppRestored>
25+
</PropertyGroup>
26+
</Target>
27+
1928
<!-- Build the Android test app in various configurations during the build of this test project. -->
20-
<Target Name="BuildTestAPKs" BeforeTargets="DispatchToInnerBuilds;BeforeBuild" Condition="'$(TargetPlatformIdentifier)' != 'android'">
21-
<MSBuild Projects="..\AndroidTestApp\AndroidTestApp.csproj" Targets="Restore" />
22-
<MSBuild Projects="$(MSBuildProjectFile)" Targets="_InnerBuildTestAPKs" Properties="TargetFramework=net8.0-android" />
23-
<MSBuild Projects="$(MSBuildProjectFile)" Targets="_InnerBuildTestAPKs" Properties="TargetFramework=net9.0-android" />
29+
<Target Name="BuildTestAPKs" BeforeTargets="DispatchToInnerBuilds;BeforeBuild" DependsOnTargets="EnsureAndroidTestAppRestored" Condition="'$(TargetPlatformIdentifier)' != 'android'">
30+
<MSBuild Projects="$(MSBuildProjectFile)" Targets="_InnerBuildTestAPKs" Properties="TargetFramework=net8.0-android" Condition="$(TargetFramework) == 'net8.0'" />
31+
<MSBuild Projects="$(MSBuildProjectFile)" Targets="_InnerBuildTestAPKs" Properties="TargetFramework=net9.0-android" Condition="$(TargetFramework) == 'net9.0'" />
2432
</Target>
2533
<Target Name="_InnerBuildTestAPKs">
2634
<MSBuild Projects="$(MSBuildProjectFile)" Targets="_BuildTestAPK" Properties="_Aot=False;_Store=False;_Compressed=False" />

0 commit comments

Comments
 (0)