Skip to content

Commit f1176c5

Browse files
author
Hao Chen
committed
Merge pull request Azure#1904 from Azure/master
Release 1.2.2 merge from master to dev
2 parents 09576ff + 5ab7c15 commit f1176c5

File tree

181 files changed

+10392
-9764
lines changed

Some content is hidden

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

181 files changed

+10392
-9764
lines changed

‎ChangeLog.md

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,15 @@
1-
##2016.03.08 version 1.3.0
1+
##2016.03.03 version 1.2.2
2+
* Azure Compute (ARM):
3+
* Add -LicenseType parameter to New-AzureRmVM for bring your own license (BYOL)
4+
* Add -SecureExecution parameter to Set-AzureRmVMCustomScriptExtension
5+
* Add -DisableAutoUpgradeMinorVersion and -ForceRerun parameters to Set-AzureRmVMExtension
6+
* Add Set-AzureRmVMPlan cmdlet
7+
* Add -Redeploy parameter to Set-AzureRmVM
8+
* Add AutoUpgradeMinorVersion and ForceUpdateTag parameters for Get-AzureRmVMExtension
9+
* Update positions of parameters for New-AzureRmVM
10+
* Azure Compute (Service Management):
11+
* Add Set-AzureBootDiagnostics cmdlets
12+
* Enable boot diagnostics by default for New-AzureVM and New-AzureQuickVM
213
* Azure LogicApp: New cmdlets for managing LogicApps
314
* Get-AzureLogicAppAccessKey
415
* Get-AzureLogicApp

‎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">
33

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

8-
<?define version="1.2.1" ?>
8+
<?define version="1.2.2" ?>
99

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

‎setup/azurecmdfiles.wxi

Lines changed: 184 additions & 188 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
@@ -8,7 +8,7 @@
88
<OutputType>Library</OutputType>
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>Microsoft.Azure.Commands.Common.Authentication</RootNamespace>
11-
<AssemblyName>Commands.Common.Authentication</AssemblyName>
11+
<AssemblyName>Microsoft.Azure.Commands.Common.Authentication</AssemblyName>
1212
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
<TargetFrameworkProfile />

‎src/Common/Commands.Common.Authentication/Factories/ClientFactory.cs

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -119,11 +119,19 @@ public virtual TClient CreateClient<TClient>(AzureSMProfile profile, AzureEnviro
119119
}
120120

121121
/// <summary>
122+
/// Creates the client.
122123
/// </summary>
123-
/// <typeparam name="TClient"></typeparam>
124-
/// <param name="subscription"></param>
125-
/// <param name="endpoint"></param>
124+
/// <typeparam name="TClient">The type of the client.</typeparam>
125+
/// <param name="profile">The profile.</param>
126+
/// <param name="subscription">The subscription.</param>
127+
/// <param name="endpoint">The endpoint.</param>
126128
/// <returns></returns>
129+
/// <exception cref="System.ApplicationException"></exception>
130+
/// <exception cref="System.ArgumentException">
131+
/// accountName
132+
/// or
133+
/// environment
134+
/// </exception>
127135
public virtual TClient CreateClient<TClient>(AzureSMProfile profile, AzureSubscription subscription, AzureEnvironment.Endpoint endpoint) where TClient : ServiceClient<TClient>
128136
{
129137
if (subscription == null)
@@ -287,7 +295,7 @@ public void AddUserAgent(string productName)
287295

288296
public HashSet<ProductInfoHeaderValue> UserAgents { get; set; }
289297

290-
private DelegatingHandler[] GetCustomHandlers()
298+
public DelegatingHandler[] GetCustomHandlers()
291299
{
292300
List<DelegatingHandler> newHandlers = new List<DelegatingHandler>();
293301
var enumerator = _handlers.GetEnumerator();

‎src/Common/Commands.Common.Authentication/Interfaces/IClientFactory.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,12 @@ public interface IClientFactory
5454
/// <param name="productName">Product name.</param>
5555
void AddUserAgent(string productName);
5656

57+
/// <summary>
58+
/// Gets the custom handlers.
59+
/// </summary>
60+
/// <returns>An array of custom handlers</returns>
61+
DelegatingHandler[] GetCustomHandlers();
62+
5763
/// <summary>
5864
/// Adds user agent to UserAgents collection.
5965
/// </summary>

‎src/Common/Commands.ScenarioTests.Common/Mocks/MockClientFactory.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,12 @@ public void RemoveHandler(Type handlerType)
176176
// Do nothing
177177
}
178178

179+
public DelegatingHandler[] GetCustomHandlers()
180+
{
181+
// the equivalent of doing nothing
182+
return new DelegatingHandler[0];
183+
}
184+
179185
public void AddUserAgent(string productName, string productVersion)
180186
{
181187
this.UserAgents.Add(new ProductInfoHeaderValue(productName, productVersion));

‎src/Common/Storage/Azure.Storage.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 = '1.0.4'
12+
ModuleVersion = '1.0.5'
1313

1414
# ID used to uniquely identify this module
1515
GUID = '00612bca-fa22-401d-a671-9cc48b010e3b'

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
@{
1010

1111
# Version number of this module.
12-
ModuleVersion = '1.0.4'
12+
ModuleVersion = '1.0.5'
1313

1414
# ID used to uniquely identify this module
1515
GUID = 'f875725d-8ce4-423f-a6af-ea880bc63f13'
@@ -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 = '1.0.4'})
48+
RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.5'})
4949

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

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
@{
1010

1111
# Version number of this module.
12-
ModuleVersion = '1.0.4'
12+
ModuleVersion = '1.0.5'
1313

1414
# ID used to uniquely identify this module
1515
GUID = 'bcea1c70-a32b-48c3-a05c-323e1c02f4d3'
@@ -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 = '1.0.4'})
48+
RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.5'})
4949

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

