From 73cc0209cf3b008cfe05128730feeb396cb39fe8 Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Thu, 13 Jan 2022 12:14:34 -0800
Subject: Move PublishDir into WixToolset.Sdk project to reuse for
 NuspecBasePath

---
 src/wix/WixToolset.Sdk/WixToolset.Sdk.csproj | 3 ++-
 src/wix/wix.cmd                              | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/wix/WixToolset.Sdk/WixToolset.Sdk.csproj b/src/wix/WixToolset.Sdk/WixToolset.Sdk.csproj
index a20a3aa9..d1f8c75b 100644
--- a/src/wix/WixToolset.Sdk/WixToolset.Sdk.csproj
+++ b/src/wix/WixToolset.Sdk/WixToolset.Sdk.csproj
@@ -6,8 +6,9 @@
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <IncludeBuildOutput>false</IncludeBuildOutput>
     <Description>WiX Toolset MSBuild integration</Description>
+    <PublishDir>$(OutputPath)publish\WixToolset.Sdk\</PublishDir>
     <NuspecFile>$(MSBuildThisFileName).nuspec</NuspecFile>
-    <NuspecBasePath>$(OutputPath)publish\WixToolset.Sdk\</NuspecBasePath>
+    <NuspecBasePath>$(PublishDir)</NuspecBasePath>
     <NuspecProperties>Id=$(MSBuildThisFileName);Authors=$(Authors);Copyright=$(Copyright);Description=$(Description)</NuspecProperties>
   </PropertyGroup>
 
diff --git a/src/wix/wix.cmd b/src/wix/wix.cmd
index 98c0d580..c1a746ff 100644
--- a/src/wix/wix.cmd
+++ b/src/wix/wix.cmd
@@ -47,7 +47,7 @@ robocopy %_P_OBJ%\WixToolset.Sdk\separate\netcoreapp3.1\buildtasks %_P%\WixTools
 robocopy %_P_OBJ%\WixToolset.Sdk\separate\netcoreapp3.1\heat %_P%\WixToolset.Sdk\tools\netcoreapp3.1 %_RCO%
 robocopy %_P_OBJ%\WixToolset.Sdk\separate\netcoreapp3.1\wix %_P%\WixToolset.Sdk\tools\netcoreapp3.1 %_RCO%
 
-msbuild -t:Publish -p:Configuration=%_C% -nologo -warnaserror -p:PublishDir=%_P%WixToolset.Sdk\ WixToolset.Sdk\WixToolset.Sdk.csproj -bl:%_L%\wix_sdk_publish.binlog || exit /b
+msbuild -t:Publish -p:Configuration=%_C% -nologo -warnaserror WixToolset.Sdk\WixToolset.Sdk.csproj -bl:%_L%\wix_sdk_publish.binlog || exit /b
 
 :: TODO - used by MsbuildFixture.ReportsInnerExceptionForUnexpectedExceptions test
 :: msbuild -t:Publish -Restore -p:Configuration=%_C% -p:TargetFramework=net472 -p:RuntimeIdentifier=linux-x86 -p:PublishDir=%_P%WixToolset.Sdk\broken\net472\ wix\wix.csproj || exit /b
-- 
cgit v1.2.3-55-g6feb