Skip to content

Commit a30bbac

Browse files
caeteracaetera
authored
Merge pull request #193 from CompOmics/dotnetcore
Version 2.0.0-dev
2 parents 290a650 + 22cfd67 commit a30bbac

File tree

896 files changed

+2207
-1641967
lines changed

Some content is hidden

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

896 files changed

+2207
-1641967
lines changed

‎.github/workflows/buildandtest.yml‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
name: buildtest
2+
3+
on:
4+
push:
5+
paths:
6+
- '**.cs'
7+
- '.github/workflows/*.yml'
8+
pull_request:
9+
paths:
10+
- '**.cs'
11+
- '.github/workflows/*.yml'
12+
13+
jobs:
14+
buildandtest:
15+
16+
runs-on: 'ubuntu-latest'
17+
18+
steps:
19+
- uses: actions/checkout@v4
20+
with:
21+
path: 'main'
22+
23+
- name: Setup .NET
24+
uses: actions/setup-dotnet@v4
25+
with:
26+
dotnet-version: 8.0.x
27+
28+
- name: Get Thermo packages
29+
uses: actions/checkout@v4
30+
with:
31+
repository: 'thermofisherlsms/RawFileReader'
32+
path: 'ThermoPKG'
33+
token: ${{ secrets.GITHUB_TOKEN }}
34+
sparse-checkout: 'Libs/NetCore/Net8/*.nupkg'
35+
sparse-checkout-cone-mode: 'false'
36+
37+
- name: Add Thermo packages as NuGet source
38+
run: |
39+
dotnet nuget add source -n ThermoPKG `pwd`/ThermoPKG/Libs/NetCore/Net8
40+
41+
- name: Build and test
42+
run: |
43+
cd main
44+
dotnet build .
45+
dotnet test .
46+

‎.github/workflows/release.yml‎

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
name: publish
2+
3+
on:
4+
release:
5+
types: 'published'
6+
7+
jobs:
8+
publish:
9+
10+
runs-on: 'ubuntu-latest'
11+
12+
steps:
13+
- name: Checkout
14+
uses: actions/checkout@v4
15+
with:
16+
path: 'main'
17+
18+
- name: Setup .NET
19+
uses: actions/setup-dotnet@v4
20+
with:
21+
dotnet-version: 8.0.x
22+
23+
- name: Get Thermo packages
24+
uses: actions/checkout@v4
25+
with:
26+
repository: 'thermofisherlsms/RawFileReader'
27+
path: 'ThermoPKG'
28+
token: ${{ secrets.GITHUB_TOKEN }}
29+
sparse-checkout: 'Libs/NetCore/Net8/*.nupkg'
30+
sparse-checkout-cone-mode: 'false'
31+
32+
- name: Add Thermo packages as NuGet source
33+
run: |
34+
dotnet nuget add source -n ThermoPKG `pwd`/ThermoPKG/Libs/NetCore/Net8
35+
36+
- name: Publish all and zip artifacts
37+
run: |
38+
dotnet publish --configuration Release --runtime linux-x64 main/ThermoRawFileParser.csproj --sc -o publish/linux-x64
39+
dotnet publish --configuration Release --runtime win-x64 main/ThermoRawFileParser.csproj --sc -o publish/win-x64
40+
dotnet publish --configuration Release --runtime osx-x64 main/ThermoRawFileParser.csproj --sc -o publish/osx-x64
41+
dotnet publish --configuration Release --framework net8.0 main/ThermoRawFileParser.csproj -o publish/net8
42+
cd publish/linux-x64
43+
zip -r -q ThermoRawFileParser-${{ github.ref_name }}-linux.zip *
44+
cd ../win-x64
45+
zip -r -q ThermoRawFileParser-${{ github.ref_name }}-win.zip *
46+
cd ../osx-x64
47+
zip -r -q ThermoRawFileParser-${{ github.ref_name }}-osx.zip *
48+
cd ../net8
49+
zip -r -q ThermoRawFileParser-${{ github.ref_name }}-net8.zip *
50+
51+
- name: Upload Linux to release
52+
uses: svenstaro/upload-release-action@v2
53+
with:
54+
repo_token: ${{ secrets.GITHUB_TOKEN }}
55+
file: publish/linux-x64/ThermoRawFileParser-${{ github.ref_name }}-linux.zip
56+
tag: ${{ github.ref }}
57+
58+
- name: Upload OSX to release
59+
uses: svenstaro/upload-release-action@v2
60+
with:
61+
repo_token: ${{ secrets.GITHUB_TOKEN }}
62+
file: publish/osx-x64/ThermoRawFileParser-${{ github.ref_name }}-osx.zip
63+
tag: ${{ github.ref }}
64+
65+
- name: Upload Windows to release
66+
uses: svenstaro/upload-release-action@v2
67+
with:
68+
repo_token: ${{ secrets.GITHUB_TOKEN }}
69+
file: publish/win-x64/ThermoRawFileParser-${{ github.ref_name }}-win.zip
70+
tag: ${{ github.ref }}
71+
72+
- name: Upload framework-based to release
73+
uses: svenstaro/upload-release-action@v2
74+
with:
75+
repo_token: ${{ secrets.GITHUB_TOKEN }}
76+
file: publish/net8/ThermoRawFileParser-${{ github.ref_name }}-net8.zip
77+
tag: ${{ github.ref }}
78+

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,4 @@ obj/
66
.vs/
77
*.csproj.user
88
.vscode/
9+
Properties/

