Unify DefineConstants #109541
Merged
Unify DefineConstants #109541
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dotnet-policy-service
bot
added
the
community-contribution
|
Tagging subscribers to this area: @dotnet/area-meta |
am11
commented
Nov 5, 2024
| @@ -11,7 +11,6 @@ | |||
| <RuntimeMetadataVersion>v4.0.30319</RuntimeMetadataVersion> | |||
| <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute> | |||
| <RunAnalyzers>false</RunAnalyzers> | |||
| <DefineConstants>TYPEEQUIVALENCEASSEMBLY_2</DefineConstants> | |||
There was a problem hiding this comment.
the same one is in src/tests/baseservices/typeequivalence/istypeequivalent/typeequivalenttypes_2.csproj, we can remove it there too
am11
commented
Nov 5, 2024
| @@ -10,7 +10,6 @@ | |||
| <SignAssembly>true</SignAssembly> | |||
| <StrongNameKeyId>Open</StrongNameKeyId> | |||
| <RunAnalyzers>false</RunAnalyzers> | |||
| <DefineConstants>NETSTANDARD2_0</DefineConstants> | |||
am11
commented
Nov 5, 2024
| @@ -3,7 +3,7 @@ | |||
| <!-- Needed for CLRTestTargetUnsupported, CMakeProjectReference --> | |||
| <RequiresProcessIsolation>true</RequiresProcessIsolation> | |||
| <AllowUnsafeBlocks>true</AllowUnsafeBlocks> | |||
| <DefineConstants >WINDOWS</DefineConstants> | |||
| <DefineConstants>$(DefineConstants);WINDOWS</DefineConstants> | |||
There was a problem hiding this comment.
Note: this is not redundant. WINDOWS is only defined when OS-specific TFM is used https://learn.microsoft.com/dotnet/standard/frameworks#preprocessor-symbols (net9.0 vs. net9.0-windows)
akoeplinger
approved these changes
Nov 5, 2024
ilonatommy
approved these changes
Nov 5, 2024
This was referenced Nov 5, 2024
|
/ba-g One timeout in stackoverflowtester test but that wasn't touched in this PR so unrelated. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
A followup on #109539 where it seems unintentional to not capture contextual constants. Also removed unused and redundant ones.
Query:
$ git grep -B1 -P '<DefineConstants(?![^<]*\$\(\s*DefineConstants\s*\))[^<]*</DefineConstants>(?!.*DefineConstants)'cc @akoeplinger, @ilonatommy