Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,8 @@
</Target>
<Target Name="BeforeBuild">
<Exec Command="dotnet publish $(ProjectDir)\..\RemoteApplicationPublisher\RemoteApplicationPublisher.csproj -c $(Configuration) -o $(ProjectDir)bin\$(Configuration)\Publish --self-contained true -r win-x64" />
<Exec Condition="'$(SignFiles)'=='true'" Command="&quot;$(SignToolPath)&quot; sign /v /f &quot;$(CertificatePath)&quot; /p &quot;$(CertificatePassword)&quot; &quot;$(ProjectDir)bin\$(Configuration)\Publish\RemoteApplicationPublisher.dll&quot;" />
<Exec Condition="'$(SignFiles)'=='true'" Command="&quot;$(SignToolPath)&quot; sign /v /f &quot;$(CertificatePath)&quot; /p &quot;$(CertificatePassword)&quot; &quot;$(ProjectDir)bin\$(Configuration)\Publish\RemoteApplicationPublisher.exe&quot;" />
<HeatDirectory SuppressAllWarnings="true" ToolPath="$(WixToolPath)" AutogenerateGuids="$(HarvestDirectoryAutogenerateGuids)" OutputFile="Component-generated.wxs" SuppressFragments="true" SuppressUniqueIds="true" Transforms="%(HarvestDirectory.Transforms)" Directory="$(ProjectDir)bin\$(Configuration)\Publish" ComponentGroupName="RemoteAppsPub_CommonAssemblies" DirectoryRefId="INSTALLLOCATION" KeepEmptyDirectories="false" PreprocessorVariable="var.SourceDir" SuppressRootDirectory="true" SuppressRegistry="true">
</HeatDirectory>
<GetAssemblyIdentity AssemblyFiles="$(ProjectDir)bin\$(Configuration)\Publish\RemoteApplicationPublisher.dll">
Expand All @@ -71,6 +73,9 @@
<Output TaskParameter="Value" PropertyName="TargetName" />
</CreateProperty>
</Target>
<Target Name="AfterBuild">
<Exec Condition="'$(SignFiles)'=='true'" Command="&quot;$(SignToolPath)&quot; sign /v /f &quot;$(CertificatePath)&quot; /p &quot;$(CertificatePassword)&quot; &quot;$(ProjectDir)bin\$(Configuration)\en-us\*.msi&quot;" />
</Target>
<PropertyGroup>
<PreBuildEvent />
</PropertyGroup>
Expand Down
51 changes: 45 additions & 6 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,11 @@
# https://docs.microsoft.com/azure/devops/pipelines/apps/windows/dot-net

trigger:
- main

branches:
include:
- main
- release-*
pr: none
pool:
vmImage: 'windows-latest'

Expand All @@ -19,6 +22,8 @@ variables:
isReleaseBranch: $[ or( eq(variables['Build.SourceBranch'], 'refs/heads/main'), startsWith(variables['Build.SourceBranch'], 'refs/heads/release-') ) ]
setupProjectDir: 'RemoteApplicationPublisherSetup'
setupProject: '**/$(setupProjectDir)/*.wixproj'
codeSigningCertFileName: 'OneIdentityCodeSigning.pfx'
signingToolPath: 'C:\Program Files (x86)\Windows Kits\10\bin\10.0.18362.0\x64'

steps:
- task: Bash@3
Expand All @@ -40,10 +45,28 @@ steps:
inputs:
restoreSolution: '$(solution)'

- task: AzureKeyVault@1
inputs:
azureSubscription: 'Azure.Infrastructure.CodeSigning'
KeyVaultName: 'CodeSigningCertificates'
SecretsFilter: '*'
displayName: 'Get code signing certificate from Azure Key Vault'
condition: and(succeeded(), eq(variables.isReleaseBranch, true))

- powershell: |
$kvSecretBytes = [System.Convert]::FromBase64String("$(OneIdentity-CodeSigning)")
$certCollection = New-Object System.Security.Cryptography.X509Certificates.X509Certificate2Collection
$certCollection.Import($kvSecretBytes,$null,[System.Security.Cryptography.X509Certificates.X509KeyStorageFlags]::Exportable)
$protectedCertificateBytes = $certCollection.Export([System.Security.Cryptography.X509Certificates.X509ContentType]::Pkcs12,"$(OneIdentity-CodeSigningCertPassword)")
$certpath = '$(Build.BinariesDirectory)\$(codeSigningCertFileName)'
Write-Verbose -Verbose $certpath
[System.IO.File]::WriteAllBytes($certpath, $protectedCertificateBytes)
displayName: 'Save code signing certificate to PFX file'
condition: and(succeeded(), eq(variables.isReleaseBranch, true))

- task: VSBuild@1
inputs:
solution: '$(solution)'
#msbuildArgs: '/p:buildId=$(Build.BuildId)'
platform: '$(buildPlatform)'
configuration: '$(buildConfiguration)'
displayName: 'Build $(solution)'
Expand All @@ -53,9 +76,25 @@ steps:
solution: '$(setupProject)'
platform: '$(buildPlatform)'
configuration: '$(buildConfiguration)'
displayName: 'Build $(setupProject)'
displayName: 'Build $(setupProject) no signing'
condition: and(succeeded(), eq(variables.isReleaseBranch, false))

- task: VSBuild@1
inputs:
solution: '$(setupProject)'
msbuildArgs: '/p:SignFiles=true /p:CertificatePassword=$(OneIdentity-CodeSigningCertPassword) /p:CertificatePath="$(Build.BinariesDirectory)\$(codeSigningCertFileName)" '
platform: '$(buildPlatform)'
configuration: '$(buildConfiguration)'
displayName: 'Build $(setupProject) with signing'
condition: and(succeeded(), eq(variables.isReleaseBranch, true))

- task: DeleteFiles@1
inputs:
SourceFolder: '$(Build.BinariesDirectory)'
Contents: '$(codeSigningCertFileName)'
condition: succeededOrFailed()
displayName: 'Delete code signing certificate files'

- task: ArchiveFiles@2
inputs:
rootFolderOrFile: '$(Build.SourcesDirectory)\RemoteApplicationPublisher\bin\$(buildConfiguration)\net6.0-windows'
Expand Down Expand Up @@ -89,8 +128,8 @@ steps:
action: 'create'
target: '$(Build.SourceVersion)'
tagSource: 'userSpecifiedTag'
tag: 'release-1.0.0.$(Build.BuildId)'
title: '1.0.0.$(Build.BuildId)'
tag: 'release-$(VersionString)'
title: '$(VersionString)'
isPreRelease: $(isPrerelease)
changeLogCompareToRelease: 'lastFullRelease'
changeLogType: 'commitBased'
Expand Down