Better .nupkg names

9 files changed, 13 insertions, 18 deletions

diff --git a/src/api/burn/bextutil/bextutil.nuspec b/src/api/burn/bextutil/bextutil.nuspec
index 125e8807..b2881354 100644
--- a/src/api/burn/bextutil/bextutil.nuspec
+++ b/src/api/burn/bextutil/bextutil.nuspec
@@ -13,7 +13,6 @@
     <projectUrl>$projectUrl$</projectUrl>
     <repository type="$repositorytype$" url="$repositoryurl$" commit="$repositorycommit$" />
     <dependencies>
-      <dependency id="WixToolset.BootstrapperCore.Native" version="[$version$,5)" />
       <dependency id="WixToolset.DUtil" version="[$version$,5)" />
     </dependencies>
   </metadata>
@@ -22,6 +21,8 @@
     <file src="$projectFolder$\build\$id$.props" target="build\" />
     <file src="$projectFolder$\..\..\..\internal\images\wix.png" />
     <file src="$projectFolder$\inc\*" target="build\native\include" />
+    <file src="$projectFolder$\..\inc\BundleExtension.h" target="build\native\include" />
+    <file src="$projectFolder$\..\inc\BundleExtensionEngine.h" target="build\native\include" />
     <file src="..\..\v141\x86\bextutil.lib" target="build\native\v14\x86" />
     <file src="..\..\v141\x64\bextutil.lib" target="build\native\v14\x64" />
     <file src="..\..\v141\ARM64\bextutil.lib" target="build\native\v14\ARM64" />
diff --git a/src/api/burn/bextutil/bextutil.vcxproj b/src/api/burn/bextutil/bextutil.vcxproj
index 69222b4c..467f2d56 100644
--- a/src/api/burn/bextutil/bextutil.vcxproj
+++ b/src/api/burn/bextutil/bextutil.vcxproj
@@ -49,7 +49,7 @@
   </ImportGroup>
 
   <PropertyGroup>
-    <ProjectAdditionalIncludeDirectories>inc;..\WixToolset.BootstrapperCore.Native\inc</ProjectAdditionalIncludeDirectories>
+    <ProjectAdditionalIncludeDirectories>inc;..\inc</ProjectAdditionalIncludeDirectories>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/api/burn/bextutil/inc/BextBaseBundleExtension.h b/src/api/burn/bextutil/inc/BextBaseBundleExtension.h
index a302702e..5bda04e1 100644
--- a/src/api/burn/bextutil/inc/BextBaseBundleExtension.h
+++ b/src/api/burn/bextutil/inc/BextBaseBundleExtension.h
@@ -2,11 +2,6 @@
 
 #include <windows.h>
 
-#include "BundleExtensionEngine.h"
-#include "BundleExtension.h"
-#include "IBundleExtensionEngine.h"
-#include "IBundleExtension.h"
-
 #include "bextutil.h"
 
 class CBextBaseBundleExtension : public IBundleExtension
diff --git a/src/api/burn/bextutil/inc/BextBaseBundleExtensionProc.h b/src/api/burn/bextutil/inc/BextBaseBundleExtensionProc.h
index f71e3b92..cd7e3cb3 100644
--- a/src/api/burn/bextutil/inc/BextBaseBundleExtensionProc.h
+++ b/src/api/burn/bextutil/inc/BextBaseBundleExtensionProc.h
@@ -4,10 +4,8 @@
 
 #include <windows.h>
 
-#include "BundleExtensionEngine.h"
-#include "BundleExtension.h"
-#include "IBundleExtensionEngine.h"
-#include "IBundleExtension.h"
+#include <IBundleExtensionEngine.h>
+#include <IBundleExtension.h>
 
 static HRESULT BextBaseBEProcSearch(
     __in IBundleExtension* pBE,
@@ -33,7 +31,7 @@ static HRESULT WINAPI BextBaseBundleExtensionProc(
 {
     IBundleExtension* pBE = reinterpret_cast<IBundleExtension*>(pvContext);
     HRESULT hr = pBE->BundleExtensionProc(message, pvArgs, pvResults, pvContext);
-    
+
     if (E_NOTIMPL == hr)
     {
         switch (message)
diff --git a/src/api/burn/bextutil/inc/BextBundleExtensionEngine.h b/src/api/burn/bextutil/inc/BextBundleExtensionEngine.h
index 9fdcb700..97b02f36 100644
--- a/src/api/burn/bextutil/inc/BextBundleExtensionEngine.h
+++ b/src/api/burn/bextutil/inc/BextBundleExtensionEngine.h
@@ -1,5 +1,8 @@
+#pragma once
 // 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 <IBundleExtensionEngine.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/src/api/burn/bextutil/inc/IBundleExtension.h b/src/api/burn/bextutil/inc/IBundleExtension.h
index 7516c11b..00301672 100644
--- a/src/api/burn/bextutil/inc/IBundleExtension.h
+++ b/src/api/burn/bextutil/inc/IBundleExtension.h
@@ -1,6 +1,7 @@
 #pragma once
 // 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 <BundleExtension.h>
 
 DECLARE_INTERFACE_IID_(IBundleExtension, IUnknown, "93123C9D-796B-4FCD-A507-6EDEF9A925FD")
 {
diff --git a/src/api/burn/bextutil/inc/IBundleExtensionEngine.h b/src/api/burn/bextutil/inc/IBundleExtensionEngine.h
index 0053a71e..a4a27fb1 100644
--- a/src/api/burn/bextutil/inc/IBundleExtensionEngine.h
+++ b/src/api/burn/bextutil/inc/IBundleExtensionEngine.h
@@ -1,6 +1,7 @@
 #pragma once
 // 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 <BundleExtensionEngine.h>
 
 DECLARE_INTERFACE_IID_(IBundleExtensionEngine, IUnknown, "9D027A39-F6B6-42CC-9737-C185089EB263")
 {
diff --git a/src/api/burn/bextutil/inc/bextutil.h b/src/api/burn/bextutil/inc/bextutil.h
index 356ccc47..b8536444 100644
--- a/src/api/burn/bextutil/inc/bextutil.h
+++ b/src/api/burn/bextutil/inc/bextutil.h
@@ -4,6 +4,8 @@
 
 #include "dutil.h"
 
+#include "IBundleExtensionEngine.h"
+#include "IBundleExtension.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/api/burn/bextutil/precomp.h b/src/api/burn/bextutil/precomp.h
index 5d1dd20b..d5714cc2 100644
--- a/src/api/burn/bextutil/precomp.h
+++ b/src/api/burn/bextutil/precomp.h
@@ -12,11 +12,5 @@
 #include <strutil.h>
 #include <xmlutil.h>
 
-#include <BundleExtensionEngine.h>
-#include <BundleExtension.h>
-
-#include "IBundleExtensionEngine.h"
-#include "IBundleExtension.h"
-
 #include "bextutil.h"
 #include "BextBundleExtensionEngine.h"