diff options
| author | Rob Mensching <rob@firegiant.com> | 2021-04-02 14:54:40 -0700 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2021-04-03 13:59:25 -0700 |
| commit | 04dd968856734d40e20802cd07e89f40ac871191 (patch) | |
| tree | d6157b4f0edc39c108d2104a88e09b008d263aa6 /src/test | |
| parent | 9331f113bcaedd6c391077a07d5f98f3fdb85a95 (diff) | |
| download | wix-04dd968856734d40e20802cd07e89f40ac871191.tar.gz wix-04dd968856734d40e20802cd07e89f40ac871191.tar.bz2 wix-04dd968856734d40e20802cd07e89f40ac871191.zip | |
Standardize on .NET Core v3.1
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj | 2 | ||||
| -rw-r--r-- | src/test/WixToolsetTest.Sdk/MsbuildUtilities.cs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj b/src/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj index 95a88190..c01860cd 100644 --- a/src/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj +++ b/src/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj | |||
| @@ -22,7 +22,7 @@ | |||
| 22 | 22 | ||
| 23 | <ItemGroup> | 23 | <ItemGroup> |
| 24 | <PackageReference Include="Microsoft.Build.Tasks.Core" Version="14.3" Condition="'$(TargetFramework)'=='net461' or '$(TargetFramework)'=='net472'" /> | 24 | <PackageReference Include="Microsoft.Build.Tasks.Core" Version="14.3" Condition="'$(TargetFramework)'=='net461' or '$(TargetFramework)'=='net472'" /> |
| 25 | <PackageReference Include="Microsoft.Build.Tasks.Core" Version="15.7.179" Condition="'$(TargetFramework)'=='netcoreapp2.1' " /> | 25 | <PackageReference Include="Microsoft.Build.Tasks.Core" Version="15.7.179" Condition="'$(TargetFramework)'=='netcoreapp3.1' " /> |
| 26 | <PackageReference Include="WixBuildTools.TestSupport" Version="4.0.*" /> | 26 | <PackageReference Include="WixBuildTools.TestSupport" Version="4.0.*" /> |
| 27 | <PackageReference Include="WixToolset.Core.TestPackage" Version="4.0.*" /> | 27 | <PackageReference Include="WixToolset.Core.TestPackage" Version="4.0.*" /> |
| 28 | </ItemGroup> | 28 | </ItemGroup> |
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") |