Skip to content

Commit 347d314

Browse files
isra-felazurepowershell
isra-fel
and
azurepowershell
authored
[Az.Migrate] Tagging bug fix (#15573)
* Move Migrate to release-2021-08-03 * Update GeneratedModuleList.txt remove duplicated postgresql entry Co-authored-by: azurepowershell <[email protected]>
1 parent b4037c1 commit 347d314

File tree

5 files changed

+74
-74
lines changed

5 files changed

+74
-74
lines changed

‎src/Migrate/Az.Migrate.psd1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#
44
# Generated by: Microsoft Corporation
55
#
6-
# Generated on: 7/26/2021
6+
# Generated on: 7/28/2021
77
#
88

99
@{

‎src/Migrate/Migrate.sln

Lines changed: 65 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio Version 16
44
VisualStudioVersion = 16.6.30114.105
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Accounts", "..\Accounts\Accounts\Accounts.csproj", "{2859F804-F238-4F9F-97C8-211A20AB87A6}"
6+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Accounts", "..\Accounts\Accounts\Accounts.csproj", "{4F45282F-1038-4543-936C-6A4F26D923BD}"
77
EndProject
8-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Authentication", "..\Accounts\Authentication\Authentication.csproj", "{F9DC971B-3FC6-49EE-8C2B-C10152758A08}"
8+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Authentication", "..\Accounts\Authentication\Authentication.csproj", "{5865F747-0236-41E2-971F-83D9DA0DCA10}"
99
EndProject
10-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Authentication.ResourceManager", "..\Accounts\Authentication.ResourceManager\Authentication.ResourceManager.csproj", "{1BD51096-7A55-4B56-B4FF-8507AEE12DE6}"
10+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Authentication.ResourceManager", "..\Accounts\Authentication.ResourceManager\Authentication.ResourceManager.csproj", "{0EE7328C-4C77-4AD0-8666-F14C667F68B5}"
1111
EndProject
12-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Authenticators", "..\Accounts\Authenticators\Authenticators.csproj", "{C2496D13-00AC-4D9E-9A88-B481F29EEA05}"
12+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Authenticators", "..\Accounts\Authenticators\Authenticators.csproj", "{07798F1D-C572-47B1-A330-197B0E17D80E}"
1313
EndProject
14-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Az.Migrate", "Az.Migrate.csproj", "{64CB87A5-B3FC-48EE-923A-A63E325700AC}"
14+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Az.Migrate", "Az.Migrate.csproj", "{BF7AB725-7968-445E-9358-C62AD37F3665}"
1515
EndProject
1616
Global
1717
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -26,65 +26,65 @@ Global
2626
HideSolutionNode = FALSE
2727
EndGlobalSection
2828
GlobalSection(ProjectConfigurationPlatforms) = postSolution
29-
{2859F804-F238-4F9F-97C8-211A20AB87A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
30-
{2859F804-F238-4F9F-97C8-211A20AB87A6}.Debug|Any CPU.Build.0 = Debug|Any CPU
31-
{2859F804-F238-4F9F-97C8-211A20AB87A6}.Debug|x64.ActiveCfg = Debug|Any CPU
32-
{2859F804-F238-4F9F-97C8-211A20AB87A6}.Debug|x64.Build.0 = Debug|Any CPU
33-
{2859F804-F238-4F9F-97C8-211A20AB87A6}.Debug|x86.ActiveCfg = Debug|Any CPU
34-
{2859F804-F238-4F9F-97C8-211A20AB87A6}.Debug|x86.Build.0 = Debug|Any CPU
35-
{2859F804-F238-4F9F-97C8-211A20AB87A6}.Release|Any CPU.ActiveCfg = Release|Any CPU
36-
{2859F804-F238-4F9F-97C8-211A20AB87A6}.Release|Any CPU.Build.0 = Release|Any CPU
37-
{2859F804-F238-4F9F-97C8-211A20AB87A6}.Release|x64.ActiveCfg = Release|Any CPU
38-
{2859F804-F238-4F9F-97C8-211A20AB87A6}.Release|x64.Build.0 = Release|Any CPU
39-
{2859F804-F238-4F9F-97C8-211A20AB87A6}.Release|x86.ActiveCfg = Release|Any CPU
40-
{2859F804-F238-4F9F-97C8-211A20AB87A6}.Release|x86.Build.0 = Release|Any CPU
41-
{F9DC971B-3FC6-49EE-8C2B-C10152758A08}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
42-
{F9DC971B-3FC6-49EE-8C2B-C10152758A08}.Debug|Any CPU.Build.0 = Debug|Any CPU
43-
{F9DC971B-3FC6-49EE-8C2B-C10152758A08}.Debug|x64.ActiveCfg = Debug|Any CPU
44-
{F9DC971B-3FC6-49EE-8C2B-C10152758A08}.Debug|x64.Build.0 = Debug|Any CPU
45-
{F9DC971B-3FC6-49EE-8C2B-C10152758A08}.Debug|x86.ActiveCfg = Debug|Any CPU
46-
{F9DC971B-3FC6-49EE-8C2B-C10152758A08}.Debug|x86.Build.0 = Debug|Any CPU
47-
{F9DC971B-3FC6-49EE-8C2B-C10152758A08}.Release|Any CPU.ActiveCfg = Release|Any CPU
48-
{F9DC971B-3FC6-49EE-8C2B-C10152758A08}.Release|Any CPU.Build.0 = Release|Any CPU
49-
{F9DC971B-3FC6-49EE-8C2B-C10152758A08}.Release|x64.ActiveCfg = Release|Any CPU
50-
{F9DC971B-3FC6-49EE-8C2B-C10152758A08}.Release|x64.Build.0 = Release|Any CPU
51-
{F9DC971B-3FC6-49EE-8C2B-C10152758A08}.Release|x86.ActiveCfg = Release|Any CPU
52-
{F9DC971B-3FC6-49EE-8C2B-C10152758A08}.Release|x86.Build.0 = Release|Any CPU
53-
{1BD51096-7A55-4B56-B4FF-8507AEE12DE6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
54-
{1BD51096-7A55-4B56-B4FF-8507AEE12DE6}.Debug|Any CPU.Build.0 = Debug|Any CPU
55-
{1BD51096-7A55-4B56-B4FF-8507AEE12DE6}.Debug|x64.ActiveCfg = Debug|Any CPU
56-
{1BD51096-7A55-4B56-B4FF-8507AEE12DE6}.Debug|x64.Build.0 = Debug|Any CPU
57-
{1BD51096-7A55-4B56-B4FF-8507AEE12DE6}.Debug|x86.ActiveCfg = Debug|Any CPU
58-
{1BD51096-7A55-4B56-B4FF-8507AEE12DE6}.Debug|x86.Build.0 = Debug|Any CPU
59-
{1BD51096-7A55-4B56-B4FF-8507AEE12DE6}.Release|Any CPU.ActiveCfg = Release|Any CPU
60-
{1BD51096-7A55-4B56-B4FF-8507AEE12DE6}.Release|Any CPU.Build.0 = Release|Any CPU
61-
{1BD51096-7A55-4B56-B4FF-8507AEE12DE6}.Release|x64.ActiveCfg = Release|Any CPU
62-
{1BD51096-7A55-4B56-B4FF-8507AEE12DE6}.Release|x64.Build.0 = Release|Any CPU
63-
{1BD51096-7A55-4B56-B4FF-8507AEE12DE6}.Release|x86.ActiveCfg = Release|Any CPU
64-
{1BD51096-7A55-4B56-B4FF-8507AEE12DE6}.Release|x86.Build.0 = Release|Any CPU
65-
{C2496D13-00AC-4D9E-9A88-B481F29EEA05}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
66-
{C2496D13-00AC-4D9E-9A88-B481F29EEA05}.Debug|Any CPU.Build.0 = Debug|Any CPU
67-
{C2496D13-00AC-4D9E-9A88-B481F29EEA05}.Debug|x64.ActiveCfg = Debug|Any CPU
68-
{C2496D13-00AC-4D9E-9A88-B481F29EEA05}.Debug|x64.Build.0 = Debug|Any CPU
69-
{C2496D13-00AC-4D9E-9A88-B481F29EEA05}.Debug|x86.ActiveCfg = Debug|Any CPU
70-
{C2496D13-00AC-4D9E-9A88-B481F29EEA05}.Debug|x86.Build.0 = Debug|Any CPU
71-
{C2496D13-00AC-4D9E-9A88-B481F29EEA05}.Release|Any CPU.ActiveCfg = Release|Any CPU
72-
{C2496D13-00AC-4D9E-9A88-B481F29EEA05}.Release|Any CPU.Build.0 = Release|Any CPU
73-
{C2496D13-00AC-4D9E-9A88-B481F29EEA05}.Release|x64.ActiveCfg = Release|Any CPU
74-
{C2496D13-00AC-4D9E-9A88-B481F29EEA05}.Release|x64.Build.0 = Release|Any CPU
75-
{C2496D13-00AC-4D9E-9A88-B481F29EEA05}.Release|x86.ActiveCfg = Release|Any CPU
76-
{C2496D13-00AC-4D9E-9A88-B481F29EEA05}.Release|x86.Build.0 = Release|Any CPU
77-
{64CB87A5-B3FC-48EE-923A-A63E325700AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
78-
{64CB87A5-B3FC-48EE-923A-A63E325700AC}.Debug|Any CPU.Build.0 = Debug|Any CPU
79-
{64CB87A5-B3FC-48EE-923A-A63E325700AC}.Debug|x64.ActiveCfg = Debug|Any CPU
80-
{64CB87A5-B3FC-48EE-923A-A63E325700AC}.Debug|x64.Build.0 = Debug|Any CPU
81-
{64CB87A5-B3FC-48EE-923A-A63E325700AC}.Debug|x86.ActiveCfg = Debug|Any CPU
82-
{64CB87A5-B3FC-48EE-923A-A63E325700AC}.Debug|x86.Build.0 = Debug|Any CPU
83-
{64CB87A5-B3FC-48EE-923A-A63E325700AC}.Release|Any CPU.ActiveCfg = Release|Any CPU
84-
{64CB87A5-B3FC-48EE-923A-A63E325700AC}.Release|Any CPU.Build.0 = Release|Any CPU
85-
{64CB87A5-B3FC-48EE-923A-A63E325700AC}.Release|x64.ActiveCfg = Release|Any CPU
86-
{64CB87A5-B3FC-48EE-923A-A63E325700AC}.Release|x64.Build.0 = Release|Any CPU
87-
{64CB87A5-B3FC-48EE-923A-A63E325700AC}.Release|x86.ActiveCfg = Release|Any CPU
88-
{64CB87A5-B3FC-48EE-923A-A63E325700AC}.Release|x86.Build.0 = Release|Any CPU
29+
{4F45282F-1038-4543-936C-6A4F26D923BD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
30+
{4F45282F-1038-4543-936C-6A4F26D923BD}.Debug|Any CPU.Build.0 = Debug|Any CPU
31+
{4F45282F-1038-4543-936C-6A4F26D923BD}.Debug|x64.ActiveCfg = Debug|Any CPU
32+
{4F45282F-1038-4543-936C-6A4F26D923BD}.Debug|x64.Build.0 = Debug|Any CPU
33+
{4F45282F-1038-4543-936C-6A4F26D923BD}.Debug|x86.ActiveCfg = Debug|Any CPU
34+
{4F45282F-1038-4543-936C-6A4F26D923BD}.Debug|x86.Build.0 = Debug|Any CPU
35+
{4F45282F-1038-4543-936C-6A4F26D923BD}.Release|Any CPU.ActiveCfg = Release|Any CPU
36+
{4F45282F-1038-4543-936C-6A4F26D923BD}.Release|Any CPU.Build.0 = Release|Any CPU
37+
{4F45282F-1038-4543-936C-6A4F26D923BD}.Release|x64.ActiveCfg = Release|Any CPU
38+
{4F45282F-1038-4543-936C-6A4F26D923BD}.Release|x64.Build.0 = Release|Any CPU
39+
{4F45282F-1038-4543-936C-6A4F26D923BD}.Release|x86.ActiveCfg = Release|Any CPU
40+
{4F45282F-1038-4543-936C-6A4F26D923BD}.Release|x86.Build.0 = Release|Any CPU
41+
{5865F747-0236-41E2-971F-83D9DA0DCA10}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
42+
{5865F747-0236-41E2-971F-83D9DA0DCA10}.Debug|Any CPU.Build.0 = Debug|Any CPU
43+
{5865F747-0236-41E2-971F-83D9DA0DCA10}.Debug|x64.ActiveCfg = Debug|Any CPU
44+
{5865F747-0236-41E2-971F-83D9DA0DCA10}.Debug|x64.Build.0 = Debug|Any CPU
45+
{5865F747-0236-41E2-971F-83D9DA0DCA10}.Debug|x86.ActiveCfg = Debug|Any CPU
46+
{5865F747-0236-41E2-971F-83D9DA0DCA10}.Debug|x86.Build.0 = Debug|Any CPU
47+
{5865F747-0236-41E2-971F-83D9DA0DCA10}.Release|Any CPU.ActiveCfg = Release|Any CPU
48+
{5865F747-0236-41E2-971F-83D9DA0DCA10}.Release|Any CPU.Build.0 = Release|Any CPU
49+
{5865F747-0236-41E2-971F-83D9DA0DCA10}.Release|x64.ActiveCfg = Release|Any CPU
50+
{5865F747-0236-41E2-971F-83D9DA0DCA10}.Release|x64.Build.0 = Release|Any CPU
51+
{5865F747-0236-41E2-971F-83D9DA0DCA10}.Release|x86.ActiveCfg = Release|Any CPU
52+
{5865F747-0236-41E2-971F-83D9DA0DCA10}.Release|x86.Build.0 = Release|Any CPU
53+
{0EE7328C-4C77-4AD0-8666-F14C667F68B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
54+
{0EE7328C-4C77-4AD0-8666-F14C667F68B5}.Debug|Any CPU.Build.0 = Debug|Any CPU
55+
{0EE7328C-4C77-4AD0-8666-F14C667F68B5}.Debug|x64.ActiveCfg = Debug|Any CPU
56+
{0EE7328C-4C77-4AD0-8666-F14C667F68B5}.Debug|x64.Build.0 = Debug|Any CPU
57+
{0EE7328C-4C77-4AD0-8666-F14C667F68B5}.Debug|x86.ActiveCfg = Debug|Any CPU
58+
{0EE7328C-4C77-4AD0-8666-F14C667F68B5}.Debug|x86.Build.0 = Debug|Any CPU
59+
{0EE7328C-4C77-4AD0-8666-F14C667F68B5}.Release|Any CPU.ActiveCfg = Release|Any CPU
60+
{0EE7328C-4C77-4AD0-8666-F14C667F68B5}.Release|Any CPU.Build.0 = Release|Any CPU
61+
{0EE7328C-4C77-4AD0-8666-F14C667F68B5}.Release|x64.ActiveCfg = Release|Any CPU
62+
{0EE7328C-4C77-4AD0-8666-F14C667F68B5}.Release|x64.Build.0 = Release|Any CPU
63+
{0EE7328C-4C77-4AD0-8666-F14C667F68B5}.Release|x86.ActiveCfg = Release|Any CPU
64+
{0EE7328C-4C77-4AD0-8666-F14C667F68B5}.Release|x86.Build.0 = Release|Any CPU
65+
{07798F1D-C572-47B1-A330-197B0E17D80E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
66+
{07798F1D-C572-47B1-A330-197B0E17D80E}.Debug|Any CPU.Build.0 = Debug|Any CPU
67+
{07798F1D-C572-47B1-A330-197B0E17D80E}.Debug|x64.ActiveCfg = Debug|Any CPU
68+
{07798F1D-C572-47B1-A330-197B0E17D80E}.Debug|x64.Build.0 = Debug|Any CPU
69+
{07798F1D-C572-47B1-A330-197B0E17D80E}.Debug|x86.ActiveCfg = Debug|Any CPU
70+
{07798F1D-C572-47B1-A330-197B0E17D80E}.Debug|x86.Build.0 = Debug|Any CPU
71+
{07798F1D-C572-47B1-A330-197B0E17D80E}.Release|Any CPU.ActiveCfg = Release|Any CPU
72+
{07798F1D-C572-47B1-A330-197B0E17D80E}.Release|Any CPU.Build.0 = Release|Any CPU
73+
{07798F1D-C572-47B1-A330-197B0E17D80E}.Release|x64.ActiveCfg = Release|Any CPU
74+
{07798F1D-C572-47B1-A330-197B0E17D80E}.Release|x64.Build.0 = Release|Any CPU
75+
{07798F1D-C572-47B1-A330-197B0E17D80E}.Release|x86.ActiveCfg = Release|Any CPU
76+
{07798F1D-C572-47B1-A330-197B0E17D80E}.Release|x86.Build.0 = Release|Any CPU
77+
{BF7AB725-7968-445E-9358-C62AD37F3665}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
78+
{BF7AB725-7968-445E-9358-C62AD37F3665}.Debug|Any CPU.Build.0 = Debug|Any CPU
79+
{BF7AB725-7968-445E-9358-C62AD37F3665}.Debug|x64.ActiveCfg = Debug|Any CPU
80+
{BF7AB725-7968-445E-9358-C62AD37F3665}.Debug|x64.Build.0 = Debug|Any CPU
81+
{BF7AB725-7968-445E-9358-C62AD37F3665}.Debug|x86.ActiveCfg = Debug|Any CPU
82+
{BF7AB725-7968-445E-9358-C62AD37F3665}.Debug|x86.Build.0 = Debug|Any CPU
83+
{BF7AB725-7968-445E-9358-C62AD37F3665}.Release|Any CPU.ActiveCfg = Release|Any CPU
84+
{BF7AB725-7968-445E-9358-C62AD37F3665}.Release|Any CPU.Build.0 = Release|Any CPU
85+
{BF7AB725-7968-445E-9358-C62AD37F3665}.Release|x64.ActiveCfg = Release|Any CPU
86+
{BF7AB725-7968-445E-9358-C62AD37F3665}.Release|x64.Build.0 = Release|Any CPU
87+
{BF7AB725-7968-445E-9358-C62AD37F3665}.Release|x86.ActiveCfg = Release|Any CPU
88+
{BF7AB725-7968-445E-9358-C62AD37F3665}.Release|x86.Build.0 = Release|Any CPU
8989
EndGlobalSection
9090
EndGlobal

‎src/Migrate/custom/Set-AzMigrateServerReplication.ps1

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,7 @@ function Set-AzMigrateServerReplication {
338338
$UserProvidedTag += @{$operation = $UpdateNicTag}
339339
}
340340
else {
341-
$ProviderSpecificDetails.TargetVmTag = $ReplicationMigrationItem.ProviderSpecificDetail.TargetVmTag
341+
$ProviderSpecificDetails.TargetNicTag = $ReplicationMigrationItem.ProviderSpecificDetail.TargetNicTag
342342
}
343343

344344
if ($HasUpdateDiskTag -And $HasUpdateDiskTagOperation -And $UpdateDiskTag)
@@ -347,7 +347,7 @@ function Set-AzMigrateServerReplication {
347347
$UserProvidedTag += @{$operation = $UpdateDiskTag}
348348
}
349349
else {
350-
$ProviderSpecificDetails.TargetVmTag = $ReplicationMigrationItem.ProviderSpecificDetail.TargetVmTag
350+
$ProviderSpecificDetails.TargetDiskTag = $ReplicationMigrationItem.ProviderSpecificDetail.TargetDiskTag
351351
}
352352

353353
foreach($tag in $UserProvidedTag.Keys)
@@ -623,6 +623,7 @@ function Set-AzMigrateServerReplication {
623623
$updateNic.NicId = $storedNic.NicId
624624
$updateNic.TargetStaticIPAddress = $storedNic.TargetIPAddress
625625
$updateNic.TargetSubnetName = $storedNic.TargetSubnetName
626+
$updateNic.TargetNicName = $storedNic.TargetNicName
626627

627628
$matchingUserInputNic = $null
628629
if ($HasNicToUpdate) {

‎src/Migrate/generate-info.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
2-
"autorest_modelerfour": "4.15.414",
3-
"node": "v14.15.5",
4-
"swagger_commit": "e3dbb827d99eaadf132075707373f6b4bda08fd9",
5-
"autorest": "`-- (empty)",
62
"autorest_powershell": "3.0.438",
7-
"autorest_core": "3.5.1"
3+
"node": "v14.15.5",
4+
"autorest_core": "3.5.1",
5+
"swagger_commit": "2b4fc08199d3789162b806c70eb25f09a40fc55c",
6+
"autorest_modelerfour": "4.15.414",
7+
"autorest": "`-- (empty)"
88
}

‎tools/GeneratedModuleList.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ Az.MonitoringSolutions
3131
Az.MySql
3232
Az.Portal
3333
Az.PostgreSql
34-
Az.PostgreSQL
3534
Az.ProviderHub
3635
Az.RedisEnterpriseCache
3736
Az.ResourceMover

0 commit comments

Comments
 (0)