diff options
author | Rob Mensching <rob@firegiant.com> | 2021-04-26 11:31:05 -0700 |
---|---|---|
committer | Rob Mensching <rob@firegiant.com> | 2021-05-11 11:14:01 -0700 |
commit | df016066100df955d5ff98811e113fb2b1bd4b8a (patch) | |
tree | a27b35a3651ca7b1d8c4bb7c7483ec2f92583e08 /src/ext/Bal/test/WixToolsetTest.ManagedHost | |
parent | dc6022da6cdbb9d7ca54c4a36485ceead07feaaf (diff) | |
download | wix-df016066100df955d5ff98811e113fb2b1bd4b8a.tar.gz wix-df016066100df955d5ff98811e113fb2b1bd4b8a.tar.bz2 wix-df016066100df955d5ff98811e113fb2b1bd4b8a.zip |
Implement integrated build process
Diffstat (limited to 'src/ext/Bal/test/WixToolsetTest.ManagedHost')
-rw-r--r-- | src/ext/Bal/test/WixToolsetTest.ManagedHost/TestEngine.cs | 2 | ||||
-rw-r--r-- | src/ext/Bal/test/WixToolsetTest.ManagedHost/WixToolsetTest.ManagedHost.csproj | 15 |
2 files changed, 8 insertions, 9 deletions
diff --git a/src/ext/Bal/test/WixToolsetTest.ManagedHost/TestEngine.cs b/src/ext/Bal/test/WixToolsetTest.ManagedHost/TestEngine.cs index 44538227..9d7fc9db 100644 --- a/src/ext/Bal/test/WixToolsetTest.ManagedHost/TestEngine.cs +++ b/src/ext/Bal/test/WixToolsetTest.ManagedHost/TestEngine.cs | |||
@@ -10,7 +10,7 @@ namespace WixToolsetTest.ManagedHost | |||
10 | 10 | ||
11 | public class TestEngine | 11 | public class TestEngine |
12 | { | 12 | { |
13 | private static readonly string TestEngineFile = TestData.Get(@"..\Win32\examples\Example.TestEngine\Example.TestEngine.exe"); | 13 | private static readonly string TestEngineFile = TestData.Get(@"..\x86\examples\Example.TestEngine\Example.TestEngine.exe"); |
14 | 14 | ||
15 | public TestEngineResult RunReloadEngine(string bundleFilePath, string tempFolderPath) | 15 | public TestEngineResult RunReloadEngine(string bundleFilePath, string tempFolderPath) |
16 | { | 16 | { |
diff --git a/src/ext/Bal/test/WixToolsetTest.ManagedHost/WixToolsetTest.ManagedHost.csproj b/src/ext/Bal/test/WixToolsetTest.ManagedHost/WixToolsetTest.ManagedHost.csproj index 38c8926c..16dbec94 100644 --- a/src/ext/Bal/test/WixToolsetTest.ManagedHost/WixToolsetTest.ManagedHost.csproj +++ b/src/ext/Bal/test/WixToolsetTest.ManagedHost/WixToolsetTest.ManagedHost.csproj | |||
@@ -4,22 +4,21 @@ | |||
4 | <Project Sdk="Microsoft.NET.Sdk"> | 4 | <Project Sdk="Microsoft.NET.Sdk"> |
5 | <PropertyGroup> | 5 | <PropertyGroup> |
6 | <TargetFramework>netcoreapp3.1</TargetFramework> | 6 | <TargetFramework>netcoreapp3.1</TargetFramework> |
7 | <IsPackable>false</IsPackable> | ||
8 | <SignOutput>false</SignOutput> | ||
7 | </PropertyGroup> | 9 | </PropertyGroup> |
8 | 10 | ||
9 | <ItemGroup> | 11 | <ItemGroup> |
10 | <ProjectReference Include="..\examples\TestEngine\Example.TestEngine.vcxproj" /> | 12 | <ProjectReference Include="..\examples\TestEngine\Example.TestEngine.vcxproj" ReferenceOutputAssembly="false" /> |
11 | </ItemGroup> | 13 | </ItemGroup> |
12 | 14 | ||
13 | <ItemGroup> | 15 | <ItemGroup> |
14 | <PackageReference Include="WixBuildTools.TestSupport" Version="4.0.*" /> | 16 | <PackageReference Include="WixToolset.Core.TestPackage" /> |
15 | <PackageReference Include="WixToolset.Core.Burn" Version="4.0.*" /> | ||
16 | <PackageReference Include="WixToolset.Core.WindowsInstaller" Version="4.0.*" /> | ||
17 | <PackageReference Include="WixToolset.Core.TestPackage" Version="4.0.*" /> | ||
18 | </ItemGroup> | 17 | </ItemGroup> |
19 | 18 | ||
20 | <ItemGroup> | 19 | <ItemGroup> |
21 | <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" /> | 20 | <PackageReference Include="Microsoft.NET.Test.Sdk" /> |
22 | <PackageReference Include="xunit" Version="2.4.1" /> | 21 | <PackageReference Include="xunit" /> |
23 | <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" PrivateAssets="All" /> | 22 | <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="All" /> |
24 | </ItemGroup> | 23 | </ItemGroup> |
25 | </Project> | 24 | </Project> |