Build fixes for none Windows desktop platforms.

* Exclude a couple of sources currently not building anything useful on Windows.
* Added MONO_EMTPY_SOURCE_FILE to a couple of source files ending up empty by default.
* Excluded API's not included on UWP targets.
* Explicitly declared import project paths in target files.
* Added support to define x64 MASM build outside default targets file.

12 files changed, 66 insertions, 39 deletions

diff --git a/msvc/eglib.targets b/msvc/eglib.targets
index 5f9d4cd1c90..06da959d67a 100644
--- a/msvc/eglib.targets
+++ b/msvc/eglib.targets
@@ -1,6 +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="eglib-common.targets" />
-  <Import Project="eglib-win32.targets" />
-  <Import Project="eglib-posix.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)eglib-common.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)eglib-win32.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)eglib-posix.targets" />
 </Project>
\ No newline at end of file
diff --git a/msvc/eglib.targets.filters b/msvc/eglib.targets.filters
index 5727d3c669f..ae668fafa3e 100644
--- a/msvc/eglib.targets.filters
+++ b/msvc/eglib.targets.filters
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="eglib-common.targets.filters" />
-  <Import Project="eglib-win32.targets.filters" />
-  <Import Project="eglib-posix.targets.filters" />
+  <Import Project="$(MSBuildThisFileDirectory)eglib-common.targets.filters" />
+  <Import Project="$(MSBuildThisFileDirectory)eglib-win32.targets.filters" />
+  <Import Project="$(MSBuildThisFileDirectory)eglib-posix.targets.filters" />
   <ItemGroup Condition="'$(EGLibFilterSubFolder)'!=''">
     <Filter Include="Source Files$(EGLibFilterSubFolder)">
       <UniqueIdentifier>{8B3E0DAF-48EA-4B5F-B573-4E8ED8525134}</UniqueIdentifier>
diff --git a/msvc/libmini-arch.targets b/msvc/libmini-arch.targets
index c02878fe9c1..c4414d7a00c 100644
--- a/msvc/libmini-arch.targets
+++ b/msvc/libmini-arch.targets
@@ -2,9 +2,13 @@
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <ExcludeFromWindowsBuild>true</ExcludeFromWindowsBuild>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(ExcludeFromWindows32Build)'==''">
     <ExcludeFromWindows32Build>false</ExcludeFromWindows32Build>
-    <ExcludeFromWindows64Build>false</ExcludeFromWindows64Build>
     <ExcludeFromWindows32Build Condition="'$(Platform)'=='Win32'">true</ExcludeFromWindows32Build>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(ExcludeFromWindows64Build)'==''">
+    <ExcludeFromWindows64Build>false</ExcludeFromWindows64Build>
     <ExcludeFromWindows64Build Condition="'$(Platform)'=='x64'">true</ExcludeFromWindows64Build>
   </PropertyGroup>
   <ItemGroup Label="arch_wasm_sources">
diff --git a/msvc/libmini.targets b/msvc/libmini.targets
index 999a576a629..5202159d86e 100644
--- a/msvc/libmini.targets
+++ b/msvc/libmini.targets
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="libmini-common.targets" />
-  <Import Project="libmini-win32.targets" />
-  <Import Project="libmini-posix.targets" />
-  <Import Project="libmini-arch.targets" />
-  <Import Project="libmini-interp.targets" />
-  <Import Project="libmini-llvm.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)libmini-common.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)libmini-win32.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)libmini-posix.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)libmini-arch.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)libmini-interp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)libmini-llvm.targets" />
 </Project>
diff --git a/msvc/libmini.targets.filters b/msvc/libmini.targets.filters
index 467de8a12af..972f58bf861 100644
--- a/msvc/libmini.targets.filters
+++ b/msvc/libmini.targets.filters
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="libmini-common.targets.filters" />
-  <Import Project="libmini-win32.targets.filters" />
-  <Import Project="libmini-posix.targets.filters" />
-  <Import Project="libmini-arch.targets.filters" />
-  <Import Project="libmini-interp.targets.filters" />
-  <Import Project="libmini-llvm.targets.filters" />
+  <Import Project="$(MSBuildThisFileDirectory)libmini-common.targets.filters" />
+  <Import Project="$(MSBuildThisFileDirectory)libmini-win32.targets.filters" />
+  <Import Project="$(MSBuildThisFileDirectory)libmini-posix.targets.filters" />
+  <Import Project="$(MSBuildThisFileDirectory)libmini-arch.targets.filters" />
+  <Import Project="$(MSBuildThisFileDirectory)libmini-interp.targets.filters" />
+  <Import Project="$(MSBuildThisFileDirectory)libmini-llvm.targets.filters" />
   <ItemGroup Condition="'$(MonoMiniFilterSubFolder)'!=''">
     <Filter Include="Header Files$(MonoMiniFilterSubFolder)">
       <UniqueIdentifier>{b64924de-7e02-416b-9779-4cc7fe0270e6}</UniqueIdentifier>
