Skip to content

Commit faf7621

Browse files
cormacpaynecormacpayne
committed
RecoveryServices.SiteRecovery AutoMapper update
1 parent f9e9a42 commit faf7621

13 files changed

+717
-711
lines changed

‎src/ResourceManager/RecoveryServices.SiteRecovery/Commands.RecoveryServices.SiteRecovery/Commands.RecoveryServices.SiteRecovery.csproj

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,12 @@
3535
<DelaySign>true</DelaySign>
3636
</PropertyGroup>
3737
<ItemGroup>
38-
<Reference Include="AutoMapper, Version=3.1.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
39-
<HintPath>..\..\..\packages\AutoMapper.3.1.1\lib\net40\AutoMapper.dll</HintPath>
38+
<Reference Include="AutoMapper, Version=6.0.2.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
39+
<HintPath>..\..\..\packages\AutoMapper.6.0.2\lib\net45\AutoMapper.dll</HintPath>
40+
<Private>True</Private>
4041
</Reference>
41-
<Reference Include="AutoMapper.Net4, Version=3.1.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
42-
<HintPath>..\..\..\packages\AutoMapper.3.1.1\lib\net40\AutoMapper.Net4.dll</HintPath>
42+
<Reference Include="AutoMapper.Net4, Version=6.0.2.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
43+
<HintPath>..\..\..\packages\AutoMapper.6.0.2\lib\net45\AutoMapper.Net4.dll</HintPath>
4344
</Reference>
4445
<Reference Include="Microsoft.Azure.Management.RecoveryServices, Version=4.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
4546
<HintPath>..\..\..\packages\Microsoft.Azure.Management.RecoveryServices.4.2.0-preview\lib\net45\Microsoft.Azure.Management.RecoveryServices.dll</HintPath>

‎src/ResourceManager/RecoveryServices.SiteRecovery/Commands.RecoveryServices.SiteRecovery/Common/AsrCmdletBase.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,6 @@ public override void ExecuteCmdlet()
7979
/// </summary>
8080
public virtual void ExecuteSiteRecoveryCmdlet()
8181
{
82-
SiteRecoveryAutoMapperProfile.Initialize();
83-
8482
// Do Nothing
8583
}
8684

‎src/ResourceManager/RecoveryServices.SiteRecovery/Commands.RecoveryServices.SiteRecovery/Common/PSAsrFabricClient.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public PSSiteRecoveryLongRunningOperation CreateAzureSiteRecoveryFabric(
3939
this.GetRequestHeaders(true))
4040
.GetAwaiter()
4141
.GetResult();
42-
var result = Mapper.Map<PSSiteRecoveryLongRunningOperation>(op);
42+
var result = SiteRecoveryAutoMapperProfile.Mapper.Map<PSSiteRecoveryLongRunningOperation>(op);
4343
return result;
4444
}
4545

@@ -57,7 +57,7 @@ public PSSiteRecoveryLongRunningOperation DeleteAzureSiteRecoveryFabric(
5757
this.GetRequestHeaders(true))
5858
.GetAwaiter()
5959
.GetResult();
60-
var result = Mapper.Map<PSSiteRecoveryLongRunningOperation>(op);
60+
var result = SiteRecoveryAutoMapperProfile.Mapper.Map<PSSiteRecoveryLongRunningOperation>(op);
6161
return result;
6262
}
6363

@@ -117,7 +117,7 @@ public PSSiteRecoveryLongRunningOperation PurgeAzureSiteRecoveryFabric(
117117
this.GetRequestHeaders(true))
118118
.GetAwaiter()
119119
.GetResult();
120-
var result = Mapper.Map<PSSiteRecoveryLongRunningOperation>(op);
120+
var result = SiteRecoveryAutoMapperProfile.Mapper.Map<PSSiteRecoveryLongRunningOperation>(op);
121121
return result;
122122
}
123123
}

‎src/ResourceManager/RecoveryServices.SiteRecovery/Commands.RecoveryServices.SiteRecovery/Common/PSAsrJobClient.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public PSSiteRecoveryLongRunningOperation CancelAzureSiteRecoveryJob(
3838
this.GetRequestHeaders(true))
3939
.GetAwaiter()
4040
.GetResult();
41-
var result = Mapper.Map<PSSiteRecoveryLongRunningOperation>(op);
41+
var result = SiteRecoveryAutoMapperProfile.Mapper.Map<PSSiteRecoveryLongRunningOperation>(op);
4242
return result;
4343
}
4444

