Skip to content

Commit d120a3d

Browse files
authored
Merge branch 'preview' into preview
2 parents 34eb29a + ce5128c commit d120a3d

File tree

6 files changed

+19
-49
lines changed

6 files changed

+19
-49
lines changed

ChangeLog.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
## 6.2.0 - June 2018
1+
## 6.2.1 - June 2018
2+
### AzureRM.OperationalInsights
3+
* Updated PSWorkspace model to allow Network to use type as a parameter
4+
5+
## 6.2.0 - June 2018
26
#### AzureRM.Profile
37
* Fix issue where version 10.0.3 of Newtonsoft.Json wasn't being loaded on module import
48

src/Common/Commands.Common/AzurePowerShell.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ public class AzurePowerShell
2626

2727
public const string AssemblyCopyright = "Copyright © Microsoft";
2828

29-
public const string AssemblyVersion = "6.2.0";
29+
public const string AssemblyVersion = "6.2.1";
3030

31-
public const string AssemblyFileVersion = "6.2.0";
31+
public const string AssemblyFileVersion = "6.2.1";
3232

3333
public const string ProfileFile = "AzureProfile.json";
3434

src/ResourceManager/OperationalInsights/AzureRM.OperationalInsights.psd1

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# RootModule = ''
1313

1414
# Version number of this module.
15-
ModuleVersion = '5.0.0'
15+
ModuleVersion = '5.0.1'
1616

1717
# Supported PSEditions
1818
# CompatiblePSEditions = @()
@@ -147,9 +147,7 @@ PrivateData = @{
147147
# IconUri = ''
148148

149149
# ReleaseNotes of this module
150-
ReleaseNotes = '* Set minimum dependency of module to PowerShell 5.0
151-
* Introduce multiple breaking changes
152-
- Please refer to the migration guide for more information'
150+
ReleaseNotes = '* Updated PSWorkspace model to allow Network to use type as a parameter'
153151

154152
# Prerelease string of this module
155153
# Prerelease = ''

src/ResourceManager/OperationalInsights/ChangeLog.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@
1919
-->
2020
## Current Release
2121

22+
## Version 5.0.1
23+
* Updated PSWorkspace model to allow Network to use type as a parameter
24+
2225
## Version 5.0.0
2326
* Set minimum dependency of module to PowerShell 5.0
2427
* Introduce multiple breaking changes

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
[assembly: ComVisible(false)]
2626
[assembly: CLSCompliant(false)]
2727
[assembly: Guid("5be35a94-c20f-4659-aa29-9b9aebcfaf36")]
28-
[assembly: AssemblyVersion("5.0.0")]
29-
[assembly: AssemblyFileVersion("5.0.0")]
28+
[assembly: AssemblyVersion("5.0.1")]
29+
[assembly: AssemblyFileVersion("5.0.1")]
3030
#if SIGN
3131
[assembly: InternalsVisibleTo("Microsoft.Azure.Commands.OperationalInsights.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]
3232
#else

tools/AzureRM/AzureRM.psd1

Lines changed: 5 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# RootModule = ''
1313

1414
# Version number of this module.
15-
ModuleVersion = '6.2.0'
15+
ModuleVersion = '6.2.1'
1616

1717
# Supported PSEditions
1818
# CompatiblePSEditions = @()
@@ -86,7 +86,7 @@ RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; RequiredVersion = '5.2.0';
8686
@{ModuleName = 'AzureRM.Media'; RequiredVersion = '0.10.0'; },
8787
@{ModuleName = 'AzureRM.Network'; RequiredVersion = '6.2.0'; },
8888
@{ModuleName = 'AzureRM.NotificationHubs'; RequiredVersion = '5.0.0'; },
89-
@{ModuleName = 'AzureRM.OperationalInsights'; RequiredVersion = '5.0.0'; },
89+
@{ModuleName = 'AzureRM.OperationalInsights'; RequiredVersion = '5.0.1'; },
9090
@{ModuleName = 'AzureRM.PolicyInsights'; RequiredVersion = '1.0.0'; },
9191
@{ModuleName = 'AzureRM.PowerBIEmbedded'; RequiredVersion = '4.1.5'; },
9292
@{ModuleName = 'AzureRM.RecoveryServices'; RequiredVersion = '4.1.3'; },
@@ -160,44 +160,9 @@ PrivateData = @{
160160
# IconUri = ''
161161

162162
# ReleaseNotes of this module
163-
ReleaseNotes = '6.2.0 - June 2018
164-
AzureRM.Profile
165-
* Fix issue where version 10.0.3 of Newtonsoft.Json wasn''t being loaded on module import
166-
167-
AzureRM.Compute
168-
* VMSS VM Update feature
169-
- Added ''Update-AzureRmVmssVM'' and ''New-AzureRmVMDataDisk'' cmdlets
170-
- Add VirtualMachineScaleSetVM parameter to ''Add-AzureRmVMDataDisk'' cmdlet to support adding a data disk to Vmss VM.
171-
172-
AzureRM.DataFactoryV2
173-
* Updated the ADF .Net SDK version to 0.8.0-preview containing following changes:
174-
- Added Configure factory repository operation
175-
- Updated QuickBooks LinkedService to expose consumerKey and consumerSecret properties
176-
- Updated Several model types from SecretBase to Object
177-
- Added Blob Events trigger
178-
179-
AzureRM.KeyVault
180-
* Update documentation with example output
181-
182-
AzureRM.Network
183-
* Enable Traffic Analytics parameters on Network Watcher cmdlets
184-
185-
AzureRM.Resources
186-
* Fix issue with ''Properties'' property of ''PSResource'' object(s) returned from ''Get-AzureRmResource''
187-
188-
AzureRM.Sql
189-
* Updated the following cmdlets with optional LicenseType parameter
190-
- New-AzureRmSqlDatabase; Set-AzureRmSqlDatabase
191-
- New-AzureRmSqlElasticPool; Set-AzureRmSqlElasticPool
192-
- New-AzureRmSqlDatabaseCopy
193-
- New-AzureRmSqlDatabaseSecondary
194-
- Restore-AzureRmSqlDatabase
195-
196-
AzureRM.Scheduler
197-
* Fix issue with update ServiceBusQueueJob not setting new Auth values
198-
199-
AzureRM.Websites
200-
* ''New-AzureRMWebApp'' is updated to use common algorithms from the Strategy library.
163+
ReleaseNotes = '6.2.1 - June 2018
164+
AzureRM.OperationalInsights
165+
* Updated PSWorkspace model to allow Network to use type as a parameter
201166
'
202167

203168
# Prerelease string of this module

0 commit comments

Comments
 (0)