From 15c9e35a17925f7ba9b89fe800fafc39770268b5 Mon Sep 17 00:00:00 2001 From: Nick Craver Date: Sat, 6 May 2017 19:17:56 -0400 Subject: [PATCH] Fix type loads for the builds without SQL in the GAC --- .gitignore | 1 + Dapper.Tests/Dapper.Tests.csproj | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 4edc20f..f484647 100644 --- a/.gitignore +++ b/.gitignore @@ -16,4 +16,5 @@ NuGet.exe Test.DB.* TestResults/ Dapper.Tests/*.sdf +Dapper.Tests/SqlServerTypes/ .dotnet/* \ No newline at end of file diff --git a/Dapper.Tests/Dapper.Tests.csproj b/Dapper.Tests/Dapper.Tests.csproj index 79839ce..aa10728 100644 --- a/Dapper.Tests/Dapper.Tests.csproj +++ b/Dapper.Tests/Dapper.Tests.csproj @@ -57,10 +57,10 @@ - if not exist "$(TargetDir)x86" md "$(TargetDir)x86" - xcopy /s /y /q "$(NuGetPackageRoot)\Microsoft.SqlServer.Types\14.0.314.76\NativeBinaries\x86\*.*" "$(TargetDir)x86" - if not exist "$(TargetDir)x64" md "$(TargetDir)x64" - xcopy /s /y /q "$(NuGetPackageRoot)\Microsoft.SqlServer.Types\14.0.314.76\NativeBinaries\x64\*.*" "$(TargetDir)x64" + if not exist "$(MSBuildProjectDirectory)\SqlServerTypes\x86" md "$(MSBuildProjectDirectory)\SqlServerTypes\x86" + xcopy /s /y /q "$(NuGetPackageRoot)\Microsoft.SqlServer.Types\14.0.314.76\NativeBinaries\x86\*.*" "$(MSBuildProjectDirectory)\SqlServerTypes\x86" + if not exist "$(MSBuildProjectDirectory)\SqlServerTypes\x64" md "$(MSBuildProjectDirectory)\SqlServerTypes\x64" + xcopy /s /y /q "$(NuGetPackageRoot)\Microsoft.SqlServer.Types\14.0.314.76\NativeBinaries\x64\*.*" "$(MSBuildProjectDirectory)\SqlServerTypes\x64" -- GitLab