Keep ModuleVersion when copy code from generation branch to master branch. (#15013)

wyunchi-ms · web-flow · commit 5a7cf596b2d8 · 2021-05-17T15:41:47.000+08:00
Co-authored-by: wyunchi-ms &lt;yunwang@microsoft.com&gt;
diff --git a/tools/Gen2Master/MoveFromGeneration2Master.ps1 b/tools/Gen2Master/MoveFromGeneration2Master.ps1
@@ -61,8 +61,10 @@ Function Move-Generation2Master {
             $Psd1Metadata = Import-LocalizedData -BaseDirectory $DestPath -FileName "Az.$ModuleName.psd1"
             $ModuleGuid = $Psd1Metadata.GUID
             $RequiredModule = $Psd1Metadata.RequiredModules
+            $Psd1Version = $Psd1Metadata.ModuleVersion
         }
         $Psd1Metadata = Import-LocalizedData -BaseDirectory $SourcePath -FileName "Az.$ModuleName.psd1"
+        $Psd1Metadata.ModuleVersion = $Psd1Version
         If ($Null -ne $ModuleGuid) {
             $Psd1Metadata.GUID = $ModuleGuid
         }

Original file line number	Diff line number	Diff line change
`@@ -61,8 +61,10 @@ Function Move-Generation2Master {`
`61`	`61`	`$Psd1Metadata = Import-LocalizedData -BaseDirectory $DestPath -FileName "Az.$ModuleName.psd1"`
`62`	`62`	`$ModuleGuid = $Psd1Metadata.GUID`
`63`	`63`	`$RequiredModule = $Psd1Metadata.RequiredModules`
	`64`	`+ $Psd1Version = $Psd1Metadata.ModuleVersion`
`64`	`65`	`}`
`65`	`66`	`$Psd1Metadata = Import-LocalizedData -BaseDirectory $SourcePath -FileName "Az.$ModuleName.psd1"`
	`67`	`+ $Psd1Metadata.ModuleVersion = $Psd1Version`
`66`	`68`	`If ($Null -ne $ModuleGuid) {`
`67`	`69`	`$Psd1Metadata.GUID = $ModuleGuid`
`68`	`70`	`}`