Imported Upstream version 4.6.0.125

Former-commit-id: a2155e9bd80020e49e72e86c44da02a8ac0e57a4
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2016-08-03 10:59:49 +00:00
parent a569aebcfd
commit e79aa3c0ed
17047 changed files with 3137615 additions and 392334 deletions

View File

@@ -7,18 +7,12 @@ include $(XBUILD_DIR)/xbuild.make
LIBRARY = Microsoft.Build.dll
LIB_REFS = System System.Core System.Xml Microsoft.Build.Engine Microsoft.Build.Framework
LIB_REFS = $(PARENT_PROFILE)System $(PARENT_PROFILE)System.Core $(PARENT_PROFILE)System.Xml Microsoft.Build.Engine Microsoft.Build.Framework
LIB_MCS_FLAGS = \
/r:$(corlib) \
/r:System.dll \
/r:System.Core.dll \
/r:System.Xml.dll \
/r:Microsoft.Build.Engine.dll \
/r:Microsoft.Build.Framework.dll \
/d:MICROSOFT_BUILD_DLL
TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) \
/r:Microsoft.Build.Utilities.v4.0.dll
TEST_MCS_FLAGS = $(LIB_MCS_FLAGS)
TEST_LIB_REFS = $(XBUILD_UTILITIES)
EXTRA_DISTFILES = \
Microsoft.Build.Internal/ExpressionParser.jay \

View File

@@ -54,7 +54,8 @@ namespace Microsoft.Build.Execution
public void Dispose ()
{
WaitHandle.WaitAll (submissions.Select (s => s.WaitHandle).ToArray ());
if (submissions.Count > 0)
WaitHandle.WaitAll (submissions.Select (s => s.WaitHandle).ToArray ());
BuildNodeManager.Stop ();
}

View File

@@ -427,6 +427,7 @@ namespace Microsoft.Build.Execution
};
var requestData = new BuildRequestData (this, targets ?? DefaultTargets.ToArray ());
var result = manager.Build (parameters, requestData);
manager.Dispose ();
targetOutputs = result.ResultsByTarget;
return result.OverallResult == BuildResultCode.Success;
}

View File

@@ -41,7 +41,10 @@ namespace Microsoft.Build.Internal
public BuildNodeManager (BuildManager buildManager)
{
BuildManager = buildManager;
new Thread (RunLoop).Start ();
new Thread (RunLoop) {
IsBackground = true,
Name = "xbuild request handler"
}.Start ();
}
~BuildNodeManager ()