Skip to content

Commit 4976fa0

Browse files
huangpfhuangpf
committed
Merge branch 'crp2' of https://github.com/huangpf/azure-powershell-pr into crp2
2 parents 06a60bf + 2d6ea2f commit 4976fa0

File tree

1 file changed

+122
-4
lines changed

1 file changed

+122
-4
lines changed

‎setup/azurecmdfiles.wxi

Lines changed: 122 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -106,9 +106,6 @@
106106
<Component Id="cmpEDFE5B7CD43B10FD4C5F82D443DA0C5D" Guid="*">
107107
<File Id="fil3E1AD32F04CFF244686C4DD4C07D2F19" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Compute\Microsoft.Azure.Commands.Compute.dll" />
108108
</Component>
109-
<Component Id="cmp7F2719BE7827D3FDDF69D7ACB6135115" Guid="*">
110-
<File Id="fil5F7831CF20346B8506EC74012F655FD2" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Compute\Microsoft.Azure.Commands.Compute.dll-Help.psd1" />
111-
</Component>
112109
<Component Id="cmpD5624BF8D78E80B0526773DE6E4FD2D2" Guid="*">
113110
<File Id="fil81AE4D49FE4C59DD6526396037D718F7" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Compute\Microsoft.Azure.Commands.Compute.dll-Help.xml" />
114111
</Component>
@@ -130,6 +127,9 @@
130127
<Component Id="cmpE5B396D6BC55FFE949E3919AD9982543" Guid="*">
131128
<File Id="fil5B09451702B8E0FDFB2111AECAACF7CB" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Compute\Microsoft.Azure.Commands.NetworkResourceProvider.format.ps1xml" />
132129
</Component>
130+
<Component Id="cmp51F8573497DFA72CD06485162F3A1E27" Guid="*">
131+
<File Id="filF6B6DF9B148F9E7C3481B867F200A77D" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Compute\Microsoft.Azure.Commands.Resources.dll" />
132+
</Component>
133133
<Component Id="cmpEECBE5F49A0C47F120DB3E3EC8285147" Guid="*">
134134
<File Id="fil55CE08716A009A39FFE69E7C4608DE7F" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Compute\Microsoft.Azure.Commands.Resources.dll-Help.xml" />
135135
</Component>
@@ -1039,6 +1039,95 @@
10391039
<File Id="fil7A32AD86FBDEEFC451F2A733F565CCA0" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Sql\System.Spatial.dll" />
10401040
</Component>
10411041
</Directory>
1042+
<Directory Id="dirC5B9F44FE7E3085B7040840DC5810788" Name="Storage">
1043+
<Component Id="cmp56AF579A92D02BCBB5E870A15B104FAA" Guid="*">
1044+
<File Id="fil44BD6B0E48F6B90626E36B26469EF435" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Storage\Hyak.Common.dll" />
1045+
</Component>
1046+
<Component Id="cmpAC642C5F59201F7C06DB3F522ED731E1" Guid="*">
1047+
<File Id="filBD1DCBC071AD742274D482AE34B4CA46" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Storage\Microsoft.Azure.Common.Authentication.dll" />
1048+
</Component>
1049+
<Component Id="cmp77482647F64B89022BF69C3C96069490" Guid="*">
1050+
<File Id="filA5EA11FF6214B967A2C052D92E4E69AB" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Storage\Microsoft.Azure.Common.dll" />
1051+
</Component>
1052+
<Component Id="cmp587BFCD7A4D4B98BA0EB9322C8CFC8AB" Guid="*">
1053+
<File Id="fil6E9182592D85DCA30E9B045BBE891AC8" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Storage\Microsoft.Azure.Common.NetFramework.dll" />
1054+
</Component>
1055+
<Component Id="cmp6F90252DF1BE04C01648D28F34CA8206" Guid="*">
1056+
<File Id="fil4174D2CFD167B98AF9CF92777ECF6AFF" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Storage\Microsoft.Azure.ResourceManager.dll" />
1057+
</Component>
1058+
<Component Id="cmp88D934A3A9E3DB228CD032221E9BFBA0" Guid="*">
1059+
<File Id="fil06CD97C3031902E5442BAADA6E7DC2A5" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Storage\Microsoft.Data.Edm.dll" />
1060+
</Component>
1061+
<Component Id="cmp1C3C1945C77D48582DB1CAA9C5A0019C" Guid="*">
1062+
<File Id="fil640D9A51D21100AA88649B1D34415DEB" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Storage\Microsoft.Data.OData.dll" />
1063+
</Component>
1064+
<Component Id="cmpF89F9DD1DC23B8C483041CE53CF58C7B" Guid="*">
1065+
<File Id="fil6C36BEB0925EE9777DA31624A7C4B52A" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Storage\Microsoft.Data.Services.Client.dll" />
1066+
</Component>
1067+
<Component Id="cmpD8FE320C40E48792113684359CE870D2" Guid="*">
1068+
<File Id="fil464BD3231A0EB159CCAC157B824F7731" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Storage\Microsoft.IdentityModel.Clients.ActiveDirectory.dll" />
1069+
</Component>
1070+
<Component Id="cmpF25F6981290D268FC31D1EAEA94C6877" Guid="*">
1071+
<File Id="fil7CD1890658A49739937C77386FF0F8E6" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Storage\Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms.dll" />
1072+
</Component>
1073+
<Component Id="cmp489DF0CB518C2129004581D8B8876B26" Guid="*">
1074+
<File Id="fil5116DA3E7A6601C667920B57F4AD6E31" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Storage\Microsoft.Threading.Tasks.dll" />
1075+
</Component>
1076+
<Component Id="cmpB2F810FC7E145BE68A9EA83903188129" Guid="*">
1077+
<File Id="fil0951843C6ACBFACE2B569FF34135C724" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Storage\Microsoft.Threading.Tasks.Extensions.Desktop.dll" />
1078+
</Component>
1079+
<Component Id="cmpD1C1C0EE1A2DE4FD961DCE90FFEE0906" Guid="*">
1080+
<File Id="fil5FCBD0D07B09E9F594D2E3952A60C59D" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Storage\Microsoft.Threading.Tasks.Extensions.dll" />
1081+
</Component>
1082+
<Component Id="cmp632CDBB997D198B4D9EA4A94A6EC7ED6" Guid="*">
1083+
<File Id="fil107EF209CB6A993A50D550ADBC6350B2" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Storage\Microsoft.WindowsAzure.Commands.Common.dll" />
1084+
</Component>
1085+
<Component Id="cmp1507F3748EACEE7FCE30282135C2995C" Guid="*">
1086+
<File Id="fil22DFE7C90E9BCB30AD2ED2FEEA908359" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Storage\Microsoft.WindowsAzure.Commands.Common.Storage.dll" />
1087+
</Component>
1088+
<Component Id="cmp552A75801AB856A0D6DC41617F8E796C" Guid="*">
1089+
<File Id="fil500E5AF11A328F66B7A9C660F994AF0C" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Storage\Microsoft.WindowsAzure.Commands.Storage.dll" />
1090+
</Component>
1091+
<Component Id="cmpDC4958E942CBFDA07ACA6916732593EC" Guid="*">
1092+
<File Id="fil21890A0F5055DA117EFFC8DEFFE9B419" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Storage\Microsoft.WindowsAzure.Commands.Storage.dll-Help.xml" />
1093+
</Component>
1094+
<Component Id="cmp109103DC4EFA3851A1E73ECDF59E2789" Guid="*">
1095+
<File Id="fil5366119142E33550F03177F3CD6E58BA" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Storage\Microsoft.WindowsAzure.Commands.Storage.format.ps1xml" />
1096+
</Component>
1097+
<Component Id="cmp854B01FD321346AE6B02A6EFEF49EEB3" Guid="*">
1098+
<File Id="fil7A43DCE6601D10D087C1EDDC49FE5DBF" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Storage\Microsoft.WindowsAzure.Commands.Storage.types.ps1xml" />
1099+
</Component>
1100+
<Component Id="cmp390AD7E3374896E9BB95442D7679A9B4" Guid="*">
1101+
<File Id="fil72BEEAF51895CD786D57D6E0198EAEFA" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Storage\Microsoft.WindowsAzure.Configuration.dll" />
1102+
</Component>
1103+
<Component Id="cmpF113AF444881B0BA790E50DF0D463A6D" Guid="*">
1104+
<File Id="filA3F40C61958D078656A7B88401FE1276" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Storage\Microsoft.WindowsAzure.Management.dll" />
1105+
</Component>
1106+
<Component Id="cmp41F25150661E54972832690A813137ED" Guid="*">
1107+
<File Id="fil27315DEFA6D5383472B055904669E1C3" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Storage\Microsoft.WindowsAzure.Management.Storage.dll" />
1108+
</Component>
1109+
<Component Id="cmp8CC873DBE9230381C5CDCADC4920348E" Guid="*">
1110+
<File Id="filD765D7341F2745F26FCED494DADB42BB" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Storage\Microsoft.WindowsAzure.Storage.DataMovement.dll" />
1111+
</Component>
1112+
<Component Id="cmp1E206A516CD1793516989E02475DED35" Guid="*">
1113+
<File Id="fil908F2BC428F166A846B8F708F0C4620E" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Storage\Microsoft.WindowsAzure.Storage.dll" />
1114+
</Component>
1115+
<Component Id="cmp93A93C29B2093AFCB0348F2C5B999E64" Guid="*">
1116+
<File Id="fil3D666DBAA021AB26520C7A0308E583D4" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Storage\Newtonsoft.Json.dll" />
1117+
</Component>
1118+
<Component Id="cmp7985D9505A461C04CC38A8D7F341EBC2" Guid="*">
1119+
<File Id="fil12F263F6FC0E5DBC1B0BCA1887AFD846" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Storage\System.Net.Http.Extensions.dll" />
1120+
</Component>
1121+
<Component Id="cmp02ACACBB96C5AF339C3EF0B3D748D59D" Guid="*">
1122+
<File Id="fil2A6D817C6D4900EA00F7B439AC0BC3F7" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Storage\System.Net.Http.Formatting.dll" />
1123+
</Component>
1124+
<Component Id="cmpADC075B4FA9AC22F9AA7C27E98D28FBE" Guid="*">
1125+
<File Id="fil923120666268438B14FB5BC8DFCF5EAC" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Storage\System.Net.Http.Primitives.dll" />
1126+
</Component>
1127+
<Component Id="cmpA0FD50E9B4EB9B27F9FDFCE9D54E8D9A" Guid="*">
1128+
<File Id="fil87330C603D3385F35652822CDCEB8588" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Storage\System.Spatial.dll" />
1129+
</Component>
1130+
</Directory>
10421131
<Directory Id="dir8413049F81D0CDE9406A994992EE6182" Name="StreamAnalytics">
10431132
<Component Id="cmp22CBF7AB5FADA57EFE27CC8028DDE792" Guid="*">
10441133
<File Id="fil1D23C5C26B6D69DF6B8D07F0B2FBE43E" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\StreamAnalytics\Hyak.Common.dll" />
@@ -2952,14 +3041,14 @@
29523041
<ComponentRef Id="cmp2E3CCDF954A1857E106A7052882B0C1F" />
29533042
<ComponentRef Id="cmp1A9472BC4D15B6030BB6F05D11229806" />
29543043
<ComponentRef Id="cmpEDFE5B7CD43B10FD4C5F82D443DA0C5D" />
2955-
<ComponentRef Id="cmp7F2719BE7827D3FDDF69D7ACB6135115" />
29563044
<ComponentRef Id="cmpD5624BF8D78E80B0526773DE6E4FD2D2" />
29573045
<ComponentRef Id="cmp62942A24352ADC631A6C9DAE39D62F70" />
29583046
<ComponentRef Id="cmp479E4B1EF0A49C9845DB071F542F5392" />
29593047
<ComponentRef Id="cmp04DC4A0F9B4418FB31419B4A87B953E9" />
29603048
<ComponentRef Id="cmp1AA87AE1B3BBFEBD19E17639D49CDA90" />
29613049
<ComponentRef Id="cmp1F28A79C208B9738E5E26A06862B9B8E" />
29623050
<ComponentRef Id="cmpE5B396D6BC55FFE949E3919AD9982543" />
3051+
<ComponentRef Id="cmp51F8573497DFA72CD06485162F3A1E27" />
29633052
<ComponentRef Id="cmpEECBE5F49A0C47F120DB3E3EC8285147" />
29643053
<ComponentRef Id="cmpE589C2638F4762F1AC5A28AD2E915D55" />
29653054
<ComponentRef Id="cmpB535785AED40D95B6D7CD2090F07D6A5" />
@@ -3248,6 +3337,35 @@
32483337
<ComponentRef Id="cmpCEA0B6B326B2B5FCB604E6998DD01FB3" />
32493338
<ComponentRef Id="cmp329D251034D48C44DBF8DF110F11EDB4" />
32503339
<ComponentRef Id="cmp47EB259B731D91876249F0E7E3FB00E4" />
3340+
<ComponentRef Id="cmp56AF579A92D02BCBB5E870A15B104FAA" />
3341+
<ComponentRef Id="cmpAC642C5F59201F7C06DB3F522ED731E1" />
3342+
<ComponentRef Id="cmp77482647F64B89022BF69C3C96069490" />
3343+
<ComponentRef Id="cmp587BFCD7A4D4B98BA0EB9322C8CFC8AB" />
3344+
<ComponentRef Id="cmp6F90252DF1BE04C01648D28F34CA8206" />
3345+
<ComponentRef Id="cmp88D934A3A9E3DB228CD032221E9BFBA0" />
3346+
<ComponentRef Id="cmp1C3C1945C77D48582DB1CAA9C5A0019C" />
3347+
<ComponentRef Id="cmpF89F9DD1DC23B8C483041CE53CF58C7B" />
3348+
<ComponentRef Id="cmpD8FE320C40E48792113684359CE870D2" />
3349+
<ComponentRef Id="cmpF25F6981290D268FC31D1EAEA94C6877" />
3350+
<ComponentRef Id="cmp489DF0CB518C2129004581D8B8876B26" />
3351+
<ComponentRef Id="cmpB2F810FC7E145BE68A9EA83903188129" />
3352+
<ComponentRef Id="cmpD1C1C0EE1A2DE4FD961DCE90FFEE0906" />
3353+
<ComponentRef Id="cmp632CDBB997D198B4D9EA4A94A6EC7ED6" />
3354+
<ComponentRef Id="cmp1507F3748EACEE7FCE30282135C2995C" />
3355+
<ComponentRef Id="cmp552A75801AB856A0D6DC41617F8E796C" />
3356+
<ComponentRef Id="cmpDC4958E942CBFDA07ACA6916732593EC" />
3357+
<ComponentRef Id="cmp109103DC4EFA3851A1E73ECDF59E2789" />
3358+
<ComponentRef Id="cmp854B01FD321346AE6B02A6EFEF49EEB3" />
3359+
<ComponentRef Id="cmp390AD7E3374896E9BB95442D7679A9B4" />
3360+
<ComponentRef Id="cmpF113AF444881B0BA790E50DF0D463A6D" />
3361+
<ComponentRef Id="cmp41F25150661E54972832690A813137ED" />
3362+
<ComponentRef Id="cmp8CC873DBE9230381C5CDCADC4920348E" />
3363+
<ComponentRef Id="cmp1E206A516CD1793516989E02475DED35" />
3364+
<ComponentRef Id="cmp93A93C29B2093AFCB0348F2C5B999E64" />
3365+
<ComponentRef Id="cmp7985D9505A461C04CC38A8D7F341EBC2" />
3366+
<ComponentRef Id="cmp02ACACBB96C5AF339C3EF0B3D748D59D" />
3367+
<ComponentRef Id="cmpADC075B4FA9AC22F9AA7C27E98D28FBE" />
3368+
<ComponentRef Id="cmpA0FD50E9B4EB9B27F9FDFCE9D54E8D9A" />
32513369
<ComponentRef Id="cmp22CBF7AB5FADA57EFE27CC8028DDE792" />
32523370
<ComponentRef Id="cmp6B22A40C943D2FF94326E5E13B8D5C54" />
32533371
<ComponentRef Id="cmpB92948BBDA4B1E777561DB20002367CE" />

0 commit comments

Comments
 (0)