Skip to content

Commit 5433219

Browse files
Thoriumsmoothdeveloper
Thorium
authored and
smoothdeveloper
committed
Feedback from smoothdeveloper implemented.
Fixes for Samples.sln
1 parent fcfe638 commit 5433219

File tree

14 files changed

+93
-145
lines changed

14 files changed

+93
-145
lines changed

‎paket.dependencies‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
source https://www.nuget.org/api/v2/
22
generate_load_scripts: on
33
storage: none
4-
github fsprojects/FSharp.TypeProviders.SDK src/ProvidedTypes.fsi
5-
github fsprojects/FSharp.TypeProviders.SDK src/ProvidedTypes.fs
4+
github fsprojects/FSharp.TypeProviders.SDK:23b588d06acb8e100402523abc1d4f3f06325b8a src/ProvidedTypes.fsi
5+
github fsprojects/FSharp.TypeProviders.SDK:23b588d06acb8e100402523abc1d4f3f06325b8a src/ProvidedTypes.fs
66

77
group Build
88
source https://www.nuget.org/api/v2/

‎paket.lock‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -374,12 +374,12 @@ NUGET
374374
Microsoft.NETCore.Targets (>= 1.1) - restriction: || (&& (< monoandroid) (< net45) (< netstandard1.3) (>= netstandard2.0) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard2.0) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< net45) (>= net462))
375375
System.Runtime (>= 4.3) - restriction: || (&& (< monoandroid) (< net45) (< netstandard1.3) (>= netstandard2.0) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard2.0) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< net45) (>= net462))
376376
System.Text.RegularExpressions (4.3) - restriction: || (&& (< monoandroid) (< net451) (>= netstandard2.0) (< win81) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< net451) (>= net462))
377-
System.Collections (>= 4.3) - restriction: || (&& (< net45) (>= net462) (>= netstandard1.6)) (&& (< net45) (< netcoreapp1.1) (>= netstandard2.0) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos))
378-
System.Globalization (>= 4.3) - restriction: || (&& (< net45) (>= net462) (>= netstandard1.6)) (&& (< net45) (< netcoreapp1.1) (>= netstandard2.0) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos))
379-
System.Resources.ResourceManager (>= 4.3) - restriction: || (&& (< net45) (>= net462) (>= netstandard1.6)) (&& (< net45) (< netcoreapp1.1) (>= netstandard2.0) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos))
380-
System.Runtime (>= 4.3) - restriction: || (&& (< monoandroid) (< net45) (< netstandard1.3) (>= netstandard2.0) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.6) (>= netstandard2.0) (< win8) (< wpa81)) (&& (< net45) (>= net462) (< netstandard1.3)) (&& (< net45) (>= net462) (>= netstandard1.6)) (&& (< net45) (>= net462) (< netstandard1.6)) (&& (< net45) (< netcoreapp1.1) (>= netstandard2.0) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (>= net462) (>= netcoreapp1.1)) (&& (>= netcoreapp1.1) (>= netstandard2.0) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos))
381-
System.Runtime.Extensions (>= 4.3) - restriction: || (&& (< net45) (>= net462) (>= netstandard1.6)) (&& (< net45) (< netcoreapp1.1) (>= netstandard2.0) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos))
382-
System.Threading (>= 4.3) - restriction: || (&& (< net45) (>= net462) (>= netstandard1.6)) (&& (< net45) (< netcoreapp1.1) (>= netstandard2.0) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos))
377+
System.Collections (>= 4.3) - restriction: || (&& (< net45) (>= net462) (>= netstandard1.6)) (&& (< net45) (>= net462) (>= netstandard2.0)) (&& (< net45) (< netcoreapp1.1) (>= netstandard2.0) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos))
378+
System.Globalization (>= 4.3) - restriction: || (&& (< net45) (>= net462) (>= netstandard1.6)) (&& (< net45) (>= net462) (>= netstandard2.0)) (&& (< net45) (< netcoreapp1.1) (>= netstandard2.0) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos))
379+
System.Resources.ResourceManager (>= 4.3) - restriction: || (&& (< net45) (>= net462) (>= netstandard1.6)) (&& (< net45) (>= net462) (>= netstandard2.0)) (&& (< net45) (< netcoreapp1.1) (>= netstandard2.0) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos))
380+
System.Runtime (>= 4.3) - restriction: || (&& (< monoandroid) (< net45) (< netstandard1.3) (>= netstandard2.0) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.6) (>= netstandard2.0) (< win8) (< wpa81)) (&& (< net45) (>= net462) (< netstandard1.3)) (&& (< net45) (>= net462) (>= netstandard1.6)) (&& (< net45) (>= net462) (< netstandard1.6)) (&& (< net45) (>= net462) (>= netstandard2.0)) (&& (< net45) (< netcoreapp1.1) (>= netstandard2.0) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (>= net462) (>= netcoreapp1.1)) (&& (>= netcoreapp1.1) (>= netstandard2.0) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos))
381+
System.Runtime.Extensions (>= 4.3) - restriction: || (&& (< net45) (>= net462) (>= netstandard1.6)) (&& (< net45) (>= net462) (>= netstandard2.0)) (&& (< net45) (< netcoreapp1.1) (>= netstandard2.0) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos))
382+
System.Threading (>= 4.3) - restriction: || (&& (< net45) (>= net462) (>= netstandard1.6)) (&& (< net45) (>= net462) (>= netstandard2.0)) (&& (< net45) (< netcoreapp1.1) (>= netstandard2.0) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos))
383383
System.Threading (4.3) - restriction: || (&& (< monoandroid) (< net45) (< netcoreapp1.1) (>= netstandard2.0) (< win81) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< net45) (>= net462) (>= netstandard1.6)) (&& (< net45) (>= net462) (>= netstandard2.0))
384384
System.Runtime (>= 4.3) - restriction: || (&& (< monoandroid) (< net45) (< netstandard1.3) (>= netstandard2.0) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard2.0) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< net45) (>= net462))
385385
System.Threading.Tasks (>= 4.3) - restriction: || (&& (< monoandroid) (< net45) (< netstandard1.3) (>= netstandard2.0) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard2.0) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< net45) (>= net462))
@@ -416,7 +416,7 @@ RESTRICTION: || (>= net462) (>= netstandard2.0)
416416
NUGET
417417
remote: https://www.nuget.org/api/v2
418418
FSharp.Core (8.0.301) - redirects: force
419-
FSharp.Data.SqlClient (2.0.7)
419+
FSharp.Data.SqlClient (2.1.2)
420420
FSharp.Core (>= 4.1.18) - restriction: || (&& (>= net40) (>= netstandard2.0)) (>= net462)
421421
FSharp.Core (>= 4.3.4) - restriction: && (< net40) (>= netstandard2.0)
422422
System.Configuration.ConfigurationManager (>= 4.5) - restriction: && (< net40) (>= netstandard2.0)
@@ -431,8 +431,10 @@ NUGET
431431
Microsoft.AspNet.WebApi.Client (>= 5.2.7)
432432
Microsoft.AspNet.WebApi.WebHost (5.2.7)
433433
Microsoft.AspNet.WebApi.Core (>= 5.2.7 < 5.3)
434-
Microsoft.SqlServer.Types (14.0.1016.290)
435-
Newtonsoft.Json (12.0.3) - redirects: force
434+
Microsoft.SqlServer.Server (1.0) - restriction: >= netstandard2.1
435+
Microsoft.SqlServer.Types (160.1000.6)
436+
Microsoft.SqlServer.Server (>= 1.0) - restriction: >= netstandard2.1
437+
Newtonsoft.Json (13.0.3) - redirects: force
436438
Newtonsoft.Json.Bson (1.0.2) - restriction: && (< net45) (>= netstandard2.0)
437439
Newtonsoft.Json (>= 12.0.1)
438440
runtime.native.System.Data.SqlClient.sni (4.7) - restriction: >= net6.0

