Skip to content

Commit 92c5691

Browse files
ThoriumThorium
committed
Merge branch 'more-updates2' into microsoft-data-sqlclient
# Conflicts: # paket.lock # src/SqlClient.Samples/WebApi.Controllers/App.config
2 parents 1548927 + 4fb547f commit 92c5691

File tree

27 files changed

+3450
-242
lines changed

27 files changed

+3450
-242
lines changed

‎build/paket.references‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
group Build
2-
32
Fun.Build
43
Fake.Core.Process
54
Fake.Core.ReleaseNotes
@@ -10,10 +9,8 @@ Fake.DotNet.Cli
109
Fake.DotNet.MSBuild
1110
Fake.DotNet.NuGet
1211
Fake.DotNet.Testing.XUnit2
13-
1412
Fake.Tools.Git
1513
FSharp.Core
1614
FSharp.Formatting
1715
NuGet.CommandLine
1816
System.Data.SqlClient
19-
System.Configuration.ConfigurationManager

‎netfx.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646

4747
<ItemGroup>
4848
<PackageReference Include="System.Data.SqlClient" Version="4.9.0" Condition="'$(TargetFramework)' != 'net462'" />
49-
<PackageReference Include="Microsoft.Data.SqlClient" Version="5.2.2" />
49+
<PackageReference Include="Microsoft.Data.SqlClient" Version="6.0.1" />
5050
</ItemGroup>
5151

5252
</Project>

‎paket.dependencies‎

Lines changed: 17 additions & 6 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/
@@ -50,26 +50,35 @@ group DesignTime
5050
nuget FSharp.Core 8.0.301
5151
nuget Microsoft.SqlServer.TransactSql.ScriptDom
5252
nuget Microsoft.SqlServer.Types
53+
nuget System.Text.Json
54+
nuget Microsoft.SqlServer.Server
5355

5456
group Test
5557
source https://www.nuget.org/api/v2/
5658

5759
nuget FSharp.Core redirects:force
5860
nuget Microsoft.Data.SqlClient 6.0.1
59-
nuget System.Data.SqlClient
60-
nuget System.Configuration.ConfigurationManager
61+
nuget System.Data.SqlClient
62+
nuget System.Configuration.ConfigurationManager
6163

62-
nuget Microsoft.SqlServer.Types ~> 12
64+
nuget Microsoft.SqlServer.Types
6365
nuget Newtonsoft.Json
6466
nuget xunit = 2.4.1
6567
nuget xunit.runner.visualstudio = 2.4.1
68+
nuget System.Text.Json
69+
nuget Microsoft.SqlServer.Server
6670

6771
group Net40
6872
source https://www.nuget.org/api/v2/
6973
framework: net462
7074
storage: none
7175

7276
nuget FSharp.Core = 8.0.301
77+
nuget Microsoft.Data.SqlClient 6.0.1
78+
nuget System.Configuration.ConfigurationManager 9.0.4
79+
nuget Microsoft.SqlServer.Server
80+
nuget System.Text.Json
81+
nuget System.Data.SqlClient
7382

7483
group TestProjects
7584
source https://www.nuget.org/api/v2/
@@ -81,6 +90,8 @@ group TestProjects
8190

8291
nuget System.Data.SqlClient
8392
nuget System.Configuration.ConfigurationManager
93+
nuget System.Text.Json
94+
nuget Microsoft.SqlServer.Server
8495

8596
group Samples
8697
source https://www.nuget.org/api/v2/
@@ -99,4 +110,4 @@ group Samples
99110

100111
nuget Newtonsoft.Json redirects: force
101112
nuget FSharp.Data.SqlClient
102-
113+
nuget Microsoft.SqlServer.Server

‎paket.lock‎

Lines changed: 130 additions & 14 deletions
Large diffs are not rendered by default.

‎src/SqlClient.DesignTime/DesignTime.fs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -572,7 +572,7 @@ type DesignTime private() =
572572

573573
//done via reflection because not implemented on Mono
574574
let sqlDataRecordType = typeof<SqlCommand>.Assembly.GetType("Microsoft.SqlServer.Server.SqlDataRecord", throwOnError = true)
575-
let record = Activator.CreateInstance(sqlDataRecordType, args = [| %%Expr.Coerce(Expr.NewArray(typeof<SqlMetaData>, sqlMetas), typeof<obj>) |])
575+
let record = Activator.CreateInstance(sqlDataRecordType, args = [| %%Expr.Coerce(Expr.NewArray(typeof<Microsoft.SqlServer.Server.SqlMetaData>, sqlMetas), typeof<obj>) |])
576576
sqlDataRecordType.GetMethod("SetValues").Invoke(record, [| values |]) |> ignore
577577

578578
record

‎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: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,20 +20,18 @@
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>
26-
<!--
2726
<PackageReference Include="FSharp.Core" Version="8.0.301" />
2827
<PackageReference Include="System.Configuration.ConfigurationManager" Version="9.0.4" />
29-
<PackageReference Include="Microsoft.SqlServer.TransactSql.ScriptDom" Version="14.0.3811.1" />
30-
<PackageReference Include="Microsoft.SqlServer.Types" Version="12.0.5000" />
28+
<!--<PackageReference Include="Microsoft.SqlServer.TransactSql.ScriptDom" Version="14.0.3811.1" />-->
29+
<PackageReference Include="Microsoft.SqlServer.Types" Version="160.1000.6" />
3130
<PackageReference Include="System.Data.SqlClient" Version="4.9.0" />
32-
<PackageReference Include="Microsoft.Data.SqlClient" Version="5.2.2" />
33-
-->
34-
31+
<PackageReference Include="Microsoft.Data.SqlClient" Version="6.0.1" />
32+
<PackageReference Include="System.Text.Json" Version="9.0.4" />
3533
</ItemGroup>
36-
<!--<ItemGroup Condition="$(TargetFramework) == 'net40'">
34+
<!--<ItemGroup Condition="$(TargetFramework) == 'net462'">
3735
<Reference Include="System.Configuration" />
3836
<Reference Include="System.Data" />
3937
</ItemGroup>

