Fix for desktop tests in keyvault and network. Testing Travis dotnet version update.

Author: MiYanni

.travis.yml

@@ -1,7 +1,7 @@
 sudo: required
 language: csharp
 mono: none
-dotnet: 2.1.2
+dotnet: 2.1.200
 dist: trusty
 
 env:

src/ResourceManager/KeyVault/Commands.KeyVault.Test/Commands.KeyVault.Test.Netcore.csproj

@@ -53,7 +53,7 @@
     <None Update="Scripts\ControlPlane\KeyVaultManagementTests.ps1">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Update="pshtest.pfx">
+    <None Update="Resources\pshtest.pfx">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>

src/ResourceManager/KeyVault/Commands.KeyVault.Test/Commands.KeyVault.Test.csproj

@@ -179,7 +179,9 @@
     <None Include="packages.config">
       <SubType>Designer</SubType>
     </None>
-    <None Include="Resources\pshtest.pfx" />
+    <None Include="Resources\pshtest.pfx">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Include="ScenarioTests\Common.ps1">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>

src/ResourceManager/KeyVault/Commands.KeyVault.Test/Models/UtilitiesTests.cs

@@ -63,7 +63,7 @@ public void GetWebKeyFromByok()
         public void GetWebKeyFromCertificate()
         {
             string password = "123";
-            string path = "pshtest.pfx";
+            string path = "Resources/pshtest.pfx";
 
             IWebKeyConverter converters = WebKeyConverterFactory.CreateConverterChain();
             var webKey = converters.ConvertKeyFromFile(new FileInfo(path), password.ConvertToSecureString());

src/ResourceManager/KeyVault/Commands.KeyVault.Test/pshtest.pfx

@@ -123,7 +123,7 @@ function Test-ApplicationGatewayCRUD
 		$fp01 = New-AzureRmApplicationGatewayFrontendPort -Name $frontendPort01Name  -Port 80
 		$fp02 = New-AzureRmApplicationGatewayFrontendPort -Name $frontendPort02Name  -Port 8080
 
-		$authCertFilePath = $basedir + "ScenarioTests/Data/ApplicationGatewayAuthCert.cer"
+		$authCertFilePath = $basedir + "/ScenarioTests/Data/ApplicationGatewayAuthCert.cer"
 		$authcert01 = New-AzureRmApplicationGatewayAuthenticationCertificate -Name $authCertName -CertificateFile $authCertFilePath
 
 		# Create match with undefined statuscode list
@@ -330,7 +330,7 @@ function Test-ApplicationGatewayCRUD2
 {
 	param 
 	( 
-		$basedir = ".\" 
+		$basedir = "./" 
 	) 
 
 	# Setup	
@@ -388,7 +388,7 @@ function Test-ApplicationGatewayCRUD2
 
 		# frontend part
 		$pw01 = ConvertTo-SecureString "P@ssw0rd" -AsPlainText -Force
-		$sslCert01Path = $basedir + "ScenarioTests/Data/ApplicationGatewaySslCert1.pfx"
+		$sslCert01Path = $basedir + "/ScenarioTests/Data/ApplicationGatewaySslCert1.pfx"
 		$sslCert01 = New-AzureRmApplicationGatewaySslCertificate -Name $sslCert01Name -CertificateFile $sslCert01Path -Password $pw01
 
 		$fipconfig = New-AzureRmApplicationGatewayFrontendIPConfig -Name $fipconfigName -PublicIPAddress $publicip
@@ -451,7 +451,7 @@ function Test-ApplicationGatewayCRUD2
 		Assert-NotNull $getgw.SslCertificates[0].Password
 
 		$pw02 = ConvertTo-SecureString "P@ssw0rd" -AsPlainText -Force
-		$sslCert02Path = $basedir + "ScenarioTests/Data/ApplicationGatewaySslCert2.pfx"
+		$sslCert02Path = $basedir + "/ScenarioTests/Data/ApplicationGatewaySslCert2.pfx"
 		$getgw = Add-AzureRmApplicationGatewaySslCertificate -ApplicationGateway $getgw -Name $sslCert02Name -CertificateFile $sslCert02Path -Password $pw02
 
 		# Modify existing application gateway with new configuration

src/ResourceManager/Network/Commands.Network.Test/ScenarioTests/ApplicationGatewayTests.ps1

@@ -658,9 +658,12 @@ public void GetAzureRmSubscriptionByNameMultiplePages()
             Assert.Equal(tenants[1], resultSubscription.TenantId);
         }
 
-#if !NETSTANDARD
-
+#if NETSTANDARD
+        [Fact(Skip = "ConcurrentDictionary is not marked as Serializable")]
+        [Trait(Category.RunType, Category.DesktopOnly)]
+#else
         [Fact]
+#endif
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void ProfileSerializeDeserializeWorks()
         {
@@ -723,7 +726,6 @@ public void ProfileSerializeDeserializeWorks()
             Assert.Equal("http://contoso.io", deserializedProfile.DefaultContext.Environment.GetProperty(AzureEnvironment.ExtendedEndpoint.OperationalInsightsEndpoint));
             Assert.Equal("http://insights.contoso.io/", deserializedProfile.DefaultContext.Environment.GetProperty(AzureEnvironment.ExtendedEndpoint.OperationalInsightsEndpointResourceId));
         }
-#endif
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]