Move potentially throwing app domain cleanup code inside of try/catch

bradwilson · bradwilson · commit 2a4863b09039 · 2025-05-03T11:48:59.000-07:00
diff --git a/src/xunit.runner.visualstudio/Utility/AppDomainManager.cs b/src/xunit.runner.visualstudio/Utility/AppDomainManager.cs
@@ -56,10 +56,10 @@ public virtual void Dispose()
 	{
 		if (appDomain is not null)
 		{
-			var cachePath = appDomain.SetupInformation.CachePath;
-
 			try
 			{
+				var cachePath = appDomain.SetupInformation.CachePath;
+
 				AppDomain.Unload(appDomain);
 
 				if (cachePath is not null)

Original file line number	Diff line number	Diff line change
`@@ -56,10 +56,10 @@ public virtual void Dispose()`
`56`	`56`	`{`
`57`	`57`	`if (appDomain is not null)`
`58`	`58`	`{`
`59`		`- var cachePath = appDomain.SetupInformation.CachePath;`
`60`		`-`
`61`	`59`	`try`
`62`	`60`	`{`
	`61`	`+ var cachePath = appDomain.SetupInformation.CachePath;`
	`62`	`+`
`63`	`63`	`AppDomain.Unload(appDomain);`
`64`	`64`
`65`	`65`	`if (cachePath is not null)`