From ed589a780fe28414c9b6aa2ddf5a315a46200e96 Mon Sep 17 00:00:00 2001
From: Yeming Liu <11371776+isra-fel@users.noreply.github.com>
Date: Fri, 8 Jul 2022 19:40:17 +0800
Subject: [PATCH 1/2] Update MoveFromGeneration2Master.ps1

---
 tools/Gen2Master/MoveFromGeneration2Master.ps1 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/Gen2Master/MoveFromGeneration2Master.ps1 b/tools/Gen2Master/MoveFromGeneration2Master.ps1
index d8f9d46c1b84..902d4484f82f 100644
--- a/tools/Gen2Master/MoveFromGeneration2Master.ps1
+++ b/tools/Gen2Master/MoveFromGeneration2Master.ps1
@@ -361,11 +361,11 @@ Function Update-MappingJson {
         $MappingPath = Join-Path -Path (Join-Path -Path $PSScriptRoot -ChildPath '..') -ChildPath "CreateMappings_rules.json"
         $MappingObject = Get-Content -Path $MappingPath | ConvertFrom-Json
         Foreach ($Item in $MappingObject) {
-            If ($ModuleName -eq $Item.regex) {
+            If ($ModuleName -eq $Item.module) {
                 return
             }
         }
-        $MappingObject = $MappingObject + @{regex = $ModuleName; alias = $ModuleName }
+        $MappingObject = $MappingObject + @{module = $ModuleName; alias = $ModuleName }
         ConvertTo-Json $MappingObject -Depth 1 | Set-Content -Path $MappingPath
     }
 }

From fdf679c138510c50d4463ca35a1174fd51c68cda Mon Sep 17 00:00:00 2001
From: Yeming Liu <11371776+isra-fel@users.noreply.github.com>
Date: Mon, 11 Jul 2022 13:43:00 +0800
Subject: [PATCH 2/2] Update MoveFromGeneration2Master.ps1

---
 tools/Gen2Master/MoveFromGeneration2Master.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/Gen2Master/MoveFromGeneration2Master.ps1 b/tools/Gen2Master/MoveFromGeneration2Master.ps1
index 902d4484f82f..5916504976b3 100644
--- a/tools/Gen2Master/MoveFromGeneration2Master.ps1
+++ b/tools/Gen2Master/MoveFromGeneration2Master.ps1
@@ -361,7 +361,7 @@ Function Update-MappingJson {
         $MappingPath = Join-Path -Path (Join-Path -Path $PSScriptRoot -ChildPath '..') -ChildPath "CreateMappings_rules.json"
         $MappingObject = Get-Content -Path $MappingPath | ConvertFrom-Json
         Foreach ($Item in $MappingObject) {
-            If ($ModuleName -eq $Item.module) {
+            If ($ModuleName -eq $Item.regex -or $ModuleName -eq $Item.module) {
                 return
             }
         }