Fix build errors caused by Map namespace/class name ambiguity

arnaudleclerc · Copilot · arnaudleclerc · commit b41fc680a0ee · 2026-03-19T10:46:17.000+01:00
Files in namespaces descending from AzureMapsControl.Components that import
'using AzureMapsControl.Components.Map;' had their using directives placed
before the namespace declaration. Since 'Map' is also a sub-namespace of
AzureMapsControl.Components, C# resolves the name 'Map' as the namespace
before ever reaching the compilation-unit-level using directive.

Fix: keep 'using AzureMapsControl.Components.Map;' after the namespace
declaration (inside the namespace body) in the 29 files affected by this
ambiguity. All other using directives remain before the namespace declaration.

Also restored and properly transformed 7 Map test files that had been
corrupted during prior bulk transformations.

Co-authored-by: Copilot &lt;223556219+Copilot@users.noreply.github.com&gt;
diff --git a/src/AzureMapsControl.Components/Animations/AnimationService.cs b/src/AzureMapsControl.Components/Animations/AnimationService.cs
@@ -3,13 +3,14 @@
 using AzureMapsControl.Components.Data;
 using AzureMapsControl.Components.Layers;
 using AzureMapsControl.Components.Logger;
-using AzureMapsControl.Components.Map;
 using AzureMapsControl.Components.Markers;
 using AzureMapsControl.Components.Runtime;
 using Microsoft.Extensions.Logging;
 
 namespace AzureMapsControl.Components.Animations;
 
