Merge pull request Azure#6563 from Azure/master

Merge Master to Preview

Author: Maddie Clayton

ChangeLog.md

@@ -26,9 +26,9 @@ public class AzurePowerShell
 
         public const string AssemblyCopyright = "Copyright © Microsoft";
 
-        public const string AssemblyVersion = "6.3.0";
+        public const string AssemblyVersion = "6.4.0";
 
-        public const string AssemblyFileVersion = "6.3.0";
+        public const string AssemblyFileVersion = "6.4.0";
 
         public const string ProfileFile = "AzureProfile.json";
 

src/Common/Commands.Common/AzurePowerShell.cs

@@ -3,7 +3,7 @@
 #
 # Generated by: Microsoft Corporation
 #
-# Generated on: 3/20/2018
+# Generated on: 6/26/2018
 #
 
 @{
@@ -12,7 +12,7 @@
 # RootModule = ''
 
 # Version number of this module.
-ModuleVersion = '0.0.2'
+ModuleVersion = '0.0.3'
 
 # Supported PSEditions
 # CompatiblePSEditions = @()
@@ -51,12 +51,12 @@ CLRVersion = '4.0'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '5.3.0'; })
+RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '5.3.1'; })
 
 # Assemblies that must be loaded prior to importing this module
 RequiredAssemblies = '.\YamlDotNet.dll',
-	'.\Microsoft.Azure.Commands.Common.Graph.RBAC.dll',
-	'.\AutoMapper.dll', '.\System.Management.Automation.dll'
+               '.\Microsoft.Azure.Commands.Common.Graph.RBAC.dll',
+               '.\AutoMapper.dll', '.\System.Management.Automation.dll'
 
 # Script files (.ps1) that are run in the caller's environment prior to importing this module.
 # ScriptsToProcess = @()
@@ -74,8 +74,8 @@ NestedModules = @('.\Microsoft.Azure.Commands.Aks.dll')
 FunctionsToExport = @()
 
 # Cmdlets to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no cmdlets to export.
-CmdletsToExport = 'Get-AzureRmAks', 'New-AzureRmAks', 'Remove-AzureRmAks', 
-               'Import-AzureRmAksCredential', 'Start-AzureRmAksDashboard', 
+CmdletsToExport = 'Get-AzureRmAks', 'New-AzureRmAks', 'Remove-AzureRmAks',
+               'Import-AzureRmAksCredential', 'Start-AzureRmAksDashboard',
                'Stop-AzureRmAksDashboard', 'Set-AzureRmAks'
 
 # Variables to export from this module
@@ -111,8 +111,7 @@ PrivateData = @{
         # IconUri = ''
 
         # ReleaseNotes of this module
-        ReleaseNotes = '* Updated to the latest version of the Azure ClientRuntime
-* Set minimum dependency of module to PowerShell 5.0'
+        ReleaseNotes = '* No version update. Extracted AKS sdk to common for reuse in DevSpaces.'
 
         # Prerelease string of this module
         Prerelease = 'preview'
@@ -124,7 +123,7 @@ PrivateData = @{
         # ExternalModuleDependencies = @()
 
     } # End of PSData hashtable
-    
+
  } # End of PrivateData hashtable
 
 # HelpInfo URI of this module

src/ResourceManager/Aks/Commands.Aks/AzureRM.Aks.psd1

@@ -18,6 +18,8 @@
         - Additional information about change #1
 -->
 ## Current Release
+
+## Version 0.0.3
 * No version update. Extracted AKS sdk to common for reuse in DevSpaces.
 
 ## Version 0.0.2

src/ResourceManager/Aks/Commands.Aks/ChangeLog.md

@@ -23,5 +23,5 @@
 [assembly: ComVisible(false)]
 [assembly: CLSCompliant(false)]
 [assembly: Guid("a97e0c3e-e389-46a6-b73d-2b9bd6909bdb")]
-[assembly: AssemblyVersion("0.0.2")]
-[assembly: AssemblyFileVersion("0.0.2")]
+[assembly: AssemblyVersion("0.0.3")]
+[assembly: AssemblyFileVersion("0.0.3")]

src/ResourceManager/Aks/Commands.Aks/Properties/AssemblyInfo.cs

@@ -1,92 +1,92 @@
-#  
-# Module manifest for module 'Microsoft.Azure.Commands.AnalysisServices.Dataplane'  
-#  
-# Generated by: Microsoft Corporation  
-#  
+#
+# Module manifest for module 'Microsoft.Azure.Commands.AnalysisServices.Dataplane'
+#
+# Generated by: Microsoft Corporation
+#
 # Generated on: 12/02/2016
