Skip to content

Commit

Permalink
testing
Browse files Browse the repository at this point in the history
  • Loading branch information
Thorium committed Sep 12, 2024
1 parent 9a6b76d commit 36bfe13
Show file tree
Hide file tree
Showing 30 changed files with 117 additions and 119 deletions.
1 change: 1 addition & 0 deletions docs/RELEASE_NOTES.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
### 1.4.0-alpha2 - 11.09.2024
* F# dependency from 6.0.7 to 8.0.301
* Build with .NET 8.0 compiler
* .NET Framework 4.7.2 to 4.8

### 1.3.45 - 09.09.2024
* Fix cached return columns for function, PR#830
Expand Down
4 changes: 2 additions & 2 deletions docs/content/core/techdetails.fsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Even though our test run will run modifications to the test databases, don't che
We use Fake and Paket. You have to run `build.cmd` on Windows (or `sh ./build.sh` on Mac/Linux) before opening the solutions.
The main source solution is `SQLProvider.sln`.
The unit tests are located in another one, `SQLProvider.Tests.sln`, and when you open the solution, it will lock the `bin\net472\FSharp.Data.SqlProvider.dll`, and after that you can't build the main solution.
The unit tests are located in another one, `SQLProvider.Tests.sln`, and when you open the solution, it will lock the `bin\net48\FSharp.Data.SqlProvider.dll`, and after that you can't build the main solution.
- To debug design-time features you "Attach to process" the main solution debugger to another instance of Visual Studio running the tests solution.
- To debug runtime you attach it to e.g. fsi.exe and run the code in interactive.
Expand Down Expand Up @@ -178,7 +178,7 @@ Debugging the design-time VS2022 is doable, but a bit more complex.
This will mess your SQLProvider Nuget cache, so after done, delete the SQLProvider cache-folder and restore the package again.
1. Open SQLProvider.sln (with Visual Studio 2022) and build it (in debug mode). Keep this open for now.
2. Open explorer, it has made under bin-folder some folders, e.g. \net472 \net6.0 \netstandard2.0 \netstandard2.1 and \typeproviders
2. Open explorer, it has made under bin-folder some folders, e.g. \net48 \net6.0 \netstandard2.0 \netstandard2.1 and \typeproviders
3. Open another explorer, go to your location of Nuget cache, the version you are using e.g. `C:\Users\me\.nuget\packages\sqlprovider\1.3.30`
4. Replace the nuget cache \typeproviders folder with your fresh bin typeproviders folder.
5. Replace the nuget cache \lib folder with other folders from your fresh bin folder.
Expand Down
6 changes: 3 additions & 3 deletions paket.dependencies
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ source https://api.nuget.org/v3/index.json
storage: none

nuget FSharp.Core == 8.0.301
nuget System.Data.SqlClient framework: net461, net472, net480, netstandard2.0, netstandard2.1, netcoreapp2.1, netcoreapp3.1
nuget System.Data.SqlClient framework: net461, net472, net48, netstandard2.0, netstandard2.1, netcoreapp2.1, netcoreapp3.1
nuget NETStandard.Library.NETFramework storage: packages
nuget System.Data.OleDb
nuget System.Runtime
Expand Down Expand Up @@ -79,7 +79,7 @@ group Docs

group Tests
source https://api.nuget.org/v3/index.json
frameworks: netcoreapp3.1, net472
frameworks: netcoreapp3.1, net472, net48
storage: packages

nuget MySql.Data < 7.0.0
Expand All @@ -88,7 +88,7 @@ group Tests
nuget NUnit3TestAdapter
nuget Newtonsoft.Json
nuget Npgsql < 4.0
nuget NUnit
nuget NUnit 3.14.0
nuget Oracle.ManagedDataAccess 12.2.1100
nuget FirebirdSql.Data.FirebirdClient 5.12.1
nuget System.Data.SQLite.Core 1.0.105.2
Expand Down
126 changes: 62 additions & 64 deletions paket.lock

Large diffs are not rendered by default.

