Redo nuget package so that burn.exe's get put where Core expects them to be
Sean Hall committed
May 10, 2020 at 12:04 UTC
d232c5621fe336b1f563b69be7637c93e795e151
3 files changed
+17
-9
src/stub/WixToolset.Burn.nuspec
renamed
+3
-2
@@ -14,7 +14,8 @@
14
</metadata>
15
16
<files>
17
- <file src="Win32\burn.x86.exe" target="runtimes\win-x86\native" />
18
- <file src="Win32\burn.x86.pdb" target="runtimes\win-x86\native" />
17
+ <file src="$projectFolder$$id$.props" target="buildTransitive" />
18
+ <file src="Win32\burn.exe" target="tools\x86" />
19
+ <file src="Win32\burn.pdb" target="tools\x86" />
20
</files>
21
</package>
src/stub/WixToolset.Burn.props
new
+12
@@ -0,0 +1,12 @@
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 xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
5
+ <ItemGroup>
6
+ <BurnExes Include="$(MSBuildThisFileDirectory)..\tools\**\burn.exe" />
7
+ <None Include="@(BurnExes)">
8
+ <Link>%(RecursiveDir)%(FileName)%(Extension)</Link>
9
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
10
+ </None>
11
+ </ItemGroup>
12
+</Project>
src/stub/stub.vcxproj
+2
-7
@@ -23,16 +23,11 @@
23
</ProjectConfiguration>
24
</ItemGroup>
25
26
- <PropertyGroup>
27
- <NameSuffix Condition=" '$(Platform)'=='Win32' ">x86</NameSuffix>
28
- <NameSuffix Condition=" '$(Platform)'=='x64' ">amd64</NameSuffix>
29
- </PropertyGroup>
30
-
26
<PropertyGroup Label="Globals">
27
<ProjectGuid>{C38373AA-882F-4F55-B03F-2AAB4BFBE3F1}</ProjectGuid>
28
<ConfigurationType>Application</ConfigurationType>
29
<ProjectSubSystem>Windows</ProjectSubSystem>
35
- <TargetName>burn.$(NameSuffix)</TargetName>
30
+ <TargetName>burn</TargetName>
31
<PlatformToolset>v141</PlatformToolset>
32
<CharacterSet>Unicode</CharacterSet>
33
<Description>Native component of WixToolset.Burn</Description>
@@ -90,7 +85,7 @@
85
</ItemGroup>
86
87
<Target Name="Pack" DependsOnTargets="GetBuildVersion">
93
- <Exec Command='nuget pack runtime.win.WixToolset.Burn.nuspec -BasePath "$(BaseOutputPath)$(Configuration)" -OutputDirectory "$(BaseOutputPath)$(Configuration)" -NoPackageAnalysis -Properties Configuration=$(Configuration);Id=runtime.win.WixToolset.Burn;Version="$(BuildVersionSimple)";Platform=$(PlatformTarget);Authors="$(Authors)";Copyright="$(Copyright)";Description="$(Description)";Title="$(Title)"' />
88
+ <Exec Command='nuget pack WixToolset.Burn.nuspec -BasePath "$(BaseOutputPath)$(Configuration)" -OutputDirectory "$(BaseOutputPath)$(Configuration)" -NoPackageAnalysis -Properties Configuration=$(Configuration);Id=WixToolset.Burn;Version="$(BuildVersionSimple)";ProjectFolder=$(MSBuildThisFileDirectory);Platform=$(PlatformTarget);Authors="$(Authors)";Copyright="$(Copyright)";Description="$(Description)";Title="$(Title)"' />
89
</Target>
90
91
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />