Move PublishDir into WixToolset.Sdk project to reuse for NuspecBasePath
Rob Mensching committed
Jan 13, 2022 at 12:14 UTC
73cc0209cf3b008cfe05128730feeb396cb39fe8
2 files changed
+3
-2
src/wix/WixToolset.Sdk/WixToolset.Sdk.csproj
+2
-1
@@ -6,8 +6,9 @@
6
<TargetFramework>netcoreapp3.1</TargetFramework>
7
<IncludeBuildOutput>false</IncludeBuildOutput>
8
<Description>WiX Toolset MSBuild integration</Description>
9
+ <PublishDir>$(OutputPath)publish\WixToolset.Sdk\</PublishDir>
10
<NuspecFile>$(MSBuildThisFileName).nuspec</NuspecFile>
10
- <NuspecBasePath>$(OutputPath)publish\WixToolset.Sdk\</NuspecBasePath>
11
+ <NuspecBasePath>$(PublishDir)</NuspecBasePath>
12
<NuspecProperties>Id=$(MSBuildThisFileName);Authors=$(Authors);Copyright=$(Copyright);Description=$(Description)</NuspecProperties>
13
</PropertyGroup>
14
src/wix/wix.cmd
+1
-1
@@ -47,7 +47,7 @@ robocopy %_P_OBJ%\WixToolset.Sdk\separate\netcoreapp3.1\buildtasks %_P%\WixTools
47
robocopy %_P_OBJ%\WixToolset.Sdk\separate\netcoreapp3.1\heat %_P%\WixToolset.Sdk\tools\netcoreapp3.1 %_RCO%
48
robocopy %_P_OBJ%\WixToolset.Sdk\separate\netcoreapp3.1\wix %_P%\WixToolset.Sdk\tools\netcoreapp3.1 %_RCO%
49
50
-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
50
+msbuild -t:Publish -p:Configuration=%_C% -nologo -warnaserror WixToolset.Sdk\WixToolset.Sdk.csproj -bl:%_L%\wix_sdk_publish.binlog || exit /b
51
52
:: TODO - used by MsbuildFixture.ReportsInnerExceptionForUnexpectedExceptions test
53
:: 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