From dfcb8918d4991fa53f086b071553928d3d5de3a5 Mon Sep 17 00:00:00 2001
From: Michael Yanni <miyanni@microsoft.com>
Date: Thu, 8 Feb 2024 10:38:54 -0800
Subject: [PATCH] Backslashes are escape characters. Trying forward slashes
 explicitly.

---
 src/finalizer/CMakeLists.txt       |  4 ++--
 src/finalizer/finalizer.nativeproj | 13 ++++++++++++-
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/finalizer/CMakeLists.txt b/src/finalizer/CMakeLists.txt
index 96c0cd825..38941a20f 100644
--- a/src/finalizer/CMakeLists.txt
+++ b/src/finalizer/CMakeLists.txt
@@ -12,9 +12,9 @@ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SUBSYSTEM:WINDOWS /ENTRY:
 # The WiX SDK is extracted from a NuGet package using an SDK .csproj (finalizer-build) that copies the "lib" and "inc" folders to a stable location.
 # The defines below (values in ${}) are set in the finalizer.nativeproj.
 # See: https://github.com/dotnet/arcade/tree/main/src/Microsoft.DotNet.CMake.Sdk#common-items
-include_directories(${ArtifactsDir}WixSdk\inc)
+include_directories(${ArtifactsDir}WixSdk/inc)
 include_directories(${ArtifactsDir}obj)
-link_directories(${ArtifactsDir}WixSdk\lib\${Platform})
+link_directories(${ArtifactsDir}WixSdk/lib/${Platform})
 
 add_compile_options(/MT)
 
diff --git a/src/finalizer/finalizer.nativeproj b/src/finalizer/finalizer.nativeproj
index 53cbf1347..677406d49 100644
--- a/src/finalizer/finalizer.nativeproj
+++ b/src/finalizer/finalizer.nativeproj
@@ -9,9 +9,20 @@
   <!-- This will be passed through -D and referenced by the CMakeLists.txt to correctly resolve the platform specific libs. -->
   <ItemGroup>
     <CMakeDefines Include="Platform" Value="$(Platform)" />
-    <CMakeDefines Include="ArtifactsDir" Value="$(ArtifactsDir)" />
+    <CMakeDefines Include="ArtifactsDir" Value="$([System.String]::Copy($(ArtifactsDir)).Replace('\','/'))" />
     <!-- Include this item below to create a binlog for the native build. -->
     <!-- <CMakeNativeToolArguments Include="/bl:$(ArtifactsDir)native.binlog" /> -->
   </ItemGroup>
 
+  <Target Name="FinalizerPropertyCheck" AfterTargets="Restore" BeforeTargets="Build">
+    <Message Text="Platform: $(Platform)" Importance="high"/>
+    <Message Text="ArtifactsDir: $(ArtifactsDir)" Importance="high"/>
+
+    <PropertyGroup>
+      <ArtDirFixed>$([System.String]::Copy($(ArtifactsDir)).Replace('\','/'))</ArtDirFixed>
+    </PropertyGroup>
+
+    <Message Text="ArtDirFixed: $(ArtDirFixed)" Importance="high"/>
+  </Target>
+
 </Project>