Testfx target framework upgrade from netcoreapp3.1 to net6.0 (#22484)

* Upgraded target framework for testfx to net6.0

* Fixed test case issues after TestFx target framework upgraded to .NET6 and also improved test execution performance by replacing Start-Sleep with Start-TestSleep

* Update test-steps.yml

* Fixed test script issue for Compute.

* Updated test framework for testcoverage CI

---------

Co-authored-by: Yeming Liu <[email protected]>

Author: vidai-msft

.azure-pipelines/powershell-core.yml

@@ -1,5 +1,5 @@
 variables:
-  WindowsName: windows 
+  WindowsName: windows
   WindowsAgentPoolName: pool-windows-2019
   WindowsAgentPoolVMImage: ''
   LinuxName: linux
@@ -8,7 +8,7 @@ variables:
   MacOSName: macOS
   MacOSAgentPoolName: 'Azure Pipelines'
   MacOSAgentPoolVMImage: macOS-11
-  TestFramework: netcoreapp3.1
+  TestFramework: net6.0
   TestTarget: Test
   Configuration: Debug
   DebugLocalBuildTasks: true

.azure-pipelines/test-coverage.yml

@@ -1,7 +1,4 @@
 parameters:
-- name: dotnet_sdk_3_1
-  displayName: .NET Core 3.1
-  default: 3.1.x
 - name: dotnet_sdk_6
   displayName: .NET 6
   type: string
@@ -13,7 +10,7 @@ parameters:
 - name: testFramework
   displayName: Test Framework
   type: string
-  default: netcoreapp3.1
+  default: net6.0
 - name: testPoolName
   displayName: Test Pool Name
   type: string
@@ -64,10 +61,10 @@ jobs:
 
   steps:
   - task: UseDotNet@2
-    displayName: 'Install .NET Core 3.1 SDK'
+    displayName: 'Install .NET 6.0 SDK'
     inputs:
       packageType: sdk
-      version: ${{ parameters.dotnet_sdk_3_1 }}
+      version: ${{ parameters.dotnet_sdk_6 }}
 
   - task: PowerShell@2
     displayName: Initialize Environment

.azure-pipelines/util/test-steps.yml

@@ -26,10 +26,10 @@ steps:
     pwsh: true
 
 - task: UseDotNet@2
-  displayName: 'Use .NET Core sdk'
+  displayName: 'Use .NET SDK 6 for tests'
   inputs:
     packageType: sdk
-    version: 3.1.x
+    version: 6.0.x
 
 - task: PowerShell@2
   displayName: Remove pre-installed Az modules

.azure-pipelines/windows-powershell.yml

@@ -2,7 +2,7 @@ variables:
   AgentPoolName: pool-windows-2019
   WindowsName: windows
   WindowsImage: windows-2019
-  TestFramework: netcoreapp3.1
+  TestFramework: net6.0
   TestTarget: Test
   Configuration: Debug
   DebugLocalBuildTasks: true

src/Accounts/Accounts.Test/AzureRMProfileTests.cs

@@ -42,6 +42,7 @@
 using System.Net.Http;
 using System.Runtime.InteropServices;
 using System.Runtime.Serialization.Formatters.Binary;
+using System.Text.Json;
 using System.Threading;
 using System.Threading.Tasks;
 
@@ -1064,20 +1065,10 @@ public void ProfileSerializeDeserializeWorks()
             currentProfile.EnvironmentTable[environment.Name] = environment;
             currentProfile.DefaultContext.TokenCache = new AzureTokenCache { CacheData = new byte[] { 1, 2, 3, 4, 5, 6, 8, 9, 0 } };
 
-            AzureRmProfile deserializedProfile;
             // Round-trip the exception: Serialize and de-serialize with a BinaryFormatter
-            BinaryFormatter bf = new BinaryFormatter();
-            using (MemoryStream ms = new MemoryStream())
-            {
-                // "Save" object state
-                bf.Serialize(ms, currentProfile);
-
-                // Re-use the same stream for de-serialization
-                ms.Seek(0, 0);
-
-                // Replace the original exception with de-serialized one
-                deserializedProfile = (AzureRmProfile)bf.Deserialize(ms);
-            }
+            var serializedProfile = JsonSerializer.Serialize(currentProfile);
+            // Replace the original exception with de-serialized one
+            var deserializedProfile = JsonSerializer.Deserialize<AzureRmProfile>(serializedProfile);
             Assert.NotNull(deserializedProfile);
             var jCurrentProfile = currentProfile.ToString();
             var jDeserializedProfile = deserializedProfile.ToString();

src/Accounts/Accounts.Test/Mocks/MockDataStore.cs

@@ -278,7 +278,8 @@ public X509Certificate2 GetCertificate(string thumbprint)
             }
             else
             {
-                return new X509Certificate2();
+                byte[] emptyCertificateData = Array.Empty<byte>();
+                return new X509Certificate2(emptyCertificateData);
             }
         }
 

src/Accounts/Accounts.Test/OnImportTests.cs

@@ -43,7 +43,7 @@ public void UserProfilePathInAccessible()
             cmdlt.OnImport();
 
             //Verify
-            Assert.Equal(AzureSession.Instance.ARMContextSaveMode, ContextSaveMode.Process);
+            Assert.Equal(ContextSaveMode.Process, AzureSession.Instance.ARMContextSaveMode);
         }
 
         [Fact]
@@ -60,7 +60,7 @@ public void PersistenceCheckReturnFalse()
             cmdlt.OnImport();
 
             //Verify
-            Assert.Equal(AzureSession.Instance.ARMContextSaveMode, ContextSaveMode.Process);
+            Assert.Equal(ContextSaveMode.Process, AzureSession.Instance.ARMContextSaveMode);
         }
     }
 }

src/Accounts/Authentication.Test/Mocks/MockDataStore.cs

@@ -272,7 +272,8 @@ public X509Certificate2 GetCertificate(string thumbprint)
             }
             else
             {
-                return new X509Certificate2();
+                byte[] emptyCertificateData = Array.Empty<byte>();
+                return new X509Certificate2(emptyCertificateData);
             }
         }
 

src/Accounts/AuthenticationAssemblyLoadContext/AuthenticationAssemblyLoadContext.csproj

@@ -6,7 +6,7 @@
   <Import Project="$(MSBuildThisFileDirectory)..\..\Az.props" />
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <AssemblyName>Microsoft.Azure.PowerShell.AuthenticationAssemblyLoadContext</AssemblyName>
     <RootNamespace>Microsoft.Azure.PowerShell.AuthenticationAssemblyLoadContext</RootNamespace>
   </PropertyGroup>

src/Aks/Aks.Test/MergeKubeConfigTests.cs

@@ -16,7 +16,7 @@ public class ConfigFixture
 
         public ConfigFixture()
         {
-            var dir = Path.GetDirectoryName(new Uri(Assembly.GetExecutingAssembly().CodeBase).AbsolutePath);
+            var dir = Path.GetDirectoryName(new Uri(Assembly.GetExecutingAssembly().Location).AbsolutePath);
             var merged = ImportAzureRmAksCredential.MergeKubeConfig(File.ReadAllText(dir + "/Fixtures/config.yaml"), File.ReadAllText(dir + "/Fixtures/additional_kube_config.yaml"));
             _rootNode = RootNodeFromString(merged);
         }