Build bafunctions.vcxproj

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 @@
-// 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.
-
-#include <winver.h>
-#include <windows.h>
-#include "bafunctionsver.h"
-
-#define VER_APP
-#define VER_ORIGINAL_FILENAME "bafunctions.dll"
-#define VER_INTERNAL_NAME "bafunctions"
-#define VER_PRODUCT_NAME "WiX Sample BAFunctions"
-#define VER_FILE_DESCRIPTION "WiX Sample BAFunctions"
-
-#ifdef DEBUG
-    #define VER_DEBUG                VS_FF_DEBUG
-    #define VER_PRIVATE_BUILD        VS_FF_PRIVATEBUILD
-    #define VER_PRE_RELEASE          (VS_FF_PRERELEASE | VS_FF_SPECIALBUILD)
-#else
-    #define VER_DEBUG                0
-    #define VER_PRIVATE_BUILD        0
-    #define VER_PRE_RELEASE          0
-#endif
-
-#if defined(VER_APP)
-    #define VER_FILE_TYPE            VFT_APP
-#elif defined(VER_DLL)
-    #define VER_FILE_TYPE            VFT_DLL
-#elif defined(VER_TYPELIB)
-    #define VER_FILE_TYPE            VFT_UNKNOWN
-#else
-    #define VER_FILE_TYPE            VFT_UNKNOWN
-#endif
-
-#if defined(VER_LANG_NEUTRAL)
-    #ifndef VER_LANG
-    #define VER_LANG                 0x0000
-    #endif
-    #ifndef VER_CP
-    #define VER_CP                   0x04E4
-    #endif
-    #ifndef VER_BLOCK
-    #define VER_BLOCK                "000004E4"
-    #endif
-#else
-    #ifndef VER_LANG
-    #define VER_LANG                 0x0409
-    #endif
-    #ifndef VER_CP
-    #define VER_CP                   0x04E4
-    #endif
-    #ifndef VER_BLOCK
-    #define VER_BLOCK                "040904E4"
-    #endif
-#endif
-
-#define VER_FILE_VERSION             rmj, rmm, rbd, rev
-#define VER_PRODUCT_VERSION          rmj, rmm, rbd, rev
-#define VER_FILE_VERSION_STRING      szVerMajorMinorBuildRev
-#define VER_PRODUCT_VERSION_STRING   VER_FILE_VERSION_STRING
-#define VER_FILE_FLAGS_MASK          VS_FFI_FILEFLAGSMASK
-#define VER_FILE_FLAGS               (VER_DEBUG | VER_PRIVATE_BUILD | VER_PRE_RELEASE)
-
-#define VER_FILE_OS                  VOS__WINDOWS32
-
-#define VER_COMPANY_NAME             ".NET Foundation"
-#ifndef VER_PRODUCT_NAME
-    #define VER_PRODUCT_NAME         "Windows Installer XML (WiX)"
-#endif
-#ifndef VER_FILE_DESCRIPTION
-    #define VER_FILE_DESCRIPTION     "Windows Installer XML (WiX) component"
-#endif
-
-#if defined(VER_LEGAL_COPYRIGHT)
-    #error
-#endif
-#define VER_LEGAL_COPYRIGHT          "Copyright (c) .NET Foundation and contributors.\240 All rights reserved."
-
-#if !defined(VER_FILE_SUBTYPE)
-    #define VER_FILE_SUBTYPE 0
-#endif
-
-#ifdef RC_INVOKED
-
-VS_VERSION_INFO VERSIONINFO
-FILEVERSION     VER_FILE_VERSION
-PRODUCTVERSION  VER_PRODUCT_VERSION
-FILEFLAGSMASK   VER_FILE_FLAGS_MASK
-FILEFLAGS       VER_FILE_FLAGS
-FILEOS          VER_FILE_OS
-FILETYPE        VER_FILE_TYPE
-FILESUBTYPE     VER_FILE_SUBTYPE
-BEGIN
-BLOCK "StringFileInfo"
-    BEGIN
-    BLOCK VER_BLOCK
-        BEGIN
-        VALUE "CompanyName",       VER_COMPANY_NAME
-        VALUE "FileDescription",   VER_FILE_DESCRIPTION
-        VALUE "FileVersion",       VER_FILE_VERSION_STRING
-        VALUE "InternalName",      VER_INTERNAL_NAME
-
-        VALUE "LegalCopyright",    VER_LEGAL_COPYRIGHT
-
-        VALUE "OriginalFilename",  VER_ORIGINAL_FILENAME
-        VALUE "ProductName",       VER_PRODUCT_NAME
-        VALUE "ProductVersion",    VER_FILE_VERSION_STRING
-#if defined(DEBUG)
-        VALUE "WiX Common Resource Format", "Debug Only"
-#endif
-        END
-    END
-
-BLOCK "VarFileInfo"
-    BEGIN
-    VALUE "Translation", VER_LANG, VER_CP
-    END
-END
-
-#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 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- 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. -->
 
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\..\packages\WixToolset.BalUtil.4.0.4\build\WixToolset.BalUtil.props" Condition="Exists('..\..\..\packages\WixToolset.BalUtil.4.0.4\build\WixToolset.BalUtil.props')" />
+  <Import Project="..\..\..\packages\WixToolset.BootstrapperCore.4.0.3\build\WixToolset.BootstrapperCore.props" Condition="Exists('..\..\..\packages\WixToolset.BootstrapperCore.4.0.1\build\WixToolset.BootstrapperCore.props')" />
+  <Import Project="..\..\..\packages\WixToolset.DUtil.4.0.13\build\WixToolset.DUtil.props" Condition="Exists('..\..\..\packages\WixToolset.DUtil.4.0.13\build\WixToolset.DUtil.props')" />
 
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -13,31 +16,27 @@
       <Platform>Win32</Platform>
     </ProjectConfiguration>
   </ItemGroup>
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|ARM">
-      <Configuration>Debug</Configuration>
-      <Platform>ARM</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|ARM">
-      <Configuration>Release</Configuration>
-      <Platform>ARM</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
+
   <PropertyGroup Label="Globals">
     <ProjectGuid>{EB0A7D51-2133-4EE7-B6CA-87DBEAC67E02}</ProjectGuid>
     <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v141</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <TargetName>BAFunctions</TargetName>
     <ProjectModuleDefinitionFile>bafunctions.def</ProjectModuleDefinitionFile>
   </PropertyGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), wix.proj))\tools\WixBuild.props" />
