From c46dd91c170fc6aeb757e4732e7b0f504a77e660 Mon Sep 17 00:00:00 2001
From: glopesdev <glopesdev@users.noreply.github.com>
Date: Tue, 15 Jun 2021 09:54:28 +0100
Subject: [PATCH 1/3] Add support for nuget package generation

Fixes #2
---
 Directory.Build.props          |  8 --------
 examples/Directory.Build.props |  7 +++++--
 liblsl.csproj                  | 11 ++++++++++-
 runtimes/README.md             |  3 +++
 4 files changed, 18 insertions(+), 11 deletions(-)
 delete mode 100644 Directory.Build.props
 create mode 100644 runtimes/README.md

diff --git a/Directory.Build.props b/Directory.Build.props
deleted file mode 100644
index 84e162b..0000000
--- a/Directory.Build.props
+++ /dev/null
@@ -1,8 +0,0 @@
-<Project>
-  <PropertyGroup>
-    <Authors>Christian Kothe</Authors>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>1.12.2</Version>
-  </PropertyGroup>
-</Project>
-
diff --git a/examples/Directory.Build.props b/examples/Directory.Build.props
index 7a68623..b57ab75 100644
--- a/examples/Directory.Build.props
+++ b/examples/Directory.Build.props
@@ -1,6 +1,9 @@
 <Project>
-<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
   <PropertyGroup>
+    <Authors>Christian Kothe</Authors>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <Version>1.12.2</Version>
     <LangVersion>8.0</LangVersion>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>
