diff options
Diffstat (limited to 'src/api/burn/balutil')
-rw-r--r-- | src/api/burn/balutil/balutil.nuspec | 29 | ||||
-rw-r--r-- | src/api/burn/balutil/balutil.vcxproj | 3 | ||||
-rw-r--r-- | src/api/burn/balutil/build/WixToolset.BalUtil.props | 18 |
3 files changed, 1 insertions, 49 deletions
diff --git a/src/api/burn/balutil/balutil.nuspec b/src/api/burn/balutil/balutil.nuspec deleted file mode 100644 index be51ec79..00000000 --- a/src/api/burn/balutil/balutil.nuspec +++ /dev/null | |||
@@ -1,29 +0,0 @@ | |||
1 | <?xml version="1.0" encoding="utf-8"?> | ||
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 | <title>$title$</title> | ||
7 | <description>$description$</description> | ||
8 | <authors>$authors$</authors> | ||
9 | <icon>wix.png</icon> | ||
10 | <license type="expression">MS-RL</license> | ||
11 | <requireLicenseAcceptance>false</requireLicenseAcceptance> | ||
12 | <copyright>$copyright$</copyright> | ||
13 | <projectUrl>$projectUrl$</projectUrl> | ||
14 | <repository type="$repositorytype$" url="$repositoryurl$" commit="$repositorycommit$" /> | ||
15 | <dependencies> | ||
16 | <dependency id="WixToolset.BootstrapperCore.Native" version="[$version$,5)" /> | ||
17 | <dependency id="WixToolset.DUtil" version="[$version$,5)" /> | ||
18 | </dependencies> | ||
19 | </metadata> | ||
20 | |||
21 | <files> | ||
22 | <file src="$projectFolder$\build\$id$.props" target="build\" /> | ||
23 | <file src="$projectFolder$\..\..\..\internal\images\wix.png" /> | ||
24 | <file src="$projectFolder$\inc\*" target="build\native\include" /> | ||
25 | <file src="..\..\v141\x86\balutil.lib" target="build\native\v14\x86" /> | ||
26 | <file src="..\..\v141\x64\balutil.lib" target="build\native\v14\x64" /> | ||
27 | <file src="..\..\v141\ARM64\balutil.lib" target="build\native\v14\ARM64" /> | ||
28 | </files> | ||
29 | </package> | ||
diff --git a/src/api/burn/balutil/balutil.vcxproj b/src/api/burn/balutil/balutil.vcxproj index 8f93d636..280f21b8 100644 --- a/src/api/burn/balutil/balutil.vcxproj +++ b/src/api/burn/balutil/balutil.vcxproj | |||
@@ -35,7 +35,6 @@ | |||
35 | <TargetName>balutil</TargetName> | 35 | <TargetName>balutil</TargetName> |
36 | <CharacterSet>MultiByte</CharacterSet> | 36 | <CharacterSet>MultiByte</CharacterSet> |
37 | <Description>WiX Toolset Bootstrapper Application Layer native utility library</Description> | 37 | <Description>WiX Toolset Bootstrapper Application Layer native utility library</Description> |
38 | <PackageId>WixToolset.BalUtil</PackageId> | ||
39 | </PropertyGroup> | 38 | </PropertyGroup> |
40 | 39 | ||
41 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> | 40 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> |
@@ -49,7 +48,7 @@ | |||
49 | </ImportGroup> | 48 | </ImportGroup> |
50 | 49 | ||
51 | <PropertyGroup> | 50 | <PropertyGroup> |
52 | <ProjectAdditionalIncludeDirectories>inc;..\WixToolset.BootstrapperCore.Native\inc</ProjectAdditionalIncludeDirectories> | 51 | <ProjectAdditionalIncludeDirectories>inc;..\inc</ProjectAdditionalIncludeDirectories> |
53 | </PropertyGroup> | 52 | </PropertyGroup> |
54 | 53 | ||
55 | <ItemGroup> | 54 | <ItemGroup> |
diff --git a/src/api/burn/balutil/build/WixToolset.BalUtil.props b/src/api/burn/balutil/build/WixToolset.BalUtil.props deleted file mode 100644 index b276574d..00000000 --- a/src/api/burn/balutil/build/WixToolset.BalUtil.props +++ /dev/null | |||
@@ -1,18 +0,0 @@ | |||
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. --> | ||
3 | |||
4 | <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
5 | <ItemDefinitionGroup> | ||
6 | <ClCompile> | ||
7 | <AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)native\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||
8 | </ClCompile> | ||
9 | <ResourceCompile> | ||
10 | <AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)native\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||
11 | </ResourceCompile> | ||
12 | </ItemDefinitionGroup> | ||
13 | <ItemDefinitionGroup Condition=" $(PlatformToolset.ToLower().StartsWith('v14')) "> | ||
14 | <Link> | ||
15 | <AdditionalDependencies>$(MSBuildThisFileDirectory)native\v14\$(PlatformTarget)\balutil.lib;%(AdditionalDependencies)</AdditionalDependencies> | ||
16 | </Link> | ||
17 | </ItemDefinitionGroup> | ||
18 | </Project> | ||