diff options
| author | Andrew Rabert <6550543+nvllsvm@users.noreply.github.com> | 2019-01-22 18:13:47 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-22 18:13:47 -0500 |
| commit | 28483bdb54be96ae83e0fded097f534d7e26ba1e (patch) | |
| tree | e7f4b92326417ebf55eecdf68a01d2c3b9e660d7 /MediaBrowser.Model/System | |
| parent | 920c39454c05e979eabe81877269cd4517a03ccf (diff) | |
| parent | 8106c8393b711a7e1d40487e3caf2b014decbe28 (diff) | |
Merge pull request #651 from jellyfin/release-10.1.0
Release 10.1.0
Diffstat (limited to 'MediaBrowser.Model/System')
| -rw-r--r-- | MediaBrowser.Model/System/IEnvironmentInfo.cs | 8 | ||||
| -rw-r--r-- | MediaBrowser.Model/System/ISystemEvents.cs | 2 | ||||
| -rw-r--r-- | MediaBrowser.Model/System/LogFile.cs | 2 | ||||
| -rw-r--r-- | MediaBrowser.Model/System/PublicSystemInfo.cs | 6 | ||||
| -rw-r--r-- | MediaBrowser.Model/System/SystemInfo.cs | 13 | ||||
| -rw-r--r-- | MediaBrowser.Model/System/WakeOnLanInfo.cs | 2 |
6 files changed, 19 insertions, 14 deletions
diff --git a/MediaBrowser.Model/System/IEnvironmentInfo.cs b/MediaBrowser.Model/System/IEnvironmentInfo.cs index 6af514dc8..3ffcc7de1 100644 --- a/MediaBrowser.Model/System/IEnvironmentInfo.cs +++ b/MediaBrowser.Model/System/IEnvironmentInfo.cs @@ -1,17 +1,13 @@ -using System.Runtime.InteropServices; +using System.Runtime.InteropServices; namespace MediaBrowser.Model.System { public interface IEnvironmentInfo { - MediaBrowser.Model.System.OperatingSystem OperatingSystem { get; } + OperatingSystem OperatingSystem { get; } string OperatingSystemName { get; } string OperatingSystemVersion { get; } Architecture SystemArchitecture { get; } - string GetEnvironmentVariable(string name); - void SetProcessEnvironmentVariable(string name, string value); - string StackTrace { get; } - char PathSeparator { get; } } public enum OperatingSystem diff --git a/MediaBrowser.Model/System/ISystemEvents.cs b/MediaBrowser.Model/System/ISystemEvents.cs index dec8ed8c0..8c47d6fbf 100644 --- a/MediaBrowser.Model/System/ISystemEvents.cs +++ b/MediaBrowser.Model/System/ISystemEvents.cs @@ -1,4 +1,4 @@ -using System; +using System; namespace MediaBrowser.Model.System { diff --git a/MediaBrowser.Model/System/LogFile.cs b/MediaBrowser.Model/System/LogFile.cs index ba409c542..913e8e1ea 100644 --- a/MediaBrowser.Model/System/LogFile.cs +++ b/MediaBrowser.Model/System/LogFile.cs @@ -1,4 +1,4 @@ -using System; +using System; namespace MediaBrowser.Model.System { diff --git a/MediaBrowser.Model/System/PublicSystemInfo.cs b/MediaBrowser.Model/System/PublicSystemInfo.cs index b9a3260b0..accdc9e60 100644 --- a/MediaBrowser.Model/System/PublicSystemInfo.cs +++ b/MediaBrowser.Model/System/PublicSystemInfo.cs @@ -21,10 +21,10 @@ namespace MediaBrowser.Model.System public string ServerName { get; set; } /// <summary> - /// Gets or sets the version. + /// Gets or sets the server version. /// </summary> /// <value>The version.</value> - public string Version { get; set; } + public string Version { get; set; } /// <summary> /// Gets or sets the operating sytem. @@ -38,4 +38,4 @@ namespace MediaBrowser.Model.System /// <value>The id.</value> public string Id { get; set; } } -}
\ No newline at end of file +} diff --git a/MediaBrowser.Model/System/SystemInfo.cs b/MediaBrowser.Model/System/SystemInfo.cs index a63ce5e66..26f735330 100644 --- a/MediaBrowser.Model/System/SystemInfo.cs +++ b/MediaBrowser.Model/System/SystemInfo.cs @@ -1,5 +1,5 @@ -using MediaBrowser.Model.Updates; using System.Runtime.InteropServices; +using MediaBrowser.Model.Updates; namespace MediaBrowser.Model.System { @@ -16,8 +16,17 @@ namespace MediaBrowser.Model.System /// <value>The display name of the operating system.</value> public string OperatingSystemDisplayName { get; set; } + /// <summary> + /// The product name. This is the AssemblyProduct name. + /// </summary> + public string ProductName { get; set; } + + /// <summary> + /// Get or sets the package name. + /// </summary> + /// <value>The value of the '-package' command line argument.</value> public string PackageName { get; set; } - + /// <summary> /// Gets or sets a value indicating whether this instance has pending restart. /// </summary> diff --git a/MediaBrowser.Model/System/WakeOnLanInfo.cs b/MediaBrowser.Model/System/WakeOnLanInfo.cs index cde867176..031458735 100644 --- a/MediaBrowser.Model/System/WakeOnLanInfo.cs +++ b/MediaBrowser.Model/System/WakeOnLanInfo.cs @@ -10,4 +10,4 @@ namespace MediaBrowser.Model.System Port = 9; } } -}
\ No newline at end of file +} |
