fix CI

Author: dsyme

build/build.fs

@@ -2,6 +2,7 @@ open Fake.DotNet
 open System
 open System.Linq
 open System.IO
+open System.Xml.Linq
 open Fun.Build
 open Fake.Core
 open Fake.Tools.Git
@@ -127,7 +128,6 @@ Target.create "Build" (fun _ ->
         slnPath)
 
 open System.Data.SqlClient
-open System.Configuration
 open System.IO.Compression
 open Fake.DotNet.Testing
 
@@ -141,29 +141,32 @@ Target.create "DeployTestDB" (fun _ ->
 
         stage "adjust config file connection strings" {
             run (fun ctx ->
-                let map = ExeConfigurationFileMap()
-                map.ExeConfigFilename <- testsSourceRoot @@ "app.config"
+                let appConfigPath = testsSourceRoot @@ "app.config"
 
-                let testConfigFile =
-                    ConfigurationManager.OpenMappedExeConfiguration(map, ConfigurationUserLevel.None)
+                let connStrValue =
+                    let gitHubActionSqlConnectionString =
+                        System.Environment.GetEnvironmentVariable "GITHUB_ACTION_SQL_SERVER_CONNECTION_STRING"
 
-                let connStr =
-                    let connStr =
-                        let gitHubActionSqlConnectionString =
-                            System.Environment.GetEnvironmentVariable "GITHUB_ACTION_SQL_SERVER_CONNECTION_STRING"
+                    if String.IsNullOrWhiteSpace gitHubActionSqlConnectionString then
+                        // Read current value directly from XML
+                        let doc = XDocument.Load(appConfigPath)
 
-                        if String.IsNullOrWhiteSpace gitHubActionSqlConnectionString then
-                            testConfigFile.ConnectionStrings.ConnectionStrings.["AdventureWorks"].ConnectionString
-                        else
-                            // we run under Github Actions, update the test config file connection string.
-                            testConfigFile.ConnectionStrings.ConnectionStrings.["AdventureWorks"].ConnectionString <-
-                                gitHubActionSqlConnectionString
+                        doc.Root.Element("connectionStrings").Elements("add")
+                        |> Seq.find (fun el -> el.Attribute(XName.Get "name").Value = "AdventureWorks")
+                        |> fun el -> el.Attribute(XName.Get "connectionString").Value
+                    else
+                        // Write the new connection string directly into the XML file
+                        let doc = XDocument.Load(appConfigPath)
 
-                            testConfigFile.Save()
-                            gitHubActionSqlConnectionString
+                        let el =
+                            doc.Root.Element("connectionStrings").Elements("add")
+                            |> Seq.find (fun el -> el.Attribute(XName.Get "name").Value = "AdventureWorks")
 
-                    SqlConnectionStringBuilder connStr
+                        el.SetAttributeValue(XName.Get "connectionString", gitHubActionSqlConnectionString)
+                        doc.Save(appConfigPath)
+                        gitHubActionSqlConnectionString
 
+                let connStr = SqlConnectionStringBuilder connStrValue
                 testConnStr <- Some connStr
                 database <- Some connStr.InitialCatalog
 

src/SqlClient.DesignTime/AssemblyInfo.fs

@@ -7,8 +7,8 @@ open System.Runtime.CompilerServices
 [<assembly: AssemblyTitleAttribute("SqlClient.DesignTime")>]
 [<assembly: AssemblyProductAttribute("FSharp.Data.SqlClient.DesignTime")>]
 [<assembly: AssemblyDescriptionAttribute("SqlClient F# type providers")>]
-[<assembly: AssemblyVersionAttribute("2.1.3")>]
-[<assembly: AssemblyFileVersionAttribute("2.1.3")>]
+[<assembly: AssemblyVersionAttribute("3.0.0")>]
+[<assembly: AssemblyFileVersionAttribute("3.0.0")>]
 [<assembly: InternalsVisibleToAttribute("SqlClient.Tests")>]
 do ()
 
@@ -23,10 +23,10 @@ module internal AssemblyVersionInformation =
     let AssemblyDescription = "SqlClient F# type providers"
 
     [<Literal>]
-    let AssemblyVersion = "2.1.3"
+    let AssemblyVersion = "3.0.0"
 
     [<Literal>]
-    let AssemblyFileVersion = "2.1.3"
+    let AssemblyFileVersion = "3.0.0"
 
     [<Literal>]
     let InternalsVisibleTo = "SqlClient.Tests"

src/SqlClient/AssemblyInfo.fs

@@ -7,8 +7,8 @@ open System.Runtime.CompilerServices
 [<assembly: AssemblyTitleAttribute("SqlClient")>]
 [<assembly: AssemblyProductAttribute("FSharp.Data.SqlClient")>]
 [<assembly: AssemblyDescriptionAttribute("SqlClient F# type providers")>]
-[<assembly: AssemblyVersionAttribute("2.1.3")>]
-[<assembly: AssemblyFileVersionAttribute("2.1.3")>]
+[<assembly: AssemblyVersionAttribute("3.0.0")>]
+[<assembly: AssemblyFileVersionAttribute("3.0.0")>]
 [<assembly: InternalsVisibleToAttribute("SqlClient.Tests")>]
 do ()
 
@@ -23,10 +23,10 @@ module internal AssemblyVersionInformation =
     let AssemblyDescription = "SqlClient F# type providers"
 
     [<Literal>]
-    let AssemblyVersion = "2.1.3"
+    let AssemblyVersion = "3.0.0"
 
     [<Literal>]
-    let AssemblyFileVersion = "2.1.3"
+    let AssemblyFileVersion = "3.0.0"
 
     [<Literal>]
     let InternalsVisibleTo = "SqlClient.Tests"

tests/SqlClient.Tests/app.config

@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <configSections>
     <section name="FSharp.Data.SqlClient" type="System.Configuration.NameValueSectionHandler" />
   </configSections>
   <!--<connectionStrings configSource="connectionStrings.Azure.config"/>-->
   <connectionStrings>
-    <add name="AdventureWorks" connectionString="Data Source=.;Initial Catalog=AdventureWorks2012;Integrated Security=True;TrustServerCertificate=true" />
-    <add name="MasterDb" connectionString="Data Source=.;Initial Catalog=master;Integrated Security=True;TrustServerCertificate=true" />
+      <add name="AdventureWorks" connectionString="Data Source=localhost,1433;Initial Catalog=AdventureWorks2012;User ID=SA;Password=YourStrong@Passw0rd;TrustServerCertificate=True;" />
+      <add name="MasterDb" connectionString="Data Source=.;Initial Catalog=master;Integrated Security=True;TrustServerCertificate=true" />
   </connectionStrings>
 <runtime><assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
   <dependentAssembly>