Refactor ScriptStartupTypeDiscovererTests for env isolation

Author: jviau

src/WebJobs.Script/DependencyInjection/ScriptStartupTypeLocator.cs

@@ -36,29 +36,37 @@ public sealed class ScriptStartupTypeLocator : IWebJobsStartupTypeLocator
         private readonly IExtensionBundleManager _extensionBundleManager;
         private readonly IFunctionMetadataManager _functionMetadataManager;
         private readonly IMetricsLogger _metricsLogger;
-        private readonly Lazy<IEnumerable<Type>> _startupTypes;
+        private readonly IEnvironment _environment;
         private readonly IOptions<ExtensionRequirementOptions> _extensionRequirementOptions;
+        private readonly Lazy<IEnumerable<Type>> _startupTypes;
         private static string[] _builtinExtensionAssemblies = GetBuiltinExtensionAssemblies();
 
-        public ScriptStartupTypeLocator(string rootScriptPath, ILogger<ScriptStartupTypeLocator> logger, IExtensionBundleManager extensionBundleManager,
-            IFunctionMetadataManager functionMetadataManager, IMetricsLogger metricsLogger, IOptions<ExtensionRequirementOptions> extensionRequirementOptions)
+        public ScriptStartupTypeLocator(
+            string rootScriptPath,
+            ILogger<ScriptStartupTypeLocator> logger,
+            IExtensionBundleManager extensionBundleManager,
+            IFunctionMetadataManager functionMetadataManager,
+            IMetricsLogger metricsLogger,
+            IEnvironment environment,
+            IOptions<ExtensionRequirementOptions> extensionRequirementOptions)
         {
             _rootScriptPath = rootScriptPath ?? throw new ArgumentNullException(nameof(rootScriptPath));
             _extensionBundleManager = extensionBundleManager ?? throw new ArgumentNullException(nameof(extensionBundleManager));
             _logger = logger;
             _functionMetadataManager = functionMetadataManager;
             _metricsLogger = metricsLogger;
-            _startupTypes = new Lazy<IEnumerable<Type>>(() => GetExtensionsStartupTypesAsync().ConfigureAwait(false).GetAwaiter().GetResult());
+            _environment = environment;
             _extensionRequirementOptions = extensionRequirementOptions;
+            _startupTypes = new Lazy<IEnumerable<Type>>(() => GetExtensionsStartupTypesAsync().ConfigureAwait(false).GetAwaiter().GetResult());
         }
 
         private static string[] GetBuiltinExtensionAssemblies()
         {
-            return new[]
-            {
+            return
+            [
                 typeof(WebJobs.Extensions.Http.HttpWebJobsStartup).Assembly.GetName().Name,
                 typeof(WebJobs.Extensions.ExtensionsWebJobsStartup).Assembly.GetName().Name
-            };
+            ];
         }
 
         public Type[] GetStartupTypes()
@@ -102,11 +110,11 @@ public async Task<IEnumerable<Type>> GetExtensionsStartupTypesAsync()
                 }
             }
 
-            bool isDotnetIsolatedApp = Utility.IsDotnetIsolatedApp(SystemEnvironment.Instance, functionMetadataCollection);
+            bool isDotnetIsolatedApp = Utility.IsDotnetIsolatedApp(_environment, functionMetadataCollection);
             bool isDotnetApp = isPrecompiledFunctionApp || isDotnetIsolatedApp;
-            var isLogicApp = SystemEnvironment.Instance.IsLogicApp();
+            var isLogicApp = _environment.IsLogicApp();
 
-            if (SystemEnvironment.Instance.IsPlaceholderModeEnabled())
+            if (_environment.IsPlaceholderModeEnabled())
             {
                 // Do not move this.
                 // Calling this log statement in the placeholder mode to avoid jitting during specialization

src/WebJobs.Script/ScriptHostBuilderExtensions.cs

@@ -142,12 +142,13 @@ public static IHostBuilder AddScriptHost(this IHostBuilder builder,
                 var bundleManager = new ExtensionBundleManager(extensionBundleOptions, SystemEnvironment.Instance, loggerFactory, configOption, httpClientFactory);
                 var metadataServiceManager = applicationOptions.RootServiceProvider.GetService<IFunctionMetadataManager>();
 
-                ScriptStartupTypeLocator locator = new(
+                var locator = new ScriptStartupTypeLocator(
                     applicationOptions.ScriptPath,
                     loggerFactory.CreateLogger<ScriptStartupTypeLocator>(),
                     bundleManager,
                     metadataServiceManager,
                     metricsLogger,
+                    SystemEnvironment.Instance,
                     extensionRequirementOptions);
 
                 // The locator (and thus the bundle manager) need to be created now in order to configure app configuration.

test/WebJobs.Script.Tests.Shared/TempDirectory.cs

@@ -19,25 +19,9 @@ public TempDirectory(string path)
             Directory.CreateDirectory(path);
         }
 
-        ~TempDirectory()
-        {
-            Dispose(false);
-        }
-
         public string Path { get; }
 
         public void Dispose()
-        {
-            GC.SuppressFinalize(this);
-            Dispose(true);
-        }
-
-        private void Dispose(bool disposing)
-        {
-            DeleteDirectory();
-        }
-
-        private void DeleteDirectory()
         {
             try
             {