-
Notifications
You must be signed in to change notification settings - Fork 63
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Ensure MicroBuild signing runs correctly by using classic MSBuild, and split the Windows installer/sign build step into phases to facilitate the jumping between .NET Core MSBuild and Framework MSBuild. Also correct a few issues with Mac signing.
- Loading branch information
Showing
10 changed files
with
93 additions
and
20 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
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,67 @@ | ||
steps: | ||
# Must use the NuGet & MSBuild toolchain here rather than `dotnet` | ||
# because the signing tasks target the netfx MSBuild runtime only. | ||
- task: NuGetCommand@2 | ||
displayName: Restore MicroBuild packages | ||
inputs: | ||
command: restore | ||
restoreSolution: 'Scalar.Signing\Scalar.SignFiles.Windows.csproj' | ||
|
||
- task: NuGetCommand@2 | ||
displayName: Restore MicroBuild packages | ||
inputs: | ||
command: restore | ||
restoreSolution: 'Scalar.Signing\Scalar.SignInstaller.Windows.csproj' | ||
|
||
- task: MSBuild@1 | ||
displayName: Collect payload files | ||
inputs: | ||
solution: 'Scalar.Installer.Windows\Scalar.Installer.Windows.csproj' | ||
msbuildArguments: '/t:BuildInstallerPhase1 /p:LayoutPath="$(Build.ArtifactStagingDirectory)\signpayload"' | ||
|
||
- task: MSBuild@1 | ||
displayName: Sign payload | ||
inputs: | ||
solution: 'Scalar.Signing\Scalar.SignFiles.Windows.csproj' | ||
msbuildArguments: '/p:RootDir="$(Build.ArtifactStagingDirectory)\signpayload"' | ||
|
||
- task: MSBuild@1 | ||
displayName: Build installer | ||
inputs: | ||
solution: 'Scalar.Installer.Windows\Scalar.Installer.Windows.csproj' | ||
msbuildArguments: '/t:BuildInstallerPhase2 /p:LayoutPath="$(Build.ArtifactStagingDirectory)\signpayload" /p:InstallerOutputPath="$(Build.ArtifactStagingDirectory)\signinstaller" /p:ScalarVersion=$(majorAndMinorVersion).$(revision)' | ||
|
||
- task: MSBuild@1 | ||
displayName: Sign installer | ||
inputs: | ||
solution: 'Scalar.Signing\Scalar.SignInstaller.Windows.csproj' | ||
msbuildArguments: '/p:RootDir="$(Build.ArtifactStagingDirectory)\signinstaller"' | ||
|
||
- script: rmdir /s /q ..\out\Scalar.Installer.Windows\dist | ||
displayName: Clean distribution output directory | ||
|
||
- task: MSBuild@1 | ||
displayName: Create distribution | ||
inputs: | ||
solution: 'Scalar.Installer.Windows\Scalar.Installer.Windows.csproj' | ||
msbuildArguments: '/t:BuildInstallerPhase3 /p:InstallerOutputPath="$(Build.ArtifactStagingDirectory)\signinstaller"' | ||
|
||
- script: Scripts\CI\CreateFTDrop.bat $(configuration) $(Build.ArtifactStagingDirectory)\Tests | ||
displayName: Create functional tests drop | ||
|
||
- task: PublishPipelineArtifact@1 | ||
displayName: Publish functional tests drop | ||
inputs: | ||
targetPath: $(Build.ArtifactStagingDirectory)\Tests\ | ||
artifactName: "FunctionalTests_Windows_$(configuration)" | ||
condition: succeeded() | ||
|
||
- script: Scripts\CI\CreateInstallerDrop.bat $(configuration) $(Build.ArtifactStagingDirectory)\Installers | ||
displayName: Create distribution drop | ||
|
||
- task: PublishPipelineArtifact@1 | ||
displayName: Publish distribution drop | ||
inputs: | ||
targetPath: $(Build.ArtifactStagingDirectory)\Installers\ | ||
artifactName: "Installers_Windows_$(configuration)" | ||
condition: succeeded() |
File renamed without changes.
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
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