Skip to content

Commit 7fd657a

Browse files
cormacpaynecormacpayne
authored
Merge pull request #5887 from Azure/master
[5.7.0] Merge master --> preview
2 parents f3e9466 + 23262b6 commit 7fd657a

File tree

653 files changed

+46498
-61227
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

653 files changed

+46498
-61227
lines changed

‎ChangeLog.md

Lines changed: 56 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,59 @@
1-
## 5.6.0 - March 2018
1+
## 5.7.0 - April 2018
2+
3+
#### General
4+
* Updated to the latest version of the Azure ClientRuntime
5+
6+
#### Azure.Storage
7+
* Fix the issue that upload Blob and upload File cmdlets fail on FIPS policy enabled machines
8+
- Set-AzureStorageBlobContent
9+
- Set-AzureStorageFileContent
10+
11+
#### AzureRM.Billing
12+
* New Cmdlet Get-AzureRmEnrollmentAccount
13+
- cmdlet to retrieve enrollment accounts
14+
15+
#### AzureRM.CognitiveServices
16+
* Integrate with Cognitive Services Management SDK version 4.0.0.
17+
* Add Get-AzureRmCognitiveServicesAccountUsage operation.
18+
19+
#### AzureRM.Compute
20+
* `Get-AzureRmVmssDiskEncryptionStatus` supports encryption status at data disk level
21+
* `Get-AzureRmVmssVmDiskEncryptionStatus` supports encryption status at data disk level
22+
* Update for Zone Resilient
23+
* 'New-AzureRmVm' and 'New-AzureRmVmss' (simple parameter set) support availability zones.
24+
25+
#### AzureRM.ContainerRegistry
26+
* Decouple reliance on Commands.Resources.Rest and ARM/Storage SDKs.
27+
28+
#### AzureRM.DataLakeStore
29+
* Add debug functionality
30+
* Update the version of the ADLS dataplane SDK to 1.1.2
31+
* Export-AzureRmDataLakeStoreItem - Deprecated parameters PerFileThreadCount, ConcurrentFileCount and introduced parameter Concurrency
32+
* Import-AzureRMDataLakeStoreItem - Deprecated parametersPerFileThreadCount, ConcurrentFileCount and introduced parameter Concurrency
33+
* Get-AzureRMDataLakeStoreItemContent - Fixed the tail behavior for contents greater than 4MB
34+
* Set-AzureRMDataLakeStoreItemExpiry - Introduced new parameter set SetRelativeExpiry for setting relative expiration time
35+
* Remove-AzureRmDataLakeStoreItem - Deprecated parameter Clean.
36+
37+
#### AzureRM.EventHub
38+
* Fixed AlternameName in New-AzureRmEventHubGeoDRConfiguration
39+
40+
#### AzureRM.KeyVault
41+
* Updated cmdlets to include piping scenarios
42+
* Add deprecation messages for upcoming breaking change release
43+
44+
#### AzureRM.Network
45+
* Fix error message with Network cmdlets
46+
47+
#### AzureRM.ServiceBus
48+
* Added 'properties' in CorrelationFilter of Rules to support customproperties
49+
* updated New-AzureRmServiceBusGeoDRConfiguration help and fixed Rules cmdlet output
50+
* Fixed auto-forward properties in New-AzureRmServiceBusQueue and New-AzureRmServiceBusSubscription cmdlet
51+
52+
#### AzureRM.Sql
53+
* Add new cmdlet 'Stop-AzureRmSqlElasticPoolActivity' to support canceling the asynchronous operations on elastic pool
54+
* Update the response for cmdlets Get-AzureRmSqlDatabaseActivity and Get-AzureRmSqlElasticPoolActivity to reflect more information in the response
55+
56+
## 5.6.0 - March 2018
257

358
#### General
459
* Fix issue with Default Resource Group in CloudShell

‎src/Common/Commands.Common.Authentication.Abstractions/AzureAccount.cs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,9 +128,13 @@ public static class Property
128128
/// <summary>
129129
/// Backup login Uri for MSI
130130
/// </summary>
131-
MSILoginUriBackup = "MSILoginBackup";
131+
MSILoginUriBackup = "MSILoginBackup",
132132

