Merge Project | Build the Common Project

build2.proj

@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+	<!-- Build Parameters ============================================== -->
+	<PropertyGroup>
+		<!-- Configuration:  Which build configuration to build                                 -->
+		<!-- Allowed values: Debug, Release                                                     -->
+		<!-- Default value:  Debug                                                              -->
+		<Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
+
+		<!-- DotnetPath: Path to folder containing the `dotnet` binary. Override this if a      -->
+		<!--    specific version (eg, x86) is required. Otherwise, this defaults to using the   -->
+		<!--    dotnet binary in the PATH variable. The provided path should end with a `\` (or -->
+		<!--    `/`) character. Eg. C:\x86\                                                     -->
+		<DotnetPath Condition="'$(DotnetPath)' == ''"></DotnetPath>
+	</PropertyGroup>
+
+	<!-- Imports ======================================================= -->
+	<Import Project="src/Directory.Build.props" />
+
+	<!-- Microsoft.Data.SqlClient Build Targets ======================== -->
+	<PropertyGroup>
+		<MdsProjectPath>$(RepoRoot)src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj</MdsProjectPath>
+	</PropertyGroup>
+
+	<!-- BuildMds: Builds all binaries for MDS -->
+	<Target Name="BuildMds" DependsOnTargets="BuildMdsUnix;BuildMdsWindows" />
+
+	<!-- BuildMdsUnix: Builds all unix-specific MDS binaries -->
+	<Target Name="BuildMdsUnix">
+		<PropertyGroup>
+			<DotnetCommand>
+				$(DotnetPath)dotnet build $(MdsProjectPath)
+				  -p:Configuration=$(Configuration)
+				  -p:TargetOs=Unix
+			</DotnetCommand>
+			<DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s{2,}", " "))</DotnetCommand>
+		</PropertyGroup>
+		<Exec ConsoleToMsBuild="true" Command="$(DotNetCommand)" />
+	</Target>
+
+	<!-- BuildMdsWindows: Builds all windows-specific MDS binaries -->
+	<Target Name="BuildMdsWindows">
+		<PropertyGroup>
+			<DotnetCommand>
+				$(DotnetPath)dotnet build $(MdsProjectPath)
+				  -p:Configuration=$(Configuration)
+				  -p:TargetOs=Unix
+			</DotnetCommand>
+			<DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s{2,}", " "))</DotnetCommand>
+		</PropertyGroup>
+		<Exec ConsoleToMsBuild="true" Command="$(DotNetCommand)" />
+	</Target>
+</Project>

src/Microsoft.Data.SqlClient.sln

@@ -1,4 +1,4 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
+Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.0.31912.275
 MinimumVisualStudioVersion = 10.0.40219.1
@@ -561,6 +561,12 @@ Global
 		{9A8996A8-6484-4AA7-B50F-F861430EDE2F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9A8996A8-6484-4AA7-B50F-F861430EDE2F}.Release|x64.ActiveCfg = Release|Any CPU
 		{9A8996A8-6484-4AA7-B50F-F861430EDE2F}.Release|x86.ActiveCfg = Release|Any CPU
+		{9A8996A8-6484-4AA7-B50F-F861430EDE2F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9A8996A8-6484-4AA7-B50F-F861430EDE2F}.Debug|x64.Build.0 = Debug|Any CPU
+		{9A8996A8-6484-4AA7-B50F-F861430EDE2F}.Debug|x86.Build.0 = Debug|Any CPU
+		{9A8996A8-6484-4AA7-B50F-F861430EDE2F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9A8996A8-6484-4AA7-B50F-F861430EDE2F}.Release|x64.Build.0 = Release|Any CPU
+		{9A8996A8-6484-4AA7-B50F-F861430EDE2F}.Release|x86.Build.0 = Release|Any CPU
 		{4461063D-2F2B-274C-7E6F-F235119D258E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{4461063D-2F2B-274C-7E6F-F235119D258E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{4461063D-2F2B-274C-7E6F-F235119D258E}.Debug|x64.ActiveCfg = Debug|x64

src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj

@@ -815,11 +815,11 @@
     <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlDependencyUtils.cs">
       <Link>Microsoft\Data\SqlClient\SqlDependencyUtils.cs</Link>
     </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlDependencyUtils.AppDomain.cs">
-      <Link>Microsoft\Data\SqlClient\SqlDependencyUtils.AppDomain.cs</Link>
+    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlDependencyUtils.AppDomain.netcore.cs">
+      <Link>Microsoft\Data\SqlClient\SqlDependencyUtils.AppDomain.netcore.cs</Link>
     </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlDependencyUtils.AssemblyLoadContext.cs">
-      <Link>Microsoft\Data\SqlClient\SqlDependencyUtils.AssemblyLoadContext.cs</Link>
+    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlDependencyUtils.AssemblyLoadContext.netcore.cs">
+      <Link>Microsoft\Data\SqlClient\SqlDependencyUtils.AssemblyLoadContext.netcore.cs</Link>
     </Compile>
     <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlEnclaveAttestationParameters.Crypto.cs">
       <Link>Microsoft\Data\SqlClient\SqlEnclaveAttestationParameters.Crypto.cs</Link>

src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj

@@ -1,12 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
-	<PropertyGroup>
-		<TargetFrameworks>net462;net8.0;net9.0</TargetFrameworks>
+	<!-- General Properties ============================================== -->
+  <PropertyGroup>
+    <Configurations>Debug;Release;</Configurations>
+    <RootNamespace />
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-		<RootNamespace />
 	</PropertyGroup>
 
   <!-- OS Constants ==================================================== -->
   <PropertyGroup>
+    <!-- @TODO: Move to directory.build.props? -->
     <!-- If a target OS was not specified, use the current OS as the target OS. -->
     <TargetOs Condition="'$(TargetOs)' == ''">$(OS)</TargetOs>
 
@@ -15,41 +17,74 @@
     <!--<TargetOs>Windows_NT</TargetOs>-->
 
     <!-- NOTE: These constants are prefixed with _ to keep them separate from .NET 5+ precompiler -->
-    <!--     flags. Those only apply to OS-specific target frameworks, and would interfere here. -->
-    <DefineConstants Condition="'$(TargetOs.ToUpper())' == 'UNIX'">$(DefineConstants),_UNIX</DefineConstants>
-    <DefineConstants Condition="'$(TargetOs.ToUpper())' == 'WINDOWS_NT'">$(DefineConstants),_WINDOWS</DefineConstants>
+    <!--     flags. Those only apply to OS-specific target frameworks, and would interfere here.  -->
+    <DefineConstants Condition="'$(TargetOs.ToUpper())' == 'UNIX'">$(DefineConstants);_UNIX</DefineConstants>
+    <DefineConstants Condition="'$(TargetOs.ToUpper())' == 'WINDOWS_NT'">$(DefineConstants);_WINDOWS</DefineConstants>
+  </PropertyGroup>
+
+  <!-- Target Frameworks =============================================== -->
+  <PropertyGroup>
+    <!-- net462 is only supported on Windows, so we will only add it if we're building for Windows -->
+    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
+    <TargetFrameworks Condition="'$(TargetOs.ToUpper())' == 'WINDOWS_NT'">$(TargetFrameworks);net462</TargetFrameworks>
+  </PropertyGroup>
+
+  <!-- Build Output ==================================================== -->
+  <PropertyGroup>
+    <!-- @TODO: Move to directory.build.props? -->
+    <ArtifactPath>$(RepoRoot)artifacts/</ArtifactPath>
+
+    <!-- MSBuild will add the target framework to the end of this path by default. Telling it not -->
+    <!-- to is possible but requires also specifying the IntermediateOutputPath. So while it      -->
+    <!-- would be nice to have a flat directory structure, it's more hassle than its worth.       -->
+    <OutputPath>$(ArtifactPath)$(AssemblyName)/$(Configuration)/$(TargetOs.ToLower())/</OutputPath>
   </PropertyGroup>
 
   <!-- Embedded resources ============================================== -->
   <ItemGroup>
+    <!-- Linker directives to replace UseManagedNetworking with a constant if consumer specifies  -->
+    <!-- the app context switch in their csproj. This file only applies to netcore on windows.    -->
+    <!-- This file does not support pre-processor directives, so it must be conditionally         -->
+    <!-- included into the build.                                                                 -->
     <EmbeddedResource Include="Resources/ILLink.Substitutions.xml"
-                      Condition="'$(TargetOs.ToUpper())' == 'WINDOWS_NT'" />
+                      Condition="'$(TargetOs.ToUpper())' == 'WINDOWS_NT' AND '$(TargetFramework)' == 'net462'" />
   </ItemGroup>
 
   <!-- References ====================================================== -->
+  <!-- References that apply to all target frameworks -->
   <ItemGroup>
-    <!-- References that apply to all target frameworks -->
     <PackageReference Include="Azure.Core" />
     <PackageReference Include="Azure.Identity" />
     <PackageReference Include="Microsoft.Bcl.Cryptography" />
     <PackageReference Include="Microsoft.Extensions.Caching.Memory" />
     <PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" />
     <PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" />
-    <PackageReference Include="System.Configuration.ConfigurationManager" />
     <PackageReference Include="System.Security.Cryptography.Pkcs"  />
   </ItemGroup>
+
+  <!-- References that only apply to net462 -->
   <ItemGroup Condition="'$(TargetFramework)' == 'net462'">
-    <!-- References that only apply to net462 -->
     <Reference Include="System.Configuration" />
+    <Reference Include="System.EnterpriseServices" />
     <Reference Include="System.Transactions" />
     <PackageReference Include="System.ValueTuple" />
     <PackageReference Include="System.Threading.Channels" />
 	</ItemGroup>
 
-  <!-- System.Buffers, System.Memory, and System.Runtime.InteropServices.RuntimeInformation are included in .NET 10+ BCL -->
-  <ItemGroup Condition="$([MSBuild]::VersionLessThan($([MSBuild]::GetTargetFrameworkVersion($(TargetFramework))), '10.0'))">
-    <PackageReference Include="System.Buffers" />
-    <PackageReference Include="System.Memory" />
-    <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" />
+  <!-- References that only apply to netcore -->
+  <ItemGroup Condition="'$(TargetFramework)' != 'net462'">
+    <PackageReference Include="Microsoft.SqlServer.Server" />
+    <PackageReference Include="System.Configuration.ConfigurationManager" />
+
+    <!-- References that only apply to netcore < 10 -->
+    <PackageReference Include="System.Buffers"
+                      Condition="$([MSBuild]::VersionLessThan($([MSBuild]::GetTargetFrameworkVersion($(TargetFramework))), '10.0'))" />
+    <PackageReference Include="System.Memory"
+                      Condition="$([MSBuild]::VersionLessThan($([MSBuild]::GetTargetFrameworkVersion($(TargetFramework))), '10.0'))" />
+    <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation"
+                      Condition="$([MSBuild]::VersionLessThan($([MSBuild]::GetTargetFrameworkVersion($(TargetFramework))), '10.0'))" />
   </ItemGroup>
+
+  <!-- CodeGen Targets ================================================= -->
+  <Import Project="$(ToolsDir)targets\GenerateThisAssemblyCs.targets" />
 </Project>

src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/AdapterUtil.cs

@@ -69,24 +69,27 @@ internal static partial class ADP
         internal const int MaxBufferAccessTokenExpiry = 600;
 
         #region UDT
-#if NETFRAMEWORK
-        private static readonly MethodInfo s_method = typeof(InvalidUdtException).GetMethod("Create", BindingFlags.NonPublic | BindingFlags.Static);
-#endif
+
+        #if NETFRAMEWORK
+        private static readonly MethodInfo s_udtConstructor =
+            typeof(InvalidUdtException).GetMethod("Create", BindingFlags.NonPublic | BindingFlags.Static);
+        #endif
+
         /// <summary>
         /// Calls "InvalidUdtException.Create" method when an invalid UDT occurs.
         /// </summary>
         internal static InvalidUdtException CreateInvalidUdtException(Type udtType, string resourceReasonName)
         {
-            // @TODO: Can we adopt the netcore version?
-            InvalidUdtException e =
-#if NETFRAMEWORK
-                (InvalidUdtException)s_method.Invoke(null, new object[] { udtType, resourceReasonName });
-            ADP.TraceExceptionAsReturnValue(e);
-#else
-                InvalidUdtException.Create(udtType, resourceReasonName);
-#endif
+            #if NETFRAMEWORK
+            InvalidUdtException e = (InvalidUdtException)s_udtConstructor.Invoke(null, [udtType, resourceReasonName]);
+            #else
+            InvalidUdtException e = InvalidUdtException.Create(udtType, resourceReasonName);
+            #endif
+
+            TraceExceptionAsReturnValue(e);
             return e;
         }
+
         #endregion
 
         static private void TraceException(string trace, Exception e)

src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDependencyUtils.AppDomain.cs → src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDependencyUtils.AppDomain.netcore.cs

@@ -2,6 +2,8 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NET
+
 using System;
 
 namespace Microsoft.Data.SqlClient
@@ -18,3 +20,5 @@ partial void SubscribeToAppDomainUnload()
         }
     }
 }
+
+#endif