Merge pull request Azure#10586 from VeryEarly/upgrade-test-framework

Upgrade test framework (alternative for Azure#10500)

Author: VeryEarly

.azure-pipelines/powershell-core.yml

@@ -5,7 +5,7 @@ variables:
   LinuxImage: ubuntu-18.04
   MacOSName: macOS
   MacOSImage: macOS-10.13
-  TestFramework: netcoreapp2.1
+  TestFramework: netcoreapp2.2
   TestTarget: Test
   Configuration: Debug
 

.azure-pipelines/windows-powershell.yml

@@ -1,8 +1,8 @@
 variables:
   WindowsName: windows
   WindowsImage: VS2017-Win2016
-  TestFramework: net472
-  TestTarget: TestNet472
+  TestFramework: netcoreapp2.2
+  TestTarget: Test
   Configuration: Debug
 
 jobs:

build.proj

@@ -29,7 +29,7 @@
     <!-- General -->
     <Configuration Condition="'$(Configuration)' != 'Release'">Debug</Configuration>
     <Scope Condition="$(Scope) == ''">All</Scope>
-    <TestFramework Condition="'$(TestFramework)' == ''">netcoreapp2.1</TestFramework>
+    <TestFramework Condition="'$(TestFramework)' == ''">netcoreapp2.2</TestFramework>
 
     <!-- Flags -->
     <CodeSign Condition ="'$(CodeSign)' == ''">false</CodeSign>

src/Automation/Automation.Test/Automation.Test.csproj

@@ -9,7 +9,7 @@
   <PropertyGroup>
     <RootNamespace>$(LegacyAssemblyPrefix)$(PsModuleName)$(AzTestAssemblySuffix)</RootNamespace>
     <AutoGenerateBindingRedirects>false</AutoGenerateBindingRedirects>
-    <TargetFrameworks>netcoreapp2.0;netcoreapp2.1</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.2;netcoreapp2.1</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

src/Az.Test.props

@@ -11,7 +11,7 @@
 
   <!-- Build -->
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.1;netcoreapp2.0;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.2;netcoreapp2.1;netstandard2.0</TargetFrameworks>
     <AssemblyName>$(AzAssemblyPrefix)$(PsModuleName)$(AzTestAssemblySuffix)</AssemblyName>
     <RootNamespace>$(AzAssemblyPrefix)$(PsModuleName)$(AzTestAssemblySuffix)</RootNamespace>
     <IsPackable>false</IsPackable>

src/Sql/Sql.Test/Utilities/UnitTestHelper.cs

@@ -34,7 +34,14 @@ public static void CheckConfirmImpact(Type cmdlet, ConfirmImpact confirmImpact)
             object[] cmdletAttributes = cmdlet.GetCustomAttributes(typeof(CmdletAttribute), true);
             Assert.Single(cmdletAttributes);
             CmdletAttribute attribute = (CmdletAttribute)cmdletAttributes[0];
-            Assert.Equal(confirmImpact, attribute.ConfirmImpact);
+            if(attribute.SupportsShouldProcess)
+            {
+                Assert.Equal(confirmImpact, attribute.ConfirmImpact);
+            }else
+            {
+                Assert.Equal(ConfirmImpact.None, attribute.ConfirmImpact);
+            }
+            
         }
 
         /// <summary>

src/SqlVirtualMachine/SqlVirtualMachine.Test/Utilities/UnitTestHelper.cs

@@ -28,7 +28,13 @@ public static void CheckConfirmImpact(Type cmdlet, ConfirmImpact confirmImpact)
             object[] cmdletAttributes = cmdlet.GetCustomAttributes(typeof(CmdletAttribute), true);
             Assert.Single(cmdletAttributes);
             CmdletAttribute attribute = (CmdletAttribute)cmdletAttributes[0];
-            Assert.Equal(confirmImpact, attribute.ConfirmImpact);
+            if(attribute.SupportsShouldProcess)
+            {
+                Assert.Equal(confirmImpact, attribute.ConfirmImpact);
+            }else
+            {
+                Assert.Equal(ConfirmImpact.None, attribute.ConfirmImpact);
+            }
         }
 
         public static void CheckCmdletModifiesData(Type cmdlet, bool supportsShouldProcess)

src/Storage/Storage.Test/Storage.Test.csproj

@@ -9,7 +9,7 @@
 
   <PropertyGroup>
     <RootNamespace>Microsoft.WindowsAzure.Management.$(PsModuleName)$(AzTestAssemblySuffix)</RootNamespace>
-    <TargetFrameworks>netcoreapp2.0;netcoreapp2.1</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.2;netcoreapp2.1</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

src/Websites/Websites.Test/ScenarioTests/WebAppTests.ps1

@@ -710,21 +710,27 @@ function Test-WindowsContainerCanIssueWebAppPSSession
 			$messageDNS = "Connecting to remote server $wname.azurewebsites.net failed with the following error message : The WinRM client cannot process the request because the server name cannot be resolved"
 			$messageUnavailable = "Connecting to remote server $wname.azurewebsites.net failed with the following error message : The WinRM client sent a request to an HTTP server and got a response saying the requested HTTP URL was not available."
 			$messagePsVersionNotSupported = "Remote Powershell sessions into Windows Containers on App Service from this version of PowerShell is not supported.";
+			$messageMIResulFailed = "Connecting to remote server $wname.azurewebsites.net failed with the following error message : MI_RESULT_FAILED";
+			$messageWSManNotInstalled = "This parameter set requires WSMan, and no supported WSMan client library was found. WSMan is either not installed or unavailable for this system";
 
 			# One possible warning message in Playback mode.
 			$messageWSMANNotConfigured = "Your current WSMAN Trusted Hosts settings will prevent you from connecting to your Container Web App";
 
 			$resultError = ($Error[0] -like "*$($messageDNS)*") -or 
 				($Error[0] -like "*$($messageUnavailable)*") -or 
 				($Error[0] -like "*$($messageWSMANNotConfigured)*") -or
-				($Error[0] -like "*$($messagePsVersionNotSupported)*")
-			
+				($Error[0] -like "*$($messagePsVersionNotSupported)*") -or
+				($Error[0] -like "*$($messageMIResulFailed)*") -or
+				($Error[0] -like "*$($messageWSManNotInstalled)*")
+				
 			$resultWarning = ($wv[0] -like "*$($messageWSMANNotConfigured)*")
 
 			Write-Debug "Expected error message 1: $messageDNS"
 			Write-Debug "Expected error message 2: $messageUnavailable"
 			Write-Debug "Expected error message 3: $messagePsVersionNotSupported"
-			
+			Write-Debug "Expected error message 4: $messageMIResulFailed"
+			Write-Debug "Expected error message 5: $messageWSManNotInstalled"
+
 			Write-Debug "Expected Warning message 1: $messageWSMANNotConfigured"
 
 

tools/Common.Netcore.Dependencies.Test.targets

@@ -46,6 +46,12 @@
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
  </ItemGroup>
 
+ <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.2'">
+    <PackageReference Include="Microsoft.PowerShell.SDK" Version="6.2.3" IncludeAssets="All" />
+    <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
+ </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="Microsoft.IdentityModel.Clients.ActiveDirectory" Version="3.19.2" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />