8000 Adjust `IsTestProject` hacks to not include MTP by Youssef1313 · Pull Request #49085 · dotnet/sdk · GitHub
[go: up one dir, main page]
Skip to content

Adjust IsTestProject hacks to not include MTP #49085

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

Jump to bottom
Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Adjust IsTestProject hacks to not include MTP #49085

wants to merge 3 commits into from

Conversation

Youssef1313
Copy link
Member
@Youssef1313 Youssef1313 commented May 21, 2025 •
edited
Loading

Fixes #49063

@Copilot Copilot AI review requested due to automatic review settings May 21, 2025 12:30
Copilot
Copilot AI reviewed May 21, 2025
View reviewed changes
Copy link
Contributor
@Copilot Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull Request Overview

This PR adjusts test project conditions so that projects using the Microsoft Testing Platform (MTP) are no longer treated as standard test projects. The changes introduce a new property (_IsVSTestOnlyTestProject) and update existing conditions in the targets file to use this property.

  • Introduces _IsVSTestOnlyTestProject to differentiate test projects from MTP projects.
  • Updates condition checks for IsRidAgnostic, ValidateExecutableReferencesMatchSelfContained, and ShouldBeValidatedAsExecutableReference.

src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.targets
@@ -97,6 +97,7 @@ Copyright (c) .NET Foundation. All rights reserved.
<_DefaultUserProfileRuntimeStorePath Condition="$([MSBuild]::IsOSPlatform(`Windows`))">$(USERPROFILE)</_DefaultUserProfileRuntimeStorePath>
<_DefaultUserProfileRuntimeStorePath>$([System.IO.Path]::Combine($(_DefaultUserProfileRuntimeStorePath), '.dotnet', 'store'))</_DefaultUserProfileRuntimeStorePath>
<UserProfileRuntimeStorePath Condition="'$(UserProfileRuntimeStorePath)' == ''">$(_DefaultUserProfileRuntimeStorePath)</UserProfileRuntimeStorePath>
<_IsVSTestOnlyTestProject 8000 Condition="'$(IsTestProject)' == 'true' AND '$(IsTestingPlatformApplication)' != 'true'">true</_IsVSTestOnlyTestProject>
Copy link
Preview
Copilot AI May 21, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[nitpick] Consider adding an inline comment explaining the purpose of the new _IsVSTestOnlyTestProject property, clarifying that it excludes MTP projects from test-specific conditions.

Copilot uses AI. Check for mistakes.

src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.targets
@@ -114,7 +115,7 @@ Copyright (c) .NET Foundation. All rights reserved.
<!-- Set the IsRidAgnostic property if this project should NOT accept global RuntimeIdentifier and SelfContained
property values from referencing projects. -->
<PropertyGroup Condition="'$(IsRidAgnostic)' == ''">
<IsRidAgnostic Condition="('$(_IsExecutable)' == 'true' And '$(IsTestProject)' != 'true') Or
<IsRidAgnostic Condition="('$(_IsExecutable)' == 'true' And '$(_IsVSTestOnlyTestProject)' != 'true') Or
Copy link
Preview
Copilot AI May 21, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[nitpick] Review and update any nearby inline comments to ensure they accurately reflect the change from IsTestProject to _IsVSTestOnlyTestProject for non-MTP test projects.

Copilot uses AI. Check for mistakes.

@Youssef1313
Copy link
Member Author

@dsplaisted Can I have an eye on this PR please? Thanks!

@Youssef1313 Youssef1313 requested a review from dsplaisted May 26, 2025 17:34
@build-analysis build-analysis bot mentioned this pull request May 26, 2025
Open
3 tasks
dsplaisted
dsplaisted reviewed May 28, 2025
View reviewed changes
Copy link
Member
@dsplaisted dsplaisted left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, though if we can define _IsVSTestOnlyTestProject only once I think that would be better.

Have you tested this? Do you think we should add automated tests? There are some existing tests for Reference Exe scenarios here: https://github.com/dotnet/sdk/blob/main/test/Microsoft.NET.Build.Tests/ReferenceExeTests.cs

src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.targets
@@ -97,6 +97,8 @@ Copyright (c) .NET Foundation. All rights reserved.
<_DefaultUserProfileRuntimeStorePath Condition="$([MSBuild]::IsOSPlatform(`Windows`))">$(USERPROFILE)</_DefaultUserProfileRuntimeStorePath>
<_DefaultUserProfileRuntimeStorePath>$([System.IO.Path]::Combine($(_DefaultUserProfileRuntimeStorePath), '.dotnet', 'store'))</_DefaultUserProfileRuntimeStorePath>
<UserProfileRuntimeStorePath Condition="'$(UserProfileRuntimeStorePath)' == ''">$(_DefaultUserProfileRuntimeStorePath)</UserProfileRuntimeStorePath>
<!-- This excludes MTP projects, as they are normal console apps -->
<_IsVSTestOnlyTestProject Condition="'$(IsTestProject)' == 'true' AND '$(IsTestingPlatformApplication)' != 'true'">true</_IsVSTestOnlyTestProject>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like this property is defined multiple times. Can you find a single place to define it? You may need to dig into the evaluation order to figure out the right place to do this.

@Youssef1313
Copy link
Member Author
Youssef1313 commented Jun 2, 2025 •
edited
Loading

@dsplaisted Would adding the property here be good?

Or probably here can be good as well

@dsplaisted
Copy link
Member

@Youssef1313 Looking at the ordering, I think you can leave it where you have it in Microsoft.NET.RuntimeIdentifierInference.targets, and remove it from Microsoft.NET.Sdk.targets, and that should work.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dsplaisted dsplaisted dsplaisted left review comments

Copilot code review Copilot Copilot left review comments

At least 1 approving review is required to merge this pull request.

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Validate historical hacks for test projects that may be harmful for MTP projects
2 participants
@Youssef1313 @dsplaisted
0