Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Lib updates and prepare for Microsoft.Data.SqlClient #1313

Merged
merged 38 commits into from
Aug 28, 2019
Merged

Lib updates and prepare for Microsoft.Data.SqlClient #1313

Changes from 1 commit
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
fff9c33
part 1
mgravell Aug 22, 2019
2366f71
sqlclient
mgravell Aug 22, 2019
4a3242a
sqlite
mgravell Aug 22, 2019
45758f6
csharp,sqlite
mgravell Aug 22, 2019
db299c5
xunit,reflection
mgravell Aug 22, 2019
bec85c0
valuetuple,test.sdk
mgravell Aug 22, 2019
3a4cddf
EF
mgravell Aug 22, 2019
f2b3656
bdn
mgravell Aug 22, 2019
57b0e46
various 3rd party
mgravell Aug 22, 2019
46f180c
more 3rd party
mgravell Aug 22, 2019
12312d2
try to include SNI
mgravell Aug 22, 2019
67fc0d8
fix tests for TVPs with SqlDataRecord
mgravell Aug 22, 2019
d97932c
fix inconsistent param name in test proc
mgravell Aug 22, 2019
32b536a
more test fixups
mgravell Aug 22, 2019
e1b503a
detect IEnumerable<T> for some T : IDataRecord dynamically, rather th…
mgravell Aug 27, 2019
719536e
fix sql geo config
mgravell Aug 27, 2019
9ccbb13
don't ref Microsoft.SqlServer.Types when not on framework; you're on …
mgravell Aug 27, 2019
354e63d
drop the SqlClient ref and associated API; this makes it a (minor) br…
mgravell Aug 27, 2019
ed78dd6
make sure System.Data and Microsoft.Data tests can't squabble; record…
mgravell Aug 27, 2019
12b6b9a
use SkipTestException
mgravell Aug 27, 2019
3ff2dab
try targeting ns2.0 *everywhere* possible; remove all unnecessary deps
mgravell Aug 27, 2019
f8297f9
use parameterized $(xUnitVersion)
mgravell Aug 27, 2019
37a36f8
resolve https://github.com/StackExchange/Dapper/pull/1313/files/ed78d…
mgravell Aug 27, 2019
2f7081a
drop nca2.0 config from test project
mgravell Aug 27, 2019
d1b2e15
get rid of all the NS1.3 fallback code
mgravell Aug 27, 2019
0f3911b
TransactionScope isn't supported everywhere
mgravell Aug 27, 2019
3c6cbeb
Merge branch 'master' into lib-updates
mgravell Aug 27, 2019
79edde7
Merge branch 'master' into lib-updates
mgravell Aug 27, 2019
61d1061
remove nca3.0 so CI server can build it
mgravell Aug 27, 2019
cd20c90
use LocalBuilder instead of hard-coded _{0|1|2} in Rainbow
mgravell Aug 28, 2019
10d62ba
revert EF dep to 6.1.3
mgravell Aug 28, 2019
c325ad2
avoid having to hard-code when a size-local is needed in CreateParamI…
mgravell Aug 28, 2019
dd2c7ba
fix bad merge
mgravell Aug 28, 2019
ab64a47
hack around SkipTestException glitch
mgravell Aug 28, 2019
7ebd9db
make AssertNoCacheWorksForQueryMultiple less brittle
mgravell Aug 28, 2019
23ad634
update dynamic skippable code (from SE.Redis tests)
mgravell Aug 28, 2019
ae9d6da
fix bug with Identity not applying type equality correctly; to avoid …
mgravell Aug 28, 2019
c96b0b3
preview build
mgravell Aug 28, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
sqlite
  • Loading branch information
@mgravell
mgravell committed Aug 22, 2019
commit 4a3242a864cbd49832df16f38c18884dc9dbfd88
9 changes: 6 additions & 3 deletions Dapper.Tests/Dapper.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<GenerateDocumentationFile>false</GenerateDocumentationFile>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
<TargetFrameworks>netcoreapp2.1;net46;netcoreapp2.0;net472</TargetFrameworks><!--;netcoreapp3.0-->
<TargetFrameworks>netcoreapp2.1;net46;netcoreapp2.0;net472;netcoreapp3.0</TargetFrameworks>
mgravell marked this conversation as resolved.
Show resolved Hide resolved
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
</PropertyGroup>

Expand Down Expand Up @@ -53,10 +53,13 @@
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.0'">
<PackageReference Include="Microsoft.Data.Sqlite" Version="2.0.0" />
<PackageReference Include="Microsoft.Data.Sqlite" Version="2.2.6" />
</ItemGroup>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can drop this block with netcoreapp2.0 build drop

<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1'">
<PackageReference Include="Microsoft.Data.Sqlite" Version="2.0.0" />
<PackageReference Include="Microsoft.Data.Sqlite" Version="2.2.6" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
<PackageReference Include="Microsoft.Data.Sqlite" Version="2.2.6" />
</ItemGroup>

<!--
Expand Down