diff --git a/msvc/libmonoruntime-common.targets b/msvc/libmonoruntime-common.targets
index 2a18201825f..381f4f7bf16 100644
--- a/msvc/libmonoruntime-common.targets
+++ b/msvc/libmonoruntime-common.targets
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ExcludeFromWindowsBuild>true</ExcludeFromWindowsBuild>
+  </PropertyGroup>
   <ItemGroup Label="common_sources">
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\appdomain.c" />
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\domain.c" />
@@ -74,7 +77,9 @@
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\mono-perfcounters.h" />
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\mono-perfcounters-def.h" />
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\mono-ptr-array.h" />
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\mono-route.c" />
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\mono-route.c">
+      <ExcludedFromBuild>$(ExcludeFromWindowsBuild)</ExcludedFromBuild>
+    </ClCompile>
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\mono-route.h" />
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\monitor.h" />
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\normalization-tables.h" />
@@ -128,7 +133,9 @@
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\custom-attrs-internals.h" />
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\sre-internals.h" />
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\reflection-internals.h" />
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\file-mmap-posix.c" />
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\file-mmap-posix.c">
+      <ExcludedFromBuild>$(ExcludeFromWindowsBuild)</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\file-mmap-windows.c" />
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\file-mmap.h" />
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\object-offsets.h" />
@@ -142,7 +149,9 @@
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\w32semaphore.h" />
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\w32event.h" />
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\w32handle-namespace.h" />
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32handle-namespace.c" />
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32handle-namespace.c">
+      <ExcludedFromBuild>$(ExcludeFromWindowsBuild)</ExcludedFromBuild>
+    </ClCompile>
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\w32handle.h" />
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32handle.c" />
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\w32error.h" />
@@ -164,7 +173,7 @@
   </ItemGroup>
   <ItemGroup Label="null_sources">
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\console-null.c">
-      <ExcludedFromBuild>true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeFromWindowsBuild)</ExcludedFromBuild>
     </ClCompile>
   </ItemGroup>
   <ItemGroup Label="null_gc_sources">
diff --git a/msvc/libmonoruntime.targets b/msvc/libmonoruntime.targets
index 2db90bd79b3..3dcf845605a 100644
--- a/msvc/libmonoruntime.targets
+++ b/msvc/libmonoruntime.targets
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="libmonoruntime-common.targets" />
-  <Import Project="libmonoruntime-win32.targets" />
-  <Import Project="libmonoruntime-posix.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)libmonoruntime-common.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)libmonoruntime-win32.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)libmonoruntime-posix.targets" />
 </Project>
diff --git a/msvc/libmonoruntime.targets.filters b/msvc/libmonoruntime.targets.filters
index cad037ad015..2653ecb2d84 100644
--- a/msvc/libmonoruntime.targets.filters
+++ b/msvc/libmonoruntime.targets.filters
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="libmonoruntime-common.targets.filters" />
-  <Import Project="libmonoruntime-win32.targets.filters" />
-  <Import Project="libmonoruntime-posix.targets.filters" />
+  <Import Project="$(MSBuildThisFileDirectory)libmonoruntime-common.targets.filters" />
+  <Import Project="$(MSBuildThisFileDirectory)libmonoruntime-win32.targets.filters" />
+  <Import Project="$(MSBuildThisFileDirectory)libmonoruntime-posix.targets.filters" />
   <ItemGroup Condition="'$(MonoRuntimeFilterSubFolder)'!=''">
     <Filter Include="Header Files$(MonoRuntimeFilterSubFolder)">
       <UniqueIdentifier>{992766FD-0584-4B49-A4F7-B59947CD8488}</UniqueIdentifier>
diff --git a/msvc/libmonoutils-arch.targets b/msvc/libmonoutils-arch.targets
index 041daa7863d..96bfd8bb5e9 100644
--- a/msvc/libmonoutils-arch.targets
+++ b/msvc/libmonoutils-arch.targets
@@ -2,11 +2,18 @@
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <ExcludeFromWindowsBuild>true</ExcludeFromWindowsBuild>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(ExcludeFromWindows32Build)'==''">
     <ExcludeFromWindows32Build>false</ExcludeFromWindows32Build>
-    <ExcludeFromWindows64Build>false</ExcludeFromWindows64Build>
     <ExcludeFromWindows32Build Condition="'$(Platform)'=='Win32'">true</ExcludeFromWindows32Build>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(ExcludeFromWindows64Build)'==''">
