Skip to content

Commit da1b26d

Browse files
Thoriumsmoothdeveloper
Thorium
authored and
smoothdeveloper
committed
Moved .NET 4.0 to NET 4,6.2, Changed F# core to 8.0.301, updated System.Data.SqlClient to 4.9.0, Added TrustServerCertificate to connectionstrings, added
1 parent cedf1aa commit da1b26d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+1006
-882
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ Provides statically typed access to the parameters and result set of T-SQL comma
4040
open FSharp.Data
4141
4242
[<Literal>]
43-
let connectionString = "Data Source=.;Initial Catalog=AdventureWorks2012;Integrated Security=True"
43+
let connectionString = "Data Source=.;Initial Catalog=AdventureWorks2012;Integrated Security=True;TrustServerCertificate=true"
4444
4545
// The query below retrieves top 3 sales representatives from North American region with YTD sales of more than one million.
4646

‎docs/content/SqlClientComparison.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ Here is a typical snippet of SqlCommandProvider-enabled code:
3838
open FSharp.Data
3939

4040
[<Literal>]
41-
let connectionString = @"Data Source=(LocalDb)\v11.0;Initial Catalog=AdventureWorks2012;Integrated Security=True"
41+
let connectionString = @"Data Source=(LocalDb)\v11.0;Initial Catalog=AdventureWorks2012;Integrated Security=True;TrustServerCertificate=true"
4242

4343
[<Literal>]
4444
let query = "

‎docs/content/app.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<connectionStrings>
4-
<add name="AdventureWorks" connectionString="Data Source=.;Initial Catalog=AdventureWorks2012;Integrated Security=True" />
4+
<add name="AdventureWorks" connectionString="Data Source=.;Initial Catalog=AdventureWorks2012;Integrated Security=True;TrustServerCertificate=true" />
55
</connectionStrings>
66
</configuration>

‎docs/content/bulk load.fsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
(*** hide ***)
2-
#r @"..\..\bin\net40\FSharp.Data.SqlClient.dll"
2+
#r @"..\..\bin\net462\FSharp.Data.SqlClient.dll"
33
#r "System.Transactions"
44
open FSharp.Data
55
open System
66

77
[<Literal>]
8-
let connectionString = @"Data Source=.;Initial Catalog=AdventureWorks2014;Integrated Security=True"
8+
let connectionString = @"Data Source=.;Initial Catalog=AdventureWorks2014;Integrated Security=True;TrustServerCertificate=true"
99

