diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2020-04-23 12:17:32 +1000 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2020-04-23 12:43:38 +1000 |
| commit | bd3ee565f342bc0bb015594f303d13b67285a958 (patch) | |
| tree | 1994e37e385851a7cfdd69b3f7cf03b3bfaa8a7b /src/test/examples/FullFramework4MBA | |
| parent | 05edba00dc08b74a6d9b32b4e56f4da6ef90c638 (diff) | |
| download | wix-bd3ee565f342bc0bb015594f303d13b67285a958.tar.gz wix-bd3ee565f342bc0bb015594f303d13b67285a958.tar.bz2 wix-bd3ee565f342bc0bb015594f303d13b67285a958.zip | |
Update ManagedHost tests to run off of a bundle.
Diffstat (limited to 'src/test/examples/FullFramework4MBA')
| -rw-r--r-- | src/test/examples/FullFramework4MBA/BootstrapperApplicationData.xml | bin | 20128 -> 0 bytes | |||
| -rw-r--r-- | src/test/examples/FullFramework4MBA/Example.FullFramework4MBA.csproj | 26 | ||||
| -rw-r--r-- | src/test/examples/FullFramework4MBA/FullFramework4BA.cs | 7 |
3 files changed, 10 insertions, 23 deletions
diff --git a/src/test/examples/FullFramework4MBA/BootstrapperApplicationData.xml b/src/test/examples/FullFramework4MBA/BootstrapperApplicationData.xml deleted file mode 100644 index 7c4169b1..00000000 --- a/src/test/examples/FullFramework4MBA/BootstrapperApplicationData.xml +++ /dev/null | |||
| Binary files differ | |||
diff --git a/src/test/examples/FullFramework4MBA/Example.FullFramework4MBA.csproj b/src/test/examples/FullFramework4MBA/Example.FullFramework4MBA.csproj index 40f6d008..2d0dd790 100644 --- a/src/test/examples/FullFramework4MBA/Example.FullFramework4MBA.csproj +++ b/src/test/examples/FullFramework4MBA/Example.FullFramework4MBA.csproj | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | <Project Sdk="Microsoft.NET.Sdk"> | 1 | <?xml version="1.0" encoding="utf-8"?> |
| 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 | 3 | ||
| 4 | <Project Sdk="Microsoft.NET.Sdk"> | ||
| 3 | <PropertyGroup> | 5 | <PropertyGroup> |
| 4 | <TargetFramework>net48</TargetFramework> | 6 | <TargetFramework>net48</TargetFramework> |
| 5 | <Description>Full Framework v4 MBA</Description> | 7 | <Description>Full Framework v4 MBA</Description> |
| @@ -11,28 +13,6 @@ | |||
| 11 | </ItemGroup> | 13 | </ItemGroup> |
| 12 | 14 | ||
| 13 | <ItemGroup> | 15 | <ItemGroup> |
| 14 | <Content Include="BootstrapperApplicationData.xml" CopyToOutputDirectory="PreserveNewest" /> | ||
| 15 | <Content Include="WixToolset.Mba.Host.config" CopyToOutputDirectory="PreserveNewest" /> | 16 | <Content Include="WixToolset.Mba.Host.config" CopyToOutputDirectory="PreserveNewest" /> |
| 16 | </ItemGroup> | 17 | </ItemGroup> |
| 17 | |||
| 18 | <ItemGroup> | ||
| 19 | <ProjectReference Include="..\..\..\mbahost\mbahost.vcxproj"> | ||
| 20 | <Project>{12c87c77-3547-44f8-8134-29bc915cb19d}</Project> | ||
| 21 | <ReferenceOutputAssembly>false</ReferenceOutputAssembly> | ||
| 22 | </ProjectReference> | ||
| 23 | <ProjectReference Include="..\..\..\WixToolset.Mba.Host\WixToolset.Mba.Host.csproj"> | ||
| 24 | <Project>{F2BA1935-70FA-4156-B161-FD03850B4FAA}</Project> | ||
| 25 | <ReferenceOutputAssembly>false</ReferenceOutputAssembly> | ||
| 26 | <OutputItemType>Content</OutputItemType> | ||
| 27 | <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> | ||
| 28 | </ProjectReference> | ||
| 29 | </ItemGroup> | ||
| 30 | |||
| 31 | <ItemGroup> | ||
| 32 | <MbaHostDependency Include="$(BaseOutputPath)$(Configuration)\Win32\mbahost.dll" /> | ||
| 33 | </ItemGroup> | ||
| 34 | |||
| 35 | <Target Name="CopyMbaHostDependencies" AfterTargets="Build"> | ||
| 36 | <Copy DestinationFolder="$(OutputPath)" SourceFiles="@(MbaHostDependency)" SkipUnchangedFiles="true" /> | ||
| 37 | </Target> | ||
| 38 | </Project> \ No newline at end of file | 18 | </Project> \ No newline at end of file |
diff --git a/src/test/examples/FullFramework4MBA/FullFramework4BA.cs b/src/test/examples/FullFramework4MBA/FullFramework4BA.cs index 556a61a7..8ee3bd19 100644 --- a/src/test/examples/FullFramework4MBA/FullFramework4BA.cs +++ b/src/test/examples/FullFramework4MBA/FullFramework4BA.cs | |||
| @@ -16,6 +16,13 @@ namespace Example.FullFramework4MBA | |||
| 16 | { | 16 | { |
| 17 | } | 17 | } |
| 18 | 18 | ||
| 19 | protected override void OnStartup(StartupEventArgs args) | ||
| 20 | { | ||
| 21 | base.OnStartup(args); | ||
| 22 | |||
| 23 | this.engine.Log(LogLevel.Standard, nameof(FullFramework4BA)); | ||
| 24 | } | ||
| 25 | |||
| 19 | protected override void OnShutdown(ShutdownEventArgs args) | 26 | protected override void OnShutdown(ShutdownEventArgs args) |
| 20 | { | 27 | { |
| 21 | base.OnShutdown(args); | 28 | base.OnShutdown(args); |
