From 1091bd94fd707a8373ff561821457a45ff9a3d9c Mon Sep 17 00:00:00 2001
From: lateralusX <lateralusx.github@gmail.com>
Date: Thu, 28 Sep 2017 14:51:49 +0200
Subject: [PATCH] Align libgcmonosgen vcxproj with makefile.

---
 msvc/libgcmonosgen.targets         | 266 ++++++++++++++---------------
 msvc/libgcmonosgen.targets.filters | 164 +++++++++---------
 2 files changed, 214 insertions(+), 216 deletions(-)

diff --git a/msvc/libgcmonosgen.targets b/msvc/libgcmonosgen.targets
index aba5c4343bf..fc5cc26d586 100644
--- a/msvc/libgcmonosgen.targets
+++ b/msvc/libgcmonosgen.targets
@@ -1,163 +1,161 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-alloc.c">
-		<ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
-	</ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-array-list.c">
-		<ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
-	</ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-cardtable.c">
-		<ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
-	</ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-debug.c">
-		<ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
-	</ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-descriptor.c">
-		<ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
-	</ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-gc.c">
-		<ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
-	</ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-gchandles.c">
-		<ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
-	</ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-gray.c">
-		<ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
-	</ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-hash-table.c">
-		<ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
-	</ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-internal.c">
-		<ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
-	</ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-los.c">
-		<ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
-	</ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-marksweep.c">
-		<ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
-	</ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-memory-governor.c">
-		<ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
-	</ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-nursery-allocator.c">
-		<ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
-	</ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-pinning-stats.c">
-		<ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
-	</ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-pinning.c">
-		<ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
-	</ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-pointer-queue.c">
-		<ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
-	</ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-protocol.c">
-		<ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
-	</ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-qsort.c">
-		<ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
-	</ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-simple-nursery.c">
-		<ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
-	</ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-split-nursery.c">
-		<ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
-	</ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-thread-pool.c">
-		<ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
-	</ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-workers.c">
-		<ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
-	</ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-fin-weak-hash.c">
-		<ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
-	</ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-layout-stats.c">
-		<ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
-	</ClCompile>
-  </ItemGroup>
-  <ItemGroup>
+  <ItemGroup Label="monosgen_sources">
     <ClInclude Include="$(MonoSourceLocation)\mono\sgen\gc-internal-agnostic.h">
-		<ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
-	</ClInclude>
+      <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-alloc.c">
+		  <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
+	  </ClCompile>
     <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-archdep.h">
-		<ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
-	</ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-array-list.h">
-		<ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
-	</ClInclude>
+      <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-cardtable.c">
+      <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
+    </ClCompile>
     <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-cardtable.h">
-		<ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
-	</ClInclude>
+      <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
+    </ClInclude>
     <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-client.h">
-		<ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
-	</ClInclude>
+      <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
+    </ClInclude>
     <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-conf.h">
-		<ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
-	</ClInclude>
+      <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
+    </ClInclude>
     <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-copy-object.h">
-		<ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
-	</ClInclude>
+      <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-debug.c">
+      <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-descriptor.c">
+      <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
+    </ClCompile>
     <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-descriptor.h">
-		<ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
-	</ClInclude>
+      <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-fin-weak-hash.c">
+      <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-gc.c">
+      <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
+    </ClCompile>
     <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-gc.h">
-		<ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
-	</ClInclude>
+      <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-gchandles.c">
+      <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-gray.c">
+      <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
+    </ClCompile>
     <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-gray.h">
-		<ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
-	</ClInclude>
+      <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-hash-table.c">
+      <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
+    </ClCompile>
     <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-hash-table.h">
-		<ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
-	</ClInclude>
+      <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-internal.c">
+      <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-layout-stats.c">
+      <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
+    </ClCompile>
     <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-layout-stats.h">
-		<ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
-	</ClInclude>
+      <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-los.c">
+      <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
+    </ClCompile>
     <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-major-copy-object.h">
-		<ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
-	</ClInclude>
+      <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
+    </ClInclude>
     <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-marksweep-drain-gray-stack.h">
-		<ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
-	</ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-marksweep-scan-object-concurrent.h">
-		<ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
-	</ClInclude>
+      <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-marksweep.c">
+      <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-memory-governor.c">
+      <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
+    </ClCompile>
     <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-memory-governor.h">
