Merge branch 'master' into externalid-type

1 files changed, 5 insertions, 5 deletions

diff --git a/MediaBrowser.Common/System/OperatingSystem.cs b/MediaBrowser.Common/System/OperatingSystem.cs
index 7d38ddb6e..5f673d320 100644
--- a/MediaBrowser.Common/System/OperatingSystem.cs
+++ b/MediaBrowser.Common/System/OperatingSystem.cs
@@ -35,7 +35,7 @@ namespace MediaBrowser.Common.System
                     case OperatingSystemId.Linux: return "Linux";
                     case OperatingSystemId.Darwin: return "macOS";
                     case OperatingSystemId.Windows: return "Windows";
-                    default: throw new Exception($"Unknown OS {Id}");
+                    default: throw new PlatformNotSupportedException($"Unknown OS {Id}");
                 }
             }
         }
@@ -53,20 +53,20 @@ namespace MediaBrowser.Common.System
                 default:
                     {
                         string osDescription = RuntimeInformation.OSDescription;
-                        if (osDescription.IndexOf("linux", StringComparison.OrdinalIgnoreCase) != -1)
+                        if (osDescription.Contains("linux", StringComparison.OrdinalIgnoreCase))
                         {
                             return OperatingSystemId.Linux;
                         }
-                        else if (osDescription.IndexOf("darwin", StringComparison.OrdinalIgnoreCase) != -1)
+                        else if (osDescription.Contains("darwin", StringComparison.OrdinalIgnoreCase))
                         {
                             return OperatingSystemId.Darwin;
                         }
-                        else if (osDescription.IndexOf("bsd", StringComparison.OrdinalIgnoreCase) != -1)
+                        else if (osDescription.Contains("bsd", StringComparison.OrdinalIgnoreCase))
                         {
                             return OperatingSystemId.BSD;
                         }
 
-                        throw new Exception($"Can't resolve OS with description: '{osDescription}'");
+                        throw new PlatformNotSupportedException($"Can't resolve OS with description: '{osDescription}'");
                     }
             }
         }