aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Samples/bafunctions/bafunctions.rc118
-rw-r--r--src/Samples/bafunctions/bafunctions.vcxproj45
-rw-r--r--src/Samples/bafunctions/bafunctionsver.h13
-rw-r--r--src/Samples/bafunctions/packages.config7
-rw-r--r--src/Samples/bafunctions/precomp.h5
5 files changed, 40 insertions, 148 deletions
diff --git a/src/Samples/bafunctions/bafunctions.rc b/src/Samples/bafunctions/bafunctions.rc
deleted file mode 100644
index 9643d240..00000000
--- a/src/Samples/bafunctions/bafunctions.rc
+++ /dev/null
@@ -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
83VS_VERSION_INFO VERSIONINFO
84FILEVERSION VER_FILE_VERSION
85PRODUCTVERSION VER_PRODUCT_VERSION
86FILEFLAGSMASK VER_FILE_FLAGS_MASK
87FILEFLAGS VER_FILE_FLAGS
88FILEOS VER_FILE_OS
89FILETYPE VER_FILE_TYPE
90FILESUBTYPE VER_FILE_SUBTYPE
91BEGIN
92BLOCK "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
112BLOCK "VarFileInfo"
113 BEGIN
114 VALUE "Translation", VER_LANG, VER_CP
115 END
116END
117
118#endif
diff --git a/src/Samples/bafunctions/bafunctions.vcxproj b/src/Samples/bafunctions/bafunctions.vcxproj
index 71b27bca..662aa711 100644
--- a/src/Samples/bafunctions/bafunctions.vcxproj
+++ b/src/Samples/bafunctions/bafunctions.vcxproj
@@ -1,8 +1,11 @@
1<?xml version="1.0" encoding="utf-8"?> 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<!-- 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 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')" />
4 8
5<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
6 <ItemGroup Label="ProjectConfigurations"> 9 <ItemGroup Label="ProjectConfigurations">
7 <ProjectConfiguration Include="Debug|Win32"> 10 <ProjectConfiguration Include="Debug|Win32">
8 <Configuration>Debug</Configuration> 11 <Configuration>Debug</Configuration>
@@ -13,31 +16,27 @@
13 <Platform>Win32</Platform> 16 <Platform>Win32</Platform>
14 </ProjectConfiguration> 17 </ProjectConfiguration>
15 </ItemGroup> 18 </ItemGroup>
16 <ItemGroup Label="ProjectConfigurations"> 19
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>
26 <PropertyGroup Label="Globals"> 20 <PropertyGroup Label="Globals">
27 <ProjectGuid>{EB0A7D51-2133-4EE7-B6CA-87DBEAC67E02}</ProjectGuid> 21 <ProjectGuid>{EB0A7D51-2133-4EE7-B6CA-87DBEAC67E02}</ProjectGuid>
28 <ConfigurationType>DynamicLibrary</ConfigurationType> 22 <ConfigurationType>DynamicLibrary</ConfigurationType>
23 <PlatformToolset>v141</PlatformToolset>
29 <CharacterSet>Unicode</CharacterSet> 24 <CharacterSet>Unicode</CharacterSet>
30 <TargetName>BAFunctions</TargetName> 25 <TargetName>BAFunctions</TargetName>
31 <ProjectModuleDefinitionFile>bafunctions.def</ProjectModuleDefinitionFile> 26 <ProjectModuleDefinitionFile>bafunctions.def</ProjectModuleDefinitionFile>
32 </PropertyGroup> 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
34 <PropertyGroup> 32 <PropertyGroup>
35 <ProjectAdditionalIncludeDirectories>$(WixRoot)src\libs\dutil\inc;$(WixRoot)src\burn\inc;$(WixRoot)src\libs\balutil\inc</ProjectAdditionalIncludeDirectories> 33 <ProjectAdditionalLinkLibraries>comctl32.lib;gdiplus.lib;msimg32.lib;shlwapi.lib;wininet.lib</ProjectAdditionalLinkLibraries>
36 <ProjectAdditionalLinkLibraries>comctl32.lib;gdiplus.lib;msimg32.lib;shlwapi.lib;wininet.lib;dutil.lib;balutil.lib;version.lib</ProjectAdditionalLinkLibraries>
37 </PropertyGroup> 34 </PropertyGroup>
38 <ItemGroup> 35 <ItemGroup>
39 <ClCompile Include="WixSampleBAFunctions.cpp" /> 36 <ClCompile Include="WixSampleBAFunctions.cpp" />
40 <ClCompile Include="bafunctions.cpp" /> 37 <ClCompile Include="bafunctions.cpp">
38 <PrecompiledHeader>Create</PrecompiledHeader>
39 </ClCompile>
41 </ItemGroup> 40 </ItemGroup>
42 <ItemGroup> 41 <ItemGroup>
43 <ClInclude Include="precomp.h" /> 42 <ClInclude Include="precomp.h" />
@@ -47,8 +46,20 @@
47 <None Include="bafunctions.def" /> 46 <None Include="bafunctions.def" />
48 <None Include="Readme.txt" /> 47 <None Include="Readme.txt" />
49 </ItemGroup> 48 </ItemGroup>
49
50 <ItemGroup> 50 <ItemGroup>
51 <ResourceCompile Include="bafunctions.rc" /> 51 <None Include="packages.config" />
52 </ItemGroup> 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>
54</Project> 65</Project>
diff --git a/src/Samples/bafunctions/bafunctionsver.h b/src/Samples/bafunctions/bafunctionsver.h
deleted file mode 100644
index e6e22f4e..00000000
--- a/src/Samples/bafunctions/bafunctionsver.h
+++ /dev/null
@@ -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
diff --git a/src/Samples/bafunctions/packages.config b/src/Samples/bafunctions/packages.config
new file mode 100644
index 00000000..41ba2f12
--- /dev/null
+++ b/src/Samples/bafunctions/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/Samples/bafunctions/precomp.h b/src/Samples/bafunctions/precomp.h
index 82ce2dae..9d2fe726 100644
--- a/src/Samples/bafunctions/precomp.h
+++ b/src/Samples/bafunctions/precomp.h
@@ -3,7 +3,12 @@
3 3
4 4
5#include <windows.h> 5#include <windows.h>
6
7#pragma warning(push)
8#pragma warning(disable:4458) // declaration of 'xxx' hides class member
6#include <gdiplus.h> 9#include <gdiplus.h>
10#pragma warning(pop)
11
7#include <msiquery.h> 12#include <msiquery.h>
8#include <objbase.h> 13#include <objbase.h>
9#include <shlobj.h> 14#include <shlobj.h>
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-04-01 01:34:54 +0000