9 changes: 4 additions & 5 deletions src/SQLProvider.DesignTime/SQLProvider.DesignTime.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Import Project="..\..\netfx.props" />
<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFrameworks>netstandard2.0;netstandard2.1;netcoreapp3.1;net472;net6.0;net8.0</TargetFrameworks>
<TargetFrameworks>netstandard2.0;netstandard2.1;netcoreapp3.1;net472;net48;net6.0;net8.0</TargetFrameworks>
<DefineConstants>NETSTANDARD;NO_GENERATIVE;DESIGNTIME</DefineConstants>
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
<RestoreProjectStyle>PackageReference</RestoreProjectStyle>
Expand Down Expand Up @@ -127,15 +127,14 @@
<Reference Include="System.IO.Compression" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies.net472" Version="1.0.3">
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies.net472" Version="1.0.3" Condition="'$(TargetFramework)' == 'net472'">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<!--
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies.net48" Version="1.0.3">
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies.net48" Version="1.0.3" Condition="'$(TargetFramework)' == 'net48'">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>-->
</PackageReference>
</ItemGroup>
<Import Project="..\..\.paket\Paket.Restore.targets" />
</Project>
15 changes: 7 additions & 8 deletions src/SQLProvider.Runtime/SQLProvider.Runtime.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<Import Project="..\..\netfx.props" />
<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFrameworks>netstandard2.0;netstandard2.1;net472;net6.0;net8.0</TargetFrameworks>
<TargetFrameworks>netstandard2.0;netstandard2.1;net472;net48;net6.0;net8.0</TargetFrameworks>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
<DefineConstants>TP_RUNTIME;NETSTANDARD;NO_GENERATIVE</DefineConstants>
Expand Down Expand Up @@ -76,23 +76,22 @@
<None Include="..\..\README.md" Link="README.md" Pack="true" PackagePath="\" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies.net472" Version="1.0.3">
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies.net472" Version="1.0.3" Condition=" '$(TargetFramework)' == 'net472'">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<!--
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies.net48" Version="1.0.0">
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies.net48" Version="1.0.3" Condition=" '$(TargetFramework)' == 'net48'">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>-->
</PackageReference>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
</ItemGroup>
<Target Name="BeforeBuild" Condition=" '$(TargetFramework)' != 'net8.0' And '$(TargetFramework)' != 'net6.0' And '$(TargetFramework)' != 'netstandard2.1' ">
<!--<MSBuild Projects="..\SQLProvider.DesignTime\SQLProvider.DesignTime.fsproj" Targets="Restore" />-->
<MSBuild Projects="..\SQLProvider.DesignTime\SQLProvider.DesignTime.fsproj" Targets="Build" Properties="Configuration=$(Configuration);TargetFrameworks=netcoreapp3.1" />
<MSBuild Projects="..\SQLProvider.DesignTime\SQLProvider.DesignTime.fsproj" Targets="Build" Properties="Configuration=$(Configuration);TargetFramework=netstandard2.0" />
<!--<MSBuild Projects="..\SQLProvider.DesignTime\SQLProvider.DesignTime.fsproj" Targets="Build" Properties="Configuration=$(Configuration);TargetFramework=net48" />-->
<MSBuild Projects="..\SQLProvider.DesignTime\SQLProvider.DesignTime.fsproj" Targets="Build" Properties="Configuration=$(Configuration);TargetFramework=net472" />
<MSBuild Projects="..\SQLProvider.DesignTime\SQLProvider.DesignTime.fsproj" Targets="Build" Properties="Configuration=$(Configuration);TargetFramework=net472" Condition=" '$(TargetFramework)' == 'net472'" />
<MSBuild Projects="..\SQLProvider.DesignTime\SQLProvider.DesignTime.fsproj" Targets="Build" Properties="Configuration=$(Configuration);TargetFramework=net48" Condition=" '$(TargetFramework)' == 'net48'" />
</Target>
<Target Name="BeforeBuild" Condition=" '$(TargetFramework)' == 'netstandard2.1' ">
<MSBuild Projects="..\SQLProvider.DesignTime\SQLProvider.DesignTime.fsproj" Targets="Build" Properties="Configuration=$(Configuration);TargetFramework=netstandard2.1" />
Expand All @@ -116,4 +115,4 @@
<Reference Include="System.IO.Compression" />
</ItemGroup>
<Import Project="..\..\.paket\Paket.Restore.targets" />
</Project>
</Project>
2 changes: 2 additions & 0 deletions src/SQLProvider.Runtime/paket.template
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ description
Type providers for SQL database access.
files
../../bin/net472/FSharp.Data.SqlProvider.* ==> lib/net472
../../bin/net48/FSharp.Data.SqlProvider.* ==> lib/net48
../../bin/net6.0/FSharp.Data.SqlProvider.* ==> lib/net6.0
../../bin/net8.0/FSharp.Data.SqlProvider.* ==> lib/net8.0
../../bin/netstandard2.0/FSharp.Data.SqlProvider.* ==> lib/netstandard2.0
Expand All @@ -33,6 +34,7 @@ files
../../bin/typeproviders/fsharp41/netstandard2.0/*.dll ==> typeproviders/fsharp41/netstandard2.0
../../bin/typeproviders/fsharp41/netcoreapp3.1/*.dll ==> typeproviders/fsharp41/netcoreapp3.1
../../bin/typeproviders/fsharp41/net472/*.dll ==> typeproviders/fsharp41/net472
../../bin/typeproviders/fsharp41/net48/*.dll ==> typeproviders/fsharp41/net48
../../bin/typeproviders/fsharp41/net8.0/*.dll ==> typeproviders/fsharp41/net8.0
references
FSharp.Data.SqlProvider.dll
Expand Down
2 changes: 1 addition & 1 deletion tests/SqlProvider.Core.Tests/MsSql/Program.fs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#r @"C:\Program Files\dotnet\sdk\2.0.0\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\netstandard.dll"
#r "../../../bin/netstandard2.0/FSharp.Data.SqlProvider.dll"
// On Non-Windows-machine, fsharpi is not running on Core:
// #r "../../../bin/net472/FSharp.Data.SqlProvider.dll"
// #r "../../../bin/net48/FSharp.Data.SqlProvider.dll"

#else
module NetstandardTest
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@
</ItemGroup>
<ItemGroup><!-- Mono fix -->
<Reference Condition="'$(IsWindows)' != 'true' Or '$(TargetFramework)' == 'netstandard2.0'" Include="FSharp.Data.SqlProvider">
<HintPath>../../../bin/net472/FSharp.Data.SqlProvider.dll</HintPath>
<!--HintPath>../../packages/SQLProvider/lib/net472/FSharp.Data.SqlProvider.dll</HintPath-->
<HintPath>../../../bin/net48/FSharp.Data.SqlProvider.dll</HintPath>
<!--HintPath>../../packages/SQLProvider/lib/net48/FSharp.Data.SqlProvider.dll</HintPath-->
</Reference>
</ItemGroup>
<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="MSBuild.Sdk.SqlProj/2.0.0">
<Project Sdk="MSBuild.Sdk.SqlProj/2.7.1">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<SuppressTSqlWarnings>71558,71502</SuppressTSqlWarnings>
Expand All @@ -23,7 +23,7 @@
<ModelCollation>1033, CI</ModelCollation>
<DefaultFileStructure>BySchemaAndSchemaType</DefaultFileStructure>
<DeployToDatabase>True</DeployToDatabase>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<TargetLanguage>CS</TargetLanguage>
<AppDesignerFolder>Properties</AppDesignerFolder>
<SqlServerVerification>False</SqlServerVerification>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net472</TargetFramework>
<TargetFramework>net48</TargetFramework>

<IsPackable>false</IsPackable>
<GenerateProgramFile>false</GenerateProgramFile>
Expand Down
2 changes: 1 addition & 1 deletion tests/SqlProvider.Core.Tests/MySql/Program.fs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#r @"C:\Program Files\dotnet\sdk\2.0.0\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\netstandard.dll"
#r "../../../bin/netstandard2.0/FSharp.Data.SqlProvider.dll"
// On Non-Windows-machine, fsharpi is not running on Core:
// #r "../../../bin/net472/FSharp.Data.SqlProvider.dll"
// #r "../../../bin/net48/FSharp.Data.SqlProvider.dll"

//[<Literal>]
//let msyqlDataPath = __SOURCE_DIRECTORY__ + "/dataTemp"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@
assembly will ve .NET Core compatible. -->
<ItemGroup><!-- Mono fix, and .NET Standard fix -->
<Reference Condition="'$(IsWindows)' != 'true' Or '$(TargetFramework)' == 'netstandard2.0'" Include="FSharp.Data.SqlProvider">
<HintPath>../../../bin/net472/FSharp.Data.SqlProvider.dll</HintPath>
<!--HintPath>../../packages/SQLProvider/lib/net472/FSharp.Data.SqlProvider.dll</HintPath-->
<HintPath>../../../bin/net48/FSharp.Data.SqlProvider.dll</HintPath>
<!--HintPath>../../packages/SQLProvider/lib/net48/FSharp.Data.SqlProvider.dll</HintPath-->
</Reference>
</ItemGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion tests/SqlProvider.Core.Tests/Postgres/Program.fs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#r @"C:\Program Files\dotnet\sdk\2.0.0\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\netstandard.dll"
#r "../../../bin/netstandard2.0/FSharp.Data.SqlProvider.dll"
// On Non-Windows-machine, fsharpi is not running on Core:
// #r "../../../bin/net472/FSharp.Data.SqlProvider.dll"
// #r "../../../bin/net48/FSharp.Data.SqlProvider.dll"

[<Literal>]
let resolutionPath = __SOURCE_DIRECTORY__ + "/temp"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@
assembly will ve .NET Core compatible. -->
<ItemGroup><!-- Mono fix -->
<Reference Condition="'$(IsWindows)' != 'true' Or '$(TargetFramework)' == 'netstandard2.0'" Include="FSharp.Data.SqlProvider">
<HintPath>../../../bin/net472/FSharp.Data.SqlProvider.dll</HintPath>
<!--HintPath>../../packages/SQLProvider/lib/net472/FSharp.Data.SqlProvider.dll</HintPath-->
<HintPath>../../../bin/net48/FSharp.Data.SqlProvider.dll</HintPath>
<!--HintPath>../../packages/SQLProvider/lib/net48/FSharp.Data.SqlProvider.dll</HintPath-->
</Reference>
</ItemGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion tests/SqlProvider.Core.Tests/SQLite/Program.fs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#r "../../../packages/Microsoft.Data.Sqlite.Core/lib/netstandard2.0/Microsoft.Data.Sqlite.dll"
#r "../../../bin/netstandard2.0/FSharp.Data.SqlProvider.dll"
// On Non-Windows-machine, fsharpi is not running on Core:
// #r "../../../bin/net472/FSharp.Data.SqlProvider.dll"
// #r "../../../bin/net48/FSharp.Data.SqlProvider.dll"
[<Literal>]
let resolutionPath = __SOURCE_DIRECTORY__ + "/temp"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
assembly will ve .NET Core compatible. -->
<ItemGroup><!-- Mono fix -->
<Reference Condition="'$(IsWindows)' != 'true' Or '$(TargetFramework)' == 'netstandard2.0'" Include="FSharp.Data.SqlProvider">
<HintPath>../../../bin/net472/FSharp.Data.SqlProvider.dll</HintPath>
<HintPath>../../../bin/net48/FSharp.Data.SqlProvider.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
Expand Down
5 changes: 2 additions & 3 deletions tests/SqlProvider.Tests/CrudTests.fs
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
#if INTERACTIVE
#I @"../../bin/net472/"
#I @"../../bin/net472/"
#I @"../../bin/net48/"
#r "FSharp.Data.SqlProvider.dll"
#r @"System.Transactions.dll"
#r @"../../packages/NUnit/lib/nunit.framework.dll"
#r @"../../packages/NUnit/lib/netstandard2.0/nunit.framework.dll"
#else
module CrudTests
#endif
Expand Down
2 changes: 1 addition & 1 deletion tests/SqlProvider.Tests/QueryTests.fs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#if INTERACTIVE
#I @"../../bin/net472/"
#I @"../../bin/net48/"
#r "FSharp.Data.SqlProvider.dll"
#r @"../../packages/tests/NUnit/lib/netstandard2.0/nunit.framework.dll"
#else
Expand Down
6 changes: 3 additions & 3 deletions tests/SqlProvider.Tests/SqlProvider.Tests.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
<IsPackable>false</IsPackable>
<GenerateProgramFile>false</GenerateProgramFile>
<OutputType>Library</OutputType>
<TargetFramework>net472</TargetFramework>
<!--<TargetFrameworks>net472;netcoreapp3.1</TargetFrameworks>-->
<TargetFramework>net48</TargetFramework>
<!--<TargetFrameworks>net48;netcoreapp3.1</TargetFrameworks>-->
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<AssemblyName>SqlProvider.Tests</AssemblyName>
<TargetFSharpCoreVersion>6.0.0.0</TargetFSharpCoreVersion>
Expand Down Expand Up @@ -48,7 +48,7 @@
<ProjectReference Include="..\..\src\SQLProvider.Runtime\SQLProvider.Runtime.fsproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies.net472" Version="1.0.0">
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies.net48" Version="1.0.3">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
Expand Down
4 changes: 2 additions & 2 deletions tests/SqlProvider.Tests/SqlServerTests.fs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#if INTERACTIVE
#I @"../../bin/net472"
#r @"../../bin/net472/FSharp.Data.SqlProvider.dll"
#I @"../../bin/net48"
#r @"../../bin/net48/FSharp.Data.SqlProvider.dll"
#I @"../../packages/tests/Newtonsoft.Json/lib/net45"
#r @"../../packages/tests/Newtonsoft.Json/lib/net45/Newtonsoft.Json.dll"

Expand Down
4 changes: 2 additions & 2 deletions tests/SqlProvider.Tests/scripts/DuckDbTest.fsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
// Or if you are doing a project, not a script, reference you can reference them like usual and you should be fine...
#r "nuget: DuckDB.NET.Data.Full"

#I @"../../../bin/net472"
#r @"../../../bin/net472/FSharp.Data.SqlProvider.dll"
#I @"../../../bin/net48"
#r @"../../../bin/net48/FSharp.Data.SqlProvider.dll"

// Note: In Windows you need to install first: https://learn.microsoft.com/en-us/cpp/windows/latest-supported-vc-redist

Expand Down
2 changes: 1 addition & 1 deletion tests/SqlProvider.Tests/scripts/FirebirdTests.fsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#r @"../../../bin/net472/FSharp.Data.SqlProvider.dll"
#r @"../../../bin/net48/FSharp.Data.SqlProvider.dll"
#r @"../../../packages/tests/Newtonsoft.Json/lib/net45/Newtonsoft.Json.dll"

open System
Expand Down
2 changes: 1 addition & 1 deletion tests/SqlProvider.Tests/scripts/MSAccessTests.fsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#r @"../../../bin/net472/FSharp.Data.SqlProvider.dll"
#r @"../../../bin/net48/FSharp.Data.SqlProvider.dll"

open System
open System.Linq
Expand Down
4 changes: 2 additions & 2 deletions tests/SqlProvider.Tests/scripts/MySqlTests.fsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#I @"../../../bin/net461"
#r @"../../../bin/net472/FSharp.Data.SqlProvider.dll"
#I @"../../../bin/net48"
#r @"../../../bin/net48/FSharp.Data.SqlProvider.dll"
#r @"../../../packages/tests/Newtonsoft.Json/lib/net45/Newtonsoft.Json.dll"
#r @"../../../packages/tests/System.Threading.Tasks.Extensions/lib/net461/System.Threading.Tasks.Extensions.dll"

Expand Down
4 changes: 2 additions & 2 deletions tests/SqlProvider.Tests/scripts/OdbcTests.fsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#I @"../../../bin/net451"
#r @"../../../bin/net472/FSharp.Data.SqlProvider.dll"
#I @"../../../bin/net48"
#r @"../../../bin/net48/FSharp.Data.SqlProvider.dll"

open System
open FSharp.Data.Sql
Expand Down
4 changes: 2 additions & 2 deletions tests/SqlProvider.Tests/scripts/OracleTests.fsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#I @"../../../bin/net451"
#r @"../../../bin/net472/FSharp.Data.SqlProvider.dll"
#I @"../../../bin/net48"
#r @"../../../bin/net48/FSharp.Data.SqlProvider.dll"
#r @"../libs/Oracle.ManagedDataAccess.dll"

open System
Expand Down
2 changes: 1 addition & 1 deletion tests/SqlProvider.Tests/scripts/PostgreSQLTests.fsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#if INTERACTIVE
#r @"../../bin/net472/FSharp.Data.SqlProvider.dll"
#r @"../../bin/net48/FSharp.Data.SqlProvider.dll"
#r @"../../packages/NUnit/lib/nunit.framework.dll"
#else
module PostgreSQLTests
Expand Down
2 changes: 1 addition & 1 deletion tests/SqlProvider.Tests/scripts/SQLLiteTests.fsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#r @"../../../bin/net472/FSharp.Data.SqlProvider.dll"
#r @"../../../bin/net48/FSharp.Data.SqlProvider.dll"

open System
open FSharp.Data.Sql
Expand Down
4 changes: 2 additions & 2 deletions tests/SqlProvider.Tests/scripts/SqlServerTests.fsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
#r "nuget: Microsoft.Data.SqlClient"

// This is with classic FSI:
#I @"../../../bin/net472"
#r @"../../../bin/net472/FSharp.Data.SqlProvider.dll"
#I @"../../../bin/net48"
#r @"../../../bin/net48/FSharp.Data.SqlProvider.dll"
// This is with dotnet.exe fsi:
#I @"../../../bin/netstandard2.1"
#r @"../../../bin/netstandard2.1/FSharp.Data.SqlProvider.dll"
Expand Down

0 comments on commit 36bfe13

Please sign in to comment.