133133

134+
/// <summary>
135+
/// Secret that may be used with MSI login
136+
/// </summary>
137+
MSILoginSecret = "MSILoginSecret";
134138
}
135139
}
136140
}

‎src/Common/Commands.Common.Authentication/Authentication/ManagedServiceAccessToken.cs

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
using Microsoft.Rest.Azure;
1818
using System;
1919
using System.Collections.Generic;
20+
using System.Net.Http;
2021
using System.Text;
2122
using System.Threading;
2223

@@ -72,6 +73,10 @@ public ManagedServiceAccessToken(IAzureAccount account, IAzureEnvironment enviro
7273
}
7374

7475
_tokenGetter = factory.GetHttpOperations<ManagedServiceTokenInfo>(true).WithHeader("Metadata", new[] { "true" });
76+
if (account.IsPropertySet(AzureAccount.Property.MSILoginSecret))
77+
{
78+
_tokenGetter = _tokenGetter.WithHeader("Secret", new[] { account.GetProperty(AzureAccount.Property.MSILoginSecret) });
79+
}
7580
}
7681

7782
public string AccessToken
@@ -119,11 +124,12 @@ void GetOrRenewAuthentication()
119124
RequestUris.Clear();
120125
RequestUris.Enqueue(currentRequestUri);
121126
}
122-
catch (CloudException) when (RequestUris.Count > 0)
127+
catch (Exception e) when ( (e is CloudException || e is HttpRequestException) && RequestUris.Count > 0)
123128
{
124-
// do nothing
129+
// skip to the next uri
125130
}
126131
}
132+
127133
SetToken(info);
128134
}
129135
}

‎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 = "5.6.0";
29+
public const string AssemblyVersion = "5.7.0";
3030

31-
public const string AssemblyFileVersion = "5.6.0";
31+
public const string AssemblyFileVersion = "5.7.0";
3232

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

‎src/Common/Commands.Common/Extensions/CmdletExtensions.cs

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,18 @@ public static void SafeCopyParameterSet<T>(this T source, T target) where T : Az
202202
}
203203
}
204204

205+
/// <summary>
206+
/// Return the value of a paramater, or null if not set
207+
/// </summary>
208+
/// <typeparam name="T"></typeparam>
209+
/// <param name="cmdlet">the executing cmdlet</param>
210+
/// <param name="parameterName">The name of the parameter to return</param>
211+
/// <returns>true if the parameter was provided by the user, otherwise false</returns>
212+
public static bool IsBound(this PSCmdlet cmdlet, string parameterName)
213+
{
214+
return cmdlet.MyInvocation.BoundParameters.ContainsKey(parameterName);
215+
}
216+
205217
public static string AsAbsoluteLocation(this string realtivePath)
206218
{
207219
return Path.GetFullPath(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, realtivePath));

‎src/ResourceManager/Aks/NuGet.Config

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<config>
4+
<add key="repositorypath" value="..\..\packages" />
5+
</config>
6+
</configuration>

‎src/ResourceManager/AnalysisServices/AzureRM.AnalysisServices.psd1

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#
44
# Generated by: Microsoft Corporation
55
#
6-
# Generated on: 3/20/2018
6+
# Generated on: 4/3/2018
77
#
88

99
@{
@@ -12,7 +12,7 @@
1212
# RootModule = ''
1313

1414
# Version number of this module.
15-
ModuleVersion = '0.6.5'
15+
ModuleVersion = '0.6.6'
1616

1717
# Supported PSEditions
1818
# CompatiblePSEditions = @()
@@ -51,7 +51,7 @@ CLRVersion = '4.0'
5151
# ProcessorArchitecture = ''
5252

5353
# Modules that must be imported into the global environment prior to importing this module
54-
RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '4.5.0'; })
54+
RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '4.6.0'; })
5555

