Skip to content

Commit 2137d72

Browse files
committed
More path fixes
1 parent 36ef635 commit 2137d72

File tree

9 files changed

+233
-1199
lines changed

9 files changed

+233
-1199
lines changed

paket.lock

Lines changed: 40 additions & 691 deletions
Large diffs are not rendered by default.

src/SqlClient.Samples/WebApi.Controllers/WebApi.Controllers.fsproj

Lines changed: 54 additions & 250 deletions
Large diffs are not rendered by default.

src/SqlClient.Samples/WebApi/WebApi.csproj

Lines changed: 84 additions & 13 deletions
Large diffs are not rendered by default.

src/SqlClient.Samples/WpfDataBinding/WpfDataBinding.fsproj

Lines changed: 46 additions & 233 deletions
Large diffs are not rendered by default.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
</ItemGroup>
1717
<ItemGroup>
1818
<Reference Condition="$(TargetFramework) == 'net462'" Include="FSharp.Data.SqlClient.DesignTime">
19-
<HintPath>..\..\bin\typeproviders\fsharp41\net461\FSharp.Data.SqlClient.DesignTime.dll</HintPath>
19+
<HintPath>..\..\bin\typeproviders\fsharp41\net462\FSharp.Data.SqlClient.DesignTime.dll</HintPath>
2020
</Reference>
2121
<Reference Condition="$(TargetFramework) == 'net8.0'" Include="FSharp.Data.SqlClient.DesignTime">
2222
<HintPath>..\..\bin\typeproviders\fsharp41\net8.0\FSharp.Data.SqlClient.DesignTime.dll</HintPath>

tests/SqlClient.DesignTime.Tests/app.config

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,6 @@
1616
<assemblyIdentity name="xunit" publicKeyToken="8d05b1bb7a6fdb6c" culture="neutral" />
1717
<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="1.9.2.1705" />
1818
</dependentAssembly>
19-
<dependentAssembly>
20-
<Paket>True</Paket>
21-
<assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
22-
<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="8.0.0.0" />
23-
</dependentAssembly>
2419
</assemblyBinding></runtime>
2520
<!--<connectionStrings configSource="connectionStrings.Azure.config"/>-->
2621
<connectionStrings>

tests/SqlClient.SqlServerTypes.Tests/App.config

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,10 @@
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" />
13+
<dependentAssembly>
14+
<assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
15+
<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="8.0.0.0" />
16+
</dependentAssembly>
1517
<dependentAssembly>
1618
<Paket>True</Paket>
1719
<assemblyIdentity name="Microsoft.SqlServer.Types" publicKeyToken="89845dcd8080cc91" culture="neutral" />

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<HintPath>..\..\bin\netstandard2.0\FSharp.Data.SqlClient.dll</HintPath>
2424
</Reference>
2525
<Reference Condition="$(TargetFramework) == 'net462'" Include="FSharp.Data.SqlClient">
26-
<HintPath>..\..\bin\net40\FSharp.Data.SqlClient.dll</HintPath>
26+
<HintPath>..\..\bin\net462\FSharp.Data.SqlClient.dll</HintPath>
2727
</Reference>
2828

2929
</ItemGroup>

tests/SqlClient.Tests/SqlClient.Tests.fsproj

Lines changed: 3 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-
<TargetFrameworks>net8.0;net462;netcoreapp3.1</TargetFrameworks>
6+
<TargetFrameworks>net8.0;net462</TargetFrameworks>
77
<AssemblyName>SqlClient.Tests</AssemblyName>
88
<EnableDefaultCompileItems>false</EnableDefaultCompileItems>
99
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
@@ -52,8 +52,8 @@
5252
</Content>
5353
</ItemGroup>
5454
<ItemGroup>
55-
<Reference Condition="'$(TargetFramework)' != 'net8.0'" Include="FSharp.Data.SqlClient">
56-
<HintPath>..\..\bin\netstandard2.0\FSharp.Data.SqlClient.dll</HintPath>
55+
<Reference Condition="'$(TargetFramework)' == 'net462'" Include="FSharp.Data.SqlClient">
56+
<HintPath>..\..\bin\net462\FSharp.Data.SqlClient.dll</HintPath>
5757
</Reference>
5858
<Reference Condition="'$(TargetFramework)' == 'net8.0'" Include="FSharp.Data.SqlClient">
5959
<HintPath>..\..\bin\net8.0\FSharp.Data.SqlClient.dll</HintPath>

0 commit comments

Comments
 (0)