Skip to content

Commit b0638b2

Browse files
eshaparmareshaparmar
committed
Merge branch 'dev' of https://github.com/Azure/azure-powershell into fixwmfversion
2 parents b977e4e + cfafbe8 commit b0638b2

File tree

322 files changed

+13555
-10103
lines changed

Some content is hidden

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

322 files changed

+13555
-10103
lines changed

‎AzurePowershell.Test.targets

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@
6666
<AsmXUnitTests Include=".\src\ServiceManagement\Network\Commands.Network.Test\bin\Debug\Microsoft.WindowsAzure.Commands.ServiceManagement.Network.Test.dll"/>
6767
</ItemGroup>
6868
<ItemGroup Condition=" '$(scope)' == 'all' ">
69+
<XUnitTests Include=".\tools\StaticAnalysis\StaticAnalysis.Test\bin\Debug\StaticAnalysis.Test.dll"/>
6970
<XUnitTests Include=".\src\ResourceManager\SiteRecovery\Commands.SiteRecovery.Test\bin\Debug\Microsoft.Azure.Commands.SiteRecovery.Test.dll"/>
7071
<XUnitTests Include=".\src\ResourceManager\Sql\Commands.Sql.Test\bin\Debug\Microsoft.Azure.Commands.Sql.Test.dll"/>
7172
<XUnitTests Include=".\src\ResourceManager\Resources\Commands.Resources.Test\bin\Debug\Microsoft.Azure.Commands.Resources.Test.dll"/>

‎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

‎build.proj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,9 @@
137137
<!-- Restore packages -->
138138
<Exec Command="$(NuGetCommand) restore %(CmdletSolutionsToBuild.FullPath) $(NuGetRestoreConfigSwitch)"
139139
ContinueOnError="false" />
140+
<!-- Restore packages for static analysis-->
141+
<Exec Command="$(NuGetCommand) restore %(StaticAnalysis.FullPath) $(NuGetRestoreConfigSwitch)"
142+
ContinueOnError="false" />
140143

141144
<!--Restore the xunit runner needed to run unit tests-->
142145
<Exec Command="$(NuGetCommand) restore $(MSBuildProjectDirectory)\packages.config -PackagesDirectory $(MSBuildProjectDirectory)\packages" />

‎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.Test/Commands.Common.Authentication.Test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
<Private>True</Private>
8585
</Reference>
8686
<Reference Include="Moq">
87-
<HintPath>..\..\packages\Moq.4.2.1409.1722\lib\net40\Moq.dll</HintPath>
87+
<HintPath>..\..\packages\Moq.4.2.1510.2205\lib\net40\Moq.dll</HintPath>
8888
</Reference>
8989
<Reference Include="Newtonsoft.Json">
9090
<HintPath>..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<package id="Microsoft.Rest.ClientRuntime.Azure" version="3.0.2" targetFramework="net45" />
1313
<package id="Microsoft.Rest.ClientRuntime.Azure.Authentication" version="2.0.1-preview" targetFramework="net45" />
1414
<package id="Microsoft.WindowsAzure.Management.Storage" version="5.1.1" targetFramework="net45" />
15-
<package id="Moq" version="4.2.1409.1722" targetFramework="net45" />
15+
<package id="Moq" version="4.2.1510.2205" targetFramework="net45" />
1616
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
1717
<package id="xunit" version="2.1.0" targetFramework="net45" />
1818
<package id="xunit.abstractions" version="2.0.0" targetFramework="net45" />

‎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.Common/Commands.Common.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,6 @@
159159
<Compile Include="RecordingTracingInterceptor.cs" />
160160
<Compile Include="ClientCreatedArgs.cs" />
161161
<Compile Include="CmdletExtensions.cs" />
162-
<Compile Include="ServiceClientTracingInterceptor.cs" />
163162
<Compile Include="TestMockSupport.cs" />
164163
<Compile Include="Properties\AssemblyInfo.cs" />
165164
<Compile Include="ValidateGuidNotEmpty.cs" />

‎src/Common/Commands.Common/ServiceClientTracingInterceptor.cs

Lines changed: 0 additions & 79 deletions
This file was deleted.

‎src/Common/Commands.Common/TestMockSupport.cs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,10 @@ public static void Delay(int milliSeconds)
2929
{
3030
System.Threading.Thread.Sleep(milliSeconds);
3131
}
32+
else
33+
{
34+
System.Threading.Thread.Yield();
35+
}
3236
}
3337

3438
public static void Delay(TimeSpan duration)
@@ -37,6 +41,10 @@ public static void Delay(TimeSpan duration)
3741
{
3842
System.Threading.Thread.Sleep(duration);
3943
}
44+
else
45+
{
46+
System.Threading.Thread.Yield();
47+
}
4048
}
4149
}
4250
}