‎src/ResourceManager/AzureBackup/AzureRM.Backup.psd1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
@{
1010

1111
# Version number of this module.
12-
ModuleVersion = '1.0.4'
12+
ModuleVersion = '1.0.5'
1313

1414
# ID used to uniquely identify this module
1515
GUID = '0b1d76f5-a928-4b8f-9c83-df26947568d4'
@@ -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 = '1.0.4'})
48+
RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.5'})
4949

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

‎src/ResourceManager/AzureBatch/AzureRM.Batch.psd1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
@{
1010

1111
# Version number of this module.
12-
ModuleVersion = '1.0.4'
12+
ModuleVersion = '1.0.5'
1313

1414
# ID used to uniquely identify this module
1515
GUID = 'a8f00f40-1c1a-49b5-9db3-24076b75c3cf'
@@ -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 = '1.0.4'})
48+
RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.5'})
4949

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

‎src/ResourceManager/AzureBatch/Commands.Batch/Microsoft.Azure.Commands.Batch.dll-Help.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11195,7 +11195,7 @@
1119511195
PS C:\&gt; $StartTask = New-Object Microsoft.Azure.Commands.Batch.Models.PSStartTask
1119611196
PS C:\&gt; $StartTask.CommandLine = "cmd /c echo example"
1119711197
PS C:\&gt; $Pool.StartTask = $StartTask
11198-
PS C:\&gt; Set-AzureBatchPool -PSCloudPool $Pool -BatchContext $Context
11198+
PS C:\&gt; Set-AzureBatchPool -Pool $Pool -BatchContext $Context
1119911199
</dev:code>
1120011200
<dev:remarks>
1120111201
<maml:para>The first command gets a pool by using Get-AzureBatchPool, and then stores it in the $Pool variable. </maml:para>

‎src/ResourceManager/AzureStackAdmin/AzureRM.AzureStackAdmin.psd1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
ModuleToProcess = 'Microsoft.AzureStack.Commands.dll'
1313

1414
# Version number of this module.
15-
ModuleVersion = '0.9.1'
15+
ModuleVersion = '0.9.2'
1616

1717
# ID used to uniquely identify this module
1818
GUID = '0e691e0a-ce16-40f2-af84-86fb0d82fb29'
@@ -48,7 +48,7 @@ CLRVersion = '4.0'
4848
ProcessorArchitecture = ''
4949

5050
# Modules that must be imported into the global environment prior to importing this module
51-
RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.3'})
51+
RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.4'})
5252

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

‎src/ResourceManager/AzureStackAdmin/Commands.AzureStackAdmin.Test/App.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<appSettings>
44
<add key="AzureStackMachineName" value="azstackvm"/>
@@ -11,4 +11,4 @@
1111
<add key="AadLoginUri" value="https://login.windows.net/"/>
1212
<add key="AadGraphUri" value="https://graph.windows.net/"/>
1313
</appSettings>
14-
</configuration>
14+
</configuration>

