From eb4159441ada394241a73477b1a0fea361619146 Mon Sep 17 00:00:00 2001
From: Josh Kingery <joshking@microsoft.com>
Date: Wed, 26 Apr 2017 13:10:35 -0700
Subject: [PATCH] Create AfterAnyTargets property

---
 src/CBT.After.Any.Targets/CBT.After.Any.Targets.nuproj |  5 +----
 .../CBT/Module/After.Microsoft.Common.targets          |  2 +-
 .../CBT/Module/After.Traversal.targets                 |  2 +-
 src/CBT.After.Any.Targets/CBT/Module/build.props       | 10 ++++++++++
 4 files changed, 13 insertions(+), 6 deletions(-)
 create mode 100644 src/CBT.After.Any.Targets/CBT/Module/build.props

diff --git a/src/CBT.After.Any.Targets/CBT.After.Any.Targets.nuproj b/src/CBT.After.Any.Targets/CBT.After.Any.Targets.nuproj
index 2faf428..b3d7bd7 100644
--- a/src/CBT.After.Any.Targets/CBT.After.Any.Targets.nuproj
+++ b/src/CBT.After.Any.Targets/CBT.After.Any.Targets.nuproj
@@ -11,10 +11,7 @@
     <None Include="version.json" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="CBT\Module\Extensions\After.Any.targets" />
-    <Content Include="CBT\Module\After.Microsoft.Common.targets" />
-    <Content Include="CBT\Module\After.Traversal.targets" />
-    <Content Include="CBT\Module\module.config" />
+    <Content Include="CBT\**\*" />
   </ItemGroup>
   <ItemGroup>
    <Dependency Include="CBT.Microsoft.Common.targets">
diff --git a/src/CBT.After.Any.Targets/CBT/Module/After.Microsoft.Common.targets b/src/CBT.After.Any.Targets/CBT/Module/After.Microsoft.Common.targets
index 47c21f1..3d23588 100644
--- a/src/CBT.After.Any.Targets/CBT/Module/After.Microsoft.Common.targets
+++ b/src/CBT.After.Any.Targets/CBT/Module/After.Microsoft.Common.targets
@@ -5,6 +5,6 @@
     <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
   </PropertyGroup>
 
-  <Import Project="$(MSBuildThisFileDirectory)\Extensions\After.Any.targets" />
+  <Import Project="$(AfterAnyTargets)" />
   
 </Project>
diff --git a/src/CBT.After.Any.Targets/CBT/Module/After.Traversal.targets b/src/CBT.After.Any.Targets/CBT/Module/After.Traversal.targets
index 47c21f1..3d23588 100644
--- a/src/CBT.After.Any.Targets/CBT/Module/After.Traversal.targets
+++ b/src/CBT.After.Any.Targets/CBT/Module/After.Traversal.targets
@@ -5,6 +5,6 @@
     <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
   </PropertyGroup>
 
-  <Import Project="$(MSBuildThisFileDirectory)\Extensions\After.Any.targets" />
+  <Import Project="$(AfterAnyTargets)" />
   
 </Project>
diff --git a/src/CBT.After.Any.Targets/CBT/Module/build.props b/src/CBT.After.Any.Targets/CBT/Module/build.props
new file mode 100644
index 0000000..dfcc9ed
--- /dev/null
+++ b/src/CBT.After.Any.Targets/CBT/Module/build.props
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <PropertyGroup>
+    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AfterAnyTargets>$(MSBuildThisFileDirectory)\Extensions\After.Any.targets</AfterAnyTargets>
+  </PropertyGroup>
+</Project>