Minor changes

SqlClient.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.28010.2041
+# Visual Studio Version 17
+VisualStudioVersion = 17.8.34309.116
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".paket", ".paket", "{FD7933BD-2A90-49EB-A4B2-95F9D3076BBD}"
 	ProjectSection(SolutionItems) = preProject
@@ -17,7 +17,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 	ProjectSection(SolutionItems) = preProject
 		build.cmd = build.cmd
 		build.fsx = build.fsx
+		Directory.Build.props = Directory.Build.props
+		fsc.props = fsc.props
 		LICENSE.md = LICENSE.md
+		netfx.props = netfx.props
 		README.md = README.md
 		RELEASE_NOTES.md = RELEASE_NOTES.md
 	EndProjectSection

Tests.sln

@@ -1,11 +1,12 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.28010.2041
+# Visual Studio Version 17
+VisualStudioVersion = 17.9.34310.174
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".paket", ".paket", "{E35ED000-5A6C-49E1-82CF-55CB8C16C2AB}"
 	ProjectSection(SolutionItems) = preProject
 		paket.dependencies = paket.dependencies
+		paket.lock = paket.lock
 	EndProjectSection
 EndProject
 Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "SqlClient.Tests", "tests\SqlClient.Tests\SqlClient.Tests.fsproj", "{36665EFF-56A2-46C2-852D-6D26DF492D79}"
@@ -14,6 +15,13 @@ Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "SqlClient.DesignTime.Tests"
 EndProject
 Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "SqlClient.SqlServerTypes.Tests", "tests\SqlClient.SqlServerTypes.Tests\SqlClient.SqlServerTypes.Tests.fsproj", "{CF3D9433-B20A-4E5A-9401-F6518CBAD34E}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution items", "Solution items", "{0005CBDB-E976-46EE-89A0-CEE3F25A9365}"
+	ProjectSection(SolutionItems) = preProject
+		Directory.Build.props = Directory.Build.props
+		fsc.props = fsc.props
+		netfx.props = netfx.props
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU

fsc.props

@@ -6,45 +6,50 @@
     <IsOSX Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::OSX)))' == 'true'">true</IsOSX>
     <IsLinux Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))' == 'true'">true</IsLinux>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(IsWindows)' == 'true' AND Exists('C:\Program Files (x86)\Microsoft SDKs\F#\4.1\Framework\v4.0\fsc.exe')">
-    <FscToolPath>C:\Program Files (x86)\Microsoft SDKs\F#\4.1\Framework\v4.0</FscToolPath>
+  <PropertyGroup Condition="'$(IsWindows)' == 'true'">
     <FscToolExe>fsc.exe</FscToolExe>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(IsWindows)' == 'true' AND Exists('C:\Program Files\Microsoft Visual Studio\2022\BuildTools\Common7\IDE\CommonExtensions\Microsoft\FSharp\fsc.exe')">
+    <FscToolPath>C:\Program Files\Microsoft Visual Studio\2022\BuildTools\Common7\IDE\CommonExtensions\Microsoft\FSharp</FscToolPath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(IsWindows)' == 'true' AND Exists('C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\CommonExtensions\Microsoft\FSharp\fsc.exe')">
+    <FscToolPath>C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\CommonExtensions\Microsoft\FSharp</FscToolPath>    
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(IsWindows)' == 'true' AND Exists('C:\Program Files\Microsoft Visual Studio\2022\Professional\Common7\IDE\CommonExtensions\Microsoft\FSharp\fsc.exe')">
+    <FscToolPath>C:\Program Files\Microsoft Visual Studio\2022\Professional\Common7\IDE\CommonExtensions\Microsoft\FSharp</FscToolPath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(IsWindows)' == 'true' AND Exists('C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\IDE\CommonExtensions\Microsoft\FSharp\fsc.exe')">
+    <FscToolPath>C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\IDE\CommonExtensions\Microsoft\FSharp</FscToolPath>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(IsWindows)' == 'true' AND Exists('C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\Common7\IDE\CommonExtensions\Microsoft\FSharp\fsc.exe')">
     <FscToolPath>C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\Common7\IDE\CommonExtensions\Microsoft\FSharp</FscToolPath>
