Testing.

K-Society · Oct 19, 2023 · e6feb28 · e6feb28
1 parent e7ca229
commit e6feb28
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/src/01/KSociety.SharpCubeProgrammer/CubeProgrammerApi.cs b/src/01/KSociety.SharpCubeProgrammer/CubeProgrammerApi.cs
@@ -57,11 +57,13 @@ public CubeProgrammerApi(IWmiManager wmiManager, ILogger<CubeProgrammerApi>? log
 
                 if (Environment.Is64BitProcess)
                 {
-                    Assembly.LoadFrom(@".\dll\x64\STLinkUSBDriver.dll");
+                    //Assembly.Load(@".\dll\x64\STLinkUSBDriver.dll");
+                    Native.ProgrammerApi.LoadLibraryEx(@".\dll\x64\STLinkUSBDriver.dll", IntPtr.Zero, 0);
                 }
                 else
                 {
-                    Assembly.LoadFrom(@".\dll\x86\STLinkUSBDriver.dll");
+                    Native.ProgrammerApi.LoadLibraryEx(@".\dll\x86\STLinkUSBDriver.dll", IntPtr.Zero, 0);
+                    //Assembly.LoadFrom(@".\dll\x86\STLinkUSBDriver.dll");
                 }
             }
             catch (Exception ex)

diff --git a/src/01/KSociety.SharpCubeProgrammer/KSociety.SharpCubeProgrammer.csproj b/src/01/KSociety.SharpCubeProgrammer/KSociety.SharpCubeProgrammer.csproj
@@ -24,10 +24,10 @@
     <None Include="..\..\..\Programmer\x86\STLinkUSBDriver.dll" Pack="true" PackagePath="runtimes\win-x86\native" Visible="false" CopyToOutputDirectory="Never" CopyToPublishDirectory="Never" />
     <None Include="..\..\..\Win32\Release\*.dll" Pack="true" PackagePath="runtimes\win-x86\native\Programmer" Visible="false" CopyToOutputDirectory="Never" CopyToPublishDirectory="Never" />-->
     <None Include="..\..\..\Programmer\x64\*.dll" Pack="true" PackagePath="build\native\x64\Programmer" Visible="false" Exclude="**\STLinkUSBDriver.dll" CopyToOutputDirectory="Never" CopyToPublishDirectory="Never" />
-    <None Include="..\..\..\Programmer\x64\STLinkUSBDriver.dll" Pack="true" PackagePath="build\native\x64\native" Visible="false" CopyToOutputDirectory="Never" CopyToPublishDirectory="Never" />
+    <None Include="..\..\..\Programmer\x64\STLinkUSBDriver.dll" Pack="true" PackagePath="build\native\x64" Visible="false" CopyToOutputDirectory="Never" CopyToPublishDirectory="Never" />
     <None Include="..\..\..\x64\Release\*.dll" Pack="true" PackagePath="build\native\x64\Programmer" Visible="false" CopyToOutputDirectory="Never" CopyToPublishDirectory="Never" />
     <None Include="..\..\..\Programmer\x86\*.dll" Pack="true" PackagePath="build\native\x86\Programmer" Visible="false" Exclude="**\STLinkUSBDriver.dll" CopyToOutputDirectory="Never" CopyToPublishDirectory="Never" />
-    <None Include="..\..\..\Programmer\x86\STLinkUSBDriver.dll" Pack="true" PackagePath="build\native\x86\native" Visible="false" CopyToOutputDirectory="Never" CopyToPublishDirectory="Never" />
+    <None Include="..\..\..\Programmer\x86\STLinkUSBDriver.dll" Pack="true" PackagePath="build\native\x86" Visible="false" CopyToOutputDirectory="Never" CopyToPublishDirectory="Never" />
     <None Include="..\..\..\Win32\Release\*.dll" Pack="true" PackagePath="build\native\x86\Programmer" Visible="false" CopyToOutputDirectory="Never" CopyToPublishDirectory="Never" />
     <None Include="..\..\..\Data_Base\*.*" Pack="true" PackagePath="contentFiles\Data_Base" Visible="false" />
     <None Include="..\..\..\Programmer\FlashLoader\*.*" Pack="true" PackagePath="contentFiles\FlashLoader" Visible="false" />

diff --git a/src/01/KSociety.SharpCubeProgrammer/Native/ProgrammerApi.cs b/src/01/KSociety.SharpCubeProgrammer/Native/ProgrammerApi.cs
@@ -12,6 +12,9 @@ internal static class ProgrammerApi
         private const string ProgrammerDll32 = @".\dll\x86\Programmer.dll";
         private const string ProgrammerDll64 = @".\dll\x64\Programmer.dll";
 
+        [DllImport("kernel32.dll", CharSet = CharSet.Auto, EntryPoint = "LoadLibraryEx")]
+        internal static extern IntPtr LoadLibraryEx(string lpFileName, IntPtr hFile, uint dwFlags);
+
         #region [STLINK]
 
         #region [GetStLinkList]

diff --git a/src/01/Samples/Programming/Programming.csproj b/src/01/Samples/Programming/Programming.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="KSociety.SharpCubeProgrammer" Version="0.0.69" />
+    <PackageReference Include="KSociety.SharpCubeProgrammer" Version="0.0.70" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
     <PackageReference Include="Serilog.Extensions.Hosting" Version="7.0.0" />
     <PackageReference Include="Serilog.Settings.Configuration" Version="7.0.1" />