‎src/SqlClient.DesignTime/paket.references‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ System.Runtime.Caching
88
Microsoft.SqlServer.TransactSql.ScriptDom
99
Microsoft.SqlServer.Types
1010
Microsoft.SqlServer.Server
11-
11+
System.Text.Json
1212

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

Lines changed: 97 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,100 @@
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="Microsoft.Bcl.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
15+
<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="9.0.0.4" />
16+
</dependentAssembly>
17+
<dependentAssembly>
18+
<Paket>True</Paket>
19+
<assemblyIdentity name="Microsoft.Bcl.TimeProvider" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
20+
<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="9.0.0.4" />
21+
</dependentAssembly>
22+
<dependentAssembly>
23+
<Paket>True</Paket>
24+
<assemblyIdentity name="Microsoft.Extensions.Caching.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
25+
<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="9.0.0.4" />
26+
</dependentAssembly>
27+
<dependentAssembly>
28+
<Paket>True</Paket>
29+
<assemblyIdentity name="Microsoft.Extensions.Caching.Memory" publicKeyToken="adb9793829ddae60" culture="neutral" />
30+
<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="9.0.0.4" />
31+
</dependentAssembly>
32+
<dependentAssembly>
33+
<Paket>True</Paket>
34+
<assemblyIdentity name="Microsoft.Extensions.Logging.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
35+
<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="9.0.0.4" />
36+
</dependentAssembly>
37+
<dependentAssembly>
38+
<Paket>True</Paket>
39+
<assemblyIdentity name="Microsoft.Extensions.Options" publicKeyToken="adb9793829ddae60" culture="neutral" />
40+
<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="9.0.0.4" />
41+
</dependentAssembly>
42+
<dependentAssembly>
43+
<Paket>True</Paket>
44+
<assemblyIdentity name="Microsoft.IdentityModel.JsonWebTokens" publicKeyToken="31bf3856ad364e35" culture="neutral" />
45+
<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="8.8.0.0" />
46+
</dependentAssembly>
47+
<dependentAssembly>
48+
<Paket>True</Paket>
49+
<assemblyIdentity name="Microsoft.IdentityModel.Logging" publicKeyToken="31bf3856ad364e35" culture="neutral" />
50+
<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="8.8.0.0" />
51+
</dependentAssembly>
52+
<dependentAssembly>
53+
<Paket>True</Paket>
54+
<assemblyIdentity name="Microsoft.IdentityModel.Protocols" publicKeyToken="31bf3856ad364e35" culture="neutral" />
55+
<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="8.8.0.0" />
56+
</dependentAssembly>
57+
<dependentAssembly>
58+
<Paket>True</Paket>
59+
<assemblyIdentity name="Microsoft.IdentityModel.Protocols.OpenIdConnect" publicKeyToken="31bf3856ad364e35" culture="neutral" />
60+
<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="8.8.0.0" />
61+
</dependentAssembly>
62+
<dependentAssembly>
63+
<Paket>True</Paket>
64+
<assemblyIdentity name="Microsoft.IdentityModel.Tokens" publicKeyToken="31bf3856ad364e35" culture="neutral" />
65+
<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="8.8.0.0" />
66+
</dependentAssembly>
67+
<dependentAssembly>
68+
<Paket>True</Paket>
69+
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
70+
<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="13.0.0.0" />
71+
</dependentAssembly>
72+
<dependentAssembly>
73+
<Paket>True</Paket>
74+
<assemblyIdentity name="System.Diagnostics.DiagnosticSource" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
75+
<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="9.0.0.4" />
76+
</dependentAssembly>
77+
<dependentAssembly>
78+
<Paket>True</Paket>
79+
<assemblyIdentity name="System.IdentityModel.Tokens.Jwt" publicKeyToken="31bf3856ad364e35" culture="neutral" />
80+
<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="8.8.0.0" />
81+
</dependentAssembly>
82+
<dependentAssembly>
83+
<Paket>True</Paket>
84+
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
85+
<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="6.0.3.0" />
86+
</dependentAssembly>
87+
<dependentAssembly>
88+
<Paket>True</Paket>
89+
<assemblyIdentity name="System.Text.Encodings.Web" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
90+
<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="9.0.0.4" />
91+
</dependentAssembly>
92+
<dependentAssembly>
93+
<Paket>True</Paket>
94+
<assemblyIdentity name="System.Text.Json" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
95+
<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="9.0.0.4" />
96+
</dependentAssembly>
97+
<dependentAssembly>
98+
<Paket>True</Paket>
99+
<assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
100+
<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="4.2.4.0" />
101+
</dependentAssembly>
102+
<dependentAssembly>
103+
<Paket>True</Paket>
104+
<assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
105+
<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="4.0.5.0" />
106+
</dependentAssembly>
107+
</assemblyBinding></runtime></configuration>

0 commit comments

Comments
 (0)