Add special cases to the reporter for environment variable versions and setup the current maui android scenarios to use the non-special case.

Author: LoopedBard3

src/scenarios/mauiandroid/pre.py

@@ -36,6 +36,6 @@
 
 # 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")
-version_dict = { "maui_version": maui_version }
+version_dict = { "mauiVersion": maui_version }
 versionswritejson(version_dict, rf"{precommands.output}\versions.json")
 print(f"Versions: {version_dict}")

src/scenarios/mauiandroidpodcast/pre.py

@@ -30,6 +30,6 @@
 RemoveAABFiles(precommands.output)
 
 maui_version = GetVersionFromDll(f".\{const.APPDIR}\src\Mobile\obj\Release\{precommands.framework}\{precommands.runtime_identifier}\linked\Microsoft.Maui.dll")
-version_dict = { "maui_version": maui_version }
+version_dict = { "mauiVersion": maui_version }
 versionswritejson(version_dict, rf"{precommands.output}\versions.json")
 print(f"Versions: {version_dict}")

src/scenarios/mauiblazorandroid/pre.py

@@ -73,6 +73,6 @@
 
 # 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")
-version_dict = { "maui_version": maui_version }
+version_dict = { "mauiVersion": maui_version }
 versionswritejson(version_dict, rf"{precommands.output}\versions.json")
 print(f"Versions: {version_dict}")

src/tools/Reporting/Reporting/Reporter.cs

@@ -93,7 +93,14 @@ private void Init()
             foreach (DictionaryEntry entry in environment.GetEnvironmentVariables()){
                 if (entry.Key.ToString().EndsWith("version", ignoreCase: true, culture: CultureInfo.InvariantCulture))
                 {
-                    build.AdditionalData[entry.Key.ToString()] = entry.Value.ToString();
+                    // Special case the original two special cases, MAUI_VERSION is only needed because runtime based runs use MAUI_VERSION
+                    if(entry.Key.ToString().Equals("DOTNET_VERSION", StringComparison.InvariantCultureIgnoreCase)){
+                        build.AdditionalData["productVersion"] = entry.Value.ToString();
+                    } else if(entry.Key.ToString().Equals("MAUI_VERSION", StringComparison.InvariantCultureIgnoreCase)){
+                        build.AdditionalData["mauiVersion"] = entry.Value.ToString();
+                    } else { 
+                        build.AdditionalData[entry.Key.ToString()] = entry.Value.ToString();
+                    }
                 }
             }            
         }