From 8f0b80f46c169eaaaed434aaa4fc9040e11b8c66 Mon Sep 17 00:00:00 2001
From: Bill Zissimopoulos <billziss@navimatics.com>
Date: Thu, 16 Dec 2021 14:18:52 +0000
Subject: [PATCH] build: VStudio: build.common.props

---
 build/VStudio/{After.props => build.aftercpp.props}         | 0
 build/VStudio/{Directory.Build.props => build.common.props} | 2 +-
 build/VStudio/dotnet/winfsp.net.csproj                      | 1 +
 build/VStudio/installer/CustomActions/CustomActions.vcxproj | 1 +
 build/VStudio/installer/winfsp_msi.wixproj                  | 2 +-
 build/VStudio/testing/fsbench.vcxproj                       | 1 +
 build/VStudio/testing/fscrash.vcxproj                       | 1 +
 build/VStudio/testing/memfs-dotnet.csproj                   | 1 +
 build/VStudio/testing/memfs.vcxproj                         | 1 +
 build/VStudio/testing/winfsp-tests.vcxproj                  | 1 +
 build/VStudio/tools/fsptool.vcxproj                         | 1 +
 build/VStudio/tools/launchctl.vcxproj                       | 1 +
 build/VStudio/tools/launcher.vcxproj                        | 1 +
 build/VStudio/winfsp_dll.vcxproj                            | 1 +
 build/VStudio/winfsp_sys.vcxproj                            | 1 +
 15 files changed, 14 insertions(+), 2 deletions(-)
 rename build/VStudio/{After.props => build.aftercpp.props} (100%)
 rename build/VStudio/{Directory.Build.props => build.common.props} (93%)

diff --git a/build/VStudio/After.props b/build/VStudio/build.aftercpp.props
similarity index 100%
rename from build/VStudio/After.props
rename to build/VStudio/build.aftercpp.props
diff --git a/build/VStudio/Directory.Build.props b/build/VStudio/build.common.props
similarity index 93%
rename from build/VStudio/Directory.Build.props
rename to build/VStudio/build.common.props
index 41a6f74e..ac15491b 100644
--- a/build/VStudio/Directory.Build.props
+++ b/build/VStudio/build.common.props
@@ -30,6 +30,6 @@
     </PropertyGroup>
 
     <PropertyGroup>
-        <ForceImportAfterCppProps>$(MsbuildThisFileDirectory)\After.props</ForceImportAfterCppProps>
+        <ForceImportAfterCppProps>$(MsbuildThisFileDirectory)\build.aftercpp.props</ForceImportAfterCppProps>
     </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/build/VStudio/dotnet/winfsp.net.csproj b/build/VStudio/dotnet/winfsp.net.csproj
index 2a2dafcb..614e83ec 100644
--- a/build/VStudio/dotnet/winfsp.net.csproj
+++ b/build/VStudio/dotnet/winfsp.net.csproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetPathOfFileAbove(build.common.props, $(MSBuildProjectDirectory)))" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
diff --git a/build/VStudio/installer/CustomActions/CustomActions.vcxproj b/build/VStudio/installer/CustomActions/CustomActions.vcxproj
index a89c2577..c4dde6e8 100644
--- a/build/VStudio/installer/CustomActions/CustomActions.vcxproj
+++ b/build/VStudio/installer/CustomActions/CustomActions.vcxproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetPathOfFileAbove(build.common.props, $(MSBuildProjectDirectory)))" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
diff --git a/build/VStudio/installer/winfsp_msi.wixproj b/build/VStudio/installer/winfsp_msi.wixproj
index 17028fea..16103805 100644
--- a/build/VStudio/installer/winfsp_msi.wixproj
+++ b/build/VStudio/installer/winfsp_msi.wixproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\Directory.Build.props" />
+  <Import Project="$([MSBuild]::GetPathOfFileAbove(build.common.props, $(MSBuildProjectDirectory)))" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
diff --git a/build/VStudio/testing/fsbench.vcxproj b/build/VStudio/testing/fsbench.vcxproj
index ac57702a..d9413ed6 100644
--- a/build/VStudio/testing/fsbench.vcxproj
+++ b/build/VStudio/testing/fsbench.vcxproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetPathOfFileAbove(build.common.props, $(MSBuildProjectDirectory)))" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM64">
       <Configuration>Debug</Configuration>
