Skip to content

Commit 6ea87f0

Browse files
authored
Remove AKV Build from sqlclient-official build (#3187)
* Remove the AKV pipeline from the current official MDS pipeline * Removing MDS_PackageRef_Version * Add target to build guide
1 parent 1e59b88 commit 6ea87f0

10 files changed

+1
-166
lines changed

BUILDGUIDE.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ Once the environment is setup properly, execute the desired set of commands belo
3030
|`RunTests`|Runs the functional and manual tests for the .NET Framework and .NET drivers|
3131
|`RunFunctionalTests`|Runs just the functional tests for the .NET Framework and .NET drivers|
3232
|`RunManualTests`|Runs just the manual tests for the .NET Framework and .NET drivers|
33+
|`BuildAkv`|Builds the Azure Key Vault Provider package for all supported platforms.|
3334

3435

3536
### Parameters

eng/pipelines/common/templates/jobs/build-signed-akv-package-job.yml

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

eng/pipelines/common/templates/steps/build-all-configurations-signed-dlls-step.yml

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ parameters:
2020
default: MDS
2121
values:
2222
- MDS
23-
- AKV
2423
- MSS
2524

2625
steps:
@@ -49,18 +48,3 @@ steps:
4948
solution: '**/build.proj'
5049
configuration: '${{parameters.Configuration }}'
5150
msbuildArguments: '-p:AssemblyFileVersion=${{parameters.AssemblyFileVersion }} -t:BuildAllConfigurations -p:GenerateNuget=false -p:SigningKeyPath=$(Agent.TempDirectory)\netfxKeypair.snk'
52-
53-
- ${{ if eq(parameters.product, 'AKV') }}:
54-
- task: MSBuild@1
55-
displayName: 'BuildAKVNetFx using build.proj'
56-
inputs:
57-
solution: '**/build.proj'
58-
configuration: '${{parameters.Configuration }}'
59-
msbuildArguments: '-p:AssemblyFileVersion=${{parameters.AssemblyFileVersion }} -t:BuildAKVNetFx -p:NugetPackageVersion=${{parameters.packageRefMdsVersion }} -p:ReferenceType=Package -p:SigningKeyPath=$(Agent.TempDirectory)\netfxKeypair.snk'
60-
61-
- task: MSBuild@1
62-
displayName: 'BuildAKVNetCoreAllOS using build.proj'
63-
inputs:
64-
solution: '**/build.proj'
65-
configuration: '${{parameters.Configuration }}'
66-
msbuildArguments: '-p:AssemblyFileVersion=${{parameters.AssemblyFileVersion }} -t:BuildAKVNetCoreAllOS -p:NugetPackageVersion=${{parameters.packageRefMdsVersion }} -p:ReferenceType=Package -p:SigningKeyPath=$(Agent.TempDirectory)\netfxKeypair.snk'

eng/pipelines/common/templates/steps/code-analyze-step.yml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ parameters:
2222
default: MDS
2323
values:
2424
- MDS
25-
- AKV
2625
- MSS
2726

2827
steps:
@@ -35,14 +34,6 @@ steps:
3534
msBuildArchitecture: x64
3635
setupCommandlinePicker: vs2022
3736
msBuildCommandline: 'msbuild ${{parameters.sourceRoot}}\build.proj -p:configuration=Release -p:GenerateNuget=false -p:BuildTools=false -p:SigningKeyPath=$(Agent.TempDirectory)\netfxKeypair.snk'
38-
- ${{ if eq(parameters.product, 'AKV') }}:
39-
- task: securedevelopmentteam.vss-secure-development-tools.build-task-roslynanalyzers.RoslynAnalyzers@3
40-
displayName: 'Guardian Dotnet Analyzers '
41-
inputs:
42-
msBuildVersion: 17.0
43-
msBuildArchitecture: x64
44-
setupCommandlinePicker: vs2022
45-
msBuildCommandline: 'msbuild ${{parameters.sourceRoot}}\build.proj -p:configuration=Release -p:GenerateNuget=false -p:BuildTools=false -p:NugetPackageVersion=${{parameters.packageRefMdsVersion }} -p:ReferenceType=Package -t:BuildAKVNetCoreAllOS -p:SigningKeyPath=$(Agent.TempDirectory)\netfxKeypair.snk'
4637

4738
- ${{ if or(eq(parameters.analyzeType, 'inspect'), eq(parameters.analyzeType, 'all')) }}:
4839
- task: securedevelopmentteam.vss-secure-development-tools.build-task-codeinspector.CodeInspector@2

eng/pipelines/common/templates/steps/copy-dlls-for-test-step.yml

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ parameters:
3333
default: MDS
3434
values:
3535
- MDS
36-
- AKV
3736
- MSS
3837

3938
steps:
@@ -80,23 +79,6 @@ steps:
8079
Get-Location
8180
displayName: 'Prepare ${{ targetFramework }} Artifacts for Testing'
8281
83-
- ${{ if eq(parameters.product, 'AKV') }}:
84-
- powershell: |
85-
$software = '${{parameters.softwareFolder}}'
86-
$tf = '${{ targetFramework }}'
87-
md $software\win\$tf
88-
89-
Copy-Item "artifacts\${{parameters.referenceType }}\bin\Windows_NT\${{parameters.Configuration }}.AnyCPU\AzureKeyVaultProvider\$tf\Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.dll" "$software\win\$tf" -recurse
90-
91-
$symbols = '${{parameters.symbolsFolder}}'
92-
md $symbols\win\$tf
93-
94-
Copy-Item "artifacts\${{parameters.referenceType }}\bin\Windows_NT\${{parameters.Configuration }}.AnyCPU\AzureKeyVaultProvider\$tf\Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.pdb" "$symbols\win\$tf" -recurse
95-
96-
Write-Host "Artifacts fetched for testing"
97-
Get-Location
98-
displayName: 'Prepare ${{ targetFramework }} Artifacts for Testing'
99-
10082
- powershell: |
10183
$software = '${{parameters.softwareFolder}}'
10284
$symbols = '${{parameters.symbolsFolder}}'

eng/pipelines/common/templates/steps/publish-symbols-step.yml

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ parameters:
4545
default: MDS
4646
values:
4747
- MDS
48-
- AKV
4948
- MSS
5049

5150
steps:
@@ -71,24 +70,6 @@ steps:
7170
Pat: $(System.AccessToken)
7271
condition: and(succeeded(), ${{ eq(parameters.publishSymbols, 'true') }})
7372

74-
- ${{ if eq(parameters.product, 'AKV') }}:
75-
- task: PublishSymbols@2
76-
displayName: 'Upload symbols to ${{parameters.SymAccount }} org'
77-
inputs:
78-
SymbolsFolder: '$(Build.SourcesDirectory)\artifacts\${{parameters.referenceType }}\bin'
79-
SearchPattern: |
80-
Windows_NT/$(Configuration).AnyCPU/AzureKeyVaultProvider/**/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.pdb
81-
AnyOS/$(Configuration).AnyCPU/AzureKeyVaultProvider/**/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.pdb
82-
IndexSources: false
83-
SymbolServerType: TeamServices
84-
SymbolsMaximumWaitTime: 60
85-
SymbolExpirationInDays: 1825 # 5 years
86-
SymbolsProduct: Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider
87-
SymbolsVersion: ${{parameters.symbolsVersion }}
88-
SymbolsArtifactName: ${{parameters.symbolsArtifactName }}
89-
Pat: $(System.AccessToken)
90-
condition: and(succeeded(), ${{ eq(parameters.publishSymbols, 'true') }})
91-
9273
- task: AzureCLI@2
9374
displayName: 'Publish symbols'
9475
condition: and(succeeded(), ${{ eq(parameters.publishSymbols, 'true') }})

eng/pipelines/dotnet-sqlclient-signing-pipeline.yml

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,6 @@ parameters: # parameters are shown up in ADO UI in a build queue time
4545
type: boolean
4646
default: false
4747

48-
- name: MDS_PackageRef_Version
49-
displayName: 'MDS package version of AKV Provider (build AKV)'
50-
type: string
51-
default: 5.1.5
52-
5348
- name: CurrentNetFxVersion
5449
displayName: 'Lowest supported .NET Framework version (MDS validation)'
5550
type: string
@@ -73,8 +68,6 @@ variables:
7368
value: drop_buildMDS_build_signed_package
7469
- name: PublishSymbols
7570
value: ${{ parameters['publishSymbols'] }}
76-
- name: MDS_PackageRef_Version
77-
value: ${{ parameters['MDS_PackageRef_Version'] }}
7871
- name: CurrentNetFxVersion
7972
value: ${{ parameters['CurrentNetFxVersion'] }}
8073

@@ -130,15 +123,6 @@ extends:
130123
tsaOptionsPath: $(REPOROOT)\.config\tsaoptions.json
131124
disableLegacyManifest: true
132125
stages:
133-
- stage: buildAKV
134-
displayName: 'Build AKV Provider'
135-
jobs:
136-
- template: eng/pipelines/common/templates/jobs/build-signed-akv-package-job.yml@self
137-
parameters:
138-
symbolsFolder: $(symbolsFolder)
139-
softwareFolder: $(softwareFolder)
140-
publishSymbols: ${{ parameters['publishSymbols'] }}
141-
142126
- stage: buildMDS
143127
displayName: 'Build MDS'
144128
jobs:

eng/pipelines/libraries/akv-variables.yml

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

eng/pipelines/libraries/build-variables.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,4 @@
66

77
variables:
88
- template: common-variables.yml@self
9-
- template: akv-variables.yml@self
109
- template: mds-variables.yml@self

src/Microsoft.Data.SqlClient.sln

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "templates", "templates", "{
234234
EndProject
235235
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "jobs", "jobs", "{3850810F-535E-443A-A9B4-7EE85B327E0A}"
236236
ProjectSection(SolutionItems) = preProject
237-
..\eng\pipelines\common\templates\jobs\build-signed-akv-package-job.yml = ..\eng\pipelines\common\templates\jobs\build-signed-akv-package-job.yml
238237
..\eng\pipelines\common\templates\jobs\build-signed-package-job.yml = ..\eng\pipelines\common\templates\jobs\build-signed-package-job.yml
239238
..\eng\pipelines\common\templates\jobs\ci-build-nugets-job.yml = ..\eng\pipelines\common\templates\jobs\ci-build-nugets-job.yml
240239
..\eng\pipelines\common\templates\jobs\ci-code-coverage-job.yml = ..\eng\pipelines\common\templates\jobs\ci-code-coverage-job.yml
@@ -275,7 +274,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "steps", "steps", "{EABE3A3E
275274
EndProject
276275
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libraries", "libraries", "{75BAE755-3A1F-41F2-9176-9F8FF9FEE2DD}"
277276
ProjectSection(SolutionItems) = preProject
278-
..\eng\pipelines\libraries\akv-variables.yml = ..\eng\pipelines\libraries\akv-variables.yml
279277
..\eng\pipelines\libraries\build-variables.yml = ..\eng\pipelines\libraries\build-variables.yml
280278
..\eng\pipelines\libraries\ci-build-variables.yml = ..\eng\pipelines\libraries\ci-build-variables.yml
281279
..\eng\pipelines\libraries\common-variables.yml = ..\eng\pipelines\libraries\common-variables.yml

0 commit comments

Comments
 (0)