Skip to content

Commit ce929ff

Browse files
authored
[4.0] eng | Fix strong name issue (#2701) (#2746)
1 parent f401443 commit ce929ff

File tree

6 files changed

+38
-2
lines changed

6 files changed

+38
-2
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ steps:
3535
inputs:
3636
solution: '**/build.proj'
3737
configuration: '${{parameters.Configuration }}'
38-
msbuildArguments: '-p:AssemblyFileVersion=${{parameters.AssemblyFileVersion }} -t:BuildAllConfigurations -p:GenerateNuget=false -p:SignAssembly=true -p:AssemblyOriginatorKeyFile=$(Agent.TempDirectory)\netfxKeypair.snk'
38+
msbuildArguments: '-p:AssemblyFileVersion=${{parameters.AssemblyFileVersion }} -t:BuildAllConfigurations -p:GenerateNuget=false -p:SignAssembly=true -p:SigningKeyPath=$(Agent.TempDirectory)\netfxKeypair.snk'
3939

4040
- ${{ if eq(parameters.product, 'AKV') }}:
4141
- task: MSBuild@1

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ steps:
3333
msBuildVersion: 17.0
3434
msBuildArchitecture: x64
3535
setupCommandlinePicker: vs2022
36-
msBuildCommandline: 'msbuild ${{parameters.sourceRoot}}\build.proj -p:configuration=Release -p:GenerateNuget=false -p:BuildTools=false'
36+
msBuildCommandline: 'msbuild ${{parameters.sourceRoot}}\build.proj -p:configuration=Release -p:GenerateNuget=false -p:BuildTools=false -p:SigningKeyPath=$(Agent.TempDirectory)\netfxKeypair.snk'
3737
- ${{ if eq(parameters.product, 'AKV') }}:
3838
- task: securedevelopmentteam.vss-secure-development-tools.build-task-roslynanalyzers.RoslynAnalyzers@3
3939
displayName: 'Guardian Dotnet Analyzers '

src/Microsoft.Data.SqlClient/netcore/ref/Microsoft.Data.SqlClient.csproj

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,15 @@
1818
<PropertyGroup Condition="'$(TargetGroup)' == 'netcoreapp'">
1919
<DefineConstants>$(DefineConstants);NETCOREAPP</DefineConstants>
2020
</PropertyGroup>
21+
<PropertyGroup Condition="$(CDP_BUILD_TYPE)==Official">
22+
<SignAssembly>true</SignAssembly>
23+
<DelaySign>true</DelaySign>
24+
<KeyFile>$(SigningKeyPath)</KeyFile>
25+
<AssemblyOriginatorKeyFile>$(SigningKeyPath)</AssemblyOriginatorKeyFile>
26+
</PropertyGroup>
27+
<PropertyGroup Condition="$(CDP_BUILD_TYPE)!=Official">
28+
<AssemblyOriginatorKeyFile>$(SigningKeyPath)</AssemblyOriginatorKeyFile>
29+
</PropertyGroup>
2130
<ItemGroup>
2231
<Compile Include="Microsoft.Data.SqlClient.cs" />
2332
<Compile Include="Microsoft.Data.SqlClient.Manual.cs" />

src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,15 @@
2828
<PropertyGroup Condition="'$(TargetGroup)' == 'netcoreapp' AND !$(TargetFramework.StartsWith('netcoreapp2.'))">
2929
<DefineConstants>$(DefineConstants);NETCOREAPP31_AND_ABOVE</DefineConstants>
3030
</PropertyGroup>
31+
<PropertyGroup Condition="$(CDP_BUILD_TYPE)==Official">
32+
<SignAssembly>true</SignAssembly>
33+
<DelaySign>true</DelaySign>
34+
<KeyFile>$(SigningKeyPath)</KeyFile>
35+
<AssemblyOriginatorKeyFile>$(SigningKeyPath)</AssemblyOriginatorKeyFile>
36+
</PropertyGroup>
37+
<PropertyGroup Condition="$(CDP_BUILD_TYPE)!=Official">
38+
<AssemblyOriginatorKeyFile>$(SigningKeyPath)</AssemblyOriginatorKeyFile>
39+
</PropertyGroup>
3140
<PropertyGroup>
3241
<DebugType>portable</DebugType>
3342
<DebugSymbols>true</DebugSymbols>

src/Microsoft.Data.SqlClient/netfx/ref/Microsoft.Data.SqlClient.csproj

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,15 @@
88
<Product>Framework $(BaseProduct)</Product>
99
<Configurations>Debug;Release;</Configurations>
1010
</PropertyGroup>
11+
<PropertyGroup Condition="$(CDP_BUILD_TYPE)==Official">
12+
<SignAssembly>true</SignAssembly>
13+
<DelaySign>true</DelaySign>
14+
<KeyFile>$(SigningKeyPath)</KeyFile>
15+
<AssemblyOriginatorKeyFile>$(SigningKeyPath)</AssemblyOriginatorKeyFile>
16+
</PropertyGroup>
17+
<PropertyGroup Condition="$(CDP_BUILD_TYPE)!=Official">
18+
<AssemblyOriginatorKeyFile>$(SigningKeyPath)</AssemblyOriginatorKeyFile>
19+
</PropertyGroup>
1120
<ItemGroup>
1221
<Compile Include="Microsoft.Data.SqlClient.cs" />
1322
</ItemGroup>

src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,15 @@
5959
<ComCompatibleSideBySide>True</ComCompatibleSideBySide>
6060
<GenerateTargetFrameworkAttribute>False</GenerateTargetFrameworkAttribute>
6161
</PropertyGroup>
62+
<PropertyGroup Condition="$(CDP_BUILD_TYPE)==Official">
63+
<SignAssembly>true</SignAssembly>
64+
<DelaySign>true</DelaySign>
65+
<KeyFile>$(SigningKeyPath)</KeyFile>
66+
<AssemblyOriginatorKeyFile>$(SigningKeyPath)</AssemblyOriginatorKeyFile>
67+
</PropertyGroup>
68+
<PropertyGroup Condition="$(CDP_BUILD_TYPE)!=Official">
69+
<AssemblyOriginatorKeyFile>$(SigningKeyPath)</AssemblyOriginatorKeyFile>
70+
</PropertyGroup>
6271
<!-- ********************** Configuration and Platform specific properties ********************* -->
6372
<!-- All Available Configurations-->
6473
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />

0 commit comments

Comments
 (0)