Implement integrated build process

2 files changed, 10 insertions, 22 deletions

diff --git a/src/ext/Bal/wixext/WixToolset.Bal.wixext.csproj b/src/ext/Bal/wixext/WixToolset.Bal.wixext.csproj
index 00451403..f74baa9a 100644
--- a/src/ext/Bal/wixext/WixToolset.Bal.wixext.csproj
+++ b/src/ext/Bal/wixext/WixToolset.Bal.wixext.csproj
@@ -8,32 +8,20 @@
     <Description>WiX Toolset Bal Extension</Description>
     <Title>WiX Toolset Bal Extension</Title>
     <DebugType>embedded</DebugType>
-    <NuspecFile>$(MSBuildThisFileName).nuspec</NuspecFile>
     <IncludeSymbols>true</IncludeSymbols>
-    <NuspecProperties>Id=$(MSBuildThisFileName);Authors=$(Authors);Copyright=$(Copyright);Description=$(Description);Title=$(Title)</NuspecProperties>
   </PropertyGroup>
+
   <ItemGroup>
     <Content Include="$(MSBuildThisFileName).targets" />
     <EmbeddedResource Include="$(OutputPath)..\bal.wixlib" />
   </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="all" />
-    <PackageReference Include="WixToolset.Data" Version="4.0.*" PrivateAssets="all" />
-    <PackageReference Include="WixToolset.Extensibility" Version="4.0.*" PrivateAssets="all" />
-  </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\wixlib\bal.wixproj" ReferenceOutputAssembly="false" Condition=" '$(NCrunch)'=='' " />
+    <PackageReference Include="WixToolset.Data" PrivateAssets="all" />
+    <PackageReference Include="WixToolset.Extensibility" PrivateAssets="all" />
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="all" />
+  <ItemGroup Condition=" '$(NCrunch)'=='' ">
+    <ProjectReference Include="..\wixlib\bal.wixproj" ReferenceOutputAssembly="false" />
   </ItemGroup>
-
-  <Target Name="SetNuspecProperties" DependsOnTargets="InitializeSourceControlInformation" AfterTargets="GetBuildVersion">
-    <PropertyGroup>
-      <NuspecBasePath>$(OutputPath)..\</NuspecBasePath>
-      <NuspecProperties>$(NuspecProperties);Version=$(BuildVersionSimple);RepositoryCommit=$(SourceRevisionId);RepositoryType=$(RepositoryType);RepositoryUrl=$(PrivateRepositoryUrl);ProjectFolder=$(MSBuildThisFileDirectory)</NuspecProperties>
-    </PropertyGroup>
-  </Target>
 </Project>
diff --git a/src/ext/Bal/wixext/WixToolset.Bal.wixext.nuspec b/src/ext/Bal/wixext/WixToolset.Bal.wixext.nuspec
index d9e704ae..c99c803f 100644
--- a/src/ext/Bal/wixext/WixToolset.Bal.wixext.nuspec
+++ b/src/ext/Bal/wixext/WixToolset.Bal.wixext.nuspec
@@ -15,12 +15,12 @@
   </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="x64\*.pdb" target="pdbs\x64" />
-    <file src="ARM64\*.pdb" target="pdbs\ARM64" />
+    <file src="..\x86\*.pdb" target="pdbs\x86" />
+    <file src="..\x64\*.pdb" target="pdbs\x64" />
+    <file src="..\ARM64\*.pdb" target="pdbs\ARM64" />
   </files>
 </package>