Skip to content

Commit a9a1eda

Browse files
huangpfhuangpf
committed
Merge pull request Azure#229 from Azure/dev
.
2 parents a640521 + 3956d11 commit a9a1eda

File tree

247 files changed

+139636
-124353
lines changed

Some content is hidden

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

247 files changed

+139636
-124353
lines changed

‎setup/azurecmdfiles.wxi

Lines changed: 24 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -630,6 +630,9 @@
630630
<Component Id="cmp445592B9F172DAE872410DC369380437" Guid="*">
631631
<File Id="fil11E2F901D32E9C01CE85BFE6164B2D2B" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Compute\Microsoft.Rest.ClientRuntime.Azure.Authentication.dll" />
632632
</Component>
633+
<Component Id="cmpA4ABAFD97F273AAE18069F4B27F52F9F" Guid="*">
634+
<File Id="filFFC3AE4B692D316EECB7ED9C4B87E00A" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Compute\Microsoft.Rest.ClientRuntime.Azure.dll" />
635+
</Component>
633636
<Component Id="cmp8ECDEA22C0E5F05DDBFD04588509AA21" Guid="*">
634637
<File Id="fil1D14D8E7C825D2BD455555795EFE6561" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Compute\Microsoft.Rest.ClientRuntime.dll" />
635638
</Component>
@@ -1420,6 +1423,9 @@
14201423
<Component Id="cmpC56452777A4C55825BB8DC3B1A79C0E9" Guid="*">
14211424
<File Id="fil994A60097D3068C15365718168C5F4B3" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Network\Microsoft.Rest.ClientRuntime.Azure.Authentication.dll" />
14221425
</Component>
1426+
<Component Id="cmp9A256511B9A3DF7422472167F2EAB94A" Guid="*">
1427+
<File Id="fil8EF4728E41E90C8CB34A6CF1ED480DD3" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Network\Microsoft.Rest.ClientRuntime.Azure.dll" />
1428+
</Component>
14231429
<Component Id="cmpB69DD31582993D319EB909D5DEB4004E" Guid="*">
14241430
<File Id="filFB0DABB41FC6B134654589CEDDE107CF" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Network\Microsoft.Rest.ClientRuntime.dll" />
14251431
</Component>
@@ -1686,12 +1692,12 @@
16861692
<Component Id="cmpEDB84317615898A496C0FF620B372C87" Guid="*">
16871693
<File Id="fil56F72CE4FFC9F006CE1B279238995FC8" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices\Microsoft.ApplicationInsights.dll" />
16881694
</Component>
1689-
<Component Id="cmp66ECF842EEB4EB595925E310358E9750" Guid="*">
1690-
<File Id="filF271979440640E53A189C08A7ADBAD7A" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices\Microsoft.Azure.Commands.RecoveryServices.ARM.dll-help.xml" />
1691-
</Component>
16921695
<Component Id="cmp5CAA968EE7C749E4480233FD90EDFE63" Guid="*">
16931696
<File Id="filC143DADE40E067E4692D2246F93BA8A4" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices\Microsoft.Azure.Commands.RecoveryServices.ARM.dll" />
16941697
</Component>
1698+
<Component Id="cmp66ECF842EEB4EB595925E310358E9750" Guid="*">
1699+
<File Id="filF271979440640E53A189C08A7ADBAD7A" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices\Microsoft.Azure.Commands.RecoveryServices.ARM.dll-help.xml" />
1700+
</Component>
16951701
<Component Id="cmpE7C8C6576C1069564C717CBBBD229F39" Guid="*">
16961702
<File Id="fil5D33856298AF8DC4453258F6359E225A" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices\Microsoft.Azure.Commands.ResourceManager.Common.dll" />
16971703
</Component>
@@ -2245,6 +2251,9 @@
22452251
<Component Id="cmpA2A4B67ACC8738C88A82A9576BD82026" Guid="*">
22462252
<File Id="fil2E6EA8F5997FA6DBE29FCE3A58F051DF" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Storage\Microsoft.Rest.ClientRuntime.Azure.Authentication.dll" />
22472253
</Component>
2254+
<Component Id="cmp954D77FCB95677621EC6B1C52E8B4AB2" Guid="*">
2255+
<File Id="fil6844E5CF8B2186F0D283DF52A5892125" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Storage\Microsoft.Rest.ClientRuntime.Azure.dll" />
2256+
</Component>
22482257
<Component Id="cmpE56C0006C325EFBAD7984DBBCF689FD2" Guid="*">
22492258
<File Id="filDAF92272D69F4A127139311912333F8B" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Storage\Microsoft.Rest.ClientRuntime.dll" />
22502259
</Component>
@@ -2645,8 +2654,8 @@
26452654
<Component Id="cmpDDFF9247E3FEE7AEC0B3F18CF8E20F56" Guid="*">
26462655
<File Id="fil340839FF9D028D51450BFA55C70F19B0" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Websites\Microsoft.Azure.Management.Authorization.dll" />
26472656
</Component>
2648-
<Component Id="cmp9CECEA023485ADC54C0C0003C97FD2EE" Guid="*">
2649-
<File Id="fil281751FB333BD31E78F6444EBC692110" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Websites\Microsoft.Azure.Management.WebSites.dll" />
2657+
<Component Id="cmp1E3B57026A388D007110B00870507DBC" Guid="*">
2658+
<File Id="fil33A1F00BA2C9D931E584B54DB529C4D5" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Websites\Microsoft.Azure.Management.Websites.dll" />
26502659
</Component>
26512660
<Component Id="cmp062B8928EE85DD8BA564343F3175517D" Guid="*">
26522661
<File Id="fil1E4BD72E68BC882029B91C6BFFD0F1CC" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Websites\Microsoft.Azure.ResourceManager.dll" />
@@ -4365,6 +4374,9 @@
43654374
<Component Id="cmp74B0B7D2461EE67BC1B2C706CD41372F" Guid="*">
43664375
<File Id="filD84EC14AB325E2924B8FFE3A4D3D018A" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Sql\Azure.Storage.psd1" />
43674376
</Component>
4377+
<Component Id="cmp572CBAA060A870457B636480C182F6E3" Guid="*">
4378+
<File Id="filA870DB1BA05E5465BDE158B5DC54FD4F" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Sql\AzureStorageStartup.ps1" />
4379+
</Component>
43684380
<Component Id="cmpD8BD7D4C976FE7FE527348B4E7F85B8D" Guid="*">
43694381
<File Id="filA1C13EA190ADD849F77BDADF0A1A0638" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Sql\Hyak.Common.dll" />
43704382
</Component>
@@ -4908,6 +4920,7 @@
49084920
<ComponentRef Id="cmpECF9BEC9A3BBC2CB463FDBB2208A4ACB" />
49094921
<ComponentRef Id="cmp3602F125A1435ADA621E6C5DF5B70546" />
49104922
<ComponentRef Id="cmp445592B9F172DAE872410DC369380437" />
4923+
<ComponentRef Id="cmpA4ABAFD97F273AAE18069F4B27F52F9F" />
49114924
<ComponentRef Id="cmp8ECDEA22C0E5F05DDBFD04588509AA21" />
49124925
<ComponentRef Id="cmpC7651407AC5E8A64F827FC2A7DEF30E6" />
49134926
<ComponentRef Id="cmpD844318ECE3D0A693D753D7748D987A4" />
@@ -5166,6 +5179,7 @@
51665179
<ComponentRef Id="cmp7C5DC68CB3D456A7C949172F3331E20A" />
51675180
<ComponentRef Id="cmp7DA1E70725BB433588D7BDC0E029C0A0" />
51685181
<ComponentRef Id="cmpC56452777A4C55825BB8DC3B1A79C0E9" />
5182+
<ComponentRef Id="cmp9A256511B9A3DF7422472167F2EAB94A" />
51695183
<ComponentRef Id="cmpB69DD31582993D319EB909D5DEB4004E" />
51705184
<ComponentRef Id="cmpDAA3E1FBD7B784DD8FBDB88D7CCFEFE8" />
51715185
<ComponentRef Id="cmpB1CC3831A4FB6A26C143DA8B6606425B" />
@@ -5252,8 +5266,8 @@
52525266
<ComponentRef Id="cmpC96DAF4A31F86D19246E39394F496F83" />
52535267
<ComponentRef Id="cmpA77D5875EABE5151973A245C04E3858E" />
52545268
<ComponentRef Id="cmpEDB84317615898A496C0FF620B372C87" />
5255-
<ComponentRef Id="cmp66ECF842EEB4EB595925E310358E9750" />
52565269
<ComponentRef Id="cmp5CAA968EE7C749E4480233FD90EDFE63" />
5270+
<ComponentRef Id="cmp66ECF842EEB4EB595925E310358E9750" />
52575271
<ComponentRef Id="cmpE7C8C6576C1069564C717CBBBD229F39" />
52585272
<ComponentRef Id="cmpC9F93119DA28BCE2B325C737951EFABA" />
52595273
<ComponentRef Id="cmp3629350DB44BADB48B9F7787CAEA966A" />
@@ -5435,6 +5449,7 @@
54355449
<ComponentRef Id="cmp4EA5A818E3BE7C67C27B69ADABCE5CBF" />
54365450
<ComponentRef Id="cmpBF600E80A7D04977AF21CAA07A79254C" />
54375451
<ComponentRef Id="cmpA2A4B67ACC8738C88A82A9576BD82026" />
5452+
<ComponentRef Id="cmp954D77FCB95677621EC6B1C52E8B4AB2" />
54385453
<ComponentRef Id="cmpE56C0006C325EFBAD7984DBBCF689FD2" />
54395454
<ComponentRef Id="cmpA94FD747C692B4A9A45D9DE5D869DE53" />
54405455
<ComponentRef Id="cmp7F0D9683DB4D431F6A1A42EBCAD0E4E3" />
@@ -5565,7 +5580,7 @@
55655580
<ComponentRef Id="cmp2C2622C3604F560651F9A1522DE2A835" />
55665581
<ComponentRef Id="cmpADF79D78DEB22F0CAADF59666B8349F9" />
55675582
<ComponentRef Id="cmpDDFF9247E3FEE7AEC0B3F18CF8E20F56" />
5568-
<ComponentRef Id="cmp9CECEA023485ADC54C0C0003C97FD2EE" />
5583+
<ComponentRef Id="cmp1E3B57026A388D007110B00870507DBC" />
55695584
<ComponentRef Id="cmp062B8928EE85DD8BA564343F3175517D" />
55705585
<ComponentRef Id="cmp36E0BE08BF36A891E1E741FAE0D24269" />
55715586
<ComponentRef Id="cmpDD166FFA65677744E2C3EFC05FC744AC" />
@@ -6034,7 +6049,7 @@
60346049
<ComponentRef Id="cmp2F2E1D5926F718232A6068856776B49D" />
60356050
<ComponentRef Id="cmpF1CE4A66C053B106D2C485757F703AB2" />
60366051
<ComponentRef Id="cmp2A6B149B9B0BDCC11A05919864D86251" />
6037-
<ComponentRef Id="cmp2FF23DA02D92BABF1414E60E2746B791" />
6052+
<ComponentRef Id="cmp2FF23DA02D92BABF1414E60E2746B791" />
60386053
<ComponentRef Id="cmpE1EAFD7E808AF4C192C5D45154BB2136" />
60396054
<ComponentRef Id="cmp0313F8F73743B761E3DC5BBE65D6FB04" />
60406055
<ComponentRef Id="cmpFA98ECC9A87BB49B7FC68AC0CDC89955" />
@@ -6109,6 +6124,7 @@
61096124
<ComponentRef Id="cmp65991ADC169007028A31A4F049E069EF" />
61106125
<ComponentRef Id="cmp221C334CE6510BD95538F285D482251F" />
61116126
<ComponentRef Id="cmp74B0B7D2461EE67BC1B2C706CD41372F" />
6127+
<ComponentRef Id="cmp572CBAA060A870457B636480C182F6E3" />
61126128
<ComponentRef Id="cmpD8BD7D4C976FE7FE527348B4E7F85B8D" />
61136129
<ComponentRef Id="cmpD5A2C7B5CF9A37015F3B71F2DC61EC0B" />
61146130
<ComponentRef Id="cmp4C01FCB6C2D2D2591BAEDBA0D9284C3C" />

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,10 @@
9595
<SpecificVersion>False</SpecificVersion>
9696
<HintPath>..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.18.206251556\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms.dll</HintPath>
9797
</Reference>
98+
<Reference Include="Microsoft.Rest.ClientRuntime">
99+
<HintPath>..\..\packages\Microsoft.Rest.ClientRuntime.1.3.0\lib\portable-net45+win8+wpa81\Microsoft.Rest.ClientRuntime.dll</HintPath>
100+
<Private>True</Private>
101+
</Reference>
98102
<Reference Include="Microsoft.Threading.Tasks, Version=1.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
99103
<SpecificVersion>False</SpecificVersion>
100104
<HintPath>..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.dll</HintPath>
@@ -126,10 +130,6 @@
126130
<SpecificVersion>False</SpecificVersion>
127131
<HintPath>..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
128132
</Reference>
129-
<Reference Include="Microsoft.Rest.ClientRuntime">
130-
<HintPath>..\..\packages\Microsoft.Rest.ClientRuntime.1.4.1\lib\dotnet\Microsoft.Rest.ClientRuntime.dll</HintPath>
131-
<Private>True</Private>
132-
</Reference>
133133
<Reference Include="Microsoft.Rest.ClientRuntime.Azure.Authentication">
134134
<HintPath>..\..\packages\Microsoft.Rest.ClientRuntime.Azure.Authentication.0.11.0\lib\net45\Microsoft.Rest.ClientRuntime.Azure.Authentication.dll</HintPath>
135135
<Private>True</Private>

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,10 @@
8282
<SpecificVersion>False</SpecificVersion>
8383
<HintPath>..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.18.206251556\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms.dll</HintPath>
8484
</Reference>
85+
<Reference Include="Microsoft.Rest.ClientRuntime">
86+
<HintPath>..\..\packages\Microsoft.Rest.ClientRuntime.1.3.0\lib\portable-net45+win8+wpa81\Microsoft.Rest.ClientRuntime.dll</HintPath>
87+
<Private>True</Private>
88+
</Reference>
8589
<Reference Include="Microsoft.Threading.Tasks, Version=1.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
8690
<SpecificVersion>False</SpecificVersion>
8791
<HintPath>..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.dll</HintPath>
@@ -98,16 +102,12 @@
98102
<SpecificVersion>False</SpecificVersion>
99103
<HintPath>..\..\packages\Microsoft.WindowsAzure.Management.4.1.1\lib\net40\Microsoft.WindowsAzure.Management.dll</HintPath>
100104
</Reference>
101-
<Reference Include="Newtonsoft.Json">
102-
<HintPath>..\..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>
103-
<Private>True</Private>
104-
</Reference>
105-
<Reference Include="Microsoft.Rest.ClientRuntime">
106-
<HintPath>..\..\packages\Microsoft.Rest.ClientRuntime.1.4.1\lib\dotnet\Microsoft.Rest.ClientRuntime.dll</HintPath>
105+
<Reference Include="Microsoft.Rest.ClientRuntime.Azure.Authentication, Version=0.11.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
106+
<HintPath>..\..\packages\Microsoft.Rest.ClientRuntime.Azure.Authentication.0.11.0\lib\net45\Microsoft.Rest.ClientRuntime.Azure.Authentication.dll</HintPath>
107107
<Private>True</Private>
108108
</Reference>
109-
<Reference Include="Microsoft.Rest.ClientRuntime.Azure.Authentication">
110-
<HintPath>..\..\packages\Microsoft.Rest.ClientRuntime.Azure.Authentication.0.11.0\lib\net45\Microsoft.Rest.ClientRuntime.Azure.Authentication.dll</HintPath>
109+
<Reference Include="Newtonsoft.Json">
110+
<HintPath>..\..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>
111111
<Private>True</Private>
112112
</Reference>
113113
<Reference Include="System" />

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,10 @@
7676
<SpecificVersion>False</SpecificVersion>
7777
<HintPath>..\..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.18.206251556\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms.dll</HintPath>
7878
</Reference>
79+
<Reference Include="Microsoft.Rest.ClientRuntime">
80+
<HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.1.3.0\lib\portable-net45+win8+wpa81\Microsoft.Rest.ClientRuntime.dll</HintPath>
81+
<Private>True</Private>
82+
</Reference>
7983
<Reference Include="Microsoft.Threading.Tasks, Version=1.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
8084
<SpecificVersion>False</SpecificVersion>
8185
<HintPath>..\..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.dll</HintPath>
@@ -92,16 +96,12 @@
9296
<SpecificVersion>False</SpecificVersion>
9397
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.4.1.1\lib\net40\Microsoft.WindowsAzure.Management.dll</HintPath>
9498
</Reference>
95-
<Reference Include="Newtonsoft.Json">
96-
<HintPath>..\..\..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>
97-
<Private>True</Private>
98-
</Reference>
99-
<Reference Include="Microsoft.Rest.ClientRuntime">
100-
<HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.1.4.1\lib\dotnet\Microsoft.Rest.ClientRuntime.dll</HintPath>
99+
<Reference Include="Microsoft.Rest.ClientRuntime.Azure.Authentication, Version=0.11.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
100+
<HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.Azure.Authentication.0.11.0\lib\net45\Microsoft.Rest.ClientRuntime.Azure.Authentication.dll</HintPath>
101101
<Private>True</Private>
102102
</Reference>
103-
<Reference Include="Microsoft.Rest.ClientRuntime.Azure.Authentication">
104-
<HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.Azure.Authentication.0.11.0\lib\net45\Microsoft.Rest.ClientRuntime.Azure.Authentication.dll</HintPath>
103+
<Reference Include="Newtonsoft.Json">
104+
<HintPath>..\..\..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>
105105
<Private>True</Private>
106106
</Reference>
107107
<Reference Include="System" />

‎src/ResourceManager/Compute/AzureRM.Compute.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.1.0'
12+
ModuleVersion = '1.2.0'
1313

1414
# ID used to uniquely identify this module
1515
GUID = '0a83c907-1ffb-4d87-a492-c65ac7d7ed37'

0 commit comments

Comments
 (0)