@@ -100,7 +100,7 @@ public PSSiteRecoveryLongRunningOperation RestartAzureSiteRecoveryJob(
100100
this.GetRequestHeaders(true))
101101
.GetAwaiter()
102102
.GetResult();
103-
var result = Mapper.Map<PSSiteRecoveryLongRunningOperation>(op);
103+
var result = SiteRecoveryAutoMapperProfile.Mapper.Map<PSSiteRecoveryLongRunningOperation>(op);
104104
return result;
105105
}
106106

@@ -121,7 +121,7 @@ public PSSiteRecoveryLongRunningOperation ResumeAzureSiteRecoveryJob(
121121
this.GetRequestHeaders(true))
122122
.GetAwaiter()
123123
.GetResult();
124-
var result = Mapper.Map<PSSiteRecoveryLongRunningOperation>(op);
124+
var result = SiteRecoveryAutoMapperProfile.Mapper.Map<PSSiteRecoveryLongRunningOperation>(op);
125125
return result;
126126
}
127127
}

‎src/ResourceManager/RecoveryServices.SiteRecovery/Commands.RecoveryServices.SiteRecovery/Common/PSAsrNetworkMappingClient.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ public PSSiteRecoveryLongRunningOperation NewAzureSiteRecoveryNetworkMapping(
123123
this.GetRequestHeaders(true))
124124
.GetAwaiter()
125125
.GetResult();
126-
var result = Mapper.Map<PSSiteRecoveryLongRunningOperation>(op);
126+
var result = SiteRecoveryAutoMapperProfile.Mapper.Map<PSSiteRecoveryLongRunningOperation>(op);
127127
return result;
128128
}
129129

@@ -147,7 +147,7 @@ public PSSiteRecoveryLongRunningOperation RemoveAzureSiteRecoveryNetworkMapping(
147147
this.GetRequestHeaders(true))
148148
.GetAwaiter()
149149
.GetResult();
150-
var result = Mapper.Map<PSSiteRecoveryLongRunningOperation>(op);
150+
var result = SiteRecoveryAutoMapperProfile.Mapper.Map<PSSiteRecoveryLongRunningOperation>(op);
151151
return result;
152152
}
153153

@@ -174,7 +174,7 @@ public PSSiteRecoveryLongRunningOperation UpdateAzureSiteRecoveryNetworkMapping(
174174
this.GetRequestHeaders(true))
175175
.GetAwaiter()
176176
.GetResult();
177-
var result = Mapper.Map<PSSiteRecoveryLongRunningOperation>(op);
177+
var result = SiteRecoveryAutoMapperProfile.Mapper.Map<PSSiteRecoveryLongRunningOperation>(op);
178178
return result;
179179
}
180180
}

‎src/ResourceManager/RecoveryServices.SiteRecovery/Commands.RecoveryServices.SiteRecovery/Common/PSAsrPolicyClient.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public PSSiteRecoveryLongRunningOperation CreatePolicy(
4040
this.GetRequestHeaders(true))
4141
.GetAwaiter()
4242
.GetResult();
43-
var result = Mapper.Map<PSSiteRecoveryLongRunningOperation>(op);
43+
var result = SiteRecoveryAutoMapperProfile.Mapper.Map<PSSiteRecoveryLongRunningOperation>(op);
4444
return result;
4545
}
4646

@@ -58,7 +58,7 @@ public PSSiteRecoveryLongRunningOperation DeletePolicy(
5858
this.GetRequestHeaders(true))
5959
.GetAwaiter()
6060
.GetResult();
61-
var result = Mapper.Map<PSSiteRecoveryLongRunningOperation>(op);
61+
var result = SiteRecoveryAutoMapperProfile.Mapper.Map<PSSiteRecoveryLongRunningOperation>(op);
6262
return result;
6363
}
6464

@@ -119,7 +119,7 @@ public PSSiteRecoveryLongRunningOperation UpdatePolicy(
119119
this.GetRequestHeaders(true))
120120
.GetAwaiter()
121121
.GetResult();
122-
var result = Mapper.Map<PSSiteRecoveryLongRunningOperation>(op);
122+
var result = SiteRecoveryAutoMapperProfile.Mapper.Map<PSSiteRecoveryLongRunningOperation>(op);
123123
return result;
124124
}
125125
}

