Merge branch 'dev' into V6

.github/workflows/ci-pipeline.yml

@@ -192,9 +192,7 @@ jobs:
       run: dotnet restore
 
     - name: Build ReleaseNotes
-      run: |
-        export TGS_HOST_NO_WEBPANEL=true
-        dotnet build -c Release tools/Tgstation.Server.ReleaseNotes/Tgstation.Server.ReleaseNotes.csproj
+      run: dotnet build -c Release -p:TGS_HOST_NO_WEBPANEL=true tools/Tgstation.Server.ReleaseNotes/Tgstation.Server.ReleaseNotes.csproj
 
     - name: Build Changelog (Incremental)
       run: |
@@ -1231,9 +1229,7 @@ jobs:
       run: dotnet restore
 
     - name: Build ReleaseNotes
-      run: |
-        export TGS_HOST_NO_WEBPANEL=true
-        dotnet build -c Release tools/Tgstation.Server.ReleaseNotes/Tgstation.Server.ReleaseNotes.csproj
+      run: dotnet build -c Release -p:TGS_HOST_NO_WEBPANEL=true tools/Tgstation.Server.ReleaseNotes/Tgstation.Server.ReleaseNotes.csproj
 
     - name: Run ReleaseNotes Check
       run: dotnet run -c Release --no-build --project tools/Tgstation.Server.ReleaseNotes --winget-template-check ${{ steps.get-sha.outputs.pr_template_sha }}
@@ -1274,9 +1270,7 @@ jobs:
       run: dotnet restore
 
     - name: Build ReleaseNotes
-      run: |
-        $Env:TGS_HOST_NO_WEBPANEL=true
-        dotnet build -c Release tools/Tgstation.Server.ReleaseNotes/Tgstation.Server.ReleaseNotes.csproj
+      run: dotnet build -c Release -p:TGS_HOST_NO_WEBPANEL=true tools/Tgstation.Server.ReleaseNotes/Tgstation.Server.ReleaseNotes.csproj
 
     - name: Parse API version
       shell: powershell
@@ -1339,9 +1333,7 @@ jobs:
       run: dotnet restore
 
     - name: Build ReleaseNotes
-      run: |
-        $Env:TGS_HOST_NO_WEBPANEL=true
-        dotnet build -c Release tools/Tgstation.Server.ReleaseNotes/Tgstation.Server.ReleaseNotes.csproj
+      run: dotnet build -c Release -p:TGS_HOST_NO_WEBPANEL=true tools/Tgstation.Server.ReleaseNotes/Tgstation.Server.ReleaseNotes.csproj
 
     - name: Parse DMAPI version
       shell: powershell
@@ -1403,9 +1395,7 @@ jobs:
       run: dotnet restore
 
     - name: Build ReleaseNotes
-      run: |
-        export TGS_HOST_NO_WEBPANEL=true
-        dotnet build -c Release tools/Tgstation.Server.ReleaseNotes/Tgstation.Server.ReleaseNotes.csproj
+      run: dotnet build -c Release -p:TGS_HOST_NO_WEBPANEL=true tools/Tgstation.Server.ReleaseNotes/Tgstation.Server.ReleaseNotes.csproj
 
     - name: Grab Most Recent Changelog
       run: curl -L https://raw.githubusercontent.com/tgstation/tgstation-server/gh-pages/changelog.yml -o changelog.yml
@@ -1455,9 +1445,7 @@ jobs:
       run: dotnet restore
 
     - name: Build ReleaseNotes
-      run: |
-        export TGS_HOST_NO_WEBPANEL=true
-        dotnet build -c Release tools/Tgstation.Server.ReleaseNotes/Tgstation.Server.ReleaseNotes.csproj
+      run: dotnet build -c Release -p:TGS_HOST_NO_WEBPANEL=true tools/Tgstation.Server.ReleaseNotes/Tgstation.Server.ReleaseNotes.csproj
 
     - name: Run ReleaseNotes with --ensure-release
       run: dotnet run -c Release --no-build --project tools/Tgstation.Server.ReleaseNotes --ensure-release
