#if the breaking change for DataLakeAnalytics. Fix build error with Sql.

# Conflicts:
#	src/ResourceManager/Sql/Commands.Sql.Test/UnitTests/AzureSqlServerUpgradeAttributeTests.cs

Author: MiYanni

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

@@ -529,10 +529,18 @@ public void DeleteSecret(string accountName, string databaseName, string secretN
             }
         }
 
+
+#if NETSTANDARD
         public USqlCredential GetSecret(string accountName, string databaseName, string secretName)
         {
             return _catalogClient.Catalog.GetCredential(accountName, databaseName, secretName);
         }
+#else
+        public USqlSecret GetSecret(string accountName, string databaseName, string secretName)
+        {
+            return _catalogClient.Catalog.GetSecret(accountName, databaseName, secretName);
+        }
+#endif
 
         public bool TestCatalogItem(string accountName, CatalogPathInstance path,
             DataLakeAnalyticsEnums.CatalogItemType itemType)
@@ -847,12 +855,23 @@ private IList<USqlExternalDataSource> GetExternalDataSources(string accountName,
             return toReturn;
         }
 
+#if NETSTANDARD
         private USqlCredential GetCredential(string accountName, string databaseName, string credName)
         {
             return _catalogClient.Catalog.GetCredential(accountName, databaseName, credName);
         }
+#else
+        private ObsoleteUSqlCredential GetCredential(string accountName, string databaseName, string credName)
+        {
+            return new ObsoleteUSqlCredential(_catalogClient.Catalog.GetCredential(accountName, databaseName, credName), databaseName, computeAccountName: accountName);
+        }
+#endif
 
+#if NETSTANDARD
         private IList<USqlCredential> GetCredentials(string accountName, string databaseName)
+#else
+        private IList<ObsoleteUSqlCredential> GetCredentials(string accountName, string databaseName)
+#endif
         {
             List<USqlCredential> toReturn = new List<USqlCredential>();
             var response = _catalogClient.Catalog.ListCredentials(accountName, databaseName);
@@ -863,7 +882,11 @@ private IList<USqlCredential> GetCredentials(string accountName, string database
                 toReturn.AddRange(response);
             }
 
+#if NETSTANDARD
             return toReturn;
+#else
+            return toReturn.Select(element => new ObsoleteUSqlCredential(element, databaseName, computeAccountName: accountName)).ToList();
+#endif
         }
 
         private USqlSchema GetSchema(string accountName, string databaseName,
@@ -1116,8 +1139,8 @@ private IList<USqlType> GetTypes(string accountName, string databaseName,
             return toReturn;
         }
 
-        #endregion
-        #region Compute Policy Operations
+#endregion
+#region Compute Policy Operations
         public ComputePolicy CreateComputePolicy(string resourceGroupName, string accountName, string policyName, Guid objectId, string objectType, int? maxAnalyticsUnitsPerJob = null, int? minPriorityPerJob = null)
         {
             if (string.IsNullOrEmpty(resourceGroupName))
@@ -1189,8 +1212,8 @@ public void DeleteComputePolicy(string resourceGroupName, string accountName, st
             _accountClient.ComputePolicies.Delete(resourceGroupName, accountName, policyName);
         }
 
-        #endregion
-        #region Job Related Operations
+#endregion
+#region Job Related Operations
 
         public JobRecurrenceInformation GetJobReccurence(string accountName, Guid recurrenceId, DateTimeOffset? start = null, DateTimeOffset? end = null)
         {
@@ -1302,9 +1325,9 @@ public List<JobInformationBasic> ListJobs(string accountName, string filter, int
             return jobList.GetRange(0, Math.Min(curCount, top.Value));
         }
 
-        #endregion
+#endregion
 
-        #region internal helpers
+#region internal helpers
         internal string GetResourceGroupByAccountName(string accountName)
         {
             try
@@ -1355,9 +1378,9 @@ internal string GetWildcardFilterString(string propertyName, string value)
             // default case requires both
             return string.Format("startswith({0},'{1}') and endswith({0},'{2}')", propertyName, subStrings[0], subStrings[1]);
         }
-        #endregion
+#endregion
 
-        #region private helpers
+#region private helpers
 
         private IPage<JobInformationBasic> ListJobsWithNextLink(string nextLink)
         {
@@ -1470,6 +1493,6 @@ private bool IsCatalogItemOrList(CatalogPathInstance path, DataLakeAnalyticsEnum
 
             return isList;
         }
-        #endregion
+#endregion
     }
 }

src/ResourceManager/Sql/Commands.Sql.Test/UnitTests/AzureSqlServerUpgradeAttributeTests.cs

@@ -33,7 +33,9 @@ public AzureSqlServerUpgradeAttributeTests(ITestOutputHelper output)
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void StartAzureSqlServerUpgradeAttributes()
         {
+#pragma warning disable 618
             Type type = typeof(StartAzureSqlServerUpgrade);
+#pragma warning restore 618
             UnitTestHelper.CheckCmdletModifiesData(type, supportsShouldProcess: false);
             UnitTestHelper.CheckConfirmImpact(type, System.Management.Automation.ConfirmImpact.Low);
 
@@ -45,7 +47,9 @@ public void StartAzureSqlServerUpgradeAttributes()
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void StopAzureSqlServerUpgradeAttributes()
         {
+#pragma warning disable 618
             Type type = typeof(StopAzureSqlServerUpgrade);
+#pragma warning restore 618
             UnitTestHelper.CheckCmdletModifiesData(type, supportsShouldProcess: true);
 
             UnitTestHelper.CheckCmdletParameterAttributes(type, "ServerName", isMandatory: true, valueFromPipelineByName: true);
@@ -55,7 +59,9 @@ public void StopAzureSqlServerUpgradeAttributes()
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void GetAzureSqlServerUpgradeAttributes()
         {
+#pragma warning disable 618
             Type type = typeof(GetAzureSqlServerUpgrade);
+#pragma warning restore 618
             UnitTestHelper.CheckCmdletModifiesData(type, supportsShouldProcess: false);
             UnitTestHelper.CheckConfirmImpact(type, System.Management.Automation.ConfirmImpact.None);