netcoreapp3.1 migration (Azure#22545)

pakrym · heaths · web-flow · commit b31464883e28 · 2021-07-19T17:01:57.000-07:00
Co-authored-by: Heath Stewart &lt;heaths@outlook.com&gt;
diff --git a/common/SmokeTests/SmokeTest/SmokeTest.csproj b/common/SmokeTests/SmokeTest/SmokeTest.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>netcoreapp2.1;net461;net5.0</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;net461;net5.0</TargetFrameworks>
     <LangVersion>latest</LangVersion>
     <StartupObject>SmokeTest.Program</StartupObject>
   </PropertyGroup>
diff --git a/eng/Directory.Build.Common.props b/eng/Directory.Build.Common.props
@@ -107,16 +107,16 @@
 
   <PropertyGroup Condition="'$(IsTestProject)' == 'true' or '$(IsTestSupportProject)' == 'true' or '$(IsSamplesProject)' == 'true'">
     <IsPackable>false</IsPackable>
-    <RequiredTargetFrameworks>netcoreapp2.1;net5.0</RequiredTargetFrameworks>
-    <!-- Also test net461 on Windows; it's listed first so that coverage reports are for netcoreapp2.1 (the "primary"). -->
-    <RequiredTargetFrameworks Condition="'$(OS)' == 'Windows_NT'">net461;netcoreapp2.1;net5.0</RequiredTargetFrameworks>
+    <RequiredTargetFrameworks>netcoreapp3.1;net5.0</RequiredTargetFrameworks>
+    <!-- Also test net461 on Windows; it's listed first so that coverage reports are for netcoreapp3.1 (the "primary"). -->
+    <RequiredTargetFrameworks Condition="'$(OS)' == 'Windows_NT'">net461;netcoreapp3.1;net5.0</RequiredTargetFrameworks>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(IsPerfProject)' == 'true' or '$(IsStressProject)' == 'true'">
     <IsPackable>false</IsPackable>
-    <RequiredTargetFrameworks>netcoreapp2.1;netcoreapp3.1;net5.0</RequiredTargetFrameworks>
-    <!-- Also test net461 on Windows; it's listed first so that coverage reports are for netcoreapp2.1 (the "primary"). -->
-    <RequiredTargetFrameworks Condition="'$(OS)' == 'Windows_NT'">net461;netcoreapp2.1;netcoreapp3.1;net5.0</RequiredTargetFrameworks>
+    <RequiredTargetFrameworks>netcoreapp3.1;net5.0</RequiredTargetFrameworks>
+    <!-- Also test net461 on Windows; it's listed first so that coverage reports are for netcoreapp3.1 (the "primary"). -->
+    <RequiredTargetFrameworks Condition="'$(OS)' == 'Windows_NT'">net461;netcoreapp3.1;net5.0</RequiredTargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup Condition="'$(IsMgmtLibrary)' == 'true'">
diff --git a/eng/pipelines/templates/jobs/smoke.tests.yml b/eng/pipelines/templates/jobs/smoke.tests.yml
@@ -50,21 +50,21 @@ jobs:
         Linux (AzureCloud):
           Pool: "azsdk-pool-mms-ubuntu-2004-general"
           OSVmImage: "MMSUbuntu20.04"
-          TestTargetFramework: netcoreapp2.1
+          TestTargetFramework: netcoreapp3.1
           SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
           ArmTemplateParameters: $(azureCloudArmParameters)
           Location: "westus"
         Linux (AzureCloud Canary):
           Pool: "azsdk-pool-mms-ubuntu-2004-general"
           OSVmImage: "MMSUbuntu20.04"
-          TestTargetFramework: netcoreapp2.1
+          TestTargetFramework: netcoreapp3.1
           SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources-preview)
           ArmTemplateParameters: $(azureCloudArmParameters)
           Location: "eastus2euap"
         Windows_NetCoreApp (AzureCloud):
           Pool: "azsdk-pool-mms-win-2019-general"
           OSVmImage: "MMS2019"
-          TestTargetFramework: netcoreapp2.1
+          TestTargetFramework: netcoreapp3.1
           SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
           ArmTemplateParameters: $(azureCloudArmParameters)
           Location: "westus"
@@ -78,7 +78,7 @@ jobs:
         MacOs (AzureCloud):
           Pool: Azure Pipelines
           OSVmImage: "macOS-10.15"
-          TestTargetFramework: netcoreapp2.1
+          TestTargetFramework: netcoreapp3.1
           SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
           ArmTemplateParameters: $(azureCloudArmParameters)
           Location: "westus"