‎src/ResourceManager/AzureStackAdmin/Commands.AzureStackAdmin.Test/Commands.AzureStackAdmin.Test.csproj

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -172,9 +172,7 @@
172172
</ProjectReference>
173173
</ItemGroup>
174174
<ItemGroup>
175-
<None Include="App.config">
176-
<SubType>Designer</SubType>
177-
</None>
175+
<None Include="App.config" />
178176
<None Include="AzureStackTests.ps1">
179177
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
180178
</None>

‎src/ResourceManager/AzureStackStorage/AzureRM.AzureStackStorage.psd1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
@{
1010

1111
# Version number of this module.
12-
ModuleVersion = '0.9.2'
12+
ModuleVersion = '0.9.3'
1313

1414
# ID used to uniquely identify this module
1515
GUID = 'DA5816B5-97A6-4301-9AA0-72CC68C79F20'
@@ -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 = '1.0.3'})
48+
RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.4'})
4949

5050
# Assemblies that must be loaded prior to importing this module
5151
RequiredAssemblies = @()
@@ -85,4 +85,4 @@ FileList = @()
8585
# Private data to pass to the module specified in ModuleToProcess
8686
PrivateData = ''
8787

88-
}
88+
}

‎src/ResourceManager/Common/Commands.ScenarioTests.ResourceManager.Common/EnvironmentSetupHelper.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,8 @@ private void SetupAzureEnvironmentFromEnvironmentVariables(AzureModule mode)
169169
environment.Endpoints[AzureEnvironment.Endpoint.ServiceManagement] = currentEnvironment.BaseUri.AbsoluteUri;
170170
environment.Endpoints[AzureEnvironment.Endpoint.ResourceManager] = currentEnvironment.Endpoints.ResourceManagementUri.AbsoluteUri;
171171
environment.Endpoints[AzureEnvironment.Endpoint.Graph] = currentEnvironment.Endpoints.GraphUri.AbsoluteUri;
172+
environment.Endpoints[AzureEnvironment.Endpoint.AzureDataLakeAnalyticsCatalogAndJobEndpointSuffix] = currentEnvironment.Endpoints.DataLakeAnalyticsJobAndCatalogServiceUri.OriginalString.Replace("https://",""); // because it is just a sufix
173+
environment.Endpoints[AzureEnvironment.Endpoint.AzureDataLakeStoreFileSystemEndpointSuffix] = currentEnvironment.Endpoints.DataLakeStoreServiceUri.OriginalString.Replace("https://", ""); // because it is just a sufix
172174

173175
if (!ProfileClient.Profile.Environments.ContainsKey(testEnvironmentName))
174176
{

‎src/ResourceManager/Common/Commands.ScenarioTests.ResourceManager.Common/Mocks/MockClientFactory.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,12 @@ public void RemoveHandler(Type handlerType)
176176
// Do nothing
177177
}
178178

179+
public DelegatingHandler[] GetCustomHandlers()
180+
{
181+
// the equivalent of doing nothing
182+
return new DelegatingHandler[0];
183+
}
184+
179185
public void AddUserAgent(string productName, string productVersion)
180186
{
181187
this.UniqueUserAgents.Add(new ProductInfoHeaderValue(productName, productVersion));

‎src/ResourceManager/Compute/AzureRM.Compute.psd1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
@{
1010

1111
# Version number of this module.
12-
ModuleVersion = '1.2.3'
12+
ModuleVersion = '1.2.4'
1313

1414
# ID used to uniquely identify this module
1515
GUID = '0a83c907-1ffb-4d87-a492-c65ac7d7ed37'
@@ -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 = '1.0.4'})
48+
RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.5'})
4949

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

‎src/ResourceManager/DataFactories/AzureRM.DataFactories.psd1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
@{
1010

1111
# Version number of this module.
12-
ModuleVersion = '1.0.4'
12+
ModuleVersion = '1.0.5'
1313

1414
# ID used to uniquely identify this module
1515
GUID = 'e3c0f6bc-fe96-41a0-88f4-5e490a91f05d'
@@ -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 = '1.0.4'})
48+
RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.5'})
4949

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

‎src/ResourceManager/DataLakeAnalytics/AzureRM.DataLakeAnalytics.psd1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
@{
1010

1111
# Version number of this module.
12-
ModuleVersion = '1.0.4'
12+
ModuleVersion = '1.0.5'
1313

1414
# ID used to uniquely identify this module
1515
GUID = 'eca73aa1-a68f-4ceb-9775-70759316a57b'
@@ -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 = '1.0.4' })
48+
RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.5' })
4949

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

0 commit comments

Comments
 (0)