+
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+
   <PropertyGroup>
-    <ProjectAdditionalIncludeDirectories>$(WixRoot)src\libs\dutil\inc;$(WixRoot)src\burn\inc;$(WixRoot)src\libs\balutil\inc</ProjectAdditionalIncludeDirectories>
-    <ProjectAdditionalLinkLibraries>comctl32.lib;gdiplus.lib;msimg32.lib;shlwapi.lib;wininet.lib;dutil.lib;balutil.lib;version.lib</ProjectAdditionalLinkLibraries>
+    <ProjectAdditionalLinkLibraries>comctl32.lib;gdiplus.lib;msimg32.lib;shlwapi.lib;wininet.lib</ProjectAdditionalLinkLibraries>
   </PropertyGroup>
   <ItemGroup>
     <ClCompile Include="WixSampleBAFunctions.cpp" />
-    <ClCompile Include="bafunctions.cpp" />
+    <ClCompile Include="bafunctions.cpp">
+      <PrecompiledHeader>Create</PrecompiledHeader>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="precomp.h" />
@@ -47,8 +46,20 @@
     <None Include="bafunctions.def" />
     <None Include="Readme.txt" />
   </ItemGroup>
+
   <ItemGroup>
-    <ResourceCompile Include="bafunctions.rc" />
+    <None Include="packages.config" />
   </ItemGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), wix.proj))\tools\WixBuild.targets" />
+
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <Import Project="..\..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <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>
+    </PropertyGroup>
+    <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'))" />
+    <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'))" />
+    <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'))" />
+    <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'))" />
+  </Target>
 </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 @@
-// 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.
-
-#ifndef _VERSION_FILE_H_
-#define _VERSION_FILE_H_
-
-#define szVerMajorMinor "1.0"
-#define szVerMajorMinorBuildRev "1.0.0.0"
-#define rmj     1
-#define rmm     0
-#define rbd     0
-#define rev     0
-
-#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 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Nerdbank.GitVersioning" version="2.1.65" targetFramework="native" developmentDependency="true" />
+  <package id="WixToolset.BootstrapperCore" version="4.0.3" targetFramework="native" />
+  <package id="WixToolset.BalUtil" version="4.0.4" targetFramework="native" />
+  <package id="WixToolset.DUtil" version="4.0.13" targetFramework="native" />
+</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 @@
 
 
 #include <windows.h>
+
+#pragma warning(push)
+#pragma warning(disable:4458) // declaration of 'xxx' hides class member
 #include <gdiplus.h>
+#pragma warning(pop)
+
 #include <msiquery.h>
 #include <objbase.h>
 #include <shlobj.h>