diff options
Diffstat (limited to 'src')
4 files changed, 9 insertions, 9 deletions
diff --git a/src/test/WixToolsetTest.MbaHost/TestManagedBootstrapperApplication.h b/src/test/WixToolsetTest.MbaHost/TestManagedBootstrapperApplication.h index d74d90c5..910d39bd 100644 --- a/src/test/WixToolsetTest.MbaHost/TestManagedBootstrapperApplication.h +++ b/src/test/WixToolsetTest.MbaHost/TestManagedBootstrapperApplication.h | |||
@@ -13,8 +13,8 @@ namespace Native | |||
13 | public ref class TestManagedBootstrapperApplication : BootstrapperApplication | 13 | public ref class TestManagedBootstrapperApplication : BootstrapperApplication |
14 | { | 14 | { |
15 | public: | 15 | public: |
16 | TestManagedBootstrapperApplication(WixToolset::BootstrapperCore::Engine^ engine, WixToolset::BootstrapperCore::Command command) | 16 | TestManagedBootstrapperApplication(WixToolset::BootstrapperCore::IEngine^ engine) |
17 | : BootstrapperApplication(engine, command) | 17 | : BootstrapperApplication(engine) |
18 | { | 18 | { |
19 | 19 | ||
20 | } | 20 | } |
@@ -26,7 +26,7 @@ namespace Native | |||
26 | virtual void OnShutdown(ShutdownEventArgs^ e) override | 26 | virtual void OnShutdown(ShutdownEventArgs^ e) override |
27 | { | 27 | { |
28 | String^ message = "Shutdown," + e->Action.ToString() + "," + e->HResult.ToString(); | 28 | String^ message = "Shutdown," + e->Action.ToString() + "," + e->HResult.ToString(); |
29 | this->Engine->Log(LogLevel::Standard, message); | 29 | this->engine->Log(LogLevel::Standard, message); |
30 | } | 30 | } |
31 | }; | 31 | }; |
32 | } | 32 | } |
diff --git a/src/test/WixToolsetTest.MbaHost/TestManagedBootstrapperApplicationFactory.h b/src/test/WixToolsetTest.MbaHost/TestManagedBootstrapperApplicationFactory.h index 9d44075b..0f30ff2d 100644 --- a/src/test/WixToolsetTest.MbaHost/TestManagedBootstrapperApplicationFactory.h +++ b/src/test/WixToolsetTest.MbaHost/TestManagedBootstrapperApplicationFactory.h | |||
@@ -13,9 +13,9 @@ namespace Native | |||
13 | public ref class TestManagedBootstrapperApplicationFactory : public BaseBootstrapperApplicationFactory | 13 | public ref class TestManagedBootstrapperApplicationFactory : public BaseBootstrapperApplicationFactory |
14 | { | 14 | { |
15 | protected: | 15 | protected: |
16 | virtual IBootstrapperApplication^ Create(Engine^ engine, Command% command) override | 16 | virtual IBootstrapperApplication^ Create(IEngine^ engine, IBootstrapperCommand^ /*command*/) override |
17 | { | 17 | { |
18 | return gcnew TestManagedBootstrapperApplication(engine, command); | 18 | return gcnew TestManagedBootstrapperApplication(engine); |
19 | } | 19 | } |
20 | }; | 20 | }; |
21 | 21 | ||
diff --git a/src/test/WixToolsetTest.MbaHost/WixToolsetTest.MbaHost.vcxproj b/src/test/WixToolsetTest.MbaHost/WixToolsetTest.MbaHost.vcxproj index a95a1606..094c351f 100644 --- a/src/test/WixToolsetTest.MbaHost/WixToolsetTest.MbaHost.vcxproj +++ b/src/test/WixToolsetTest.MbaHost/WixToolsetTest.MbaHost.vcxproj | |||
@@ -2,7 +2,7 @@ | |||
2 | <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. --> | 2 | <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. --> |
3 | <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | 3 | <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
4 | <Import Project="..\..\..\packages\WixToolset.BalUtil.4.0.4\build\WixToolset.BalUtil.props" Condition="Exists('..\..\..\packages\WixToolset.BalUtil.4.0.4\build\WixToolset.BalUtil.props')" /> | 4 | <Import Project="..\..\..\packages\WixToolset.BalUtil.4.0.4\build\WixToolset.BalUtil.props" Condition="Exists('..\..\..\packages\WixToolset.BalUtil.4.0.4\build\WixToolset.BalUtil.props')" /> |
5 | <Import Project="..\..\..\packages\WixToolset.BootstrapperCore.4.0.4\build\WixToolset.BootstrapperCore.props" Condition="Exists('..\..\..\packages\WixToolset.BootstrapperCore.4.0.4\build\WixToolset.BootstrapperCore.props')" /> | 5 | <Import Project="..\..\..\packages\WixToolset.BootstrapperCore.4.0.5\build\WixToolset.BootstrapperCore.props" Condition="Exists('..\..\..\packages\WixToolset.BootstrapperCore.4.0.5\build\WixToolset.BootstrapperCore.props')" /> |
6 | <Import Project="..\..\..\packages\xunit.core.2.4.0\build\xunit.core.props" Condition="Exists('..\..\..\packages\xunit.core.2.4.0\build\xunit.core.props')" /> | 6 | <Import Project="..\..\..\packages\xunit.core.2.4.0\build\xunit.core.props" Condition="Exists('..\..\..\packages\xunit.core.2.4.0\build\xunit.core.props')" /> |
7 | <Import Project="..\..\..\packages\WixToolset.DUtil.4.0.16\build\WixToolset.DUtil.props" Condition="Exists('..\..\..\packages\WixToolset.DUtil.4.0.16\build\WixToolset.DUtil.props')" /> | 7 | <Import Project="..\..\..\packages\WixToolset.DUtil.4.0.16\build\WixToolset.DUtil.props" Condition="Exists('..\..\..\packages\WixToolset.DUtil.4.0.16\build\WixToolset.DUtil.props')" /> |
8 | <ItemGroup Label="ProjectConfigurations"> | 8 | <ItemGroup Label="ProjectConfigurations"> |
@@ -66,7 +66,7 @@ | |||
66 | <HintPath>..\..\..\packages\xunit.extensibility.execution.2.4.0\lib\net452\xunit.execution.desktop.dll</HintPath> | 66 | <HintPath>..\..\..\packages\xunit.extensibility.execution.2.4.0\lib\net452\xunit.execution.desktop.dll</HintPath> |
67 | </Reference> | 67 | </Reference> |
68 | <Reference Include="WixToolset.BootstrapperCore"> | 68 | <Reference Include="WixToolset.BootstrapperCore"> |
69 | <HintPath>..\..\..\packages\WixToolset.BootstrapperCore.4.0.4\lib\net20\WixToolset.BootstrapperCore.dll</HintPath> | 69 | <HintPath>..\..\..\packages\WixToolset.BootstrapperCore.4.0.5\lib\net20\WixToolset.BootstrapperCore.dll</HintPath> |
70 | </Reference> | 70 | </Reference> |
71 | </ItemGroup> | 71 | </ItemGroup> |
72 | <ItemGroup> | 72 | <ItemGroup> |
@@ -83,7 +83,7 @@ | |||
83 | <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> | 83 | <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> |
84 | </PropertyGroup> | 84 | </PropertyGroup> |
85 | <Error Condition="!Exists('..\..\..\packages\WixToolset.BalUtil.4.0.4\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.BalUtil.4.0.4\build\WixToolset.BalUtil.props'))" /> | 85 | <Error Condition="!Exists('..\..\..\packages\WixToolset.BalUtil.4.0.4\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.BalUtil.4.0.4\build\WixToolset.BalUtil.props'))" /> |
86 | <Error Condition="!Exists('..\..\..\packages\WixToolset.BootstrapperCore.4.0.4\build\WixToolset.BootstrapperCore.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.BootstrapperCore.4.0.4\build\WixToolset.BootstrapperCore.props'))" /> | 86 | <Error Condition="!Exists('..\..\..\packages\WixToolset.BootstrapperCore.4.0.5\build\WixToolset.BootstrapperCore.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.BootstrapperCore.4.0.5\build\WixToolset.BootstrapperCore.props'))" /> |
87 | <Error Condition="!Exists('..\..\..\packages\xunit.core.2.4.0\build\xunit.core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\xunit.core.2.4.0\build\xunit.core.props'))" /> | 87 | <Error Condition="!Exists('..\..\..\packages\xunit.core.2.4.0\build\xunit.core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\xunit.core.2.4.0\build\xunit.core.props'))" /> |
88 | <Error Condition="!Exists('..\..\..\packages\xunit.core.2.4.0\build\xunit.core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\xunit.core.2.4.0\build\xunit.core.targets'))" /> | 88 | <Error Condition="!Exists('..\..\..\packages\xunit.core.2.4.0\build\xunit.core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\xunit.core.2.4.0\build\xunit.core.targets'))" /> |
89 | <Error Condition="!Exists('..\..\..\packages\WixToolset.DUtil.4.0.16\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.DUtil.4.0.16\build\WixToolset.DUtil.props'))" /> | 89 | <Error Condition="!Exists('..\..\..\packages\WixToolset.DUtil.4.0.16\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.DUtil.4.0.16\build\WixToolset.DUtil.props'))" /> |
diff --git a/src/test/WixToolsetTest.MbaHost/packages.config b/src/test/WixToolsetTest.MbaHost/packages.config index d534f781..4cd75692 100644 --- a/src/test/WixToolsetTest.MbaHost/packages.config +++ b/src/test/WixToolsetTest.MbaHost/packages.config | |||
@@ -9,6 +9,6 @@ | |||
9 | <package id="xunit.extensibility.execution" version="2.4.0" targetFramework="net461" /> | 9 | <package id="xunit.extensibility.execution" version="2.4.0" targetFramework="net461" /> |
10 | <package id="xunit.runner.visualstudio" version="2.4.0" targetFramework="net461" /> | 10 | <package id="xunit.runner.visualstudio" version="2.4.0" targetFramework="net461" /> |
11 | <package id="WixToolset.BalUtil" version="4.0.4" targetFramework="native" /> | 11 | <package id="WixToolset.BalUtil" version="4.0.4" targetFramework="native" /> |
12 | <package id="WixToolset.BootstrapperCore" version="4.0.4" targetFramework="net461" /> | 12 | <package id="WixToolset.BootstrapperCore" version="4.0.5" targetFramework="net461" /> |
13 | <package id="WixToolset.DUtil" version="4.0.16" targetFramework="native" /> | 13 | <package id="WixToolset.DUtil" version="4.0.16" targetFramework="native" /> |
14 | </packages> \ No newline at end of file | 14 | </packages> \ No newline at end of file |