Merge pull request Azure#6409 from maddieclayton/mergerelease

Merge release-6.2.1 to master

Author: Maddie Clayton

ChangeLog.md

@@ -1,4 +1,8 @@
-## 6.2.0 - June 2018
+## 6.2.1 - June 2018
+### AzureRM.OperationalInsights
+* Updated PSWorkspace model to allow Network to use type as a parameter
+
+## 6.2.0 - June 2018
 #### AzureRM.Profile
 * Fix issue where version 10.0.3 of Newtonsoft.Json wasn't being loaded on module import
 

src/Common/Commands.Common/AzurePowerShell.cs

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

src/ResourceManager/OperationalInsights/AzureRM.OperationalInsights.psd1

@@ -12,7 +12,7 @@
 # RootModule = ''
 
 # Version number of this module.
-ModuleVersion = '5.0.0'
+ModuleVersion = '5.0.1'
 
 # Supported PSEditions
 # CompatiblePSEditions = @()
@@ -147,9 +147,7 @@ PrivateData = @{
         # IconUri = ''
 
         # ReleaseNotes of this module
-        ReleaseNotes = '* Set minimum dependency of module to PowerShell 5.0
-* Introduce multiple breaking changes
-    - Please refer to the migration guide for more information'
+        ReleaseNotes = '* Updated PSWorkspace model to allow Network to use type as a parameter'
 
         # Prerelease string of this module
         # Prerelease = ''

src/ResourceManager/OperationalInsights/ChangeLog.md

@@ -19,6 +19,9 @@
 -->
 ## Current Release
 
+## Version 5.0.1
+* Updated PSWorkspace model to allow Network to use type as a parameter
+
 ## Version 5.0.0
 * Set minimum dependency of module to PowerShell 5.0
 * Introduce multiple breaking changes

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

@@ -25,8 +25,8 @@
 [assembly: ComVisible(false)]
 [assembly: CLSCompliant(false)]
 [assembly: Guid("5be35a94-c20f-4659-aa29-9b9aebcfaf36")]
-[assembly: AssemblyVersion("5.0.0")]
-[assembly: AssemblyFileVersion("5.0.0")]
+[assembly: AssemblyVersion("5.0.1")]
+[assembly: AssemblyFileVersion("5.0.1")]
 #if SIGN
 [assembly: InternalsVisibleTo("Microsoft.Azure.Commands.OperationalInsights.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]
 #else

tools/AzureRM/AzureRM.psd1

@@ -12,7 +12,7 @@
 # RootModule = ''
 
 # Version number of this module.
-ModuleVersion = '6.2.0'
+ModuleVersion = '6.2.1'
 
 # Supported PSEditions
 # CompatiblePSEditions = @()
@@ -86,7 +86,7 @@ RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; RequiredVersion = '5.2.0';
                @{ModuleName = 'AzureRM.Media'; RequiredVersion = '0.10.0'; }, 
                @{ModuleName = 'AzureRM.Network'; RequiredVersion = '6.2.0'; }, 
                @{ModuleName = 'AzureRM.NotificationHubs'; RequiredVersion = '5.0.0'; }, 
-               @{ModuleName = 'AzureRM.OperationalInsights'; RequiredVersion = '5.0.0'; }, 
+               @{ModuleName = 'AzureRM.OperationalInsights'; RequiredVersion = '5.0.1'; }, 
                @{ModuleName = 'AzureRM.PowerBIEmbedded'; RequiredVersion = '4.1.5'; }, 
                @{ModuleName = 'AzureRM.RecoveryServices'; RequiredVersion = '4.1.3'; }, 
                @{ModuleName = 'AzureRM.RecoveryServices.Backup'; RequiredVersion = '4.1.3'; }, 
@@ -159,44 +159,9 @@ PrivateData = @{
         # IconUri = ''
 
         # ReleaseNotes of this module
-        ReleaseNotes = '6.2.0 - June 2018
-AzureRM.Profile
-* Fix issue where version 10.0.3 of Newtonsoft.Json wasn''t being loaded on module import
-
-AzureRM.Compute
-* VMSS VM Update feature
-    - Added ''Update-AzureRmVmssVM'' and ''New-AzureRmVMDataDisk'' cmdlets
-    - Add VirtualMachineScaleSetVM parameter to ''Add-AzureRmVMDataDisk'' cmdlet to support adding a data disk to Vmss VM.
-
-AzureRM.DataFactoryV2
-* Updated the ADF .Net SDK version to 0.8.0-preview containing following changes:
-    - Added Configure factory repository operation
-    - Updated QuickBooks LinkedService to expose consumerKey and consumerSecret properties
-    - Updated Several model types from SecretBase to Object
-    - Added Blob Events trigger
-
-AzureRM.KeyVault
-* Update documentation with example output
-
-AzureRM.Network
-* Enable Traffic Analytics parameters on Network Watcher cmdlets
-
-AzureRM.Resources
-* Fix issue with ''Properties'' property of ''PSResource'' object(s) returned from ''Get-AzureRmResource''
-
-AzureRM.Sql
-* Updated the following cmdlets with optional LicenseType parameter
-	- New-AzureRmSqlDatabase; Set-AzureRmSqlDatabase
-	- New-AzureRmSqlElasticPool; Set-AzureRmSqlElasticPool
-	- New-AzureRmSqlDatabaseCopy
-	- New-AzureRmSqlDatabaseSecondary
-	- Restore-AzureRmSqlDatabase
-
-AzureRM.Scheduler
-* Fix issue with update ServiceBusQueueJob not setting new Auth values
-
-AzureRM.Websites
-* ''New-AzureRMWebApp'' is updated to use common algorithms from the Strategy library.
+        ReleaseNotes = '6.2.1 - June 2018
+AzureRM.OperationalInsights
+* Updated PSWorkspace model to allow Network to use type as a parameter
 '
 
         # Prerelease string of this module