[dotnet] allow tests to be run with dotnet as well as bazel

titusfortner · titusfortner · commit 6785daca6a92 · 2024-05-29T09:25:24.000-05:00
diff --git a/dotnet/test/common/Environment/EnvironmentManager.cs b/dotnet/test/common/Environment/EnvironmentManager.cs
@@ -24,9 +24,10 @@ public class EnvironmentManager
         private EnvironmentManager()
         {
             string dataFilePath;
-            var runfiles = Runfiles.Create();
+            Runfiles runfiles = null;
             try
             {
+                runfiles = Runfiles.Create();
                 dataFilePath = runfiles.Rlocation("_main/dotnet/test/common/appconfig.json");
             }
             catch (FileNotFoundException)
@@ -143,6 +144,8 @@ private EnvironmentManager()
             try
             {
                 string managerFilePath = "";
+                runfiles ??= Runfiles.Create();
+
                 if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
                 {
                     managerFilePath = runfiles.Rlocation("_main/dotnet/src/webdriver/manager/windows/selenium-manager.exe");

Original file line number	Diff line number	Diff line change
`@@ -24,9 +24,10 @@ public class EnvironmentManager`
`24`	`24`	`private EnvironmentManager()`
`25`	`25`	`{`
`26`	`26`	`string dataFilePath;`
`27`		`- var runfiles = Runfiles.Create();`
	`27`	`+ Runfiles runfiles = null;`
`28`	`28`	`try`
`29`	`29`	`{`
	`30`	`+ runfiles = Runfiles.Create();`
`30`	`31`	`dataFilePath = runfiles.Rlocation("_main/dotnet/test/common/appconfig.json");`
`31`	`32`	`}`
`32`	`33`	`catch (FileNotFoundException)`
`@@ -143,6 +144,8 @@ private EnvironmentManager()`
`143`	`144`	`try`
`144`	`145`	`{`
`145`	`146`	`string managerFilePath = "";`
	`147`	`+ runfiles ??= Runfiles.Create();`
	`148`	`+`
`146`	`149`	`if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))`
`147`	`150`	`{`
`148`	`151`	`managerFilePath = runfiles.Rlocation("_main/dotnet/src/webdriver/manager/windows/selenium-manager.exe");`