From c946df6b1dc1b62369501d1d7e934e02da375e88 Mon Sep 17 00:00:00 2001 From: Ankit Jain Date: Tue, 1 Mar 2011 17:10:19 +0530 Subject: [PATCH] [xbuild] Fix warnings. --- .../Microsoft.Build.BuildEngine/BuildChoose.cs | 12 ++++++------ .../Microsoft.Build.BuildEngine/BuildWhen.cs | 4 ++-- .../Microsoft.Build.BuildEngine/DirectoryScanner.cs | 1 - .../Microsoft.Build.BuildEngine/Engine.cs | 6 +++--- .../Microsoft.Build.BuildEngine/Project.cs | 1 + .../Microsoft.Build.Tasks/AL.cs | 2 -- .../Microsoft.Build.Tasks/AssemblyResolver.cs | 1 - .../GetReferenceAssemblyPaths.cs | 1 - mcs/tools/xbuild/SolutionParser.cs | 1 - 9 files changed, 12 insertions(+), 17 deletions(-) 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 7cf3632ec4a..53725110f80 100644 --- 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; - Project project; - ImportedProject importedProject; - XmlElement xmlElement; + //Project project; + //ImportedProject importedProject; + //XmlElement xmlElement; List whens; public BuildChoose (XmlElement xmlElement, Project project) @@ -47,9 +47,9 @@ namespace Microsoft.Build.BuildEngine { 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 (); 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 09661da4359..f243f679f22 100644 --- 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 { - Project parentProject; + //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"); 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 4215deb0fb4..d16cbcf4a3d 100644 --- 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 excludedItems; List includedItems; - string[] splitExclude; 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 239118910a2..6799dc85dae 100644 --- 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; - ToolsetDefinitionLocations toolsetLocations; + //ToolsetDefinitionLocations toolsetLocations; BuildPropertyGroup global_properties; //IDictionary importedProjects; List loggers; @@ -73,7 +73,7 @@ namespace Microsoft.Build.BuildEngine { public Engine (ToolsetDefinitionLocations locations) : this (ToolLocationHelper.GetPathToDotNetFramework (TargetDotNetFrameworkVersion.Version20)) { - toolsetLocations = locations; + //toolsetLocations = locations; } public Engine (BuildPropertyGroup globalProperties) @@ -86,7 +86,7 @@ namespace Microsoft.Build.BuildEngine { : this (ToolLocationHelper.GetPathToDotNetFramework (TargetDotNetFrameworkVersion.Version20)) { this.global_properties = globalProperties; - toolsetLocations = locations; + //toolsetLocations = locations; } // 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 4befeb90d8c..f41ba855164 100644 --- 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); + conditionedProperties = new Dictionary> (); 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 f0195f01e05..6b91a2e2554 100644 --- 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 { - Process alProcess; - 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 143b005366f..0a6ed084589 100644 --- 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 target_framework_cache; Dictionary> gac; TaskLoggingHelper log; - StringWriter sw; List 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 2e82004c76a..796296e35bd 100644 --- 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 { - public string Moniker; public string[] Directories; public string DisplayName; } diff --git a/mcs/tools/xbuild/SolutionParser.cs b/mcs/tools/xbuild/SolutionParser.cs index c3fc69a46d1..b9f5090e2a4 100644 --- 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 strVersion = null; string strInput = null; Match match; -- 2.25.1