Skip to content

Commit faaa3b1

Browse files
committed
Installer.Windows: fix up installer output path
When building locally the gcm(user)-$RID-$VERSION.exe installer files were being written to the PayloadPath, rather than the OutputPath. Also, since we're now specifying a RID for all invocations of the project file, we should disable the appending of the RID to the OutputPath variable - we already have the RID as part of the PayloadPath (for keeping binaries separated by RID) and the resulting installer filenames also contain the RID anyway. Signed-off-by: Matthew John Cheetham <mjcheetham@outlook.com>
1 parent de3b137 commit faaa3b1

2 files changed

Lines changed: 5 additions & 2 deletions

File tree

.github/workflows/continuous-integration.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
shell: bash
5252
run: |
5353
mkdir -p artifacts/bin
54-
mv out/windows/Installer.Windows/bin/Release/net472/${{ matrix.runtime }}/gcm*.exe artifacts/
54+
mv out/windows/Installer.Windows/bin/Release/net472/gcm*.exe artifacts/
5555
mv out/windows/Installer.Windows/bin/Release/net472/${{ matrix.runtime }} artifacts/bin/
5656
cp out/windows/Installer.Windows/bin/Release/net472/${{ matrix.runtime }}.sym/* artifacts/bin/${{ matrix.runtime }}/
5757

src/windows/Installer.Windows/Installer.Windows.csproj

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,11 @@
1313
<TargetFramework>net472</TargetFramework>
1414
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
1515
<EnableDefaultItems>false</EnableDefaultItems>
16-
<PayloadPath>$(PlatformOutPath)Installer.Windows\bin\$(Configuration)\net472\$(RuntimeIdentifier)</PayloadPath>
16+
<PayloadPath>$(PlatformOutPath)Installer.Windows\bin\$(Configuration)\net472\$(RuntimeIdentifier)\</PayloadPath>
1717
<InnoSetupVersion>6.3.1</InnoSetupVersion>
18+
<!-- We already append the RID to our intermediate PayloadPath and also to the
19+
final installer filenames so there's no need to append to the output path. -->
20+
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
1821
</PropertyGroup>
1922

2023
<ItemGroup>

0 commit comments

Comments
 (0)