‎.travis.yml‎

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

‎.vs/ThermoRawFileParser/v15/.suo‎

-95 KB
Binary file not shown.

‎App.config‎

Lines changed: 29 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,35 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
3+
4+
<configSections>
5+
<section name="log4net" type="System.Configuration.IgnoreSectionHandler" />
6+
</configSections>
7+
8+
<log4net>
9+
<root>
10+
<level value="INFO" />
11+
<appender-ref ref="console" />
12+
<!-- <appender-ref ref="file" /> -->
13+
</root>
14+
<appender name="console" type="log4net.Appender.ConsoleAppender">
15+
<layout type="log4net.Layout.PatternLayout">
16+
<conversionPattern value="%date{yyyy-MM-dd HH:mm:ss} %level %message%newline" />
17+
</layout>
18+
</appender>
19+
<!--<appender name="file" type="log4net.Appender.RollingFileAppender">
20+
<file value="ThermoRawFileParser.log" />
21+
<appendToFile value="true" />
22+
<rollingStyle value="Size" />
23+
<maxSizeRollBackups value="5" />
24+
<maximumFileSize value="10MB" />
25+
<staticLogFileName value="true" />
26+
<layout type="log4net.Layout.PatternLayout">
27+
<conversionPattern value="%date{yyyy-MM-dd HH:mm:ss} [%thread] %message%newline" />
28+
</layout>
29+
</appender>-->
30+
</log4net>
31+
332
<runtime>
433
<loadFromRemoteSources enabled="true" />
5-
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
6-
<dependentAssembly>
7-
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
8-
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
9-
</dependentAssembly>
10-
<dependentAssembly>
11-
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
12-
<bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
13-
</dependentAssembly>
14-
<dependentAssembly>
15-
<assemblyIdentity name="OpenMcdf" publicKeyToken="fdbb1629d7c00800" culture="neutral" />
16-
<bindingRedirect oldVersion="0.0.0.0-2.2.1.9" newVersion="2.2.1.9" />
17-
</dependentAssembly>
18-
<dependentAssembly>
19-
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
20-
<bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
21-
</dependentAssembly>
22-
<dependentAssembly>
23-
<assemblyIdentity name="ThermoFisher.CommonCore.Data" publicKeyToken="1aef06afb5abd953" culture="neutral" />
24-
<bindingRedirect oldVersion="0.0.0.0-5.0.0.88" newVersion="5.0.0.88" />
25-
</dependentAssembly>
26-
<dependentAssembly>
27-
<assemblyIdentity name="System.IO.FileSystem.AccessControl" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
28-
<bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
29-
</dependentAssembly>
30-
<dependentAssembly>
31-
<assemblyIdentity name="OpenMcdf.Extensions" publicKeyToken="fdbb1629d7c00800" culture="neutral" />
32-
<bindingRedirect oldVersion="0.0.0.0-2.3.0.0" newVersion="2.3.0.0" />
33-
</dependentAssembly>
34-
<dependentAssembly>
35-
<assemblyIdentity name="System.Security.Principal.Windows" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
36-
<bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
37-
</dependentAssembly>
38-
<dependentAssembly>
39-
<assemblyIdentity name="System.Security.AccessControl" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
40-
<bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
41-
</dependentAssembly>
42-
</assemblyBinding>
4334
</runtime>
4435
</configuration>

0 commit comments

Comments
 (0)