azure-pipelines.yml

@@ -9,7 +9,7 @@ variables:
   testsFolder: './_tests'
   yarnCacheFolder: $(Pipeline.Workspace)/.yarn
   nugetCacheFolder: $(Pipeline.Workspace)/.nuget/packages
-  majorVersion: '6.1.0'
+  majorVersion: '6.0.4'
   minorVersion: $[counter('minorVersion', 2000)]
   radarrVersion: '$(majorVersion).$(minorVersion)'
   buildName: '$(Build.SourceBranchName).$(radarrVersion)'
@@ -18,9 +18,9 @@ variables:
   dotnetVersion: '8.0.405'
   nodeVersion: '20.X'
   innoVersion: '6.2.2'
-  windowsImage: 'windows-2025'
+  windowsImage: 'windows-2022'
-  linuxImage: 'ubuntu-24.04'
+  linuxImage: 'ubuntu-22.04'
-  macImage: 'macOS-15'
+  macImage: 'macOS-13'
 
 trigger:
   branches:

frontend/src/System/Status/Donations/Donations.tsx

@@ -23,6 +23,14 @@ function Donations() {
           />
         </Link>
       </div>
+      <div className={styles.logoContainer} title="Readarr">
+        <Link to="https://readarr.com/donate">
+          <img
+            className={styles.logo}
+            src={`${window.Radarr.urlBase}/Content/Images/Icons/logo-readarr.png`}
+          />
+        </Link>
+      </div>
       <div className={styles.logoContainer} title="Prowlarr">
         <Link to="https://prowlarr.com/donate">
           <img

src/NzbDrone.Core.Test/Http/HttpProxySettingsProviderFixture.cs

@@ -8,7 +8,6 @@
 namespace NzbDrone.Core.Test.Http
 {
     [TestFixture]
-    [Platform(Exclude = "MacOsX")]
     public class HttpProxySettingsProviderFixture : TestBase<HttpProxySettingsProvider>
     {
         private HttpProxySettings GetProxySettings()

src/NzbDrone.Core/Localization/Core/en.json

@@ -1340,13 +1340,11 @@
   "NotificationsPushoverSettingsDevices": "Devices",
   "NotificationsPushoverSettingsDevicesHelpText": "List of device names (leave blank to send to all devices)",
   "NotificationsPushoverSettingsExpire": "Expire",
-  "NotificationsPushoverSettingsExpireHelpText": "Maximum time to retry Emergency alerts, maximum 86400 seconds",
+  "NotificationsPushoverSettingsExpireHelpText": "Maximum time to retry Emergency alerts, maximum 86400 seconds\"",
   "NotificationsPushoverSettingsRetry": "Retry",
   "NotificationsPushoverSettingsRetryHelpText": "Interval to retry Emergency alerts, minimum 30 seconds",
   "NotificationsPushoverSettingsSound": "Sound",
   "NotificationsPushoverSettingsSoundHelpText": "Notification sound, leave blank to use the default",
-  "NotificationsPushoverSettingsTtl": "Time To Live",
-  "NotificationsPushoverSettingsTtlHelpText": "Time in seconds before the message expires. Set to 0 for unlimited duration",
   "NotificationsPushoverSettingsUserKey": "User Key",
   "NotificationsSendGridSettingsApiKeyHelpText": "The API Key generated by SendGrid",
   "NotificationsSettingsUpdateLibrary": "Update Library",

src/NzbDrone.Core/Notifications/Pushover/PushoverProxy.cs

@@ -45,11 +45,6 @@ public void SendNotification(string title, string message, PushoverSettings sett
                 requestBuilder.AddFormParameter("expire", settings.Expire);
             }
 
-            if (settings.Ttl > 0)
-            {
-                requestBuilder.AddFormParameter("ttl", settings.Ttl);
-            }
-
             if (!settings.Sound.IsNullOrWhiteSpace())
             {
                 requestBuilder.AddFormParameter("sound", settings.Sound);

src/NzbDrone.Core/Notifications/Pushover/PushoverSettings.cs

@@ -13,7 +13,6 @@ public PushoverSettingsValidator()
             RuleFor(c => c.UserKey).NotEmpty();
             RuleFor(c => c.Retry).GreaterThanOrEqualTo(30).LessThanOrEqualTo(86400).When(c => (PushoverPriority)c.Priority == PushoverPriority.Emergency);
             RuleFor(c => c.Retry).GreaterThanOrEqualTo(0).LessThanOrEqualTo(86400).When(c => (PushoverPriority)c.Priority == PushoverPriority.Emergency);
-            RuleFor(c => c.Ttl).GreaterThanOrEqualTo(0);
         }
     }
 
@@ -45,10 +44,7 @@ public PushoverSettings()
         [FieldDefinition(5, Label = "NotificationsPushoverSettingsExpire", Type = FieldType.Textbox, HelpText = "NotificationsPushoverSettingsExpireHelpText")]
         public int Expire { get; set; }
 
-        [FieldDefinition(6, Label = "NotificationsPushoverSettingsTtl", Type = FieldType.Textbox, HelpText = "NotificationsPushoverSettingsTtlHelpText", Advanced = true)]
+        [FieldDefinition(6, Label = "NotificationsPushoverSettingsSound", Type = FieldType.Textbox, HelpText = "NotificationsPushoverSettingsSoundHelpText", HelpLink = "https://pushover.net/api#sounds")]
-        public int Ttl { get; set; }
-
-        [FieldDefinition(7, Label = "NotificationsPushoverSettingsSound", Type = FieldType.Textbox, HelpText = "NotificationsPushoverSettingsSoundHelpText", HelpLink = "https://pushover.net/api#sounds")]
         public string Sound { get; set; }
 
         public bool IsValid => !string.IsNullOrWhiteSpace(UserKey) && Priority >= -1 && Priority <= 2;

src/NzbDrone.Host/Startup.cs

@@ -65,8 +65,6 @@ public void ConfigureServices(IServiceCollection services)
                 options.KnownNetworks.Add(new IPNetwork(IPAddress.Parse("10.0.0.0"), 8));
                 options.KnownNetworks.Add(new IPNetwork(IPAddress.Parse("172.16.0.0"), 12));
                 options.KnownNetworks.Add(new IPNetwork(IPAddress.Parse("192.168.0.0"), 16));
-                options.KnownNetworks.Add(new IPNetwork(IPAddress.Parse("fc00::"), 7));
-                options.KnownNetworks.Add(new IPNetwork(IPAddress.Parse("fe80::"), 10));
             });
 
             services.AddRouting(options => options.LowercaseUrls = true);