From df016066100df955d5ff98811e113fb2b1bd4b8a Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Mon, 26 Apr 2021 11:31:05 -0700
Subject: Implement integrated build process

---
 src/ext/VisualStudio/wixext/WixToolset.VisualStudio.wixext.csproj | 7 +------
 src/ext/VisualStudio/wixext/WixToolset.VisualStudio.wixext.nuspec | 6 +++---
 2 files changed, 4 insertions(+), 9 deletions(-)

(limited to 'src/ext/VisualStudio/wixext')

diff --git a/src/ext/VisualStudio/wixext/WixToolset.VisualStudio.wixext.csproj b/src/ext/VisualStudio/wixext/WixToolset.VisualStudio.wixext.csproj
index 20282720..8a3a8e6f 100644
--- a/src/ext/VisualStudio/wixext/WixToolset.VisualStudio.wixext.csproj
+++ b/src/ext/VisualStudio/wixext/WixToolset.VisualStudio.wixext.csproj
@@ -20,11 +20,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="WixToolset.Extensibility" Version="4.0.*" PrivateAssets="all" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="all" />
-    <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="all" />
+    <PackageReference Include="WixToolset.Extensibility" />
   </ItemGroup>
 </Project>
diff --git a/src/ext/VisualStudio/wixext/WixToolset.VisualStudio.wixext.nuspec b/src/ext/VisualStudio/wixext/WixToolset.VisualStudio.wixext.nuspec
index 51c9708e..504d4458 100644
--- a/src/ext/VisualStudio/wixext/WixToolset.VisualStudio.wixext.nuspec
+++ b/src/ext/VisualStudio/wixext/WixToolset.VisualStudio.wixext.nuspec
@@ -14,10 +14,10 @@
   </metadata>
 
   <files>
-    <file src="$projectFolder$$id$.targets" target="build" />
+    <file src="$projectFolder$\$id$.targets" target="build" />
 
-    <file src="netstandard2.0\$id$.dll" target="tools" />
+    <file src="$id$.dll" target="tools" />
 
-    <file src="x86\*.pdb" target="pdbs\x86" />
+    <file src="..\x86\*.pdb" target="pdbs\x86" />
   </files>
 </package>
-- 
cgit v1.2.3-55-g6feb