‎src/ResourceManager/RecoveryServices.SiteRecovery/Commands.RecoveryServices.SiteRecovery/Common/PSAsrProtectionContainerClient.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public PSSiteRecoveryLongRunningOperation ConfigureProtection(
4646
this.GetRequestHeaders(true))
4747
.GetAwaiter()
4848
.GetResult();
49-
var result = Mapper.Map<PSSiteRecoveryLongRunningOperation>(op);
49+
var result = SiteRecoveryAutoMapperProfile.Mapper.Map<PSSiteRecoveryLongRunningOperation>(op);
5050
return result;
5151
}
5252

@@ -195,7 +195,7 @@ public PSSiteRecoveryLongRunningOperation PurgeCloudMapping(
195195
this.GetRequestHeaders(true))
196196
.GetAwaiter()
197197
.GetResult();
198-
var result = Mapper.Map<PSSiteRecoveryLongRunningOperation>(op);
198+
var result = SiteRecoveryAutoMapperProfile.Mapper.Map<PSSiteRecoveryLongRunningOperation>(op);
199199
return result;
200200
}
201201

@@ -222,7 +222,7 @@ public PSSiteRecoveryLongRunningOperation UnConfigureProtection(
222222
this.GetRequestHeaders(true))
223223
.GetAwaiter()
224224
.GetResult();
225-
var result = Mapper.Map<PSSiteRecoveryLongRunningOperation>(op);
225+
var result = SiteRecoveryAutoMapperProfile.Mapper.Map<PSSiteRecoveryLongRunningOperation>(op);
226226
return result;
227227
}
228228
}

‎src/ResourceManager/RecoveryServices.SiteRecovery/Commands.RecoveryServices.SiteRecovery/Common/PSAsrRecoveryPlanClient.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public PSSiteRecoveryLongRunningOperation CreateAzureSiteRecoveryRecoveryPlan(
4040
this.GetRequestHeaders(true))
4141
.GetAwaiter()
4242
.GetResult();
43-
var result = Mapper.Map<PSSiteRecoveryLongRunningOperation>(op);
43+
var result = SiteRecoveryAutoMapperProfile.Mapper.Map<PSSiteRecoveryLongRunningOperation>(op);
4444
return result;
4545
}
4646

@@ -98,7 +98,7 @@ public PSSiteRecoveryLongRunningOperation RemoveAzureSiteRecoveryRecoveryPlan(
9898
this.GetRequestHeaders(true))
9999
.GetAwaiter()
100100
.GetResult();
101-
var result = Mapper.Map<PSSiteRecoveryLongRunningOperation>(op);
101+
var result = SiteRecoveryAutoMapperProfile.Mapper.Map<PSSiteRecoveryLongRunningOperation>(op);
102102
return result;
103103
}
104104

@@ -116,7 +116,7 @@ public PSSiteRecoveryLongRunningOperation StartAzureSiteRecoveryCommitFailover(
116116
this.GetRequestHeaders(true))
117117
.GetAwaiter()
118118
.GetResult();
119-
var result = Mapper.Map<PSSiteRecoveryLongRunningOperation>(op);
119+
var result = SiteRecoveryAutoMapperProfile.Mapper.Map<PSSiteRecoveryLongRunningOperation>(op);
120120
return result;
121121
}
122122

@@ -137,7 +137,7 @@ public PSSiteRecoveryLongRunningOperation StartAzureSiteRecoveryPlannedFailover(
137137
this.GetRequestHeaders(true))
138138
.GetAwaiter()
139139
.GetResult();
140-
var result = Mapper.Map<PSSiteRecoveryLongRunningOperation>(op);
140+
var result = SiteRecoveryAutoMapperProfile.Mapper.Map<PSSiteRecoveryLongRunningOperation>(op);
141141
return result;
142142
}
143143

@@ -158,7 +158,7 @@ public PSSiteRecoveryLongRunningOperation StartAzureSiteRecoveryTestFailover(
158158
this.GetRequestHeaders(true))
159159
.GetAwaiter()
160160
.GetResult();
161-
var result = Mapper.Map<PSSiteRecoveryLongRunningOperation>(op);
161+
var result = SiteRecoveryAutoMapperProfile.Mapper.Map<PSSiteRecoveryLongRunningOperation>(op);
162162
return result;
163163
}
164164

@@ -179,7 +179,7 @@ public PSSiteRecoveryLongRunningOperation StartAzureSiteRecoveryUnplannedFailove
179179
this.GetRequestHeaders(true))
180180
.GetAwaiter()
181181
.GetResult();
182-
var result = Mapper.Map<PSSiteRecoveryLongRunningOperation>(op);
182+
var result = SiteRecoveryAutoMapperProfile.Mapper.Map<PSSiteRecoveryLongRunningOperation>(op);
183183
return result;
184184
}
185185

