Include dlls into nuget

Author: matihuf

.github/workflows/main.yml

@@ -30,10 +30,10 @@ jobs:
         run: dotnet build ${{ env.PROJECT_FOLDER }}/${{ env.PROJECT }} --configuration Release
 
       - name: Tests
-        run: dotnet test Tests/EDSDK.NET.Tests/EDSDK.NET.Tests.csproj
+        run: dotnet test Tests/EDSDK.NET.Tests/EDSDK.NET.Tests.csproj --no-restore
 
       - name: Create the package
-        run: dotnet pack ${{ env.PROJECT_FOLDER }}/${{ env.PROJECT }} --configuration Release
+        run: dotnet pack ${{ env.PROJECT_FOLDER }}/${{ env.PROJECT }} --configuration Release --no-restore
 
       - name: Publish the package to Repository
         run: dotnet nuget push ${{ env.PROJECT_FOLDER }}/bin/Release/*.nupkg --api-key ${{ secrets.MRRADIANNUGETSECRET }} --source ${{ env.NUGET_REPO_URL }}

EDSDK.NET/EDSDK.NET.csproj

@@ -1,40 +1,41 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-	<Version>1.0.1.5</Version>
-	<AssemblyVersion>1.0.1.5</AssemblyVersion>
-	<FileVersion>1.0.1.5</FileVersion>
-	<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-	<Title>Motiony.EDSDK</Title>
-	<PackageProjectUrl>https://github.com/Motiony/EDSDK.NET.git</PackageProjectUrl>
-	<RepositoryUrl>https://github.com/Motiony/EDSDK.NET.git</RepositoryUrl>
+    <Version>1.0.1.6</Version>
+    <AssemblyVersion>1.0.1.6</AssemblyVersion>
+    <FileVersion>1.0.1.6</FileVersion>
+    <PackageProjectUrl>https://github.com/Motiony/EDSDK.NET.git</PackageProjectUrl>
+    <RepositoryUrl>https://github.com/Motiony/EDSDK.NET.git</RepositoryUrl>
     <Authors>Motiony</Authors>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
 
-  <ItemGroup>
-	<None Include="..\lib\EDSDK.dll" Link="\lib\EDSDK.dll">
-		<Pack>true</Pack>
-		<PackagePath>lib</PackagePath>
-		<CopyToOutputDirectory>Always</CopyToOutputDirectory>
-	</None>
-	<None Include="..\lib\EdsImage.dll" Link="\lib\EdsImage.dll">
-		<Pack>true</Pack>
-		<PackagePath>lib</PackagePath>
-		<CopyToOutputDirectory>Always</CopyToOutputDirectory>
-	</None>
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="Emgu.CV" Version="4.8.0.5324" />
   </ItemGroup>
 
   <ItemGroup>
-    <Folder Include="lib\" />
+    <Content Include="lib\EDSDK.dll">
+      <Pack>true</Pack>
+      <PackagePath>lib\$(TargetFramework)</PackagePath>
+    </Content>
+    <ContentWithTargetPath Include="lib\EDSDK.dll">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <TargetPath>EDSDK.dll</TargetPath>
+    </ContentWithTargetPath>
+    <Content Include="lib\EdsImage.dll">
+      <Pack>true</Pack>
+      <PackagePath>lib\$(TargetFramework)</PackagePath>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <ContentWithTargetPath Include="lib\EdsImage.dll">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <TargetPath>EdsImage.dll</TargetPath>
+    </ContentWithTargetPath>
   </ItemGroup>
 </Project>

EDSDK.NET/PInvoke/EDSDK.cs

@@ -8,7 +8,7 @@ public class EDSDK
         /// <summary>
         /// Path to the EDSDK DLL
         /// </summary>
-        const string DLLPath = "lib/EDSDK.dll";
+        const string DLLPath = "EDSDK.dll";
 
         #region Callback Functions
 
@@ -2254,7 +2254,7 @@ SaveImage Setting
         public struct EdsSaveImageSetting
         {
             public uint JPEGQuality;
-            private IntPtr iccProfileStream;
+            private readonly IntPtr iccProfileStream;
             public uint reserved;
         }