From 3e4b29145070de493d0982f31f630fbcd5634587 Mon Sep 17 00:00:00 2001
From: Tom van Dinther <39470469+tvandinther@users.noreply.github.com>
Date: Tue, 24 Oct 2023 20:58:35 +0200
Subject: [PATCH] General improvements (#10)

* Improve csproj configuration

* Pipeline improvements

* does this break the pipeline?

* Broke the wrong thing

* Revert "does this break the pipeline?"

* use latest setup-dotnet action
---
 .github/workflows/build-dependencies.yaml |  6 +++---
 .github/workflows/publish.yaml            |  4 ++--
 .github/workflows/test.yaml               | 13 ++++++++-----
 Libsql.Client/Libsql.Client.csproj        |  8 ++++----
 4 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/build-dependencies.yaml b/.github/workflows/build-dependencies.yaml
index 3dae76a..2f12a31 100644
--- a/.github/workflows/build-dependencies.yaml
+++ b/.github/workflows/build-dependencies.yaml
@@ -14,11 +14,11 @@ jobs:
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Cache Rust Bindings
         id: cache-rust-bindings
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: |
             rust-bindings/target/release/*csharp_bindings.*
@@ -34,7 +34,7 @@ jobs:
         shell: bash
 
       - name: Upload bindings
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: bindings
           path: |
diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
index aa7f2f7..3dc20cf 100644
--- a/.github/workflows/publish.yaml
+++ b/.github/workflows/publish.yaml
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: build-dependencies
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Assert tag matches project version
         run: |
@@ -29,7 +29,7 @@ jobs:
           path: rust-bindings
 
       - name: Setup dotnet
-        uses: actions/setup-dotnet@v1
+        uses: actions/setup-dotnet@v3
         with:
           dotnet-version: "7.0.x"
 
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index aecbbd7..9f0b898 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -14,11 +14,14 @@ jobs:
 
   test:
     name: Test
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
     needs: build-dependencies
+    strategy:
+      matrix:
+        os: [ubuntu-latest, windows-latest, macos-latest]
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Download bindings
         uses: actions/download-artifact@v3
@@ -26,8 +29,8 @@ jobs:
           name: bindings
           path: rust-bindings
 
-      - name: Setup .NET Core SDK ${{ matrix.dotnet-version }}
-        uses: actions/setup-dotnet@v1.7.2
+      - name: Setup .NET Core SDK
+        uses: actions/setup-dotnet@v3
         with:
           dotnet-version: "7.0.x"
 
@@ -35,7 +38,7 @@ jobs:
         run: dotnet restore
 
       - name: Build
-        run: dotnet build --configuration Release --no-restore -p:MultiPlatformBuild=True
+        run: dotnet build --configuration Release --no-restore
 
       - name: Test
         run: dotnet test --no-restore --verbosity normal
diff --git a/Libsql.Client/Libsql.Client.csproj b/Libsql.Client/Libsql.Client.csproj
index ec2e926..d50f93b 100644
--- a/Libsql.Client/Libsql.Client.csproj
+++ b/Libsql.Client/Libsql.Client.csproj
@@ -3,7 +3,7 @@
     <PropertyGroup>
         <Title>Libsql.Client</Title>
         <Authors>Tom van Dinther</Authors>
-        <Description>A client library for Libsql</Description>
+        <Description>A client library for Libsql.</Description>
         <PackageVersion>0.2.3</PackageVersion>
         <Copyright>Copyright (c) Tom van Dinther 2023</Copyright>
         <PackageProjectUrl>https://github.com/tvandinther/libsql-client-dotnet</PackageProjectUrl>
@@ -34,15 +34,15 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <Content Include="$(NativeOutputPath)libcsharp_bindings.so">
+        <Content Condition="'$(MultiPlatformBuild)' Or '$([MSBuild]::IsOsPlatform(Linux))'" Include="$(NativeOutputPath)libcsharp_bindings.so">
             <PackagePath>runtimes/linux-x64/native/libcsharp_bindings.so</PackagePath>
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </Content>
-        <Content Condition="'$(MultiPlatformBuild)' == 'True'" Include="$(NativeOutputPath)csharp_bindings.dll">
+        <Content Condition="'$(MultiPlatformBuild)' Or '$([MSBuild]::IsOsPlatform(Windows))'" Include="$(NativeOutputPath)csharp_bindings.dll">
             <PackagePath>runtimes/win-x64/native/csharp_bindings.dll</PackagePath>
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </Content>
-        <Content Condition="'$(MultiPlatformBuild)' == 'True'" Include="$(NativeOutputPath)libcsharp_bindings.dylib">
+        <Content Condition="'$(MultiPlatformBuild)' Or '$([MSBuild]::IsOsPlatform(macOS))'" Include="$(NativeOutputPath)libcsharp_bindings.dylib">
             <PackagePath>runtimes/osx-x64/native/libcsharp_bindings.dylib</PackagePath>
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </Content>