Merge pull request #388 from smoothdeveloper/use-global-json

use global.json rather than hardcoded dotnet sdk version in build.fsx
fsprojects · Nov 15, 2020 · 8dd0898 · 8dd0898
2 parents a92db69 + 5454f49
commit 8dd0898
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 5 deletions.
diff --git a/build.fsx b/build.fsx
@@ -43,7 +43,7 @@ let release =
 let version = release.AssemblyVersion
 let releaseNotes = release.Notes |> String.concat "\n"
 
-let install = lazy DotNet.install DotNet.Versions.Release_2_1_402
+let install = lazy DotNet.install DotNet.Versions.FromGlobalJson
 let inline dnDefault arg = DotNet.Options.lift install.Value arg
 
 // --------------------------------------------------------------------------------------
@@ -249,8 +249,8 @@ open Fake.Core.TargetOperators // for ==>
 "Clean"
   ==> "AssemblyInfo"
   ==> "Build"
-  ==> "BuildTestProjects"
   ==> "DeployTestDB"  
+  ==> "BuildTestProjects"  
   ==> "RunTests"
   ==> "All"
 

diff --git a/global.json b/global.json
@@ -0,0 +1 @@
+{ "sdk": { "version": "2.1.402" } }
diff --git a/src/SqlClient.TestProjects/Lib/App.config b/src/SqlClient.TestProjects/Lib/App.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <connectionStrings>
-    <add name="AdventureWorks" connectionString="Data Source=mhknbn2kdz.database.windows.net;Initial Catalog=AdventureWorks2012;Integrated Security=False;User ID=sqlfamily;Password=sqlf@m1ly" />
+    <add name="AdventureWorks" connectionString="Data Source=localhost;Initial Catalog=AdventureWorks2012;Integrated Security=True" />
   </connectionStrings>
 </configuration>
diff --git a/src/SqlClient.TestProjects/SqlClient.Tests.NET40/Program.fs b/src/SqlClient.TestProjects/SqlClient.Tests.NET40/Program.fs
@@ -1,7 +1,7 @@
 open FSharp.Data
 
 [<Literal>]
-let connectionString = "Data Source=mhknbn2kdz.database.windows.net;Initial Catalog=AdventureWorks2012;Integrated Security=False;User ID=sqlfamily;Password=sqlf@m1ly"
+let connectionString = "Data Source=localhost;Initial Catalog=AdventureWorks2012;Integrated Security=True"
 
 [<EntryPoint>]
 let main _ =

diff --git a/src/SqlClient.TestProjects/SqlClient.Tests.NetCoreApp/Program.fs b/src/SqlClient.TestProjects/SqlClient.Tests.NetCoreApp/Program.fs
@@ -1,7 +1,7 @@
 open FSharp.Data
 
 [<Literal>]
-let Cnx = "Data Source=mhknbn2kdz.database.windows.net;Initial Catalog=AdventureWorks2012;Integrated Security=False;User ID=sqlfamily;Password=sqlf@m1ly"
+let Cnx = "Data Source=.;Initial Catalog=AdventureWorks2012;Integrated Security=True"
 
 type SingleColumnSelect = SqlEnumProvider<"SELECT Name FROM Purchasing.ShipMethod", Cnx>
 type TinyIntEnum = SqlEnumProvider<"SELECT * FROM (VALUES(('One'), CAST(1 AS tinyint)), ('Two', CAST(2 AS tinyint))) AS T(Tag, Value)", Cnx, Kind = SqlEnumKind.CLI>