diff options
| author | Rob Mensching <rob@firegiant.com> | 2018-12-27 20:52:57 -0800 |
|---|---|---|
| committer | Rob Mensching <rob@robmensching.com> | 2018-12-27 20:56:24 -0800 |
| commit | 51044df46896ee17d62f2036b76546a0fdcee9bc (patch) | |
| tree | 0e47d995b759546541d363001f3004b4f5e4e8cc /src | |
| parent | 61c89b0fbe9d2946d8303c08384af7b2bb1844a8 (diff) | |
| download | wix-51044df46896ee17d62f2036b76546a0fdcee9bc.tar.gz wix-51044df46896ee17d62f2036b76546a0fdcee9bc.tar.bz2 wix-51044df46896ee17d62f2036b76546a0fdcee9bc.zip | |
Fix double inclusion of wixnative.*.exe
Diffstat (limited to 'src')
| -rw-r--r-- | src/WixToolset.MSBuild/WixToolset.MSBuild.nuspec | 2 | ||||
| -rw-r--r-- | src/dotnet-wix/dotnet-wix.nuspec | 1 |
2 files changed, 0 insertions, 3 deletions
diff --git a/src/WixToolset.MSBuild/WixToolset.MSBuild.nuspec b/src/WixToolset.MSBuild/WixToolset.MSBuild.nuspec index 1a21315a..6bca928a 100644 --- a/src/WixToolset.MSBuild/WixToolset.MSBuild.nuspec +++ b/src/WixToolset.MSBuild/WixToolset.MSBuild.nuspec | |||
| @@ -13,9 +13,7 @@ | |||
| 13 | <files> | 13 | <files> |
| 14 | <file src="$projectFolder$$id$.props" target="build" /> | 14 | <file src="$projectFolder$$id$.props" target="build" /> |
| 15 | <file src="net461\*" target="tools\net461" /> | 15 | <file src="net461\*" target="tools\net461" /> |
| 16 | <file src="net461\runtimes\win-x86\native\*.exe" target="tools\net461" /> | ||
| 17 | <file src="netcoreapp2.1\*" target="tools\netcoreapp2.1" /> | 16 | <file src="netcoreapp2.1\*" target="tools\netcoreapp2.1" /> |
| 18 | <file src="netcoreapp2.1\runtimes\**" target="tools\netcoreapp2.1\runtimes" /> | 17 | <file src="netcoreapp2.1\runtimes\**" target="tools\netcoreapp2.1\runtimes" /> |
| 19 | <file src="netcoreapp2.1\runtimes\win-x86\native\*.exe" target="tools\netcoreapp2.1" /> | ||
| 20 | </files> | 18 | </files> |
| 21 | </package> | 19 | </package> |
diff --git a/src/dotnet-wix/dotnet-wix.nuspec b/src/dotnet-wix/dotnet-wix.nuspec index 53a8dc9e..c2a4c8f4 100644 --- a/src/dotnet-wix/dotnet-wix.nuspec +++ b/src/dotnet-wix/dotnet-wix.nuspec | |||
| @@ -19,6 +19,5 @@ | |||
| 19 | <files> | 19 | <files> |
| 20 | <file src="$projectFolder$DotnetToolSettings.xml" target="tools\netcoreapp2.1\any" /> | 20 | <file src="$projectFolder$DotnetToolSettings.xml" target="tools\netcoreapp2.1\any" /> |
| 21 | <file src="**" target="tools\netcoreapp2.1\any" /> | 21 | <file src="**" target="tools\netcoreapp2.1\any" /> |
| 22 | <file src="runtimes\win-x86\native\*.exe" target="tools\netcoreapp2.1\any" /> | ||
| 23 | </files> | 22 | </files> |
| 24 | </package> | 23 | </package> |