@@ -92,7 +92,7 @@ jobs:
         Windows_NetCoreApp (AzureUSGovernment):
           Pool: "azsdk-pool-mms-win-2019-general"
           OSVmImage: "MMS2019"
-          TestTargetFramework: netcoreapp2.1
+          TestTargetFramework: netcoreapp3.1
           SubscriptionConfiguration: $(sub-config-gov-test-resources)
           ArmTemplateParameters: $(azureUSGovernmentArmParameters)
           Location: "usgovarizona"
@@ -106,7 +106,7 @@ jobs:
         Windows_NetCoreApp (AzureChinaCloud):
           Pool: "azsdk-pool-mms-win-2019-general"
           OSVmImage: "MMS2019"
-          TestTargetFramework: netcoreapp2.1
+          TestTargetFramework: netcoreapp3.1
           SubscriptionConfiguration: $(sub-config-cn-test-resources)
           ArmTemplateParameters: $(azureChinaCloudArmParameters)
           Location: "chinaeast2"
diff --git a/eng/pipelines/templates/stages/platform-matrix.json b/eng/pipelines/templates/stages/platform-matrix.json
@@ -19,7 +19,7 @@
       }
     },
     "TestTargetFramework": [
-        "netcoreapp2.1",
+        "netcoreapp3.1",
         "net461",
         "net5.0"
     ],
