Skip to content

Commit 985e96d

Browse files
authored
[5.2] | Fix strong name in AKV provider (#2845)
1 parent a985927 commit 985e96d

File tree

3 files changed

+11
-3
lines changed

3 files changed

+11
-3
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,14 @@ steps:
4444
inputs:
4545
solution: '**/build.proj'
4646
configuration: '$(Configuration)'
47-
msbuildArguments: '-p:AssemblyFileVersion=${{parameters.AssemblyFileVersion }} -t:BuildAKVNetStAllOS -p:NugetPackageVersion=${{parameters.nugetPackageRefVersion }} -p:ReferenceType=Package -p:SignAssembly=true -p:AssemblyOriginatorKeyFile=$(Agent.TempDirectory)\netfxKeypair.snk'
47+
msbuildArguments: '-p:AssemblyFileVersion=${{parameters.AssemblyFileVersion }} -t:BuildAKVNetStAllOS -p:NugetPackageVersion=${{parameters.nugetPackageRefVersion }} -p:ReferenceType=Package -p:SigningKeyPath=$(Agent.TempDirectory)\netfxKeypair.snk'
4848

4949
- task: MSBuild@1
5050
displayName: 'BuildAKVNetFx using build.proj'
5151
inputs:
5252
solution: '**/build.proj'
5353
configuration: '$(Configuration)'
54-
msbuildArguments: '-p:AssemblyFileVersion=${{parameters.AssemblyFileVersion }} -t:BuildAKVNetFx -p:NugetPackageVersion=${{parameters.nugetPackageRefVersion }} -p:ReferenceType=Package -p:SignAssembly=true -p:AssemblyOriginatorKeyFile=$(Agent.TempDirectory)\netfxKeypair.snk'
54+
msbuildArguments: '-p:AssemblyFileVersion=${{parameters.AssemblyFileVersion }} -t:BuildAKVNetFx -p:NugetPackageVersion=${{parameters.nugetPackageRefVersion }} -p:ReferenceType=Package -p:SigningKeyPath=$(Agent.TempDirectory)\netfxKeypair.snk'
5555

5656
- task: MSBuild@1
5757
displayName: 'BuildAKVNetCoreAllOS using build.proj'

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ steps:
4242
msBuildVersion: 17.0
4343
msBuildArchitecture: x64
4444
setupCommandlinePicker: vs2022
45-
msBuildCommandline: 'msbuild ${{parameters.sourceRoot}}\build.proj -p:configuration=Release -p:GenerateNuget=false -p:BuildTools=false -p:NugetPackageVersion=${{parameters.nugetPackageRefVersion }} -p:ReferenceType=Package -t:BuildAKVNetCoreAllOS'
45+
msBuildCommandline: 'msbuild ${{parameters.sourceRoot}}\build.proj -p:configuration=Release -p:GenerateNuget=false -p:BuildTools=false -p:NugetPackageVersion=${{parameters.nugetPackageRefVersion }} -p:ReferenceType=Package -t:BuildAKVNetCoreAllOS -p:SigningKeyPath=$(Agent.TempDirectory)\netfxKeypair.snk'
4646

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

src/Microsoft.Data.SqlClient/add-ons/AzureKeyVaultProvider/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.csproj

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,14 @@
1515
<BuildProjectReferences>false</BuildProjectReferences>
1616
<PackageLicenseExpression>MIT</PackageLicenseExpression>
1717
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
18+
</PropertyGroup>
19+
<!--Generating Strong Name-->
20+
<PropertyGroup Condition="'$(CDP_BUILD_TYPE)'=='Official'">
21+
<SignAssembly>true</SignAssembly>
22+
<KeyFile>$(SigningKeyPath)</KeyFile>
23+
</PropertyGroup>
24+
<PropertyGroup>
25+
<AssemblyOriginatorKeyFile>$(SigningKeyPath)</AssemblyOriginatorKeyFile>
1826
</PropertyGroup>
1927
<PropertyGroup>
2028
<TargetFrameworkMonikerAssemblyAttributesPath>$([System.IO.Path]::Combine('$(IntermediateOutputPath)','$(GeneratedSourceFileName)'))</TargetFrameworkMonikerAssemblyAttributesPath>

0 commit comments

Comments
 (0)