Skip to content

Commit 572eed1

Browse files
yugangw-msftyugangw-msft
committed
Merge pull request Azure#688 from yugangw-msft/sr
fix a bad merge on posh solution file which causes recovery commands not load
2 parents 6ef5a19 + 4f2c49b commit 572eed1

File tree

3 files changed

+136
-10092
lines changed

3 files changed

+136
-10092
lines changed

‎setup/azurecmdfiles.wxi

Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1942,6 +1942,74 @@
19421942
<File Id="fil59FE45D1790EB33DE9F5C7E23E2F7100" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Resources\System.Spatial.dll" />
19431943
</Component>
19441944
</Directory>
1945+
<Directory Id="dir34E4B68E32D75685E557B179C38A2666" Name="SiteRecovery">
1946+
<Component Id="cmp0DD9F98F1EAD9265107E180BFB1FC40E" Guid="*">
1947+
<File Id="fil746C358AF3BFF78D4B61FE6A7820EDFA" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\SiteRecovery\Hyak.Common.dll" />
1948+
</Component>
1949+
<Component Id="cmp720E5456FE6184B96FDB013EC066BB32" Guid="*">
1950+
<File Id="fil2CFB675B7D0CD69580DE12C624CB2564" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\SiteRecovery\Microsoft.Azure.Commands.SiteRecovery.dll" />
1951+
</Component>
1952+
<Component Id="cmpB4BBE3154AE161F6B43BB8DDDAA60B03" Guid="*">
1953+
<File Id="fil7E87C0238FCF2512F53E9D95C0ADB878" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\SiteRecovery\Microsoft.Azure.Commands.SiteRecovery.dll-help.xml" />
1954+
</Component>
1955+
<Component Id="cmp71D4786BD668BFD20B03AB80B05F7E11" Guid="*">
1956+
<File Id="filA00057A2738D770C908C96480CBDFE3E" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\SiteRecovery\Microsoft.Azure.Common.Authentication.dll" />
1957+
</Component>
1958+
<Component Id="cmp3264FFC9CADDF15989DCA32C641F18D9" Guid="*">
1959+
<File Id="fil35EF118F0936E244DED92DE62AC6512E" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\SiteRecovery\Microsoft.Azure.Common.dll" />
1960+
</Component>
1961+
<Component Id="cmp9B963BC9F05647CF581301BC7200E99F" Guid="*">
1962+
<File Id="filBF2AF31711B3BBA3963ECACFBC5C6085" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\SiteRecovery\Microsoft.Azure.Common.NetFramework.dll" />
1963+
</Component>
1964+
<Component Id="cmp73FB031576E1C20C88BA9BBB9FC3E248" Guid="*">
1965+
<File Id="filB5BDC69B9B2A55E29712F2788B8BEF56" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\SiteRecovery\Microsoft.Azure.Management.SiteRecovery.dll" />
1966+
</Component>
1967+
<Component Id="cmp6CB0D022248608D0C4D47C2AB6993391" Guid="*">
1968+
<File Id="filAE9A43B38DF585F90DF54C5308A0C66F" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\SiteRecovery\Microsoft.Data.Edm.dll" />
1969+
</Component>
1970+
<Component Id="cmp4C0F68E81387DFBC42C52A74B954BDFC" Guid="*">
1971+
<File Id="fil8F9B13ECC62FD14E7C65CF811B56DBDF" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\SiteRecovery\Microsoft.Data.OData.dll" />
1972+
</Component>
1973+
<Component Id="cmp2F9BD3BDACF7301C7367BB81E84D07C5" Guid="*">
1974+
<File Id="fil8E8D16EC3DA3C2DAE8FBEDC40E94B077" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\SiteRecovery\Microsoft.Data.Services.Client.dll" />
1975+
</Component>
1976+
<Component Id="cmpCC0E975593FE452CD28E53383FDCA6CC" Guid="*">
1977+
<File Id="fil6C4608FDCA7FB3DE1469183A87FE2F4B" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\SiteRecovery\Microsoft.IdentityModel.Clients.ActiveDirectory.dll" />
1978+
</Component>
1979+
<Component Id="cmp7886B3783EC4CA318C3FC1B70B2776FB" Guid="*">
1980+
<File Id="fil770E9FE333627662CF8F68987E0F6376" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\SiteRecovery\Microsoft.Threading.Tasks.dll" />
1981+
</Component>
1982+
<Component Id="cmp7EB72BFDCED68608173EFAF47EC77E49" Guid="*">
1983+
<File Id="fil7B73273A683BA2036B07217070376A71" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\SiteRecovery\Microsoft.Threading.Tasks.Extensions.Desktop.dll" />
1984+
</Component>
1985+
<Component Id="cmp08BF15A9163BDB63E6494854B9D1C3E9" Guid="*">
1986+
<File Id="filDA61DF3EB92F1BFF323C4D910A8189F4" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\SiteRecovery\Microsoft.Threading.Tasks.Extensions.dll" />
1987+
</Component>
1988+
<Component Id="cmp6932892D3EB941E513DDF7B42C800185" Guid="*">
1989+
<File Id="fil1D0B75D45EBB3D78E01D5D9F41B8BC1E" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\SiteRecovery\Microsoft.WindowsAzure.Commands.Common.dll" />
1990+
</Component>
1991+
<Component Id="cmp876290D191477725F9995546F39CFA7C" Guid="*">
1992+
<File Id="filC3F886CA7C6E0FA53E1DD7565EDAE705" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\SiteRecovery\Microsoft.WindowsAzure.Storage.dll" />
1993+
</Component>
1994+
<Component Id="cmp221776A546431A254D6AFC9C774C14CB" Guid="*">
1995+
<File Id="filFE1DD10E0939B54760057B43058A5C93" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\SiteRecovery\Newtonsoft.Json.dll" />
1996+
</Component>
1997+
<Component Id="cmpFC0F305B51DB7E1FB2F0920E119CEBCA" Guid="*">
1998+
<File Id="filFF5DA7A132DBBADC329A7B68E73E59BE" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\SiteRecovery\Security.Cryptography.dll" />
1999+
</Component>
2000+
<Component Id="cmpF88DDCCB35F1D6E61990314B0C8488D9" Guid="*">
2001+
<File Id="fil8C065D0B1DAC75E774B12377860E4688" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\SiteRecovery\System.Net.Http.Extensions.dll" />
2002+
</Component>
2003+
<Component Id="cmpC44E33D73A6414F89BCFF3DC321E6ABA" Guid="*">
2004+
<File Id="filDE0990425673EDA47E878EC5E6A563FD" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\SiteRecovery\System.Net.Http.Formatting.dll" />
2005+
</Component>
2006+
<Component Id="cmpC4E6EBEA1E49EAA9D986D2F85635EBB5" Guid="*">
2007+
<File Id="fil1EA41DEEA511B44C2AE03EF8E7F1145B" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\SiteRecovery\System.Net.Http.Primitives.dll" />
2008+
</Component>
2009+
<Component Id="cmpB2C893412C4BD70AB8AB8AA3A984231F" Guid="*">
2010+
<File Id="fil3ACC065FE4F682BED30B9D4816B920A5" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\SiteRecovery\System.Spatial.dll" />
2011+
</Component>
2012+
</Directory>
19452013
<Directory Id="dir70AE8239A404E2C5D5621DBCDA6733C9" Name="Sql">
19462014
<Component Id="cmp5746A3BAD258D8EA1473730146C01F1D" Guid="*">
19472015
<File Id="filC77480943AC17C0B5A6742189E2B9D60" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Sql\Hyak.Common.dll" />
@@ -5273,6 +5341,28 @@
52735341
<ComponentRef Id="cmp997A920A652163E94E56A412D2BEC28C" />
52745342
<ComponentRef Id="cmp353F25E254A7722E3CADF046790D3C4D" />
52755343
<ComponentRef Id="cmpCADE67F2ED98E9D37A3889AE074E65ED" />
5344+
<ComponentRef Id="cmp0DD9F98F1EAD9265107E180BFB1FC40E" />
5345+
<ComponentRef Id="cmp720E5456FE6184B96FDB013EC066BB32" />
5346+
<ComponentRef Id="cmpB4BBE3154AE161F6B43BB8DDDAA60B03" />
5347+
<ComponentRef Id="cmp71D4786BD668BFD20B03AB80B05F7E11" />
5348+
<ComponentRef Id="cmp3264FFC9CADDF15989DCA32C641F18D9" />
5349+
<ComponentRef Id="cmp9B963BC9F05647CF581301BC7200E99F" />
5350+
<ComponentRef Id="cmp73FB031576E1C20C88BA9BBB9FC3E248" />
5351+
<ComponentRef Id="cmp6CB0D022248608D0C4D47C2AB6993391" />
5352+
<ComponentRef Id="cmp4C0F68E81387DFBC42C52A74B954BDFC" />
5353+
<ComponentRef Id="cmp2F9BD3BDACF7301C7367BB81E84D07C5" />
5354+
<ComponentRef Id="cmpCC0E975593FE452CD28E53383FDCA6CC" />
5355+
<ComponentRef Id="cmp7886B3783EC4CA318C3FC1B70B2776FB" />
5356+
<ComponentRef Id="cmp7EB72BFDCED68608173EFAF47EC77E49" />
5357+
<ComponentRef Id="cmp08BF15A9163BDB63E6494854B9D1C3E9" />
5358+
<ComponentRef Id="cmp6932892D3EB941E513DDF7B42C800185" />
5359+
<ComponentRef Id="cmp876290D191477725F9995546F39CFA7C" />
5360+
<ComponentRef Id="cmp221776A546431A254D6AFC9C774C14CB" />
5361+
<ComponentRef Id="cmpFC0F305B51DB7E1FB2F0920E119CEBCA" />
5362+
<ComponentRef Id="cmpF88DDCCB35F1D6E61990314B0C8488D9" />
5363+
<ComponentRef Id="cmpC44E33D73A6414F89BCFF3DC321E6ABA" />
5364+
<ComponentRef Id="cmpC4E6EBEA1E49EAA9D986D2F85635EBB5" />
5365+
<ComponentRef Id="cmpB2C893412C4BD70AB8AB8AA3A984231F" />
52765366
<ComponentRef Id="cmp5746A3BAD258D8EA1473730146C01F1D" />
52775367
<ComponentRef Id="cmp56F52674BB946225BB64533814DCF37F" />
52785368
<ComponentRef Id="cmp499092B04619C0EDE4686B78E1128605" />

‎src/AzurePowershell.sln

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -232,6 +232,7 @@ EndProject
232232
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HDInsight", "ServiceManagement\HDInsight\Commands.HDInsight\HDInsight.csproj", "{137D404A-865A-43DB-930C-6DA67DA048DF}"
233233
EndProject
234234
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.HDInsight", "ResourceManager\HDInsight\Commands.HDInsight\Commands.HDInsight.csproj", "{6B7540C5-8AB3-4011-864B-0BE76F282F9E}"
235+
EndProject
235236
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.SiteRecovery", "ResourceManager\SiteRecovery\Commands.SiteRecovery\Commands.SiteRecovery.csproj", "{7C879645-31EE-4A78-AD81-5512300FA104}"
236237
EndProject
237238
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.SiteRecovery.Test", "ResourceManager\SiteRecovery\Commands.SiteRecovery.Test\Commands.SiteRecovery.Test.csproj", "{6C7D3D81-37AB-445E-8081-78A1FEC0A773}"

0 commit comments

Comments
 (0)