diff options
| author | Sven Boemer <sbomer@gmail.com> | 2019-01-18 09:50:33 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-18 09:50:33 -0800 |
| commit | 40ac403fb3028af50f7287838f4c1009fecad69c (patch) | |
| tree | 76678f702f9770a70be9d166d1249e3d70b118e6 /eng | |
| parent | 732f892665343e84d04eea4478eccb459b385f55 (diff) | |
| download | coreclr-40ac403fb3028af50f7287838f4c1009fecad69c.tar.gz coreclr-40ac403fb3028af50f7287838f4c1009fecad69c.tar.bz2 coreclr-40ac403fb3028af50f7287838f4c1009fecad69c.zip | |
Re-enable signing of System.Private.CoreLib (#22068)
* Re-enable signing for System.Private.CoreLib
Now that https://github.com/dotnet/arcade/issues/1582 is fixed.
Addresses https://github.com/dotnet/coreclr/issues/21946.
* Use uppercase build config
For consistency with other builds. Doesn't impact functionality, but
will result in the build logs showing the bin directory with the
uppercase build config during this step.
* Override arcade version of SignTool package
Diffstat (limited to 'eng')
| -rw-r--r-- | eng/Signing.props | 5 | ||||
| -rw-r--r-- | eng/Versions.props | 5 | ||||
| -rw-r--r-- | eng/build-job.yml | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/eng/Signing.props b/eng/Signing.props index c51b9d3d41..1ad6a4b791 100644 --- a/eng/Signing.props +++ b/eng/Signing.props @@ -47,11 +47,6 @@ <Output TaskParameter="SigningMetadata" ItemName="ItemsToSign" /> </ReadSigningRequired> - <!-- Temporarily disable signing CoreLib due to https://github.com/dotnet/arcade/issues/1582 --> - <ItemGroup> - <ItemsToSign Remove="$(BinDir)System.Private.CoreLib.dll" /> - </ItemGroup> - <Message Importance="High" Text="Attempting to sign %(ItemsToSign.Identity) with authenticode='%(ItemsToSign.Authenticode)' and strongname='%(ItemsToSign.StrongName)'" /> </Target> diff --git a/eng/Versions.props b/eng/Versions.props index 8a440dc884..e69fd0b8c9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -11,6 +11,11 @@ <!-- Libs --> </PropertyGroup> <PropertyGroup> + <!-- Override arcade package version to use most recent signing + package --> + <MicrosoftDotNetSignToolVersion>1.0.0-beta.19067.6</MicrosoftDotNetSignToolVersion> + </PropertyGroup> + <PropertyGroup> <RestoreSources> $(RestoreSources); https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json; diff --git a/eng/build-job.yml b/eng/build-job.yml index c1e3481580..f0b8559d29 100644 --- a/eng/build-job.yml +++ b/eng/build-job.yml @@ -92,7 +92,7 @@ jobs: # Sign on Windows - ${{ if and(ne(variables['System.TeamProject'], 'public'), ne(variables['Build.Reason'], 'PullRequest'), eq(parameters.osGroup, 'Windows_NT')) }}: - - script: powershell eng\common\build.ps1 -ci -sign -restore -configuration:$(buildConfig) -warnaserror:0 /p:ArcadeBuild=true /p:OfficialBuild=true /p:BuildOS=$(osGroup) /p:BuildArch=$(archType) /p:BuildType=$(buildConfig) /p:DotNetSignType=%_SignType% -projects $(Build.SourcesDirectory)\eng\empty.proj + - script: powershell eng\common\build.ps1 -ci -sign -restore -configuration:$(buildConfig) -warnaserror:0 /p:ArcadeBuild=true /p:OfficialBuild=true /p:BuildOS=$(osGroup) /p:BuildArch=$(archType) /p:BuildType=$(buildConfigUpper) /p:DotNetSignType=%_SignType% -projects $(Build.SourcesDirectory)\eng\empty.proj displayName: Sign Binaries - task: PublishBuildArtifacts@1 |