Skip to content

Commit 3fcc717

Browse files
sudhakar4171sudhakar4171
committed
Merge pull request #219 from MabOneSdk/dev1-sudreddy
MSI related and policy bug fixes
2 parents 0a7ef98 + 48185b6 commit 3fcc717

File tree

7 files changed

+152
-37
lines changed

7 files changed

+152
-37
lines changed

‎setup/azurecmdfiles.wxi

Lines changed: 122 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -880,6 +880,9 @@
880880
<Component Id="cmp5835D87A5A94F44EAAAE61BCA33C1D80" Guid="*">
881881
<File Id="filEC64A002E6CBA598F7148F816DB05F11" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.DataLakeAnalytics\Microsoft.Azure.Commands.DataLakeAnalytics.dll" />
882882
</Component>
883+
<Component Id="cmp48F19935A02383063E0B360AA999603C" Guid="*">
884+
<File Id="fil49E99655A03D6452E383DFA326B88D9C" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.DataLakeAnalytics\Microsoft.Azure.Commands.DataLakeAnalytics.dll-help.psd1" />
885+
</Component>
883886
<Component Id="cmp96C621A371FF4A410548AAB167869D94" Guid="*">
884887
<File Id="filC7912B6B895CF7DF00A7C7F821AE40BF" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.DataLakeAnalytics\Microsoft.Azure.Commands.DataLakeAnalytics.dll-help.xml" />
885888
</Component>
@@ -960,6 +963,9 @@
960963
<Component Id="cmp5014A98086549EE22F2F2DF9C7C1B1F2" Guid="*">
961964
<File Id="filECB31473DDB8F3F534163169ABBEC69D" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.DataLakeStore\Microsoft.Azure.Commands.DataLakeStore.dll" />
962965
</Component>
966+
<Component Id="cmp94C1745555268B9A864EE489A357D45E" Guid="*">
967+
<File Id="fil6EB35A8BD5FD7462E0D84E4E546009F3" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.DataLakeStore\Microsoft.Azure.Commands.DataLakeStore.dll-help.psd1" />
968+
</Component>
963969
<Component Id="cmp23342B840C2625BED919B4FA66BA0BA6" Guid="*">
964970
<File Id="filB052F432D77A8BCDFF1ADC6CF9AEFFD1" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.DataLakeStore\Microsoft.Azure.Commands.DataLakeStore.dll-help.xml" />
965971
</Component>
@@ -1995,6 +2001,92 @@
19952001
<File Id="fil3A29806CC321EA39756A69909C112925" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices\System.Net.Http.Primitives.dll" />
19962002
</Component>
19972003
</Directory>
2004+
<Directory Id="dir4B5D5A50B55B6D96C02DC2573A68955C" Name="AzureRM.RecoveryServices.Backup">
2005+
<Component Id="cmp131A9DE83A67006D51F1314A42E399CA" Guid="*">
2006+
<File Id="filA2C0D97A8033046D96249BA12C24D9D4" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices.Backup\AzureRM.RecoveryServices.Backup.psd1" />
2007+
</Component>
2008+
<Component Id="cmpEB886EAAAF58ED0808ACCABDCC7707CA" Guid="*">
2009+
<File Id="filB0E96893813842B67380A6863ABBCC0D" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices.Backup\AzureRM.RecoveryServices.psd1" />
2010+
</Component>
2011+
<Component Id="cmpB35FF47D728C871816F14A3529260DE9" Guid="*">
2012+
<File Id="fil4BCDE7803B14A0BC88A83E82379716A7" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices.Backup\Hyak.Common.dll" />
2013+
</Component>
2014+
<Component Id="cmp99A277F4A4EF20D7BFBB171691A4B7E7" Guid="*">
2015+
<File Id="fil193C22E9D7D487844F6F0FD30BB8FB26" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices.Backup\Microsoft.ApplicationInsights.dll" />
2016+
</Component>
2017+
<Component Id="cmp1675F88279F58B72A180AF1411111337" Guid="*">
2018+
<File Id="fil368A68C98DD3F0B808B02BBF24EBB9AC" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices.Backup\Microsoft.Azure.Commands.Common.Authentication.dll" />
2019+
</Component>
2020+
<Component Id="cmp787B2B1E92B4AEF145134D74C17913C9" Guid="*">
2021+
<File Id="fil4414EC37DBB3B801C0176E172A8566FD" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices.Backup\Microsoft.Azure.Commands.RecoveryServices.ARM.dll" />
2022+
</Component>
2023+
<Component Id="cmpE5C4E7687DB1C6113A30F1D9CE41182F" Guid="*">
2024+
<File Id="fil1DF400D4DB252DE79904817997C7CB41" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices.Backup\Microsoft.Azure.Commands.RecoveryServices.ARM.dll-help.xml" />
2025+
</Component>
2026+
<Component Id="cmpB5BF9FBFFC4EDD83B9F7135CF42CB617" Guid="*">
2027+
<File Id="fil64AAA98F94DB6985D3A60FF7570C5E4A" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices.Backup\Microsoft.Azure.Commands.RecoveryServices.Backup.dll" />
2028+
</Component>
2029+
<Component Id="cmp7E42CC4AEA15FEF46E621AD38CC09F5A" Guid="*">
2030+
<File Id="filB3BB12CA661C1C8E6E7BE93BD77D781D" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices.Backup\Microsoft.Azure.Commands.RecoveryServices.Backup.format.ps1xml" />
2031+
</Component>
2032+
<Component Id="cmpB7B864E9C70EE65B799C79119DF7E80B" Guid="*">
2033+
<File Id="fil53BEB99E0373F87AA8C1DE1E39F13115" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices.Backup\Microsoft.Azure.Commands.RecoveryServices.Backup.Helpers.dll" />
2034+
</Component>
2035+
<Component Id="cmp298EE60DD6AAA12C33CA9E9EDDE4D674" Guid="*">
2036+
<File Id="filCA9A0EEBDB33D088D4D0EB9555189CD6" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices.Backup\Microsoft.Azure.Commands.RecoveryServices.Backup.HydraAdapter.dll" />
2037+
</Component>
2038+
<Component Id="cmp8826130AB84A23A8748B2E58087F1733" Guid="*">
2039+
<File Id="filBDEE1F034CEDF43D3B10E1DCA9DF81C0" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices.Backup\Microsoft.Azure.Commands.RecoveryServices.Backup.Logger.dll" />
2040+
</Component>
2041+
<Component Id="cmp705D3AFB5E86339823E569C4645A139F" Guid="*">
2042+
<File Id="filF87916ADE8086D552AFBF5F86147DB57" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices.Backup\Microsoft.Azure.Commands.RecoveryServices.Backup.Models.dll" />
2043+
</Component>
2044+
<Component Id="cmp3CBA7972F4711484D7FFF19457023268" Guid="*">
2045+
<File Id="filFEB151053DDC35E6643F363B07EC1EE3" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices.Backup\Microsoft.Azure.Commands.RecoveryServices.Backup.Providers.dll" />
2046+
</Component>
2047+
<Component Id="cmpDD61A35D79AF0DB08D533DDD646150DC" Guid="*">
2048+
<File Id="filF23BA348008E142BB0CEBEBDBD6F0B09" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices.Backup\Microsoft.Azure.Commands.ResourceManager.Common.dll" />
2049+
</Component>
2050+
<Component Id="cmp577E28EE57A416E3052CEE1BD21E5990" Guid="*">
2051+
<File Id="filC0711EC11D3FDA55E7F0015642F4BBC2" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices.Backup\Microsoft.Azure.Common.dll" />
2052+
</Component>
2053+
<Component Id="cmp403248FE1CECDB2218740975E268E81C" Guid="*">
2054+
<File Id="fil6311352FB4850E9DAC49E5FCCA907E9B" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices.Backup\Microsoft.Azure.Common.NetFramework.dll" />
2055+
</Component>
2056+
<Component Id="cmp16B849AA6669D83462B54D42D739CCCC" Guid="*">
2057+
<File Id="filE7E1056326FD5C43C9A9CDEBA5395825" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices.Backup\Microsoft.Azure.Management.RecoveryServices.dll" />
2058+
</Component>
2059+
<Component Id="cmpC96F162D3A5B03822697EB2BE5B4D5EB" Guid="*">
2060+
<File Id="filBF5932AC23F8EBCB6F98F17FF84774EF" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices.Backup\Microsoft.Azure.Management.RecoveryServicesBackupManagement.dll" />
2061+
</Component>
2062+
<Component Id="cmpA2EFAF047A9595A3CA7DFC6031140F27" Guid="*">
2063+
<File Id="fil9CAF7845821BBD039F828C617305D835" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices.Backup\Microsoft.IdentityModel.Clients.ActiveDirectory.dll" />
2064+
</Component>
2065+
<Component Id="cmp902DC2364C6FF451A60B4D115B5DC7A9" Guid="*">
2066+
<File Id="filDFC93A6AA2A808957B249CC88C7D6EE5" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices.Backup\Microsoft.Rest.ClientRuntime.Azure.Authentication.dll" />
2067+
</Component>
2068+
<Component Id="cmpF8AEF0C5D785D40AEC8F1BF4ACE4E939" Guid="*">
2069+
<File Id="filA708CDDEB8C8A8363E22F4C83953E14E" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices.Backup\Microsoft.Rest.ClientRuntime.dll" />
2070+
</Component>
2071+
<Component Id="cmp0FB4C1F5BB0FB399774156C4B56696B8" Guid="*">
2072+
<File Id="fil4E1010AEBDF69B9DF75CE473426C64B7" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices.Backup\Microsoft.Threading.Tasks.dll" />
2073+
</Component>
2074+
<Component Id="cmp7B84FC694FB5281CF08E6F1B41D07E12" Guid="*">
2075+
<File Id="filF61F62275153BB9F26EB1521CB9F8499" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices.Backup\Microsoft.WindowsAzure.Commands.Common.dll" />
2076+
</Component>
2077+
<Component Id="cmpF9EE1FA96DC6D8D178B61CD12160F541" Guid="*">
2078+
<File Id="fil60C54B33813267CA413696B2DA8D7864" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices.Backup\Microsoft.WindowsAzure.Management.dll" />
2079+
</Component>
2080+
<Component Id="cmp829F9EDD9A1D61A93ABE0F823CA9C181" Guid="*">
2081+
<File Id="fil187A39E94510EE8FA451727EFDD1793C" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices.Backup\Microsoft.WindowsAzure.Management.Scheduler.dll" />
2082+
</Component>
2083+
<Component Id="cmp517D253BF8B4A6D2010F79CA7DF1BEF5" Guid="*">
2084+
<File Id="fil0C3EEB7F44300C37492FACA1F361D1C6" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices.Backup\Newtonsoft.Json.dll" />
2085+
</Component>
2086+
<Component Id="cmp91B9EAC62A0387B3AF8AD38F521C37B2" Guid="*">
2087+
<File Id="fil5512E9FE988FAF589373CE2C48F046FF" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices.Backup\Security.Cryptography.dll" />
2088+
</Component>
2089+
</Directory>
19982090
<Directory Id="dir81EE6B6C66E21DBFAFE07FA058F415D6" Name="AzureRM.RedisCache">
19992091
<Component Id="cmp301F9E8FA547D7C9A0DF4FF20F87815D" Guid="*">
20002092
<File Id="fil1A611C57F01D0929B21DD9483DAF7EE0" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RedisCache\AzureRM.RedisCache.psd1" />
@@ -5253,6 +5345,7 @@
52535345
<ComponentRef Id="cmp2FEEAA23FF0F261C6E47AB598DBBF8A6" />
52545346
<ComponentRef Id="cmp2724FFAE2E4148D8281FED1A2B986135" />
52555347
<ComponentRef Id="cmp5835D87A5A94F44EAAAE61BCA33C1D80" />
5348+
<ComponentRef Id="cmp48F19935A02383063E0B360AA999603C" />
52565349
<ComponentRef Id="cmp96C621A371FF4A410548AAB167869D94" />
52575350
<ComponentRef Id="cmpBFBF6E4B62912618B79304EFC6838BAB" />
52585351
<ComponentRef Id="cmpF9A737C5D10D7520DABFD5A7B1CA19AF" />
@@ -5279,6 +5372,7 @@
52795372
<ComponentRef Id="cmpFA06C9BD3FF76E0DAA7ACE5C9435F394" />
52805373
<ComponentRef Id="cmp198EEB211792E85743513C6C91F89DE2" />
52815374
<ComponentRef Id="cmp5014A98086549EE22F2F2DF9C7C1B1F2" />
5375+
<ComponentRef Id="cmp94C1745555268B9A864EE489A357D45E" />
52825376
<ComponentRef Id="cmp23342B840C2625BED919B4FA66BA0BA6" />
52835377
<ComponentRef Id="cmp001FEDC74DD7D918EFE88F2EB8E4285C" />
52845378
<ComponentRef Id="cmpBE1007C3B5920359FED93D232612FA3D" />
@@ -5617,6 +5711,34 @@
56175711
<ComponentRef Id="cmp6507BFAC437859C861A9F8D0535A62ED" />
56185712
<ComponentRef Id="cmpC00974919B90C9055BED1F2A9DA95441" />
56195713
<ComponentRef Id="cmpE300D8B185C427E05E95BA97413F6CC8" />
5714+
<ComponentRef Id="cmp131A9DE83A67006D51F1314A42E399CA" />
5715+
<ComponentRef Id="cmpEB886EAAAF58ED0808ACCABDCC7707CA" />
5716+
<ComponentRef Id="cmpB35FF47D728C871816F14A3529260DE9" />
5717+
<ComponentRef Id="cmp99A277F4A4EF20D7BFBB171691A4B7E7" />
5718+
<ComponentRef Id="cmp1675F88279F58B72A180AF1411111337" />
5719+
<ComponentRef Id="cmp787B2B1E92B4AEF145134D74C17913C9" />
5720+
<ComponentRef Id="cmpE5C4E7687DB1C6113A30F1D9CE41182F" />
5721+
<ComponentRef Id="cmpB5BF9FBFFC4EDD83B9F7135CF42CB617" />
5722+
<ComponentRef Id="cmp7E42CC4AEA15FEF46E621AD38CC09F5A" />
5723+
<ComponentRef Id="cmpB7B864E9C70EE65B799C79119DF7E80B" />
5724+
<ComponentRef Id="cmp298EE60DD6AAA12C33CA9E9EDDE4D674" />
5725+
<ComponentRef Id="cmp8826130AB84A23A8748B2E58087F1733" />
5726+
<ComponentRef Id="cmp705D3AFB5E86339823E569C4645A139F" />
5727+
<ComponentRef Id="cmp3CBA7972F4711484D7FFF19457023268" />
5728+
<ComponentRef Id="cmpDD61A35D79AF0DB08D533DDD646150DC" />
5729+
<ComponentRef Id="cmp577E28EE57A416E3052CEE1BD21E5990" />
5730+
<ComponentRef Id="cmp403248FE1CECDB2218740975E268E81C" />
5731+
<ComponentRef Id="cmp16B849AA6669D83462B54D42D739CCCC" />
5732+
<ComponentRef Id="cmpC96F162D3A5B03822697EB2BE5B4D5EB" />
5733+
<ComponentRef Id="cmpA2EFAF047A9595A3CA7DFC6031140F27" />
5734+
<ComponentRef Id="cmp902DC2364C6FF451A60B4D115B5DC7A9" />
5735+
<ComponentRef Id="cmpF8AEF0C5D785D40AEC8F1BF4ACE4E939" />
5736+
<ComponentRef Id="cmp0FB4C1F5BB0FB399774156C4B56696B8" />
5737+
<ComponentRef Id="cmp7B84FC694FB5281CF08E6F1B41D07E12" />
5738+
<ComponentRef Id="cmpF9EE1FA96DC6D8D178B61CD12160F541" />
5739+
<ComponentRef Id="cmp829F9EDD9A1D61A93ABE0F823CA9C181" />
5740+
<ComponentRef Id="cmp517D253BF8B4A6D2010F79CA7DF1BEF5" />
5741+
<ComponentRef Id="cmp91B9EAC62A0387B3AF8AD38F521C37B2" />
56205742
<ComponentRef Id="cmp301F9E8FA547D7C9A0DF4FF20F87815D" />
56215743
<ComponentRef Id="cmp5EF3051C386C8DAA602E772A7C258726" />
56225744
<ComponentRef Id="cmpD143AF1A4E05D7D8425777ECA2F5440D" />

