diff options
156 files changed, 166 insertions, 166 deletions
diff --git a/main/src/addins/AspNet/Projects/AspNetMSBuildImportProvider.cs b/main/src/addins/AspNet/Projects/AspNetMSBuildImportProvider.cs index 40deaca04d..634c5edd0c 100644 --- a/main/src/addins/AspNet/Projects/AspNetMSBuildImportProvider.cs +++ b/main/src/addins/AspNet/Projects/AspNetMSBuildImportProvider.cs @@ -27,7 +27,7 @@ using System; using System.Collections.Generic; using MonoDevelop.Projects; -using MonoDevelop.Projects.Formats.MSBuild; +using MonoDevelop.Projects.MSBuild; using Mono.Addins; using MonoDevelop.AspNet.Projects; diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Project/CSharpCompilerParameters.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Project/CSharpCompilerParameters.cs index 99e0b6ff48..b285a0843c 100644 --- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Project/CSharpCompilerParameters.cs +++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Project/CSharpCompilerParameters.cs @@ -33,7 +33,7 @@ using MonoDevelop.Core.Serialization; using MonoDevelop.Core; using Mono.Collections.Generic; using System.Linq; -using MonoDevelop.Projects.Formats.MSBuild; +using MonoDevelop.Projects.MSBuild; using System.Collections.Immutable; using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.CSharp; diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Project/CSharpProjectExtension.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Project/CSharpProjectExtension.cs index ce66e1cd0d..7dd7239f66 100644 --- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Project/CSharpProjectExtension.cs +++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Project/CSharpProjectExtension.cs @@ -25,7 +25,7 @@ // THE SOFTWARE. using System; using MonoDevelop.Projects; -using MonoDevelop.Projects.Formats.MSBuild; +using MonoDevelop.Projects.MSBuild; using MonoDevelop.Core; using MonoDevelop.Core.Serialization; using MonoDevelop.Projects.Extensions; diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Project/CSharpResourceIdBuilder.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Project/CSharpResourceIdBuilder.cs index b2ace92110..83ecac0135 100644 --- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Project/CSharpResourceIdBuilder.cs +++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Project/CSharpResourceIdBuilder.cs @@ -34,7 +34,7 @@ using System.Globalization; using System.IO; using System.Text; using MonoDevelop.Projects.Extensions; -using MonoDevelop.Projects.Formats.MSBuild; +using MonoDevelop.Projects.MSBuild; namespace MonoDevelop.CSharp.Project { diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Project/PortableCSharpProjectFlavor.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Project/PortableCSharpProjectFlavor.cs index 54a2dadc20..1c60770696 100644 --- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Project/PortableCSharpProjectFlavor.cs +++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Project/PortableCSharpProjectFlavor.cs @@ -26,7 +26,7 @@ using System; using MonoDevelop.Projects; using MonoDevelop.Core; -using MonoDevelop.Projects.Formats.MSBuild; +using MonoDevelop.Projects.MSBuild; namespace MonoDevelop.CSharp.Project { diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment.Linux/MonoDevelop.Deployment.Linux/LinuxDeployData.cs b/main/src/addins/Deployment/MonoDevelop.Deployment.Linux/MonoDevelop.Deployment.Linux/LinuxDeployData.cs index 2cc61ed8d8..aed6187f73 100644 --- a/main/src/addins/Deployment/MonoDevelop.Deployment.Linux/MonoDevelop.Deployment.Linux/LinuxDeployData.cs +++ b/main/src/addins/Deployment/MonoDevelop.Deployment.Linux/MonoDevelop.Deployment.Linux/LinuxDeployData.cs @@ -4,7 +4,7 @@ using MonoDevelop.Projects; using MonoDevelop.Core.Serialization; using System.Xml; using System.IO; -using MonoDevelop.Projects.Formats.MSBuild; +using MonoDevelop.Projects.MSBuild; namespace MonoDevelop.Deployment.Linux { diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Gui/SourcesZipEditorWidget.cs b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Gui/SourcesZipEditorWidget.cs index e956190e7a..fd428d98ef 100644 --- a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Gui/SourcesZipEditorWidget.cs +++ b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Gui/SourcesZipEditorWidget.cs @@ -4,7 +4,7 @@ using System.Collections; using System.IO; using MonoDevelop.Projects; using MonoDevelop.Deployment.Targets; -using MonoDevelop.Projects.Formats.MSBuild; +using MonoDevelop.Projects.MSBuild; using System.Linq; namespace MonoDevelop.Deployment.Gui diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Targets/SourcesZipPackageBuilder.cs b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Targets/SourcesZipPackageBuilder.cs index 26e9cd891c..5cf009cc19 100644 --- a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Targets/SourcesZipPackageBuilder.cs +++ b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Targets/SourcesZipPackageBuilder.cs @@ -7,7 +7,7 @@ using MonoDevelop.Core; using MonoDevelop.Core.ProgressMonitoring; using MonoDevelop.Projects; using MonoDevelop.Core.Serialization; -using MonoDevelop.Projects.Formats.MSBuild; +using MonoDevelop.Projects.MSBuild; namespace MonoDevelop.Deployment.Targets { diff --git a/main/src/addins/MonoDevelop.Autotools/MakefileData.cs b/main/src/addins/MonoDevelop.Autotools/MakefileData.cs index 452b56c66e..a11cb8d733 100644 --- a/main/src/addins/MonoDevelop.Autotools/MakefileData.cs +++ b/main/src/addins/MonoDevelop.Autotools/MakefileData.cs @@ -39,7 +39,7 @@ using MonoDevelop.Projects; using MonoDevelop.Core.Assemblies; using MonoDevelop.Ide; using System.Xml; -using MonoDevelop.Projects.Formats.MSBuild; +using MonoDevelop.Projects.MSBuild; namespace MonoDevelop.Autotools { diff --git a/main/src/addins/MonoDevelop.Autotools/MakefileProjectServiceExtension.cs b/main/src/addins/MonoDevelop.Autotools/MakefileProjectServiceExtension.cs index d0575adc6e..7c39600a08 100644 --- a/main/src/addins/MonoDevelop.Autotools/MakefileProjectServiceExtension.cs +++ b/main/src/addins/MonoDevelop.Autotools/MakefileProjectServiceExtension.cs @@ -45,7 +45,7 @@ namespace MonoDevelop.Autotools { public class MakefileProjectServiceExtension : SolutionExtension { - protected override void OnReadSolution (ProgressMonitor monitor, MonoDevelop.Projects.Formats.MSBuild.SlnFile file) + protected override void OnReadSolution (ProgressMonitor monitor, MonoDevelop.Projects.MSBuild.SlnFile file) { base.OnReadSolution (monitor, file); @@ -77,7 +77,7 @@ namespace MonoDevelop.Autotools set { data = value; } } - protected override void OnReadProject (ProgressMonitor monitor, MonoDevelop.Projects.Formats.MSBuild.MSBuildProject msproject) + protected override void OnReadProject (ProgressMonitor monitor, MonoDevelop.Projects.MSBuild.MSBuildProject msproject) { base.OnReadProject (monitor, msproject); var ext = msproject.GetMonoDevelopProjectExtension ("MonoDevelop.Autotools.MakefileInfo"); @@ -102,7 +102,7 @@ namespace MonoDevelop.Autotools } } - protected override void OnWriteProject (ProgressMonitor monitor, MonoDevelop.Projects.Formats.MSBuild.MSBuildProject msproject) + protected override void OnWriteProject (ProgressMonitor monitor, MonoDevelop.Projects.MSBuild.MSBuildProject msproject) { base.OnWriteProject (monitor, msproject); diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GtkProjectServiceExtension.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GtkProjectServiceExtension.cs index be96b93843..04e2b66bd2 100644 --- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GtkProjectServiceExtension.cs +++ b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GtkProjectServiceExtension.cs @@ -19,7 +19,7 @@ namespace MonoDevelop.GtkCore.GuiBuilder return base.SupportsObject (item) && IdeApp.IsInitialized; } - protected override void OnReadProject (ProgressMonitor monitor, MonoDevelop.Projects.Formats.MSBuild.MSBuildProject msproject) + protected override void OnReadProject (ProgressMonitor monitor, MonoDevelop.Projects.MSBuild.MSBuildProject msproject) { base.OnReadProject (monitor, msproject); if (info != null) diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/EnsureNuGetPackageBuildImportsTargetUpdaterTests.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/EnsureNuGetPackageBuildImportsTargetUpdaterTests.cs index d9208fab12..10d81693ac 100644 --- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/EnsureNuGetPackageBuildImportsTargetUpdaterTests.cs +++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/EnsureNuGetPackageBuildImportsTargetUpdaterTests.cs @@ -26,7 +26,7 @@ using System;
using System.Linq;
-using MonoDevelop.Projects.Formats.MSBuild;
+using MonoDevelop.Projects.MSBuild;
using NUnit.Framework;
namespace MonoDevelop.PackageManagement.Tests
diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/MSBuildProjectExtensionsTests.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/MSBuildProjectExtensionsTests.cs index 10cadb76af..fa1377e91d 100644 --- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/MSBuildProjectExtensionsTests.cs +++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/MSBuildProjectExtensionsTests.cs @@ -2,7 +2,7 @@ using System;
using System.Xml;
using ICSharpCode.PackageManagement;
-using MonoDevelop.Projects.Formats.MSBuild;
+using MonoDevelop.Projects.MSBuild;
using NuGet;
using NUnit.Framework;
using System.Linq;
diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/MonoDevelopProjectSystemTests.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/MonoDevelopProjectSystemTests.cs index 501413c166..5a183aca78 100644 --- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/MonoDevelopProjectSystemTests.cs +++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/MonoDevelopProjectSystemTests.cs @@ -33,7 +33,7 @@ using MonoDevelop.Core; using MonoDevelop.Core.Assemblies;
using MonoDevelop.PackageManagement.Tests.Helpers;
using MonoDevelop.Projects;
-using MonoDevelop.Projects.Formats.MSBuild;
+using MonoDevelop.Projects.MSBuild;
using NuGet;
using NUnit.Framework;
diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/EnsureNuGetPackageBuildImportsTargetUpdater.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/EnsureNuGetPackageBuildImportsTargetUpdater.cs index 8dc4aeaf35..f566b47309 100644 --- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/EnsureNuGetPackageBuildImportsTargetUpdater.cs +++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/EnsureNuGetPackageBuildImportsTargetUpdater.cs @@ -27,7 +27,7 @@ using System;
using System.Linq;
using System.Xml;
-using MonoDevelop.Projects.Formats.MSBuild;
+using MonoDevelop.Projects.MSBuild;
namespace MonoDevelop.PackageManagement
{
diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/MSBuildProjectExtensions.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/MSBuildProjectExtensions.cs index c4f6703b87..429b8ad619 100644 --- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/MSBuildProjectExtensions.cs +++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/MSBuildProjectExtensions.cs @@ -31,7 +31,7 @@ using System.Collections.Generic; using System.Linq;
using System.Xml;
-using MonoDevelop.Projects.Formats.MSBuild;
+using MonoDevelop.Projects.MSBuild;
using NuGet;
namespace ICSharpCode.PackageManagement
diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementMSBuildExtension.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementMSBuildExtension.cs index 9526a211f3..4e6a65ae4f 100644 --- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementMSBuildExtension.cs +++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementMSBuildExtension.cs @@ -27,7 +27,7 @@ using System;
using MonoDevelop.Core;
using MonoDevelop.Projects;
-using MonoDevelop.Projects.Formats.MSBuild;
+using MonoDevelop.Projects.MSBuild;
namespace MonoDevelop.PackageManagement
{
diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/SharpDevelopProjectSystem.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/SharpDevelopProjectSystem.cs index 80ac36fa0b..90323a333d 100644 --- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/SharpDevelopProjectSystem.cs +++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/SharpDevelopProjectSystem.cs @@ -35,7 +35,7 @@ using MonoDevelop.Core; using MonoDevelop.Ide;
using MonoDevelop.PackageManagement;
using MonoDevelop.Projects;
-using MonoDevelop.Projects.Formats.MSBuild;
+using MonoDevelop.Projects.MSBuild;
using NuGet;
namespace ICSharpCode.PackageManagement
diff --git a/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.WCF/WCFMetadata.cs b/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.WCF/WCFMetadata.cs index 5e5618ab16..422fbf91fa 100644 --- a/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.WCF/WCFMetadata.cs +++ b/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.WCF/WCFMetadata.cs @@ -26,7 +26,7 @@ using MonoDevelop.Projects; using MonoDevelop.Core; -using MonoDevelop.Projects.Formats.MSBuild; +using MonoDevelop.Projects.MSBuild; namespace MonoDevelop.WebReferences.WCF { diff --git a/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.WCF/WCFMetadataStorage.cs b/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.WCF/WCFMetadataStorage.cs index 0fd31876e4..435f76d8e6 100644 --- a/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.WCF/WCFMetadataStorage.cs +++ b/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.WCF/WCFMetadataStorage.cs @@ -26,7 +26,7 @@ using MonoDevelop.Projects; using MonoDevelop.Core; -using MonoDevelop.Projects.Formats.MSBuild; +using MonoDevelop.Projects.MSBuild; namespace MonoDevelop.WebReferences.WCF { diff --git a/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.WS/WebReferenceUrl.cs b/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.WS/WebReferenceUrl.cs index 1d582d730d..bd5d77331e 100644 --- a/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.WS/WebReferenceUrl.cs +++ b/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.WS/WebReferenceUrl.cs @@ -44,7 +44,7 @@ namespace MonoDevelop.WebReferences.WS UpdateFromURL = url; } - protected override void Read (Project project, MonoDevelop.Projects.Formats.MSBuild.IMSBuildItemEvaluated buildItem) + protected override void Read (Project project, MonoDevelop.Projects.MSBuild.IMSBuildItemEvaluated buildItem) { base.Read (project, buildItem); } diff --git a/main/src/addins/MonoDeveloperExtensions/MonoMakefileProjectReader.cs b/main/src/addins/MonoDeveloperExtensions/MonoMakefileProjectReader.cs index 8e0ab40f3f..317e5d1840 100644 --- a/main/src/addins/MonoDeveloperExtensions/MonoMakefileProjectReader.cs +++ b/main/src/addins/MonoDeveloperExtensions/MonoMakefileProjectReader.cs @@ -27,7 +27,7 @@ using System; using MonoDevelop.Projects; using MonoDevelop.Core; using System.Threading.Tasks; -using MonoDevelop.Projects.Formats.MSBuild; +using MonoDevelop.Projects.MSBuild; using System.IO; using System.Text; using System.Collections.Generic; diff --git a/main/src/addins/VBNetBinding/Project/VBNetResourceIdBuilder.cs b/main/src/addins/VBNetBinding/Project/VBNetResourceIdBuilder.cs index 42b87c14eb..c1bef2c519 100644 --- a/main/src/addins/VBNetBinding/Project/VBNetResourceIdBuilder.cs +++ b/main/src/addins/VBNetBinding/Project/VBNetResourceIdBuilder.cs @@ -31,7 +31,7 @@ using System; using System.IO; using System.Text; using MonoDevelop.Projects.Extensions; -using MonoDevelop.Projects.Formats.MSBuild; +using MonoDevelop.Projects.MSBuild; namespace MonoDevelop.VBNetBinding { diff --git a/main/src/addins/VBNetBinding/Project/VBProjectExtension.cs b/main/src/addins/VBNetBinding/Project/VBProjectExtension.cs index 40321526c3..66973b5080 100644 --- a/main/src/addins/VBNetBinding/Project/VBProjectExtension.cs +++ b/main/src/addins/VBNetBinding/Project/VBProjectExtension.cs @@ -25,7 +25,7 @@ // THE SOFTWARE. using System; using MonoDevelop.Projects; -using MonoDevelop.Projects.Formats.MSBuild; +using MonoDevelop.Projects.MSBuild; using MonoDevelop.Core.Serialization; using System.Diagnostics; using MonoDevelop.Core; diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Core/Runtime.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Core/Runtime.cs index f13e1aa795..5db30ff3e2 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Core/Runtime.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Core/Runtime.cs @@ -43,7 +43,6 @@ using System.Net.Security; using System.Net; using System.Threading.Tasks; using System.Collections.Generic; -using MonoDevelop.Projects.Formats.MSBuild; namespace MonoDevelop.Core @@ -513,7 +512,7 @@ namespace MonoDevelop.Core public readonly ConfigurationProperty<bool> EnableInstrumentation = ConfigurationProperty.Create ("MonoDevelop.EnableInstrumentation", false); public readonly ConfigurationProperty<bool> EnableAutomatedTesting = ConfigurationProperty.Create ("MonoDevelop.EnableAutomatedTesting", false); public readonly ConfigurationProperty<string> UserInterfaceLanguage = ConfigurationProperty.Create ("MonoDevelop.Ide.UserInterfaceLanguage", ""); - public readonly ConfigurationProperty<MSBuildVerbosity> MSBuildVerbosity = ConfigurationProperty.Create ("MonoDevelop.Ide.MSBuildVerbosity", MonoDevelop.Projects.Formats.MSBuild.MSBuildVerbosity.Normal); + public readonly ConfigurationProperty<MonoDevelop.Projects.MSBuild.MSBuildVerbosity> MSBuildVerbosity = ConfigurationProperty.Create ("MonoDevelop.Ide.MSBuildVerbosity", MonoDevelop.Projects.MSBuild.MSBuildVerbosity.Normal); public readonly ConfigurationProperty<bool> ParallelBuild = ConfigurationProperty.Create ("MonoDevelop.ParallelBuild", true); public readonly ConfigurationProperty<string> AuthorName = ConfigurationProperty.Create ("Author.Name", Environment.UserName, oldName:"ChangeLogAddIn.Name"); diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Extensions/DotNetProjectTypeNode.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Extensions/DotNetProjectTypeNode.cs index 2d577cb4ab..202a41f0c7 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Extensions/DotNetProjectTypeNode.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Extensions/DotNetProjectTypeNode.cs @@ -28,7 +28,7 @@ using System; using Mono.Addins; using MonoDevelop.Core; -using MonoDevelop.Projects.Formats.MSBuild; +using MonoDevelop.Projects.MSBuild; using MonoDevelop.Projects.Extensions; using System.Threading.Tasks; using System.Collections.Generic; diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Extensions/ProjectMigrationHandler.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Extensions/ProjectMigrationHandler.cs index 4aa9ae352e..c8b7870ae3 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Extensions/ProjectMigrationHandler.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Extensions/ProjectMigrationHandler.cs @@ -28,7 +28,7 @@ using System; using System.Linq; using Mono.Addins; -using MonoDevelop.Projects.Formats.MSBuild; +using MonoDevelop.Projects.MSBuild; using System.Collections.Generic; using MonoDevelop.Core; using System.Threading.Tasks; diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Extensions/ProjectTypeNode.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Extensions/ProjectTypeNode.cs index 7d5fe64b30..64b07d9a7a 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Extensions/ProjectTypeNode.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Extensions/ProjectTypeNode.cs @@ -27,7 +27,7 @@ using System; using System.Linq; using System.Threading.Tasks; using System.Collections.Generic; -using MonoDevelop.Projects.Formats.MSBuild; +using MonoDevelop.Projects.MSBuild; using Mono.Addins; using MonoDevelop.Core; diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Extensions/SolutionItemTypeNode.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Extensions/SolutionItemTypeNode.cs index 2d61c39b43..46fa87c880 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Extensions/SolutionItemTypeNode.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Extensions/SolutionItemTypeNode.cs @@ -29,7 +29,7 @@ using System; using System.IO; using System.Xml; using Mono.Addins; -using MonoDevelop.Projects.Formats.MSBuild; +using MonoDevelop.Projects.MSBuild; using MonoDevelop.Core; using System.Threading.Tasks; using MonoDevelop.Core.ProgressMonitoring; diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Extensions/TypeTagCondition.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Extensions/TypeTagCondition.cs index a18ad05e3a..cc1afe825c 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Extensions/TypeTagCondition.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Extensions/TypeTagCondition.cs @@ -26,7 +26,7 @@ using System; using System.Linq; using Mono.Addins; -using MonoDevelop.Projects.Formats.MSBuild; +using MonoDevelop.Projects.MSBuild; namespace MonoDevelop.Projects.Extensions { diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MD1/MD1DotNetProjectHandler.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MD1/MD1DotNetProjectHandler.cs index d26ca800c1..c1a0b02246 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MD1/MD1DotNetProjectHandler.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MD1/MD1DotNetProjectHandler.cs @@ -36,7 +36,7 @@ using MonoDevelop.Core.Execution; using MonoDevelop.Projects.Extensions; using Microsoft.Build.BuildEngine; using System.Threading.Tasks; -using MonoDevelop.Projects.Formats.MSBuild.Conditions; +using MonoDevelop.Projects.MSBuild.Conditions; namespace MonoDevelop.Projects.Formats.MD1 { diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild.Conditions/ConditionAndExpression.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild.Conditions/ConditionAndExpression.cs index 9655b4f9a4..634a202b4d 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild.Conditions/ConditionAndExpression.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild.Conditions/ConditionAndExpression.cs @@ -28,7 +28,7 @@ using System; using System.Xml; -namespace MonoDevelop.Projects.Formats.MSBuild.Conditions { +namespace MonoDevelop.Projects.MSBuild.Conditions { internal sealed class ConditionAndExpression : ConditionExpression { readonly ConditionExpression left; diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild.Conditions/ConditionExpression.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild.Conditions/ConditionExpression.cs index 90575a3367..f97da39df7 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild.Conditions/ConditionExpression.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild.Conditions/ConditionExpression.cs @@ -28,7 +28,7 @@ using System; using System.Xml; -namespace MonoDevelop.Projects.Formats.MSBuild.Conditions { +namespace MonoDevelop.Projects.MSBuild.Conditions { internal abstract class ConditionExpression { public abstract bool BoolEvaluate (IExpressionContext context); diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild.Conditions/ConditionFactorExpresion.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild.Conditions/ConditionFactorExpresion.cs index e17b8f1ce7..73aa9bc4d7 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild.Conditions/ConditionFactorExpresion.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild.Conditions/ConditionFactorExpresion.cs @@ -31,7 +31,7 @@ using System.Collections.Specialized; using System.Globalization; using System.Xml; -namespace MonoDevelop.Projects.Formats.MSBuild.Conditions { +namespace MonoDevelop.Projects.MSBuild.Conditions { internal sealed class ConditionFactorExpression : ConditionExpression { readonly Token token; diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild.Conditions/ConditionFunctionExpression.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild.Conditions/ConditionFunctionExpression.cs index 8a9c7f211c..175403ef4d 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild.Conditions/ConditionFunctionExpression.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild.Conditions/ConditionFunctionExpression.cs @@ -31,7 +31,7 @@ using System.IO; using System.Reflection; using System.Xml; -namespace MonoDevelop.Projects.Formats.MSBuild.Conditions { +namespace MonoDevelop.Projects.MSBuild.Conditions { internal sealed class ConditionFunctionExpression : ConditionExpression { List <ConditionFactorExpression> args; diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild.Conditions/ConditionNotExpression.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild.Conditions/ConditionNotExpression.cs index 173b2f9762..f53c5f0bc2 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild.Conditions/ConditionNotExpression.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild.Conditions/ConditionNotExpression.cs @@ -30,7 +30,7 @@ using System; using System.Xml; -namespace MonoDevelop.Projects.Formats.MSBuild.Conditions { +namespace MonoDevelop.Projects.MSBuild.Conditions { internal sealed class ConditionNotExpression : ConditionExpression { readonly ConditionExpression expression; diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild.Conditions/ConditionOrExpression.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild.Conditions/ConditionOrExpression.cs index a3a92d3ea0..e0d2fa2b20 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild.Conditions/ConditionOrExpression.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild.Conditions/ConditionOrExpression.cs @@ -29,7 +29,7 @@ using System; using System.Xml; -namespace MonoDevelop.Projects.Formats.MSBuild.Conditions { +namespace MonoDevelop.Projects.MSBuild.Conditions { internal sealed class ConditionOrExpression : ConditionExpression { readonly ConditionExpression left; diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild.Conditions/ConditionParser.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild.Conditions/ConditionParser.cs index 638b428bda..17622a6a48 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild.Conditions/ConditionParser.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild.Conditions/ConditionParser.cs @@ -33,7 +33,7 @@ using System.Collections.Generic; using System.Text; using Microsoft.Build.BuildEngine; -namespace MonoDevelop.Projects.Formats.MSBuild.Conditions { +namespace MonoDevelop.Projects.MSBuild.Conditions { internal class ConditionParser { diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild.Conditions/ConditionRelationalExpression.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild.Conditions/ConditionRelationalExpression.cs index 3f8e1dac98..d6fc6fdc56 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild.Conditions/ConditionRelationalExpression.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild.Conditions/ConditionRelationalExpression.cs @@ -29,7 +29,7 @@ using System; using System.Collections; using System.Xml; -namespace MonoDevelop.Projects.Formats.MSBuild.Conditions { +namespace MonoDevelop.Projects.MSBuild.Conditions { internal sealed class ConditionRelationalExpression : ConditionExpression { readonly ConditionExpression left; diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild.Conditions/ConditionTokenizer.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild.Conditions/ConditionTokenizer.cs index e948548f00..97722fe338 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild.Conditions/ConditionTokenizer.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild.Conditions/ConditionTokenizer.cs @@ -33,7 +33,7 @@ using System.Collections.Generic; using System.Collections.Specialized; using System.Text; -namespace MonoDevelop.Projects.Formats.MSBuild.Conditions { +namespace MonoDevelop.Projects.MSBuild.Conditions { internal sealed class ConditionTokenizer { diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild.Conditions/ConditionedPropertyCollection.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild.Conditions/ConditionedPropertyCollection.cs index bf2e4452b2..7ff9f3a970 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild.Conditions/ConditionedPropertyCollection.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild.Conditions/ConditionedPropertyCollection.cs @@ -26,7 +26,7 @@ using System; using System.Collections.Generic; -namespace MonoDevelop.Projects.Formats.MSBuild.Conditions +namespace MonoDevelop.Projects.MSBuild.Conditions { class ConditionedPropertyCollection : Dictionary<string, List<string>> { diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild.Conditions/ExpressionEvaluationException.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild.Conditions/ExpressionEvaluationException.cs index a60a64fa68..b15103fe15 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild.Conditions/ExpressionEvaluationException.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild.Conditions/ExpressionEvaluationException.cs @@ -28,7 +28,7 @@ using System; using System.Runtime.Serialization; -namespace MonoDevelop.Projects.Formats.MSBuild.Conditions { +namespace MonoDevelop.Projects.MSBuild.Conditions { [Serializable] internal class ExpressionEvaluationException : Exception { diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild.Conditions/ExpressionParseException.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild.Conditions/ExpressionParseException.cs index 40c37e6d89..2b2c8c84ae 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild.Conditions/ExpressionParseException.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild.Conditions/ExpressionParseException.cs @@ -28,7 +28,7 @@ using System; using System.Runtime.Serialization; -namespace MonoDevelop.Projects.Formats.MSBuild.Conditions { +namespace MonoDevelop.Projects.MSBuild.Conditions { [Serializable] internal class ExpressionParseException : Exception { diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild.Conditions/InvalidProjectFileException.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild.Conditions/InvalidProjectFileException.cs index f4df5a9bf1..a57de35ae1 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild.Conditions/InvalidProjectFileException.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild.Conditions/InvalidProjectFileException.cs @@ -30,7 +30,7 @@ using System.Runtime.Serialization; using System.Security.Permissions; using System.Xml; -namespace MonoDevelop.Projects.Formats.MSBuild.Conditions { +namespace MonoDevelop.Projects.MSBuild.Conditions { [Serializable] public sealed class InvalidProjectFileException : Exception { diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild.Conditions/Token.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild.Conditions/Token.cs index ed189a4d47..0b0a8420f3 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild.Conditions/Token.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild.Conditions/Token.cs @@ -29,7 +29,7 @@ using System; -namespace MonoDevelop.Projects.Formats.MSBuild.Conditions { +namespace MonoDevelop.Projects.MSBuild.Conditions { internal class Token { diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/DefaultMSBuildEngine.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/DefaultMSBuildEngine.cs index 67d8258114..2765286835 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/DefaultMSBuildEngine.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/DefaultMSBuildEngine.cs @@ -33,9 +33,9 @@ using System.Text; using System.Text.RegularExpressions; using Microsoft.Build.BuildEngine; using MonoDevelop.Core; -using MonoDevelop.Projects.Formats.MSBuild.Conditions; +using MonoDevelop.Projects.MSBuild.Conditions; -namespace MonoDevelop.Projects.Formats.MSBuild +namespace MonoDevelop.Projects.MSBuild { class DefaultMSBuildEngine: MSBuildEngine { diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/FileUtil.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/FileUtil.cs index 53f9f1c797..00d87ca022 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/FileUtil.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/FileUtil.cs @@ -27,7 +27,7 @@ using System; using System.IO; using MonoDevelop.Projects.Utility; -namespace MonoDevelop.Projects.Formats.MSBuild +namespace MonoDevelop.Projects.MSBuild { static class FileUtil { diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/IMSBuildGlobalPropertyProvider.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/IMSBuildGlobalPropertyProvider.cs index df7c76e443..3297443bdf 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/IMSBuildGlobalPropertyProvider.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/IMSBuildGlobalPropertyProvider.cs @@ -26,7 +26,7 @@ using System; using System.Collections.Generic; -namespace MonoDevelop.Projects.Formats.MSBuild +namespace MonoDevelop.Projects.MSBuild { public interface IMSBuildGlobalPropertyProvider { diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/IMSBuildProjectObject.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/IMSBuildProjectObject.cs index bf056e59a6..5ee831fa8a 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/IMSBuildProjectObject.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/IMSBuildProjectObject.cs @@ -24,7 +24,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. using System; -namespace MonoDevelop.Projects.Formats.MSBuild +namespace MonoDevelop.Projects.MSBuild { interface IMSBuildProjectObject { diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/IMSBuildPropertyEvaluated.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/IMSBuildPropertyEvaluated.cs index 3fc9a91c63..fc9590437f 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/IMSBuildPropertyEvaluated.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/IMSBuildPropertyEvaluated.cs @@ -31,7 +31,7 @@ using System.Xml.Linq; using MonoDevelop.Core; using System.Globalization; -namespace MonoDevelop.Projects.Formats.MSBuild +namespace MonoDevelop.Projects.MSBuild { public interface IMSBuildPropertyEvaluated diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/IMSBuildPropertySet.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/IMSBuildPropertySet.cs index 6332fb1e6e..c50d165ac6 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/IMSBuildPropertySet.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/IMSBuildPropertySet.cs @@ -38,7 +38,7 @@ using System.Reflection; using MonoDevelop.Core.Serialization; using System.Globalization; -namespace MonoDevelop.Projects.Formats.MSBuild +namespace MonoDevelop.Projects.MSBuild { public interface IMSBuildPropertySet: IPropertySet { diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/IMetadataProperty.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/IMetadataProperty.cs index 560c743de3..23bbbb74bc 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/IMetadataProperty.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/IMetadataProperty.cs @@ -31,7 +31,7 @@ using System.Xml.Linq; using MonoDevelop.Core; using System.Globalization; -namespace MonoDevelop.Projects.Formats.MSBuild +namespace MonoDevelop.Projects.MSBuild { public interface IMetadataProperty diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildChoose.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildChoose.cs index dec11b4c0a..c6091d7a45 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildChoose.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildChoose.cs @@ -28,7 +28,7 @@ using System.Xml; using System.Collections.Generic; using System.Linq; -namespace MonoDevelop.Projects.Formats.MSBuild +namespace MonoDevelop.Projects.MSBuild { public class MSBuildChoose: MSBuildElement { diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildElement.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildElement.cs index afb4f5351b..dd18b5dd6a 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildElement.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildElement.cs @@ -24,7 +24,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. using System; -namespace MonoDevelop.Projects.Formats.MSBuild +namespace MonoDevelop.Projects.MSBuild { public abstract class MSBuildElement: MSBuildObject { diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildEngine.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildEngine.cs index 38c85d37a6..a97eb2edde 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildEngine.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildEngine.cs @@ -38,7 +38,7 @@ using Microsoft.Build.BuildEngine; using MSProject = Microsoft.Build.BuildEngine.Project; using MonoDevelop.Core; -namespace MonoDevelop.Projects.Formats.MSBuild +namespace MonoDevelop.Projects.MSBuild { abstract class MSBuildEngine: IDisposable { diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildEngineManager.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildEngineManager.cs index e6b41249fb..1a48a53aca 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildEngineManager.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildEngineManager.cs @@ -25,7 +25,7 @@ // THE SOFTWARE. using System; -namespace MonoDevelop.Projects.Formats.MSBuild +namespace MonoDevelop.Projects.MSBuild { class MSBuildEngineManager: IDisposable { diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildEngineV12.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildEngineV12.cs index 2477b7a2a2..039a67ccbf 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildEngineV12.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildEngineV12.cs @@ -36,7 +36,7 @@ using MSProject = Microsoft.Build.Evaluation.Project; using MSProjectItem = Microsoft.Build.Evaluation.ProjectItem; using MonoDevelop.Core; -namespace MonoDevelop.Projects.Formats.MSBuild +namespace MonoDevelop.Projects.MSBuild { class MSBuildEngineV12: MSBuildEngine diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildEngineV4.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildEngineV4.cs index 35abf2fd8e..472cba4d5c 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildEngineV4.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildEngineV4.cs @@ -34,7 +34,7 @@ using Microsoft.Build.BuildEngine; using MSProject = Microsoft.Build.BuildEngine.Project; using MonoDevelop.Core; -namespace MonoDevelop.Projects.Formats.MSBuild +namespace MonoDevelop.Projects.MSBuild { #if !WINDOWS class MSBuildEngineV4: MSBuildEngine diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildEvaluationContext.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildEvaluationContext.cs index 3fae85832d..3f09106dc4 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildEvaluationContext.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildEvaluationContext.cs @@ -35,11 +35,11 @@ using Microsoft.Build.BuildEngine; using MonoDevelop.Core; using System.Reflection; using Microsoft.Build.Utilities; -using MonoDevelop.Projects.Formats.MSBuild.Conditions; +using MonoDevelop.Projects.MSBuild.Conditions; using System.Globalization; using Microsoft.Build.Evaluation; -namespace MonoDevelop.Projects.Formats.MSBuild +namespace MonoDevelop.Projects.MSBuild { class MSBuildEvaluationContext: IExpressionContext { diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildFileFormat.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildFileFormat.cs index 697f3c09fd..12a69d7c01 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildFileFormat.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildFileFormat.cs @@ -36,7 +36,7 @@ using MonoDevelop.Projects.Extensions; using System.Threading.Tasks; using System.Linq; -namespace MonoDevelop.Projects.Formats.MSBuild +namespace MonoDevelop.Projects.MSBuild { public abstract class MSBuildFileFormat { diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildFileFormatException.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildFileFormatException.cs index 989566f354..4881170d82 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildFileFormatException.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildFileFormatException.cs @@ -24,7 +24,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. using System; -namespace MonoDevelop.Projects.Formats.MSBuild +namespace MonoDevelop.Projects.MSBuild { public class MSBuildFileFormatException: Exception { diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildImport.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildImport.cs index 91bcbeaa9a..c758e31212 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildImport.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildImport.cs @@ -27,7 +27,7 @@ using System.Xml; -namespace MonoDevelop.Projects.Formats.MSBuild +namespace MonoDevelop.Projects.MSBuild { public class MSBuildImport: MSBuildElement { diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildImportAttribute.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildImportAttribute.cs index 04e8c4d260..f1493475b1 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildImportAttribute.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildImportAttribute.cs @@ -26,7 +26,7 @@ using System; -namespace MonoDevelop.Projects.Formats.MSBuild +namespace MonoDevelop.Projects.MSBuild { [AttributeUsage (AttributeTargets.Class)] public class MSBuildImportAttribute: Attribute diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildImportGroup.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildImportGroup.cs index afc3d07757..48d2e81d64 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildImportGroup.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildImportGroup.cs @@ -28,7 +28,7 @@ using System.Xml; using System.Collections.Generic; using System.Linq; -namespace MonoDevelop.Projects.Formats.MSBuild +namespace MonoDevelop.Projects.MSBuild { public class MSBuildImportGroup: MSBuildElement { diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildItem.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildItem.cs index 7fae0d97aa..62c2c9c633 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildItem.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildItem.cs @@ -30,7 +30,7 @@ using System; using System.Collections.Immutable; -namespace MonoDevelop.Projects.Formats.MSBuild +namespace MonoDevelop.Projects.MSBuild { public class MSBuildItem: MSBuildElement { diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildItemGroup.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildItemGroup.cs index 37bd43bea2..1e7a745691 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildItemGroup.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildItemGroup.cs @@ -29,7 +29,7 @@ using System.Xml; using System.Linq; using System; -namespace MonoDevelop.Projects.Formats.MSBuild +namespace MonoDevelop.Projects.MSBuild { public class MSBuildItemGroup: MSBuildElement { diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildObject.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildObject.cs index 4bd2ab0cad..c9f1d3a2e4 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildObject.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildObject.cs @@ -33,7 +33,7 @@ using System.Linq; using System.Xml; -namespace MonoDevelop.Projects.Formats.MSBuild +namespace MonoDevelop.Projects.MSBuild { public abstract class MSBuildObject: MSBuildNode { diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildProject.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildProject.cs index 3332104fa1..ed9ebf32ec 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildProject.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildProject.cs @@ -37,7 +37,7 @@ using System.Linq; using MonoDevelop.Projects.Text; using System.Threading.Tasks; -namespace MonoDevelop.Projects.Formats.MSBuild +namespace MonoDevelop.Projects.MSBuild { public sealed partial class MSBuildProject : MSBuildObject, IDisposable { diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildProjectExtensions.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildProjectExtensions.cs index dfed253c66..2f0a36142a 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildProjectExtensions.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildProjectExtensions.cs @@ -29,7 +29,7 @@ using System.IO; using System.Linq; using System.Xml; -namespace MonoDevelop.Projects.Formats.MSBuild +namespace MonoDevelop.Projects.MSBuild { public class MSBuildProjectExtensions: MSBuildElement { diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildProjectInstance.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildProjectInstance.cs index 1ace679304..850c6654ca 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildProjectInstance.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildProjectInstance.cs @@ -29,7 +29,7 @@ using System.Xml; using MonoDevelop.Core; using System.Linq; -namespace MonoDevelop.Projects.Formats.MSBuild +namespace MonoDevelop.Projects.MSBuild { public sealed class MSBuildProjectInstance: IDisposable { diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildProjectService.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildProjectService.cs index 96edba0592..aa7b299bd4 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildProjectService.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildProjectService.cs @@ -44,7 +44,7 @@ using System.Threading; using System.Threading.Tasks; using System.Xml; -namespace MonoDevelop.Projects.Formats.MSBuild +namespace MonoDevelop.Projects.MSBuild { public static class MSBuildProjectService { @@ -956,7 +956,7 @@ namespace MonoDevelop.Projects.Formats.MSBuild engine = (IBuildEngine)bf.Deserialize (ms); } else { var asm = System.Reflection.Assembly.LoadFrom (exe); - var t = asm.GetType ("MonoDevelop.Projects.Formats.MSBuild.BuildEngine"); + var t = asm.GetType ("MonoDevelop.Projects.MSBuild.BuildEngine"); engine = (IBuildEngine)Activator.CreateInstance (t); } engine.SetCulture (GettextCatalog.UICulture); @@ -1017,7 +1017,7 @@ namespace MonoDevelop.Projects.Formats.MSBuild if ((runtime is MsNetTargetRuntime) && int.Parse (toolsVersion.Split ('.')[0]) >= 4) toolsVersion = "dotnet." + toolsVersion; - var exe = sourceExe.ParentDirectory.Combine ("MSBuild", toolsVersion, "MonoDevelop.Projects.Formats.MSBuild.exe"); + var exe = sourceExe.ParentDirectory.Combine ("MSBuild", toolsVersion, "MonoDevelop.Projects.MSBuild.exe"); if (File.Exists (exe)) return exe; diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildProperty.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildProperty.cs index f67ad00227..823aa5be85 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildProperty.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildProperty.cs @@ -34,7 +34,7 @@ using System.Text; using System.IO; using System.Linq; -namespace MonoDevelop.Projects.Formats.MSBuild +namespace MonoDevelop.Projects.MSBuild { public class MSBuildProperty: MSBuildPropertyCore, IMetadataProperty, IMSBuildPropertyEvaluated { diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildPropertyCore.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildPropertyCore.cs index a0346a22b0..a4ebb44cdb 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildPropertyCore.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildPropertyCore.cs @@ -31,7 +31,7 @@ using System.Xml.Linq; using MonoDevelop.Core; using System.Globalization; -namespace MonoDevelop.Projects.Formats.MSBuild +namespace MonoDevelop.Projects.MSBuild { public abstract class MSBuildPropertyCore: MSBuildElement diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildPropertyEvaluated.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildPropertyEvaluated.cs index 78ca9c5113..2fa900ddd2 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildPropertyEvaluated.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildPropertyEvaluated.cs @@ -31,7 +31,7 @@ using System.Xml.Linq; using MonoDevelop.Core; using System.Globalization; -namespace MonoDevelop.Projects.Formats.MSBuild +namespace MonoDevelop.Projects.MSBuild { class MSBuildPropertyEvaluated: MSBuildPropertyCore, IMSBuildPropertyEvaluated diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildPropertyGroup.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildPropertyGroup.cs index f7e1ae1309..624b94a372 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildPropertyGroup.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildPropertyGroup.cs @@ -34,7 +34,7 @@ using System.Xml.Linq; using Microsoft.Build.BuildEngine; using System.Collections.Immutable;
-namespace MonoDevelop.Projects.Formats.MSBuild +namespace MonoDevelop.Projects.MSBuild { public class MSBuildPropertyGroup: MSBuildElement, IMSBuildPropertySet, IMSBuildEvaluatedPropertyCollection { diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildPropertyGroupEvaluated.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildPropertyGroupEvaluated.cs index 2a6b3cd06f..0636e757e7 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildPropertyGroupEvaluated.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildPropertyGroupEvaluated.cs @@ -28,7 +28,7 @@ using System.Collections.Generic; using System.Xml.Linq; using MonoDevelop.Core; -namespace MonoDevelop.Projects.Formats.MSBuild +namespace MonoDevelop.Projects.MSBuild { class MSBuildPropertyGroupEvaluated: IMSBuildPropertyGroupEvaluated, IMSBuildProjectObject { diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildPropertyGroupMerged.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildPropertyGroupMerged.cs index 46f0612c63..291f3f9a6a 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildPropertyGroupMerged.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildPropertyGroupMerged.cs @@ -32,7 +32,7 @@ using System.Xml; using MonoDevelop.Core; using System.Xml.Linq; -namespace MonoDevelop.Projects.Formats.MSBuild +namespace MonoDevelop.Projects.MSBuild { class MSBuildPropertyGroupMerged: IMSBuildPropertySet diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildTarget.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildTarget.cs index 8405304be5..48499bd3f1 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildTarget.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildTarget.cs @@ -36,7 +36,7 @@ using System.Linq; using MonoDevelop.Projects.Text; using System.Threading.Tasks; -namespace MonoDevelop.Projects.Formats.MSBuild +namespace MonoDevelop.Projects.MSBuild { public class MSBuildTarget: MSBuildElement diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildTask.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildTask.cs index 12a169a501..95716a4644 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildTask.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildTask.cs @@ -36,7 +36,7 @@ using System.Linq; using MonoDevelop.Projects.Text; using System.Threading.Tasks; -namespace MonoDevelop.Projects.Formats.MSBuild +namespace MonoDevelop.Projects.MSBuild { public class MSBuildTask: MSBuildElement diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildValueType.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildValueType.cs index 920c315b95..d64ef6a9a4 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildValueType.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildValueType.cs @@ -25,7 +25,7 @@ // THE SOFTWARE. using System; -namespace MonoDevelop.Projects.Formats.MSBuild +namespace MonoDevelop.Projects.MSBuild { class MSBuildValueType { diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildWhitespace.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildWhitespace.cs index 65c88349a7..c7115cb3d3 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildWhitespace.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildWhitespace.cs @@ -36,7 +36,7 @@ using System.Linq; using MonoDevelop.Projects.Text; using System.Threading.Tasks; -namespace MonoDevelop.Projects.Formats.MSBuild +namespace MonoDevelop.Projects.MSBuild { class MSBuildWhitespace { diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildXmlElement.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildXmlElement.cs index 5802283275..ce45e64c85 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildXmlElement.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildXmlElement.cs @@ -30,7 +30,7 @@ using System.IO; using System.Text; using System.Xml; -namespace MonoDevelop.Projects.Formats.MSBuild +namespace MonoDevelop.Projects.MSBuild { class MSBuildXmlElement : MSBuildObject diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildXmlNode.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildXmlNode.cs index 8938e427c9..814892f5d9 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildXmlNode.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildXmlNode.cs @@ -29,7 +29,7 @@ using System.IO; using System.Text; using System.Xml; -namespace MonoDevelop.Projects.Formats.MSBuild +namespace MonoDevelop.Projects.MSBuild { public class MSBuildNode: IMSBuildProjectObject { diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildXmlReader.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildXmlReader.cs index 6e02f2492d..3dc429738b 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildXmlReader.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildXmlReader.cs @@ -36,7 +36,7 @@ using System.Linq; using MonoDevelop.Projects.Text; using System.Threading.Tasks; -namespace MonoDevelop.Projects.Formats.MSBuild +namespace MonoDevelop.Projects.MSBuild { class MSBuildXmlReader diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MergeToProjectAttribute.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MergeToProjectAttribute.cs index a04b220e29..2053557750 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MergeToProjectAttribute.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MergeToProjectAttribute.cs @@ -26,7 +26,7 @@ using System; -namespace MonoDevelop.Projects.Formats.MSBuild +namespace MonoDevelop.Projects.MSBuild { /// <summary> /// Specifies that a property of a project configuration has to be stored as a project property diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/ProjectEvaluationException.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/ProjectEvaluationException.cs index 9c545c4360..000fcea525 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/ProjectEvaluationException.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/ProjectEvaluationException.cs @@ -25,7 +25,7 @@ // THE SOFTWARE. using System; -namespace MonoDevelop.Projects.Formats.MSBuild +namespace MonoDevelop.Projects.MSBuild { public class ProjectEvaluationException: ApplicationException { diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/RemoteProjectBuilder.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/RemoteProjectBuilder.cs index 1e08a4e2a5..e2ddb4c12a 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/RemoteProjectBuilder.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/RemoteProjectBuilder.cs @@ -33,8 +33,9 @@ using System.Threading.Tasks; using MonoDevelop.Core; using System.IO; using System.Linq; +using MonoDevelop.Projects.MSBuild; -namespace MonoDevelop.Projects.Formats.MSBuild +namespace MonoDevelop.Projects.MSBuild { class RemoteBuildEngine: IBuildEngine { diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/SlnFile.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/SlnFile.cs index 30a01b337f..834f702baf 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/SlnFile.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/SlnFile.cs @@ -10,7 +10,7 @@ using MonoDevelop.Projects.Text; using System.Text.RegularExpressions; using System.Globalization; -namespace MonoDevelop.Projects.Formats.MSBuild +namespace MonoDevelop.Projects.MSBuild { public class SlnFile { diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/SlnFileFormat.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/SlnFileFormat.cs index c425e815a7..9bf684a17c 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/SlnFileFormat.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/SlnFileFormat.cs @@ -40,7 +40,7 @@ using System.Reflection; using System.Linq; using System.Threading.Tasks; -namespace MonoDevelop.Projects.Formats.MSBuild +namespace MonoDevelop.Projects.MSBuild { class SlnFileFormat { diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/TargetsAvailableCondition.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/TargetsAvailableCondition.cs index 81e7119165..4057b33d8d 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/TargetsAvailableCondition.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/TargetsAvailableCondition.cs @@ -32,7 +32,7 @@ using Mono.Addins; using MonoDevelop.Core; using MonoDevelop.Core.Assemblies; -namespace MonoDevelop.Projects.Formats.MSBuild +namespace MonoDevelop.Projects.MSBuild { public class TargetsAvailableCondition : ConditionType { diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/UnknownSolutionItemTypeException.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/UnknownSolutionItemTypeException.cs index ce2af4ae34..5ce4056087 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/UnknownSolutionItemTypeException.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/UnknownSolutionItemTypeException.cs @@ -42,7 +42,7 @@ using MonoDevelop.Core.Instrumentation; using MonoDevelop.Core.ProgressMonitoring; using System.Threading.Tasks; -namespace MonoDevelop.Projects.Formats.MSBuild +namespace MonoDevelop.Projects.MSBuild { class UnknownSolutionItemTypeException : InvalidOperationException diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.SharedAssetsProjects/SharedAssetsProject.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.SharedAssetsProjects/SharedAssetsProject.cs index 24fcd20038..d63250d896 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.SharedAssetsProjects/SharedAssetsProject.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.SharedAssetsProjects/SharedAssetsProject.cs @@ -32,7 +32,7 @@ using System.IO; using System.Xml; using MonoDevelop.Projects.Policies; using System.Threading.Tasks; -using MonoDevelop.Projects.Formats.MSBuild; +using MonoDevelop.Projects.MSBuild; namespace MonoDevelop.Projects.SharedAssetsProjects { @@ -110,7 +110,7 @@ namespace MonoDevelop.Projects.SharedAssetsProjects base.SaveProjectItems (monitor, projitemsProject, usedMSBuildItems, "$(MSBuildThisFileDirectory)"); } - protected override void OnWriteProject (ProgressMonitor monitor, MonoDevelop.Projects.Formats.MSBuild.MSBuildProject msproject) + protected override void OnWriteProject (ProgressMonitor monitor, MonoDevelop.Projects.MSBuild.MSBuildProject msproject) { if (projItemsPath == FilePath.Null) projItemsPath = Path.ChangeExtension (FileName, ".projitems"); diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.SharedAssetsProjects/SharedAssetsProjectMSBuildExtension.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.SharedAssetsProjects/SharedAssetsProjectMSBuildExtension.cs index 566cc5816d..b2c68ad756 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.SharedAssetsProjects/SharedAssetsProjectMSBuildExtension.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.SharedAssetsProjects/SharedAssetsProjectMSBuildExtension.cs @@ -28,7 +28,7 @@ using System.Linq; using System.IO; using MonoDevelop.Core; using System.Collections.Generic; -using MonoDevelop.Projects.Formats.MSBuild; +using MonoDevelop.Projects.MSBuild; namespace MonoDevelop.Projects.SharedAssetsProjects { diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/CompiledAssemblyProject.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/CompiledAssemblyProject.cs index 6d81aca415..6b5226d49c 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/CompiledAssemblyProject.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/CompiledAssemblyProject.cs @@ -36,7 +36,7 @@ using Mono.Cecil.Mdb; using Mono.Cecil.Cil; using System.Threading.Tasks; using MonoDevelop.Core.Serialization; -using MonoDevelop.Projects.Formats.MSBuild; +using MonoDevelop.Projects.MSBuild; namespace MonoDevelop.Projects { diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/DotNetCompilerParameters.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/DotNetCompilerParameters.cs index a04d3d15c6..f6b72ebf64 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/DotNetCompilerParameters.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/DotNetCompilerParameters.cs @@ -28,7 +28,7 @@ using System; using MonoDevelop.Core.Serialization; using System.Collections.Generic; using System.Linq; -using MonoDevelop.Projects.Formats.MSBuild; +using MonoDevelop.Projects.MSBuild; namespace MonoDevelop.Projects { diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/DotNetProject.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/DotNetProject.cs index 0536402938..e6b93bddda 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/DotNetProject.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/DotNetProject.cs @@ -38,12 +38,12 @@ using MonoDevelop.Core.Execution; using MonoDevelop.Projects.Policies; using MonoDevelop.Projects.Formats.MD1; using MonoDevelop.Projects.Extensions; -using MonoDevelop.Projects.Formats.MSBuild; +using MonoDevelop.Projects.MSBuild; using MonoDevelop.Core.Assemblies; using System.Globalization; using System.Threading.Tasks; using System.Collections.Immutable; -using MonoDevelop.Projects.Formats.MSBuild.Conditions; +using MonoDevelop.Projects.MSBuild.Conditions; namespace MonoDevelop.Projects { diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/DotNetProjectConfiguration.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/DotNetProjectConfiguration.cs index 7abccf1b47..fe1968af99 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/DotNetProjectConfiguration.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/DotNetProjectConfiguration.cs @@ -35,7 +35,7 @@ using MonoDevelop.Core.Serialization; using MonoDevelop.Core.Assemblies; using MonoDevelop.Core.StringParsing; using System.Collections.Generic; -using MonoDevelop.Projects.Formats.MSBuild; +using MonoDevelop.Projects.MSBuild; namespace MonoDevelop.Projects { diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/DotNetProjectExtension.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/DotNetProjectExtension.cs index 4ea297e92a..4281c40a73 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/DotNetProjectExtension.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/DotNetProjectExtension.cs @@ -29,7 +29,7 @@ using MonoDevelop.Core.Assemblies; using MonoDevelop.Core.Execution; using MonoDevelop.Core; using System.Threading.Tasks; -using MonoDevelop.Projects.Formats.MSBuild; +using MonoDevelop.Projects.MSBuild; namespace MonoDevelop.Projects { diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ExportProjectTypeAttribute.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ExportProjectTypeAttribute.cs index 7fc3746e8c..1d108c12f3 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ExportProjectTypeAttribute.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ExportProjectTypeAttribute.cs @@ -26,7 +26,7 @@ using System; using MonoDevelop.Core; using System.Threading.Tasks; -using MonoDevelop.Projects.Formats.MSBuild; +using MonoDevelop.Projects.MSBuild; using Mono.Addins; namespace MonoDevelop.Projects diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/IMSBuildFileObject.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/IMSBuildFileObject.cs index d3565a68b4..329d253fcc 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/IMSBuildFileObject.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/IMSBuildFileObject.cs @@ -24,7 +24,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. using System; -using MonoDevelop.Projects.Formats.MSBuild; +using MonoDevelop.Projects.MSBuild; namespace MonoDevelop.Projects { diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/IPropertySet.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/IPropertySet.cs index e8b7e9ef5d..b86d8715e1 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/IPropertySet.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/IPropertySet.cs @@ -27,7 +27,7 @@ using System; using System.Xml; using MonoDevelop.Core; using System.Xml.Linq; -using MonoDevelop.Projects.Formats.MSBuild; +using MonoDevelop.Projects.MSBuild; using System.Collections.Generic; namespace MonoDevelop.Projects diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ItemConfiguration.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ItemConfiguration.cs index 0c8f6de583..58165373e2 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ItemConfiguration.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ItemConfiguration.cs @@ -32,7 +32,7 @@ using System.Collections.ObjectModel; using MonoDevelop.Projects; using MonoDevelop.Core.Serialization; using MonoDevelop.Core; -using MonoDevelop.Projects.Formats.MSBuild; +using MonoDevelop.Projects.MSBuild; namespace MonoDevelop.Projects { diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/MSBuildSerializationExtension.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/MSBuildSerializationExtension.cs index f3fc026b42..0b2e8efdf9 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/MSBuildSerializationExtension.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/MSBuildSerializationExtension.cs @@ -24,7 +24,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. using System; -using MonoDevelop.Projects.Formats.MSBuild; +using MonoDevelop.Projects.MSBuild; using MonoDevelop.Core; using System.Threading.Tasks; diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/PathBasedProjectItem.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/PathBasedProjectItem.cs index 4ba0a56777..3ad5203a43 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/PathBasedProjectItem.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/PathBasedProjectItem.cs @@ -25,7 +25,7 @@ // THE SOFTWARE. using System; using MonoDevelop.Core; -using MonoDevelop.Projects.Formats.MSBuild; +using MonoDevelop.Projects.MSBuild; namespace MonoDevelop.Projects { diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/PortableDotNetProjectFlavor.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/PortableDotNetProjectFlavor.cs index 581d4eedc4..6ffc5cb2e2 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/PortableDotNetProjectFlavor.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/PortableDotNetProjectFlavor.cs @@ -27,7 +27,7 @@ using System; using System.Collections.Generic; using MonoDevelop.Core.Assemblies; using System.Linq; -using MonoDevelop.Projects.Formats.MSBuild; +using MonoDevelop.Projects.MSBuild; using System.Threading.Tasks; namespace MonoDevelop.Projects diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/Project.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/Project.cs index 8bce1ba118..dea34c0ef4 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/Project.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/Project.cs @@ -37,7 +37,7 @@ using MonoDevelop.Core; using MonoDevelop.Core.Serialization; using MonoDevelop.Projects; using System.Threading.Tasks; -using MonoDevelop.Projects.Formats.MSBuild; +using MonoDevelop.Projects.MSBuild; using System.Xml; using MonoDevelop.Core.Instrumentation; using MonoDevelop.Core.Assemblies; diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ProjectConfiguration.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ProjectConfiguration.cs index 48660182df..d07c46e2ef 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ProjectConfiguration.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ProjectConfiguration.cs @@ -32,7 +32,7 @@ using System.IO; using System.Collections.Generic; using MonoDevelop.Core.StringParsing; using System.Xml.Linq; -using MonoDevelop.Projects.Formats.MSBuild; +using MonoDevelop.Projects.MSBuild; namespace MonoDevelop.Projects { diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ProjectConvertTool.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ProjectConvertTool.cs index 8dd4526ab4..dddda00224 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ProjectConvertTool.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ProjectConvertTool.cs @@ -31,7 +31,7 @@ using System.IO; using System.Collections.Generic; using MonoDevelop.Core; using MonoDevelop.Core.ProgressMonitoring; -using MonoDevelop.Projects.Formats.MSBuild; +using MonoDevelop.Projects.MSBuild; using System.Linq; using System.Threading.Tasks; diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ProjectExtension.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ProjectExtension.cs index 86133060a6..e709017ad8 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ProjectExtension.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ProjectExtension.cs @@ -27,7 +27,7 @@ using System; using System.Collections.Generic; using MonoDevelop.Core; using System.Threading.Tasks; -using MonoDevelop.Projects.Formats.MSBuild; +using MonoDevelop.Projects.MSBuild; using Mono.Addins; using System.Linq; using System.Collections.Immutable; diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ProjectFile.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ProjectFile.cs index 72f2479c86..5e12fb87b1 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ProjectFile.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ProjectFile.cs @@ -37,7 +37,7 @@ using MonoDevelop.Core; using MonoDevelop.Core.Serialization; using MonoDevelop.Projects; using MonoDevelop.Projects.Extensions; -using MonoDevelop.Projects.Formats.MSBuild; +using MonoDevelop.Projects.MSBuild; using MonoDevelop.Projects.Policies; namespace MonoDevelop.Projects diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ProjectItem.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ProjectItem.cs index dfd1fc06e3..cdfd4f90a7 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ProjectItem.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ProjectItem.cs @@ -28,7 +28,7 @@ using System; using System.Collections; using System.Collections.Generic; using MonoDevelop.Core.Serialization; -using MonoDevelop.Projects.Formats.MSBuild; +using MonoDevelop.Projects.MSBuild; namespace MonoDevelop.Projects { diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ProjectItemMetadata.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ProjectItemMetadata.cs index 14be1c22ce..2a4f870b2b 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ProjectItemMetadata.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ProjectItemMetadata.cs @@ -25,7 +25,7 @@ // THE SOFTWARE. using System; using MonoDevelop.Core; -using MonoDevelop.Projects.Formats.MSBuild; +using MonoDevelop.Projects.MSBuild; using System.Collections.Generic; using System.Xml; using System.Linq; diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ProjectReference.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ProjectReference.cs index 7630cb9951..3d502486ba 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ProjectReference.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ProjectReference.cs @@ -37,7 +37,7 @@ using System.ComponentModel; using MonoDevelop.Projects; using MonoDevelop.Core.Serialization; using MonoDevelop.Core.Assemblies; -using MonoDevelop.Projects.Formats.MSBuild; +using MonoDevelop.Projects.MSBuild; namespace MonoDevelop.Projects { diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ProjectService.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ProjectService.cs index c8ff8722ed..8c0dc3ec33 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ProjectService.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ProjectService.cs @@ -42,7 +42,7 @@ using MonoDevelop.Core.Instrumentation; using MonoDevelop.Projects.Extensions; using Mono.Unix; using System.Linq; -using MonoDevelop.Projects.Formats.MSBuild; +using MonoDevelop.Projects.MSBuild; using System.Threading.Tasks; namespace MonoDevelop.Projects diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/Solution.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/Solution.cs index c8779dd79f..d02a445446 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/Solution.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/Solution.cs @@ -38,7 +38,7 @@ using MonoDevelop.Core.StringParsing; using MonoDevelop.Projects.Policies; using MonoDevelop.Core.Execution; using System.Threading.Tasks; -using MonoDevelop.Projects.Formats.MSBuild; +using MonoDevelop.Projects.MSBuild; namespace MonoDevelop.Projects { diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/SolutionDataSectionAttribute.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/SolutionDataSectionAttribute.cs index a772ae4f2c..98e1d282eb 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/SolutionDataSectionAttribute.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/SolutionDataSectionAttribute.cs @@ -24,7 +24,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. using System; -using MonoDevelop.Projects.Formats.MSBuild; +using MonoDevelop.Projects.MSBuild; namespace MonoDevelop.Projects { diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/SolutionExtension.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/SolutionExtension.cs index b03eb6c60b..1907ade73c 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/SolutionExtension.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/SolutionExtension.cs @@ -28,7 +28,7 @@ using MonoDevelop.Core; using MonoDevelop.Core.Execution; using System.Collections.Generic; using System.Threading.Tasks; -using MonoDevelop.Projects.Formats.MSBuild; +using MonoDevelop.Projects.MSBuild; namespace MonoDevelop.Projects { diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/SolutionFolderItem.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/SolutionFolderItem.cs index 3405074ef0..3421f40c46 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/SolutionFolderItem.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/SolutionFolderItem.cs @@ -34,7 +34,7 @@ using MonoDevelop.Projects.Extensions; using MonoDevelop.Core.StringParsing; using MonoDevelop.Projects.Policies; using System.Collections.Generic; -using MonoDevelop.Projects.Formats.MSBuild; +using MonoDevelop.Projects.MSBuild; namespace MonoDevelop.Projects { diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/SolutionItem.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/SolutionItem.cs index 1bf201f4cf..11848fc18d 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/SolutionItem.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/SolutionItem.cs @@ -47,7 +47,7 @@ using Mono.Addins; using MonoDevelop.Core.Instrumentation; using MonoDevelop.Core.Collections; using System.Threading.Tasks; -using MonoDevelop.Projects.Formats.MSBuild; +using MonoDevelop.Projects.MSBuild; using System.Collections.Immutable; namespace MonoDevelop.Projects diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/SolutionItemExtension.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/SolutionItemExtension.cs index 1bebb7e5d1..012f1b3c58 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/SolutionItemExtension.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/SolutionItemExtension.cs @@ -29,7 +29,7 @@ using MonoDevelop.Core; using MonoDevelop.Core.StringParsing; using MonoDevelop.Core.Execution; using System.Xml; -using MonoDevelop.Projects.Formats.MSBuild; +using MonoDevelop.Projects.MSBuild; using MonoDevelop.Projects.Extensions; using System.Threading.Tasks; using System.Linq; diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/TargetEvaluationResult.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/TargetEvaluationResult.cs index 95c97b9c47..aaff7ecbab 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/TargetEvaluationResult.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/TargetEvaluationResult.cs @@ -25,7 +25,7 @@ // THE SOFTWARE. using System; using System.Collections.Generic; -using MonoDevelop.Projects.Formats.MSBuild; +using MonoDevelop.Projects.MSBuild; namespace MonoDevelop.Projects { diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/UnknownProject.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/UnknownProject.cs index 607f6cd0d5..e37bd6b611 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/UnknownProject.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/UnknownProject.cs @@ -27,7 +27,7 @@ using System; using MonoDevelop.Core; using System.Collections.Generic; using System.Threading.Tasks; -using MonoDevelop.Projects.Formats.MSBuild; +using MonoDevelop.Projects.MSBuild; namespace MonoDevelop.Projects { diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/WorkspaceObjectReader.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/WorkspaceObjectReader.cs index 681dfa9362..9c0a453544 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/WorkspaceObjectReader.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/WorkspaceObjectReader.cs @@ -29,7 +29,7 @@ using System; using MonoDevelop.Core; using System.Threading.Tasks; -using MonoDevelop.Projects.Formats.MSBuild; +using MonoDevelop.Projects.MSBuild; namespace MonoDevelop.Projects { diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CustomTools/CustomToolService.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CustomTools/CustomToolService.cs index ef21f1d43d..941765a559 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CustomTools/CustomToolService.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CustomTools/CustomToolService.cs @@ -159,7 +159,7 @@ namespace MonoDevelop.Ide.CustomTools return false; } bool byDefault, require; - MonoDevelop.Projects.Formats.MSBuild.MSBuildProjectService.CheckHandlerUsesMSBuildEngine (file.Project, out byDefault, out require); + MonoDevelop.Projects.MSBuild.MSBuildProjectService.CheckHandlerUsesMSBuildEngine (file.Project, out byDefault, out require); var usesMSBuild = require || (file.Project.UseMSBuildEngine ?? byDefault); if (!usesMSBuild) { return false; diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/SelectFileFormatDialog.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/SelectFileFormatDialog.cs index d92cee1e4c..11909769fa 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/SelectFileFormatDialog.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/SelectFileFormatDialog.cs @@ -28,7 +28,7 @@ using System; using System.Collections.Generic; using MonoDevelop.Projects; using MonoDevelop.Core; -using MonoDevelop.Projects.Formats.MSBuild; +using MonoDevelop.Projects.MSBuild; namespace MonoDevelop.Ide.Gui.Dialogs { diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.OptionPanels/BuildPanel.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.OptionPanels/BuildPanel.cs index 7160e6da6b..bac0ec7fb6 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.OptionPanels/BuildPanel.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.OptionPanels/BuildPanel.cs @@ -29,7 +29,7 @@ using System; using Gtk; using MonoDevelop.Ide.Gui.Dialogs; -using MonoDevelop.Projects.Formats.MSBuild; +using MonoDevelop.Projects.MSBuild; namespace MonoDevelop.Ide.Gui.OptionPanels { diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects.OptionPanels/CombineMSBuildOptions.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects.OptionPanels/CombineMSBuildOptions.cs index 00ddb8d815..3f393ce1cb 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects.OptionPanels/CombineMSBuildOptions.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects.OptionPanels/CombineMSBuildOptions.cs @@ -25,7 +25,7 @@ // THE SOFTWARE.
using System;
using MonoDevelop.Ide.Gui.Dialogs;
-using MonoDevelop.Projects.Formats.MSBuild;
+using MonoDevelop.Projects.MSBuild;
using MonoDevelop.Core;
using MonoDevelop.Components;
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/ExportSolutionDialog.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/ExportSolutionDialog.cs index f716da17e7..3a14ecec9a 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/ExportSolutionDialog.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/ExportSolutionDialog.cs @@ -30,7 +30,7 @@ using System; using System.IO; using MonoDevelop.Components; using MonoDevelop.Projects; -using MonoDevelop.Projects.Formats.MSBuild; +using MonoDevelop.Projects.MSBuild; using System.Linq; namespace MonoDevelop.Ide.Projects diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates/ProjectDescriptor.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates/ProjectDescriptor.cs index dbf4869b78..78a24d98b3 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates/ProjectDescriptor.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates/ProjectDescriptor.cs @@ -34,7 +34,7 @@ using System.IO; using System.Collections.Generic; using System.Xml; using System.Linq; -using MonoDevelop.Projects.Formats.MSBuild; +using MonoDevelop.Projects.MSBuild; namespace MonoDevelop.Ide.Templates diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates/SolutionDescriptor.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates/SolutionDescriptor.cs index 15d18b8557..51eebafb51 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates/SolutionDescriptor.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates/SolutionDescriptor.cs @@ -42,7 +42,7 @@ using MonoDevelop.Components.Commands; using System.Collections.Generic; using System.Xml; using Mono.Addins; -using MonoDevelop.Projects.Formats.MSBuild; +using MonoDevelop.Projects.MSBuild; namespace MonoDevelop.Ide.Templates { diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/IdePreferences.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/IdePreferences.cs index 1b79545e62..4d465a3bdb 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/IdePreferences.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/IdePreferences.cs @@ -28,7 +28,7 @@ using System; using MonoDevelop.Core; using MonoDevelop.Core.Assemblies; -using MonoDevelop.Projects.Formats.MSBuild; +using MonoDevelop.Projects.MSBuild; using MonoDevelop.Ide.Fonts; using MonoDevelop.Ide.Editor; diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/ProjectOperations.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/ProjectOperations.cs index 74f6ea058a..9eeec61399 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/ProjectOperations.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/ProjectOperations.cs @@ -52,7 +52,7 @@ using System.Threading.Tasks; using System.Threading; using ExecutionContext = MonoDevelop.Projects.ExecutionContext; using MonoDevelop.Ide.Tasks; -using MonoDevelop.Projects.Formats.MSBuild; +using MonoDevelop.Projects.MSBuild; using System.Collections.Immutable; using MonoDevelop.Ide.Editor; using MonoDevelop.Core.Text; diff --git a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/AssemblyInfo.v12.0.cs b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/AssemblyInfo.v12.0.cs index eff9423485..d8ee3d5e30 100644 --- a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/AssemblyInfo.v12.0.cs +++ b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/AssemblyInfo.v12.0.cs @@ -1,6 +1,6 @@ [assembly: System.Reflection.AssemblyTitle ("MonoDevelop MSBuild 12.0 Builder")]
-namespace MonoDevelop.Projects.Formats.MSBuild
+namespace MonoDevelop.Projects.MSBuild
{
static class MSBuildConsts
{
diff --git a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/AssemblyInfo.v14.0.cs b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/AssemblyInfo.v14.0.cs index 6b3d27577c..09cae154f2 100644 --- a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/AssemblyInfo.v14.0.cs +++ b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/AssemblyInfo.v14.0.cs @@ -1,6 +1,6 @@ [assembly: System.Reflection.AssemblyTitle ("MonoDevelop MSBuild 14.0 Builder")]
-namespace MonoDevelop.Projects.Formats.MSBuild
+namespace MonoDevelop.Projects.MSBuild
{
static class MSBuildConsts
{
diff --git a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/AssemblyInfo.v4.0.cs b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/AssemblyInfo.v4.0.cs index de5f65ec45..5ea952f86d 100644 --- a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/AssemblyInfo.v4.0.cs +++ b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/AssemblyInfo.v4.0.cs @@ -1,6 +1,6 @@ [assembly: System.Reflection.AssemblyTitle ("MonoDevelop MSBuild 4.0 Builder")]
-namespace MonoDevelop.Projects.Formats.MSBuild
+namespace MonoDevelop.Projects.MSBuild
{
static class MSBuildConsts
{
diff --git a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/Main.cs b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/Main.cs index 7436777040..d1b85e7c26 100644 --- a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/Main.cs +++ b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/Main.cs @@ -33,7 +33,7 @@ using System.Runtime.Remoting.Channels.Tcp; using System.Threading; using System.Diagnostics; -namespace MonoDevelop.Projects.Formats.MSBuild +namespace MonoDevelop.Projects.MSBuild { class MainClass { diff --git a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/BuildEngine.Shared.cs b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/BuildEngine.Shared.cs index 538e5d08ac..1fe71fd699 100644 --- a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/BuildEngine.Shared.cs +++ b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/BuildEngine.Shared.cs @@ -34,7 +34,7 @@ using System.IO; //this is the builder for the deprecated build engine API #pragma warning disable 618 -namespace MonoDevelop.Projects.Formats.MSBuild +namespace MonoDevelop.Projects.MSBuild { partial class BuildEngine: MarshalByRefObject, IBuildEngine { diff --git a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/BuildEngine.cs b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/BuildEngine.cs index 61dc37af7d..676ff9d933 100644 --- a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/BuildEngine.cs +++ b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/BuildEngine.cs @@ -33,7 +33,7 @@ using System.Globalization; //this is the builder for the deprecated build engine API #pragma warning disable 618 -namespace MonoDevelop.Projects.Formats.MSBuild +namespace MonoDevelop.Projects.MSBuild { public partial class BuildEngine: MarshalByRefObject, IBuildEngine { diff --git a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/BuildEngine.v4.0.cs b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/BuildEngine.v4.0.cs index e69d3b275a..4afa977d9b 100644 --- a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/BuildEngine.v4.0.cs +++ b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/BuildEngine.v4.0.cs @@ -34,7 +34,7 @@ using Microsoft.Build.Construction; using System.Linq;
using System.Globalization;
-namespace MonoDevelop.Projects.Formats.MSBuild
+namespace MonoDevelop.Projects.MSBuild
{
public partial class BuildEngine: MarshalByRefObject, IBuildEngine
{
diff --git a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/ConsoleLogger.cs b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/ConsoleLogger.cs index a64fcab1f3..05aa2407a7 100644 --- a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/ConsoleLogger.cs +++ b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/ConsoleLogger.cs @@ -35,7 +35,7 @@ using System.Text; using Microsoft.Build.Framework; using Microsoft.Build.BuildEngine; -namespace MonoDevelop.Projects.Formats.MSBuild { +namespace MonoDevelop.Projects.MSBuild { public class MDConsoleLogger : ILogger { string parameters; diff --git a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/IBuildEngine.cs b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/IBuildEngine.cs index 60b1172476..d926143452 100644 --- a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/IBuildEngine.cs +++ b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/IBuildEngine.cs @@ -28,7 +28,7 @@ using System; using System.Globalization; using System.Collections.Generic; -namespace MonoDevelop.Projects.Formats.MSBuild +namespace MonoDevelop.Projects.MSBuild { public interface IBuildEngine: IDisposable { diff --git a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/ILogWriter.cs b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/ILogWriter.cs index 8373877c11..10f7982178 100644 --- a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/ILogWriter.cs +++ b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/ILogWriter.cs @@ -28,7 +28,7 @@ using System; using System.IO; using System.Runtime.Remoting.Messaging; -namespace MonoDevelop.Projects.Formats.MSBuild +namespace MonoDevelop.Projects.MSBuild { public interface ILogWriter { diff --git a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/IProjectBuilder.cs b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/IProjectBuilder.cs index 542c29d5c3..886a5937a9 100644 --- a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/IProjectBuilder.cs +++ b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/IProjectBuilder.cs @@ -29,7 +29,7 @@ using System; using System.Collections.Generic; -namespace MonoDevelop.Projects.Formats.MSBuild +namespace MonoDevelop.Projects.MSBuild { public interface IProjectBuilder : IDisposable { diff --git a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/LocalLogger.cs b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/LocalLogger.cs index 7d08df441e..6dcc8dd153 100644 --- a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/LocalLogger.cs +++ b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/LocalLogger.cs @@ -30,7 +30,7 @@ using System.Collections.Generic; using Microsoft.Build.Utilities; using Microsoft.Build.Framework; -namespace MonoDevelop.Projects.Formats.MSBuild +namespace MonoDevelop.Projects.MSBuild { public class LocalLogger: Logger { diff --git a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/MSBuildEvaluatedItem.cs b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/MSBuildEvaluatedItem.cs index 221eb11b24..6e2d31916f 100644 --- a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/MSBuildEvaluatedItem.cs +++ b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/MSBuildEvaluatedItem.cs @@ -27,7 +27,7 @@ using System; using System.Collections.Generic; -namespace MonoDevelop.Projects.Formats.MSBuild +namespace MonoDevelop.Projects.MSBuild { [Serializable] diff --git a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/MSBuildResult.cs b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/MSBuildResult.cs index 358659d42a..843961a150 100644 --- a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/MSBuildResult.cs +++ b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/MSBuildResult.cs @@ -27,7 +27,7 @@ using System; using System.Collections.Generic; -namespace MonoDevelop.Projects.Formats.MSBuild +namespace MonoDevelop.Projects.MSBuild { [Serializable] public class MSBuildResult diff --git a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/MSBuildTargetResult.cs b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/MSBuildTargetResult.cs index 78115749b3..ba37f3ef32 100644 --- a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/MSBuildTargetResult.cs +++ b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/MSBuildTargetResult.cs @@ -27,7 +27,7 @@ using System; using System.Text; -namespace MonoDevelop.Projects.Formats.MSBuild +namespace MonoDevelop.Projects.MSBuild { [Serializable] public class MSBuildTargetResult diff --git a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/ProjectBuilder.Shared.cs b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/ProjectBuilder.Shared.cs index c22e4d7284..ec79d80dc5 100644 --- a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/ProjectBuilder.Shared.cs +++ b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/ProjectBuilder.Shared.cs @@ -30,7 +30,7 @@ using Microsoft.Build.Framework; using System.Xml;
using System.IO;
-namespace MonoDevelop.Projects.Formats.MSBuild
+namespace MonoDevelop.Projects.MSBuild
{
partial class ProjectBuilder
{
diff --git a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/ProjectBuilder.cs b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/ProjectBuilder.cs index 8e4f3881e3..73a986555b 100644 --- a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/ProjectBuilder.cs +++ b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/ProjectBuilder.cs @@ -40,7 +40,7 @@ using System.Linq; #pragma warning disable 618 -namespace MonoDevelop.Projects.Formats.MSBuild +namespace MonoDevelop.Projects.MSBuild { public partial class ProjectBuilder: MarshalByRefObject, IProjectBuilder { diff --git a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/ProjectBuilder.v4.0.cs b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/ProjectBuilder.v4.0.cs index 55abc76f01..5f0b8a06f1 100644 --- a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/ProjectBuilder.v4.0.cs +++ b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/ProjectBuilder.v4.0.cs @@ -36,7 +36,7 @@ using Microsoft.Build.Logging; using Microsoft.Build.Execution;
using System.Xml;
-namespace MonoDevelop.Projects.Formats.MSBuild
+namespace MonoDevelop.Projects.MSBuild
{
public partial class ProjectBuilder: MarshalByRefObject, IProjectBuilder
{
diff --git a/main/tests/UnitTests/MonoDevelop.Projects/FlavorMigration.cs b/main/tests/UnitTests/MonoDevelop.Projects/FlavorMigration.cs index 65b19b7cc2..e1ea8d613d 100644 --- a/main/tests/UnitTests/MonoDevelop.Projects/FlavorMigration.cs +++ b/main/tests/UnitTests/MonoDevelop.Projects/FlavorMigration.cs @@ -30,7 +30,7 @@ using UnitTests; using System.Threading.Tasks; using MonoDevelop.Projects.Extensions; using MonoDevelop.Core; -using MonoDevelop.Projects.Formats.MSBuild; +using MonoDevelop.Projects.MSBuild; using MonoDevelop.Core.ProgressMonitoring; using System.Collections.Generic; diff --git a/main/tests/UnitTests/MonoDevelop.Projects/MSBuildProjectTests.cs b/main/tests/UnitTests/MonoDevelop.Projects/MSBuildProjectTests.cs index df74e91d51..a881a10cf1 100644 --- a/main/tests/UnitTests/MonoDevelop.Projects/MSBuildProjectTests.cs +++ b/main/tests/UnitTests/MonoDevelop.Projects/MSBuildProjectTests.cs @@ -26,7 +26,7 @@ using System; using NUnit.Framework; using UnitTests; -using MonoDevelop.Projects.Formats.MSBuild; +using MonoDevelop.Projects.MSBuild; using System.Linq; namespace MonoDevelop.Projects diff --git a/main/tests/UnitTests/MonoDevelop.Projects/MSBuildTests.cs b/main/tests/UnitTests/MonoDevelop.Projects/MSBuildTests.cs index af267d15d2..1b77fd8aa0 100644 --- a/main/tests/UnitTests/MonoDevelop.Projects/MSBuildTests.cs +++ b/main/tests/UnitTests/MonoDevelop.Projects/MSBuildTests.cs @@ -34,7 +34,7 @@ using MonoDevelop.CSharp.Project; using MonoDevelop.Core; using MonoDevelop.Ide.Projects; using System.Linq; -using MonoDevelop.Projects.Formats.MSBuild; +using MonoDevelop.Projects.MSBuild; using System.Threading.Tasks; using MonoDevelop.Core.Serialization; using MonoDevelop.Projects.Extensions; diff --git a/main/tests/UnitTests/MonoDevelop.Projects/SharedAssetsProjectTests.cs b/main/tests/UnitTests/MonoDevelop.Projects/SharedAssetsProjectTests.cs index 0325e6e780..3e3d3b677b 100644 --- a/main/tests/UnitTests/MonoDevelop.Projects/SharedAssetsProjectTests.cs +++ b/main/tests/UnitTests/MonoDevelop.Projects/SharedAssetsProjectTests.cs @@ -29,7 +29,7 @@ using UnitTests; using MonoDevelop.Projects.SharedAssetsProjects; using System.IO; using System.Threading.Tasks; -using MonoDevelop.Projects.Formats.MSBuild; +using MonoDevelop.Projects.MSBuild; namespace MonoDevelop.Projects { diff --git a/main/tests/UnitTests/MonoDevelop.Projects/SolutionTests.cs b/main/tests/UnitTests/MonoDevelop.Projects/SolutionTests.cs index 0d9527ed26..16f9448fc6 100644 --- a/main/tests/UnitTests/MonoDevelop.Projects/SolutionTests.cs +++ b/main/tests/UnitTests/MonoDevelop.Projects/SolutionTests.cs @@ -32,7 +32,7 @@ using System.Collections.Generic; using NUnit.Framework; using UnitTests; using MonoDevelop.Core; -using MonoDevelop.Projects.Formats.MSBuild; +using MonoDevelop.Projects.MSBuild; using MonoDevelop.Core.ProgressMonitoring; using System.Threading.Tasks; using MonoDevelop.Core.Serialization; diff --git a/main/tests/UnitTests/MonoDevelop.Projects/TestProjectsChecks.cs b/main/tests/UnitTests/MonoDevelop.Projects/TestProjectsChecks.cs index 22047d2fb9..a940fcbfef 100644 --- a/main/tests/UnitTests/MonoDevelop.Projects/TestProjectsChecks.cs +++ b/main/tests/UnitTests/MonoDevelop.Projects/TestProjectsChecks.cs @@ -33,7 +33,7 @@ using UnitTests; using MonoDevelop.Core.Serialization; using MonoDevelop.Core; using MonoDevelop.CSharp.Project; -using MonoDevelop.Projects.Formats.MSBuild; +using MonoDevelop.Projects.MSBuild; using System.Threading.Tasks; namespace MonoDevelop.Projects @@ -254,7 +254,7 @@ namespace Foo { sol.FileName = Path.Combine (dir, "TestGenericItem"); sol.Name = "TheItem"; - MonoDevelop.Projects.Formats.MSBuild.MSBuildProjectService.RegisterGenericProjectType ("GenericItem", typeof(GenericItem)); + MonoDevelop.Projects.MSBuild.MSBuildProjectService.RegisterGenericProjectType ("GenericItem", typeof(GenericItem)); GenericItem it = new GenericItem (); it.SomeValue = "hi"; |