[msbuild] Put all the MSBuild tests in the same namespace. (#15919)

I always have to look through all the namespaces to figure out where a specific test is, so this simplifies things a bit. It's also where the tasks themselves are headed at some point.
xamarin · Sep 12, 2022 · c63f238 · c63f238
1 parent b353c21
commit c63f238
Show file tree

Hide file tree

Showing 54 changed files with 59 additions and 54 deletions.
diff --git a/tests/msbuild/Xamarin.MacDev.Tasks.Tests/FrameworkListTest.cs b/tests/msbuild/Xamarin.MacDev.Tasks.Tests/FrameworkListTest.cs
@@ -8,7 +8,7 @@
 using Xamarin.Tests;
 using System.Linq;
 
-namespace Xamarin.iOS.Tasks
+namespace Xamarin.MacDev.Tasks
 {
 	[TestFixture]
 	public class FrameworkListTests

diff --git a/tests/msbuild/Xamarin.MacDev.Tasks.Tests/TaskTests/CollectITunesArtworkTaskTests.cs b/tests/msbuild/Xamarin.MacDev.Tasks.Tests/TaskTests/CollectITunesArtworkTaskTests.cs
@@ -5,7 +5,9 @@
 
 using NUnit.Framework;
 
-namespace Xamarin.iOS.Tasks {
+using Xamarin.iOS.Tasks;
+
+namespace Xamarin.MacDev.Tasks {
 	[TestFixture]
 	public class CollectITunesArtworkTaskTests : TestBase {
 		string AppPath => Path.GetDirectoryName (GetType ().Assembly.Location);

diff --git a/tests/msbuild/Xamarin.MacDev.Tasks.Tests/TaskTests/CompileAppManifestTaskTests.cs b/tests/msbuild/Xamarin.MacDev.Tasks.Tests/TaskTests/CompileAppManifestTaskTests.cs
@@ -9,7 +9,7 @@
 using Xamarin.MacDev.Tasks;
 using Xamarin.Utils;
 
-namespace Xamarin.iOS.Tasks {
+namespace Xamarin.MacDev.Tasks {
 	[TestFixture]
 	public class CompileAppManifestTaskTests : TestBase {
 		CompileAppManifest CreateTask (string? tmpdir = null, ApplePlatform platform = ApplePlatform.iOS)

diff --git a/...amarin.MacDev.Tasks.Tests/TaskTests/GeneratePlistTaskTests/GeneratePlistTaskTests_Core.cs b/...amarin.MacDev.Tasks.Tests/TaskTests/GeneratePlistTaskTests/GeneratePlistTaskTests_Core.cs
@@ -9,7 +9,7 @@
 
 using Xamarin.MacDev.Tasks;
 
-namespace Xamarin.iOS.Tasks
+namespace Xamarin.MacDev.Tasks
 {
 	[TestFixture]
 	public abstract class GeneratePlistTaskTests_Core : TestBase

diff --git a/...Xamarin.MacDev.Tasks.Tests/TaskTests/GeneratePlistTaskTests/GeneratePlistTaskTests_iOS.cs b/...Xamarin.MacDev.Tasks.Tests/TaskTests/GeneratePlistTaskTests/GeneratePlistTaskTests_iOS.cs
@@ -3,7 +3,7 @@
 using NUnit.Framework;
 using Xamarin.MacDev;
 
-namespace Xamarin.iOS.Tasks
+namespace Xamarin.MacDev.Tasks
 {
 	[TestFixture]
 	public class GeneratePlistTaskTests_iOS : GeneratePlistTaskTests_Core

diff --git a/...v.Tasks.Tests/TaskTests/GeneratePlistTaskTests/GeneratePlistTaskTests_iOS_AppExtension.cs b/...v.Tasks.Tests/TaskTests/GeneratePlistTaskTests/GeneratePlistTaskTests_iOS_AppExtension.cs
@@ -1,7 +1,7 @@
 using NUnit.Framework;
 using Xamarin.MacDev;
 
-namespace Xamarin.iOS.Tasks
+namespace Xamarin.MacDev.Tasks
 {
 	[TestFixture]
 	public class GeneratePlistTaskTests_iOS_AppExtension : GeneratePlistTaskTests_iOS

diff --git a/...amarin.MacDev.Tasks.Tests/TaskTests/GeneratePlistTaskTests/GeneratePlistTaskTests_tvOS.cs b/...amarin.MacDev.Tasks.Tests/TaskTests/GeneratePlistTaskTests/GeneratePlistTaskTests_tvOS.cs
@@ -1,7 +1,7 @@
 using NUnit.Framework;
 using Xamarin.MacDev;
 
-namespace Xamarin.iOS.Tasks
+namespace Xamarin.MacDev.Tasks
 {
 	[TestFixture]
 	public class GeneratePlistTaskTests_tvOS : GeneratePlistTaskTests_Core

diff --git a/...rin.MacDev.Tasks.Tests/TaskTests/GeneratePlistTaskTests/GeneratePlistTaskTests_watchOS.cs b/...rin.MacDev.Tasks.Tests/TaskTests/GeneratePlistTaskTests/GeneratePlistTaskTests_watchOS.cs
@@ -1,7 +1,7 @@
 using NUnit.Framework;
 using Xamarin.MacDev;
 
-namespace Xamarin.iOS.Tasks
+namespace Xamarin.MacDev.Tasks
 {
 	[TestFixture]
 	public abstract class GeneratePlistTaskTests_watchOS: GeneratePlistTaskTests_Core

diff --git a/...asks.Tests/TaskTests/GeneratePlistTaskTests/GeneratePlistTaskTests_watchOS_WatchKitApp.cs b/...asks.Tests/TaskTests/GeneratePlistTaskTests/GeneratePlistTaskTests_watchOS_WatchKitApp.cs
@@ -1,6 +1,6 @@
 using NUnit.Framework;
 
-namespace Xamarin.iOS.Tasks
+namespace Xamarin.MacDev.Tasks
 {
 	[TestFixture]
 	public class GeneratePlistTaskTests_watchOS_WatchKitApp : GeneratePlistTaskTests_watchOS

diff --git a/...ests/TaskTests/GeneratePlistTaskTests/GeneratePlistTaskTests_watchOS_WatchKitExtension.cs b/...ests/TaskTests/GeneratePlistTaskTests/GeneratePlistTaskTests_watchOS_WatchKitExtension.cs
@@ -2,7 +2,7 @@
 using NUnit.Framework;
 using Xamarin.MacDev;
 
-namespace Xamarin.iOS.Tasks
+namespace Xamarin.MacDev.Tasks
 {
 	[TestFixture]
 	public class GeneratePlistTaskTests_watchOS_WatchKitExtension : GeneratePlistTaskTests_watchOS

diff --git a/tests/msbuild/Xamarin.MacDev.Tasks.Tests/TaskTests/GetBundleNameTaskTests.cs b/tests/msbuild/Xamarin.MacDev.Tasks.Tests/TaskTests/GetBundleNameTaskTests.cs
@@ -4,7 +4,7 @@
 
 using Xamarin.MacDev.Tasks;
 
-namespace Xamarin.iOS.Tasks
+namespace Xamarin.MacDev.Tasks
 {
 	[TestFixture]
 	public class GetBundleNameTaskTests : TestBase

diff --git a/tests/msbuild/Xamarin.MacDev.Tasks.Tests/TaskTests/IBToolTaskTests.cs b/tests/msbuild/Xamarin.MacDev.Tasks.Tests/TaskTests/IBToolTaskTests.cs
@@ -13,7 +13,7 @@
 using Xamarin.Tests;
 using Xamarin.Utils;
 
-namespace Xamarin.iOS.Tasks
+namespace Xamarin.MacDev.Tasks
 {
 	[TestFixture]
 	public class IBToolTaskTests : TestBase

diff --git a/tests/msbuild/Xamarin.MacDev.Tasks.Tests/TaskTests/LocalizationStringTest.cs b/tests/msbuild/Xamarin.MacDev.Tasks.Tests/TaskTests/LocalizationStringTest.cs
@@ -11,9 +11,10 @@
 using System.Linq;
 using System.Text;
 using System.Xml.Linq;
+using Xamarin.iOS.Tasks;
 using Xamarin.Tests;
 
-namespace Xamarin.iOS.Tasks {
+namespace Xamarin.MacDev.Tasks {
 	[TestFixture]
 	public class LocalizationStringTest : TestBase {
 		[TestCase ("cs-CZ", "došlo k chybě: neznámý formát image")]

diff --git a/tests/msbuild/Xamarin.MacDev.Tasks.Tests/TaskTests/MTouchTaskTests.cs b/tests/msbuild/Xamarin.MacDev.Tasks.Tests/TaskTests/MTouchTaskTests.cs
@@ -6,9 +6,11 @@
 using Microsoft.Build.Utilities;
 
 using NUnit.Framework;
+
+using Xamarin.iOS.Tasks;
 using Xamarin.MacDev;
 
-namespace Xamarin.iOS.Tasks
+namespace Xamarin.MacDev.Tasks
 {
 	class CustomMTouchTask : MTouch
 	{

diff --git a/tests/msbuild/Xamarin.MacDev.Tasks.Tests/TaskTests/ParseBundlerArgumentsTests.cs b/tests/msbuild/Xamarin.MacDev.Tasks.Tests/TaskTests/ParseBundlerArgumentsTests.cs
@@ -6,7 +6,7 @@
 
 using Xamarin.MacDev.Tasks;
 
-namespace Xamarin.iOS.Tasks
+namespace Xamarin.MacDev.Tasks
 {
 	[TestFixture]
 	public class ParseBundlerArgumentsTests : TestBase

diff --git a/tests/msbuild/Xamarin.MacDev.Tasks.Tests/TaskTests/PropertyListEditorTaskTests.cs b/tests/msbuild/Xamarin.MacDev.Tasks.Tests/TaskTests/PropertyListEditorTaskTests.cs
@@ -5,7 +5,7 @@
 using Xamarin.MacDev;
 using Xamarin.MacDev.Tasks;
 
-namespace Xamarin.iOS.Tasks
+namespace Xamarin.MacDev.Tasks
 {
 	[TestFixture]
 	public class PropertyListEditorTaskTests : TestBase

diff --git a/tests/msbuild/Xamarin.MacDev.Tasks.Tests/TestHelpers/Logger.cs b/tests/msbuild/Xamarin.MacDev.Tasks.Tests/TestHelpers/Logger.cs
@@ -2,7 +2,7 @@
 
 using Microsoft.Build.Framework;
 
-namespace Xamarin.iOS.Tasks
+namespace Xamarin.MacDev.Tasks
 {
 	public class Logger : ILogger
 	{

diff --git a/tests/msbuild/Xamarin.MacDev.Tasks.Tests/TestHelpers/TestBase.cs b/tests/msbuild/Xamarin.MacDev.Tasks.Tests/TestHelpers/TestBase.cs
@@ -7,7 +7,7 @@
 
 using Xamarin.Tests;
 
-namespace Xamarin.iOS.Tasks
+namespace Xamarin.MacDev.Tasks
 {
 	public abstract class TestBase
 	{

diff --git a/tests/msbuild/Xamarin.MacDev.Tasks.Tests/TestHelpers/TestEngine.cs b/tests/msbuild/Xamarin.MacDev.Tasks.Tests/TestHelpers/TestEngine.cs
@@ -6,7 +6,7 @@
 using Microsoft.Build.Evaluation;
 using Microsoft.Build.Logging;
 
-namespace Xamarin.iOS.Tasks
+namespace Xamarin.MacDev.Tasks
 {
 
 	public class TestEngine : IBuildEngine, IBuildEngine2, IBuildEngine3, IBuildEngine4

diff --git a/tests/msbuild/Xamarin.MacDev.Tasks.Tests/UtilityTests.cs b/tests/msbuild/Xamarin.MacDev.Tasks.Tests/UtilityTests.cs
@@ -10,7 +10,7 @@
 using Xamarin.MacDev.Tasks;
 using Xamarin.Utils;
 
-namespace Xamarin.iOS.Tasks
+namespace Xamarin.MacDev.Tasks
 {
 	[TestFixture]
 	public class UtilityTests

diff --git a/tests/msbuild/Xamarin.MacDev.Tests/DotnetTest.cs b/tests/msbuild/Xamarin.MacDev.Tests/DotnetTest.cs
@@ -6,7 +6,7 @@
 
 using NUnit.Framework;
 
-namespace Xamarin.iOS.Tasks {
+namespace Xamarin.MacDev.Tasks {
 
 	// This test builds test projects using both MSBuild (old-style) and .NET (new-style), and
 	// compares the resulting .app directories.

diff --git a/tests/msbuild/Xamarin.MacDev.Tests/ProjectsTests/BindingProject.cs b/tests/msbuild/Xamarin.MacDev.Tests/ProjectsTests/BindingProject.cs
@@ -2,7 +2,7 @@
 using System.IO;
 using Xamarin.Tests;
 
-namespace Xamarin.iOS.Tasks
+namespace Xamarin.MacDev.Tasks
 {
 	[TestFixture ("iPhone")]
 	[TestFixture ("iPhoneSimulator")]

diff --git a/tests/msbuild/Xamarin.MacDev.Tests/ProjectsTests/BindingReferences.cs b/tests/msbuild/Xamarin.MacDev.Tests/ProjectsTests/BindingReferences.cs
@@ -4,7 +4,7 @@
 
 using Xamarin.Tests;
 
-namespace Xamarin.iOS.Tasks {
+namespace Xamarin.MacDev.Tasks {
 	public class BindingReferences : TestBase {
 
 		[Test]

diff --git a/tests/msbuild/Xamarin.MacDev.Tests/ProjectsTests/Bug60536.cs b/tests/msbuild/Xamarin.MacDev.Tests/ProjectsTests/Bug60536.cs
@@ -7,7 +7,7 @@
 
 using NUnit.Framework;
 
-namespace Xamarin.iOS.Tasks
+namespace Xamarin.MacDev.Tasks
 {
 	[TestFixture]
 	public class Bug60536 : ProjectTest

diff --git a/tests/msbuild/Xamarin.MacDev.Tests/ProjectsTests/CodesignAppBundle.cs b/tests/msbuild/Xamarin.MacDev.Tests/ProjectsTests/CodesignAppBundle.cs
@@ -9,7 +9,7 @@
 
 using Xamarin.MacDev;
 
-namespace Xamarin.iOS.Tasks
+namespace Xamarin.MacDev.Tasks
 {
 	[TestFixture ("iPhone", "Debug")]
 	[TestFixture ("iPhone", "Release")]

diff --git a/tests/msbuild/Xamarin.MacDev.Tests/ProjectsTests/CompileSceneKitAssetsTest.cs b/tests/msbuild/Xamarin.MacDev.Tests/ProjectsTests/CompileSceneKitAssetsTest.cs
@@ -9,7 +9,7 @@
 
 using Xamarin.Tests;
 
-namespace Xamarin.iOS.Tasks
+namespace Xamarin.MacDev.Tasks
 {
 	// [TestFixture ("iPhone")] // Skip this to speed things up a bit.
 	[TestFixture ("iPhoneSimulator")]

diff --git a/tests/msbuild/Xamarin.MacDev.Tests/ProjectsTests/CoreMLCompiler.cs b/tests/msbuild/Xamarin.MacDev.Tests/ProjectsTests/CoreMLCompiler.cs
@@ -8,7 +8,7 @@
 
 using NUnit.Framework;
 
-namespace Xamarin.iOS.Tasks
+namespace Xamarin.MacDev.Tasks
 {
 	[TestFixture ("iPhone")]
 	[TestFixture ("iPhoneSimulator")]

diff --git a/tests/msbuild/Xamarin.MacDev.Tests/ProjectsTests/EmbeddedExtension.cs b/tests/msbuild/Xamarin.MacDev.Tests/ProjectsTests/EmbeddedExtension.cs
@@ -7,7 +7,7 @@
 
 using Xamarin.Tests;
 
-namespace Xamarin.iOS.Tasks {
+namespace Xamarin.MacDev.Tasks {
 	[TestFixture ("iPhone")]
 	[TestFixture ("iPhoneSimulator")]
 	public class EmbeddedExtension : ProjectTest {

diff --git a/tests/msbuild/Xamarin.MacDev.Tests/ProjectsTests/Extensions/Action.cs b/tests/msbuild/Xamarin.MacDev.Tests/ProjectsTests/Extensions/Action.cs
@@ -1,6 +1,6 @@
 using NUnit.Framework;
 
-namespace Xamarin.iOS.Tasks {
+namespace Xamarin.MacDev.Tasks {
 	[TestFixture ("iPhone")]
 	[TestFixture ("iPhoneSimulator")]
 	public class ActionTests : ExtensionTestBase

diff --git a/tests/msbuild/Xamarin.MacDev.Tests/ProjectsTests/Extensions/CustomKeyboard.cs b/tests/msbuild/Xamarin.MacDev.Tests/ProjectsTests/Extensions/CustomKeyboard.cs
@@ -2,7 +2,7 @@
 using NUnit.Framework;
 using System.Linq;
 
-namespace Xamarin.iOS.Tasks {
+namespace Xamarin.MacDev.Tasks {
 	[TestFixture ("iPhone")]
 	[TestFixture ("iPhoneSimulator")]
 	public class CustomKeyboardTests : ExtensionTestBase {

diff --git a/tests/msbuild/Xamarin.MacDev.Tests/ProjectsTests/Extensions/DocumentPicker.cs b/tests/msbuild/Xamarin.MacDev.Tests/ProjectsTests/Extensions/DocumentPicker.cs
@@ -1,7 +1,7 @@
 using System;
 using NUnit.Framework;
 
-namespace Xamarin.iOS.Tasks {
+namespace Xamarin.MacDev.Tasks {
 	[TestFixture ("iPhone")]
 	[TestFixture ("iPhoneSimulator")]
 	public class DocumentPickerTests : ExtensionTestBase {

diff --git a/tests/msbuild/Xamarin.MacDev.Tests/ProjectsTests/Extensions/ExtensionTestBase.cs b/tests/msbuild/Xamarin.MacDev.Tests/ProjectsTests/Extensions/ExtensionTestBase.cs
@@ -5,7 +5,7 @@
 
 using Xamarin.Tests;
 
-namespace Xamarin.iOS.Tasks
+namespace Xamarin.MacDev.Tasks
 {
 	public class ExtensionTestBase : TestBase {
 		public ExtensionTestBase () { }

diff --git a/tests/msbuild/Xamarin.MacDev.Tests/ProjectsTests/Extensions/PhotoEditing.cs b/tests/msbuild/Xamarin.MacDev.Tests/ProjectsTests/Extensions/PhotoEditing.cs
@@ -1,7 +1,7 @@
 using System;
 using NUnit.Framework;
 
-namespace Xamarin.iOS.Tasks {
+namespace Xamarin.MacDev.Tasks {
 	[TestFixture ("iPhone")]
 	[TestFixture ("iPhoneSimulator")]
 	public class PhotoEditingTests : ExtensionTestBase {

diff --git a/tests/msbuild/Xamarin.MacDev.Tests/ProjectsTests/Extensions/Share.cs b/tests/msbuild/Xamarin.MacDev.Tests/ProjectsTests/Extensions/Share.cs
@@ -1,7 +1,7 @@
 using System;
 using NUnit.Framework;
 
-namespace Xamarin.iOS.Tasks {
+namespace Xamarin.MacDev.Tasks {
 	[TestFixture ("iPhoneSimulator")]
 	[TestFixture ("iPhone")]
 	public class ShareTests : ExtensionTestBase {

diff --git a/tests/msbuild/Xamarin.MacDev.Tests/ProjectsTests/Extensions/Today.cs b/tests/msbuild/Xamarin.MacDev.Tests/ProjectsTests/Extensions/Today.cs
@@ -1,7 +1,7 @@
 using System;
 using NUnit.Framework;
 
-namespace Xamarin.iOS.Tasks {
+namespace Xamarin.MacDev.Tasks {
 	[TestFixture ("iPhone")]
 	[TestFixture ("iPhoneSimulator")]
 	public class TodayTests : ExtensionTestBase {

diff --git a/tests/msbuild/Xamarin.MacDev.Tests/ProjectsTests/Extensions/WatchKit.cs b/tests/msbuild/Xamarin.MacDev.Tests/ProjectsTests/Extensions/WatchKit.cs
@@ -1,6 +1,6 @@
 using NUnit.Framework;
 
-namespace Xamarin.iOS.Tasks {
+namespace Xamarin.MacDev.Tasks {
 	[TestFixture ("iPhone")]
 	[TestFixture ("iPhoneSimulator")]
 	public class WatchKit : ExtensionTestBase {

diff --git a/tests/msbuild/Xamarin.MacDev.Tests/ProjectsTests/Extensions/WatchKit2.cs b/tests/msbuild/Xamarin.MacDev.Tests/ProjectsTests/Extensions/WatchKit2.cs
@@ -3,7 +3,7 @@
 
 using NUnit.Framework;
 
-namespace Xamarin.iOS.Tasks {
+namespace Xamarin.MacDev.Tasks {
 	[TestFixture ("iPhone")]
 	[TestFixture ("iPhoneSimulator")]
 	public class WatchKit2 : ExtensionTestBase {

diff --git a/tests/msbuild/Xamarin.MacDev.Tests/ProjectsTests/IBToolLinking.cs b/tests/msbuild/Xamarin.MacDev.Tests/ProjectsTests/IBToolLinking.cs
@@ -1,6 +1,6 @@
 using NUnit.Framework;
 
-namespace Xamarin.iOS.Tasks
+namespace Xamarin.MacDev.Tasks
 {
 	[TestFixture ("iPhone")]
 	[TestFixture ("iPhoneSimulator")]

diff --git a/tests/msbuild/Xamarin.MacDev.Tests/ProjectsTests/LinkedAssets.cs b/tests/msbuild/Xamarin.MacDev.Tests/ProjectsTests/LinkedAssets.cs
@@ -2,7 +2,7 @@
 
 using NUnit.Framework;
 
-namespace Xamarin.iOS.Tasks
+namespace Xamarin.MacDev.Tasks
 {
 	[TestFixture ("iPhone")]
 	[TestFixture ("iPhoneSimulator")]

diff --git a/tests/msbuild/Xamarin.MacDev.Tests/ProjectsTests/NativeReferences.cs b/tests/msbuild/Xamarin.MacDev.Tests/ProjectsTests/NativeReferences.cs
@@ -7,7 +7,7 @@
 
 using Xamarin.Tests;
 
-namespace Xamarin.iOS.Tasks {
+namespace Xamarin.MacDev.Tasks {
 	[TestFixture ("iPhone")]
 	[TestFixture ("iPhoneSimulator")]
 	public class NativeReferencesTests : ProjectTest {

diff --git a/tests/msbuild/Xamarin.MacDev.Tests/ProjectsTests/NativeReferencesNoEmbedding.cs b/tests/msbuild/Xamarin.MacDev.Tests/ProjectsTests/NativeReferencesNoEmbedding.cs
@@ -6,7 +6,7 @@
 using Xamarin.Tests;
 using Xamarin.Utils;
 
-namespace Xamarin.iOS.Tasks
+namespace Xamarin.MacDev.Tasks
 {
 	[TestFixture ("iPhone")]
 	[TestFixture ("iPhoneSimulator")]

diff --git a/tests/msbuild/Xamarin.MacDev.Tests/ProjectsTests/ProjectReference.cs b/tests/msbuild/Xamarin.MacDev.Tests/ProjectsTests/ProjectReference.cs
@@ -5,7 +5,7 @@
 
 using Xamarin.Tests;
 
-namespace Xamarin.iOS.Tasks
+namespace Xamarin.MacDev.Tasks
 {
 	[TestFixture ("iPhone")]
 	[TestFixture ("iPhoneSimulator")]

diff --git a/tests/msbuild/Xamarin.MacDev.Tests/ProjectsTests/ProjectTest.cs b/tests/msbuild/Xamarin.MacDev.Tests/ProjectsTests/ProjectTest.cs
@@ -6,7 +6,7 @@
 
 using Xamarin.Tests;
 
-namespace Xamarin.iOS.Tasks
+namespace Xamarin.MacDev.Tasks
 {
 	public class ProjectTest : TestBase {
 		public ProjectTest (string platform)