Skip to content

Commit 08dd728

Browse files
pragrawapragrawa
committed
resolved merge conflicts
2 parents 533e4ba + 0121f42 commit 08dd728

24 files changed

+714
-31
lines changed

‎setup/azurecmdfiles.wxi

Lines changed: 98 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,80 @@
152152
<File Id="filB7DFDD0ACAF2679C28F3AF1B6DC0A867" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Automation\System.Net.Http.Primitives.dll" />
153153
</Component>
154154
</Directory>
155+
<Directory Id="dirCC8589A1609C88A852852588FA95B876" Name="AzureBackup">
156+
<Component Id="cmpA601CFA1ACF963497A0D63D3EE3973F8" Guid="*">
157+
<File Id="fil189B3FB2ECE2ECDFDC54134356B445D3" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureBackup\BackupManagementInterface.dll" />
158+
</Component>
159+
<Component Id="cmp54C05FC7F025C6990F85DE83E9FF18F8" Guid="*">
160+
<File Id="filB0B89380E01BF02C12D0F2FCCC07D11D" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureBackup\BMSCommonInterface.dll" />
161+
</Component>
162+
<Component Id="cmp764ECD171DCCFF43B9646B18B611C5D2" Guid="*">
163+
<File Id="fil9D808FDD0064A9119122C0B052FC6EB9" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureBackup\Hyak.Common.dll" />
164+
</Component>
165+
<Component Id="cmpD173AA3EBCFA9D5846F4885F00E0FF17" Guid="*">
166+
<File Id="filC8E16A191A89A857FE6DD3C8D1A103BF" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureBackup\Microsoft.Azure.Commands.AzureBackup.dll" />
167+
</Component>
168+
<Component Id="cmp93F2FD2A2CE813D71E9EB73D17766862" Guid="*">
169+
<File Id="filCB9C0579875213FCE61AEAD8E0098F2F" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureBackup\Microsoft.Azure.Commands.AzureBackup.format.ps1xml" />
170+
</Component>
171+
<Component Id="cmpC7C46B78400D1C9A65690C32146B49BD" Guid="*">
172+
<File Id="fil0B030B7B33A1B25A7EE70305B133968E" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureBackup\Microsoft.Azure.Commands.AzureBackup.types.ps1xml" />
173+
</Component>
174+
<Component Id="cmp1A08000EC2A9124236B81995565C0926" Guid="*">
175+
<File Id="fil699B99C9DB560DDE812364CE51A9957A" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureBackup\Microsoft.Azure.Common.Authentication.dll" />
176+
</Component>
177+
<Component Id="cmp8E2C563F298EDDBFDC6F6CC139C33DF1" Guid="*">
178+
<File Id="fil1FF5C687D7C91867DD51CBFB9C49A493" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureBackup\Microsoft.Azure.Common.dll" />
179+
</Component>
180+
<Component Id="cmp7C9C5CA6ADCC1B66BA82B614FE8CFFCB" Guid="*">
181+
<File Id="fil85D3B846061C1260337DD842A5C287C2" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureBackup\Microsoft.Azure.Common.NetFramework.dll" />
182+
</Component>
183+
<Component Id="cmpA81CEF5E38E88EEF72F9C893C12EF35D" Guid="*">
184+
<File Id="fil0729013A7C04A794635A8ABEE3E947EF" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureBackup\Microsoft.Azure.ResourceManager.dll" />
185+
</Component>
186+
<Component Id="cmp42AAFCF1A1599D7AF884AFE99AAB2154" Guid="*">
187+
<File Id="fil7BD596A66D05C12F2C4007D218500891" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureBackup\Microsoft.IdentityModel.Clients.ActiveDirectory.dll" />
188+
</Component>
189+
<Component Id="cmp720F48C9F6CC776B973E65B539427788" Guid="*">
190+
<File Id="filA9D89F74B0189CDFDA15036218534F89" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureBackup\Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms.dll" />
191+
</Component>
192+
<Component Id="cmp5910D1DDDA65854BFE55F77DF913EB60" Guid="*">
193+
<File Id="fil8C88483375CA4F0FA6A3D9AE2AEF3E98" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureBackup\Microsoft.Threading.Tasks.dll" />
194+
</Component>
195+
<Component Id="cmp0842E5A900246DB39874B9F02422196D" Guid="*">
196+
<File Id="filFABBAEE9D1F6354EBC49162FF0987BAA" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureBackup\Microsoft.Threading.Tasks.Extensions.Desktop.dll" />
197+
</Component>
198+
<Component Id="cmp4DB6C0ED23E725EA4DA266D191DB5726" Guid="*">
199+
<File Id="filCF9C4B4192C180A4410029CA3F3C3594" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureBackup\Microsoft.Threading.Tasks.Extensions.dll" />
200+
</Component>
201+
<Component Id="cmp494186128A123AE9FAC7031C52A341D6" Guid="*">
202+
<File Id="fil51490FAA14DDAD32B820748F76630D84" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureBackup\Microsoft.WindowsAzure.Commands.Common.dll" />
203+
</Component>
204+
<Component Id="cmpFBC9DC48A073E448097EFA94B6028013" Guid="*">
205+
<File Id="fil383CABBD062EF8949F93BC0473ECDF13" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureBackup\Microsoft.WindowsAzure.Management.BackupServicesManagment.dll" />
206+
</Component>
207+
<Component Id="cmpD372F34FD330CEAC019FBB033BE17912" Guid="*">
208+
<File Id="filF500CDDFD11B76156B143F658EBAA9B6" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureBackup\Microsoft.WindowsAzure.Management.Common.dll" />
209+
</Component>
210+
<Component Id="cmp177B5F86946D4DDBF0BF60F56BBC4F7C" Guid="*">
211+
<File Id="filAA9BC90CD8B9E3B2D09140B62BCDEF5F" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureBackup\Microsoft.WindowsAzure.Management.dll" />
212+
</Component>
213+
<Component Id="cmp2E6CFBDC49B18E60EC38F7193250527D" Guid="*">
214+
<File Id="fil2AA0C49F628F1CAAA302FD10A454AC59" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureBackup\Microsoft.WindowsAzure.Management.Scheduler.dll" />
215+
</Component>
216+
<Component Id="cmp93B570ACAF639E6733432034AE6FF02F" Guid="*">
217+
<File Id="filA3F63AFC3D8C80E0ABD42BC65FC9F78A" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureBackup\Newtonsoft.Json.dll" />
218+
</Component>
219+
<Component Id="cmpB0017F910A9D7192DF5537E276999B55" Guid="*">
220+
<File Id="fil9302297991A83D9D62FD2EDC5BF685C7" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureBackup\Security.Cryptography.dll" />
221+
</Component>
222+
<Component Id="cmp2573B704E37818542BAE4FDBC4140886" Guid="*">
223+
<File Id="filA2F0F36806A850A7988EFE7BEBFE21D8" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureBackup\System.Net.Http.Extensions.dll" />
224+
</Component>
225+
<Component Id="cmp7A5671ADC66ADF99291C222308469AF0" Guid="*">
226+
<File Id="fil681B36B6802ACB36656FBFA816A9AF95" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureBackup\System.Net.Http.Primitives.dll" />
227+
</Component>
228+
</Directory>
155229
<Directory Id="dir2BEEAACE1371947984B11E66ADCB80DD" Name="Batch">
156230
<Component Id="cmp7D23FBEE3847FF584460769B5AE3E319" Guid="*">
157231
<File Id="filDAA85018E0B209874BB796A169C0F372" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Batch\Hyak.Common.dll" />
@@ -3741,6 +3815,30 @@
37413815
<ComponentRef Id="cmp6DBF879ED21E537983293A8230D414C3" />
37423816
<ComponentRef Id="cmp0EA7B1A75545315150C0D194E197D085" />
37433817
<ComponentRef Id="cmp47534337D86993B60F1616D43D3AE489" />
3818+
<ComponentRef Id="cmpA601CFA1ACF963497A0D63D3EE3973F8" />
3819+
<ComponentRef Id="cmp54C05FC7F025C6990F85DE83E9FF18F8" />
3820+
<ComponentRef Id="cmp764ECD171DCCFF43B9646B18B611C5D2" />
3821+
<ComponentRef Id="cmpD173AA3EBCFA9D5846F4885F00E0FF17" />
3822+
<ComponentRef Id="cmp93F2FD2A2CE813D71E9EB73D17766862" />
3823+
<ComponentRef Id="cmpC7C46B78400D1C9A65690C32146B49BD" />
3824+
<ComponentRef Id="cmp1A08000EC2A9124236B81995565C0926" />
3825+
<ComponentRef Id="cmp8E2C563F298EDDBFDC6F6CC139C33DF1" />
3826+
<ComponentRef Id="cmp7C9C5CA6ADCC1B66BA82B614FE8CFFCB" />
3827+
<ComponentRef Id="cmpA81CEF5E38E88EEF72F9C893C12EF35D" />
3828+
<ComponentRef Id="cmp42AAFCF1A1599D7AF884AFE99AAB2154" />
3829+
<ComponentRef Id="cmp720F48C9F6CC776B973E65B539427788" />
3830+
<ComponentRef Id="cmp5910D1DDDA65854BFE55F77DF913EB60" />
3831+
<ComponentRef Id="cmp0842E5A900246DB39874B9F02422196D" />
3832+
<ComponentRef Id="cmp4DB6C0ED23E725EA4DA266D191DB5726" />
3833+
<ComponentRef Id="cmp494186128A123AE9FAC7031C52A341D6" />
3834+
<ComponentRef Id="cmpFBC9DC48A073E448097EFA94B6028013" />
3835+
<ComponentRef Id="cmpD372F34FD330CEAC019FBB033BE17912" />
3836+
<ComponentRef Id="cmp177B5F86946D4DDBF0BF60F56BBC4F7C" />
3837+
<ComponentRef Id="cmp2E6CFBDC49B18E60EC38F7193250527D" />
3838+
<ComponentRef Id="cmp93B570ACAF639E6733432034AE6FF02F" />
3839+
<ComponentRef Id="cmpB0017F910A9D7192DF5537E276999B55" />
3840+
<ComponentRef Id="cmp2573B704E37818542BAE4FDBC4140886" />
3841+
<ComponentRef Id="cmp7A5671ADC66ADF99291C222308469AF0" />
37443842
<ComponentRef Id="cmp7D23FBEE3847FF584460769B5AE3E319" />
37453843
<ComponentRef Id="cmp0F050B6B9709FCF0F3A1624615831882" />
37463844
<ComponentRef Id="cmp8E2BA91A40B8D59412A2943485B811AE" />

‎src/ResourceManager/AzureBackup/Commands.AzureBackup.Test/App.config

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<appSettings>
4+
<add key="ResourceName" value="swatirn1" />
5+
<add key="ResourceGroupName" value="swatirg1" />
6+
<add key="ResourceId" value="7368183945769329045" />
7+
<add key="ClientSettingsProvider.ServiceUri" value="" />
8+
</appSettings>
9+
</configuration>

0 commit comments

Comments
 (0)