Skip to content

Commit 48b0cfb

Browse files
markcowlmarkcowl
authored
Merge branch 'release-4.1.0' into feature/allanbo/appgwclassicfixlistcert
2 parents 66ba65b + 5165906 commit 48b0cfb

File tree

467 files changed

+308346
-67633
lines changed

Some content is hidden

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

467 files changed

+308346
-67633
lines changed

‎ChangeLog.md

Lines changed: 60 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,62 @@
1-
## 2017.05.12 - Version 4.0.1
1+
## 2017.06.07 - Version 4.1.0
2+
* AnalysisServices
3+
* New SKUs added: B1, B2, S0
4+
* Scale up/down support added
5+
* CognitiveServices
6+
* Update detailed display of license agreements when creating Cognitive Services resources
7+
* Compute
8+
* Fix Test-AzureRmVMAEMExtension for virtual machines with multiple managed disks
9+
* Updated Set-AzureRmVMAEMExtension: Add caching information for Premium managed disks
10+
* Add-AzureRmVhd: The size limit on vhd is increased to 4TB.
11+
* Stop-AzureRmVM: Clarify documentation for STayProvisioned parameter
12+
* DataLakeStore
13+
* Enable-AzureRmDataLakeStoreKeyVault (Enable-AdlStoreKeyVault)
14+
* Enable KeyVault managed encryption for a DataLake Store
15+
* DevTestLabs
16+
* Update cmdlets to work with current and updated DevTest Labs API version.
17+
* IotHub
18+
* Add Routing support for IoTHub cmdlets
19+
* Network
20+
* Get-AzureRmNetworkUsage: New cmdlet to show network usage and capacity details
21+
* Added new GatewaySku options for VirtualNetworkGateways
22+
* VpnGw1, VpnGw2, VpnGw3 are the new Skus added for Vpn gateways
23+
* Set-AzureRmNetworkWatcherConfigFlowLog
24+
* Fixed help examples
25+
* NotificationHubs
26+
* Transparent Update to NotificationHubs cmdlets for new API
27+
* Profile
28+
* Resolve-AzureRmError
29+
* New cmdlet to show details of errors and exceptions thrown by cmdlets, including server request/response data
30+
* Send-Feedback
31+
* Enabled sending feedback without logging in
32+
* Resources
33+
* Fixed issue where Get-AzureRMRoleAssignment would result in a Bad Request if the number of roleassignments where greater than 1000
34+
* Users can now use Get-AzureRMRoleAssignment even if the roleassignments to be returned is greater than 1000
35+
* Sql
36+
* Restore-AzureRmSqlDatabase: Update documentation example
37+
* Storage
38+
* Add AssignIdentity setting support to resource mode storage account cmdlets
39+
* New-AzureRmStorageAccount
40+
* Set-AzureRmStorageAccount
41+
* Add Customer Key Support to resource mode storage account cmdlets
42+
* Set-AzureRmStorageAccount
43+
* New-AzureRmStorageAccountEncryptionKeySource
44+
* TrafficManager
45+
46+
* New Monitor settings 'MonitorIntervalInSeconds', 'MonitorTimeoutInSeconds', 'MonitorToleratedNumberOfFailures'
47+
* New Monitor protocol 'TCP'
48+
* ServiceManagement
49+
* Add-AzureVhd: The size limit on vhd is increased to 4TB.
50+
* New-AzureBGPPeering: Support LegacyMode
51+
* Azure.Storage
52+
* Update help for parameters that accept wildcard characters and update StorageContext type
53+
54+
## 2017.05.23 - Version 4.0.2
55+
* Profile
56+
* Add-AzureRmAccount
57+
* Added `-EnvironmentName` parameter alis for backward compatibility with 2.x versions of AzureRM.profile
58+
59+
## 2017.05.12 - Version 4.0.1
260
* Fix issue with New-AzureStorageContext in offline scenarios: https://github.com/Azure/azure-powershell/issues/3939
361

462
## 2017.05.10 - Version 4.0.0
@@ -3214,4 +3272,4 @@ Virtual Network cmdlets
32143272
* iisnode 0.1.13
32153273

32163274
2011.12.09 Version 0.5.0
3217-
* Initial Release
3275+
* Initial Release

‎setup/azurecmd.wxs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" xmlns:netfx="http://schemas.microsoft.com/wix/NetFxExtension">
33

