projects
/
mono.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c5c1940
)
[xbuild] Fix warnings.
author
Ankit Jain
<radical@corewars.org>
Tue, 1 Mar 2011 11:40:19 +0000
(17:10 +0530)
committer
Ankit Jain
<radical@corewars.org>
Tue, 1 Mar 2011 11:40:52 +0000
(17:10 +0530)
mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/BuildChoose.cs
patch
|
blob
|
history
mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/BuildWhen.cs
patch
|
blob
|
history
mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/DirectoryScanner.cs
patch
|
blob
|
history
mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Engine.cs
patch
|
blob
|
history
mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Project.cs
patch
|
blob
|
history
mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/AL.cs
patch
|
blob
|
history
mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/AssemblyResolver.cs
patch
|
blob
|
history
mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/GetReferenceAssemblyPaths.cs
patch
|
blob
|
history
mcs/tools/xbuild/SolutionParser.cs
patch
|
blob
|
history
diff --git
a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/BuildChoose.cs
b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/BuildChoose.cs
index 7cf3632ec4a00beeec00b5b396dcff95ee188a0e..53725110f80f87e692164f4cd3d46144747e6dda 100644
(file)
--- a/
mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/BuildChoose.cs
+++ b/
mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/BuildChoose.cs
@@
-35,9
+35,9
@@
namespace Microsoft.Build.BuildEngine {
internal class BuildChoose {
BuildWhen otherwise;
internal class BuildChoose {
BuildWhen otherwise;
-
Project
project;
-
ImportedProject
importedProject;
-
XmlElement
xmlElement;
+
//Project
project;
+
//ImportedProject
importedProject;
+
//XmlElement
xmlElement;
List <BuildWhen> whens;
public BuildChoose (XmlElement xmlElement, Project project)
List <BuildWhen> whens;
public BuildChoose (XmlElement xmlElement, Project project)
@@
-47,9
+47,9
@@
namespace Microsoft.Build.BuildEngine {
internal BuildChoose (XmlElement xmlElement, Project project, ImportedProject importedProject)
{
internal BuildChoose (XmlElement xmlElement, Project project, ImportedProject importedProject)
{
- this.xmlElement = xmlElement;
- this.project = project;
- this.importedProject = importedProject;
+
//
this.xmlElement = xmlElement;
+
//
this.project = project;
+
//
this.importedProject = importedProject;
this.whens = new List <BuildWhen> ();
foreach (XmlNode xn in xmlElement.ChildNodes) {
this.whens = new List <BuildWhen> ();
foreach (XmlNode xn in xmlElement.ChildNodes) {
diff --git
a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/BuildWhen.cs
b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/BuildWhen.cs
index 09661da43599d8c27065abbb80ff539ac123c327..f243f679f22b9503c0da57ddcc9471434aa4b155 100644
(file)
--- a/
mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/BuildWhen.cs
+++ b/
mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/BuildWhen.cs
@@
-33,13
+33,13
@@
using System.Xml;
namespace Microsoft.Build.BuildEngine {
internal class BuildWhen {
namespace Microsoft.Build.BuildEngine {
internal class BuildWhen {
-
Project
parentProject;
+
//Project
parentProject;
GroupingCollection groupingCollection;
XmlElement whenElement;
public BuildWhen (XmlElement whenElement, Project parentProject)
{
GroupingCollection groupingCollection;
XmlElement whenElement;
public BuildWhen (XmlElement whenElement, Project parentProject)
{
- this.parentProject = parentProject;
+
//
this.parentProject = parentProject;
this.groupingCollection = new GroupingCollection (parentProject);
if (whenElement == null)
throw new ArgumentNullException ("whenElement");
this.groupingCollection = new GroupingCollection (parentProject);
if (whenElement == null)
throw new ArgumentNullException ("whenElement");
diff --git
a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/DirectoryScanner.cs
b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/DirectoryScanner.cs
index 4215deb0fb4f1673f18c9de29b921d9fb254bc2c..d16cbcf4a3d0a0e457520d5dff9adc64afdc61f9 100644
(file)
--- a/
mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/DirectoryScanner.cs
+++ b/
mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/DirectoryScanner.cs
@@
-57,7
+57,6
@@
namespace Microsoft.Build.BuildEngine {
{
Dictionary <string, bool> excludedItems;
List <ITaskItem> includedItems;
{
Dictionary <string, bool> excludedItems;
List <ITaskItem> includedItems;
- string[] splitExclude;
if (includes == null)
throw new ArgumentNullException ("Includes");
if (includes == null)
throw new ArgumentNullException ("Includes");
diff --git
a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Engine.cs
b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Engine.cs
index 239118910a277e63707b74a82afb515da34f3f3a..6799dc85daeaee0f330aa897e252ce87d073a2b1 100644
(file)
--- a/
mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Engine.cs
+++ b/
mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Engine.cs
@@
-45,7
+45,7
@@
namespace Microsoft.Build.BuildEngine {
const string defaultTasksProjectName = "Microsoft.Common.tasks";
EventSource eventSource;
bool buildStarted;
const string defaultTasksProjectName = "Microsoft.Common.tasks";
EventSource eventSource;
bool buildStarted;
- ToolsetDefinitionLocations toolsetLocations;
+
//
ToolsetDefinitionLocations toolsetLocations;
BuildPropertyGroup global_properties;
//IDictionary importedProjects;
List <ILogger> loggers;
BuildPropertyGroup global_properties;
//IDictionary importedProjects;
List <ILogger> loggers;
@@
-73,7
+73,7
@@
namespace Microsoft.Build.BuildEngine {
public Engine (ToolsetDefinitionLocations locations)
: this (ToolLocationHelper.GetPathToDotNetFramework (TargetDotNetFrameworkVersion.Version20))
{
public Engine (ToolsetDefinitionLocations locations)
: this (ToolLocationHelper.GetPathToDotNetFramework (TargetDotNetFrameworkVersion.Version20))
{
- toolsetLocations = locations;
+
//
toolsetLocations = locations;
}
public Engine (BuildPropertyGroup globalProperties)
}
public Engine (BuildPropertyGroup globalProperties)
@@
-86,7
+86,7
@@
namespace Microsoft.Build.BuildEngine {
: this (ToolLocationHelper.GetPathToDotNetFramework (TargetDotNetFrameworkVersion.Version20))
{
this.global_properties = globalProperties;
: this (ToolLocationHelper.GetPathToDotNetFramework (TargetDotNetFrameworkVersion.Version20))
{
this.global_properties = globalProperties;
- toolsetLocations = locations;
+
//
toolsetLocations = locations;
}
// engine should be invoked with path where binary files are
}
// engine should be invoked with path where binary files are
diff --git
a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Project.cs
b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Project.cs
index 4befeb90d8c354a14a38041bbba69017d1b9fe8b..f41ba855164d9df2c567a5a3404f22ba5bbbb831 100644
(file)
--- a/
mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Project.cs
+++ b/
mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Project.cs
@@
-929,6
+929,7
@@
namespace Microsoft.Build.BuildEngine {
BuildProperty bp;
evaluatedProperties = new BuildPropertyGroup (null, null, null, true);
BuildProperty bp;
evaluatedProperties = new BuildPropertyGroup (null, null, null, true);
+ conditionedProperties = new Dictionary<string, List<string>> ();
foreach (BuildProperty gp in GlobalProperties) {
bp = new BuildProperty (gp.Name, gp.Value, PropertyType.Global);
foreach (BuildProperty gp in GlobalProperties) {
bp = new BuildProperty (gp.Name, gp.Value, PropertyType.Global);
diff --git
a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/AL.cs
b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/AL.cs
index f0195f01e057ba46cd58d4e8f0b888d3b61ed819..6b91a2e25540927f0672b3efe56ed6afd6c1259f 100644
(file)
--- a/
mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/AL.cs
+++ b/
mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/AL.cs
@@
-37,8
+37,6
@@
using Mono.XBuild.Utilities;
namespace Microsoft.Build.Tasks {
public class AL : ToolTaskExtension {
namespace Microsoft.Build.Tasks {
public class AL : ToolTaskExtension {
- Process alProcess;
-
public AL ()
{
}
public AL ()
{
}
diff --git
a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/AssemblyResolver.cs
b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/AssemblyResolver.cs
index 143b005366fa1ea1bbdf9a8e6dd810b3188c1626..0a6ed084589efd09e2831aab38c2e4090273fec1 100644
(file)
--- a/
mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/AssemblyResolver.cs
+++ b/
mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/AssemblyResolver.cs
@@
-46,7
+46,6
@@
namespace Microsoft.Build.Tasks {
Dictionary<string, TargetFrameworkAssemblies> target_framework_cache;
Dictionary<string, Dictionary<Version, string>> gac;
TaskLoggingHelper log;
Dictionary<string, TargetFrameworkAssemblies> target_framework_cache;
Dictionary<string, Dictionary<Version, string>> gac;
TaskLoggingHelper log;
- StringWriter sw;
List<string> search_log;
static LibraryPcFileCache cache;
List<string> search_log;
static LibraryPcFileCache cache;
diff --git
a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/GetReferenceAssemblyPaths.cs
b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/GetReferenceAssemblyPaths.cs
index 2e82004c76a7c52dc381f6b6092b21d07b921eac..796296e35bde960d6ef7b80dddd62211ace444d0 100644
(file)
--- a/
mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/GetReferenceAssemblyPaths.cs
+++ b/
mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/GetReferenceAssemblyPaths.cs
@@
-265,7
+265,6
@@
namespace Microsoft.Build.Tasks
}
class Framework {
}
class Framework {
- public string Moniker;
public string[] Directories;
public string DisplayName;
}
public string[] Directories;
public string DisplayName;
}
diff --git
a/mcs/tools/xbuild/SolutionParser.cs
b/mcs/tools/xbuild/SolutionParser.cs
index c3fc69a46d150ca72c5f402e706a52fda7763722..b9f5090e2a4e8162ab250abdd8c861d88b932751 100644
(file)
--- a/
mcs/tools/xbuild/SolutionParser.cs
+++ b/
mcs/tools/xbuild/SolutionParser.cs
@@
-313,7
+313,6
@@
namespace Mono.XBuild.CommandLine {
string GetSlnFileVersion (StreamReader reader)
{
string GetSlnFileVersion (StreamReader reader)
{
- string strVersion = null;
string strInput = null;
Match match;
string strInput = null;
Match match;