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
6 changes: 6 additions & 0 deletions .azure-pipelines/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,12 @@ extends:
"Parameters": {}
}
]
- task: PowerShell@2
displayName: 'Clean up code signing artifacts'
inputs:
targetType: inline
script: |
Remove-Item "$(Build.ArtifactStagingDirectory)\payload\CodeSignSummary-*.md"
- task: PowerShell@2
displayName: 'Build installers'
inputs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:
shell: bash
run: |
mkdir -p artifacts/bin
mv out/windows/Installer.Windows/bin/Release/net472/${{ matrix.runtime }}/gcm*.exe artifacts/
mv out/windows/Installer.Windows/bin/Release/net472/gcm*.exe artifacts/
mv out/windows/Installer.Windows/bin/Release/net472/${{ matrix.runtime }} artifacts/bin/
cp out/windows/Installer.Windows/bin/Release/net472/${{ matrix.runtime }}.sym/* artifacts/bin/${{ matrix.runtime }}/

Expand Down
5 changes: 4 additions & 1 deletion src/windows/Installer.Windows/Installer.Windows.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,11 @@
<TargetFramework>net472</TargetFramework>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<EnableDefaultItems>false</EnableDefaultItems>
<PayloadPath>$(PlatformOutPath)Installer.Windows\bin\$(Configuration)\net472\$(RuntimeIdentifier)</PayloadPath>
<PayloadPath>$(PlatformOutPath)Installer.Windows\bin\$(Configuration)\net472\$(RuntimeIdentifier)\</PayloadPath>
<InnoSetupVersion>6.3.1</InnoSetupVersion>
<!-- We already append the RID to our intermediate PayloadPath and also to the
final installer filenames so there's no need to append to the output path. -->
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
</PropertyGroup>

<ItemGroup>
Expand Down
4 changes: 4 additions & 0 deletions src/windows/Installer.Windows/layout.ps1
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
# Inputs
param ([Parameter(Mandatory)] $Configuration, [Parameter(Mandatory)] $Output, $RuntimeIdentifier, $SymbolOutput)

# Trim trailing slashes from output paths
$Output = $Output.TrimEnd('\','/')
$SymbolOutput = $SymbolOutput.TrimEnd('\','/')

Write-Output "Output: $Output"

# Determine a runtime if one was not provided
Expand Down