diff options
author | Sean Hall <r.sean.hall@gmail.com> | 2020-03-28 17:03:31 +1000 |
---|---|---|
committer | Sean Hall <r.sean.hall@gmail.com> | 2020-03-30 21:57:49 +1000 |
commit | d74e3dd4bcc573d0c4b1fb5c36c8bf0115cc21a1 (patch) | |
tree | 7d051293940bcc2778d0aa52f015e52506663faf /src/wixlib | |
parent | e79d9190439e1f740d5646f2f30cccd57b328d17 (diff) | |
download | wix-d74e3dd4bcc573d0c4b1fb5c36c8bf0115cc21a1.tar.gz wix-d74e3dd4bcc573d0c4b1fb5c36c8bf0115cc21a1.tar.bz2 wix-d74e3dd4bcc573d0c4b1fb5c36c8bf0115cc21a1.zip |
Add initial WixUtilBundleExtension.
Diffstat (limited to 'src/wixlib')
-rw-r--r-- | src/wixlib/UtilExtension.wxs | 4 | ||||
-rw-r--r-- | src/wixlib/packages.config | 2 | ||||
-rw-r--r-- | src/wixlib/util.wixproj | 8 |
3 files changed, 11 insertions, 3 deletions
diff --git a/src/wixlib/UtilExtension.wxs b/src/wixlib/UtilExtension.wxs index 28646ee1..50828416 100644 --- a/src/wixlib/UtilExtension.wxs +++ b/src/wixlib/UtilExtension.wxs | |||
@@ -418,4 +418,8 @@ | |||
418 | <PropertyRef Id="WixSilentExec64CmdLine" /> | 418 | <PropertyRef Id="WixSilentExec64CmdLine" /> |
419 | <CustomAction Id="$(var.Prefix)SilentExec64$(var.Suffix)" BinaryKey="$(var.Prefix)UtilCA$(var.Suffix)" DllEntry="WixSilentExec64" Execute="immediate" Return="check" Impersonate="yes" /> | 419 | <CustomAction Id="$(var.Prefix)SilentExec64$(var.Suffix)" BinaryKey="$(var.Prefix)UtilCA$(var.Suffix)" DllEntry="WixSilentExec64" Execute="immediate" Return="check" Impersonate="yes" /> |
420 | </Fragment> | 420 | </Fragment> |
421 | |||
422 | <Fragment> | ||
423 | <BundleExtension Id="WixUtilBundleExtension" SourceFile="utilbe.dll" Name="WixUtilBundleExtension\utilbe.dll" /> | ||
424 | </Fragment> | ||
421 | </Wix> | 425 | </Wix> |
diff --git a/src/wixlib/packages.config b/src/wixlib/packages.config index 06184af1..25b4e6a9 100644 --- a/src/wixlib/packages.config +++ b/src/wixlib/packages.config | |||
@@ -1,5 +1,5 @@ | |||
1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
2 | <packages> | 2 | <packages> |
3 | <package id="Nerdbank.GitVersioning" version="2.1.65" developmentDependency="true" targetFramework="net40" /> | 3 | <package id="Nerdbank.GitVersioning" version="2.1.65" developmentDependency="true" targetFramework="net40" /> |
4 | <package id="WixToolset.MSBuild" version="4.0.0-build-0063" developmentDependency="true" targetFramework="net40" /> | 4 | <package id="WixToolset.MSBuild" version="4.0.0-build-0080" developmentDependency="true" targetFramework="net40" /> |
5 | </packages> \ No newline at end of file | 5 | </packages> \ No newline at end of file |
diff --git a/src/wixlib/util.wixproj b/src/wixlib/util.wixproj index 21d96832..4db3b93d 100644 --- a/src/wixlib/util.wixproj +++ b/src/wixlib/util.wixproj | |||
@@ -1,7 +1,7 @@ | |||
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 | <Project DefaultTargets="Build" InitialTargets="EnsureWixToolsetInstalled" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0"> | 3 | <Project DefaultTargets="Build" InitialTargets="EnsureWixToolsetInstalled" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0"> |
4 | <Import Project="..\..\packages\WixToolset.MSBuild.4.0.0-build-0063\build\WixToolset.MSBuild.props" Condition="Exists('..\..\packages\WixToolset.MSBuild.4.0.0-build-0063\build\WixToolset.MSBuild.props')" /> | 4 | <Import Project="..\..\packages\WixToolset.MSBuild.4.0.0-build-0080\build\WixToolset.MSBuild.props" Condition="Exists('..\..\packages\WixToolset.MSBuild.4.0.0-build-0080\build\WixToolset.MSBuild.props')" /> |
5 | <Import Project="..\FindLocalWix.props" /> | 5 | <Import Project="..\FindLocalWix.props" /> |
6 | <PropertyGroup> | 6 | <PropertyGroup> |
7 | <ProjectGuid>{1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}</ProjectGuid> | 7 | <ProjectGuid>{1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}</ProjectGuid> |
@@ -26,6 +26,10 @@ | |||
26 | <None Include="packages.config" /> | 26 | <None Include="packages.config" /> |
27 | </ItemGroup> | 27 | </ItemGroup> |
28 | <ItemGroup> | 28 | <ItemGroup> |
29 | <ProjectReference Include="..\be\utilbe.vcxproj"> | ||
30 | <Name>utilbe</Name> | ||
31 | <Project>{630C1EE7-2517-4A8C-83E3-DA1150308B58}</Project> | ||
32 | </ProjectReference> | ||
29 | <ProjectReference Include="..\ca\utilca.vcxproj"> | 33 | <ProjectReference Include="..\ca\utilca.vcxproj"> |
30 | <Name>utilca</Name> | 34 | <Name>utilca</Name> |
31 | <Project>{076018F7-19BD-423A-ABBF-229273DA08D8}</Project> | 35 | <Project>{076018F7-19BD-423A-ABBF-229273DA08D8}</Project> |
@@ -46,7 +50,7 @@ | |||
46 | <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> | 50 | <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> |
47 | </PropertyGroup> | 51 | </PropertyGroup> |
48 | <Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets'))" /> | 52 | <Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets'))" /> |
49 | <Error Condition="!Exists('..\..\packages\WixToolset.MSBuild.4.0.0-build-0063\build\WixToolset.MSBuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.MSBuild.4.0.0-build-0063\build\WixToolset.MSBuild.props'))" /> | 53 | <Error Condition="!Exists('..\..\packages\WixToolset.MSBuild.4.0.0-build-0080\build\WixToolset.MSBuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.MSBuild.4.0.0-build-0080\build\WixToolset.MSBuild.props'))" /> |
50 | </Target> | 54 | </Target> |
51 | <Import Project="..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" /> | 55 | <Import Project="..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" /> |
52 | </Project> | 56 | </Project> |