Add cocoa fact attribute and related unit tests #68
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -349,3 +349,6 @@ MigrationBackup/ | |
|
|
||
| # dotnet tool local install directory | ||
| .store/ | ||
|
|
||
| # File built by MacOS | ||
| .DS_Store | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -65,6 +65,19 @@ if (!$NoPrerequisites) { | |
| if ($env:OS -eq 'Windows_NT') { | ||
| $EnvVars['PROCDUMP_PATH'] = & "$PSScriptRoot\azure-pipelines\Get-ProcDump.ps1" | ||
| } | ||
|
|
||
| # Install specific macOS workload version in order to support usage on older .NET and macOS | ||
| $rollbackFile = Join-Path ([System.IO.Path]::GetTempPath()) ([System.Guid]::NewGuid()) | ||
| @{ | ||
| "microsoft.net.sdk.macos" = "12.3.2372/7.0.100" | ||
|
Owner
There was a problem hiding this comment. Can you explain to me more about this requirement? Does this mean that
Contributor
There was a problem hiding this comment. The macOS workload is necessary in order to target The .NET SDK makes it difficult to specify a preferred version of a given workload. You have to use a rollback file to achieve this. Without specifying the version, the SDK will pull the latest for the SDK version specified in
Yes.
Owner
There was a problem hiding this comment. Thanks. That's helpful, and I've upvoted that issue.
Contributor
There was a problem hiding this comment. Notice it's picking 13.1.1024, which is a different version. It's newer, and I don't see it in nuget. If you have multiple SDK versions installed, and you're running
On Mac, when installing workloads to the machine-wide .NET SDK installation (
Owner
There was a problem hiding this comment. I do have the 7.0.200 installed, as of this morning when a VS update installed it. But all my dotnet workload install attempts were within the directory containing global.json, so evidently my repo's 7.0.101 constraint wasn't effective at retaining behavior from that SDK in this regard. Windows doesn't need The failures I'm seeing turn out to come from a collection of bugs in the SDK around this area. The do not show up when DOTNET_ROOT is set, which is why it works in non-elevated scenarios. |
||
| } | ConvertTo-Json | Set-Content -Path $rollbackFile | ||
|
|
||
| try { | ||
| dotnet workload install macos --from-rollback-file $rollbackFile | ||
| } | ||
| finally { | ||
| Remove-Item $rollbackFile | ||
| } | ||
| } | ||
|
|
||
| # Workaround nuget credential provider bug that causes very unreliable package restores on Azure Pipelines | ||
|
|
@@ -77,7 +90,10 @@ try { | |
|
|
||
| if (!$NoRestore -and $PSCmdlet.ShouldProcess("NuGet packages", "Restore")) { | ||
| Write-Host "Restoring NuGet packages" -ForegroundColor $HeaderColor | ||
| if ($IsMacOS) { | ||
| $restoreArgs = "/p:Configuration=DebugMac" | ||
| } | ||
| dotnet restore $restoreArgs | ||
| if ($lastexitcode -ne 0) { | ||
| throw "Failure while restoring packages." | ||
| } | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| // Copyright (c) Andrew Arnott. All rights reserved. | ||
| // Licensed under the Ms-PL license. See LICENSE file in the project root for full license information. | ||
|
|
||
| using Xunit.Sdk; | ||
|
|
||
| namespace Xunit; | ||
|
|
||
| /// <summary> | ||
| /// Identifies an xunit test that starts on with a <see cref="System.Threading.SynchronizationContext"/> | ||
| /// running on <see cref="Foundation.NSRunLoop.Main"/>. | ||
| /// </summary> | ||
| [AttributeUsage(AttributeTargets.Method, AllowMultiple = false)] | ||
| [XunitTestCaseDiscoverer("Xunit.Sdk.CocoaFactDiscoverer", ThisAssembly.AssemblyName)] | ||
| public class CocoaFactAttribute : FactAttribute | ||
| { | ||
| } |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| // Copyright (c) Andrew Arnott. All rights reserved. | ||
| // Licensed under the Ms-PL license. See LICENSE file in the project root for full license information. | ||
|
|
||
| using Xunit.Sdk; | ||
|
|
||
| namespace Xunit; | ||
|
|
||
| /// <summary> | ||
| /// Identifies an xunit theory that starts on with a <see cref="System.Threading.SynchronizationContext"/> | ||
| /// running on <see cref="Foundation.NSRunLoop.Main"/>. | ||
| /// </summary> | ||
| [AttributeUsage(AttributeTargets.Method, AllowMultiple = false)] | ||
| [XunitTestCaseDiscoverer("Xunit.Sdk.CocoaTheoryDiscoverer", ThisAssembly.AssemblyName)] | ||
| public class CocoaTheoryAttribute : TheoryAttribute | ||
| { | ||
| } |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| // Copyright (c) Andrew Arnott. All rights reserved. | ||
| // Licensed under the Ms-PL license. See LICENSE file in the project root for full license information. | ||
|
|
||
| using System.Runtime.CompilerServices; | ||
|
|
||
| namespace Xunit.Sdk; | ||
|
|
||
| /// <summary> | ||
| /// The discovery class for <see cref="CocoaFactDiscoverer"/>. | ||
| /// </summary> | ||
| public class CocoaFactDiscoverer : FactDiscoverer | ||
| { | ||
| private readonly IMessageSink diagnosticMessageSink; | ||
|
|
||
| /// <summary> | ||
| /// Initializes a new instance of the <see cref="CocoaFactDiscoverer"/> class. | ||
| /// </summary> | ||
| /// <param name="diagnosticMessageSink">The diagnostic message sink.</param> | ||
| public CocoaFactDiscoverer(IMessageSink diagnosticMessageSink) | ||
| : base(diagnosticMessageSink) | ||
| { | ||
| this.diagnosticMessageSink = diagnosticMessageSink; | ||
| } | ||
|
|
||
| protected override IXunitTestCase CreateTestCase(ITestFrameworkDiscoveryOptions discoveryOptions, ITestMethod testMethod, IAttributeInfo factAttribute) | ||
| { | ||
| if (testMethod.Method.ReturnType.Name == "System.Void" && | ||
| testMethod.Method.GetCustomAttributes(typeof(AsyncStateMachineAttribute)).Any()) | ||
| { | ||
| return new ExecutionErrorTestCase(this.diagnosticMessageSink, discoveryOptions.MethodDisplayOrDefault(), TestMethodDisplayOptions.None, testMethod, "Async void methods are not supported."); | ||
| } | ||
|
|
||
| return new UITestCase(UITestCase.SyncContextType.Cocoa, this.diagnosticMessageSink, discoveryOptions.MethodDisplayOrDefault(), testMethod); | ||
| } | ||
| } |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think the changes to this file can be undone now, right?