Build bafunctions.vcxproj
Sean Hall committed
Jan 13, 2019 at 19:44 UTC
ae67928056de9a1933eb0272fdd9d3f22af067d4
6 files changed
+50
-148
Bal.wixext.sln
+10
@@ -3,6 +3,8 @@ Microsoft Visual Studio Solution File, Format Version 12.00
3
# Visual Studio 15
4
VisualStudioVersion = 15.0.28010.2016
5
MinimumVisualStudioVersion = 10.0.40219.1
6
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bafunctions", "src\Samples\bafunctions\bafunctions.vcxproj", "{EB0A7D51-2133-4EE7-B6CA-87DBEAC67E02}"
7
+EndProject
8
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mbahost", "src\mbahost\mbahost.vcxproj", "{12C87C77-3547-44F8-8134-29BC915CB19D}"
9
EndProject
10
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wixstdba", "src\wixstdba\wixstdba.vcxproj", "{41085A22-E6AA-4E8B-AB1B-DDEE0DC89DFA}"
@@ -19,6 +21,14 @@ Global
21
Release|x86 = Release|x86
22
EndGlobalSection
23
GlobalSection(ProjectConfigurationPlatforms) = postSolution
24
+ {EB0A7D51-2133-4EE7-B6CA-87DBEAC67E02}.Debug|Any CPU.ActiveCfg = Debug|Win32
25
+ {EB0A7D51-2133-4EE7-B6CA-87DBEAC67E02}.Debug|Any CPU.Build.0 = Debug|Win32
26
+ {EB0A7D51-2133-4EE7-B6CA-87DBEAC67E02}.Debug|x86.ActiveCfg = Debug|Win32
27
+ {EB0A7D51-2133-4EE7-B6CA-87DBEAC67E02}.Debug|x86.Build.0 = Debug|Win32
28
+ {EB0A7D51-2133-4EE7-B6CA-87DBEAC67E02}.Release|Any CPU.ActiveCfg = Release|Win32
29
+ {EB0A7D51-2133-4EE7-B6CA-87DBEAC67E02}.Release|Any CPU.Build.0 = Release|Win32
30
+ {EB0A7D51-2133-4EE7-B6CA-87DBEAC67E02}.Release|x86.ActiveCfg = Release|Win32
31
+ {EB0A7D51-2133-4EE7-B6CA-87DBEAC67E02}.Release|x86.Build.0 = Release|Win32
32
{12C87C77-3547-44F8-8134-29BC915CB19D}.Debug|Any CPU.ActiveCfg = Debug|Win32
33
{12C87C77-3547-44F8-8134-29BC915CB19D}.Debug|Any CPU.Build.0 = Debug|Win32
34
{12C87C77-3547-44F8-8134-29BC915CB19D}.Debug|x86.ActiveCfg = Debug|Win32
src/Samples/bafunctions/bafunctions.rc
deleted
-118
@@ -1,118 +0,0 @@
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 <winver.h>
4
-#include <windows.h>
5
-#include "bafunctionsver.h"
6
-
7
-#define VER_APP
8
-#define VER_ORIGINAL_FILENAME "bafunctions.dll"
9
-#define VER_INTERNAL_NAME "bafunctions"
10
-#define VER_PRODUCT_NAME "WiX Sample BAFunctions"
11
-#define VER_FILE_DESCRIPTION "WiX Sample BAFunctions"
12
-
13
-#ifdef DEBUG
14
- #define VER_DEBUG VS_FF_DEBUG
15
- #define VER_PRIVATE_BUILD VS_FF_PRIVATEBUILD
16
- #define VER_PRE_RELEASE (VS_FF_PRERELEASE | VS_FF_SPECIALBUILD)
17
-#else
18
- #define VER_DEBUG 0
19
- #define VER_PRIVATE_BUILD 0
20
- #define VER_PRE_RELEASE 0
21
-#endif
22
-
23
-#if defined(VER_APP)
24
- #define VER_FILE_TYPE VFT_APP
25
-#elif defined(VER_DLL)
26
- #define VER_FILE_TYPE VFT_DLL
27
-#elif defined(VER_TYPELIB)
28
- #define VER_FILE_TYPE VFT_UNKNOWN
29
-#else
30
- #define VER_FILE_TYPE VFT_UNKNOWN
31
-#endif
32
-
33
-#if defined(VER_LANG_NEUTRAL)
34
- #ifndef VER_LANG
35
- #define VER_LANG 0x0000
36
- #endif
37
- #ifndef VER_CP
38
- #define VER_CP 0x04E4
39
- #endif
40
- #ifndef VER_BLOCK
41
- #define VER_BLOCK "000004E4"
42
- #endif
43
-#else
44
- #ifndef VER_LANG
45
- #define VER_LANG 0x0409
46
- #endif
47
- #ifndef VER_CP
48
- #define VER_CP 0x04E4
49
- #endif
50
- #ifndef VER_BLOCK
51
- #define VER_BLOCK "040904E4"
52
- #endif
53
-#endif
54
-
55
-#define VER_FILE_VERSION rmj, rmm, rbd, rev
56
-#define VER_PRODUCT_VERSION rmj, rmm, rbd, rev
57
-#define VER_FILE_VERSION_STRING szVerMajorMinorBuildRev
58
-#define VER_PRODUCT_VERSION_STRING VER_FILE_VERSION_STRING
59
-#define VER_FILE_FLAGS_MASK VS_FFI_FILEFLAGSMASK
60
-#define VER_FILE_FLAGS (VER_DEBUG | VER_PRIVATE_BUILD | VER_PRE_RELEASE)
61
-
62
-#define VER_FILE_OS VOS__WINDOWS32
63
-
64
-#define VER_COMPANY_NAME ".NET Foundation"
65
-#ifndef VER_PRODUCT_NAME
66
- #define VER_PRODUCT_NAME "Windows Installer XML (WiX)"
67
-#endif
68
-#ifndef VER_FILE_DESCRIPTION
69
- #define VER_FILE_DESCRIPTION "Windows Installer XML (WiX) component"
70
-#endif
71
-
72
-#if defined(VER_LEGAL_COPYRIGHT)
73
- #error
74
-#endif
75
-#define VER_LEGAL_COPYRIGHT "Copyright (c) .NET Foundation and contributors.\240 All rights reserved."
76
-
77
-#if !defined(VER_FILE_SUBTYPE)
78
- #define VER_FILE_SUBTYPE 0
79
-#endif
80
-
81
-#ifdef RC_INVOKED
82
-
83
-VS_VERSION_INFO VERSIONINFO
84
-FILEVERSION VER_FILE_VERSION
85
-PRODUCTVERSION VER_PRODUCT_VERSION
86
-FILEFLAGSMASK VER_FILE_FLAGS_MASK
87
-FILEFLAGS VER_FILE_FLAGS
88
-FILEOS VER_FILE_OS
89
-FILETYPE VER_FILE_TYPE
90
-FILESUBTYPE VER_FILE_SUBTYPE
91
-BEGIN
92
-BLOCK "StringFileInfo"
93
- BEGIN
94
- BLOCK VER_BLOCK
95
- BEGIN
96
- VALUE "CompanyName", VER_COMPANY_NAME
97
- VALUE "FileDescription", VER_FILE_DESCRIPTION
98
- VALUE "FileVersion", VER_FILE_VERSION_STRING
99
- VALUE "InternalName", VER_INTERNAL_NAME
100
-
101
- VALUE "LegalCopyright", VER_LEGAL_COPYRIGHT
102
-
103
- VALUE "OriginalFilename", VER_ORIGINAL_FILENAME
104
- VALUE "ProductName", VER_PRODUCT_NAME
105
- VALUE "ProductVersion", VER_FILE_VERSION_STRING
106
-#if defined(DEBUG)
107
- VALUE "WiX Common Resource Format", "Debug Only"
108
-#endif
109
- END
110
- END
111
-
112
-BLOCK "VarFileInfo"
113
- BEGIN
114
- VALUE "Translation", VER_LANG, VER_CP
115
- END
116
-END
117
-
118
-#endif
src/Samples/bafunctions/bafunctions.vcxproj
+28
-17
@@ -1,8 +1,11 @@
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
5
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
9
<ItemGroup Label="ProjectConfigurations">
10
<ProjectConfiguration Include="Debug|Win32">
11
<Configuration>Debug</Configuration>
@@ -13,31 +16,27 @@
16
<Platform>Win32</Platform>
17
</ProjectConfiguration>
18
</ItemGroup>
16
- <ItemGroup Label="ProjectConfigurations">
17
- <ProjectConfiguration Include="Debug|ARM">
18
- <Configuration>Debug</Configuration>
19
- <Platform>ARM</Platform>
20
- </ProjectConfiguration>
21
- <ProjectConfiguration Include="Release|ARM">
22
- <Configuration>Release</Configuration>
23
- <Platform>ARM</Platform>
24
- </ProjectConfiguration>
25
- </ItemGroup>
19
+
20
<PropertyGroup Label="Globals">
21
<ProjectGuid>{EB0A7D51-2133-4EE7-B6CA-87DBEAC67E02}</ProjectGuid>
22
<ConfigurationType>DynamicLibrary</ConfigurationType>
23
+ <PlatformToolset>v141</PlatformToolset>
24
<CharacterSet>Unicode</CharacterSet>
25
<TargetName>BAFunctions</TargetName>
26
<ProjectModuleDefinitionFile>bafunctions.def</ProjectModuleDefinitionFile>
27
</PropertyGroup>
33
- <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), wix.proj))\tools\WixBuild.props" />
28
+
29
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
30
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
31
+
32
<PropertyGroup>
35
- <ProjectAdditionalIncludeDirectories>$(WixRoot)src\libs\dutil\inc;$(WixRoot)src\burn\inc;$(WixRoot)src\libs\balutil\inc</ProjectAdditionalIncludeDirectories>
36
- <ProjectAdditionalLinkLibraries>comctl32.lib;gdiplus.lib;msimg32.lib;shlwapi.lib;wininet.lib;dutil.lib;balutil.lib;version.lib</ProjectAdditionalLinkLibraries>
33
+ <ProjectAdditionalLinkLibraries>comctl32.lib;gdiplus.lib;msimg32.lib;shlwapi.lib;wininet.lib</ProjectAdditionalLinkLibraries>
34
</PropertyGroup>
35
<ItemGroup>
36
<ClCompile Include="WixSampleBAFunctions.cpp" />
40
- <ClCompile Include="bafunctions.cpp" />
37
+ <ClCompile Include="bafunctions.cpp">
38
+ <PrecompiledHeader>Create</PrecompiledHeader>
39
+ </ClCompile>
40
</ItemGroup>
41
<ItemGroup>
42
<ClInclude Include="precomp.h" />
@@ -47,8 +46,20 @@
46
<None Include="bafunctions.def" />
47
<None Include="Readme.txt" />
48
</ItemGroup>
49
+
50
<ItemGroup>
51
- <ResourceCompile Include="bafunctions.rc" />
51
+ <None Include="packages.config" />
52
</ItemGroup>
53
- <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), wix.proj))\tools\WixBuild.targets" />
53
+
54
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
55
+ <Import Project="..\..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" />
56
+ <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
57
+ <PropertyGroup>
58
+ <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>
59
+ </PropertyGroup>
60
+ <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'))" />
61
+ <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'))" />
62
+ <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'))" />
63
+ <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'))" />
64
+ </Target>
65
</Project>
src/Samples/bafunctions/bafunctionsver.h
deleted
-13
@@ -1,13 +0,0 @@
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
-#ifndef _VERSION_FILE_H_
4
-#define _VERSION_FILE_H_
5
-
6
-#define szVerMajorMinor "1.0"
7
-#define szVerMajorMinorBuildRev "1.0.0.0"
8
-#define rmj 1
9
-#define rmm 0
10
-#define rbd 0
11
-#define rev 0
12
-
13
-#endif
src/Samples/bafunctions/packages.config
new
+7
@@ -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
src/Samples/bafunctions/precomp.h
+5
@@ -3,7 +3,12 @@
3
4
5
#include <windows.h>
6
+
7
+#pragma warning(push)
8
+#pragma warning(disable:4458) // declaration of 'xxx' hides class member
9
#include <gdiplus.h>
10
+#pragma warning(pop)
11
+
12
#include <msiquery.h>
13
#include <objbase.h>
14
#include <shlobj.h>