@@ -40,7 +40,7 @@
           "netcoreapp21_Coverage_Record": {
               "SupportsRecording": true,
               "CollectCoverage": true,
-              "TestTargetFramework": "netcoreapp2.1"
+              "TestTargetFramework": "netcoreapp3.1"
           },
           "net5.0": {
               "TestTargetFramework": "net5.0"
diff --git a/eng/pipelines/templates/steps/install-dotnet.yml b/eng/pipelines/templates/steps/install-dotnet.yml
@@ -12,10 +12,10 @@ steps:
       performMultiLevelLookup: true
   - task: UseDotNet@2
     condition: ne(variables['Agent.OS'], 'Windows_NT') # Windows supports MultiLevelLookup and doesn't need explicit framework installation
-    displayName: 'Use .NET Core 2.1 runtime'
+    displayName: 'Use .NET Core 3.1 runtime'
     inputs:
       packageType: runtime
-      version: "2.1.x"
+      version: "3.1.x"
   - task: Cache@2
     inputs:
       key: 'nuget | "$(Agent.OS)" | $(Build.SourcesDirectory)/eng/Packages.Data.props | ${{parameters.NuGetCacheKey}}'
diff --git a/eng/scripts/dependencies/azure-sdk.deps.csproj b/eng/scripts/dependencies/azure-sdk.deps.csproj
@@ -1,6 +1,6 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <OutputType>Exe</OutputType>
     <EnableDefaultItems>false</EnableDefaultItems>
     <!-- 
diff --git a/samples/CloudClipboard/CloudClipboard/CloudClipboard.csproj b/samples/CloudClipboard/CloudClipboard/CloudClipboard.csproj
@@ -1,15 +1,13 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <LangVersion>preview</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Azure.Identity" Version="1.3.0" />
     <PackageReference Include="Azure.Storage.Blobs" Version="12.7.0" />
-    <PackageReference Include="Microsoft.AspNetCore.App" />
-    <PackageReference Include="Microsoft.AspNetCore.Razor.Design" Version="2.1.2" PrivateAssets="All" />
     <PackageReference Include="Microsoft.Azure.Services.AppAuthentication" Version="1.6.0" />
     <PackageReference Include="Microsoft.Azure.Storage.Blob" Version="11.2.2" />
     <PackageReference Include="Microsoft.Extensions.Azure" Version="1.0.0" />
diff --git a/sdk/appconfiguration/CONTRIBUTING.md b/sdk/appconfiguration/CONTRIBUTING.md
@@ -48,7 +48,7 @@ Properly supporting recorded tests does require a few extra considerations. All
 
 The easiest way to run the tests is via Visual Studio's unit test runner.
 
-You can also run tests via the command line using `dotnet test`, but that will run tests for all supported platforms simultaneously and intermingle their output. You can run the tests for just one platform with `dotnet test -f netcoreapp2.1` or `dotnet test -f net461`.
+You can also run tests via the command line using `dotnet test`, but that will run tests for all supported platforms simultaneously and intermingle their output. You can run the tests for just one platform with `dotnet test -f netcoreapp3.1` or `dotnet test -f net461`.
 
 The recorded tests are run automatically on every pull request. Live tests are run nightly. Contributors with write access can ask Azure DevOps to run the live tests against a pull request by commenting `/azp run net - appconfiguration - tests` in the PR.
 
diff --git a/sdk/core/Azure.Core.Experimental/tests/JsonDataDynamicMutableTests.cs b/sdk/core/Azure.Core.Experimental/tests/JsonDataDynamicMutableTests.cs
@@ -114,7 +114,7 @@ public static IEnumerable<object[]> PrimitiveValues()
             yield return new object[] {1L, "1"};
             yield return new object[] {1, "1"};
             yield return new object[] {1.0, "1"};
-#if NET5_0
+#if NETCOREAPP
             yield return new object[] {1.1D, "1.1"};
             yield return new object[] {1.1F, "1.100000023841858"};
 #else
diff --git a/sdk/core/Azure.Core.TestFramework/README.md b/sdk/core/Azure.Core.TestFramework/README.md
@@ -240,8 +240,6 @@ public class ConfigurationLiveTests: RecordedTestBase<AppConfigurationTestEnviro
 
 When tests are run in recording mode, session records are saved to the project directory automatically in a folder named 'SessionRecords'.
 
-__NOTE:__ recordings are copied from `netcoreapp2.1` directory by default, make sure you are running the right target framework.
-
 ### Sanitizing
 
 Secrets that are part of requests, responses, headers, or connections strings should be sanitized before saving the record.
diff --git a/sdk/core/Azure.Core/tests/MultipartReaderTests.cs b/sdk/core/Azure.Core/tests/MultipartReaderTests.cs
@@ -375,7 +375,7 @@ public async Task MultipartReader_ReadInvalidUtf8SurrogateHeader_ReplacementChar
             Assert.NotNull(section);
             Assert.That(section.Headers.Count, Is.EqualTo(1));
             // cspell:ignore FFFDU
-#if NET5_0 //https://github.com/dotnet/runtime/issues/29017
+#if NETCOREAPP //https://github.com/dotnet/runtime/issues/29017
             Assert.That(section.Headers["Content-Disposition"][0], Is.EqualTo("form-data; name=\"text\" filename=\"a\uFFFD\uFFFDU.txt\""));
 #else
             Assert.That(section.Headers["Content-Disposition"][0], Is.EqualTo("form-data; name=\"text\" filename=\"a\uFFFDU.txt\""));
diff --git a/sdk/core/Azure.Core/tests/PemReaderTests.cs b/sdk/core/Azure.Core/tests/PemReaderTests.cs
@@ -277,7 +277,7 @@ public void LoadCertificatePemOverridesCer()
         [Test]
         public void LoadECDsaCertificate()
         {
-#if NET461 || NETCOREAPP2_1
+#if NET461
             // Compatible with previous release. Goes through the LightweightPkcs8Decoder.DecodeRSAPkcs8().
             Assert.Throws<InvalidDataException>(() => PemReader.LoadCertificate(ECDsaCertificate.AsSpan(), keyType: PemReader.KeyType.RSA));
 #else
diff --git a/sdk/digitaltwins/Azure.DigitalTwins.Core/perf/README.md b/sdk/digitaltwins/Azure.DigitalTwins.Core/perf/README.md
@@ -31,7 +31,7 @@ Run the executable output of a project
 dotnet run -c Release -f <supported-framework> --no-build -p <path/to/project/file> -- [parameters needed for the test]
 ```
 
-\<supported-framework\> can be one of netcoreapp2.1, netcoreapp3.1, net461 or net5.0. Note the -- before any custom parameters to pass. This prevents dotnet from trying to handle any ambiguous command line switches.
+\<supported-framework\> can be one of netcoreapp3.1, netcoreapp3.1, net461 or net5.0. Note the -- before any custom parameters to pass. This prevents dotnet from trying to handle any ambiguous command line switches.
 
 You should use the scenario test class names as the first parameter that is needed for running the test.
 
diff --git a/sdk/eventhub/Azure.Messaging.EventHubs.Processor/tests/Snippets/Sample02_EventProcessorConfigurationLiveTests.cs b/sdk/eventhub/Azure.Messaging.EventHubs.Processor/tests/Snippets/Sample02_EventProcessorConfigurationLiveTests.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Diagnostics.CodeAnalysis;
 using System.Net;
+using System.Net.Http;
 using Azure.Messaging.EventHubs.Processor;
 using Azure.Storage.Blobs;
 using NUnit.Framework;
@@ -445,7 +446,7 @@ public void TryTimeoutConfiguration()
             Assert.That(options, Is.Not.Null);
         }
 
-#if NETCOREAPP3_1 || NET5 || SNIPPET
+#if NETCOREAPP || SNIPPET
         /// <summary>
         ///   Performs basic smoke test validation of the contained snippet.
         /// </summary>
diff --git a/sdk/eventhub/Azure.Messaging.EventHubs/tests/Snippets/Sample02_EventHubsClientsLiveTests.cs b/sdk/eventhub/Azure.Messaging.EventHubs/tests/Snippets/Sample02_EventHubsClientsLiveTests.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Diagnostics.CodeAnalysis;
 using System.Net;
+using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
 using Azure.Messaging.EventHubs.Consumer;
@@ -299,7 +300,7 @@ public void TryTimeoutConfiguration()
             Assert.That(options, Is.Not.Null);
         }
 
-#if NETCOREAPP3_1 || NET5 || SNIPPET
+#if NETCOREAPP || SNIPPET
         /// <summary>
         ///   Performs basic smoke test validation of the contained snippet.
         /// </summary>
diff --git a/sdk/identity/platform-matrix.json b/sdk/identity/platform-matrix.json
@@ -8,7 +8,7 @@
           "Container": "ubuntu_netcore_keyring"
         }
       },
-      "TestTargetFramework": "netcoreapp2.1",
+      "TestTargetFramework": "netcoreapp3.1",
       "SupportedClouds": "Public,Preview,Canary"
     }
   ]
diff --git a/sdk/keyvault/Azure.Security.KeyVault.Certificates/tests/PemReaderTests.cs b/sdk/keyvault/Azure.Security.KeyVault.Certificates/tests/PemReaderTests.cs
@@ -89,7 +89,7 @@ public void LoadCertificatePemOverridesCer()
         [Test]
         public void LoadRSACertificate()
         {
-#if NET461 || NETCOREAPP2_1
+#if NET461
             // Compatible with previous release. Goes through the LightweightPkcs8Decoder.DecodeECDsaPkcs8().
             Assert.Throws<InvalidDataException>(() => PemReader.LoadCertificate(RSACertificate.AsSpan(), keyType: PemReader.KeyType.ECDsa));
 #else
diff --git a/sdk/keyvault/CONTRIBUTING.md b/sdk/keyvault/CONTRIBUTING.md
@@ -47,7 +47,7 @@ Properly supporting recorded tests does require a few extra considerations. All
 
 The easiest way to run and debug the tests is via Visual Studio's unit test runner.
 
-You can also run tests via the command line using `dotnet test`, but that will run tests for all supported platforms simultaneously and intermingle their output. You can run the tests for just one platform with `dotnet test -f netcoreapp2.1` or `dotnet test -f net461`.
+You can also run tests via the command line using `dotnet test`, but that will run tests for all supported platforms simultaneously and intermingle their output. You can run the tests for just one platform with `dotnet test -f netcoreapp3.1` or `dotnet test -f net461`.
 
 The recorded tests are run automatically on every pull request. Live tests are run nightly. Contributors with write access can ask Azure DevOps to run the live tests against a pull request by commenting `/azp run net - keyvault - tests` in the PR.
 
diff --git a/sdk/keyvault/platform-matrix.json b/sdk/keyvault/platform-matrix.json
@@ -11,7 +11,7 @@
         }
       },
       "ArmTemplateParameters": "@{ enableHsm = $true }",
-      "TestTargetFramework": [ "netcoreapp2.1" ]
+      "TestTargetFramework": [ "netcoreapp3.1" ]
     }
   ]
 }
diff --git a/sdk/keyvault/samples/keyvaultproxy/tests/AzureSamples.Security.KeyVault.Proxy.Tests.csproj b/sdk/keyvault/samples/keyvaultproxy/tests/AzureSamples.Security.KeyVault.Proxy.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.1;net5.0</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;net5.0</TargetFrameworks>
     <TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">$(TargetFrameworks);net461</TargetFrameworks>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
diff --git a/sdk/monitor/Azure.Monitor.OpenTelemetry.Exporter/tests/Integration.Tests.AspNetCoreWebApp/Azure.Monitor.OpenTelemetry.Exporter.Integration.Tests.AspNetCoreWebApp.csproj b/sdk/monitor/Azure.Monitor.OpenTelemetry.Exporter/tests/Integration.Tests.AspNetCoreWebApp/Azure.Monitor.OpenTelemetry.Exporter.Integration.Tests.AspNetCoreWebApp.csproj
@@ -1,18 +1,16 @@
-﻿<Project Sdk="Microsoft.NET.Sdk.Web">
+﻿<Project Sdk="Microsoft.NET.Sdk">
   <!-- https://docs.microsoft.com/aspnet/core/test/integration-tests -->
   
   <PropertyGroup>
     <TargetFrameworks>$(RequiredTargetFrameworks)</TargetFrameworks>
     
     <!-- Azure SDK pipeline tries to pack test projects. This warning will be treated as an error and fail the whole build. -->
     <WarnOnPackingNonPackableProject>false</WarnOnPackingNonPackableProject>
+    <PreserveCompilationContext>true</PreserveCompilationContext>
+    <OutputType>Exe</OutputType>
   </PropertyGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1'">
-    <PackageReference Include="Microsoft.AspNetCore.App" />
-  </ItemGroup>
-    
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
+  <ItemGroup>
     <!--We would prefer to use the meta package "Microsoft.AspNetCore.App" here.
     But this package targets NetCoreApp2.1, while all the dependent packages target NetStandard2.0.
     To support net461 so we must reference the dependent packages.-->
diff --git a/sdk/monitor/Azure.Monitor.OpenTelemetry.Exporter/tests/Integration.Tests.AspNetCoreWebApp/Startup.cs b/sdk/monitor/Azure.Monitor.OpenTelemetry.Exporter/tests/Integration.Tests.AspNetCoreWebApp/Startup.cs
@@ -23,9 +23,6 @@ public void ConfigureServices(IServiceCollection services)
         {
             services.AddMvc(options =>
             {
-#if NET5_0
-                options.EnableEndpointRouting = false;
-#endif
 #pragma warning disable 618
             }).SetCompatibilityVersion(CompatibilityVersion.Version_2_1);
 #pragma warning restore 618
diff --git a/sdk/monitor/Azure.Monitor.OpenTelemetry.Exporter/tests/Integration.Tests/Azure.Monitor.OpenTelemetry.Exporter.Integration.Tests.csproj b/sdk/monitor/Azure.Monitor.OpenTelemetry.Exporter/tests/Integration.Tests/Azure.Monitor.OpenTelemetry.Exporter.Integration.Tests.csproj
@@ -18,13 +18,13 @@
     <PackageReference Include="xunit.runner.visualstudio" />
   </ItemGroup>
 
-  <!--<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1'">
+  <!--<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
     <PackageReference Include="Microsoft.AspNetCore.App" />
   </ItemGroup>-->
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net461' OR '$(TargetFramework)' == 'netcoreapp2.1'">
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net461' OR '$(TargetFramework)' == 'netcoreapp3.1'">
     <!--We would prefer to use the meta package "Microsoft.AspNetCore.App" here.
-    But this package targets NetCoreApp2.1, while all the dependent packages target NetStandard2.0.
+    But this package targets NetCoreApp3.1, while all the dependent packages target NetStandard2.0.
     To support net461 so we must reference the dependent packages.-->
     <PackageReference Include="Microsoft.AspNetCore" VersionOverride="[2.1.1,2.2)" />
     <PackageReference Include="Microsoft.AspNetCore.Hosting" VersionOverride="[2.1.1,2.2)" />
diff --git a/sdk/monitor/Azure.Monitor.OpenTelemetry.Exporter/tests/Integration.Tests/BasicTests.cs b/sdk/monitor/Azure.Monitor.OpenTelemetry.Exporter/tests/Integration.Tests/BasicTests.cs
@@ -23,7 +23,6 @@ public BasicTests(WebApplicationFactory<AspNetCoreWebApp.Startup> factory)
             this.factory = factory;
         }
 
-#if !NET5_0  // "https://github.com/Azure/azure-sdk-for-net/issues/16961")]
         [Theory]
         [InlineData(HttpStatusCode.OK)]
         [InlineData(HttpStatusCode.BadRequest)]
@@ -39,6 +38,5 @@ public async Task VerifyRequest(HttpStatusCode httpStatusCode)
             // Assert
             Assert.Equal(httpStatusCode, response.StatusCode);
         }
-#endif
     }
 }
diff --git a/sdk/monitor/Azure.Monitor.OpenTelemetry.Exporter/tests/Integration.Tests/OpenTelemetryTests.cs b/sdk/monitor/Azure.Monitor.OpenTelemetry.Exporter/tests/Integration.Tests/OpenTelemetryTests.cs
@@ -23,7 +23,6 @@ public OpenTelemetryTests(OpenTelemetryWebApplicationFactory<AspNetCoreWebApp.St
             this.output = output;
         }
 
-#if !NET5_0  // "https://github.com/Azure/azure-sdk-for-net/issues/16961")]
         /// <summary>
         /// This test validates that when an app instrumented with the AzureMonitorExporter receives an HTTP request,
         /// A TelemetryItem is created matching that request.
@@ -52,7 +51,6 @@ public async Task ProofOfConcept()
             var baseData = (Models.RequestData)item.Data.BaseData;
             Assert.True(baseData.Url.EndsWith(testValue), "it is expected that the recorded TelemetryItem matches the value of testValue.");
         }
-#endif
 
         /// <summary>
         /// This uses the XUnit ITestOutputHelper to print details to the output of the test run.
diff --git a/sdk/objectanchors/Azure.MixedReality.ObjectAnchors.Conversion/tests/MixedRealityRecordMatcher.cs b/sdk/objectanchors/Azure.MixedReality.ObjectAnchors.Conversion/tests/MixedRealityRecordMatcher.cs
@@ -8,21 +8,16 @@ namespace Azure.MixedReality.ObjectAnchors.Conversion.Tests
     public class MixedRealityRecordMatcher : RecordMatcher
     {
         private const string ClientCorrelationVectorHeaderName = "X-MRC-CV";
-        private const string ContentLengthHeaderName = "Content-Length";
 
         public MixedRealityRecordMatcher()
             : base(compareBodies: ShouldValidateBodies())
         {
             IgnoredHeaders.Add(ClientCorrelationVectorHeaderName);
-            if (!ShouldValidateBodies())
-            {
-                IgnoredHeaders.Add(ContentLengthHeaderName);
-            }
         }
 
         public static bool ShouldValidateBodies()
         {
-#if NETCOREAPP2_1
+#if NET461
             return true;
 #else
             return false;
diff --git a/sdk/schemaregistry/Azure.Data.SchemaRegistry/tests/Azure.Data.SchemaRegistry.Tests.csproj b/sdk/schemaregistry/Azure.Data.SchemaRegistry/tests/Azure.Data.SchemaRegistry.Tests.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <TargetFrameworks>$(RequiredTargetFrameworks)</TargetFrameworks>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|netcoreapp2.1|AnyCPU'">
+  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|netcoreapp3.1|AnyCPU'">
     <DefineConstants>TRACE</DefineConstants>
   </PropertyGroup>
 
diff --git a/sdk/schemaregistry/Microsoft.Azure.Data.SchemaRegistry.ApacheAvro/tests/Microsoft.Azure.Data.SchemaRegistry.ApacheAvro.Tests.csproj b/sdk/schemaregistry/Microsoft.Azure.Data.SchemaRegistry.ApacheAvro/tests/Microsoft.Azure.Data.SchemaRegistry.ApacheAvro.Tests.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <TargetFrameworks>$(RequiredTargetFrameworks)</TargetFrameworks>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|netcoreapp2.1|AnyCPU'">
+  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|netcoreapp3.1|AnyCPU'">
     <DefineConstants>TRACE</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
diff --git a/sdk/search/CONTRIBUTING.md b/sdk/search/CONTRIBUTING.md
diff --git a/sdk/servicebus/Microsoft.Azure.ServiceBus/tests/API/APIApprovals.cs b/sdk/servicebus/Microsoft.Azure.ServiceBus/tests/API/APIApprovals.cs
diff --git a/sdk/storage/CONTRIBUTING.md b/sdk/storage/CONTRIBUTING.md
diff --git a/sdk/storage/Microsoft.Azure.WebJobs.Extensions.Storage.Queues/tests/QueueTests.cs b/sdk/storage/Microsoft.Azure.WebJobs.Extensions.Storage.Queues/tests/QueueTests.cs
diff --git a/sdk/storage/platform-matrix-all-versions.json b/sdk/storage/platform-matrix-all-versions.json
diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/perf/Azure.AI.TextAnalytics.Perf/README.md b/sdk/textanalytics/Azure.AI.TextAnalytics/perf/Azure.AI.TextAnalytics.Perf/README.md
diff --git a/sdk/webpubsub/Azure.Messaging.WebPubSub/tests/Azure.Messaging.WebPubSub.Tests.csproj b/sdk/webpubsub/Azure.Messaging.WebPubSub/tests/Azure.Messaging.WebPubSub.Tests.csproj