+
diff --git a/liblsl.csproj b/liblsl.csproj
index 9e7f251..0b9263b 100644
--- a/liblsl.csproj
+++ b/liblsl.csproj
@@ -7,6 +7,15 @@
     <Version>2.0</Version>
     <DefaultItemExcludes>$(DefaultItemExcludes);examples/**</DefaultItemExcludes>
     <AssemblyName>lsl_csharp</AssemblyName>
+    <Copyright>Copyright © Christian Kothe 2021</Copyright>
+    <ProjectUrl>https://github.com/labstreaminglayer/liblsl-Csharp</ProjectUrl>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
+    <PackageTags>LSL Lab Streaming Layer</PackageTags>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <RuntimeIdentifiers>win-x86;win-x64;osx-x64;linux-x64</RuntimeIdentifiers>
   </PropertyGroup>
-</Project>
 
+  <ItemGroup>
+    <Content Include="runtimes\**" Exclude="runtimes\README.md" PackagePath="runtimes" />
+  </ItemGroup>
+</Project>
diff --git a/runtimes/README.md b/runtimes/README.md
new file mode 100644
index 0000000..ccc3e7e
--- /dev/null
+++ b/runtimes/README.md
@@ -0,0 +1,3 @@
+# Runtime Identifier Dependencies
+
+The NuGet package for the C# bindings includes binary distributions for major platform runtimes targeted by [liblsl](https://github.com/sccn/liblsl). To successfully build the package, these binaries need to be downloaded from [liblsl releases](https://github.com/sccn/liblsl/releases) and included in this folder following the RID naming conventions outlined in the [RID Catalog](https://docs.microsoft.com/en-us/dotnet/core/rid-catalog).
\ No newline at end of file

From 0f1627d47ad2dfc0d9d65bd00ee639657061d3df Mon Sep 17 00:00:00 2001
From: glopesdev <glopesdev@users.noreply.github.com>
Date: Wed, 16 Jun 2021 20:51:37 +0100
Subject: [PATCH 2/3] Add docs for architecture-specific folders

---
 runtimes/README.md | 64 +++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 63 insertions(+), 1 deletion(-)

diff --git a/runtimes/README.md b/runtimes/README.md
index ccc3e7e..b275674 100644
--- a/runtimes/README.md
+++ b/runtimes/README.md
@@ -1,3 +1,65 @@
 # Runtime Identifier Dependencies
 
-The NuGet package for the C# bindings includes binary distributions for major platform runtimes targeted by [liblsl](https://github.com/sccn/liblsl). To successfully build the package, these binaries need to be downloaded from [liblsl releases](https://github.com/sccn/liblsl/releases) and included in this folder following the RID naming conventions outlined in the [RID Catalog](https://docs.microsoft.com/en-us/dotnet/core/rid-catalog).
\ No newline at end of file
+The NuGet package for the C# bindings includes binary distributions for major platform runtimes targeted by [liblsl](https://github.com/sccn/liblsl). To successfully build the package, these binaries need to be downloaded from [liblsl releases](https://github.com/sccn/liblsl/releases) and included in this folder following the RID naming conventions outlined in the [RID Catalog](https://docs.microsoft.com/en-us/dotnet/core/rid-catalog).
+
+The following [architecture-specific folders](https://docs.microsoft.com/en-us/nuget/create-packages/supporting-multiple-target-frameworks#architecture-specific-folders) are recommended:
+
+```
+\runtimes
+    \linux-x64
+        \native
+            liblsl.so
+            liblsl.so.1.14.0
+    \osx-x64
+        \native
+            liblsl.dylib
+            liblsl.1.14.0.dylib
+    \win-x64
+        \native
+            lsl.dll
+    \win-x86
+        \native
+            lsl.dll
+```
+
+## Project files for dependent projects
+
+From Visual Studio 2019, both .NET Core (`dotnet`) and .NET Framework compilers will use the `RuntimeIdentifier` element of the new SDK csproj format to control which native dependencies to deploy to the final output folder.
+
+### .NET Core
+In .NET Core, the default is to generate cross-platform deployments, which means that all the runtimes will be deployed to the final output folder. By inserting a specific `RuntimeIdentifier` a build targeting only the specified architecture is generated.
+
+```xml
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net5.0</TargetFramework>
+    <!--<RuntimeIdentifier>linux-x64</RuntimeIdentifier>-->
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="lsl_csharp" Version="2.0.0" />
+  </ItemGroup>
+
+</Project>
+```
+
+### .NET Framework
+In legacy .NET framework projects, `RuntimeIdentifier` defaults to `win7-x86` which has the generic fallback to `win-x86`. Therefore, the above folder structure will automatically copy `lsl.dll` into the output folder of .NET Framework projects.
+
+```xml
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net472</TargetFramework>
+    <!--<RuntimeIdentifier>win-x64</RuntimeIdentifier>-->
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="lsl_csharp" Version="2.0.0" />
+  </ItemGroup>
+
+</Project>
+```
\ No newline at end of file

From 02f845ac10945394657fe7a5de0604c0b08a4f83 Mon Sep 17 00:00:00 2001
From: myd7349 <myd7349@gmail.com>
Date: Sat, 29 Mar 2025 17:15:22 +0800
Subject: [PATCH 3/3] Add NuGet packaging support

---
 .editorconfig                                 |  17 ++-
 .github/workflows/dotnet-core.yaml            |  29 ----
 .github/workflows/dotnet.yaml                 |  88 +++++++++++
 Directory.Build.props                         |  18 +++
 Directory.Packages.props                      |  14 ++
 liblsl.sln => LSL.Net.sln                     | 139 ++++++++++++------
 README.md                                     |  36 +++--
 examples/Directory.Build.props                |  26 +++-
 examples/HandleMetaData/HandleMetaData.csproj |   9 --
 examples/LSLExamples.csproj                   |  18 ---
 examples/LSLExamples/LSLExamples.csproj       |  12 ++
 examples/{ => LSLExamples}/Main.cs            |   0
 examples/LSLVer/LSLVer.cs                     |  15 ++
 examples/LSLVer/LSLVer.csproj                 |   2 +
 examples/ReceiveData/ReceiveData.csproj       |  10 --
 .../ReceiveDataInChunks.csproj                |  10 --
 .../ReceiveStringMarkers.csproj               |  10 --
 examples/SendData/SendData.csproj             |  10 --
 .../SendDataInChunks/SendDataInChunks.csproj  |  10 --
 .../SendStringMarkers.csproj                  |  10 --
 img/vs2019_lsl_props.PNG                      | Bin 13342 -> 0 bytes
 liblsl.csproj                                 |  21 ---
 runtimes/README.md                            |  65 --------
 src/Directory.Build.props                     |  17 +++
 src/LSL.Net.runtime/CopyNativeLib.targets     |  47 ++++++
 src/LSL.Net.runtime/Directory.Build.props     |  28 ++++
 src/LSL.Net.runtime/Directory.Build.targets   |  74 ++++++++++
 src/LSL.Net.runtime/LICENSE                   |  15 ++
 src/LSL.Net.runtime/README.md                 |  75 ++++++++++
 .../win-x64/LSL.Net.runtime.win-x64.csproj    |  15 ++
 .../net35/LSL.Net.runtime.win-x64.targets     |  21 +++
 .../win-x86/LSL.Net.runtime.win-x86.csproj    |  15 ++
 .../net35/LSL.Net.runtime.win-x86.targets     |  21 +++
 src/LSL.Net.slnf                              |  10 ++
 src/LSL.Net/LSL.Net.csproj                    |  29 ++++
 LSL.cs => src/LSL.Net/LSL.cs                  |  33 +++++
 36 files changed, 705 insertions(+), 264 deletions(-)
 delete mode 100644 .github/workflows/dotnet-core.yaml
 create mode 100644 .github/workflows/dotnet.yaml
 create mode 100644 Directory.Build.props
 create mode 100644 Directory.Packages.props
 rename liblsl.sln => LSL.Net.sln (63%)
 delete mode 100644 examples/LSLExamples.csproj
 create mode 100644 examples/LSLExamples/LSLExamples.csproj
 rename examples/{ => LSLExamples}/Main.cs (100%)
 create mode 100644 examples/LSLVer/LSLVer.cs
 create mode 100644 examples/LSLVer/LSLVer.csproj
 delete mode 100644 img/vs2019_lsl_props.PNG
 delete mode 100644 liblsl.csproj
 delete mode 100644 runtimes/README.md
 create mode 100644 src/Directory.Build.props
 create mode 100644 src/LSL.Net.runtime/CopyNativeLib.targets
 create mode 100644 src/LSL.Net.runtime/Directory.Build.props
 create mode 100644 src/LSL.Net.runtime/Directory.Build.targets
 create mode 100644 src/LSL.Net.runtime/LICENSE
 create mode 100644 src/LSL.Net.runtime/README.md
 create mode 100644 src/LSL.Net.runtime/win-x64/LSL.Net.runtime.win-x64.csproj
 create mode 100644 src/LSL.Net.runtime/win-x64/build/net35/LSL.Net.runtime.win-x64.targets
 create mode 100644 src/LSL.Net.runtime/win-x86/LSL.Net.runtime.win-x86.csproj
 create mode 100644 src/LSL.Net.runtime/win-x86/build/net35/LSL.Net.runtime.win-x86.targets
 create mode 100644 src/LSL.Net.slnf
 create mode 100644 src/LSL.Net/LSL.Net.csproj
 rename LSL.cs => src/LSL.Net/LSL.cs (98%)

diff --git a/.editorconfig b/.editorconfig
index d3422af..826d0fe 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -4,10 +4,23 @@
 ###############################
 # All files
 [*]
+charset = utf8
+indent_style = space
 indent_size = 4
 insert_final_newline = true
-charset = utf
-indent_style = space
+trim_trailing_whitespace = true
+
+###############################
+# File Extension Settings     #
+###############################
+
+# Visual Studio Solution Files
+[*.sln]
+indent_style = tab
+
+# Visual Studio XML Project Files
+[*.{csproj,vbproj,vcxproj.filters,proj,projitems,shproj}]
+indent_size = 2
 
 [*.{cs,csx,vb,vbx}]
 
diff --git a/.github/workflows/dotnet-core.yaml b/.github/workflows/dotnet-core.yaml
deleted file mode 100644
index 8fc56b0..0000000
--- a/.github/workflows/dotnet-core.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
-name: .NET Core
-
-on:
-  push:
-    branches: '*'
-  pull_request:
-    branches: [ master ]
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v2
-    - name: Install .NET Core
-      uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: 5.x
-    - name: Build and package liblsl
-      run: dotnet pack -c Release liblsl.csproj -o pkg
-    - name: Build and package examples
-      run: dotnet pack -c Release examples/LSLExamples.csproj -o pkg
-#    - name: Run examples
-#      run: dotnet run -p examples/LSLExamples.csproj
-    - name: Upload build artifacts
-      uses: actions/upload-artifact@v1
-      with:
-        name: nuget pkg
-        path: pkg
diff --git a/.github/workflows/dotnet.yaml b/.github/workflows/dotnet.yaml
new file mode 100644
index 0000000..265b2ad
--- /dev/null
+++ b/.github/workflows/dotnet.yaml
@@ -0,0 +1,88 @@
+name: LSL.Net
+
+on:
+  pull_request:
+  push:
+    branches: '*'
+  workflow_dispatch:
+  release:
+    types: [ published ]
+
+jobs:
+  build:
+    name: Build-${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ ubuntu-latest, windows-latest, macOS-latest ]
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Install .NET SDK
+        uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: |
+            5.0.x
+            6.0.x
+
+      - name: List installed .NET SDKs
+        run: dotnet --list-sdks
+
+      - name: Build
+        run: dotnet build -c Release LSL.Net.sln
+
+      - name: Pack
+        run: dotnet pack -c Release src/LSL.Net.slnf
+
+      - name: Setup library path
+        if: ${{ runner.os == 'Linux' || runner.os == 'macOS' }}
+        run: |
+          echo ${{ github.workspace }}
+          uname -a
+          if [[ "$OSTYPE" == "darwin"* ]]; then
+            echo "DYLD_LIBRARY_PATH=${{ github.workspace }}/examples/LSLVer/bin/Release/net6.0" >> "$GITHUB_ENV"
+          else
+            echo "LD_LIBRARY_PATH=${{ github.workspace }}/examples/LSLVer/bin/Release/net6.0" >> "$GITHUB_ENV"
+          fi
+
+      - name: Run LSLVer
+        # LSL.Net.runtime for linux and macOS is not yet landed.
+        if: ${{ runner.os == 'Windows' }}
+        run: dotnet run -c Release -p examples/LSLVer/LSLVer.csproj -f net6.0
+
+      - name: Upload build artifacts
+        if: ${{ runner.os == 'Linux' }}
+        uses: actions/upload-artifact@v4
+        with:
+          name: nuget-packages
+          path: "**/*.*nupkg"
+
+  publish:
+    name: Publish
+    runs-on: ubuntu-latest
+    needs: build
+    if: github.event_name == 'release'
+    steps:
+      - name: Install .NET SDK
+        uses: actions/setup-dotnet@v4
+
+      - name: Download artifacts
+        uses: actions/download-artifact@v4
+        with:
+          name: nuget-packages
+
+      - name: Push NuGet packages
+        run: |
+          dotnet nuget push **/*.nupkg --skip-duplicate --api-key ${{ secrets.NUGET_API_KEY }} --source https://api.nuget.org/v3/index.json
+
+      - name: Release
+        uses: softprops/action-gh-release@v2
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          generate_release_notes: true
+          files: |
+            **/*.nupkg
+            **/*.snupkg
diff --git a/Directory.Build.props b/Directory.Build.props
new file mode 100644
index 0000000..8378018
--- /dev/null
+++ b/Directory.Build.props
@@ -0,0 +1,18 @@
+<Project>
+  <PropertyGroup>
+    <TargetFrameworks>net35;netstandard2.0;net5.0;net6.0</TargetFrameworks>
+    <AnalysisLevel>latest</AnalysisLevel>
+    <AppendTargetFrameworkToOutputPath>true</AppendTargetFrameworkToOutputPath>
+    <EnableNETAnalyzers>true</EnableNETAnalyzers>
+    <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
+    <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <Version>1.16.2-preview.1</Version>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <Authors>Christian Kothe</Authors>
+    <Company>Christian Kothe</Company>
+    <Copyright>Copyright © Christian Kothe 2021-2025</Copyright>
+  </PropertyGroup>
+</Project>
diff --git a/Directory.Packages.props b/Directory.Packages.props
new file mode 100644
index 0000000..294f949
--- /dev/null
+++ b/Directory.Packages.props
@@ -0,0 +1,14 @@
+<Project>
+  <PropertyGroup>
+    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageVersion Include="LSL.Net" />
+    <!--
+    <PackageVersion Include="LSL.Net.runtime.win-x64" Version="1.16.2-preview.1" />
+    <PackageVersion Include="LSL.Net.runtime.win-x86" Version="1.16.2-preview.1" />
+    -->
+    <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/liblsl.sln b/LSL.Net.sln
similarity index 63%
rename from liblsl.sln
rename to LSL.Net.sln
index 56fc09e..d6df6c9 100644
--- a/liblsl.sln
+++ b/LSL.Net.sln
@@ -1,10 +1,8 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29609.76
+# Visual Studio Version 17
+VisualStudioVersion = 17.12.35728.132
 MinimumVisualStudioVersion = 15.0.26124.0
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "liblsl", "liblsl.csproj", "{9CF380F5-EB84-4A39-969E-7E6F5534F17F}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "examples", "examples", "{2831BC99-EB85-43AC-AEDF-8A689B8268FC}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HandleMetaData", "examples\HandleMetaData\HandleMetaData.csproj", "{55625B73-07CD-4C9F-ABFB-FB3C5899A79F}"
@@ -21,6 +19,18 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SendDataInChunks", "example
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SendStringMarkers", "examples\SendStringMarkers\SendStringMarkers.csproj", "{0847C79E-E4BD-4B67-8DB7-6873415815A6}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E771A42F-A73C-4C1E-B50E-58CA0A6A2113}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LSL.Net", "src\LSL.Net\LSL.Net.csproj", "{AFD9C248-E42F-4C6E-829E-712096292FE7}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "runtimes", "runtimes", "{55693EBC-5165-42D3-A433-69A4503F8867}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LSL.Net.runtime.win-x64", "src\LSL.Net.runtime\win-x64\LSL.Net.runtime.win-x64.csproj", "{C310E070-EA3B-4E65-A00B-549B980F0881}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LSL.Net.runtime.win-x86", "src\LSL.Net.runtime\win-x86\LSL.Net.runtime.win-x86.csproj", "{A2D6D146-96BF-431C-AEF8-3C21CC60206A}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LSLVer", "examples\LSLVer\LSLVer.csproj", "{96CF8C5B-D343-4ECF-AC40-1F87891F046B}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -31,24 +41,12 @@ Global
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{9CF380F5-EB84-4A39-969E-7E6F5534F17F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9CF380F5-EB84-4A39-969E-7E6F5534F17F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9CF380F5-EB84-4A39-969E-7E6F5534F17F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{9CF380F5-EB84-4A39-969E-7E6F5534F17F}.Debug|x64.Build.0 = Debug|Any CPU
-		{9CF380F5-EB84-4A39-969E-7E6F5534F17F}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{9CF380F5-EB84-4A39-969E-7E6F5534F17F}.Debug|x86.Build.0 = Debug|Any CPU
-		{9CF380F5-EB84-4A39-969E-7E6F5534F17F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9CF380F5-EB84-4A39-969E-7E6F5534F17F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9CF380F5-EB84-4A39-969E-7E6F5534F17F}.Release|x64.ActiveCfg = Release|Any CPU
-		{9CF380F5-EB84-4A39-969E-7E6F5534F17F}.Release|x64.Build.0 = Release|Any CPU
-		{9CF380F5-EB84-4A39-969E-7E6F5534F17F}.Release|x86.ActiveCfg = Release|Any CPU
-		{9CF380F5-EB84-4A39-969E-7E6F5534F17F}.Release|x86.Build.0 = Release|Any CPU
 		{55625B73-07CD-4C9F-ABFB-FB3C5899A79F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{55625B73-07CD-4C9F-ABFB-FB3C5899A79F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{55625B73-07CD-4C9F-ABFB-FB3C5899A79F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{55625B73-07CD-4C9F-ABFB-FB3C5899A79F}.Debug|x64.Build.0 = Debug|Any CPU
-		{55625B73-07CD-4C9F-ABFB-FB3C5899A79F}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{55625B73-07CD-4C9F-ABFB-FB3C5899A79F}.Debug|x86.Build.0 = Debug|Any CPU
+		{55625B73-07CD-4C9F-ABFB-FB3C5899A79F}.Debug|x64.ActiveCfg = Debug|x64
+		{55625B73-07CD-4C9F-ABFB-FB3C5899A79F}.Debug|x64.Build.0 = Debug|x64
+		{55625B73-07CD-4C9F-ABFB-FB3C5899A79F}.Debug|x86.ActiveCfg = Debug|x86
+		{55625B73-07CD-4C9F-ABFB-FB3C5899A79F}.Debug|x86.Build.0 = Debug|x86
 		{55625B73-07CD-4C9F-ABFB-FB3C5899A79F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{55625B73-07CD-4C9F-ABFB-FB3C5899A79F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{55625B73-07CD-4C9F-ABFB-FB3C5899A79F}.Release|x64.ActiveCfg = Release|Any CPU
@@ -57,10 +55,10 @@ Global
 		{55625B73-07CD-4C9F-ABFB-FB3C5899A79F}.Release|x86.Build.0 = Release|Any CPU
 		{98F76BEE-C774-44C0-BAF3-BFF4B429420B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{98F76BEE-C774-44C0-BAF3-BFF4B429420B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{98F76BEE-C774-44C0-BAF3-BFF4B429420B}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{98F76BEE-C774-44C0-BAF3-BFF4B429420B}.Debug|x64.Build.0 = Debug|Any CPU
-		{98F76BEE-C774-44C0-BAF3-BFF4B429420B}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{98F76BEE-C774-44C0-BAF3-BFF4B429420B}.Debug|x86.Build.0 = Debug|Any CPU
+		{98F76BEE-C774-44C0-BAF3-BFF4B429420B}.Debug|x64.ActiveCfg = Debug|x64
+		{98F76BEE-C774-44C0-BAF3-BFF4B429420B}.Debug|x64.Build.0 = Debug|x64
+		{98F76BEE-C774-44C0-BAF3-BFF4B429420B}.Debug|x86.ActiveCfg = Debug|x86
+		{98F76BEE-C774-44C0-BAF3-BFF4B429420B}.Debug|x86.Build.0 = Debug|x86
 		{98F76BEE-C774-44C0-BAF3-BFF4B429420B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{98F76BEE-C774-44C0-BAF3-BFF4B429420B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{98F76BEE-C774-44C0-BAF3-BFF4B429420B}.Release|x64.ActiveCfg = Release|Any CPU
@@ -69,10 +67,10 @@ Global
 		{98F76BEE-C774-44C0-BAF3-BFF4B429420B}.Release|x86.Build.0 = Release|Any CPU
 		{A0EF1C60-7461-415B-9C98-F28A3283258A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{A0EF1C60-7461-415B-9C98-F28A3283258A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A0EF1C60-7461-415B-9C98-F28A3283258A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A0EF1C60-7461-415B-9C98-F28A3283258A}.Debug|x64.Build.0 = Debug|Any CPU
-		{A0EF1C60-7461-415B-9C98-F28A3283258A}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{A0EF1C60-7461-415B-9C98-F28A3283258A}.Debug|x86.Build.0 = Debug|Any CPU
+		{A0EF1C60-7461-415B-9C98-F28A3283258A}.Debug|x64.ActiveCfg = Debug|x64
+		{A0EF1C60-7461-415B-9C98-F28A3283258A}.Debug|x64.Build.0 = Debug|x64
+		{A0EF1C60-7461-415B-9C98-F28A3283258A}.Debug|x86.ActiveCfg = Debug|x86
+		{A0EF1C60-7461-415B-9C98-F28A3283258A}.Debug|x86.Build.0 = Debug|x86
 		{A0EF1C60-7461-415B-9C98-F28A3283258A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A0EF1C60-7461-415B-9C98-F28A3283258A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{A0EF1C60-7461-415B-9C98-F28A3283258A}.Release|x64.ActiveCfg = Release|Any CPU
@@ -81,10 +79,10 @@ Global
 		{A0EF1C60-7461-415B-9C98-F28A3283258A}.Release|x86.Build.0 = Release|Any CPU
 		{8AB092B9-F671-4185-BB6C-543B6A2AE55A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{8AB092B9-F671-4185-BB6C-543B6A2AE55A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8AB092B9-F671-4185-BB6C-543B6A2AE55A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{8AB092B9-F671-4185-BB6C-543B6A2AE55A}.Debug|x64.Build.0 = Debug|Any CPU
-		{8AB092B9-F671-4185-BB6C-543B6A2AE55A}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{8AB092B9-F671-4185-BB6C-543B6A2AE55A}.Debug|x86.Build.0 = Debug|Any CPU
+		{8AB092B9-F671-4185-BB6C-543B6A2AE55A}.Debug|x64.ActiveCfg = Debug|x64
+		{8AB092B9-F671-4185-BB6C-543B6A2AE55A}.Debug|x64.Build.0 = Debug|x64
+		{8AB092B9-F671-4185-BB6C-543B6A2AE55A}.Debug|x86.ActiveCfg = Debug|x86
+		{8AB092B9-F671-4185-BB6C-543B6A2AE55A}.Debug|x86.Build.0 = Debug|x86
 		{8AB092B9-F671-4185-BB6C-543B6A2AE55A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8AB092B9-F671-4185-BB6C-543B6A2AE55A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{8AB092B9-F671-4185-BB6C-543B6A2AE55A}.Release|x64.ActiveCfg = Release|Any CPU
@@ -93,10 +91,10 @@ Global
 		{8AB092B9-F671-4185-BB6C-543B6A2AE55A}.Release|x86.Build.0 = Release|Any CPU
 		{4DB5312C-5B29-4725-8EA0-3458AC36FB08}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{4DB5312C-5B29-4725-8EA0-3458AC36FB08}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4DB5312C-5B29-4725-8EA0-3458AC36FB08}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{4DB5312C-5B29-4725-8EA0-3458AC36FB08}.Debug|x64.Build.0 = Debug|Any CPU
-		{4DB5312C-5B29-4725-8EA0-3458AC36FB08}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{4DB5312C-5B29-4725-8EA0-3458AC36FB08}.Debug|x86.Build.0 = Debug|Any CPU
+		{4DB5312C-5B29-4725-8EA0-3458AC36FB08}.Debug|x64.ActiveCfg = Debug|x64
+		{4DB5312C-5B29-4725-8EA0-3458AC36FB08}.Debug|x64.Build.0 = Debug|x64
+		{4DB5312C-5B29-4725-8EA0-3458AC36FB08}.Debug|x86.ActiveCfg = Debug|x86
+		{4DB5312C-5B29-4725-8EA0-3458AC36FB08}.Debug|x86.Build.0 = Debug|x86
 		{4DB5312C-5B29-4725-8EA0-3458AC36FB08}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4DB5312C-5B29-4725-8EA0-3458AC36FB08}.Release|Any CPU.Build.0 = Release|Any CPU
 		{4DB5312C-5B29-4725-8EA0-3458AC36FB08}.Release|x64.ActiveCfg = Release|Any CPU
@@ -105,10 +103,10 @@ Global
 		{4DB5312C-5B29-4725-8EA0-3458AC36FB08}.Release|x86.Build.0 = Release|Any CPU
 		{4763E2F5-B238-4896-AC52-217555ACFF2A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{4763E2F5-B238-4896-AC52-217555ACFF2A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4763E2F5-B238-4896-AC52-217555ACFF2A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{4763E2F5-B238-4896-AC52-217555ACFF2A}.Debug|x64.Build.0 = Debug|Any CPU
-		{4763E2F5-B238-4896-AC52-217555ACFF2A}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{4763E2F5-B238-4896-AC52-217555ACFF2A}.Debug|x86.Build.0 = Debug|Any CPU
+		{4763E2F5-B238-4896-AC52-217555ACFF2A}.Debug|x64.ActiveCfg = Debug|x64
+		{4763E2F5-B238-4896-AC52-217555ACFF2A}.Debug|x64.Build.0 = Debug|x64
+		{4763E2F5-B238-4896-AC52-217555ACFF2A}.Debug|x86.ActiveCfg = Debug|x86
+		{4763E2F5-B238-4896-AC52-217555ACFF2A}.Debug|x86.Build.0 = Debug|x86
 		{4763E2F5-B238-4896-AC52-217555ACFF2A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4763E2F5-B238-4896-AC52-217555ACFF2A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{4763E2F5-B238-4896-AC52-217555ACFF2A}.Release|x64.ActiveCfg = Release|Any CPU
@@ -117,16 +115,64 @@ Global
 		{4763E2F5-B238-4896-AC52-217555ACFF2A}.Release|x86.Build.0 = Release|Any CPU
 		{0847C79E-E4BD-4B67-8DB7-6873415815A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{0847C79E-E4BD-4B67-8DB7-6873415815A6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0847C79E-E4BD-4B67-8DB7-6873415815A6}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{0847C79E-E4BD-4B67-8DB7-6873415815A6}.Debug|x64.Build.0 = Debug|Any CPU
-		{0847C79E-E4BD-4B67-8DB7-6873415815A6}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{0847C79E-E4BD-4B67-8DB7-6873415815A6}.Debug|x86.Build.0 = Debug|Any CPU
+		{0847C79E-E4BD-4B67-8DB7-6873415815A6}.Debug|x64.ActiveCfg = Debug|x64
+		{0847C79E-E4BD-4B67-8DB7-6873415815A6}.Debug|x64.Build.0 = Debug|x64
+		{0847C79E-E4BD-4B67-8DB7-6873415815A6}.Debug|x86.ActiveCfg = Debug|x86
+		{0847C79E-E4BD-4B67-8DB7-6873415815A6}.Debug|x86.Build.0 = Debug|x86
 		{0847C79E-E4BD-4B67-8DB7-6873415815A6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0847C79E-E4BD-4B67-8DB7-6873415815A6}.Release|Any CPU.Build.0 = Release|Any CPU
 		{0847C79E-E4BD-4B67-8DB7-6873415815A6}.Release|x64.ActiveCfg = Release|Any CPU
 		{0847C79E-E4BD-4B67-8DB7-6873415815A6}.Release|x64.Build.0 = Release|Any CPU
 		{0847C79E-E4BD-4B67-8DB7-6873415815A6}.Release|x86.ActiveCfg = Release|Any CPU
 		{0847C79E-E4BD-4B67-8DB7-6873415815A6}.Release|x86.Build.0 = Release|Any CPU
+		{AFD9C248-E42F-4C6E-829E-712096292FE7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AFD9C248-E42F-4C6E-829E-712096292FE7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AFD9C248-E42F-4C6E-829E-712096292FE7}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{AFD9C248-E42F-4C6E-829E-712096292FE7}.Debug|x64.Build.0 = Debug|Any CPU
+		{AFD9C248-E42F-4C6E-829E-712096292FE7}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{AFD9C248-E42F-4C6E-829E-712096292FE7}.Debug|x86.Build.0 = Debug|Any CPU
+		{AFD9C248-E42F-4C6E-829E-712096292FE7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AFD9C248-E42F-4C6E-829E-712096292FE7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AFD9C248-E42F-4C6E-829E-712096292FE7}.Release|x64.ActiveCfg = Release|Any CPU
+		{AFD9C248-E42F-4C6E-829E-712096292FE7}.Release|x64.Build.0 = Release|Any CPU
+		{AFD9C248-E42F-4C6E-829E-712096292FE7}.Release|x86.ActiveCfg = Release|Any CPU
+		{AFD9C248-E42F-4C6E-829E-712096292FE7}.Release|x86.Build.0 = Release|Any CPU
+		{C310E070-EA3B-4E65-A00B-549B980F0881}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C310E070-EA3B-4E65-A00B-549B980F0881}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C310E070-EA3B-4E65-A00B-549B980F0881}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C310E070-EA3B-4E65-A00B-549B980F0881}.Debug|x64.Build.0 = Debug|Any CPU
+		{C310E070-EA3B-4E65-A00B-549B980F0881}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{C310E070-EA3B-4E65-A00B-549B980F0881}.Debug|x86.Build.0 = Debug|Any CPU
+		{C310E070-EA3B-4E65-A00B-549B980F0881}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C310E070-EA3B-4E65-A00B-549B980F0881}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C310E070-EA3B-4E65-A00B-549B980F0881}.Release|x64.ActiveCfg = Release|Any CPU
+		{C310E070-EA3B-4E65-A00B-549B980F0881}.Release|x64.Build.0 = Release|Any CPU
+		{C310E070-EA3B-4E65-A00B-549B980F0881}.Release|x86.ActiveCfg = Release|Any CPU
+		{C310E070-EA3B-4E65-A00B-549B980F0881}.Release|x86.Build.0 = Release|Any CPU
+		{A2D6D146-96BF-431C-AEF8-3C21CC60206A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A2D6D146-96BF-431C-AEF8-3C21CC60206A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A2D6D146-96BF-431C-AEF8-3C21CC60206A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A2D6D146-96BF-431C-AEF8-3C21CC60206A}.Debug|x64.Build.0 = Debug|Any CPU
+		{A2D6D146-96BF-431C-AEF8-3C21CC60206A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A2D6D146-96BF-431C-AEF8-3C21CC60206A}.Debug|x86.Build.0 = Debug|Any CPU
+		{A2D6D146-96BF-431C-AEF8-3C21CC60206A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A2D6D146-96BF-431C-AEF8-3C21CC60206A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A2D6D146-96BF-431C-AEF8-3C21CC60206A}.Release|x64.ActiveCfg = Release|Any CPU
+		{A2D6D146-96BF-431C-AEF8-3C21CC60206A}.Release|x64.Build.0 = Release|Any CPU
+		{A2D6D146-96BF-431C-AEF8-3C21CC60206A}.Release|x86.ActiveCfg = Release|Any CPU
+		{A2D6D146-96BF-431C-AEF8-3C21CC60206A}.Release|x86.Build.0 = Release|Any CPU
+		{96CF8C5B-D343-4ECF-AC40-1F87891F046B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{96CF8C5B-D343-4ECF-AC40-1F87891F046B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{96CF8C5B-D343-4ECF-AC40-1F87891F046B}.Debug|x64.ActiveCfg = Debug|x64
+		{96CF8C5B-D343-4ECF-AC40-1F87891F046B}.Debug|x64.Build.0 = Debug|x64
+		{96CF8C5B-D343-4ECF-AC40-1F87891F046B}.Debug|x86.ActiveCfg = Debug|x86
+		{96CF8C5B-D343-4ECF-AC40-1F87891F046B}.Debug|x86.Build.0 = Debug|x86
+		{96CF8C5B-D343-4ECF-AC40-1F87891F046B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{96CF8C5B-D343-4ECF-AC40-1F87891F046B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{96CF8C5B-D343-4ECF-AC40-1F87891F046B}.Release|x64.ActiveCfg = Release|x64
+		{96CF8C5B-D343-4ECF-AC40-1F87891F046B}.Release|x64.Build.0 = Release|x64
+		{96CF8C5B-D343-4ECF-AC40-1F87891F046B}.Release|x86.ActiveCfg = Release|x86
+		{96CF8C5B-D343-4ECF-AC40-1F87891F046B}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -139,6 +185,11 @@ Global
 		{4DB5312C-5B29-4725-8EA0-3458AC36FB08} = {2831BC99-EB85-43AC-AEDF-8A689B8268FC}
 		{4763E2F5-B238-4896-AC52-217555ACFF2A} = {2831BC99-EB85-43AC-AEDF-8A689B8268FC}
 		{0847C79E-E4BD-4B67-8DB7-6873415815A6} = {2831BC99-EB85-43AC-AEDF-8A689B8268FC}
+		{AFD9C248-E42F-4C6E-829E-712096292FE7} = {E771A42F-A73C-4C1E-B50E-58CA0A6A2113}
+		{55693EBC-5165-42D3-A433-69A4503F8867} = {E771A42F-A73C-4C1E-B50E-58CA0A6A2113}
+		{C310E070-EA3B-4E65-A00B-549B980F0881} = {55693EBC-5165-42D3-A433-69A4503F8867}
+		{A2D6D146-96BF-431C-AEF8-3C21CC60206A} = {55693EBC-5165-42D3-A433-69A4503F8867}
+		{96CF8C5B-D343-4ECF-AC40-1F87891F046B} = {2831BC99-EB85-43AC-AEDF-8A689B8268FC}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {3C10DB2A-2433-4783-82DF-C6433CBD211B}
diff --git a/README.md b/README.md
index 6f67ec0..b7a131c 100644
--- a/README.md
+++ b/README.md
@@ -1,20 +1,32 @@
-# C# bindings
+# LSL.Net
 
-The is the C# interface to the lab streaming layer. To use it, you need to include the file LSL.cs in your project, and make sure that the appropriate lsl library (e.g. lsl.dll) is findable (e.g., in your application's root directory or in a system path). If LSL.cs fails to find the lsl shared library for your target platform, edit LSL.cs and update the libname line with the library name for your target platform. As of liblsl 1.14, this should be the same for all targets: `const string libname = "lsl";`
+LSL.Net is a cross-platform C# binding of [Lab Streaming Layer](https://github.com/sccn/labstreaminglayer).
 
-## Using Visual Studio 2019
+## Usage
 
-* Make sure you have the .NET desktop development pack installed.
-* Open the liblsl.sln file. If you are asked to upgrade then go ahead.
-* Add lsl.dll to your solution.
-    * In the solution explorer, right click on the `liblsl` target and choose `Add > Existing Item ...`.
-    * In the new explorer window, change the `Add` dropdown button to `Add as Link` and change the file types/extensions to `all files (*.*)`. Browse to where you have lsl.dll ([previously downloaded from here](https://github.com/sccn/liblsl/releases)) and select it.
-* Click on the lsl.dll entry now in the solution explorer to view its properties.
-* Set "Build Action" to "Content" and "Copy to Output Directory" to "Copy if newer".
+LSL.Net is available as a convenient NuGet package. You can install LSL.Net using any of the following methods:
 
-![Visual Studio lsl.dll properties](img/vs2019_lsl_props.PNG)
+.NET CLI:
 
-From now on, whenever a target in the solution is built, lsl.dll will be copied into the build directory.
+```
+dotnet add package LSL.Net --version <version>
+```
+
+NuGet package manager:
+
+```
+Install-Package LSL.Net -Version <version>
+```
+
+PackageReference:
+
+```
+<PackageReference Include="LSL.Net" Version="<version>" />
+```
+
+Replace `<version>` with the specific version number of LSL.Net you wish to use.
+
+In addition to installing LSL.Net, you will need to install the appropriate liblsl runtime package(s) for your target platform(s). There are separate NuGet packages that contain liblsl native binaries for the most common platforms, named [```LSL.Net.runtime.[RID]```](https://www.nuget.org/packages?q=LSL.Net.runtime), where `[RID]` represents the runtime identifier for the specific platform. For details on runtime identifiers, refer to the [.NET RID catalog](https://learn.microsoft.com/en-us/dotnet/core/rid-catalog). You can find the list of available native packages and their platform mappings in the [LSL.Net.runtime README](https://github.com/labstreaminglayer/liblsl-Csharp/blob/master/src/LSL.Net.runtime/README.md).
 
 # C# Example Programs
 
diff --git a/examples/Directory.Build.props b/examples/Directory.Build.props
index b57ab75..f1821f1 100644
--- a/examples/Directory.Build.props
+++ b/examples/Directory.Build.props
@@ -1,9 +1,27 @@
 <Project>
+  <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
+
   <PropertyGroup>
-    <Authors>Christian Kothe</Authors>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>1.12.2</Version>
+    <OutputType>Exe</OutputType>
+    <IsPublishable>false</IsPublishable>
     <LangVersion>8.0</LangVersion>
+    <Platforms>AnyCPU;x86;x64</Platforms>
+    <UseNugetPackage>false</UseNugetPackage>
   </PropertyGroup>
-</Project>
 
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\LSL.Net\LSL.Net.csproj" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(UseNugetPackage)' == 'false'">
+    <ProjectReference Include="..\..\src\LSL.Net.runtime\win-x64\LSL.Net.runtime.win-x64.csproj" />
+    <ProjectReference Include="..\..\src\LSL.Net.runtime\win-x86\LSL.Net.runtime.win-x86.csproj" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(UseNugetPackage)' == 'true'">
+    <PackageReference Include="LSL.Net.runtime.win-x64" />
+    <PackageReference Include="LSL.Net.runtime.win-x86" />
+  </ItemGroup>
+
+  <Import Project="..\src\LSL.Net.runtime\CopyNativeLib.targets" />
+</Project>
diff --git a/examples/HandleMetaData/HandleMetaData.csproj b/examples/HandleMetaData/HandleMetaData.csproj
index 5943752..35e3d84 100644
--- a/examples/HandleMetaData/HandleMetaData.csproj
+++ b/examples/HandleMetaData/HandleMetaData.csproj
@@ -1,11 +1,2 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-	<TargetFramework>net5.0</TargetFramework>
-	<Version>1.14</Version>
-	<LangVersion>8.0</LangVersion>
-	<OutputType>Exe</OutputType>
-  </PropertyGroup>
-   <ItemGroup>
-    <ProjectReference Include="..\..\liblsl.csproj" />
-  </ItemGroup>
 </Project>
diff --git a/examples/LSLExamples.csproj b/examples/LSLExamples.csproj
deleted file mode 100644
index 912f39e..0000000
--- a/examples/LSLExamples.csproj
+++ /dev/null
@@ -1,18 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-	<!-- All-in-one example project.
-	It contains a launcher for all examples in the subdirectories that
-	compiles to a single .exe, prints some information about the wrapper and
-	passes all arguments through to the example specified as first command line
-	argument. -->
-  <PropertyGroup>
-	<TargetFramework>netcoreapp5.0</TargetFramework>
-	<Product>Labstreaminglayer C# examples</Product>
-	<Version>1.14</Version>
-	<LangVersion>8.0</LangVersion>
-	<OutputType>Exe</OutputType>
-	<StartupObject>LSLExamples.EntryPoint</StartupObject>
-  </PropertyGroup>
-   <ItemGroup>
-    <ProjectReference Include="..\liblsl.csproj" />
-  </ItemGroup>
-</Project>
diff --git a/examples/LSLExamples/LSLExamples.csproj b/examples/LSLExamples/LSLExamples.csproj
new file mode 100644
index 0000000..2ff494c
--- /dev/null
+++ b/examples/LSLExamples/LSLExamples.csproj
@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <!--
+  All-in-one example project.
+  It contains a launcher for all examples in the subdirectories that
+  compiles to a single .exe, prints some information about the wrapper and
+  passes all arguments through to the example specified as first command line
+  argument.
+  -->
+  <PropertyGroup>
+    <StartupObject>LSLExamples.EntryPoint</StartupObject>
+   </PropertyGroup>
+</Project>
diff --git a/examples/Main.cs b/examples/LSLExamples/Main.cs
similarity index 100%
rename from examples/Main.cs
rename to examples/LSLExamples/Main.cs
diff --git a/examples/LSLVer/LSLVer.cs b/examples/LSLVer/LSLVer.cs
new file mode 100644
index 0000000..5b61b48
--- /dev/null
+++ b/examples/LSLVer/LSLVer.cs
@@ -0,0 +1,15 @@
+// Port of https://github.com/sccn/liblsl/blob/master/testing/lslver.c
+using System;
+
+namespace LSLExamples
+{
+    internal class LSLVer
+    {
+        static void Main(string[] args)
+        {
+            Console.WriteLine($"LSL version: {LSL.LSL.library_version()}");
+            Console.WriteLine(LSL.LSL.library_info());
+            Console.WriteLine(LSL.LSL.local_clock());
+        }
+    }
+}
diff --git a/examples/LSLVer/LSLVer.csproj b/examples/LSLVer/LSLVer.csproj
new file mode 100644
index 0000000..35e3d84
--- /dev/null
+++ b/examples/LSLVer/LSLVer.csproj
@@ -0,0 +1,2 @@
+<Project Sdk="Microsoft.NET.Sdk">
+</Project>
diff --git a/examples/ReceiveData/ReceiveData.csproj b/examples/ReceiveData/ReceiveData.csproj
index e5668bc..35e3d84 100644
--- a/examples/ReceiveData/ReceiveData.csproj
+++ b/examples/ReceiveData/ReceiveData.csproj
@@ -1,12 +1,2 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-	<TargetFramework>net5.0</TargetFramework>
-	<Product>Labstreaminglayer C# examples</Product>
-	<Version>1.14</Version>
-	<LangVersion>8.0</LangVersion>
-	<OutputType>Exe</OutputType>
-  </PropertyGroup>
-   <ItemGroup>
-    <ProjectReference Include="..\..\liblsl.csproj" />
-  </ItemGroup>
 </Project>
diff --git a/examples/ReceiveDataInChunks/ReceiveDataInChunks.csproj b/examples/ReceiveDataInChunks/ReceiveDataInChunks.csproj
index e5668bc..35e3d84 100644
--- a/examples/ReceiveDataInChunks/ReceiveDataInChunks.csproj
+++ b/examples/ReceiveDataInChunks/ReceiveDataInChunks.csproj
@@ -1,12 +1,2 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-	<TargetFramework>net5.0</TargetFramework>
-	<Product>Labstreaminglayer C# examples</Product>
-	<Version>1.14</Version>
-	<LangVersion>8.0</LangVersion>
-	<OutputType>Exe</OutputType>
-  </PropertyGroup>
-   <ItemGroup>
-    <ProjectReference Include="..\..\liblsl.csproj" />
-  </ItemGroup>
 </Project>
diff --git a/examples/ReceiveStringMarkers/ReceiveStringMarkers.csproj b/examples/ReceiveStringMarkers/ReceiveStringMarkers.csproj
index e5668bc..35e3d84 100644
--- a/examples/ReceiveStringMarkers/ReceiveStringMarkers.csproj
+++ b/examples/ReceiveStringMarkers/ReceiveStringMarkers.csproj
@@ -1,12 +1,2 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-	<TargetFramework>net5.0</TargetFramework>
-	<Product>Labstreaminglayer C# examples</Product>
-	<Version>1.14</Version>
-	<LangVersion>8.0</LangVersion>
-	<OutputType>Exe</OutputType>
-  </PropertyGroup>
-   <ItemGroup>
-    <ProjectReference Include="..\..\liblsl.csproj" />
-  </ItemGroup>
 </Project>
diff --git a/examples/SendData/SendData.csproj b/examples/SendData/SendData.csproj
index e5668bc..35e3d84 100644
--- a/examples/SendData/SendData.csproj
+++ b/examples/SendData/SendData.csproj
@@ -1,12 +1,2 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-	<TargetFramework>net5.0</TargetFramework>
-	<Product>Labstreaminglayer C# examples</Product>
-	<Version>1.14</Version>
-	<LangVersion>8.0</LangVersion>
-	<OutputType>Exe</OutputType>
-  </PropertyGroup>
-   <ItemGroup>
-    <ProjectReference Include="..\..\liblsl.csproj" />
-  </ItemGroup>
 </Project>
diff --git a/examples/SendDataInChunks/SendDataInChunks.csproj b/examples/SendDataInChunks/SendDataInChunks.csproj
index e5668bc..35e3d84 100644
--- a/examples/SendDataInChunks/SendDataInChunks.csproj
+++ b/examples/SendDataInChunks/SendDataInChunks.csproj
@@ -1,12 +1,2 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-	<TargetFramework>net5.0</TargetFramework>
-	<Product>Labstreaminglayer C# examples</Product>
-	<Version>1.14</Version>
-	<LangVersion>8.0</LangVersion>
-	<OutputType>Exe</OutputType>
-  </PropertyGroup>
-   <ItemGroup>
-    <ProjectReference Include="..\..\liblsl.csproj" />
-  </ItemGroup>
 </Project>
diff --git a/examples/SendStringMarkers/SendStringMarkers.csproj b/examples/SendStringMarkers/SendStringMarkers.csproj
index e5668bc..35e3d84 100644
--- a/examples/SendStringMarkers/SendStringMarkers.csproj
+++ b/examples/SendStringMarkers/SendStringMarkers.csproj
@@ -1,12 +1,2 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-	<TargetFramework>net5.0</TargetFramework>
-	<Product>Labstreaminglayer C# examples</Product>
-	<Version>1.14</Version>
-	<LangVersion>8.0</LangVersion>
-	<OutputType>Exe</OutputType>
-  </PropertyGroup>
-   <ItemGroup>
-    <ProjectReference Include="..\..\liblsl.csproj" />
-  </ItemGroup>
 </Project>
diff --git a/img/vs2019_lsl_props.PNG b/img/vs2019_lsl_props.PNG
deleted file mode 100644
index 42670bdbca948293b3e73444fd1d9a9fedd9b040..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 13342
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

diff --git a/liblsl.csproj b/liblsl.csproj
deleted file mode 100644
index 0b9263b..0000000
--- a/liblsl.csproj
+++ /dev/null
@@ -1,21 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <Authors>Christian Kothe</Authors>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <RootNamespace>LSL</RootNamespace>
-    <Product>Labstreaminglayer C# bindings</Product>
-    <Version>2.0</Version>
-    <DefaultItemExcludes>$(DefaultItemExcludes);examples/**</DefaultItemExcludes>
-    <AssemblyName>lsl_csharp</AssemblyName>
-    <Copyright>Copyright © Christian Kothe 2021</Copyright>
-    <ProjectUrl>https://github.com/labstreaminglayer/liblsl-Csharp</ProjectUrl>
-    <PackageLicenseExpression>MIT</PackageLicenseExpression>
-    <PackageTags>LSL Lab Streaming Layer</PackageTags>
-    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <RuntimeIdentifiers>win-x86;win-x64;osx-x64;linux-x64</RuntimeIdentifiers>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Content Include="runtimes\**" Exclude="runtimes\README.md" PackagePath="runtimes" />
-  </ItemGroup>
-</Project>
diff --git a/runtimes/README.md b/runtimes/README.md
deleted file mode 100644
index b275674..0000000
--- a/runtimes/README.md
+++ /dev/null
@@ -1,65 +0,0 @@
-# Runtime Identifier Dependencies
-
-The NuGet package for the C# bindings includes binary distributions for major platform runtimes targeted by [liblsl](https://github.com/sccn/liblsl). To successfully build the package, these binaries need to be downloaded from [liblsl releases](https://github.com/sccn/liblsl/releases) and included in this folder following the RID naming conventions outlined in the [RID Catalog](https://docs.microsoft.com/en-us/dotnet/core/rid-catalog).
-
-The following [architecture-specific folders](https://docs.microsoft.com/en-us/nuget/create-packages/supporting-multiple-target-frameworks#architecture-specific-folders) are recommended:
-
-```
-\runtimes
-    \linux-x64
-        \native
-            liblsl.so
-            liblsl.so.1.14.0
-    \osx-x64
-        \native
-            liblsl.dylib
-            liblsl.1.14.0.dylib
-    \win-x64
-        \native
-            lsl.dll
-    \win-x86
-        \native
-            lsl.dll
-```
-
-## Project files for dependent projects
-
-From Visual Studio 2019, both .NET Core (`dotnet`) and .NET Framework compilers will use the `RuntimeIdentifier` element of the new SDK csproj format to control which native dependencies to deploy to the final output folder.
-
-### .NET Core
-In .NET Core, the default is to generate cross-platform deployments, which means that all the runtimes will be deployed to the final output folder. By inserting a specific `RuntimeIdentifier` a build targeting only the specified architecture is generated.
-
-```xml
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
-    <!--<RuntimeIdentifier>linux-x64</RuntimeIdentifier>-->
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="lsl_csharp" Version="2.0.0" />
-  </ItemGroup>
-
-</Project>
-```
-
-### .NET Framework
-In legacy .NET framework projects, `RuntimeIdentifier` defaults to `win7-x86` which has the generic fallback to `win-x86`. Therefore, the above folder structure will automatically copy `lsl.dll` into the output folder of .NET Framework projects.
-
-```xml
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>net472</TargetFramework>
-    <!--<RuntimeIdentifier>win-x64</RuntimeIdentifier>-->
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="lsl_csharp" Version="2.0.0" />
-  </ItemGroup>
-
-</Project>
-```
\ No newline at end of file
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
new file mode 100644
index 0000000..67cc478
--- /dev/null
+++ b/src/Directory.Build.props
@@ -0,0 +1,17 @@
+<Project>
+  <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
+
+  <PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">
+    <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
+  </PropertyGroup>
+
+  <PropertyGroup Label="Package">
+    <PackageProjectUrl>https://github.com/labstreaminglayer/liblsl-Csharp</PackageProjectUrl>
+    <PackageReadmeFile>README.md</PackageReadmeFile>
+    <PackageReleaseNotes>https://github.com/labstreaminglayer/liblsl-Csharp/releases</PackageReleaseNotes>
+    <PackageTags>labstreaminglayer;lsl;liblsl</PackageTags>
+    <PublishRepositoryUrl>true</PublishRepositoryUrl>
+    <RepositoryUrl>https://github.com/labstreaminglayer/liblsl-Csharp</RepositoryUrl>
+    <RepositoryType>git</RepositoryType>
+  </PropertyGroup>
+</Project>
diff --git a/src/LSL.Net.runtime/CopyNativeLib.targets b/src/LSL.Net.runtime/CopyNativeLib.targets
new file mode 100644
index 0000000..ff7cd28
--- /dev/null
+++ b/src/LSL.Net.runtime/CopyNativeLib.targets
@@ -0,0 +1,47 @@
+<Project>
+  <PropertyGroup Condition="$([MSBuild]::IsOSPlatform('Linux'))">
+    <OSName>linux</OSName>
+    <NativeLibFile>liblsl.so</NativeLibFile>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="$([MSBuild]::IsOSPlatform('OSX'))">
+    <OSName>osx</OSName>
+    <NativeLibFile>liblsl.dylib</NativeLibFile>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="$([MSBuild]::IsOSPlatform('Windows'))">
+    <OSName>win</OSName>
+    <NativeLibFile>lsl.dll</NativeLibFile>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <OSArch Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture)' == 'Arm'">arm</OSArch>
+    <OSArch Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture)' == 'Arm64'">arm64</OSArch>
+    <OSArch Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture)' == 'X64'">x64</OSArch>
+    <OSArch Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture)' == 'X86'">x86</OSArch>
+  </PropertyGroup>
+
+  <!--
+  This is a workaround for the issue mentioned in: https://github.com/dotnet/sdk/issues/19929.
+  However, this approach has drawbacks:
+  1. On Windows, it does not load the correct version of `lsl.dll` based on AnyCPU/x64/x86 project configuration;
+  2. On Linux and macOS, you should set `LD_LIBRARY_PATH` and `DYLD_LIBRARY_PATH` respectively.
+  Another solution is to use `PackageReference` instead of `ProjectReference` to reference
+  `LSL.Net.runtime.[rid]`.
+  -->
+  <Target Name="CopyNativeLib" AfterTargets="PostBuildEvent">
+    <ItemGroup>
+      <NativeLibPath Include="$(MSBuildThisFileDirectory)$(OSName)-$(OSArch)/$(BaseIntermediateOutputPath)**/$(NativeLibFile)" />
+      <None Include="@(NativeLibPath)">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
+    </ItemGroup>
+
+    <Message Text="Copying lsl native lib: @(NativeLibPath) -> $(OutDir)$(NativeLibFile)"
+             Importance="High" />
+
+    <Copy SourceFiles="@(NativeLibPath)" 
+          DestinationFolder="$(OutDir)" 
+          SkipUnchangedFiles="true" />
+  </Target>
+</Project>
\ No newline at end of file
diff --git a/src/LSL.Net.runtime/Directory.Build.props b/src/LSL.Net.runtime/Directory.Build.props
new file mode 100644
index 0000000..8843899
--- /dev/null
+++ b/src/LSL.Net.runtime/Directory.Build.props
@@ -0,0 +1,28 @@
+<Project>
+  <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
+
+  <PropertyGroup>
+    <LSLRuntimeVersion>1.16.2</LSLRuntimeVersion>
+  </PropertyGroup>
+
+  <PropertyGroup Label="Build">
+    <BuildInParallel>false</BuildInParallel>
+    <DebugType>None</DebugType>
+    <DebugSymbols>false</DebugSymbols>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <NoWarn>CS2008</NoWarn>
+  </PropertyGroup>
+
+  <PropertyGroup Label="Package">
+    <ExcludeSymbolsFromPackage>false</ExcludeSymbolsFromPackage>
+    <IncludeBuildOutput>false</IncludeBuildOutput>
+    <PackageLicenseFile>LICENSE</PackageLicenseFile>
+    <SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <None Include="../LICENSE" Pack="true" PackagePath="/" />
+    <None Include="../README.md" Pack="true" PackagePath="/" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/LSL.Net.runtime/Directory.Build.targets b/src/LSL.Net.runtime/Directory.Build.targets
new file mode 100644
index 0000000..bd659f8
--- /dev/null
+++ b/src/LSL.Net.runtime/Directory.Build.targets
@@ -0,0 +1,74 @@
+<Project>
+
+  <PropertyGroup>
+    <PackageId>LSL.Net.runtime.$(RID)</PackageId>
+    <Description>liblsl runtime library for $(RID)</Description>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <NativeAssetUrl>https://github.com/sccn/liblsl/releases/download/v$(LSLRuntimeVersion)/$(NativeAssetFile)</NativeAssetUrl>
+    <NativeLibFile>$(NativeLibPrefix)lsl.$(NativeLibExt)</NativeLibFile>
+    <NativeLibUnpackDir>$(ProjectDir)$(BaseIntermediateOutputPath)$(NativeAssetTitle)/</NativeLibUnpackDir>
+  </PropertyGroup>
+
+  <Target Name="_DownloadNativeAsset" BeforeTargets="_UnpackNativeAsset">
+    <DownloadFile SourceUrl="$(NativeAssetUrl)"
+                  DestinationFolder="$(ProjectDir)$(BaseIntermediateOutputPath)"
+                  DestinationFileName="$(NativeAssetFile)"
+                  Condition="!Exists('$(ProjectDir)$(BaseIntermediateOutputPath)$(NativeAssetFile)')" />
+  </Target>
+
+  <Target Name="_UnpackNativeAsset" BeforeTargets="_CollectNativeLibs">
+    <Unzip SourceFiles="$(ProjectDir)$(BaseIntermediateOutputPath)$(NativeAssetFile)"
+           DestinationFolder="$(NativeLibUnpackDir)"
+           OverwriteReadOnlyFiles="true"
+           Condition="!Exists('$(NativeLibUnpackDir)$(NativeLibBaseDir)/$(NativeLibFile)')"  />
+  </Target>
+
+  <Target Name="_CollectNativeLibs" BeforeTargets="Build">
+    <ItemGroup>
+      <NativeLibs Include="$(NativeLibUnpackDir)$(NativeLibBaseDir)/**/$(NativeLibFile)" />
+      <None Include="@(NativeLibs)">
+        <Pack>true</Pack>
+        <PackagePath>runtimes/$(RID)/native</PackagePath>
+        <Link>runtimes/$(RID)/native/%(FileName)%(Extension)</Link>
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
+    </ItemGroup>
+  </Target>
+
+  <Target Name="_IncludeAdditionalTfmSpecificPackageFilesPrepare">
+    <GetNuGetShortFolderName TargetFrameworkMoniker="$(TargetFrameworkMoniker)" TargetPlatformMoniker="$(TargetPlatformMoniker)">
+      <Output TaskParameter="NuGetShortFolderName" PropertyName="NuGetShortFolderName" />
+    </GetNuGetShortFolderName>
+  </Target>
+
+  <Target Name="_IncludePlaceholders" AfterTargets="_IncludeAdditionalTfmSpecificPackageFilesPrepare">
+    <Touch Files="$(IntermediateOutputPath)_._" AlwaysCreate="True" />
+    <ItemGroup>
+      <FileWrites Include="$(IntermediateOutputPath)_._" />
+      <TfmSpecificPackageFile Include="$(IntermediateOutputPath)_._"
+                              PackagePath="lib\$(NuGetShortFolderName)\_._" />
+    </ItemGroup>
+  </Target>
+
+  <Target Name="_IncludeAdditionalTfmSpecificPackageFiles">
+    <ItemGroup Condition="'$(TargetFramework)' == 'net35'">
+      <TfmSpecificPackageFile Include="$(ProjectDir)build\net35\$(PackageId).targets"
+                              PackagePath="build\net35\$(PackageId).targets" />
+      <TfmSpecificPackageFile Include="$(ProjectDir)build\net35\$(PackageId).targets"
+                              PackagePath="buildTransitive\net35\$(PackageId).targets" />
+    </ItemGroup>
+  </Target>
+
+  <PropertyGroup>
+    <_IncludeAdditionalTfmSpecificPackageFilesDependsOn>
+      _IncludeAdditionalTfmSpecificPackageFilesPrepare;
+      _IncludeAdditionalTfmSpecificPackageFiles;
+    </_IncludeAdditionalTfmSpecificPackageFilesDependsOn>
+  </PropertyGroup>
+
+  <Target Name="IncludeAdditionalTfmSpecificPackageFiles"
+          DependsOnTargets="$(_IncludeAdditionalTfmSpecificPackageFilesDependsOn)" />
+
+</Project>
diff --git a/src/LSL.Net.runtime/LICENSE b/src/LSL.Net.runtime/LICENSE
new file mode 100644
index 0000000..3e443e3
--- /dev/null
+++ b/src/LSL.Net.runtime/LICENSE
@@ -0,0 +1,15 @@
+Copyright (C) 2012 Christian A. Kothe
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+This software uses the following libraries:
+
+
+pugixml (https://pugixml.org), MIT. pugixml is Copyright (C) 2006-2018 Arseny Kapoulkine.
+Boost (https://boost.org), Boost Software License
+Loguru (https://github.com/emilk/loguru), Public Domain
+Catch2 (https://github.com/catchorg/Catch2), Boost Software License
diff --git a/src/LSL.Net.runtime/README.md b/src/LSL.Net.runtime/README.md
new file mode 100644
index 0000000..825ca81
--- /dev/null
+++ b/src/LSL.Net.runtime/README.md
@@ -0,0 +1,75 @@
+# LSL.Net runtime packages
+
+The following NuGet packages include binary distributions for major platform runtimes targeted by [liblsl](https://github.com/sccn/liblsl).
+
+| RID           |                        NuGet Package                         |
+| :------------ | :----------------------------------------------------------: |
+| android-arm   | [![LSL.Net.runtime.android-arm-badge]][LSL.Net.runtime.android-arm-nuget] |
+| android-arm64 | [![LSL.Net.runtime.android-arm64-badge]][LSL.Net.runtime.android-arm64-nuget] |
+| android-x64   | [![LSL.Net.runtime.android-x64-badge]][LSL.Net.runtime.android-x64-nuget] |
+| android-x86   | [![LSL.Net.runtime.android-x86-badge]][LSL.Net.runtime.android-x86-nuget] |
+| ios-arm64     | [![LSL.Net.runtime.ios-arm64-badge]][LSL.Net.runtime.ios-arm64-nuget] |
+| linux-arm     | [![LSL.Net.runtime.linux-arm-badge]][LSL.Net.runtime.linux-arm-nuget] |
+| linux-arm64   | [![LSL.Net.runtime.linux-arm64-badge]][LSL.Net.runtime.linux-arm64-nuget] |
+| linux-x64     | [![LSL.Net.runtime.linux-x64-badge]][LSL.Net.runtime.linux-x64-nuget] |
+| osx-arm64     | [![LSL.Net.runtime.osx-arm64-badge]][LSL.Net.runtime.osx-arm64-nuget] |
+| osx-x64       | [![LSL.Net.runtime.osx-x64-badge]][LSL.Net.runtime.osx-x64-nuget] |
+| win-arm64     | [![LSL.Net.runtime.win-arm64-badge]][LSL.Net.runtime.win-arm64-nuget] |
+| win-x64       | [![LSL.Net.runtime.win-x64-badge]][LSL.Net.runtime.win-x64-nuget] |
+| win-x86       | [![LSL.Net.runtime.win-x86-badge]][LSL.Net.runtime.win-x86-nuget] |
+
+[LSL.Net.runtime.android-arm-badge]: https://img.shields.io/nuget/v/LSL.Net.runtime.android-arm.svg
+[LSL.Net.runtime.android-arm-nuget]: https://www.nuget.org/packages/LSL.Net.runtime.android-arm
+[LSL.Net.runtime.android-arm64-badge]: https://img.shields.io/nuget/v/LSL.Net.runtime.android-arm64.svg
+[LSL.Net.runtime.android-arm64-nuget]: https://www.nuget.org/packages/LSL.Net.runtime.android-arm64
+[LSL.Net.runtime.android-x64-badge]: https://img.shields.io/nuget/v/LSL.Net.runtime.android-x64.svg
+[LSL.Net.runtime.android-x64-nuget]: https://www.nuget.org/packages/LSL.Net.runtime.android-x64
+[LSL.Net.runtime.android-x86-badge]: https://img.shields.io/nuget/v/LSL.Net.runtime.android-x86.svg
+[LSL.Net.runtime.android-x86-nuget]: https://www.nuget.org/packages/LSL.Net.runtime.android-x86
+[LSL.Net.runtime.ios-arm64-badge]: https://img.shields.io/nuget/v/LSL.Net.runtime.ios-arm64.svg
+[LSL.Net.runtime.ios-arm64-nuget]: https://www.nuget.org/packages/LSL.Net.runtime.ios-arm64
+[LSL.Net.runtime.linux-arm-badge]: https://img.shields.io/nuget/v/LSL.Net.runtime.linux-arm.svg
+[LSL.Net.runtime.linux-arm-nuget]: https://www.nuget.org/packages/LSL.Net.runtime.linux-arm
+[LSL.Net.runtime.linux-arm64-badge]: https://img.shields.io/nuget/v/LSL.Net.runtime.linux-arm64.svg
+[LSL.Net.runtime.linux-arm64-nuget]: https://www.nuget.org/packages/LSL.Net.runtime.linux-arm64
+[LSL.Net.runtime.linux-x64-badge]: https://img.shields.io/nuget/v/LSL.Net.runtime.linux-x64.svg
+[LSL.Net.runtime.linux-x64-nuget]: https://www.nuget.org/packages/LSL.Net.runtime.linux-x64
+[LSL.Net.runtime.osx-arm64-badge]: https://img.shields.io/nuget/v/LSL.Net.runtime.osx-arm64.svg
+[LSL.Net.runtime.osx-arm64-nuget]: https://www.nuget.org/packages/LSL.Net.runtime.osx-arm64
+[LSL.Net.runtime.osx-x64-badge]: https://img.shields.io/nuget/v/LSL.Net.runtime.osx-x64.svg
+[LSL.Net.runtime.osx-x64-nuget]: https://www.nuget.org/packages/LSL.Net.runtime.osx-x64
+[LSL.Net.runtime.win-arm64-badge]: https://img.shields.io/nuget/v/LSL.Net.runtime.win-arm64.svg
+[LSL.Net.runtime.win-arm64-nuget]: https://www.nuget.org/packages/LSL.Net.runtime.win-arm64
+[LSL.Net.runtime.win-x64-badge]: https://img.shields.io/nuget/v/LSL.Net.runtime.win-x64.svg
+[LSL.Net.runtime.win-x64-nuget]: https://www.nuget.org/packages/LSL.Net.runtime.win-x64
+[LSL.Net.runtime.win-x86-badge]: https://img.shields.io/nuget/v/LSL.Net.runtime.win-x86.svg
+[LSL.Net.runtime.win-x86-nuget]: https://www.nuget.org/packages/LSL.Net.runtime.win-x86
+
+## Usage
+
+```xml
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net6.0</TargetFramework>
+    <!--<RuntimeIdentifier>linux-x64</RuntimeIdentifier>-->
+    <!--<RuntimeIdentifiers>linux-x64;osx-arm64;win-x64;win-x86</RuntimeIdentifiers>-->
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="LSL.Net" Version="<version>" />
+    <PackageReference Include="LSL.Net.runtime.linux-x64" Version="<version>" />
+    <PackageReference Include="LSL.Net.runtime.osx-arm64" Version="<version>" />
+    <PackageReference Include="LSL.Net.runtime.win-x64" Version="<version>" />
+    <PackageReference Include="LSL.Net.runtime.win-x86" Version="<version>" />
+  </ItemGroup>
+
+</Project>
+```
+
+Replace `<version>` with the specific version number of these packages you wish to use.
+
+# License
+
+These packages only bundle the dynamic libraries of [liblsl](https://github.com/sccn/liblsl), thus using the same licensing agreement as liblsl. Please refer to the [LICENSE](./LICENSE) file for more information.
diff --git a/src/LSL.Net.runtime/win-x64/LSL.Net.runtime.win-x64.csproj b/src/LSL.Net.runtime/win-x64/LSL.Net.runtime.win-x64.csproj
new file mode 100644
index 0000000..ab997da
--- /dev/null
+++ b/src/LSL.Net.runtime/win-x64/LSL.Net.runtime.win-x64.csproj
@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <RID>win-x64</RID>
+    <NativeAssetTitle>liblsl-$(LSLRuntimeVersion)-Win_amd64</NativeAssetTitle>
+    <NativeAssetFile>$(NativeAssetTitle).zip</NativeAssetFile>
+    <NativeLibBaseDir>bin</NativeLibBaseDir>
+    <NativeLibPrefix></NativeLibPrefix>
+    <NativeLibExt>dll</NativeLibExt>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <SuppressDependenciesWhenPacking>false</SuppressDependenciesWhenPacking>
+    <TargetsForTfmSpecificContentInPackage>$(TargetsForTfmSpecificContentInPackage);IncludeAdditionalTfmSpecificPackageFiles</TargetsForTfmSpecificContentInPackage>
+  </PropertyGroup>
+</Project>
diff --git a/src/LSL.Net.runtime/win-x64/build/net35/LSL.Net.runtime.win-x64.targets b/src/LSL.Net.runtime/win-x64/build/net35/LSL.Net.runtime.win-x64.targets
new file mode 100644
index 0000000..efab157
--- /dev/null
+++ b/src/LSL.Net.runtime/win-x64/build/net35/LSL.Net.runtime.win-x64.targets
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Condition="'$(MSBuildThisFileFullPath)' != '' And Exists('$(MSBuildThisFileFullPath).user')"
+          Project="$(MSBuildThisFileFullPath).user" />
+
+  <PropertyGroup>
+    <ShouldCopyLSLNativeLib Condition=" '$(ShouldCopyLSLNativeLib)' == '' ">True</ShouldCopyLSLNativeLib>
+  </PropertyGroup>
+
+  <ItemGroup Condition="'$(ShouldCopyLSLNativeLib)' != 'False'">
+    <NativeLibFiles Include="$(MSBuildThisFileDirectory)..\..\runtimes\win-x64\native\*">
+      <Dir>x64\</Dir>
+    </NativeLibFiles>
+
+    <None Include="@(NativeLibFiles)">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Link>%(Dir)%(Filename)%(Extension)</Link>
+      <Visible>False</Visible>
+    </None>
+  </ItemGroup>
+</Project>
diff --git a/src/LSL.Net.runtime/win-x86/LSL.Net.runtime.win-x86.csproj b/src/LSL.Net.runtime/win-x86/LSL.Net.runtime.win-x86.csproj
new file mode 100644
index 0000000..db98b81
--- /dev/null
+++ b/src/LSL.Net.runtime/win-x86/LSL.Net.runtime.win-x86.csproj
@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <RID>win-x86</RID>
+    <NativeAssetTitle>liblsl-$(LSLRuntimeVersion)-Win_i386</NativeAssetTitle>
+    <NativeAssetFile>$(NativeAssetTitle).zip</NativeAssetFile>
+    <NativeLibBaseDir>bin</NativeLibBaseDir>
+    <NativeLibPrefix></NativeLibPrefix>
+    <NativeLibExt>dll</NativeLibExt>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <SuppressDependenciesWhenPacking>false</SuppressDependenciesWhenPacking>
+    <TargetsForTfmSpecificContentInPackage>$(TargetsForTfmSpecificContentInPackage);IncludeAdditionalTfmSpecificPackageFiles</TargetsForTfmSpecificContentInPackage>
+  </PropertyGroup>
+</Project>
diff --git a/src/LSL.Net.runtime/win-x86/build/net35/LSL.Net.runtime.win-x86.targets b/src/LSL.Net.runtime/win-x86/build/net35/LSL.Net.runtime.win-x86.targets
new file mode 100644
index 0000000..d359866
--- /dev/null
+++ b/src/LSL.Net.runtime/win-x86/build/net35/LSL.Net.runtime.win-x86.targets
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Condition="'$(MSBuildThisFileFullPath)' != '' And Exists('$(MSBuildThisFileFullPath).user')"
+          Project="$(MSBuildThisFileFullPath).user" />
+
+  <PropertyGroup>
+    <ShouldCopyLSLNativeLib Condition="'$(ShouldCopyLSLNativeLib)' == ''">True</ShouldCopyLSLNativeLib>
+  </PropertyGroup>
+
+  <ItemGroup Condition="'$(ShouldCopyLSLNativeLib)' != 'False'">
+    <NativeLibFiles Include="$(MSBuildThisFileDirectory)..\..\runtimes\win-x86\native\*">
+      <Dir>x86\</Dir>
+    </NativeLibFiles>
+
+    <None Include="@(NativeLibFiles)">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Link>%(Dir)%(Filename)%(Extension)</Link>
+      <Visible>False</Visible>
+    </None>
+  </ItemGroup>
+</Project>
diff --git a/src/LSL.Net.slnf b/src/LSL.Net.slnf
new file mode 100644
index 0000000..360f71f
--- /dev/null
+++ b/src/LSL.Net.slnf
@@ -0,0 +1,10 @@
+{
+  "solution": {
+    "path": "..\\LSL.Net.sln",
+    "projects": [
+      "src\\LSL.Net.runtime\\win-x64\\LSL.Net.runtime.win-x64.csproj",
+      "src\\LSL.Net.runtime\\win-x86\\LSL.Net.runtime.win-x86.csproj",
+      "src\\LSL.Net\\LSL.Net.csproj"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/src/LSL.Net/LSL.Net.csproj b/src/LSL.Net/LSL.Net.csproj
new file mode 100644
index 0000000..1186840
--- /dev/null
+++ b/src/LSL.Net/LSL.Net.csproj
@@ -0,0 +1,29 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <Description>LSL.Net is a cross-platform C# binding of lab streaming layer</Description>
+    <EmbedUntrackedSources>true</EmbedUntrackedSources>
+    <!--
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    -->
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
+    <IncludeSymbols>true</IncludeSymbols>
+    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+  </PropertyGroup>
+
+  <!--
+  <PropertyGroup Condition="'$(TargetFramework)' == 'net8.0'">
+    <IsTrimmable>true</IsTrimmable>
+  </PropertyGroup>
+  -->
+
+  <ItemGroup Label="Package References">
+    <PackageReference Include="Microsoft.SourceLink.GitHub">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Include="../../README.md" Pack="true" PackagePath="/" />
+  </ItemGroup>
+</Project>
diff --git a/LSL.cs b/src/LSL.Net/LSL.cs
similarity index 98%
rename from LSL.cs
rename to src/LSL.Net/LSL.cs
index bb7137d..6a35e88 100644
--- a/LSL.cs
+++ b/src/LSL.Net/LSL.cs
@@ -1,4 +1,7 @@
 using System;
+using System.Diagnostics;
+using System.IO;
+using System.Reflection;
 using System.Runtime.InteropServices;
 
 namespace LSL
@@ -94,6 +97,11 @@ Note that significantly larger numbers can cause the timeout to be invalid on so
         */
         public static int library_version() { return dll.lsl_library_version(); }
 
+        /**
+        * Get a string containing library information.
+        */
+        public static string library_info() { return Marshal.PtrToStringAnsi(dll.lsl_library_info()); }
+
         /**
         * Obtain a local system time stamp in seconds. The resolution is better than a millisecond.
         * This reading can be used to assign time stamps to samples as they are being acquired. 
@@ -893,6 +901,28 @@ protected InternalException(System.Runtime.Serialization.SerializationInfo info,
 
     class dll
     {
+#if NET35
+        static dll()
+        {
+            var searchPath = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
+
+            //if (Environment.Is64BitProcess)
+            if (IntPtr.Size == 8)
+                searchPath = Path.Combine(searchPath, "x64");
+            else
+                searchPath = Path.Combine(searchPath, "x86");
+
+            if (Directory.Exists(searchPath))
+            {
+                Trace.WriteLine($"Search LSL dynamic library in {searchPath}.");
+                SetDllDirectory(searchPath);
+            }
+        }
+
+        [DllImport("kernel32.dll", CharSet = CharSet.Auto, SetLastError = true)]
+        public static extern bool SetDllDirectory(string path);
+#endif
+
         // Name of the binary to include -- replace this if the native library has a differentname
         const string libname = "lsl";
 
@@ -902,6 +932,9 @@ class dll
         [DllImport(libname, CallingConvention = CallingConvention.Cdecl, CharSet = CharSet.Ansi, ExactSpelling = true)]
         public static extern int lsl_library_version();
 
+        [DllImport(libname, CallingConvention = CallingConvention.Cdecl, CharSet = CharSet.Ansi, ExactSpelling = true)]
+        public static extern IntPtr lsl_library_info();
+
         [DllImport(libname, CallingConvention = CallingConvention.Cdecl, CharSet = CharSet.Ansi, ExactSpelling = true)]
         public static extern double lsl_local_clock();