aboutsummaryrefslogtreecommitdiff
path: root/src/WixToolset.BuildTasks
diff options
context:
space:
mode:
authorRob Mensching <rob@firegiant.com>2017-09-24 15:49:15 -0700
committerRob Mensching <rob@firegiant.com>2017-09-24 15:49:15 -0700
commit5d6c31d1f5e0b8a46f41d4f321e878adba156bb2 (patch)
tree0efc8b01fee4254b616a492e3191a36c4fb6f62a /src/WixToolset.BuildTasks
parentfeea62d5bd1f90bb012cb7cf2c84c9703f6568b2 (diff)
downloadwix-5d6c31d1f5e0b8a46f41d4f321e878adba156bb2.tar.gz
wix-5d6c31d1f5e0b8a46f41d4f321e878adba156bb2.tar.bz2
wix-5d6c31d1f5e0b8a46f41d4f321e878adba156bb2.zip
Correctly name NuGet .props file
Diffstat (limited to 'src/WixToolset.BuildTasks')
-rw-r--r--src/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj1
-rw-r--r--src/WixToolset.BuildTasks/redirects/wix.props8
2 files changed, 0 insertions, 9 deletions
diff --git a/src/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj b/src/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj
index ce65ea41..10dce157 100644
--- a/src/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj
+++ b/src/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj
@@ -16,7 +16,6 @@
16 <ItemGroup> 16 <ItemGroup>
17 <Content Include="redirects\wix.targets" CopyToOutputDirectory="PreserveNewest" /> 17 <Content Include="redirects\wix.targets" CopyToOutputDirectory="PreserveNewest" />
18 <Content Include="redirects\wix.ca.targets" CopyToOutputDirectory="PreserveNewest" /> 18 <Content Include="redirects\wix.ca.targets" CopyToOutputDirectory="PreserveNewest" />
19 <Content Include="redirects\wix.props" CopyToOutputDirectory="PreserveNewest" />
20 <Content Include="wix.targets" CopyToOutputDirectory="PreserveNewest" /> 19 <Content Include="wix.targets" CopyToOutputDirectory="PreserveNewest" />
21 <Content Include="wix.ca.targets" CopyToOutputDirectory="PreserveNewest" /> 20 <Content Include="wix.ca.targets" CopyToOutputDirectory="PreserveNewest" />
22 <Content Include="wix.harvest.targets" CopyToOutputDirectory="PreserveNewest" /> 21 <Content Include="wix.harvest.targets" CopyToOutputDirectory="PreserveNewest" />
diff --git a/src/WixToolset.BuildTasks/redirects/wix.props b/src/WixToolset.BuildTasks/redirects/wix.props
deleted file mode 100644
index 7448d192..00000000
--- a/src/WixToolset.BuildTasks/redirects/wix.props
+++ /dev/null
@@ -1,8 +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 xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
5 <PropertyGroup>
6 <WixTargetsPath>$(MSBuildThisFileDirectory)..\tools\wix.targets</WixTargetsPath>
7 </PropertyGroup>
8</Project>