Skip to content

Commit 89e0562

Browse files
committed
User Story 39839: Move existing MDS tests to Azure package
- Identified and moved tests specific to ActiveDirectoryAuthenticationProvider into the Azure Test project. - Updated other existing tests in Functional and Manual Test projects to cover a few missing cases. - Added tests to Abstractions Test project to ensure AAD/Entra auth fails when the Azure package isn't present. - Various build and pipeline changes to support the test changes.
1 parent 4e16f78 commit 89e0562

File tree

7 files changed

+13
-100
lines changed

7 files changed

+13
-100
lines changed

build.proj

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -515,11 +515,7 @@
515515
<RemoveDir Directories='$([System.IO.Directory]::GetDirectories(".", "bin", SearchOption.AllDirectories))' />
516516
<RemoveDir Directories='$([System.IO.Directory]::GetDirectories(".", ".nuget", SearchOption.AllDirectories))' />
517517
<RemoveDir Directories='$([System.IO.Directory]::GetDirectories(".", "obj", SearchOption.AllDirectories))' />
518-
<<<<<<< HEAD
519-
=======
520-
<RemoveDir Directories='$([System.IO.Directory]::GetDirectories(".", "packages", SearchOption.AllDirectories))' />
521-
>>>>>>> f6a74cc8c (Abstractions Package - C# project changes (#3626))
522-
</Target>
518+
</Target>
523519

524520
<!-- AKV Targets ========================================================= -->
525521
<Target Name="BuildAkv">

eng/pipelines/libraries/ci-build-variables.yml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,3 @@ variables:
2828
value: false
2929
- name: packagePath
3030
value: '$(Build.SourcesDirectory)/packages'
31-
32-
# TODO(ADO-38703): Remove these when the other pipeline changes arrive.
33-
- name: baseBuildNumber
34-
value: $[ split(variables['Build.BuildNumber'], '.')[0] ]
35-
- name: abstractionsPackageVersion
36-
value: 1.0.0.$(baseBuildNumber)
37-
- name: mdsPackageVersion
38-
value: $(NugetPackageVersion)
39-
- name: akvPackageVersion
40-
value: $(NugetPackageVersion)

eng/pipelines/libraries/common-variables.yml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -81,13 +81,3 @@ variables:
8181
value: $(Major).$(Minor).$(Patch).$(assemblyBuildNumber)
8282
- name: nuspecPath
8383
value: '$(REPOROOT)/tools/specs/Microsoft.Data.SqlClient.nuspec'
84-
85-
# TODO(ADO-38703): Remove these when the other pipeline changes arrive.
86-
- name: baseBuildNumber
87-
value: $[ split(variables['Build.BuildNumber'], '.')[0] ]
88-
- name: abstractionsPackageVersion
89-
value: 1.0.0.$(baseBuildNumber)
90-
- name: mdsPackageVersion
91-
value: $(NugetPackageVersion)
92-
- name: akvPackageVersion
93-
value: $(NugetPackageVersion)

src/Microsoft.Data.SqlClient.Extensions/Abstractions/doc/Sample.xml

Lines changed: 0 additions & 18 deletions
This file was deleted.

src/Microsoft.Data.SqlClient.Extensions/Abstractions/src/Sample.cs

Lines changed: 0 additions & 20 deletions
This file was deleted.

src/Microsoft.Data.SqlClient.Extensions/Abstractions/test/SampleTest.cs

Lines changed: 0 additions & 19 deletions
This file was deleted.

tools/specs/add-ons/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.nuspec

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,6 @@ Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyStoreProvider.SqlColumnEncrypti
3636
<dependency id="Azure.Security.KeyVault.Keys" version="4.8.0" />
3737
<dependency id="Microsoft.Extensions.Caching.Memory" version="8.0.1" />
3838
</group>
39-
<group targetFramework="net8.0">
40-
<dependency id="Microsoft.Data.SqlClient" version="$MdsPackageVersion$" />
41-
<dependency id="Azure.Core" version="1.47.1" />
42-
<dependency id="Azure.Security.KeyVault.Keys" version="4.7.0" />
43-
<dependency id="Microsoft.Extensions.Caching.Memory" version="8.0.1" />
44-
</group>
4539
</dependencies>
4640
<frameworkAssemblies>
4741
<frameworkAssembly assemblyName="mscorlib" targetFramework="net462" />
@@ -57,22 +51,22 @@ Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyStoreProvider.SqlColumnEncrypti
5751
-->
5852

5953
<!-- NetFx Files -->
60-
<file src="..\..\..\artifacts\Project\bin\Windows_NT\$Configuration$.AnyCPU\AzureKeyVaultProvider\net462\Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.dll" target="lib\net462\" exclude="" />
61-
<file src="..\..\..\artifacts\Project\bin\Windows_NT\$Configuration$.AnyCPU\AzureKeyVaultProvider\net462\Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.pdb" target="lib\net462\" exclude="" />
62-
<file src="..\..\..\artifacts\Project\bin\Windows_NT\$Configuration$.AnyCPU\AzureKeyVaultProvider\net462\Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.xml" target="lib\net462\" exclude="" />
63-
<file src="..\..\..\artifacts\Project\bin\Windows_NT\$Configuration$.AnyCPU\AzureKeyVaultProvider\net462\Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.dll" target="runtimes\win\lib\net462\" exclude="" />
64-
<file src="..\..\..\artifacts\Project\bin\Windows_NT\$Configuration$.AnyCPU\AzureKeyVaultProvider\net462\Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.pdb" target="runtimes\win\lib\net462\" exclude="" />
54+
<file src="..\..\..\artifacts\$ReferenceType$\bin\Windows_NT\$Configuration$.AnyCPU\AzureKeyVaultProvider\net462\Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.dll" target="lib\net462\" exclude="" />
55+
<file src="..\..\..\artifacts\$ReferenceType$\bin\Windows_NT\$Configuration$.AnyCPU\AzureKeyVaultProvider\net462\Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.pdb" target="lib\net462\" exclude="" />
56+
<file src="..\..\..\artifacts\$ReferenceType$\bin\Windows_NT\$Configuration$.AnyCPU\AzureKeyVaultProvider\net462\Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.xml" target="lib\net462\" exclude="" />
57+
<file src="..\..\..\artifacts\$ReferenceType$\bin\Windows_NT\$Configuration$.AnyCPU\AzureKeyVaultProvider\net462\Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.dll" target="runtimes\win\lib\net462\" exclude="" />
58+
<file src="..\..\..\artifacts\$ReferenceType$\bin\Windows_NT\$Configuration$.AnyCPU\AzureKeyVaultProvider\net462\Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.pdb" target="runtimes\win\lib\net462\" exclude="" />
6559

6660
<!-- NetCore Files -->
67-
<file src="..\..\..\artifacts\Project\bin\AnyOS\$Configuration$.AnyCPU\AzureKeyVaultProvider\net8.0\Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.dll" target="lib\net8.0\" exclude="" />
68-
<file src="..\..\..\artifacts\Project\bin\Windows_NT\$Configuration$.AnyCPU\AzureKeyVaultProvider\net8.0\Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.dll" target="runtimes\win\lib\net8.0\" exclude="" />
69-
<file src="..\..\..\artifacts\Project\bin\Unix\$Configuration$.AnyCPU\AzureKeyVaultProvider\net8.0\Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.dll" target="runtimes\unix\lib\net8.0\" exclude="" />
61+
<file src="..\..\..\artifacts\$ReferenceType$\bin\AnyOS\$Configuration$.AnyCPU\AzureKeyVaultProvider\net8.0\Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.dll" target="lib\net8.0\" exclude="" />
62+
<file src="..\..\..\artifacts\$ReferenceType$\bin\Windows_NT\$Configuration$.AnyCPU\AzureKeyVaultProvider\net8.0\Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.dll" target="runtimes\win\lib\net8.0\" exclude="" />
63+
<file src="..\..\..\artifacts\$ReferenceType$\bin\Unix\$Configuration$.AnyCPU\AzureKeyVaultProvider\net8.0\Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.dll" target="runtimes\unix\lib\net8.0\" exclude="" />
7064

71-
<file src="..\..\..\artifacts\Project\bin\AnyOS\$Configuration$.AnyCPU\AzureKeyVaultProvider\net8.0\Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.pdb" target="lib\net8.0\" exclude="" />
72-
<file src="..\..\..\artifacts\Project\bin\Windows_NT\$Configuration$.AnyCPU\AzureKeyVaultProvider\net8.0\Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.pdb" target="runtimes\win\lib\net8.0\" exclude="" />
73-
<file src="..\..\..\artifacts\Project\bin\Unix\$Configuration$.AnyCPU\AzureKeyVaultProvider\net8.0\Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.pdb" target="runtimes\unix\lib\net8.0\" exclude="" />
65+
<file src="..\..\..\artifacts\$ReferenceType$\bin\AnyOS\$Configuration$.AnyCPU\AzureKeyVaultProvider\net8.0\Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.pdb" target="lib\net8.0\" exclude="" />
66+
<file src="..\..\..\artifacts\$ReferenceType$\bin\Windows_NT\$Configuration$.AnyCPU\AzureKeyVaultProvider\net8.0\Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.pdb" target="runtimes\win\lib\net8.0\" exclude="" />
67+
<file src="..\..\..\artifacts\$ReferenceType$\bin\Unix\$Configuration$.AnyCPU\AzureKeyVaultProvider\net8.0\Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.pdb" target="runtimes\unix\lib\net8.0\" exclude="" />
7468

75-
<file src="..\..\..\artifacts\Project\bin\AnyOS\$Configuration$.AnyCPU\AzureKeyVaultProvider\net8.0\Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.xml" target="lib\net8.0\" exclude="" />
69+
<file src="..\..\..\artifacts\$ReferenceType$\bin\AnyOS\$Configuration$.AnyCPU\AzureKeyVaultProvider\net8.0\Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.xml" target="lib\net8.0\" exclude="" />
7670

7771
<!--
7872
GOTCHA: Even though we target .NET 9.0 and build DLLs for it, we do not

0 commit comments

Comments
 (0)