Skip to content

Commit 6dd3c1a

Browse files
author
maddieclayton
authored
Merge branch 'preview' into ResourceCompleter1
2 parents 06f7963 + fda97b5 commit 6dd3c1a

File tree

299 files changed

+13869
-4434
lines changed

Some content is hidden

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

299 files changed

+13869
-4434
lines changed

‎setup/azurecmdfiles.wxi

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -147,9 +147,6 @@
147147
<Component Id="cmpBEA6E3263480C18705DC2E3B15E3C1CF" Guid="*">
148148
<File Id="fil7E95F218EFC39408F9F2DB3FD01A124C" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.ApiManagement\AutoMapper.dll" />
149149
</Component>
150-
<Component Id="cmp957D146263F021CE3EF1CBADBF06D2C4" Guid="*">
151-
<File Id="fil3B64A78FBE060D1999F5155A4FC7A5A6" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.ApiManagement\AutoMapper.Net4.dll" />
152-
</Component>
153150
<Component Id="cmp5FB922E1DB9224DAB3732AEA3ECC0388" Guid="*">
154151
<File Id="fil5213407D51829D166CAC13B03BB3E5D9" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.ApiManagement\AzureRM.ApiManagement.psd1" />
155152
</Component>
@@ -704,9 +701,6 @@
704701
<Component Id="cmpD2516E302D41812368A84BD6010FB066" Guid="*">
705702
<File Id="filEBA6A8A31DD00604D785E38F8379CCC0" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Compute\AutoMapper.dll" />
706703
</Component>
707-
<Component Id="cmp22A6F693AF6FBFD6498C688650850591" Guid="*">
708-
<File Id="filA6AB6542AE249CFD2B0A551B0685C0C6" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Compute\AutoMapper.Net4.dll" />
709-
</Component>
710704
<Component Id="cmp594709EB2E69BD7173BC8833BE2061B4" Guid="*">
711705
<File Id="filEF7117E1317C1E3E14DF115DF4490BA3" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Compute\AzureRM.Compute.psd1" />
712706
</Component>
@@ -2371,9 +2365,6 @@
23712365
<Component Id="cmp33F39A22183184A6B41F85DF085BAD29" Guid="*">
23722366
<File Id="fil55AEBBBFEF03FD95E26F163516FF2E54" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Network\AutoMapper.dll" />
23732367
</Component>
2374-
<Component Id="cmp70B60DBD32D61BCA5715AB2D64131358" Guid="*">
2375-
<File Id="filF785DC83C86073F482446C70517349AF" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Network\AutoMapper.Net4.dll" />
2376-
</Component>
23772368
<Component Id="cmp6E3EAD7F12BD99ACB19E0249804739D9" Guid="*">
23782369
<File Id="fil073D08239CE53D9BDD13AB4040BF2180" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Network\AzureRM.Network.psd1" />
23792370
</Component>
@@ -2928,9 +2919,6 @@
29282919
<Component Id="cmp0771616382C276888CCCCAEDE5A4A116" Guid="*">
29292920
<File Id="fil3A2FA9FED44014FB034C65AE36153CCE" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices.SiteRecovery\AutoMapper.dll" />
29302921
</Component>
2931-
<Component Id="cmpCCE9F48369C0A7D8A62E453BBDD3BA60" Guid="*">
2932-
<File Id="fil9F99200863B45D3C4CAA2165474C1154" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices.SiteRecovery\AutoMapper.Net4.dll" />
2933-
</Component>
29342922
<Component Id="cmpAC48F0FFA8AD61A159AE77B4461BF0A1" Guid="*">
29352923
<File Id="filF5C89CCF397E88A4026855A0D2C52D03" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices.SiteRecovery\AzureRM.RecoveryServices.psd1" />
29362924
</Component>
@@ -4334,9 +4322,6 @@
43344322
<Component Id="cmpD31EE6D7925E4DAECBC12F02B2C896AA" Guid="*">
43354323
<File Id="fil5E38548DB973410FC004A041113E5421" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Compute\AutoMapper.dll" />
43364324
</Component>
4337-
<Component Id="cmpDFC157C3442E97BDF0570FFD8C7B977D" Guid="*">
4338-
<File Id="filCDCF5E4FDFBA13866B504E33B24C6195" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Compute\AutoMapper.Net4.dll" />
4339-
</Component>
43404325
<Component Id="cmp4BF22B003CB6023A1EABDD3AE357872E" Guid="*">
43414326
<File Id="filAFC87FC699D2AD74AA2D8FB62EE910B0" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Compute\Azure.psd1" />
43424327
</Component>
@@ -4718,9 +4703,6 @@
47184703
<Component Id="cmpAB9D9954A1CC38F64EDAC5266657C35E" Guid="*">
47194704
<File Id="filF838B2660677A0427291EE91BAF3C885" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Networking\AutoMapper.dll" />
47204705
</Component>
4721-
<Component Id="cmpB2A7275C2B928AA4B05A2C6CCAEDB373" Guid="*">
4722-
<File Id="fil10AC900CA72AF74C1282D479947DDA0C" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Networking\AutoMapper.Net4.dll" />
4723-
</Component>
47244706
<Component Id="cmpE341C9178CD349DCB605EB78561663C9" Guid="*">
47254707
<File Id="fil1D6B292A5C5BC3CFC39CC35067D40538" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Networking\Azure.psd1" />
47264708
</Component>
@@ -5074,9 +5056,6 @@
50745056
<Component Id="cmp5F55270F607737A772BFBE2D8F6B76E4" Guid="*">
50755057
<File Id="filF7E717D6789D9D4D072D3BA81461FCB3" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Services\AutoMapper.dll" />
50765058
</Component>
5077-
<Component Id="cmp9EF03D7C53CEE400751AD1905625B82B" Guid="*">
5078-
<File Id="fil1F623F47BC709C9D252862AC58BB467C" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Services\AutoMapper.Net4.dll" />
5079-
</Component>
50805059
<Component Id="cmpC4F524A9EBF63DAC78B9678CF113D652" Guid="*">
50815060
<File Id="fil9FEAB9D127D01AF382317A68BDBAE174" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Services\Azure.psd1" />
50825061
</Component>
@@ -5932,7 +5911,6 @@
59325911
<ComponentRef Id="cmp4239E298007039D73447BCF1C811AFFF" />
59335912
<ComponentRef Id="cmp52FA0519C93110702BAA6D4D39EED5A4" />
59345913
<ComponentRef Id="cmpBEA6E3263480C18705DC2E3B15E3C1CF" />
5935-
<ComponentRef Id="cmp957D146263F021CE3EF1CBADBF06D2C4" />
59365914
<ComponentRef Id="cmp5FB922E1DB9224DAB3732AEA3ECC0388" />
59375915
<ComponentRef Id="cmp7356D01A9E7869ACE3727CF75BD7E0CB" />
59385916
<ComponentRef Id="cmp2E3A58C9336220FF001B6912E569A1C3" />
@@ -6113,7 +6091,6 @@
61136091
<ComponentRef Id="cmp3D82D19F427B152BB3BB2BAD217958C2" />
61146092
<ComponentRef Id="cmpFDA0979F65585F21A39465A3177C778A" />
61156093
<ComponentRef Id="cmpD2516E302D41812368A84BD6010FB066" />
6116-
<ComponentRef Id="cmp22A6F693AF6FBFD6498C688650850591" />
61176094
<ComponentRef Id="cmp594709EB2E69BD7173BC8833BE2061B4" />
61186095
<ComponentRef Id="cmp4677B0CE124023330EDD7AA4FECFF45E" />
61196096
<ComponentRef Id="cmpCC409403AF670A9E0538AC743C61BD66" />
@@ -6654,7 +6631,6 @@
66546631
<ComponentRef Id="cmpE3675757E9A4594575D644697F2511CE" />
66556632
<ComponentRef Id="cmp40E1A281AD8C136D20FD0CC6C3A5D54C" />
66566633
<ComponentRef Id="cmp33F39A22183184A6B41F85DF085BAD29" />
6657-
<ComponentRef Id="cmp70B60DBD32D61BCA5715AB2D64131358" />
66586634
<ComponentRef Id="cmp6E3EAD7F12BD99ACB19E0249804739D9" />
66596635
<ComponentRef Id="cmp80BCFE8BC9E31ADA65ADD4B0ADA2A4C4" />
66606636
<ComponentRef Id="cmp7422E480DBC8B16B0BF2E5387A594B0B" />
@@ -6835,7 +6811,6 @@
68356811
<ComponentRef Id="cmp4C0352326E88F3944C388E2F8F24D0BA" />
68366812
<ComponentRef Id="cmpCA10090D9DBBEA0C6A7D6462DB2D0611" />
68376813
<ComponentRef Id="cmp0771616382C276888CCCCAEDE5A4A116" />
6838-
<ComponentRef Id="cmpCCE9F48369C0A7D8A62E453BBDD3BA60" />
68396814
<ComponentRef Id="cmpAC48F0FFA8AD61A159AE77B4461BF0A1" />
68406815
<ComponentRef Id="cmp7046713066487041F1101B42659052B1" />
68416816
<ComponentRef Id="cmp1BA726DB262180ED2598DA99F6FD43C0" />
@@ -7289,7 +7264,6 @@
72897264
<ComponentRef Id="cmp01E003A3FA26FB81C6B89817FE7250BE" />
72907265
<ComponentRef Id="cmp5E7A927FFF2CD1AC2D9A4D4746132F63" />
72917266
<ComponentRef Id="cmpD31EE6D7925E4DAECBC12F02B2C896AA" />
7292-
<ComponentRef Id="cmpDFC157C3442E97BDF0570FFD8C7B977D" />
72937267
<ComponentRef Id="cmp4BF22B003CB6023A1EABDD3AE357872E" />
72947268
<ComponentRef Id="cmp51ECC6BA35E7D95A12F581DD08E66F64" />
72957269
<ComponentRef Id="cmpECEA3A8AB38FEEEC397A918E3448B3FF" />
@@ -7415,7 +7389,6 @@
74157389
<ComponentRef Id="cmpB5F241C0863E789EFB3F330351AF23A0" />
74167390
<ComponentRef Id="cmp403B76F26F2AB3EBEC4773C05C428394" />
74177391
<ComponentRef Id="cmpAB9D9954A1CC38F64EDAC5266657C35E" />
7418-
<ComponentRef Id="cmpB2A7275C2B928AA4B05A2C6CCAEDB373" />
74197392
<ComponentRef Id="cmpE341C9178CD349DCB605EB78561663C9" />
74207393
<ComponentRef Id="cmpB3830B2F5405EB63585D70D9B4A8083B" />
74217394
<ComponentRef Id="cmp609ECF22CBCD5D733FA476301D478408" />
@@ -7531,7 +7504,6 @@
75317504
<ComponentRef Id="cmp0B4140C0041F650FB202F15FD4F86721" />
75327505
<ComponentRef Id="cmp2F1B2A67C2270698BE3A0B5967C8F271" />
75337506
<ComponentRef Id="cmp5F55270F607737A772BFBE2D8F6B76E4" />
7534-
<ComponentRef Id="cmp9EF03D7C53CEE400751AD1905625B82B" />
75357507
<ComponentRef Id="cmpC4F524A9EBF63DAC78B9678CF113D652" />
75367508
<ComponentRef Id="cmp401224722DA5F5678A1230A4DEC4B453" />
75377509
<ComponentRef Id="cmp2970C04AAF17425A9A2994CDC024E65D" />

0 commit comments

Comments
 (0)