Merge pull request #3903 from jaredpar/fix

Clean up the MSBuild code

src/Compilers/Core/MSBuildTask/Csc.cs

-// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
 using System;
 using System.Diagnostics;
@@ -31,80 +31,80 @@ public class Csc : ManagedCompiler
 
         public bool AllowUnsafeBlocks
         {
-            set { _store["AllowUnsafeBlocks"] = value; }
-            get { return _store.GetOrDefault("AllowUnsafeBlocks", false); }
+            set { _store[nameof(AllowUnsafeBlocks)] = value; }
+            get { return _store.GetOrDefault(nameof(AllowUnsafeBlocks), false); }
         }
 
         public string ApplicationConfiguration
         {
-            set { _store["ApplicationConfiguration"] = value; }
-            get { return (string)_store["ApplicationConfiguration"]; }
+            set { _store[nameof(ApplicationConfiguration)] = value; }
+            get { return (string)_store[nameof(ApplicationConfiguration)]; }
         }
 
         public string BaseAddress
         {
-            set { _store["BaseAddress"] = value; }
-            get { return (string)_store["BaseAddress"]; }
+            set { _store[nameof(BaseAddress)] = value; }
+            get { return (string)_store[nameof(BaseAddress)]; }
         }
 
         public bool CheckForOverflowUnderflow
         {
-            set { _store["CheckForOverflowUnderflow"] = value; }
-            get { return _store.GetOrDefault("CheckForOverflowUnderflow", false); }
+            set { _store[nameof(CheckForOverflowUnderflow)] = value; }
+            get { return _store.GetOrDefault(nameof(CheckForOverflowUnderflow), false); }
         }
 
         public string DocumentationFile
         {
-            set { _store["DocumentationFile"] = value; }
-            get { return (string)_store["DocumentationFile"]; }
+            set { _store[nameof(DocumentationFile)] = value; }
+            get { return (string)_store[nameof(DocumentationFile)]; }
         }
 
         public string DisabledWarnings
         {
-            set { _store["DisabledWarnings"] = value; }
-            get { return (string)_store["DisabledWarnings"]; }
+            set { _store[nameof(DisabledWarnings)] = value; }
+            get { return (string)_store[nameof(DisabledWarnings)]; }
         }
 
         public bool ErrorEndLocation
         {
-            set { _store["ErrorEndLocation"] = value; }
-            get { return _store.GetOrDefault("ErrorEndLocation", false); }
+            set { _store[nameof(ErrorEndLocation)] = value; }
+            get { return _store.GetOrDefault(nameof(ErrorEndLocation), false); }
         }
 
         public string ErrorReport
         {
-            set { _store["ErrorReport"] = value; }
-            get { return (string)_store["ErrorReport"]; }
+            set { _store[nameof(ErrorReport)] = value; }
+            get { return (string)_store[nameof(ErrorReport)]; }
         }
 
         public bool GenerateFullPaths
         {
-            set { _store["GenerateFullPaths"] = value; }
-            get { return _store.GetOrDefault("GenerateFullPaths", false); }
+            set { _store[nameof(GenerateFullPaths)] = value; }
+            get { return _store.GetOrDefault(nameof(GenerateFullPaths), false); }
         }
 
         public string LangVersion
         {
-            set { _store["LangVersion"] = value; }
-            get { return (string)_store["LangVersion"]; }
+            set { _store[nameof(LangVersion)] = value; }
+            get { return (string)_store[nameof(LangVersion)]; }
         }
 
         public string ModuleAssemblyName
         {
-            set { _store["ModuleAssemblyName"] = value; }
-            get { return (string)_store["ModuleAssemblyName"]; }
+            set { _store[nameof(ModuleAssemblyName)] = value; }
+            get { return (string)_store[nameof(ModuleAssemblyName)]; }
         }
 
         public bool NoStandardLib
         {
-            set { _store["NoStandardLib"] = value; }
-            get { return _store.GetOrDefault("NoStandardLib", false); }
+            set { _store[nameof(NoStandardLib)] = value; }
+            get { return _store.GetOrDefault(nameof(NoStandardLib), false); }
         }
 
         public string PdbFile
         {
-            set { _store["PdbFile"] = value; }
-            get { return (string)_store["PdbFile"]; }
+            set { _store[nameof(PdbFile)] = value; }
+            get { return (string)_store[nameof(PdbFile)]; }
         }
 
         /// <summary>
