summaryrefslogtreecommitdiff
path: root/src/wix/test/WixToolsetTest.Sdk/MsbuildUtilities.cs
diff options
context:
space:
mode:
authorRob Mensching <rob@firegiant.com>2022-02-14 13:39:03 -0800
committerRob Mensching <rob@firegiant.com>2022-02-17 14:52:59 -0800
commit4310916863735f641d2aa2e3f44d47c7b08c9d49 (patch)
tree00e2fe71b151c3b437f011f08b76d2df38d0918f /src/wix/test/WixToolsetTest.Sdk/MsbuildUtilities.cs
parent9bf030f84f8717d3565d733acfd796bfc52b5fc0 (diff)
downloadwix-4310916863735f641d2aa2e3f44d47c7b08c9d49.tar.gz
wix-4310916863735f641d2aa2e3f44d47c7b08c9d49.tar.bz2
wix-4310916863735f641d2aa2e3f44d47c7b08c9d49.zip
Fix the bitness of native binaries for .NET Framework
First, moved the tests build into a separate directory to prevent collisions with shipping code. That requires each test to copy in the required native binaries. Default the native binaries to x64 for testing since we've standardized on VS2022 which is all x64 all the time. Finally, copy the native binaries into the .NET Framework differently from .NET Core because .NET Framework does not support cross-platform thus requires a different layout.
Diffstat (limited to 'src/wix/test/WixToolsetTest.Sdk/MsbuildUtilities.cs')
-rw-r--r--src/wix/test/WixToolsetTest.Sdk/MsbuildUtilities.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/wix/test/WixToolsetTest.Sdk/MsbuildUtilities.cs b/src/wix/test/WixToolsetTest.Sdk/MsbuildUtilities.cs
index 875e3279..028ea0cf 100644
--- a/src/wix/test/WixToolsetTest.Sdk/MsbuildUtilities.cs
+++ b/src/wix/test/WixToolsetTest.Sdk/MsbuildUtilities.cs
@@ -17,7 +17,7 @@ namespace WixToolsetTest.Sdk
17 17
18 public static class MsbuildUtilities 18 public static class MsbuildUtilities
19 { 19 {
20 public static readonly string WixMsbuildPath = Path.Combine(Path.GetDirectoryName(new Uri(typeof(MsbuildUtilities).Assembly.CodeBase).AbsolutePath), "..", "publish", "WixToolset.Sdk"); 20 public static readonly string WixMsbuildPath = Path.Combine(Path.GetDirectoryName(new Uri(typeof(MsbuildUtilities).Assembly.CodeBase).AbsolutePath), "..", "..", "..", "publish", "WixToolset.Sdk");
21 public static readonly string WixPropsPath = Path.Combine(WixMsbuildPath, "build", "WixToolset.Sdk.props"); 21 public static readonly string WixPropsPath = Path.Combine(WixMsbuildPath, "build", "WixToolset.Sdk.props");
22 22
23 public static MsbuildRunnerResult BuildProject(BuildSystem buildSystem, string projectPath, string[] arguments = null, string configuration = "Release", bool? outOfProc = null, string verbosityLevel = "normal", bool suppressValidation = true) 23 public static MsbuildRunnerResult BuildProject(BuildSystem buildSystem, string projectPath, string[] arguments = null, string configuration = "Release", bool? outOfProc = null, string verbosityLevel = "normal", bool suppressValidation = true)