From 0df6be845fbb183da68b2529b5eae91258787b1d Mon Sep 17 00:00:00 2001 From: Gauthier Segay Date: Fri, 1 Dec 2023 21:37:24 +0100 Subject: [PATCH 01/11] appveyor, what breaks if I switch this? --- global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.json b/global.json index aac6be5e..67a67c24 100644 --- a/global.json +++ b/global.json @@ -1 +1 @@ -{ "sdk": { "version": "2.1.402" } } \ No newline at end of file +{ "sdk": { "version": "8.0.100" } } \ No newline at end of file From f1ed40e5c92381daae660b42b54cfc17d40aef4b Mon Sep 17 00:00:00 2001 From: Gauthier Segay Date: Fri, 1 Dec 2023 23:19:59 +0100 Subject: [PATCH 02/11] try VS2022 appveyor image --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 127981a3..88acefac 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,6 +1,6 @@ init: - git config --global core.autocrlf input -image: Visual Studio 2017 +image: Visual Studio 2022 build_script: - cmd: build.cmd GenerateDocs test: off From 703683ecc0111d8d7f4a317519d3fe63723e30de Mon Sep 17 00:00:00 2001 From: Gauthier Segay Date: Fri, 1 Dec 2023 23:38:30 +0100 Subject: [PATCH 03/11] net start mssql 2019 in appveyor --- appveyor.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/appveyor.yml b/appveyor.yml index 88acefac..b86e5055 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,5 +1,6 @@ init: - git config --global core.autocrlf input + - net start MSSQL$SQL2019 image: Visual Studio 2022 build_script: - cmd: build.cmd GenerateDocs From 4ecef5be67a61595bd0368cad33bb89d83846efa Mon Sep 17 00:00:00 2001 From: Gauthier Segay Date: Sat, 2 Dec 2023 00:23:46 +0100 Subject: [PATCH 04/11] comment start sql2014 service from appveyor for now. --- appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index b86e5055..d6800209 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -9,5 +9,5 @@ version: 0.0.1.{build} artifacts: - path: bin name: bin -services: - - mssql2014 +#services: +# - mssql2014 From 5f1dff8647aa046900413faa078e71685ccffc7f Mon Sep 17 00:00:00 2001 From: Gauthier Segay Date: Sat, 2 Dec 2023 01:17:14 +0100 Subject: [PATCH 05/11] pick msbuild from vs2022 or vs2019 and remove older ones (vs2017 and msbuild15.0). --- build.fsx | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/build.fsx b/build.fsx index c51b24da..70fb073d 100644 --- a/build.fsx +++ b/build.fsx @@ -80,15 +80,14 @@ let runMsBuild project = (fun args -> let toolPath = [ + @"C:\Program Files\Microsoft Visual Studio\2022\BuildTools\MSBuild\Current\Bin" + @"C:\Program Files\Microsoft Visual Studio\2022\Preview\MSBuild\current\Bin" + @"C:\Program Files\Microsoft Visual Studio\2022\Professional\MSBuild\current\Bin" + @"C:\Program Files\Microsoft Visual Studio\2022\Community\MSBuild\current\Bin" @"C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\MSBuild\Current\Bin" @"C:\Program Files (x86)\Microsoft Visual Studio\2019\Preview\MSBuild\current\Bin" @"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\MSBuild\current\Bin" @"C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\MSBuild\current\Bin" - @"C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\MSBuild\15.0\Bin" - @"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\MSBuild\15.0\Bin" - @"C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin" - @"C:\Program Files (x86)\MSBuild\15.0\Bin" - @"\Microsoft Visual Studio\2017\BuildTools\MSBuild\15.0\Bin" args.ToolPath ] |> List.map (fun p -> Path.Combine(p, "MSBuild.exe")) From 3d509d8e0698219f9b2ec2ff1c2f683587173aef Mon Sep 17 00:00:00 2001 From: Gauthier Segay Date: Sat, 2 Dec 2023 02:05:59 +0100 Subject: [PATCH 06/11] remove comment in appveyor.yml and add CHANGE_LOG.md --- CHANGE_LOG.md | 14 ++++++++++++++ appveyor.yml | 2 -- 2 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 CHANGE_LOG.md diff --git a/CHANGE_LOG.md b/CHANGE_LOG.md new file mode 100644 index 00000000..8a3a81a9 --- /dev/null +++ b/CHANGE_LOG.md @@ -0,0 +1,14 @@ +# Unreleased + +# 2023-12 + +## dotnet SDK and CI Infrastructure updates + +* cleanup: delete xunit test output from the repository +* adjust all tests to be under FSharp.Data.SqlClient.Tests namespace, removing all the conditional about "legacy namespace" support in context of tests. +* adjust .sln to have few more useful stuff in the solution explorer +* few launch settings to make it possible to launch in debug vscode +* appveyor, what breaks if I switch this? +* try VS2022 appveyor image +* net start mssql 2019 in appveyor +* pick msbuild from vs2022 or vs2019 and remove older ones (vs2017 and msbuild15.0) \ No newline at end of file diff --git a/appveyor.yml b/appveyor.yml index d6800209..8d038433 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -9,5 +9,3 @@ version: 0.0.1.{build} artifacts: - path: bin name: bin -#services: -# - mssql2014 From f172aa5baaa441232bcae91a720e9db2dfe9fa42 Mon Sep 17 00:00:00 2001 From: Gauthier Segay Date: Sat, 2 Dec 2023 03:25:17 +0100 Subject: [PATCH 07/11] try to fix appveyor failing to build sample lib.fsproj --- src/SqlClient.TestProjects/Lib/Lib.fsproj | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/SqlClient.TestProjects/Lib/Lib.fsproj b/src/SqlClient.TestProjects/Lib/Lib.fsproj index 3e515f97..a354e31b 100644 --- a/src/SqlClient.TestProjects/Lib/Lib.fsproj +++ b/src/SqlClient.TestProjects/Lib/Lib.fsproj @@ -18,7 +18,8 @@ - + + ..\..\..\bin\netstandard2.0\FSharp.Data.SqlClient.dll From 7051bc36512212df109121ac9154760215016e6f Mon Sep 17 00:00:00 2001 From: Gauthier Segay Date: Sat, 2 Dec 2023 03:42:22 +0100 Subject: [PATCH 08/11] try to enable dotnet 8 on appveyor, and enable roll forward in global.json --- appveyor.yml | 3 +++ global.json | 8 +++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 8d038433..7f1deb94 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -2,6 +2,9 @@ init: - git config --global core.autocrlf input - net start MSSQL$SQL2019 image: Visual Studio 2022 +before_build: +# switch on dotnet 8 on appveyor: https://github.com/appveyor/ci/issues/3897#issuecomment-1827682384 +- choco install dotnet-sdk --version 8.0.100 build_script: - cmd: build.cmd GenerateDocs test: off diff --git a/global.json b/global.json index 67a67c24..7fa76039 100644 --- a/global.json +++ b/global.json @@ -1 +1,7 @@ -{ "sdk": { "version": "8.0.100" } } \ No newline at end of file +{ + "sdk": + { + "version": "8.0.100" + , "rollForward": "latestFeature" + } +} \ No newline at end of file From 598f4160bf19b2976cd0d061cda67e1fb48ef72d Mon Sep 17 00:00:00 2001 From: Gauthier Segay Date: Sat, 2 Dec 2023 04:02:15 +0100 Subject: [PATCH 09/11] another try for appveyor, downgrade to vs2019 for now. --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 7f1deb94..ee384e0e 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,7 +1,7 @@ init: - git config --global core.autocrlf input - net start MSSQL$SQL2019 -image: Visual Studio 2022 +image: Visual Studio 2019 # VS2022 not yet ok with choco install dotnet sdk and appveyor not updated for dotnet 8 yet? before_build: # switch on dotnet 8 on appveyor: https://github.com/appveyor/ci/issues/3897#issuecomment-1827682384 - choco install dotnet-sdk --version 8.0.100 From 9e019e4de10aa9f0fcf62317cec1df8bd0513ac1 Mon Sep 17 00:00:00 2001 From: Gauthier Segay Date: Sat, 2 Dec 2023 04:10:30 +0100 Subject: [PATCH 10/11] try dotnet 7 while appveyor is not ok with 8 --- appveyor.yml | 6 +++--- global.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index ee384e0e..f0ac0792 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,10 +1,10 @@ init: - git config --global core.autocrlf input - net start MSSQL$SQL2019 -image: Visual Studio 2019 # VS2022 not yet ok with choco install dotnet sdk and appveyor not updated for dotnet 8 yet? -before_build: +image: Visual Studio 2022 +#before_build: # switch on dotnet 8 on appveyor: https://github.com/appveyor/ci/issues/3897#issuecomment-1827682384 -- choco install dotnet-sdk --version 8.0.100 +#- choco install dotnet-sdk --version 8.0.100 build_script: - cmd: build.cmd GenerateDocs test: off diff --git a/global.json b/global.json index 7fa76039..f7786958 100644 --- a/global.json +++ b/global.json @@ -1,7 +1,7 @@ { "sdk": { - "version": "8.0.100" + "version": "7.0.100" , "rollForward": "latestFeature" } } \ No newline at end of file From 61ab445c0ae2a3f7c1ccf3ef4ea96f7278bc216d Mon Sep 17 00:00:00 2001 From: Gauthier Segay Date: Sat, 2 Dec 2023 04:29:56 +0100 Subject: [PATCH 11/11] add a Directory.Build.props which is sensible in context of this repository, and may help progress with appveyor and dotnet sdk update in this branch. --- Directory.Build.props | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 Directory.Build.props diff --git a/Directory.Build.props b/Directory.Build.props new file mode 100644 index 00000000..9f55f399 --- /dev/null +++ b/Directory.Build.props @@ -0,0 +1,24 @@ + + + + $(WarningsNotAsErrors);44; + latest + + + Release + AnyCPU + true + true + + $(WarningsNotAsErrors);NU1504;NU1701;NU1902;NU1903;NU1904 + + \ No newline at end of file