1010
(**
1111

‎docs/content/configuration and Input.fsx‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
(*** hide ***)
2-
#r @"..\..\bin\net40\FSharp.Data.SqlClient.dll"
2+
#r @"..\..\bin\net462\FSharp.Data.SqlClient.dll"
33
#r "Microsoft.SqlServer.Types.dll"
44
(**
55
@@ -46,7 +46,7 @@ CommandText
4646
open FSharp.Data
4747

4848
[<Literal>]
49-
let connStr = @"Data Source=.;Initial Catalog=AdventureWorks2012;Integrated Security=True"
49+
let connStr = @"Data Source=.;Initial Catalog=AdventureWorks2012;Integrated Security=True;TrustServerCertificate=true"
5050

5151
//Inline T-SQL text convinient for short queries
5252
type GetDate = SqlCommandProvider<"SELECT GETDATE() AS Now", connStr>
@@ -166,7 +166,7 @@ Connection string can be provided either via literal (all examples above) or inl
166166

167167
//Inline
168168
type Get42 =
169-
SqlCommandProvider<"SELECT 42", @"Data Source=.;Initial Catalog=AdventureWorks2012;Integrated Security=True">
169+
SqlCommandProvider<"SELECT 42", @"Data Source=.;Initial Catalog=AdventureWorks2012;Integrated Security=True;TrustServerCertificate=true">
170170

171171
(**
172172
@@ -225,7 +225,7 @@ let get42 = new Get42(runTimeConnStr)
225225
//Factory or IOC of choice to avoid logic duplication. Use F# ctor static constraints.
226226
module DB =
227227
[<Literal>]
228-
let connStr = @"Data Source=.;Initial Catalog=AdventureWorks2012;Integrated Security=True"
228+
let connStr = @"Data Source=.;Initial Catalog=AdventureWorks2012;Integrated Security=True;TrustServerCertificate=true"
229229

230230
open System.Data.SqlClient
231231

@@ -247,9 +247,9 @@ let dbCmd2: DB.MyCmd2 = DB.createCommand()
247247
//Static type property ConnectionStringOrName that has exactly same value as passed into SqlCommandProvider helps.
248248
module DataAccess =
249249
[<Literal>]
250-
let adventureWorks = @"Data Source=.;Initial Catalog=AdventureWorks2012;Integrated Security=True"
250+
let adventureWorks = @"Data Source=.;Initial Catalog=AdventureWorks2012;Integrated Security=True;TrustServerCertificate=true"
251251
[<Literal>]
252-
let master = @"Data Source=.;Initial Catalog=master;Integrated Security=True"
252+
let master = @"Data Source=.;Initial Catalog=master;Integrated Security=True;TrustServerCertificate=true"
253253

254254
type MyCmd1 = SqlCommandProvider<"SELECT 42", adventureWorks>
255255
type MyCmd2 = SqlCommandProvider<"SELECT 42", master>

‎docs/content/data modification.fsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
(*** hide ***)
2-
#r @"..\..\bin\net40\FSharp.Data.SqlClient.dll"
2+
#r @"..\..\bin\net462\FSharp.Data.SqlClient.dll"
33
#r "System.Transactions"
44
open FSharp.Data
55
open System
66

77
[<Literal>]
8-
let connectionString = @"Data Source=.;Initial Catalog=AdventureWorks2012;Integrated Security=True"
8+
let connectionString = @"Data Source=.;Initial Catalog=AdventureWorks2012;Integrated Security=True;TrustServerCertificate=true"
99

1010
(**
1111

‎docs/content/debugging.fsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
(*** hide ***)
2-
#r @"..\..\bin\net40\FSharp.Data.SqlClient.dll"
2+
#r @"..\..\bin\net462\FSharp.Data.SqlClient.dll"
33
#r "System.Transactions"
44
open FSharp.Data
55
open System
66

77
[<Literal>]
8-
let connectionString = @"Data Source=.;Initial Catalog=AdventureWorks2012;Integrated Security=True"
8+
let connectionString = @"Data Source=.;Initial Catalog=AdventureWorks2012;Integrated Security=True;TrustServerCertificate=true"
99

1010
(**
1111

‎docs/content/dynamic local db.fsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ open FSharp.Data
1919

2020
[<Literal>]
2121
let compileConnectionString =
22-
@"Data Source=(LocalDB)\MSSQLLocalDB;AttachDbFilename=C:\git\Project1\Database1.mdf;Integrated Security=True"
22+
@"Data Source=(LocalDB)\MSSQLLocalDB;AttachDbFilename=C:\git\Project1\Database1.mdf;Integrated Security=True;TrustServerCertificate=true"
2323

2424
(**
2525
However, binary files like this are difficult to diff/merge when working with

‎docs/content/faq.fsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
(*** hide ***)
2-
#r @"..\..\bin\net40\FSharp.Data.SqlClient.dll"
2+
#r @"..\..\bin\net462\FSharp.Data.SqlClient.dll"
33
#r "System.Transactions"
44
open FSharp.Data
55

66
[<Literal>]
7-
let connectionString = @"Data Source=.;Initial Catalog=AdventureWorks2012;Integrated Security=True"
7+
let connectionString = @"Data Source=.;Initial Catalog=AdventureWorks2012;Integrated Security=True;TrustServerCertificate=true"
88

99
(**
1010
FAQ

‎docs/content/index.fsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
(*** hide ***)
22
#r "Microsoft.SqlServer.Types.dll"
3-
#r @"..\..\bin\net40\FSharp.Data.SqlClient.dll"
3+
#r @"..\..\bin\net462\FSharp.Data.SqlClient.dll"
44

55
(**
66
Not your grandfather's ORM
@@ -33,7 +33,7 @@ open FSharp.Data
3333

3434
[<Literal>]
3535
let connectionString =
36-
@"Data Source=.;Initial Catalog=AdventureWorks2012;Integrated Security=True"
36+
@"Data Source=.;Initial Catalog=AdventureWorks2012;Integrated Security=True;TrustServerCertificate=true"
3737

3838
(**
3939

0 commit comments

Comments
 (0)