From 68b26d47331685acf977dfd341814a306f22a8f9 Mon Sep 17 00:00:00 2001 From: Cheena Malhotra Date: Tue, 10 Nov 2020 17:48:25 -0800 Subject: [PATCH 1/4] Source link PDBs for supporting debugging package directly --- .gitignore | 1 + build.proj | 2 +- src/Directory.Build.props | 11 ++++++++++- ...ient.AlwaysEncrypted.AzureKeyVaultProvider.csproj | 1 + .../add-ons/Directory.Build.props | 12 +++++++++++- .../netcore/src/Microsoft.Data.SqlClient.csproj | 1 + .../netfx/src/Microsoft.Data.SqlClient.csproj | 5 +++-- .../tests/Directory.Build.props | 3 ++- .../tests/tools/Directory.Build.props | 2 +- tools/props/AssemblyInfo.props | 2 +- tools/props/AssemblyRef.props | 2 +- tools/props/Tools.props | 2 +- tools/props/Versions.props | 3 ++- tools/targets/NotSupported.targets | 2 +- 14 files changed, 37 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index df05bd9b0f..daeaf68c7a 100644 --- a/.gitignore +++ b/.gitignore @@ -38,6 +38,7 @@ bld/ # Visual Studio 2017 auto generated files Generated\ Files/ +**/.AssemblyAttributes # Visual Studio Code settings .vscode/ diff --git a/build.proj b/build.proj index a1a6df03a2..af5431c16c 100644 --- a/build.proj +++ b/build.proj @@ -1,5 +1,5 @@ - + diff --git a/src/Directory.Build.props b/src/Directory.Build.props index c56d604473..c8ab7c1763 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -1,5 +1,5 @@ - + true false @@ -22,7 +22,16 @@ > msbuild /p:configuration=Release --> Project + $(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb + true + true + + $([System.IO.Path]::Combine('$(IntermediateOutputPath)','$(TargetFrameworkMoniker).AssemblyAttributes$(DefaultLanguageSourceExtension)')) + + + + $(DefineConstants);DEBUG diff --git a/src/Microsoft.Data.SqlClient/add-ons/AzureKeyVaultProvider/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.csproj b/src/Microsoft.Data.SqlClient/add-ons/AzureKeyVaultProvider/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.csproj index 77b6e7e1be..b882eb77b7 100644 --- a/src/Microsoft.Data.SqlClient/add-ons/AzureKeyVaultProvider/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.csproj +++ b/src/Microsoft.Data.SqlClient/add-ons/AzureKeyVaultProvider/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.csproj @@ -26,5 +26,6 @@ + diff --git a/src/Microsoft.Data.SqlClient/add-ons/Directory.Build.props b/src/Microsoft.Data.SqlClient/add-ons/Directory.Build.props index e2303ef132..a76d932f17 100644 --- a/src/Microsoft.Data.SqlClient/add-ons/Directory.Build.props +++ b/src/Microsoft.Data.SqlClient/add-ons/Directory.Build.props @@ -1,12 +1,22 @@ - + Project + $(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb + true + true + + + $([System.IO.Path]::Combine('$(IntermediateOutputPath)','$(TargetFrameworkMoniker).AssemblyAttributes$(DefaultLanguageSourceExtension)')) + + + + diff --git a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj index c8ccbad2b0..d4d8d25cb7 100644 --- a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj +++ b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj @@ -771,6 +771,7 @@ + diff --git a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj index 0c4f55cd1a..64a2974d44 100644 --- a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj +++ b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj @@ -1,5 +1,5 @@  - + {407890AC-9876-4FEF-A6F1-F36A876BAADE} @@ -499,6 +499,7 @@ + $(SystemSecurityCryptographyAlgorithmsVersion) @@ -531,4 +532,4 @@ - + \ No newline at end of file diff --git a/src/Microsoft.Data.SqlClient/tests/Directory.Build.props b/src/Microsoft.Data.SqlClient/tests/Directory.Build.props index 3225e9461a..869e879f76 100644 --- a/src/Microsoft.Data.SqlClient/tests/Directory.Build.props +++ b/src/Microsoft.Data.SqlClient/tests/Directory.Build.props @@ -1,5 +1,5 @@ - @@ -10,6 +10,7 @@ netcoreapp3.1 netcoreapp2.1 Project + false diff --git a/src/Microsoft.Data.SqlClient/tests/tools/Directory.Build.props b/src/Microsoft.Data.SqlClient/tests/tools/Directory.Build.props index 9604977e86..abbaa56026 100644 --- a/src/Microsoft.Data.SqlClient/tests/tools/Directory.Build.props +++ b/src/Microsoft.Data.SqlClient/tests/tools/Directory.Build.props @@ -1,5 +1,5 @@ - diff --git a/tools/props/AssemblyInfo.props b/tools/props/AssemblyInfo.props index 0e6533ebd2..71488482eb 100644 --- a/tools/props/AssemblyInfo.props +++ b/tools/props/AssemblyInfo.props @@ -1,5 +1,5 @@ - + Microsoft.Data.SqlClient Microsoft diff --git a/tools/props/AssemblyRef.props b/tools/props/AssemblyRef.props index c1e14aadba..e27f711eb5 100644 --- a/tools/props/AssemblyRef.props +++ b/tools/props/AssemblyRef.props @@ -1,5 +1,5 @@ - + "Microsoft.VSDesigner, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" "System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" diff --git a/tools/props/Tools.props b/tools/props/Tools.props index 6a121cb430..f9fc26dee3 100644 --- a/tools/props/Tools.props +++ b/tools/props/Tools.props @@ -1,5 +1,5 @@ - + $(RestoreSources) diff --git a/tools/props/Versions.props b/tools/props/Versions.props index cfaad4d960..ce500cd5e4 100644 --- a/tools/props/Versions.props +++ b/tools/props/Versions.props @@ -1,5 +1,5 @@ - + 1.0.0.0 @@ -23,6 +23,7 @@ 5.6.0 4.5.1 4.3.0 + 1.0.0 diff --git a/tools/targets/NotSupported.targets b/tools/targets/NotSupported.targets index de19934bae..7935ef4768 100644 --- a/tools/targets/NotSupported.targets +++ b/tools/targets/NotSupported.targets @@ -1,5 +1,5 @@ - + From 5c41e85e28b7c68bcc464eaf0209658d5f6fa371 Mon Sep 17 00:00:00 2001 From: Cheena Malhotra Date: Tue, 10 Nov 2020 18:28:07 -0800 Subject: [PATCH 2/4] Enable CI only for build packages via build.proj --- build.proj | 23 ++++++++++--------- src/Directory.Build.props | 1 - .../tests/Directory.Build.props | 1 - 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/build.proj b/build.proj index af5431c16c..2dcc4ae354 100644 --- a/build.proj +++ b/build.proj @@ -17,6 +17,7 @@ true Configuration=$(Configuration);AssemblyFileVersion=$(AssemblyFileVersion);TargetsWindows=$(TargetsWindows);TargetsUnix=$(TargetsUnix); BuildProjectReferences=false;$(ProjectProperties); + ContinuousIntegrationBuild=true @@ -71,17 +72,17 @@ - + - + - - - + + + @@ -114,21 +115,21 @@ - + - - + + - - - + + + diff --git a/src/Directory.Build.props b/src/Directory.Build.props index c8ab7c1763..9cff26e78c 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -24,7 +24,6 @@ Project $(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb true - true $([System.IO.Path]::Combine('$(IntermediateOutputPath)','$(TargetFrameworkMoniker).AssemblyAttributes$(DefaultLanguageSourceExtension)')) diff --git a/src/Microsoft.Data.SqlClient/tests/Directory.Build.props b/src/Microsoft.Data.SqlClient/tests/Directory.Build.props index 869e879f76..7d0925284f 100644 --- a/src/Microsoft.Data.SqlClient/tests/Directory.Build.props +++ b/src/Microsoft.Data.SqlClient/tests/Directory.Build.props @@ -10,7 +10,6 @@ netcoreapp3.1 netcoreapp2.1 Project - false From 22639c5517c44c81a2703b8032a898533a630a22 Mon Sep 17 00:00:00 2001 From: Cheena Malhotra Date: Tue, 10 Nov 2020 18:52:51 -0800 Subject: [PATCH 3/4] attempt to ix sourceroot error --- src/Directory.Build.props | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 9cff26e78c..b43e2df35a 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -29,6 +29,7 @@ $([System.IO.Path]::Combine('$(IntermediateOutputPath)','$(TargetFrameworkMoniker).AssemblyAttributes$(DefaultLanguageSourceExtension)')) + From 0ce0c92944c5640e01efb6f4d3167c26cb8e243b Mon Sep 17 00:00:00 2001 From: Cheena Malhotra Date: Tue, 10 Nov 2020 19:06:34 -0800 Subject: [PATCH 4/4] Improve --- .../netfx/src/Microsoft.Data.SqlClient.csproj | 3 +++ tools/specs/Microsoft.Data.SqlClient.nuspec | 1 + 2 files changed, 4 insertions(+) diff --git a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj index 64a2974d44..8096839c85 100644 --- a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj +++ b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj @@ -22,6 +22,9 @@ True $(DefineConstants);NETFRAMEWORK; + + $([System.IO.Path]::Combine('$(IntermediateOutputPath)','$(GeneratedSourceFileName)')) + True diff --git a/tools/specs/Microsoft.Data.SqlClient.nuspec b/tools/specs/Microsoft.Data.SqlClient.nuspec index 8d0239ce60..0119dd0635 100644 --- a/tools/specs/Microsoft.Data.SqlClient.nuspec +++ b/tools/specs/Microsoft.Data.SqlClient.nuspec @@ -9,6 +9,7 @@ MIT https://aka.ms/sqlclientproject dotnet.png + Provides the data provider for SQL Server. These classes provide access to versions of SQL Server and encapsulate database-specific protocols, including tabular data stream (TDS) Commonly Used Types: