Skip to content

Commit e5eb0ac

Browse files
paulmedynskipaulmedynski
committed
User Story 33636: Add Linux build support
- Removed 'Update AKV MDS package version' step. - Added TestMicrosoftDataSqlClientVersion property to AKV Package build steps.
1 parent cdb77f0 commit e5eb0ac

File tree

5 files changed

+48
-48
lines changed

5 files changed

+48
-48
lines changed

‎eng/pipelines/common/templates/jobs/validate-signed-package-job.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,7 @@ jobs:
340340
displayName: 'Modify TestMicrosoftDataSqlClientVersion'
341341
342342
- powershell: |
343-
#Change TestMicrosoftDataSqlClientVersion
343+
#Check AssemblyFileVersion
344344
345345
[Xml] $versionprops = Get-Content -Path "tools/props/Versions.props"
346346
$AssemblyFileVersion = $versionprops.Project.PropertyGroup[0].AssemblyFileVersion

‎eng/pipelines/common/templates/steps/build-and-run-tests-netcore-step.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ steps:
4747
inputs:
4848
solution: build.proj
4949
msbuildArchitecture: x64
50-
msbuildArguments: '-p:Configuration=${{parameters.configuration }} -t:BuildAKVNetCore -p:ReferenceType=${{parameters.referenceType }} '
50+
msbuildArguments: '-p:Configuration=${{parameters.configuration }} -t:BuildAKVNetCore -p:ReferenceType=${{parameters.referenceType }} -p:TestMicrosoftDataSqlClientVersion=${{parameters.NugetPackageVersion }} '
5151

5252
- task: MSBuild@1
5353
displayName: 'MSBuild Build Tests for ${{parameters.TargetNetCoreVersion }}'

‎eng/pipelines/common/templates/steps/build-and-run-tests-netfx-step.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ steps:
4747
inputs:
4848
solution: build.proj
4949
msbuildArchitecture: x64
50-
msbuildArguments: '-p:Configuration=${{parameters.configuration }} -t:BuildAKVNetFx -p:ReferenceType=${{parameters.referenceType }} '
50+
msbuildArguments: '-p:Configuration=${{parameters.configuration }} -t:BuildAKVNetFx -p:ReferenceType=${{parameters.referenceType }} -p:TestMicrosoftDataSqlClientVersion=${{parameters.NugetPackageVersion }}'
5151

5252
- task: MSBuild@1
5353
displayName: 'MSBuild Build Tests for ${{parameters.TargetNetFxVersion }}'

‎eng/pipelines/common/templates/steps/ci-project-build-step.yml

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -81,23 +81,23 @@ steps:
8181
clean: true
8282

8383
- ${{ if or(eq(parameters.build, 'AKV'), eq(parameters.build, 'all'), eq(parameters.build, 'allNoDocs')) }}:
84-
# - task: MSBuild@1
85-
# displayName: 'Build AKV Provider NetFx [Win]'
86-
# condition: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT'))
87-
# inputs:
88-
# solution: build.proj
89-
# msbuildArchitecture: x64
90-
# platform: '${{ parameters.platform }}'
91-
# configuration: '${{ parameters.configuration }}'
92-
# msbuildArguments: '-t:BuildAKVNetFx -p:BuildNumber=${{ parameters.buildNumber }}'
93-
94-
- task: DotNetCoreCLI@2
95-
displayName: 'Build AKV Provider NetFx (dotnet) [Win]'
84+
- task: MSBuild@1
85+
displayName: 'Build AKV Provider NetFx [Win]'
9686
condition: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT'))
9787
inputs:
98-
command: build
99-
projects: build.proj
100-
arguments: '-t:BuildAKVNetFx -p:Platform=${{ parameters.platform }} -p:Configuration=${{ parameters.configuration }} -p:BuildNumber=${{ parameters.buildNumber }} -v detailed --no-restore'
88+
solution: build.proj
89+
msbuildArchitecture: x64
90+
platform: '${{ parameters.platform }}'
91+
configuration: '${{ parameters.configuration }}'
92+
msbuildArguments: '-t:BuildAKVNetFx -p:BuildNumber=${{ parameters.buildNumber }}'
93+
94+
# - task: DotNetCoreCLI@2
95+
# displayName: 'Build AKV Provider NetFx (dotnet) [Win]'
96+
# condition: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT'))
97+
# inputs:
98+
# command: build
99+
# projects: build.proj
100+
# arguments: '-t:BuildAKVNetFx -p:Platform=${{ parameters.platform }} -p:Configuration=${{ parameters.configuration }} -p:BuildNumber=${{ parameters.buildNumber }} -v detailed --no-restore'
101101

