diff options
| author | Rob Mensching <rob@firegiant.com> | 2022-10-04 05:29:47 -0700 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2022-10-04 14:23:47 -0700 |
| commit | d76532b128e4e187fd9ac5e1d018638dcf8876ec (patch) | |
| tree | 7d85769e752579f7a1cc55abcf2edaa8c19c8057 /src/ext/Util | |
| parent | 21ea5adcc788bbecd81e475277aba927ec66c860 (diff) | |
| download | wix-d76532b128e4e187fd9ac5e1d018638dcf8876ec.tar.gz wix-d76532b128e4e187fd9ac5e1d018638dcf8876ec.tar.bz2 wix-d76532b128e4e187fd9ac5e1d018638dcf8876ec.zip | |
Modernize Util.wixext build
Diffstat (limited to 'src/ext/Util')
| -rw-r--r-- | src/ext/Util/be/utilbe.v3.ncrunchproject | 5 | ||||
| -rw-r--r-- | src/ext/Util/util.cmd | 25 | ||||
| -rw-r--r-- | src/ext/Util/wixext/WixToolset.Util.wixext.csproj | 11 |
3 files changed, 35 insertions, 6 deletions
diff --git a/src/ext/Util/be/utilbe.v3.ncrunchproject b/src/ext/Util/be/utilbe.v3.ncrunchproject new file mode 100644 index 00000000..319cd523 --- /dev/null +++ b/src/ext/Util/be/utilbe.v3.ncrunchproject | |||
| @@ -0,0 +1,5 @@ | |||
| 1 | <ProjectConfiguration> | ||
| 2 | <Settings> | ||
| 3 | <IgnoreThisComponentCompletely>True</IgnoreThisComponentCompletely> | ||
| 4 | </Settings> | ||
| 5 | </ProjectConfiguration> \ No newline at end of file | ||
diff --git a/src/ext/Util/util.cmd b/src/ext/Util/util.cmd index 0ae8851d..aad9c65c 100644 --- a/src/ext/Util/util.cmd +++ b/src/ext/Util/util.cmd | |||
| @@ -2,20 +2,43 @@ | |||
| 2 | @pushd %~dp0 | 2 | @pushd %~dp0 |
| 3 | 3 | ||
| 4 | @set _C=Debug | 4 | @set _C=Debug |
| 5 | @set _L=%~dp0..\..\..\build\logs | ||
| 6 | |||
| 5 | :parse_args | 7 | :parse_args |
| 6 | @if /i "%1"=="release" set _C=Release | 8 | @if /i "%1"=="release" set _C=Release |
| 9 | @if /i "%1"=="inc" set _INC=1 | ||
| 10 | @if /i "%1"=="clean" set _CLEAN=1 | ||
| 7 | @if not "%1"=="" shift & goto parse_args | 11 | @if not "%1"=="" shift & goto parse_args |
| 8 | 12 | ||
| 13 | @set _B=%~dp0..\..\..\build\Util.wixext\%_C% | ||
| 14 | |||
| 15 | :: Clean | ||
| 16 | |||
| 17 | @if "%_INC%"=="" call :clean | ||
| 18 | @if NOT "%_CLEAN%"=="" goto :end | ||
| 19 | |||
| 9 | @echo Building ext\Util %_C% using %_N% | 20 | @echo Building ext\Util %_C% using %_N% |
| 10 | 21 | ||
| 11 | :: Build | 22 | :: Build |
| 12 | msbuild -Restore -p:Configuration=%_C% || exit /b | 23 | msbuild -Restore -p:Configuration=%_C% || exit /b |
| 13 | 24 | ||
| 14 | :: Test | 25 | :: Test |
| 15 | dotnet test -c %_C% --no-build test\WixToolsetTest.Util || exit /b | 26 | dotnet test ^ |
| 27 | %_B%\net6.0\WixToolsetTest.Util.dll ^ | ||
| 28 | --nologo -l "trx;LogFileName=%_L%\TestResults\util.wixext.trx" || exit /b | ||
| 16 | 29 | ||
| 17 | :: Pack | 30 | :: Pack |
| 18 | msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true wixext\WixToolset.Util.wixext.csproj || exit /b | 31 | msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true wixext\WixToolset.Util.wixext.csproj || exit /b |
| 19 | 32 | ||
| 33 | @goto :end | ||
| 34 | |||
| 35 | :clean | ||
| 36 | @rd /s/q "..\..\build\Util.wixext" 2> nul | ||
| 37 | @del "..\..\build\artifacts\WixToolset.Util.wixext.*.nupkg" 2> nul | ||
| 38 | @del "%_L%\TestResults\util.wixext.trx" 2> nul | ||
| 39 | @rd /s/q "%USERPROFILE%\.nuget\packages\wixtoolset.util.wixext" 2> nul | ||
| 40 | @exit /b | ||
| 41 | |||
| 42 | :end | ||
| 20 | @popd | 43 | @popd |
| 21 | @endlocal | 44 | @endlocal |
diff --git a/src/ext/Util/wixext/WixToolset.Util.wixext.csproj b/src/ext/Util/wixext/WixToolset.Util.wixext.csproj index 9a09ae82..82e1886b 100644 --- a/src/ext/Util/wixext/WixToolset.Util.wixext.csproj +++ b/src/ext/Util/wixext/WixToolset.Util.wixext.csproj | |||
| @@ -11,11 +11,12 @@ | |||
| 11 | </PropertyGroup> | 11 | </PropertyGroup> |
| 12 | 12 | ||
| 13 | <ItemGroup> | 13 | <ItemGroup> |
| 14 | <EmbeddedResource Include="$(OutputPath)..\util.wixlib" /> | 14 | <ProjectReference Include="..\wixlib\util.wixproj" |
| 15 | </ItemGroup> | 15 | OutputItemType="EmbeddedResource" |
| 16 | 16 | ReferenceOutputAssembly="false" | |
| 17 | <ItemGroup Condition=" '$(NCrunch)'=='' "> | 17 | SkipGetTargetFrameworkProperties="true" |
| 18 | <ProjectReference Include="..\wixlib\util.wixproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" /> | 18 | /> |
| 19 | <EmbeddedResource Include="$(OutputPath)..\util.wixlib" Condition=" '$(NCrunch)'=='1' " /> | ||
| 19 | </ItemGroup> | 20 | </ItemGroup> |
| 20 | 21 | ||
| 21 | <ItemGroup> | 22 | <ItemGroup> |