Skip to content

Commit 54d6b64

Browse files
committed
Re-enable other PR queues
1 parent dfd3a40 commit 54d6b64

File tree

2 files changed

+29
-35
lines changed

2 files changed

+29
-35
lines changed

.vsts-pr.yml

Lines changed: 29 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -36,43 +36,44 @@ stages:
3636
displayName: Build
3737
jobs:
3838
############### WINDOWS ###############
39-
# - template: /eng/pipelines/templates/jobs/sdk-job-matrix.yml@self
40-
# parameters:
41-
# pool:
42-
# name: $(DncEngPublicBuildPool)
43-
# demands: ImageOverride -equals windows.vs2022.amd64.open
44-
# os: windows
45-
# helixTargetQueue: windows.amd64.vs2022.pre.scout.open
39+
- template: /eng/pipelines/templates/jobs/sdk-job-matrix.yml@self
40+
parameters:
41+
pool:
42+
name: $(DncEngPublicBuildPool)
43+
demands: ImageOverride -equals windows.vs2022.amd64.open
44+
os: windows
45+
helixTargetQueue: windows.amd64.vs2022.pre.open
4646

4747
############### LINUX ###############
48-
# - template: /eng/pipelines/templates/jobs/sdk-job-matrix.yml
49-
# parameters:
50-
# pool:
51-
# name: $(DncEngPublicBuildPool)
52-
# demands: ImageOverride -equals build.ubuntu.2204.amd64.open
53-
# os: linux
54-
# helixTargetQueue: ubuntu.2204.amd64.open
48+
- template: /eng/pipelines/templates/jobs/sdk-job-matrix.yml
49+
parameters:
50+
pool:
51+
name: $(DncEngPublicBuildPool)
52+
demands: ImageOverride -equals build.ubuntu.2204.amd64.open
53+
os: linux
54+
helixTargetQueue: ubuntu.2204.amd64.open
5555

5656
############### MACOS ###############
57-
# - template: /eng/pipelines/templates/jobs/sdk-job-matrix.yml
58-
# parameters:
59-
# pool:
60-
# name: Azure Pipelines
61-
# vmImage: macOS-latest
62-
# os: macOS
63-
# helixTargetQueue: osx.13.amd64.open
64-
### ARM64 ###
6557
- template: /eng/pipelines/templates/jobs/sdk-job-matrix.yml
6658
parameters:
6759
pool:
6860
name: Azure Pipelines
6961
vmImage: macOS-latest
7062
os: macOS
71-
helixTargetQueue: osx.13.arm64.open
72-
macOSJobParameterSets:
73-
- categoryName: TestBuild
74-
targetArchitecture: arm64
75-
runtimeIdentifier: osx-arm64
63+
helixTargetQueue: osx.15.amd64.open
64+
### ARM64 ###
65+
- ${{ if eq(parameters.enableArm64Job, true) }}:
66+
- template: /eng/pipelines/templates/jobs/sdk-job-matrix.yml
67+
parameters:
68+
pool:
69+
name: Azure Pipelines
70+
vmImage: macOS-latest
71+
os: macOS
72+
helixTargetQueue: osx.13.arm64.open
73+
macOSJobParameterSets:
74+
- categoryName: TestBuild
75+
targetArchitecture: arm64
76+
runtimeIdentifier: osx-arm64
7677

7778
############### DOTNET-FORMAT ###############
78-
# - template: /eng/dotnet-format/dotnet-format-integration.yml
79+
- template: /eng/dotnet-format/dotnet-format-integration.yml

test/HelixTasks/SDKCustomCreateXUnitWorkItemsWithTestExclusion.cs

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -75,17 +75,10 @@ private async Task ExecuteAsync()
7575
{
7676
return;
7777
}
78-
79-
HashSet<string> workItemsToInclude = new()
80-
{
81-
"dotnet.Tests.dll.15",
82-
"dotnet-watch.Tests.dll.3",
83-
};
8478

8579
XUnitWorkItems = (await Task.WhenAll(XUnitProjects.Select(PrepareWorkItem)))
8680
.SelectMany(i => i ?? new())
8781
.Where(wi => wi != null)
88-
//.Where(workItemsToInclude.Contains(wi.ItemSpec))
8982
.ToArray();
9083
return;
9184
}

0 commit comments

Comments
 (0)