From e1b23eb7181a3a33b4f954948559a3e917cee410 Mon Sep 17 00:00:00 2001 From: v-arellegue Date: Thu, 24 Aug 2023 12:13:26 -0700 Subject: [PATCH 01/19] Enchance project and target files to generate debugging symbols for nuget packages. --- build.proj | 12 +++++---- ...waysEncrypted.AzureKeyVaultProvider.csproj | 25 +++++++++++++++++++ .../src/Microsoft.Data.SqlClient.csproj | 21 ++++++++++++++++ .../netfx/src/Microsoft.Data.SqlClient.csproj | 23 ++++++++++++++++- tools/specs/Microsoft.Data.SqlClient.nuspec | 10 ++++---- tools/targets/GenerateNugetPackage.targets | 4 +-- .../GenerateAKVProviderNugetPackage.targets | 2 +- 7 files changed, 83 insertions(+), 14 deletions(-) diff --git a/build.proj b/build.proj index 465f9264c3..7b6f69c142 100644 --- a/build.proj +++ b/build.proj @@ -34,6 +34,8 @@ The provided path should be ended to a `\` character without white spaces: Ex. C:\x86\ --> + + DebugType=portable;DebugSymbols=true;IncludeSymbols=true;SymbolPackageFormat=snupkg;PublishRepositoryUrl=true;RepositoryUrl=https://github.com/dotnet/sqlclient;RepositoryType=git;EmbedUnTrackedSources=true;ContinuousIntegrationBuild=true;Deterministic=true; @@ -111,7 +113,7 @@ - + @@ -200,21 +202,21 @@ - + - + - + - + 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 3f2267451e..509ad91497 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 @@ -16,6 +16,27 @@ MIT true + + portable + true + false + true + snupkg + true + + https://github.com/dotnet/sqlclient + git + true + true + true + + + $([System.IO.Path]::Combine('$(IntermediateOutputPath)','$(GeneratedSourceFileName)')) + + + + + @@ -24,6 +45,10 @@ + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + 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 dcd3594c9b..8ed62c3666 100644 --- a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj +++ b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj @@ -24,7 +24,24 @@ portable true + false + true + snupkg + true + true + true + true + + $([System.IO.Path]::Combine('$(IntermediateOutputPath)','$(TargetFrameworkMoniker).AssemblyAttributes$(DefaultLanguageSourceExtension)')) + + + + + + + + @@ -966,6 +983,10 @@ + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + 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 df9c0f3fa9..3d92a96d4e 100644 --- a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj +++ b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj @@ -19,9 +19,27 @@ True $(DefineConstants);NETFRAMEWORK; + + portable + true + false + true + snupkg + true + + https://github.com/dotnet/sqlclient + git + true + true + true + $([System.IO.Path]::Combine('$(IntermediateOutputPath)','$(GeneratedSourceFileName)')) + + + + True @@ -708,7 +726,10 @@ - + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + $(SystemTextEncodingsWebVersion) diff --git a/tools/specs/Microsoft.Data.SqlClient.nuspec b/tools/specs/Microsoft.Data.SqlClient.nuspec index c49973874b..4c4d0edbd1 100644 --- a/tools/specs/Microsoft.Data.SqlClient.nuspec +++ b/tools/specs/Microsoft.Data.SqlClient.nuspec @@ -110,27 +110,27 @@ When using NuGet 3.x this package requires at least version 3.4. - + - + - + - + - + diff --git a/tools/targets/GenerateNugetPackage.targets b/tools/targets/GenerateNugetPackage.targets index 5ec95be2dc..250d95ac86 100644 --- a/tools/targets/GenerateNugetPackage.targets +++ b/tools/targets/GenerateNugetPackage.targets @@ -7,7 +7,7 @@ - + @@ -16,6 +16,6 @@ - + diff --git a/tools/targets/add-ons/GenerateAKVProviderNugetPackage.targets b/tools/targets/add-ons/GenerateAKVProviderNugetPackage.targets index 0f3f3d9b10..8efff4cb43 100644 --- a/tools/targets/add-ons/GenerateAKVProviderNugetPackage.targets +++ b/tools/targets/add-ons/GenerateAKVProviderNugetPackage.targets @@ -7,6 +7,6 @@ - + From 96dabe4ce0bf21ee531d5ed666f2f020a6b2c6d5 Mon Sep 17 00:00:00 2001 From: v-arellegue Date: Mon, 28 Aug 2023 11:19:54 -0700 Subject: [PATCH 02/19] Moved duplicate Nuget packaging properties from all csproj files into Directory.Build.props which is automatically imported. --- src/Directory.Build.props | 16 ++++++++++++++++ ....AlwaysEncrypted.AzureKeyVaultProvider.csproj | 14 -------------- .../netcore/src/Microsoft.Data.SqlClient.csproj | 11 ----------- .../netfx/src/Microsoft.Data.SqlClient.csproj | 14 ++------------ 4 files changed, 18 insertions(+), 37 deletions(-) diff --git a/src/Directory.Build.props b/src/Directory.Build.props index b686f9fe8f..99a6b531ce 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -71,6 +71,22 @@ $(DefineConstants);ENCLAVE_SIMULATOR + + + portable + true + false + true + snupkg + true + + https://github.com/dotnet/sqlclient + git + true + true + true + + 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 509ad91497..0216548325 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 @@ -16,20 +16,6 @@ MIT true - - portable - true - false - true - snupkg - true - - https://github.com/dotnet/sqlclient - git - true - true - true - $([System.IO.Path]::Combine('$(IntermediateOutputPath)','$(GeneratedSourceFileName)')) 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 8ed62c3666..3f8b8b933b 100644 --- a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj +++ b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj @@ -21,17 +21,6 @@ true $(NoWarn);IL2026;IL2057;IL2072;IL2075 - - portable - true - false - true - snupkg - true - true - true - true - $([System.IO.Path]::Combine('$(IntermediateOutputPath)','$(TargetFrameworkMoniker).AssemblyAttributes$(DefaultLanguageSourceExtension)')) 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 3d92a96d4e..60806e6980 100644 --- a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj +++ b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj @@ -19,19 +19,9 @@ True $(DefineConstants);NETFRAMEWORK; + - portable - true - false - true - snupkg - true - - https://github.com/dotnet/sqlclient - git - true - true - true + full $([System.IO.Path]::Combine('$(IntermediateOutputPath)','$(GeneratedSourceFileName)')) From bf8da42416ae63f45de23748a739398acc9419be Mon Sep 17 00:00:00 2001 From: v-arellegue Date: Wed, 30 Aug 2023 13:23:40 -0700 Subject: [PATCH 03/19] Applied changes as per PR Review. --- build.proj | 8 ++++---- src/Directory.Build.props | 5 ++++- ...SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.csproj | 5 +---- .../netcore/src/Microsoft.Data.SqlClient.csproj | 7 ------- .../netfx/src/Microsoft.Data.SqlClient.csproj | 4 ---- .../Microsoft.SqlServer.Server.csproj | 3 --- tools/props/Versions.props | 6 ++++++ 7 files changed, 15 insertions(+), 23 deletions(-) diff --git a/build.proj b/build.proj index 7b6f69c142..71b4756f9f 100644 --- a/build.proj +++ b/build.proj @@ -34,7 +34,7 @@ The provided path should be ended to a `\` character without white spaces: Ex. C:\x86\ --> - + DebugType=portable;DebugSymbols=true;IncludeSymbols=true;SymbolPackageFormat=snupkg;PublishRepositoryUrl=true;RepositoryUrl=https://github.com/dotnet/sqlclient;RepositoryType=git;EmbedUnTrackedSources=true;ContinuousIntegrationBuild=true;Deterministic=true; @@ -206,17 +206,17 @@ - + - + - + diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 99a6b531ce..71ff7b0c34 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -79,10 +79,13 @@ true snupkg true + true + + + https://github.com/dotnet/sqlclient git - true true true 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 0216548325..118295c166 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 @@ -31,10 +31,7 @@ - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - + 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 3f8b8b933b..bb63787df6 100644 --- a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj +++ b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj @@ -24,9 +24,6 @@ $([System.IO.Path]::Combine('$(IntermediateOutputPath)','$(TargetFrameworkMoniker).AssemblyAttributes$(DefaultLanguageSourceExtension)')) - - - @@ -972,10 +969,6 @@ - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - 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 60806e6980..6cec67ee8e 100644 --- a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj +++ b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj @@ -716,10 +716,6 @@ - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - $(SystemTextEncodingsWebVersion) diff --git a/src/Microsoft.SqlServer.Server/Microsoft.SqlServer.Server.csproj b/src/Microsoft.SqlServer.Server/Microsoft.SqlServer.Server.csproj index dafc9a4dbe..2808094a25 100644 --- a/src/Microsoft.SqlServer.Server/Microsoft.SqlServer.Server.csproj +++ b/src/Microsoft.SqlServer.Server/Microsoft.SqlServer.Server.csproj @@ -40,9 +40,6 @@ Strings.Designer.cs - - - diff --git a/tools/props/Versions.props b/tools/props/Versions.props index ac1ff864ef..6ee218be1f 100644 --- a/tools/props/Versions.props +++ b/tools/props/Versions.props @@ -83,4 +83,10 @@ $(NugetPackageVersion) $(NugetPackageVersion) + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + From 64cc0f8dcea9156ff2b5532e04e7c0e8d214f99d Mon Sep 17 00:00:00 2001 From: v-arellegue Date: Mon, 30 Oct 2023 10:50:56 -0700 Subject: [PATCH 04/19] Refactored Directory.build.Props, Versions.props, build.proj and MDS.AlwaysEncrypted.AzureKeyVaultProvider.csproj. --- build.proj | 2 +- src/Directory.Build.props | 10 +--------- ...Client.AlwaysEncrypted.AzureKeyVaultProvider.csproj | 3 +-- tools/props/Versions.props | 4 ++-- 4 files changed, 5 insertions(+), 14 deletions(-) diff --git a/build.proj b/build.proj index 71b4756f9f..4d9888e7cc 100644 --- a/build.proj +++ b/build.proj @@ -238,4 +238,4 @@ - + \ No newline at end of file diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 71ff7b0c34..e360dfe3a8 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -81,14 +81,6 @@ true true - - - - https://github.com/dotnet/sqlclient - git - true - true - @@ -97,4 +89,4 @@ - + \ No newline at end of file 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 118295c166..a68015b38b 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 @@ -29,11 +29,10 @@ - - + \ No newline at end of file diff --git a/tools/props/Versions.props b/tools/props/Versions.props index 6ee218be1f..539d162e65 100644 --- a/tools/props/Versions.props +++ b/tools/props/Versions.props @@ -84,9 +84,9 @@ $(NugetPackageVersion) - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + \ No newline at end of file From f293ae02b8d2700fe50d2c8ee9d74e8ae75b7d04 Mon Sep 17 00:00:00 2001 From: v-arellegue Date: Tue, 7 Nov 2023 12:10:38 -0800 Subject: [PATCH 05/19] Removed empty line to trigger piepline. --- tools/specs/Microsoft.Data.SqlClient.nuspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/specs/Microsoft.Data.SqlClient.nuspec b/tools/specs/Microsoft.Data.SqlClient.nuspec index 4c4d0edbd1..dd510a9752 100644 --- a/tools/specs/Microsoft.Data.SqlClient.nuspec +++ b/tools/specs/Microsoft.Data.SqlClient.nuspec @@ -275,4 +275,4 @@ When using NuGet 3.x this package requires at least version 3.4. - + \ No newline at end of file From fc3b9752e76e1a157d21e889d64403101497801d Mon Sep 17 00:00:00 2001 From: v-arellegue Date: Tue, 7 Nov 2023 12:42:47 -0800 Subject: [PATCH 06/19] Removed Microsoft.DotNet.XUnitExtensions.csproj which also no longer exists in latest version. --- build.proj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.proj b/build.proj index 4d9888e7cc..beb627b5f5 100644 --- a/build.proj +++ b/build.proj @@ -55,7 +55,7 @@ - + @@ -66,7 +66,7 @@ - + From 09783a33cb9fd2ab7ec4720d3476d4937c6805d9 Mon Sep 17 00:00:00 2001 From: v-arellegue Date: Tue, 7 Nov 2023 13:02:33 -0800 Subject: [PATCH 07/19] Moved package reference Microsoft.SourceLink.GitHub from Versions.props to Directory.Build.props as the projects fals to build in the pipeline. --- src/Directory.Build.props | 7 ++++++- tools/props/Versions.props | 12 ++++++------ 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/Directory.Build.props b/src/Directory.Build.props index e360dfe3a8..6e6d59889d 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -81,7 +81,12 @@ true true - + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + diff --git a/tools/props/Versions.props b/tools/props/Versions.props index 539d162e65..6d43c026d2 100644 --- a/tools/props/Versions.props +++ b/tools/props/Versions.props @@ -83,10 +83,10 @@ $(NugetPackageVersion) $(NugetPackageVersion) - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - + + + + + + \ No newline at end of file From 3ff66aeec49f28efb6e58f6d134e3a7fa77022b3 Mon Sep 17 00:00:00 2001 From: v-arellegue Date: Tue, 7 Nov 2023 13:07:57 -0800 Subject: [PATCH 08/19] Removed commented out lines to trigger pipeline. --- tools/props/Versions.props | 6 ------ 1 file changed, 6 deletions(-) diff --git a/tools/props/Versions.props b/tools/props/Versions.props index 6d43c026d2..eeda21d62e 100644 --- a/tools/props/Versions.props +++ b/tools/props/Versions.props @@ -83,10 +83,4 @@ $(NugetPackageVersion) $(NugetPackageVersion) - - - - - - \ No newline at end of file From 30579ce5359847e184816206f592dd6090b754c4 Mon Sep 17 00:00:00 2001 From: v-arellegue Date: Tue, 7 Nov 2023 13:10:45 -0800 Subject: [PATCH 09/19] Resolve conflict in build.proj --- build.proj | 2 -- 1 file changed, 2 deletions(-) diff --git a/build.proj b/build.proj index beb627b5f5..474a5d4813 100644 --- a/build.proj +++ b/build.proj @@ -55,7 +55,6 @@ - @@ -66,7 +65,6 @@ - From 47da0eedc8f80f0b42131fc6bd519f8af4fd3bc2 Mon Sep 17 00:00:00 2001 From: v-arellegue Date: Tue, 7 Nov 2023 13:33:48 -0800 Subject: [PATCH 10/19] Moved package reference to Microsoft.SourceLink.GitHub back to each csproj. --- src/Directory.Build.props | 7 +------ ....SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.csproj | 5 ++++- .../netcore/src/Microsoft.Data.SqlClient.csproj | 4 ++++ .../netfx/src/Microsoft.Data.SqlClient.csproj | 4 ++++ 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 6e6d59889d..e360dfe3a8 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -81,12 +81,7 @@ true true - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - + 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 a68015b38b..fe5601fd73 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 @@ -30,8 +30,11 @@ - + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + 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 bb63787df6..3e7b96cb4f 100644 --- a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj +++ b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj @@ -969,6 +969,10 @@ + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + 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 6cec67ee8e..a1b7ccd04b 100644 --- a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj +++ b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj @@ -716,6 +716,10 @@ + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + $(SystemTextEncodingsWebVersion) From ca3e5b267bb7e416d331f7c61052087d5931fc39 Mon Sep 17 00:00:00 2001 From: v-arellegue Date: Wed, 8 Nov 2023 13:14:58 -0800 Subject: [PATCH 11/19] Added TF_BUILD condition. Add commit id to nuget package to create. --- build.proj | 9 +++++---- src/Directory.Build.props | 3 +++ tools/specs/Microsoft.Data.SqlClient.nuspec | 2 +- tools/targets/GenerateNugetPackage.targets | 14 ++++++++++++-- 4 files changed, 21 insertions(+), 7 deletions(-) diff --git a/build.proj b/build.proj index 474a5d4813..ce72f28b0c 100644 --- a/build.proj +++ b/build.proj @@ -35,7 +35,8 @@ --> - DebugType=portable;DebugSymbols=true;IncludeSymbols=true;SymbolPackageFormat=snupkg;PublishRepositoryUrl=true;RepositoryUrl=https://github.com/dotnet/sqlclient;RepositoryType=git;EmbedUnTrackedSources=true;ContinuousIntegrationBuild=true;Deterministic=true; + DebugType=portable;DebugSymbols=true;IncludeSymbols=true;SymbolPackageFormat=snupkg;PublishRepositoryUrl=true;RepositoryUrl=https://github.com/dotnet/sqlclient;RepositoryType=git;EmbedUnTrackedSources=true;Deterministic=true; + $(NugetPackProperties);ContinuousIntegrationBuild=true; @@ -111,7 +112,7 @@ - + @@ -200,11 +201,11 @@ - + - + diff --git a/src/Directory.Build.props b/src/Directory.Build.props index e360dfe3a8..78b16706d6 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -81,6 +81,9 @@ true true + + true + diff --git a/tools/specs/Microsoft.Data.SqlClient.nuspec b/tools/specs/Microsoft.Data.SqlClient.nuspec index dd510a9752..b40506b330 100644 --- a/tools/specs/Microsoft.Data.SqlClient.nuspec +++ b/tools/specs/Microsoft.Data.SqlClient.nuspec @@ -9,7 +9,7 @@ MIT https://aka.ms/sqlclientproject dotnet.png - + The current data provider for SQL Server and Azure SQL databases. This has replaced System.Data.SqlClient. These classes provide access to SQL and encapsulate database-specific protocols, including tabular data stream (TDS). Commonly Used Types: diff --git a/tools/targets/GenerateNugetPackage.targets b/tools/targets/GenerateNugetPackage.targets index 250d95ac86..4c8cea4159 100644 --- a/tools/targets/GenerateNugetPackage.targets +++ b/tools/targets/GenerateNugetPackage.targets @@ -5,17 +5,27 @@ $(NugetPackageVersion)-debug + + + + + - + $(SqlServerPackageVersion)-debug + + + + + - + From fc46a72bde0372d050837de78aabe3e345865562 Mon Sep 17 00:00:00 2001 From: v-arellegue Date: Tue, 14 Nov 2023 14:19:38 -0800 Subject: [PATCH 12/19] Add condition TF_BUILD == true to all references to Microsoft.SourceLink.GitHub. --- ...ata.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.csproj | 2 +- .../netcore/src/Microsoft.Data.SqlClient.csproj | 4 ++-- .../netfx/src/Microsoft.Data.SqlClient.csproj | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) 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 fe5601fd73..887450e932 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 @@ -31,7 +31,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive 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 3e7b96cb4f..f10c4f917b 100644 --- a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj +++ b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj @@ -969,7 +969,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive @@ -992,7 +992,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 a1b7ccd04b..4a92775d05 100644 --- a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj +++ b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj @@ -716,7 +716,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive From c542b35028f7c89a6a0e8e2ccb3f2e4b9b2102ff Mon Sep 17 00:00:00 2001 From: v-arellegue Date: Wed, 15 Nov 2023 12:47:34 -0800 Subject: [PATCH 13/19] Updated BUILDGUIDE.md to show example of TF_BUILD. --- BUILDGUIDE.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/BUILDGUIDE.md b/BUILDGUIDE.md index 47cacc9fb7..08cf4e3c0b 100644 --- a/BUILDGUIDE.md +++ b/BUILDGUIDE.md @@ -56,6 +56,15 @@ msbuild -t:BuildNetCoreAllOS # Builds the .NET driver for all Operating Systems. ``` +### Conditional properties intended for continuous integation build + +Some project properties are enabled only within AzureDevOps pipeline. For these properties, the DevOPs system variable TF_BUILD is used. + +For example: + +$(NugetPackProperties);ContinuousIntegrationBuild=true; + + ## Building Tests ```bash From 10314e756c72acc4d07c2e8fbbb006ce661a541a Mon Sep 17 00:00:00 2001 From: JRahnama Date: Wed, 17 Jan 2024 19:11:10 -0800 Subject: [PATCH 14/19] Gathering all sourceLink related in directory.Build.props. Address a few minor issues. Upgrading Microsoft.SourceLink.GitHub to version 8.0.0 --- src/Directory.Build.props | 7 ++++++- ....SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.csproj | 4 ---- .../netcore/src/Microsoft.Data.SqlClient.csproj | 5 ----- .../netfx/src/Microsoft.Data.SqlClient.csproj | 4 ---- tools/props/Versions.props | 4 ++-- tools/specs/Microsoft.Data.SqlClient.nuspec | 7 +------ 6 files changed, 9 insertions(+), 22 deletions(-) diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 78b16706d6..cd06fd3a78 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -71,7 +71,7 @@ $(DefineConstants);ENCLAVE_SIMULATOR - + portable true @@ -84,6 +84,11 @@ true + + + + + 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 887450e932..91c3a028b9 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 @@ -31,10 +31,6 @@ - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - 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 f10c4f917b..52c3e07ac7 100644 --- a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj +++ b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj @@ -969,10 +969,6 @@ - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - @@ -992,7 +988,6 @@ - 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 4a92775d05..6cec67ee8e 100644 --- a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj +++ b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj @@ -716,10 +716,6 @@ - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - $(SystemTextEncodingsWebVersion) diff --git a/tools/props/Versions.props b/tools/props/Versions.props index eeda21d62e..fbcaf4788d 100644 --- a/tools/props/Versions.props +++ b/tools/props/Versions.props @@ -33,7 +33,7 @@ 6.24.0 4.5.1 6.0.0 - 1.1.0 + 8.0.0 @@ -83,4 +83,4 @@ $(NugetPackageVersion) $(NugetPackageVersion) - \ No newline at end of file + diff --git a/tools/specs/Microsoft.Data.SqlClient.nuspec b/tools/specs/Microsoft.Data.SqlClient.nuspec index b40506b330..99822881bc 100644 --- a/tools/specs/Microsoft.Data.SqlClient.nuspec +++ b/tools/specs/Microsoft.Data.SqlClient.nuspec @@ -110,27 +110,22 @@ When using NuGet 3.x this package requires at least version 3.4. - - - - - @@ -275,4 +270,4 @@ When using NuGet 3.x this package requires at least version 3.4. - \ No newline at end of file + From 7f8abdd474f58178bfcb9dcd3fa4765539bede82 Mon Sep 17 00:00:00 2001 From: JRahnama Date: Wed, 17 Jan 2024 19:12:24 -0800 Subject: [PATCH 15/19] adding extra line at the end of build.proj --- build.proj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.proj b/build.proj index ce72f28b0c..9f986234e2 100644 --- a/build.proj +++ b/build.proj @@ -237,4 +237,4 @@ - \ No newline at end of file + From d40c01d44ec7c7b15b49d9b777c1243ed511d574 Mon Sep 17 00:00:00 2001 From: JRahnama Date: Wed, 17 Jan 2024 19:14:12 -0800 Subject: [PATCH 16/19] commit --- src/Directory.Build.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Directory.Build.props b/src/Directory.Build.props index cd06fd3a78..fbc2321fec 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -97,4 +97,4 @@ - \ No newline at end of file + From 7ca66352c626c01bb7adde2c78535ae76a53753d Mon Sep 17 00:00:00 2001 From: JRahnama Date: Wed, 17 Jan 2024 20:52:32 -0800 Subject: [PATCH 17/19] Removing TF_BUILD from Microsoft.SourceLink.GitHub --- src/Directory.Build.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Directory.Build.props b/src/Directory.Build.props index fbc2321fec..a929dfb933 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -85,7 +85,7 @@ true - + From 4e6e7afaaca455da7163c3cf0b835821a10cddc5 Mon Sep 17 00:00:00 2001 From: JRahnama Date: Fri, 19 Jan 2024 10:52:26 -0800 Subject: [PATCH 18/19] minor changes. Removing true and snupkg as we do it inside pack command. Adding extra line at the end of Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.csproj --- src/Directory.Build.props | 2 -- ....Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.csproj | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/Directory.Build.props b/src/Directory.Build.props index a929dfb933..130569b357 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -76,8 +76,6 @@ portable true false - true - snupkg true true 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 91c3a028b9..eb08db41c2 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 @@ -34,4 +34,4 @@ - \ No newline at end of file + From 6ff85b100a632efe3ca6bab0aafc059001add416 Mon Sep 17 00:00:00 2001 From: Davoud Date: Tue, 23 Jan 2024 16:00:07 -0800 Subject: [PATCH 19/19] Make inline comment of TF_Build --- BUILDGUIDE.md | 9 --------- build.proj | 3 ++- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/BUILDGUIDE.md b/BUILDGUIDE.md index 08cf4e3c0b..47cacc9fb7 100644 --- a/BUILDGUIDE.md +++ b/BUILDGUIDE.md @@ -56,15 +56,6 @@ msbuild -t:BuildNetCoreAllOS # Builds the .NET driver for all Operating Systems. ``` -### Conditional properties intended for continuous integation build - -Some project properties are enabled only within AzureDevOps pipeline. For these properties, the DevOPs system variable TF_BUILD is used. - -For example: - -$(NugetPackProperties);ContinuousIntegrationBuild=true; - - ## Building Tests ```bash diff --git a/build.proj b/build.proj index 9f986234e2..d500f48886 100644 --- a/build.proj +++ b/build.proj @@ -36,7 +36,8 @@ DebugType=portable;DebugSymbols=true;IncludeSymbols=true;SymbolPackageFormat=snupkg;PublishRepositoryUrl=true;RepositoryUrl=https://github.com/dotnet/sqlclient;RepositoryType=git;EmbedUnTrackedSources=true;Deterministic=true; - $(NugetPackProperties);ContinuousIntegrationBuild=true; + + $(NugetPackProperties);ContinuousIntegrationBuild=true;