Skip to content

Commit 4e6198e

Browse files
committed
Test dependecies
1 parent 273ff2c commit 4e6198e

File tree

4 files changed

+78
-9
lines changed

4 files changed

+78
-9
lines changed

ThermoRawFileParserTest/ThermoRawFileParserTest.csproj

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,12 @@
112112
<HintPath>..\packages\NUnit.3.13.1\lib\net45\nunit.framework.dll</HintPath>
113113
<Private>True</Private>
114114
</Reference>
115+
<Reference Include="OpenMcdf, Version=2.2.1.9, Culture=neutral, PublicKeyToken=fdbb1629d7c00800, processorArchitecture=MSIL">
116+
<HintPath>..\packages\OpenMcdf.2.2.1.9\lib\net40\OpenMcdf.dll</HintPath>
117+
</Reference>
118+
<Reference Include="OpenMcdf.Extensions, Version=2.3.0.0, Culture=neutral, PublicKeyToken=fdbb1629d7c00800, processorArchitecture=MSIL">
119+
<HintPath>..\packages\OpenMcdf.Extensions.2.2.1.4\lib\net40\OpenMcdf.Extensions.dll</HintPath>
120+
</Reference>
115121
<Reference Include="PepXML, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null">
116122
<HintPath>..\packages\mzLib.1.0.450\lib\net471\PepXML.dll</HintPath>
117123
<Private>True</Private>
@@ -128,27 +134,34 @@
128134
<Reference Include="System.Configuration" />
129135
<Reference Include="System.Core" />
130136
<Reference Include="System.Data" />
137+
<Reference Include="System.IO.FileSystem.AccessControl, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
138+
<HintPath>..\packages\System.IO.FileSystem.AccessControl.5.0.0\lib\net461\System.IO.FileSystem.AccessControl.dll</HintPath>
139+
</Reference>
131140
<Reference Include="System.Net" />
132141
<Reference Include="System.Numerics" />
133142
<Reference Include="System.Runtime.Serialization" />
143+
<Reference Include="System.Security.AccessControl, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
144+
<HintPath>..\packages\System.Security.AccessControl.5.0.0\lib\net461\System.Security.AccessControl.dll</HintPath>
145+
</Reference>
146+
<Reference Include="System.Security.Principal.Windows, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
147+
<HintPath>..\packages\System.Security.Principal.Windows.5.0.0\lib\net461\System.Security.Principal.Windows.dll</HintPath>
148+
</Reference>
134149
<Reference Include="System.Web" />
135150
<Reference Include="System.Xml" />
136151
<Reference Include="System.Xml.Linq" />
137152
<Reference Include="ThermoFisher.CommonCore.BackgroundSubtraction, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1aef06afb5abd953">
138153
<HintPath>..\packages\mzLib.1.0.450\lib\net471\ThermoFisher.CommonCore.BackgroundSubtraction.dll</HintPath>
139154
<Private>True</Private>
140155
</Reference>
141-
<Reference Include="ThermoFisher.CommonCore.Data, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1aef06afb5abd953">
142-
<HintPath>..\packages\mzLib.1.0.450\lib\net471\ThermoFisher.CommonCore.Data.dll</HintPath>
143-
<Private>True</Private>
156+
<Reference Include="ThermoFisher.CommonCore.Data, Version=5.0.0.71, Culture=neutral, PublicKeyToken=1aef06afb5abd953, processorArchitecture=MSIL">
157+
<HintPath>..\packages\ThermoFisher.CommonCore.Data.5.0.0.71\lib\netstandard2.0\ThermoFisher.CommonCore.Data.dll</HintPath>
144158
</Reference>
145159
<Reference Include="ThermoFisher.CommonCore.MassPrecisionEstimator, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null">
146160
<HintPath>..\packages\mzLib.1.0.450\lib\net471\ThermoFisher.CommonCore.MassPrecisionEstimator.dll</HintPath>
147161
<Private>True</Private>
148162
</Reference>
149-
<Reference Include="ThermoFisher.CommonCore.RawFileReader, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1aef06afb5abd953">
150-
<HintPath>..\packages\mzLib.1.0.450\lib\net471\ThermoFisher.CommonCore.RawFileReader.dll</HintPath>
151-
<Private>True</Private>
163+
<Reference Include="ThermoFisher.CommonCore.RawFileReader, Version=5.0.0.71, Culture=neutral, PublicKeyToken=1aef06afb5abd953, processorArchitecture=MSIL">
164+
<HintPath>..\packages\ThermoFisher.CommonCore.RawFileReader.5.0.0.71\lib\netstandard2.0\ThermoFisher.CommonCore.RawFileReader.dll</HintPath>
152165
</Reference>
153166
<Reference Include="ThermoRawFileReader, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null">
154167
<HintPath>..\packages\mzLib.1.0.450\lib\net471\ThermoRawFileReader.dll</HintPath>
@@ -171,6 +184,7 @@
171184
<Compile Include="XicReaderTests.cs" />
172185
</ItemGroup>
173186
<ItemGroup>
187+
<None Include="app.config" />
174188
<None Include="Data\TestFolderMgfs\small1.RAW">
175189
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
176190
</None>

