From: monojenkins <jo.shields+jenkins@xamarin.com>
Date: Thu, 27 Feb 2020 17:08:56 +0000 (-0500)
Subject: Clean up libmono-dynamic.vcxproj dependency for netcore. (#32856)
X-Git-Tag: submit/tizen/20210909.063632~9461
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5426b70e5309f5005ce47a33b2e0daaeb57a5ebd;p=platform%2Fupstream%2Fdotnet%2Fruntime.git

Clean up libmono-dynamic.vcxproj dependency for netcore. (#32856)

Co-authored-by: Johan Lorensson <lateralusx.github@gmail.com>
---

diff --git a/src/mono/msvc/libgc.targets b/src/mono/msvc/libgc.targets
index 4f99736..5d69917 100644
--- a/src/mono/msvc/libgc.targets
+++ b/src/mono/msvc/libgc.targets
@@ -5,7 +5,7 @@
     <ExcludeBoehmGCFromBuild>true</ExcludeBoehmGCFromBuild>
     <ExcludeBoehmGCFromBuild Condition="'$(MONO_TARGET_GC)'=='boehm'">false</ExcludeBoehmGCFromBuild>
   </PropertyGroup>
-  <ItemGroup Label="libmonogc_la_sources">
+  <ItemGroup Label="libmonogc_sources">
     <ClCompile Include="$(MonoSourceLocation)\external\bdwgc\extra\gc.c">
       <ExcludedFromBuild>$(ExcludeBoehmGCFromBuild)</ExcludedFromBuild>
     </ClCompile>
diff --git a/src/mono/msvc/libgc.targets.filters b/src/mono/msvc/libgc.targets.filters
index 085b58e..2131f90 100644
--- a/src/mono/msvc/libgc.targets.filters
+++ b/src/mono/msvc/libgc.targets.filters
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="libmonogc_la_sources">
+  <ItemGroup Label="libmonogc_sources">
     <ClCompile Include="$(MonoSourceLocation)\external\bdwgc\extra\gc.c">
       <Filter>Source Files$(GCboehmFilterSubFolder)</Filter>
     </ClCompile>
diff --git a/src/mono/msvc/libmono-dynamic.vcxproj b/src/mono/msvc/libmono-dynamic.vcxproj
index ec0914b..3b1fab1 100644
--- a/src/mono/msvc/libmono-dynamic.vcxproj
+++ b/src/mono/msvc/libmono-dynamic.vcxproj
@@ -204,16 +204,16 @@
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ProjectReference Include="build-external-btls.vcxproj">
+    <ProjectReference Include="build-external-btls.vcxproj" Condition="'$(MONO_ENABLE_NETCORE)'=='false'">
       <Project>{e41ddf41-0916-454b-a7c2-6e410e45cafd}</Project>
     </ProjectReference>
-    <ProjectReference Include="build-external-llvm.vcxproj">
+    <ProjectReference Include="build-external-llvm.vcxproj" Condition="'$(MONO_ENABLE_NETCORE)'=='false'">
       <Project>{c3d4c623-55f8-4653-980d-61aa629b4e1d}</Project>
     </ProjectReference>
     <ProjectReference Include="genmdesc.vcxproj">
       <Project>{b7098dfa-31e6-4006-8a15-1c9a4e925149}</Project>
     </ProjectReference>
-    <ProjectReference Include="libgc.vcxproj">
+    <ProjectReference Include="libgc.vcxproj" Condition="'$(MONO_TARGET_GC)'=='boehm'">
       <Project>{eb56000b-c80b-4e8b-908d-d84d31b517d3}</Project>
     </ProjectReference>
   </ItemGroup>
@@ -229,7 +229,7 @@
   <Import Project="mono.external.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-  <Target Name="_SetupMonoLLVMCompileItems" Condition="$(MONO_ENABLE_LLVM)=='true'">
+  <Target Name="_SetupMonoLLVMCompileItems" Condition="'$(MONO_ENABLE_LLVM)'=='true'">
     <ItemGroup>
       <ClCompile>
         <AdditionalIncludeDirectories>$(MONO_LLVM_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -242,7 +242,7 @@
       </ClCompile>
     </ItemGroup>
   </Target>
-  <Target Name="_SetupMonoLLVMLinkItems" Condition="$(MONO_ENABLE_LLVM)=='true'">
+  <Target Name="_SetupMonoLLVMLinkItems" Condition="'$(MONO_ENABLE_LLVM)'=='true'">
     <ItemGroup>
       <Link>
         <AdditionalLibraryDirectories>$(MONO_LLVM_LIB_DIR);%(Link.AdditionalLibraryDirectories)</AdditionalLibraryDirectories>