@@ -197,7 +197,7 @@ public PSSiteRecoveryLongRunningOperation UpdateAzureSiteRecoveryProtection(
197197
this.GetRequestHeaders(true))
198198
.GetAwaiter()
199199
.GetResult();
200-
var result = Mapper.Map<PSSiteRecoveryLongRunningOperation>(op);
200+
var result = SiteRecoveryAutoMapperProfile.Mapper.Map<PSSiteRecoveryLongRunningOperation>(op);
201201
return result;
202202
}
203203

@@ -218,7 +218,7 @@ public PSSiteRecoveryLongRunningOperation UpdateAzureSiteRecoveryRecoveryPlan(
218218
this.GetRequestHeaders(true))
219219
.GetAwaiter()
220220
.GetResult();
221-
var result = Mapper.Map<PSSiteRecoveryLongRunningOperation>(op);
221+
var result = SiteRecoveryAutoMapperProfile.Mapper.Map<PSSiteRecoveryLongRunningOperation>(op);
222222
return result;
223223
}
224224
}

‎src/ResourceManager/RecoveryServices.SiteRecovery/Commands.RecoveryServices.SiteRecovery/Common/PSAsrRecoveryServicesProviderClient.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ public PSSiteRecoveryLongRunningOperation PurgeAzureSiteRecoveryProvider(
8888
this.GetRequestHeaders(true))
8989
.GetAwaiter()
9090
.GetResult();
91-
var result = Mapper.Map<PSSiteRecoveryLongRunningOperation>(op);
91+
var result = SiteRecoveryAutoMapperProfile.Mapper.Map<PSSiteRecoveryLongRunningOperation>(op);
9292
return result;
9393
}
9494

@@ -109,7 +109,7 @@ public PSSiteRecoveryLongRunningOperation RefreshAzureSiteRecoveryProvider(
109109
this.GetRequestHeaders(true))
110110
.GetAwaiter()
111111
.GetResult();
112-
var result = Mapper.Map<PSSiteRecoveryLongRunningOperation>(op);
112+
var result = SiteRecoveryAutoMapperProfile.Mapper.Map<PSSiteRecoveryLongRunningOperation>(op);
113113
return result;
114114
}
115115

@@ -130,7 +130,7 @@ public PSSiteRecoveryLongRunningOperation RemoveAzureSiteRecoveryProvider(
130130
this.GetRequestHeaders(true))
131131
.GetAwaiter()
132132
.GetResult();
133-
var result = Mapper.Map<PSSiteRecoveryLongRunningOperation>(op);
133+
var result = SiteRecoveryAutoMapperProfile.Mapper.Map<PSSiteRecoveryLongRunningOperation>(op);
134134
return result;
135135
}
136136
}

‎src/ResourceManager/RecoveryServices.SiteRecovery/Commands.RecoveryServices.SiteRecovery/Common/PSAsrReplicationProtectedItemsClient.cs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public PSSiteRecoveryLongRunningOperation DisableProtection(
4646
this.GetRequestHeaders(true))
4747
.GetAwaiter()
4848
.GetResult();
49-
var result = Mapper.Map<PSSiteRecoveryLongRunningOperation>(op);
49+
var result = SiteRecoveryAutoMapperProfile.Mapper.Map<PSSiteRecoveryLongRunningOperation>(op);
5050
return result;
5151
}
5252

@@ -72,7 +72,7 @@ public PSSiteRecoveryLongRunningOperation EnableProtection(
7272
this.GetRequestHeaders(true))
7373
.GetAwaiter()
7474
.GetResult();
75-
var result = Mapper.Map<PSSiteRecoveryLongRunningOperation>(op);
75+
var result = SiteRecoveryAutoMapperProfile.Mapper.Map<PSSiteRecoveryLongRunningOperation>(op);
7676
return result;
7777
}
7878

@@ -182,7 +182,7 @@ public PSSiteRecoveryLongRunningOperation PurgeProtection(
182182
this.GetRequestHeaders(true))
183183
.GetAwaiter()
184184
.GetResult();
185-
var result = Mapper.Map<PSSiteRecoveryLongRunningOperation>(op);
185+
var result = SiteRecoveryAutoMapperProfile.Mapper.Map<PSSiteRecoveryLongRunningOperation>(op);
186186
return result;
187187
}
188188