+using AzureMapsControl.Components.Map;
+
 internal sealed class AnimationService : IAnimationService
 {
     private readonly IMapJsRuntime _jsRuntime;
diff --git a/src/AzureMapsControl.Components/Controls/OverviewMapControl.cs b/src/AzureMapsControl.Components/Controls/OverviewMapControl.cs
@@ -1,12 +1,13 @@
-using System.Text.Json;
-using System.Text.Json.Serialization;
 using AzureMapsControl.Components.Logger;
-using AzureMapsControl.Components.Map;
 using AzureMapsControl.Components.Runtime;
 using Microsoft.Extensions.Logging;
+using System.Text.Json;
+using System.Text.Json.Serialization;
 
 namespace AzureMapsControl.Components.Controls;
 
+using AzureMapsControl.Components.Map;
+
 public sealed class OverviewMapControl : Control<OverviewMapControlOptions>
 {
     internal override string Type => "overviewmap";
diff --git a/src/AzureMapsControl.Components/Controls/OverviewMapControlOptions.cs b/src/AzureMapsControl.Components/Controls/OverviewMapControlOptions.cs
@@ -1,10 +1,11 @@
-using System.Diagnostics.CodeAnalysis;
 using AzureMapsControl.Components.Atlas;
-using AzureMapsControl.Components.Map;
 using AzureMapsControl.Components.Markers;
+using System.Diagnostics.CodeAnalysis;
 
 namespace AzureMapsControl.Components.Controls;
 
+using AzureMapsControl.Components.Map;
+
 [ExcludeFromCodeCoverage]
 public sealed class OverviewMapControlOptions : IControlOptions
 {
diff --git a/src/AzureMapsControl.Components/Controls/StyleControlOptions.cs b/src/AzureMapsControl.Components/Controls/StyleControlOptions.cs
@@ -1,8 +1,9 @@
 using System.Diagnostics.CodeAnalysis;
-using AzureMapsControl.Components.Map;
 
 namespace AzureMapsControl.Components.Controls;
 
+using AzureMapsControl.Components.Map;
+
 /// <summary>
 /// The options for a StyleControl object.
 /// </summary>
diff --git a/src/AzureMapsControl.Components/Drawing/DrawingToolbarEventArgs.cs b/src/AzureMapsControl.Components/Drawing/DrawingToolbarEventArgs.cs
@@ -1,9 +1,10 @@
 using System.Diagnostics.CodeAnalysis;
 using AzureMapsControl.Components.Atlas;
-using AzureMapsControl.Components.Map;
 
 namespace AzureMapsControl.Components.Drawing;
 
+using AzureMapsControl.Components.Map;
+
 [ExcludeFromCodeCoverage]
 public sealed class DrawingToolbarEventArgs : MapEventArgs
 {
diff --git a/src/AzureMapsControl.Components/Drawing/DrawingToolbarModeEventArgs.cs b/src/AzureMapsControl.Components/Drawing/DrawingToolbarModeEventArgs.cs
@@ -1,8 +1,9 @@
 using System.Diagnostics.CodeAnalysis;
-using AzureMapsControl.Components.Map;
 
 namespace AzureMapsControl.Components.Drawing;
 
+using AzureMapsControl.Components.Map;
+
 [ExcludeFromCodeCoverage]
 public sealed class DrawingToolbarModeEventArgs : MapEventArgs
 {
diff --git a/src/AzureMapsControl.Components/Layers/Layer.cs b/src/AzureMapsControl.Components/Layers/Layer.cs
@@ -1,11 +1,12 @@
 using AzureMapsControl.Components.Exceptions;
 using AzureMapsControl.Components.Logger;
-using AzureMapsControl.Components.Map;
 using AzureMapsControl.Components.Runtime;
 using Microsoft.Extensions.Logging;
 
 namespace AzureMapsControl.Components.Layers;
 
+using AzureMapsControl.Components.Map;
+
 public delegate void LayerMouseEvent(MapMouseEventArgs eventArgs);
 public delegate void LayerTouchEvent(MapTouchEventArgs eventArgs);
 public delegate void LayerEvent(MapEventArgs eventArgs);
diff --git a/src/AzureMapsControl.Components/Layers/LayerEventInvokeHelper.cs b/src/AzureMapsControl.Components/Layers/LayerEventInvokeHelper.cs
@@ -1,8 +1,9 @@
 using AzureMapsControl.Components.Events;
-using AzureMapsControl.Components.Map;
 
 namespace AzureMapsControl.Components.Layers;
 
+using AzureMapsControl.Components.Map;
+
 internal sealed class LayerEventInvokeHelper : EventInvokeHelper<MapJsEventArgs>
 {
     public LayerEventInvokeHelper(Func<MapJsEventArgs, ValueTask> callback) : base(callback)
diff --git a/src/AzureMapsControl.Components/Markers/HtmlMarker.cs b/src/AzureMapsControl.Components/Markers/HtmlMarker.cs
@@ -1,12 +1,13 @@
 using Microsoft.JSInterop;
 using AzureMapsControl.Components.Logger;
-using AzureMapsControl.Components.Map;
 using AzureMapsControl.Components.Popups;
 using AzureMapsControl.Components.Runtime;
 using Microsoft.Extensions.Logging;
 
 namespace AzureMapsControl.Components.Markers;
 
+using AzureMapsControl.Components.Map;
+
 internal delegate void HtmlMarkerPopupToggledEvent();
 public delegate void HtmlMarkerEvent(HtmlMarkerEventArgs eventArgs);
 
diff --git a/src/AzureMapsControl.Components/Markers/HtmlMarkerEventArgs.cs b/src/AzureMapsControl.Components/Markers/HtmlMarkerEventArgs.cs
@@ -1,8 +1,9 @@
 using System.Diagnostics.CodeAnalysis;
-using AzureMapsControl.Components.Map;
 
 namespace AzureMapsControl.Components.Markers;
 
+using AzureMapsControl.Components.Map;
+
 [ExcludeFromCodeCoverage]
 public sealed class HtmlMarkerEventArgs : MapEventArgs
 {
diff --git a/tests/AzureMapsControl.Components.Tests/Animations/AnimationService.cs b/tests/AzureMapsControl.Components.Tests/Animations/AnimationService.cs
@@ -4,7 +4,6 @@
 using AzureMapsControl.Components.Atlas;
 using AzureMapsControl.Components.Data;
 using AzureMapsControl.Components.Layers;
-using AzureMapsControl.Components.Map;
 using AzureMapsControl.Components.Markers;
 using AzureMapsControl.Components.Runtime;
 using Microsoft.Extensions.Logging;
@@ -13,6 +12,8 @@
 
 namespace AzureMapsControl.Components.Tests.Animations;
 
+using AzureMapsControl.Components.Map;
+
 public class AnimationServiceTests
 {
     private readonly Mock<IMapJsRuntime> _jsRuntimeMock = new();
diff --git a/tests/AzureMapsControl.Components.Tests/Controls/Control.cs b/tests/AzureMapsControl.Components.Tests/Controls/Control.cs
@@ -1,11 +1,12 @@
 using AzureMapsControl.Components.Controls;
 using AzureMapsControl.Components.Geolocation;
-using AzureMapsControl.Components.Map;
 using AzureMapsControl.Components.Tests.Json;
 using Xunit;
 
 namespace AzureMapsControl.Components.Tests.Controls;
 
+using AzureMapsControl.Components.Map;
+
 public class ControlJsonConverterTests : JsonConverterTests<Control>
 {
     public ControlJsonConverterTests(): base(new ControlJsonConverter()) { }
diff --git a/tests/AzureMapsControl.Components.Tests/Controls/OverviewMapControl.cs b/tests/AzureMapsControl.Components.Tests/Controls/OverviewMapControl.cs
@@ -1,13 +1,14 @@
 using AzureMapsControl.Components.Controls;
 using AzureMapsControl.Components.Exceptions;
-using AzureMapsControl.Components.Map;
 using AzureMapsControl.Components.Runtime;
 using AzureMapsControl.Components.Tests.Json;
 using Moq;
 using Xunit;
 
 namespace AzureMapsControl.Components.Tests.Controls;
 
+using AzureMapsControl.Components.Map;
+
 public class OverviewMapControlTests
 {
     private readonly Mock<IMapJsRuntime> _jsRuntimeMock = new();
diff --git a/tests/AzureMapsControl.Components.Tests/Controls/StyleControl.cs b/tests/AzureMapsControl.Components.Tests/Controls/StyleControl.cs
@@ -1,10 +1,11 @@
 using AzureMapsControl.Components.Controls;
-using AzureMapsControl.Components.Map;
 using AzureMapsControl.Components.Tests.Json;
 using Xunit;
 
 namespace AzureMapsControl.Components.Tests.Controls;
 
+using AzureMapsControl.Components.Map;
+
 public class StyleControlJsonConverterTests : JsonConverterTests<StyleControl>
 {
     public StyleControlJsonConverterTests() : base(new StyleControlJsonConverter()) { }
diff --git a/tests/AzureMapsControl.Components.Tests/Layers/BubbleLayer.cs b/tests/AzureMapsControl.Components.Tests/Layers/BubbleLayer.cs
@@ -1,10 +1,11 @@
 using AzureMapsControl.Components.Atlas;
 using AzureMapsControl.Components.Layers;
-using AzureMapsControl.Components.Map;
 using Xunit;
 
 namespace AzureMapsControl.Components.Tests.Layers;
 
+using AzureMapsControl.Components.Map;
+
 public class BubbleLayerTests
 {
     [Fact]
diff --git a/tests/AzureMapsControl.Components.Tests/Layers/HeatmapLayer.cs b/tests/AzureMapsControl.Components.Tests/Layers/HeatmapLayer.cs
@@ -1,10 +1,11 @@
 using AzureMapsControl.Components.Atlas;
 using AzureMapsControl.Components.Layers;
-using AzureMapsControl.Components.Map;
 using Xunit;
 
 namespace AzureMapsControl.Components.Tests.Layers;
 
+using AzureMapsControl.Components.Map;
+
 public class HeatmapLayerTests
 {
     [Fact]
diff --git a/tests/AzureMapsControl.Components.Tests/Layers/ImageLayer.cs b/tests/AzureMapsControl.Components.Tests/Layers/ImageLayer.cs
@@ -1,10 +1,11 @@
 using AzureMapsControl.Components.Atlas;
 using AzureMapsControl.Components.Layers;
-using AzureMapsControl.Components.Map;
 using Xunit;
 
 namespace AzureMapsControl.Components.Tests.Layers;
 
+using AzureMapsControl.Components.Map;
+
 public class ImageLayerTests
 {
     [Fact]
diff --git a/tests/AzureMapsControl.Components.Tests/Layers/LayerEventInvokeHelper.cs b/tests/AzureMapsControl.Components.Tests/Layers/LayerEventInvokeHelper.cs
@@ -1,9 +1,10 @@
 using AzureMapsControl.Components.Layers;
-using AzureMapsControl.Components.Map;
 using Xunit;
 
 namespace AzureMapsControl.Components.Tests.Layers;
 
+using AzureMapsControl.Components.Map;
+
 public class LayerEventInvokeHelperTests
 {
     [Fact]
diff --git a/tests/AzureMapsControl.Components.Tests/Layers/LineLayer.cs b/tests/AzureMapsControl.Components.Tests/Layers/LineLayer.cs
@@ -1,10 +1,11 @@
 using AzureMapsControl.Components.Atlas;
 using AzureMapsControl.Components.Layers;
-using AzureMapsControl.Components.Map;
 using Xunit;
 
 namespace AzureMapsControl.Components.Tests.Layers;
 
+using AzureMapsControl.Components.Map;
+
 public class LineLayerTests
 {
     [Fact]
diff --git a/tests/AzureMapsControl.Components.Tests/Layers/PolygonExtrusionLayer.cs b/tests/AzureMapsControl.Components.Tests/Layers/PolygonExtrusionLayer.cs
@@ -1,10 +1,11 @@
 using AzureMapsControl.Components.Atlas;
 using AzureMapsControl.Components.Layers;
-using AzureMapsControl.Components.Map;
 using Xunit;
 
 namespace AzureMapsControl.Components.Tests.Layers;
 
+using AzureMapsControl.Components.Map;
+
 public class PolygonExtrusionLayerTests
 {
     [Fact]
diff --git a/tests/AzureMapsControl.Components.Tests/Layers/PolygonLayer.cs b/tests/AzureMapsControl.Components.Tests/Layers/PolygonLayer.cs
@@ -1,10 +1,11 @@
 using AzureMapsControl.Components.Atlas;
 using AzureMapsControl.Components.Layers;
-using AzureMapsControl.Components.Map;
 using Xunit;
 
 namespace AzureMapsControl.Components.Tests.Layers;
 
+using AzureMapsControl.Components.Map;
+
 public class PolygonLayerTests
 {
     [Fact]
diff --git a/tests/AzureMapsControl.Components.Tests/Layers/SymbolLayer.cs b/tests/AzureMapsControl.Components.Tests/Layers/SymbolLayer.cs
@@ -1,10 +1,11 @@
 using AzureMapsControl.Components.Atlas;
 using AzureMapsControl.Components.Layers;
-using AzureMapsControl.Components.Map;
 using Xunit;
 
 namespace AzureMapsControl.Components.Tests.Layers;
 
+using AzureMapsControl.Components.Map;
+
 public class SymbolLayerTests
 {
     [Fact]
diff --git a/tests/AzureMapsControl.Components.Tests/Layers/TileLayer.cs b/tests/AzureMapsControl.Components.Tests/Layers/TileLayer.cs
@@ -1,10 +1,11 @@
 using AzureMapsControl.Components.Atlas;
 using AzureMapsControl.Components.Layers;
-using AzureMapsControl.Components.Map;
 using Xunit;
 
 namespace AzureMapsControl.Components.Tests.Layers;
 
+using AzureMapsControl.Components.Map;
+
 public class TileLayerTests
 {
     [Fact]
diff --git a/tests/AzureMapsControl.Components.Tests/Map/AzureMap.cs b/tests/AzureMapsControl.Components.Tests/Map/AzureMap.cs
@@ -1,16 +1,16 @@
-using Microsoft.JSInterop;
-using System.Runtime.InteropServices.ComTypes;
 using AzureMapsControl.Components.Configuration;
-using AzureMapsControl.Components.Map;
 using AzureMapsControl.Components.Runtime;
 using Bunit;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
+using Microsoft.JSInterop;
 using Moq;
 using Xunit;
 
 namespace AzureMapsControl.Components.Tests.Map;
 
+using AzureMapsControl.Components.Map;
+
 public class AzureMapFixture : IDisposable
 {
     internal Mock<IMapAdderService> MapService { get; }
@@ -64,11 +64,7 @@ public void Should_DisplayDivWithId()
 
             fixture.RegisterServices();
 
-            var map = fixture.TestContext.Render<AzureMap>(b => {
-                b.OpenComponent<AzureMap>(0);
-                b.AddAttribute(1, nameof(AzureMap.Id), mapId);
-                b.CloseComponent();
-            });
+            var map = fixture.TestContext.RenderComponent<AzureMap>(ComponentParameter.CreateParameter("Id", mapId));
 
             var mapElem = map.Find("div");
 
@@ -105,12 +101,7 @@ public void Should_DisplayDivWithClass()
 
             fixture.RegisterServices();
 
-            var map = fixture.TestContext.Render<AzureMap>(b => {
-                b.OpenComponent<AzureMap>(0);
-                b.AddAttribute(1, nameof(AzureMap.Id), mapId);
-                b.AddAttribute(2, nameof(AzureMap.Class), classes);
-                b.CloseComponent();
-            });
+            var map = fixture.TestContext.RenderComponent<AzureMap>(ComponentParameter.CreateParameter("Id", mapId), ComponentParameter.CreateParameter("Class", classes));
 
             var mapElem = map.Find("div");
 
diff --git a/tests/AzureMapsControl.Components.Tests/Map/Bearing.cs b/tests/AzureMapsControl.Components.Tests/Map/Bearing.cs
@@ -1,8 +1,9 @@
-using AzureMapsControl.Components.Map;
 using Xunit;
 
 namespace AzureMapsControl.Components.Tests.Map;
 
+using AzureMapsControl.Components.Map;
+
 public class BearingTests
 {
     [Theory]
diff --git a/tests/AzureMapsControl.Components.Tests/Map/CameraType.cs b/tests/AzureMapsControl.Components.Tests/Map/CameraType.cs
@@ -1,8 +1,9 @@
-using AzureMapsControl.Components.Map;
 using Xunit;
 
 namespace AzureMapsControl.Components.Tests.Map;
 
+using AzureMapsControl.Components.Map;
+
 public class CameraTypeTests
 {
     [Theory]
diff --git a/tests/AzureMapsControl.Components.Tests/Map/Map.cs b/tests/AzureMapsControl.Components.Tests/Map/Map.cs
diff --git a/tests/AzureMapsControl.Components.Tests/Map/MapEventInvokeHelper.cs b/tests/AzureMapsControl.Components.Tests/Map/MapEventInvokeHelper.cs
diff --git a/tests/AzureMapsControl.Components.Tests/Map/MapEventsActivationFlags.cs b/tests/AzureMapsControl.Components.Tests/Map/MapEventsActivationFlags.cs
diff --git a/tests/AzureMapsControl.Components.Tests/Map/MapService.cs b/tests/AzureMapsControl.Components.Tests/Map/MapService.cs
diff --git a/tests/AzureMapsControl.Components.Tests/Map/MapStyle.cs b/tests/AzureMapsControl.Components.Tests/Map/MapStyle.cs
diff --git a/tests/AzureMapsControl.Components.Tests/Markers/HtmlMarkerInvokeHelper.cs b/tests/AzureMapsControl.Components.Tests/Markers/HtmlMarkerInvokeHelper.cs

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,9 @@`
`1`	`1`	`using System.Diagnostics.CodeAnalysis;`
`2`		`-using AzureMapsControl.Components.Map;`
`3`	`2`
`4`	`3`	`namespace AzureMapsControl.Components.Drawing;`
`5`	`4`
	`5`	`+using AzureMapsControl.Components.Map;`
	`6`	`+`
`6`	`7`	`[ExcludeFromCodeCoverage]`
`7`	`8`	`public sealed class DrawingToolbarModeEventArgs : MapEventArgs`
`8`	`9`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,9 @@`
`1`	`1`	`using AzureMapsControl.Components.Events;`
`2`		`-using AzureMapsControl.Components.Map;`
`3`	`2`
`4`	`3`	`namespace AzureMapsControl.Components.Layers;`
`5`	`4`
	`5`	`+using AzureMapsControl.Components.Map;`
	`6`	`+`
`6`	`7`	`internal sealed class LayerEventInvokeHelper : EventInvokeHelper<MapJsEventArgs>`
`7`	`8`	`{`
`8`	`9`	`public LayerEventInvokeHelper(Func<MapJsEventArgs, ValueTask> callback) : base(callback)`