Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 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
14 changes: 7 additions & 7 deletions .azure-pipelines/ultimate-pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -947,7 +947,7 @@ stages:
timeoutInMinutes: 60 #default value
dependsOn: [ ]
pool:
vmImage: macos-13
vmImage: macos-14
steps:
- template: steps/clone-repo.yml
parameters:
Expand All @@ -967,7 +967,7 @@ stages:
timeoutInMinutes: 60 #default value
dependsOn: [ ]
pool:
vmImage: macos-13
vmImage: macos-14
steps:
- template: steps/clone-repo.yml
parameters:
Expand All @@ -992,7 +992,7 @@ stages:
timeoutInMinutes: 60 #default value
dependsOn: [native_tracer, native_loader_and_managed ]
pool:
vmImage: macos-13
vmImage: macos-14
steps:
- checkout: none

Expand Down Expand Up @@ -1288,7 +1288,7 @@ stages:
timeoutInMinutes: 60 #default value
dependsOn: [ ]
pool:
vmImage: macos-13
vmImage: macos-14
steps:
- template: steps/clone-repo.yml
parameters:
Expand Down Expand Up @@ -1363,7 +1363,7 @@ stages:
$[stageDependencies.generate_variables.generate_variables_job.outputs['generate_variables_step.unit_tests_macos_matrix'] ]
timeoutInMinutes: 90
pool:
vmImage: macos-13
vmImage: macos-14
steps:
- template: steps/clone-repo.yml
parameters:
Expand Down Expand Up @@ -1619,7 +1619,7 @@ stages:
- job: macos
timeoutInMinutes: 60 #default value
pool:
vmImage: macos-13
vmImage: macos-14
steps:
- template: steps/clone-repo.yml
parameters:
Expand Down Expand Up @@ -1979,7 +1979,7 @@ stages:
timeoutInMinutes: 60 #default value
dependsOn: [ ]
pool:
vmImage: macos-13
vmImage: macos-14
steps:
- template: steps/clone-repo.yml
parameters:
Expand Down
11 changes: 4 additions & 7 deletions tracer/build/_build/Build.VariableGenerations.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1782,16 +1782,13 @@ void GenerateMacosDotnetToolNugetSmokeTestsMatrix()
{
var images = new SmokeTestImage[]
{
// macos-11/12 environments are no longer available in Azure Devops
new (publishFramework: TargetFramework.NETCOREAPP3_1, "macos-13", "macos", "13"),
new (publishFramework: TargetFramework.NET5_0, "macos-13", "macos", "13"),
new (publishFramework: TargetFramework.NET6_0, "macos-13", "macos", "13"),
new (publishFramework: TargetFramework.NET7_0, "macos-13", "macos", "13"),
new (publishFramework: TargetFramework.NET8_0, "macos-13", "macos", "13"),
new (publishFramework: TargetFramework.NET9_0, "macos-13", "macos", "13"),
// macos-11/12/13 environments are no longer available in Azure Devops
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ahh some of these actually appear to be the same so we can remove them, but they aren't all the same / dupes

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed some to keep it in order, but unsure if they will actually work? Unsure what the reasoning was for the mix

new (publishFramework: TargetFramework.NETCOREAPP3_1, "macos-14", "macos", "14"),
new (publishFramework: TargetFramework.NET5_0, "macos-14", "macos", "14"),
new (publishFramework: TargetFramework.NET6_0, "macos-14", "macos", "14"),
new (publishFramework: TargetFramework.NET7_0, "macos-14", "macos", "14"),
new (publishFramework: TargetFramework.NET8_0, "macos-14", "macos", "14"),
new (publishFramework: TargetFramework.NET9_0, "macos-14", "macos", "14"),
new (publishFramework: TargetFramework.NET10_0, "macos-14", "macos-14_net10.0", "14"),
new (publishFramework: TargetFramework.NET6_0, "macos-15", "macos", "15"),
new (publishFramework: TargetFramework.NET8_0, "macos-15", "macos", "15"),
Expand Down
Loading