‎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: 23 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 = '00612bca-fa22-401d-a671-9cc48b010e3b'
@@ -91,6 +91,27 @@ ModuleList = @()
9191
FileList = @()
9292

9393
# Private data to pass to the module specified in ModuleToProcess
94-
PrivateData = ''
94+
PrivateData = @{
95+
96+
PSData = @{
97+
98+
# Tags applied to this module. These help with module discovery in online galleries.
99+
# Tags = @()
100+
101+
# A URL to the license for this module.
102+
LicenseUri = 'https://raw.githubusercontent.com/Azure/azure-powershell/dev/LICENSE.txt'
103+
104+
# A URL to the main website for this project.
105+
ProjectUri = 'https://github.com/Azure/azure-powershell'
106+
107+
# A URL to an icon representing this module.
108+
# IconUri = ''
109+
110+
# ReleaseNotes of this module
111+
ReleaseNotes = 'https://github.com/Azure/azure-powershell/blob/dev/ChangeLog.md'
112+
113+
} # End of PSData hashtable
114+
115+
} # End of PrivateData hashtable
95116

96117
}

‎src/Common/Storage/Commands.Storage/Microsoft.WindowsAzure.Commands.Storage.dll-Help.psd1

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,27 @@ ModuleList = @()
8181
FileList = @()
8282

8383
# Private data to pass to the module specified in ModuleToProcess
84-
PrivateData = ''
84+
PrivateData = @{
85+
86+
PSData = @{
87+
88+
# Tags applied to this module. These help with module discovery in online galleries.
89+
# Tags = @()
90+
91+
# A URL to the license for this module.
92+
LicenseUri = 'https://raw.githubusercontent.com/Azure/azure-powershell/dev/LICENSE.txt'
93+
94+
# A URL to the main website for this project.
95+
ProjectUri = 'https://github.com/Azure/azure-powershell'
96+
97+
# A URL to an icon representing this module.
98+
# IconUri = ''
99+
100+
# ReleaseNotes of this module
101+
ReleaseNotes = 'https://github.com/Azure/azure-powershell/blob/dev/ChangeLog.md'
102+
103+
} # End of PSData hashtable
104+
105+
} # End of PrivateData hashtable
85106

86107
}

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

Lines changed: 24 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 = '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 = @()
@@ -84,6 +84,27 @@ ModuleList = @()
8484
FileList = @()
8585

8686
# Private data to pass to the module specified in ModuleToProcess
87-
PrivateData = ''
87+
PrivateData = @{
88+
89+
PSData = @{
90+
91+
# Tags applied to this module. These help with module discovery in online galleries.
92+
# Tags = @()
93+
94+
# A URL to the license for this module.
95+
LicenseUri = 'https://raw.githubusercontent.com/Azure/azure-powershell/dev/LICENSE.txt'
96+
97+
# A URL to the main website for this project.
98+
ProjectUri = 'https://github.com/Azure/azure-powershell'
99+
100+
# A URL to an icon representing this module.
101+
# IconUri = ''
102+
103+
# ReleaseNotes of this module
104+
ReleaseNotes = 'https://github.com/Azure/azure-powershell/blob/dev/ChangeLog.md'
105+
106+
} # End of PSData hashtable
107+
108+
} # End of PrivateData hashtable
88109

89110
}

‎src/ResourceManager/ApiManagement/Commands.ApiManagement.ServiceManagement/Microsoft.Azure.Commands.ApiManagement.ServiceManagement.dll-help.psd1

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,27 @@ ModuleList = @()
8181
FileList = @()
8282

8383
# Private data to pass to the module specified in ModuleToProcess
84-
PrivateData = ''
84+
PrivateData = @{
85+
86+
PSData = @{
87+
88+
# Tags applied to this module. These help with module discovery in online galleries.
89+
# Tags = @()
90+
91+
# A URL to the license for this module.
92+
LicenseUri = 'https://raw.githubusercontent.com/Azure/azure-powershell/dev/LICENSE.txt'
93+
94+
# A URL to the main website for this project.
95+
ProjectUri = 'https://github.com/Azure/azure-powershell'
96+
97+
# A URL to an icon representing this module.
98+
# IconUri = ''
99+
100+
# ReleaseNotes of this module
101+
ReleaseNotes = 'https://github.com/Azure/azure-powershell/blob/dev/ChangeLog.md'
102+
103+
} # End of PSData hashtable
104+
105+
} # End of PrivateData hashtable
85106

86107
}

0 commit comments

Comments
 (0)