Skip to content

Commit ea42660

Browse files
committed
Switching to Net 8.0
Known issues: Parquet needs refactoring - new API AWS S3 needs testing Tests cannot be executed
1 parent 290a650 commit ea42660

File tree

867 files changed

+204
-1640992
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

867 files changed

+204
-1640992
lines changed

.vs/ThermoRawFileParser/v15/.suo

-95 KB
Binary file not shown.

Properties/AssemblyInfo.cs

Lines changed: 0 additions & 37 deletions
This file was deleted.

ThermoRawFileParser.csproj

Lines changed: 24 additions & 258 deletions
Large diffs are not rendered by default.

ThermoRawFileParser.sln

Lines changed: 13 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,31 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 15
4-
VisualStudioVersion = 15.0.27703.2026
3+
# Visual Studio Version 17
4+
VisualStudioVersion = 17.9.34902.65
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ThermoRawFileParser", "ThermoRawFileParser.csproj", "{A70EBBB7-8F36-4C29-B886-1B6916047EB7}"
6+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ThermoRawFileParser", "ThermoRawFileParser.csproj", "{A1AB1BD8-180D-49FD-AFBB-9515EE1E862B}"
77
EndProject
8-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ThermoRawFileParserTest", "ThermoRawFileParserTest\ThermoRawFileParserTest.csproj", "{825604E5-E6E0-461B-AD2A-E2210ABEFE59}"
8+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ThermoRawFileParserTest", "ThermoRawFileParserTest\ThermoRawFileParserTest.csproj", "{5D42807F-E856-42D7-9D3E-0A17584A9D55}"
99
EndProject
1010
Global
1111
GlobalSection(SolutionConfigurationPlatforms) = preSolution
12-
Debug|Any CPU = Debug|Any CPU
1312
Debug|x64 = Debug|x64
14-
Release|Any CPU = Release|Any CPU
1513
Release|x64 = Release|x64
1614
EndGlobalSection
1715
GlobalSection(ProjectConfigurationPlatforms) = postSolution
18-
{A70EBBB7-8F36-4C29-B886-1B6916047EB7}.Debug|x64.ActiveCfg = Debug|x64
19-
{A70EBBB7-8F36-4C29-B886-1B6916047EB7}.Debug|x64.Build.0 = Debug|x64
20-
{A70EBBB7-8F36-4C29-B886-1B6916047EB7}.Release|Any CPU.ActiveCfg = Release|Any CPU
21-
{A70EBBB7-8F36-4C29-B886-1B6916047EB7}.Release|Any CPU.Build.0 = Release|Any CPU
22-
{A70EBBB7-8F36-4C29-B886-1B6916047EB7}.Release|x64.ActiveCfg = Release|x64
23-
{A70EBBB7-8F36-4C29-B886-1B6916047EB7}.Release|x64.Build.0 = Release|x64
24-
{A70EBBB7-8F36-4C29-B886-1B6916047EB7}.Debug|Any CPU.ActiveCfg = Debug|x64
25-
{A70EBBB7-8F36-4C29-B886-1B6916047EB7}.Debug|Any CPU.Build.0 = Debug|x64
26-
{825604E5-E6E0-461B-AD2A-E2210ABEFE59}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
27-
{825604E5-E6E0-461B-AD2A-E2210ABEFE59}.Debug|Any CPU.Build.0 = Debug|Any CPU
28-
{825604E5-E6E0-461B-AD2A-E2210ABEFE59}.Debug|x64.ActiveCfg = Debug|Any CPU
29-
{825604E5-E6E0-461B-AD2A-E2210ABEFE59}.Debug|x64.Build.0 = Debug|Any CPU
30-
{825604E5-E6E0-461B-AD2A-E2210ABEFE59}.Release|Any CPU.ActiveCfg = Release|Any CPU
31-
{825604E5-E6E0-461B-AD2A-E2210ABEFE59}.Release|Any CPU.Build.0 = Release|Any CPU
32-
{825604E5-E6E0-461B-AD2A-E2210ABEFE59}.Release|x64.ActiveCfg = Release|Any CPU
33-
{825604E5-E6E0-461B-AD2A-E2210ABEFE59}.Release|x64.Build.0 = Release|Any CPU
16+
{A1AB1BD8-180D-49FD-AFBB-9515EE1E862B}.Debug|x64.ActiveCfg = Debug|x64
17+
{A1AB1BD8-180D-49FD-AFBB-9515EE1E862B}.Debug|x64.Build.0 = Debug|x64
18+
{A1AB1BD8-180D-49FD-AFBB-9515EE1E862B}.Release|x64.ActiveCfg = Release|x64
19+
{A1AB1BD8-180D-49FD-AFBB-9515EE1E862B}.Release|x64.Build.0 = Release|x64
20+
{5D42807F-E856-42D7-9D3E-0A17584A9D55}.Debug|x64.ActiveCfg = Debug|x64
21+
{5D42807F-E856-42D7-9D3E-0A17584A9D55}.Debug|x64.Build.0 = Debug|x64
22+
{5D42807F-E856-42D7-9D3E-0A17584A9D55}.Release|x64.ActiveCfg = Release|x64
23+
{5D42807F-E856-42D7-9D3E-0A17584A9D55}.Release|x64.Build.0 = Release|x64
3424
EndGlobalSection
3525
GlobalSection(SolutionProperties) = preSolution
3626
HideSolutionNode = FALSE
3727
EndGlobalSection
3828
GlobalSection(ExtensibilityGlobals) = postSolution
39-
SolutionGuid = {B067B00F-6A1F-4387-997E-C06B42805D54}
29+
SolutionGuid = {6549F3E3-F5CF-4970-8527-E8E0594A0294}
4030
EndGlobalSection
4131
EndGlobal
Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
using System;
2-
using System.Text.RegularExpressions;
3-
using NUnit.Framework;
1+
using NUnit.Framework;
42
using ThermoRawFileParser.Writer;
53

64
namespace ThermoRawFileParserTest
@@ -13,13 +11,13 @@ public void TestGetInstrumentModel()
1311
{
1412
// exact match
1513
var match = OntologyMapping.GetInstrumentModel("LTQ Orbitrap");
16-
Assert.AreEqual("MS:1000449", match.accession);
14+
Assert.Equals("MS:1000449", match.accession);
1715
// partial match, should return the longest partial match
1816
var partialMatch = OntologyMapping.GetInstrumentModel("LTQ Orbitrap XXL");
19-
Assert.AreEqual("MS:1000449", partialMatch.accession);
17+
Assert.Equals("MS:1000449", partialMatch.accession);
2018
// no match, should return the generic thermo instrument
2119
var noMatch = OntologyMapping.GetInstrumentModel("non existing model");
22-
Assert.AreEqual("MS:1000483", noMatch.accession);
20+
Assert.Equals("MS:1000483", noMatch.accession);
2321
}
2422
}
2523
}

ThermoRawFileParserTest/Properties/AssemblyInfo.cs

Lines changed: 0 additions & 35 deletions
This file was deleted.

0 commit comments

Comments
 (0)