Fixed: macOS version detection

Sonarr · Sep 8, 2023 · 060be61 · 060be61
1 parent 1b3ff64
commit 060be61
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/NzbDrone.Mono.Test/EnvironmentInfo/VersionAdapters/MacOsVersionAdapterFixture.cs b/src/NzbDrone.Mono.Test/EnvironmentInfo/VersionAdapters/MacOsVersionAdapterFixture.cs
@@ -15,6 +15,9 @@ public class MacOsVersionAdapterFixture : TestBase<MacOsVersionAdapter>
         [TestCase("10.8")]
         [TestCase("10.8.1")]
         [TestCase("10.11.20")]
+        [TestCase("11.7.9")]
+        [TestCase("12.6.8")]
+        [TestCase("13.5.1")]
         public void should_get_version_info(string versionString)
         {
             var fileContent = File.ReadAllText(GetTestPath("Files/macOS/SystemVersion.plist")).Replace("10.0.0", versionString);

diff --git a/src/NzbDrone.Mono/EnvironmentInfo/VersionAdapters/MacOsVersionAdapter.cs b/src/NzbDrone.Mono/EnvironmentInfo/VersionAdapters/MacOsVersionAdapter.cs
@@ -10,7 +10,7 @@ public class MacOsVersionAdapter : IOsVersionAdapter
     {
         private const string PLIST_DIR = "/System/Library/CoreServices/";
 
-        private static readonly Regex DarwinVersionRegex = new Regex("<string>(?<version>10\\.\\d{1,2}\\.?\\d{0,2}?)<\\/string>",
+        private static readonly Regex DarwinVersionRegex = new ("<key>ProductVersion<\\/key>\\s*<string>(?<version>1\\d\\.\\d{1,2}\\.?\\d{0,2}?)<\\/string>",
             RegexOptions.Compiled | RegexOptions.IgnoreCase);
 
         private readonly IDiskProvider _diskProvider;