From 8a0fd134fe213ebe5e77441622dec61ea2916107 Mon Sep 17 00:00:00 2001
From: Alexandr Surkov <sanyakid@mail.ru>
Date: Mon, 28 Mar 2016 17:23:25 +0300
Subject: [PATCH] Platform designer improvements from netmf 4.2 community
 branch

---
 .../BuildScriptWrapper.cs                     |   8 +-
 .../ComponentObjectModel/CodeGenerator.cs     |   4 -
 .../ComponentObjectModel/InventoryFormat.cs   | 658 +++++++++---------
 .../ComponentObjectModel/InventoryFormatEx.cs | 199 +++---
 .../ComponentObjectModel/InventoryHelper.cs   |  79 ++-
 .../ComponentObjectModel/MsBuildWrapper.cs    | 346 ++++-----
 .../ComponentObjectModel/ScatterfileSchema.cs | 331 ++++-----
 .../ScatterfileSchemaEx.cs                    |   1 -
 .../ScatterfileWrapper.cs                     |  76 +-
 .../PlatformDesigner/PlatformDesigner.sln     |   4 +-
 10 files changed, 869 insertions(+), 837 deletions(-)

diff --git a/CLR/Tools/PlatformDesigner/ComponentObjectModel/BuildScriptWrapper.cs b/CLR/Tools/PlatformDesigner/ComponentObjectModel/BuildScriptWrapper.cs
index 128e309a2..299c26d1d 100644
--- a/CLR/Tools/PlatformDesigner/ComponentObjectModel/BuildScriptWrapper.cs
+++ b/CLR/Tools/PlatformDesigner/ComponentObjectModel/BuildScriptWrapper.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections;
 using System.Collections.Generic;
-using System.Text;
 using System.IO;
 using XsdInventoryFormatObject;
 
@@ -112,7 +109,7 @@ public void ProduceBuildScript(string path, string scriptFileName)
                 tw.WriteLine();
                 tw.WriteLine(
 @":USAGE
-      @ECHO."   );
+      @ECHO.");
                 tw.WriteLine(
 "      @ECHO.Usage: msbuild_dotNetMF.cmd ^<TARGET^> ^<FLAVOR^> ^[^<options^>...^] ^[Projects \"<list>\"^]"
                 );
@@ -132,7 +129,7 @@ @ECHO   release       - release build
       @ECHO.^<options^>:");
                 foreach (BuildParameter bp in m_invHelper.BuildParameters)
                 {
-                    tw.WriteLine(string.Format("      @ECHO   {0,-14}- {1}", bp.Parameter, bp.Description ));
+                    tw.WriteLine(string.Format("      @ECHO   {0,-14}- {1}", bp.Parameter, bp.Description));
                 }
                 tw.WriteLine(
 @"      @ECHO.
@@ -151,3 +148,4 @@ @ECHO   release       - release build
 
     }
 }
