Skip to content

Commit 8dd0898

Browse files
Merge pull request #388 from smoothdeveloper/use-global-json
use global.json rather than hardcoded dotnet sdk version in build.fsx
2 parents a92db69 + 5454f49 commit 8dd0898

File tree

5 files changed

+6
-5
lines changed

5 files changed

+6
-5
lines changed

build.fsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ let release =
4343
let version = release.AssemblyVersion
4444
let releaseNotes = release.Notes |> String.concat "\n"
4545

46-
let install = lazy DotNet.install DotNet.Versions.Release_2_1_402
46+
let install = lazy DotNet.install DotNet.Versions.FromGlobalJson
4747
let inline dnDefault arg = DotNet.Options.lift install.Value arg
4848

4949
// --------------------------------------------------------------------------------------
@@ -249,8 +249,8 @@ open Fake.Core.TargetOperators // for ==>
249249
"Clean"
250250
==> "AssemblyInfo"
251251
==> "Build"
252-
==> "BuildTestProjects"
253252
==> "DeployTestDB"
253+
==> "BuildTestProjects"
254254
==> "RunTests"
255255
==> "All"
256256

global.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{ "sdk": { "version": "2.1.402" } }
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=mhknbn2kdz.database.windows.net;Initial Catalog=AdventureWorks2012;Integrated Security=False;User ID=sqlfamily;Password=sqlf@m1ly" />
4+
<add name="AdventureWorks" connectionString="Data Source=localhost;Initial Catalog=AdventureWorks2012;Integrated Security=True" />
55
</connectionStrings>
66
</configuration>

src/SqlClient.TestProjects/SqlClient.Tests.NET40/Program.fs

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

33
[<Literal>]
4-
let connectionString = "Data Source=mhknbn2kdz.database.windows.net;Initial Catalog=AdventureWorks2012;Integrated Security=False;User ID=sqlfamily;Password=sqlf@m1ly"
4+
let connectionString = "Data Source=localhost;Initial Catalog=AdventureWorks2012;Integrated Security=True"
55

66
[<EntryPoint>]
77
let main _ =

src/SqlClient.TestProjects/SqlClient.Tests.NetCoreApp/Program.fs

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

33
[<Literal>]
4-
let Cnx = "Data Source=mhknbn2kdz.database.windows.net;Initial Catalog=AdventureWorks2012;Integrated Security=False;User ID=sqlfamily;Password=sqlf@m1ly"
4+
let Cnx = "Data Source=.;Initial Catalog=AdventureWorks2012;Integrated Security=True"
55

66
type SingleColumnSelect = SqlEnumProvider<"SELECT Name FROM Purchasing.ShipMethod", Cnx>
77
type TinyIntEnum = SqlEnumProvider<"SELECT * FROM (VALUES(('One'), CAST(1 AS tinyint)), ('Two', CAST(2 AS tinyint))) AS T(Tag, Value)", Cnx, Kind = SqlEnumKind.CLI>

0 commit comments

Comments
 (0)