Skip to content

Commit 189c3a0

Browse files
jtlibingusjtlibingus
committed
Merge pull request #17 from Azure/dev
pull from dev branch of azure/azure-powershell
2 parents c2b1f32 + e7f170f commit 189c3a0

File tree

227 files changed

+13825
-8155
lines changed

Some content is hidden

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

227 files changed

+13825
-8155
lines changed

‎ChangeLog.txt

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,34 @@
1+
2015.03.31 version 0.8.16
2+
* Azure Data Factory:
3+
* Fixes for clean install and subscription registration issues
4+
* Azure HDInsight:
5+
* Support for creating, deleting, listing, and submitting jobs to HDInsight clusters with Linux Operating System.
6+
* Azure Compute
7+
* Fix pipeline issues with Get-AzureVM (#3047)
8+
* Fixed DateTime Overflow issue
9+
* Azure Batch
10+
* Added cmdlets
11+
* Add/Remove Batch Pools
12+
* Get-BatchTaskFileContent
13+
* Get-BatchTaskFile
14+
* Azure Insights
15+
* Added cmdlets
16+
* Add-AutoscaleSetting
17+
* Get-AutoscaleHistory
18+
* Get-AutoscaleSetting
19+
* New-AutoscaleProfile
20+
* New-AutoscaleRule
21+
* Remove-AutoscaleSetting
22+
* Get-Metrics
23+
* Get-MetricDefinitions
24+
* Format-MetricsAsTable
25+
* Azure Websites
26+
* Added cmdlet Get-AzureWebhostingPlanMetrics
27+
* Added Premium support
28+
* Renamed WebSites to WebApp
29+
* AzureProfile
30+
* Made AzureProfile serializable to support workflow scenarios
31+
132
2015.03.11 version 0.8.15.1
233
* Fixes for clean install and subscription registration issues
334

‎README.md

Lines changed: 45 additions & 209 deletions
Large diffs are not rendered by default.

‎setup/azurecmd.wxs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<?define sourceDir="$(var.SolutionDir)..\src\Package\$(var.Configuration)" ?>
66
<?define caSourceDir="$(var.SolutionDir)setup\bin\$(var.Configuration)" ?>
77

8-
<?define version="0.8.15.1" ?>
8+
<?define version="0.8.16" ?>
99
<?define versionedStartMenuFolder="Microsoft Azure" ?>
1010
<?define staleStartMenuFolder="Windows Azure" ?>
1111

‎setup/azurecmdfiles.wxi

Lines changed: 0 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -2253,52 +2253,6 @@
22532253
</Component>
22542254
</Directory>
22552255
</Directory>
2256-
<Directory Id="dirE5EA14CE73A6C72D22D108D9497DF74C" Name="Python">
2257-
<Directory Id="dirCDAC5B8A642AC456869167EAE2A10C93" Name="WebRole">
2258-
<Component Id="cmp1A43AEA8E47DF46A363C5FA3B6EE14DE" Guid="*">
2259-
<File Id="filE6C0D9B69028476CEF9107E1347CA861" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Services\Resources\Scaffolding\Python\WebRole\AzureSetup.cfg" />
2260-
</Component>
2261-
<Component Id="cmp5D8936EABB5A2DB970A0AB381C73830D" Guid="*">
2262-
<File Id="filE2A6F752B86D2DFA0959B90BD41DA77C" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Services\Resources\Scaffolding\Python\WebRole\Microsoft.PythonTools.AzureSetup.exe.config" />
2263-
</Component>
2264-
<Component Id="cmp1F5C71A2DDA57D948B24B19D145ADE56" Guid="*">
2265-
<File Id="fil22FCD09649F038F981DDB84F67167316" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Services\Resources\Scaffolding\Python\WebRole\Microsoft.PythonTools.AzureSetup.exe.content" />
2266-
</Component>
2267-
<Component Id="cmp021B29446C062B1149132B85E2459720" Guid="*">
2268-
<File Id="filF3D8A3E762DD13F9FFD7B2B0BB339070" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Services\Resources\Scaffolding\Python\WebRole\Microsoft.PythonTools.WebRole.dll.content" />
2269-
</Component>
2270-
<Component Id="cmpA69B6C11506C243CDE56D867B794AC9F" Guid="*">
2271-
<File Id="fil848958AA95168855F8FE3E93358C2B76" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Services\Resources\Scaffolding\Python\WebRole\Microsoft.Web.Deployment.dll.content" />
2272-
</Component>
2273-
<Component Id="cmp8B904F97CEDA97F7D1A68BDBC2259AB4" Guid="*">
2274-
<File Id="filD732F0BF33579E271040FE1DE0AB979E" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Services\Resources\Scaffolding\Python\WebRole\Microsoft.Web.PlatformInstaller.dll.content" />
2275-
</Component>
2276-
<Component Id="cmp0F225B9A1229479E467639080599E9D1" Guid="*">
2277-
<File Id="fil92F43807E9714346A87AFB7D901AE389" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Services\Resources\Scaffolding\Python\WebRole\Microsoft.Web.PlatformInstaller.UI.dll.content" />
2278-
</Component>
2279-
<Component Id="cmpB20DE8E10E242EDCAFEBEAEECD60CDD3" Guid="*">
2280-
<File Id="fil7615C0F35ED9D985DD0C6EADB7E910CE" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Services\Resources\Scaffolding\Python\WebRole\RoleSettings.xml" />
2281-
</Component>
2282-
<Component Id="cmpC252A869692E36346E5A3771DD27D205" Guid="*">
2283-
<File Id="fil7846CF7AD904A172B671C85CDF5CC0E6" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Services\Resources\Scaffolding\Python\WebRole\Scaffold.xml" />
2284-
</Component>
2285-
<Component Id="cmp9F463ADD333B57253F89EE9E82167637" Guid="*">
2286-
<File Id="filB84BA051D600909C743652ECF66D8B51" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Services\Resources\Scaffolding\Python\WebRole\web.cloud.config" />
2287-
</Component>
2288-
<Component Id="cmp43BD3F229DAE64FEDBC8155FEF158956" Guid="*">
2289-
<File Id="fil30EB96553E136D5AAA0C61DD1A9776F7" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Services\Resources\Scaffolding\Python\WebRole\Web.config" />
2290-
</Component>
2291-
<Component Id="cmpA02D6608F19F40B64C14E402AD8E622B" Guid="*">
2292-
<File Id="filF4535711345CAACEFE8F95EB9C91C691" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Services\Resources\Scaffolding\Python\WebRole\WebPICmdLine.exe.content" />
2293-
</Component>
2294-
<Component Id="cmp878544C3BBE474849E893E400314D586" Guid="*">
2295-
<File Id="fil56D79CA1DCB21C2716FF96E6BB48B5CE" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Services\Resources\Scaffolding\Python\WebRole\WebRole.xml" />
2296-
</Component>
2297-
<Component Id="cmp70473B6477B7086BBB4B792180BF8925" Guid="*">
2298-
<File Id="fil3CB79929DB0097DEE79F047B38A9C19A" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Services\Resources\Scaffolding\Python\WebRole\wfastcgi.py" />
2299-
</Component>
2300-
</Directory>
2301-
</Directory>
23022256
</Directory>
23032257
</Directory>
23042258
</Directory>
@@ -3486,20 +3440,6 @@
34863440
<ComponentRef Id="cmp080181B4207E414501C622783B794CA8" />
34873441
<ComponentRef Id="cmpE4F565792794EACEBFA721815AE3957C" />
34883442
<ComponentRef Id="cmpAC5F70011A33DAC18EE39F5D5BB9840B" />
3489-
<ComponentRef Id="cmp1A43AEA8E47DF46A363C5FA3B6EE14DE" />
3490-
<ComponentRef Id="cmp5D8936EABB5A2DB970A0AB381C73830D" />
3491-
<ComponentRef Id="cmp1F5C71A2DDA57D948B24B19D145ADE56" />
3492-
<ComponentRef Id="cmp021B29446C062B1149132B85E2459720" />
3493-
<ComponentRef Id="cmpA69B6C11506C243CDE56D867B794AC9F" />
3494-
<ComponentRef Id="cmp8B904F97CEDA97F7D1A68BDBC2259AB4" />
3495-
<ComponentRef Id="cmp0F225B9A1229479E467639080599E9D1" />
3496-
<ComponentRef Id="cmpB20DE8E10E242EDCAFEBEAEECD60CDD3" />
3497-
<ComponentRef Id="cmpC252A869692E36346E5A3771DD27D205" />
3498-
<ComponentRef Id="cmp9F463ADD333B57253F89EE9E82167637" />
3499-
<ComponentRef Id="cmp43BD3F229DAE64FEDBC8155FEF158956" />
3500-
<ComponentRef Id="cmpA02D6608F19F40B64C14E402AD8E622B" />
3501-
<ComponentRef Id="cmp878544C3BBE474849E893E400314D586" />
3502-
<ComponentRef Id="cmp70473B6477B7086BBB4B792180BF8925" />
35033443
<ComponentRef Id="cmp5C3F4FE4E92F090F22B371444CEFA7FB" />
35043444
<ComponentRef Id="cmp65991ADC169007028A31A4F049E069EF" />
35053445
<ComponentRef Id="cmp221C334CE6510BD95538F285D482251F" />

‎src/Common/Commands.Common.Storage/Commands.Common.Storage.csproj

Lines changed: 4 additions & 5 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
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
44
<PropertyGroup>
@@ -101,11 +101,10 @@
101101
</Reference>
102102
<Reference Include="Microsoft.WindowsAzure.Management, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
103103
<SpecificVersion>False</SpecificVersion>
104-
<HintPath>..\..\packages\Microsoft.WindowsAzure.Management.4.0.1\lib\net40\Microsoft.WindowsAzure.Management.dll</HintPath>
104+
<HintPath>..\..\packages\Microsoft.WindowsAzure.Management.4.1.1\lib\net40\Microsoft.WindowsAzure.Management.dll</HintPath>
105105
</Reference>
106-
<Reference Include="Microsoft.WindowsAzure.Management.Storage, Version=5.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
107-
<SpecificVersion>False</SpecificVersion>
108-
<HintPath>..\..\packages\Microsoft.WindowsAzure.Management.Storage.5.0.0\lib\net40\Microsoft.WindowsAzure.Management.Storage.dll</HintPath>
106+
<Reference Include="Microsoft.WindowsAzure.Management.Storage">
107+
<HintPath>..\..\packages\Microsoft.WindowsAzure.Management.Storage.5.1.1\lib\net40\Microsoft.WindowsAzure.Management.Storage.dll</HintPath>
109108
</Reference>
110109
<Reference Include="Microsoft.WindowsAzure.Storage, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
111110
<SpecificVersion>False</SpecificVersion>

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

Lines changed: 3 additions & 3 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
<packages>
33
<package id="Hyak.Common" version="1.0.2" targetFramework="net45" />
44
<package id="Microsoft.Azure.Common" version="2.0.4" targetFramework="net45" />
@@ -14,8 +14,8 @@
1414
<package id="Microsoft.IdentityModel.Clients.ActiveDirectory" version="2.12.111071459" targetFramework="net45" />
1515
<package id="Microsoft.Net.Http" version="2.2.28" targetFramework="net45" />
1616
<package id="Microsoft.WindowsAzure.ConfigurationManager" version="2.0.3" targetFramework="net45" />
17-
<package id="Microsoft.WindowsAzure.Management" version="4.0.1" targetFramework="net45" />
18-
<package id="Microsoft.WindowsAzure.Management.Storage" version="5.0.0" targetFramework="net45" />
17+
<package id="Microsoft.WindowsAzure.Management" version="4.1.1" targetFramework="net45" />
18+
<package id="Microsoft.WindowsAzure.Management.Storage" version="5.1.1" targetFramework="net45" />
1919
<package id="Newtonsoft.Json" version="6.0.4" targetFramework="net45" />
2020
<package id="System.Spatial" version="5.6.0" targetFramework="net45" />
2121
<package id="WindowsAzure.Storage" version="4.0.0" targetFramework="net45" />

‎src/Common/Commands.Common.Test/Commands.Common.Test.csproj

Lines changed: 5 additions & 6 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
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
44
<PropertyGroup>
@@ -102,16 +102,15 @@
102102
<Reference Include="Microsoft.WindowsAzure.Configuration, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
103103
<HintPath>..\..\packages\Microsoft.WindowsAzure.ConfigurationManager.2.0.3\lib\net40\Microsoft.WindowsAzure.Configuration.dll</HintPath>
104104
</Reference>
105-
<Reference Include="Microsoft.WindowsAzure.Management, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
106-
<SpecificVersion>False</SpecificVersion>
107-
<HintPath>..\..\packages\Microsoft.WindowsAzure.Management.4.0.1\lib\net40\Microsoft.WindowsAzure.Management.dll</HintPath>
105+
<Reference Include="Microsoft.WindowsAzure.Management">
106+
<HintPath>..\..\packages\Microsoft.WindowsAzure.Management.4.1.1\lib\net40\Microsoft.WindowsAzure.Management.dll</HintPath>
108107
</Reference>
109108
<Reference Include="Microsoft.WindowsAzure.Management.Compute, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
110109
<SpecificVersion>False</SpecificVersion>
111-
<HintPath>..\..\packages\Microsoft.WindowsAzure.Management.Compute.9.2.0\lib\net40\Microsoft.WindowsAzure.Management.Compute.dll</HintPath>
110+
<HintPath>..\..\packages\Microsoft.WindowsAzure.Management.Compute.9.2.1\lib\net40\Microsoft.WindowsAzure.Management.Compute.dll</HintPath>
112111
</Reference>
113112
<Reference Include="Microsoft.WindowsAzure.Management.Storage">
114-
<HintPath>..\..\packages\Microsoft.WindowsAzure.Management.Storage.5.0.0\lib\net40\Microsoft.WindowsAzure.Management.Storage.dll</HintPath>
113+
<HintPath>..\..\packages\Microsoft.WindowsAzure.Management.Storage.5.1.1\lib\net40\Microsoft.WindowsAzure.Management.Storage.dll</HintPath>
115114
</Reference>
116115
<Reference Include="Microsoft.WindowsAzure.Storage, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
117116
<SpecificVersion>False</SpecificVersion>

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

Lines changed: 4 additions & 4 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
<packages>
33
<package id="Hyak.Common" version="1.0.2" targetFramework="net45" />
44
<package id="Microsoft.Azure.Common" version="2.0.4" targetFramework="net45" />
@@ -15,9 +15,9 @@
1515
<package id="Microsoft.IdentityModel.Clients.ActiveDirectory" version="2.12.111071459" targetFramework="net45" />
1616
<package id="Microsoft.Net.Http" version="2.2.28" targetFramework="net45" />
1717
<package id="Microsoft.WindowsAzure.ConfigurationManager" version="2.0.3" targetFramework="net45" />
18-
<package id="Microsoft.WindowsAzure.Management" version="4.0.1" targetFramework="net45" />
19-
<package id="Microsoft.WindowsAzure.Management.Compute" version="9.2.0" targetFramework="net45" />
20-
<package id="Microsoft.WindowsAzure.Management.Storage" version="5.0.0" targetFramework="net45" />
18+
<package id="Microsoft.WindowsAzure.Management" version="4.1.1" targetFramework="net45" />
19+
<package id="Microsoft.WindowsAzure.Management.Compute" version="9.2.1" targetFramework="net45" />
20+
<package id="Microsoft.WindowsAzure.Management.Storage" version="5.1.1" targetFramework="net45" />
2121
<package id="Moq" version="4.2.1402.2112" targetFramework="net45" />
2222
<package id="Newtonsoft.Json" version="6.0.4" targetFramework="net45" />
2323
<package id="System.Spatial" version="5.6.0" targetFramework="net45" />

‎src/Common/Commands.Common/AzurePowerShell.cs

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

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

30-
public const string AssemblyVersion = "0.8.15.1";
30+
public const string AssemblyVersion = "0.8.16";
3131

32-
public const string AssemblyFileVersion = "0.8.15.1";
32+
public const string AssemblyFileVersion = "0.8.16";
3333

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

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

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
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
44
<PropertyGroup>
@@ -101,7 +101,7 @@
101101
</Reference>
102102
<Reference Include="Microsoft.WindowsAzure.Management, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
103103
<SpecificVersion>False</SpecificVersion>
104-
<HintPath>..\..\packages\Microsoft.WindowsAzure.Management.4.0.1\lib\net40\Microsoft.WindowsAzure.Management.dll</HintPath>
104+
<HintPath>..\..\packages\Microsoft.WindowsAzure.Management.4.1.1\lib\net40\Microsoft.WindowsAzure.Management.dll</HintPath>
105105
</Reference>
106106
<Reference Include="Newtonsoft.Json">
107107
<HintPath>..\..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>

‎src/Common/Commands.Common/Properties/Resources.Designer.cs

Lines changed: 0 additions & 45 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)