Skip to content
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

Rename MacOSX to OSX and introduce FreeBSD #4789

Merged
merged 4 commits into from
Jan 26, 2025
Merged

Rename MacOSX to OSX and introduce FreeBSD #4789

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4f9a571
Rename MacOSX to OSX and introduce FreeBSD
Youssef1313 Jan 26, 2025
6ba64ac
Update OSConditionAttribute
Youssef1313 Jan 26, 2025
1433a72
Update PublicAPI.Unshipped.txt
Youssef1313 Jan 26, 2025
6470289
Fix FreeBSD on netstandard
Evangelink Jan 26, 2025
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
15 changes: 14 additions & 1 deletion src/TestFramework/TestFramework/Attributes/TestMethod/OSConditionAttribute.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,15 @@ namespace Microsoft.VisualStudio.TestTools.UnitTesting;
[AttributeUsage(AttributeTargets.Class | AttributeTargets.Method, Inherited = false, AllowMultiple = false)]
public sealed class OSConditionAttribute : ConditionBaseAttribute
{
#if !NETFRAMEWORK
private static readonly OSPlatform FreeBSD =
#if NETSTANDARD
OSPlatform.Create("FreeBSD");
#else
OSPlatform.FreeBSD;
#endif
#endif

private readonly OperatingSystems _operatingSystems;

/// <summary>
Expand Down Expand Up @@ -48,7 +57,11 @@ public override bool ShouldRun
}
else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
{
return (_operatingSystems & OperatingSystems.MacOSX) != 0;
return (_operatingSystems & OperatingSystems.OSX) != 0;
}
else if (RuntimeInformation.IsOSPlatform(FreeBSD))
{
return (_operatingSystems & OperatingSystems.FreeBSD) != 0;
}

return false;
Expand Down
13 changes: 8 additions & 5 deletions src/TestFramework/TestFramework/Attributes/TestMethod/OperatingSystems.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,20 @@ public enum OperatingSystems
/// <summary>
/// Represents the Linux operating system.
/// </summary>
Linux = 1,

// TODO: This is copied from aspnetcore repo. Should we name it MacOS instead? Or OSX?
Linux = 1 << 0,

/// <summary>
/// Representing the MacOS operating system.
/// </summary>
MacOSX = 2,
OSX = 1 << 1,

/// <summary>
/// Represents the Windows operating system.
/// </summary>
Windows = 4,
Windows = 1 << 2,

/// <summary>
/// Represents the FreeBSD operating system.
/// </summary>
FreeBSD = 1 << 3,
}
3 changes: 2 additions & 1 deletion src/TestFramework/TestFramework/PublicAPI/PublicAPI.Unshipped.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,8 +249,9 @@ Microsoft.VisualStudio.TestTools.UnitTesting.ITestDataSourceIgnoreCapability
Microsoft.VisualStudio.TestTools.UnitTesting.ITestDataSourceIgnoreCapability.IgnoreMessage.get -> string?
Microsoft.VisualStudio.TestTools.UnitTesting.ITestDataSourceIgnoreCapability.IgnoreMessage.set -> void
Microsoft.VisualStudio.TestTools.UnitTesting.OperatingSystems
Microsoft.VisualStudio.TestTools.UnitTesting.OperatingSystems.FreeBSD = 8 -> Microsoft.VisualStudio.TestTools.UnitTesting.OperatingSystems
Microsoft.VisualStudio.TestTools.UnitTesting.OperatingSystems.Linux = 1 -> Microsoft.VisualStudio.TestTools.UnitTesting.OperatingSystems
Microsoft.VisualStudio.TestTools.UnitTesting.OperatingSystems.MacOSX = 2 -> Microsoft.VisualStudio.TestTools.UnitTesting.OperatingSystems
Microsoft.VisualStudio.TestTools.UnitTesting.OperatingSystems.OSX = 2 -> Microsoft.VisualStudio.TestTools.UnitTesting.OperatingSystems
Microsoft.VisualStudio.TestTools.UnitTesting.OperatingSystems.Windows = 4 -> Microsoft.VisualStudio.TestTools.UnitTesting.OperatingSystems
Microsoft.VisualStudio.TestTools.UnitTesting.OSConditionAttribute
Microsoft.VisualStudio.TestTools.UnitTesting.OSConditionAttribute.OSConditionAttribute(Microsoft.VisualStudio.TestTools.UnitTesting.ConditionMode mode, Microsoft.VisualStudio.TestTools.UnitTesting.OperatingSystems operatingSystems) -> void
Expand Down
Loading