From 556569fbb8c62ca169061dc1ff509785e82beedb Mon Sep 17 00:00:00 2001
From: Igor Velikorossov <igor.velikorossov@microsoft.com>
Date: Thu, 28 Nov 2019 11:27:37 +1100
Subject: [PATCH] fix: Type 'System.Windows.Forms.IWin32Window' is not defined

Builds randomly fail with "Type 'System.Windows.Forms.IWin32Window' is
not defined" error, estimated about 10% of builds failed because of this.

Investigations suggest that there may be MSBuild bug that
`GetCopyToOutputDirectoryItemsDependsOn` property stomps over previous
property value without including itself, thus leading to incorrect behaviours
later in a build.
More info: https://github.com/microsoft/msbuild/issues/4923#issuecomment-554265394

Closes #2107
---
 .../src/Microsoft.VisualBasic.Forms.vbproj        | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/Microsoft.VisualBasic.Forms/src/Microsoft.VisualBasic.Forms.vbproj b/src/Microsoft.VisualBasic.Forms/src/Microsoft.VisualBasic.Forms.vbproj
index b738fbd25b4..a13c424c19a 100644
--- a/src/Microsoft.VisualBasic.Forms/src/Microsoft.VisualBasic.Forms.vbproj
+++ b/src/Microsoft.VisualBasic.Forms/src/Microsoft.VisualBasic.Forms.vbproj
@@ -1,5 +1,10 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
+<Project>
+  <!--
+    https://github.com/dotnet/winforms/issues/2107#issuecomment-559289716
+    https://github.com/microsoft/msbuild/issues/4923#issuecomment-554265394
+    -->
+  <Import Project="Sdk.Props" Sdk="Microsoft.NET.Sdk" />
+  
   <PropertyGroup>
     <AssemblyName>Microsoft.VisualBasic.Forms</AssemblyName>
     <Deterministic>true</Deterministic>
@@ -39,4 +44,10 @@
     </EmbeddedResource>
   </ItemGroup>
 
+  <Import Project="Sdk.Targets" Sdk="Microsoft.NET.Sdk" />
+
+  <PropertyGroup>
+    <GetCopyToOutputDirectoryItemsDependsOn>AssignProjectConfiguration;$(GetCopyToOutputDirectoryItemsDependsOn)</GetCopyToOutputDirectoryItemsDependsOn>
+  </PropertyGroup>
+
 </Project>