Bump version to 0.7.3.1

editor-tools · Sep 28, 2018 · f17e0be · f17e0be
1 parent 5802305
commit f17e0be
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/gen_build.cs b/gen_build.cs
@@ -2024,8 +2024,9 @@ private static void write_cppinterop_with_targets_file(XmlWriter f, List<config_
 		f.WriteEndElement(); // file
 	}
 
-	private static string NUSPEC_VERSION = "0.7.2.4";
-	private static string NUSPEC_RELEASE_NOTES = @"Make loading the native dll more robust and improve error message
+	private static string NUSPEC_VERSION = "0.7.3.1";
+	private static string NUSPEC_RELEASE_NOTES = @"Bump to 0.7.3.1
+Make loading the native dll more robust and improve error message
 Bump to 0.7.2.3 and name packages with vs version used to build them
 Add missing nuget packager
 Add command line flag -vs to allow targetting vs 2008-2015

diff --git a/src/cs/AssemblyInfo.cs b/src/cs/AssemblyInfo.cs
@@ -24,5 +24,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.7.2.4")]
-[assembly: AssemblyFileVersion("0.7.2.4")]
+[assembly: AssemblyVersion("0.7.3.1")]
+[assembly: AssemblyFileVersion("0.7.3.1")]
diff --git a/src/cs/sqlite3_pinvoke.cs b/src/cs/sqlite3_pinvoke.cs
@@ -1208,7 +1208,7 @@ private static string CalculateDllPath(string baseDirectory, Architecture arch =
                         architecture = Is32bit ? X86 : X64;
                         break;
                     case Architecture.InverseAutoDetect:
-                        architecture = Is32bit ? X64 : X32;
+                        architecture = Is32bit ? X64 : X86;
                         break;
                     case Architecture.Bit32:
                         architecture = X86;
@@ -1238,17 +1238,17 @@ static NativeMethods()
 
                     List<string> probedPaths = new List<string>();
 
-                    var dllPath = CalculateDllPath(System.IO.Path.GetDirectoryName(currentAssembly.Location));
-                    if (TryLoad("sqlite3.dll", dllPath))
+                    var dllPath = System.IO.Path.Combine(CalculateDllPath(System.IO.Path.GetDirectoryName(currentAssembly.Location)), "sqlite3.dll");
+                    if (TryLoad(dllPath))
                         return;
                     probedPaths.Add(dllPath);
 
-                    dllPath = CalculateDllPath(System.IO.Path.GetDirectoryName(currentAssembly.Location), Architecture.InverseAutoDetect);
-                    if (TryLoad("sqlite3.dll", dllPath))
+                    dllPath = System.IO.Path.Combine(CalculateDllPath(System.IO.Path.GetDirectoryName(currentAssembly.Location), Architecture.InverseAutoDetect), "sqlite3.dll");
+                    if (TryLoad(dllPath))
                         return;
                     probedPaths.Add(dllPath);
 
-                    throw new Exception("Tried to load sqlite3.dll from " + String.Join(';', probedPaths) + " and failed miserably.");
+                    throw new Exception("Tried to load sqlite3.dll from " + String.Join(";", probedPaths.ToArray()) + " and failed miserably.");
                 }
             }
 #endif