@@ -209,7 +209,7 @@ public PSSiteRecoveryLongRunningOperation StartAzureSiteRecoveryApplyRecoveryPoi
209209
this.GetRequestHeaders(true))
210210
.GetAwaiter()
211211
.GetResult();
212-
var result = Mapper.Map<PSSiteRecoveryLongRunningOperation>(op);
212+
var result = SiteRecoveryAutoMapperProfile.Mapper.Map<PSSiteRecoveryLongRunningOperation>(op);
213213
return result;
214214
}
215215

@@ -233,7 +233,7 @@ public PSSiteRecoveryLongRunningOperation StartAzureSiteRecoveryCommitFailover(
233233
this.GetRequestHeaders(true))
234234
.GetAwaiter()
235235
.GetResult();
236-
var result = Mapper.Map<PSSiteRecoveryLongRunningOperation>(op);
236+
var result = SiteRecoveryAutoMapperProfile.Mapper.Map<PSSiteRecoveryLongRunningOperation>(op);
237237
return result;
238238
}
239239

@@ -260,7 +260,7 @@ public PSSiteRecoveryLongRunningOperation StartAzureSiteRecoveryPlannedFailover(
260260
this.GetRequestHeaders(true))
261261
.GetAwaiter()
262262
.GetResult();
263-
var result = Mapper.Map<PSSiteRecoveryLongRunningOperation>(op);
263+
var result = SiteRecoveryAutoMapperProfile.Mapper.Map<PSSiteRecoveryLongRunningOperation>(op);
264264
return result;
265265
}
266266

@@ -287,7 +287,7 @@ public PSSiteRecoveryLongRunningOperation StartAzureSiteRecoveryReprotection(
287287
this.GetRequestHeaders(true))
288288
.GetAwaiter()
289289
.GetResult();
290-
var result = Mapper.Map<PSSiteRecoveryLongRunningOperation>(op);
290+
var result = SiteRecoveryAutoMapperProfile.Mapper.Map<PSSiteRecoveryLongRunningOperation>(op);
291291
return result;
292292
}
293293

@@ -314,7 +314,7 @@ public PSSiteRecoveryLongRunningOperation StartAzureSiteRecoveryTestFailover(
314314
this.GetRequestHeaders(true))
315315
.GetAwaiter()
316316
.GetResult();
317-
var result = Mapper.Map<PSSiteRecoveryLongRunningOperation>(op);
317+
var result = SiteRecoveryAutoMapperProfile.Mapper.Map<PSSiteRecoveryLongRunningOperation>(op);
318318
return result;
319319
}
320320

@@ -341,7 +341,7 @@ public PSSiteRecoveryLongRunningOperation StartAzureSiteRecoveryUnplannedFailove
341341
this.GetRequestHeaders(true))
342342
.GetAwaiter()
343343
.GetResult();
344-
var result = Mapper.Map<PSSiteRecoveryLongRunningOperation>(op);
344+
var result = SiteRecoveryAutoMapperProfile.Mapper.Map<PSSiteRecoveryLongRunningOperation>(op);
345345
return result;
346346
}
347347

@@ -368,7 +368,7 @@ public PSSiteRecoveryLongRunningOperation UpdateVmProperties(
368368
this.GetRequestHeaders(true))
369369
.GetAwaiter()
370370
.GetResult();
371-
var result = Mapper.Map<PSSiteRecoveryLongRunningOperation>(op);
371+
var result = SiteRecoveryAutoMapperProfile.Mapper.Map<PSSiteRecoveryLongRunningOperation>(op);
372372
return result;
373373
}
374374
}

‎src/ResourceManager/RecoveryServices.SiteRecovery/Commands.RecoveryServices.SiteRecovery/Common/PSAsrStorageClassificationClient.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ public PSSiteRecoveryLongRunningOperation MapStorageClassification(
9393
this.GetRequestHeaders(true))
9494
.GetAwaiter()
9595
.GetResult();
96-
var result = Mapper.Map<PSSiteRecoveryLongRunningOperation>(op);
96+
var result = SiteRecoveryAutoMapperProfile.Mapper.Map<PSSiteRecoveryLongRunningOperation>(op);
9797
return result;
9898
}
9999

@@ -117,7 +117,7 @@ public PSSiteRecoveryLongRunningOperation UnmapStorageClassifications(
117117
this.GetRequestHeaders(true))
118118
.GetAwaiter()
119119
.GetResult();
120-
var result = Mapper.Map<PSSiteRecoveryLongRunningOperation>(op);
120+
var result = SiteRecoveryAutoMapperProfile.Mapper.Map<PSSiteRecoveryLongRunningOperation>(op);
121121
return result;
122122
}
123123
}

0 commit comments

Comments
 (0)