From c594d61da9a17b0a994951eb0523ac23bf791eb2 Mon Sep 17 00:00:00 2001
From: Atsushi Eno <atsushieno@veritas-vos-liberabit.com>
Date: Wed, 27 Nov 2013 16:04:51 +0900
Subject: [PATCH] For expression stuff, change namespace to
 MS.Build.Internal.Expressionns.

Too annoying to track build engine traces.
---
 .../Microsoft.Build/Microsoft.Build.Evaluation/Project.cs      | 1 +
 .../Microsoft.Build.Exceptions/InvalidProjectFileException.cs  | 3 ++-
 .../Microsoft.Build.Execution/ProjectInstance.cs               | 1 +
 .../Microsoft.Build.Internal/ExpressionConstructs.cs           | 2 +-
 .../Microsoft.Build.Internal/ExpressionEvaluator.cs            | 2 +-
 .../Microsoft.Build.Internal/ExpressionParserManual.cs         | 2 +-
 .../Microsoft.Build.Internal/ExpressionTokenizer.cs            | 2 +-
 7 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/mcs/class/Microsoft.Build/Microsoft.Build.Evaluation/Project.cs b/mcs/class/Microsoft.Build/Microsoft.Build.Evaluation/Project.cs
index 54213b08193..b1741a8e521 100644
--- a/mcs/class/Microsoft.Build/Microsoft.Build.Evaluation/Project.cs
+++ b/mcs/class/Microsoft.Build/Microsoft.Build.Evaluation/Project.cs
@@ -41,6 +41,7 @@ using Microsoft.Build.Exceptions;
 using Microsoft.Build.Execution;
 using Microsoft.Build.Framework;
 using Microsoft.Build.Internal;
+using Microsoft.Build.Internal.Expressions;
 using Microsoft.Build.Logging;
 using System.Collections;
 
diff --git a/mcs/class/Microsoft.Build/Microsoft.Build.Exceptions/InvalidProjectFileException.cs b/mcs/class/Microsoft.Build/Microsoft.Build.Exceptions/InvalidProjectFileException.cs
index 806c4f33b5f..756ed779914 100644
--- a/mcs/class/Microsoft.Build/Microsoft.Build.Exceptions/InvalidProjectFileException.cs
+++ b/mcs/class/Microsoft.Build/Microsoft.Build.Exceptions/InvalidProjectFileException.cs
@@ -29,6 +29,7 @@
 using System;
 using System.Runtime.Serialization;
 using Microsoft.Build.Construction;
+using Microsoft.Build.Internal.Expressions;
 
 namespace Microsoft.Build.Exceptions
 {
@@ -58,7 +59,7 @@ namespace Microsoft.Build.Exceptions
                         : base(message, innerException)
                 {
                 }
-                internal InvalidProjectFileException (Microsoft.Build.Internal.ILocation start, string message,
+                internal InvalidProjectFileException (ILocation start, string message,
                                                       string errorSubcategory = null, string errorCode = null, string helpKeyword = null)
                         : this (null, 0, start != null ? start.Column : 0, 0, 0, message, errorSubcategory, errorCode, helpKeyword)
                 {
diff --git a/mcs/class/Microsoft.Build/Microsoft.Build.Execution/ProjectInstance.cs b/mcs/class/Microsoft.Build/Microsoft.Build.Execution/ProjectInstance.cs
index 1d75b0c78d9..d91d3803e84 100644
--- a/mcs/class/Microsoft.Build/Microsoft.Build.Execution/ProjectInstance.cs
+++ b/mcs/class/Microsoft.Build/Microsoft.Build.Execution/ProjectInstance.cs
@@ -35,6 +35,7 @@ using System.Linq;
 using Microsoft.Build.Construction;
 using Microsoft.Build.Evaluation;
 using Microsoft.Build.Framework;
+using Microsoft.Build.Internal.Expressions;
 using Microsoft.Build.Logging;
 
 //
diff --git a/mcs/class/Microsoft.Build/Microsoft.Build.Internal/ExpressionConstructs.cs b/mcs/class/Microsoft.Build/Microsoft.Build.Internal/ExpressionConstructs.cs
index bbb304fc43c..e231f272781 100644
--- a/mcs/class/Microsoft.Build/Microsoft.Build.Internal/ExpressionConstructs.cs
+++ b/mcs/class/Microsoft.Build/Microsoft.Build.Internal/ExpressionConstructs.cs
@@ -29,7 +29,7 @@ using System;
 using System.Collections;
 using System.Collections.Generic;
 
-namespace Microsoft.Build.Internal
+namespace Microsoft.Build.Internal.Expressions
 {
 	
 	class Locatable
diff --git a/mcs/class/Microsoft.Build/Microsoft.Build.Internal/ExpressionEvaluator.cs b/mcs/class/Microsoft.Build/Microsoft.Build.Internal/ExpressionEvaluator.cs
index 9ffe9b74530..e89a45f9b22 100644
--- a/mcs/class/Microsoft.Build/Microsoft.Build.Internal/ExpressionEvaluator.cs
+++ b/mcs/class/Microsoft.Build/Microsoft.Build.Internal/ExpressionEvaluator.cs
@@ -35,7 +35,7 @@ using Microsoft.Build.Execution;
 using Microsoft.Build.Framework;
 using System.IO;
 
-namespace Microsoft.Build.Internal
+namespace Microsoft.Build.Internal.Expressions
 {
 	class ExpressionEvaluator
 	{
diff --git a/mcs/class/Microsoft.Build/Microsoft.Build.Internal/ExpressionParserManual.cs b/mcs/class/Microsoft.Build/Microsoft.Build.Internal/ExpressionParserManual.cs
index 83d4e9b1565..1c99ad81421 100644
--- a/mcs/class/Microsoft.Build/Microsoft.Build.Internal/ExpressionParserManual.cs
+++ b/mcs/class/Microsoft.Build/Microsoft.Build.Internal/ExpressionParserManual.cs
@@ -30,7 +30,7 @@ using System.Collections.Generic;
 using System.Linq;
 using Microsoft.Build.Exceptions;
 
-namespace Microsoft.Build.Internal
+namespace Microsoft.Build.Internal.Expressions
 {
 	class ExpressionParserManual
 	{
diff --git a/mcs/class/Microsoft.Build/Microsoft.Build.Internal/ExpressionTokenizer.cs b/mcs/class/Microsoft.Build/Microsoft.Build.Internal/ExpressionTokenizer.cs
index 6820cc467d1..af25f75401b 100644
--- a/mcs/class/Microsoft.Build/Microsoft.Build.Internal/ExpressionTokenizer.cs
+++ b/mcs/class/Microsoft.Build/Microsoft.Build.Internal/ExpressionTokenizer.cs
@@ -29,7 +29,7 @@ using System;
 using System.Collections.Generic;
 using Microsoft.Build.Evaluation;
 
-namespace Microsoft.Build.Internal
+namespace Microsoft.Build.Internal.Expressions
 {
 	enum ExpressionValidationType
 	{
-- 
2.25.1