Skip to content

Commit d31d6e3

Browse files
author
stefanks
authored
Merge pull request #226 from rmillikin/master
merge
2 parents f0da8a7 + ea2928f commit d31d6e3

34 files changed

+926
-386
lines changed

‎CMD/App.config

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<startup>
4-
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.1" />
4+
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.1"/>
55
</startup>
66
<runtime>
77
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
88
<dependentAssembly>
9-
<assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
10-
<bindingRedirect oldVersion="0.0.0.0-4.4.0.0" newVersion="4.4.0.0" />
9+
<assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
10+
<bindingRedirect oldVersion="0.0.0.0-4.4.0.0" newVersion="4.4.0.0"/>
1111
</dependentAssembly>
1212
</assemblyBinding>
1313
</runtime>
14-
</configuration>
14+
</configuration>

‎CMD/CMD.csproj

+22-18
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
<TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
15+
<TargetFrameworkProfile>
16+
</TargetFrameworkProfile>
1517
</PropertyGroup>
1618
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1719
<PlatformTarget>x64</PlatformTarget>
@@ -23,6 +25,7 @@
2325
<ErrorReport>prompt</ErrorReport>
2426
<WarningLevel>4</WarningLevel>
2527
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
28+
<Prefer32Bit>false</Prefer32Bit>
2629
</PropertyGroup>
2730
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
2831
<PlatformTarget>x64</PlatformTarget>
@@ -33,42 +36,43 @@
3336
<ErrorReport>prompt</ErrorReport>
3437
<WarningLevel>4</WarningLevel>
3538
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
39+
<Prefer32Bit>false</Prefer32Bit>
3640
</PropertyGroup>
3741
<ItemGroup>
38-
<Reference Include="Chemistry, Version=1.0.105.0, Culture=neutral, processorArchitecture=AMD64">
39-
<HintPath>..\packages\mzLib.1.0.105\lib\Chemistry.dll</HintPath>
42+
<Reference Include="Chemistry, Version=1.0.106.0, Culture=neutral, processorArchitecture=AMD64">
43+
<HintPath>..\packages\mzLib.1.0.106\lib\Chemistry.dll</HintPath>
4044
<Private>True</Private>
4145
</Reference>
42-
<Reference Include="MassSpectrometry, Version=1.0.105.0, Culture=neutral, processorArchitecture=AMD64">
43-
<HintPath>..\packages\mzLib.1.0.105\lib\MassSpectrometry.dll</HintPath>
46+
<Reference Include="MassSpectrometry, Version=1.0.106.0, Culture=neutral, processorArchitecture=AMD64">
47+
<HintPath>..\packages\mzLib.1.0.106\lib\MassSpectrometry.dll</HintPath>
4448
<Private>True</Private>
4549
</Reference>
4650
<Reference Include="MathNet.Numerics, Version=3.17.0.0, Culture=neutral, processorArchitecture=MSIL">
4751
<HintPath>..\packages\MathNet.Numerics.3.17.0\lib\net40\MathNet.Numerics.dll</HintPath>
4852
<Private>True</Private>
4953
</Reference>
50-
<Reference Include="mzIdentML, Version=1.0.105.0, Culture=neutral, processorArchitecture=AMD64">
51-
<HintPath>..\packages\mzLib.1.0.105\lib\mzIdentML.dll</HintPath>
54+
<Reference Include="mzIdentML, Version=1.0.106.0, Culture=neutral, processorArchitecture=AMD64">
55+
<HintPath>..\packages\mzLib.1.0.106\lib\mzIdentML.dll</HintPath>
5256
<Private>True</Private>
5357
</Reference>
54-
<Reference Include="MzLibUtil, Version=1.0.105.0, Culture=neutral, processorArchitecture=AMD64">
55-
<HintPath>..\packages\mzLib.1.0.105\lib\MzLibUtil.dll</HintPath>
58+
<Reference Include="MzLibUtil, Version=1.0.106.0, Culture=neutral, processorArchitecture=AMD64">
59+
<HintPath>..\packages\mzLib.1.0.106\lib\MzLibUtil.dll</HintPath>
5660
<Private>True</Private>
5761
</Reference>
58-
<Reference Include="MzML, Version=1.0.105.0, Culture=neutral, processorArchitecture=AMD64">
59-
<HintPath>..\packages\mzLib.1.0.105\lib\MzML.dll</HintPath>
62+
<Reference Include="MzML, Version=1.0.106.0, Culture=neutral, processorArchitecture=AMD64">
63+
<HintPath>..\packages\mzLib.1.0.106\lib\MzML.dll</HintPath>
6064
<Private>True</Private>
6165
</Reference>
6266
<Reference Include="NetSerializer, Version=4.1.0.0, Culture=neutral, processorArchitecture=MSIL">
6367
<HintPath>..\packages\NetSerializer.4.1.0\lib\net45\NetSerializer.dll</HintPath>
6468
<Private>True</Private>
6569
</Reference>
66-
<Reference Include="Proteomics, Version=1.0.105.0, Culture=neutral, processorArchitecture=AMD64">
67-
<HintPath>..\packages\mzLib.1.0.105\lib\Proteomics.dll</HintPath>
70+
<Reference Include="Proteomics, Version=1.0.106.0, Culture=neutral, processorArchitecture=AMD64">
71+
<HintPath>..\packages\mzLib.1.0.106\lib\Proteomics.dll</HintPath>
6872
<Private>True</Private>
6973
</Reference>
70-
<Reference Include="Spectra, Version=1.0.105.0, Culture=neutral, processorArchitecture=AMD64">
71-
<HintPath>..\packages\mzLib.1.0.105\lib\Spectra.dll</HintPath>
74+
<Reference Include="Spectra, Version=1.0.106.0, Culture=neutral, processorArchitecture=AMD64">
75+
<HintPath>..\packages\mzLib.1.0.106\lib\Spectra.dll</HintPath>
7276
<Private>True</Private>
7377
</Reference>
7478
<Reference Include="System" />
@@ -80,12 +84,12 @@
8084
<Reference Include="System.Data" />
8185
<Reference Include="System.Net.Http" />
8286
<Reference Include="System.Xml" />
83-
<Reference Include="Thermo, Version=1.0.105.0, Culture=neutral, processorArchitecture=AMD64">
84-
<HintPath>..\packages\mzLib.1.0.105\lib\Thermo.dll</HintPath>
87+
<Reference Include="Thermo, Version=1.0.106.0, Culture=neutral, processorArchitecture=AMD64">
88+
<HintPath>..\packages\mzLib.1.0.106\lib\Thermo.dll</HintPath>
8589
<Private>True</Private>
8690
</Reference>
87-
<Reference Include="UsefulProteomicsDatabases, Version=1.0.105.0, Culture=neutral, processorArchitecture=AMD64">
88-
<HintPath>..\packages\mzLib.1.0.105\lib\UsefulProteomicsDatabases.dll</HintPath>
91+
<Reference Include="UsefulProteomicsDatabases, Version=1.0.106.0, Culture=neutral, processorArchitecture=AMD64">
92+
<HintPath>..\packages\mzLib.1.0.106\lib\UsefulProteomicsDatabases.dll</HintPath>
8993
<Private>True</Private>
9094
</Reference>
9195
<Reference Include="Zlib.Portable, Version=1.11.0.0, Culture=neutral, processorArchitecture=MSIL">

‎CMD/packages.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="MathNet.Numerics" version="3.17.0" targetFramework="net451" />
4-
<package id="mzLib" version="1.0.105" targetFramework="net451" />
4+
<package id="mzLib" version="1.0.106" targetFramework="net451" />
55
<package id="NetSerializer" version="4.1.0" targetFramework="net451" />
66
<package id="Zlib.Portable" version="1.11.0" targetFramework="net451" />
77
</packages>

0 commit comments

Comments
 (0)