Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

eng | Add delay signed to official builds #2653

Merged
merged 4 commits into from
Jul 10, 2024
Merged

eng | Add delay signed to official builds #2653

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c5ba9c9
Adding delay sign to csprojs
Jul 8, 2024
5334f15
changing yaml to take argument for delay signed
Jul 8, 2024
382f171
Modify Condition in csprojs
Jul 9, 2024
9a177a7
Apply suggestions from code review
Jul 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion eng/pipelines/common/templates/steps/build-all-configurations-signed-dlls-step.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ steps:
inputs:
solution: '**/build.proj'
configuration: '${{parameters.Configuration }}'
msbuildArguments: '-p:AssemblyFileVersion=${{parameters.AssemblyFileVersion }} -t:BuildAllConfigurations -p:GenerateNuget=false -p:SignAssembly=true -p:AssemblyOriginatorKeyFile=$(Agent.TempDirectory)\netfxKeypair.snk'
msbuildArguments: '-p:AssemblyFileVersion=${{parameters.AssemblyFileVersion }} -t:BuildAllConfigurations -p:GenerateNuget=false -p:SigningKeyPath=$(Agent.TempDirectory)\netfxKeypair.snk'

- ${{ if eq(parameters.product, 'AKV') }}:
- task: MSBuild@1
Expand Down
2 changes: 1 addition & 1 deletion eng/pipelines/common/templates/steps/code-analyze-step.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ steps:
msBuildVersion: 17.0
msBuildArchitecture: x64
setupCommandlinePicker: vs2022
msBuildCommandline: 'msbuild ${{parameters.sourceRoot}}\build.proj -p:configuration=Release -p:GenerateNuget=false -p:BuildTools=false'
msBuildCommandline: 'msbuild ${{parameters.sourceRoot}}\build.proj -p:configuration=Release -p:GenerateNuget=false -p:BuildTools=false -p:SigningKeyPath=$(Agent.TempDirectory)\netfxKeypair.snk'
- ${{ if eq(parameters.product, 'AKV') }}:
- task: securedevelopmentteam.vss-secure-development-tools.build-task-roslynanalyzers.RoslynAnalyzers@3
displayName: 'Guardian Dotnet Analyzers '
Expand Down
7 changes: 7 additions & 0 deletions src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,13 @@
<NoWarn>$(NoWarn);IL2026;IL2057;IL2072;IL2075</NoWarn>
<RootNamespace />
</PropertyGroup>
<!--Generating Strong Name in official pipelines -->
JRahnama marked this conversation as resolved.
Show resolved Hide resolved
<PropertyGroup Condition="$(SigningKeyPath) != ''">
<SignAssembly>true</SignAssembly>
<DelaySign>true</DelaySign>
<KeyFile>$(SigningKeyPath)</KeyFile>
<AssemblyOriginatorKeyFile>$(SigningKeyPath)</AssemblyOriginatorKeyFile>
</PropertyGroup>
<PropertyGroup>
<TargetFrameworkMonikerAssemblyAttributesPath>$([System.IO.Path]::Combine('$(IntermediateOutputPath)','$(TargetFrameworkMoniker).AssemblyAttributes$(DefaultLanguageSourceExtension)'))</TargetFrameworkMonikerAssemblyAttributesPath>
</PropertyGroup>
Expand Down
7 changes: 7 additions & 0 deletions src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,13 @@
<EnableDefaultCompileItems>false</EnableDefaultCompileItems>
<DefineConstants>$(DefineConstants);NETFRAMEWORK;</DefineConstants>
</PropertyGroup>
<!--Generating Strong Name in official pipelines -->
JRahnama marked this conversation as resolved.
Show resolved Hide resolved
<PropertyGroup Condition="$(SigningKeyPath) != ''">
<SignAssembly>true</SignAssembly>
<DelaySign>true</DelaySign>
<KeyFile>$(SigningKeyPath)</KeyFile>
<AssemblyOriginatorKeyFile>$(SigningKeyPath)</AssemblyOriginatorKeyFile>
</PropertyGroup>
<!-- Override debugtype=portable in Directory.Build.props for netfx -->
<PropertyGroup>
<DebugType>full</DebugType>
Expand Down
Loading