5656
# Assemblies that must be loaded prior to importing this module
5757
RequiredAssemblies = '.\Microsoft.Azure.Management.Analysis.dll'
@@ -116,8 +116,7 @@ PrivateData = @{
116116
# IconUri = ''
117117

118118
# ReleaseNotes of this module
119-
ReleaseNotes = '* Fix issue with Default Resource Group in CloudShell
120-
* Fixed issue with cleaning up scripts in build'
119+
ReleaseNotes = '* Updated to the latest version of the Azure ClientRuntime'
121120

122121
# Prerelease string of this module
123122
# Prerelease = ''

‎src/ResourceManager/AnalysisServices/ChangeLog.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
- Additional information about change #1
1919
-->
2020
## Current Release
21+
22+
## Version 0.6.6
2123
* Updated to the latest version of the Azure ClientRuntime
2224

2325
## Version 0.6.5

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ CLRVersion='4.0'
4545
ProcessorArchitecture = 'None'
4646

4747
# Modules that must be imported into the global environment prior to importing this module
48-
RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '4.5.0'; })
48+
RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '4.6.0'; })
4949

5050
# Assemblies that must be loaded prior to importing this module
5151
RequiredAssemblies = @()

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,5 +34,5 @@
3434
// You can specify all the values or you can default the Build and Revision Numbers
3535
// by using the '*' as shown below:
3636

37-
[assembly: AssemblyVersion("0.6.5")]
38-
[assembly: AssemblyFileVersion("0.6.5")]
37+
[assembly: AssemblyVersion("0.6.6")]
38+
[assembly: AssemblyFileVersion("0.6.6")]

‎src/ResourceManager/ApiManagement/AzureRM.ApiManagement.psd1

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#
44
# Generated by: Microsoft Corporation
55
#
6-
# Generated on: 3/20/2018
6+
# Generated on: 4/3/2018
77
#
88

99
@{
@@ -12,7 +12,7 @@
1212
# RootModule = ''
1313

1414
# Version number of this module.
15-
ModuleVersion = '5.1.1'
15+
ModuleVersion = '5.1.2'
1616

1717
# Supported PSEditions
1818
# CompatiblePSEditions = @()
@@ -51,7 +51,7 @@ CLRVersion = '4.0'
5151
# ProcessorArchitecture = ''
5252

5353
# Modules that must be imported into the global environment prior to importing this module
54-
RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '4.5.0'; })
54+
RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '4.6.0'; })
5555

5656
# Assemblies that must be loaded prior to importing this module
5757
RequiredAssemblies = '.\AutoMapper.dll',
@@ -189,7 +189,7 @@ PrivateData = @{
189189
# IconUri = ''
190190

191191
# ReleaseNotes of this module
192-
ReleaseNotes = '* Fix issue with Default Resource Group in CloudShell'
192+
ReleaseNotes = '* Updated to the latest version of the Azure ClientRuntime'
193193

194194
# Prerelease string of this module
195195
# Prerelease = ''

‎src/ResourceManager/ApiManagement/ChangeLog.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
- Additional information about change #1
1919
-->
2020
## Current Release
21+
22+
## Version 5.1.2
2123
* Updated to the latest version of the Azure ClientRuntime
2224

2325
## Version 5.1.1

‎src/ResourceManager/ApiManagement/Commands.ApiManagement.ServiceManagement/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,5 +42,5 @@
4242
// You can specify all the values or you can default the Build and Revision Numbers
4343
// by using the '*' as shown below:
4444

45-
[assembly: AssemblyVersion("5.1.1")]
46-
[assembly: AssemblyFileVersion("5.1.1")]
45+
[assembly: AssemblyVersion("5.1.2")]
46+
[assembly: AssemblyFileVersion("5.1.2")]

‎src/ResourceManager/ApiManagement/Commands.ApiManagement/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,5 +41,5 @@
4141
// You can specify all the values or you can default the Build and Revision Numbers
4242
// by using the '*' as shown below:
4343

44-
[assembly: AssemblyVersion("5.1.1")]
45-
[assembly: AssemblyFileVersion("5.1.1")]
44+
[assembly: AssemblyVersion("5.1.2")]
45+
[assembly: AssemblyFileVersion("5.1.2")]

‎src/ResourceManager/ApplicationInsights/AzureRM.ApplicationInsights.psd1

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#
44
# Generated by: Microsoft Corporation
55
#
6-
# Generated on: 3/20/2018
6+
# Generated on: 4/3/2018
77
#
88

99
@{
@@ -12,7 +12,7 @@
1212
# RootModule = ''
1313

1414
# Version number of this module.
15-
ModuleVersion = '0.1.2'
15+
ModuleVersion = '0.1.3'
1616

1717
# Supported PSEditions
1818
# CompatiblePSEditions = @()
@@ -51,7 +51,7 @@ CLRVersion = '4.0'
5151
# ProcessorArchitecture = ''
5252

5353
# Modules that must be imported into the global environment prior to importing this module
54-
RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '4.5.0'; })
54+
RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '4.6.0'; })
5555

