From ad177ad91e6f15ff6b02e5e24cd1a946216f54de Mon Sep 17 00:00:00 2001
From: Eline Jorritsma <eline@baseflow.com>
Date: Tue, 23 Apr 2024 09:26:22 +0200
Subject: [PATCH 1/4] Add .nuspec

---
 .github/workflows/PUBLISH_PACKAGE.yml |  3 ++-
 SickRfid/SickRfid.nuspec              | 15 +++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 SickRfid/SickRfid.nuspec

diff --git a/.github/workflows/PUBLISH_PACKAGE.yml b/.github/workflows/PUBLISH_PACKAGE.yml
index 653c006..033ae26 100644
--- a/.github/workflows/PUBLISH_PACKAGE.yml
+++ b/.github/workflows/PUBLISH_PACKAGE.yml
@@ -4,8 +4,9 @@ on:
   push:
     branches: [ main ]
     paths:
-      - 'SickRfid/SickRfid.csproj'
+      - 'SickRfid/*'
       - 'Directory.Build.props'
+      - '.github/workflows/PUBLISH_PACKAGE.yml'
 
 jobs:
   build:
diff --git a/SickRfid/SickRfid.nuspec b/SickRfid/SickRfid.nuspec
new file mode 100644
index 0000000..e4af25a
--- /dev/null
+++ b/SickRfid/SickRfid.nuspec
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<package >
+    <metadata>
+        <id>$id$</id>
+        <version>$version$</version>
+        <title>$title$</title>
+        <authors>$author$</authors>
+        <owners>$author$</owners>
+        <requireLicenseAcceptance>false</requireLicenseAcceptance>
+        <description>$description$</description>
+        <releaseNotes>Initial Release</releaseNotes>
+        <copyright>Copyright 2024</copyright>
+        <tags>RFID, SICK, RFU610, scanner</tags>
+    </metadata>
+</package>
\ No newline at end of file

From fb243e881e842abd154941d116a5fbd8839f27a6 Mon Sep 17 00:00:00 2001
From: Eline Jorritsma <eline@baseflow.com>
Date: Tue, 23 Apr 2024 11:49:09 +0200
Subject: [PATCH 2/4] Fix SickRfid.csproj icon

---
 SickRfid/SickRfid.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SickRfid/SickRfid.csproj b/SickRfid/SickRfid.csproj
index feb5af7..d374a2e 100644
--- a/SickRfid/SickRfid.csproj
+++ b/SickRfid/SickRfid.csproj
@@ -21,7 +21,7 @@
         <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleToAttribute">
             <_Parameter1>$(AssemblyName).Tests</_Parameter1> <!-- We use the value of AssemblyName to declare the value of the attribute -->
         </AssemblyAttribute>
-        <None Include="images\icon.png" Pack="true" PackagePath="\"/>
+        <None Include="$([MSBuild]::GetPathOfFileAbove('icon.png', '$(MSBuildThisFileDirectory)../'))" Pack="true" PackagePath="\" />
         <None Include="$([MSBuild]::GetPathOfFileAbove('README.md', '$(MSBuildThisFileDirectory)../'))" Pack="true" PackagePath="\" />
     </ItemGroup>
     <ItemGroup>

From 546f69a69dac65b62dc590d35d6363137c2156a8 Mon Sep 17 00:00:00 2001
From: Thomas Luijken <thomas@luijken.dev>
Date: Mon, 9 Sep 2024 11:20:00 +0200
Subject: [PATCH 3/4] Added cancellation_token for connect async

---
 SickRfid/DisconnectedSickRfidController.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/SickRfid/DisconnectedSickRfidController.cs b/SickRfid/DisconnectedSickRfidController.cs
index cb3977c..e82cea3 100644
--- a/SickRfid/DisconnectedSickRfidController.cs
+++ b/SickRfid/DisconnectedSickRfidController.cs
@@ -18,10 +18,10 @@ internal DisconnectedSickRfidController(IPAddress ipAddress, int port)
         _port = port;
     }
 
-    public async Task<ConnectedSickRfidController> ConnectAsync()
+    public async Task<ConnectedSickRfidController> ConnectAsync(CancellationToken cancellationToken = default)
     {
         var socket = new Socket(SocketType.Stream, ProtocolType.Tcp);
-        await socket.ConnectAsync(_ipAddress, _port).ConfigureAwait(true);
+        await socket.ConnectAsync(_ipAddress, _port, cancellationToken).ConfigureAwait(true);
         return new ConnectedSickRfidController().SetSocket(socket);
     }
-}
\ No newline at end of file
+}

From ebfc045f8b39745dd61feea20d887d15cb8d3f32 Mon Sep 17 00:00:00 2001
From: Thomas Luijken <thomas@luijken.dev>
Date: Mon, 9 Sep 2024 11:23:40 +0200
Subject: [PATCH 4/4] versionbump

---
 SickRfid/SickRfid.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SickRfid/SickRfid.csproj b/SickRfid/SickRfid.csproj
index d374a2e..bf73a37 100644
--- a/SickRfid/SickRfid.csproj
+++ b/SickRfid/SickRfid.csproj
@@ -4,7 +4,7 @@
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <PackageId>Baseflow.SICK.RFU610.SDK</PackageId>
-        <Version>1.0.0</Version>
+        <Version>1.0.2</Version>
         <Authors>Eline Jorritsma, Thomas Luijken</Authors>
         <Company>Baseflow</Company>
         <Description>This is an SDK for the SICK RFU610-10600 RFID reader that lets you easily scan an RFID tag from the connected RFID reader.</Description>