From 05ee2175b44c68816c24a33a16861a637fa15ad7 Mon Sep 17 00:00:00 2001
From: Sean Hall <r.sean.hall@gmail.com>
Date: Sat, 30 May 2020 18:55:57 +1000
Subject: Update MSBuild tests to use WixToolset.MSBuild.props to find
 wix.targets.

---
 src/WixToolset.MSBuild/WixToolset.MSBuild.csproj      | 1 +
 src/WixToolset.MSBuild/WixToolset.MSBuild.nuspec      | 2 +-
 src/WixToolset.MSBuild/WixToolset.MSBuild.props       | 8 --------
 src/WixToolset.MSBuild/build/WixToolset.MSBuild.props | 8 ++++++++
 4 files changed, 10 insertions(+), 9 deletions(-)
 delete mode 100644 src/WixToolset.MSBuild/WixToolset.MSBuild.props
 create mode 100644 src/WixToolset.MSBuild/build/WixToolset.MSBuild.props

(limited to 'src/WixToolset.MSBuild')

diff --git a/src/WixToolset.MSBuild/WixToolset.MSBuild.csproj b/src/WixToolset.MSBuild/WixToolset.MSBuild.csproj
index 2d5ea01b..ba67660c 100644
--- a/src/WixToolset.MSBuild/WixToolset.MSBuild.csproj
+++ b/src/WixToolset.MSBuild/WixToolset.MSBuild.csproj
@@ -12,6 +12,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <Content Include="build\$(MSBuildThisFileName).props" CopyToOutputDirectory="PreserveNewest" />
     <Content Include="tools\wix.ca.targets" CopyToOutputDirectory="PreserveNewest" />
     <Content Include="tools\wix.harvest.targets" CopyToOutputDirectory="PreserveNewest" />
     <Content Include="tools\wix.signing.targets" CopyToOutputDirectory="PreserveNewest" />
diff --git a/src/WixToolset.MSBuild/WixToolset.MSBuild.nuspec b/src/WixToolset.MSBuild/WixToolset.MSBuild.nuspec
index ff0d74ee..be04d21b 100644
--- a/src/WixToolset.MSBuild/WixToolset.MSBuild.nuspec
+++ b/src/WixToolset.MSBuild/WixToolset.MSBuild.nuspec
@@ -11,7 +11,7 @@
   </metadata>
 
   <files>
-    <file src="$projectFolder$$id$.props" target="build" />
+    <file src="build\**\*" target="build" />
     <file src="tools\**\*" target="tools" />
   </files>
 </package>
diff --git a/src/WixToolset.MSBuild/WixToolset.MSBuild.props b/src/WixToolset.MSBuild/WixToolset.MSBuild.props
deleted file mode 100644
index b453361b..00000000
--- a/src/WixToolset.MSBuild/WixToolset.MSBuild.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 Condition=" '$(WixTargetsPath)' == '' ">$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\tools\wix.targets'))</WixTargetsPath>
-  </PropertyGroup>
-</Project>
diff --git a/src/WixToolset.MSBuild/build/WixToolset.MSBuild.props b/src/WixToolset.MSBuild/build/WixToolset.MSBuild.props
new file mode 100644
index 00000000..b453361b
--- /dev/null
+++ b/src/WixToolset.MSBuild/build/WixToolset.MSBuild.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 Condition=" '$(WixTargetsPath)' == '' ">$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\tools\wix.targets'))</WixTargetsPath>
+  </PropertyGroup>
+</Project>
-- 
cgit v1.2.3-55-g6feb