+    <ExcludeFromWindows64Build>false</ExcludeFromWindows64Build>
     <ExcludeFromWindows64Build Condition="'$(Platform)'=='x64'">true</ExcludeFromWindows64Build>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(ExcludeMASMFromWindowsBuild)'==''">
+    <ExcludeMASMFromWindowsBuild>false</ExcludeMASMFromWindowsBuild>
+  </PropertyGroup>
   <ItemGroup Label="arch_x86_sources">
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\mach-support-x86.c">
       <ExcludedFromBuild>$(ExcludeFromWindowsBuild)</ExcludedFromBuild>
@@ -17,7 +24,7 @@
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\mach-support-amd64.c">
       <ExcludedFromBuild>$(ExcludeFromWindowsBuild)</ExcludedFromBuild>
     </ClCompile>
-    <MASM Include="$(MonoSourceLocation)\mono\utils\win64.asm">
+    <MASM Include="$(MonoSourceLocation)\mono\utils\win64.asm" Condition="'$(ExcludeMASMFromWindowsBuild)'=='false'">
       <FileType>Document</FileType>
       <ExcludedFromBuild>$(ExcludeFromWindows32Build)</ExcludedFromBuild>
       <PreprocessorDefinitions>X64</PreprocessorDefinitions>
@@ -75,7 +82,7 @@
     </ClCompile>
   </ItemGroup>
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="$(MonoSourceLocation)\msvc\masm.fixed.props" />
+    <Import Project="$(MSBuildThisFileDirectory)masm.fixed.props" />
     <Import Project="$(VCTargetsPath)\BuildCustomizations\masm.targets" />
   </ImportGroup>
 </Project>
diff --git a/msvc/libmonoutils-arch.targets.filters b/msvc/libmonoutils-arch.targets.filters
index 836b30fb65d..8498d9780c9 100644
--- a/msvc/libmonoutils-arch.targets.filters
+++ b/msvc/libmonoutils-arch.targets.filters
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Condition="'$(ExcludeMASMFromWindowsBuild)'==''">
+    <ExcludeMASMFromWindowsBuild>false</ExcludeMASMFromWindowsBuild>
+  </PropertyGroup>
   <ItemGroup Label="arch_x86_sources">
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\mach-support-x86.c">
       <Filter>Source Files$(MonoUtilsFilterSubFolder)\arch\x86</Filter>
@@ -12,7 +15,7 @@
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\mach-support-amd64.c">
       <Filter>Source Files$(MonoUtilsFilterSubFolder)\arch\amd64</Filter>
     </ClCompile>
-    <MASM Include="$(MonoSourceLocation)\mono\utils\win64.asm">
+    <MASM Include="$(MonoSourceLocation)\mono\utils\win64.asm" Condition="'$(ExcludeMASMFromWindowsBuild)'=='false'">
       <Filter>Resource Files$(MonoUtilsFilterSubFolder)\arch\amd64</Filter>
     </MASM>
   </ItemGroup>
diff --git a/msvc/libmonoutils-common.targets b/msvc/libmonoutils-common.targets
index d9da64597f1..0f0ce2a7788 100644
--- a/msvc/libmonoutils-common.targets
+++ b/msvc/libmonoutils-common.targets
@@ -51,7 +51,9 @@
     <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-mmap-internals.h" />
     <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-mmap-windows-internals.h" />
     <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-os-mutex.h" />
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-os-mutex.c" />
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-os-mutex.c">
+      <ExcludedFromBuild>$(ExcludeFromWindowsBuild)</ExcludedFromBuild>
+    </ClCompile>
     <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-os-wait.h" />
     <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-coop-mutex.h" />
     <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-once.h" />
@@ -98,7 +100,9 @@
     <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-uri.h" />
     <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-stdlib.h" />
     <ClInclude Include="$(MonoSourceLocation)\mono\utils\valgrind.h" />
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mach-support.c" />
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mach-support.c">
+      <ExcludedFromBuild>$(ExcludeFromWindowsBuild)</ExcludedFromBuild>
+    </ClCompile>
     <ClInclude Include="$(MonoSourceLocation)\mono\utils\mach-support.h" />
     <ClInclude Include="$(MonoSourceLocation)\mono\utils\memcheck.h" />
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-context.c" />
diff --git a/msvc/libmonoutils.targets b/msvc/libmonoutils.targets
index a9a95828f05..5ee9ed0cc40 100644
--- a/msvc/libmonoutils.targets
+++ b/msvc/libmonoutils.targets
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="libmonoutils-common.targets" />
-  <Import Project="libmonoutils-win32.targets" />
-  <Import Project="libmonoutils-posix.targets" />
-  <Import Project="libmonoutils-arch.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)libmonoutils-common.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)libmonoutils-win32.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)libmonoutils-posix.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)libmonoutils-arch.targets" />
 </Project>