4-
<?define productName="Microsoft Azure PowerShell - May 2017" ?>
4+
<?define productName="Microsoft Azure PowerShell - June 2017" ?>
55
<?define sourceDir="$(var.SolutionDir)..\src\Package\$(var.Configuration)" ?>
66
<?define caSourceDir="$(var.SolutionDir)setup\bin\$(var.Configuration)" ?>
77

8-
<?define version="4.0.1" ?>
8+
<?define version="4.1.0" ?>
99

1010
<Product Id="*"
1111
Name="$(var.productName)"

‎setup/azurecmdfiles.wxi

Lines changed: 192 additions & 8 deletions
Large diffs are not rendered by default.

‎src/Common/Commands.Common.Authentication/Commands.Common.Authentication.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
<Private>True</Private>
7373
</Reference>
7474
<Reference Include="Microsoft.Rest.ClientRuntime, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
75-
<HintPath>..\..\packages\Microsoft.Rest.ClientRuntime.2.3.5\lib\net45\Microsoft.Rest.ClientRuntime.dll</HintPath>
75+
<HintPath>..\..\packages\Microsoft.Rest.ClientRuntime.2.3.8\lib\net45\Microsoft.Rest.ClientRuntime.dll</HintPath>
7676
<Private>True</Private>
7777
</Reference>
7878
<Reference Include="Microsoft.Rest.ClientRuntime.Azure, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

‎src/Common/Commands.Common.Authentication/packages.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
<package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="net45" />
99
<package id="Microsoft.IdentityModel.Clients.ActiveDirectory" version="2.28.3" targetFramework="net45" />
1010
<package id="Microsoft.Net.Http" version="2.2.28" targetFramework="net45" />
11-
<package id="Microsoft.Rest.ClientRuntime" version="2.3.5" targetFramework="net45" />
11+
<package id="Microsoft.Rest.ClientRuntime" version="2.3.8" targetFramework="net452" />
1212
<package id="Microsoft.Rest.ClientRuntime.Azure" version="3.3.5" targetFramework="net45" />
1313
<package id="Microsoft.Rest.ClientRuntime.Azure.Authentication" version="2.2.9-preview" targetFramework="net45" />
1414
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
15-
</packages>
15+
</packages>

‎src/Common/Commands.Common/AzurePSCmdlet.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ protected string PSVersion
9898
/// <summary>
9999
/// Gets PowerShell module version used for user agent header.
100100
/// </summary>
101-
protected string ModuleVersion { get { return Assembly.GetCallingAssembly().GetName().Version.ToString(); } }
101+
protected string ModuleVersion { get { return AzurePowerShell.AssemblyVersion; } }
102102

103103
/// <summary>
104104
/// The context for management cmdlet requests - includes account, tenant, subscription,

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

31-
public const string AssemblyFileVersion = "4.0.0";
31+
public const string AssemblyFileVersion = "4.1.0";
3232

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

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

Lines changed: 6 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: 5/5/2017
6+
# Generated on: 6/4/2017
77
#
88

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

1414
# Version number of this module.
15-
ModuleVersion = '0.3.0'
15+
ModuleVersion = '0.4.0'
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 = '3.0.0'; })
54+
RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '3.1.0'; })
5555

5656
# Assemblies that must be loaded prior to importing this module
5757
# RequiredAssemblies = @()
@@ -114,7 +114,9 @@ PrivateData = @{
114114
# IconUri = ''
115115

116116
# ReleaseNotes of this module
117-
ReleaseNotes = 'Updated for common code changes'
117+
ReleaseNotes = '* New SKUs added: B1, B2, S0
118+
* Scale up/down support added
119+
'
118120

119121
# External dependent modules of this module
120122
# ExternalModuleDependencies = ''

‎src/ResourceManager/AnalysisServices/ChangeLog.md

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

22+
## Version 0.4.0
2223
* New SKUs added: B1, B2, S0
2324
* Scale up/down support added
2425

26+
## Version 0.3.1
27+
2528
## Version 0.3.0
2629

2730
## Version 0.2.0

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
@{
1010

1111
# Version number of this module.
12-
ModuleVersion = '0.3.0'
12+
ModuleVersion = '0.4.0'
1313

1414
# ID used to uniquely identify this module
1515
GUID = 'c717b5a4-1f1b-4a2f-8aa1-bfd09934626e'

0 commit comments

Comments
 (0)