-    <FscToolExe>fsc.exe</FscToolExe>
   </PropertyGroup>
   <PropertyGroup Condition="'$(IsWindows)' == 'true' AND Exists('C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\IDE\CommonExtensions\Microsoft\FSharp\fsc.exe')">
     <FscToolPath>C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\IDE\CommonExtensions\Microsoft\FSharp</FscToolPath>
-    <FscToolExe>fsc.exe</FscToolExe>
   </PropertyGroup>
   <PropertyGroup Condition="'$(IsWindows)' == 'true' AND Exists('C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\Common7\IDE\CommonExtensions\Microsoft\FSharp\fsc.exe')">
     <FscToolPath>C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\Common7\IDE\CommonExtensions\Microsoft\FSharp</FscToolPath>
-    <FscToolExe>fsc.exe</FscToolExe>
   </PropertyGroup>
   <PropertyGroup Condition="'$(IsWindows)' == 'true' AND Exists('C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\IDE\CommonExtensions\Microsoft\FSharp\fsc.exe')">
     <FscToolPath>C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\IDE\CommonExtensions\Microsoft\FSharp</FscToolPath>
-    <FscToolExe>fsc.exe</FscToolExe>
   </PropertyGroup>
   <PropertyGroup Condition="'$(IsWindows)' == 'true' AND Exists('C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\Common7\IDE\CommonExtensions\Microsoft\FSharp\fsc.exe')">
     <FscToolPath>C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\Common7\IDE\CommonExtensions\Microsoft\FSharp</FscToolPath>
-    <FscToolExe>fsc.exe</FscToolExe>
   </PropertyGroup>
   <PropertyGroup Condition="'$(IsWindows)' == 'true' AND Exists('C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\CommonExtensions\Microsoft\FSharp\fsc.exe')">
     <FscToolPath>C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\CommonExtensions\Microsoft\FSharp</FscToolPath>
-    <FscToolExe>fsc.exe</FscToolExe>
   </PropertyGroup>
   <PropertyGroup Condition="'$(IsWindows)' == 'true' AND Exists('C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\Common7\IDE\CommonExtensions\Microsoft\FSharp\fsc.exe')">
     <FscToolPath>C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\Common7\IDE\CommonExtensions\Microsoft\FSharp</FscToolPath>
-    <FscToolExe>fsc.exe</FscToolExe>
   </PropertyGroup>
   <PropertyGroup Condition="'$(IsWindows)' == 'true' AND Exists('C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\Common7\IDE\CommonExtensions\Microsoft\FSharp\fsc.exe')">
     <FscToolPath>C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\Common7\IDE\CommonExtensions\Microsoft\FSharp</FscToolPath>
-    <FscToolExe>fsc.exe</FscToolExe>
   </PropertyGroup>
   <PropertyGroup Condition="'$(IsWindows)' == 'true' AND Exists('C:\Program Files (x86)\Microsoft SDKs\F#\10.1\Framework\v4.0\fsc.exe')">
     <FscToolPath>C:\Program Files (x86)\Microsoft SDKs\F#\10.1\Framework\v4.0</FscToolPath>
-    <FscToolExe>fsc.exe</FscToolExe>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(IsWindows)' == 'true' AND Exists('C:\Program Files (x86)\Microsoft SDKs\F#\4.1\Framework\v4.0\fsc.exe')">
+    <FscToolPath>C:\Program Files (x86)\Microsoft SDKs\F#\4.1\Framework\v4.0</FscToolPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(IsOSX)' == 'true'  AND Exists('/Library/Frameworks/Mono.framework/Versions/Current/Commands/fsharpc')">
     <FscToolPath>/Library/Frameworks/Mono.framework/Versions/Current/Commands</FscToolPath>
@@ -54,4 +59,8 @@
     <FscToolPath>/usr/bin</FscToolPath>
     <FscToolExe>fsharpc</FscToolExe>
   </PropertyGroup>
