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
3 changes: 2 additions & 1 deletion tests/common/shared-dotnet.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
<Project>
<!-- NativeLibName: the platform-specific subdirectory of tests/test-libraries/.libs where to get libraries with all the relevant architectures -->

<Import Project="$(MSBuildThisFileDirectory)/test-variations.csproj" />

<!-- Logic for iOS -->
<PropertyGroup Condition="$(TargetFramework.EndsWith('-ios'))">
<AssetTargetFallback>xamarinios10;$(AssetTargetFallback)</AssetTargetFallback>
Expand Down Expand Up @@ -98,7 +100,6 @@

<Import Project="$(MSBuildThisFileDirectory)/../ComputeRegistrarConstant.targets" />
<Import Project="$(MSBuildThisFileDirectory)/../nunit.framework.targets" Condition="'$(ExcludeNUnitLiteReference)' != 'true'" />
<Import Project="$(MSBuildThisFileDirectory)/test-variations.csproj" />

<Import Project="$(GeneratedProjectFile)" Condition="'$(GeneratedProjectFile)' != ''" />

Expand Down
8 changes: 7 additions & 1 deletion tests/common/test-variations.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
<ItemGroup>
<TestVariations Include="interpreter" Description="Run with the interpreter ('UseInterpreter=true')" />
<TestVariations Include="bundle-original-resources" Description="Bundle original resources ('BundleOriginalResources=true')" />
<TestVariations Include="do-not-bundle-original-resources" Description="Do not original resources ('BundleOriginalResources=false')" />
<TestVariations Include="do-not-bundle-original-resources" Description="Do not bundle original resources ('BundleOriginalResources=false')" />
<TestVariations Include="nativeaot" Description="Enable NativeAOT ('PublishAot=true' and '_IsPublishing=true')" />
</ItemGroup>

<PropertyGroup Condition="'$(TestVariation)' == 'interpreter'">
Expand All @@ -19,6 +20,11 @@
<BundleOriginalResources>false</BundleOriginalResources>
</PropertyGroup>

<PropertyGroup Condition="'$(TestVariation)' == 'nativeaot'">
<PublishAot>true</PublishAot>
<_IsPublishing>true</_IsPublishing>
</PropertyGroup>

<Target Name="ValidateTestVariation" Condition="'$(TestVariation)' != '' And '$(OutputType)' == 'exe'" BeforeTargets="Build">
<ItemGroup>
<_FilteredTestVariations Include="@(TestVariations)" Condition="'%(Identity)' == '$(TestVariation)'" />
Expand Down