‎src/ResourceManager/RecoveryServices.Backup/Cmdlets/Container/GetAzureRmBackupManagementServer.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets
2727
/// <summary>
2828
/// Get list of containers
2929
/// </summary>
30-
[Cmdlet(VerbsCommon.Get, "AzureRmRecoveryServicesContainer"), OutputType(typeof(List<AzureRmRecoveryServicesContainerBase>), typeof(AzureRmRecoveryServicesContainerBase))]
30+
[Cmdlet(VerbsCommon.Get, "AzureRmBackupManagementServer"), OutputType(typeof(List<AzureRmRecoveryServicesContainerBase>), typeof(AzureRmRecoveryServicesContainerBase))]
3131
public class GetAzureRmBackupManagementServer : RecoveryServicesBackupCmdletBase
3232
{
3333
[Parameter(Mandatory = true, HelpMessage = ParamHelpMsg.Container.Name)]

‎src/ResourceManager/RecoveryServices.Backup/Cmdlets/ProtectionPolicy/NewAzureRmRecoveryServicesPolicy.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,7 @@ public override void ExecuteCmdlet()
7878
PsBackupProviderManager providerManager = new PsBackupProviderManager(new Dictionary<System.Enum, object>()
7979
{
8080
{PolicyParams.PolicyName, Name},
81-
{PolicyParams.WorkloadType, WorkloadType},
82-
{PolicyParams.BackupManagementType, BackupManagementType},
81+
{PolicyParams.WorkloadType, WorkloadType},
8382
{PolicyParams.RetentionPolicy, RetentionPolicy},
8483
{PolicyParams.SchedulePolicy, SchedulePolicy},
8584
}, HydraAdapter);

‎src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Cmdlets.csproj

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -152,12 +152,4 @@
152152
<None Include="packages.config" />
153153
</ItemGroup>
154154
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
155-
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
156-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
157-
Other similar extension points exist, see Microsoft.Common.targets.
158-
<Target Name="BeforeBuild">
159-
</Target>
160-
<Target Name="AfterBuild">
161-
</Target>
162-
-->
163155
</Project>

0 commit comments

Comments
 (0)