From cf0d6b014222a6424bae52dbbb55849a6f874d2f Mon Sep 17 00:00:00 2001 From: RobinDadswell <19610103+RobinDadswell@users.noreply.github.com> Date: Thu, 19 Mar 2026 02:10:01 +0000 Subject: [PATCH 1/4] Chore: Sonar Cloud version bump --- azure-pipelines.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 5bb9f29743..06ea786ae6 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1093,7 +1093,7 @@ stages: vmImage: ${{ variables.windowsImage }} steps: - checkout: self # Need history for Sonar analysis - - task: SonarCloudPrepare@3 + - task: SonarCloudPrepare@4 env: SONAR_SCANNER_OPTS: '' inputs: @@ -1105,7 +1105,7 @@ stages: cliProjectName: 'RadarrUI' cliProjectVersion: '$(radarrVersion)' cliSources: './frontend' - - task: SonarCloudAnalyze@3 + - task: SonarCloudAnalyze@4 - job: Api_Docs displayName: API Docs @@ -1182,7 +1182,7 @@ stages: submodules: true - powershell: Set-Service SCardSvr -StartupType Manual displayName: Enable Windows Test Service - - task: SonarCloudPrepare@3 + - task: SonarCloudPrepare@4 condition: eq(variables['System.PullRequest.IsFork'], 'False') inputs: SonarCloud: 'SonarCloud' @@ -1200,7 +1200,7 @@ stages: ./build.sh --backend -f net8.0 -r win-x64 TEST_DIR=_tests/net8.0/win-x64/publish/ ./test.sh Windows Unit Coverage displayName: Coverage Unit Tests - - task: SonarCloudAnalyze@3 + - task: SonarCloudAnalyze@4 condition: eq(variables['System.PullRequest.IsFork'], 'False') displayName: Publish SonarCloud Results - task: reportgenerator@5 From 079e2136ee6d3b579329f18deaf2e59ed20d93ee Mon Sep 17 00:00:00 2001 From: RobinDadswell <19610103+RobinDadswell@users.noreply.github.com> Date: Wed, 25 Mar 2026 14:48:38 +0000 Subject: [PATCH 2/4] version bump to 6.1.2 --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 06ea786ae6..b678b14d82 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -9,7 +9,7 @@ variables: testsFolder: './_tests' yarnCacheFolder: $(Pipeline.Workspace)/.yarn nugetCacheFolder: $(Pipeline.Workspace)/.nuget/packages - majorVersion: '6.1.1' + majorVersion: '6.1.2' minorVersion: $[counter('minorVersion', 2000)] radarrVersion: '$(majorVersion).$(minorVersion)' buildName: '$(Build.SourceBranchName).$(radarrVersion)' From 8ae71b54a784ec333d37dc2d62a22ab3c9825214 Mon Sep 17 00:00:00 2001 From: Auggie <773150+augustuen@users.noreply.github.com> Date: Wed, 25 Mar 2026 19:42:26 +0100 Subject: [PATCH 3/4] chore: Fix innosetup download URI Co-authored-by: RobinDadswell <19610103+RobinDadswell@users.noreply.github.com> --- azure-pipelines.yml | 2 +- build.sh | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index b678b14d82..4b01aab6a2 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -17,7 +17,7 @@ variables: sentryUrl: 'https://sentry.servarr.com' dotnetVersion: '8.0.405' nodeVersion: '20.X' - innoVersion: '6.2.2' + innoVersion: '6.7.1' windowsImage: 'windows-2025' linuxImage: 'ubuntu-24.04' macImage: 'macOS-15' diff --git a/build.sh b/build.sh index 73e785bebe..d77a6f9f35 100755 --- a/build.sh +++ b/build.sh @@ -149,7 +149,7 @@ PackageMacOS() { local framework="$1" local runtime="$2" - + ProgressStart "Creating MacOS Package for $framework $runtime" local folder=$artifactsFolder/$runtime/$framework/Radarr @@ -177,7 +177,7 @@ PackageMacOSApp() { local framework="$1" local runtime="$2" - + ProgressStart "Creating macOS App Package for $framework $runtime" local folder="$artifactsFolder/$runtime-app/$framework" @@ -200,11 +200,11 @@ PackageWindows() { local framework="$1" local runtime="$2" - + ProgressStart "Creating Windows Package for $framework" local folder=$artifactsFolder/$runtime/$framework/Radarr - + PackageFiles "$folder" "$framework" "$runtime" cp -r $outputFolder/$framework-windows/$runtime/publish/* $folder @@ -245,20 +245,20 @@ BuildInstaller() { local framework="$1" local runtime="$2" - + ./_inno/ISCC.exe distribution/windows/setup/radarr.iss "//DFramework=$framework" "//DRuntime=$runtime" } InstallInno() { ProgressStart "Installing portable Inno Setup" - + rm -rf _inno - curl -s --output innosetup.exe "https://files.jrsoftware.org/is/6/innosetup-${INNOVERSION:-6.2.2}.exe" + curl -s -L --output innosetup.exe "https://github.com/jrsoftware/issrc/releases/download/is-${INNOVERSION//./_}/innosetup-${INNOVERSION}.exe" mkdir _inno ./innosetup.exe //portable=1 //silent //currentuser //dir=.\\_inno rm innosetup.exe - + ProgressEnd "Installed portable Inno Setup" } From 4b85fab05bc37a51c2e673673d9cabd4113fedd8 Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Wed, 25 Mar 2026 07:38:36 -0700 Subject: [PATCH 4/4] Fixed: Downloading backups when path contains a trailing slash (cherry picked from commit 31c7647eacb3c3a50e55550880287e00302a9881) --- src/Radarr.Http/Frontend/Mappers/BackupFileMapper.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Radarr.Http/Frontend/Mappers/BackupFileMapper.cs b/src/Radarr.Http/Frontend/Mappers/BackupFileMapper.cs index 612b3515b6..e0f624a242 100644 --- a/src/Radarr.Http/Frontend/Mappers/BackupFileMapper.cs +++ b/src/Radarr.Http/Frontend/Mappers/BackupFileMapper.cs @@ -15,7 +15,7 @@ public BackupFileMapper(IBackupService backupService, IDiskProvider diskProvider _backupService = backupService; } - protected override string FolderPath => _backupService.GetBackupFolder(); + protected override string FolderPath => _backupService.GetBackupFolder().TrimEnd(Path.DirectorySeparatorChar); protected override string MapPath(string resourceUrl) {