Remove TargetFrameworkMonikers.Mono and replace with runtime detection #4799
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
The Mono TFM is a leftover from some earlier plans and doesn't apply anymore with .NET 5. It just creates confusion so remove it and replace with runtime detection.
|
@safern @ViktorHofer ping |
safern
reviewed
Feb 11, 2020
| } | ||
|
|
||
| if (DiscovererHelpers.TestPlatformApplies(platforms)) | ||
| if (DiscovererHelpers.TestPlatformApplies(platforms) && DiscovererHelpers.TestRuntimeApplies(runtimes)) |
There was a problem hiding this comment.
If no TFM is provided and the runtime applies, this will return the “activeissue” trait and I don’t believe we ignore that trait in all our scripts. Could we update the last yield return to return failing instead?
There was a problem hiding this comment.
What is the activeissue trait for actually? We never catch that. Should we instead just always return failing if none else applies?
There was a problem hiding this comment.
Actually since we default frameworks to 0 it would return failing, but I would instead always return failing as @ViktorHofer suggested.
There was a problem hiding this comment.
Never-mind, we just need to remove the whole yield return at the end that returns the activeissue trait.
safern
reviewed
Feb 11, 2020
| @@ -11,7 +11,6 @@ public enum TargetFrameworkMonikers | |||
| { | |||
| Netcoreapp = 0x1, | |||
| NetFramework = 0x2, | |||
| Uap = 0x4, | |||
| Mono = 0x8 | |||
| Uap = 0x4 | |||
safern
approved these changes
Feb 11, 2020
|
@akoeplinger I also removed uap in your PR. I hope you don't mind :) |
safern
reviewed
Feb 11, 2020
ViktorHofer
approved these changes
Feb 11, 2020
akoeplinger
added a commit
to dotnet/runtime
that referenced
this pull request
Feb 11, 2020
dotnet-maestro bot
added a commit
to dotnet/runtime
that referenced
this pull request
Feb 12, 2020
* Update dependencies from https://github.com/dotnet/arcade build 20200210.11 - Microsoft.DotNet.XUnitExtensions - 5.0.0-beta.20110.11 - Microsoft.DotNet.VersionTools.Tasks - 5.0.0-beta.20110.11 - Microsoft.DotNet.ApiCompat - 5.0.0-beta.20110.11 - Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.20110.11 - Microsoft.DotNet.Build.Tasks.Configuration - 5.0.0-beta.20110.11 - Microsoft.DotNet.Build.Tasks.Feed - 5.0.0-beta.20110.11 - Microsoft.DotNet.Build.Tasks.Packaging - 5.0.0-beta.20110.11 - Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk - 5.0.0-beta.20110.11 - Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk - 5.0.0-beta.20110.11 - Microsoft.DotNet.CodeAnalysis - 5.0.0-beta.20110.11 - Microsoft.DotNet.GenAPI - 5.0.0-beta.20110.11 - Microsoft.DotNet.XUnitConsoleRunner - 2.5.1-beta.20110.11 - Microsoft.DotNet.GenFacades - 5.0.0-beta.20110.11 - Microsoft.DotNet.Helix.Sdk - 5.0.0-beta.20110.11 - Microsoft.DotNet.RemoteExecutor - 5.0.0-beta.20110.11 * Update dependencies from https://github.com/dotnet/arcade build 20200211.3 - Microsoft.DotNet.XUnitExtensions - 5.0.0-beta.20111.3 - Microsoft.DotNet.VersionTools.Tasks - 5.0.0-beta.20111.3 - Microsoft.DotNet.ApiCompat - 5.0.0-beta.20111.3 - Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.20111.3 - Microsoft.DotNet.Build.Tasks.Configuration - 5.0.0-beta.20111.3 - Microsoft.DotNet.Build.Tasks.Feed - 5.0.0-beta.20111.3 - Microsoft.DotNet.Build.Tasks.Packaging - 5.0.0-beta.20111.3 - Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk - 5.0.0-beta.20111.3 - Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk - 5.0.0-beta.20111.3 - Microsoft.DotNet.CodeAnalysis - 5.0.0-beta.20111.3 - Microsoft.DotNet.GenAPI - 5.0.0-beta.20111.3 - Microsoft.DotNet.XUnitConsoleRunner - 2.5.1-beta.20111.3 - Microsoft.DotNet.GenFacades - 5.0.0-beta.20111.3 - Microsoft.DotNet.Helix.Sdk - 5.0.0-beta.20111.3 - Microsoft.DotNet.RemoteExecutor - 5.0.0-beta.20111.3 * Update dependencies from https://github.com/dotnet/arcade build 20200211.5 - Microsoft.DotNet.XUnitExtensions - 5.0.0-beta.20111.5 - Microsoft.DotNet.VersionTools.Tasks - 5.0.0-beta.20111.5 - Microsoft.DotNet.ApiCompat - 5.0.0-beta.20111.5 - Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.20111.5 - Microsoft.DotNet.Build.Tasks.Configuration - 5.0.0-beta.20111.5 - Microsoft.DotNet.Build.Tasks.Feed - 5.0.0-beta.20111.5 - Microsoft.DotNet.Build.Tasks.Packaging - 5.0.0-beta.20111.5 - Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk - 5.0.0-beta.20111.5 - Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk - 5.0.0-beta.20111.5 - Microsoft.DotNet.CodeAnalysis - 5.0.0-beta.20111.5 - Microsoft.DotNet.GenAPI - 5.0.0-beta.20111.5 - Microsoft.DotNet.XUnitConsoleRunner - 2.5.1-beta.20111.5 - Microsoft.DotNet.GenFacades - 5.0.0-beta.20111.5 - Microsoft.DotNet.Helix.Sdk - 5.0.0-beta.20111.5 - Microsoft.DotNet.RemoteExecutor - 5.0.0-beta.20111.5 * React to changes from dotnet/arcade#4799 * Downgrade compiler version * Update dependencies from https://github.com/dotnet/arcade build 20200211.11 - Microsoft.DotNet.XUnitExtensions - 5.0.0-beta.20111.11 - Microsoft.DotNet.VersionTools.Tasks - 5.0.0-beta.20111.11 - Microsoft.DotNet.ApiCompat - 5.0.0-beta.20111.11 - Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.20111.11 - Microsoft.DotNet.Build.Tasks.Configuration - 5.0.0-beta.20111.11 - Microsoft.DotNet.Build.Tasks.Feed - 5.0.0-beta.20111.11 - Microsoft.DotNet.Build.Tasks.Packaging - 5.0.0-beta.20111.11 - Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk - 5.0.0-beta.20111.11 - Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk - 5.0.0-beta.20111.11 - Microsoft.DotNet.CodeAnalysis - 5.0.0-beta.20111.11 - Microsoft.DotNet.GenAPI - 5.0.0-beta.20111.11 - Microsoft.DotNet.XUnitConsoleRunner - 2.5.1-beta.20111.11 - Microsoft.DotNet.GenFacades - 5.0.0-beta.20111.11 - Microsoft.DotNet.Helix.Sdk - 5.0.0-beta.20111.11 - Microsoft.DotNet.RemoteExecutor - 5.0.0-beta.20111.11 * Disable serialization test on Mono Co-authored-by: Alexander Köplinger <alex.koeplinger@outlook.com> Co-authored-by: Viktor Hofer <viktor.hofer@microsoft.com>
|
@akoeplinger, @safern I see this PR was going to omit Mono and its dependencies with runtime detection. What I'm looking for is the reason for taking the UAP out. Is it only because it had zero reference or it was something else like having a better way for its detection? |
Yep, it wasn't used anymore. |
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.
The Mono TFM is a leftover from some earlier plans and doesn't apply anymore with .NET 5.
It just creates confusion so remove it and replace with runtime detection.
Noticed this while looking at dotnet/runtime#31920.