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

4
mcs/class/Microsoft.Build/Microsoft.Build.Evaluation/Project.cs
View File

@@ -717,11 +717,7 @@ namespace Microsoft.Build.Evaluation
public bool SkipEvaluation { get; set; }
#if NET_4_5
public
#else
internal
#endif
IDictionary<string, ProjectTargetInstance> Targets {
get { return targets; }
}

24
mcs/class/Microsoft.Build/Microsoft.Build.Evaluation/ProjectCollection.cs
View File

@@ -69,11 +69,7 @@ namespace Microsoft.Build.Evaluation
static ProjectCollection ()
{
#if NET_4_5
global_project_collection = new ProjectCollection (new ReadOnlyDictionary<string, string> (new Dictionary<string, string> ()));
#else
global_project_collection = new ProjectCollection (new Dictionary<string, string> ());
#endif
}
public static string Escape (string unescapedString)
@@ -251,20 +247,24 @@ namespace Microsoft.Build.Evaluation
//FIXME: should also support config file, depending on ToolsetLocations
void LoadDefaultToolsets ()
{
AddToolset (new Toolset ("4.0",
ToolLocationHelper.GetPathToDotNetFramework (TargetDotNetFrameworkVersion.Version40), this, null));
#if XBUILD_12
AddToolset (new Toolset ("12.0", ToolLocationHelper.GetPathToBuildTools ("12.0"), this, null));
#endif
#if XBUILD_14
AddToolset (new Toolset ("14.0", ToolLocationHelper.GetPathToBuildTools ("14.0"), this, null));
#endif
// We don't support these anymore
AddToolset (new Toolset ("2.0",
ToolLocationHelper.GetPathToDotNetFramework (TargetDotNetFrameworkVersion.Version20), this, null));
AddToolset (new Toolset ("3.0",
ToolLocationHelper.GetPathToDotNetFramework (TargetDotNetFrameworkVersion.Version30), this, null));
AddToolset (new Toolset ("3.5",
ToolLocationHelper.GetPathToDotNetFramework (TargetDotNetFrameworkVersion.Version35), this, null));
#if NET_4_0
AddToolset (new Toolset ("4.0",
ToolLocationHelper.GetPathToDotNetFramework (TargetDotNetFrameworkVersion.Version40), this, null));
#endif
#if XBUILD_12
AddToolset (new Toolset ("12.0", ToolLocationHelper.GetPathToBuildTools ("12.0"), this, null));
#endif
default_tools_version = toolsets.First ().ToolsVersion;
default_tools_version = toolsets [0].ToolsVersion;
}
[MonoTODO ("not verified at all")]

2
mcs/class/Microsoft.Build/Microsoft.Build.Evaluation/SubToolset.cs
View File

@@ -4,9 +4,7 @@ using Microsoft.Build.Execution;
namespace Microsoft.Build.Evaluation
{
#if NET_4_5
public
#endif
class SubToolset
{
internal SubToolset (IDictionary<string, ProjectPropertyInstance> properties, string subToolsetVersion)

6
mcs/class/Microsoft.Build/Microsoft.Build.Evaluation/Toolset.cs
View File

@@ -48,9 +48,7 @@ namespace Microsoft.Build.Evaluation
{
}
#if NET_4_5
public
#endif
Toolset (string toolsVersion, string toolsPath, IDictionary<string, string> buildProperties,
ProjectCollection projectCollection, IDictionary<string, SubToolset> subToolsets,
string msbuildOverrideTasksPath)
@@ -61,15 +59,11 @@ namespace Microsoft.Build.Evaluation
buildProperties == null ?
new Dictionary<string, ProjectPropertyInstance> () :
buildProperties.Select (p => new ProjectPropertyInstance (p.Key, true, p.Value)).ToDictionary (e => e.Name);
#if NET_4_5
SubToolsets = subToolsets ?? new Dictionary<string, SubToolset> ();
#endif
}
#if NET_4_5
public string DefaultSubToolsetVersion { get; private set; }
public IDictionary<string, SubToolset> SubToolsets { get; private set; }
#endif
public IDictionary<string, ProjectPropertyInstance> Properties { get; private set; }