diff --git a/build/VStudio/testing/fscrash.vcxproj b/build/VStudio/testing/fscrash.vcxproj
index f50f5f94..42fa2f45 100644
--- a/build/VStudio/testing/fscrash.vcxproj
+++ b/build/VStudio/testing/fscrash.vcxproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetPathOfFileAbove(build.common.props, $(MSBuildProjectDirectory)))" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM64">
       <Configuration>Debug</Configuration>
diff --git a/build/VStudio/testing/memfs-dotnet.csproj b/build/VStudio/testing/memfs-dotnet.csproj
index 1ccb65e5..5bbe4851 100644
--- a/build/VStudio/testing/memfs-dotnet.csproj
+++ b/build/VStudio/testing/memfs-dotnet.csproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetPathOfFileAbove(build.common.props, $(MSBuildProjectDirectory)))" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
diff --git a/build/VStudio/testing/memfs.vcxproj b/build/VStudio/testing/memfs.vcxproj
index 86c3b047..6d71cca9 100644
--- a/build/VStudio/testing/memfs.vcxproj
+++ b/build/VStudio/testing/memfs.vcxproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetPathOfFileAbove(build.common.props, $(MSBuildProjectDirectory)))" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM64">
       <Configuration>Debug</Configuration>
diff --git a/build/VStudio/testing/winfsp-tests.vcxproj b/build/VStudio/testing/winfsp-tests.vcxproj
index 17d26ec5..fe32bd47 100644
--- a/build/VStudio/testing/winfsp-tests.vcxproj
+++ b/build/VStudio/testing/winfsp-tests.vcxproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetPathOfFileAbove(build.common.props, $(MSBuildProjectDirectory)))" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM64">
       <Configuration>Debug</Configuration>
diff --git a/build/VStudio/tools/fsptool.vcxproj b/build/VStudio/tools/fsptool.vcxproj
index bdd4f0b6..bd117a6f 100644
--- a/build/VStudio/tools/fsptool.vcxproj
+++ b/build/VStudio/tools/fsptool.vcxproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetPathOfFileAbove(build.common.props, $(MSBuildProjectDirectory)))" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM64">
       <Configuration>Debug</Configuration>
diff --git a/build/VStudio/tools/launchctl.vcxproj b/build/VStudio/tools/launchctl.vcxproj
index fddc00d7..f86b1f20 100644
--- a/build/VStudio/tools/launchctl.vcxproj
+++ b/build/VStudio/tools/launchctl.vcxproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetPathOfFileAbove(build.common.props, $(MSBuildProjectDirectory)))" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM64">
       <Configuration>Debug</Configuration>
diff --git a/build/VStudio/tools/launcher.vcxproj b/build/VStudio/tools/launcher.vcxproj
index 04e12870..275fdb64 100644
--- a/build/VStudio/tools/launcher.vcxproj
+++ b/build/VStudio/tools/launcher.vcxproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetPathOfFileAbove(build.common.props, $(MSBuildProjectDirectory)))" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM64">
       <Configuration>Debug</Configuration>
diff --git a/build/VStudio/winfsp_dll.vcxproj b/build/VStudio/winfsp_dll.vcxproj
index f5220d97..c4b1b90b 100644
--- a/build/VStudio/winfsp_dll.vcxproj
+++ b/build/VStudio/winfsp_dll.vcxproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetPathOfFileAbove(build.common.props, $(MSBuildProjectDirectory)))" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM64">
       <Configuration>Debug</Configuration>
diff --git a/build/VStudio/winfsp_sys.vcxproj b/build/VStudio/winfsp_sys.vcxproj
index ba561078..dad7f4dc 100644
--- a/build/VStudio/winfsp_sys.vcxproj
+++ b/build/VStudio/winfsp_sys.vcxproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetPathOfFileAbove(build.common.props, $(MSBuildProjectDirectory)))" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM64">
       <Configuration>Debug</Configuration>