Skip to content

Commit 1bcef36

Browse files
authored
[release/3.1] Move off of expiring machine pools (#38534)
* Move off of expiring machine pools * Use 10.15 * Skip test * SkipOnCI * Update FileWatcherTests.cs
1 parent 0e7c39e commit 1bcef36

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

.azure/pipelines/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -626,7 +626,7 @@ stages:
626626
parameters:
627627
condition: ne(variables['SkipTests'], 'true')
628628
jobName: MacOS_Test
629-
jobDisplayName: "Test: macOS 10.14"
629+
jobDisplayName: "Test: macOS 10.15"
630630
agentOs: macOS
631631
isTestingJob: true
632632
buildArgs: --all --test "/p:RunTemplateTests=false" $(_InternalRuntimeDownloadArgs)
@@ -778,7 +778,7 @@ stages:
778778
- Windows_Templates_Test
779779
- Windows_Test
780780
pool:
781-
vmImage: vs2017-win2016
781+
vmImage: windows-latest
782782
publishUsingPipelines: ${{ variables._PublishUsingPipelines }}
783783
enablePublishBuildArtifacts: true # publish artifacts/log files
784784

.azure/pipelines/jobs/default-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ jobs:
8989
# See https://github.com/dotnet/arcade/blob/master/Documentation/ChoosingAMachinePool.md
9090
pool:
9191
${{ if eq(parameters.agentOs, 'macOS') }}:
92-
vmImage: macOS-10.14
92+
vmImage: macOS-10.15
9393
${{ if eq(parameters.agentOs, 'Linux') }}:
9494
vmImage: ubuntu-18.04
9595
${{ if eq(parameters.agentOs, 'Windows') }}:

src/Tools/dotnet-watch/test/FileWatcherTests.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,10 @@ await UsingTempDirectory(async dir =>
9393
});
9494
}
9595

96-
[Theory]
96+
[ConditionalTheory]
9797
[InlineData(true)]
9898
[InlineData(false)]
99+
[SkipOnCI]
99100
public async Task MoveFile(bool usePolling)
100101
{
101102
await UsingTempDirectory(async dir =>

0 commit comments

Comments
 (0)