ThermoRawFileParserTest/app.config

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<runtime>
4+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
5+
<dependentAssembly>
6+
<assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
7+
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
8+
</dependentAssembly>
9+
<dependentAssembly>
10+
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
11+
<bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
12+
</dependentAssembly>
13+
<dependentAssembly>
14+
<assemblyIdentity name="ThermoFisher.CommonCore.RawFileReader" publicKeyToken="1aef06afb5abd953" culture="neutral" />
15+
<bindingRedirect oldVersion="0.0.0.0-5.0.0.71" newVersion="5.0.0.71" />
16+
</dependentAssembly>
17+
<dependentAssembly>
18+
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
19+
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
20+
</dependentAssembly>
21+
<dependentAssembly>
22+
<assemblyIdentity name="OpenMcdf" publicKeyToken="fdbb1629d7c00800" culture="neutral" />
23+
<bindingRedirect oldVersion="0.0.0.0-2.2.1.9" newVersion="2.2.1.9" />
24+
</dependentAssembly>
25+
<dependentAssembly>
26+
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
27+
<bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
28+
</dependentAssembly>
29+
<dependentAssembly>
30+
<assemblyIdentity name="ThermoFisher.CommonCore.Data" publicKeyToken="1aef06afb5abd953" culture="neutral" />
31+
<bindingRedirect oldVersion="0.0.0.0-5.0.0.71" newVersion="5.0.0.71" />
32+
</dependentAssembly>
33+
<dependentAssembly>
34+
<assemblyIdentity name="System.IO.FileSystem.AccessControl" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
35+
<bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
36+
</dependentAssembly>
37+
<dependentAssembly>
38+
<assemblyIdentity name="OpenMcdf.Extensions" publicKeyToken="fdbb1629d7c00800" culture="neutral" />
39+
<bindingRedirect oldVersion="0.0.0.0-2.3.0.0" newVersion="2.3.0.0" />
40+
</dependentAssembly>
41+
<dependentAssembly>
42+
<assemblyIdentity name="System.Security.Principal.Windows" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
43+
<bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
44+
</dependentAssembly>
45+
<dependentAssembly>
46+
<assemblyIdentity name="System.Security.AccessControl" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
47+
<bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
48+
</dependentAssembly>
49+
</assemblyBinding>
50+
</runtime>
51+
</configuration>

ThermoRawFileParserTest/packages.config

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,13 @@
1212
<package id="Newtonsoft.Json" version="13.0.1" targetFramework="net472" />
1313
<package id="NJsonSchema" version="10.4.0" targetFramework="net472" />
1414
<package id="NUnit" version="3.13.1" targetFramework="net472" />
15+
<package id="OpenMcdf" version="2.2.1.9" targetFramework="net472" />
16+
<package id="OpenMcdf.Extensions" version="2.2.1.4" targetFramework="net472" />
1517
<package id="PSI_Interface" version="2.3.2" targetFramework="net472" />
16-
<package id="zlib.net" version="1.0.4.0" targetFramework="net471" />
18+
<package id="System.IO.FileSystem.AccessControl" version="5.0.0" targetFramework="net472" />
19+
<package id="System.Security.AccessControl" version="5.0.0" targetFramework="net472" />
20+
<package id="System.Security.Principal.Windows" version="5.0.0" targetFramework="net472" />
1721
<package id="ThermoFisher.CommonCore.Data" version="5.0.0.71" targetFramework="net472" />
1822
<package id="ThermoFisher.CommonCore.RawFileReader" version="5.0.0.71" targetFramework="net472" />
19-
</packages>
23+
<package id="zlib.net" version="1.0.4.0" targetFramework="net471" />
24+
</packages>

Util/Peptide.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
using System.Collections.Generic;
33
using System.Linq;
44
using System.Text.RegularExpressions;
5-
using System.Threading.Tasks;
65

76
namespace ThermoRawFileParser.Util
87
{

0 commit comments

Comments
 (0)