aboutsummaryrefslogtreecommitdiff
path: root/src/ext/UI
diff options
context:
space:
mode:
Diffstat (limited to 'src/ext/UI')
-rw-r--r--src/ext/UI/ui.cmd18
-rw-r--r--src/ext/UI/wixext/WixToolset.UI.wixext.csproj6
-rw-r--r--src/ext/UI/wixext/WixToolset.UI.wixext.nuspec24
-rw-r--r--src/ext/UI/wixext/WixToolset.UI.wixext.targets10
4 files changed, 24 insertions, 34 deletions
diff --git a/src/ext/UI/ui.cmd b/src/ext/UI/ui.cmd
index d62870d4..3823f45a 100644
--- a/src/ext/UI/ui.cmd
+++ b/src/ext/UI/ui.cmd
@@ -4,18 +4,34 @@
4@set _C=Debug 4@set _C=Debug
5:parse_args 5:parse_args
6@if /i "%1"=="release" set _C=Release 6@if /i "%1"=="release" set _C=Release
7@if /i "%1"=="inc" set _INC=1
8@if /i "%1"=="clean" set _CLEAN=1
7@if not "%1"=="" shift & goto parse_args 9@if not "%1"=="" shift & goto parse_args
8 10
11:: Clean
12
13@if "%_INC%"=="" call :clean
14@if NOT "%_CLEAN%"=="" goto :end
15
9@echo UI.wixext build %_C% 16@echo UI.wixext build %_C%
10 17
11:: Build 18:: Build
12msbuild -Restore -p:Configuration=%_C% || exit /b 19msbuild -Restore -p:Configuration=%_C% || exit /b
13 20
14:: Test 21:: Test
15dotnet test -c %_C% --no-build test\WixToolsetTest.UI || exit /b 22:: dotnet test -c %_C% --no-build test\WixToolsetTest.UI || exit /b
16 23
17:: Pack 24:: Pack
18msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true wixext\WixToolset.UI.wixext.csproj || exit /b 25msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true wixext\WixToolset.UI.wixext.csproj || exit /b
19 26
27@goto :end
28
29:clean
30@rd /s/q "..\..\..\build\UI.wixext" 2> nul
31@del "..\..\..\build\artifacts\WixToolset.UI.wixext.*.nupkg" 2> nul
32@rd /s/q "%USERPROFILE%\.nuget\packages\wixtoolset.ui.wixext" 2> nul
33@exit /b
34
35:end
20@popd 36@popd
21@endlocal 37@endlocal
diff --git a/src/ext/UI/wixext/WixToolset.UI.wixext.csproj b/src/ext/UI/wixext/WixToolset.UI.wixext.csproj
index 09f748c3..288b4a85 100644
--- a/src/ext/UI/wixext/WixToolset.UI.wixext.csproj
+++ b/src/ext/UI/wixext/WixToolset.UI.wixext.csproj
@@ -10,6 +10,8 @@
10 <DebugType>embedded</DebugType> 10 <DebugType>embedded</DebugType>
11 </PropertyGroup> 11 </PropertyGroup>
12 12
13 <Import Project="..\..\WixExt.props" />
14
13 <ItemGroup> 15 <ItemGroup>
14 <EmbeddedResource Include="$(OutputPath)..\ui.wixlib" /> 16 <EmbeddedResource Include="$(OutputPath)..\ui.wixlib" />
15 </ItemGroup> 17 </ItemGroup>
@@ -17,8 +19,4 @@
17 <ItemGroup Condition=" '$(NCrunch)'=='' "> 19 <ItemGroup Condition=" '$(NCrunch)'=='' ">
18 <ProjectReference Include="..\wixlib\ui.wixproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" /> 20 <ProjectReference Include="..\wixlib\ui.wixproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" />
19 </ItemGroup> 21 </ItemGroup>
20
21 <ItemGroup>
22 <PackageReference Include="WixToolset.Extensibility" PrivateAssets="all" />
23 </ItemGroup>
24</Project> 22</Project>
diff --git a/src/ext/UI/wixext/WixToolset.UI.wixext.nuspec b/src/ext/UI/wixext/WixToolset.UI.wixext.nuspec
deleted file mode 100644
index 4abfa98c..00000000
--- a/src/ext/UI/wixext/WixToolset.UI.wixext.nuspec
+++ /dev/null
@@ -1,24 +0,0 @@
1<?xml version="1.0"?>
2<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
3 <metadata minClientVersion="4.0">
4 <id>$id$</id>
5 <version>$version$</version>
6 <authors>$authors$</authors>
7 <owners>$authors$</owners>
8 <icon>wix-white-bg.png</icon>
9 <license type="expression">MS-RL</license>
10 <projectUrl>https://github.com/wixtoolset/Bal.wixext</projectUrl>
11 <requireLicenseAcceptance>false</requireLicenseAcceptance>
12 <title>$title$</title>
13 <description>$description$</description>
14 <copyright>$copyright$</copyright>
15 <repository type="$repositorytype$" url="$repositoryurl$" commit="$repositorycommit$" />
16 </metadata>
17
18 <files>
19 <file src="$projectFolder$\$id$.targets" target="build" />
20 <file src="$projectFolder$\..\..\..\internal\images\wix-white-bg.png" />
21
22 <file src="$id$.dll" target="tools" />
23 </files>
24</package>
diff --git a/src/ext/UI/wixext/WixToolset.UI.wixext.targets b/src/ext/UI/wixext/WixToolset.UI.wixext.targets
index b07a0886..bf6df083 100644
--- a/src/ext/UI/wixext/WixToolset.UI.wixext.targets
+++ b/src/ext/UI/wixext/WixToolset.UI.wixext.targets
@@ -1,11 +1,11 @@
1<?xml version="1.0" encoding="utf-8"?> 1<?xml version="1.0" encoding="utf-8"?>
2<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. --> 2<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
3 3
4<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0"> 4<Project>
5 <PropertyGroup>
6 <WixToolsetUIWixextPath Condition=" '$(WixToolsetUIWixextPath)' == '' ">$(MSBuildThisFileDirectory)..\tools\WixToolset.UI.wixext.dll</WixToolsetUIWixextPath>
7 </PropertyGroup>
8 <ItemGroup> 5 <ItemGroup>
9 <WixExtension Include="$(WixToolsetUIWixextPath)" /> 6 <WixExtension Include="$(MSBuildThisFileDirectory)..\$(WixToolsetExtensionPackageFolder)\$(MSBuildThisFileName).dll"
7 Condition=" Exists('$(MSBuildThisFileDirectory)..\$(WixToolsetExtensionPackageFolder)\$(MSBuildThisFileName).dll') " />
8 <UnsupportedWixExtension Include="$(MSBuildThisFileName)"
9 Condition=" !Exists('$(MSBuildThisFileDirectory)..\$(WixToolsetExtensionPackageFolder)\$(MSBuildThisFileName).dll') " />
10 </ItemGroup> 10 </ItemGroup>
11</Project> 11</Project>
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-25 03:59:43 +0000