-#  
-  
+#
+
 @{
 
 # Script module or binary module file associated with this manifest.
 # RootModule = ''
-  
-# Version number of this module.  
-ModuleVersion = '0.5.1'
-  
-# ID used to uniquely identify this module  
-GUID = 'c717b5a4-1f1b-4a2f-8aa1-bfd09934626e'  
-  
-# Author of this module  
-Author = 'Microsoft Corporation'  
-  
-# Company or vendor of this module  
-CompanyName = 'Microsoft Corporation'  
-  
-# Copyright statement for this module  
-Copyright = 'Microsoft Corporation. All rights reserved.'    
-  
-# Description of the functionality provided by this module  
+
+# Version number of this module.
+ModuleVersion = '0.5.2'
+
+# ID used to uniquely identify this module
+GUID = 'c717b5a4-1f1b-4a2f-8aa1-bfd09934626e'
+
+# Author of this module
+Author = 'Microsoft Corporation'
+
+# Company or vendor of this module
+CompanyName = 'Microsoft Corporation'
+
+# Copyright statement for this module
+Copyright = 'Microsoft Corporation. All rights reserved.'
+
+# Description of the functionality provided by this module
 Description = 'Microsoft Azure PowerShell - Analysis Services server management'
-  
-# Minimum version of the Windows PowerShell engine required by this module  
-PowerShellVersion = '5.0'  
-  
-# Name of the Windows PowerShell host required by this module  
-PowerShellHostName = ''  
-  
-# Minimum version of the Windows PowerShell host required by this module  
-PowerShellHostVersion = ''  
-  
-# Minimum version of the .NET Framework required by this module  
-DotNetFrameworkVersion = '4.5.2'  
-  
-# Minimum version of the common language runtime (CLR) required by this module  
-CLRVersion='4.0'  
-  
-# Processor architecture (None, X86, Amd64, IA64) required by this module  
-ProcessorArchitecture = 'None'  
+
+# Minimum version of the Windows PowerShell engine required by this module
+PowerShellVersion = '5.0'
+
+# Name of the Windows PowerShell host required by this module
+PowerShellHostName = ''
+
+# Minimum version of the Windows PowerShell host required by this module
+PowerShellHostVersion = ''
+
+# Minimum version of the .NET Framework required by this module
+DotNetFrameworkVersion = '4.5.2'
+
+# Minimum version of the common language runtime (CLR) required by this module
+CLRVersion='4.0'
+
+# Processor architecture (None, X86, Amd64, IA64) required by this module
+ProcessorArchitecture = 'None'
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '5.3.0'; })
+RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '5.3.1'; })
 
-# Assemblies that must be loaded prior to importing this module  
+# Assemblies that must be loaded prior to importing this module
 RequiredAssemblies = @()
-  
-# Script files (.ps1) that are run in the caller's environment prior to importing this module  
-ScriptsToProcess = @()  
-  
-# Type files (.ps1xml) to be loaded when importing this module  
+
+# Script files (.ps1) that are run in the caller's environment prior to importing this module
+ScriptsToProcess = @()
+
+# Type files (.ps1xml) to be loaded when importing this module
 TypesToProcess = @()
-  
-# Format files (.ps1xml) to be loaded when importing this module  
+
+# Format files (.ps1xml) to be loaded when importing this module
 FormatsToProcess = @()
-  
-# Modules to import as nested modules of the module specified in ModuleToProcess  
+
+# Modules to import as nested modules of the module specified in ModuleToProcess
 NestedModules = @('.\Microsoft.Azure.Commands.AnalysisServices.Dataplane.dll')
-  
-# Functions to export from this module  
-FunctionsToExport = '*'  
-  
-# Cmdlets to export from this module  
+
+# Functions to export from this module
+FunctionsToExport = '*'
+
+# Cmdlets to export from this module
 CmdletsToExport = 'Add-AzureAnalysisServicesAccount',
                 'Restart-AzureAnalysisServicesInstance',
                 'Export-AzureAnalysisServicesInstanceLog',
                 'Sync-AzureAnalysisServicesInstance'
-  
-# Variables to export from this module  
-VariablesToExport = '*'  
-  
-# Aliases to export from this module  
+
+# Variables to export from this module
+VariablesToExport = '*'
+
+# Aliases to export from this module
 AliasesToExport = '*'
