Fix test and build issues

Author: viparek

src/Sql/Sql.Test/ScenarioTests/TransparentDataEncryptionCrudTests.cs

@@ -55,12 +55,5 @@ public void TestServerTransparentDataEncryptionProtectorSet()
         {
             RunPowerShellTest("Test-SetTransparentDataEncryptionProtector");
         }
-
-        [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
-        public void TestServerTransparentDataEncryptionProtectorSetWithKeyRotation()
-        {
-            RunPowerShellTest("Test-SetTransparentDataEncryptionProtectorWithKeyRotation");
-        }
     }
 }

src/Sql/Sql/Common/ResourceIdentityHelper.cs

@@ -27,38 +27,7 @@ public enum ResourceIdentityType
     }
 
     public class ResourceIdentityHelper
-    {       
-        public static Management.Sql.Models.ResourceIdentity GetIdentityObjectFromType(string AssignIdentity, List<string> userAssignedIdentities)
-        {
-            Management.Sql.Models.ResourceIdentity identityResult = null;
-            
-            if (AssignIdentity.Equals(ResourceIdentityType.SystemAssigned))
-            {
-                identityResult = new Management.Sql.Models.ResourceIdentity()
-                {
-                    Type = ResourceIdentityType.SystemAssigned.ToString()
-                };
-            }
-
-            if (AssignIdentity.Equals(ResourceIdentityType.UserAssigned) && userAssignedIdentities.Any())
-            {
-                Dictionary<string, UserIdentity> umiDict = new Dictionary<string, UserIdentity>();
-                
-                foreach (string identity in userAssignedIdentities)
-                {
-                    umiDict.Add(identity, new UserIdentity());
-                }
-
-                identityResult = new Management.Sql.Models.ResourceIdentity()
-                {
-                    Type = ResourceIdentityType.UserAssigned.ToString(),
-                    UserAssignedIdentities = umiDict
-                };
-            }
-
-            return identityResult;
-        }
-
+    {
         public static Management.Sql.Models.ResourceIdentity GetIdentityObjectFromType(bool assignIdentityIsPresent, bool userAssignedIdentityIsPresent, List<string> userAssignedIdentities)
         {
             Management.Sql.Models.ResourceIdentity identityResult = null;
@@ -95,6 +64,13 @@ public static Management.Sql.Models.ResourceIdentity GetIdentityObjectFromType(b
                     Type = ResourceIdentityType.SystemAssigned.ToString()
                 };
             }
+            else if (!assignIdentityIsPresent && !userAssignedIdentityIsPresent)
+            {
+                identityResult = new Management.Sql.Models.ResourceIdentity()
+                {
+                    Type = ResourceIdentityType.None.ToString()
+                };
+            }
 
             return identityResult;
         }

src/Sql/Sql/Sql.csproj

@@ -24,10 +24,6 @@
     <PackageReference Include="Microsoft.Azure.Management.Sql" Version="1.53.0-preview" /> 
     <PackageReference Include="System.Security.Permissions" Version="4.5.0" />
   </ItemGroup>
-  
-  <ItemGroup>
-    <Reference Include="D:\repos\azure-sdk-for-net\artifacts\bin\Microsoft.Azure.Management.Sql\Debug\net461\Microsoft.Azure.Management.Sql.dll" />
-  </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\Sql.LegacySdk\Sql.LegacySdk.csproj" />