Implement integrated build process

4 files changed, 24 insertions, 23 deletions

diff --git a/src/ext/Iis/ca/iisca.vcxproj b/src/ext/Iis/ca/iisca.vcxproj
index eb1174be..d99ef4ab 100644
--- a/src/ext/Iis/ca/iisca.vcxproj
+++ b/src/ext/Iis/ca/iisca.vcxproj
@@ -1,7 +1,7 @@
 <?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.DUtil.4.0.30\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props')" />
+  <Import Project="..\..\packages\WixToolset.DUtil.4.0.0-preview.0-build.1\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.0-preview.0-build.1\build\WixToolset.DUtil.props')" />
   <Import Project="..\..\packages\WixToolset.WcaUtil.4.0.16\build\WixToolset.WcaUtil.props" Condition="Exists('..\..\packages\WixToolset.WcaUtil.4.0.16\build\WixToolset.WcaUtil.props')" />
 
   <ItemGroup Label="ProjectConfigurations">
@@ -40,14 +40,14 @@
     <ProjectModuleDefinitionFile>iisca.def</ProjectModuleDefinitionFile>
     <Description>WiX Toolset Iis CustomAction</Description>
   </PropertyGroup>
-  
+
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  
+
   <PropertyGroup>
     <ProjectAdditionalLinkLibraries>crypt32.lib;msi.lib;Ws2_32.lib</ProjectAdditionalLinkLibraries>
   </PropertyGroup>
-  
+
   <ItemGroup>
     <ClCompile Include="dllmain.cpp">
       <PrecompiledHeader>Create</PrecompiledHeader>
@@ -91,6 +91,9 @@
     <ClCompile Include="scawebprop7.cpp" />
     <ClCompile Include="scawebsvcext.cpp" />
     <ClCompile Include="scawebsvcext7.cpp" />
+  </ItemGroup>
+
+  <ItemGroup>
     <ClInclude Include="caSuffix.h" />
     <ClInclude Include="CustomMsiErrors.h" />
     <ClInclude Include="precomp.h" />
@@ -131,17 +134,18 @@
     <ClInclude Include="scawebprop7.h" />
     <ClInclude Include="scawebsvcext.h" />
     <ClInclude Include="scawebsvcext7.h" />
-    <None Include="packages.config" />
+  </ItemGroup>
+
+  <ItemGroup>
     <None Include="iisca.def" />
   </ItemGroup>
-  
+
+  <ItemGroup>
+    <PackageReference Include="WixToolset.Dutil" />
+    <PackageReference Include="WixToolset.WcaUtil" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" />
+    <PackageReference Include="GitInfo" />
+  </ItemGroup>
+
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.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.DUtil.4.0.30\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props'))" />
-    <Error Condition="!Exists('..\..\packages\WixToolset.WcaUtil.4.0.16\build\WixToolset.WcaUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.WcaUtil.4.0.16\build\WixToolset.WcaUtil.props'))" />
-  </Target>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/ext/Iis/ca/packages.config b/src/ext/Iis/ca/packages.config
deleted file mode 100644
index e3dc0e43..00000000
--- a/src/ext/Iis/ca/packages.config
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="WixToolset.DUtil" version="4.0.30" targetFramework="native" />
-  <package id="WixToolset.WcaUtil" version="4.0.16" targetFramework="native" />
-</packages>
\ No newline at end of file
diff --git a/src/ext/Iis/ca/precomp.h b/src/ext/Iis/ca/precomp.h
index 85ee0890..106ab884 100644
--- a/src/ext/Iis/ca/precomp.h
+++ b/src/ext/Iis/ca/precomp.h
@@ -17,8 +17,6 @@
 #include <ComAdmin.h>
 #include <ahadmin.h>    // IIS 7 config
 
-#define MAXUINT USHRT_MAX
-
 #include "wcautil.h"
 #include "wcawow64.h"
 #include "wcawrapquery.h"
diff --git a/src/ext/Iis/ca/scacert.cpp b/src/ext/Iis/ca/scacert.cpp
index 5eae905a..0bb87f9f 100644
--- a/src/ext/Iis/ca/scacert.cpp
+++ b/src/ext/Iis/ca/scacert.cpp
@@ -552,8 +552,12 @@ static HRESULT ReadCertificateFile(
         // If we have a PFX blob, get the first certificate out of the PFX and use that instead of the PFX.
         if (dwContentType & CERT_QUERY_CONTENT_PFX)
         {
-            hr = FileRead(&pbData, &cbData, wzPath);
+            SIZE_T size = 0;
+
+            hr = FileRead(&pbData, &size, wzPath);
             ExitOnFailure(hr, "Failed to read PFX file: %ls", wzPath);
+
+            cbData = (DWORD)size;
         }
         else
         {