Skip to content

Commit 9496eb0

Browse files
Thoriumsmoothdeveloper
authored andcommitted
unit test fixes
1 parent da1b26d commit 9496eb0

File tree

4 files changed

+16
-4
lines changed

4 files changed

+16
-4
lines changed

build/build.fs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -278,6 +278,7 @@ Target.create "RunTests" (fun _ ->
278278
try
279279
DotNet.test (dnTestOptions "net462") testSlnPath
280280
DotNet.test (dnTestOptions "netcoreapp3.1") testProjectPath
281+
DotNet.test (dnTestOptions "net8.0") testProjectPath
281282
with
282283
| ex ->
283284
Trace.log (sprintf "Test exception: %A" ex)

tests/SqlClient.DesignTime.Tests/SqlClient.DesignTime.Tests.fsproj

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<!--<Import Project="..\..\fsc.props" />-->
44
<!--<Import Project="..\..\netfx.props" />-->
55
<PropertyGroup>
6-
<TargetFramework>net8.0</TargetFramework>
6+
<TargetFramework>net462</TargetFramework>
77
<AssemblyName>SqlClient.DesignTime.Tests</AssemblyName>
88
<EnableDefaultCompileItems>false</EnableDefaultCompileItems>
99
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
@@ -15,8 +15,10 @@
1515
<Compile Include="DesignTimeConnectionStringTests.fs" />
1616
</ItemGroup>
1717
<ItemGroup>
18-
<Reference Include="FSharp.Data.SqlClient.DesignTime">
19-
<!--<HintPath>..\..\bin\typeproviders\fsharp41\net461\FSharp.Data.SqlClient.DesignTime.dll</HintPath>-->
18+
<Reference Condition="$(TargetFramework) == 'net462'" Include="FSharp.Data.SqlClient.DesignTime">
19+
<HintPath>..\..\bin\typeproviders\fsharp41\net461\FSharp.Data.SqlClient.DesignTime.dll</HintPath>
20+
</Reference>
21+
<Reference Condition="$(TargetFramework) == 'net8.0'" Include="FSharp.Data.SqlClient.DesignTime">
2022
<HintPath>..\..\bin\typeproviders\fsharp41\net8.0\FSharp.Data.SqlClient.DesignTime.dll</HintPath>
2123
</Reference>
2224
</ItemGroup>

tests/SqlClient.SqlServerTypes.Tests/App.config

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
<assemblyIdentity name="xunit" publicKeyToken="8d05b1bb7a6fdb6c" culture="neutral" />
1111
<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="1.9.2.1705" />
1212
</dependentAssembly>
13+
<assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
14+
<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="8.0.0.0" />
1315
<dependentAssembly>
1416
<Paket>True</Paket>
1517
<assemblyIdentity name="Microsoft.SqlServer.Types" publicKeyToken="89845dcd8080cc91" culture="neutral" />

tests/SqlClient.SqlServerTypes.Tests/SqlClient.SqlServerTypes.Tests.fsproj

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,16 @@
1616
<Compile Include="SpatialTypesTests.fs" />
1717
</ItemGroup>
1818
<ItemGroup>
19-
<Reference Include="FSharp.Data.SqlClient">
19+
<Reference Condition="$(TargetFramework) == 'net8.0'" Include="FSharp.Data.SqlClient">
2020
<HintPath>..\..\bin\netstandard2.0\FSharp.Data.SqlClient.dll</HintPath>
2121
</Reference>
22+
<Reference Condition="$(TargetFramework) == 'netstandard2.0'" Include="FSharp.Data.SqlClient">
23+
<HintPath>..\..\bin\netstandard2.0\FSharp.Data.SqlClient.dll</HintPath>
24+
</Reference>
25+
<Reference Condition="$(TargetFramework) == 'net462'" Include="FSharp.Data.SqlClient">
26+
<HintPath>..\..\bin\net40\FSharp.Data.SqlClient.dll</HintPath>
27+
</Reference>
28+
2229
</ItemGroup>
2330
<Import Project="..\..\.paket\Paket.Restore.targets" />
2431
</Project>

0 commit comments

Comments
 (0)