-</Project>
+  <!-- it doesn't do what I want: @baronfel "Imports and property groups are part of evaluation phase, not execution phase. Errors and warnings are only fired during execution phase. Best which can be done is detect the bad state in a target that you run early in the build"  
+  <Error Condition="'$(FscToolPath)' == ''" Text="FscToolPath MSBuild property could'nt be set" />
+  <Error Condition="'$(FscToolPath)' == ''" Text="FscToolExe MSBuild property could'nt be set" />
+  -->
+</Project>

src/SqlClient/Properties/launchSettings.json

@@ -1,9 +1,19 @@
 {
   "profiles": {
-    "SqlClient": {
+    "debug vs2022": {
       "commandName": "Executable",
-      "executablePath": "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Professional\\Common7\\IDE\\devenv.exe",
-      "commandLineArgs": "..\\..\\Tests.sln"
+      "executablePath": "C:\\Program Files\\Microsoft Visual Studio\\2022\\Community\\Common7\\IDE\\devenv.exe",
+      "commandLineArgs": "..\\Tests.sln"
+    },
+    "debug vscode": {
+      "commandName": "Executable",
+      "executablePath": "C:\\Users\\gauth\\AppData\\Local\\Programs\\Microsoft VS Code\\Code.exe",
+      "commandLineArgs": "..\\"
+    },
+    "debug rider": {
+      "commandName": "Executable",
+      "executablePath": "C:\\Users\\gauth\\AppData\\Local\\JetBrains\\Toolbox\\apps\\Rider\\ch-0\\232.10203.29\\bin\\rider64.exe",
+      "commandLineArgs": "..\\..\\..\\..\\..\\tests.sln"
     }
   }
 }

tests/SqlClient.DesignTime.Tests/SqlClient.DesignTime.Tests.fsproj

@@ -8,7 +8,6 @@
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <NoWarn>101</NoWarn>
-    <DefineConstants>$(DefineConstants);WITH_LEGACY_NAMESPACE</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <None Include="app.config" />

tests/SqlClient.SqlServerTypes.Tests/SpatialTypesTests.fs

@@ -1,10 +1,6 @@
-#if WITH_LEGACY_NAMESPACE
-module FSharp.Data.SpatialTypesTests
-open FSharp.Data.SqlClient
-#else
-module FSharp.Data.SqlClient.SpatialTypesTests
-#endif
+module FSharp.Data.SqlClient.Tests.SpatialTypesTests
 
+open FSharp.Data
 open Xunit
 open Microsoft.SqlServer.Types
 open System.Data.SqlTypes

tests/SqlClient.SqlServerTypes.Tests/SqlClient.SqlServerTypes.Tests.fsproj

@@ -10,7 +10,6 @@
     for the time necessary of the transition, this enables more coverage of the type aliases working the way expected in client code
     -->
     <NoWarn>$(NoWarn);0044</NoWarn>
-    <DefineConstants>$(DefineConstants);WITH_LEGACY_NAMESPACE</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <None Include="App.config" />

tests/SqlClient.Tests/ConfigurationTest.fs

@@ -1,7 +1,9 @@
-module FSharp.Data.SqlClient.ConfigurationTests 
+module FSharp.Data.SqlClient.Tests.ConfigurationTests 
 
 open Xunit
 open FSharp.Data
+open FSharp.Data.SqlClient
+open FSharp.Data.SqlClient.Tests
 open System.Configuration
 
 let adventureWorks = ConfigurationManager.ConnectionStrings.["AdventureWorks"].ConnectionString

tests/SqlClient.Tests/ConnectionStrings.fs

@@ -1,4 +1,4 @@
-module FSharp.Data.ConnectionStrings 
+module FSharp.Data.SqlClient.Tests.ConnectionStrings 
 
 [<Literal>]
 let server = @"."

tests/SqlClient.Tests/CreateCommand.fs

@@ -1,8 +1,10 @@
-module FSharp.Data.CreateCommandTest
-
+module FSharp.Data.SqlClient.Tests.CreateCommandTest
+open FSharp.Data
+open FSharp.Data.SqlClient
+open FSharp.Data.SqlClient.Tests
 open Xunit
 
-type DB = FSharp.Data.ProgrammabilityTest.AdventureWorks
+type DB = FSharp.Data.SqlClient.Tests.ProgrammabilityTest.AdventureWorks
 
 [<Fact>]
 let getSingleRowNoParams() = 

tests/SqlClient.Tests/DataTablesTests.fs

@@ -1,4 +1,4 @@
-namespace FSharp.Data
+namespace FSharp.Data.SqlClient.Tests
 
 open System
 open System.Configuration
@@ -7,6 +7,7 @@ open System.Data.SqlClient
 open System.Data
 open FSharp.Data
 open FSharp.Data.SqlClient
+open FSharp.Data.SqlClient.Tests
 open Xunit
 
 open ProgrammabilityTest

tests/SqlClient.Tests/DynamicRecordTests.fs

@@ -1,4 +1,4 @@
-module FSharp.Data.DynamicRecordTests
+module FSharp.Data.Tests.DynamicRecordTests
 
 open System
 open System.Dynamic

tests/SqlClient.Tests/FreeVarDoubleDeclTests.fs

@@ -1,9 +1,7 @@
-#if WITH_LEGACY_NAMESPACE
-module FSharp.Data.``The undeclared parameter 'X' is used more than once in the batch being analyzed``
+module FSharp.Data.SqlClient.Tests.``The undeclared parameter 'X' is used more than once in the batch being analyzed``
+open FSharp.Data
 open FSharp.Data.SqlClient
-#else
-module FSharp.Data.SqlClient.``The undeclared parameter 'X' is used more than once in the batch being analyzed``
-#endif
+open FSharp.Data.SqlClient.Tests
 
 open System
 open Xunit

tests/SqlClient.Tests/OptionalParamsTests.fs

@@ -1,10 +1,8 @@
-#if WITH_LEGACY_NAMESPACE
-module FSharp.Data.OptionalParamsTests
-open FSharp.Data.SqlClient
-#else
-module FSharp.Data.SqlClient.OptionalParamsTests
-#endif
+module FSharp.Data.SqlClient.Tests.OptionalParamsTests
 
+open FSharp.Data
+open FSharp.Data.SqlClient
+open FSharp.Data.SqlClient.Tests
 
 open Xunit
 [<Literal>]

tests/SqlClient.Tests/ProgrammabilityTests.fs

@@ -1,9 +1,7 @@
-#if WITH_LEGACY_NAMESPACE
-module FSharp.Data.ProgrammabilityTest
+module FSharp.Data.SqlClient.Tests.ProgrammabilityTest
+open FSharp.Data
 open FSharp.Data.SqlClient
-#else
-module FSharp.Data.SqlClient.ProgrammabilityTest
-#endif
+open FSharp.Data.SqlClient.Tests
 
 open System
 open System.Data.SqlClient

tests/SqlClient.Tests/ResultTypeTests.fs

@@ -1,9 +1,7 @@
-#if WITH_LEGACY_NAMESPACE
-module FSharp.Data.ResultTypeTests
+module FSharp.Data.SqlClient.Tests.ResultTypeTests
+open FSharp.Data
 open FSharp.Data.SqlClient
-#else
-module FSharp.Data.SqlClient.ResultTypeTests
-#endif
+open FSharp.Data.SqlClient.Tests
 
 open FSharp.Data
 open Xunit

tests/SqlClient.Tests/SpReturnValueTests.fs

@@ -1,9 +1,7 @@
-#if WITH_LEGACY_NAMESPACE
-module FSharp.Data.SpReturnValueTests
+module FSharp.Data.SqlClient.Tests.SpReturnValueTests
+open FSharp.Data
 open FSharp.Data.SqlClient
-#else
-module FSharp.Data.SqlClient.SpReturnValueTests
-#endif
+open FSharp.Data.SqlClient.Tests
 
 open System
 open Xunit