-		<ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
-	</ClInclude>
+      <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
+    </ClInclude>
     <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-minor-copy-object.h">
-		<ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
-	</ClInclude>
+      <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
+    </ClInclude>
     <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-minor-scan-object.h">
-		<ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
-	</ClInclude>
+      <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-nursery-allocator.c">
+      <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-pinning-stats.c">
+      <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-pinning.c">
+      <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
+    </ClCompile>
     <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-pinning.h">
-		<ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
-	</ClInclude>
+      <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-pointer-queue.c">
+      <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
+    </ClCompile>
     <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-pointer-queue.h">
-		<ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
-	</ClInclude>
+      <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-array-list.h">
+      <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-array-list.c">
+      <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
+    </ClCompile>
     <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-protocol-def.h">
-		<ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
-	</ClInclude>
+      <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-protocol.c">
+      <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
+    </ClCompile>
     <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-protocol.h">
-		<ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
-	</ClInclude>
+      <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-qsort.c">
+      <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
+    </ClCompile>
     <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-qsort.h">
-		<ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
-	</ClInclude>
+      <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
+    </ClInclude>
     <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-scan-object.h">
-		<ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
-	</ClInclude>
+      <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-simple-nursery.c">
+      <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-split-nursery.c">
+      <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
+    </ClCompile>
     <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-tagged-pointer.h">
-		<ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
-	</ClInclude>
+      <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-thread-pool.c">
+      <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
+    </ClCompile>
     <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-thread-pool.h">
-		<ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
-	</ClInclude>
+      <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-workers.c">
+      <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
+    </ClCompile>
     <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-workers.h">
-		<ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
-	</ClInclude>
+      <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="$(MonoSourceLocation)\mono\sgen\Makefile.am" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/msvc/libgcmonosgen.targets.filters b/msvc/libgcmonosgen.targets.filters
index 6713a534ff2..14c1299f190 100644
--- a/msvc/libgcmonosgen.targets.filters
+++ b/msvc/libgcmonosgen.targets.filters
@@ -1,125 +1,87 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
+  <ItemGroup Label="monosgen_sources">
+    <ClInclude Include="$(MonoSourceLocation)\mono\sgen\gc-internal-agnostic.h">
+      <Filter>Header Files$(MonoGCsgenFilterSubFolder)</Filter>
+    </ClInclude>
     <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-alloc.c">
       <Filter>Source Files$(MonoGCsgenFilterSubFolder)</Filter>
     </ClCompile>
+    <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-archdep.h">
+      <Filter>Header Files$(MonoGCsgenFilterSubFolder)</Filter>
+    </ClInclude>
     <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-cardtable.c">
       <Filter>Source Files$(MonoGCsgenFilterSubFolder)</Filter>
     </ClCompile>
+    <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-cardtable.h">
+      <Filter>Header Files$(MonoGCsgenFilterSubFolder)</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-client.h">
+      <Filter>Header Files$(MonoGCsgenFilterSubFolder)</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-conf.h">
+      <Filter>Header Files$(MonoGCsgenFilterSubFolder)</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-copy-object.h">
+      <Filter>Header Files$(MonoGCsgenFilterSubFolder)</Filter>
+    </ClInclude>
     <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-debug.c">
       <Filter>Source Files$(MonoGCsgenFilterSubFolder)</Filter>
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-descriptor.c">
       <Filter>Source Files$(MonoGCsgenFilterSubFolder)</Filter>
     </ClCompile>
+    <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-descriptor.h">
+      <Filter>Header Files$(MonoGCsgenFilterSubFolder)</Filter>
+    </ClInclude>
     <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-fin-weak-hash.c">
       <Filter>Source Files$(MonoGCsgenFilterSubFolder)</Filter>
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-gc.c">
       <Filter>Source Files$(MonoGCsgenFilterSubFolder)</Filter>
     </ClCompile>
+    <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-gc.h">
+      <Filter>Header Files$(MonoGCsgenFilterSubFolder)</Filter>
+    </ClInclude>
     <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-gchandles.c">
       <Filter>Source Files$(MonoGCsgenFilterSubFolder)</Filter>
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-gray.c">
       <Filter>Source Files$(MonoGCsgenFilterSubFolder)</Filter>
     </ClCompile>
