Skip to content

Commit 0fea459

Browse files
committedApr 29, 2021
Working copy of Data Script Writer
1 parent 08dd1a8 commit 0fea459

File tree

4 files changed

+190
-40
lines changed

4 files changed

+190
-40
lines changed
 

‎CAMOsoft/CAMOsoft.DbUtils/CAMOsoft.DbUtils.csproj

-12
Original file line numberDiff line numberDiff line change
@@ -115,18 +115,6 @@
115115
</ItemGroup>
116116
<ItemGroup>
117117
<Content Include="SqlServerTypes\readme.htm" />
118-
<Content Include="SqlServerTypes\x64\msvcr120.dll">
119-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
120-
</Content>
121-
<Content Include="SqlServerTypes\x64\SqlServerSpatial140.dll">
122-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
123-
</Content>
124-
<Content Include="SqlServerTypes\x86\msvcr120.dll">
125-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
126-
</Content>
127-
<Content Include="SqlServerTypes\x86\SqlServerSpatial140.dll">
128-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
129-
</Content>
130118
</ItemGroup>
131119
<ItemGroup>
132120
<None Include="packages.config" />

‎CAMOsoft/CAMOsoft.DbUtils/SqlServerTypes/Loader.cs

+5-5
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@ public class Utilities
2121
/// </param>
2222
public static void LoadNativeAssemblies(string rootApplicationPath)
2323
{
24-
var nativeBinaryPath = IntPtr.Size > 4
25-
? Path.Combine(rootApplicationPath, @"SqlServerTypes\x64\")
26-
: Path.Combine(rootApplicationPath, @"SqlServerTypes\x86\");
24+
//var nativeBinaryPath = IntPtr.Size > 4
25+
// ? Path.Combine(rootApplicationPath, @"RequiredDLL\x64\")
26+
// : Path.Combine(rootApplicationPath, @"RequiredDLL\x86\");
2727

28-
LoadNativeAssembly(nativeBinaryPath, "msvcr120.dll");
29-
LoadNativeAssembly(nativeBinaryPath, "SqlServerSpatial140.dll");
28+
//LoadNativeAssembly(nativeBinaryPath, "msvcr120.dll");
29+
//LoadNativeAssembly(nativeBinaryPath, "SqlServerSpatial140.dll");
3030
}
3131

3232
private static void LoadNativeAssembly(string nativeBinaryPath, string assemblyName)

0 commit comments

Comments
 (0)