diff --git a/src/SDKs/Azure.ApplicationModel.Configuration/data-plane/Azure.Configuration.Tests/Azure.Configuration.Tests.csproj b/src/SDKs/Azure.ApplicationModel.Configuration/data-plane/Azure.Configuration.Tests/Azure.Configuration.Tests.csproj
index bbdb7409f146..baa027a07de6 100644
--- a/src/SDKs/Azure.ApplicationModel.Configuration/data-plane/Azure.Configuration.Tests/Azure.Configuration.Tests.csproj
+++ b/src/SDKs/Azure.ApplicationModel.Configuration/data-plane/Azure.Configuration.Tests/Azure.Configuration.Tests.csproj
@@ -12,7 +12,7 @@
-
-
+
+
\ No newline at end of file
diff --git a/src/SDKs/Azure.ApplicationModel.Configuration/data-plane/Azure.Configuration.Tests/ConfigurationLiveTests.cs b/src/SDKs/Azure.ApplicationModel.Configuration/data-plane/Azure.Configuration.Tests/ConfigurationLiveTests.cs
index cf85873d1b1d..3df7e1dba84f 100644
--- a/src/SDKs/Azure.ApplicationModel.Configuration/data-plane/Azure.Configuration.Tests/ConfigurationLiveTests.cs
+++ b/src/SDKs/Azure.ApplicationModel.Configuration/data-plane/Azure.Configuration.Tests/ConfigurationLiveTests.cs
@@ -2,7 +2,7 @@
// Licensed under the MIT License. See License.txt in the project root for
// license information.
-using Azure.Core;
+using Azure.Base;
using NUnit.Framework;
using System;
using System.Collections.Generic;
diff --git a/src/SDKs/Azure.ApplicationModel.Configuration/data-plane/Azure.Configuration.Tests/ConfigurationMockTests.cs b/src/SDKs/Azure.ApplicationModel.Configuration/data-plane/Azure.Configuration.Tests/ConfigurationMockTests.cs
index baf33a27468c..6dab6b7905eb 100644
--- a/src/SDKs/Azure.ApplicationModel.Configuration/data-plane/Azure.Configuration.Tests/ConfigurationMockTests.cs
+++ b/src/SDKs/Azure.ApplicationModel.Configuration/data-plane/Azure.Configuration.Tests/ConfigurationMockTests.cs
@@ -7,11 +7,11 @@
using System.Net;
using System.Threading;
using System.Threading.Tasks;
-using Azure.Core.Testing;
-using Azure.Core;
-using Azure.Core.Http;
+using Azure.Base.Testing;
+using Azure.Base;
+using Azure.Base.Http;
using System.Buffers;
-using Azure.Core.Http.Pipeline;
+using Azure.Base.Http.Pipeline;
using Azure.ApplicationModel.Configuration.Test;
using System.Collections.Generic;
diff --git a/src/SDKs/Azure.ApplicationModel.Configuration/data-plane/Azure.Configuration.Tests/MockHttpClientTransport.cs b/src/SDKs/Azure.ApplicationModel.Configuration/data-plane/Azure.Configuration.Tests/MockHttpClientTransport.cs
index 5875d22df08f..db76a32da1e1 100644
--- a/src/SDKs/Azure.ApplicationModel.Configuration/data-plane/Azure.Configuration.Tests/MockHttpClientTransport.cs
+++ b/src/SDKs/Azure.ApplicationModel.Configuration/data-plane/Azure.Configuration.Tests/MockHttpClientTransport.cs
@@ -2,8 +2,8 @@
// Licensed under the MIT License. See License.txt in the project root for
// license information.
-using Azure.Core.Http;
-using Azure.Core.Http.Pipeline;
+using Azure.Base.Http;
+using Azure.Base.Http.Pipeline;
using Newtonsoft.Json;
using NUnit.Framework;
using System;
diff --git a/src/SDKs/Azure.ApplicationModel.Configuration/data-plane/Azure.Configuration.Tests/samples/Sample4_Logging.cs b/src/SDKs/Azure.ApplicationModel.Configuration/data-plane/Azure.Configuration.Tests/samples/Sample4_Logging.cs
index a73f8757f35d..3c68b21eb888 100644
--- a/src/SDKs/Azure.ApplicationModel.Configuration/data-plane/Azure.Configuration.Tests/samples/Sample4_Logging.cs
+++ b/src/SDKs/Azure.ApplicationModel.Configuration/data-plane/Azure.Configuration.Tests/samples/Sample4_Logging.cs
@@ -2,7 +2,7 @@
// Licensed under the MIT License. See License.txt in the project root for
// license information.
-using Azure.Core;
+using Azure.Base;
using NUnit.Framework;
using System;
using System.Diagnostics;
diff --git a/src/SDKs/Azure.ApplicationModel.Configuration/data-plane/Azure.Configuration.Tests/samples/Sample6_ConfiguringRetries.cs b/src/SDKs/Azure.ApplicationModel.Configuration/data-plane/Azure.Configuration.Tests/samples/Sample6_ConfiguringRetries.cs
index 2d2e03d368c7..1dc87816678a 100644
--- a/src/SDKs/Azure.ApplicationModel.Configuration/data-plane/Azure.Configuration.Tests/samples/Sample6_ConfiguringRetries.cs
+++ b/src/SDKs/Azure.ApplicationModel.Configuration/data-plane/Azure.Configuration.Tests/samples/Sample6_ConfiguringRetries.cs
@@ -2,8 +2,8 @@
// Licensed under the MIT License. See License.txt in the project root for
// license information.
-using Azure.Core.Http;
-using Azure.Core.Http.Pipeline;
+using Azure.Base.Http;
+using Azure.Base.Http.Pipeline;
using NUnit.Framework;
using System;
using System.Threading.Tasks;
diff --git a/src/SDKs/Azure.ApplicationModel.Configuration/data-plane/Azure.Configuration.Tests/samples/Sample7_ConfiguringPipeline.cs b/src/SDKs/Azure.ApplicationModel.Configuration/data-plane/Azure.Configuration.Tests/samples/Sample7_ConfiguringPipeline.cs
index 88ff7429a06e..a425be6eae4a 100644
--- a/src/SDKs/Azure.ApplicationModel.Configuration/data-plane/Azure.Configuration.Tests/samples/Sample7_ConfiguringPipeline.cs
+++ b/src/SDKs/Azure.ApplicationModel.Configuration/data-plane/Azure.Configuration.Tests/samples/Sample7_ConfiguringPipeline.cs
@@ -2,8 +2,8 @@
// Licensed under the MIT License. See License.txt in the project root for
// license information.
-using Azure.Core.Http;
-using Azure.Core.Http.Pipeline;
+using Azure.Base.Http;
+using Azure.Base.Http.Pipeline;
using NUnit.Framework;
using System;
using System.Net.Http;
diff --git a/src/SDKs/Azure.ApplicationModel.Configuration/data-plane/Azure.Configuration.sln b/src/SDKs/Azure.ApplicationModel.Configuration/data-plane/Azure.Configuration.sln
index fb1983788615..81a7128c5f68 100644
--- a/src/SDKs/Azure.ApplicationModel.Configuration/data-plane/Azure.Configuration.sln
+++ b/src/SDKs/Azure.ApplicationModel.Configuration/data-plane/Azure.Configuration.sln
@@ -7,9 +7,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Azure.Configuration", "Azur
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Azure.Configuration.Tests", "Azure.Configuration.Tests\Azure.Configuration.Tests.csproj", "{AAA761F4-D037-46AC-BF7A-496C15310F66}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Azure.Core", "..\..\Azure.Core\data-plane\Azure.Core\Azure.Core.csproj", "{019A28FC-EFEA-4431-872C-AB8F9C0049BF}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Azure.Base", "..\..\Azure.Base\data-plane\Azure.Base\Azure.Base.csproj", "{019A28FC-EFEA-4431-872C-AB8F9C0049BF}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Azure.Core.Tests", "..\..\Azure.Core\data-plane\Azure.Core.Tests\Azure.Core.Tests.csproj", "{84491222-6C36-4FA7-BBAE-1FA804129151}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Azure.Base.Tests", "..\..\Azure.Base\data-plane\Azure.Base.Tests\Azure.Base.Tests.csproj", "{84491222-6C36-4FA7-BBAE-1FA804129151}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/src/SDKs/Azure.ApplicationModel.Configuration/data-plane/Azure.Configuration/Azure.Configuration.csproj b/src/SDKs/Azure.ApplicationModel.Configuration/data-plane/Azure.Configuration/Azure.Configuration.csproj
index 778bab38a727..f2dbfe8baf47 100644
--- a/src/SDKs/Azure.ApplicationModel.Configuration/data-plane/Azure.Configuration/Azure.Configuration.csproj
+++ b/src/SDKs/Azure.ApplicationModel.Configuration/data-plane/Azure.Configuration/Azure.Configuration.csproj
@@ -27,7 +27,7 @@
-
+
diff --git a/src/SDKs/Azure.ApplicationModel.Configuration/data-plane/Azure.Configuration/ConfigurationClient.cs b/src/SDKs/Azure.ApplicationModel.Configuration/data-plane/Azure.Configuration/ConfigurationClient.cs
index b9f7bda64e3b..af6640eeda2e 100644
--- a/src/SDKs/Azure.ApplicationModel.Configuration/data-plane/Azure.Configuration/ConfigurationClient.cs
+++ b/src/SDKs/Azure.ApplicationModel.Configuration/data-plane/Azure.Configuration/ConfigurationClient.cs
@@ -2,8 +2,8 @@
// Licensed under the MIT License. See License.txt in the project root for
// license information.
-using Azure.Core;
-using Azure.Core.Http;
+using Azure.Base;
+using Azure.Base.Http;
using System;
using System.Net.Http;
using System.Threading;
diff --git a/src/SDKs/Azure.ApplicationModel.Configuration/data-plane/Azure.Configuration/ConfigurationClient_private.cs b/src/SDKs/Azure.ApplicationModel.Configuration/data-plane/Azure.Configuration/ConfigurationClient_private.cs
index f83d08601764..c88a1df6ec7c 100644
--- a/src/SDKs/Azure.ApplicationModel.Configuration/data-plane/Azure.Configuration/ConfigurationClient_private.cs
+++ b/src/SDKs/Azure.ApplicationModel.Configuration/data-plane/Azure.Configuration/ConfigurationClient_private.cs
@@ -2,8 +2,8 @@
// Licensed under the MIT License. See License.txt in the project root for
// license information.
-using Azure.Core;
-using Azure.Core.Http;
+using Azure.Base;
+using Azure.Base.Http;
using System;
using System.ComponentModel;
using System.Diagnostics;
diff --git a/src/SDKs/Azure.ApplicationModel.Configuration/data-plane/Azure.Configuration/ConfigurationSettingParser.cs b/src/SDKs/Azure.ApplicationModel.Configuration/data-plane/Azure.Configuration/ConfigurationSettingParser.cs
index 9b2514ab64bf..744ee2b89022 100644
--- a/src/SDKs/Azure.ApplicationModel.Configuration/data-plane/Azure.Configuration/ConfigurationSettingParser.cs
+++ b/src/SDKs/Azure.ApplicationModel.Configuration/data-plane/Azure.Configuration/ConfigurationSettingParser.cs
@@ -2,7 +2,7 @@
// Licensed under the MIT License. See License.txt in the project root for
// license information.
-using Azure.Core;
+using Azure.Base;
using System;
using System.Buffers;
using System.Buffers.Text;
diff --git a/src/SDKs/Azure.ApplicationModel.Configuration/data-plane/Azure.Configuration/ConfigurationWatcher.cs b/src/SDKs/Azure.ApplicationModel.Configuration/data-plane/Azure.Configuration/ConfigurationWatcher.cs
index e4af9eda376d..566fc14667ff 100644
--- a/src/SDKs/Azure.ApplicationModel.Configuration/data-plane/Azure.Configuration/ConfigurationWatcher.cs
+++ b/src/SDKs/Azure.ApplicationModel.Configuration/data-plane/Azure.Configuration/ConfigurationWatcher.cs
@@ -2,7 +2,7 @@
// Licensed under the MIT License. See License.txt in the project root for
// license information.
-using Azure.Core;
+using Azure.Base;
using System;
using System.Collections.Generic;
using System.Diagnostics;
diff --git a/src/SDKs/Azure.ApplicationModel.Configuration/data-plane/Azure.Configuration/Options.cs b/src/SDKs/Azure.ApplicationModel.Configuration/data-plane/Azure.Configuration/Options.cs
index 9f4c518cf9db..469507135c30 100644
--- a/src/SDKs/Azure.ApplicationModel.Configuration/data-plane/Azure.Configuration/Options.cs
+++ b/src/SDKs/Azure.ApplicationModel.Configuration/data-plane/Azure.Configuration/Options.cs
@@ -2,7 +2,7 @@
// Licensed under the MIT License. See License.txt in the project root for
// license information.
-using Azure.Core;
+using Azure.Base;
using System;
using System.ComponentModel;
diff --git a/src/SDKs/Azure.Core/data-plane/Azure.Core.Tests/Azure.Core.Tests.csproj b/src/SDKs/Azure.Base/data-plane/Azure.Base.Tests/Azure.Base.Tests.csproj
similarity index 88%
rename from src/SDKs/Azure.Core/data-plane/Azure.Core.Tests/Azure.Core.Tests.csproj
rename to src/SDKs/Azure.Base/data-plane/Azure.Base.Tests/Azure.Base.Tests.csproj
index 565a9a283a0b..4d5fac54cea9 100644
--- a/src/SDKs/Azure.Core/data-plane/Azure.Core.Tests/Azure.Core.Tests.csproj
+++ b/src/SDKs/Azure.Base/data-plane/Azure.Base.Tests/Azure.Base.Tests.csproj
@@ -13,9 +13,9 @@
-
+
{FEC0AE57-E241-46DB-B7C7-9181F28E1D3F}
- Azure.Core
+ Azure.Base
diff --git a/src/SDKs/Azure.Core/data-plane/Azure.Core.Tests/HeadersTests.cs b/src/SDKs/Azure.Base/data-plane/Azure.Base.Tests/HeadersTests.cs
similarity index 97%
rename from src/SDKs/Azure.Core/data-plane/Azure.Core.Tests/HeadersTests.cs
rename to src/SDKs/Azure.Base/data-plane/Azure.Base.Tests/HeadersTests.cs
index 14cdef075887..0b4adfadb8e7 100644
--- a/src/SDKs/Azure.Core/data-plane/Azure.Core.Tests/HeadersTests.cs
+++ b/src/SDKs/Azure.Base/data-plane/Azure.Base.Tests/HeadersTests.cs
@@ -2,11 +2,11 @@
// Licensed under the MIT License.
using System.Text;
using System.Text.RegularExpressions;
-using Azure.Core.Http;
+using Azure.Base.Http;
using NUnit.Framework;
using static System.Buffers.Text.Encodings;
-namespace Azure.Core.Tests
+namespace Azure.Base.Tests
{
public class HeadersTests
{
diff --git a/src/SDKs/Azure.Core/data-plane/Azure.Core.Tests/PipelineTests.cs b/src/SDKs/Azure.Base/data-plane/Azure.Base.Tests/PipelineTests.cs
similarity index 94%
rename from src/SDKs/Azure.Core/data-plane/Azure.Core.Tests/PipelineTests.cs
rename to src/SDKs/Azure.Base/data-plane/Azure.Base.Tests/PipelineTests.cs
index 2a1b5ed64fe8..60c014f27bd2 100644
--- a/src/SDKs/Azure.Core/data-plane/Azure.Core.Tests/PipelineTests.cs
+++ b/src/SDKs/Azure.Base/data-plane/Azure.Base.Tests/PipelineTests.cs
@@ -1,14 +1,14 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
-using Azure.Core.Http;
-using Azure.Core.Http.Pipeline;
-using Azure.Core.Testing;
+using Azure.Base.Http;
+using Azure.Base.Http.Pipeline;
+using Azure.Base.Testing;
using NUnit.Framework;
using System;
using System.Diagnostics.Tracing;
-namespace Azure.Core.Tests
+namespace Azure.Base.Tests
{
// TODO (pri 2): Do use the EventRegister NuGet package or the standalone eventRegister.exe tool, to run build-time validation of the event source classes defined in your assemblies.
public class PipelineTests
diff --git a/src/SDKs/Azure.Core/data-plane/Azure.Core.Tests/Testing/Mocks.cs b/src/SDKs/Azure.Base/data-plane/Azure.Base.Tests/Testing/Mocks.cs
similarity index 97%
rename from src/SDKs/Azure.Core/data-plane/Azure.Core.Tests/Testing/Mocks.cs
rename to src/SDKs/Azure.Base/data-plane/Azure.Base.Tests/Testing/Mocks.cs
index a12b880c5241..e96e10bf8d03 100644
--- a/src/SDKs/Azure.Core/data-plane/Azure.Core.Tests/Testing/Mocks.cs
+++ b/src/SDKs/Azure.Base/data-plane/Azure.Base.Tests/Testing/Mocks.cs
@@ -1,8 +1,8 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
-using Azure.Core.Http;
-using Azure.Core.Http.Pipeline;
+using Azure.Base.Http;
+using Azure.Base.Http.Pipeline;
using System;
using System.Collections.Generic;
using System.Diagnostics.Tracing;
@@ -10,7 +10,7 @@
using System.Threading;
using System.Threading.Tasks;
-namespace Azure.Core.Testing
+namespace Azure.Base.Testing
{
public class TestEventListener : EventListener
{
diff --git a/src/SDKs/Azure.Core/data-plane/Azure.Core.Tests/Testing/TestLogger.cs b/src/SDKs/Azure.Base/data-plane/Azure.Base.Tests/Testing/TestLogger.cs
similarity index 89%
rename from src/SDKs/Azure.Core/data-plane/Azure.Core.Tests/Testing/TestLogger.cs
rename to src/SDKs/Azure.Base/data-plane/Azure.Base.Tests/Testing/TestLogger.cs
index 27548a0186f9..f89a90e5cf5f 100644
--- a/src/SDKs/Azure.Core/data-plane/Azure.Core.Tests/Testing/TestLogger.cs
+++ b/src/SDKs/Azure.Base/data-plane/Azure.Base.Tests/Testing/TestLogger.cs
@@ -1,13 +1,13 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
-using Azure.Core.Http;
-using Azure.Core.Http.Pipeline;
+using Azure.Base.Http;
+using Azure.Base.Http.Pipeline;
using System;
using System.Text;
using System.Threading.Tasks;
-namespace Azure.Core.Testing
+namespace Azure.Base.Testing
{
public class TestLoggingPolicy : PipelinePolicy
{
diff --git a/src/SDKs/Azure.Core/data-plane/Azure.Core.Tests/Testing/TestPool.cs b/src/SDKs/Azure.Base/data-plane/Azure.Base.Tests/Testing/TestPool.cs
similarity index 97%
rename from src/SDKs/Azure.Core/data-plane/Azure.Core.Tests/Testing/TestPool.cs
rename to src/SDKs/Azure.Base/data-plane/Azure.Base.Tests/Testing/TestPool.cs
index 1962554186b8..583dee1c170f 100644
--- a/src/SDKs/Azure.Core/data-plane/Azure.Core.Tests/Testing/TestPool.cs
+++ b/src/SDKs/Azure.Base/data-plane/Azure.Base.Tests/Testing/TestPool.cs
@@ -4,7 +4,7 @@
using System.Buffers;
using System.Collections.Generic;
-namespace Azure.Core.Testing
+namespace Azure.Base.Testing
{
public class TestPool : ArrayPool
{
diff --git a/src/SDKs/Azure.Core/data-plane/Azure.Core.sln b/src/SDKs/Azure.Base/data-plane/Azure.Base.sln
similarity index 83%
rename from src/SDKs/Azure.Core/data-plane/Azure.Core.sln
rename to src/SDKs/Azure.Base/data-plane/Azure.Base.sln
index 893b003bd45b..fa9498d0c896 100644
--- a/src/SDKs/Azure.Core/data-plane/Azure.Core.sln
+++ b/src/SDKs/Azure.Base/data-plane/Azure.Base.sln
@@ -3,9 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.28307.231
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Azure.Core", "Azure.Core\Azure.Core.csproj", "{25CE0676-8F2C-497B-8FB5-7DA41A31F6F9}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Azure.Base", "Azure.Base\Azure.Base.csproj", "{25CE0676-8F2C-497B-8FB5-7DA41A31F6F9}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Azure.Core.Tests", "Azure.Core.Tests\Azure.Core.Tests.csproj", "{84491222-6C36-4FA7-BBAE-1FA804129151}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Azure.Base.Tests", "Azure.Base.Tests\Azure.Base.Tests.csproj", "{84491222-6C36-4FA7-BBAE-1FA804129151}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/src/SDKs/Azure.Core/data-plane/Azure.Core/Attributes/HttpErrorAttribute.cs b/src/SDKs/Azure.Base/data-plane/Azure.Base/Attributes/HttpErrorAttribute.cs
similarity index 96%
rename from src/SDKs/Azure.Core/data-plane/Azure.Core/Attributes/HttpErrorAttribute.cs
rename to src/SDKs/Azure.Base/data-plane/Azure.Base/Attributes/HttpErrorAttribute.cs
index a9363e82fb8a..b27262cb83c7 100644
--- a/src/SDKs/Azure.Core/data-plane/Azure.Core/Attributes/HttpErrorAttribute.cs
+++ b/src/SDKs/Azure.Base/data-plane/Azure.Base/Attributes/HttpErrorAttribute.cs
@@ -3,7 +3,7 @@
using System;
-namespace Azure.Core
+namespace Azure.Base
{
///
/// Represents errors that the application might handle.
diff --git a/src/SDKs/Azure.Core/data-plane/Azure.Core/Attributes/KnownExceptionAttribute.cs b/src/SDKs/Azure.Base/data-plane/Azure.Base/Attributes/KnownExceptionAttribute.cs
similarity index 94%
rename from src/SDKs/Azure.Core/data-plane/Azure.Core/Attributes/KnownExceptionAttribute.cs
rename to src/SDKs/Azure.Base/data-plane/Azure.Base/Attributes/KnownExceptionAttribute.cs
index 9338bfe40068..9cc0fd7a2a92 100644
--- a/src/SDKs/Azure.Core/data-plane/Azure.Core/Attributes/KnownExceptionAttribute.cs
+++ b/src/SDKs/Azure.Base/data-plane/Azure.Base/Attributes/KnownExceptionAttribute.cs
@@ -3,7 +3,7 @@
using System;
-namespace Azure.Core
+namespace Azure.Base
{
public class KnownExceptionAttribute : Attribute
{
diff --git a/src/SDKs/Azure.Core/data-plane/Azure.Core/Attributes/UsageErrorsAttribute.cs b/src/SDKs/Azure.Base/data-plane/Azure.Base/Attributes/UsageErrorsAttribute.cs
similarity index 96%
rename from src/SDKs/Azure.Core/data-plane/Azure.Core/Attributes/UsageErrorsAttribute.cs
rename to src/SDKs/Azure.Base/data-plane/Azure.Base/Attributes/UsageErrorsAttribute.cs
index 88bd97dd46df..8f7e9abd90b6 100644
--- a/src/SDKs/Azure.Core/data-plane/Azure.Core/Attributes/UsageErrorsAttribute.cs
+++ b/src/SDKs/Azure.Base/data-plane/Azure.Base/Attributes/UsageErrorsAttribute.cs
@@ -3,7 +3,7 @@
using System;
-namespace Azure.Core
+namespace Azure.Base
{
///
/// Represents errors resulting from misuse of the API. The application code should be changed/fixed.
diff --git a/src/SDKs/Azure.Core/data-plane/Azure.Core/Azure.Core.csproj b/src/SDKs/Azure.Base/data-plane/Azure.Base/Azure.Base.csproj
similarity index 100%
rename from src/SDKs/Azure.Core/data-plane/Azure.Core/Azure.Core.csproj
rename to src/SDKs/Azure.Base/data-plane/Azure.Base/Azure.Base.csproj
diff --git a/src/SDKs/Azure.Core/data-plane/Azure.Core/Buffers/StreamMemoryExtensions.cs b/src/SDKs/Azure.Base/data-plane/Azure.Base/Buffers/StreamMemoryExtensions.cs
similarity index 99%
rename from src/SDKs/Azure.Core/data-plane/Azure.Core/Buffers/StreamMemoryExtensions.cs
rename to src/SDKs/Azure.Base/data-plane/Azure.Base/Buffers/StreamMemoryExtensions.cs
index 7e67bd96bfbc..ccb6fa304f8c 100644
--- a/src/SDKs/Azure.Core/data-plane/Azure.Core/Buffers/StreamMemoryExtensions.cs
+++ b/src/SDKs/Azure.Base/data-plane/Azure.Base/Buffers/StreamMemoryExtensions.cs
@@ -8,7 +8,7 @@
using System.Threading;
using System.Threading.Tasks;
-namespace Azure.Core.Buffers
+namespace Azure.Base.Buffers
{
public static class StreamMemoryExtensions
{
diff --git a/src/SDKs/Azure.Core/data-plane/Azure.Core/Diagnostics/ServiceLogger.cs b/src/SDKs/Azure.Base/data-plane/Azure.Base/Diagnostics/ServiceLogger.cs
similarity index 98%
rename from src/SDKs/Azure.Core/data-plane/Azure.Core/Diagnostics/ServiceLogger.cs
rename to src/SDKs/Azure.Base/data-plane/Azure.Base/Diagnostics/ServiceLogger.cs
index 41e77a073799..f0908209f654 100644
--- a/src/SDKs/Azure.Core/data-plane/Azure.Core/Diagnostics/ServiceLogger.cs
+++ b/src/SDKs/Azure.Base/data-plane/Azure.Base/Diagnostics/ServiceLogger.cs
@@ -1,13 +1,13 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
-using Azure.Core.Http;
+using Azure.Base.Http;
using System;
using System.Diagnostics.Tracing;
// TODO (pri 2): we should log correction/activity
// TODO (pri 2): we should log exceptions
-namespace Azure.Core.Diagnostics
+namespace Azure.Base.Diagnostics
{
// TODO (pri 2): make the type internal
[EventSource(Name = SOURCE_NAME)]
diff --git a/src/SDKs/Azure.Core/data-plane/Azure.Core/ETag.cs b/src/SDKs/Azure.Base/data-plane/Azure.Base/ETag.cs
similarity index 98%
rename from src/SDKs/Azure.Core/data-plane/Azure.Core/ETag.cs
rename to src/SDKs/Azure.Base/data-plane/Azure.Base/ETag.cs
index 2f2cab91290f..43892655390a 100644
--- a/src/SDKs/Azure.Core/data-plane/Azure.Core/ETag.cs
+++ b/src/SDKs/Azure.Base/data-plane/Azure.Base/ETag.cs
@@ -5,7 +5,7 @@
using System.ComponentModel;
using System.Text;
-namespace Azure.Core
+namespace Azure.Base
{
public readonly struct ETag : IEquatable
{
diff --git a/src/SDKs/Azure.Core/data-plane/Azure.Core/ETagFilter.cs b/src/SDKs/Azure.Base/data-plane/Azure.Base/ETagFilter.cs
similarity index 97%
rename from src/SDKs/Azure.Core/data-plane/Azure.Core/ETagFilter.cs
rename to src/SDKs/Azure.Base/data-plane/Azure.Base/ETagFilter.cs
index cc1af4b9d81f..8c8f87e22273 100644
--- a/src/SDKs/Azure.Core/data-plane/Azure.Core/ETagFilter.cs
+++ b/src/SDKs/Azure.Base/data-plane/Azure.Base/ETagFilter.cs
@@ -4,7 +4,7 @@
using System;
using System.ComponentModel;
-namespace Azure.Core
+namespace Azure.Base
{
public struct ETagFilter : IEquatable
{
diff --git a/src/SDKs/Azure.Core/data-plane/Azure.Core/FailedResponseException.cs b/src/SDKs/Azure.Base/data-plane/Azure.Base/FailedResponseException.cs
similarity index 91%
rename from src/SDKs/Azure.Core/data-plane/Azure.Core/FailedResponseException.cs
rename to src/SDKs/Azure.Base/data-plane/Azure.Base/FailedResponseException.cs
index efd3b06881c8..97b14ef77209 100644
--- a/src/SDKs/Azure.Core/data-plane/Azure.Core/FailedResponseException.cs
+++ b/src/SDKs/Azure.Base/data-plane/Azure.Base/FailedResponseException.cs
@@ -1,10 +1,10 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
-using Azure.Core.Http;
+using Azure.Base.Http;
using System;
-namespace Azure.Core
+namespace Azure.Base
{
public class ResponseFailedException : Exception
{
diff --git a/src/SDKs/Azure.Core/data-plane/Azure.Core/Net/ClientPipeline.cs b/src/SDKs/Azure.Base/data-plane/Azure.Base/Net/ClientPipeline.cs
similarity index 98%
rename from src/SDKs/Azure.Core/data-plane/Azure.Core/Net/ClientPipeline.cs
rename to src/SDKs/Azure.Base/data-plane/Azure.Base/Net/ClientPipeline.cs
index 8a882f47b566..802f1b022dc6 100644
--- a/src/SDKs/Azure.Core/data-plane/Azure.Core/Net/ClientPipeline.cs
+++ b/src/SDKs/Azure.Base/data-plane/Azure.Base/Net/ClientPipeline.cs
@@ -1,13 +1,13 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
-using Azure.Core.Http.Pipeline;
+using Azure.Base.Http.Pipeline;
using System;
using System.Runtime.CompilerServices;
using System.Threading;
using System.Threading.Tasks;
-namespace Azure.Core.Http
+namespace Azure.Base.Http
{
public struct HttpPipeline
{
diff --git a/src/SDKs/Azure.Core/data-plane/Azure.Core/Net/Header.cs b/src/SDKs/Azure.Base/data-plane/Azure.Base/Net/Header.cs
similarity index 99%
rename from src/SDKs/Azure.Core/data-plane/Azure.Core/Net/Header.cs
rename to src/SDKs/Azure.Base/data-plane/Azure.Base/Net/Header.cs
index 577a8dbbab8e..fca410a76090 100644
--- a/src/SDKs/Azure.Core/data-plane/Azure.Core/Net/Header.cs
+++ b/src/SDKs/Azure.Base/data-plane/Azure.Base/Net/Header.cs
@@ -7,7 +7,7 @@
using System.Buffers;
using System.ComponentModel;
-namespace Azure.Core.Http
+namespace Azure.Base.Http
{
public readonly struct HttpHeader : IEquatable
{
diff --git a/src/SDKs/Azure.Core/data-plane/Azure.Core/Net/Pipeline/FixedPolicy.cs b/src/SDKs/Azure.Base/data-plane/Azure.Base/Net/Pipeline/FixedPolicy.cs
similarity index 96%
rename from src/SDKs/Azure.Core/data-plane/Azure.Core/Net/Pipeline/FixedPolicy.cs
rename to src/SDKs/Azure.Base/data-plane/Azure.Base/Net/Pipeline/FixedPolicy.cs
index fd2bb1eca0d5..d08f3fad8b70 100644
--- a/src/SDKs/Azure.Core/data-plane/Azure.Core/Net/Pipeline/FixedPolicy.cs
+++ b/src/SDKs/Azure.Base/data-plane/Azure.Base/Net/Pipeline/FixedPolicy.cs
@@ -3,7 +3,7 @@
using System;
-namespace Azure.Core.Http.Pipeline
+namespace Azure.Base.Http.Pipeline
{
class FixedPolicy : RetryPolicy {
int _maxRetries;
diff --git a/src/SDKs/Azure.Core/data-plane/Azure.Core/Net/Pipeline/HttpPipelineTransport.cs b/src/SDKs/Azure.Base/data-plane/Azure.Base/Net/Pipeline/HttpPipelineTransport.cs
similarity index 99%
rename from src/SDKs/Azure.Core/data-plane/Azure.Core/Net/Pipeline/HttpPipelineTransport.cs
rename to src/SDKs/Azure.Base/data-plane/Azure.Base/Net/Pipeline/HttpPipelineTransport.cs
index a7714bee1d2d..d06370231940 100644
--- a/src/SDKs/Azure.Core/data-plane/Azure.Core/Net/Pipeline/HttpPipelineTransport.cs
+++ b/src/SDKs/Azure.Base/data-plane/Azure.Base/Net/Pipeline/HttpPipelineTransport.cs
@@ -10,7 +10,7 @@
using System.Threading;
using System.Threading.Tasks;
-namespace Azure.Core.Http.Pipeline
+namespace Azure.Base.Http.Pipeline
{
public class HttpPipelineTransport : PipelineTransport
{
diff --git a/src/SDKs/Azure.Core/data-plane/Azure.Core/Net/Pipeline/LoggingPolicy.cs b/src/SDKs/Azure.Base/data-plane/Azure.Base/Net/Pipeline/LoggingPolicy.cs
similarity index 97%
rename from src/SDKs/Azure.Core/data-plane/Azure.Core/Net/Pipeline/LoggingPolicy.cs
rename to src/SDKs/Azure.Base/data-plane/Azure.Base/Net/Pipeline/LoggingPolicy.cs
index aefd2e769f1a..0343febe01be 100644
--- a/src/SDKs/Azure.Core/data-plane/Azure.Core/Net/Pipeline/LoggingPolicy.cs
+++ b/src/SDKs/Azure.Base/data-plane/Azure.Base/Net/Pipeline/LoggingPolicy.cs
@@ -6,7 +6,7 @@
using System.Diagnostics;
using System.Threading.Tasks;
-namespace Azure.Core.Http.Pipeline
+namespace Azure.Base.Http.Pipeline
{
public class LoggingPolicy : PipelinePolicy
{
diff --git a/src/SDKs/Azure.Core/data-plane/Azure.Core/Net/Pipeline/PipelinePolicy.cs b/src/SDKs/Azure.Base/data-plane/Azure.Base/Net/Pipeline/PipelinePolicy.cs
similarity index 92%
rename from src/SDKs/Azure.Core/data-plane/Azure.Core/Net/Pipeline/PipelinePolicy.cs
rename to src/SDKs/Azure.Base/data-plane/Azure.Base/Net/Pipeline/PipelinePolicy.cs
index 209959ceb6a5..a381ac569c81 100644
--- a/src/SDKs/Azure.Core/data-plane/Azure.Core/Net/Pipeline/PipelinePolicy.cs
+++ b/src/SDKs/Azure.Base/data-plane/Azure.Base/Net/Pipeline/PipelinePolicy.cs
@@ -1,12 +1,12 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
-using Azure.Core.Diagnostics;
+using Azure.Base.Diagnostics;
using System;
using System.Runtime.CompilerServices;
using System.Threading.Tasks;
-namespace Azure.Core.Http.Pipeline
+namespace Azure.Base.Http.Pipeline
{
public abstract class PipelinePolicy
{
diff --git a/src/SDKs/Azure.Core/data-plane/Azure.Core/Net/Pipeline/PipelineTransport.cs b/src/SDKs/Azure.Base/data-plane/Azure.Base/Net/Pipeline/PipelineTransport.cs
similarity index 95%
rename from src/SDKs/Azure.Core/data-plane/Azure.Core/Net/Pipeline/PipelineTransport.cs
rename to src/SDKs/Azure.Base/data-plane/Azure.Base/Net/Pipeline/PipelineTransport.cs
index fcc46746f377..098d20e6e087 100644
--- a/src/SDKs/Azure.Core/data-plane/Azure.Core/Net/Pipeline/PipelineTransport.cs
+++ b/src/SDKs/Azure.Base/data-plane/Azure.Base/Net/Pipeline/PipelineTransport.cs
@@ -5,7 +5,7 @@
using System.Threading;
using System.Threading.Tasks;
-namespace Azure.Core.Http.Pipeline
+namespace Azure.Base.Http.Pipeline
{
public abstract class PipelineTransport : PipelinePolicy
{
diff --git a/src/SDKs/Azure.Core/data-plane/Azure.Core/Net/Pipeline/RetryPolicy.cs b/src/SDKs/Azure.Base/data-plane/Azure.Base/Net/Pipeline/RetryPolicy.cs
similarity index 96%
rename from src/SDKs/Azure.Core/data-plane/Azure.Core/Net/Pipeline/RetryPolicy.cs
rename to src/SDKs/Azure.Base/data-plane/Azure.Base/Net/Pipeline/RetryPolicy.cs
index 3cf28c2e8df4..11de1cbc07f6 100644
--- a/src/SDKs/Azure.Core/data-plane/Azure.Core/Net/Pipeline/RetryPolicy.cs
+++ b/src/SDKs/Azure.Base/data-plane/Azure.Base/Net/Pipeline/RetryPolicy.cs
@@ -4,7 +4,7 @@
using System;
using System.Threading.Tasks;
-namespace Azure.Core.Http.Pipeline
+namespace Azure.Base.Http.Pipeline
{
public abstract class RetryPolicy : PipelinePolicy
{
diff --git a/src/SDKs/Azure.Core/data-plane/Azure.Core/Net/Pipeline/TelemetryPolicy.cs b/src/SDKs/Azure.Base/data-plane/Azure.Base/Net/Pipeline/TelemetryPolicy.cs
similarity index 94%
rename from src/SDKs/Azure.Core/data-plane/Azure.Core/Net/Pipeline/TelemetryPolicy.cs
rename to src/SDKs/Azure.Base/data-plane/Azure.Base/Net/Pipeline/TelemetryPolicy.cs
index cb0fe462fa94..84ef8be187f6 100644
--- a/src/SDKs/Azure.Core/data-plane/Azure.Core/Net/Pipeline/TelemetryPolicy.cs
+++ b/src/SDKs/Azure.Base/data-plane/Azure.Base/Net/Pipeline/TelemetryPolicy.cs
@@ -4,7 +4,7 @@
using System;
using System.Threading.Tasks;
-namespace Azure.Core.Http.Pipeline
+namespace Azure.Base.Http.Pipeline
{
public class TelemetryPolicy : PipelinePolicy
{
diff --git a/src/SDKs/Azure.Core/data-plane/Azure.Core/Net/PipelineCallContext.cs b/src/SDKs/Azure.Base/data-plane/Azure.Base/Net/PipelineCallContext.cs
similarity index 98%
rename from src/SDKs/Azure.Core/data-plane/Azure.Core/Net/PipelineCallContext.cs
rename to src/SDKs/Azure.Base/data-plane/Azure.Base/Net/PipelineCallContext.cs
index fc69dc5517b4..109d6bd1c46a 100644
--- a/src/SDKs/Azure.Core/data-plane/Azure.Core/Net/PipelineCallContext.cs
+++ b/src/SDKs/Azure.Base/data-plane/Azure.Base/Net/PipelineCallContext.cs
@@ -6,7 +6,7 @@
using System.IO;
using System.Threading;
-namespace Azure.Core.Http
+namespace Azure.Base.Http
{
public abstract class HttpMessage : IDisposable
{
diff --git a/src/SDKs/Azure.Core/data-plane/Azure.Core/Net/PipelineCallOptions.cs b/src/SDKs/Azure.Base/data-plane/Azure.Base/Net/PipelineCallOptions.cs
similarity index 98%
rename from src/SDKs/Azure.Core/data-plane/Azure.Core/Net/PipelineCallOptions.cs
rename to src/SDKs/Azure.Base/data-plane/Azure.Base/Net/PipelineCallOptions.cs
index 543d4023fc1d..dd3b72bcb30c 100644
--- a/src/SDKs/Azure.Core/data-plane/Azure.Core/Net/PipelineCallOptions.cs
+++ b/src/SDKs/Azure.Base/data-plane/Azure.Base/Net/PipelineCallOptions.cs
@@ -3,7 +3,7 @@
using System.ComponentModel;
-namespace Azure.Core.Http
+namespace Azure.Base.Http
{
public readonly struct PipelineMessageOptions
{
diff --git a/src/SDKs/Azure.Core/data-plane/Azure.Core/Net/PipelineContent.cs b/src/SDKs/Azure.Base/data-plane/Azure.Base/Net/PipelineContent.cs
similarity index 98%
rename from src/SDKs/Azure.Core/data-plane/Azure.Core/Net/PipelineContent.cs
rename to src/SDKs/Azure.Base/data-plane/Azure.Base/Net/PipelineContent.cs
index 47102616b50f..d02172663fbc 100644
--- a/src/SDKs/Azure.Core/data-plane/Azure.Core/Net/PipelineContent.cs
+++ b/src/SDKs/Azure.Base/data-plane/Azure.Base/Net/PipelineContent.cs
@@ -3,12 +3,12 @@
using System;
using System.IO;
-using Azure.Core.Buffers;
+using Azure.Base.Buffers;
using System.Threading.Tasks;
using System.Threading;
using System.Buffers;
-namespace Azure.Core.Http
+namespace Azure.Base.Http
{
public abstract class PipelineContent : IDisposable
{
diff --git a/src/SDKs/Azure.Core/data-plane/Azure.Core/Net/PipelineOptions.cs b/src/SDKs/Azure.Base/data-plane/Azure.Base/Net/PipelineOptions.cs
similarity index 97%
rename from src/SDKs/Azure.Core/data-plane/Azure.Core/Net/PipelineOptions.cs
rename to src/SDKs/Azure.Base/data-plane/Azure.Base/Net/PipelineOptions.cs
index 7562af9cb8d3..49a2e36aa865 100644
--- a/src/SDKs/Azure.Core/data-plane/Azure.Core/Net/PipelineOptions.cs
+++ b/src/SDKs/Azure.Base/data-plane/Azure.Base/Net/PipelineOptions.cs
@@ -1,14 +1,14 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
-using Azure.Core.Http.Pipeline;
+using Azure.Base.Http.Pipeline;
using System;
using System.Buffers;
using System.ComponentModel;
using System.Diagnostics;
using System.Threading.Tasks;
-namespace Azure.Core.Http
+namespace Azure.Base.Http
{
public class PipelineOptions
{
diff --git a/src/SDKs/Azure.Core/data-plane/Azure.Core/Net/Transcoder.cs b/src/SDKs/Azure.Base/data-plane/Azure.Base/Net/Transcoder.cs
similarity index 98%
rename from src/SDKs/Azure.Core/data-plane/Azure.Core/Net/Transcoder.cs
rename to src/SDKs/Azure.Base/data-plane/Azure.Base/Net/Transcoder.cs
index db878ba4c46d..bf61e5bb788a 100644
--- a/src/SDKs/Azure.Core/data-plane/Azure.Core/Net/Transcoder.cs
+++ b/src/SDKs/Azure.Base/data-plane/Azure.Base/Net/Transcoder.cs
@@ -4,7 +4,7 @@
using System;
using System.Text;
-namespace Azure.Core.Http
+namespace Azure.Base.Http
{
internal static class Transcoder
{
diff --git a/src/SDKs/Azure.Core/data-plane/Azure.Core/Net/UriExtensions.cs b/src/SDKs/Azure.Base/data-plane/Azure.Base/Net/UriExtensions.cs
similarity index 96%
rename from src/SDKs/Azure.Core/data-plane/Azure.Core/Net/UriExtensions.cs
rename to src/SDKs/Azure.Base/data-plane/Azure.Base/Net/UriExtensions.cs
index 53232cea5618..e5d8dfeb1fcf 100644
--- a/src/SDKs/Azure.Core/data-plane/Azure.Core/Net/UriExtensions.cs
+++ b/src/SDKs/Azure.Base/data-plane/Azure.Base/Net/UriExtensions.cs
@@ -3,7 +3,7 @@
using System;
-namespace Azure.Core
+namespace Azure.Base
{
public static class UriExtensions
{
diff --git a/src/SDKs/Azure.Core/data-plane/Azure.Core/OptionsStore.cs b/src/SDKs/Azure.Base/data-plane/Azure.Base/OptionsStore.cs
similarity index 98%
rename from src/SDKs/Azure.Core/data-plane/Azure.Core/OptionsStore.cs
rename to src/SDKs/Azure.Base/data-plane/Azure.Base/OptionsStore.cs
index 9a9445d57fc3..852ac474cebb 100644
--- a/src/SDKs/Azure.Core/data-plane/Azure.Core/OptionsStore.cs
+++ b/src/SDKs/Azure.Base/data-plane/Azure.Base/OptionsStore.cs
@@ -4,7 +4,7 @@
using System.Collections.Generic;
using System.ComponentModel;
-namespace Azure.Core
+namespace Azure.Base
{
struct OptionsStore
{
diff --git a/src/SDKs/Azure.Core/data-plane/Azure.Core/Response.cs b/src/SDKs/Azure.Base/data-plane/Azure.Base/Response.cs
similarity index 98%
rename from src/SDKs/Azure.Core/data-plane/Azure.Core/Response.cs
rename to src/SDKs/Azure.Base/data-plane/Azure.Base/Response.cs
index 03ad23c590e5..e07a3fadb178 100644
--- a/src/SDKs/Azure.Core/data-plane/Azure.Core/Response.cs
+++ b/src/SDKs/Azure.Base/data-plane/Azure.Base/Response.cs
@@ -1,14 +1,14 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
-using Azure.Core.Http;
+using Azure.Base.Http;
using System;
using System.Buffers.Text;
using System.ComponentModel;
using System.IO;
using System.Text;
-namespace Azure.Core
+namespace Azure.Base
{
public readonly struct Response
{
diff --git a/src/SDKs/Azure.Core/data-plane/Azure.Core/ResponseOfT.cs b/src/SDKs/Azure.Base/data-plane/Azure.Base/ResponseOfT.cs
similarity index 99%
rename from src/SDKs/Azure.Core/data-plane/Azure.Core/ResponseOfT.cs
rename to src/SDKs/Azure.Base/data-plane/Azure.Base/ResponseOfT.cs
index dfaa1187f56e..2e3f2fb09048 100644
--- a/src/SDKs/Azure.Core/data-plane/Azure.Core/ResponseOfT.cs
+++ b/src/SDKs/Azure.Base/data-plane/Azure.Base/ResponseOfT.cs
@@ -5,7 +5,7 @@
using System.ComponentModel;
using System.Text;
-namespace Azure.Core
+namespace Azure.Base
{
public struct Response : IDisposable
{
diff --git a/src/SDKs/Azure.Core/data-plane/Azure.Core/ServiceMethod.cs b/src/SDKs/Azure.Base/data-plane/Azure.Base/ServiceMethod.cs
similarity index 89%
rename from src/SDKs/Azure.Core/data-plane/Azure.Core/ServiceMethod.cs
rename to src/SDKs/Azure.Base/data-plane/Azure.Base/ServiceMethod.cs
index 28acd0d435e6..eb0a37c92242 100644
--- a/src/SDKs/Azure.Core/data-plane/Azure.Core/ServiceMethod.cs
+++ b/src/SDKs/Azure.Base/data-plane/Azure.Base/ServiceMethod.cs
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
-namespace Azure.Core.Http
+namespace Azure.Base.Http
{
public enum PipelineMethod : byte
{