[macOS] Return the correct minor version on 11 and later OS. #3605
Conversation
The OS returned from 11.0 and later is: 11.* = 20.6.0.0 12.* - 21.2.0.0 The minor in those versions is correct. This fix ensures that Agent capabilities can match the minor version too.
The agent is not reporting the OS version property and returns only 11.0. This has been fixed in: microsoft/azure-pipelines-agent#3605 But this was not yet landed.
| @@ -117,7 +117,7 @@ private static string GetDarwinVersionString() | |||
| } | |||
| else | |||
| { | |||
| return $"11.{version.Major - 20}"; | |||
| return $"11.{version.Minor}"; | |||
There was a problem hiding this comment.
It doesn't look like this method is ever going to return 12.*, or am I missing something?
There was a problem hiding this comment.
Very good point, fixing that
src/Microsoft.VisualStudio.Services.Agent/Capabilities/AgentCapabilitiesProvider.cs
Outdated
Show resolved
Hide resolved
…pabilitiesProvider.cs
The agent is not reporting the OS version property and returns only 11.0. This has been fixed in: microsoft/azure-pipelines-agent#3605 But this was not yet landed.
|
/cc @fadnavistanmay |
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
|
@alexander-smolyakov can we land this? |
|
This should also fix #3655 |
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
@mandel-macaque, sorry for the delay on this one, our team is currently on holiday until next week. We are planning to finish the testing of these changes and merge them next week. |
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
| @@ -117,7 +117,7 @@ private static string GetDarwinVersionString() | |||
| } | |||
| else | |||
| { | |||
| return $"11.{version.Major - 20}"; | |||
| return $"{version.Major - 9}.{version.Minor}"; | |||
There was a problem hiding this comment.
Should it be version.Minor - 1 if version.Minor > 0?
There was a problem hiding this comment.
No need, minor version numbers start at 0, not 1. Running on Monterey you get:
Enter statements below.
csharp> var version = Environment.OSVersion.Version;
csharp> version.Minor
2
csharp> version
21.2.0.0
csharp>
There was a problem hiding this comment.
Which version of Monterey were you running? If this was 12.1.0 then seems you need to decrease version by one. i.e. 21.2.0 -> 12.1 (which is on the machine I am running now)
There was a problem hiding this comment.
ugh apple.. yes you are right, fixing it.
src/Microsoft.VisualStudio.Services.Agent/Capabilities/AgentCapabilitiesProvider.cs
Outdated
Show resolved
Hide resolved
…pabilitiesProvider.cs Address minor version being of by 1.
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
|
Hello @alexander-smolyakov / anatolybolshakov anything else needed to get this merged? |
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
|
@mandel-macaque thanks! We've merged the PR and going to roll out these changes with the next agent release. |
|
Quick Update: Agent v2.198.3, which contains the related changes, has been fully rolled out. |
The OS returned from 11.0 and later is:
11.* = 20.6.0.0 (for 11.6)
12.* - 21.2.0.0 (for 12.2 beta)
The minor in those versions is correct. This fix ensures that Agent
capabilities can match the minor version too.