From 9eb536a50a6441c58d85a21800a52727f3e303f7 Mon Sep 17 00:00:00 2001
From: Kyle Bloom <kyle@symless.com>
Date: Tue, 1 Mar 2022 10:13:31 +0000
Subject: [PATCH] SYNERGY3-150 Fix unstable build for windows core (#7148)

* SYNERGY3-150 Minor change to core build script

* SYNERGY3-150 Missing line continuation

* SYNERGY3-150 Re-enable flags

* SYNERGY-150 Disable on PR

* SYNERGY3-150 Changelog
---
 .github/workflows/aws-upload-windows.yml |  5 ++++-
 ChangeLog                                |  3 +++
 scripts/buildCoreWindows.ps1             | 11 +++++------
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/aws-upload-windows.yml b/.github/workflows/aws-upload-windows.yml
index ed74ac12a..63140827c 100644
--- a/.github/workflows/aws-upload-windows.yml
+++ b/.github/workflows/aws-upload-windows.yml
@@ -50,7 +50,10 @@ jobs:
           cd build
           cmake -DCMAKE_BUILD_TYPE=Release ..
           . ./version
-          msbuild synergy-core.sln /p:Configuration=Release
+          msbuild synergy-core.sln `
+            /p:Platform="x64" `
+            /p:Configuration=Release `
+            /m
 
       - uses: anshulrgoyal/upload-s3-action@master
         if: "github.event_name == 'release'"
diff --git a/ChangeLog b/ChangeLog
index 7ca713313..342d12fe3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,9 @@ v1.14.4-snapshot
 ===========
 Enhancements:
 - #7143 Add ability to stop synergy on the login screen
+
+Github Actions:
+- #7148 Fix unstable build for windows core
 ===========
 
 v1.14.3-snapshot
diff --git a/scripts/buildCoreWindows.ps1 b/scripts/buildCoreWindows.ps1
index 7ac4d6b9e..e858785dc 100644
--- a/scripts/buildCoreWindows.ps1
+++ b/scripts/buildCoreWindows.ps1
@@ -95,16 +95,15 @@ New-Item `
 Push-Location $env:SYNERGY_BUILD_DIRECTORY
 Try {
   cmake `
-    -G "Visual Studio 16 2019" `
     -DCMAKE_BUILD_TYPE=$env:SYNERGY_BUILD_TYPE `
     ..
-
+  . ./version
   msbuild synergy-core.sln `
-    /p:Platform="x64" `
     /p:Configuration=$env:SYNERGY_BUILD_TYPE `
-    /m `
-    /t:synergys `
-    /t:synergyc
+    /p:Platform="x64" `
+    /m
+
+  Remove-Item -Force -Path "synergy-core-win-x64.zip" -ErrorAction SilentlyContinue
   Compress-Archive `
     -Path ".\bin\${env:SYNERGY_BUILD_TYPE}\*" `
     -DestinationPath "synergy-core-win-x64.zip"