From 5d6c31d1f5e0b8a46f41d4f321e878adba156bb2 Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Sun, 24 Sep 2017 15:49:15 -0700
Subject: Correctly name NuGet .props file

---
 src/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj            | 1 -
 src/WixToolset.BuildTasks/redirects/wix.props                     | 8 --------
 .../WixToolset.Core.InternalPackage.csproj                        | 2 +-
 .../WixToolset.Core.InternalPackage.nuspec                        | 2 +-
 .../WixToolset.Core.InternalPackage.props                         | 8 ++++++++
 5 files changed, 10 insertions(+), 11 deletions(-)
 delete mode 100644 src/WixToolset.BuildTasks/redirects/wix.props
 create mode 100644 src/WixToolset.Core.InternalPackage/WixToolset.Core.InternalPackage.props

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 @@
   <ItemGroup>
     <Content Include="redirects\wix.targets" CopyToOutputDirectory="PreserveNewest" />
     <Content Include="redirects\wix.ca.targets" CopyToOutputDirectory="PreserveNewest" />
-    <Content Include="redirects\wix.props" CopyToOutputDirectory="PreserveNewest" />
     <Content Include="wix.targets" CopyToOutputDirectory="PreserveNewest" />
     <Content Include="wix.ca.targets" CopyToOutputDirectory="PreserveNewest" />
     <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 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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. -->
-
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
-  <PropertyGroup>
-    <WixTargetsPath>$(MSBuildThisFileDirectory)..\tools\wix.targets</WixTargetsPath>
-  </PropertyGroup>
-</Project>
diff --git a/src/WixToolset.Core.InternalPackage/WixToolset.Core.InternalPackage.csproj b/src/WixToolset.Core.InternalPackage/WixToolset.Core.InternalPackage.csproj
index 613c6b88..687e8955 100644
--- a/src/WixToolset.Core.InternalPackage/WixToolset.Core.InternalPackage.csproj
+++ b/src/WixToolset.Core.InternalPackage/WixToolset.Core.InternalPackage.csproj
@@ -20,7 +20,7 @@
     <Error Text="Cannot pack $(MSBuildThisFileName) until all projects are published to: $(NuspecBasePath). Run appveyor.cmd to publish projects properly." Condition=" !Exists('$(NuspecBasePath)') " />
 
     <PropertyGroup>
-      <NuspecProperties>$(NuspecProperties);Version=$(Version)</NuspecProperties>
+      <NuspecProperties>$(NuspecProperties);Version=$(Version);ProjectFolder=$(MSBuildThisFileDirectory)</NuspecProperties>
     </PropertyGroup>
   </Target>
 </Project>
diff --git a/src/WixToolset.Core.InternalPackage/WixToolset.Core.InternalPackage.nuspec b/src/WixToolset.Core.InternalPackage/WixToolset.Core.InternalPackage.nuspec
index 5879b7a5..5b81d615 100644
--- a/src/WixToolset.Core.InternalPackage/WixToolset.Core.InternalPackage.nuspec
+++ b/src/WixToolset.Core.InternalPackage/WixToolset.Core.InternalPackage.nuspec
@@ -11,7 +11,7 @@
   </metadata>
 
   <files>
-    <file src="redirects\wix.props" target="build" />
+    <file src="$projectFolder$$id$.props" target="build" />
 
     <file src="redirects\wix.targets" target="msbuild" />
     <file src="redirects\wix.ca.targets" target="msbuild" />
diff --git a/src/WixToolset.Core.InternalPackage/WixToolset.Core.InternalPackage.props b/src/WixToolset.Core.InternalPackage/WixToolset.Core.InternalPackage.props
new file mode 100644
index 00000000..7448d192
--- /dev/null
+++ b/src/WixToolset.Core.InternalPackage/WixToolset.Core.InternalPackage.props
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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. -->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <PropertyGroup>
+    <WixTargetsPath>$(MSBuildThisFileDirectory)..\tools\wix.targets</WixTargetsPath>
+  </PropertyGroup>
+</Project>
-- 
cgit v1.2.3-55-g6feb