‎src/SqlClient.DesignTime/DesignTimeConnectionString.fs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,7 @@ type internal DesignTimeConnectionString =
6868
value
6969
else
7070
let section = ConfigurationManager.ConnectionStrings.[name]
71-
if isNull section
72-
then raise <| KeyNotFoundException(message = sprintf "Cannot find name %s in <connectionStrings> section of config file." name)
71+
if isNull section then raise <| KeyNotFoundException(message = sprintf "Cannot find name %s in <connectionStrings> section of config file." name)
7372
else section.ConnectionString
7473
@@>
7574

‎src/SqlClient.DesignTime/SqlClient.DesignTime.fsproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<WarningsNotAsErrors>$(WarningsNotAsErrors);FS0026;FS3218;FS3548</WarningsNotAsErrors>
2121
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
2222
<DisableImplicitSystemValueTupleReference>true</DisableImplicitSystemValueTupleReference>
23-
<DefineConstants>$(DefineConstants);DESIGNTIME_CODE_ONLY;WITH_LEGACY_NAMESPACE</DefineConstants>
23+
<DefineConstants>$(DefineConstants);DESIGNTIME_CODE_ONLY;IS_DESIGNTIME;WITH_LEGACY_NAMESPACE</DefineConstants>
2424
</PropertyGroup>
2525
<ItemGroup>
2626
<!--
@@ -33,7 +33,7 @@
3333
-->
3434

3535
</ItemGroup>
36-
<!--<ItemGroup Condition="$(TargetFramework) == 'net40'">
36+
<!--<ItemGroup Condition="$(TargetFramework) == 'net462'">
3737
<Reference Include="System.Configuration" />
3838
<Reference Include="System.Data" />
3939
</ItemGroup>

‎src/SqlClient.Samples/WebApi.Controllers/App.config‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,10 @@
88
<startup>
99
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
1010
</startup>
11-
</configuration>
11+
<runtime><assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
12+
<dependentAssembly>
13+
<Paket>True</Paket>
14+
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
15+
<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="13.0.0.0" />
16+
</dependentAssembly>
17+
</assemblyBinding></runtime></configuration>

0 commit comments

Comments
 (0)