More aligned with Microsoft maintenance

.config/dotnet-tools.json

@@ -3,10 +3,11 @@
   "isRoot": true,
   "tools": {
     "paket": {
-      "version": "8.0.0",
+      "version": "9.0.2",
       "commands": [
         "paket"
-      ]
+      ],
+      "rollForward": false
     }
   }
 }

README.md

@@ -40,7 +40,7 @@ Provides statically typed access to the parameters and result set of T-SQL comma
 open FSharp.Data
 
 [<Literal>]
-let connectionString = "Data Source=.;Initial Catalog=AdventureWorks2012;Integrated Security=True"
+let connectionString = "Data Source=.;Initial Catalog=AdventureWorks2012;Integrated Security=True;TrustServerCertificate=true"
 
 // The query below retrieves top 3 sales representatives from North American region with YTD sales of more than one million.
 

build/build.fs

@@ -278,6 +278,7 @@
       try 
           DotNet.test (dnTestOptions "net462") testSlnPath
           DotNet.test (dnTestOptions "netcoreapp3.1") testProjectPath
+          DotNet.test (dnTestOptions "net8.0") testProjectPath
       with
       | ex ->
           Trace.log (sprintf "Test exception: %A" ex)
@@ -338,7 +339,7 @@
 
 Target.create "ServeDocs" (fun _ -> 
   fakeiisexpress.HostStaticWebsite id (__SOURCE_DIRECTORY__ @@ @"docs\output\") |> ignore
   fakeiisexpress.OpenUrlInBrowser "http://localhost:8080"
 )
 
 Target.create "ReleaseDocs" (fun _ ->

docs/content/SqlClientComparison.md

@@ -38,7 +38,7 @@ Here is a typical snippet of SqlCommandProvider-enabled code:
 	open FSharp.Data
 
 	[<Literal>]
-	let connectionString = @"Data Source=(LocalDb)\v11.0;Initial Catalog=AdventureWorks2012;Integrated Security=True"
+	let connectionString = @"Data Source=(LocalDb)\v11.0;Initial Catalog=AdventureWorks2012;Integrated Security=True;TrustServerCertificate=true"
 
 	[<Literal>]
 	let query = "

docs/content/app.config

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <connectionStrings>
-    <add name="AdventureWorks" connectionString="Data Source=.;Initial Catalog=AdventureWorks2012;Integrated Security=True" />
+    <add name="AdventureWorks" connectionString="Data Source=.;Initial Catalog=AdventureWorks2012;Integrated Security=True;TrustServerCertificate=true" />
   </connectionStrings>
 </configuration>

docs/content/bulk load.fsx

@@ -1,11 +1,11 @@
 (*** hide ***)
-#r @"..\..\bin\net40\FSharp.Data.SqlClient.dll"
+#r @"..\..\bin\net462\FSharp.Data.SqlClient.dll"
 #r "System.Transactions"
 open FSharp.Data
 open System
 
 [<Literal>]
-let connectionString = @"Data Source=.;Initial Catalog=AdventureWorks2014;Integrated Security=True"
+let connectionString = @"Data Source=.;Initial Catalog=AdventureWorks2014;Integrated Security=True;TrustServerCertificate=true"
 
 (**
 

docs/content/configuration and Input.fsx

@@ -1,5 +1,5 @@
 (*** hide ***)
-#r @"..\..\bin\net40\FSharp.Data.SqlClient.dll"
+#r @"..\..\bin\net462\FSharp.Data.SqlClient.dll"
 #r "Microsoft.SqlServer.Types.dll"
 (**
 
@@ -46,7 +46,7 @@ CommandText
 open FSharp.Data
 
 [<Literal>]
-let connStr = @"Data Source=.;Initial Catalog=AdventureWorks2012;Integrated Security=True"
+let connStr = @"Data Source=.;Initial Catalog=AdventureWorks2012;Integrated Security=True;TrustServerCertificate=true"
 
 //Inline T-SQL text convinient for short queries 
 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
 
 //Inline 
 type Get42 = 
-    SqlCommandProvider<"SELECT 42", @"Data Source=.;Initial Catalog=AdventureWorks2012;Integrated Security=True">
+    SqlCommandProvider<"SELECT 42", @"Data Source=.;Initial Catalog=AdventureWorks2012;Integrated Security=True;TrustServerCertificate=true">
 
 (**
 
@@ -225,7 +225,7 @@ let get42 = new Get42(runTimeConnStr)
 //Factory or IOC of choice to avoid logic duplication. Use F# ctor static constraints.
 module DB = 
     [<Literal>]
-    let connStr = @"Data Source=.;Initial Catalog=AdventureWorks2012;Integrated Security=True"
+    let connStr = @"Data Source=.;Initial Catalog=AdventureWorks2012;Integrated Security=True;TrustServerCertificate=true"
 
     open System.Data.SqlClient
 
@@ -247,9 +247,9 @@ let dbCmd2: DB.MyCmd2 = DB.createCommand()
 //Static type property ConnectionStringOrName that has exactly same value as passed into SqlCommandProvider helps.
 module DataAccess = 
     [<Literal>]
-    let adventureWorks = @"Data Source=.;Initial Catalog=AdventureWorks2012;Integrated Security=True"
+    let adventureWorks = @"Data Source=.;Initial Catalog=AdventureWorks2012;Integrated Security=True;TrustServerCertificate=true"
     [<Literal>]
-    let master = @"Data Source=.;Initial Catalog=master;Integrated Security=True"
+    let master = @"Data Source=.;Initial Catalog=master;Integrated Security=True;TrustServerCertificate=true"
 
     type MyCmd1 = SqlCommandProvider<"SELECT 42", adventureWorks>
     type MyCmd2 = SqlCommandProvider<"SELECT 42", master>

docs/content/data modification.fsx

@@ -1,11 +1,11 @@
 (*** hide ***)
-#r @"..\..\bin\net40\FSharp.Data.SqlClient.dll"
+#r @"..\..\bin\net462\FSharp.Data.SqlClient.dll"
 #r "System.Transactions"
 open FSharp.Data
 open System
 
 [<Literal>]
-let connectionString = @"Data Source=.;Initial Catalog=AdventureWorks2012;Integrated Security=True"
+let connectionString = @"Data Source=.;Initial Catalog=AdventureWorks2012;Integrated Security=True;TrustServerCertificate=true"
 
 (**
 

docs/content/debugging.fsx

@@ -1,11 +1,11 @@
 (*** hide ***)
-#r @"..\..\bin\net40\FSharp.Data.SqlClient.dll"
+#r @"..\..\bin\net462\FSharp.Data.SqlClient.dll"
 #r "System.Transactions"
 open FSharp.Data
 open System
 
 [<Literal>]
-let connectionString = @"Data Source=.;Initial Catalog=AdventureWorks2012;Integrated Security=True"
+let connectionString = @"Data Source=.;Initial Catalog=AdventureWorks2012;Integrated Security=True;TrustServerCertificate=true"
 
 (**
 

docs/content/dynamic local db.fsx

@@ -19,7 +19,7 @@ open FSharp.Data
 
 [<Literal>]
 let compileConnectionString =
-    @"Data Source=(LocalDB)\MSSQLLocalDB;AttachDbFilename=C:\git\Project1\Database1.mdf;Integrated Security=True"
+    @"Data Source=(LocalDB)\MSSQLLocalDB;AttachDbFilename=C:\git\Project1\Database1.mdf;Integrated Security=True;TrustServerCertificate=true"
 
 (**
 However, binary files like this are difficult to diff/merge when working with

docs/content/faq.fsx

@@ -1,10 +1,10 @@
 (*** hide ***)
-#r @"..\..\bin\net40\FSharp.Data.SqlClient.dll"
+#r @"..\..\bin\net462\FSharp.Data.SqlClient.dll"
 #r "System.Transactions"
 open FSharp.Data
 
 [<Literal>]
-let connectionString = @"Data Source=.;Initial Catalog=AdventureWorks2012;Integrated Security=True"
+let connectionString = @"Data Source=.;Initial Catalog=AdventureWorks2012;Integrated Security=True;TrustServerCertificate=true"
 
 (**
 FAQ

docs/content/index.fsx

@@ -1,6 +1,6 @@
 (*** hide ***)
 #r "Microsoft.SqlServer.Types.dll"
-#r @"..\..\bin\net40\FSharp.Data.SqlClient.dll"   
+#r @"..\..\bin\net462\FSharp.Data.SqlClient.dll"   
 
 (**
 Not your grandfather's ORM
@@ -33,7 +33,7 @@ open FSharp.Data
 
 [<Literal>]
 let connectionString = 
-    @"Data Source=.;Initial Catalog=AdventureWorks2012;Integrated Security=True"
+    @"Data Source=.;Initial Catalog=AdventureWorks2012;Integrated Security=True;TrustServerCertificate=true"
 
 (**
 

docs/content/output.fsx

@@ -1,9 +1,9 @@
 (*** hide ***)
-#r @"..\..\bin\net40\FSharp.Data.SqlClient.dll"
+#r @"..\..\bin\net462\FSharp.Data.SqlClient.dll"
 #r "Microsoft.SqlServer.Types.dll"
 open FSharp.Data
 [<Literal>]
-let connectionString = @"Data Source=.;Initial Catalog=AdventureWorks2012;Integrated Security=True"
+let connectionString = @"Data Source=.;Initial Catalog=AdventureWorks2012;Integrated Security=True;TrustServerCertificate=true"
 
 (**
 

docs/content/reference architecture.fsx

@@ -103,7 +103,7 @@ END
 open FSharp.Data
 
 [<Literal>]
-let adventureWorks = @"Data Source=(LocalDb)\v12.0;Initial Catalog=AdventureWorks2012;Integrated Security=True"
+let adventureWorks = @"Data Source=(LocalDb)\v12.0;Initial Catalog=AdventureWorks2012;Integrated Security=True;TrustServerCertificate=true"
 
 [<Literal>]
 let euler17 = "

docs/content/setup.fsx

@@ -1,8 +1,8 @@
 #nowarn "211"
-#r @"..\..\bin\net40\FSharp.Data.SqlClient.dll"
+#r @"..\..\bin\net462\FSharp.Data.SqlClient.dll"
 #r "System.Transactions"
 
 open FSharp.Data
 
 [<Literal>]
-let connectionString = @"Data Source=.;Initial Catalog=AdventureWorks2012;Integrated Security=True"
+let connectionString = @"Data Source=.;Initial Catalog=AdventureWorks2012;Integrated Security=True;TrustServerCertificate=true"

docs/content/sqlenumprovider.quickstart.fsx

@@ -37,7 +37,7 @@ A typical implementation for overnight orders shipped since Jan 1, 2008 is follo
 *)
 
 [<Literal>]
-let connStr = @"Data Source=.;Initial Catalog=AdventureWorks2012;Integrated Security=True"
+let connStr = @"Data Source=.;Initial Catalog=AdventureWorks2012;Integrated Security=True;TrustServerCertificate=true"
 
 open System 
 open System.Data.SqlClient
@@ -194,7 +194,7 @@ type Roles =
     SqlEnumProvider<"
         SELECT * 
         FROM (VALUES(('Read'), 1), ('Write', 2), ('Admin', 4)) AS T(Name, Value)
-    ", @"Data Source=(LocalDb)\v12.0;Integrated Security=True", Kind = SqlEnumKind.CLI>
+    ", @"Data Source=(LocalDb)\v12.0;Integrated Security=True;TrustServerCertificate=true", Kind = SqlEnumKind.CLI>
 
 type CustomAuthorizeAttribute(roles: Roles) = 
     inherit AuthorizeAttribute()

docs/content/transactions.fsx

@@ -4,7 +4,7 @@
 open FSharp.Data
 
 [<Literal>]
-let connectionString = @"Data Source=.;Initial Catalog=AdventureWorks2012;Integrated Security=True"
+let connectionString = @"Data Source=.;Initial Catalog=AdventureWorks2012;Integrated Security=True;TrustServerCertificate=true"
 
 (**
 Transactions 

docs/content/unit-testing.fsx

@@ -1,12 +1,12 @@
 (*** hide ***)
-#r @"..\..\bin\net40\FSharp.Data.SqlClient.dll"
+#r @"..\..\bin\net462\FSharp.Data.SqlClient.dll"
 #r @"..\..\packages\Test\xunit\lib\net20\xunit.dll"
 #r "System.Transactions"
 open FSharp.Data
 open System
 
 [<Literal>]
-let connectionString = @"Data Source=.;Initial Catalog=AdventureWorks2012;Integrated Security=True"
+let connectionString = @"Data Source=.;Initial Catalog=AdventureWorks2012;Integrated Security=True;TrustServerCertificate=true"
 
 (**
 

docs/content/user.config

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <connectionStrings>
-    <add name="AdventureWorks" connectionString="Data Source=.;Initial Catalog=AdventureWorks2012;Integrated Security=True" />
+    <add name="AdventureWorks" connectionString="Data Source=.;Initial Catalog=AdventureWorks2012;Integrated Security=True;TrustServerCertificate=true" />
   </connectionStrings>
 </configuration>

docs/content/whatsnew.fsx

@@ -1,12 +1,12 @@
 (*** hide ***)
 #r "Microsoft.SqlServer.Types.dll"
-#r @"..\..\bin\net40\FSharp.Data.SqlClient.dll"   
+#r @"..\..\bin\net462\FSharp.Data.SqlClient.dll"   
 
 open FSharp.Data
 
 [<Literal>]
 let connectionString = 
-    @"Data Source=.;Initial Catalog=AdventureWorks2012;Integrated Security=True"
+    @"Data Source=.;Initial Catalog=AdventureWorks2012;Integrated Security=True;TrustServerCertificate=true"
 
 type DB = SqlProgrammabilityProvider<connectionString>
 

netfx.props

@@ -36,7 +36,7 @@
   </ItemGroup>
 
   <!-- F# SQL CLIENT STUFF -->
-  <PropertyGroup Condition="$(TargetFramework) == 'net461'">
+  <PropertyGroup Condition="$(TargetFramework) == 'net462'">
     <!-- 
     Microsoft.SqlServer.Types is currently not available for netstandard, 
     USE_SQL_SERVER_TYPES_ASSEMBLY singles out code depending on it
@@ -45,7 +45,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-      <PackageReference Include="System.Data.SqlClient" Version="4.5.1" Condition="'$(TargetFramework)' != 'net40'" />
+      <PackageReference Include="System.Data.SqlClient" Version="4.9.0" Condition="'$(TargetFramework)' != 'net462'" />
   </ItemGroup>
 
 </Project>

nuget/SqlClient.nuspec

@@ -15,20 +15,25 @@
     <copyright>Copyright 2015</copyright>
     <tags>@tags@</tags>
     <frameworkAssemblies>
-      <frameworkAssembly assemblyName="System.Data" targetFramework="net40" />
-      <frameworkAssembly assemblyName="System.Xml" targetFramework="net40" />
+      <frameworkAssembly assemblyName="System.Data" targetFramework="net462" />
+      <frameworkAssembly assemblyName="System.Xml" targetFramework="net462" />
     </frameworkAssemblies>
     <references>
       <reference file="FSharp.Data.SqlClient.dll" />
     </references>
     <dependencies>
-      <group targetFramework="net40">
-        <dependency id="FSharp.Core" version="4.1.18" />
+      <group targetFramework="net462">
+        <dependency id="FSharp.Core" version="8.0.301" />
       </group>
       <group targetFramework="netstandard2.0">
-        <dependency id="FSharp.Core" version="4.3.4" />
-        <dependency id="System.Data.SqlClient" version="4.5.1" />
-        <dependency id="System.Configuration.ConfigurationManager" version="4.5.0" />
+        <dependency id="FSharp.Core" version="8.0.301" />
+        <dependency id="System.Data.SqlClient" version="4.9.0" />
+        <dependency id="System.Configuration.ConfigurationManager" version="9.0.4" />
+      </group>
+      <group targetFramework="net8.0">
+        <dependency id="FSharp.Core" version="8.0.301" />
+        <dependency id="System.Data.SqlClient" version="4.9.0" />
+        <dependency id="System.Configuration.ConfigurationManager" version="9.0.4" />
       </group>
     </dependencies>
   </metadata>