From 875b0581f7f97c04d0211c20f00535e151039493 Mon Sep 17 00:00:00 2001
From: Simon Rozman <simon@rozman.si>
Date: Fri, 28 Mar 2025 12:33:40 +0100
Subject: [PATCH] UnitTests: Fix VS Win32 output folder anomaly

Visual Studio is using different output folder convention for Win32
builds. This makes it a royal-pain-in-the-ass to automate artifact
paths.

Signed-off-by: Simon Rozman <simon@rozman.si>
---
 UnitTests/.gitignore        |  4 +--
 UnitTests/UnitTests.vcxproj |  1 +
 appveyor.yml                | 69 +------------------------------------
 3 files changed, 4 insertions(+), 70 deletions(-)

diff --git a/UnitTests/.gitignore b/UnitTests/.gitignore
index 787e91f5..1ecad244 100644
--- a/UnitTests/.gitignore
+++ b/UnitTests/.gitignore
@@ -1,10 +1,10 @@
 /.vs
 /*.user
-/Debug
-/Release
 /UnitTests/Debug
 /UnitTests/Release
 /UnitTests/x64/Debug
 /UnitTests/x64/Release
 /x64/Debug
 /x64/Release
+/x86/Debug
+/x86/Release
diff --git a/UnitTests/UnitTests.vcxproj b/UnitTests/UnitTests.vcxproj
index d641831a..ec284c05 100644
--- a/UnitTests/UnitTests.vcxproj
+++ b/UnitTests/UnitTests.vcxproj
@@ -64,6 +64,7 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
+    <OutDir>$(SolutionDir)\$(PlatformTarget)\$(Configuration)\</OutDir>
     <RunCodeAnalysis>true</RunCodeAnalysis>
     <CodeAnalysisRuleSet>NativeRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
diff --git a/appveyor.yml b/appveyor.yml
index 09d09bc3..a9b74539 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -8,76 +8,9 @@ configuration:
 platform:
 - x64
 - x86
-
-for:
-  -
-    matrix:
-      only:
-          - image: Visual Studio 2022
-            configuration: Debug
-            platform: x64
-    environment:
-      UnitTestsFile: UnitTests\x64\Debug\UnitTests.dll
-  -
-    matrix:
-      only:
-        - image: Visual Studio 2022
-          configuration: Release
-          platform: x64
-    environment:
-      UnitTestsFile: UnitTests\x64\Release\UnitTests.dll
-  -
-    matrix:
-      only:
-        - image: Visual Studio 2022
-          configuration: Debug
-          platform: x86
-    environment:
-      UnitTestsFile: UnitTests\Debug\UnitTests.dll
-  -
-    matrix:
-      only:
-        - image: Visual Studio 2022
-          configuration: Release
-          platform: x86
-    environment:
-      UnitTestsFile: UnitTests\Release\UnitTests.dll
-  -
-    matrix:
-      only:
-        - image: Visual Studio 2019
-          configuration: Debug
-          platform: x64
-    environment:
-      UnitTestsFile: UnitTests\x64\Debug\UnitTests.dll
-  -
-    matrix:
-      only:
-        - image: Visual Studio 2019
-          configuration: Release
-          platform: x64
-    environment:
-      UnitTestsFile: UnitTests\x64\Release\UnitTests.dll
-  -
-    matrix:
-      only:
-        - image: Visual Studio 2019
-          configuration: Debug
-          platform: x86
-    environment:
-      UnitTestsFile: UnitTests\Debug\UnitTests.dll"
-  -
-    matrix:
-      only:
-        - image: Visual Studio 2019
-          configuration: Release
-          platform: x86
-    environment:
-      UnitTestsFile: UnitTests\Release\UnitTests.dll
-
 build:
   project: UnitTests\UnitTests.sln
   parallel: true
   verbosity: minimal
 test_script:
-- cmd: vstest.console /logger:Appveyor %UnitTestsFile%
+- cmd: vstest.console /logger:Appveyor UnitTests\%platform%\%configuration%\UnitTests.dll