+    <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-gray.h">
+      <Filter>Header Files$(MonoGCsgenFilterSubFolder)</Filter>
+    </ClInclude>
     <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-hash-table.c">
       <Filter>Source Files$(MonoGCsgenFilterSubFolder)</Filter>
     </ClCompile>
+    <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-hash-table.h">
+      <Filter>Header Files$(MonoGCsgenFilterSubFolder)</Filter>
+    </ClInclude>
     <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-internal.c">
       <Filter>Source Files$(MonoGCsgenFilterSubFolder)</Filter>
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-layout-stats.c">
       <Filter>Source Files$(MonoGCsgenFilterSubFolder)</Filter>
     </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-los.c">
-      <Filter>Source Files$(MonoGCsgenFilterSubFolder)</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-marksweep.c">
-      <Filter>Source Files$(MonoGCsgenFilterSubFolder)</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-memory-governor.c">
-      <Filter>Source Files$(MonoGCsgenFilterSubFolder)</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-nursery-allocator.c">
-      <Filter>Source Files$(MonoGCsgenFilterSubFolder)</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-pinning.c">
-      <Filter>Source Files$(MonoGCsgenFilterSubFolder)</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-pinning-stats.c">
-      <Filter>Source Files$(MonoGCsgenFilterSubFolder)</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-pointer-queue.c">
-      <Filter>Source Files$(MonoGCsgenFilterSubFolder)</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-protocol.c">
-      <Filter>Source Files$(MonoGCsgenFilterSubFolder)</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-qsort.c">
-      <Filter>Source Files$(MonoGCsgenFilterSubFolder)</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-simple-nursery.c">
-      <Filter>Source Files$(MonoGCsgenFilterSubFolder)</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-split-nursery.c">
-      <Filter>Source Files$(MonoGCsgenFilterSubFolder)</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-thread-pool.c">
-      <Filter>Source Files$(MonoGCsgenFilterSubFolder)</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-workers.c">
-      <Filter>Source Files$(MonoGCsgenFilterSubFolder)</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-array-list.c">
-      <Filter>Source Files$(MonoGCsgenFilterSubFolder)</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="$(MonoSourceLocation)\mono\sgen\gc-internal-agnostic.h">
-      <Filter>Header Files$(MonoGCsgenFilterSubFolder)</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-archdep.h">
-      <Filter>Header Files$(MonoGCsgenFilterSubFolder)</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-cardtable.h">
-      <Filter>Header Files$(MonoGCsgenFilterSubFolder)</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-client.h">
-      <Filter>Header Files$(MonoGCsgenFilterSubFolder)</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-conf.h">
-      <Filter>Header Files$(MonoGCsgenFilterSubFolder)</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-copy-object.h">
-      <Filter>Header Files$(MonoGCsgenFilterSubFolder)</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-descriptor.h">
-      <Filter>Header Files$(MonoGCsgenFilterSubFolder)</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-gc.h">
-      <Filter>Header Files$(MonoGCsgenFilterSubFolder)</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-gray.h">
-      <Filter>Header Files$(MonoGCsgenFilterSubFolder)</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-hash-table.h">
-      <Filter>Header Files$(MonoGCsgenFilterSubFolder)</Filter>
-    </ClInclude>
     <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-layout-stats.h">
       <Filter>Header Files$(MonoGCsgenFilterSubFolder)</Filter>
     </ClInclude>
+    <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-los.c">
+      <Filter>Source Files$(MonoGCsgenFilterSubFolder)</Filter>
+    </ClCompile>
     <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-major-copy-object.h">
       <Filter>Header Files$(MonoGCsgenFilterSubFolder)</Filter>
     </ClInclude>
     <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-marksweep-drain-gray-stack.h">
       <Filter>Header Files$(MonoGCsgenFilterSubFolder)</Filter>
     </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-marksweep-scan-object-concurrent.h">
