Skip to content

Don't run net4x tests with Mono on non-Windows #98767

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
merged 6 commits into from
Mar 2, 2024
Merged

Don't run net4x tests with Mono on non-Windows #98767

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
510af16
Don't run net4x tests with Mono on non-Windows
akoeplinger Feb 21, 2024
808a55d
Make AdditionalProperties more resilient against changes
akoeplinger Feb 26, 2024
eb1afce
Use TargetOS instead of OS so it also works for building e.g. Browser…
akoeplinger Feb 26, 2024
c564e27
Move logic to arcade Microsoft.DotNet.Build.Tasks
akoeplinger Feb 26, 2024
86d955d
Update eng/testing/outerBuild.targets
akoeplinger Mar 1, 2024
f7c3091
Merge branch 'main' into filter-netfx
akoeplinger Mar 1, 2024
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
4 changes: 2 additions & 2 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,9 +186,9 @@
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>c3f5cbfb2829795294f5c2d9fa5a0522f47e91fb</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="9.0.0-beta.24112.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="9.0.0-beta.24126.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>c3f5cbfb2829795294f5c2d9fa5a0522f47e91fb</Sha>
<Sha>6f665a25162ef1cad9b252f5fb3dc7c822d2a4a5</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.24112.1">
<Uri>https://github.com/dotnet/arcade</Uri>
Expand Down
2 changes: 1 addition & 1 deletion eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@
<MicrosoftDotNetBuildTasksArchivesVersion>9.0.0-beta.24112.1</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.24112.1</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>9.0.0-beta.24112.1</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>9.0.0-beta.24112.1</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>9.0.0-beta.24126.2</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.24112.1</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>9.0.0-beta.24112.1</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.24112.1</MicrosoftDotNetRemoteExecutorVersion>
Expand Down
10 changes: 8 additions & 2 deletions eng/testing/outerBuild.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,18 @@
<Project>
<Target Name="Test" DependsOnTargets="GetProjectWithBestTargetFrameworks">
<Target Name="Test" DependsOnTargets="RemoveNetFrameworkProjectsOnNonWindows;GetProjectWithBestTargetFrameworks">
<MSBuild Projects="@(InnerBuildProjectsWithBestTargetFramework)"
Targets="Test">
</MSBuild>
</Target>
<Target Name="VSTest" DependsOnTargets="GetProjectWithBestTargetFrameworks">
<Target Name="VSTest" DependsOnTargets="RemoveNetFrameworkProjectsOnNonWindows;GetProjectWithBestTargetFrameworks">
<MSBuild Projects="@(InnerBuildProjectsWithBestTargetFramework)"
Targets="VSTest">
</MSBuild>
</Target>
<Target Name="RemoveNetFrameworkProjectsOnNonWindows" Condition="'$(TargetOS)' != 'windows'">
<PropertyGroup>
<!-- we'd try to run tests with Mono for netfx projects which doesn't work so filter them out -->
<IncludeNetFrameworkTfms>false</IncludeNetFrameworkTfms>
</PropertyGroup>
</Target>
</Project>