Version 2.0.0-dev

.github/workflows/buildandtest.yml

@@ -0,0 +1,46 @@
+name: buildtest
+
+on:
+  push:
+    paths:
+      - '**.cs'
+      - '.github/workflows/*.yml'
+  pull_request:
+    paths:
+      - '**.cs'
+      - '.github/workflows/*.yml'
+
+jobs:
+  buildandtest:
+
+    runs-on: 'ubuntu-latest'
+
+    steps:
+    - uses: actions/checkout@v4    
+      with:
+        path: 'main'
+
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v4
+      with:
+        dotnet-version: 8.0.x
+
+    - name: Get Thermo packages
+      uses: actions/checkout@v4
+      with:
+        repository: 'thermofisherlsms/RawFileReader'
+        path: 'ThermoPKG'
+        token: ${{ secrets.GITHUB_TOKEN }}
+        sparse-checkout: 'Libs/NetCore/Net8/*.nupkg'
+        sparse-checkout-cone-mode: 'false'       
+
+    - name: Add Thermo packages as NuGet source
+      run: |
+        dotnet nuget add source -n ThermoPKG `pwd`/ThermoPKG/Libs/NetCore/Net8
+
+    - name: Build and test
+      run: |
+        cd main
+        dotnet build .
+        dotnet test .     
+

.github/workflows/release.yml

@@ -0,0 +1,78 @@
+name: publish
+
+on:
+  release:
+    types: 'published'
+
+jobs:
+  publish:
+
+    runs-on: 'ubuntu-latest'
+
+    steps:    
+    - name: Checkout
+      uses: actions/checkout@v4
+      with:
+        path: 'main'
+
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v4
+      with:
+        dotnet-version: 8.0.x
+
+    - name: Get Thermo packages
+      uses: actions/checkout@v4
+      with:
+        repository: 'thermofisherlsms/RawFileReader'
+        path: 'ThermoPKG'
+        token: ${{ secrets.GITHUB_TOKEN }}
+        sparse-checkout: 'Libs/NetCore/Net8/*.nupkg'
+        sparse-checkout-cone-mode: 'false'
+
+    - name: Add Thermo packages as NuGet source
+      run: |
+        dotnet nuget add source -n ThermoPKG `pwd`/ThermoPKG/Libs/NetCore/Net8
+
+    - name: Publish all and zip artifacts
+      run: |
+        dotnet publish --configuration Release --runtime linux-x64 main/ThermoRawFileParser.csproj --sc -o publish/linux-x64
+        dotnet publish --configuration Release --runtime win-x64 main/ThermoRawFileParser.csproj --sc -o publish/win-x64
+        dotnet publish --configuration Release --runtime osx-x64 main/ThermoRawFileParser.csproj --sc -o publish/osx-x64
+        dotnet publish --configuration Release --framework net8.0 main/ThermoRawFileParser.csproj -o publish/net8
+        cd publish/linux-x64
+        zip -r -q ThermoRawFileParser-${{ github.ref_name }}-linux.zip *
+        cd ../win-x64
+        zip -r -q ThermoRawFileParser-${{ github.ref_name }}-win.zip *
+        cd ../osx-x64
+        zip -r -q ThermoRawFileParser-${{ github.ref_name }}-osx.zip *
+        cd ../net8
+        zip -r -q ThermoRawFileParser-${{ github.ref_name }}-net8.zip *
+
+    - name: Upload Linux to release
+      uses: svenstaro/upload-release-action@v2
+      with:
+        repo_token: ${{ secrets.GITHUB_TOKEN }}
+        file: publish/linux-x64/ThermoRawFileParser-${{ github.ref_name }}-linux.zip
+        tag: ${{ github.ref }}
+
+    - name: Upload OSX to release
+      uses: svenstaro/upload-release-action@v2
+      with:
+        repo_token: ${{ secrets.GITHUB_TOKEN }}
+        file: publish/osx-x64/ThermoRawFileParser-${{ github.ref_name }}-osx.zip
+        tag: ${{ github.ref }}
+
+    - name: Upload Windows to release
+      uses: svenstaro/upload-release-action@v2
+      with:
+        repo_token: ${{ secrets.GITHUB_TOKEN }}
+        file: publish/win-x64/ThermoRawFileParser-${{ github.ref_name }}-win.zip
+        tag: ${{ github.ref }}
+
+    - name: Upload framework-based to release
+      uses: svenstaro/upload-release-action@v2
+      with:
+        repo_token: ${{ secrets.GITHUB_TOKEN }}
+        file: publish/net8/ThermoRawFileParser-${{ github.ref_name }}-net8.zip
+        tag: ${{ github.ref }}
+

.gitignore

@@ -6,3 +6,4 @@ obj/
 .vs/
 *.csproj.user
 .vscode/
+Properties/

App.config

@@ -1,44 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
+
+  <configSections>
+    <section name="log4net" type="System.Configuration.IgnoreSectionHandler" />
+  </configSections>
+
+  <log4net>
+    <root>
+      <level value="INFO" />
+      <appender-ref ref="console" />
+      <!-- <appender-ref ref="file" /> -->
+    </root>
+    <appender name="console" type="log4net.Appender.ConsoleAppender">
+      <layout type="log4net.Layout.PatternLayout">
+        <conversionPattern value="%date{yyyy-MM-dd HH:mm:ss} %level %message%newline" />
+      </layout>
+    </appender>
+    <!--<appender name="file" type="log4net.Appender.RollingFileAppender">        
+        <file value="ThermoRawFileParser.log" />
+        <appendToFile value="true" />
+        <rollingStyle value="Size" />
+        <maxSizeRollBackups value="5" />
+        <maximumFileSize value="10MB" />
+        <staticLogFileName value="true" />
+        <layout type="log4net.Layout.PatternLayout">
+            <conversionPattern value="%date{yyyy-MM-dd HH:mm:ss} [%thread] %message%newline" />
+        </layout>        
+    </appender>-->
+  </log4net>
+
   <runtime>
     <loadFromRemoteSources enabled="true" />
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="OpenMcdf" publicKeyToken="fdbb1629d7c00800" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-2.2.1.9" newVersion="2.2.1.9" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="ThermoFisher.CommonCore.Data" publicKeyToken="1aef06afb5abd953" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-5.0.0.88" newVersion="5.0.0.88" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.IO.FileSystem.AccessControl" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="OpenMcdf.Extensions" publicKeyToken="fdbb1629d7c00800" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-2.3.0.0" newVersion="2.3.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Security.Principal.Windows" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Security.AccessControl" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
-      </dependentAssembly>
-    </assemblyBinding>
   </runtime>
 </configuration>