-      <Filter>Header Files$(MonoGCsgenFilterSubFolder)</Filter>
-    </ClInclude>
+    <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-marksweep.c">
+      <Filter>Source Files$(MonoGCsgenFilterSubFolder)</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-memory-governor.c">
+      <Filter>Source Files$(MonoGCsgenFilterSubFolder)</Filter>
+    </ClCompile>
     <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-memory-governor.h">
       <Filter>Header Files$(MonoGCsgenFilterSubFolder)</Filter>
     </ClInclude>
@@ -129,36 +91,74 @@
     <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-minor-scan-object.h">
       <Filter>Header Files$(MonoGCsgenFilterSubFolder)</Filter>
     </ClInclude>
+    <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-nursery-allocator.c">
+      <Filter>Source Files$(MonoGCsgenFilterSubFolder)</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-pinning-stats.c">
+      <Filter>Source Files$(MonoGCsgenFilterSubFolder)</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-pinning.c">
+      <Filter>Source Files$(MonoGCsgenFilterSubFolder)</Filter>
+    </ClCompile>
     <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-pinning.h">
       <Filter>Header Files$(MonoGCsgenFilterSubFolder)</Filter>
     </ClInclude>
+    <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-pointer-queue.c">
+      <Filter>Source Files$(MonoGCsgenFilterSubFolder)</Filter>
+    </ClCompile>
     <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-pointer-queue.h">
       <Filter>Header Files$(MonoGCsgenFilterSubFolder)</Filter>
     </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-protocol.h">
+    <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-array-list.h">
       <Filter>Header Files$(MonoGCsgenFilterSubFolder)</Filter>
     </ClInclude>
+    <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-array-list.c">
+      <Filter>Source Files$(MonoGCsgenFilterSubFolder)</Filter>
+    </ClCompile>
     <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-protocol-def.h">
       <Filter>Header Files$(MonoGCsgenFilterSubFolder)</Filter>
     </ClInclude>
+    <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-protocol.c">
+      <Filter>Source Files$(MonoGCsgenFilterSubFolder)</Filter>
+    </ClCompile>
+    <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-protocol.h">
+      <Filter>Header Files$(MonoGCsgenFilterSubFolder)</Filter>
+    </ClInclude>
+    <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-qsort.c">
+      <Filter>Source Files$(MonoGCsgenFilterSubFolder)</Filter>
+    </ClCompile>
     <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-qsort.h">
       <Filter>Header Files$(MonoGCsgenFilterSubFolder)</Filter>
     </ClInclude>
     <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-scan-object.h">
       <Filter>Header Files$(MonoGCsgenFilterSubFolder)</Filter>
     </ClInclude>
+    <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-simple-nursery.c">
+      <Filter>Source Files$(MonoGCsgenFilterSubFolder)</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-split-nursery.c">
+      <Filter>Source Files$(MonoGCsgenFilterSubFolder)</Filter>
+    </ClCompile>
     <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-tagged-pointer.h">
       <Filter>Header Files$(MonoGCsgenFilterSubFolder)</Filter>
     </ClInclude>
+    <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-thread-pool.c">
+      <Filter>Source Files$(MonoGCsgenFilterSubFolder)</Filter>
+    </ClCompile>
     <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-thread-pool.h">
       <Filter>Header Files$(MonoGCsgenFilterSubFolder)</Filter>
     </ClInclude>
+    <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-workers.c">
+      <Filter>Source Files$(MonoGCsgenFilterSubFolder)</Filter>
+    </ClCompile>
     <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-workers.h">
       <Filter>Header Files$(MonoGCsgenFilterSubFolder)</Filter>
     </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-array-list.h">
-      <Filter>Header Files$(MonoGCsgenFilterSubFolder)</Filter>
-    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="$(MonoSourceLocation)\mono\sgen\Makefile.am">
+      <Filter>Resource Files$(MonoGCsgenFilterSubFolder)</Filter>
+    </None>
   </ItemGroup>
   <ItemGroup Condition="'$(MonoGCsgenFilterSubFolder)'!=''">
     <Filter Include="Header Files$(MonoGCsgenFilterSubFolder)">
-- 
2.25.1