diff options
Diffstat (limited to 'src/ext/Util')
-rw-r--r-- | src/ext/Util/util.cmd | 7 | ||||
-rw-r--r-- | src/ext/Util/wixext/WixToolset.Util.wixext.csproj | 7 |
2 files changed, 5 insertions, 9 deletions
diff --git a/src/ext/Util/util.cmd b/src/ext/Util/util.cmd index 3913c892..0ae8851d 100644 --- a/src/ext/Util/util.cmd +++ b/src/ext/Util/util.cmd | |||
@@ -8,17 +8,14 @@ | |||
8 | 8 | ||
9 | @echo Building ext\Util %_C% using %_N% | 9 | @echo Building ext\Util %_C% using %_N% |
10 | 10 | ||
11 | :: Restore | ||
12 | msbuild -t:Restore -p:Configuration=%_C% || exit /b | ||
13 | |||
14 | :: Build | 11 | :: Build |
15 | msbuild -t:Build -p:Configuration=%_C% test\WixToolsetTest.Util\WixToolsetTest.Util.csproj || exit /b | 12 | msbuild -Restore -p:Configuration=%_C% || exit /b |
16 | 13 | ||
17 | :: Test | 14 | :: Test |
18 | dotnet test -c %_C% --no-build test\WixToolsetTest.Util || exit /b | 15 | dotnet test -c %_C% --no-build test\WixToolsetTest.Util || exit /b |
19 | 16 | ||
20 | :: Pack | 17 | :: Pack |
21 | msbuild -p:Configuration=%_C% -p:NoBuild=true -t:Pack wixext\WixToolset.Util.wixext.csproj || exit /b | 18 | msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true wixext\WixToolset.Util.wixext.csproj || exit /b |
22 | 19 | ||
23 | @popd | 20 | @popd |
24 | @endlocal | 21 | @endlocal |
diff --git a/src/ext/Util/wixext/WixToolset.Util.wixext.csproj b/src/ext/Util/wixext/WixToolset.Util.wixext.csproj index ea1e8921..94e13139 100644 --- a/src/ext/Util/wixext/WixToolset.Util.wixext.csproj +++ b/src/ext/Util/wixext/WixToolset.Util.wixext.csproj | |||
@@ -15,12 +15,11 @@ | |||
15 | <EmbeddedResource Include="$(OutputPath)..\util.wixlib" /> | 15 | <EmbeddedResource Include="$(OutputPath)..\util.wixlib" /> |
16 | </ItemGroup> | 16 | </ItemGroup> |
17 | 17 | ||
18 | <ItemGroup> | 18 | <ItemGroup Condition=" '$(NCrunch)'=='' "> |
19 | <ProjectReference Include="..\wixlib\util.wixproj" ReferenceOutputAssembly="false" Condition=" '$(NCrunch)'=='' " /> | 19 | <ProjectReference Include="..\wixlib\util.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> |