Merge pull request #4416 from darshanhs90/preview

remove resources.dll as it isnt needed

Author: cormacpayne

src/ResourceManager/Resources/Commands.Resources.Test/ScenarioTests/RoleAssignmentTests.ps1

@@ -19,7 +19,6 @@ Tests retrieval of classic administrators
 function Test-RaClassicAdmins
 {
 	# Setup
-	Add-Type -Path ".\\Microsoft.Azure.Commands.Resources.dll"
 	$subscription = Get-AzureRmSubscription
 
 	# Test
@@ -37,8 +36,6 @@ Tests verifies negative scenarios for RoleAssignments
 function Test-RaNegativeScenarios
 {
     # Setup
-     Add-Type -Path ".\\Microsoft.Azure.Commands.Resources.dll"
-
     $subscription = Get-AzureRmSubscription
 
     # Bad OID returns zero role assignments
@@ -66,8 +63,6 @@ Tests verifies creation and deletion of a RoleAssignments by Scope
 function Test-RaByScope
 {
     # Setup
-    Add-Type -Path ".\\Microsoft.Azure.Commands.Resources.dll"
-
     $definitionName = 'Reader'
     $users = Get-AzureRmADUser | Select-Object -First 1 -Wait
     $subscription = Get-AzureRmSubscription
@@ -101,8 +96,6 @@ Tests verifies creation and deletion of a RoleAssignments by Resource Group
 function Test-RaByResourceGroup
 {
     # Setup
-    Add-Type -Path ".\\Microsoft.Azure.Commands.Resources.dll"
-
     $definitionName = 'Contributor'
     $users = Get-AzureRmADUser | Select-Object -Last 1 -Wait
     $resourceGroups = Get-AzureRmResourceGroup | Select-Object -Last 1 -Wait
@@ -134,8 +127,6 @@ Tests verifies creation and deletion of a RoleAssignments by Resource
 function Test-RaByResource
 {
     # Setup
-    Add-Type -Path ".\\Microsoft.Azure.Commands.Resources.dll"
-
     $definitionName = 'Owner'
     $groups = Get-AzureRmADGroup | Select-Object -Last 1 -Wait
     Assert-AreEqual 1 $groups.Count "There should be at least one group to run the test."
@@ -171,8 +162,6 @@ Tests validate input parameters
 function Test-RaValidateInputParameters ($cmdName)
 {
     # Setup
-    Add-Type -Path ".\\Microsoft.Azure.Commands.Resources.dll"
-
     $definitionName = 'Owner'
     $groups = Get-AzureRmADGroup | Select-Object -Last 1 -Wait
     Assert-AreEqual 1 $groups.Count "There should be at least one group to run the test."
@@ -224,8 +213,6 @@ Tests verifies creation and deletion of a RoleAssignments for Service principal
 function Test-RaByServicePrincipal
 {
     # Setup
-    Add-Type -Path ".\\Microsoft.Azure.Commands.Resources.dll"
-
     $definitionName = 'Reader'
     $servicePrincipals = Get-AzureRmADServicePrincipal | Select-Object -Last 1 -Wait
     $subscription = Get-AzureRmSubscription
@@ -260,8 +247,6 @@ Tests verifies creation and deletion of a RoleAssignments for User Principal Nam
 function Test-RaByUpn
 {
     # Setup
-    Add-Type -Path ".\\Microsoft.Azure.Commands.Resources.dll"
-
     $definitionName = 'Contributor'
     $users = Get-AzureRmADUser | Select-Object -Last 1 -Wait
     $resourceGroups = Get-AzureRmResourceGroup | Select-Object -Last 1 -Wait
@@ -290,9 +275,6 @@ function Test-RaByUpn
 function Test-RaUserPermissions 
 { 
     param([string]$rgName, [string]$action) 
-    
-    # Setup 
-    
     # Test 
     $rg = Get-AzureRmResourceGroup
 	$errorMsg = "User should have access to only 1 RG. Found: {0}" -f $rg.Count
@@ -309,8 +291,6 @@ Tests verifies creation and deletion of a RoleAssignments by Scope irrespective
 function Test-RaDeletionByScope
 {
     # Setup
-    Add-Type -Path ".\\Microsoft.Azure.Commands.Resources.dll"
-
     $definitionName = 'Reader'
     $users = Get-AzureRmADUser | Select-Object -First 1 -Wait
     $subscription = Get-AzureRmSubscription
@@ -346,8 +326,6 @@ function CreateRoleAssignment
 {
     param([string]$roleAssignmentId, [string]$userId, [string]$definitionName, [string]$resourceGroupName) 
 
-    Add-Type -Path ".\\Microsoft.Azure.Commands.Resources.dll"
-
     [Microsoft.Azure.Commands.Resources.Models.Authorization.AuthorizationClient]::RoleAssignmentNames.Enqueue($roleAssignmentId)
     $newAssignment = New-AzureRmRoleAssignment `
                         -ObjectId $userId `

src/ResourceManager/Resources/Commands.Resources.Test/ScenarioTests/RoleDefinitionTests.ps1

@@ -19,8 +19,6 @@ Tests verify scenarios for RoleDefinitions creation.
 function Test-RoleDefinitionCreateTests
 {
     # Setup
-    Add-Type -Path ".\\Microsoft.Azure.Commands.Resources.dll"
-
     # Basic positive case - read from file
     $rdName = 'CustomRole Tests Role'
     [Microsoft.Azure.Commands.Resources.Models.Authorization.AuthorizationClient]::RoleDefinitionNames.Enqueue("8D7DD69E-9AE2-44A1-94D8-F7BC8E12645E")
@@ -62,8 +60,6 @@ Tests verify negative scenarios for RoleDefinitions
 function Test-RdNegativeScenarios
 {
 	# Setup
-	Add-Type -Path ".\\Microsoft.Azure.Commands.Resources.dll"
-
     # Does not throw when getting a non-existing role assignment
     $rdName = 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa'
     $rdNull = Get-AzureRmRoleDefinition -Name $rdName
@@ -104,8 +100,6 @@ Tests verify positive scenarios for RoleDefinitions.
 function Test-RDPositiveScenarios
 {
     # Setup
-    Add-Type -Path ".\\Microsoft.Azure.Commands.Resources.dll"
-
     # Create a role definition with Name rdNamme.
     $rdName = 'Another tests role'
     [Microsoft.Azure.Commands.Resources.Models.Authorization.AuthorizationClient]::RoleDefinitionNames.Enqueue("032F61D2-ED09-40C9-8657-26A273DA7BAE")
@@ -176,8 +170,6 @@ Verify positive and negative scenarios for RoleDefinition remove.
 function Test-RDRemove
 {
     # Setup
-    Add-Type -Path ".\\Microsoft.Azure.Commands.Resources.dll"
-
     # Create a role definition at RG Scope.
     [Microsoft.Azure.Commands.Resources.Models.Authorization.AuthorizationClient]::RoleDefinitionNames.Enqueue("65E1D983-ECF4-42D4-8C08-5B1FD6E86335")
 
@@ -217,8 +209,6 @@ Verify positive and negative scenarios for RoleDefinition Get.
 function Test-RDGet
 {
     # Setup
-    Add-Type -Path ".\\Microsoft.Azure.Commands.Resources.dll"
-	
 	$subscription = Get-AzureRmSubscription
 
 	$resource = Get-AzureRmResource | Select-Object -Last 1 -Wait
@@ -289,8 +279,6 @@ Tests validate input parameters
 function Test-RdValidateInputParameters ($cmdName)
 {
     # Setup
-    Add-Type -Path ".\\Microsoft.Azure.Commands.Resources.dll"
-
     # Note: All below scenarios are invalid, we'll expect an exception during scope validation so the ID parameter doesn't need to be a valid one. 
 
     # Test
@@ -324,8 +312,6 @@ Tests validate input parameters
 function Test-RdValidateInputParameters2 ($cmdName)
 {
     # Setup
-    Add-Type -Path ".\\Microsoft.Azure.Commands.Resources.dll"
-
     # Note: All below scenarios are invalid, we'll expect an exception during scope validation so the ID parameter doesn't need to be a valid one. 
 
 	$roleDef = Get-AzureRmRoleDefinition -Name "Reader"