mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 4.0.0~alpha1

Browse Source 
Former-commit-id: 806294f5ded97629b74c85c09952f2a74fe182d9
This commit is contained in:
Jo Shields
2015-04-07 09:35:12 +01:00
parent 283343f570
commit 3c1f479b9d
22469 changed files with 2931443 additions and 869343 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mcs/class/Microsoft.Build/Microsoft.Build.Internal/BuildEngine4.cs
View File

@@ -42,11 +42,7 @@ using System.Xml;
namespace Microsoft.Build.Internal
{
class BuildEngine4
#if NET_4_5
: IBuildEngine4
#else
: IBuildEngine3
#endif
{
public BuildEngine4 (BuildSubmission submission)
{
@@ -318,10 +314,8 @@ namespace Microsoft.Build.Internal
// Create Task instance.
var factoryIdentityParameters = new Dictionary<string,string> ();
#if NET_4_5
factoryIdentityParameters ["MSBuildRuntime"] = taskInstance.MSBuildRuntime;
factoryIdentityParameters ["MSBuildArchitecture"] = taskInstance.MSBuildArchitecture;
#endif
var task = args.BuildTaskFactory.CreateTask (taskInstance.Name, factoryIdentityParameters, this);
if (task == null)
throw new InvalidOperationException (string.Format ("TaskFactory {0} returned null Task", args.BuildTaskFactory));
@@ -523,7 +517,6 @@ namespace Microsoft.Build.Internal
}
}
#if NET_4_5
#region IBuildEngine4 implementation
// task objects are not in use anyways though...
@@ -564,7 +557,6 @@ namespace Microsoft.Build.Internal
return reg.Object;
}
#endregion
#endif
#region IBuildEngine3 implementation