Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ apk-sizes-*.txt
*~
external/monodroid/
external/mono/
tests/api-compatibility/reference/*.dll
tests/api-compatibility/reference/*.cs
tests/api-compatibility/reference/*/*.dll
tests/api-compatibility/reference/*/*.cs
Novell
*.patch
*.keystore
Expand Down
8 changes: 3 additions & 5 deletions build-tools/automation/azure-pipelines.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -346,8 +346,7 @@ stages:
condition: and(succeeded(), not(startsWith(variables['Build.SourceBranch'], '$(DotNetReleaseBranchPrefix)')))
pool:
vmImage: $(HostedMacImage)
timeoutInMinutes: 240
cancelTimeoutInMinutes: 5
timeoutInMinutes: 180
workspace:
clean: all
variables:
Expand Down Expand Up @@ -771,8 +770,7 @@ stages:
displayName: macOS > Tests > MSBuild+Emulator One .NET
pool:
vmImage: $(HostedMacImage)
timeoutInMinutes: 90
cancelTimeoutInMinutes: 5
timeoutInMinutes: 180
workspace:
clean: all
steps:
Expand Down Expand Up @@ -802,7 +800,7 @@ stages:
useDotNet: true
testRunTitle: MSBuildDeviceIntegration Smoke - macOS
testAssembly: $(System.DefaultWorkingDirectory)/bin/Test$(XA.Build.Configuration)/MSBuildDeviceIntegration/$(DotNetStableTargetFramework)/MSBuildDeviceIntegration.dll
nunitConsoleExtraArgs: --filter "TestCategory = SmokeTests $(DotNetNUnitCategories)"
dotNetTestExtraArgs: --filter "TestCategory = SmokeTests $(DotNetNUnitCategories)"
testResultsFile: TestResult-MSBuildDeviceIntegrationSmoke-$(XA.Build.Configuration).xml

- task: MSBuild@1
Expand Down