Added VC runtime DLL in case it's missing.

cedric-r · Oct 1, 2023 · b338a0e · b338a0e
1 parent 640285b
commit b338a0e
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 7 deletions.
diff --git a/ASCOM.HomeMade.SBIGCamera.iss b/ASCOM.HomeMade.SBIGCamera.iss
@@ -1,13 +1,13 @@
 [Setup]
 AppID={{3a7e63ad-c913-44f0-9489-e1744c9c2991}}
 AppName=ASCOM HomeMade Camera
-AppVerName=ASCOM HomeMade SBig Camera Driver 1.2.19
-AppVersion=1.2.19
+AppVerName=ASCOM HomeMade SBig Camera Driver 1.2.20.14
+AppVersion=1.2.20.14
 AppPublisher=Cedric Raguenaud <cedric@raguenaud.earth>
 AppPublisherURL=mailto:cedric@raguenaud.earth
 AppSupportURL=https://github.com/cedric-r/ASCOM.HomeMade.SBIGCamera
 AppUpdatesURL=https://github.com/cedric-r/ASCOM.HomeMade.SBIGCamera
-VersionInfoVersion=1.2.19
+VersionInfoVersion=1.2.20.14
 MinVersion=0,6.1
 DefaultDirName="{cf}\ASCOM\Camera\HomeMade SBIGCamera\"
 DisableDirPage=yes
@@ -35,8 +35,11 @@ Source: "k:\astro\ASCOM.HomeMade.SBIGCamera\readme.txt"; DestDir: "{app}"; Flags
 ; TODO: Add other files needed by your driver here (add subfolders above)
 Source: "k:\astro\ASCOM.HomeMade.SBIGCamera\ASCOM.HomeMade.SBIGImagingCamera\bin\Debug\ASCOM.Astrometry.dll"; DestDir: "{app}"; Flags: comparetimestamp overwritereadonly ignoreversion
 Source: "k:\astro\ASCOM.HomeMade.SBIGCamera\ASCOM.HomeMade.SBIGImagingCamera\bin\Debug\ASCOM.Attributes.dll"; DestDir: "{app}"; Flags: comparetimestamp overwritereadonly ignoreversion
+Source: "k:\astro\ASCOM.HomeMade.SBIGCamera\ASCOM.HomeMade.SBIGCamera\bin\Debug\ASCOM.Cache.dll"; DestDir: "{app}"; Flags: comparetimestamp overwritereadonly ignoreversion
 Source: "k:\astro\ASCOM.HomeMade.SBIGCamera\ASCOM.HomeMade.SBIGImagingCamera\bin\Debug\ASCOM.Controls.dll"; DestDir: "{app}"; Flags: comparetimestamp overwritereadonly ignoreversion
 Source: "k:\astro\ASCOM.HomeMade.SBIGCamera\ASCOM.HomeMade.SBIGImagingCamera\bin\Debug\ASCOM.DeviceInterfaces.dll"; DestDir: "{app}"; Flags: comparetimestamp overwritereadonly ignoreversion
+Source: "k:\astro\ASCOM.HomeMade.SBIGCamera\ASCOM.HomeMade.SBIGCamera\bin\Debug\ASCOM.DriverAccess.dll"; DestDir: "{app}"; Flags: comparetimestamp overwritereadonly ignoreversion
+Source: "k:\astro\ASCOM.HomeMade.SBIGCamera\ASCOM.HomeMade.SBIGCamera\bin\Debug\sensors.txt"; DestDir: "{app}"; Flags: comparetimestamp overwritereadonly ignoreversion
 Source: "k:\astro\ASCOM.HomeMade.SBIGCamera\ASCOM.HomeMade.SBIGImagingCamera\bin\Debug\ASCOM.Exceptions.dll"; DestDir: "{app}"; Flags: comparetimestamp overwritereadonly ignoreversion
 Source: "k:\astro\ASCOM.HomeMade.SBIGCamera\ASCOM.HomeMade.SBIGImagingCamera\bin\Debug\ASCOM.HomeMade.SBIGCommon.dll"; DestDir: "{app}"; Flags: comparetimestamp overwritereadonly ignoreversion
 Source: "k:\astro\ASCOM.HomeMade.SBIGCamera\ASCOM.HomeMade.SBIGImagingCamera\bin\Debug\ASCOM.HomeMade.SBIGClient.dll"; DestDir: "{app}"; Flags: comparetimestamp overwritereadonly ignoreversion
