From b9bd85cb2591f7c3f3c054f33f158e758056f1d3 Mon Sep 17 00:00:00 2001
From: JoshLove-msft <54595583+JoshLove-msft@users.noreply.github.com>
Date: Thu, 30 Apr 2020 16:59:04 -0700
Subject: [PATCH] Create TestFramework project (#11663)
---
eng/.docsettings.yml | 1 +
eng/Directory.Build.Data.props | 3 +
eng/Directory.Build.Data.targets | 2 +
eng/TestFramework.props | 6 +
eng/TestFramework.targets | 22 +++
.../tests/AppConfigurationTestEnvironment.cs | 4 +-
.../Azure.Data.AppConfiguration.Tests.csproj | 2 +-
.../tests/ConfigurationLiveTests.cs | 2 +-
.../tests/ConfigurationMockTests.cs | 2 +-
.../tests/ConfigurationRecordMatcher.cs | 2 +-
.../ConfigurationRecordedTestSanitizer.cs | 2 +-
.../tests/CustomHeadersPolicyTests.cs | 2 +-
.../tests/SyncTokenPolicyTests.cs | 2 +-
.../tests/samples/Sample1_HelloWorld.cs | 2 +-
.../samples/Sample2_HelloWorldExtended.cs | 2 +-
.../tests/samples/Sample3_SetClearReadOnly.cs | 2 +-
.../samples/Sample4_ReadRevisionHistory.cs | 2 +-
.../samples/Sample5_GetSettingIfChanged.cs | 2 +-
.../Sample6_UpdateSettingIfUnchanged.cs | 2 +-
.../tests/samples/SampleSnippets.cs | 2 +-
.../Azure.Core.TestFramework.sln | 25 +++
.../Directory.Build.props | 6 +
.../src}/AsyncGate.cs | 2 +-
.../src}/AsyncOnlyAttribute.cs | 2 +-
.../src}/AsyncValidatingStream.cs | 2 +-
.../src/Azure.Core.TestFramework.csproj | 18 ++
.../src}/ClientDiagnosticListener.cs | 0
.../src}/ClientTestBase.cs | 2 +-
.../src}/ClientTestFixtureAttribute.cs | 2 +-
.../DiagnosticScopeValidatingInterceptor.cs | 2 +-
.../src/EntryRecordModel.cs | 12 ++
.../src}/EnumValuesAttribute.cs | 4 +-
.../src}/LiveOnlyAttribute.cs | 2 +-
.../src}/MockRequest.cs | 2 +-
.../src}/MockResponse.cs | 2 +-
.../src}/MockTransport.cs | 2 +-
.../src}/NonSeekableMemoryStream.cs | 4 +-
.../src}/PlaybackTransport.cs | 2 +-
.../src}/RandomExtensions.cs | 2 +-
.../src}/RecordEntry.cs | 4 +-
.../src}/RecordEntryMessage.cs | 4 +-
.../src}/RecordMatcher.cs | 2 +-
.../src}/RecordSession.cs | 2 +-
.../src}/RecordTransport.cs | 4 +-
.../src}/RecordedTestBase.cs | 2 +-
.../src}/RecordedTestBase{TEnvironment}.cs | 2 +-
.../src}/RecordedTestMode.cs | 2 +-
.../src}/RecordedTestSanitizer.cs | 2 +-
.../src}/RecordedTestUtilities.cs | 6 +-
.../src}/RunOnlyOnPlatformsAttribute.cs | 2 +-
.../src}/SamplesBase.cs | 2 +-
.../src}/ServiceVersionAttribute.cs | 2 +-
.../src}/SyncAsyncPolicyTestBase.cs | 2 +-
.../src}/SyncAsyncTestBase.cs | 2 +-
.../src}/SyncOnlyAttribute.cs | 2 +-
.../src}/TaskExtensions.cs | 2 +-
.../src}/TestAsyncEnumerableExtensions.cs | 2 +-
.../src}/TestDiagnosticListener.cs | 0
.../src}/TestEnvironment.Recorded.cs | 2 +-
.../src}/TestEnvironment.cs | 2 +-
.../src}/TestEventListener.cs | 2 +-
.../src}/TestEventListenerExtensions.cs | 4 +-
.../src}/TestRandom.cs | 2 +-
.../src}/TestRecording.cs | 2 +-
.../src}/TestRetryHelper.cs | 2 +-
.../src}/UseSyncMethodsInterceptor.cs | 2 +-
sdk/core/Azure.Core/Azure.Core.All.sln | 161 ++++++++++--------
.../src/Shared/ContentTypeUtilities.cs | 6 -
.../Azure.Core/tests/Azure.Core.Tests.csproj | 4 +-
.../tests/AzureEventSourceListenerTests.cs | 2 +-
.../tests/AzureKeyCredentialPolicyTests.cs | 2 +-
.../BearerTokenAuthenticationPolicyTests.cs | 2 +-
.../tests/ClientRequestIdPolicyTests.cs | 2 +-
.../ClientTestBaseDiagnosticScopeTests.cs | 2 +-
.../tests/ClientTestBaseMultiVersionTests.cs | 2 +-
.../Azure.Core/tests/ClientTestBaseTests.cs | 2 +-
.../tests/EnumValuesAttributeTests.cs | 2 +-
sdk/core/Azure.Core/tests/EventSourceTests.cs | 2 +-
.../Azure.Core/tests/ExponentialPolicyTest.cs | 2 +-
.../tests/FailedResponseExceptionTests.cs | 2 +-
.../Azure.Core/tests/FixedRetryPolicyTests.cs | 2 +-
sdk/core/Azure.Core/tests/HeadersTests.cs | 2 +-
.../tests/HttpPipelineBuilderTest.cs | 2 +-
.../tests/HttpPipelineMessageTest.cs | 2 +-
.../Azure.Core/tests/HttpPipelineTests.cs | 2 +-
sdk/core/Azure.Core/tests/OperationTests.cs | 2 +-
sdk/core/Azure.Core/tests/PipelineTests.cs | 2 +-
.../Azure.Core/tests/RecordSessionTests.cs | 2 +-
.../tests/RequestActivityPolicyTests.cs | 2 +-
.../tests/ResponseBodyPolicyTests.cs | 2 +-
.../tests/ResponseClassifierTests.cs | 2 +-
sdk/core/Azure.Core/tests/ResponseTests.cs | 2 +-
.../Azure.Core/tests/RetriableStreamTests.cs | 2 +-
.../Azure.Core/tests/RetryPolicyTestBase.cs | 2 +-
.../Azure.Core/tests/TelemetryPolicyTests.cs | 2 +-
.../Azure.Core/tests/TestEnvironmentTests.cs | 2 +-
sdk/core/Azure.Core/tests/TestFramework.props | 38 -----
...Messaging.EventHubs.Processor.Tests.csproj | 3 +-
.../Infrastructure/StorageTestEnvironment.cs | 2 +-
.../src/Testing/EventHubsTestEnvironment.cs | 2 +-
...re.Messaging.EventHubs.Shared.Tests.csproj | 4 +-
.../Azure.Messaging.EventHubs.Tests.csproj | 5 +-
...NetCore.Configuration.Secrets.Tests.csproj | 3 +-
.../tests/AzureKeyVaultConfigurationTests.cs | 2 +-
.../tests/ConfigurationTestEnvironment.cs | 2 +-
...pNetCore.DataProtection.Blobs.Tests.csproj | 3 +-
.../tests/AzureBlobXmlRepositoryTests.cs | 2 +-
.../tests/DataProtectionTestEnvironment.cs | 2 +-
...spNetCore.DataProtection.Keys.Tests.csproj | 3 +-
.../tests/DataProtectionTestEnvironment.cs | 2 +-
.../Azure.AI.FormRecognizer.Tests.csproj | 7 +-
.../FormRecognizerClientLiveTests.cs | 2 +-
.../FormRecognizerClientTests.cs | 2 +-
.../FormTrainingClientLiveTests.cs | 2 +-
.../FormTrainingClientTests.cs | 2 +-
.../FormRecognizerRecordMatcher.cs | 2 +-
.../FormRecognizerRecordedTestSanitizer.cs | 2 +-
.../FormRecognizerTestEnvironment.cs | 2 +-
.../Sample1_RecognizeContentFromFile.cs | 2 +-
.../Sample1_RecognizeContentFromUri.cs | 2 +-
.../Sample2_RecognizeReceiptsFromFile.cs | 2 +-
.../Sample2_RecognizeReceiptsFromUri.cs | 2 +-
.../Sample3_RecognizeCustomFormsFromFile.cs | 2 +-
.../Sample3_RecognizeCustomFormsFromUri.cs | 2 +-
.../samples/Sample4_TrainModelWithForms.cs | 2 +-
.../Sample5_TrainModelWithFormsAndLabels.cs | 2 +-
.../samples/Sample6_ManageCustomModels.cs | 2 +-
.../Sample6_ManageCustomModelsAsync.cs | 2 +-
.../tests/samples/SampleSnippets.cs | 2 +-
.../tests/AuthorizationCodeCredentialTests.cs | 2 +-
.../tests/Azure.Identity.Tests.csproj | 5 +-
.../tests/AzureCliCredentialTests.cs | 2 +-
.../tests/AzureIdentityEventSourceTests.cs | 2 +-
.../tests/ClientCertificateCredentialTests.cs | 2 +-
.../tests/ClientSecretCredentialTests.cs | 2 +-
.../tests/DefaultAzureCredentialTests.cs | 2 +-
.../tests/DeviceCodeCredentialTests.cs | 2 +-
.../EnvironmentCredentialProviderTests.cs | 2 +-
.../tests/IdentityRecordedTestSanitizer.cs | 2 +-
.../tests/IdentityTestEnvironment.cs | 2 +-
.../InteractiveBrowserCredentialTests.cs | 2 +-
.../tests/LightweightPcks8DecoderTests.cs | 2 +-
.../ManagedIdentityCredentialImdsLiveTests.cs | 2 +-
.../ManagedIdentityCredentialLiveTests.cs | 2 +-
.../tests/ManagedIdentityCredentialTests.cs | 2 +-
.../Azure.Identity/tests/MockExtensions.cs | 2 +-
.../tests/SharedTokenCacheCredentialTests.cs | 2 +-
.../tests/TokenCredentialOptionsTests.cs | 2 +-
.../UsernamePasswordCredentialLiveTests.cs | 2 +-
.../tests/UsernamePasswordCredentialTests.cs | 2 +-
.../VisualStudioCodeCredentialLiveTests.cs | 2 +-
.../tests/VisualStudioCredentialTests.cs | 2 +-
...ecurity.KeyVault.Certificates.Tests.csproj | 2 +-
.../tests/CertificateClientLiveTests.cs | 2 +-
.../tests/CertificateClientTests.cs | 2 +-
.../tests/CertificatesTestBase.cs | 2 +-
.../tests/SampleFixture.cs | 2 +-
.../Azure.Security.KeyVault.Keys.Tests.csproj | 2 +-
.../tests/CryptographyClientLiveTests.cs | 2 +-
.../tests/CryptographyClientTests.cs | 2 +-
.../tests/DelayCreateKeyInterceptor.cs | 2 +-
.../tests/KeyClientLiveTests.cs | 2 +-
.../tests/KeyClientTests.cs | 2 +-
.../tests/KeyResolverLiveTests.cs | 2 +-
.../tests/KeysEventSourceTests.cs | 2 +-
.../tests/KeysTestBase.cs | 2 +-
.../tests/SampleFixture.cs | 2 +-
.../tests/samples/SampleSnippets.cs | 2 +-
...ure.Security.KeyVault.Secrets.Tests.csproj | 2 +-
...ChallengeBasedAuthenticationPolicyTests.cs | 2 +-
.../tests/SampleFixture.cs | 2 +-
.../tests/SecretClientLiveTests.cs | 2 +-
.../tests/SecretClientTests.cs | 2 +-
.../tests/SecretsTestBase.cs | 2 +-
.../tests/KeyVaultTestEnvironment.cs | 2 +-
.../tests/Azure.Search.Documents.Tests.csproj | 4 +-
.../DocumentOperations/AutocompleteTests.cs | 2 +-
.../DocumentOperations/GetDocumentTests.cs | 2 +-
.../tests/DocumentOperations/IndexingTests.cs | 2 +-
.../tests/DocumentOperations/SearchTests.cs | 2 +-
.../tests/DocumentOperations/SuggestTests.cs | 2 +-
.../tests/Samples/HelloWorld.cs | 2 +-
.../tests/Samples/Readme.cs | 2 +-
.../tests/SearchServiceClientTests.cs | 2 +-
.../tests/Serialization/SearchFilterTests.cs | 2 +-
.../Utilities/SearchRecordedTestSanitizer.cs | 2 +-
.../tests/Utilities/SearchResources.cs | 2 +-
.../tests/Utilities/SearchTestBase.cs | 2 +-
.../tests/Utilities/SearchTestEnvironment.cs | 2 +-
.../Azure.Messaging.ServiceBus.Tests.csproj | 4 +-
.../ServiceBusTestEnvironment.cs | 2 +-
.../tests/BlobBatchClientTests.cs | 2 +-
.../tests/DelayedResponseTests.cs | 2 +-
.../tests/AppendBlobClientTests.cs | 2 +-
.../tests/BlobBaseClientTests.cs | 2 +-
.../tests/BlobClientTests.cs | 2 +-
.../Azure.Storage.Blobs/tests/BlobTestBase.cs | 2 +-
.../tests/BlobUriBuilderTests.cs | 2 +-
.../tests/BlockBlobClientTests.cs | 2 +-
.../tests/ContainerClientTests.cs | 2 +-
.../tests/EncryptedBlockBlobClientTests.cs | 2 +-
.../tests/PageBlobClientTests.cs | 2 +-
.../tests/PartitionedDownloaderTests.cs | 2 +-
.../tests/PartitionedUploaderTests.cs | 2 +-
.../tests/ServiceClientTests.cs | 2 +-
.../tests/CommonTestBase.cs | 2 +-
.../tests/GeoRedundantReadPolicyTests.cs | 2 +-
.../Shared/RecordedClientRequestIdPolicy.cs | 2 +-
.../tests/Shared/StorageRecordMatcher.cs | 2 +-
.../Shared/StorageRecordedTestSanitizer.cs | 2 +-
.../tests/Shared/StorageTestBase.cs | 2 +-
.../tests/Shared/TestExceptionPolicy.cs | 2 +-
.../tests/StorageConnectionStringTests.cs | 2 +-
.../tests/StorageResponseClassifierTests.cs | 2 +-
.../tests/StorageSharedKeyCredentialsTests.cs | 2 +-
.../StorageSharedKeyPipelinePolicyTests.cs | 2 +-
.../tests/DataLakePartitionedUploaderTests.cs | 2 +-
.../tests/DataLakeTestBase.cs | 2 +-
.../tests/DirectoryClientTests.cs | 2 +-
.../tests/FileClientTests.cs | 2 +-
.../tests/FileSystemClientTests.cs | 2 +-
.../tests/PathTestBase.cs | 2 +-
.../tests/ServiceClientTests.cs | 2 +-
.../tests/DirectoryClientTests.cs | 2 +-
.../tests/FileClientTests.cs | 2 +-
.../tests/FileTestBase.cs | 2 +-
.../tests/FileUriBuilderTests.cs | 2 +-
.../tests/ServiceClientTests.cs | 2 +-
.../tests/ShareClientTests.cs | 2 +-
.../tests/QueueClientTests.cs | 2 +-
.../tests/QueueTestBase.cs | 2 +-
.../tests/QueueUriBuilderTests.cs | 2 +-
.../tests/ServiceClientTests.cs | 2 +-
sdk/storage/Directory.Build.props | 5 +-
.../tests/Azure.Data.Tables.Tests.csproj | 3 +-
.../tests/TableClientLiveTests.cs | 2 +-
.../tests/TableServiceClientLiveTests.cs | 2 +-
.../tests/TablesRecordedTestSanitizer.cs | 2 +-
.../tests/TablesTestEnvironment.cs | 2 +-
.../tests/Azure.Template.Tests.csproj | 3 +-
.../tests/MiniSecretClientLiveTest.cs | 2 +-
.../tests/MiniSecretClientTestEnvironment.cs | 2 +-
.../MiniSecretClientSamples.HelloWorld.cs | 2 +-
.../tests/Azure.AI.TextAnalytics.Tests.csproj | 2 +-
.../tests/TextAnalyticsClientLiveTests.cs | 2 +-
.../tests/TextAnalyticsClientMockTests.cs | 2 +-
.../tests/TextAnalyticsClientTests.cs | 2 +-
.../tests/TextAnalyticsErrorTests.cs | 2 +-
.../TextAnalyticsRecordedTestSanitizer.cs | 2 +-
.../tests/samples/Sample1_DetectLanguage.cs | 2 +-
.../samples/Sample1_DetectLanguageAsync.cs | 2 +-
.../samples/Sample1_DetectLanguageBatch.cs | 2 +-
.../Sample1_DetectLanguageBatchAsync.cs | 2 +-
.../Sample1_DetectLanguageBatchConvenience.cs | 2 +-
...le1_DetectLanguageBatchConvenienceAsync.cs | 2 +-
.../tests/samples/Sample2_AnalyzeSentiment.cs | 2 +-
.../samples/Sample2_AnalyzeSentimentAsync.cs | 2 +-
.../samples/Sample2_AnalyzeSentimentBatch.cs | 2 +-
.../Sample2_AnalyzeSentimentBatchAsync.cs | 2 +-
...ample2_AnalyzeSentimentBatchConvenience.cs | 2 +-
...2_AnalyzeSentimentBatchConvenienceAsync.cs | 2 +-
.../samples/Sample3_ExtractKeyPhrases.cs | 2 +-
.../samples/Sample3_ExtractKeyPhrasesAsync.cs | 2 +-
.../samples/Sample3_ExtractKeyPhrasesBatch.cs | 2 +-
.../Sample3_ExtractKeyPhrasesBatchAsync.cs | 2 +-
...mple3_ExtractKeyPhrasesBatchConvenience.cs | 2 +-
..._ExtractKeyPhrasesBatchConvenienceAsync.cs | 2 +-
.../samples/Sample4_RecognizeEntities.cs | 2 +-
.../samples/Sample4_RecognizeEntitiesAsync.cs | 2 +-
.../samples/Sample4_RecognizeEntitiesBatch.cs | 2 +-
.../Sample4_RecognizeEntitiesBatchAsync.cs | 2 +-
...mple4_RecognizeEntitiesBatchConvenience.cs | 2 +-
..._RecognizeEntitiesBatchConvenienceAsync.cs | 2 +-
.../Sample6_RecognizeLinkedEntities.cs | 2 +-
.../Sample6_RecognizeLinkedEntitiesAsync.cs | 2 +-
.../Sample6_RecognizeLinkedEntitiesBatch.cs | 2 +-
...mple6_RecognizeLinkedEntitiesBatchAsync.cs | 2 +-
...RecognizeLinkedEntitiesBatchConvenience.cs | 2 +-
...nizeLinkedEntitiesBatchConvenienceAsync.cs | 2 +-
.../tests/samples/SampleMoq.cs | 2 +-
.../tests/samples/SampleSnippets.cs | 2 +-
.../samples/TextAnalyticsTestEnvironment.cs | 2 +-
282 files changed, 470 insertions(+), 412 deletions(-)
create mode 100644 eng/TestFramework.props
create mode 100644 eng/TestFramework.targets
create mode 100644 sdk/core/Azure.Core.TestFramework/Azure.Core.TestFramework.sln
create mode 100644 sdk/core/Azure.Core.TestFramework/Directory.Build.props
rename sdk/core/{Azure.Core/tests/TestFramework => Azure.Core.TestFramework/src}/AsyncGate.cs (98%)
rename sdk/core/{Azure.Core/tests/TestFramework => Azure.Core.TestFramework/src}/AsyncOnlyAttribute.cs (93%)
rename sdk/core/{Azure.Core/tests/TestFramework => Azure.Core.TestFramework/src}/AsyncValidatingStream.cs (98%)
create mode 100644 sdk/core/Azure.Core.TestFramework/src/Azure.Core.TestFramework.csproj
rename sdk/core/{Azure.Core/tests/TestFramework => Azure.Core.TestFramework/src}/ClientDiagnosticListener.cs (100%)
mode change 100755 => 100644
rename sdk/core/{Azure.Core/tests/TestFramework => Azure.Core.TestFramework/src}/ClientTestBase.cs (99%)
rename sdk/core/{Azure.Core/tests/TestFramework => Azure.Core.TestFramework/src}/ClientTestFixtureAttribute.cs (99%)
mode change 100755 => 100644
rename sdk/core/{Azure.Core/tests/TestFramework => Azure.Core.TestFramework/src}/DiagnosticScopeValidatingInterceptor.cs (99%)
mode change 100755 => 100644
create mode 100644 sdk/core/Azure.Core.TestFramework/src/EntryRecordModel.cs
rename sdk/core/{Azure.Core/tests/TestFramework => Azure.Core.TestFramework/src}/EnumValuesAttribute.cs (97%)
mode change 100755 => 100644
rename sdk/core/{Azure.Core/tests/TestFramework => Azure.Core.TestFramework/src}/LiveOnlyAttribute.cs (97%)
rename sdk/core/{Azure.Core/tests/TestFramework => Azure.Core.TestFramework/src}/MockRequest.cs (98%)
rename sdk/core/{Azure.Core/tests/TestFramework => Azure.Core.TestFramework/src}/MockResponse.cs (98%)
rename sdk/core/{Azure.Core/tests/TestFramework => Azure.Core.TestFramework/src}/MockTransport.cs (98%)
rename sdk/core/{Azure.Core/tests/TestFramework => Azure.Core.TestFramework/src}/NonSeekableMemoryStream.cs (88%)
rename sdk/core/{Azure.Core/tests/TestFramework => Azure.Core.TestFramework/src}/PlaybackTransport.cs (98%)
rename sdk/core/{Azure.Core/tests/TestFramework => Azure.Core.TestFramework/src}/RandomExtensions.cs (91%)
rename sdk/core/{Azure.Core/tests/TestFramework => Azure.Core.TestFramework/src}/RecordEntry.cs (98%)
rename sdk/core/{Azure.Core/tests/TestFramework => Azure.Core.TestFramework/src}/RecordEntryMessage.cs (90%)
rename sdk/core/{Azure.Core/tests/TestFramework => Azure.Core.TestFramework/src}/RecordMatcher.cs (99%)
rename sdk/core/{Azure.Core/tests/TestFramework => Azure.Core.TestFramework/src}/RecordSession.cs (99%)
rename sdk/core/{Azure.Core/tests/TestFramework => Azure.Core.TestFramework/src}/RecordTransport.cs (97%)
rename sdk/core/{Azure.Core/tests/TestFramework => Azure.Core.TestFramework/src}/RecordedTestBase.cs (98%)
rename sdk/core/{Azure.Core/tests/TestFramework => Azure.Core.TestFramework/src}/RecordedTestBase{TEnvironment}.cs (95%)
rename sdk/core/{Azure.Core/tests/TestFramework => Azure.Core.TestFramework/src}/RecordedTestMode.cs (87%)
rename sdk/core/{Azure.Core/tests/TestFramework => Azure.Core.TestFramework/src}/RecordedTestSanitizer.cs (99%)
rename sdk/core/{Azure.Core/tests/TestFramework => Azure.Core.TestFramework/src}/RecordedTestUtilities.cs (80%)
rename sdk/core/{Azure.Core/tests/TestFramework => Azure.Core.TestFramework/src}/RunOnlyOnPlatformsAttribute.cs (97%)
rename sdk/core/{Azure.Core/tests/TestFramework => Azure.Core.TestFramework/src}/SamplesBase.cs (97%)
rename sdk/core/{Azure.Core/tests/TestFramework => Azure.Core.TestFramework/src}/ServiceVersionAttribute.cs (91%)
rename sdk/core/{Azure.Core/tests/TestFramework => Azure.Core.TestFramework/src}/SyncAsyncPolicyTestBase.cs (98%)
rename sdk/core/{Azure.Core/tests/TestFramework => Azure.Core.TestFramework/src}/SyncAsyncTestBase.cs (96%)
rename sdk/core/{Azure.Core/tests/TestFramework => Azure.Core.TestFramework/src}/SyncOnlyAttribute.cs (93%)
rename sdk/core/{Azure.Core/tests/TestFramework => Azure.Core.TestFramework/src}/TaskExtensions.cs (98%)
rename sdk/core/{Azure.Core/tests/TestFramework => Azure.Core.TestFramework/src}/TestAsyncEnumerableExtensions.cs (93%)
rename sdk/core/{Azure.Core/tests/TestFramework => Azure.Core.TestFramework/src}/TestDiagnosticListener.cs (100%)
mode change 100755 => 100644
rename sdk/core/{Azure.Core/tests/TestFramework => Azure.Core.TestFramework/src}/TestEnvironment.Recorded.cs (97%)
rename sdk/core/{Azure.Core/tests/TestFramework => Azure.Core.TestFramework/src}/TestEnvironment.cs (99%)
rename sdk/core/{Azure.Core/tests/TestFramework => Azure.Core.TestFramework/src}/TestEventListener.cs (97%)
rename sdk/core/{Azure.Core/tests/TestFramework => Azure.Core.TestFramework/src}/TestEventListenerExtensions.cs (78%)
rename sdk/core/{Azure.Core/tests/TestFramework => Azure.Core.TestFramework/src}/TestRandom.cs (96%)
rename sdk/core/{Azure.Core/tests/TestFramework => Azure.Core.TestFramework/src}/TestRecording.cs (99%)
rename sdk/core/{Azure.Core/tests/TestFramework => Azure.Core.TestFramework/src}/TestRetryHelper.cs (96%)
rename sdk/core/{Azure.Core/tests/TestFramework => Azure.Core.TestFramework/src}/UseSyncMethodsInterceptor.cs (99%)
delete mode 100644 sdk/core/Azure.Core/tests/TestFramework.props
diff --git a/eng/.docsettings.yml b/eng/.docsettings.yml
index 9e8ba3c5542b..db9908a7cbf8 100644
--- a/eng/.docsettings.yml
+++ b/eng/.docsettings.yml
@@ -70,6 +70,7 @@ known_presence_issues:
- ['sdk/keyvault','#5499']
- ['sdk/eventhub','#5499']
- ['sdk/formrecognizer/Azure.AI.FormRecognizer','#5499']
+ - ['sdk/core/Azure.Core.TestFramework', '#5499']
# List for changelogs begins here
- ['sdk/applicationinsights/Microsoft.Azure.ApplicationInsights.Query/CHANGELOG.md','#5499']
diff --git a/eng/Directory.Build.Data.props b/eng/Directory.Build.Data.props
index 4738c2b44545..907ba0671721 100644
--- a/eng/Directory.Build.Data.props
+++ b/eng/Directory.Build.Data.props
@@ -69,6 +69,8 @@
netcoreapp2.1;net461
+
+
$(RequiredTargetFrameworks)
@@ -120,6 +122,7 @@
windowsazureofficial;azureofficial
$(MSBuildThisFileDirectory)/../sdk/core/Azure.Core/src/Shared/
+ $(MSBuildThisFileDirectory)/../sdk/core/Azure.Core.TestFramework/src/Azure.Core.TestFramework.csproj
diff --git a/eng/Directory.Build.Data.targets b/eng/Directory.Build.Data.targets
index 06290af360e3..3f9fdaf688fb 100644
--- a/eng/Directory.Build.Data.targets
+++ b/eng/Directory.Build.Data.targets
@@ -104,6 +104,8 @@
+
+
$(MSBuildThisFileDirectory)Packages.Data.props
diff --git a/eng/TestFramework.props b/eng/TestFramework.props
new file mode 100644
index 000000000000..5e7e20b8b55a
--- /dev/null
+++ b/eng/TestFramework.props
@@ -0,0 +1,6 @@
+
+
+
+
+
+
diff --git a/eng/TestFramework.targets b/eng/TestFramework.targets
new file mode 100644
index 000000000000..2ce137b47dc8
--- /dev/null
+++ b/eng/TestFramework.targets
@@ -0,0 +1,22 @@
+
+
+
+
+
+ SessionRecords
+
+
+ <_CopyItems Include="$(OutputPath)\netcoreapp2.1\SessionRecords\**\*.*" />
+
+
+
+
+
+
+
diff --git a/sdk/appconfiguration/Azure.Data.AppConfiguration/tests/AppConfigurationTestEnvironment.cs b/sdk/appconfiguration/Azure.Data.AppConfiguration/tests/AppConfigurationTestEnvironment.cs
index 7575c6470739..60aecfb7c35b 100644
--- a/sdk/appconfiguration/Azure.Data.AppConfiguration/tests/AppConfigurationTestEnvironment.cs
+++ b/sdk/appconfiguration/Azure.Data.AppConfiguration/tests/AppConfigurationTestEnvironment.cs
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
namespace Azure.Data.AppConfiguration
{
@@ -14,4 +14,4 @@ public AppConfigurationTestEnvironment() : base("appconfiguration")
public string ConnectionString => GetRecordedVariable("APPCONFIGURATION_CONNECTION_STRING");
public string Endpoint => GetRecordedVariable("APPCONFIGURATION_ENDPOINT_STRING");
}
-}
\ No newline at end of file
+}
diff --git a/sdk/appconfiguration/Azure.Data.AppConfiguration/tests/Azure.Data.AppConfiguration.Tests.csproj b/sdk/appconfiguration/Azure.Data.AppConfiguration/tests/Azure.Data.AppConfiguration.Tests.csproj
index 0a998b8f68fb..555b2b4c1b3d 100644
--- a/sdk/appconfiguration/Azure.Data.AppConfiguration/tests/Azure.Data.AppConfiguration.Tests.csproj
+++ b/sdk/appconfiguration/Azure.Data.AppConfiguration/tests/Azure.Data.AppConfiguration.Tests.csproj
@@ -12,9 +12,9 @@
+
-
diff --git a/sdk/appconfiguration/Azure.Data.AppConfiguration/tests/ConfigurationLiveTests.cs b/sdk/appconfiguration/Azure.Data.AppConfiguration/tests/ConfigurationLiveTests.cs
index 2e83917324ec..19a413923d2f 100644
--- a/sdk/appconfiguration/Azure.Data.AppConfiguration/tests/ConfigurationLiveTests.cs
+++ b/sdk/appconfiguration/Azure.Data.AppConfiguration/tests/ConfigurationLiveTests.cs
@@ -7,7 +7,7 @@
using System.Threading;
using System.Threading.Tasks;
using Azure.Core;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using NUnit.Framework;
namespace Azure.Data.AppConfiguration.Tests
diff --git a/sdk/appconfiguration/Azure.Data.AppConfiguration/tests/ConfigurationMockTests.cs b/sdk/appconfiguration/Azure.Data.AppConfiguration/tests/ConfigurationMockTests.cs
index 2d24f7b02e06..2a209513b394 100644
--- a/sdk/appconfiguration/Azure.Data.AppConfiguration/tests/ConfigurationMockTests.cs
+++ b/sdk/appconfiguration/Azure.Data.AppConfiguration/tests/ConfigurationMockTests.cs
@@ -14,7 +14,7 @@
using System.Threading.Tasks;
using Azure.Core;
using Azure.Core.Pipeline;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using NUnit.Framework;
namespace Azure.Data.AppConfiguration.Tests
diff --git a/sdk/appconfiguration/Azure.Data.AppConfiguration/tests/ConfigurationRecordMatcher.cs b/sdk/appconfiguration/Azure.Data.AppConfiguration/tests/ConfigurationRecordMatcher.cs
index 7bfbe4a34688..7792b498a2d7 100644
--- a/sdk/appconfiguration/Azure.Data.AppConfiguration/tests/ConfigurationRecordMatcher.cs
+++ b/sdk/appconfiguration/Azure.Data.AppConfiguration/tests/ConfigurationRecordMatcher.cs
@@ -5,7 +5,7 @@
using System.Collections.Generic;
using System.Linq;
using System.Text;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using Newtonsoft.Json.Linq;
namespace Azure.Data.AppConfiguration.Tests
diff --git a/sdk/appconfiguration/Azure.Data.AppConfiguration/tests/ConfigurationRecordedTestSanitizer.cs b/sdk/appconfiguration/Azure.Data.AppConfiguration/tests/ConfigurationRecordedTestSanitizer.cs
index cc3a163a56c4..632aa1b16d53 100644
--- a/sdk/appconfiguration/Azure.Data.AppConfiguration/tests/ConfigurationRecordedTestSanitizer.cs
+++ b/sdk/appconfiguration/Azure.Data.AppConfiguration/tests/ConfigurationRecordedTestSanitizer.cs
@@ -2,7 +2,7 @@
// Licensed under the MIT License.
using Azure.Core;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
namespace Azure.Data.AppConfiguration.Tests
{
diff --git a/sdk/appconfiguration/Azure.Data.AppConfiguration/tests/CustomHeadersPolicyTests.cs b/sdk/appconfiguration/Azure.Data.AppConfiguration/tests/CustomHeadersPolicyTests.cs
index f150a14705e5..69a07c42716d 100644
--- a/sdk/appconfiguration/Azure.Data.AppConfiguration/tests/CustomHeadersPolicyTests.cs
+++ b/sdk/appconfiguration/Azure.Data.AppConfiguration/tests/CustomHeadersPolicyTests.cs
@@ -3,7 +3,7 @@
using System.Diagnostics;
using System.Threading.Tasks;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using NUnit.Framework;
namespace Azure.Data.AppConfiguration.Tests
diff --git a/sdk/appconfiguration/Azure.Data.AppConfiguration/tests/SyncTokenPolicyTests.cs b/sdk/appconfiguration/Azure.Data.AppConfiguration/tests/SyncTokenPolicyTests.cs
index f9f3d0b33951..79eb6d137f5e 100644
--- a/sdk/appconfiguration/Azure.Data.AppConfiguration/tests/SyncTokenPolicyTests.cs
+++ b/sdk/appconfiguration/Azure.Data.AppConfiguration/tests/SyncTokenPolicyTests.cs
@@ -3,7 +3,7 @@
using System.Threading.Tasks;
using Azure.Core;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using NUnit.Framework;
namespace Azure.Data.AppConfiguration.Tests
diff --git a/sdk/appconfiguration/Azure.Data.AppConfiguration/tests/samples/Sample1_HelloWorld.cs b/sdk/appconfiguration/Azure.Data.AppConfiguration/tests/samples/Sample1_HelloWorld.cs
index 51ca052513c8..5d1e5af692b5 100644
--- a/sdk/appconfiguration/Azure.Data.AppConfiguration/tests/samples/Sample1_HelloWorld.cs
+++ b/sdk/appconfiguration/Azure.Data.AppConfiguration/tests/samples/Sample1_HelloWorld.cs
@@ -2,7 +2,7 @@
// Licensed under the MIT License.
using System;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using NUnit.Framework;
namespace Azure.Data.AppConfiguration.Samples
diff --git a/sdk/appconfiguration/Azure.Data.AppConfiguration/tests/samples/Sample2_HelloWorldExtended.cs b/sdk/appconfiguration/Azure.Data.AppConfiguration/tests/samples/Sample2_HelloWorldExtended.cs
index 57571b862eea..049c744b58ea 100644
--- a/sdk/appconfiguration/Azure.Data.AppConfiguration/tests/samples/Sample2_HelloWorldExtended.cs
+++ b/sdk/appconfiguration/Azure.Data.AppConfiguration/tests/samples/Sample2_HelloWorldExtended.cs
@@ -4,7 +4,7 @@
using System;
using System.Diagnostics;
using System.Threading.Tasks;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using NUnit.Framework;
using NUnit.Framework.Constraints;
diff --git a/sdk/appconfiguration/Azure.Data.AppConfiguration/tests/samples/Sample3_SetClearReadOnly.cs b/sdk/appconfiguration/Azure.Data.AppConfiguration/tests/samples/Sample3_SetClearReadOnly.cs
index cdfaf33028c6..14bbe2e27736 100644
--- a/sdk/appconfiguration/Azure.Data.AppConfiguration/tests/samples/Sample3_SetClearReadOnly.cs
+++ b/sdk/appconfiguration/Azure.Data.AppConfiguration/tests/samples/Sample3_SetClearReadOnly.cs
@@ -2,7 +2,7 @@
// Licensed under the MIT License.
using System;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using NUnit.Framework;
namespace Azure.Data.AppConfiguration.Samples
diff --git a/sdk/appconfiguration/Azure.Data.AppConfiguration/tests/samples/Sample4_ReadRevisionHistory.cs b/sdk/appconfiguration/Azure.Data.AppConfiguration/tests/samples/Sample4_ReadRevisionHistory.cs
index 5d974ef8dbaf..02d6d9ba5e67 100644
--- a/sdk/appconfiguration/Azure.Data.AppConfiguration/tests/samples/Sample4_ReadRevisionHistory.cs
+++ b/sdk/appconfiguration/Azure.Data.AppConfiguration/tests/samples/Sample4_ReadRevisionHistory.cs
@@ -4,7 +4,7 @@
using System;
using System.Diagnostics;
using System.Threading.Tasks;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using NUnit.Framework;
namespace Azure.Data.AppConfiguration.Samples
diff --git a/sdk/appconfiguration/Azure.Data.AppConfiguration/tests/samples/Sample5_GetSettingIfChanged.cs b/sdk/appconfiguration/Azure.Data.AppConfiguration/tests/samples/Sample5_GetSettingIfChanged.cs
index 4cc8ae638cac..818b39e347c8 100644
--- a/sdk/appconfiguration/Azure.Data.AppConfiguration/tests/samples/Sample5_GetSettingIfChanged.cs
+++ b/sdk/appconfiguration/Azure.Data.AppConfiguration/tests/samples/Sample5_GetSettingIfChanged.cs
@@ -3,7 +3,7 @@
using System;
using System.Diagnostics;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using NUnit.Framework;
namespace Azure.Data.AppConfiguration.Samples
diff --git a/sdk/appconfiguration/Azure.Data.AppConfiguration/tests/samples/Sample6_UpdateSettingIfUnchanged.cs b/sdk/appconfiguration/Azure.Data.AppConfiguration/tests/samples/Sample6_UpdateSettingIfUnchanged.cs
index a6020b12c368..4bf29fbce0b4 100644
--- a/sdk/appconfiguration/Azure.Data.AppConfiguration/tests/samples/Sample6_UpdateSettingIfUnchanged.cs
+++ b/sdk/appconfiguration/Azure.Data.AppConfiguration/tests/samples/Sample6_UpdateSettingIfUnchanged.cs
@@ -2,7 +2,7 @@
// Licensed under the MIT License.
using System;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using NUnit.Framework;
namespace Azure.Data.AppConfiguration.Samples
diff --git a/sdk/appconfiguration/Azure.Data.AppConfiguration/tests/samples/SampleSnippets.cs b/sdk/appconfiguration/Azure.Data.AppConfiguration/tests/samples/SampleSnippets.cs
index 63d9343b8794..a08e2efd5fc9 100644
--- a/sdk/appconfiguration/Azure.Data.AppConfiguration/tests/samples/SampleSnippets.cs
+++ b/sdk/appconfiguration/Azure.Data.AppConfiguration/tests/samples/SampleSnippets.cs
@@ -3,7 +3,7 @@
using System;
using System.Threading.Tasks;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using Azure.Identity;
using NUnit.Framework;
diff --git a/sdk/core/Azure.Core.TestFramework/Azure.Core.TestFramework.sln b/sdk/core/Azure.Core.TestFramework/Azure.Core.TestFramework.sln
new file mode 100644
index 000000000000..4a6591c1acf9
--- /dev/null
+++ b/sdk/core/Azure.Core.TestFramework/Azure.Core.TestFramework.sln
@@ -0,0 +1,25 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.30011.22
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Azure.Core.TestFramework", "src\Azure.Core.TestFramework.csproj", "{961FD4FB-3CA1-4B33-B6FD-8396CF9280DF}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Any CPU = Debug|Any CPU
+ Release|Any CPU = Release|Any CPU
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {961FD4FB-3CA1-4B33-B6FD-8396CF9280DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {961FD4FB-3CA1-4B33-B6FD-8396CF9280DF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {961FD4FB-3CA1-4B33-B6FD-8396CF9280DF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {961FD4FB-3CA1-4B33-B6FD-8396CF9280DF}.Release|Any CPU.Build.0 = Release|Any CPU
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+ GlobalSection(ExtensibilityGlobals) = postSolution
+ SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE}
+ EndGlobalSection
+EndGlobal
diff --git a/sdk/core/Azure.Core.TestFramework/Directory.Build.props b/sdk/core/Azure.Core.TestFramework/Directory.Build.props
new file mode 100644
index 000000000000..2cf19dda8fed
--- /dev/null
+++ b/sdk/core/Azure.Core.TestFramework/Directory.Build.props
@@ -0,0 +1,6 @@
+
+
+ true
+
+
+
diff --git a/sdk/core/Azure.Core/tests/TestFramework/AsyncGate.cs b/sdk/core/Azure.Core.TestFramework/src/AsyncGate.cs
similarity index 98%
rename from sdk/core/Azure.Core/tests/TestFramework/AsyncGate.cs
rename to sdk/core/Azure.Core.TestFramework/src/AsyncGate.cs
index 291f5aa011a9..53f2c0445388 100644
--- a/sdk/core/Azure.Core/tests/TestFramework/AsyncGate.cs
+++ b/sdk/core/Azure.Core.TestFramework/src/AsyncGate.cs
@@ -4,7 +4,7 @@
using System;
using System.Threading.Tasks;
-namespace Azure.Core.Testing
+namespace Azure.Core.TestFramework
{
public class AsyncGate
{
diff --git a/sdk/core/Azure.Core/tests/TestFramework/AsyncOnlyAttribute.cs b/sdk/core/Azure.Core.TestFramework/src/AsyncOnlyAttribute.cs
similarity index 93%
rename from sdk/core/Azure.Core/tests/TestFramework/AsyncOnlyAttribute.cs
rename to sdk/core/Azure.Core.TestFramework/src/AsyncOnlyAttribute.cs
index 65fa85b6b760..2fca89d8ae9d 100644
--- a/sdk/core/Azure.Core/tests/TestFramework/AsyncOnlyAttribute.cs
+++ b/sdk/core/Azure.Core.TestFramework/src/AsyncOnlyAttribute.cs
@@ -4,7 +4,7 @@
using System;
using NUnit.Framework;
-namespace Azure.Core.Testing
+namespace Azure.Core.TestFramework
{
///
/// Marks that a test should only be executed asynchronously (in a test
diff --git a/sdk/core/Azure.Core/tests/TestFramework/AsyncValidatingStream.cs b/sdk/core/Azure.Core.TestFramework/src/AsyncValidatingStream.cs
similarity index 98%
rename from sdk/core/Azure.Core/tests/TestFramework/AsyncValidatingStream.cs
rename to sdk/core/Azure.Core.TestFramework/src/AsyncValidatingStream.cs
index 96b557c3840a..f1144a3b05d4 100644
--- a/sdk/core/Azure.Core/tests/TestFramework/AsyncValidatingStream.cs
+++ b/sdk/core/Azure.Core.TestFramework/src/AsyncValidatingStream.cs
@@ -6,7 +6,7 @@
using System.Threading;
using System.Threading.Tasks;
-namespace Azure.Core.Testing
+namespace Azure.Core.TestFramework
{
internal class AsyncValidatingStream : Stream
{
diff --git a/sdk/core/Azure.Core.TestFramework/src/Azure.Core.TestFramework.csproj b/sdk/core/Azure.Core.TestFramework/src/Azure.Core.TestFramework.csproj
new file mode 100644
index 000000000000..49f96cf34603
--- /dev/null
+++ b/sdk/core/Azure.Core.TestFramework/src/Azure.Core.TestFramework.csproj
@@ -0,0 +1,18 @@
+
+
+ $(RequiredTargetFrameworks);net461;net47
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/sdk/core/Azure.Core/tests/TestFramework/ClientDiagnosticListener.cs b/sdk/core/Azure.Core.TestFramework/src/ClientDiagnosticListener.cs
old mode 100755
new mode 100644
similarity index 100%
rename from sdk/core/Azure.Core/tests/TestFramework/ClientDiagnosticListener.cs
rename to sdk/core/Azure.Core.TestFramework/src/ClientDiagnosticListener.cs
diff --git a/sdk/core/Azure.Core/tests/TestFramework/ClientTestBase.cs b/sdk/core/Azure.Core.TestFramework/src/ClientTestBase.cs
similarity index 99%
rename from sdk/core/Azure.Core/tests/TestFramework/ClientTestBase.cs
rename to sdk/core/Azure.Core.TestFramework/src/ClientTestBase.cs
index 4d509a87d257..4b4983fc25d2 100644
--- a/sdk/core/Azure.Core/tests/TestFramework/ClientTestBase.cs
+++ b/sdk/core/Azure.Core.TestFramework/src/ClientTestBase.cs
@@ -9,7 +9,7 @@
using Castle.DynamicProxy;
using NUnit.Framework;
-namespace Azure.Core.Testing
+namespace Azure.Core.TestFramework
{
[ClientTestFixture]
public abstract class ClientTestBase
diff --git a/sdk/core/Azure.Core/tests/TestFramework/ClientTestFixtureAttribute.cs b/sdk/core/Azure.Core.TestFramework/src/ClientTestFixtureAttribute.cs
old mode 100755
new mode 100644
similarity index 99%
rename from sdk/core/Azure.Core/tests/TestFramework/ClientTestFixtureAttribute.cs
rename to sdk/core/Azure.Core.TestFramework/src/ClientTestFixtureAttribute.cs
index 37d7179196f6..ee17550292eb
--- a/sdk/core/Azure.Core/tests/TestFramework/ClientTestFixtureAttribute.cs
+++ b/sdk/core/Azure.Core.TestFramework/src/ClientTestFixtureAttribute.cs
@@ -9,7 +9,7 @@
using NUnit.Framework.Interfaces;
using NUnit.Framework.Internal;
-namespace Azure.Core.Testing
+namespace Azure.Core.TestFramework
{
public class ClientTestFixtureAttribute : NUnitAttribute, IFixtureBuilder2, IPreFilter
{
diff --git a/sdk/core/Azure.Core/tests/TestFramework/DiagnosticScopeValidatingInterceptor.cs b/sdk/core/Azure.Core.TestFramework/src/DiagnosticScopeValidatingInterceptor.cs
old mode 100755
new mode 100644
similarity index 99%
rename from sdk/core/Azure.Core/tests/TestFramework/DiagnosticScopeValidatingInterceptor.cs
rename to sdk/core/Azure.Core.TestFramework/src/DiagnosticScopeValidatingInterceptor.cs
index ad7e28ba461c..b5df97f22936
--- a/sdk/core/Azure.Core/tests/TestFramework/DiagnosticScopeValidatingInterceptor.cs
+++ b/sdk/core/Azure.Core.TestFramework/src/DiagnosticScopeValidatingInterceptor.cs
@@ -8,7 +8,7 @@
using Azure.Core.Tests;
using Castle.DynamicProxy;
-namespace Azure.Core.Testing
+namespace Azure.Core.TestFramework
{
public class DiagnosticScopeValidatingInterceptor : IInterceptor
{
diff --git a/sdk/core/Azure.Core.TestFramework/src/EntryRecordModel.cs b/sdk/core/Azure.Core.TestFramework/src/EntryRecordModel.cs
new file mode 100644
index 000000000000..e0367a6efb9c
--- /dev/null
+++ b/sdk/core/Azure.Core.TestFramework/src/EntryRecordModel.cs
@@ -0,0 +1,12 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+namespace Azure.Core.TestFramework
+{
+ public enum EntryRecordModel
+ {
+ Record,
+ DontRecord,
+ RecordWithoutRequestBody
+ }
+}
diff --git a/sdk/core/Azure.Core/tests/TestFramework/EnumValuesAttribute.cs b/sdk/core/Azure.Core.TestFramework/src/EnumValuesAttribute.cs
old mode 100755
new mode 100644
similarity index 97%
rename from sdk/core/Azure.Core/tests/TestFramework/EnumValuesAttribute.cs
rename to sdk/core/Azure.Core.TestFramework/src/EnumValuesAttribute.cs
index 44e67d18abd5..ea4c9855a968
--- a/sdk/core/Azure.Core/tests/TestFramework/EnumValuesAttribute.cs
+++ b/sdk/core/Azure.Core.TestFramework/src/EnumValuesAttribute.cs
@@ -9,7 +9,7 @@
using NUnit.Framework.Interfaces;
using NUnit.Framework.Internal;
-namespace Azure.Core.Testing
+namespace Azure.Core.TestFramework
{
///
/// Provides values to NUnit that are public, static, read-only fields and properties of the declared type.
@@ -44,7 +44,7 @@ public EnumValuesAttribute(params string[] names)
public IEnumerable GetData(IParameterInfo parameter) => GetMembers(parameter.ParameterType, parameter.ParameterInfo?.Name);
- internal IEnumerable
-
-
@@ -17,6 +15,7 @@
+
diff --git a/sdk/extensions/Azure.Extensions.AspNetCore.Configuration.Secrets/tests/AzureKeyVaultConfigurationTests.cs b/sdk/extensions/Azure.Extensions.AspNetCore.Configuration.Secrets/tests/AzureKeyVaultConfigurationTests.cs
index 471228ce8058..e646dd15870a 100644
--- a/sdk/extensions/Azure.Extensions.AspNetCore.Configuration.Secrets/tests/AzureKeyVaultConfigurationTests.cs
+++ b/sdk/extensions/Azure.Extensions.AspNetCore.Configuration.Secrets/tests/AzureKeyVaultConfigurationTests.cs
@@ -6,7 +6,7 @@
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using Azure.Security.KeyVault.Secrets;
using Microsoft.Extensions.Primitives;
using Moq;
diff --git a/sdk/extensions/Azure.Extensions.AspNetCore.Configuration.Secrets/tests/ConfigurationTestEnvironment.cs b/sdk/extensions/Azure.Extensions.AspNetCore.Configuration.Secrets/tests/ConfigurationTestEnvironment.cs
index 34eb89b41d8f..f6f2d462dca4 100644
--- a/sdk/extensions/Azure.Extensions.AspNetCore.Configuration.Secrets/tests/ConfigurationTestEnvironment.cs
+++ b/sdk/extensions/Azure.Extensions.AspNetCore.Configuration.Secrets/tests/ConfigurationTestEnvironment.cs
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
namespace Azure.Extensions.AspNetCore.Configuration.Secrets.Tests
{
diff --git a/sdk/extensions/Azure.Extensions.AspNetCore.DataProtection.Blobs/tests/Azure.Extensions.AspNetCore.DataProtection.Blobs.Tests.csproj b/sdk/extensions/Azure.Extensions.AspNetCore.DataProtection.Blobs/tests/Azure.Extensions.AspNetCore.DataProtection.Blobs.Tests.csproj
index c1cb26104475..b6c6e8702679 100644
--- a/sdk/extensions/Azure.Extensions.AspNetCore.DataProtection.Blobs/tests/Azure.Extensions.AspNetCore.DataProtection.Blobs.Tests.csproj
+++ b/sdk/extensions/Azure.Extensions.AspNetCore.DataProtection.Blobs/tests/Azure.Extensions.AspNetCore.DataProtection.Blobs.Tests.csproj
@@ -5,8 +5,6 @@
true
-
-
@@ -17,6 +15,7 @@
+
diff --git a/sdk/extensions/Azure.Extensions.AspNetCore.DataProtection.Blobs/tests/AzureBlobXmlRepositoryTests.cs b/sdk/extensions/Azure.Extensions.AspNetCore.DataProtection.Blobs/tests/AzureBlobXmlRepositoryTests.cs
index 470b000c8a2d..9a8ae4d4be1d 100644
--- a/sdk/extensions/Azure.Extensions.AspNetCore.DataProtection.Blobs/tests/AzureBlobXmlRepositoryTests.cs
+++ b/sdk/extensions/Azure.Extensions.AspNetCore.DataProtection.Blobs/tests/AzureBlobXmlRepositoryTests.cs
@@ -10,7 +10,7 @@
using System.Xml.Linq;
using Azure;
using Azure.Core;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using Azure.Storage;
using Azure.Storage.Blobs;
using Azure.Storage.Blobs.Models;
diff --git a/sdk/extensions/Azure.Extensions.AspNetCore.DataProtection.Blobs/tests/DataProtectionTestEnvironment.cs b/sdk/extensions/Azure.Extensions.AspNetCore.DataProtection.Blobs/tests/DataProtectionTestEnvironment.cs
index 8f4733328267..66c00024c68b 100644
--- a/sdk/extensions/Azure.Extensions.AspNetCore.DataProtection.Blobs/tests/DataProtectionTestEnvironment.cs
+++ b/sdk/extensions/Azure.Extensions.AspNetCore.DataProtection.Blobs/tests/DataProtectionTestEnvironment.cs
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
namespace Azure.Extensions.AspNetCore.DataProtection.Blobs.Tests
{
diff --git a/sdk/extensions/Azure.Extensions.AspNetCore.DataProtection.Keys/tests/Azure.Extensions.AspNetCore.DataProtection.Keys.Tests.csproj b/sdk/extensions/Azure.Extensions.AspNetCore.DataProtection.Keys/tests/Azure.Extensions.AspNetCore.DataProtection.Keys.Tests.csproj
index 9f98a969a561..1ac847ca22e2 100644
--- a/sdk/extensions/Azure.Extensions.AspNetCore.DataProtection.Keys/tests/Azure.Extensions.AspNetCore.DataProtection.Keys.Tests.csproj
+++ b/sdk/extensions/Azure.Extensions.AspNetCore.DataProtection.Keys/tests/Azure.Extensions.AspNetCore.DataProtection.Keys.Tests.csproj
@@ -5,8 +5,6 @@
true
-
-
@@ -17,6 +15,7 @@
+
diff --git a/sdk/extensions/Azure.Extensions.AspNetCore.DataProtection.Keys/tests/DataProtectionTestEnvironment.cs b/sdk/extensions/Azure.Extensions.AspNetCore.DataProtection.Keys/tests/DataProtectionTestEnvironment.cs
index 220861a69fd0..638231462ba6 100644
--- a/sdk/extensions/Azure.Extensions.AspNetCore.DataProtection.Keys/tests/DataProtectionTestEnvironment.cs
+++ b/sdk/extensions/Azure.Extensions.AspNetCore.DataProtection.Keys/tests/DataProtectionTestEnvironment.cs
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
namespace Azure.Extensions.AspNetCore.DataProtection.Keys.Tests
{
diff --git a/sdk/formrecognizer/Azure.AI.FormRecognizer/tests/Azure.AI.FormRecognizer.Tests.csproj b/sdk/formrecognizer/Azure.AI.FormRecognizer/tests/Azure.AI.FormRecognizer.Tests.csproj
index 00d8122d937d..ef75eefaa9c8 100644
--- a/sdk/formrecognizer/Azure.AI.FormRecognizer/tests/Azure.AI.FormRecognizer.Tests.csproj
+++ b/sdk/formrecognizer/Azure.AI.FormRecognizer/tests/Azure.AI.FormRecognizer.Tests.csproj
@@ -2,10 +2,8 @@
$(RequiredTargetFrameworks)
-
-
-
-
+
+
@@ -18,6 +16,7 @@
+
diff --git a/sdk/formrecognizer/Azure.AI.FormRecognizer/tests/FormRecognizerClient/FormRecognizerClientLiveTests.cs b/sdk/formrecognizer/Azure.AI.FormRecognizer/tests/FormRecognizerClient/FormRecognizerClientLiveTests.cs
index 49e1fc99d80d..868ad0f4f5ba 100644
--- a/sdk/formrecognizer/Azure.AI.FormRecognizer/tests/FormRecognizerClient/FormRecognizerClientLiveTests.cs
+++ b/sdk/formrecognizer/Azure.AI.FormRecognizer/tests/FormRecognizerClient/FormRecognizerClientLiveTests.cs
@@ -8,7 +8,7 @@
using System.Threading.Tasks;
using Azure.AI.FormRecognizer.Models;
using Azure.AI.FormRecognizer.Training;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using NUnit.Framework;
using NUnit.Framework.Internal;
diff --git a/sdk/formrecognizer/Azure.AI.FormRecognizer/tests/FormRecognizerClient/FormRecognizerClientTests.cs b/sdk/formrecognizer/Azure.AI.FormRecognizer/tests/FormRecognizerClient/FormRecognizerClientTests.cs
index 06275ff58cf9..d9a6f868b5fd 100644
--- a/sdk/formrecognizer/Azure.AI.FormRecognizer/tests/FormRecognizerClient/FormRecognizerClientTests.cs
+++ b/sdk/formrecognizer/Azure.AI.FormRecognizer/tests/FormRecognizerClient/FormRecognizerClientTests.cs
@@ -7,7 +7,7 @@
using System.Threading.Tasks;
using Azure.AI.FormRecognizer.Models;
using Azure.AI.FormRecognizer.Training;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using NUnit.Framework;
namespace Azure.AI.FormRecognizer.Tests
diff --git a/sdk/formrecognizer/Azure.AI.FormRecognizer/tests/FormTrainingClient/FormTrainingClientLiveTests.cs b/sdk/formrecognizer/Azure.AI.FormRecognizer/tests/FormTrainingClient/FormTrainingClientLiveTests.cs
index bd51e0340c5a..b5483b114314 100644
--- a/sdk/formrecognizer/Azure.AI.FormRecognizer/tests/FormTrainingClient/FormTrainingClientLiveTests.cs
+++ b/sdk/formrecognizer/Azure.AI.FormRecognizer/tests/FormTrainingClient/FormTrainingClientLiveTests.cs
@@ -5,7 +5,7 @@
using System.Linq;
using System.Threading.Tasks;
using Azure.AI.FormRecognizer.Training;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using NUnit.Framework;
namespace Azure.AI.FormRecognizer.Tests
diff --git a/sdk/formrecognizer/Azure.AI.FormRecognizer/tests/FormTrainingClient/FormTrainingClientTests.cs b/sdk/formrecognizer/Azure.AI.FormRecognizer/tests/FormTrainingClient/FormTrainingClientTests.cs
index b2c942aca0ac..cf803d758012 100644
--- a/sdk/formrecognizer/Azure.AI.FormRecognizer/tests/FormTrainingClient/FormTrainingClientTests.cs
+++ b/sdk/formrecognizer/Azure.AI.FormRecognizer/tests/FormTrainingClient/FormTrainingClientTests.cs
@@ -3,7 +3,7 @@
using System;
using Azure.AI.FormRecognizer.Training;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using NUnit.Framework;
namespace Azure.AI.FormRecognizer.Tests
diff --git a/sdk/formrecognizer/Azure.AI.FormRecognizer/tests/Infrastructure/FormRecognizerRecordMatcher.cs b/sdk/formrecognizer/Azure.AI.FormRecognizer/tests/Infrastructure/FormRecognizerRecordMatcher.cs
index cead8717689e..3d4bb72c9c93 100644
--- a/sdk/formrecognizer/Azure.AI.FormRecognizer/tests/Infrastructure/FormRecognizerRecordMatcher.cs
+++ b/sdk/formrecognizer/Azure.AI.FormRecognizer/tests/Infrastructure/FormRecognizerRecordMatcher.cs
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
namespace Azure.AI.FormRecognizer.Tests
{
diff --git a/sdk/formrecognizer/Azure.AI.FormRecognizer/tests/Infrastructure/FormRecognizerRecordedTestSanitizer.cs b/sdk/formrecognizer/Azure.AI.FormRecognizer/tests/Infrastructure/FormRecognizerRecordedTestSanitizer.cs
index 93101a1f1f5d..d64742b48b52 100644
--- a/sdk/formrecognizer/Azure.AI.FormRecognizer/tests/Infrastructure/FormRecognizerRecordedTestSanitizer.cs
+++ b/sdk/formrecognizer/Azure.AI.FormRecognizer/tests/Infrastructure/FormRecognizerRecordedTestSanitizer.cs
@@ -2,7 +2,7 @@
// Licensed under the MIT License.
using System.Collections.Generic;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
namespace Azure.AI.FormRecognizer.Tests
{
diff --git a/sdk/formrecognizer/Azure.AI.FormRecognizer/tests/Infrastructure/FormRecognizerTestEnvironment.cs b/sdk/formrecognizer/Azure.AI.FormRecognizer/tests/Infrastructure/FormRecognizerTestEnvironment.cs
index b7d0b6c6d120..095ba7e2f9c9 100644
--- a/sdk/formrecognizer/Azure.AI.FormRecognizer/tests/Infrastructure/FormRecognizerTestEnvironment.cs
+++ b/sdk/formrecognizer/Azure.AI.FormRecognizer/tests/Infrastructure/FormRecognizerTestEnvironment.cs
@@ -4,7 +4,7 @@
using System;
using System.IO;
using System.Reflection;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using Azure.AI.FormRecognizer.Models;
namespace Azure.AI.FormRecognizer.Tests
diff --git a/sdk/formrecognizer/Azure.AI.FormRecognizer/tests/samples/Sample1_RecognizeContentFromFile.cs b/sdk/formrecognizer/Azure.AI.FormRecognizer/tests/samples/Sample1_RecognizeContentFromFile.cs
index fbe16b1ff5a1..1283395f93db 100644
--- a/sdk/formrecognizer/Azure.AI.FormRecognizer/tests/samples/Sample1_RecognizeContentFromFile.cs
+++ b/sdk/formrecognizer/Azure.AI.FormRecognizer/tests/samples/Sample1_RecognizeContentFromFile.cs
@@ -7,7 +7,7 @@
using System.Threading.Tasks;
using Azure.AI.FormRecognizer.Models;
using Azure.AI.FormRecognizer.Tests;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using NUnit.Framework;
namespace Azure.AI.FormRecognizer.Samples
diff --git a/sdk/formrecognizer/Azure.AI.FormRecognizer/tests/samples/Sample1_RecognizeContentFromUri.cs b/sdk/formrecognizer/Azure.AI.FormRecognizer/tests/samples/Sample1_RecognizeContentFromUri.cs
index 4aa7e5ed48e7..3eb39f78eb7a 100644
--- a/sdk/formrecognizer/Azure.AI.FormRecognizer/tests/samples/Sample1_RecognizeContentFromUri.cs
+++ b/sdk/formrecognizer/Azure.AI.FormRecognizer/tests/samples/Sample1_RecognizeContentFromUri.cs
@@ -6,7 +6,7 @@
using System.Threading.Tasks;
using Azure.AI.FormRecognizer.Models;
using Azure.AI.FormRecognizer.Tests;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using NUnit.Framework;
namespace Azure.AI.FormRecognizer.Samples
diff --git a/sdk/formrecognizer/Azure.AI.FormRecognizer/tests/samples/Sample2_RecognizeReceiptsFromFile.cs b/sdk/formrecognizer/Azure.AI.FormRecognizer/tests/samples/Sample2_RecognizeReceiptsFromFile.cs
index 26fd94a5e163..0b503117c331 100644
--- a/sdk/formrecognizer/Azure.AI.FormRecognizer/tests/samples/Sample2_RecognizeReceiptsFromFile.cs
+++ b/sdk/formrecognizer/Azure.AI.FormRecognizer/tests/samples/Sample2_RecognizeReceiptsFromFile.cs
@@ -7,7 +7,7 @@
using System.Threading.Tasks;
using Azure.AI.FormRecognizer.Models;
using Azure.AI.FormRecognizer.Tests;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using NUnit.Framework;
namespace Azure.AI.FormRecognizer.Samples
diff --git a/sdk/formrecognizer/Azure.AI.FormRecognizer/tests/samples/Sample2_RecognizeReceiptsFromUri.cs b/sdk/formrecognizer/Azure.AI.FormRecognizer/tests/samples/Sample2_RecognizeReceiptsFromUri.cs
index fb6506e207d0..6fee8e1fd14a 100644
--- a/sdk/formrecognizer/Azure.AI.FormRecognizer/tests/samples/Sample2_RecognizeReceiptsFromUri.cs
+++ b/sdk/formrecognizer/Azure.AI.FormRecognizer/tests/samples/Sample2_RecognizeReceiptsFromUri.cs
@@ -6,7 +6,7 @@
using System.Threading.Tasks;
using Azure.AI.FormRecognizer.Models;
using Azure.AI.FormRecognizer.Tests;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using NUnit.Framework;
namespace Azure.AI.FormRecognizer.Samples
diff --git a/sdk/formrecognizer/Azure.AI.FormRecognizer/tests/samples/Sample3_RecognizeCustomFormsFromFile.cs b/sdk/formrecognizer/Azure.AI.FormRecognizer/tests/samples/Sample3_RecognizeCustomFormsFromFile.cs
index b23d801c3932..811be863076b 100644
--- a/sdk/formrecognizer/Azure.AI.FormRecognizer/tests/samples/Sample3_RecognizeCustomFormsFromFile.cs
+++ b/sdk/formrecognizer/Azure.AI.FormRecognizer/tests/samples/Sample3_RecognizeCustomFormsFromFile.cs
@@ -7,7 +7,7 @@
using System.Threading.Tasks;
using Azure.AI.FormRecognizer.Models;
using Azure.AI.FormRecognizer.Tests;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using NUnit.Framework;
namespace Azure.AI.FormRecognizer.Samples
diff --git a/sdk/formrecognizer/Azure.AI.FormRecognizer/tests/samples/Sample3_RecognizeCustomFormsFromUri.cs b/sdk/formrecognizer/Azure.AI.FormRecognizer/tests/samples/Sample3_RecognizeCustomFormsFromUri.cs
index 7a30a1bb0278..3c9ca4eae00b 100644
--- a/sdk/formrecognizer/Azure.AI.FormRecognizer/tests/samples/Sample3_RecognizeCustomFormsFromUri.cs
+++ b/sdk/formrecognizer/Azure.AI.FormRecognizer/tests/samples/Sample3_RecognizeCustomFormsFromUri.cs
@@ -6,7 +6,7 @@
using System.Threading.Tasks;
using Azure.AI.FormRecognizer.Models;
using Azure.AI.FormRecognizer.Tests;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using NUnit.Framework;
namespace Azure.AI.FormRecognizer.Samples
diff --git a/sdk/formrecognizer/Azure.AI.FormRecognizer/tests/samples/Sample4_TrainModelWithForms.cs b/sdk/formrecognizer/Azure.AI.FormRecognizer/tests/samples/Sample4_TrainModelWithForms.cs
index 585217f18f14..ef1f5cad98fe 100644
--- a/sdk/formrecognizer/Azure.AI.FormRecognizer/tests/samples/Sample4_TrainModelWithForms.cs
+++ b/sdk/formrecognizer/Azure.AI.FormRecognizer/tests/samples/Sample4_TrainModelWithForms.cs
@@ -5,7 +5,7 @@
using System.Threading.Tasks;
using Azure.AI.FormRecognizer.Tests;
using Azure.AI.FormRecognizer.Training;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using NUnit.Framework;
namespace Azure.AI.FormRecognizer.Samples
diff --git a/sdk/formrecognizer/Azure.AI.FormRecognizer/tests/samples/Sample5_TrainModelWithFormsAndLabels.cs b/sdk/formrecognizer/Azure.AI.FormRecognizer/tests/samples/Sample5_TrainModelWithFormsAndLabels.cs
index 00979e0a5210..6867b997e32b 100644
--- a/sdk/formrecognizer/Azure.AI.FormRecognizer/tests/samples/Sample5_TrainModelWithFormsAndLabels.cs
+++ b/sdk/formrecognizer/Azure.AI.FormRecognizer/tests/samples/Sample5_TrainModelWithFormsAndLabels.cs
@@ -5,7 +5,7 @@
using System.Threading.Tasks;
using Azure.AI.FormRecognizer.Tests;
using Azure.AI.FormRecognizer.Training;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using NUnit.Framework;
namespace Azure.AI.FormRecognizer.Samples
diff --git a/sdk/formrecognizer/Azure.AI.FormRecognizer/tests/samples/Sample6_ManageCustomModels.cs b/sdk/formrecognizer/Azure.AI.FormRecognizer/tests/samples/Sample6_ManageCustomModels.cs
index 534dba9e9c0a..8844c867e75a 100644
--- a/sdk/formrecognizer/Azure.AI.FormRecognizer/tests/samples/Sample6_ManageCustomModels.cs
+++ b/sdk/formrecognizer/Azure.AI.FormRecognizer/tests/samples/Sample6_ManageCustomModels.cs
@@ -6,7 +6,7 @@
using System.Threading.Tasks;
using Azure.AI.FormRecognizer.Tests;
using Azure.AI.FormRecognizer.Training;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using NUnit.Framework;
namespace Azure.AI.FormRecognizer.Samples
diff --git a/sdk/formrecognizer/Azure.AI.FormRecognizer/tests/samples/Sample6_ManageCustomModelsAsync.cs b/sdk/formrecognizer/Azure.AI.FormRecognizer/tests/samples/Sample6_ManageCustomModelsAsync.cs
index 2f5b05f39e91..1c2bccbd3e45 100644
--- a/sdk/formrecognizer/Azure.AI.FormRecognizer/tests/samples/Sample6_ManageCustomModelsAsync.cs
+++ b/sdk/formrecognizer/Azure.AI.FormRecognizer/tests/samples/Sample6_ManageCustomModelsAsync.cs
@@ -6,7 +6,7 @@
using System.Threading.Tasks;
using Azure.AI.FormRecognizer.Tests;
using Azure.AI.FormRecognizer.Training;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using NUnit.Framework;
namespace Azure.AI.FormRecognizer.Samples
diff --git a/sdk/formrecognizer/Azure.AI.FormRecognizer/tests/samples/SampleSnippets.cs b/sdk/formrecognizer/Azure.AI.FormRecognizer/tests/samples/SampleSnippets.cs
index 249fe826cc7a..980221fe3b20 100644
--- a/sdk/formrecognizer/Azure.AI.FormRecognizer/tests/samples/SampleSnippets.cs
+++ b/sdk/formrecognizer/Azure.AI.FormRecognizer/tests/samples/SampleSnippets.cs
@@ -8,7 +8,7 @@
using Azure.AI.FormRecognizer.Models;
using Azure.AI.FormRecognizer.Tests;
using Azure.AI.FormRecognizer.Training;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using NUnit.Framework;
namespace Azure.AI.FormRecognizer.Samples
diff --git a/sdk/identity/Azure.Identity/tests/AuthorizationCodeCredentialTests.cs b/sdk/identity/Azure.Identity/tests/AuthorizationCodeCredentialTests.cs
index f6ab99532d85..73d50c227040 100644
--- a/sdk/identity/Azure.Identity/tests/AuthorizationCodeCredentialTests.cs
+++ b/sdk/identity/Azure.Identity/tests/AuthorizationCodeCredentialTests.cs
@@ -4,7 +4,7 @@
using System;
using System.Threading.Tasks;
using Azure.Core;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using NUnit.Framework;
namespace Azure.Identity.Tests
diff --git a/sdk/identity/Azure.Identity/tests/Azure.Identity.Tests.csproj b/sdk/identity/Azure.Identity/tests/Azure.Identity.Tests.csproj
index 311c5021830a..a40932909f5d 100644
--- a/sdk/identity/Azure.Identity/tests/Azure.Identity.Tests.csproj
+++ b/sdk/identity/Azure.Identity/tests/Azure.Identity.Tests.csproj
@@ -14,10 +14,9 @@
-
-
-
+
+
diff --git a/sdk/identity/Azure.Identity/tests/AzureCliCredentialTests.cs b/sdk/identity/Azure.Identity/tests/AzureCliCredentialTests.cs
index 24fc566545df..f55def36b4be 100644
--- a/sdk/identity/Azure.Identity/tests/AzureCliCredentialTests.cs
+++ b/sdk/identity/Azure.Identity/tests/AzureCliCredentialTests.cs
@@ -6,7 +6,7 @@
using System.Threading;
using System.Threading.Tasks;
using Azure.Core;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using Azure.Identity.Tests.Mock;
using NUnit.Framework;
diff --git a/sdk/identity/Azure.Identity/tests/AzureIdentityEventSourceTests.cs b/sdk/identity/Azure.Identity/tests/AzureIdentityEventSourceTests.cs
index b7500e174522..33d1c19199f6 100644
--- a/sdk/identity/Azure.Identity/tests/AzureIdentityEventSourceTests.cs
+++ b/sdk/identity/Azure.Identity/tests/AzureIdentityEventSourceTests.cs
@@ -6,7 +6,7 @@
using System.Security.Cryptography.X509Certificates;
using System.Threading.Tasks;
using Azure.Core;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using Azure.Identity.Tests.Mock;
using Microsoft.Identity.Client;
using NUnit.Framework;
diff --git a/sdk/identity/Azure.Identity/tests/ClientCertificateCredentialTests.cs b/sdk/identity/Azure.Identity/tests/ClientCertificateCredentialTests.cs
index d971f47005ed..b37207a23a41 100644
--- a/sdk/identity/Azure.Identity/tests/ClientCertificateCredentialTests.cs
+++ b/sdk/identity/Azure.Identity/tests/ClientCertificateCredentialTests.cs
@@ -10,7 +10,7 @@
using System.Text.Json;
using System.Threading.Tasks;
using Azure.Core;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using Azure.Identity.Tests.Mock;
using NUnit.Framework;
diff --git a/sdk/identity/Azure.Identity/tests/ClientSecretCredentialTests.cs b/sdk/identity/Azure.Identity/tests/ClientSecretCredentialTests.cs
index 1fa4c796c456..5a2d399fc068 100644
--- a/sdk/identity/Azure.Identity/tests/ClientSecretCredentialTests.cs
+++ b/sdk/identity/Azure.Identity/tests/ClientSecretCredentialTests.cs
@@ -7,7 +7,7 @@
using System.Text;
using System.Threading.Tasks;
using Azure.Core;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using Azure.Identity.Tests.Mock;
using Moq;
using NUnit.Framework;
diff --git a/sdk/identity/Azure.Identity/tests/DefaultAzureCredentialTests.cs b/sdk/identity/Azure.Identity/tests/DefaultAzureCredentialTests.cs
index 864f09c51383..cf0f0863eb37 100644
--- a/sdk/identity/Azure.Identity/tests/DefaultAzureCredentialTests.cs
+++ b/sdk/identity/Azure.Identity/tests/DefaultAzureCredentialTests.cs
@@ -5,7 +5,7 @@
using System.Collections.Generic;
using System.Threading.Tasks;
using Azure.Core;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using Azure.Identity.Tests.Mock;
using Moq;
using NUnit.Framework;
diff --git a/sdk/identity/Azure.Identity/tests/DeviceCodeCredentialTests.cs b/sdk/identity/Azure.Identity/tests/DeviceCodeCredentialTests.cs
index 81b534cdbe6f..7f2344a9dd4d 100644
--- a/sdk/identity/Azure.Identity/tests/DeviceCodeCredentialTests.cs
+++ b/sdk/identity/Azure.Identity/tests/DeviceCodeCredentialTests.cs
@@ -2,7 +2,7 @@
// Licensed under the MIT License.
using Azure.Core;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using NUnit.Framework;
using System;
using System.Collections.Generic;
diff --git a/sdk/identity/Azure.Identity/tests/EnvironmentCredentialProviderTests.cs b/sdk/identity/Azure.Identity/tests/EnvironmentCredentialProviderTests.cs
index 7dc94840ad29..66ab500c36ae 100644
--- a/sdk/identity/Azure.Identity/tests/EnvironmentCredentialProviderTests.cs
+++ b/sdk/identity/Azure.Identity/tests/EnvironmentCredentialProviderTests.cs
@@ -5,7 +5,7 @@
using System;
using System.Reflection;
using NUnit.Framework;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using Azure.Identity.Tests.Mock;
using System.Threading.Tasks;
diff --git a/sdk/identity/Azure.Identity/tests/IdentityRecordedTestSanitizer.cs b/sdk/identity/Azure.Identity/tests/IdentityRecordedTestSanitizer.cs
index e4fb5af6b63d..9b188aafa4c3 100644
--- a/sdk/identity/Azure.Identity/tests/IdentityRecordedTestSanitizer.cs
+++ b/sdk/identity/Azure.Identity/tests/IdentityRecordedTestSanitizer.cs
@@ -7,7 +7,7 @@
using System.Text;
using System.Text.Json;
using Azure.Core;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
namespace Azure.Identity.Tests
{
diff --git a/sdk/identity/Azure.Identity/tests/IdentityTestEnvironment.cs b/sdk/identity/Azure.Identity/tests/IdentityTestEnvironment.cs
index 803a3c06daa9..eb9c00aafcd3 100644
--- a/sdk/identity/Azure.Identity/tests/IdentityTestEnvironment.cs
+++ b/sdk/identity/Azure.Identity/tests/IdentityTestEnvironment.cs
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
namespace Azure.Identity.Tests
{
diff --git a/sdk/identity/Azure.Identity/tests/InteractiveBrowserCredentialTests.cs b/sdk/identity/Azure.Identity/tests/InteractiveBrowserCredentialTests.cs
index b534351e7bd2..ca313354c5e0 100644
--- a/sdk/identity/Azure.Identity/tests/InteractiveBrowserCredentialTests.cs
+++ b/sdk/identity/Azure.Identity/tests/InteractiveBrowserCredentialTests.cs
@@ -2,7 +2,7 @@
// Licensed under the MIT License.
using Azure.Core;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using Azure.Identity.Tests.Mock;
using Microsoft.Identity.Client;
using NUnit.Framework;
diff --git a/sdk/identity/Azure.Identity/tests/LightweightPcks8DecoderTests.cs b/sdk/identity/Azure.Identity/tests/LightweightPcks8DecoderTests.cs
index 8874a20c0a18..87b185eba4cd 100644
--- a/sdk/identity/Azure.Identity/tests/LightweightPcks8DecoderTests.cs
+++ b/sdk/identity/Azure.Identity/tests/LightweightPcks8DecoderTests.cs
@@ -7,7 +7,7 @@
using System.Security.Cryptography.X509Certificates;
using System.Text;
using System.Text.RegularExpressions;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using NUnit.Framework;
namespace Azure.Identity.Tests
diff --git a/sdk/identity/Azure.Identity/tests/ManagedIdentityCredentialImdsLiveTests.cs b/sdk/identity/Azure.Identity/tests/ManagedIdentityCredentialImdsLiveTests.cs
index e478c9d3dbd3..d68e81a78ca8 100644
--- a/sdk/identity/Azure.Identity/tests/ManagedIdentityCredentialImdsLiveTests.cs
+++ b/sdk/identity/Azure.Identity/tests/ManagedIdentityCredentialImdsLiveTests.cs
@@ -6,7 +6,7 @@
using System.Reflection;
using System.Text;
using System.Threading.Tasks;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using Azure.Identity.Tests.Mock;
using Azure.Security.KeyVault.Secrets;
using NUnit.Framework;
diff --git a/sdk/identity/Azure.Identity/tests/ManagedIdentityCredentialLiveTests.cs b/sdk/identity/Azure.Identity/tests/ManagedIdentityCredentialLiveTests.cs
index c8c9a6395fb1..6045b92df12c 100644
--- a/sdk/identity/Azure.Identity/tests/ManagedIdentityCredentialLiveTests.cs
+++ b/sdk/identity/Azure.Identity/tests/ManagedIdentityCredentialLiveTests.cs
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using NUnit.Framework;
using System.Threading.Tasks;
using Azure.Core;
diff --git a/sdk/identity/Azure.Identity/tests/ManagedIdentityCredentialTests.cs b/sdk/identity/Azure.Identity/tests/ManagedIdentityCredentialTests.cs
index 56019d434b2e..48a2830d9908 100644
--- a/sdk/identity/Azure.Identity/tests/ManagedIdentityCredentialTests.cs
+++ b/sdk/identity/Azure.Identity/tests/ManagedIdentityCredentialTests.cs
@@ -8,7 +8,7 @@
using System.Threading;
using System.Threading.Tasks;
using Azure.Core;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using Azure.Identity.Tests.Mock;
using NUnit.Framework;
diff --git a/sdk/identity/Azure.Identity/tests/MockExtensions.cs b/sdk/identity/Azure.Identity/tests/MockExtensions.cs
index c00310b55208..3c79a7bef744 100644
--- a/sdk/identity/Azure.Identity/tests/MockExtensions.cs
+++ b/sdk/identity/Azure.Identity/tests/MockExtensions.cs
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using System;
using System.Collections.Generic;
using System.Text;
diff --git a/sdk/identity/Azure.Identity/tests/SharedTokenCacheCredentialTests.cs b/sdk/identity/Azure.Identity/tests/SharedTokenCacheCredentialTests.cs
index 449d5ced97b6..e503306ecf0e 100644
--- a/sdk/identity/Azure.Identity/tests/SharedTokenCacheCredentialTests.cs
+++ b/sdk/identity/Azure.Identity/tests/SharedTokenCacheCredentialTests.cs
@@ -4,7 +4,7 @@
using System;
using System.Threading.Tasks;
using Azure.Core;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using Azure.Identity.Tests.Mock;
using Microsoft.Identity.Client;
using NUnit.Framework;
diff --git a/sdk/identity/Azure.Identity/tests/TokenCredentialOptionsTests.cs b/sdk/identity/Azure.Identity/tests/TokenCredentialOptionsTests.cs
index 002d4f6b0108..3c59877de207 100644
--- a/sdk/identity/Azure.Identity/tests/TokenCredentialOptionsTests.cs
+++ b/sdk/identity/Azure.Identity/tests/TokenCredentialOptionsTests.cs
@@ -2,7 +2,7 @@
// Licensed under the MIT License.
using System;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using NUnit.Framework;
namespace Azure.Identity.Tests
diff --git a/sdk/identity/Azure.Identity/tests/UsernamePasswordCredentialLiveTests.cs b/sdk/identity/Azure.Identity/tests/UsernamePasswordCredentialLiveTests.cs
index 0a054affbfce..7e5dbae1e50b 100644
--- a/sdk/identity/Azure.Identity/tests/UsernamePasswordCredentialLiveTests.cs
+++ b/sdk/identity/Azure.Identity/tests/UsernamePasswordCredentialLiveTests.cs
@@ -6,7 +6,7 @@
using System.Reflection;
using System.Threading.Tasks;
using Azure.Core;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using Microsoft.Identity.Client;
using NUnit.Framework;
diff --git a/sdk/identity/Azure.Identity/tests/UsernamePasswordCredentialTests.cs b/sdk/identity/Azure.Identity/tests/UsernamePasswordCredentialTests.cs
index c1a4e77c204a..1107664f9b36 100644
--- a/sdk/identity/Azure.Identity/tests/UsernamePasswordCredentialTests.cs
+++ b/sdk/identity/Azure.Identity/tests/UsernamePasswordCredentialTests.cs
@@ -2,7 +2,7 @@
// Licensed under the MIT License.
using Azure.Core;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using Azure.Identity.Tests.Mock;
using NUnit.Framework;
using System;
diff --git a/sdk/identity/Azure.Identity/tests/VisualStudioCodeCredentialLiveTests.cs b/sdk/identity/Azure.Identity/tests/VisualStudioCodeCredentialLiveTests.cs
index b72a38461d1e..edcb1223ad72 100644
--- a/sdk/identity/Azure.Identity/tests/VisualStudioCodeCredentialLiveTests.cs
+++ b/sdk/identity/Azure.Identity/tests/VisualStudioCodeCredentialLiveTests.cs
@@ -10,7 +10,7 @@
using System.Threading.Tasks;
using Azure.Core;
using Azure.Core.Pipeline;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using Microsoft.Identity.Client;
using NUnit.Framework;
diff --git a/sdk/identity/Azure.Identity/tests/VisualStudioCredentialTests.cs b/sdk/identity/Azure.Identity/tests/VisualStudioCredentialTests.cs
index 694fd909b1b2..6f6cec5a96fa 100644
--- a/sdk/identity/Azure.Identity/tests/VisualStudioCredentialTests.cs
+++ b/sdk/identity/Azure.Identity/tests/VisualStudioCredentialTests.cs
@@ -9,7 +9,7 @@
using System.Threading;
using System.Threading.Tasks;
using Azure.Core;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using NUnit.Framework;
namespace Azure.Identity.Tests
diff --git a/sdk/keyvault/Azure.Security.KeyVault.Certificates/tests/Azure.Security.KeyVault.Certificates.Tests.csproj b/sdk/keyvault/Azure.Security.KeyVault.Certificates/tests/Azure.Security.KeyVault.Certificates.Tests.csproj
index 64f82796f7f7..60289b2748f5 100644
--- a/sdk/keyvault/Azure.Security.KeyVault.Certificates/tests/Azure.Security.KeyVault.Certificates.Tests.csproj
+++ b/sdk/keyvault/Azure.Security.KeyVault.Certificates/tests/Azure.Security.KeyVault.Certificates.Tests.csproj
@@ -4,7 +4,6 @@
$(RequiredTargetFrameworks)
-
@@ -25,6 +24,7 @@
+
diff --git a/sdk/keyvault/Azure.Security.KeyVault.Certificates/tests/CertificateClientLiveTests.cs b/sdk/keyvault/Azure.Security.KeyVault.Certificates/tests/CertificateClientLiveTests.cs
index 67ed62beb4df..416b0d1ceb92 100644
--- a/sdk/keyvault/Azure.Security.KeyVault.Certificates/tests/CertificateClientLiveTests.cs
+++ b/sdk/keyvault/Azure.Security.KeyVault.Certificates/tests/CertificateClientLiveTests.cs
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using NUnit.Framework;
using Org.BouncyCastle.Asn1;
using Org.BouncyCastle.Asn1.Pkcs;
diff --git a/sdk/keyvault/Azure.Security.KeyVault.Certificates/tests/CertificateClientTests.cs b/sdk/keyvault/Azure.Security.KeyVault.Certificates/tests/CertificateClientTests.cs
index a1b2fb793c67..32ac22085ca7 100644
--- a/sdk/keyvault/Azure.Security.KeyVault.Certificates/tests/CertificateClientTests.cs
+++ b/sdk/keyvault/Azure.Security.KeyVault.Certificates/tests/CertificateClientTests.cs
@@ -3,7 +3,7 @@
using System;
using System.Collections.Generic;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using Azure.Identity;
using NUnit.Framework;
diff --git a/sdk/keyvault/Azure.Security.KeyVault.Certificates/tests/CertificatesTestBase.cs b/sdk/keyvault/Azure.Security.KeyVault.Certificates/tests/CertificatesTestBase.cs
index 9c05fd83707e..fb241c8269db 100644
--- a/sdk/keyvault/Azure.Security.KeyVault.Certificates/tests/CertificatesTestBase.cs
+++ b/sdk/keyvault/Azure.Security.KeyVault.Certificates/tests/CertificatesTestBase.cs
@@ -6,7 +6,7 @@
using System.Collections.Generic;
using System.Threading;
using System.Threading.Tasks;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using Azure.Identity;
using Azure.Security.KeyVault.Tests;
using NUnit.Framework;
diff --git a/sdk/keyvault/Azure.Security.KeyVault.Certificates/tests/SampleFixture.cs b/sdk/keyvault/Azure.Security.KeyVault.Certificates/tests/SampleFixture.cs
index a0616b0a7a2f..81cd0af95f38 100644
--- a/sdk/keyvault/Azure.Security.KeyVault.Certificates/tests/SampleFixture.cs
+++ b/sdk/keyvault/Azure.Security.KeyVault.Certificates/tests/SampleFixture.cs
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using Azure.Security.KeyVault.Tests;
using NUnit.Framework;
diff --git a/sdk/keyvault/Azure.Security.KeyVault.Keys/tests/Azure.Security.KeyVault.Keys.Tests.csproj b/sdk/keyvault/Azure.Security.KeyVault.Keys/tests/Azure.Security.KeyVault.Keys.Tests.csproj
index b7b68d929a5e..6a297cf21d46 100644
--- a/sdk/keyvault/Azure.Security.KeyVault.Keys/tests/Azure.Security.KeyVault.Keys.Tests.csproj
+++ b/sdk/keyvault/Azure.Security.KeyVault.Keys/tests/Azure.Security.KeyVault.Keys.Tests.csproj
@@ -5,7 +5,6 @@
$(RequiredTargetFrameworks);net461;net47
-
@@ -19,6 +18,7 @@
+
diff --git a/sdk/keyvault/Azure.Security.KeyVault.Keys/tests/CryptographyClientLiveTests.cs b/sdk/keyvault/Azure.Security.KeyVault.Keys/tests/CryptographyClientLiveTests.cs
index 2d27e21b5d52..c898602430ea 100644
--- a/sdk/keyvault/Azure.Security.KeyVault.Keys/tests/CryptographyClientLiveTests.cs
+++ b/sdk/keyvault/Azure.Security.KeyVault.Keys/tests/CryptographyClientLiveTests.cs
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using Azure.Identity;
using Azure.Security.KeyVault.Keys.Cryptography;
using NUnit.Framework;
diff --git a/sdk/keyvault/Azure.Security.KeyVault.Keys/tests/CryptographyClientTests.cs b/sdk/keyvault/Azure.Security.KeyVault.Keys/tests/CryptographyClientTests.cs
index f415d3e2fb5f..c1d63f12adb8 100644
--- a/sdk/keyvault/Azure.Security.KeyVault.Keys/tests/CryptographyClientTests.cs
+++ b/sdk/keyvault/Azure.Security.KeyVault.Keys/tests/CryptographyClientTests.cs
@@ -2,7 +2,7 @@
// Licensed under the MIT License.
using Azure.Core;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using Azure.Identity;
using Azure.Security.KeyVault.Keys.Cryptography;
using NUnit.Framework;
diff --git a/sdk/keyvault/Azure.Security.KeyVault.Keys/tests/DelayCreateKeyInterceptor.cs b/sdk/keyvault/Azure.Security.KeyVault.Keys/tests/DelayCreateKeyInterceptor.cs
index a2452080e3d2..df625daa9919 100644
--- a/sdk/keyvault/Azure.Security.KeyVault.Keys/tests/DelayCreateKeyInterceptor.cs
+++ b/sdk/keyvault/Azure.Security.KeyVault.Keys/tests/DelayCreateKeyInterceptor.cs
@@ -3,7 +3,7 @@
using System;
using System.Threading;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using Castle.DynamicProxy;
using NUnit.Framework;
diff --git a/sdk/keyvault/Azure.Security.KeyVault.Keys/tests/KeyClientLiveTests.cs b/sdk/keyvault/Azure.Security.KeyVault.Keys/tests/KeyClientLiveTests.cs
index ccee20c744be..f6bf5723550c 100644
--- a/sdk/keyvault/Azure.Security.KeyVault.Keys/tests/KeyClientLiveTests.cs
+++ b/sdk/keyvault/Azure.Security.KeyVault.Keys/tests/KeyClientLiveTests.cs
@@ -6,7 +6,7 @@
using System.Linq;
using System.Text;
using System.Threading.Tasks;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using NUnit.Framework;
namespace Azure.Security.KeyVault.Keys.Tests
diff --git a/sdk/keyvault/Azure.Security.KeyVault.Keys/tests/KeyClientTests.cs b/sdk/keyvault/Azure.Security.KeyVault.Keys/tests/KeyClientTests.cs
index 1707bcd7da0e..b9304ae3041b 100644
--- a/sdk/keyvault/Azure.Security.KeyVault.Keys/tests/KeyClientTests.cs
+++ b/sdk/keyvault/Azure.Security.KeyVault.Keys/tests/KeyClientTests.cs
@@ -3,7 +3,7 @@
using System;
using System.Collections.Generic;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using Azure.Identity;
using NUnit.Framework;
diff --git a/sdk/keyvault/Azure.Security.KeyVault.Keys/tests/KeyResolverLiveTests.cs b/sdk/keyvault/Azure.Security.KeyVault.Keys/tests/KeyResolverLiveTests.cs
index 11c7ac05ee61..6db6db27a875 100644
--- a/sdk/keyvault/Azure.Security.KeyVault.Keys/tests/KeyResolverLiveTests.cs
+++ b/sdk/keyvault/Azure.Security.KeyVault.Keys/tests/KeyResolverLiveTests.cs
@@ -4,7 +4,7 @@
using System.Threading.Tasks;
using Azure.Core;
using Azure.Core.Cryptography;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using Azure.Identity;
using Azure.Security.KeyVault.Keys.Cryptography;
using Azure.Security.KeyVault.Secrets;
diff --git a/sdk/keyvault/Azure.Security.KeyVault.Keys/tests/KeysEventSourceTests.cs b/sdk/keyvault/Azure.Security.KeyVault.Keys/tests/KeysEventSourceTests.cs
index 02b7e84560f4..052e6bfec333 100644
--- a/sdk/keyvault/Azure.Security.KeyVault.Keys/tests/KeysEventSourceTests.cs
+++ b/sdk/keyvault/Azure.Security.KeyVault.Keys/tests/KeysEventSourceTests.cs
@@ -7,7 +7,7 @@
using System.Security.Cryptography;
using System.Threading.Tasks;
using Azure.Core.Pipeline;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using Azure.Identity;
using Azure.Security.KeyVault.Keys.Cryptography;
using Azure.Security.KeyVault.Tests;
diff --git a/sdk/keyvault/Azure.Security.KeyVault.Keys/tests/KeysTestBase.cs b/sdk/keyvault/Azure.Security.KeyVault.Keys/tests/KeysTestBase.cs
index e0f695f1a94c..dc3a3b6cf01b 100644
--- a/sdk/keyvault/Azure.Security.KeyVault.Keys/tests/KeysTestBase.cs
+++ b/sdk/keyvault/Azure.Security.KeyVault.Keys/tests/KeysTestBase.cs
@@ -5,7 +5,7 @@
using System.Collections.Concurrent;
using System.Collections.Generic;
using System.Threading.Tasks;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using Azure.Identity;
using Azure.Security.KeyVault.Tests;
using Castle.DynamicProxy;
diff --git a/sdk/keyvault/Azure.Security.KeyVault.Keys/tests/SampleFixture.cs b/sdk/keyvault/Azure.Security.KeyVault.Keys/tests/SampleFixture.cs
index c5fb4d47d8b8..39b5449a7ea6 100644
--- a/sdk/keyvault/Azure.Security.KeyVault.Keys/tests/SampleFixture.cs
+++ b/sdk/keyvault/Azure.Security.KeyVault.Keys/tests/SampleFixture.cs
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using Azure.Security.KeyVault.Tests;
using NUnit.Framework;
diff --git a/sdk/keyvault/Azure.Security.KeyVault.Keys/tests/samples/SampleSnippets.cs b/sdk/keyvault/Azure.Security.KeyVault.Keys/tests/samples/SampleSnippets.cs
index fc87d3a3ceb4..7192c1191aed 100644
--- a/sdk/keyvault/Azure.Security.KeyVault.Keys/tests/samples/SampleSnippets.cs
+++ b/sdk/keyvault/Azure.Security.KeyVault.Keys/tests/samples/SampleSnippets.cs
@@ -8,7 +8,7 @@
using System.Text;
using System.Threading;
using System.Threading.Tasks;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using Azure.Security.KeyVault.Tests;
namespace Azure.Security.KeyVault.Keys.Samples
diff --git a/sdk/keyvault/Azure.Security.KeyVault.Secrets/tests/Azure.Security.KeyVault.Secrets.Tests.csproj b/sdk/keyvault/Azure.Security.KeyVault.Secrets/tests/Azure.Security.KeyVault.Secrets.Tests.csproj
index 9b70334b0501..60807fbb4c16 100644
--- a/sdk/keyvault/Azure.Security.KeyVault.Secrets/tests/Azure.Security.KeyVault.Secrets.Tests.csproj
+++ b/sdk/keyvault/Azure.Security.KeyVault.Secrets/tests/Azure.Security.KeyVault.Secrets.Tests.csproj
@@ -4,7 +4,6 @@
$(RequiredTargetFrameworks)
-
@@ -18,6 +17,7 @@
+
diff --git a/sdk/keyvault/Azure.Security.KeyVault.Secrets/tests/ChallengeBasedAuthenticationPolicyTests.cs b/sdk/keyvault/Azure.Security.KeyVault.Secrets/tests/ChallengeBasedAuthenticationPolicyTests.cs
index 48b3a30bbde0..23f74958f9e4 100644
--- a/sdk/keyvault/Azure.Security.KeyVault.Secrets/tests/ChallengeBasedAuthenticationPolicyTests.cs
+++ b/sdk/keyvault/Azure.Security.KeyVault.Secrets/tests/ChallengeBasedAuthenticationPolicyTests.cs
@@ -13,7 +13,7 @@
using Azure.Core;
using Azure.Core.Diagnostics;
using Azure.Core.Pipeline;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using Azure.Security.KeyVault.Tests;
using NUnit.Framework;
diff --git a/sdk/keyvault/Azure.Security.KeyVault.Secrets/tests/SampleFixture.cs b/sdk/keyvault/Azure.Security.KeyVault.Secrets/tests/SampleFixture.cs
index 98f2c4778b60..e36ccb52b004 100644
--- a/sdk/keyvault/Azure.Security.KeyVault.Secrets/tests/SampleFixture.cs
+++ b/sdk/keyvault/Azure.Security.KeyVault.Secrets/tests/SampleFixture.cs
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using Azure.Security.KeyVault.Tests;
using NUnit.Framework;
diff --git a/sdk/keyvault/Azure.Security.KeyVault.Secrets/tests/SecretClientLiveTests.cs b/sdk/keyvault/Azure.Security.KeyVault.Secrets/tests/SecretClientLiveTests.cs
index 196029f2f0e3..f995bcbf373b 100644
--- a/sdk/keyvault/Azure.Security.KeyVault.Secrets/tests/SecretClientLiveTests.cs
+++ b/sdk/keyvault/Azure.Security.KeyVault.Secrets/tests/SecretClientLiveTests.cs
@@ -6,7 +6,7 @@
using System.Linq;
using System.Threading.Tasks;
using NUnit.Framework;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using System.Text;
using NUnit.Framework.Constraints;
diff --git a/sdk/keyvault/Azure.Security.KeyVault.Secrets/tests/SecretClientTests.cs b/sdk/keyvault/Azure.Security.KeyVault.Secrets/tests/SecretClientTests.cs
index 0c915c60669f..412edb896666 100644
--- a/sdk/keyvault/Azure.Security.KeyVault.Secrets/tests/SecretClientTests.cs
+++ b/sdk/keyvault/Azure.Security.KeyVault.Secrets/tests/SecretClientTests.cs
@@ -2,7 +2,7 @@
// Licensed under the MIT License.
using System;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using Azure.Identity;
using NUnit.Framework;
diff --git a/sdk/keyvault/Azure.Security.KeyVault.Secrets/tests/SecretsTestBase.cs b/sdk/keyvault/Azure.Security.KeyVault.Secrets/tests/SecretsTestBase.cs
index 625e80323bf8..5c9d6e7a0bba 100644
--- a/sdk/keyvault/Azure.Security.KeyVault.Secrets/tests/SecretsTestBase.cs
+++ b/sdk/keyvault/Azure.Security.KeyVault.Secrets/tests/SecretsTestBase.cs
@@ -5,7 +5,7 @@
using System.Collections.Concurrent;
using System.Collections.Generic;
using System.Threading.Tasks;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using Azure.Security.KeyVault.Tests;
using NUnit.Framework;
diff --git a/sdk/keyvault/Azure.Security.KeyVault.Shared/tests/KeyVaultTestEnvironment.cs b/sdk/keyvault/Azure.Security.KeyVault.Shared/tests/KeyVaultTestEnvironment.cs
index 23bbf3e1ff7a..66301c6d7893 100644
--- a/sdk/keyvault/Azure.Security.KeyVault.Shared/tests/KeyVaultTestEnvironment.cs
+++ b/sdk/keyvault/Azure.Security.KeyVault.Shared/tests/KeyVaultTestEnvironment.cs
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
namespace Azure.Security.KeyVault.Tests
{
diff --git a/sdk/search/Azure.Search.Documents/tests/Azure.Search.Documents.Tests.csproj b/sdk/search/Azure.Search.Documents/tests/Azure.Search.Documents.Tests.csproj
index e96db34ef4b2..d007e465c995 100644
--- a/sdk/search/Azure.Search.Documents/tests/Azure.Search.Documents.Tests.csproj
+++ b/sdk/search/Azure.Search.Documents/tests/Azure.Search.Documents.Tests.csproj
@@ -20,6 +20,7 @@
+
@@ -37,7 +38,4 @@
-
-
-
diff --git a/sdk/search/Azure.Search.Documents/tests/DocumentOperations/AutocompleteTests.cs b/sdk/search/Azure.Search.Documents/tests/DocumentOperations/AutocompleteTests.cs
index 7859cf22592e..b9cf154a9e66 100644
--- a/sdk/search/Azure.Search.Documents/tests/DocumentOperations/AutocompleteTests.cs
+++ b/sdk/search/Azure.Search.Documents/tests/DocumentOperations/AutocompleteTests.cs
@@ -5,7 +5,7 @@
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using Azure.Search.Documents.Models;
using NUnit.Framework;
diff --git a/sdk/search/Azure.Search.Documents/tests/DocumentOperations/GetDocumentTests.cs b/sdk/search/Azure.Search.Documents/tests/DocumentOperations/GetDocumentTests.cs
index d3d261f774a6..cb694b6ae9e7 100644
--- a/sdk/search/Azure.Search.Documents/tests/DocumentOperations/GetDocumentTests.cs
+++ b/sdk/search/Azure.Search.Documents/tests/DocumentOperations/GetDocumentTests.cs
@@ -6,7 +6,7 @@
using System.Linq;
using System.Text.Json.Serialization;
using System.Threading.Tasks;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using Azure.Search.Documents.Models;
using NUnit.Framework;
diff --git a/sdk/search/Azure.Search.Documents/tests/DocumentOperations/IndexingTests.cs b/sdk/search/Azure.Search.Documents/tests/DocumentOperations/IndexingTests.cs
index 6ba318ac22b5..b1356d52a47a 100644
--- a/sdk/search/Azure.Search.Documents/tests/DocumentOperations/IndexingTests.cs
+++ b/sdk/search/Azure.Search.Documents/tests/DocumentOperations/IndexingTests.cs
@@ -6,7 +6,7 @@
using System.Linq;
using System.Text.Json.Serialization;
using System.Threading.Tasks;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using Azure.Search.Documents.Models;
using NUnit.Framework;
diff --git a/sdk/search/Azure.Search.Documents/tests/DocumentOperations/SearchTests.cs b/sdk/search/Azure.Search.Documents/tests/DocumentOperations/SearchTests.cs
index f1367997a18b..d83dfc68aa80 100644
--- a/sdk/search/Azure.Search.Documents/tests/DocumentOperations/SearchTests.cs
+++ b/sdk/search/Azure.Search.Documents/tests/DocumentOperations/SearchTests.cs
@@ -5,7 +5,7 @@
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using Azure.Search.Documents.Models;
using NUnit.Framework;
diff --git a/sdk/search/Azure.Search.Documents/tests/DocumentOperations/SuggestTests.cs b/sdk/search/Azure.Search.Documents/tests/DocumentOperations/SuggestTests.cs
index 3c061381eec5..48df6ad975e7 100644
--- a/sdk/search/Azure.Search.Documents/tests/DocumentOperations/SuggestTests.cs
+++ b/sdk/search/Azure.Search.Documents/tests/DocumentOperations/SuggestTests.cs
@@ -5,7 +5,7 @@
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using Azure.Search.Documents.Models;
using NUnit.Framework;
diff --git a/sdk/search/Azure.Search.Documents/tests/Samples/HelloWorld.cs b/sdk/search/Azure.Search.Documents/tests/Samples/HelloWorld.cs
index 0ae41dce568a..b0180e0e7dbe 100644
--- a/sdk/search/Azure.Search.Documents/tests/Samples/HelloWorld.cs
+++ b/sdk/search/Azure.Search.Documents/tests/Samples/HelloWorld.cs
@@ -3,7 +3,7 @@
using System;
using System.Threading.Tasks;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
#region Snippet:Azure_Search_Tests_Samples_Namespaces
using Azure.Search.Documents;
using Azure.Search.Documents.Models;
diff --git a/sdk/search/Azure.Search.Documents/tests/Samples/Readme.cs b/sdk/search/Azure.Search.Documents/tests/Samples/Readme.cs
index a07dd48c2f40..90ddc3725d11 100644
--- a/sdk/search/Azure.Search.Documents/tests/Samples/Readme.cs
+++ b/sdk/search/Azure.Search.Documents/tests/Samples/Readme.cs
@@ -4,7 +4,7 @@
using System;
using System.Text.Json.Serialization;
using System.Threading.Tasks;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using Azure.Search.Documents.Models;
using NUnit.Framework;
diff --git a/sdk/search/Azure.Search.Documents/tests/SearchServiceClientTests.cs b/sdk/search/Azure.Search.Documents/tests/SearchServiceClientTests.cs
index 59a43076bd86..d82be39eb340 100644
--- a/sdk/search/Azure.Search.Documents/tests/SearchServiceClientTests.cs
+++ b/sdk/search/Azure.Search.Documents/tests/SearchServiceClientTests.cs
@@ -8,7 +8,7 @@
using System.Threading.Tasks;
using Azure.Core;
using Azure.Core.Pipeline;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using Azure.Search.Documents.Models;
using NUnit.Framework;
diff --git a/sdk/search/Azure.Search.Documents/tests/Serialization/SearchFilterTests.cs b/sdk/search/Azure.Search.Documents/tests/Serialization/SearchFilterTests.cs
index ee63e2f601f5..190d4744ea64 100644
--- a/sdk/search/Azure.Search.Documents/tests/Serialization/SearchFilterTests.cs
+++ b/sdk/search/Azure.Search.Documents/tests/Serialization/SearchFilterTests.cs
@@ -4,7 +4,7 @@
using System;
using System.Text;
using System.Threading.Tasks;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using NUnit.Framework;
namespace Azure.Search.Documents.Tests
diff --git a/sdk/search/Azure.Search.Documents/tests/Utilities/SearchRecordedTestSanitizer.cs b/sdk/search/Azure.Search.Documents/tests/Utilities/SearchRecordedTestSanitizer.cs
index ee7dd1c35a65..cc003431bd05 100644
--- a/sdk/search/Azure.Search.Documents/tests/Utilities/SearchRecordedTestSanitizer.cs
+++ b/sdk/search/Azure.Search.Documents/tests/Utilities/SearchRecordedTestSanitizer.cs
@@ -6,7 +6,7 @@
using System.Linq;
using System.Text;
using System.Text.Encodings.Web;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
namespace Azure.Search.Documents.Tests
{
diff --git a/sdk/search/Azure.Search.Documents/tests/Utilities/SearchResources.cs b/sdk/search/Azure.Search.Documents/tests/Utilities/SearchResources.cs
index 8649fff6dc8c..fa3fdf7b9ccc 100644
--- a/sdk/search/Azure.Search.Documents/tests/Utilities/SearchResources.cs
+++ b/sdk/search/Azure.Search.Documents/tests/Utilities/SearchResources.cs
@@ -10,7 +10,7 @@
using System.Text.Json;
using System.Threading;
using System.Threading.Tasks;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using Azure.Search.Documents.Models;
using Azure.Storage.Blobs;
using Microsoft.Azure.Management.ResourceManager.Fluent;
diff --git a/sdk/search/Azure.Search.Documents/tests/Utilities/SearchTestBase.cs b/sdk/search/Azure.Search.Documents/tests/Utilities/SearchTestBase.cs
index da89f7d80d1d..264f7394562a 100644
--- a/sdk/search/Azure.Search.Documents/tests/Utilities/SearchTestBase.cs
+++ b/sdk/search/Azure.Search.Documents/tests/Utilities/SearchTestBase.cs
@@ -8,7 +8,7 @@
using System.Threading.Tasks;
using Azure.Core;
using Azure.Core.Pipeline;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using Azure.Search.Documents.Models;
using NUnit.Framework;
diff --git a/sdk/search/Azure.Search.Documents/tests/Utilities/SearchTestEnvironment.cs b/sdk/search/Azure.Search.Documents/tests/Utilities/SearchTestEnvironment.cs
index 0b9dc721f71f..d9d34e33a628 100644
--- a/sdk/search/Azure.Search.Documents/tests/Utilities/SearchTestEnvironment.cs
+++ b/sdk/search/Azure.Search.Documents/tests/Utilities/SearchTestEnvironment.cs
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
namespace Azure.Search.Documents.Tests
{
diff --git a/sdk/servicebus/Azure.Messaging.ServiceBus/tests/Azure.Messaging.ServiceBus.Tests.csproj b/sdk/servicebus/Azure.Messaging.ServiceBus/tests/Azure.Messaging.ServiceBus.Tests.csproj
index ab8931647ba1..985ac2489125 100755
--- a/sdk/servicebus/Azure.Messaging.ServiceBus/tests/Azure.Messaging.ServiceBus.Tests.csproj
+++ b/sdk/servicebus/Azure.Messaging.ServiceBus/tests/Azure.Messaging.ServiceBus.Tests.csproj
@@ -8,6 +8,7 @@
+
@@ -30,7 +31,4 @@
-
-
-
diff --git a/sdk/servicebus/Azure.Messaging.ServiceBus/tests/Infrastructure/ServiceBusTestEnvironment.cs b/sdk/servicebus/Azure.Messaging.ServiceBus/tests/Infrastructure/ServiceBusTestEnvironment.cs
index d79372f11699..c66ae2d82c5a 100644
--- a/sdk/servicebus/Azure.Messaging.ServiceBus/tests/Infrastructure/ServiceBusTestEnvironment.cs
+++ b/sdk/servicebus/Azure.Messaging.ServiceBus/tests/Infrastructure/ServiceBusTestEnvironment.cs
@@ -4,7 +4,7 @@
using System;
using System.Threading;
using System.Threading.Tasks;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using Azure.Messaging.ServiceBus.Core;
namespace Azure.Messaging.ServiceBus.Tests
diff --git a/sdk/storage/Azure.Storage.Blobs.Batch/tests/BlobBatchClientTests.cs b/sdk/storage/Azure.Storage.Blobs.Batch/tests/BlobBatchClientTests.cs
index 9d5785d3cfb0..e0d84203dda8 100644
--- a/sdk/storage/Azure.Storage.Blobs.Batch/tests/BlobBatchClientTests.cs
+++ b/sdk/storage/Azure.Storage.Blobs.Batch/tests/BlobBatchClientTests.cs
@@ -6,7 +6,7 @@
using System.IO;
using System.Linq;
using System.Threading.Tasks;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using Azure.Storage.Blobs.Models;
using Azure.Storage.Blobs.Specialized;
using Azure.Storage.Test;
diff --git a/sdk/storage/Azure.Storage.Blobs.Batch/tests/DelayedResponseTests.cs b/sdk/storage/Azure.Storage.Blobs.Batch/tests/DelayedResponseTests.cs
index 397bf9dbd935..c9b264c26dff 100644
--- a/sdk/storage/Azure.Storage.Blobs.Batch/tests/DelayedResponseTests.cs
+++ b/sdk/storage/Azure.Storage.Blobs.Batch/tests/DelayedResponseTests.cs
@@ -2,7 +2,7 @@
// Licensed under the MIT License.
using Azure.Core;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using Azure.Storage.Blobs.Specialized;
using NUnit.Framework;
diff --git a/sdk/storage/Azure.Storage.Blobs/tests/AppendBlobClientTests.cs b/sdk/storage/Azure.Storage.Blobs/tests/AppendBlobClientTests.cs
index e9e46835235b..c1f47995c504 100644
--- a/sdk/storage/Azure.Storage.Blobs/tests/AppendBlobClientTests.cs
+++ b/sdk/storage/Azure.Storage.Blobs/tests/AppendBlobClientTests.cs
@@ -9,7 +9,7 @@
using System.Text;
using System.Threading.Tasks;
using Azure.Core.Pipeline;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using Azure.Storage.Blobs.Models;
using Azure.Storage.Blobs.Specialized;
using Azure.Storage.Test;
diff --git a/sdk/storage/Azure.Storage.Blobs/tests/BlobBaseClientTests.cs b/sdk/storage/Azure.Storage.Blobs/tests/BlobBaseClientTests.cs
index febc5c99ac91..a9707978f364 100644
--- a/sdk/storage/Azure.Storage.Blobs/tests/BlobBaseClientTests.cs
+++ b/sdk/storage/Azure.Storage.Blobs/tests/BlobBaseClientTests.cs
@@ -11,7 +11,7 @@
using System.Threading.Tasks;
using Azure.Core;
using Azure.Core.Pipeline;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using Azure.Identity;
using Azure.Storage.Blobs.Models;
using Azure.Storage.Blobs.Specialized;
diff --git a/sdk/storage/Azure.Storage.Blobs/tests/BlobClientTests.cs b/sdk/storage/Azure.Storage.Blobs/tests/BlobClientTests.cs
index 0ecc44debce4..c3301cc98abb 100644
--- a/sdk/storage/Azure.Storage.Blobs/tests/BlobClientTests.cs
+++ b/sdk/storage/Azure.Storage.Blobs/tests/BlobClientTests.cs
@@ -7,7 +7,7 @@
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using Azure.Identity;
using Azure.Storage.Blobs.Models;
using Azure.Storage.Test;
diff --git a/sdk/storage/Azure.Storage.Blobs/tests/BlobTestBase.cs b/sdk/storage/Azure.Storage.Blobs/tests/BlobTestBase.cs
index d071bc3f8587..2a7e94ec42c7 100644
--- a/sdk/storage/Azure.Storage.Blobs/tests/BlobTestBase.cs
+++ b/sdk/storage/Azure.Storage.Blobs/tests/BlobTestBase.cs
@@ -8,7 +8,7 @@
using System.Threading.Tasks;
using Azure.Core;
using Azure.Core.Pipeline;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using Azure.Storage.Blobs;
using Azure.Storage.Blobs.Models;
using Azure.Storage.Blobs.Specialized;
diff --git a/sdk/storage/Azure.Storage.Blobs/tests/BlobUriBuilderTests.cs b/sdk/storage/Azure.Storage.Blobs/tests/BlobUriBuilderTests.cs
index a777bcd243a5..9e07e95a30bd 100644
--- a/sdk/storage/Azure.Storage.Blobs/tests/BlobUriBuilderTests.cs
+++ b/sdk/storage/Azure.Storage.Blobs/tests/BlobUriBuilderTests.cs
@@ -3,7 +3,7 @@
using System;
using System.Net;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using Azure.Storage.Sas;
using Azure.Storage.Test.Shared;
using NUnit.Framework;
diff --git a/sdk/storage/Azure.Storage.Blobs/tests/BlockBlobClientTests.cs b/sdk/storage/Azure.Storage.Blobs/tests/BlockBlobClientTests.cs
index e240348927b8..0a87638885ed 100644
--- a/sdk/storage/Azure.Storage.Blobs/tests/BlockBlobClientTests.cs
+++ b/sdk/storage/Azure.Storage.Blobs/tests/BlockBlobClientTests.cs
@@ -8,7 +8,7 @@
using System.Security.Cryptography;
using System.Text;
using System.Threading.Tasks;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using Azure.Storage.Blobs.Models;
using Azure.Storage.Blobs.Specialized;
using Azure.Storage.Blobs.Tests;
diff --git a/sdk/storage/Azure.Storage.Blobs/tests/ContainerClientTests.cs b/sdk/storage/Azure.Storage.Blobs/tests/ContainerClientTests.cs
index 48f22c6d31bb..628f92b201c7 100644
--- a/sdk/storage/Azure.Storage.Blobs/tests/ContainerClientTests.cs
+++ b/sdk/storage/Azure.Storage.Blobs/tests/ContainerClientTests.cs
@@ -9,7 +9,7 @@
using System.Threading;
using System.Threading.Tasks;
using Azure.Core;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using Azure.Identity;
using Azure.Storage.Blobs.Models;
using Azure.Storage.Blobs.Specialized;
diff --git a/sdk/storage/Azure.Storage.Blobs/tests/EncryptedBlockBlobClientTests.cs b/sdk/storage/Azure.Storage.Blobs/tests/EncryptedBlockBlobClientTests.cs
index 304ba491d768..f0b1d054a900 100644
--- a/sdk/storage/Azure.Storage.Blobs/tests/EncryptedBlockBlobClientTests.cs
+++ b/sdk/storage/Azure.Storage.Blobs/tests/EncryptedBlockBlobClientTests.cs
@@ -4,7 +4,7 @@
using System;
using System.IO;
using System.Threading.Tasks;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using Azure.Storage.Blobs.Specialized;
using Azure.Storage.Test.Shared;
using NUnit.Framework;
diff --git a/sdk/storage/Azure.Storage.Blobs/tests/PageBlobClientTests.cs b/sdk/storage/Azure.Storage.Blobs/tests/PageBlobClientTests.cs
index b3e801176af4..47dd760efac9 100644
--- a/sdk/storage/Azure.Storage.Blobs/tests/PageBlobClientTests.cs
+++ b/sdk/storage/Azure.Storage.Blobs/tests/PageBlobClientTests.cs
@@ -9,7 +9,7 @@
using System.Text;
using System.Threading;
using System.Threading.Tasks;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using Azure.Storage.Blobs.Models;
using Azure.Storage.Blobs.Specialized;
using Azure.Storage.Blobs.Tests;
diff --git a/sdk/storage/Azure.Storage.Blobs/tests/PartitionedDownloaderTests.cs b/sdk/storage/Azure.Storage.Blobs/tests/PartitionedDownloaderTests.cs
index 104884ab00a3..adbb38de229d 100644
--- a/sdk/storage/Azure.Storage.Blobs/tests/PartitionedDownloaderTests.cs
+++ b/sdk/storage/Azure.Storage.Blobs/tests/PartitionedDownloaderTests.cs
@@ -6,7 +6,7 @@
using System.IO;
using System.Threading;
using System.Threading.Tasks;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using Azure.Storage.Blobs.Models;
using Azure.Storage.Blobs.Specialized;
using Moq;
diff --git a/sdk/storage/Azure.Storage.Blobs/tests/PartitionedUploaderTests.cs b/sdk/storage/Azure.Storage.Blobs/tests/PartitionedUploaderTests.cs
index 012ff96e5379..ac9eec4b46a4 100644
--- a/sdk/storage/Azure.Storage.Blobs/tests/PartitionedUploaderTests.cs
+++ b/sdk/storage/Azure.Storage.Blobs/tests/PartitionedUploaderTests.cs
@@ -8,7 +8,7 @@
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using Azure.Storage.Blobs.Models;
using Azure.Storage.Blobs.Specialized;
using Moq;
diff --git a/sdk/storage/Azure.Storage.Blobs/tests/ServiceClientTests.cs b/sdk/storage/Azure.Storage.Blobs/tests/ServiceClientTests.cs
index 029b3bbb6306..d613caeadfd1 100644
--- a/sdk/storage/Azure.Storage.Blobs/tests/ServiceClientTests.cs
+++ b/sdk/storage/Azure.Storage.Blobs/tests/ServiceClientTests.cs
@@ -5,7 +5,7 @@
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using Azure.Storage.Blobs.Models;
using Azure.Storage.Test;
using Azure.Storage.Test.Shared;
diff --git a/sdk/storage/Azure.Storage.Common/tests/CommonTestBase.cs b/sdk/storage/Azure.Storage.Common/tests/CommonTestBase.cs
index 352c945ef224..8bcdfdf4b40b 100644
--- a/sdk/storage/Azure.Storage.Common/tests/CommonTestBase.cs
+++ b/sdk/storage/Azure.Storage.Common/tests/CommonTestBase.cs
@@ -4,7 +4,7 @@
using System;
using Azure.Core;
using Azure.Core.Pipeline;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using Azure.Storage.Blobs;
using Azure.Storage.Test;
using Azure.Storage.Test.Shared;
diff --git a/sdk/storage/Azure.Storage.Common/tests/GeoRedundantReadPolicyTests.cs b/sdk/storage/Azure.Storage.Common/tests/GeoRedundantReadPolicyTests.cs
index 1d214344caf1..c5f17ed3c05d 100644
--- a/sdk/storage/Azure.Storage.Common/tests/GeoRedundantReadPolicyTests.cs
+++ b/sdk/storage/Azure.Storage.Common/tests/GeoRedundantReadPolicyTests.cs
@@ -5,7 +5,7 @@
using System.Threading;
using Azure.Core;
using Azure.Core.Pipeline;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using NUnit.Framework;
namespace Azure.Storage.Tests
diff --git a/sdk/storage/Azure.Storage.Common/tests/Shared/RecordedClientRequestIdPolicy.cs b/sdk/storage/Azure.Storage.Common/tests/Shared/RecordedClientRequestIdPolicy.cs
index 34f3c3f070ec..1bcfe20bfabf 100644
--- a/sdk/storage/Azure.Storage.Common/tests/Shared/RecordedClientRequestIdPolicy.cs
+++ b/sdk/storage/Azure.Storage.Common/tests/Shared/RecordedClientRequestIdPolicy.cs
@@ -7,7 +7,7 @@
using System.Text;
using Azure.Core;
using Azure.Core.Pipeline;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
namespace Azure.Storage.Test.Shared
{
diff --git a/sdk/storage/Azure.Storage.Common/tests/Shared/StorageRecordMatcher.cs b/sdk/storage/Azure.Storage.Common/tests/Shared/StorageRecordMatcher.cs
index 44c760ffe912..1f430f25ae90 100644
--- a/sdk/storage/Azure.Storage.Common/tests/Shared/StorageRecordMatcher.cs
+++ b/sdk/storage/Azure.Storage.Common/tests/Shared/StorageRecordMatcher.cs
@@ -8,7 +8,7 @@
using System.Linq;
using System.Text.Json;
using System.Xml.Linq;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
namespace Azure.Storage.Test.Shared
{
diff --git a/sdk/storage/Azure.Storage.Common/tests/Shared/StorageRecordedTestSanitizer.cs b/sdk/storage/Azure.Storage.Common/tests/Shared/StorageRecordedTestSanitizer.cs
index c01b5c3b6705..5f82065c4fcf 100644
--- a/sdk/storage/Azure.Storage.Common/tests/Shared/StorageRecordedTestSanitizer.cs
+++ b/sdk/storage/Azure.Storage.Common/tests/Shared/StorageRecordedTestSanitizer.cs
@@ -7,7 +7,7 @@
using System.Text;
using System.Text.Json;
using Azure.Core;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
namespace Azure.Storage.Test.Shared
{
diff --git a/sdk/storage/Azure.Storage.Common/tests/Shared/StorageTestBase.cs b/sdk/storage/Azure.Storage.Common/tests/Shared/StorageTestBase.cs
index ae9a44a56e14..bd0dcac13803 100644
--- a/sdk/storage/Azure.Storage.Common/tests/Shared/StorageTestBase.cs
+++ b/sdk/storage/Azure.Storage.Common/tests/Shared/StorageTestBase.cs
@@ -12,7 +12,7 @@
using System.Threading.Tasks;
using Azure.Core;
using Azure.Core.Pipeline;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using Azure.Identity;
using Azure.Storage.Sas;
using Azure.Storage.Tests.Shared;
diff --git a/sdk/storage/Azure.Storage.Common/tests/Shared/TestExceptionPolicy.cs b/sdk/storage/Azure.Storage.Common/tests/Shared/TestExceptionPolicy.cs
index b26a88765be1..234c058fdf3c 100644
--- a/sdk/storage/Azure.Storage.Common/tests/Shared/TestExceptionPolicy.cs
+++ b/sdk/storage/Azure.Storage.Common/tests/Shared/TestExceptionPolicy.cs
@@ -7,7 +7,7 @@
using System.Threading.Tasks;
using Azure.Core;
using Azure.Core.Pipeline;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
namespace Azure.Storage.Test
{
diff --git a/sdk/storage/Azure.Storage.Common/tests/StorageConnectionStringTests.cs b/sdk/storage/Azure.Storage.Common/tests/StorageConnectionStringTests.cs
index 6fb1d475c0a2..89e85631df06 100644
--- a/sdk/storage/Azure.Storage.Common/tests/StorageConnectionStringTests.cs
+++ b/sdk/storage/Azure.Storage.Common/tests/StorageConnectionStringTests.cs
@@ -3,7 +3,7 @@
using System;
using System.Globalization;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using NUnit.Framework;
namespace Azure.Storage.Test
diff --git a/sdk/storage/Azure.Storage.Common/tests/StorageResponseClassifierTests.cs b/sdk/storage/Azure.Storage.Common/tests/StorageResponseClassifierTests.cs
index c28405ca1737..1f85ce4c073a 100644
--- a/sdk/storage/Azure.Storage.Common/tests/StorageResponseClassifierTests.cs
+++ b/sdk/storage/Azure.Storage.Common/tests/StorageResponseClassifierTests.cs
@@ -5,7 +5,7 @@
using System.Threading;
using Azure.Core;
using Azure.Core.Pipeline;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using NUnit.Framework;
namespace Azure.Storage.Tests
diff --git a/sdk/storage/Azure.Storage.Common/tests/StorageSharedKeyCredentialsTests.cs b/sdk/storage/Azure.Storage.Common/tests/StorageSharedKeyCredentialsTests.cs
index ccc4b324618c..2110b10f5f7d 100644
--- a/sdk/storage/Azure.Storage.Common/tests/StorageSharedKeyCredentialsTests.cs
+++ b/sdk/storage/Azure.Storage.Common/tests/StorageSharedKeyCredentialsTests.cs
@@ -4,7 +4,7 @@
using System;
using System.Text;
using System.Threading.Tasks;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using Azure.Storage.Blobs;
using Azure.Storage.Test;
using NUnit.Framework;
diff --git a/sdk/storage/Azure.Storage.Common/tests/StorageSharedKeyPipelinePolicyTests.cs b/sdk/storage/Azure.Storage.Common/tests/StorageSharedKeyPipelinePolicyTests.cs
index 2fb8e9ad01ea..065455330f9b 100644
--- a/sdk/storage/Azure.Storage.Common/tests/StorageSharedKeyPipelinePolicyTests.cs
+++ b/sdk/storage/Azure.Storage.Common/tests/StorageSharedKeyPipelinePolicyTests.cs
@@ -5,7 +5,7 @@
using System.Text;
using System.Threading.Tasks;
using Azure.Core;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using NUnit.Framework;
namespace Azure.Storage.Tests
diff --git a/sdk/storage/Azure.Storage.Files.DataLake/tests/DataLakePartitionedUploaderTests.cs b/sdk/storage/Azure.Storage.Files.DataLake/tests/DataLakePartitionedUploaderTests.cs
index 3c72bd671a8b..018f4a5a0728 100644
--- a/sdk/storage/Azure.Storage.Files.DataLake/tests/DataLakePartitionedUploaderTests.cs
+++ b/sdk/storage/Azure.Storage.Files.DataLake/tests/DataLakePartitionedUploaderTests.cs
@@ -9,7 +9,7 @@
using System.Text;
using System.Threading;
using System.Threading.Tasks;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using Azure.Storage.Files.DataLake.Models;
using Moq;
using NUnit.Framework;
diff --git a/sdk/storage/Azure.Storage.Files.DataLake/tests/DataLakeTestBase.cs b/sdk/storage/Azure.Storage.Files.DataLake/tests/DataLakeTestBase.cs
index 85bcee25a59e..690dab506a0a 100644
--- a/sdk/storage/Azure.Storage.Files.DataLake/tests/DataLakeTestBase.cs
+++ b/sdk/storage/Azure.Storage.Files.DataLake/tests/DataLakeTestBase.cs
@@ -7,7 +7,7 @@
using System.Threading.Tasks;
using Azure.Core;
using Azure.Core.Pipeline;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using Azure.Storage.Files.DataLake.Models;
using Azure.Storage.Sas;
using Azure.Storage.Test;
diff --git a/sdk/storage/Azure.Storage.Files.DataLake/tests/DirectoryClientTests.cs b/sdk/storage/Azure.Storage.Files.DataLake/tests/DirectoryClientTests.cs
index ae6454da4799..0d280766b27c 100644
--- a/sdk/storage/Azure.Storage.Files.DataLake/tests/DirectoryClientTests.cs
+++ b/sdk/storage/Azure.Storage.Files.DataLake/tests/DirectoryClientTests.cs
@@ -6,7 +6,7 @@
using System.Net;
using System.Threading.Tasks;
using Azure.Core;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using Azure.Storage.Files.DataLake.Models;
using Azure.Storage.Sas;
using Azure.Storage.Test;
diff --git a/sdk/storage/Azure.Storage.Files.DataLake/tests/FileClientTests.cs b/sdk/storage/Azure.Storage.Files.DataLake/tests/FileClientTests.cs
index 003e25304f8a..a283c657beed 100644
--- a/sdk/storage/Azure.Storage.Files.DataLake/tests/FileClientTests.cs
+++ b/sdk/storage/Azure.Storage.Files.DataLake/tests/FileClientTests.cs
@@ -9,7 +9,7 @@
using System.Threading;
using System.Threading.Tasks;
using Azure.Core;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using Azure.Storage.Files.DataLake.Models;
using Azure.Storage.Sas;
using Azure.Storage.Test;
diff --git a/sdk/storage/Azure.Storage.Files.DataLake/tests/FileSystemClientTests.cs b/sdk/storage/Azure.Storage.Files.DataLake/tests/FileSystemClientTests.cs
index 52e848f819ba..762b59b12407 100644
--- a/sdk/storage/Azure.Storage.Files.DataLake/tests/FileSystemClientTests.cs
+++ b/sdk/storage/Azure.Storage.Files.DataLake/tests/FileSystemClientTests.cs
@@ -7,7 +7,7 @@
using System.Net;
using System.Threading.Tasks;
using Azure.Core;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using Azure.Storage.Files.DataLake.Models;
using Azure.Storage.Sas;
using Azure.Storage.Test;
diff --git a/sdk/storage/Azure.Storage.Files.DataLake/tests/PathTestBase.cs b/sdk/storage/Azure.Storage.Files.DataLake/tests/PathTestBase.cs
index 026c90e45930..8ecaf8cefa70 100644
--- a/sdk/storage/Azure.Storage.Files.DataLake/tests/PathTestBase.cs
+++ b/sdk/storage/Azure.Storage.Files.DataLake/tests/PathTestBase.cs
@@ -3,7 +3,7 @@
using System;
using System.Collections.Generic;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using Azure.Storage.Files.DataLake.Models;
namespace Azure.Storage.Files.DataLake.Tests
diff --git a/sdk/storage/Azure.Storage.Files.DataLake/tests/ServiceClientTests.cs b/sdk/storage/Azure.Storage.Files.DataLake/tests/ServiceClientTests.cs
index 9e21e72fa129..d25ce5c622db 100644
--- a/sdk/storage/Azure.Storage.Files.DataLake/tests/ServiceClientTests.cs
+++ b/sdk/storage/Azure.Storage.Files.DataLake/tests/ServiceClientTests.cs
@@ -7,7 +7,7 @@
using System.Text;
using System.Threading.Tasks;
using Azure.Core;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using Azure.Storage.Files.DataLake.Models;
using Azure.Storage.Sas;
using Azure.Storage.Test;
diff --git a/sdk/storage/Azure.Storage.Files.Shares/tests/DirectoryClientTests.cs b/sdk/storage/Azure.Storage.Files.Shares/tests/DirectoryClientTests.cs
index 8d4f2c461801..1dea23ce6d19 100644
--- a/sdk/storage/Azure.Storage.Files.Shares/tests/DirectoryClientTests.cs
+++ b/sdk/storage/Azure.Storage.Files.Shares/tests/DirectoryClientTests.cs
@@ -5,7 +5,7 @@
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using Azure.Storage.Files.Shares.Models;
using Azure.Storage.Files.Shares.Tests;
using Azure.Storage.Test;
diff --git a/sdk/storage/Azure.Storage.Files.Shares/tests/FileClientTests.cs b/sdk/storage/Azure.Storage.Files.Shares/tests/FileClientTests.cs
index 01dd5c8151c1..69cdc53aa94f 100644
--- a/sdk/storage/Azure.Storage.Files.Shares/tests/FileClientTests.cs
+++ b/sdk/storage/Azure.Storage.Files.Shares/tests/FileClientTests.cs
@@ -8,7 +8,7 @@
using System.Threading;
using System.Threading.Tasks;
using Azure.Core;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using Azure.Storage.Files.Shares.Models;
using Azure.Storage.Files.Shares.Specialized;
using Azure.Storage.Files.Shares.Tests;
diff --git a/sdk/storage/Azure.Storage.Files.Shares/tests/FileTestBase.cs b/sdk/storage/Azure.Storage.Files.Shares/tests/FileTestBase.cs
index c54aafae2815..2e17ef4b041f 100644
--- a/sdk/storage/Azure.Storage.Files.Shares/tests/FileTestBase.cs
+++ b/sdk/storage/Azure.Storage.Files.Shares/tests/FileTestBase.cs
@@ -7,7 +7,7 @@
using System.Net;
using System.Threading.Tasks;
using Azure.Core;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using Azure.Storage.Files.Shares.Models;
using Azure.Storage.Sas;
using Azure.Storage.Test.Shared;
diff --git a/sdk/storage/Azure.Storage.Files.Shares/tests/FileUriBuilderTests.cs b/sdk/storage/Azure.Storage.Files.Shares/tests/FileUriBuilderTests.cs
index 9c2cf4efe73b..77c76b7d40a6 100644
--- a/sdk/storage/Azure.Storage.Files.Shares/tests/FileUriBuilderTests.cs
+++ b/sdk/storage/Azure.Storage.Files.Shares/tests/FileUriBuilderTests.cs
@@ -3,7 +3,7 @@
using System;
using System.Net;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using Azure.Storage.Files.Shares.Tests;
using Azure.Storage.Sas;
using NUnit.Framework;
diff --git a/sdk/storage/Azure.Storage.Files.Shares/tests/ServiceClientTests.cs b/sdk/storage/Azure.Storage.Files.Shares/tests/ServiceClientTests.cs
index 5f76f2db991a..02dba6cd3d78 100644
--- a/sdk/storage/Azure.Storage.Files.Shares/tests/ServiceClientTests.cs
+++ b/sdk/storage/Azure.Storage.Files.Shares/tests/ServiceClientTests.cs
@@ -5,7 +5,7 @@
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using Azure.Storage.Files.Shares.Models;
using Azure.Storage.Files.Shares.Tests;
using Azure.Storage.Test;
diff --git a/sdk/storage/Azure.Storage.Files.Shares/tests/ShareClientTests.cs b/sdk/storage/Azure.Storage.Files.Shares/tests/ShareClientTests.cs
index 8e916ebee2f1..cd024fc72820 100644
--- a/sdk/storage/Azure.Storage.Files.Shares/tests/ShareClientTests.cs
+++ b/sdk/storage/Azure.Storage.Files.Shares/tests/ShareClientTests.cs
@@ -6,7 +6,7 @@
using System.Linq;
using System.Reflection;
using System.Threading.Tasks;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using Azure.Storage.Files.Shares.Models;
using Azure.Storage.Files.Shares.Tests;
using Azure.Storage.Sas;
diff --git a/sdk/storage/Azure.Storage.Queues/tests/QueueClientTests.cs b/sdk/storage/Azure.Storage.Queues/tests/QueueClientTests.cs
index bac2032a4c21..c3f5405eec3c 100644
--- a/sdk/storage/Azure.Storage.Queues/tests/QueueClientTests.cs
+++ b/sdk/storage/Azure.Storage.Queues/tests/QueueClientTests.cs
@@ -5,7 +5,7 @@
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using Azure.Storage.Test;
using Azure.Storage.Queues.Models;
using Azure.Storage.Queues.Tests;
diff --git a/sdk/storage/Azure.Storage.Queues/tests/QueueTestBase.cs b/sdk/storage/Azure.Storage.Queues/tests/QueueTestBase.cs
index 44b18af4fa80..601cfff3e510 100644
--- a/sdk/storage/Azure.Storage.Queues/tests/QueueTestBase.cs
+++ b/sdk/storage/Azure.Storage.Queues/tests/QueueTestBase.cs
@@ -7,7 +7,7 @@
using System.Threading.Tasks;
using Azure.Core;
using Azure.Core.Pipeline;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using Azure.Storage.Queues.Models;
using Azure.Storage.Sas;
using Azure.Storage.Test;
diff --git a/sdk/storage/Azure.Storage.Queues/tests/QueueUriBuilderTests.cs b/sdk/storage/Azure.Storage.Queues/tests/QueueUriBuilderTests.cs
index 353bbb94ef33..8dad3ca2327a 100644
--- a/sdk/storage/Azure.Storage.Queues/tests/QueueUriBuilderTests.cs
+++ b/sdk/storage/Azure.Storage.Queues/tests/QueueUriBuilderTests.cs
@@ -2,7 +2,7 @@
// Licensed under the MIT License.
using System;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using Azure.Storage.Queues.Tests;
using Azure.Storage.Sas;
using NUnit.Framework;
diff --git a/sdk/storage/Azure.Storage.Queues/tests/ServiceClientTests.cs b/sdk/storage/Azure.Storage.Queues/tests/ServiceClientTests.cs
index aff5b53023c2..fb55043d205a 100644
--- a/sdk/storage/Azure.Storage.Queues/tests/ServiceClientTests.cs
+++ b/sdk/storage/Azure.Storage.Queues/tests/ServiceClientTests.cs
@@ -6,7 +6,7 @@
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using Azure.Storage.Test;
using Azure.Storage.Queues.Models;
using Azure.Storage.Queues.Tests;
diff --git a/sdk/storage/Directory.Build.props b/sdk/storage/Directory.Build.props
index 4159105947f4..50ab1b283e81 100644
--- a/sdk/storage/Directory.Build.props
+++ b/sdk/storage/Directory.Build.props
@@ -49,12 +49,9 @@
-
+
-
-
-
diff --git a/sdk/tables/Azure.Data.Tables/tests/Azure.Data.Tables.Tests.csproj b/sdk/tables/Azure.Data.Tables/tests/Azure.Data.Tables.Tests.csproj
index cd7ef826283a..7d084540404a 100644
--- a/sdk/tables/Azure.Data.Tables/tests/Azure.Data.Tables.Tests.csproj
+++ b/sdk/tables/Azure.Data.Tables/tests/Azure.Data.Tables.Tests.csproj
@@ -13,6 +13,7 @@
+
@@ -21,7 +22,5 @@
-
-
diff --git a/sdk/tables/Azure.Data.Tables/tests/TableClientLiveTests.cs b/sdk/tables/Azure.Data.Tables/tests/TableClientLiveTests.cs
index 5de93e2d7690..a54645376858 100644
--- a/sdk/tables/Azure.Data.Tables/tests/TableClientLiveTests.cs
+++ b/sdk/tables/Azure.Data.Tables/tests/TableClientLiveTests.cs
@@ -5,7 +5,7 @@
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using Azure.Data.Tables.Models;
using NUnit.Framework;
diff --git a/sdk/tables/Azure.Data.Tables/tests/TableServiceClientLiveTests.cs b/sdk/tables/Azure.Data.Tables/tests/TableServiceClientLiveTests.cs
index 0054761ae261..4f77333730ab 100644
--- a/sdk/tables/Azure.Data.Tables/tests/TableServiceClientLiveTests.cs
+++ b/sdk/tables/Azure.Data.Tables/tests/TableServiceClientLiveTests.cs
@@ -5,7 +5,7 @@
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using Azure.Data.Tables.Models;
using NUnit.Framework;
diff --git a/sdk/tables/Azure.Data.Tables/tests/TablesRecordedTestSanitizer.cs b/sdk/tables/Azure.Data.Tables/tests/TablesRecordedTestSanitizer.cs
index b11fe2585d9f..124fb676ea38 100644
--- a/sdk/tables/Azure.Data.Tables/tests/TablesRecordedTestSanitizer.cs
+++ b/sdk/tables/Azure.Data.Tables/tests/TablesRecordedTestSanitizer.cs
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
namespace Azure.Data.Tables.Tests
{
diff --git a/sdk/tables/Azure.Data.Tables/tests/TablesTestEnvironment.cs b/sdk/tables/Azure.Data.Tables/tests/TablesTestEnvironment.cs
index 53ab3856f3b4..8c403487da6e 100644
--- a/sdk/tables/Azure.Data.Tables/tests/TablesTestEnvironment.cs
+++ b/sdk/tables/Azure.Data.Tables/tests/TablesTestEnvironment.cs
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
namespace Azure.Data.Tables.Tests
{
diff --git a/sdk/template/Azure.Template/tests/Azure.Template.Tests.csproj b/sdk/template/Azure.Template/tests/Azure.Template.Tests.csproj
index a8f7f8651e76..fa1aac666dcc 100644
--- a/sdk/template/Azure.Template/tests/Azure.Template.Tests.csproj
+++ b/sdk/template/Azure.Template/tests/Azure.Template.Tests.csproj
@@ -3,8 +3,6 @@
$(RequiredTargetFrameworks)
-
-
@@ -14,6 +12,7 @@
+
diff --git a/sdk/template/Azure.Template/tests/MiniSecretClientLiveTest.cs b/sdk/template/Azure.Template/tests/MiniSecretClientLiveTest.cs
index 674bddfefdb7..63f5f0d6a5eb 100644
--- a/sdk/template/Azure.Template/tests/MiniSecretClientLiveTest.cs
+++ b/sdk/template/Azure.Template/tests/MiniSecretClientLiveTest.cs
@@ -3,7 +3,7 @@
using System;
using System.Threading.Tasks;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using NUnit.Framework;
namespace Azure.Template.Tests
diff --git a/sdk/template/Azure.Template/tests/MiniSecretClientTestEnvironment.cs b/sdk/template/Azure.Template/tests/MiniSecretClientTestEnvironment.cs
index c4fa1eea35c8..ee38458b7ee9 100644
--- a/sdk/template/Azure.Template/tests/MiniSecretClientTestEnvironment.cs
+++ b/sdk/template/Azure.Template/tests/MiniSecretClientTestEnvironment.cs
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
namespace Azure.Template.Tests
{
diff --git a/sdk/template/Azure.Template/tests/Samples/MiniSecretClientSamples.HelloWorld.cs b/sdk/template/Azure.Template/tests/Samples/MiniSecretClientSamples.HelloWorld.cs
index 02713ccb1e23..789b7deab21d 100644
--- a/sdk/template/Azure.Template/tests/Samples/MiniSecretClientSamples.HelloWorld.cs
+++ b/sdk/template/Azure.Template/tests/Samples/MiniSecretClientSamples.HelloWorld.cs
@@ -2,7 +2,7 @@
// Licensed under the MIT License.
using System;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using Azure.Identity;
using Azure.Template.Models;
using NUnit.Framework;
diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/tests/Azure.AI.TextAnalytics.Tests.csproj b/sdk/textanalytics/Azure.AI.TextAnalytics/tests/Azure.AI.TextAnalytics.Tests.csproj
index 146ae0d0eb8c..25f32656c79b 100644
--- a/sdk/textanalytics/Azure.AI.TextAnalytics/tests/Azure.AI.TextAnalytics.Tests.csproj
+++ b/sdk/textanalytics/Azure.AI.TextAnalytics/tests/Azure.AI.TextAnalytics.Tests.csproj
@@ -2,7 +2,6 @@
$(RequiredTargetFrameworks)
-
@@ -11,6 +10,7 @@
+
diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/tests/TextAnalyticsClientLiveTests.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/tests/TextAnalyticsClientLiveTests.cs
index de6b0d0454e7..6bcc36a913b0 100644
--- a/sdk/textanalytics/Azure.AI.TextAnalytics/tests/TextAnalyticsClientLiveTests.cs
+++ b/sdk/textanalytics/Azure.AI.TextAnalytics/tests/TextAnalyticsClientLiveTests.cs
@@ -6,7 +6,7 @@
using System.Linq;
using System.Threading.Tasks;
using Azure.AI.TextAnalytics.Samples;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using NUnit.Framework;
namespace Azure.AI.TextAnalytics.Tests
diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/tests/TextAnalyticsClientMockTests.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/tests/TextAnalyticsClientMockTests.cs
index 0c2bfc78df52..4a3d536ef6fd 100644
--- a/sdk/textanalytics/Azure.AI.TextAnalytics/tests/TextAnalyticsClientMockTests.cs
+++ b/sdk/textanalytics/Azure.AI.TextAnalytics/tests/TextAnalyticsClientMockTests.cs
@@ -2,7 +2,7 @@
// Licensed under the MIT License.
using Azure.Core.Pipeline;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using NUnit.Framework;
using System;
using System.Collections.Generic;
diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/tests/TextAnalyticsClientTests.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/tests/TextAnalyticsClientTests.cs
index e4d7c147fd05..f8af32bfd4ad 100644
--- a/sdk/textanalytics/Azure.AI.TextAnalytics/tests/TextAnalyticsClientTests.cs
+++ b/sdk/textanalytics/Azure.AI.TextAnalytics/tests/TextAnalyticsClientTests.cs
@@ -4,7 +4,7 @@
using System;
using System.Collections.Generic;
using Azure.Core;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using Azure.Identity;
using NUnit.Framework;
diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/tests/TextAnalyticsErrorTests.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/tests/TextAnalyticsErrorTests.cs
index 9b289fef7922..0c8faf005b16 100644
--- a/sdk/textanalytics/Azure.AI.TextAnalytics/tests/TextAnalyticsErrorTests.cs
+++ b/sdk/textanalytics/Azure.AI.TextAnalytics/tests/TextAnalyticsErrorTests.cs
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using NUnit.Framework;
using System.Linq;
using System.Text.Json;
diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/tests/TextAnalyticsRecordedTestSanitizer.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/tests/TextAnalyticsRecordedTestSanitizer.cs
index 7e455c3e7519..f866b8702842 100644
--- a/sdk/textanalytics/Azure.AI.TextAnalytics/tests/TextAnalyticsRecordedTestSanitizer.cs
+++ b/sdk/textanalytics/Azure.AI.TextAnalytics/tests/TextAnalyticsRecordedTestSanitizer.cs
@@ -3,7 +3,7 @@
using System.Collections.Generic;
-namespace Azure.Core.Testing
+namespace Azure.Core.TestFramework
{
public class TextAnalyticsRecordedTestSanitizer : RecordedTestSanitizer
{
diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/Sample1_DetectLanguage.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/Sample1_DetectLanguage.cs
index a4b1ac9fe392..64d9967ae1c6 100644
--- a/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/Sample1_DetectLanguage.cs
+++ b/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/Sample1_DetectLanguage.cs
@@ -2,7 +2,7 @@
// Licensed under the MIT License.
using System;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using NUnit.Framework;
namespace Azure.AI.TextAnalytics.Samples
diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/Sample1_DetectLanguageAsync.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/Sample1_DetectLanguageAsync.cs
index 1d93e849bfec..69772f136ff4 100644
--- a/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/Sample1_DetectLanguageAsync.cs
+++ b/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/Sample1_DetectLanguageAsync.cs
@@ -3,7 +3,7 @@
using System;
using System.Threading.Tasks;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using NUnit.Framework;
namespace Azure.AI.TextAnalytics.Samples
diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/Sample1_DetectLanguageBatch.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/Sample1_DetectLanguageBatch.cs
index 177897832122..a4c5a3abb7e4 100644
--- a/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/Sample1_DetectLanguageBatch.cs
+++ b/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/Sample1_DetectLanguageBatch.cs
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using NUnit.Framework;
using System;
using System.Collections.Generic;
diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/Sample1_DetectLanguageBatchAsync.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/Sample1_DetectLanguageBatchAsync.cs
index 4cf6711fe406..b6145efd5e8b 100644
--- a/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/Sample1_DetectLanguageBatchAsync.cs
+++ b/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/Sample1_DetectLanguageBatchAsync.cs
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using NUnit.Framework;
using System;
using System.Collections.Generic;
diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/Sample1_DetectLanguageBatchConvenience.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/Sample1_DetectLanguageBatchConvenience.cs
index fffb8696e6b3..0f3ffe3833e8 100644
--- a/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/Sample1_DetectLanguageBatchConvenience.cs
+++ b/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/Sample1_DetectLanguageBatchConvenience.cs
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using NUnit.Framework;
using System;
using System.Collections.Generic;
diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/Sample1_DetectLanguageBatchConvenienceAsync.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/Sample1_DetectLanguageBatchConvenienceAsync.cs
index 2a6b27f5d066..12e6fbc29fcc 100644
--- a/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/Sample1_DetectLanguageBatchConvenienceAsync.cs
+++ b/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/Sample1_DetectLanguageBatchConvenienceAsync.cs
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using NUnit.Framework;
using System;
using System.Collections.Generic;
diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/Sample2_AnalyzeSentiment.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/Sample2_AnalyzeSentiment.cs
index 7c6be0a428f6..fe8ee831c062 100644
--- a/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/Sample2_AnalyzeSentiment.cs
+++ b/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/Sample2_AnalyzeSentiment.cs
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using NUnit.Framework;
using System;
diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/Sample2_AnalyzeSentimentAsync.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/Sample2_AnalyzeSentimentAsync.cs
index 4f572bdf10f3..d29ded078c0f 100644
--- a/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/Sample2_AnalyzeSentimentAsync.cs
+++ b/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/Sample2_AnalyzeSentimentAsync.cs
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using NUnit.Framework;
using System;
using System.Threading.Tasks;
diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/Sample2_AnalyzeSentimentBatch.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/Sample2_AnalyzeSentimentBatch.cs
index 0b397c3cc393..e1b851e07d83 100644
--- a/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/Sample2_AnalyzeSentimentBatch.cs
+++ b/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/Sample2_AnalyzeSentimentBatch.cs
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using NUnit.Framework;
using System;
using System.Collections.Generic;
diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/Sample2_AnalyzeSentimentBatchAsync.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/Sample2_AnalyzeSentimentBatchAsync.cs
index cd7492c30ec2..941f771d8915 100644
--- a/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/Sample2_AnalyzeSentimentBatchAsync.cs
+++ b/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/Sample2_AnalyzeSentimentBatchAsync.cs
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using NUnit.Framework;
using System;
using System.Collections.Generic;
diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/Sample2_AnalyzeSentimentBatchConvenience.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/Sample2_AnalyzeSentimentBatchConvenience.cs
index 9a04303e8cf3..5aff4691e2cc 100644
--- a/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/Sample2_AnalyzeSentimentBatchConvenience.cs
+++ b/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/Sample2_AnalyzeSentimentBatchConvenience.cs
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using NUnit.Framework;
using System;
using System.Collections.Generic;
diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/Sample2_AnalyzeSentimentBatchConvenienceAsync.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/Sample2_AnalyzeSentimentBatchConvenienceAsync.cs
index 6dc241dc7ed1..f2e2969b8f0a 100644
--- a/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/Sample2_AnalyzeSentimentBatchConvenienceAsync.cs
+++ b/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/Sample2_AnalyzeSentimentBatchConvenienceAsync.cs
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using NUnit.Framework;
using System;
using System.Collections.Generic;
diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/Sample3_ExtractKeyPhrases.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/Sample3_ExtractKeyPhrases.cs
index 2c473e8e3389..0cfe39efdee5 100644
--- a/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/Sample3_ExtractKeyPhrases.cs
+++ b/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/Sample3_ExtractKeyPhrases.cs
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using NUnit.Framework;
using System;
using System.Collections.Generic;
diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/Sample3_ExtractKeyPhrasesAsync.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/Sample3_ExtractKeyPhrasesAsync.cs
index c18f4b2886fa..d1a2a7e4a9e6 100644
--- a/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/Sample3_ExtractKeyPhrasesAsync.cs
+++ b/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/Sample3_ExtractKeyPhrasesAsync.cs
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using NUnit.Framework;
using System;
using System.Collections.Generic;
diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/Sample3_ExtractKeyPhrasesBatch.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/Sample3_ExtractKeyPhrasesBatch.cs
index 8486478d424e..bd5b56e00096 100644
--- a/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/Sample3_ExtractKeyPhrasesBatch.cs
+++ b/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/Sample3_ExtractKeyPhrasesBatch.cs
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using NUnit.Framework;
using System;
using System.Collections.Generic;
diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/Sample3_ExtractKeyPhrasesBatchAsync.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/Sample3_ExtractKeyPhrasesBatchAsync.cs
index 41d5a6f80456..4e606140c465 100644
--- a/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/Sample3_ExtractKeyPhrasesBatchAsync.cs
+++ b/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/Sample3_ExtractKeyPhrasesBatchAsync.cs
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using NUnit.Framework;
using System;
using System.Collections.Generic;
diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/Sample3_ExtractKeyPhrasesBatchConvenience.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/Sample3_ExtractKeyPhrasesBatchConvenience.cs
index b8cfa1f4c6a8..dccaef62791f 100644
--- a/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/Sample3_ExtractKeyPhrasesBatchConvenience.cs
+++ b/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/Sample3_ExtractKeyPhrasesBatchConvenience.cs
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using NUnit.Framework;
using System;
using System.Collections.Generic;
diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/Sample3_ExtractKeyPhrasesBatchConvenienceAsync.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/Sample3_ExtractKeyPhrasesBatchConvenienceAsync.cs
index 26abba6b5f61..f52ed32844cb 100644
--- a/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/Sample3_ExtractKeyPhrasesBatchConvenienceAsync.cs
+++ b/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/Sample3_ExtractKeyPhrasesBatchConvenienceAsync.cs
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using NUnit.Framework;
using System;
using System.Collections.Generic;
diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/Sample4_RecognizeEntities.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/Sample4_RecognizeEntities.cs
index 70f4370fb568..6b80686a808c 100644
--- a/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/Sample4_RecognizeEntities.cs
+++ b/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/Sample4_RecognizeEntities.cs
@@ -3,7 +3,7 @@
using System;
using System.Collections.Generic;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using NUnit.Framework;
namespace Azure.AI.TextAnalytics.Samples
diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/Sample4_RecognizeEntitiesAsync.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/Sample4_RecognizeEntitiesAsync.cs
index de3fd53de9b3..db7eec86d46e 100644
--- a/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/Sample4_RecognizeEntitiesAsync.cs
+++ b/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/Sample4_RecognizeEntitiesAsync.cs
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using NUnit.Framework;
using System;
using System.Collections.Generic;
diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/Sample4_RecognizeEntitiesBatch.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/Sample4_RecognizeEntitiesBatch.cs
index 17ad57d2cc9c..e43c18f3bad5 100644
--- a/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/Sample4_RecognizeEntitiesBatch.cs
+++ b/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/Sample4_RecognizeEntitiesBatch.cs
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using NUnit.Framework;
using System;
using System.Collections.Generic;
diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/Sample4_RecognizeEntitiesBatchAsync.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/Sample4_RecognizeEntitiesBatchAsync.cs
index 5068935b5839..1c85682acc05 100644
--- a/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/Sample4_RecognizeEntitiesBatchAsync.cs
+++ b/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/Sample4_RecognizeEntitiesBatchAsync.cs
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using NUnit.Framework;
using System;
using System.Collections.Generic;
diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/Sample4_RecognizeEntitiesBatchConvenience.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/Sample4_RecognizeEntitiesBatchConvenience.cs
index 883137c0b9a5..a8c595727288 100644
--- a/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/Sample4_RecognizeEntitiesBatchConvenience.cs
+++ b/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/Sample4_RecognizeEntitiesBatchConvenience.cs
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using NUnit.Framework;
using System;
using System.Collections.Generic;
diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/Sample4_RecognizeEntitiesBatchConvenienceAsync.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/Sample4_RecognizeEntitiesBatchConvenienceAsync.cs
index 49292240b277..ab33c2458a44 100644
--- a/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/Sample4_RecognizeEntitiesBatchConvenienceAsync.cs
+++ b/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/Sample4_RecognizeEntitiesBatchConvenienceAsync.cs
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using NUnit.Framework;
using System;
using System.Collections.Generic;
diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/Sample6_RecognizeLinkedEntities.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/Sample6_RecognizeLinkedEntities.cs
index 53f64e8716c9..ff1caefd45b3 100644
--- a/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/Sample6_RecognizeLinkedEntities.cs
+++ b/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/Sample6_RecognizeLinkedEntities.cs
@@ -3,7 +3,7 @@
using System;
using System.Collections.Generic;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using NUnit.Framework;
namespace Azure.AI.TextAnalytics.Samples
diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/Sample6_RecognizeLinkedEntitiesAsync.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/Sample6_RecognizeLinkedEntitiesAsync.cs
index 2e6af1903520..803896684eeb 100644
--- a/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/Sample6_RecognizeLinkedEntitiesAsync.cs
+++ b/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/Sample6_RecognizeLinkedEntitiesAsync.cs
@@ -4,7 +4,7 @@
using System;
using System.Collections.Generic;
using System.Threading.Tasks;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using NUnit.Framework;
namespace Azure.AI.TextAnalytics.Samples
diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/Sample6_RecognizeLinkedEntitiesBatch.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/Sample6_RecognizeLinkedEntitiesBatch.cs
index 03428859f5d3..ea89e8a1b128 100644
--- a/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/Sample6_RecognizeLinkedEntitiesBatch.cs
+++ b/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/Sample6_RecognizeLinkedEntitiesBatch.cs
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using NUnit.Framework;
using System;
using System.Collections.Generic;
diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/Sample6_RecognizeLinkedEntitiesBatchAsync.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/Sample6_RecognizeLinkedEntitiesBatchAsync.cs
index 458467798702..5c63face1486 100644
--- a/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/Sample6_RecognizeLinkedEntitiesBatchAsync.cs
+++ b/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/Sample6_RecognizeLinkedEntitiesBatchAsync.cs
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using NUnit.Framework;
using System;
using System.Collections.Generic;
diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/Sample6_RecognizeLinkedEntitiesBatchConvenience.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/Sample6_RecognizeLinkedEntitiesBatchConvenience.cs
index 30b7a4ded804..2262d8d0fcff 100644
--- a/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/Sample6_RecognizeLinkedEntitiesBatchConvenience.cs
+++ b/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/Sample6_RecognizeLinkedEntitiesBatchConvenience.cs
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using NUnit.Framework;
using System;
using System.Collections.Generic;
diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/Sample6_RecognizeLinkedEntitiesBatchConvenienceAsync.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/Sample6_RecognizeLinkedEntitiesBatchConvenienceAsync.cs
index 9cb6cdf76dec..b94009d1bcff 100644
--- a/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/Sample6_RecognizeLinkedEntitiesBatchConvenienceAsync.cs
+++ b/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/Sample6_RecognizeLinkedEntitiesBatchConvenienceAsync.cs
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using NUnit.Framework;
using System;
using System.Collections.Generic;
diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/SampleMoq.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/SampleMoq.cs
index 4057861d9bab..a1318353cf72 100644
--- a/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/SampleMoq.cs
+++ b/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/SampleMoq.cs
@@ -4,7 +4,7 @@
using System.Collections.Generic;
using System.Threading;
using System.Threading.Tasks;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using Moq;
using NUnit.Framework;
diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/SampleSnippets.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/SampleSnippets.cs
index 9ab6eb342042..a14c9d74d6a2 100644
--- a/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/SampleSnippets.cs
+++ b/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/SampleSnippets.cs
@@ -2,7 +2,7 @@
// Licensed under the MIT License.
using System;
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
using Azure.Identity;
using NUnit.Framework;
diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/TextAnalyticsTestEnvironment.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/TextAnalyticsTestEnvironment.cs
index 79859742339b..d7a4539148f8 100644
--- a/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/TextAnalyticsTestEnvironment.cs
+++ b/sdk/textanalytics/Azure.AI.TextAnalytics/tests/samples/TextAnalyticsTestEnvironment.cs
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
-using Azure.Core.Testing;
+using Azure.Core.TestFramework;
namespace Azure.AI.TextAnalytics.Samples
{