Attempt to move wixnative.exe to independent runtime .nupkg
Rob Mensching committed
Jul 13, 2018 at 14:19 UTC
e6897a667c06125beced3921b16cf0e3a1b21bc1
6 files changed
+42
-6
appveyor.cmd
+2
@@ -7,5 +7,7 @@ msbuild -p:Configuration=Release .\src\test\WixToolsetTest.Core.Native\WixToolse
7
8
msbuild -t:Pack -p:Configuration=Release .\src\WixToolset.Core.Native\WixToolset.Core.Native.csproj
9
10
+msbuild -t:Pack -p:Configuration=Release .\src\wixnative\wixnative.vcxproj
11
+
12
@popd
13
@endlocal
\ No newline at end of file
src/WixToolset.Core.Native/WixNativeExe.cs
+1
-1
@@ -19,7 +19,7 @@ namespace WixToolset.Core.Native
19
20
static WixNativeExe()
21
{
22
- PathToWixNativeExe = Path.Combine(Path.GetDirectoryName(new Uri(Assembly.GetExecutingAssembly().CodeBase).LocalPath), "x86\\wixnative.exe");
22
+ PathToWixNativeExe = Path.Combine(Path.GetDirectoryName(new Uri(Assembly.GetExecutingAssembly().CodeBase).LocalPath), "wixnative.x86.exe");
23
}
24
25
public WixNativeExe(params object[] args)
src/WixToolset.Core.Native/WixToolset.Core.Native.csproj
+2
-2
@@ -20,10 +20,10 @@
20
21
<ItemGroup>
22
<NativeProjectOutput Include="$(OutputPath)..\Win32\*.exe;$(OutputPath)..\Win32\*.pdb">
23
- <TargetRelativeFolder>x86\</TargetRelativeFolder>
23
+ <TargetRelativeFolder>.\</TargetRelativeFolder>
24
</NativeProjectOutput>
25
<NativeProjectOutput Include="$(OutputPath)..\x64\*.exe;$(OutputPath)..\x64\*.pdb">
26
- <TargetRelativeFolder>x64\</TargetRelativeFolder>
26
+ <TargetRelativeFolder>.\</TargetRelativeFolder>
27
</NativeProjectOutput>
28
29
<AllItemsFullPathWithTargetPath Include="@(NativeProjectOutput->'%(FullPath)')">
src/WixToolset.Core.Native/WixToolset.Core.Native.nuspec
+6
-2
@@ -10,19 +10,23 @@
10
<requireLicenseAcceptance>false</requireLicenseAcceptance>
11
<description>$description$</description>
12
<copyright>$copyright$</copyright>
13
-<!--
13
+
14
<dependencies>
15
+ <dependency id="runtime.win.WixToolset.Core.Native" version="$version$" />
16
+<!--
17
<dependency id="runtime.win-x86.WixToolset.Core.Native" version="$version$" />
18
<dependency id="runtime.win-x64.WixToolset.Core.Native" version="$version$" />
19
+-->
20
</dependencies>
18
- -->
21
</metadata>
22
23
<files>
24
<file src="$id$.dll" target="lib\netstandard2.0" />
25
+<!--
26
<file src="..\Win32\wixnative.exe" target="lib\netstandard2.0\x86" />
27
<file src="..\Win32\wixnative.pdb" target="lib\netstandard2.0\x86" />
28
<file src="..\x64\wixnative.exe" target="lib\netstandard2.0\x64" />
29
<file src="..\x64\wixnative.pdb" target="lib\netstandard2.0\x64" />
30
+ -->
31
</files>
32
</package>
src/wixnative/runtime.win.WixToolset.Core.Native.nuspec
new
+21
@@ -0,0 +1,21 @@
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
+ <licenseUrl>https://github.com/wixtoolset/Core.Native/blob/master/LICENSE.TXT</licenseUrl>
9
+ <projectUrl>https://github.com/wixtoolset/Core.Native</projectUrl>
10
+ <requireLicenseAcceptance>false</requireLicenseAcceptance>
11
+ <description>$description$</description>
12
+ <copyright>$copyright$</copyright>
13
+ </metadata>
14
+
15
+ <files>
16
+ <file src="Win32\wixnative.x86.exe" target="runtimes\win\native" />
17
+ <file src="Win32\wixnative.x86.pdb" target="runtimes\win\native" />
18
+ <file src="x64\wixnative.amd64.exe" target="runtimes\win\native" />
19
+ <file src="x64\wixnative.amd64.pdb" target="runtimes\win\native" />
20
+ </files>
21
+</package>
src/wixnative/wixnative.vcxproj
+10
-1
@@ -23,11 +23,16 @@
23
</ProjectConfiguration>
24
</ItemGroup>
25
26
+ <PropertyGroup>
27
+ <NameSuffix Condition=" '$(Platform)'=='Win32' ">x86</NameSuffix>
28
+ <NameSuffix Condition=" '$(Platform)'=='x64' ">amd64</NameSuffix>
29
+ </PropertyGroup>
30
+
31
<PropertyGroup Label="Globals">
32
<ProjectGuid>{8497EC72-B8D0-4272-A9D0-7E9D871CEFBF}</ProjectGuid>
33
<ConfigurationType>Application</ConfigurationType>
34
<ProjectSubSystem>Console</ProjectSubSystem>
30
- <TargetName>wixnative</TargetName>
35
+ <TargetName>wixnative.$(NameSuffix)</TargetName>
36
<PlatformToolset>v141</PlatformToolset>
37
<CharacterSet>Unicode</CharacterSet>
38
<Description>Native component of WixToolset.Core</Description>
@@ -69,6 +74,10 @@
74
<None Include="packages.config" />
75
</ItemGroup>
76
77
+ <Target Name="Pack" DependsOnTargets="GetBuildVersion">
78
+ <Exec Command="nuget pack runtime.win.WixToolset.Core.Native.nuspec -BasePath "$(BaseOutputPath)\" -OutputDirectory "$(BaseOutputPath)\" -NoPackageAnalysis -Properties Configuration=$(Configuration);Id=runtime.win.WixToolset.Core.Native;Version="$(BuildVersionSimple)";Platform=$(PlatformTarget);Authors="$(Authors)";Copyright="$(Copyright)";Description="$(Description)";Title="$(Title)"" />
79
+ </Target>
80
+
81
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
82
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
83
<PropertyGroup>