5656
# Assemblies that must be loaded prior to importing this module
5757
RequiredAssemblies = '.\Microsoft.Azure.Management.ApplicationInsights.dll'
@@ -117,7 +117,7 @@ PrivateData = @{
117117
# IconUri = ''
118118

119119
# ReleaseNotes of this module
120-
ReleaseNotes = '* Fix issue with Default Resource Group in CloudShell'
120+
ReleaseNotes = '* Updated to the latest version of the Azure ClientRuntime'
121121

122122
# Prerelease string of this module
123123
# Prerelease = ''

‎src/ResourceManager/ApplicationInsights/ChangeLog.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
- Additional information about change #1
1919
-->
2020
## Current Release
21+
22+
## Version 0.1.3
2123
* Updated to the latest version of the Azure ClientRuntime
2224

2325
## Version 0.1.2

‎src/ResourceManager/ApplicationInsights/Commands.ApplicationInsights/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,5 +42,5 @@
4242
// You can specify all the values or you can default the Build and Revision Numbers
4343
// by using the '*' as shown below:
4444

45-
[assembly: AssemblyVersion("0.1.2")]
46-
[assembly: AssemblyFileVersion("0.1.2")]
45+
[assembly: AssemblyVersion("0.1.3")]
46+
[assembly: AssemblyFileVersion("0.1.3")]

‎src/ResourceManager/Automation/AzureRM.Automation.psd1

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#
44
# Generated by: Microsoft Corporation
55
#
6-
# Generated on: 3/20/2018
6+
# Generated on: 4/3/2018
77
#
88

99
@{
@@ -12,7 +12,7 @@
1212
# RootModule = ''
1313

1414
# Version number of this module.
15-
ModuleVersion = '4.3.1'
15+
ModuleVersion = '4.3.2'
1616

1717
# Supported PSEditions
1818
# CompatiblePSEditions = @()
@@ -51,7 +51,7 @@ CLRVersion = '4.0'
5151
# ProcessorArchitecture = ''
5252

5353
# Modules that must be imported into the global environment prior to importing this module
54-
RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '4.5.0'; })
54+
RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '4.6.0'; })
5555

5656
# Assemblies that must be loaded prior to importing this module
5757
RequiredAssemblies = '.\Microsoft.Azure.Management.Automation.dll'
@@ -164,7 +164,7 @@ PrivateData = @{
164164
# IconUri = ''
165165

166166
# ReleaseNotes of this module
167-
ReleaseNotes = '* Fix issue with Default Resource Group in CloudShell'
167+
ReleaseNotes = '* Updated to the latest version of the Azure ClientRuntime'
168168

169169
# Prerelease string of this module
170170
# Prerelease = ''

‎src/ResourceManager/Automation/ChangeLog.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
- Additional information about change #1
1919
-->
2020
## Current Release
21+
22+
## Version 4.3.2
2123
* Updated to the latest version of the Azure ClientRuntime
2224

2325
## Version 4.3.1

‎src/ResourceManager/Automation/Commands.Automation/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@
4343
// You can specify all the values or you can default the Build and Revision Numbers
4444
// by using the '*' as shown below:
4545

46-
[assembly: AssemblyVersion("4.3.1")]
47-
[assembly: AssemblyFileVersion("4.3.1")]
46+
[assembly: AssemblyVersion("4.3.2")]
47+
[assembly: AssemblyFileVersion("4.3.2")]
4848
#if SIGN
4949
[assembly: InternalsVisibleTo("Microsoft.Azure.Commands.ResourceManager.Automation.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]
5050
#else

0 commit comments

Comments
 (0)