Clean up some cruft files on Windows releases (#2248)

Improve the handling of output paths and build artifacts in the Windows
installer build pipeline.

We accidentally started including some code signing summary report files
in the output zip archives on Windows - let's delete those.

Also I noticed that local builds were now outputting the Windows
installers to the payload directory, rather than the expected output
path. This is because now that we specify a RID we were getting the RID
appended to the output path (which would then be the same as the payload
path.. what a coincidence!).

Finally let's be a bit more robust with the path-math in our layout.ps1
script - we should not assume if the path has the trailing slash or not.
(Note that in MSBuild, the convention is that directory path variables
should end with a slash.)

Author: mjcheetham

.azure-pipelines/release.yml

@@ -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:

.github/workflows/continuous-integration.yml

@@ -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 }}/
 

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

@@ -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>

src/windows/Installer.Windows/layout.ps1

@@ -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