github/lidarr
1
0
Fork 0
mirror of https://github.com/lidarr/lidarr.git synced 2025-08-21 05:53:33 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fixed: Sentry version mismatch (#666)

Browse source 
* Downgrade to 1.0.3

* Fix ShortenPath when cross-compiled
This commit is contained in:
ta264 2019-03-11 16:19:12 +00:00 • committed by GitHub
commit 902f0c115b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/NzbDrone.Common/Instrumentation/Sentry/SentryCleanser.cs
View file

@ -66,15 +66,20 @@ namespace NzbDrone.Common.Instrumentation.Sentry
return null; return null;
} }
var rootDir = OsInfo.IsWindows ? "\\src\\" : "/src/"; // the paths in the stacktrace depend on where it was compiled,
// not the current OS
var rootDirs = new [] { "\\src\\", "/src/" };
foreach (var rootDir in rootDirs)
{
var index = path.IndexOf(rootDir, StringComparison.Ordinal); var index = path.IndexOf(rootDir, StringComparison.Ordinal);
if (index <= 0) if (index > 0)
{ {
return path;
}
return path.Substring(index + rootDir.Length - 1); return path.Substring(index + rootDir.Length - 1);
} }
} }
return path;
}
}
} }

4
src/NzbDrone.Common/NzbDrone.Common.csproj
View file

@ -57,8 +57,8 @@
<Reference Include="Sentry, Version=1.1.2.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Sentry, Version=1.1.2.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Sentry.1.1.2\lib\net461\Sentry.dll</HintPath> <HintPath>..\packages\Sentry.1.1.2\lib\net461\Sentry.dll</HintPath>
</Reference> </Reference>
<Reference Include="Sentry.Protocol, Version=1.0.4.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Sentry.Protocol, Version=1.0.3.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Sentry.Protocol.1.0.4\lib\net46\Sentry.Protocol.dll</HintPath> <HintPath>..\packages\Sentry.Protocol.1.0.3\lib\net46\Sentry.Protocol.dll</HintPath>
</Reference> </Reference>
<Reference Include="Sentry.PlatformAbstractions, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Sentry.PlatformAbstractions, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Sentry.PlatformAbstractions.1.0.0\lib\net45\Sentry.PlatformAbstractions.dll</HintPath> <HintPath>..\packages\Sentry.PlatformAbstractions.1.0.0\lib\net45\Sentry.PlatformAbstractions.dll</HintPath>

2
src/NzbDrone.Common/packages.config
View file

@ -6,6 +6,6 @@
<package id="NLog" version="4.5.4" targetFramework="net461" /> <package id="NLog" version="4.5.4" targetFramework="net461" />
<package id="Sentry" version="1.1.2" targetFramework="net461" /> <package id="Sentry" version="1.1.2" targetFramework="net461" />
<package id="Sentry.PlatformAbstractions" version="1.0.0" targetFramework="net461" /> <package id="Sentry.PlatformAbstractions" version="1.0.0" targetFramework="net461" />
<package id="Sentry.Protocol" version="1.0.4" targetFramework="net461" /> <package id="Sentry.Protocol" version="1.0.3" targetFramework="net461" />
<package id="System.Collections.Immutable" version="1.5.0" targetFramework="net461" /> <package id="System.Collections.Immutable" version="1.5.0" targetFramework="net461" />
</packages> </packages>