Merge pull request #2 from ariklin/SecurityTopology

fix conflict

Author: ariklin

src/Security/Security/Az.Security.psd1

@@ -3,7 +3,7 @@
 #
 # Generated by: Microsoft Corporation
 #
-# Generated on: 5/13/2020
+# Generated on: 6/17/2020
 #
 
 @{
@@ -12,7 +12,7 @@
 # RootModule = ''
 
 # Version number of this module.
-ModuleVersion = '0.7.8'
+ModuleVersion = '0.7.9'
 
 # Supported PSEditions
 CompatiblePSEditions = 'Core', 'Desktop'
@@ -53,7 +53,7 @@ DotNetFrameworkVersion = '4.7.2'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '1.8.1'; })
+RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '1.9.0'; })
 
 # Assemblies that must be loaded prior to importing this module
 RequiredAssemblies = 'Microsoft.Azure.Management.SecurityCenter.dll'
@@ -107,12 +107,15 @@ CmdletsToExport = 'Get-AzSecurityAlert', 'Set-AzSecurityAlert',
                'Get-AzSqlInformationProtectionPolicy', 
                'Get-AzRegulatoryComplianceStandard', 
                'Get-AzRegulatoryComplianceControl', 
-               'Get-AzRegulatoryComplainceAssessment',
-			   'Get-AzSecuritySetting', 'Set-AzSecuritySetting',
-               'Get-AzSecurityAssessment', 'Set-AzSecurityAssessment', 'Remove-AzSecurityAssessment',
-               'Get-AzSecurityAssessmentMetadata', 'Set-AzSecurityAssessmentMetadata', 'Remove-AzSecurityAssessmentMetadata',
+               'Get-AzRegulatoryComplainceAssessment', 'Get-AzSecuritySetting', 
+               'Set-AzSecuritySetting', 'Get-AzSecurityAssessment', 
+               'Set-AzSecurityAssessment', 'Remove-AzSecurityAssessment', 
+               'Get-AzSecurityAssessmentMetadata', 
+               'Set-AzSecurityAssessmentMetadata', 
+               'Remove-AzSecurityAssessmentMetadata', 
                'Get-AzSecuritySubAssessment',
-               'Get-AzSecurityTopology'
+			   'Get-AzSecurityTopology'
+
 
 # Variables to export from this module
 # VariablesToExport = @()
@@ -147,13 +150,13 @@ PrivateData = @{
         # IconUri = ''
 
         # ReleaseNotes of this module
-        ReleaseNotes = '* Add new cmdlets: Get-AzSecurityAssessment,
-                   Set-AzSecurityAssessment,
-                   Remove-AzSecurityAssessment,
-                   Get-AzSecurityAssessmentMetadata,
-                   Set-AzSecurityAssessmentMetadata,
-                   Remove-AzSecurityAssessmentMetadata,
-                   Get-AzSecuritySubAssessment'
+        ReleaseNotes = '* Add new cmdlets: ''Get-AzSecurityAssessment'',
+                   ''Set-AzSecurityAssessment'',
+                   ''Remove-AzSecurityAssessment'',
+                   ''Get-AzSecurityAssessmentMetadata'',
+                   ''Set-AzSecurityAssessmentMetadata'',
+                   ''Remove-AzSecurityAssessmentMetadata'',
+                   ''Get-AzSecuritySubAssessment'''
 
         # Prerelease string of this module
         # Prerelease = ''
@@ -175,4 +178,3 @@ PrivateData = @{
 # DefaultCommandPrefix = ''
 
 }
-