aboutsummaryrefslogtreecommitdiff
path: root/src/test/WixToolsetTest.Sdk
diff options
context:
space:
mode:
authorRob Mensching <rob@firegiant.com>2021-04-02 14:54:40 -0700
committerRob Mensching <rob@firegiant.com>2021-04-03 13:59:25 -0700
commit04dd968856734d40e20802cd07e89f40ac871191 (patch)
treed6157b4f0edc39c108d2104a88e09b008d263aa6 /src/test/WixToolsetTest.Sdk
parent9331f113bcaedd6c391077a07d5f98f3fdb85a95 (diff)
downloadwix-04dd968856734d40e20802cd07e89f40ac871191.tar.gz
wix-04dd968856734d40e20802cd07e89f40ac871191.tar.bz2
wix-04dd968856734d40e20802cd07e89f40ac871191.zip
Standardize on .NET Core v3.1
Diffstat (limited to 'src/test/WixToolsetTest.Sdk')
-rw-r--r--src/test/WixToolsetTest.Sdk/MsbuildUtilities.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/test/WixToolsetTest.Sdk/MsbuildUtilities.cs b/src/test/WixToolsetTest.Sdk/MsbuildUtilities.cs
index cfb421b2..2e07af3a 100644
--- a/src/test/WixToolsetTest.Sdk/MsbuildUtilities.cs
+++ b/src/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(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") 23 public static MsbuildRunnerResult BuildProject(BuildSystem buildSystem, string projectPath, string[] arguments = null, string configuration = "Release", bool? outOfProc = null, string verbosityLevel = "normal")