@@ -116,14 +116,14 @@ public string PdbFile
         /// </remarks>
         public string PreferredUILang
         {
-            set { _store["PreferredUILang"] = value; }
-            get { return (string)_store["PreferredUILang"]; }
+            set { _store[nameof(PreferredUILang)] = value; }
+            get { return (string)_store[nameof(PreferredUILang)]; }
         }
 
         public string VsSessionGuid
         {
-            set { _store["VsSessionGuid"] = value; }
-            get { return (string)_store["VsSessionGuid"]; }
+            set { _store[nameof(VsSessionGuid)] = value; }
+            get { return (string)_store[nameof(VsSessionGuid)]; }
         }
 
         public bool UseHostCompilerIfAvailable
@@ -134,20 +134,20 @@ public bool UseHostCompilerIfAvailable
 
         public int WarningLevel
         {
-            set { _store["WarningLevel"] = value; }
-            get { return _store.GetOrDefault("WarningLevel", 4); }
+            set { _store[nameof(WarningLevel)] = value; }
+            get { return _store.GetOrDefault(nameof(WarningLevel), 4); }
         }
 
         public string WarningsAsErrors
         {
-            set { _store["WarningsAsErrors"] = value; }
-            get { return (string)_store["WarningsAsErrors"]; }
+            set { _store[nameof(WarningsAsErrors)] = value; }
+            get { return (string)_store[nameof(WarningsAsErrors)]; }
         }
 
         public string WarningsNotAsErrors
         {
-            set { _store["WarningsNotAsErrors"] = value; }
-            get { return (string)_store["WarningsNotAsErrors"]; }
+            set { _store[nameof(WarningsNotAsErrors)] = value; }
+            get { return (string)_store[nameof(WarningsNotAsErrors)]; }
         }
 
         #endregion
@@ -186,7 +186,7 @@ override protected string ToolName
         /// <summary>
         /// Return the path to the tool to execute.
         /// </summary>