@@ -58,6 +61,7 @@ Source: "k:\astro\ASCOM.HomeMade.SBIGCamera\ASCOM.HomeMade.SBIGImagingCamera\bin
 Source: "k:\astro\ASCOM.HomeMade.SBIGCamera\ASCOM.HomeMade.SBIGImagingCamera\bin\Debug\SbigSharp.dll"; DestDir: "{app}"; Flags: comparetimestamp overwritereadonly ignoreversion
 Source: "k:\astro\ASCOM.HomeMade.SBIGCamera\ASCOM.HomeMade.SBIGImagingCamera\bin\Debug\x86\HomeMade.SBIGUDrv.dll"; DestDir: "{app}\x86\"; Flags: comparetimestamp overwritereadonly ignoreversion
 Source: "k:\astro\ASCOM.HomeMade.SBIGCamera\ASCOM.HomeMade.SBIGImagingCamera\bin\Debug\x64\HomeMade.SBIGUDrv.dll"; DestDir: "{app}\x64\"; Flags: comparetimestamp overwritereadonly ignoreversion
+Source: "k:\astro\ASCOM.HomeMade.SBIGCamera\ASCOM.HomeMade.SBIGImagingCamera\bin\Debug\vcruntime140.dll"; DestDir: "{app}"; Flags: comparetimestamp overwritereadonly ignoreversion
 
 ; Only if driver is .NET
 [Run]

diff --git a/ASCOM.HomeMade.SBIGCommon/Properties/AssemblyInfo.cs b/ASCOM.HomeMade.SBIGCommon/Properties/AssemblyInfo.cs
@@ -54,5 +54,5 @@
 // by using the '*' as shown below:
 //
 // TODO - Set your driver's version here
-[assembly: AssemblyVersion("1.2.19.0")]
-[assembly: AssemblyFileVersion("1.2.19.0")]
+[assembly: AssemblyVersion("1.2.20.14")]
+[assembly: AssemblyFileVersion("1.2.20.14")]
diff --git a/HomeMade SBIG Camera Setup.exe b/HomeMade SBIG Camera Setup.exe
diff --git a/SbigSharp/SBIGDLL.cs b/SbigSharp/SBIGDLL.cs
@@ -36,12 +36,12 @@ static SBIGDLL()
  if (Environment.Is64BitProcess)
  {
  //File.AppendAllText(@"c:\temp\SBIGDLL.txt", "Loading DLL from " + Path.Combine(AssemblyDirectory, @"x64\HomeMade.SBIGUDrv.dll") + "\n");
- LoadLibrary(Path.Combine(AssemblyDirectory, @"x64\HomeMade.SBIGUDrv.dll"));
+ LoadLibrary(Path.Combine(Path.Combine(AssemblyDirectory, @"x64"), "HomeMade.SBIGUDrv.dll"));
  }
  else
  {
  //File.AppendAllText(@"c:\temp\SBIGDLL.txt", "Loading DLL from " + Path.Combine(AssemblyDirectory, @"x86\HomeMade.SBIGUDrv.dll") + "\n");
- LoadLibrary(Path.Combine(AssemblyDirectory, @"x86\HomeMade.SBIGUDrv.dll"));
+ LoadLibrary(Path.Combine(Path.Combine(AssemblyDirectory, @"x86"), "HomeMade.SBIGUDrv.dll"));
  }
  }
 

diff --git a/SbigSharp/SbigSharp.csproj b/SbigSharp/SbigSharp.csproj
@@ -17,11 +17,15 @@
  </PropertyGroup>
 
  <ItemGroup>
+ <None Remove="vcruntime140.dll" />
  <None Remove="x64\HomeMade.SBIGUDrv.dll" />
  <None Remove="x86\HomeMade.SBIGUDrv.dll" />
  </ItemGroup>
 
  <ItemGroup>
+ <Content Include="vcruntime140.dll">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
  <Content Include="x64\HomeMade.SBIGUDrv.dll">
  <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
  </Content>

diff --git a/SbigSharp/vcruntime140.dll b/SbigSharp/vcruntime140.dll