-
Notifications
You must be signed in to change notification settings - Fork 55
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
This reverts commit bccc080.
- Loading branch information
Showing
15 changed files
with
519 additions
and
160 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,2 @@ | ||
| @echo off | ||
| powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0eng\common\Build.ps1""" -restore -build %*" | ||
| powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0eng\common\Build.ps1""" -restore -build -bl %*" |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,40 @@ | ||
| <Project> | ||
|
|
||
| <PropertyGroup> | ||
| <!-- | ||
| Windows arm/arm64 jobs don't have MSIs to sign. Keep it simple: allow not finding any matches | ||
| here and rely on overall signing validation. | ||
| --> | ||
| <AllowEmptySignList Condition="'$(SignFinalPackages)' != 'true'">true</AllowEmptySignList> | ||
| <UseDotNetCertificate>true</UseDotNetCertificate> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <!-- | ||
| Replace the default items to sign with the specific set we want. | ||
| --> | ||
| <ItemsToSign Remove="@(ItemsToSign)" /> | ||
| <ItemsToSignPostBuild Remove="@(ItemsToSignPostBuild)" /> | ||
|
|
||
| <!-- apphost and comhost template files are not signed, by design. --> | ||
| <FileSignInfo Include="apphost.exe;comhost.dll" CertificateName="None" /> | ||
|
|
||
| <FileExtensionSignInfo Include=".msi" CertificateName="MicrosoftDotNet500" /> | ||
| <FileExtensionSignInfo Include=".pkg" CertificateName="8003" /> | ||
| <FileExtensionSignInfo Include=".deb;.rpm" CertificateName="LinuxSign" /> | ||
| </ItemGroup> | ||
|
|
||
| <!-- This repo signs everything, including installers, either right before doing the PushToAzureDevOpsArtifacts, | ||
| or in post-build. Populate what will get signed the same in both cases --> | ||
| <ItemGroup Condition="'$(PrepareArtifacts)' == 'true'"> | ||
| <ItemsToSignWithPaths Include="$(DownloadDirectory)**/*.msi" /> | ||
| <ItemsToSignWithPaths Include="$(DownloadDirectory)**/*.exe" /> | ||
| <ItemsToSignWithPaths Include="$(DownloadDirectory)**/*.nupkg" /> | ||
| <ItemsToSignWithPaths Include="$(DownloadDirectory)**/*.zip" /> | ||
|
|
||
| <ItemsToSignWithoutPaths Include="@(ItemsToSignWithPaths->'%(Filename)%(Extension)')" /> | ||
| <ItemsToSignPostBuild Include="@(ItemsToSignWithoutPaths->Distinct())" Condition="'$(PostBuildSign)' == 'true'" /> | ||
| <ItemsToSign Include="@(ItemsToSignWithPaths->Distinct())" Condition="'$(PostBuildSign)' != 'true'" /> | ||
| </ItemGroup> | ||
|
|
||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,50 @@ | ||
| parameters: | ||
| dependsOn: [] | ||
| PublishRidAgnosticPackagesFromJobName: '' | ||
|
|
||
| jobs: | ||
| - job: PrepareSignedArtifacts | ||
| displayName: Prepare Signed Artifacts | ||
| dependsOn: ${{ parameters.dependsOn }} | ||
| pool: | ||
| name: NetCore1ESPool-Svc-Internal | ||
| demands: ImageOverride -equals windows.vs2019.amd64 | ||
| # Double the default timeout. | ||
| timeoutInMinutes: 120 | ||
| workspace: | ||
| clean: all | ||
|
|
||
| steps: | ||
| - task: DownloadBuildArtifacts@0 | ||
| displayName: Download IntermediateUnsignedArtifacts | ||
| inputs: | ||
| artifactName: IntermediateUnsignedArtifacts | ||
| downloadPath: $(Build.SourcesDirectory)\artifacts\PackageDownload | ||
|
|
||
| - script: > | ||
| build.cmd -ci | ||
| -projects $(Build.SourcesDirectory)\src\publish\prepare-artifacts.proj | ||
| -c Release | ||
| /p:PublishRidAgnosticPackagesFromJobName=${{ parameters.PublishRidAgnosticPackagesFromJobName }} | ||
| /p:SignType=$(SignType) | ||
| /p:DotNetSignType=$(SignType) | ||
| /bl:$(Build.SourcesDirectory)\prepare-artifacts.binlog | ||
| displayName: Prepare artifacts and upload to build | ||
| - task: CopyFiles@2 | ||
| displayName: Copy Files to $(Build.StagingDirectory)\BuildLogs | ||
| inputs: | ||
| SourceFolder: '$(Build.SourcesDirectory)' | ||
| Contents: | | ||
| **/*.log | ||
| **/*.binlog | ||
| TargetFolder: '$(Build.StagingDirectory)\BuildLogs' | ||
| continueOnError: true | ||
| condition: succeededOrFailed() | ||
|
|
||
| - task: PublishBuildArtifacts@1 | ||
| displayName: Publish Artifact BuildLogs | ||
| inputs: | ||
| PathtoPublish: '$(Build.StagingDirectory)\BuildLogs' | ||
| ArtifactName: Logs-PrepareSignedArtifacts | ||
| condition: succeededOrFailed() |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,55 @@ | ||
| parameters: | ||
| dependsOn: [] | ||
| PublishRidAgnosticPackagesFromJobName: '' | ||
|
|
||
| jobs: | ||
| - job: PrepareSignedArtifacts | ||
| displayName: Prepare Signed Artifacts | ||
| dependsOn: ${{ parameters.dependsOn }} | ||
| # Double the default timeout. | ||
| timeoutInMinutes: 120 | ||
| workspace: | ||
| clean: all | ||
|
|
||
| templateContext: | ||
| outputs: | ||
| - output: pipelineArtifact | ||
| displayName: 'Publish Artifact BuildLogs' | ||
| condition: succeededOrFailed() | ||
| targetPath: '$(Build.StagingDirectory)\BuildLogs' | ||
| artifactName: Logs-PrepareSignedArtifacts | ||
| steps: | ||
| - task: NuGetAuthenticate@1 | ||
| - task: MicroBuildSigningPlugin@2 | ||
| displayName: Install MicroBuild plugin for Signing | ||
| inputs: | ||
| signType: $(SignType) | ||
| zipSources: false | ||
| feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json | ||
| condition: and(succeeded(), in(variables['SignType'], 'real', 'test')) | ||
| - task: DownloadBuildArtifacts@0 | ||
| displayName: Download IntermediateUnsignedArtifacts | ||
| inputs: | ||
| artifactName: IntermediateUnsignedArtifacts | ||
| downloadPath: $(Build.SourcesDirectory)\artifacts\PackageDownload | ||
|
|
||
| - script: > | ||
| build.cmd -ci | ||
| -projects $(Build.SourcesDirectory)\src\publish\prepare-artifacts.proj | ||
| -c Release | ||
| /p:PublishRidAgnosticPackagesFromJobName=${{ parameters.PublishRidAgnosticPackagesFromJobName }} | ||
| /p:SignType=$(SignType) | ||
| /p:DotNetSignType=$(SignType) | ||
| /bl:$(Build.SourcesDirectory)\prepare-artifacts.binlog | ||
| displayName: Prepare artifacts and upload to build | ||
| - task: CopyFiles@2 | ||
| displayName: Copy Files to $(Build.StagingDirectory)\BuildLogs | ||
| inputs: | ||
| SourceFolder: '$(Build.SourcesDirectory)' | ||
| Contents: | | ||
| **/*.log | ||
| **/*.binlog | ||
| TargetFolder: '$(Build.StagingDirectory)\BuildLogs' | ||
| continueOnError: true | ||
| condition: succeededOrFailed() |
Oops, something went wrong.