-  
-# List of all modules packaged with this module  
-ModuleList = @()  
-  
-# List of all files packaged with this module  
-FileList =  @()  
-  
-# Private data to pass to the module specified in ModuleToProcess  
+
+# List of all modules packaged with this module
+ModuleList = @()
+
+# List of all files packaged with this module
+FileList =  @()
+
+# Private data to pass to the module specified in ModuleToProcess
 PrivateData = @{
 
     PSData = @{
@@ -104,10 +104,10 @@ PrivateData = @{
         # IconUri = ''
 
         # ReleaseNotes of this module
-        ReleaseNotes = '* Set minimum dependency of module to PowerShell 5.0'
+        ReleaseNotes = '* Fixed formatting of OutputTypes in help files'
 
     } # End of PSData hashtable
 
-} # End of PrivateData hashtable  
+} # End of PrivateData hashtable
 
-} 
+}

src/ResourceManager/AnalysisServices/Commands.AnalysisServices.Dataplane/Azure.AnalysisServices.psd1

@@ -19,5 +19,8 @@
 -->
 ## Current Release
 
+## Version 0.5.2
+* Fixed formatting of OutputTypes in help files
+
 ## Version 0.5.1
 * Set minimum dependency of module to PowerShell 5.0

src/ResourceManager/AnalysisServices/Commands.AnalysisServices.Dataplane/ChangeLog.md

@@ -37,7 +37,7 @@ namespace Microsoft.Azure.Commands.AnalysisServices.Dataplane
     /// </summary>
     [Cmdlet(VerbsData.Sync, "AzureAnalysisServicesInstance", SupportsShouldProcess = true)]
     [Alias("Sync-AzureAsInstance")]
-    [OutputType(typeof(ScaleOutServerDatabaseSyncDetails[]))]
+    [OutputType(typeof(ScaleOutServerDatabaseSyncDetails))]
     public class SynchronizeAzureAzureAnalysisServer : AzurePSCmdlet
     {
         private static TimeSpan DefaultPollingInterval = TimeSpan.FromSeconds(30);

src/ResourceManager/AnalysisServices/Commands.AnalysisServices.Dataplane/Commands/Synchronize-AzureASInstance.cs

@@ -1,7 +1,7 @@
 using System.Reflection;
 using System.Runtime.InteropServices;
 
-// General Information about an assembly is controlled through the following 
+// General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 
@@ -14,8 +14,8 @@
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components.  If you need to access a type in this assembly from
 // COM, set the ComVisible attribute to true on that type.
 
 [assembly: ComVisible(false)]
@@ -27,13 +27,13 @@
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version
-//      Minor Version 
+//      Minor Version
 //      Build Number
 //      Revision
 //
-// You can specify all the values or you can default the Build and Revision Numbers 
+// You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 
 
-[assembly: AssemblyVersion("0.5.1")]
-[assembly: AssemblyFileVersion("0.5.1")]
+[assembly: AssemblyVersion("0.5.2")]
+[assembly: AssemblyFileVersion("0.5.2")]

src/ResourceManager/AnalysisServices/Commands.AnalysisServices.Dataplane/Properties/AssemblyInfo.cs

@@ -3,7 +3,7 @@
 #
 # Generated by: Microsoft Corporation
 #
-# Generated on: 5/17/2018
+# Generated on: 6/26/2018
 #
 
 @{
@@ -12,7 +12,7 @@
 # RootModule = ''
 
 # Version number of this module.
-ModuleVersion = '0.6.8'
+ModuleVersion = '0.6.9'
 
 # Supported PSEditions
 # CompatiblePSEditions = @()
@@ -51,7 +51,7 @@ CLRVersion = '4.0'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '5.3.0'; })
+RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '5.3.1'; })
 
 # Assemblies that must be loaded prior to importing this module
 RequiredAssemblies = '.\Microsoft.Azure.Management.Analysis.dll'
@@ -116,7 +116,7 @@ PrivateData = @{
         # IconUri = ''
 
         # ReleaseNotes of this module
-        ReleaseNotes = '* Enable Gateway assocaite/disassociate operations on AS.'
+        ReleaseNotes = '* Fixed formatting of OutputType in help files'
 
         # Prerelease string of this module
         # Prerelease = ''

src/ResourceManager/AnalysisServices/Commands.AnalysisServices/AzureRM.AnalysisServices.psd1

@@ -18,6 +18,8 @@
         - Additional information about change #1
 -->
 ## Current Release
+
+## Version 0.6.9
 * Fixed formatting of OutputType in help files
 
 ## Version 0.6.8

src/ResourceManager/AnalysisServices/Commands.AnalysisServices/ChangeLog.md

@@ -34,5 +34,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersion("0.6.8")]
-[assembly: AssemblyFileVersion("0.6.8")]
+[assembly: AssemblyVersion("0.6.9")]
+[assembly: AssemblyFileVersion("0.6.9")]