aboutsummaryrefslogtreecommitdiff
path: root/src/mbahost
diff options
context:
space:
mode:
Diffstat (limited to 'src/mbahost')
-rw-r--r--src/mbahost/host.vcxproj51
-rw-r--r--src/mbahost/mbahost.cpp (renamed from src/mbahost/host.cpp)8
-rw-r--r--src/mbahost/mbahost.def (renamed from src/mbahost/host.def)0
-rw-r--r--src/mbahost/mbahost.vcxproj64
-rw-r--r--src/mbahost/packages.config7
-rw-r--r--src/mbahost/precomp.cpp3
6 files changed, 78 insertions, 55 deletions
diff --git a/src/mbahost/host.vcxproj b/src/mbahost/host.vcxproj
deleted file mode 100644
index a4c3ea16..00000000
--- a/src/mbahost/host.vcxproj
+++ /dev/null
@@ -1,51 +0,0 @@
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. -->
3
4
5<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
6 <ItemGroup Label="ProjectConfigurations">
7 <ProjectConfiguration Include="Debug|Win32">
8 <Configuration>Debug</Configuration>
9 <Platform>Win32</Platform>
10 </ProjectConfiguration>
11 <ProjectConfiguration Include="Release|Win32">
12 <Configuration>Release</Configuration>
13 <Platform>Win32</Platform>
14 </ProjectConfiguration>
15 </ItemGroup>
16
17 <PropertyGroup Label="Globals">
18 <ProjectGuid>{12C87C77-3547-44F8-8134-29BC915CB19D}</ProjectGuid>
19 <ConfigurationType>DynamicLibrary</ConfigurationType>
20 <CharacterSet>Unicode</CharacterSet>
21 <TargetName>mbahost</TargetName>
22 <ProjectModuleDefinitionFile>host.def</ProjectModuleDefinitionFile>
23 </PropertyGroup>
24
25 <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), wix.proj))\tools\WixBuild.props" />
26
27 <PropertyGroup>
28 <ProjectAdditionalIncludeDirectories>$(WixRoot)src\libs\dutil\inc;$(WixRoot)src\burn\inc;$(WixRoot)src\libs\balutil\inc;$(BaseIntermediateOutputPath)\core</ProjectAdditionalIncludeDirectories>
29 <ProjectAdditionalLinkLibraries>dutil.lib;balutil.lib;shlwapi.lib</ProjectAdditionalLinkLibraries>
30 </PropertyGroup>
31
32 <ItemGroup>
33 <ClCompile Include="host.cpp" />
34 </ItemGroup>
35 <ItemGroup>
36 <ClInclude Include="IBootstrapperApplicationFactory.h" />
37 <ClInclude Include="precomp.h" />
38 </ItemGroup>
39 <ItemGroup>
40 <None Include="host.def" />
41 </ItemGroup>
42 <ItemGroup>
43 <ResourceCompile Include="host.rc" />
44 </ItemGroup>
45
46 <ItemGroup>
47 <ProjectReference Include="..\core\core.csproj" />
48 </ItemGroup>
49
50 <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), wix.proj))\tools\WixBuild.targets" />
51</Project>
diff --git a/src/mbahost/host.cpp b/src/mbahost/mbahost.cpp
index 694db357..d3737c06 100644
--- a/src/mbahost/host.cpp
+++ b/src/mbahost/mbahost.cpp
@@ -1,7 +1,7 @@
1// 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. 1// 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 2
3#include "precomp.h" 3#include "precomp.h"
4#include <BootstrapperCore.h> // includes the generated assembly name macros. 4#include <WixToolset.BootstrapperCore.h> // includes the generated assembly name macros.
5#include "BalBaseBootstrapperApplicationProc.h" 5#include "BalBaseBootstrapperApplicationProc.h"
6 6
7static const DWORD NET452_RELEASE = 379893; 7static const DWORD NET452_RELEASE = 379893;
@@ -185,7 +185,7 @@ static HRESULT GetAppDomain(
185 hr = GetAppBase(&sczAppBase); 185 hr = GetAppBase(&sczAppBase);
186 ExitOnFailure(hr, "Failed to get the host base path."); 186 ExitOnFailure(hr, "Failed to get the host base path.");
187 187
188 hr = PathConcat(sczAppBase, L"BootstrapperCore.config", &sczConfigPath); 188 hr = PathConcat(sczAppBase, L"WixToolset.BootstrapperCore.config", &sczConfigPath);
189 ExitOnFailure(hr, "Failed to get the full path to the application configuration file."); 189 ExitOnFailure(hr, "Failed to get the full path to the application configuration file.");
190 190
191 // Check that the supported framework is installed. 191 // Check that the supported framework is installed.
@@ -554,10 +554,10 @@ static HRESULT CreateManagedBootstrapperApplicationFactory(
554 554
555 ::VariantInit(&vtBAFactory); 555 ::VariantInit(&vtBAFactory);
556 556
557 bstrAssemblyName = ::SysAllocString(MUX_ASSEMBLY_FULL_NAME); 557 bstrAssemblyName = ::SysAllocString(MBA_ASSEMBLY_FULL_NAME);
558 ExitOnNull(bstrAssemblyName, hr, E_OUTOFMEMORY, "Failed to allocate the full assembly name for the bootstrapper application factory."); 558 ExitOnNull(bstrAssemblyName, hr, E_OUTOFMEMORY, "Failed to allocate the full assembly name for the bootstrapper application factory.");
559 559
560 bstrTypeName = ::SysAllocString(L"WixToolset.Bootstrapper.BootstrapperApplicationFactory"); 560 bstrTypeName = ::SysAllocString(L"WixToolset.BootstrapperCore.BootstrapperApplicationFactory");
561 ExitOnNull(bstrTypeName, hr, E_OUTOFMEMORY, "Failed to allocate the full type name for the BA factory."); 561 ExitOnNull(bstrTypeName, hr, E_OUTOFMEMORY, "Failed to allocate the full type name for the BA factory.");
562 562
563 hr = pAppDomain->CreateInstance(bstrAssemblyName, bstrTypeName, &pObj); 563 hr = pAppDomain->CreateInstance(bstrAssemblyName, bstrTypeName, &pObj);
diff --git a/src/mbahost/host.def b/src/mbahost/mbahost.def
index 4488df94..4488df94 100644
--- a/src/mbahost/host.def
+++ b/src/mbahost/mbahost.def
diff --git a/src/mbahost/mbahost.vcxproj b/src/mbahost/mbahost.vcxproj
new file mode 100644
index 00000000..d40333ab
--- /dev/null
+++ b/src/mbahost/mbahost.vcxproj
@@ -0,0 +1,64 @@
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. -->
3
4<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
5 <Import Project="..\..\packages\WixToolset.BalUtil.4.0.4\build\WixToolset.BalUtil.props" Condition="Exists('..\..\packages\WixToolset.BalUtil.4.0.4\build\WixToolset.BalUtil.props')" />
6 <Import Project="..\..\packages\WixToolset.BootstrapperCore.4.0.3\build\WixToolset.BootstrapperCore.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.4.0.1\build\WixToolset.BootstrapperCore.props')" />
7 <Import Project="..\..\packages\WixToolset.DUtil.4.0.13\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.13\build\WixToolset.DUtil.props')" />
8
9 <ItemGroup Label="ProjectConfigurations">
10 <ProjectConfiguration Include="Debug|Win32">
11 <Configuration>Debug</Configuration>
12 <Platform>Win32</Platform>
13 </ProjectConfiguration>
14 <ProjectConfiguration Include="Release|Win32">
15 <Configuration>Release</Configuration>
16 <Platform>Win32</Platform>
17 </ProjectConfiguration>
18 </ItemGroup>
19
20 <PropertyGroup Label="Globals">
21 <ProjectGuid>{12C87C77-3547-44F8-8134-29BC915CB19D}</ProjectGuid>
22 <ConfigurationType>DynamicLibrary</ConfigurationType>
23 <PlatformToolset>v141</PlatformToolset>
24 <CharacterSet>Unicode</CharacterSet>
25 <TargetName>mbahost</TargetName>
26 <ProjectModuleDefinitionFile>mbahost.def</ProjectModuleDefinitionFile>
27 </PropertyGroup>
28
29 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
30 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
31
32 <PropertyGroup>
33 <ProjectAdditionalLinkLibraries>shlwapi.lib</ProjectAdditionalLinkLibraries>
34 </PropertyGroup>
35
36 <ItemGroup>
37 <ClCompile Include="mbahost.cpp" />
38 <ClCompile Include="precomp.cpp">
39 <PrecompiledHeader>Create</PrecompiledHeader>
40 </ClCompile>
41 </ItemGroup>
42 <ItemGroup>
43 <ClInclude Include="precomp.h" />
44 </ItemGroup>
45 <ItemGroup>
46 <None Include="mbahost.def" />
47 </ItemGroup>
48
49 <ItemGroup>
50 <None Include="packages.config" />
51 </ItemGroup>
52
53 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
54 <Import Project="..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" />
55 <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
56 <PropertyGroup>
57 <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>
58 </PropertyGroup>
59 <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'))" />
60 <Error Condition="!Exists('..\..\packages\WixToolset.BootstrapperCore.4.0.3\build\WixToolset.BootstrapperCore.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BootstrapperCore.4.0.3\build\WixToolset.BootstrapperCore.props'))" />
61 <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.13\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.13\build\WixToolset.DUtil.props'))" />
62 <Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets'))" />
63 </Target>
64</Project>
diff --git a/src/mbahost/packages.config b/src/mbahost/packages.config
new file mode 100644
index 00000000..41ba2f12
--- /dev/null
+++ b/src/mbahost/packages.config
@@ -0,0 +1,7 @@
1<?xml version="1.0" encoding="utf-8"?>
2<packages>
3 <package id="Nerdbank.GitVersioning" version="2.1.65" targetFramework="native" developmentDependency="true" />
4 <package id="WixToolset.BootstrapperCore" version="4.0.3" targetFramework="native" />
5 <package id="WixToolset.BalUtil" version="4.0.4" targetFramework="native" />
6 <package id="WixToolset.DUtil" version="4.0.13" targetFramework="native" />
7</packages> \ No newline at end of file
diff --git a/src/mbahost/precomp.cpp b/src/mbahost/precomp.cpp
new file mode 100644
index 00000000..37664a1c
--- /dev/null
+++ b/src/mbahost/precomp.cpp
@@ -0,0 +1,3 @@
1// 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#include "precomp.h"
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-04-18 08:42:33 +0000