+
diff --git a/CLR/Tools/PlatformDesigner/ComponentObjectModel/CodeGenerator.cs b/CLR/Tools/PlatformDesigner/ComponentObjectModel/CodeGenerator.cs
index 70dfec15b..eccf98fe5 100644
--- a/CLR/Tools/PlatformDesigner/ComponentObjectModel/CodeGenerator.cs
+++ b/CLR/Tools/PlatformDesigner/ComponentObjectModel/CodeGenerator.cs
@@ -1,7 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
 namespace ComponentObjectModel
 {
     class CodeGenerator
diff --git a/CLR/Tools/PlatformDesigner/ComponentObjectModel/InventoryFormat.cs b/CLR/Tools/PlatformDesigner/ComponentObjectModel/InventoryFormat.cs
index edec517f6..7e8d41da7 100644
--- a/CLR/Tools/PlatformDesigner/ComponentObjectModel/InventoryFormat.cs
+++ b/CLR/Tools/PlatformDesigner/ComponentObjectModel/InventoryFormat.cs
@@ -11,24 +11,28 @@
 // 
 // This source code was auto-generated by xsd, Version=2.0.50727.3038.
 // 
+
+using System;
+using System.CodeDom.Compiler;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Xml.Serialization;
+
 namespace XsdInventoryFormatObject {
-    using System.Xml.Serialization;
-    
-    
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.3038")]
-    [System.SerializableAttribute()]
+    [GeneratedCode("xsd", "2.0.50727.3038")]
+    [Serializable()]
     //[System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true, Namespace="http://schemas.microsoft.com/netmf/InventoryFormat.xsd")]
-    [System.Xml.Serialization.XmlRootAttribute(Namespace="http://schemas.microsoft.com/netmf/InventoryFormat.xsd", IsNullable=false)]
+    [DesignerCategory("code")]
+    [XmlType(AnonymousType=true, Namespace="http://schemas.microsoft.com/netmf/InventoryFormat.xsd")]
+    [XmlRoot(Namespace="http://schemas.microsoft.com/netmf/InventoryFormat.xsd", IsNullable=false)]
     public partial class InventoryCollection {
         
-        private System.Collections.Generic.List<Inventory> inventoriesField;
+        private List<Inventory> inventoriesField;
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute("Inventories")]
-        public System.Collections.Generic.List<Inventory> Inventories {
+        [XmlElement("Inventories")]
+        public List<Inventory> Inventories {
             get {
                 return this.inventoriesField;
             }
@@ -39,30 +43,30 @@ public System.Collections.Generic.List<Inventory> Inventories {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.3038")]
-    [System.SerializableAttribute()]
+    [GeneratedCode("xsd", "2.0.50727.3038")]
+    [Serializable()]
     //[System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://schemas.microsoft.com/netmf/InventoryFormat.xsd")]
+    [DesignerCategory("code")]
+    [XmlType(Namespace="http://schemas.microsoft.com/netmf/InventoryFormat.xsd")]
     public partial class Inventory {
         
-        private System.Collections.Generic.List<Library> librariesField;
+        private List<Library> librariesField;
         
-        private System.Collections.Generic.List<Feature> featuresField;
+        private List<Feature> featuresField;
         
-        private System.Collections.Generic.List<MFAssembly> assembliesField;
+        private List<MFAssembly> assembliesField;
         
-        private System.Collections.Generic.List<MFSolution> solutionsField;
+        private List<MFSolution> solutionsField;
         
-        private System.Collections.Generic.List<Processor> processorsField;
+        private List<Processor> processorsField;
         
-        private System.Collections.Generic.List<BuildTool> buildToolsField;
+        private List<BuildTool> buildToolsField;
         
-        private System.Collections.Generic.List<BuildParameter> buildParametersField;
+        private List<BuildParameter> buildParametersField;
         
-        private System.Collections.Generic.List<LibraryCategory> libraryCategoriesField;
+        private List<LibraryCategory> libraryCategoriesField;
         
-        private System.Collections.Generic.List<MFProject> projectTemplatesField;
+        private List<MFProject> projectTemplatesField;
         
         private string nameField;
         
@@ -71,8 +75,8 @@ public partial class Inventory {
         private Version versionField;
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute("Libraries")]
-        public System.Collections.Generic.List<Library> Libraries {
+        [XmlElement("Libraries")]
+        public List<Library> Libraries {
             get {
                 return this.librariesField;
             }
@@ -82,8 +86,8 @@ public System.Collections.Generic.List<Library> Libraries {
         }
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute("Features")]
-        public System.Collections.Generic.List<Feature> Features {
+        [XmlElement("Features")]
+        public List<Feature> Features {
             get {
                 return this.featuresField;
             }
@@ -93,8 +97,8 @@ public System.Collections.Generic.List<Feature> Features {
         }
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute("Assemblies")]
-        public System.Collections.Generic.List<MFAssembly> Assemblies {
+        [XmlElement("Assemblies")]
+        public List<MFAssembly> Assemblies {
             get {
                 return this.assembliesField;
             }
@@ -104,8 +108,8 @@ public System.Collections.Generic.List<MFAssembly> Assemblies {
         }
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute("Solutions")]
-        public System.Collections.Generic.List<MFSolution> Solutions {
+        [XmlElement("Solutions")]
+        public List<MFSolution> Solutions {
             get {
                 return this.solutionsField;
             }
@@ -115,8 +119,8 @@ public System.Collections.Generic.List<MFSolution> Solutions {
         }
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute("Processors")]
-        public System.Collections.Generic.List<Processor> Processors {
+        [XmlElement("Processors")]
+        public List<Processor> Processors {
             get {
                 return this.processorsField;
             }
@@ -126,8 +130,8 @@ public System.Collections.Generic.List<Processor> Processors {
         }
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute("BuildTools")]
-        public System.Collections.Generic.List<BuildTool> BuildTools {
+        [XmlElement("BuildTools")]
+        public List<BuildTool> BuildTools {
             get {
                 return this.buildToolsField;
             }
@@ -137,8 +141,8 @@ public System.Collections.Generic.List<BuildTool> BuildTools {
         }
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute("BuildParameters")]
-        public System.Collections.Generic.List<BuildParameter> BuildParameters {
+        [XmlElement("BuildParameters")]
+        public List<BuildParameter> BuildParameters {
             get {
                 return this.buildParametersField;
             }
@@ -148,8 +152,8 @@ public System.Collections.Generic.List<BuildParameter> BuildParameters {
         }
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute("LibraryCategories")]
-        public System.Collections.Generic.List<LibraryCategory> LibraryCategories {
+        [XmlElement("LibraryCategories")]
+        public List<LibraryCategory> LibraryCategories {
             get {
                 return this.libraryCategoriesField;
             }
@@ -159,8 +163,8 @@ public System.Collections.Generic.List<LibraryCategory> LibraryCategories {
         }
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute("ProjectTemplates")]
-        public System.Collections.Generic.List<MFProject> ProjectTemplates {
+        [XmlElement("ProjectTemplates")]
+        public List<MFProject> ProjectTemplates {
             get {
                 return this.projectTemplatesField;
             }
@@ -201,11 +205,11 @@ public Version Version {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.3038")]
-    [System.SerializableAttribute()]
+    [GeneratedCode("xsd", "2.0.50727.3038")]
+    [Serializable()]
     //[System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://schemas.microsoft.com/netmf/InventoryFormat.xsd")]
+    [DesignerCategory("code")]
+    [XmlType(Namespace="http://schemas.microsoft.com/netmf/InventoryFormat.xsd")]
     public partial class Library {
         
         private string nameField;
@@ -214,21 +218,21 @@ public partial class Library {
         
         private string guidField;
         
-        private System.Collections.Generic.List<MFComponent> dependenciesField;
+        private List<MFComponent> dependenciesField;
         
         private string descriptionField;
         
         private LibraryLevel levelField;
         
-        private System.Collections.Generic.List<MFBuildFile> sourceFilesField;
+        private List<MFBuildFile> sourceFilesField;
         
-        private System.Collections.Generic.List<MFBuildFile> headerFilesField;
+        private List<MFBuildFile> headerFilesField;
         
-        private System.Collections.Generic.List<MFBuildFile> includePathsField;
+        private List<MFBuildFile> includePathsField;
         
-        private System.Collections.Generic.List<MFBuildFile> fastCompileFilesField;
+        private List<MFBuildFile> fastCompileFilesField;
         
-        private System.Collections.Generic.List<MFBuildFile> otherFilesField;
+        private List<MFBuildFile> otherFilesField;
         
         private string libraryFileField;
         
@@ -258,7 +262,7 @@ public partial class Library {
         
         private bool isStubField;
         
-        private System.Collections.Generic.List<MFProperty> propertiesField;
+        private List<MFProperty> propertiesField;
         
         private bool isSolutionWizardVisibleField;
         
@@ -273,7 +277,7 @@ public string Name {
         }
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(DataType="integer")]
+        [XmlElement(DataType="integer")]
         public string Size {
             get {
                 return this.sizeField;
@@ -294,8 +298,8 @@ public string Guid {
         }
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute("Dependencies")]
-        public System.Collections.Generic.List<MFComponent> Dependencies {
+        [XmlElement("Dependencies")]
+        public List<MFComponent> Dependencies {
             get {
                 return this.dependenciesField;
             }
@@ -325,8 +329,8 @@ public LibraryLevel Level {
         }
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute("SourceFiles")]
-        public System.Collections.Generic.List<MFBuildFile> SourceFiles {
+        [XmlElement("SourceFiles")]
+        public List<MFBuildFile> SourceFiles {
             get {
                 return this.sourceFilesField;
             }
@@ -336,8 +340,8 @@ public System.Collections.Generic.List<MFBuildFile> SourceFiles {
         }
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute("HeaderFiles")]
-        public System.Collections.Generic.List<MFBuildFile> HeaderFiles {
+        [XmlElement("HeaderFiles")]
+        public List<MFBuildFile> HeaderFiles {
             get {
                 return this.headerFilesField;
             }
@@ -347,8 +351,8 @@ public System.Collections.Generic.List<MFBuildFile> HeaderFiles {
         }
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute("IncludePaths")]
-        public System.Collections.Generic.List<MFBuildFile> IncludePaths {
+        [XmlElement("IncludePaths")]
+        public List<MFBuildFile> IncludePaths {
             get {
                 return this.includePathsField;
             }
@@ -358,8 +362,8 @@ public System.Collections.Generic.List<MFBuildFile> IncludePaths {
         }
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute("FastCompileFiles")]
-        public System.Collections.Generic.List<MFBuildFile> FastCompileFiles {
+        [XmlElement("FastCompileFiles")]
+        public List<MFBuildFile> FastCompileFiles {
             get {
                 return this.fastCompileFilesField;
             }
@@ -369,8 +373,8 @@ public System.Collections.Generic.List<MFBuildFile> FastCompileFiles {
         }
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute("OtherFiles")]
-        public System.Collections.Generic.List<MFBuildFile> OtherFiles {
+        [XmlElement("OtherFiles")]
+        public List<MFBuildFile> OtherFiles {
             get {
                 return this.otherFilesField;
             }
@@ -520,8 +524,8 @@ public bool IsStub {
         }
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute("Properties")]
-        public System.Collections.Generic.List<MFProperty> Properties {
+        [XmlElement("Properties")]
+        public List<MFProperty> Properties {
             get {
                 return this.propertiesField;
             }
@@ -542,11 +546,11 @@ public bool IsSolutionWizardVisible {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.3038")]
-    [System.SerializableAttribute()]
+    [GeneratedCode("xsd", "2.0.50727.3038")]
+    [Serializable()]
     //[System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://schemas.microsoft.com/netmf/InventoryFormat.xsd")]
+    [DesignerCategory("code")]
+    [XmlType(Namespace="http://schemas.microsoft.com/netmf/InventoryFormat.xsd")]
     public partial class MFComponent {
         
         private Version versionDependencyField;
@@ -586,7 +590,7 @@ public MFComponentType ComponentType {
         }
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute()]
+        [XmlAttribute()]
         public string Name {
             get {
                 return this.nameField;
@@ -597,7 +601,7 @@ public string Name {
         }
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute()]
+        [XmlAttribute()]
         public string Guid {
             get {
                 return this.guidField;
@@ -608,7 +612,7 @@ public string Guid {
         }
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute()]
+        [XmlAttribute()]
         public string ProjectPath {
             get {
                 return this.projectPathField;
@@ -619,7 +623,7 @@ public string ProjectPath {
         }
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute()]
+        [XmlAttribute()]
         public string Conditional {
             get {
                 return this.conditionalField;
@@ -630,7 +634,7 @@ public string Conditional {
         }
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute()]
+        [XmlAttribute()]
         public int RefCount {
             get {
                 return this.refCountField;
@@ -641,7 +645,7 @@ public int RefCount {
         }
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlIgnoreAttribute()]
+        [XmlIgnore()]
         public bool RefCountSpecified {
             get {
                 return this.refCountFieldSpecified;
@@ -653,11 +657,11 @@ public bool RefCountSpecified {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.3038")]
-    [System.SerializableAttribute()]
+    [GeneratedCode("xsd", "2.0.50727.3038")]
+    [Serializable()]
     //[System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://schemas.microsoft.com/netmf/InventoryFormat.xsd")]
+    [DesignerCategory("code")]
+    [XmlType(Namespace="http://schemas.microsoft.com/netmf/InventoryFormat.xsd")]
     public partial class Version {
         
         private string majorField;
@@ -670,7 +674,7 @@ public partial class Version {
         
         private string extraField;
         
-        private System.DateTime dateField;
+        private DateTime dateField;
         
         private string authorField;
         
@@ -725,8 +729,8 @@ public string Extra {
         }
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute(DataType="date")]
-        public System.DateTime Date {
+        [XmlElement(DataType="date")]
+        public DateTime Date {
             get {
                 return this.dateField;
             }
@@ -747,11 +751,11 @@ public string Author {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.3038")]
-    [System.SerializableAttribute()]
+    [GeneratedCode("xsd", "2.0.50727.3038")]
+    [Serializable()]
     //[System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://schemas.microsoft.com/netmf/InventoryFormat.xsd")]
+    [DesignerCategory("code")]
+    [XmlType(Namespace="http://schemas.microsoft.com/netmf/InventoryFormat.xsd")]
     public partial class ApiTemplate {
         
         private string filePathField;
@@ -780,11 +784,11 @@ public string Description {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.3038")]
-    [System.SerializableAttribute()]
+    [GeneratedCode("xsd", "2.0.50727.3038")]
+    [Serializable()]
     //[System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://schemas.microsoft.com/netmf/InventoryFormat.xsd")]
+    [DesignerCategory("code")]
+    [XmlType(Namespace="http://schemas.microsoft.com/netmf/InventoryFormat.xsd")]
     public partial class LibraryCategory {
         
         private string nameField;
@@ -797,7 +801,7 @@ public partial class LibraryCategory {
         
         private string groupsField;
         
-        private System.Collections.Generic.List<ApiTemplate> templatesField;
+        private List<ApiTemplate> templatesField;
         
         private string documentationField;
         
@@ -811,9 +815,9 @@ public partial class LibraryCategory {
         
         private string projectPathField;
         
-        private System.Collections.Generic.List<string> libraryProjCacheField;
+        private List<string> libraryProjCacheField;
         
-        private System.Collections.Generic.List<MFComponent> featureAssociationsField;
+        private List<MFComponent> featureAssociationsField;
         
         private bool isTransportField;
         
@@ -868,8 +872,8 @@ public string Groups {
         }
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute("Templates")]
-        public System.Collections.Generic.List<ApiTemplate> Templates {
+        [XmlElement("Templates")]
+        public List<ApiTemplate> Templates {
             get {
                 return this.templatesField;
             }
@@ -939,8 +943,8 @@ public string ProjectPath {
         }
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute("LibraryProjCache")]
-        public System.Collections.Generic.List<string> LibraryProjCache {
+        [XmlElement("LibraryProjCache")]
+        public List<string> LibraryProjCache {
             get {
                 return this.libraryProjCacheField;
             }
@@ -950,8 +954,8 @@ public System.Collections.Generic.List<string> LibraryProjCache {
         }
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute("FeatureAssociations")]
-        public System.Collections.Generic.List<MFComponent> FeatureAssociations {
+        [XmlElement("FeatureAssociations")]
+        public List<MFComponent> FeatureAssociations {
             get {
                 return this.featureAssociationsField;
             }
@@ -972,9 +976,9 @@ public bool IsTransport {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.3038")]
-    [System.SerializableAttribute()]
-    [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://schemas.microsoft.com/netmf/InventoryFormat.xsd")]
+    [GeneratedCode("xsd", "2.0.50727.3038")]
+    [Serializable()]
+    [XmlType(Namespace="http://schemas.microsoft.com/netmf/InventoryFormat.xsd")]
     public enum LibraryLevel {
         
         /// <remarks/>
@@ -991,11 +995,11 @@ public enum LibraryLevel {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.3038")]
-    [System.SerializableAttribute()]
+    [GeneratedCode("xsd", "2.0.50727.3038")]
+    [Serializable()]
     //[System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://schemas.microsoft.com/netmf/InventoryFormat.xsd")]
+    [DesignerCategory("code")]
+    [XmlType(Namespace="http://schemas.microsoft.com/netmf/InventoryFormat.xsd")]
     public partial class BuildParameter {
         
         private string parameterField;
@@ -1036,11 +1040,11 @@ public string Description {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.3038")]
-    [System.SerializableAttribute()]
+    [GeneratedCode("xsd", "2.0.50727.3038")]
+    [Serializable()]
     //[System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://schemas.microsoft.com/netmf/InventoryFormat.xsd")]
+    [DesignerCategory("code")]
+    [XmlType(Namespace="http://schemas.microsoft.com/netmf/InventoryFormat.xsd")]
     public partial class MiscBuildTool {
         
         private string nameField;
@@ -1053,7 +1057,7 @@ public partial class MiscBuildTool {
         
         private string buildToolWrapperField;
         
-        private System.Collections.Generic.List<EnvVar> environmentVariablesField;
+        private List<EnvVar> environmentVariablesField;
         
         private string toolPathField;
         
@@ -1108,8 +1112,8 @@ public string BuildToolWrapper {
         }
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute("EnvironmentVariables")]
-        public System.Collections.Generic.List<EnvVar> EnvironmentVariables {
+        [XmlElement("EnvironmentVariables")]
+        public List<EnvVar> EnvironmentVariables {
             get {
                 return this.environmentVariablesField;
             }
@@ -1130,11 +1134,11 @@ public string ToolPath {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.3038")]
-    [System.SerializableAttribute()]
+    [GeneratedCode("xsd", "2.0.50727.3038")]
+    [Serializable()]
     //[System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://schemas.microsoft.com/netmf/InventoryFormat.xsd")]
+    [DesignerCategory("code")]
+    [XmlType(Namespace="http://schemas.microsoft.com/netmf/InventoryFormat.xsd")]
     public partial class BuildToolDefine {
         
         private string execField;
@@ -1175,16 +1179,16 @@ public string Conditional {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.3038")]
-    [System.SerializableAttribute()]
+    [GeneratedCode("xsd", "2.0.50727.3038")]
+    [Serializable()]
     //[System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://schemas.microsoft.com/netmf/InventoryFormat.xsd")]
+    [DesignerCategory("code")]
+    [XmlType(Namespace="http://schemas.microsoft.com/netmf/InventoryFormat.xsd")]
     public partial class ToolOptions {
         
         private BuildToolParameters buildToolParametersField;
         
-        private System.Collections.Generic.List<ToolFlag> toolFlagsField;
+        private List<ToolFlag> toolFlagsField;
         
         /// <remarks/>
         public BuildToolParameters BuildToolParameters {
@@ -1197,8 +1201,8 @@ public BuildToolParameters BuildToolParameters {
         }
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute("ToolFlags")]
-        public System.Collections.Generic.List<ToolFlag> ToolFlags {
+        [XmlElement("ToolFlags")]
+        public List<ToolFlag> ToolFlags {
             get {
                 return this.toolFlagsField;
             }
@@ -1209,22 +1213,22 @@ public System.Collections.Generic.List<ToolFlag> ToolFlags {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.3038")]
-    [System.SerializableAttribute()]
+    [GeneratedCode("xsd", "2.0.50727.3038")]
+    [Serializable()]
     //[System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://schemas.microsoft.com/netmf/InventoryFormat.xsd")]
+    [DesignerCategory("code")]
+    [XmlType(Namespace="http://schemas.microsoft.com/netmf/InventoryFormat.xsd")]
     public partial class BuildToolParameters {
         
-        private System.Collections.Generic.List<BuildScript> parametersField;
+        private List<BuildScript> parametersField;
         
-        private System.Collections.Generic.List<BuildScript> preBuildField;
+        private List<BuildScript> preBuildField;
         
-        private System.Collections.Generic.List<BuildScript> postBuildField;
+        private List<BuildScript> postBuildField;
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute("Parameters")]
-        public System.Collections.Generic.List<BuildScript> Parameters {
+        [XmlElement("Parameters")]
+        public List<BuildScript> Parameters {
             get {
                 return this.parametersField;
             }
@@ -1234,8 +1238,8 @@ public System.Collections.Generic.List<BuildScript> Parameters {
         }
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute("PreBuild")]
-        public System.Collections.Generic.List<BuildScript> PreBuild {
+        [XmlElement("PreBuild")]
+        public List<BuildScript> PreBuild {
             get {
                 return this.preBuildField;
             }
@@ -1245,8 +1249,8 @@ public System.Collections.Generic.List<BuildScript> PreBuild {
         }
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute("PostBuild")]
-        public System.Collections.Generic.List<BuildScript> PostBuild {
+        [XmlElement("PostBuild")]
+        public List<BuildScript> PostBuild {
             get {
                 return this.postBuildField;
             }
@@ -1257,11 +1261,11 @@ public System.Collections.Generic.List<BuildScript> PostBuild {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.3038")]
-    [System.SerializableAttribute()]
+    [GeneratedCode("xsd", "2.0.50727.3038")]
+    [Serializable()]
     //[System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://schemas.microsoft.com/netmf/InventoryFormat.xsd")]
+    [DesignerCategory("code")]
+    [XmlType(Namespace="http://schemas.microsoft.com/netmf/InventoryFormat.xsd")]
     public partial class BuildScript {
         
         private string conditionalField;
@@ -1290,11 +1294,11 @@ public string Script {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.3038")]
-    [System.SerializableAttribute()]
+    [GeneratedCode("xsd", "2.0.50727.3038")]
+    [Serializable()]
     //[System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://schemas.microsoft.com/netmf/InventoryFormat.xsd")]
+    [DesignerCategory("code")]
+    [XmlType(Namespace="http://schemas.microsoft.com/netmf/InventoryFormat.xsd")]
     public partial class ToolFlag {
         
         private string conditionalField;
@@ -1323,11 +1327,11 @@ public string Flag {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.3038")]
-    [System.SerializableAttribute()]
+    [GeneratedCode("xsd", "2.0.50727.3038")]
+    [Serializable()]
     //[System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://schemas.microsoft.com/netmf/InventoryFormat.xsd")]
+    [DesignerCategory("code")]
+    [XmlType(Namespace="http://schemas.microsoft.com/netmf/InventoryFormat.xsd")]
     public partial class EnvVar {
         
         private string nameField;
@@ -1368,11 +1372,11 @@ public string Conditional {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.3038")]
-    [System.SerializableAttribute()]
+    [GeneratedCode("xsd", "2.0.50727.3038")]
+    [Serializable()]
     //[System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://schemas.microsoft.com/netmf/InventoryFormat.xsd")]
+    [DesignerCategory("code")]
+    [XmlType(Namespace="http://schemas.microsoft.com/netmf/InventoryFormat.xsd")]
     public partial class ISA {
         
         private string nameField;
@@ -1449,11 +1453,11 @@ public ToolChainOptions BuildToolOptions {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.3038")]
-    [System.SerializableAttribute()]
+    [GeneratedCode("xsd", "2.0.50727.3038")]
+    [Serializable()]
     //[System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://schemas.microsoft.com/netmf/InventoryFormat.xsd")]
+    [DesignerCategory("code")]
+    [XmlType(Namespace="http://schemas.microsoft.com/netmf/InventoryFormat.xsd")]
     public partial class ToolChainOptions {
         
         private string toolNameField;
@@ -1462,11 +1466,11 @@ public partial class ToolChainOptions {
         
         private string deviceTypeField;
         
-        private System.Collections.Generic.List<ToolFlag> commonFlagsField;
+        private List<ToolFlag> commonFlagsField;
         
         private ToolOptions asmFlagsField;
         
-        private System.Collections.Generic.List<ToolFlag> c_CppFlagsField;
+        private List<ToolFlag> c_CppFlagsField;
         
         private ToolOptions cFlagsField;
         
@@ -1474,7 +1478,7 @@ public partial class ToolChainOptions {
         
         private ToolOptions linkerFlagsField;
         
-        private System.Collections.Generic.List<EnvVar> environmentVariablesField;
+        private List<EnvVar> environmentVariablesField;
         
         private ToolOptions archiverFlagsField;
         
@@ -1509,8 +1513,8 @@ public string DeviceType {
         }
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute("CommonFlags")]
-        public System.Collections.Generic.List<ToolFlag> CommonFlags {
+        [XmlElement("CommonFlags")]
+        public List<ToolFlag> CommonFlags {
             get {
                 return this.commonFlagsField;
             }
@@ -1530,8 +1534,8 @@ public ToolOptions AsmFlags {
         }
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute("C_CppFlags")]
-        public System.Collections.Generic.List<ToolFlag> C_CppFlags {
+        [XmlElement("C_CppFlags")]
+        public List<ToolFlag> C_CppFlags {
             get {
                 return this.c_CppFlagsField;
             }
@@ -1571,8 +1575,8 @@ public ToolOptions LinkerFlags {
         }
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute("EnvironmentVariables")]
-        public System.Collections.Generic.List<EnvVar> EnvironmentVariables {
+        [XmlElement("EnvironmentVariables")]
+        public List<EnvVar> EnvironmentVariables {
             get {
                 return this.environmentVariablesField;
             }
@@ -1593,11 +1597,11 @@ public ToolOptions ArchiverFlags {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.3038")]
-    [System.SerializableAttribute()]
+    [GeneratedCode("xsd", "2.0.50727.3038")]
+    [Serializable()]
     //[System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://schemas.microsoft.com/netmf/InventoryFormat.xsd")]
+    [DesignerCategory("code")]
+    [XmlType(Namespace="http://schemas.microsoft.com/netmf/InventoryFormat.xsd")]
     public partial class BuildTool {
         
         private string nameField;
@@ -1626,15 +1630,15 @@ public partial class BuildTool {
         
         private string toolPathField;
         
-        private System.Collections.Generic.List<ISA> supportedISAsField;
+        private List<ISA> supportedISAsField;
         
-        private System.Collections.Generic.List<string> supportedCpuNamesField;
+        private List<string> supportedCpuNamesField;
         
         private ToolChainOptions buildOptionsField;
         
         private string buildToolWrapperField;
         
-        private System.Collections.Generic.List<MiscBuildTool> miscToolsField;
+        private List<MiscBuildTool> miscToolsField;
         
         private string documentationField;
         
@@ -1642,9 +1646,9 @@ public partial class BuildTool {
         
         private Version versionField;
         
-        private System.Collections.Generic.List<MFProperty> propertiesField;
+        private List<MFProperty> propertiesField;
         
-        private System.Collections.Generic.List<MFProperty> itemsField;
+        private List<MFProperty> itemsField;
         
         private bool isSolutionWizardVisibleField;
         
@@ -1779,8 +1783,8 @@ public string ToolPath {
         }
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute("SupportedISAs")]
-        public System.Collections.Generic.List<ISA> SupportedISAs {
+        [XmlElement("SupportedISAs")]
+        public List<ISA> SupportedISAs {
             get {
                 return this.supportedISAsField;
             }
@@ -1790,8 +1794,8 @@ public System.Collections.Generic.List<ISA> SupportedISAs {
         }
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute("SupportedCpuNames")]
-        public System.Collections.Generic.List<string> SupportedCpuNames {
+        [XmlElement("SupportedCpuNames")]
+        public List<string> SupportedCpuNames {
             get {
                 return this.supportedCpuNamesField;
             }
@@ -1821,8 +1825,8 @@ public string BuildToolWrapper {
         }
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute("MiscTools")]
-        public System.Collections.Generic.List<MiscBuildTool> MiscTools {
+        [XmlElement("MiscTools")]
+        public List<MiscBuildTool> MiscTools {
             get {
                 return this.miscToolsField;
             }
@@ -1862,8 +1866,8 @@ public Version Version {
         }
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute("Properties")]
-        public System.Collections.Generic.List<MFProperty> Properties {
+        [XmlElement("Properties")]
+        public List<MFProperty> Properties {
             get {
                 return this.propertiesField;
             }
@@ -1873,8 +1877,8 @@ public System.Collections.Generic.List<MFProperty> Properties {
         }
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute("Items")]
-        public System.Collections.Generic.List<MFProperty> Items {
+        [XmlElement("Items")]
+        public List<MFProperty> Items {
             get {
                 return this.itemsField;
             }
@@ -1895,11 +1899,11 @@ public bool IsSolutionWizardVisible {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.3038")]
-    [System.SerializableAttribute()]
+    [GeneratedCode("xsd", "2.0.50727.3038")]
+    [Serializable()]
     //[System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://schemas.microsoft.com/netmf/InventoryFormat.xsd")]
+    [DesignerCategory("code")]
+    [XmlType(Namespace="http://schemas.microsoft.com/netmf/InventoryFormat.xsd")]
     public partial class MFProperty {
         
         private string nameField;
@@ -1909,7 +1913,7 @@ public partial class MFProperty {
         private string conditionField;
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute()]
+        [XmlAttribute()]
         public string Name {
             get {
                 return this.nameField;
@@ -1920,7 +1924,7 @@ public string Name {
         }
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute()]
+        [XmlAttribute()]
         public string Value {
             get {
                 return this.valueField;
@@ -1931,7 +1935,7 @@ public string Value {
         }
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute()]
+        [XmlAttribute()]
         public string Condition {
             get {
                 return this.conditionField;
@@ -1943,11 +1947,11 @@ public string Condition {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.3038")]
-    [System.SerializableAttribute()]
+    [GeneratedCode("xsd", "2.0.50727.3038")]
+    [Serializable()]
     //[System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://schemas.microsoft.com/netmf/InventoryFormat.xsd")]
+    [DesignerCategory("code")]
+    [XmlType(Namespace="http://schemas.microsoft.com/netmf/InventoryFormat.xsd")]
     public partial class Processor {
         
         private string nameField;
@@ -1956,9 +1960,9 @@ public partial class Processor {
         
         private string defaultISAField;
         
-        private System.Collections.Generic.List<MFComponent> supportedISAsField;
+        private List<MFComponent> supportedISAsField;
         
-        private System.Collections.Generic.List<BuildToolRef> buildToolOptionsField;
+        private List<BuildToolRef> buildToolOptionsField;
         
         private string guidField;
         
@@ -1972,7 +1976,7 @@ public partial class Processor {
         
         private string customFilterField;
         
-        private System.Collections.Generic.List<MFProperty> propertiesField;
+        private List<MFProperty> propertiesField;
         
         private Version versionField;
         
@@ -2009,8 +2013,8 @@ public string DefaultISA {
         }
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute("SupportedISAs")]
-        public System.Collections.Generic.List<MFComponent> SupportedISAs {
+        [XmlElement("SupportedISAs")]
+        public List<MFComponent> SupportedISAs {
             get {
                 return this.supportedISAsField;
             }
@@ -2020,8 +2024,8 @@ public System.Collections.Generic.List<MFComponent> SupportedISAs {
         }
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute("BuildToolOptions")]
-        public System.Collections.Generic.List<BuildToolRef> BuildToolOptions {
+        [XmlElement("BuildToolOptions")]
+        public List<BuildToolRef> BuildToolOptions {
             get {
                 return this.buildToolOptionsField;
             }
@@ -2091,8 +2095,8 @@ public string CustomFilter {
         }
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute("Properties")]
-        public System.Collections.Generic.List<MFProperty> Properties {
+        [XmlElement("Properties")]
+        public List<MFProperty> Properties {
             get {
                 return this.propertiesField;
             }
@@ -2123,11 +2127,11 @@ public bool IsSolutionWizardVisible {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.3038")]
-    [System.SerializableAttribute()]
+    [GeneratedCode("xsd", "2.0.50727.3038")]
+    [Serializable()]
     //[System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://schemas.microsoft.com/netmf/InventoryFormat.xsd")]
+    [DesignerCategory("code")]
+    [XmlType(Namespace="http://schemas.microsoft.com/netmf/InventoryFormat.xsd")]
     public partial class BuildToolRef {
         
         private string nameField;
@@ -2168,24 +2172,24 @@ public ToolChainOptions BuildOptions {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.3038")]
-    [System.SerializableAttribute()]
+    [GeneratedCode("xsd", "2.0.50727.3038")]
+    [Serializable()]
     //[System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://schemas.microsoft.com/netmf/InventoryFormat.xsd")]
+    [DesignerCategory("code")]
+    [XmlType(Namespace="http://schemas.microsoft.com/netmf/InventoryFormat.xsd")]
     public partial class EnvVars {
         
-        private System.Collections.Generic.List<EnvVar> envVarCollectionField;
+        private List<EnvVar> envVarCollectionField;
         
         private string conditionalField;
         
         private string nameField;
         
-        private System.Collections.Generic.List<EnvVars> envVarsCollectionField;
+        private List<EnvVars> envVarsCollectionField;
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute("EnvVarCollection")]
-        public System.Collections.Generic.List<EnvVar> EnvVarCollection {
+        [XmlElement("EnvVarCollection")]
+        public List<EnvVar> EnvVarCollection {
             get {
                 return this.envVarCollectionField;
             }
@@ -2215,8 +2219,8 @@ public string Name {
         }
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute("EnvVarsCollection")]
-        public System.Collections.Generic.List<EnvVars> EnvVarsCollection {
+        [XmlElement("EnvVarsCollection")]
+        public List<EnvVars> EnvVarsCollection {
             get {
                 return this.envVarsCollectionField;
             }
@@ -2227,11 +2231,11 @@ public System.Collections.Generic.List<EnvVars> EnvVarsCollection {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.3038")]
-    [System.SerializableAttribute()]
+    [GeneratedCode("xsd", "2.0.50727.3038")]
+    [Serializable()]
     //[System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://schemas.microsoft.com/netmf/InventoryFormat.xsd")]
+    [DesignerCategory("code")]
+    [XmlType(Namespace="http://schemas.microsoft.com/netmf/InventoryFormat.xsd")]
     public partial class MemorySymbol {
         
         private string nameField;
@@ -2296,16 +2300,16 @@ public int Order {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.3038")]
-    [System.SerializableAttribute()]
+    [GeneratedCode("xsd", "2.0.50727.3038")]
+    [Serializable()]
     //[System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://schemas.microsoft.com/netmf/InventoryFormat.xsd")]
+    [DesignerCategory("code")]
+    [XmlType(Namespace="http://schemas.microsoft.com/netmf/InventoryFormat.xsd")]
     public partial class MemorySection {
         
         private string nameField;
         
-        private System.Collections.Generic.List<MemorySymbol> symbolsField;
+        private List<MemorySymbol> symbolsField;
         
         private string addressField;
         
@@ -2330,8 +2334,8 @@ public string Name {
         }
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute("Symbols")]
-        public System.Collections.Generic.List<MemorySymbol> Symbols {
+        [XmlElement("Symbols")]
+        public List<MemorySymbol> Symbols {
             get {
                 return this.symbolsField;
             }
@@ -2402,14 +2406,14 @@ public int Order {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.3038")]
-    [System.SerializableAttribute()]
+    [GeneratedCode("xsd", "2.0.50727.3038")]
+    [Serializable()]
     //[System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://schemas.microsoft.com/netmf/InventoryFormat.xsd")]
+    [DesignerCategory("code")]
+    [XmlType(Namespace="http://schemas.microsoft.com/netmf/InventoryFormat.xsd")]
     public partial class MemoryRegion {
         
-        private System.Collections.Generic.List<MemorySection> sectionsField;
+        private List<MemorySection> sectionsField;
         
         private string addressField;
         
@@ -2424,8 +2428,8 @@ public partial class MemoryRegion {
         private string conditionalField;
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute("Sections")]
-        public System.Collections.Generic.List<MemorySection> Sections {
+        [XmlElement("Sections")]
+        public List<MemorySection> Sections {
             get {
                 return this.sectionsField;
             }
@@ -2496,14 +2500,14 @@ public string Conditional {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.3038")]
-    [System.SerializableAttribute()]
+    [GeneratedCode("xsd", "2.0.50727.3038")]
+    [Serializable()]
     //[System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://schemas.microsoft.com/netmf/InventoryFormat.xsd")]
+    [DesignerCategory("code")]
+    [XmlType(Namespace="http://schemas.microsoft.com/netmf/InventoryFormat.xsd")]
     public partial class MemoryMap {
         
-        private System.Collections.Generic.List<MemoryRegion> regionsField;
+        private List<MemoryRegion> regionsField;
         
         private string conditionalField;
         
@@ -2514,8 +2518,8 @@ public partial class MemoryMap {
         private EnvVars environmentVariablesField;
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute("Regions")]
-        public System.Collections.Generic.List<MemoryRegion> Regions {
+        [XmlElement("Regions")]
+        public List<MemoryRegion> Regions {
             get {
                 return this.regionsField;
             }
@@ -2566,11 +2570,11 @@ public EnvVars EnvironmentVariables {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.3038")]
-    [System.SerializableAttribute()]
+    [GeneratedCode("xsd", "2.0.50727.3038")]
+    [Serializable()]
     //[System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://schemas.microsoft.com/netmf/InventoryFormat.xsd")]
+    [DesignerCategory("code")]
+    [XmlType(Namespace="http://schemas.microsoft.com/netmf/InventoryFormat.xsd")]
     public partial class MFProject {
         
         private string nameField;
@@ -2587,27 +2591,27 @@ public partial class MFProject {
         
         private bool isClrProjectField;
         
-        private System.Collections.Generic.List<MFComponent> featuresField;
+        private List<MFComponent> featuresField;
         
-        private System.Collections.Generic.List<MFComponent> librariesField;
+        private List<MFComponent> librariesField;
         
-        private System.Collections.Generic.List<MFComponent> libraryCategoriesField;
+        private List<MFComponent> libraryCategoriesField;
         
-        private System.Collections.Generic.List<string> interopFeaturesField;
+        private List<string> interopFeaturesField;
         
-        private System.Collections.Generic.List<string> extraAssembliesField;
+        private List<string> extraAssembliesField;
         
-        private System.Collections.Generic.List<MFBuildFile> sourceFilesField;
+        private List<MFBuildFile> sourceFilesField;
         
-        private System.Collections.Generic.List<MFBuildFile> headerFilesField;
+        private List<MFBuildFile> headerFilesField;
         
-        private System.Collections.Generic.List<MFBuildFile> includePathsField;
+        private List<MFBuildFile> includePathsField;
         
-        private System.Collections.Generic.List<MFBuildFile> fastCompileFilesField;
+        private List<MFBuildFile> fastCompileFilesField;
         
         private MFBuildFile scatterFileField;
         
-        private System.Collections.Generic.List<MFBuildFile> otherFilesField;
+        private List<MFBuildFile> otherFilesField;
         
         private BuildToolRef buildToolField;
         
@@ -2617,7 +2621,7 @@ public partial class MFProject {
         
         private string settingsFileField;
         
-        private System.Collections.Generic.List<MFProperty> propertiesField;
+        private List<MFProperty> propertiesField;
         
         private bool isSolutionWizardVisibleField;
         
@@ -2692,8 +2696,8 @@ public bool IsClrProject {
         }
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute("Features")]
-        public System.Collections.Generic.List<MFComponent> Features {
+        [XmlElement("Features")]
+        public List<MFComponent> Features {
             get {
                 return this.featuresField;
             }
@@ -2703,8 +2707,8 @@ public System.Collections.Generic.List<MFComponent> Features {
         }
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute("Libraries")]
-        public System.Collections.Generic.List<MFComponent> Libraries {
+        [XmlElement("Libraries")]
+        public List<MFComponent> Libraries {
             get {
                 return this.librariesField;
             }
@@ -2714,8 +2718,8 @@ public System.Collections.Generic.List<MFComponent> Libraries {
         }
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute("LibraryCategories")]
-        public System.Collections.Generic.List<MFComponent> LibraryCategories {
+        [XmlElement("LibraryCategories")]
+        public List<MFComponent> LibraryCategories {
             get {
                 return this.libraryCategoriesField;
             }
@@ -2725,8 +2729,8 @@ public System.Collections.Generic.List<MFComponent> LibraryCategories {
         }
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute("InteropFeatures")]
-        public System.Collections.Generic.List<string> InteropFeatures {
+        [XmlElement("InteropFeatures")]
+        public List<string> InteropFeatures {
             get {
                 return this.interopFeaturesField;
             }
@@ -2736,8 +2740,8 @@ public System.Collections.Generic.List<string> InteropFeatures {
         }
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute("ExtraAssemblies")]
-        public System.Collections.Generic.List<string> ExtraAssemblies {
+        [XmlElement("ExtraAssemblies")]
+        public List<string> ExtraAssemblies {
             get {
                 return this.extraAssembliesField;
             }
@@ -2747,8 +2751,8 @@ public System.Collections.Generic.List<string> ExtraAssemblies {
         }
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute("SourceFiles")]
-        public System.Collections.Generic.List<MFBuildFile> SourceFiles {
+        [XmlElement("SourceFiles")]
+        public List<MFBuildFile> SourceFiles {
             get {
                 return this.sourceFilesField;
             }
@@ -2758,8 +2762,8 @@ public System.Collections.Generic.List<MFBuildFile> SourceFiles {
         }
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute("HeaderFiles")]
-        public System.Collections.Generic.List<MFBuildFile> HeaderFiles {
+        [XmlElement("HeaderFiles")]
+        public List<MFBuildFile> HeaderFiles {
             get {
                 return this.headerFilesField;
             }
@@ -2769,8 +2773,8 @@ public System.Collections.Generic.List<MFBuildFile> HeaderFiles {
         }
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute("IncludePaths")]
-        public System.Collections.Generic.List<MFBuildFile> IncludePaths {
+        [XmlElement("IncludePaths")]
+        public List<MFBuildFile> IncludePaths {
             get {
                 return this.includePathsField;
             }
@@ -2780,8 +2784,8 @@ public System.Collections.Generic.List<MFBuildFile> IncludePaths {
         }
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute("FastCompileFiles")]
-        public System.Collections.Generic.List<MFBuildFile> FastCompileFiles {
+        [XmlElement("FastCompileFiles")]
+        public List<MFBuildFile> FastCompileFiles {
             get {
                 return this.fastCompileFilesField;
             }
@@ -2801,8 +2805,8 @@ public MFBuildFile ScatterFile {
         }
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute("OtherFiles")]
-        public System.Collections.Generic.List<MFBuildFile> OtherFiles {
+        [XmlElement("OtherFiles")]
+        public List<MFBuildFile> OtherFiles {
             get {
                 return this.otherFilesField;
             }
@@ -2852,8 +2856,8 @@ public string SettingsFile {
         }
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute("Properties")]
-        public System.Collections.Generic.List<MFProperty> Properties {
+        [XmlElement("Properties")]
+        public List<MFProperty> Properties {
             get {
                 return this.propertiesField;
             }
@@ -2874,11 +2878,11 @@ public bool IsSolutionWizardVisible {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.3038")]
-    [System.SerializableAttribute()]
+    [GeneratedCode("xsd", "2.0.50727.3038")]
+    [Serializable()]
     //[System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://schemas.microsoft.com/netmf/InventoryFormat.xsd")]
+    [DesignerCategory("code")]
+    [XmlType(Namespace="http://schemas.microsoft.com/netmf/InventoryFormat.xsd")]
     public partial class MFBuildFile {
         
         private string itemNameField;
@@ -2888,7 +2892,7 @@ public partial class MFBuildFile {
         private string conditionField;
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute()]
+        [XmlAttribute()]
         public string ItemName {
             get {
                 return this.itemNameField;
@@ -2899,7 +2903,7 @@ public string ItemName {
         }
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute()]
+        [XmlAttribute()]
         public string File {
             get {
                 return this.fileField;
@@ -2910,7 +2914,7 @@ public string File {
         }
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute()]
+        [XmlAttribute()]
         public string Condition {
             get {
                 return this.conditionField;
@@ -2922,11 +2926,11 @@ public string Condition {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.3038")]
-    [System.SerializableAttribute()]
+    [GeneratedCode("xsd", "2.0.50727.3038")]
+    [Serializable()]
     //[System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://schemas.microsoft.com/netmf/InventoryFormat.xsd")]
+    [DesignerCategory("code")]
+    [XmlType(Namespace="http://schemas.microsoft.com/netmf/InventoryFormat.xsd")]
     public partial class MFSolution {
         
         private string nameField;
@@ -2941,7 +2945,7 @@ public partial class MFSolution {
         
         private string documentationField;
         
-        private System.Collections.Generic.List<MFProject> projectsField;
+        private List<MFProject> projectsField;
         
         private BuildToolRef buildToolField;
         
@@ -2967,9 +2971,9 @@ public partial class MFSolution {
         
         private string debuggerPortField;
         
-        private System.Collections.Generic.List<MFProperty> propertiesField;
+        private List<MFProperty> propertiesField;
         
-        private System.Collections.Generic.List<MFBuildFile> itemsField;
+        private List<MFBuildFile> itemsField;
         
         private string customFilterField;
         
@@ -3038,8 +3042,8 @@ public string Documentation {
         }
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute("Projects")]
-        public System.Collections.Generic.List<MFProject> Projects {
+        [XmlElement("Projects")]
+        public List<MFProject> Projects {
             get {
                 return this.projectsField;
             }
@@ -3169,8 +3173,8 @@ public string DebuggerPort {
         }
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute("Properties")]
-        public System.Collections.Generic.List<MFProperty> Properties {
+        [XmlElement("Properties")]
+        public List<MFProperty> Properties {
             get {
                 return this.propertiesField;
             }
@@ -3180,8 +3184,8 @@ public System.Collections.Generic.List<MFProperty> Properties {
         }
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute("Items")]
-        public System.Collections.Generic.List<MFBuildFile> Items {
+        [XmlElement("Items")]
+        public List<MFBuildFile> Items {
             get {
                 return this.itemsField;
             }
@@ -3222,11 +3226,11 @@ public string ENDIANNESS {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.3038")]
-    [System.SerializableAttribute()]
+    [GeneratedCode("xsd", "2.0.50727.3038")]
+    [Serializable()]
     //[System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://schemas.microsoft.com/netmf/InventoryFormat.xsd")]
+    [DesignerCategory("code")]
+    [XmlType(Namespace="http://schemas.microsoft.com/netmf/InventoryFormat.xsd")]
     public partial class MFAssembly {
         
         private string nameField;
@@ -3241,7 +3245,7 @@ public partial class MFAssembly {
         
         private string assemblyFileField;
         
-        private System.Collections.Generic.List<MFComponent> referencesField;
+        private List<MFComponent> referencesField;
         
         private bool isSolutionWizardVisibleField;
         
@@ -3306,8 +3310,8 @@ public string AssemblyFile {
         }
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute("References")]
-        public System.Collections.Generic.List<MFComponent> References {
+        [XmlElement("References")]
+        public List<MFComponent> References {
             get {
                 return this.referencesField;
             }
@@ -3328,24 +3332,24 @@ public bool IsSolutionWizardVisible {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.3038")]
-    [System.SerializableAttribute()]
+    [GeneratedCode("xsd", "2.0.50727.3038")]
+    [Serializable()]
     //[System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://schemas.microsoft.com/netmf/InventoryFormat.xsd")]
+    [DesignerCategory("code")]
+    [XmlType(Namespace="http://schemas.microsoft.com/netmf/InventoryFormat.xsd")]
     public partial class Feature {
         
         private string nameField;
         
         private string guidField;
         
-        private System.Collections.Generic.List<MFComponent> featureDependenciesField;
+        private List<MFComponent> featureDependenciesField;
         
         private string descriptionField;
         
         private string groupsField;
         
-        private System.Collections.Generic.List<MFComponent> componentDependenciesField;
+        private List<MFComponent> componentDependenciesField;
         
         private string documentationField;
         
@@ -3355,7 +3359,7 @@ public partial class Feature {
         
         private bool hiddenField;
         
-        private System.Collections.Generic.List<MFComponent> assembliesField;
+        private List<MFComponent> assembliesField;
         
         private bool isSolutionWizardVisibleField;
 
@@ -3382,8 +3386,8 @@ public string Guid {
         }
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute("FeatureDependencies")]
-        public System.Collections.Generic.List<MFComponent> FeatureDependencies {
+        [XmlElement("FeatureDependencies")]
+        public List<MFComponent> FeatureDependencies {
             get {
                 return this.featureDependenciesField;
             }
@@ -3413,8 +3417,8 @@ public string Groups {
         }
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute("ComponentDependencies")]
-        public System.Collections.Generic.List<MFComponent> ComponentDependencies {
+        [XmlElement("ComponentDependencies")]
+        public List<MFComponent> ComponentDependencies {
             get {
                 return this.componentDependenciesField;
             }
@@ -3464,8 +3468,8 @@ public bool Hidden {
         }
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute("Assemblies")]
-        public System.Collections.Generic.List<MFComponent> Assemblies {
+        [XmlElement("Assemblies")]
+        public List<MFComponent> Assemblies {
             get {
                 return this.assembliesField;
             }
@@ -3501,9 +3505,9 @@ public string Filter
 
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.3038")]
-    [System.SerializableAttribute()]
-    [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://schemas.microsoft.com/netmf/InventoryFormat.xsd")]
+    [GeneratedCode("xsd", "2.0.50727.3038")]
+    [Serializable()]
+    [XmlType(Namespace="http://schemas.microsoft.com/netmf/InventoryFormat.xsd")]
     public enum MFComponentType {
         
         /// <remarks/>
diff --git a/CLR/Tools/PlatformDesigner/ComponentObjectModel/InventoryFormatEx.cs b/CLR/Tools/PlatformDesigner/ComponentObjectModel/InventoryFormatEx.cs
index 85542a65d..3b497b266 100644
--- a/CLR/Tools/PlatformDesigner/ComponentObjectModel/InventoryFormatEx.cs
+++ b/CLR/Tools/PlatformDesigner/ComponentObjectModel/InventoryFormatEx.cs
@@ -1,11 +1,10 @@
-using System.Reflection;
 using System;
 using System.Collections;
-using System.Text.RegularExpressions;
-using Microsoft.Build.Framework;
 using System.Collections.Generic;
+using System.Diagnostics;
+using System.Reflection;
+using System.Text.RegularExpressions;
 using ComponentObjectModel;
-using Microsoft.Build.Execution;
 using Microsoft.Build.Construction;
 
 namespace XsdInventoryFormatObject
@@ -35,7 +34,7 @@ internal static string ReplaceText(string text, string old, string replace)
             return ret;
         }
 
-        internal static string ReplaceText(string text, Dictionary<string,string> nameChanges)
+        internal static string ReplaceText(string text, Dictionary<string, string> nameChanges)
         {
             if (nameChanges != null)
             {
@@ -48,11 +47,11 @@ internal static string ReplaceText(string text, Dictionary<string,string> nameCh
             return text;
         }
 
-        internal static void CopyTo(object from, object to, Dictionary<string,string> nameChanges)
+        internal static void CopyTo(object from, object to, Dictionary<string, string> nameChanges)
         {
-            Type toType = to.GetType();            
+            Type toType = to.GetType();
 
-            foreach(PropertyInfo fi in from.GetType().GetProperties())
+            foreach (PropertyInfo fi in from.GetType().GetProperties())
             {
                 object val = fi.GetValue(from, null);
 
@@ -60,12 +59,12 @@ internal static void CopyTo(object from, object to, Dictionary<string,string> na
                 {
                     if (fi.Name.ToUpper().Contains("GUID") && !(from is MFComponent) && !(from is BuildToolRef))
                     {
-                        fi.SetValue(to, System.Guid.NewGuid().ToString("B"), null);
+                        fi.SetValue(to, Guid.NewGuid().ToString("B"), null);
                     }
-                    else if (fi.PropertyType.FullName.ToUpper().Contains("SYSTEM.COLLECTIONS.GENERIC.LIST" ))
+                    else if (fi.PropertyType.FullName.ToUpper().Contains("SYSTEM.COLLECTIONS.GENERIC.LIST"))
                     {
-                        System.Collections.IList list = (System.Collections.IList)fi.PropertyType.GetConstructor(new Type[] { }).Invoke(null);
-                        System.Collections.IList listFrom = (System.Collections.IList)val;
+                        IList list = (IList)fi.PropertyType.GetConstructor(new Type[] { }).Invoke(null);
+                        IList listFrom = (IList)val;
 
                         foreach (object o in listFrom)
                         {
@@ -77,7 +76,7 @@ internal static void CopyTo(object from, object to, Dictionary<string,string> na
                             {
                                 list.Add(o);
                             }
-                            else if(o.GetType() == typeof(ProjectTargetElement))
+                            else if (o.GetType() == typeof(ProjectTargetElement))
                             {
                                 list.Add(o);
                             }
@@ -114,7 +113,7 @@ internal static void CopyTo(object from, object to, Dictionary<string,string> na
                     {
                         toType.GetProperty(fi.Name).SetValue(to, val, null);
                     }
-                    else if(fi.Name != "m_cloneSolution")
+                    else if (fi.Name != "m_cloneSolution")
                     {
                         object o = fi.PropertyType.GetConstructor(new Type[] { }).Invoke(null);
 
@@ -137,7 +136,7 @@ internal static void Rename(object targ, string oldName, string newName)
                 {
                     if (fi.PropertyType.FullName.ToUpper().Contains("SYSTEM.COLLECTIONS.GENERIC.LIST"))
                     {
-                        System.Collections.IList list = (System.Collections.IList)val;
+                        IList list = (IList)val;
                         ArrayList rem = new ArrayList();
                         ArrayList add = new ArrayList();
 
@@ -192,18 +191,18 @@ public partial class Inventory : object
         public Inventory()
         {
             //this.bSPsField = new System.Collections.Generic.List<BSP>();
-            this.buildParametersField = new System.Collections.Generic.List<BuildParameter>();
-            this.buildToolsField = new System.Collections.Generic.List<BuildTool>();
-            this.featuresField = new System.Collections.Generic.List<Feature>();
+            this.buildParametersField = new List<BuildParameter>();
+            this.buildToolsField = new List<BuildTool>();
+            this.featuresField = new List<Feature>();
             this.fileField = "";
-            this.librariesField = new System.Collections.Generic.List<Library>();
-            this.libraryCategoriesField = new System.Collections.Generic.List<LibraryCategory>();
+            this.librariesField = new List<Library>();
+            this.libraryCategoriesField = new List<LibraryCategory>();
             this.nameField = "";
-            this.solutionsField = new System.Collections.Generic.List<MFSolution>();
-            this.processorsField = new System.Collections.Generic.List<Processor>();
+            this.solutionsField = new List<MFSolution>();
+            this.processorsField = new List<Processor>();
             this.versionField = new Version();
-            this.assembliesField = new System.Collections.Generic.List<MFAssembly>();
-            this.projectTemplatesField = new System.Collections.Generic.List<MFProject>();
+            this.assembliesField = new List<MFAssembly>();
+            this.projectTemplatesField = new List<MFProject>();
         }
         public void CopyTo(Inventory dest)
         {
@@ -214,10 +213,10 @@ public void CopyTo(Inventory dest)
     public partial class MFComponent : object
     {
         public MFComponent() : this(MFComponentType.Unknown) { }
-        public MFComponent(MFComponentType type) 
-        { 
-            componentTypeField = type; 
-            refCountField = 0; 
+        public MFComponent(MFComponentType type)
+        {
+            componentTypeField = type;
+            refCountField = 0;
             conditionalField = "";
             projectPathField = "";
             conditionalField = "";
@@ -230,7 +229,7 @@ public MFComponent(MFComponentType type, string name, string guid, string projec
             this.nameField = name;
             this.projectPathField = projectPath;
             this.conditionalField = conditional;
-            this.guidField = string.IsNullOrEmpty(guid) ? System.Guid.NewGuid().ToString("B"): guid.ToUpper();
+            this.guidField = string.IsNullOrEmpty(guid) ? System.Guid.NewGuid().ToString("B") : guid.ToUpper();
             this.componentTypeField = type;
             this.refCountField = 0;
         }
@@ -266,7 +265,7 @@ public MFAssembly()
             this.groupsField = "";
             this.guidField = System.Guid.NewGuid().ToString("B");
             this.nameField = "";
-            this.referencesField = new System.Collections.Generic.List<MFComponent>();
+            this.referencesField = new List<MFComponent>();
             this.isSolutionWizardVisibleField = true;
         }
         public void CopyTo(MFAssembly dest)
@@ -279,15 +278,15 @@ public partial class Feature : object
     {
         public Feature()
         {
-            this.componentDependenciesField = new System.Collections.Generic.List<MFComponent>();
+            this.componentDependenciesField = new List<MFComponent>();
             this.descriptionField = "";
             this.documentationField = "";
-            this.featureDependenciesField = new System.Collections.Generic.List<MFComponent>();
+            this.featureDependenciesField = new List<MFComponent>();
             this.groupsField = "";
             this.nameField = "";
             this.guidField = System.Guid.NewGuid().ToString("B");
             this.projectPathField = "";
-            this.assembliesField = new System.Collections.Generic.List<MFComponent>();
+            this.assembliesField = new List<MFComponent>();
             this.IsSolutionWizardVisible = true;
         }
         public void CopyTo(Feature dest)
@@ -318,7 +317,7 @@ public Dictionary<string, MFComponent> GetDependants(InventoryHelper helper)
     public partial class MFProject : object
     {
         internal MFProject m_cloneProj = null;
-        System.Collections.Generic.List<ProjectTargetElement> targetsField;
+        List<ProjectTargetElement> targetsField;
 
         public MFProject()
         {
@@ -327,21 +326,21 @@ public MFProject()
             this.descriptionField = "";
             this.documentationField = "";
             this.directoryField = "";
-            this.featuresField = new System.Collections.Generic.List<MFComponent>();
+            this.featuresField = new List<MFComponent>();
             this.guidField = System.Guid.NewGuid().ToString("B");
-            this.librariesField = new System.Collections.Generic.List<MFComponent>();
+            this.librariesField = new List<MFComponent>();
             this.memoryMapField = new MemoryMap();
             this.nameField = "";
             this.versionField = new Version();
-            this.propertiesField = new System.Collections.Generic.List<MFProperty>();
-            this.interopFeaturesField = new System.Collections.Generic.List<string>();
-            this.extraAssembliesField = new System.Collections.Generic.List<string>();
-            this.sourceFilesField = new System.Collections.Generic.List<MFBuildFile>();
-            this.headerFilesField = new System.Collections.Generic.List<MFBuildFile>();
-            this.includePathsField = new System.Collections.Generic.List<MFBuildFile>();
-            this.otherFilesField = new System.Collections.Generic.List<MFBuildFile>();
-            this.fastCompileFilesField = new System.Collections.Generic.List<MFBuildFile>();
-            this.libraryCategoriesField = new System.Collections.Generic.List<MFComponent>();
+            this.propertiesField = new List<MFProperty>();
+            this.interopFeaturesField = new List<string>();
+            this.extraAssembliesField = new List<string>();
+            this.sourceFilesField = new List<MFBuildFile>();
+            this.headerFilesField = new List<MFBuildFile>();
+            this.includePathsField = new List<MFBuildFile>();
+            this.otherFilesField = new List<MFBuildFile>();
+            this.fastCompileFilesField = new List<MFBuildFile>();
+            this.libraryCategoriesField = new List<MFComponent>();
             this.isClrProjectField = false;
             this.isSolutionWizardVisibleField = true;
         }
@@ -432,7 +431,7 @@ private void RecurseFeatureDeps(MFComponent cmpFeat, List<MFComponent> features,
 
             Feature feat = helper.FindFeature(cmpFeat.Guid);
 
-            if(feat != null)
+            if (feat != null)
             {
                 foreach (MFComponent depFeat in feat.FeatureDependencies)
                 {
@@ -526,11 +525,11 @@ public bool ValidateLibrary(Library lib, MFSolution solution, Processor proc, In
                         if (!OK)
                         {
                             MFProject defProj = null;
-                            foreach(MFProject proj in solution.Projects)
+                            foreach (MFProject proj in solution.Projects)
                             {
-                                if(proj.IsClrProject)
+                                if (proj.IsClrProject)
                                 {
-                                    defProj = proj; 
+                                    defProj = proj;
                                     break;
                                 }
                             }
@@ -538,7 +537,7 @@ public bool ValidateLibrary(Library lib, MFSolution solution, Processor proc, In
                             foreach (MFComponent feat in defProj.Features)
                             {
                                 Feature f = helper.FindFeature(feat.Guid);
-                                
+
                                 if (f != null && 0 == string.Compare(f.Filter, libFilter, true))
                                 {
                                     OK = true;
@@ -581,7 +580,7 @@ public bool ValidateLibrary(Library lib, MFSolution solution, Processor proc, In
             }
             catch (Exception e)
             {
-                System.Diagnostics.Debug.WriteLine("Exception validating solution libraries: " + e.ToString());
+                Debug.WriteLine("Exception validating solution libraries: " + e.ToString());
                 return false;
             }
 
@@ -642,7 +641,7 @@ private void RecurseLibCatDeps(
                 }
             }
         }
-        
+
 
         public void AnalyzeLibraries(InventoryHelper helper, MFSolution solution, List<LibraryCategory> unresolved, List<LibraryCategory> removed)
         {
@@ -650,7 +649,7 @@ public void AnalyzeLibraries(InventoryHelper helper, MFSolution solution, List<L
             Dictionary<string, MFComponent> unresolvedTypes = new Dictionary<string, MFComponent>();
             List<MFComponent> features = new List<MFComponent>();
             Dictionary<string, MFComponent> preferredLibrary = new Dictionary<string, MFComponent>();
-            
+
             Processor proc = helper.FindProcessor(solution.Processor.Guid);
 
             libraryCategoriesField.Clear();
@@ -816,7 +815,7 @@ public void AnalyzeLibraries(InventoryHelper helper, MFSolution solution, List<L
                     }
                 }
             }
-            else if(solution.m_solRequiredLibCats != null)
+            else if (solution.m_solRequiredLibCats != null)
             {
                 foreach (MFComponent cmp in solution.m_solRequiredLibCats.Values)
                 {
@@ -935,7 +934,7 @@ public void AnalyzeLibraries(InventoryHelper helper, MFSolution solution, List<L
                                 if (libDep != null && libDep.HasLibraryCategory)
                                 {
                                     string key = libDep.LibraryCategory.Guid.ToLower();
-                                    if(!unresolvedTypes.ContainsKey(key) && !resolvedTypes.ContainsKey(key) && !newUnresolvedTypes.ContainsKey(key))
+                                    if (!unresolvedTypes.ContainsKey(key) && !resolvedTypes.ContainsKey(key) && !newUnresolvedTypes.ContainsKey(key))
                                     {
                                         newUnresolvedTypes[key] = libDep.LibraryCategory;
                                     }
@@ -1045,15 +1044,15 @@ public partial class MFSolution : object
         public MFSolution()
         {
             this.m_cloneSolution = null;
-            this.m_solRequiredLibCats = new Dictionary<string,MFComponent>();
+            this.m_solRequiredLibCats = new Dictionary<string, MFComponent>();
             this.m_clonedLibraryMap = new Dictionary<string, Library>();
             this.descriptionField = "";
             this.documentationField = "";
             this.guidField = System.Guid.NewGuid().ToString("B");
             this.nameField = "";
-            this.projectsField = new System.Collections.Generic.List<MFProject>(); 
+            this.projectsField = new List<MFProject>();
             this.versionField = new Version();
-            this.propertiesField = new System.Collections.Generic.List<MFProperty>();
+            this.propertiesField = new List<MFProperty>();
             this.isSolutionWizardVisibleField = true;
             this.authorField = "";
             this.itemsField = new List<MFBuildFile>();
@@ -1073,7 +1072,7 @@ public void CopyTo(MFSolution dest, string newName)
             Dictionary<string, string> hash = new Dictionary<string, string>();
 
             dest.m_cloneSolution = this;
-            
+
             hash[this.nameField] = newName;
             hash[@"\$\(PLATFORM\)"] = newName;
             hash[@"\$\(TARGETPLATFORM\)"] = newName;
@@ -1086,7 +1085,7 @@ public void Rename(string newName)
             if (m_cloneSolution == null)
             {
                 MFSolution sol = new MFSolution();
-                
+
                 CopyHelper.CopyTo(this, sol);
 
                 m_cloneSolution = sol;
@@ -1112,17 +1111,21 @@ public BuildTool()
             this.guidField = System.Guid.NewGuid().ToString("B");
             this.libExtField = "lib";
             this.linkerField = new BuildToolDefine();
-            this.miscToolsField = new System.Collections.Generic.List<MiscBuildTool>();
+            this.miscToolsField = new List<MiscBuildTool>();
             this.nameField = "";
             this.objExtField = "obj";
-            this.supportedISAsField = new System.Collections.Generic.List<ISA>();
+            this.supportedISAsField = new List<ISA>();
             this.toolPathField = "";
             this.versionField = new Version();
-            this.supportedCpuNamesField = new System.Collections.Generic.List<string>();
-            this.propertiesField = new System.Collections.Generic.List<MFProperty>();
-            this.itemsField = new System.Collections.Generic.List<MFProperty>();
+            this.supportedCpuNamesField = new List<string>();
+            this.propertiesField = new List<MFProperty>();
+            this.itemsField = new List<MFProperty>();
             this.isSolutionWizardVisibleField = true;
         }
+
+        /// <remarks/>
+        public string ScatterExt { get; set; }
+
         public void CopyTo(BuildTool dest)
         {
             CopyHelper.CopyTo(this, dest);
@@ -1167,12 +1170,12 @@ public partial class Processor : object
     {
         public Processor()
         {
-            this.buildToolOptionsField = new System.Collections.Generic.List<BuildToolRef>();
+            this.buildToolOptionsField = new List<BuildToolRef>();
             this.descriptionField = "";
             this.documentationField = "";
             this.guidField = System.Guid.NewGuid().ToString("B");
             this.nameField = "";
-            this.supportedISAsField = new System.Collections.Generic.List<MFComponent>();
+            this.supportedISAsField = new List<MFComponent>();
             this.versionField = new Version();
             this.isSolutionWizardVisibleField = true;
             this.customFilterField = "";
@@ -1188,11 +1191,11 @@ public ToolChainOptions()
         {
             this.archiverFlagsField = new ToolOptions();
             this.asmFlagsField = new ToolOptions();
-            this.c_CppFlagsField = new System.Collections.Generic.List<ToolFlag>();
+            this.c_CppFlagsField = new List<ToolFlag>();
             this.cFlagsField = new ToolOptions();
-            this.commonFlagsField = new System.Collections.Generic.List<ToolFlag>();
+            this.commonFlagsField = new List<ToolFlag>();
             this.cppFlagsField = new ToolOptions();
-            this.environmentVariablesField = new System.Collections.Generic.List<EnvVar>();
+            this.environmentVariablesField = new List<EnvVar>();
             this.linkerFlagsField = new ToolOptions();
         }
         public void CopyTo(ToolChainOptions dest)
@@ -1208,7 +1211,7 @@ public MemoryMap()
             this.descriptionField = "";
             this.environmentVariablesField = new EnvVars();
             this.nameField = "";
-            this.regionsField = new System.Collections.Generic.List<MemoryRegion>();
+            this.regionsField = new List<MemoryRegion>();
         }
         public void CopyTo(MemoryMap dest)
         {
@@ -1239,7 +1242,7 @@ public MemoryRegion()
             this.descriptionField = "";
             this.nameField = "";
             this.optionsField = "";
-            this.sectionsField = new System.Collections.Generic.List<MemorySection>();
+            this.sectionsField = new List<MemorySection>();
             this.sizeField = "";
         }
         public void CopyTo(MemoryRegion dest)
@@ -1258,7 +1261,7 @@ public MemorySection()
             this.optionsField = "";
             this.orderField = 0;
             this.sizeField = "";
-            this.symbolsField = new System.Collections.Generic.List<MemorySymbol>();
+            this.symbolsField = new List<MemorySymbol>();
         }
         public void CopyTo(MemorySection dest)
         {
@@ -1270,8 +1273,8 @@ public partial class EnvVars : object
         public EnvVars()
         {
             this.conditionalField = "";
-            this.envVarCollectionField = new System.Collections.Generic.List<EnvVar>();
-            this.envVarsCollectionField = new System.Collections.Generic.List<EnvVars>();
+            this.envVarCollectionField = new List<EnvVar>();
+            this.envVarsCollectionField = new List<EnvVars>();
             this.nameField = "";
         }
         public void CopyTo(EnvVars dest)
@@ -1307,12 +1310,12 @@ public void CopyTo(MFProperty dest)
     }
     public partial class Library : object
     {
-        System.Collections.Generic.List<ProjectTargetElement> targetsField;
+        List<ProjectTargetElement> targetsField;
 
         public Library()
         {
-            this.targetsField = new System.Collections.Generic.List<ProjectTargetElement>();
-            this.dependenciesField = new System.Collections.Generic.List<MFComponent>();
+            this.targetsField = new List<ProjectTargetElement>();
+            this.dependenciesField = new List<MFComponent>();
             this.descriptionField = "";
             this.documentationField = "";
             this.groupsField = "";
@@ -1330,12 +1333,12 @@ public Library()
             this.sizeField = "";
             //this.softDependenciesField = new System.Collections.Generic.List<MFComponent>();
             this.versionField = new Version();
-            this.propertiesField = new System.Collections.Generic.List<MFProperty>();
-            this.sourceFilesField = new System.Collections.Generic.List<MFBuildFile>();
-            this.headerFilesField = new System.Collections.Generic.List<MFBuildFile>();
-            this.fastCompileFilesField = new System.Collections.Generic.List<MFBuildFile>();
-            this.otherFilesField = new System.Collections.Generic.List<MFBuildFile>();
-            this.includePathsField = new System.Collections.Generic.List<MFBuildFile>();
+            this.propertiesField = new List<MFProperty>();
+            this.sourceFilesField = new List<MFBuildFile>();
+            this.headerFilesField = new List<MFBuildFile>();
+            this.fastCompileFilesField = new List<MFBuildFile>();
+            this.otherFilesField = new List<MFBuildFile>();
+            this.includePathsField = new List<MFBuildFile>();
             this.manifestFileField = "";
             this.projectPathField = "";
             this.isSolutionWizardVisibleField = true;
@@ -1343,11 +1346,17 @@ public Library()
 
         public bool HasLibraryCategory
         {
-            get { return !string.IsNullOrEmpty(libraryCategoryField.Guid); }
+            get
+            {
+                if (libraryCategoryField != null)
+                    return !string.IsNullOrEmpty(libraryCategoryField.Guid);
+                else
+                    return false;
+            }
             set { }
         }
 
-        public System.Collections.Generic.List<ProjectTargetElement> Targets
+        public List<ProjectTargetElement> Targets
         {
             get
             {
@@ -1394,10 +1403,10 @@ public LibraryCategory()
             this.nameField = "";
             this.requiredField = false;
             this.stubLibraryField = null;
-            this.templatesField = new System.Collections.Generic.List<ApiTemplate>();
+            this.templatesField = new List<ApiTemplate>();
             this.versionField = new Version();
             this.projectPathField = "";
-            this.libraryProjCacheField = new System.Collections.Generic.List<string>();
+            this.libraryProjCacheField = new List<string>();
             this.featureAssociationsField = new List<MFComponent>();
             this.IsTransport = false;
         }
@@ -1426,9 +1435,9 @@ public partial class BuildToolParameters : object
     {
         public BuildToolParameters()
         {
-            this.parametersField = new System.Collections.Generic.List<BuildScript>();
-            this.postBuildField = new System.Collections.Generic.List<BuildScript>();
-            this.preBuildField = new System.Collections.Generic.List<BuildScript>();
+            this.parametersField = new List<BuildScript>();
+            this.postBuildField = new List<BuildScript>();
+            this.preBuildField = new List<BuildScript>();
         }
         public void CopyTo(BuildToolParameters dest)
         {
@@ -1440,7 +1449,7 @@ public partial class ToolOptions : object
         public ToolOptions()
         {
             this.buildToolParametersField = new BuildToolParameters();
-            this.toolFlagsField = new System.Collections.Generic.List<ToolFlag>();
+            this.toolFlagsField = new List<ToolFlag>();
         }
         public void CopyTo(ToolOptions dest)
         {
@@ -1454,7 +1463,7 @@ public MiscBuildTool()
             this.buildToolField = new BuildToolDefine();
             this.buildToolOptionsField = new ToolOptions();
             this.buildToolWrapperField = "";
-            this.environmentVariablesField = new System.Collections.Generic.List<EnvVar>();
+            this.environmentVariablesField = new List<EnvVar>();
             this.guidField = System.Guid.NewGuid().ToString("B");
             this.nameField = "";
             this.toolPathField = "";
@@ -1482,7 +1491,7 @@ public partial class InventoryCollection : object
     {
         public InventoryCollection()
         {
-            this.inventoriesField = new System.Collections.Generic.List<Inventory>();
+            this.inventoriesField = new List<Inventory>();
         }
     }
     public partial class Version : object
@@ -1490,7 +1499,7 @@ public partial class Version : object
         public Version()
         {
             this.buildField = "0";
-            this.dateField = System.DateTime.Now;
+            this.dateField = DateTime.Now;
             this.extraField = "";
             this.majorField = "4";
             this.minorField = "0";
diff --git a/CLR/Tools/PlatformDesigner/ComponentObjectModel/InventoryHelper.cs b/CLR/Tools/PlatformDesigner/ComponentObjectModel/InventoryHelper.cs
index d0b4cc079..ac0f552bb 100644
--- a/CLR/Tools/PlatformDesigner/ComponentObjectModel/InventoryHelper.cs
+++ b/CLR/Tools/PlatformDesigner/ComponentObjectModel/InventoryHelper.cs
@@ -1,11 +1,9 @@
 using System;
-using System.IO;
-using System.Collections.Generic;
 using System.Collections;
-using System.Text;
-using XsdInventoryFormatObject;
+using System.Collections.Generic;
+using System.IO;
 using System.Reflection;
-using Microsoft.Build.Evaluation;
+using XsdInventoryFormatObject;
 
 namespace ComponentObjectModel
 {
@@ -26,11 +24,18 @@ public enum ComponentType
         };
 
         List<Inventory> m_invs;
-        Dictionary<string, object> m_guidToObjectHash = new Dictionary<string,object>();
+        Dictionary<string, object> m_guidToObjectHash = new Dictionary<string, object>();
         Dictionary<IList, Dictionary<string, object>> m_nameToObjectHash = new Dictionary<IList, Dictionary<string, object>>();
         Dictionary<string, object> m_fileToObjectHash = new Dictionary<string, object>();
         Dictionary<string, object> m_projToObjectHash = new Dictionary<string, object>();
         Dictionary<string, BuildParameter> m_nameToBuildParam = new Dictionary<string, BuildParameter>();
+        static bool s_exhaustiveLibrarySearch = false;
+
+        public static bool ExhaustiveLibrarySearch
+        {
+            get { return s_exhaustiveLibrarySearch; }
+            set { s_exhaustiveLibrarySearch = value; }
+        }
 
         public InventoryHelper(params Inventory[] inventories) : this(new List<Inventory>(inventories))
         {
@@ -67,7 +72,7 @@ private object FindObjectByProject(string file, IList list)
                 return o;
             }
 
-            if (!(list is IList<Library>))
+            if (s_exhaustiveLibrarySearch || !(list is IList<Library>))
             {
                 foreach (object o in list)
                 {
@@ -141,9 +146,9 @@ private object FindObjectByName(string name, IList list)
             {
                 nameToObjectHash = m_nameToObjectHash[list];
             }
-            else 
+            else
             {
-                nameToObjectHash = new Dictionary<string,object>();
+                nameToObjectHash = new Dictionary<string, object>();
 
                 m_nameToObjectHash[list] = nameToObjectHash;
             }
@@ -185,7 +190,7 @@ private object FindObjectByGuid(string guid, IList list)
                 return o;
             }
 
-            if (!(list is List<Library>))
+            if (s_exhaustiveLibrarySearch || !(list is List<Library>))
             {
                 foreach (object o in list)
                 {
@@ -213,7 +218,7 @@ private bool ValidateComponent(object component)
             bool bRet = true;
             object o = null;
 
-            if(component == null) return true;
+            if (component == null) return true;
 
             PropertyInfo pi = component.GetType().GetProperty("Guid");
 
@@ -227,8 +232,8 @@ private bool ValidateComponent(object component)
             {
                 PropertyInfo piNew = o.GetType().GetProperty("Name");
                 pi = component.GetType().GetProperty("Name");
-                string newName = piNew.GetValue(o,null) as string;
-                string oldName = pi.GetValue(component,null) as string;
+                string newName = piNew.GetValue(o, null) as string;
+                string oldName = pi.GetValue(component, null) as string;
                 if (pi != null && piNew != null)
                 {
                     if (0 != string.Compare(newName, oldName))
@@ -272,7 +277,7 @@ public void ValidateData()
                 */
                 foreach (Processor proc in inv.Processors)
                 {
-                    List< MFComponent > removeISAs = new List<MFComponent>();
+                    List<MFComponent> removeISAs = new List<MFComponent>();
 
                     foreach (MFComponent isa in proc.SupportedISAs)
                     {
@@ -322,20 +327,20 @@ public void ValidateData()
                     {
                         lib.Dependencies.Remove(o as MFComponent);
                     }
-/*
-                    removeList.Clear();
-                    foreach (MFComponent comp in lib.SoftDependencies)
-                    {
-                        if (!ValidateComponent(comp))
-                        {
-                            removeList.Add(comp);
-                        }
-                    }
-                    foreach (object o in removeList)
-                    {
-                        lib.SoftDependencies.Remove(o as MFComponent);
-                    }
-*/
+                    /*
+                                        removeList.Clear();
+                                        foreach (MFComponent comp in lib.SoftDependencies)
+                                        {
+                                            if (!ValidateComponent(comp))
+                                            {
+                                                removeList.Add(comp);
+                                            }
+                                        }
+                                        foreach (object o in removeList)
+                                        {
+                                            lib.SoftDependencies.Remove(o as MFComponent);
+                                        }
+                    */
                 }
 
                 foreach (Feature feat in inv.Features)
@@ -353,7 +358,7 @@ public void ValidateData()
                     {
                         feat.FeatureDependencies.Remove(c);
                     }
-                    
+
                     removeList.Clear();
                     foreach (MFComponent comp in feat.ComponentDependencies)
                     {
@@ -395,7 +400,7 @@ public void ValidateData()
             }
         }
 
-        public ComponentType GetComponentTypeByGuid( string guid, out object component )
+        public ComponentType GetComponentTypeByGuid(string guid, out object component)
         {
             component = null;
 
@@ -465,6 +470,18 @@ public BuildTool FindBuildTool(string buildToolGuid)
             return null;
         }
 
+        public BuildTool FindBuildToolByName(string buildToolName)
+        {
+            foreach (Inventory inv in m_invs)
+            {
+                BuildTool buildToo = FindObjectByName(buildToolName, inv.BuildTools) as BuildTool;
+
+                if (buildToo != null) return buildToo;
+            }
+
+            return null;
+        }
+
         public Feature FindFeature(string featureGuid)
         {
             foreach (Inventory inv in m_invs)
@@ -820,7 +837,7 @@ public MFSolution[] Solutions
             get
             {
                 List<MFSolution> ret = new List<MFSolution>();
-                
+
                 foreach (Inventory inv in m_invs)
                 {
                     ret.AddRange(inv.Solutions);
diff --git a/CLR/Tools/PlatformDesigner/ComponentObjectModel/MsBuildWrapper.cs b/CLR/Tools/PlatformDesigner/ComponentObjectModel/MsBuildWrapper.cs
index 6f590da31..4181e2abf 100644
--- a/CLR/Tools/PlatformDesigner/ComponentObjectModel/MsBuildWrapper.cs
+++ b/CLR/Tools/PlatformDesigner/ComponentObjectModel/MsBuildWrapper.cs
@@ -1,21 +1,20 @@
 using System;
-using System.Collections.Generic;
 using System.Collections;
-using System.Text;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Globalization;
 using System.IO;
 using System.Linq;
-using XsdInventoryFormatObject;
-using Microsoft.Build.Framework;
-//using Microsoft.Build.BuildEngine;
-using Microsoft.Build.Evaluation;
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Text;
 using System.Text.RegularExpressions;
 using System.Xml;
-using System.Xml.XPath;
 using System.Xml.Serialization;
-using System.Reflection;
-using System.Runtime.CompilerServices;
 using Microsoft.Build.Construction;
-using Microsoft.Build.Execution;
+using Microsoft.Build.Evaluation;
+using XsdInventoryFormatObject;
+//using Microsoft.Build.BuildEngine;
 
 [assembly: InternalsVisibleTo("ComponentBuilder, PublicKey=0024000004800000940000000602000000240000525341310004000001000100B72BE28059C8C300C866887A820EAB7FD9E8F7D41179917EA660A5AC8FA46AC492358A9E4A64591F7C279D77E56844ADDD3762F2F539D493A01631B82AE1A255110E0143856C079976A3396CC30D1E81EA2748F04D198BB273BD721C7FF461A514182C2775B7D8658B529DB2BD11319AB024FAABD7272B3C2F6196184EB666B3")]
 [assembly: InternalsVisibleTo("SolutionWizard, PublicKey=0024000004800000940000000602000000240000525341310004000001000100B72BE28059C8C300C866887A820EAB7FD9E8F7D41179917EA660A5AC8FA46AC492358A9E4A64591F7C279D77E56844ADDD3762F2F539D493A01631B82AE1A255110E0143856C079976A3396CC30D1E81EA2748F04D198BB273BD721C7FF461A514182C2775B7D8658B529DB2BD11319AB024FAABD7272B3C2F6196184EB666B3")]
@@ -46,78 +45,79 @@ public class MsBuildWrapper
         //bool m_forceLoadDependencies = false;
 
         #region TAG_STRINGS
-        const string RelativeTargetPath     = "tools\\targets\\";
-        const string RelativePlatformPath   = "DeviceCode\\targets\\";
+        const string RelativeTargetPath = "tools\\targets\\";
+        const string RelativePlatformPath = "DeviceCode\\targets\\";
         const string MicrosoftSpotNamespace = "Microsoft.SPOT.";
-        const string TargetFileExtension    = ".Targets";
-        const string CCompilerTag           = "CC";
-        const string CppCompilerTag         = "CPP";
-        const string AsmCompilerTag         = "AS";
-        const string LinkerTag              = "LINK";
-        const string ArchiverTag            = "AR";
-        const string FromElfTag             = "FROMELF";
-        const string ToolWrapperTag         = "WRAPPER";
-        const string AdsWrapperTag          = "ADS_WRAPPER";
-        const string AdiWrapperTag          = "ADI_WRAPPER";
-        const string ArcWrapperTag          = "ARC_WRAPPER";
-
-        const string ArmCCompilerTargetTag  = "ArmCompileC";
-        const string ArmCppCompilerTargetTag= "ArmCompileCPP";
-        const string ArmAsmTargetTag        = "ArmAssemble";
-        const string ArmLibTargetTag        = "ArmBuildLib";
-        const string ArmExeTargetTag        = "BuildAXF";
-
-        const string AdiCCompilerTargetTag  = "ADICompileC";
-        const string AdiCppCompilerTargetTag= "ADICompileCPP";
-        const string AdiAsmTargetTag        = "ADIAssemble";
-        const string AdiLibTargetTag        = "ADIBuildLib";
-        const string AdiExeTargetTag        = "BuildDXE";
-
-        const string ArcCCompilerTargetTag  = "ARCCompileC";
-        const string ArcCppCompilerTargetTag= "ARCCompileCPP";
-        const string ArcAsmTargetTag        = "ARCAssemble";
-        const string ArcLibTargetTag        = "ARCBuildLib";
-        const string ArcExeTargetTag        = "ARCBuildDXE";
-
-        const string CCompilerTargetTag     = "CompileC";
-        const string CppCompilerTargetTag   = "CompileCpp";
-        const string AsmCompilerTargetTag   = "CompileAsm";
-        const string LibTargetTag           = "BuildLib";
-        const string ExeTargetTag           = "BuildExe";
-        const string TargetTaskTag          = "Exec";
-        const string ScatterFileTargetTag   = "BuildScatterfile";
-
-        const string CpuNamesTag            = "CpuNames";
-        const string ISAsTag                = "ISAName";
-
-        const string PKUI_CpuNamesTag       = "PKUI_CpuNames";
-        const string PKUI_ISAsTag           = "PKUI_ISAs";
-        const string PKUI_LibCatTag         = "PKUI_LibraryCategory";
-
-        const string CommonToolFlagTag      = "AS_CC_CPP_COMMON_FLAGS";
-        const string CCppTargFlagTag        = "CC_CPP_TARGETTYPE_FLAGS";
-        const string CCppCommonFlagTag      = "CC_CPP_COMMON_FLAGS";
-        const string CFlagTag               = "CC_FLAGS";
-        const string CppFlagTag             = "CPP_FLAGS";
-        const string AsmFlagTag             = "AS_FLAGS";
-        const string AsmArmFlagTag          = "ASFLAGS";
-        const string LinkerFlagTag          = "LINK_FLAGS";
-        const string ArchiverFlagTag        = "AR_FLAGS";
-        const string ArchiverArmFlagTag     = "ARFLAGS";
-        const string ArchiverPlatFlagTag    = "AR_PLATFORM_FLAGS";
-        const string FromElfFlagTag         = "FROMELF_FLAGS";
-        const string ScatterFlagTag         = "SCATTER_FLAG";
-
-        const string SetEnvScriptTag        = "SetEnvironmentVariable";
-
-        const string ObjExtFlag             = "OBJ_EXT";
-        const string LibExtFlag             = "LIB_EXT";
-        const string ExeExtFlag             = "EXE_EXT";
+        const string TargetFileExtension = ".Targets";
+        const string CCompilerTag = "CC";
+        const string CppCompilerTag = "CPP";
+        const string AsmCompilerTag = "AS";
+        const string LinkerTag = "LINK";
+        const string ArchiverTag = "AR";
+        const string FromElfTag = "FROMELF";
+        const string ToolWrapperTag = "WRAPPER";
+        const string AdsWrapperTag = "ADS_WRAPPER";
+        const string AdiWrapperTag = "ADI_WRAPPER";
+        const string ArcWrapperTag = "ARC_WRAPPER";
+
+        const string ArmCCompilerTargetTag = "ArmCompileC";
+        const string ArmCppCompilerTargetTag = "ArmCompileCPP";
+        const string ArmAsmTargetTag = "ArmAssemble";
+        const string ArmLibTargetTag = "ArmBuildLib";
+        const string ArmExeTargetTag = "BuildAXF";
+
+        const string AdiCCompilerTargetTag = "ADICompileC";
+        const string AdiCppCompilerTargetTag = "ADICompileCPP";
+        const string AdiAsmTargetTag = "ADIAssemble";
+        const string AdiLibTargetTag = "ADIBuildLib";
+        const string AdiExeTargetTag = "BuildDXE";
+
+        const string ArcCCompilerTargetTag = "ARCCompileC";
+        const string ArcCppCompilerTargetTag = "ARCCompileCPP";
+        const string ArcAsmTargetTag = "ARCAssemble";
+        const string ArcLibTargetTag = "ARCBuildLib";
+        const string ArcExeTargetTag = "ARCBuildDXE";
+
+        const string CCompilerTargetTag = "CompileC";
+        const string CppCompilerTargetTag = "CompileCpp";
+        const string AsmCompilerTargetTag = "CompileAsm";
+        const string LibTargetTag = "BuildLib";
+        const string ExeTargetTag = "BuildExe";
+        const string TargetTaskTag = "Exec";
+        const string ScatterFileTargetTag = "BuildScatterfile";
+
+        const string CpuNamesTag = "CpuNames";
+        const string ISAsTag = "ISAName";
+
+        const string PKUI_CpuNamesTag = "PKUI_CpuNames";
+        const string PKUI_ISAsTag = "PKUI_ISAs";
+        const string PKUI_LibCatTag = "PKUI_LibraryCategory";
+
+        const string CommonToolFlagTag = "AS_CC_CPP_COMMON_FLAGS";
+        const string CCppTargFlagTag = "CC_CPP_TARGETTYPE_FLAGS";
+        const string CCppCommonFlagTag = "CC_CPP_COMMON_FLAGS";
+        const string CFlagTag = "CC_FLAGS";
+        const string CppFlagTag = "CPP_FLAGS";
+        const string AsmFlagTag = "AS_FLAGS";
+        const string AsmArmFlagTag = "ASFLAGS";
+        const string LinkerFlagTag = "LINK_FLAGS";
+        const string ArchiverFlagTag = "AR_FLAGS";
+        const string ArchiverArmFlagTag = "ARFLAGS";
+        const string ArchiverPlatFlagTag = "AR_PLATFORM_FLAGS";
+        const string FromElfFlagTag = "FROMELF_FLAGS";
+        const string ScatterFlagTag = "SCATTER_FLAG";
+
+        const string SetEnvScriptTag = "SetEnvironmentVariable";
+
+        const string ObjExtFlag = "OBJ_EXT";
+        const string LibExtFlag = "LIB_EXT";
+        const string ExeExtFlag = "EXE_EXT";
+        const string ScatterExtFlag = "SCATTER_EXT";
 
         const string TaskScriptAttributeName = "Command";
 
         const string c_MSBuildDefaultSchema = @"http://schemas.microsoft.com/developer/msbuild/2003";
-        const string c_XmlHeaderString      = "<?xml version=\"1.0\" encoding=\"utf-16\"?>";
+        const string c_XmlHeaderString = "<?xml version=\"1.0\" encoding=\"utf-16\"?>";
 
         #endregion //TAG_STRINGS
 
@@ -312,15 +312,15 @@ public void LoadDefaultManifestFiles(string pkClientDirectory)
         {
             string compiler = Environment.GetEnvironmentVariable("COMPILER_TOOL");
 
-            LoadManifestFiles(Path.Combine(pkClientDirectory , "BuildOutput\\ARM\\RVDS3.1"));
-            LoadManifestFiles(Path.Combine(pkClientDirectory , "BuildOutput\\THUMB\\RVDS3.1"));
-            LoadManifestFiles(Path.Combine(pkClientDirectory , "BuildOutput\\THUMB2\\RVDS3.1"));
-            LoadManifestFiles(Path.Combine(pkClientDirectory , "BuildOutput\\ARM\\RVDS4.1"));
-            LoadManifestFiles(Path.Combine(pkClientDirectory , "BuildOutput\\THUMB\\RVDS4.1"));
-            LoadManifestFiles(Path.Combine(pkClientDirectory , "BuildOutput\\THUMB2\\RVDS4.1"));
-            LoadManifestFiles(Path.Combine(pkClientDirectory , "BuildOutput\\ADI5.0"));
-            LoadManifestFiles(Path.Combine(pkClientDirectory , "BuildOutput\\SH2A"));
-            LoadManifestFiles(Path.Combine(pkClientDirectory , "BuildOutput\\Windows"));
+            LoadManifestFiles(Path.Combine(pkClientDirectory, "BuildOutput\\ARM\\RVDS3.1"));
+            LoadManifestFiles(Path.Combine(pkClientDirectory, "BuildOutput\\THUMB\\RVDS3.1"));
+            LoadManifestFiles(Path.Combine(pkClientDirectory, "BuildOutput\\THUMB2\\RVDS3.1"));
+            LoadManifestFiles(Path.Combine(pkClientDirectory, "BuildOutput\\ARM\\RVDS4.1"));
+            LoadManifestFiles(Path.Combine(pkClientDirectory, "BuildOutput\\THUMB\\RVDS4.1"));
+            LoadManifestFiles(Path.Combine(pkClientDirectory, "BuildOutput\\THUMB2\\RVDS4.1"));
+            LoadManifestFiles(Path.Combine(pkClientDirectory, "BuildOutput\\ADI5.0"));
+            LoadManifestFiles(Path.Combine(pkClientDirectory, "BuildOutput\\SH2A"));
+            LoadManifestFiles(Path.Combine(pkClientDirectory, "BuildOutput\\Windows"));
         }
 
         public void LoadManifestFiles(string manifestRootDirectory)
@@ -329,10 +329,10 @@ public void LoadManifestFiles(string manifestRootDirectory)
 
             if (Directory.Exists(fullpath))
             {
-                foreach(string dir in Directory.GetDirectories(fullpath))
+                foreach (string dir in Directory.GetDirectories(fullpath))
                 {
                     // only process debug
-                    if(fullpath.ToLower().Contains("\\release\\") || fullpath.ToLower().Contains("\\rtm\\"))
+                    if (fullpath.ToLower().Contains("\\release\\") || fullpath.ToLower().Contains("\\rtm\\"))
                     {
                         continue;
                     }
@@ -341,11 +341,11 @@ public void LoadManifestFiles(string manifestRootDirectory)
                     {
                         continue;
                     }
-                    
+
                     LoadManifestFiles(dir);
                 }
-                
-                foreach(string file in Directory.GetFiles(fullpath, "*.manifest"))
+
+                foreach (string file in Directory.GetFiles(fullpath, "*.manifest"))
                 {
                     LoadLibraryFromManifest(file);
                 }
@@ -354,8 +354,8 @@ public void LoadManifestFiles(string manifestRootDirectory)
 
         public void LoadDefaultProcessors(string pkClientDirectory)
         {
-            LoadProcessors(Path.Combine(pkClientDirectory , "devicecode\\Targets\\Native"));
-            LoadProcessors(Path.Combine(pkClientDirectory , "devicecode\\Targets\\OS"));
+            LoadProcessors(Path.Combine(pkClientDirectory, "devicecode\\Targets\\Native"));
+            LoadProcessors(Path.Combine(pkClientDirectory, "devicecode\\Targets\\OS"));
         }
 
         public void LoadProcessors(string procRootDirectory)
@@ -376,7 +376,7 @@ public void LoadProcessors(string procRootDirectory)
                     Processor proc = new Processor();
                     proc.Name = Path.GetFileName(subdir);
                     proc.Guid = System.Guid.NewGuid().ToString("B");
-                    proc.ProjectPath = ConvertPathToEnv( Path.Combine(subdir, proc.Name + ".settings" ));
+                    proc.ProjectPath = ConvertPathToEnv(Path.Combine(subdir, proc.Name + ".settings"));
 
                     m_helper.DefaultInventory.Processors.Add(proc);
                 }
@@ -421,7 +421,7 @@ private bool RecurseAdddotNetMFProj(DirectoryInfo path)
 
             DirectoryInfo[] dirs = path.GetDirectories();
 
-            if(dirs == null || dirs.Length == 0)
+            if (dirs == null || dirs.Length == 0)
             {
                 return File.Exists(Path.Combine(path.FullName, c_dotNetMFProj));
             }
@@ -444,7 +444,7 @@ private bool RecurseAdddotNetMFProj(DirectoryInfo path)
             {
                 p = LoadProject(Path.Combine(path.FullName, c_dotNetMFProj));
 
-                foreach(DirectoryInfo dir in projDirs)
+                foreach (DirectoryInfo dir in projDirs)
                 {
                     bool fFoundProj = false;
                     ProjectItemGroupElement lastGroup = null;
@@ -454,7 +454,7 @@ private bool RecurseAdddotNetMFProj(DirectoryInfo path)
                         lastGroup = ig;
                         foreach (ProjectItemElement bi in ig.Items)
                         {
-                            if((0 == string.Compare(bi.ItemType, c_SubDirectoriesTag)) &&
+                            if ((0 == string.Compare(bi.ItemType, c_SubDirectoriesTag)) &&
                                (0 == string.Compare(bi.Include, dir.Name)))
                             {
                                 fFoundProj = true;
@@ -504,7 +504,7 @@ private bool RecurseAdddotNetMFProj(DirectoryInfo path)
         private void AdddotNetMFProjects(string platformRoot)
         {
             DirectoryInfo di = new DirectoryInfo(platformRoot);
-            
+
             // we didn't have any code to add
             if (!di.Exists) return;
 
@@ -539,8 +539,8 @@ private void AdddotNetMFProjects(string platformRoot)
 
         internal void CopyTemplateFiles(LibraryCategory libType, MFSolution solution, MFComponent compLibTemplate)
         {
-            const string c_FastCompile      = @"fastcompile.cpp";
-            const string c_FastCompileTag   = @"FastCompileCPPFile";
+            const string c_FastCompile = @"fastcompile.cpp";
+            const string c_FastCompileTag = @"FastCompileCPPFile";
 
             string dstPath = Path.Combine(ExpandEnvVars(Path.GetDirectoryName(solution.ProjectPath), ""), "DeviceCode\\");
 
@@ -554,8 +554,8 @@ internal void CopyTemplateFiles(LibraryCategory libType, MFSolution solution, MF
 
             foreach (ApiTemplate api in libType.Templates)
             {
-                string src = ExpandEnvVars( api.FilePath, Environment.GetEnvironmentVariable("SPOCLIENT") );
-                
+                string src = ExpandEnvVars(api.FilePath, Environment.GetEnvironmentVariable("SPOCLIENT"));
+
                 //
                 // Make relative path based on path after \DeviceCode\ if it exists, otherwise up to two directories deep
                 //
@@ -712,10 +712,10 @@ internal void CopyTemplateFiles(LibraryCategory libType, MFSolution solution, MF
                         reloadProjs.Add(dst);
                     }
                 }
-                catch(Exception e)
+                catch (Exception e)
                 {
                     System.Diagnostics.Debug.Print(e.ToString());
-                    System.Diagnostics.Debug.Print("Unable to copy file: " + src + " to " + dst );
+                    System.Diagnostics.Debug.Print("Unable to copy file: " + src + " to " + dst);
                 }
             }
             foreach (string prj in reloadProjs)
@@ -732,7 +732,7 @@ private string CombineConditionals(string comp1cond, string comp2cond)
             {
                 cond = comp2cond;
             }
-            else if(!string.IsNullOrEmpty(comp2cond))
+            else if (!string.IsNullOrEmpty(comp2cond))
             {
                 if (comp2cond.Contains(cond))
                 {
@@ -758,12 +758,12 @@ private string CombineConditionals(string comp1cond, string comp2cond)
 
         private void AddEnvVarCollection(List<EnvVar> vars, Project proj)
         {
-            
+
             //lets make it pretty
             Dictionary<string, List<EnvVar>> condToEnv = new Dictionary<string, List<EnvVar>>();
             foreach (EnvVar var in vars)
             {
-                if(condToEnv.ContainsKey(var.Conditional))
+                if (condToEnv.ContainsKey(var.Conditional))
                 {
                     condToEnv[var.Conditional].Add(var);
                 }
@@ -775,7 +775,7 @@ private void AddEnvVarCollection(List<EnvVar> vars, Project proj)
                 }
             }
 
-            ProjectPropertyGroupElement global = null; 
+            ProjectPropertyGroupElement global = null;
 
             foreach (string cond in condToEnv.Keys)
             {
@@ -791,7 +791,7 @@ private void AddEnvVarCollection(List<EnvVar> vars, Project proj)
                         group.AddProperty(var.Name, var.Value);
                     }
                 }
-                else if(list.Count == 1)
+                else if (list.Count == 1)
                 {
                     if (global == null)
                     {
@@ -848,12 +848,12 @@ private void AddBuildToolProperties(BuildTool buildTool, Project proj)
                 group.AddProperty(ToolWrapperTag, buildTool.BuildToolWrapper);
             }
 
-            group.AddProperty(CCompilerTag,   buildTool.ToolPath + buildTool.CCompiler.Exec);
+            group.AddProperty(CCompilerTag, buildTool.ToolPath + buildTool.CCompiler.Exec);
             group.AddProperty(CppCompilerTag, buildTool.ToolPath + buildTool.CppCompiler.Exec);
             group.AddProperty(AsmCompilerTag, buildTool.ToolPath + buildTool.AsmCompiler.Exec);
-            group.AddProperty(LinkerTag,      buildTool.ToolPath + buildTool.Linker.Exec);
-            group.AddProperty(ArchiverTag,    buildTool.ToolPath + buildTool.Archiver.Exec);
-            group.AddProperty(FromElfTag,     buildTool.ToolPath + buildTool.FromELF.Exec);
+            group.AddProperty(LinkerTag, buildTool.ToolPath + buildTool.Linker.Exec);
+            group.AddProperty(ArchiverTag, buildTool.ToolPath + buildTool.Archiver.Exec);
+            group.AddProperty(FromElfTag, buildTool.ToolPath + buildTool.FromELF.Exec);
 
             foreach (MiscBuildTool tool in buildTool.MiscTools)
             {
@@ -868,11 +868,11 @@ private void AddBuildTools(BuildTool buildTool, Project proj)
                 AddBuildScript(tool.Name, tool.BuildTool.Conditional, ToEnvVar(ToolWrapperTag), tool.BuildToolOptions, proj, ToEnvVar(tool.Name + "_FLAGS"));
             }
 
-            AddBuildScript(CCompilerTargetTag  , buildTool.CCompiler.Conditional  , ToEnvVar(ToolWrapperTag), buildTool.BuildOptions.CFlags       , proj, ToEnvVar(CommonToolFlagTag), ToEnvVar(CFlagTag)  , ToEnvVar(CCppCommonFlagTag));
-            AddBuildScript(CppCompilerTargetTag, buildTool.CppCompiler.Conditional, ToEnvVar(ToolWrapperTag), buildTool.BuildOptions.CppFlags     , proj, ToEnvVar(CommonToolFlagTag), ToEnvVar(CppFlagTag), ToEnvVar(CCppCommonFlagTag));
+            AddBuildScript(CCompilerTargetTag, buildTool.CCompiler.Conditional, ToEnvVar(ToolWrapperTag), buildTool.BuildOptions.CFlags, proj, ToEnvVar(CommonToolFlagTag), ToEnvVar(CFlagTag), ToEnvVar(CCppCommonFlagTag));
+            AddBuildScript(CppCompilerTargetTag, buildTool.CppCompiler.Conditional, ToEnvVar(ToolWrapperTag), buildTool.BuildOptions.CppFlags, proj, ToEnvVar(CommonToolFlagTag), ToEnvVar(CppFlagTag), ToEnvVar(CCppCommonFlagTag));
             AddBuildScript(AsmCompilerTargetTag, buildTool.AsmCompiler.Conditional, ToEnvVar(ToolWrapperTag), buildTool.BuildOptions.AsmFlags, proj, ToEnvVar(CommonToolFlagTag), ToEnvVar(AsmFlagTag));
-            AddBuildScript(LibTargetTag        , buildTool.Archiver.Conditional   , ToEnvVar(ToolWrapperTag), buildTool.BuildOptions.ArchiverFlags, proj, ToEnvVar(CommonToolFlagTag), ToEnvVar(ArchiverFlagTag));
-            AddBuildScript(ExeTargetTag        , buildTool.Linker.Conditional     , ToEnvVar(ToolWrapperTag), buildTool.BuildOptions.LinkerFlags  , proj, ToEnvVar(CommonToolFlagTag), ToEnvVar(LinkerFlagTag));
+            AddBuildScript(LibTargetTag, buildTool.Archiver.Conditional, ToEnvVar(ToolWrapperTag), buildTool.BuildOptions.ArchiverFlags, proj, ToEnvVar(CommonToolFlagTag), ToEnvVar(ArchiverFlagTag));
+            AddBuildScript(ExeTargetTag, buildTool.Linker.Conditional, ToEnvVar(ToolWrapperTag), buildTool.BuildOptions.LinkerFlags, proj, ToEnvVar(CommonToolFlagTag), ToEnvVar(LinkerFlagTag));
 
         }
 
@@ -920,7 +920,7 @@ private void AddFormattedPropGroup(string flagTag, List<ToolFlag> flags, Project
                 }
             }
 
-            ProjectPropertyGroupElement global = null; 
+            ProjectPropertyGroupElement global = null;
 
             foreach (string cond in condToFlag.Keys)
             {
@@ -1146,7 +1146,7 @@ private ToolChainOptions LoadToolChainOptions(ProjectPropertyGroupElement grp)
             return opts;
         }
 
-        private List<BuildToolRef> LoadBuildToolFlags( Project proj )
+        private List<BuildToolRef> LoadBuildToolFlags(Project proj)
         {
             List<BuildToolRef> toolRefs = new List<BuildToolRef>();
 
@@ -1198,7 +1198,7 @@ private List<BuildToolRef> LoadBuildToolFlags( Project proj )
             return toolRefs;
         }
 
-        
+
         private Project GenerateBuildToolTargetFile(BuildTool buildTool)
         {
             Project proj = new Project();
@@ -1210,7 +1210,7 @@ private Project GenerateBuildToolTargetFile(BuildTool buildTool)
             mainGrp.AddProperty("Documentation", buildTool.Documentation);
             if (buildTool.SupportedCpuNames.Count > 0)
             {
-                mainGrp.AddProperty(CpuNamesTag, string.Join( ";", buildTool.SupportedCpuNames.ToArray() ) );
+                mainGrp.AddProperty(CpuNamesTag, string.Join(";", buildTool.SupportedCpuNames.ToArray()));
             }
             if (buildTool.SupportedISAs.Count > 0)
             {
@@ -1225,7 +1225,7 @@ private Project GenerateBuildToolTargetFile(BuildTool buildTool)
                     AddBuildToolFlags(isa.BuildToolOptions, proj, bgISA);
                 }
             }
-    
+
             AddBuildToolProperties(buildTool, proj);
 
             if (buildTool.Properties.Count > 0)
@@ -1273,17 +1273,17 @@ private string RemoveCommonFlags(string script)
         {
             string[] typeFlags = {
                 CommonToolFlagTag,
-                CCppTargFlagTag,        
-                CCppCommonFlagTag,      
-                CFlagTag,               
-                CppFlagTag,             
-                AsmFlagTag,             
-                LinkerFlagTag,          
-                ArchiverFlagTag,  
+                CCppTargFlagTag,
+                CCppCommonFlagTag,
+                CFlagTag,
+                CppFlagTag,
+                AsmFlagTag,
+                LinkerFlagTag,
+                ArchiverFlagTag,
                 ArchiverArmFlagTag,
                 ScatterFlagTag,
-                AsmArmFlagTag,       
-                ArchiverPlatFlagTag, 
+                AsmArmFlagTag,
+                ArchiverPlatFlagTag,
             };
 
             int idx = -1;
@@ -1404,7 +1404,7 @@ private void LoadTargetTasks(ProjectTargetElement target, List<EnvVar> vars, Bui
                         toolOptions.BuildToolParameters.PreBuild.Add(script);
                     }
                 }
-                else if(string.Compare(task.Name, SetEnvScriptTag) == 0)
+                else if (string.Compare(task.Name, SetEnvScriptTag) == 0)
                 {
                     EnvVar var = new EnvVar();
                     var.Name = task.GetParameter("Name");
@@ -1486,13 +1486,13 @@ internal static string ExpandEnvVars(string text, string path)
         {
             Regex exp = new Regex("\\$\\(([^\\)]*)\\)");
 
-            if(string.IsNullOrEmpty(text)) return "";
+            if (string.IsNullOrEmpty(text)) return "";
 
             MatchCollection match = exp.Matches(text);
 
-            if(match.Count > 0)
+            if (match.Count > 0)
             {
-                for (int i = match.Count-1; i >= 0; i--)
+                for (int i = match.Count - 1; i >= 0; i--)
                 {
                     text = text.Replace("$(" + match[i].Groups[1].Value + ")", "%" + match[i].Groups[1].Value + "%");
                 }
@@ -1506,7 +1506,7 @@ internal static string ExpandEnvVars(string text, string path)
             }
 
             bool isNetworkDrive = text.StartsWith("\\\\");
-            
+
             text = text.Replace("\\\\", "\\");
 
             if (isNetworkDrive) text = "\\" + text;
@@ -1570,7 +1570,7 @@ private ProjectPropertyGroupElement SaveStringProps(Project proj, object obj, Di
                 {
                     string val = (string)pi.GetValue(obj, null);
 
-                    if(val == null) val = "";
+                    if (val == null) val = "";
 
                     string name = pi.Name;
 
@@ -1606,7 +1606,7 @@ private ProjectPropertyGroupElement SaveStringProps(Project proj, object obj, Di
                     if (cmp != null && !string.IsNullOrEmpty(cmp.Guid))
                     {
                         bpg.AddProperty(pi.Name, SerializeXml(cmp));
-                   }
+                    }
                 }
                 else if (pi.PropertyType == typeof(LibraryLevel))
                 {
@@ -1617,7 +1617,7 @@ private ProjectPropertyGroupElement SaveStringProps(Project proj, object obj, Di
             return bpg;
         }
 
-        private void LoadStringProps(Project proj, object obj, Dictionary<string,string> tbl)
+        private void LoadStringProps(Project proj, object obj, Dictionary<string, string> tbl)
         {
             foreach (ProjectPropertyGroupElement bpg in proj.Xml.PropertyGroups)
             {
@@ -1661,7 +1661,7 @@ private void LoadStringProps(Project proj, object obj, Dictionary<string,string>
                             if (pi.Name == "ProcessorSpecific") comp.ComponentType = MFComponentType.Processor;
                             if (pi.Name == "Processor") comp.ComponentType = MFComponentType.Processor;
                             if (pi.Name == "DefaultISA") comp.ComponentType = MFComponentType.ISA;
-                                
+
                             pi.SetValue(obj, comp, null);
                         }
                         else if (pi.PropertyType == typeof(LibraryLevel))
@@ -1853,7 +1853,7 @@ private void UpdatePropertyGroups(Project proj, object obj, string[] projNames,
                 {
                     string val = (string)obj.GetType().GetProperty(objName).GetValue(obj, null);
 
-                    if(val == null) val = "";
+                    if (val == null) val = "";
 
                     lookup[prop.ToUpper()].Value = val;
                 }
@@ -1994,7 +1994,9 @@ internal void LoadTargetFile(BuildTool tool, string fileName)
                             case ExeExtFlag:
                                 tool.BinExt = bp.Value;
                                 break;
-
+                            case ScatterExtFlag:
+                                tool.ScatterExt = bp.Value;
+                                break;
                             case CCompilerTag:
                                 tool.CCompiler.Exec = RemoveWrapper(bp.Value);
                                 break;
@@ -2208,7 +2210,7 @@ internal void SaveLibraryProj(Library lib)
                     }
                     bpg.AddProperty("PlatformIndependentBuild", lib.PlatformIndependent.ToString().ToLower());
                     bpg.AddProperty("Version", lib.Version.Major + "." + lib.Version.Minor + "." + lib.Version.Revision + "." + lib.Version.Build);
-                    
+
                     // add standard import
                     proj.Xml.AddImport(@"$(SPOCLIENT)\tools\targets\Microsoft.SPOT.System.Settings");
 
@@ -2236,10 +2238,10 @@ internal void SaveLibraryProj(Library lib)
                                     ProjectItemElement bi = big.AddItem("RequiredProjects", ConvertPathToEnv(l.ProjectPath));
                                     bi.Condition = cmp.Conditional;
                                 }
-                                else if(!string.IsNullOrEmpty(cmp.ProjectPath))
+                                else if (!string.IsNullOrEmpty(cmp.ProjectPath))
                                 {
                                     ProjectItemElement bi = big.AddItem("RequiredProjects", ConvertPathToEnv(cmp.ProjectPath));
-                                    bi.Condition = cmp.Conditional;                                    
+                                    bi.Condition = cmp.Conditional;
                                 }
                                 break;
                             case MFComponentType.LibraryCategory:
@@ -2252,7 +2254,7 @@ internal void SaveLibraryProj(Library lib)
                         }
                     }
 
-                    foreach(ProjectTargetElement targ in lib.Targets)
+                    foreach (ProjectTargetElement targ in lib.Targets)
                     {
                         ProjectTargetElement t = proj.Xml.AddTarget(targ.Name);
 
@@ -2267,7 +2269,7 @@ internal void SaveLibraryProj(Library lib)
                             tsk.Condition = task.Condition;
                             tsk.ContinueOnError = task.ContinueOnError;
 
-                            foreach (KeyValuePair<string,string> param in task.Parameters)
+                            foreach (KeyValuePair<string, string> param in task.Parameters)
                             {
                                 tsk.SetParameter(param.Key, param.Value);
                             }
@@ -2275,7 +2277,7 @@ internal void SaveLibraryProj(Library lib)
                     }
 
                     proj.Xml.AddImport(@"$(SPOCLIENT)\tools\targets\Microsoft.SPOT.System.Targets");
-                    
+
                     proj.Save(fullpath);
                 }
                 catch (Exception e)
@@ -2340,7 +2342,7 @@ internal Library LoadLibraryFromManifest(string libManifestFile)
                 System.Diagnostics.Debug.WriteLine("Error: loading Library file: " + fullpath + "\r\n", e.Message);
                 lib = null;
             }
-            
+
             return lib;
         }
 
@@ -2577,7 +2579,7 @@ internal Library LoadLibraryProj(string libProjFile, string path, bool fForceRel
                             }
                             foreach (MFBuildFile bf in lib.HeaderFiles)
                             {
-                                if (Path.IsPathRooted(MsBuildWrapper.ExpandEnvVars(bf.File,"")) || bf.File.Contains("..")) continue;
+                                if (Path.IsPathRooted(MsBuildWrapper.ExpandEnvVars(bf.File, "")) || bf.File.Contains("..")) continue;
 
                                 api = new ApiTemplate();
                                 api.FilePath = ConvertPathToEnv(Path.Combine(path, bf.File));
@@ -2642,7 +2644,7 @@ internal void SaveAssemblyProj(MFAssembly asm)
                     {
                         foreach (ProjectPropertyElement bp in bpg.Properties)
                         {
-                            switch(bp.Name)
+                            switch (bp.Name)
                             {
                                 case "Description":
                                     bp.Value = asm.Description;
@@ -2665,7 +2667,7 @@ internal void SaveAssemblyProj(MFAssembly asm)
 
         internal MFAssembly LoadAssemblyProj(string asmProjFile, string path)
         {
-            
+
             Project proj;
             string projname = Path.GetFileNameWithoutExtension(asmProjFile);
             string fullpath = ExpandEnvVars(asmProjFile, path);
@@ -2776,7 +2778,7 @@ internal void SaveFeatureProj(Feature feature)
                 try
                 {
                     Project proj;
-                    
+
                     string path = ExpandEnvVars(feature.ProjectPath, "");
 
                     if (File.Exists(path))
@@ -2807,7 +2809,7 @@ internal void SaveFeatureProj(Feature feature)
 
                     proj.Save(proj.FullPath);
                 }
-                catch(Exception e)
+                catch (Exception e)
                 {
                     System.Diagnostics.Debug.WriteLine("Error: failure saving feature file " + feature.ProjectPath + "\r\n" + e.Message);
                 }
@@ -3028,7 +3030,7 @@ internal void SaveProcessorProj(Processor proc)
 
                     proj.Save(fullpath);
                 }
-                catch(Exception e)
+                catch (Exception e)
                 {
                     System.Diagnostics.Debug.WriteLine("Error: Unable to save procesor file " + proc.ProjectPath + "\r\n" + e.Message);
                 }
@@ -3156,7 +3158,7 @@ internal void SaveProjectProj(MFProject mfproj)
                     bpg = proj.Xml.AddPropertyGroup();
                     foreach (MFProperty prop in mfproj.Properties)
                     {
-                        if(!tbl.ContainsKey(prop.Name) || tbl[prop.Name] != prop.Value)
+                        if (!tbl.ContainsKey(prop.Name) || tbl[prop.Name] != prop.Value)
                         {
                             ProjectPropertyElement bp = bpg.AddProperty(prop.Name, prop.Value);
                             bp.Condition = prop.Condition;
@@ -3235,7 +3237,7 @@ internal void SaveProjectProj(MFProject mfproj)
                             tsk.Condition = task.Condition;
                             tsk.ContinueOnError = task.ContinueOnError;
 
-                            foreach (KeyValuePair<string,string> param in task.Parameters)
+                            foreach (KeyValuePair<string, string> param in task.Parameters)
                             {
                                 tsk.SetParameter(param.Key, param.Value);
                             }
@@ -3524,7 +3526,7 @@ internal MFProject LoadProjectProj(string projFile, string path)
 
                             //Console.WriteLine("Error: Feature not found " + imp.Project);
                         }
-                        else if(!featLookup.ContainsKey(feat.Guid.ToLower()))
+                        else if (!featLookup.ContainsKey(feat.Guid.ToLower()))
                         {
                             comp = new MFComponent(MFComponentType.Feature, feat.Name, feat.Guid, imp.Project);
                             comp.Conditional = imp.Condition;
@@ -3586,7 +3588,7 @@ internal MFProject LoadProjectProj(string projFile, string path)
 
                         List<MemoryMap> maps = sw.LoadFromFile(scatterfile);
 
-                        if(maps != null && maps.Count > 0)
+                        if (maps != null && maps.Count > 0)
                         {
                             mfproj.MemoryMap = maps[0];
                         }
@@ -3606,7 +3608,7 @@ internal MFProject LoadProjectProj(string projFile, string path)
                     mfproj.Targets.Add(targ);
                 }
 
-                foreach(MFComponent comp in driverLibCheck)
+                foreach (MFComponent comp in driverLibCheck)
                 {
                     Library lib = m_helper.FindLibraryByFile(comp.ProjectPath);
 
@@ -3714,7 +3716,7 @@ internal void SaveSolutionProj(MFSolution solution)
 
                     Project proj = LoadProject(fullpath);
                     proj.ProjectCollection.UnloadProject(proj);
-                    
+
                     proj = new Project();
                     proj.Xml.DefaultTargets = "Build";
 
@@ -3742,7 +3744,7 @@ internal void SaveSolutionProj(MFSolution solution)
                     mainGrp.AddProperty("IsSolutionWizardVisible", solution.IsSolutionWizardVisible.ToString());
                     mainGrp.AddProperty("ENDIANNESS", solution.ENDIANNESS.ToString());
 
-                    Dictionary<string,object> nameLookup = new Dictionary<string,object>();
+                    Dictionary<string, object> nameLookup = new Dictionary<string, object>();
 
                     foreach (MFProperty prop in solution.Properties)
                     {
@@ -3763,7 +3765,7 @@ internal void SaveSolutionProj(MFSolution solution)
 
                             default:
                                 string key = prop.Name.ToLower();
-                                if(!nameLookup.ContainsKey(key))
+                                if (!nameLookup.ContainsKey(key))
                                 {
                                     ProjectPropertyElement bp = mainGrp.AddProperty(prop.Name, prop.Value);
                                     bp.Condition = prop.Condition;
@@ -3884,7 +3886,7 @@ internal void SaveSolutionProj(MFSolution solution)
 
                     proj.Save(fullpath);
 
-                    
+
                     if (solution.m_cloneSolution != null)
                     {
                         string cloneRoot = Path.GetDirectoryName(ExpandEnvVars(solution.m_cloneSolution.ProjectPath, "")) + "\\";
@@ -3958,7 +3960,7 @@ internal void SaveSolutionProj(MFSolution solution)
                     {
                         Processor proc = m_helper.FindProcessor(solution.Processor.Guid);
 
-                        if(proc != null)
+                        if (proc != null)
                         {
                             string template = Path.GetDirectoryName(ExpandEnvVars(proc.ProjectPath, "")) + "\\" + proc.Name + "_template_selector.h";
                             string newRoot = Path.GetDirectoryName(ExpandEnvVars(solution.ProjectPath, "")) + "\\";
@@ -4181,7 +4183,7 @@ private int ParseHexInt(string text, string key)
         {
             int val = -1;
 
-            Regex rx = new Regex("\\s"+key+"\\s+([aAbBcCdDeEfFxX\\d]+)");
+            Regex rx = new Regex("\\s" + key + "\\s+([aAbBcCdDeEfFxX\\d]+)");
             Match m = rx.Match(text);
             if (m.Success)
             {
@@ -4204,7 +4206,7 @@ private int ParseHexInt(string text, string key)
 
                 if (m.Success)
                 {
-                    string[] vals = m.Groups[1].Value.Split(new char[]{'*'}, StringSplitOptions.RemoveEmptyEntries);
+                    string[] vals = m.Groups[1].Value.Split(new char[] { '*' }, StringSplitOptions.RemoveEmptyEntries);
 
                     val = 1;
                     foreach (string num in vals)
@@ -4476,7 +4478,7 @@ internal MFSolution LoadSolutionProj(string solutionProjFile, string path)
                     sol = dbSol;
                 }
             }
-            catch(Exception e)
+            catch (Exception e)
             {
                 System.Diagnostics.Debug.WriteLine("Error: Exception in load solution " + e.Message);
                 sol = null;
@@ -4492,7 +4494,7 @@ internal bool SaveLibraryCategoryProj(LibraryCategory libCat)
             Project proj = LoadProject(fullpath);
 
             proj.ProjectCollection.UnloadProject(proj);
-                
+
             proj = new Project();
             proj.Xml.DefaultTargets = "Build";
             bool fRet = false;
@@ -4527,7 +4529,7 @@ internal bool SaveLibraryCategoryProj(LibraryCategory libCat)
 
                 fRet = true;
             }
-            catch( Exception e )
+            catch (Exception e)
             {
                 System.Diagnostics.Debug.WriteLine("Error: failure saving LibCat file: " + fullpath + "\r\n", e.Message);
             }
@@ -4592,7 +4594,7 @@ internal LibraryCategory LoadLibraryCategoryProj(string libCatProjFile, string p
                 System.Diagnostics.Debug.WriteLine("Error: loading LibCat file: " + fullpath + "\r\n", e.Message);
             }
 
-            
+
             return libcat;
         }
 
@@ -4652,7 +4654,7 @@ internal void CopyProjFilesFromClone(MFProject proj, MFSolution solution)
                 {
                     System.Diagnostics.Debug.WriteLine("Error: Copying clone files\r\n\tsrc:" + dirSource + "\r\n\tdst:" + dirTarg + "\r\n", e.Message);
                 }
-                
+
             }
         }
     }
diff --git a/CLR/Tools/PlatformDesigner/ComponentObjectModel/ScatterfileSchema.cs b/CLR/Tools/PlatformDesigner/ComponentObjectModel/ScatterfileSchema.cs
index ca03b2794..756e47994 100644
--- a/CLR/Tools/PlatformDesigner/ComponentObjectModel/ScatterfileSchema.cs
+++ b/CLR/Tools/PlatformDesigner/ComponentObjectModel/ScatterfileSchema.cs
@@ -11,32 +11,37 @@
 // 
 // This source code was auto-generated by xsd, Version=2.0.50727.1432.
 // 
+
+using System;
+using System.CodeDom.Compiler;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Diagnostics;
+using System.Xml.Serialization;
+
 namespace XsdScatterfileSchemaObject {
-    using System.Xml.Serialization;
-    
-    
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.1432")]
-    [System.SerializableAttribute()]
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true, Namespace="http://schemas.microsoft.com/netmf/ScatterfileSchema.xsd")]
-    [System.Xml.Serialization.XmlRootAttribute(Namespace="http://schemas.microsoft.com/netmf/ScatterfileSchema.xsd", IsNullable=false)]
+    [GeneratedCode("xsd", "2.0.50727.1432")]
+    [Serializable()]
+    [DebuggerStepThrough()]
+    [DesignerCategory("code")]
+    [XmlType(AnonymousType=true, Namespace="http://schemas.microsoft.com/netmf/ScatterfileSchema.xsd")]
+    [XmlRoot(Namespace="http://schemas.microsoft.com/netmf/ScatterfileSchema.xsd", IsNullable=false)]
     public partial class ScatterFile {
         
-        private System.Collections.Generic.List<Set> setField;
+        private List<Set> setField;
         
-        private System.Collections.Generic.List<If> ifField;
+        private List<If> ifField;
         
-        private System.Collections.Generic.List<IfDefined> ifDefinedField;
+        private List<IfDefined> ifDefinedField;
         
-        private System.Collections.Generic.List<IfNotDefined> ifNotDefinedField;
+        private List<IfNotDefined> ifNotDefinedField;
         
-        private System.Collections.Generic.List<LoadRegion> loadRegionField;
+        private List<LoadRegion> loadRegionField;
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute("Set")]
-        public System.Collections.Generic.List<Set> Set {
+        [XmlElement("Set")]
+        public List<Set> Set {
             get {
                 return this.setField;
             }
@@ -46,8 +51,8 @@ public System.Collections.Generic.List<Set> Set {
         }
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute("If")]
-        public System.Collections.Generic.List<If> If {
+        [XmlElement("If")]
+        public List<If> If {
             get {
                 return this.ifField;
             }
@@ -57,8 +62,8 @@ public System.Collections.Generic.List<If> If {
         }
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute("IfDefined")]
-        public System.Collections.Generic.List<IfDefined> IfDefined {
+        [XmlElement("IfDefined")]
+        public List<IfDefined> IfDefined {
             get {
                 return this.ifDefinedField;
             }
@@ -68,8 +73,8 @@ public System.Collections.Generic.List<IfDefined> IfDefined {
         }
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute("IfNotDefined")]
-        public System.Collections.Generic.List<IfNotDefined> IfNotDefined {
+        [XmlElement("IfNotDefined")]
+        public List<IfNotDefined> IfNotDefined {
             get {
                 return this.ifNotDefinedField;
             }
@@ -79,8 +84,8 @@ public System.Collections.Generic.List<IfNotDefined> IfNotDefined {
         }
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute("LoadRegion")]
-        public System.Collections.Generic.List<LoadRegion> LoadRegion {
+        [XmlElement("LoadRegion")]
+        public List<LoadRegion> LoadRegion {
             get {
                 return this.loadRegionField;
             }
@@ -91,11 +96,11 @@ public System.Collections.Generic.List<LoadRegion> LoadRegion {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.1432")]
-    [System.SerializableAttribute()]
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://schemas.microsoft.com/netmf/ScatterfileSchema.xsd")]
+    [GeneratedCode("xsd", "2.0.50727.1432")]
+    [Serializable()]
+    [DebuggerStepThrough()]
+    [DesignerCategory("code")]
+    [XmlType(Namespace="http://schemas.microsoft.com/netmf/ScatterfileSchema.xsd")]
     public partial class Set {
         
         private string nameField;
@@ -103,7 +108,7 @@ public partial class Set {
         private string valueField;
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute()]
+        [XmlAttribute()]
         public string Name {
             get {
                 return this.nameField;
@@ -114,7 +119,7 @@ public string Name {
         }
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute()]
+        [XmlAttribute()]
         public string Value {
             get {
                 return this.valueField;
@@ -126,17 +131,17 @@ public string Value {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.1432")]
-    [System.SerializableAttribute()]
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://schemas.microsoft.com/netmf/ScatterfileSchema.xsd")]
+    [GeneratedCode("xsd", "2.0.50727.1432")]
+    [Serializable()]
+    [DebuggerStepThrough()]
+    [DesignerCategory("code")]
+    [XmlType(Namespace="http://schemas.microsoft.com/netmf/ScatterfileSchema.xsd")]
     public partial class Error {
         
         private string messageField;
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute()]
+        [XmlAttribute()]
         public string Message {
             get {
                 return this.messageField;
@@ -148,30 +153,30 @@ public string Message {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.1432")]
-    [System.SerializableAttribute()]
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://schemas.microsoft.com/netmf/ScatterfileSchema.xsd")]
+    [GeneratedCode("xsd", "2.0.50727.1432")]
+    [Serializable()]
+    [DebuggerStepThrough()]
+    [DesignerCategory("code")]
+    [XmlType(Namespace="http://schemas.microsoft.com/netmf/ScatterfileSchema.xsd")]
     public partial class IfNotDefined {
         
-        private System.Collections.Generic.List<FileMapping> fileMappingField;
+        private List<FileMapping> fileMappingField;
         
-        private System.Collections.Generic.List<LoadRegion> loadRegionField;
+        private List<LoadRegion> loadRegionField;
         
-        private System.Collections.Generic.List<ExecRegion> execRegionField;
+        private List<ExecRegion> execRegionField;
         
-        private System.Collections.Generic.List<IfDefined> ifDefinedField;
+        private List<IfDefined> ifDefinedField;
         
-        private System.Collections.Generic.List<IfNotDefined> ifNotDefined1Field;
+        private List<IfNotDefined> ifNotDefined1Field;
         
-        private System.Collections.Generic.List<If> ifField;
+        private List<If> ifField;
         
         private string nameField;
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute("FileMapping")]
-        public System.Collections.Generic.List<FileMapping> FileMapping {
+        [XmlElement("FileMapping")]
+        public List<FileMapping> FileMapping {
             get {
                 return this.fileMappingField;
             }
@@ -181,8 +186,8 @@ public System.Collections.Generic.List<FileMapping> FileMapping {
         }
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute("LoadRegion")]
-        public System.Collections.Generic.List<LoadRegion> LoadRegion {
+        [XmlElement("LoadRegion")]
+        public List<LoadRegion> LoadRegion {
             get {
                 return this.loadRegionField;
             }
@@ -192,8 +197,8 @@ public System.Collections.Generic.List<LoadRegion> LoadRegion {
         }
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute("ExecRegion")]
-        public System.Collections.Generic.List<ExecRegion> ExecRegion {
+        [XmlElement("ExecRegion")]
+        public List<ExecRegion> ExecRegion {
             get {
                 return this.execRegionField;
             }
@@ -203,8 +208,8 @@ public System.Collections.Generic.List<ExecRegion> ExecRegion {
         }
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute("IfDefined")]
-        public System.Collections.Generic.List<IfDefined> IfDefined {
+        [XmlElement("IfDefined")]
+        public List<IfDefined> IfDefined {
             get {
                 return this.ifDefinedField;
             }
@@ -214,8 +219,8 @@ public System.Collections.Generic.List<IfDefined> IfDefined {
         }
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute("IfNotDefined")]
-        public System.Collections.Generic.List<IfNotDefined> IfNotDefined1 {
+        [XmlElement("IfNotDefined")]
+        public List<IfNotDefined> IfNotDefined1 {
             get {
                 return this.ifNotDefined1Field;
             }
@@ -225,8 +230,8 @@ public System.Collections.Generic.List<IfNotDefined> IfNotDefined1 {
         }
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute("If")]
-        public System.Collections.Generic.List<If> If {
+        [XmlElement("If")]
+        public List<If> If {
             get {
                 return this.ifField;
             }
@@ -236,7 +241,7 @@ public System.Collections.Generic.List<If> If {
         }
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute()]
+        [XmlAttribute()]
         public string Name {
             get {
                 return this.nameField;
@@ -248,11 +253,11 @@ public string Name {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.1432")]
-    [System.SerializableAttribute()]
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://schemas.microsoft.com/netmf/ScatterfileSchema.xsd")]
+    [GeneratedCode("xsd", "2.0.50727.1432")]
+    [Serializable()]
+    [DebuggerStepThrough()]
+    [DesignerCategory("code")]
+    [XmlType(Namespace="http://schemas.microsoft.com/netmf/ScatterfileSchema.xsd")]
     public partial class FileMapping {
         
         private string nameField;
@@ -260,7 +265,7 @@ public partial class FileMapping {
         private string optionsField;
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute()]
+        [XmlAttribute()]
         public string Name {
             get {
                 return this.nameField;
@@ -271,7 +276,7 @@ public string Name {
         }
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute()]
+        [XmlAttribute()]
         public string Options {
             get {
                 return this.optionsField;
@@ -283,20 +288,20 @@ public string Options {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.1432")]
-    [System.SerializableAttribute()]
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://schemas.microsoft.com/netmf/ScatterfileSchema.xsd")]
+    [GeneratedCode("xsd", "2.0.50727.1432")]
+    [Serializable()]
+    [DebuggerStepThrough()]
+    [DesignerCategory("code")]
+    [XmlType(Namespace="http://schemas.microsoft.com/netmf/ScatterfileSchema.xsd")]
     public partial class LoadRegion {
         
-        private System.Collections.Generic.List<ExecRegion> execRegionField;
+        private List<ExecRegion> execRegionField;
         
-        private System.Collections.Generic.List<If> ifField;
+        private List<If> ifField;
         
-        private System.Collections.Generic.List<IfDefined> ifDefinedField;
+        private List<IfDefined> ifDefinedField;
         
-        private System.Collections.Generic.List<IfNotDefined> ifNotDefinedField;
+        private List<IfNotDefined> ifNotDefinedField;
         
         private string nameField;
         
@@ -307,8 +312,8 @@ public partial class LoadRegion {
         private string sizeField;
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute("ExecRegion")]
-        public System.Collections.Generic.List<ExecRegion> ExecRegion {
+        [XmlElement("ExecRegion")]
+        public List<ExecRegion> ExecRegion {
             get {
                 return this.execRegionField;
             }
@@ -318,8 +323,8 @@ public System.Collections.Generic.List<ExecRegion> ExecRegion {
         }
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute("If")]
-        public System.Collections.Generic.List<If> If {
+        [XmlElement("If")]
+        public List<If> If {
             get {
                 return this.ifField;
             }
@@ -329,8 +334,8 @@ public System.Collections.Generic.List<If> If {
         }
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute("IfDefined")]
-        public System.Collections.Generic.List<IfDefined> IfDefined {
+        [XmlElement("IfDefined")]
+        public List<IfDefined> IfDefined {
             get {
                 return this.ifDefinedField;
             }
@@ -340,8 +345,8 @@ public System.Collections.Generic.List<IfDefined> IfDefined {
         }
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute("IfNotDefined")]
-        public System.Collections.Generic.List<IfNotDefined> IfNotDefined {
+        [XmlElement("IfNotDefined")]
+        public List<IfNotDefined> IfNotDefined {
             get {
                 return this.ifNotDefinedField;
             }
@@ -351,7 +356,7 @@ public System.Collections.Generic.List<IfNotDefined> IfNotDefined {
         }
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute()]
+        [XmlAttribute()]
         public string Name {
             get {
                 return this.nameField;
@@ -362,7 +367,7 @@ public string Name {
         }
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute()]
+        [XmlAttribute()]
         public string Base {
             get {
                 return this.baseField;
@@ -373,7 +378,7 @@ public string Base {
         }
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute()]
+        [XmlAttribute()]
         public string Options {
             get {
                 return this.optionsField;
@@ -384,7 +389,7 @@ public string Options {
         }
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute()]
+        [XmlAttribute()]
         public string Size {
             get {
                 return this.sizeField;
@@ -396,20 +401,20 @@ public string Size {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.1432")]
-    [System.SerializableAttribute()]
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://schemas.microsoft.com/netmf/ScatterfileSchema.xsd")]
+    [GeneratedCode("xsd", "2.0.50727.1432")]
+    [Serializable()]
+    [DebuggerStepThrough()]
+    [DesignerCategory("code")]
+    [XmlType(Namespace="http://schemas.microsoft.com/netmf/ScatterfileSchema.xsd")]
     public partial class ExecRegion {
         
-        private System.Collections.Generic.List<FileMapping> fileMappingField;
+        private List<FileMapping> fileMappingField;
         
-        private System.Collections.Generic.List<If> ifField;
+        private List<If> ifField;
         
-        private System.Collections.Generic.List<IfDefined> ifDefinedField;
+        private List<IfDefined> ifDefinedField;
         
-        private System.Collections.Generic.List<IfNotDefined> ifNotDefinedField;
+        private List<IfNotDefined> ifNotDefinedField;
         
         private string nameField;
         
@@ -420,8 +425,8 @@ public partial class ExecRegion {
         private string sizeField;
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute("FileMapping")]
-        public System.Collections.Generic.List<FileMapping> FileMapping {
+        [XmlElement("FileMapping")]
+        public List<FileMapping> FileMapping {
             get {
                 return this.fileMappingField;
             }
@@ -431,8 +436,8 @@ public System.Collections.Generic.List<FileMapping> FileMapping {
         }
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute("If")]
-        public System.Collections.Generic.List<If> If {
+        [XmlElement("If")]
+        public List<If> If {
             get {
                 return this.ifField;
             }
@@ -442,8 +447,8 @@ public System.Collections.Generic.List<If> If {
         }
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute("IfDefined")]
-        public System.Collections.Generic.List<IfDefined> IfDefined {
+        [XmlElement("IfDefined")]
+        public List<IfDefined> IfDefined {
             get {
                 return this.ifDefinedField;
             }
@@ -453,8 +458,8 @@ public System.Collections.Generic.List<IfDefined> IfDefined {
         }
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute("IfNotDefined")]
-        public System.Collections.Generic.List<IfNotDefined> IfNotDefined {
+        [XmlElement("IfNotDefined")]
+        public List<IfNotDefined> IfNotDefined {
             get {
                 return this.ifNotDefinedField;
             }
@@ -464,7 +469,7 @@ public System.Collections.Generic.List<IfNotDefined> IfNotDefined {
         }
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute()]
+        [XmlAttribute()]
         public string Name {
             get {
                 return this.nameField;
@@ -475,7 +480,7 @@ public string Name {
         }
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute()]
+        [XmlAttribute()]
         public string Base {
             get {
                 return this.baseField;
@@ -486,7 +491,7 @@ public string Base {
         }
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute()]
+        [XmlAttribute()]
         public string Options {
             get {
                 return this.optionsField;
@@ -497,7 +502,7 @@ public string Options {
         }
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute()]
+        [XmlAttribute()]
         public string Size {
             get {
                 return this.sizeField;
@@ -509,28 +514,28 @@ public string Size {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.1432")]
-    [System.SerializableAttribute()]
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://schemas.microsoft.com/netmf/ScatterfileSchema.xsd")]
+    [GeneratedCode("xsd", "2.0.50727.1432")]
+    [Serializable()]
+    [DebuggerStepThrough()]
+    [DesignerCategory("code")]
+    [XmlType(Namespace="http://schemas.microsoft.com/netmf/ScatterfileSchema.xsd")]
     public partial class If {
         
-        private System.Collections.Generic.List<Set> setField;
+        private List<Set> setField;
         
-        private System.Collections.Generic.List<If> if1Field;
+        private List<If> if1Field;
         
-        private System.Collections.Generic.List<IfDefined> ifDefinedField;
+        private List<IfDefined> ifDefinedField;
         
-        private System.Collections.Generic.List<IfNotDefined> ifNotDefinedField;
+        private List<IfNotDefined> ifNotDefinedField;
         
         private Error errorField;
         
-        private System.Collections.Generic.List<FileMapping> fileMappingField;
+        private List<FileMapping> fileMappingField;
         
-        private System.Collections.Generic.List<LoadRegion> loadRegionField;
+        private List<LoadRegion> loadRegionField;
         
-        private System.Collections.Generic.List<ExecRegion> execRegionField;
+        private List<ExecRegion> execRegionField;
         
         private string nameField;
         
@@ -539,8 +544,8 @@ public partial class If {
         private string inField;
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute("Set")]
-        public System.Collections.Generic.List<Set> Set {
+        [XmlElement("Set")]
+        public List<Set> Set {
             get {
                 return this.setField;
             }
@@ -550,8 +555,8 @@ public System.Collections.Generic.List<Set> Set {
         }
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute("If")]
-        public System.Collections.Generic.List<If> If1 {
+        [XmlElement("If")]
+        public List<If> If1 {
             get {
                 return this.if1Field;
             }
@@ -561,8 +566,8 @@ public System.Collections.Generic.List<If> If1 {
         }
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute("IfDefined")]
-        public System.Collections.Generic.List<IfDefined> IfDefined {
+        [XmlElement("IfDefined")]
+        public List<IfDefined> IfDefined {
             get {
                 return this.ifDefinedField;
             }
@@ -572,8 +577,8 @@ public System.Collections.Generic.List<IfDefined> IfDefined {
         }
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute("IfNotDefined")]
-        public System.Collections.Generic.List<IfNotDefined> IfNotDefined {
+        [XmlElement("IfNotDefined")]
+        public List<IfNotDefined> IfNotDefined {
             get {
                 return this.ifNotDefinedField;
             }
@@ -593,8 +598,8 @@ public Error Error {
         }
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute("FileMapping")]
-        public System.Collections.Generic.List<FileMapping> FileMapping {
+        [XmlElement("FileMapping")]
+        public List<FileMapping> FileMapping {
             get {
                 return this.fileMappingField;
             }
@@ -604,8 +609,8 @@ public System.Collections.Generic.List<FileMapping> FileMapping {
         }
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute("LoadRegion")]
-        public System.Collections.Generic.List<LoadRegion> LoadRegion {
+        [XmlElement("LoadRegion")]
+        public List<LoadRegion> LoadRegion {
             get {
                 return this.loadRegionField;
             }
@@ -615,8 +620,8 @@ public System.Collections.Generic.List<LoadRegion> LoadRegion {
         }
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute("ExecRegion")]
-        public System.Collections.Generic.List<ExecRegion> ExecRegion {
+        [XmlElement("ExecRegion")]
+        public List<ExecRegion> ExecRegion {
             get {
                 return this.execRegionField;
             }
@@ -626,7 +631,7 @@ public System.Collections.Generic.List<ExecRegion> ExecRegion {
         }
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute()]
+        [XmlAttribute()]
         public string Name {
             get {
                 return this.nameField;
@@ -637,7 +642,7 @@ public string Name {
         }
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute()]
+        [XmlAttribute()]
         public string Value {
             get {
                 return this.valueField;
@@ -648,7 +653,7 @@ public string Value {
         }
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute()]
+        [XmlAttribute()]
         public string In {
             get {
                 return this.inField;
@@ -660,30 +665,30 @@ public string In {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.1432")]
-    [System.SerializableAttribute()]
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://schemas.microsoft.com/netmf/ScatterfileSchema.xsd")]
+    [GeneratedCode("xsd", "2.0.50727.1432")]
+    [Serializable()]
+    [DebuggerStepThrough()]
+    [DesignerCategory("code")]
+    [XmlType(Namespace="http://schemas.microsoft.com/netmf/ScatterfileSchema.xsd")]
     public partial class IfDefined {
         
-        private System.Collections.Generic.List<FileMapping> fileMappingField;
+        private List<FileMapping> fileMappingField;
         
-        private System.Collections.Generic.List<LoadRegion> loadRegionField;
+        private List<LoadRegion> loadRegionField;
         
-        private System.Collections.Generic.List<ExecRegion> execRegionField;
+        private List<ExecRegion> execRegionField;
         
-        private System.Collections.Generic.List<IfDefined> ifDefined1Field;
+        private List<IfDefined> ifDefined1Field;
         
-        private System.Collections.Generic.List<IfNotDefined> ifNotDefinedField;
+        private List<IfNotDefined> ifNotDefinedField;
         
-        private System.Collections.Generic.List<If> ifField;
+        private List<If> ifField;
         
         private string nameField;
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute("FileMapping")]
-        public System.Collections.Generic.List<FileMapping> FileMapping {
+        [XmlElement("FileMapping")]
+        public List<FileMapping> FileMapping {
             get {
                 return this.fileMappingField;
             }
@@ -693,8 +698,8 @@ public System.Collections.Generic.List<FileMapping> FileMapping {
         }
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute("LoadRegion")]
-        public System.Collections.Generic.List<LoadRegion> LoadRegion {
+        [XmlElement("LoadRegion")]
+        public List<LoadRegion> LoadRegion {
             get {
                 return this.loadRegionField;
             }
@@ -704,8 +709,8 @@ public System.Collections.Generic.List<LoadRegion> LoadRegion {
         }
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute("ExecRegion")]
-        public System.Collections.Generic.List<ExecRegion> ExecRegion {
+        [XmlElement("ExecRegion")]
+        public List<ExecRegion> ExecRegion {
             get {
                 return this.execRegionField;
             }
@@ -715,8 +720,8 @@ public System.Collections.Generic.List<ExecRegion> ExecRegion {
         }
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute("IfDefined")]
-        public System.Collections.Generic.List<IfDefined> IfDefined1 {
+        [XmlElement("IfDefined")]
+        public List<IfDefined> IfDefined1 {
             get {
                 return this.ifDefined1Field;
             }
@@ -726,8 +731,8 @@ public System.Collections.Generic.List<IfDefined> IfDefined1 {
         }
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute("IfNotDefined")]
-        public System.Collections.Generic.List<IfNotDefined> IfNotDefined {
+        [XmlElement("IfNotDefined")]
+        public List<IfNotDefined> IfNotDefined {
             get {
                 return this.ifNotDefinedField;
             }
@@ -737,8 +742,8 @@ public System.Collections.Generic.List<IfNotDefined> IfNotDefined {
         }
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute("If")]
-        public System.Collections.Generic.List<If> If {
+        [XmlElement("If")]
+        public List<If> If {
             get {
                 return this.ifField;
             }
@@ -748,7 +753,7 @@ public System.Collections.Generic.List<If> If {
         }
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute()]
+        [XmlAttribute()]
         public string Name {
             get {
                 return this.nameField;
diff --git a/CLR/Tools/PlatformDesigner/ComponentObjectModel/ScatterfileSchemaEx.cs b/CLR/Tools/PlatformDesigner/ComponentObjectModel/ScatterfileSchemaEx.cs
index c2182cdc0..1802d67fa 100644
--- a/CLR/Tools/PlatformDesigner/ComponentObjectModel/ScatterfileSchemaEx.cs
+++ b/CLR/Tools/PlatformDesigner/ComponentObjectModel/ScatterfileSchemaEx.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Text;
 
 namespace XsdScatterfileSchemaObject
 {
diff --git a/CLR/Tools/PlatformDesigner/ComponentObjectModel/ScatterfileWrapper.cs b/CLR/Tools/PlatformDesigner/ComponentObjectModel/ScatterfileWrapper.cs
index 26135fc35..9356bc6ea 100644
--- a/CLR/Tools/PlatformDesigner/ComponentObjectModel/ScatterfileWrapper.cs
+++ b/CLR/Tools/PlatformDesigner/ComponentObjectModel/ScatterfileWrapper.cs
@@ -1,13 +1,13 @@
 using System;
-using System.Reflection;
 using System.Collections;
 using System.Collections.Generic;
-using System.Text;
+using System.Diagnostics;
 using System.IO;
+using System.Reflection;
+using System.Text.RegularExpressions;
 using System.Xml;
-using System.Xml.XPath;
 using System.Xml.Serialization;
-using System.Text.RegularExpressions;
+using System.Xml.XPath;
 using XsdInventoryFormatObject;
 using XsdScatterfileSchemaObject;
 
@@ -22,22 +22,22 @@ public class ScatterfileWrapper
 
         const string ScatterfileNamespace = "http://schemas.microsoft.com/netmf/ScatterfileSchema.xsd";
 
-        const string IfInFormat    = "If Name=\"{0}\" In=\"{1}\"";
-        const string IfEqFormat    = "If Name=\"{0}\" Value=\"{1}\"";
-        const string IfDefFormat   = "IfDefined Name=\"{0}\"";
-        const string IfNotDefFormat= "IfNotDefined Name=\"{0}\"";
+        const string IfInFormat = "If Name=\"{0}\" In=\"{1}\"";
+        const string IfEqFormat = "If Name=\"{0}\" Value=\"{1}\"";
+        const string IfDefFormat = "IfDefined Name=\"{0}\"";
+        const string IfNotDefFormat = "IfNotDefined Name=\"{0}\"";
 
-        const string RegExIfIn     = "If\\s+Name\\s*=\\s*\"(\\S+)\"\\s+In\\s*=\\s*\"([\\S\\s]*)\"";
-        const string RegExIfEq     = "If\\s+Name\\s*=\\s*\"(\\S+)\"\\s+Value\\s*=\\s*\"([\\S\\s]*)\"";
-        const string RegExIfDef    = "IfDefined\\s+Name\\s*=\\s*\"(\\S+)\"";
+        const string RegExIfIn = "If\\s+Name\\s*=\\s*\"(\\S+)\"\\s+In\\s*=\\s*\"([\\S\\s]*)\"";
+        const string RegExIfEq = "If\\s+Name\\s*=\\s*\"(\\S+)\"\\s+Value\\s*=\\s*\"([\\S\\s]*)\"";
+        const string RegExIfDef = "IfDefined\\s+Name\\s*=\\s*\"(\\S+)\"";
         const string RegExIfNotDef = "IfNotDefined\\s+Name\\s*=\\s*\"(\\S+)\"";
 
-        Regex m_expIfIn     = new Regex(RegExIfIn,     RegexOptions.IgnoreCase);
-        Regex m_expIfEq     = new Regex(RegExIfEq,     RegexOptions.IgnoreCase);
-        Regex m_expIfDef    = new Regex(RegExIfDef,    RegexOptions.IgnoreCase);
+        Regex m_expIfIn = new Regex(RegExIfIn, RegexOptions.IgnoreCase);
+        Regex m_expIfEq = new Regex(RegExIfEq, RegexOptions.IgnoreCase);
+        Regex m_expIfDef = new Regex(RegExIfDef, RegexOptions.IgnoreCase);
         Regex m_expIfNotDef = new Regex(RegExIfNotDef, RegexOptions.IgnoreCase);
 
-        Hashtable m_execRegionOrderMap   = new Hashtable();
+        Hashtable m_execRegionOrderMap = new Hashtable();
         Hashtable m_execRegionsToNavNode = new Hashtable();
 
         //Hashtable m_symOrderMap  = new Hashtable();
@@ -64,7 +64,7 @@ private object AddConditional(object owner, string conditional)
                 cond.Value = m.Groups[2].Value;
 
                 (owner.GetType().GetProperty(typeof(List<If>).Name).GetValue(owner, null) as IList).Add(cond);
-                
+
                 ret = cond;
             }
             else if (m_expIfIn.IsMatch(conditional))
@@ -113,7 +113,7 @@ private ICollection CreateSortedList(IList list)
             {
                 int order = 0;
                 object val = o.GetType().GetProperty("Order").GetValue(o, null);
-                if(val != null)
+                if (val != null)
                 {
                     order = (int)val;
                 }
@@ -142,7 +142,7 @@ private object GetObjectFromProperty(object o, Type propType)
 
         private IList GetCollectionFromObject(object o, Type collectionType)
         {
-            foreach(PropertyInfo pi in o.GetType().GetProperties())
+            foreach (PropertyInfo pi in o.GetType().GetProperties())
             {
                 if (pi.PropertyType == collectionType)
                 {
@@ -384,12 +384,12 @@ private void WriteNextNode(XmlWriter writer, XPathNavigator nav, bool iterateSib
 
         enum MemberPrecidence : int
         {
-            Unknown     = -1,
+            Unknown = -1,
             ErrorMember = 0,
-            EnvMember   = 1,
-            SetMember   = 2,
-            LoadRegion  = 3,
-            ExecRegion  = 3,
+            EnvMember = 1,
+            SetMember = 2,
+            LoadRegion = 3,
+            ExecRegion = 3,
             FileMapping = 3,
         };
 
@@ -411,17 +411,17 @@ private string GetConditionalValue(object cond)
         {
             string ret = "";
 
-            If ifCond             = cond as If;
-            IfDefined ifDef       = cond as IfDefined;
+            If ifCond = cond as If;
+            IfDefined ifDef = cond as IfDefined;
             IfNotDefined ifNotDef = cond as IfNotDefined;
 
             if (ifCond != null)
             {
-                if(ifCond.In != null)
+                if (ifCond.In != null)
                 {
                     ret = string.Format(IfInFormat, ifCond.Name, ifCond.In);
                 }
-                else if(ifCond.Value != null)
+                else if (ifCond.Value != null)
                 {
                     ret = string.Format(IfEqFormat, ifCond.Name, ifCond.Value);
                 }
@@ -498,7 +498,7 @@ private MemberPrecidence LoadScatterElements(object owner, object conditional, L
                     region.Address = lr.Base;
                     region.Options = lr.Options;
                     region.Size = lr.Size;
-//                    region.Order = regionSet.Count;
+                    //                    region.Order = regionSet.Count;
                     region.Conditional = GetConditionalValue(conditional);
 
                     regionSet.Add(region);
@@ -517,11 +517,11 @@ private MemberPrecidence LoadScatterElements(object owner, object conditional, L
                 foreach (ExecRegion er in erCollection)
                 {
                     MemorySection section = new MemorySection();
-                    section.Name        = er.Name;
-                    section.Address     = er.Base;
-                    section.Options     = er.Options;
-                    section.Size        = er.Size;
-                    section.Order       = (int)m_execRegionOrderMap[(owner as MemoryRegion).Name + ":" + er.Name];
+                    section.Name = er.Name;
+                    section.Address = er.Base;
+                    section.Options = er.Options;
+                    section.Size = er.Size;
+                    section.Order = (int)m_execRegionOrderMap[(owner as MemoryRegion).Name + ":" + er.Name];
                     section.Conditional = GetConditionalValue(conditional);
 
                     sectionSet.Add(section);
@@ -541,8 +541,8 @@ private MemberPrecidence LoadScatterElements(object owner, object conditional, L
                 foreach (FileMapping fm in fileCollection)
                 {
                     MemorySymbol sym = new MemorySymbol();
-                    sym.Name       = fm.Name;
-                    sym.Options    = fm.Options;
+                    sym.Name = fm.Name;
+                    sym.Options = fm.Options;
                     sym.Conditional = GetConditionalValue(conditional);
 
                     symSet.Add(sym);
@@ -562,7 +562,7 @@ private MemberPrecidence LoadScatterElements(object owner, object conditional, L
                 EnvVars envSet = null;
 
                 // conditional belongs to the map if we have a load region in this conditional
-                if(conditionalStack.Count == 0)
+                if (conditionalStack.Count == 0)
                 {
                     envSet = FindMatchingSet(envSets, "Global");
 
@@ -579,9 +579,9 @@ private MemberPrecidence LoadScatterElements(object owner, object conditional, L
                     {
                         object cond = conditionalStack[i];
 
-                        if (i == (conditionalStack.Count-1) && owner is MemoryMap && ret >= MemberPrecidence.LoadRegion)
+                        if (i == (conditionalStack.Count - 1) && owner is MemoryMap && ret >= MemberPrecidence.LoadRegion)
                         {
-                            ((MemoryMap)owner).Name        = GetConditionalName(conditional);
+                            ((MemoryMap)owner).Name = GetConditionalName(conditional);
                             ((MemoryMap)owner).Conditional = GetConditionalValue(conditional);
                         }
                         else
diff --git a/CLR/Tools/PlatformDesigner/PlatformDesigner.sln b/CLR/Tools/PlatformDesigner/PlatformDesigner.sln
index a03eea4b1..bf1a5305f 100644
--- a/CLR/Tools/PlatformDesigner/PlatformDesigner.sln
+++ b/CLR/Tools/PlatformDesigner/PlatformDesigner.sln
@@ -1,5 +1,7 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
+# Visual Studio 14
+VisualStudioVersion = 14.0.24720.0
+MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ComponentBuilder", "ComponentBuilder\ComponentBuilder.csproj", "{AB5C04D8-DDE9-4AAA-831E-C51F5EACB612}"
 	ProjectSection(ProjectDependencies) = postProject
 		{E0580777-E882-46C9-82B5-947D7A69586A} = {E0580777-E882-46C9-82B5-947D7A69586A}