diff options
Diffstat (limited to 'src/ext/UI')
-rw-r--r-- | src/ext/UI/ui.cmd | 10 | ||||
-rw-r--r-- | src/ext/UI/wixext/WixToolset.UI.wixext.csproj | 5 |
2 files changed, 5 insertions, 10 deletions
diff --git a/src/ext/UI/ui.cmd b/src/ext/UI/ui.cmd index b0380adc..d62870d4 100644 --- a/src/ext/UI/ui.cmd +++ b/src/ext/UI/ui.cmd | |||
@@ -6,20 +6,16 @@ | |||
6 | @if /i "%1"=="release" set _C=Release | 6 | @if /i "%1"=="release" set _C=Release |
7 | @if not "%1"=="" shift & goto parse_args | 7 | @if not "%1"=="" shift & goto parse_args |
8 | 8 | ||
9 | @echo Building ext\UI %_C% | 9 | @echo UI.wixext build %_C% |
10 | |||
11 | :: Restore | ||
12 | @REM nuget restore || exit /b | ||
13 | msbuild -t:Restore -p:RestorePackagesConfig=true -p:Configuration=%_C% || exit /b | ||
14 | 10 | ||
15 | :: Build | 11 | :: Build |
16 | msbuild -t:Build -p:Configuration=%_C% test\WixToolsetTest.UI\WixToolsetTest.UI.csproj || exit /b | 12 | msbuild -Restore -p:Configuration=%_C% || exit /b |
17 | 13 | ||
18 | :: Test | 14 | :: Test |
19 | dotnet test -c %_C% --no-build test\WixToolsetTest.UI || exit /b | 15 | dotnet test -c %_C% --no-build test\WixToolsetTest.UI || exit /b |
20 | 16 | ||
21 | :: Pack | 17 | :: Pack |
22 | msbuild -t:Pack -p:Configuration=%_C% wixext\WixToolset.UI.wixext.csproj || exit /b | 18 | msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true wixext\WixToolset.UI.wixext.csproj || exit /b |
23 | 19 | ||
24 | @popd | 20 | @popd |
25 | @endlocal | 21 | @endlocal |
diff --git a/src/ext/UI/wixext/WixToolset.UI.wixext.csproj b/src/ext/UI/wixext/WixToolset.UI.wixext.csproj index 043cb259..635b685c 100644 --- a/src/ext/UI/wixext/WixToolset.UI.wixext.csproj +++ b/src/ext/UI/wixext/WixToolset.UI.wixext.csproj | |||
@@ -16,11 +16,10 @@ | |||
16 | </ItemGroup> | 16 | </ItemGroup> |
17 | 17 | ||
18 | <ItemGroup Condition=" '$(NCrunch)'=='' "> | 18 | <ItemGroup Condition=" '$(NCrunch)'=='' "> |
19 | <ProjectReference Include="..\wixlib\ui.wixproj" ReferenceOutputAssembly="false" /> | 19 | <ProjectReference Include="..\wixlib\ui.wixproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" /> |
20 | </ItemGroup> | 20 | </ItemGroup> |
21 | 21 | ||
22 | <ItemGroup> | 22 | <ItemGroup> |
23 | <PackageReference Include="WixToolset.Data" /> | 23 | <PackageReference Include="WixToolset.Extensibility" PrivateAssets="all" /> |
24 | <PackageReference Include="WixToolset.Extensibility" /> | ||
25 | </ItemGroup> | 24 | </ItemGroup> |
26 | </Project> | 25 | </Project> |