Readded classic (obsolete) calls for DataLakeAnalytics in desktop so tests could pass (specifically AdlaTests.TestAdlaCatalog and AdlaAliasTests.TestAdlaCatalog). Made keyvault pshtest.pfx ALWAYS copy (in CI, it sometimes wouldn't copy???). Altered setup of 2 Sql tests and linked to issue.

Author: MiYanni

src/ResourceManager/DataLakeAnalytics/Commands.DataLakeAnalytics/Models/DataLakeAnalyticsClient.cs

@@ -491,30 +491,49 @@ public List<FirewallRule> ListFirewallRules(string resourceGroupName, string acc
         public void CreateSecret(string accountName, string databaseName,
             string secretName, string password, string hostUri)
         {
+#if NETSTANDARD
             _catalogClient.Catalog.CreateCredential(accountName, databaseName, secretName,
                 new DataLakeAnalyticsCatalogCredentialCreateParameters
                 {
                     Password = password,
                     Uri = hostUri
                 });
+#else
+            _catalogClient.Catalog.CreateSecret(accountName, databaseName, secretName,
+                new DataLakeAnalyticsCatalogSecretCreateOrUpdateParameters
+                {
+                    Password = password,
+                    Uri = hostUri
+                });
+#endif
         }
 
         public USqlSecret UpdateSecret(string accountName, string databaseName,
             string secretName, string password, string hostUri)
         {
+#if NETSTANDARD
             _catalogClient.Catalog.UpdateCredential(accountName, databaseName, secretName,
                 new DataLakeAnalyticsCatalogCredentialUpdateParameters
                 {
                     Password = password,
                     Uri = hostUri
                 });
+#else
+            _catalogClient.Catalog.UpdateSecret(accountName, databaseName, secretName,
+                new DataLakeAnalyticsCatalogSecretCreateOrUpdateParameters
+                {
+                    Password = password,
+                    Uri = hostUri
+                });
+#endif
 
             // TODO: Remove this during the next breaking change release.
             return null;
         }
 
         public void DeleteSecret(string accountName, string databaseName, string secretName)
         {
+#if NETSTANDARD
             if (string.IsNullOrEmpty(secretName))
             {
                 var credentials = _catalogClient.Catalog.ListCredentials(accountName, databaseName);
@@ -527,6 +546,16 @@ public void DeleteSecret(string accountName, string databaseName, string secretN
             {
                 _catalogClient.Catalog.DeleteCredential(accountName, databaseName, secretName);
             }
+#else
+            if (string.IsNullOrEmpty(secretName))
+            {
+                _catalogClient.Catalog.DeleteAllSecrets(accountName, databaseName);
+            }
+            else
+            {
+                _catalogClient.Catalog.DeleteSecret(accountName, databaseName, secretName);
+            }
+#endif
         }
 
 

src/ResourceManager/DataLakeAnalytics/DataLakeAnalytics.sln

@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.27428.2037
+VisualStudioVersion = 15.0.27130.2027
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{95C16AED-FD57-42A0-86C3-2CF4300A4817}"
 EndProject
@@ -44,6 +44,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Common.KeyVault",
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Common.WebSites", "..\..\Common\Commands.Common.Websites\Commands.Common.WebSites.csproj", "{592B3E1B-49E3-4F3C-BF6B-E5D4133B1443}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.DataLakeStore", "..\DataLakeStore\Commands.DataLakeStore\Commands.DataLakeStore.csproj", "{8AAB43E6-E8F6-4F91-AF8A-6A63CD78EF1E}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -130,6 +132,10 @@ Global
 		{592B3E1B-49E3-4F3C-BF6B-E5D4133B1443}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{592B3E1B-49E3-4F3C-BF6B-E5D4133B1443}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{592B3E1B-49E3-4F3C-BF6B-E5D4133B1443}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8AAB43E6-E8F6-4F91-AF8A-6A63CD78EF1E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8AAB43E6-E8F6-4F91-AF8A-6A63CD78EF1E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8AAB43E6-E8F6-4F91-AF8A-6A63CD78EF1E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8AAB43E6-E8F6-4F91-AF8A-6A63CD78EF1E}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

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

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

src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/DatabaseReplicationTests.ps1

@@ -121,7 +121,9 @@ function Test-CreateVcoreDatabaseCopy()
 function Test-CreateSecondaryDatabase()
 {
 	# Setup
-	$location = Get-Location "Microsoft.Sql" "operations" "Southeast Asia"
+    # https://github.com/Azure/azure-powershell/issues/6382
+	#$location = Get-Location "Microsoft.Sql" "operations" "Southeast Asia"
+    $location = 'Southeast Asia'
 	$rg = Create-ResourceGroupForTest $location
 	$server = Create-ServerForTest $rg $location
 	$database = Create-DatabaseForTest $rg $server
@@ -162,7 +164,9 @@ function Test-CreateSecondaryDatabase()
 function Test-GetReplicationLink()
 {
 	# Setup
-	$location = Get-Location "Microsoft.Sql" "operations" "Southeast Asia"
+    # https://github.com/Azure/azure-powershell/issues/6382
+	#$location = Get-Location "Microsoft.Sql" "operations" "Southeast Asia"
+    $location = 'Southeast Asia'
 	$rg = Create-ResourceGroupForTest $location
 	$server = Create-ServerForTest $rg $location
 	$database = Create-DatabaseForTest $rg $server