diff options
| author | Rob Mensching <rob@firegiant.com> | 2022-01-13 12:14:34 -0800 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2022-01-13 13:57:33 -0800 |
| commit | 73cc0209cf3b008cfe05128730feeb396cb39fe8 (patch) | |
| tree | 08c5d535605ff2f8dc9927f28652552e55609701 | |
| parent | 445cd7833a858deec291d3682763ccbfa3856337 (diff) | |
| download | wix-73cc0209cf3b008cfe05128730feeb396cb39fe8.tar.gz wix-73cc0209cf3b008cfe05128730feeb396cb39fe8.tar.bz2 wix-73cc0209cf3b008cfe05128730feeb396cb39fe8.zip | |
Move PublishDir into WixToolset.Sdk project to reuse for NuspecBasePath
| -rw-r--r-- | src/wix/WixToolset.Sdk/WixToolset.Sdk.csproj | 3 | ||||
| -rw-r--r-- | 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 @@ | |||
| 6 | <TargetFramework>netcoreapp3.1</TargetFramework> | 6 | <TargetFramework>netcoreapp3.1</TargetFramework> |
| 7 | <IncludeBuildOutput>false</IncludeBuildOutput> | 7 | <IncludeBuildOutput>false</IncludeBuildOutput> |
| 8 | <Description>WiX Toolset MSBuild integration</Description> | 8 | <Description>WiX Toolset MSBuild integration</Description> |
| 9 | <PublishDir>$(OutputPath)publish\WixToolset.Sdk\</PublishDir> | ||
| 9 | <NuspecFile>$(MSBuildThisFileName).nuspec</NuspecFile> | 10 | <NuspecFile>$(MSBuildThisFileName).nuspec</NuspecFile> |
| 10 | <NuspecBasePath>$(OutputPath)publish\WixToolset.Sdk\</NuspecBasePath> | 11 | <NuspecBasePath>$(PublishDir)</NuspecBasePath> |
| 11 | <NuspecProperties>Id=$(MSBuildThisFileName);Authors=$(Authors);Copyright=$(Copyright);Description=$(Description)</NuspecProperties> | 12 | <NuspecProperties>Id=$(MSBuildThisFileName);Authors=$(Authors);Copyright=$(Copyright);Description=$(Description)</NuspecProperties> |
| 12 | </PropertyGroup> | 13 | </PropertyGroup> |
| 13 | 14 | ||
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 | |||
| 47 | robocopy %_P_OBJ%\WixToolset.Sdk\separate\netcoreapp3.1\heat %_P%\WixToolset.Sdk\tools\netcoreapp3.1 %_RCO% | 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% | 48 | robocopy %_P_OBJ%\WixToolset.Sdk\separate\netcoreapp3.1\wix %_P%\WixToolset.Sdk\tools\netcoreapp3.1 %_RCO% |
| 49 | 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 | 51 | ||
| 52 | :: TODO - used by MsbuildFixture.ReportsInnerExceptionForUnexpectedExceptions test | 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 | 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 |