@@ -1511,6 +1499,12 @@ jobs:
         $tgsVersion = $versionXML.Project.PropertyGroup.TgsCoreVersion
         echo "TGS_VERSION=$tgsVersion" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append
 
+    - name: Upload .msi
+      uses: actions/upload-artifact@v3
+      with:
+        name: packaging-windows-raw-msi
+        path: build/package/winget/Tgstation.Server.Host.Service.Wix/bin/Release/en-US/tgstation-server.msi
+
     - name: Retrieve Server Service
       uses: actions/download-artifact@v3
       with:
@@ -1721,9 +1715,13 @@ jobs:
       uses: actions/checkout@v3
 
     - name: Build ReleaseNotes
-      run: |
-        $Env:TGS_HOST_NO_WEBPANEL=true
-        dotnet build -c Release tools/Tgstation.Server.ReleaseNotes
+      run: dotnet build -c Release -p:TGS_HOST_NO_WEBPANEL=true tools/Tgstation.Server.ReleaseNotes
+
+    - name: Retrieve Server Service
+      uses: actions/download-artifact@v3
+      with:
+        name: packaging-windows-raw-msi
+        path: artifacts
 
     - name: Execute Push Script
       shell: powershell

.github/workflows/code-scanning.yml

@@ -47,9 +47,7 @@ jobs:
         languages: csharp
 
     - name: Build
-      run: |
-        export TGS_HOST_NO_WEBPANEL=true
-        dotnet build -c ReleaseNoWindows
+      run: dotnet build -c ReleaseNoWindows -p:TGS_HOST_NO_WEBPANEL=true
 
     - name: Perform CodeQL Analysis
       uses: github/codeql-action/analyze@v2

build/package/deb/build_package.sh

@@ -41,9 +41,7 @@ dh_make -p tgstation-server_$TGS_VERSION -y --createorig -s
 rm -f debian/README* debian/changelog debian/*.ex debian/upstream/*.ex
 
 pushd ..
-export TGS_HOST_NO_WEBPANEL=true
-dotnet run -c Release --project tools/Tgstation.Server.ReleaseNotes $TGS_VERSION --debian packaging/debian/changelog $CURRENT_COMMIT
-export TGS_HOST_NO_WEBPANEL=false
+dotnet run -c Release -p:TGS_HOST_NO_WEBPANEL=true --project tools/Tgstation.Server.ReleaseNotes $TGS_VERSION --debian packaging/debian/changelog $CURRENT_COMMIT
 popd
 
 cp -r build/package/deb/debian/* debian/

build/package/winget/push_manifest.ps1

@@ -4,7 +4,7 @@ $ErrorActionPreference="Stop"
 
 $tgsVersion = $versionXML.Project.PropertyGroup.TgsCoreVersion
 
-mkdir artifacts
+New-Item artifacts -ItemType Directory -ErrorAction SilentlyContinue
 $previousProgressPreference = $ProgressPreference
 $ProgressPreference = 'SilentlyContinue'
 try
@@ -15,6 +15,7 @@ try
 }
 
 $installerHash = Get-FileHash -Path "artifacts/tgstation-server-installer.exe" -ErrorAction Stop # SHA256 is the default
+$msiPath = [System.IO.Path]::Combine($pwd, "artifacts/tgstation-server.msi").Replace("/", "\");
 
 Push-Location build/package/winget
 try
@@ -24,7 +25,6 @@ try
     $devReleaseDate = '2023-06-24'
     $devProductCode = "{D24887FA-3228-4509-B5F3-4E07E349F278}"
 
-    $msiPath = [System.IO.Path]::Combine($pwd, "Tgstation.Server.Host.Service.Wix/bin/x86/Release/en-US/tgstation-server.msi").Replace("/", "\");
     Set-Location manifest
     Convert-Path -ErrorAction Stop -LiteralPath $msiPath
     $windowsInstaller = New-Object -ComObject WindowsInstaller.Installer