-        override protected string GenerateFullPathToTool()
+        protected override string GenerateFullPathToTool()
         {
             string pathToTool = ToolLocationHelper.GetPathToBuildToolsFile(ToolName, ToolLocationHelper.CurrentToolsVersion);
 
@@ -206,7 +206,7 @@ override protected string GenerateFullPathToTool()
         /// <summary>
         /// Fills the provided CommandLineBuilderExtension with those switches and other information that can go into a response file.
         /// </summary>
-        override protected internal void AddResponseFileCommands(CommandLineBuilderExtension commandLine)
+        protected internal override void AddResponseFileCommands(CommandLineBuilderExtension commandLine)
         {
             commandLine.AppendSwitchIfNotNull("/lib:", this.AdditionalLibPaths, ",");
             commandLine.AppendPlusOrMinusSwitch("/unsafe", this._store, "AllowUnsafeBlocks");
@@ -672,7 +672,7 @@ ICscHostObject cscHostObject
         ///     NoActionReturnFailure           Bad parameters were passed into the task.
         /// </summary>
         /// <owner>RGoel</owner>
-        override protected HostObjectInitializationStatus InitializeHostObject()
+        protected override HostObjectInitializationStatus InitializeHostObject()
         {
             if (this.HostObject != null)
             {
@@ -741,7 +741,7 @@ override protected HostObjectInitializationStatus InitializeHostObject()
         /// task.  Returns true if the compilation succeeded, otherwise false.  
         /// </summary>
         /// <owner>RGoel</owner>
-        override protected bool CallHostObjectToExecute()
+        protected override bool CallHostObjectToExecute()
         {
             Debug.Assert(this.HostObject != null, "We should not be here if the host object has not been set.");
 

src/Compilers/Core/MSBuildTask/ManagedCompiler.cs

-// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
 using System;
 using System.Collections;
@@ -35,26 +35,26 @@ public ManagedCompiler()
         // Please keep these alphabetized.
         public string[] AdditionalLibPaths
         {
-            set { _store["AdditionalLibPaths"] = value; }
-            get { return (string[])_store["AdditionalLibPaths"]; }
+            set { _store[nameof(AdditionalLibPaths)] = value; }
+            get { return (string[])_store[nameof(AdditionalLibPaths)]; }
         }
 
         public string[] AddModules
         {
-            set { _store["AddModules"] = value; }
-            get { return (string[])_store["AddModules"]; }
+            set { _store[nameof(AddModules)] = value; }
+            get { return (string[])_store[nameof(AddModules)]; }
         }
 
         public ITaskItem[] AdditionalFiles
         {
-            set { _store["AdditionalFiles"] = value; }
-            get { return (ITaskItem[])_store["AdditionalFiles"]; }
+            set { _store[nameof(AdditionalFiles)] = value; }
+            get { return (ITaskItem[])_store[nameof(AdditionalFiles)]; }
         }
 
         public ITaskItem[] Analyzers
         {
-            set { _store["Analyzers"] = value; }
-            get { return (ITaskItem[])_store["Analyzers"]; }
+            set { _store[nameof(Analyzers)] = value; }
+            get { return (ITaskItem[])_store[nameof(Analyzers)]; }
         }
 
         // We do not support BugReport because it always requires user interaction,
@@ -62,38 +62,38 @@ public ITaskItem[] Analyzers
 
         public string CodeAnalysisRuleSet
         {
-            set { _store["CodeAnalysisRuleSet"] = value; }
-            get { return (string)_store["CodeAnalysisRuleSet"]; }
+            set { _store[nameof(CodeAnalysisRuleSet)] = value; }
+            get { return (string)_store[nameof(CodeAnalysisRuleSet)]; }
         }
 
         public int CodePage
         {
-            set { _store["CodePage"] = value; }
-            get { return _store.GetOrDefault("CodePage", 0); }
+            set { _store[nameof(CodePage)] = value; }
+            get { return _store.GetOrDefault(nameof(CodePage), 0); }
         }
 
         public string DebugType
         {
-            set { _store["DebugType"] = value; }
-            get { return (string)_store["DebugType"]; }
+            set { _store[nameof(DebugType)] = value; }
+            get { return (string)_store[nameof(DebugType)]; }
         }
 
         public string DefineConstants
         {
-            set { _store["DefineConstants"] = value; }
-            get { return (string)_store["DefineConstants"]; }
+            set { _store[nameof(DefineConstants)] = value; }
+            get { return (string)_store[nameof(DefineConstants)]; }
         }
 
         public bool DelaySign
         {
-            set { _store["DelaySign"] = value; }
-            get { return _store.GetOrDefault("DelaySign", false); }
+            set { _store[nameof(DelaySign)] = value; }
+            get { return _store.GetOrDefault(nameof(DelaySign), false); }
         }
 
         public bool EmitDebugInformation
         {
-            set { _store["EmitDebugInformation"] = value; }
-            get { return _store.GetOrDefault("EmitDebugInformation", false); }
+            set { _store[nameof(EmitDebugInformation)] = value; }
+            get { return _store.GetOrDefault(nameof(EmitDebugInformation), false); }
         }
 
         public string ErrorLog
@@ -104,93 +104,93 @@ public string ErrorLog
 
         public string Features
         {
-            set { _store["Features"] = value; }
-            get { return (string)_store["Features"]; }
+            set { _store[nameof(Features)] = value; }
+            get { return (string)_store[nameof(Features)]; }
         }
 
         public int FileAlignment
         {
-            set { _store["FileAlignment"] = value; }
-            get { return _store.GetOrDefault("FileAlignment", 0); }
+            set { _store[nameof(FileAlignment)] = value; }
+            get { return _store.GetOrDefault(nameof(FileAlignment), 0); }
         }
 
         public bool HighEntropyVA
         {
-            set { _store["HighEntropyVA"] = value; }
-            get { return _store.GetOrDefault("HighEntropyVA", false); }
+            set { _store[nameof(HighEntropyVA)] = value; }
+            get { return _store.GetOrDefault(nameof(HighEntropyVA), false); }
         }
 
         public string KeyContainer
         {
-            set { _store["KeyContainer"] = value; }
-            get { return (string)_store["KeyContainer"]; }
+            set { _store[nameof(KeyContainer)] = value; }
+            get { return (string)_store[nameof(KeyContainer)]; }
         }
 
         public string KeyFile
         {
-            set { _store["KeyFile"] = value; }
-            get { return (string)_store["KeyFile"]; }
+            set { _store[nameof(KeyFile)] = value; }
+            get { return (string)_store[nameof(KeyFile)]; }
         }
 
         public ITaskItem[] LinkResources
         {
-            set { _store["LinkResources"] = value; }
-            get { return (ITaskItem[])_store["LinkResources"]; }
+            set { _store[nameof(LinkResources)] = value; }
+            get { return (ITaskItem[])_store[nameof(LinkResources)]; }
         }
 
         public string MainEntryPoint
         {
-            set { _store["MainEntryPoint"] = value; }
-            get { return (string)_store["MainEntryPoint"]; }
+            set { _store[nameof(MainEntryPoint)] = value; }
+            get { return (string)_store[nameof(MainEntryPoint)]; }
         }
 
         public bool NoConfig
         {
-            set { _store["NoConfig"] = value; }
-            get { return _store.GetOrDefault("NoConfig", false); }
+            set { _store[nameof(NoConfig)] = value; }
+            get { return _store.GetOrDefault(nameof(NoConfig), false); }
         }
 
         public bool NoLogo
         {
-            set { _store["NoLogo"] = value; }
-            get { return _store.GetOrDefault("NoLogo", false); }
+            set { _store[nameof(NoLogo)] = value; }
+            get { return _store.GetOrDefault(nameof(NoLogo), false); }
         }
 
         public bool NoWin32Manifest
         {
-            set { _store["NoWin32Manifest"] = value; }
-            get { return _store.GetOrDefault("NoWin32Manifest", false); }
+            set { _store[nameof(NoWin32Manifest)] = value; }
+            get { return _store.GetOrDefault(nameof(NoWin32Manifest), false); }
         }
 
         public bool Optimize
         {
-            set { _store["Optimize"] = value; }
-            get { return _store.GetOrDefault("Optimize", false); }
+            set { _store[nameof(Optimize)] = value; }
+            get { return _store.GetOrDefault(nameof(Optimize), false); }
         }
 
         [Output]
         public ITaskItem OutputAssembly
         {
-            set { _store["OutputAssembly"] = value; }
-            get { return (ITaskItem)_store["OutputAssembly"]; }
+            set { _store[nameof(OutputAssembly)] = value; }
+            get { return (ITaskItem)_store[nameof(OutputAssembly)]; }
         }
 
         public string Platform
         {
-            set { _store["Platform"] = value; }
-            get { return (string)_store["Platform"]; }
+            set { _store[nameof(Platform)] = value; }
+            get { return (string)_store[nameof(Platform)]; }
         }
 
         public bool Prefer32Bit
         {
-            set { _store["Prefer32Bit"] = value; }
-            get { return _store.GetOrDefault("Prefer32Bit", false); }
+            set { _store[nameof(Prefer32Bit)] = value; }
+            get { return _store.GetOrDefault(nameof(Prefer32Bit), false); }
         }
 
         public ITaskItem[] References
         {
-            set { _store["References"] = value; }
-            get { return (ITaskItem[])_store["References"]; }
+            set { _store[nameof(References)] = value; }
+            get { return (ITaskItem[])_store[nameof(References)]; }
         }
 
         public bool ReportAnalyzer
@@ -201,14 +201,14 @@ public bool ReportAnalyzer
 
         public ITaskItem[] Resources
         {
-            set { _store["Resources"] = value; }
-            get { return (ITaskItem[])_store["Resources"]; }
+            set { _store[nameof(Resources)] = value; }
+            get { return (ITaskItem[])_store[nameof(Resources)]; }
         }
 
         public ITaskItem[] ResponseFiles
         {
-            set { _store["ResponseFiles"] = value; }
-            get { return (ITaskItem[])_store["ResponseFiles"]; }
+            set { _store[nameof(ResponseFiles)] = value; }
+            get { return (ITaskItem[])_store[nameof(ResponseFiles)]; }
         }
 
         public ITaskItem[] Sources
@@ -220,51 +220,51 @@ public ITaskItem[] Sources
                     NormalizePaths(value);
                 }
 
-                _store["Sources"] = value;
+                _store[nameof(Sources)] = value;
             }
-            get { return (ITaskItem[])_store["Sources"]; }
+            get { return (ITaskItem[])_store[nameof(Sources)]; }
         }
 
         public string SubsystemVersion
         {
-            set { _store["SubsystemVersion"] = value; }
-            get { return (string)_store["SubsystemVersion"]; }
+            set { _store[nameof(SubsystemVersion)] = value; }
+            get { return (string)_store[nameof(SubsystemVersion)]; }
         }
 
         public string TargetType
         {
-            set { _store["TargetType"] = value.ToLower(CultureInfo.InvariantCulture); }
-            get { return (string)_store["TargetType"]; }
+            set { _store[nameof(TargetType)] = value.ToLower(CultureInfo.InvariantCulture); }
+            get { return (string)_store[nameof(TargetType)]; }
         }
 
         public bool TreatWarningsAsErrors
         {
-            set { _store["TreatWarningsAsErrors"] = value; }
-            get { return _store.GetOrDefault("TreatWarningsAsErrors", false); }
+            set { _store[nameof(TreatWarningsAsErrors)] = value; }
+            get { return _store.GetOrDefault(nameof(TreatWarningsAsErrors), false); }
         }
 
         public bool Utf8Output
         {
-            set { _store["Utf8Output"] = value; }
-            get { return _store.GetOrDefault("Utf8Output", false); }
+            set { _store[nameof(Utf8Output)] = value; }
+            get { return _store.GetOrDefault(nameof(Utf8Output), false); }
         }
 
         public string Win32Icon
         {
-            set { _store["Win32Icon"] = value; }
-            get { return (string)_store["Win32Icon"]; }
+            set { _store[nameof(Win32Icon)] = value; }
+            get { return (string)_store[nameof(Win32Icon)]; }
         }
 
         public string Win32Manifest
         {
-            set { _store["Win32Manifest"] = value; }
-            get { return (string)_store["Win32Manifest"]; }
+            set { _store[nameof(Win32Manifest)] = value; }
+            get { return (string)_store[nameof(Win32Manifest)]; }
         }
 
         public string Win32Resource
         {
-            set { _store["Win32Resource"] = value; }
-            get { return (string)_store["Win32Resource"]; }
+            set { _store[nameof(Win32Resource)] = value; }
+            get { return (string)_store[nameof(Win32Resource)]; }
         }
 
         /// <summary>
@@ -511,7 +511,7 @@ private string[] GetArguments(string commandLineCommands, string responseFileCom
         /// Will only be called if the task returned a non empty string from GetResponseFileCommands
         /// Called after ValidateParameters, SkipTaskExecution and GetResponseFileCommands
         /// </summary>
-        override protected string GenerateResponseFileCommands()
+        protected override string GenerateResponseFileCommands()
         {
             CommandLineBuilderExtension commandLineBuilder = new CommandLineBuilderExtension();
             AddResponseFileCommands(commandLineBuilder);

src/Compilers/Core/MSBuildTask/Vbc.cs

-// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
 using System;
 using System.IO;
@@ -44,56 +44,56 @@ public class Vbc : ManagedCompiler
 
         public string BaseAddress
         {
-            set { _store["BaseAddress"] = value; }
-            get { return (string)_store["BaseAddress"]; }
+            set { _store[nameof(BaseAddress)] = value; }
+            get { return (string)_store[nameof(BaseAddress)]; }
         }
 
         public string DisabledWarnings
         {
-            set { _store["DisabledWarnings"] = value; }
-            get { return (string)_store["DisabledWarnings"]; }
+            set { _store[nameof(DisabledWarnings)] = value; }
+            get { return (string)_store[nameof(DisabledWarnings)]; }
         }
 
         public string DocumentationFile
         {
-            set { _store["DocumentationFile"] = value; }
-            get { return (string)_store["DocumentationFile"]; }
+            set { _store[nameof(DocumentationFile)] = value; }
+            get { return (string)_store[nameof(DocumentationFile)]; }
         }
 
         public string ErrorReport
         {
-            set { _store["ErrorReport"] = value; }
-            get { return (string)_store["ErrorReport"]; }
+            set { _store[nameof(ErrorReport)] = value; }
+            get { return (string)_store[nameof(ErrorReport)]; }
         }
 
         public bool GenerateDocumentation
         {
-            set { _store["GenerateDocumentation"] = value; }
-            get { return _store.GetOrDefault("GenerateDocumentation", false); }
+            set { _store[nameof(GenerateDocumentation)] = value; }
+            get { return _store.GetOrDefault(nameof(GenerateDocumentation), false); }
         }
 
         public ITaskItem[] Imports
         {
-            set { _store["Imports"] = value; }
-            get { return (ITaskItem[])_store["Imports"]; }
+            set { _store[nameof(Imports)] = value; }
+            get { return (ITaskItem[])_store[nameof(Imports)]; }
         }
 
         public string LangVersion
         {
-            set { _store["LangVersion"] = value; }
-            get { return (string)_store["LangVersion"]; }
+            set { _store[nameof(LangVersion)] = value; }
+            get { return (string)_store[nameof(LangVersion)]; }
         }
 
         public string ModuleAssemblyName
         {
-            set { _store["ModuleAssemblyName"] = value; }
-            get { return (string)_store["ModuleAssemblyName"]; }
+            set { _store[nameof(ModuleAssemblyName)] = value; }
+            get { return (string)_store[nameof(ModuleAssemblyName)]; }
         }
 
         public bool NoStandardLib
         {
-            set { _store["NoStandardLib"] = value; }
-            get { return _store.GetOrDefault("NoStandardLib", false); }
+            set { _store[nameof(NoStandardLib)] = value; }
+            get { return _store.GetOrDefault(nameof(NoStandardLib), false); }
         }
 
         // This is not a documented switch. It prevents the automatic reference to Microsoft.VisualBasic.dll.
@@ -103,63 +103,63 @@ public bool NoStandardLib
         // within VS, which must use non-LKG msbuild bits.
         public bool NoVBRuntimeReference
         {
-            set { _store["NoVBRuntimeReference"] = value; }
-            get { return _store.GetOrDefault("NoVBRuntimeReference", false); }
+            set { _store[nameof(NoVBRuntimeReference)] = value; }
+            get { return _store.GetOrDefault(nameof(NoVBRuntimeReference), false); }
         }
 
         public bool NoWarnings
         {
-            set { _store["NoWarnings"] = value; }
-            get { return _store.GetOrDefault("NoWarnings", false); }
+            set { _store[nameof(NoWarnings)] = value; }
+            get { return _store.GetOrDefault(nameof(NoWarnings), false); }
         }
 
         public string OptionCompare
         {
-            set { _store["OptionCompare"] = value; }
-            get { return (string)_store["OptionCompare"]; }
+            set { _store[nameof(OptionCompare)] = value; }
+            get { return (string)_store[nameof(OptionCompare)]; }
         }
 
         public bool OptionExplicit
         {
-            set { _store["OptionExplicit"] = value; }
-            get { return _store.GetOrDefault("OptionExplicit", true); }
+            set { _store[nameof(OptionExplicit)] = value; }
+            get { return _store.GetOrDefault(nameof(OptionExplicit), true); }
         }
 
         public bool OptionStrict
         {
-            set { _store["OptionStrict"] = value; }
-            get { return _store.GetOrDefault("OptionStrict", false); }
+            set { _store[nameof(OptionStrict)] = value; }
+            get { return _store.GetOrDefault(nameof(OptionStrict), false); }
         }
 
         public bool OptionInfer
         {
-            set { _store["OptionInfer"] = value; }
-            get { return _store.GetOrDefault("OptionInfer", false); }
+            set { _store[nameof(OptionInfer)] = value; }
+            get { return _store.GetOrDefault(nameof(OptionInfer), false); }
         }
 
         // Currently only /optionstrict:custom
         public string OptionStrictType
         {
-            set { _store["OptionStrictType"] = value; }
-            get { return (string)_store["OptionStrictType"]; }
+            set { _store[nameof(OptionStrictType)] = value; }
+            get { return (string)_store[nameof(OptionStrictType)]; }
         }
 
         public bool RemoveIntegerChecks
         {
-            set { _store["RemoveIntegerChecks"] = value; }
-            get { return _store.GetOrDefault("RemoveIntegerChecks", false); }
+            set { _store[nameof(RemoveIntegerChecks)] = value; }
+            get { return _store.GetOrDefault(nameof(RemoveIntegerChecks), false); }
         }
 
         public string RootNamespace
         {
-            set { _store["RootNamespace"] = value; }
-            get { return (string)_store["RootNamespace"]; }
+            set { _store[nameof(RootNamespace)] = value; }
+            get { return (string)_store[nameof(RootNamespace)]; }
         }
 
         public string SdkPath
         {
-            set { _store["SdkPath"] = value; }
-            get { return (string)_store["SdkPath"]; }
+            set { _store[nameof(SdkPath)] = value; }
+            get { return (string)_store[nameof(SdkPath)]; }
         }
 
         /// <summary>
@@ -171,20 +171,20 @@ public string SdkPath
         /// </remarks>
         public string PreferredUILang
         {
-            set { _store["PreferredUILang"] = value; }
-            get { return (string)_store["PreferredUILang"]; }
+            set { _store[nameof(PreferredUILang)] = value; }
+            get { return (string)_store[nameof(PreferredUILang)]; }
         }
 
         public string VsSessionGuid
         {
-            set { _store["VsSessionGuid"] = value; }
-            get { return (string)_store["VsSessionGuid"]; }
+            set { _store[nameof(VsSessionGuid)] = value; }
+            get { return (string)_store[nameof(VsSessionGuid)]; }
         }
 
         public bool TargetCompactFramework
         {
-            set { _store["TargetCompactFramework"] = value; }
-            get { return _store.GetOrDefault("TargetCompactFramework", false); }
+            set { _store[nameof(TargetCompactFramework)] = value; }
+            get { return _store.GetOrDefault(nameof(TargetCompactFramework), false); }
         }
 
         public bool UseHostCompilerIfAvailable
@@ -195,38 +195,38 @@ public bool UseHostCompilerIfAvailable
 
         public string VBRuntimePath
         {
-            set { _store["VBRuntimePath"] = value; }
-            get { return (string)_store["VBRuntimePath"]; }
+            set { _store[nameof(VBRuntimePath)] = value; }
+            get { return (string)_store[nameof(VBRuntimePath)]; }
         }
 
         public string Verbosity
         {
-            set { _store["Verbosity"] = value; }
-            get { return (string)_store["Verbosity"]; }
+            set { _store[nameof(Verbosity)] = value; }
+            get { return (string)_store[nameof(Verbosity)]; }
         }
 
         public string WarningsAsErrors
         {
-            set { _store["WarningsAsErrors"] = value; }
-            get { return (string)_store["WarningsAsErrors"]; }
+            set { _store[nameof(WarningsAsErrors)] = value; }
+            get { return (string)_store[nameof(WarningsAsErrors)]; }
         }
 
         public string WarningsNotAsErrors
         {
-            set { _store["WarningsNotAsErrors"] = value; }
-            get { return (string)_store["WarningsNotAsErrors"]; }
+            set { _store[nameof(WarningsNotAsErrors)] = value; }
+            get { return (string)_store[nameof(WarningsNotAsErrors)]; }
         }
 
         public string VBRuntime
         {
-            set { _store["VBRuntime"] = value; }
-            get { return (string)_store["VBRuntime"]; }
+            set { _store[nameof(VBRuntime)] = value; }
+            get { return (string)_store[nameof(VBRuntime)]; }
         }
 
         public string PdbFile
         {
-            set { _store["PdbFile"] = value; }
-            get { return (string)_store["PdbFile"]; }
+            set { _store[nameof(PdbFile)] = value; }
+            get { return (string)_store[nameof(PdbFile)]; }
         }
         #endregion
 
@@ -334,7 +334,7 @@ internal void MovePdbFileIfNecessary(string outputAssembly)
         /// <summary>
         /// Generate the path to the tool
         /// </summary>
-        override protected string GenerateFullPathToTool()
+        protected override string GenerateFullPathToTool()
         {
             string pathToTool = ToolLocationHelper.GetPathToBuildToolsFile(ToolName, ToolLocationHelper.CurrentToolsVersion);
 
@@ -596,7 +596,7 @@ private void AddReferencesToCommandLine(CommandLineBuilderExtension commandLine)
         /// Validate parameters, log errors and warnings and return true if
         /// Execute should proceed.
         /// </summary>
-        override protected bool ValidateParameters()
+        protected override bool ValidateParameters()
         {
             if (!base.ValidateParameters())
             {
@@ -999,7 +999,7 @@ IVbcHostObject vbcHostObject
         ///     NoActionReturnFailure           Bad parameters were passed into the task.
         /// </summary>
         /// <owner>RGoel</owner>
-        override protected HostObjectInitializationStatus InitializeHostObject()
+        protected override HostObjectInitializationStatus InitializeHostObject()
         {
             if (this.HostObject != null)
             {
@@ -1073,7 +1073,7 @@ override protected HostObjectInitializationStatus InitializeHostObject()
         /// and the compile succeeded.  Otherwise, we return false.
         /// </summary>
         /// <owner>RGoel</owner>
-        override protected bool CallHostObjectToExecute()
+        protected override bool CallHostObjectToExecute()
         {
             Debug.Assert(this.HostObject != null, "We should not be here if the host object has not been set.");