Move GetVersionFromDLL to the version manager shared script since it can be used to get values from any Dll on systems with powershell support.

Author: LoopedBard3

src/scenarios/mauiandroid/pre.py

@@ -3,11 +3,11 @@
 '''
 import sys
 import requests
-from mauishared.mauisharedpython import RemoveAABFiles, GetVersionFromDll
+from mauishared.mauisharedpython import RemoveAABFiles
 from performance.logger import setup_loggers, getLogger
 from shared import const
 from shared.precommands import PreCommands
-from shared.versionmanager import versionswritejson
+from shared.versionmanager import versionswritejson, GetVersionFromDllPowershell
 from test import EXENAME
 
 setup_loggers(True)
@@ -35,7 +35,7 @@
 RemoveAABFiles(precommands.output)
 
 # Copy the MauiVersion to a file so we have it on the machine
-maui_version = GetVersionFromDll(rf".\{const.APPDIR}\obj\Release\{precommands.framework}\{precommands.runtime_identifier}\linked\Microsoft.Maui.dll")
+maui_version = GetVersionFromDllPowershell(rf".\{const.APPDIR}\obj\Release\{precommands.framework}\{precommands.runtime_identifier}\linked\Microsoft.Maui.dll")
 version_dict = { "mauiVersion": maui_version }
 versionswritejson(version_dict, rf"{precommands.output}\versions.json")
 print(f"Versions: {version_dict}")

src/scenarios/mauiandroidpodcast/pre.py

@@ -3,10 +3,10 @@
 '''
 import requests
 import subprocess
-from mauishared.mauisharedpython import RemoveAABFiles, GetVersionFromDll
+from mauishared.mauisharedpython import RemoveAABFiles
 from performance.logger import setup_loggers, getLogger
 from shared.precommands import PreCommands
-from shared.versionmanager import versionswritejson
+from shared.versionmanager import versionswritejson, GetVersionFromDllPowershell
 from shared import const
 
 setup_loggers(True)
@@ -29,7 +29,7 @@
 # Remove the aab files as we don't need them, this saves space
 RemoveAABFiles(precommands.output)
 
-maui_version = GetVersionFromDll(f".\{const.APPDIR}\src\Mobile\obj\Release\{precommands.framework}\{precommands.runtime_identifier}\linked\Microsoft.Maui.dll")
+maui_version = GetVersionFromDllPowershell(f".\{const.APPDIR}\src\Mobile\obj\Release\{precommands.framework}\{precommands.runtime_identifier}\linked\Microsoft.Maui.dll")
 version_dict = { "mauiVersion": maui_version }
 versionswritejson(version_dict, rf"{precommands.output}\versions.json")
 print(f"Versions: {version_dict}")

src/scenarios/mauiblazorandroid/pre.py

@@ -3,11 +3,11 @@
 '''
 import sys
 import requests
-from mauishared.mauisharedpython import RemoveAABFiles, GetVersionFromDll
+from mauishared.mauisharedpython import RemoveAABFiles
 from performance.logger import setup_loggers, getLogger
 from shared import const
 from shared.precommands import PreCommands
-from shared.versionmanager import versionswritejson
+from shared.versionmanager import versionswritejson, GetVersionFromDllPowershell
 from test import EXENAME
 
 setup_loggers(True)
@@ -72,7 +72,7 @@
 RemoveAABFiles(precommands.output)
 
 # Copy the MauiVersion to a file so we have it on the machine
-maui_version = GetVersionFromDll(rf".\{const.APPDIR}\obj\Release\{precommands.framework}\{precommands.runtime_identifier}\linked\Microsoft.Maui.dll")
+maui_version = GetVersionFromDllPowershell(rf".\{const.APPDIR}\obj\Release\{precommands.framework}\{precommands.runtime_identifier}\linked\Microsoft.Maui.dll")
 version_dict = { "mauiVersion": maui_version }
 versionswritejson(version_dict, rf"{precommands.output}\versions.json")
 print(f"Versions: {version_dict}")

src/scenarios/mauishared/mauisharedpython.py

@@ -7,7 +7,3 @@ def RemoveAABFiles(output_dir="."):
     for file in file_list:
         if file.endswith(".aab"):
             os.remove(os.path.join(output_dir, file))
-
-def GetVersionFromDll(dll_path: str):
-    result = subprocess.run(['powershell', '-Command', rf'Get-ChildItem {dll_path} | Select-Object -ExpandProperty VersionInfo | Select-Object -ExpandProperty ProductVersion'], stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-    return result.stdout.decode('utf-8').strip()

src/scenarios/shared/versionmanager.py

@@ -3,6 +3,7 @@
 '''
 import json
 import os
+import subprocess
 
 def versionswritejson(versiondict: dict, outputfile = 'versions.json'):
     with open(outputfile, 'w') as file:
@@ -23,4 +24,8 @@ def versionsreadjsonfilesaveenv(inputfile = 'versions.json'):
 
     # Remove the versions.json file if we are in the lab to ensure SOD doesn't pick it up
     if "PERFLAB_INLAB" in os.environ and os.environ["PERFLAB_INLAB"] == "1":
-        os.remove(inputfile)
+        os.remove(inputfile)
+
+def GetVersionFromDllPowershell(dll_path: str):
+    result = subprocess.run(['powershell', '-Command', rf'Get-ChildItem {dll_path} | Select-Object -ExpandProperty VersionInfo | Select-Object -ExpandProperty ProductVersion'], stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
+    return result.stdout.decode('utf-8').strip()