102102
- task: MSBuild@1
103103
displayName: 'Build AKV Provider NetCore All OS [Win]'

‎eng/pipelines/common/templates/steps/update-nuget-config-local-feed-step.yml

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -54,36 +54,36 @@ steps:
5454
arguments: 'build.proj -t:restore'
5555
feedsToUse: 'select'
5656

57-
- powershell: |
58-
$Doc = [xml](Get-Content "./Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.csproj")
59-
$parent_xpath = '/Project/ItemGroup/ProjectReference'
60-
$node = $Doc.SelectSingleNode($parent_xpath)
61-
$parentNode = $node.ParentNode
62-
while($node -ne $null) {
63-
$node.ParentNode.RemoveChild($node)
64-
$node = $Doc.SelectSingleNode($parent_xpath)
65-
}
57+
# - powershell: |
58+
# $Doc = [xml](Get-Content "./Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.csproj")
59+
# $parent_xpath = '/Project/ItemGroup/ProjectReference'
60+
# $node = $Doc.SelectSingleNode($parent_xpath)
61+
# $parentNode = $node.ParentNode
62+
# while($node -ne $null) {
63+
# $node.ParentNode.RemoveChild($node)
64+
# $node = $Doc.SelectSingleNode($parent_xpath)
65+
# }
6666

67-
$parent_xpath = '/Project/ItemGroup/PackageReference[@Include="Microsoft.Data.SqlClient"]'
68-
$node = $Doc.SelectSingleNode($parent_xpath)
67+
# $parent_xpath = '/Project/ItemGroup/PackageReference[@Include="Microsoft.Data.SqlClient"]'
68+
# $node = $Doc.SelectSingleNode($parent_xpath)
6969

70-
if($node -ne $null){
71-
$node.Version="${{parameters.nugetPackageVersion }}"
72-
}
73-
else{
74-
$packagerefnode = $doc.createelement("packagereference")
75-
$value = $doc.selectsinglenode('/project/itemgroup/projectreference')
76-
$attrinclude = $doc.createattribute("include")
77-
$attrinclude.value = "microsoft.data.sqlclient"
78-
$attrversion = $doc.createattribute("version")
79-
$attrversion.value = "${{parameters.nugetPackageVersion }}"
80-
$packagerefnode.attributes.append($attrinclude)
81-
$packagerefnode.attributes.append($attrversion)
82-
$parentNode.AppendChild($packageRefNode)
83-
}
70+
# if($node -ne $null){
71+
# $node.Version="${{parameters.nugetPackageVersion }}"
72+
# }
73+
# else{
74+
# $packagerefnode = $doc.createelement("packagereference")
75+
# $value = $doc.selectsinglenode('/project/itemgroup/projectreference')
76+
# $attrinclude = $doc.createattribute("include")
77+
# $attrinclude.value = "microsoft.data.sqlclient"
78+
# $attrversion = $doc.createattribute("version")
79+
# $attrversion.value = "${{parameters.nugetPackageVersion }}"
80+
# $packagerefnode.attributes.append($attrinclude)
81+
# $packagerefnode.attributes.append($attrversion)
82+
# $parentNode.AppendChild($packageRefNode)
83+
# }
8484

85-
$currentFolder = Get-Location
86-
$filePath = Join-Path $currentFolder "Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.csproj"
87-
$Doc.Save($filePath)
88-
workingDirectory: 'src/Microsoft.Data.SqlClient/add-ons/AzureKeyVaultProvider'
89-
displayName: 'Update AKV Project Ref to Package Ref (.NET Framework/Core)'
85+
# $currentFolder = Get-Location
86+
# $filePath = Join-Path $currentFolder "Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.csproj"
87+
# $Doc.Save($filePath)
88+
# workingDirectory: 'src/Microsoft.Data.SqlClient/add-ons/AzureKeyVaultProvider'
89+
# displayName: 'Update AKV Project Ref to Package Ref (.NET Framework/Core)'

0 commit comments

Comments
 (0)