diff options
| author | Rob Mensching <rob@firegiant.com> | 2021-04-26 11:31:05 -0700 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2021-05-11 11:14:01 -0700 |
| commit | df016066100df955d5ff98811e113fb2b1bd4b8a (patch) | |
| tree | a27b35a3651ca7b1d8c4bb7c7483ec2f92583e08 /src/ext/UI/wixext | |
| parent | dc6022da6cdbb9d7ca54c4a36485ceead07feaaf (diff) | |
| download | wix-df016066100df955d5ff98811e113fb2b1bd4b8a.tar.gz wix-df016066100df955d5ff98811e113fb2b1bd4b8a.tar.bz2 wix-df016066100df955d5ff98811e113fb2b1bd4b8a.zip | |
Implement integrated build process
Diffstat (limited to 'src/ext/UI/wixext')
| -rw-r--r-- | src/ext/UI/wixext/WixToolset.UI.wixext.csproj | 12 | ||||
| -rw-r--r-- | src/ext/UI/wixext/WixToolset.UI.wixext.nuspec | 6 |
2 files changed, 7 insertions, 11 deletions
diff --git a/src/ext/UI/wixext/WixToolset.UI.wixext.csproj b/src/ext/UI/wixext/WixToolset.UI.wixext.csproj index 67c949b2..043cb259 100644 --- a/src/ext/UI/wixext/WixToolset.UI.wixext.csproj +++ b/src/ext/UI/wixext/WixToolset.UI.wixext.csproj | |||
| @@ -15,16 +15,12 @@ | |||
| 15 | <EmbeddedResource Include="$(OutputPath)..\ui.wixlib" /> | 15 | <EmbeddedResource Include="$(OutputPath)..\ui.wixlib" /> |
| 16 | </ItemGroup> | 16 | </ItemGroup> |
| 17 | 17 | ||
| 18 | <ItemGroup> | 18 | <ItemGroup Condition=" '$(NCrunch)'=='' "> |
| 19 | <ProjectReference Include="..\wixlib\ui.wixproj" ReferenceOutputAssembly="false" Condition=" '$(NCrunch)'=='' " /> | 19 | <ProjectReference Include="..\wixlib\ui.wixproj" ReferenceOutputAssembly="false" /> |
| 20 | </ItemGroup> | ||
| 21 | |||
| 22 | <ItemGroup> | ||
| 23 | <PackageReference Include="WixToolset.Extensibility" Version="4.0.*" PrivateAssets="all" /> | ||
| 24 | </ItemGroup> | 20 | </ItemGroup> |
| 25 | 21 | ||
| 26 | <ItemGroup> | 22 | <ItemGroup> |
| 27 | <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" /> | 23 | <PackageReference Include="WixToolset.Data" /> |
| 28 | <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="All" /> | 24 | <PackageReference Include="WixToolset.Extensibility" /> |
| 29 | </ItemGroup> | 25 | </ItemGroup> |
| 30 | </Project> | 26 | </Project> |
diff --git a/src/ext/UI/wixext/WixToolset.UI.wixext.nuspec b/src/ext/UI/wixext/WixToolset.UI.wixext.nuspec index 51c9708e..504d4458 100644 --- a/src/ext/UI/wixext/WixToolset.UI.wixext.nuspec +++ b/src/ext/UI/wixext/WixToolset.UI.wixext.nuspec | |||
| @@ -14,10 +14,10 @@ | |||
| 14 | </metadata> | 14 | </metadata> |
| 15 | 15 | ||
| 16 | <files> | 16 | <files> |
| 17 | <file src="$projectFolder$$id$.targets" target="build" /> | 17 | <file src="$projectFolder$\$id$.targets" target="build" /> |
| 18 | 18 | ||
| 19 | <file src="netstandard2.0\$id$.dll" target="tools" /> | 19 | <file src="$id$.dll" target="tools" /> |
| 20 | 20 | ||
| 21 | <file src="x86\*.pdb" target="pdbs\x86" /> | 21 | <file src="..\x86\*.pdb" target="pdbs\x86" /> |
| 22 | </files> | 22 | </files> |
| 23 | </package> | 23 | </package> |