Configuring child domain's appbase to be test source location

src/Adapter/MSTest.CoreAdapter/Discovery/AssemblyEnumeratorWrapper.cs

@@ -144,9 +144,6 @@ private ICollection<UnitTestElement> GetTestsInIsolation(string fullFilePath, IR
                 var assemblyEnumerator = isolationHost.CreateInstanceForType(
                     typeof(AssemblyEnumerator), new object[] { MSTestSettings.CurrentSettings }) as AssemblyEnumerator;
 
-                // After loading adapter reset the child-domain's appbase to point to test source location
-                isolationHost.UpdateAppBaseToTestSourceLocation();
-
                 return assemblyEnumerator.EnumerateAssembly(fullFilePath, out warnings);
             }
         }

src/Adapter/MSTest.CoreAdapter/Execution/TestExecutionManager.cs

@@ -222,9 +222,6 @@ private void ExecuteTestsInSource(IEnumerable<TestCase> tests, IRunContext runCo
                     typeof(UnitTestRunner),
                     new object[] { MSTestSettings.CurrentSettings }) as UnitTestRunner;
 
-                // After loading adapter reset the chils-domain's appbase to point to test source location
-                isolationHost.UpdateAppBaseToTestSourceLocation();
-
                 PlatformServiceProvider.Instance.AdapterTraceLogger.LogInfo("Created unit-test runner {0}", source);
 
                 // Default test set is filtered tests based on user provided filter criteria
@@ -247,11 +244,31 @@ private void ExecuteTestsInSource(IEnumerable<TestCase> tests, IRunContext runCo
                     sourceLevelParameters = sourceLevelParameters.Concat(this.sessionParameters).ToDictionary(x => x.Key, x => x.Value);
                 }
 
-                var sourceSettingsProvider = isolationHost.CreateInstanceForType(
-                    typeof(TestAssemblySettingsProvider),
-                    null) as TestAssemblySettingsProvider;
+                TestAssemblySettingsProvider sourceSettingsProvider = null;
+
+                try
+                {
+                    sourceSettingsProvider = isolationHost.CreateInstanceForType(
+                        typeof(TestAssemblySettingsProvider),
+                        null) as TestAssemblySettingsProvider;
+                }
+                catch (TypeLoadException ex)
+                {
+                    PlatformServiceProvider.Instance.AdapterTraceLogger.LogInfo(
+                        "Could not create TestAssemblySettingsProvider instance in child app-domain",
+                        ex);
+                }
+
+                TestAssemblySettings sourceSettings;
+                if (sourceSettingsProvider != null)
+                {
+                    sourceSettings = sourceSettingsProvider.GetSettings(source);
+                }
+                else
+                {
+                     sourceSettings = new TestAssemblySettings();
+                }
 
-                var sourceSettings = sourceSettingsProvider.GetSettings(source);
                 var parallelWorkers = sourceSettings.Workers;
                 var parallelScope = sourceSettings.Scope;
 

src/Adapter/PlatformServices.Desktop/Services/DesktopTestSourceHost.cs

@@ -64,7 +64,6 @@ internal TestSourceHost(string sourceFileName, IRunSettings runSettings, IFramew
             this.sourceFileName = sourceFileName;
             this.runSettings = runSettings;
             this.frameworkHandle = frameworkHandle;
-
             this.appDomain = appDomain;
 
             // Set the environment context.
@@ -109,10 +108,7 @@ public void SetupHost()
                 this.targetFrameworkVersion = this.GetTargetFrameworkVersionString(this.sourceFileName);
                 AppDomainUtilities.SetAppDomainFrameworkVersionBasedOnTestSource(appDomainSetup, this.targetFrameworkVersion);
 
-                // Temporarily set appbase to the location from where adapter should be picked up from. We will later reset this to test source location
-                // once adapter gets loaded in the child app domain.
-                appDomainSetup.ApplicationBase = Path.GetDirectoryName(typeof(TestSourceHost).Assembly.Location);
-
+                appDomainSetup.ApplicationBase = this.GetAppBaseAsPerPlatform();
                 var configFile = this.GetConfigFileForTestSource(this.sourceFileName);
                 AppDomainUtilities.SetConfigurationFile(appDomainSetup, configFile);
 
@@ -214,17 +210,11 @@ public void Dispose()
         }
 
         /// <summary>
-        /// Updates child-domain's appbase to point to test source location.
+        /// Gets child-domain's appbase to point to appropriate location.
         /// </summary>
-        public void UpdateAppBaseToTestSourceLocation()
+        /// <returns>Appbase path that should be set for child appdomain</returns>
+        internal string GetAppBaseAsPerPlatform()
         {
-            // Simply return if no child-appdomain was created
-            if (this.isAppDomainCreationDisabled)
-            {
-                return;
-            }
-
-            // After adapter has been loaded, reset child-appdomains appbase.
             // The below logic of preferential setting the appdomains appbase is needed because:
             // 1. We set this to the location of the test source if it is built for Full CLR  -> Ideally this needs to be done in all situations.
             // 2. We set this to the location where the current adapter is being picked up from for UWP and .Net Core scenarios -> This needs to be
@@ -234,14 +224,12 @@ public void UpdateAppBaseToTestSourceLocation()
             //    there would be a mismatch of platform service assemblies during discovery.
             if (this.targetFrameworkVersion.Contains(PlatformServices.Constants.DotNetFrameWorkStringPrefix))
             {
-                this.domain.SetData("APPBASE", Path.GetDirectoryName(this.sourceFileName) ?? Path.GetDirectoryName(typeof(TestSourceHost).Assembly.Location));
+                return Path.GetDirectoryName(this.sourceFileName) ?? Path.GetDirectoryName(typeof(TestSourceHost).Assembly.Location);
             }
             else
             {
-                this.domain.SetData("APPBASE", Path.GetDirectoryName(typeof(TestSourceHost).Assembly.Location));
+                return Path.GetDirectoryName(typeof(TestSourceHost).Assembly.Location);
             }
-
-            EqtTrace.Info("DesktopTestSourceHost.UpdateAppBaseToTestSourceLocation(): Updating domain's appbase path for source {0} to {1}.", this.sourceFileName, this.domain.SetupInformation.ApplicationBase);
         }
 
         /// <summary>

src/Adapter/PlatformServices.Interface/ITestSourceHost.cs

@@ -27,10 +27,5 @@ public interface ITestSourceHost : IDisposable
         /// <returns> An instance of the type created in the host. </returns>
         /// <remarks> If a type is to be created in isolation then it needs to be a MarshalByRefObject. </remarks>
         object CreateInstanceForType(Type type, object[] args);
-
-        /// <summary>
-        /// Updates child-domain's appbase to point to test source location
-        /// </summary>
-        void UpdateAppBaseToTestSourceLocation();
     }
 }

src/Adapter/PlatformServices.NetCore/Services/NetCoreTestSourceHost.cs

@@ -64,14 +64,6 @@ public object CreateInstanceForType(Type type, object[] args)
             return Activator.CreateInstance(type, args);
         }
 
-        /// <summary>
-        /// Updates child-domain's appbase to point to test source location
-        /// </summary>
-        public void UpdateAppBaseToTestSourceLocation()
-        {
-            // Do nothing.
-        }
-
         /// <summary>
         /// Sets context required for running tests.
         /// </summary>

src/Adapter/PlatformServices.Shared/netstandard1.0/Services/ns10TestSourceHost.cs

@@ -53,14 +53,6 @@ public void Dispose()
         {
             // Do nothing.
         }
-
-        /// <summary>
-        /// Updates child-domain's appbase to point to test source location
-        /// </summary>
-        public void UpdateAppBaseToTestSourceLocation()
-        {
-            // Do nothing.
-        }
     }
 
 #pragma warning restore SA1649 // SA1649FileNameMustMatchTypeName

test/UnitTests/PlatformServices.Desktop.Unit.Tests/Services/DesktopTestSourceHostTests.cs

@@ -106,7 +106,7 @@ public void CreateInstanceForTypeShouldCreateTheTypeInANewAppDomain()
         }
 
         [TestMethod]
-        public void SetupHostShouldSetChildDomainsAppBaseToAdapterLocation()
+        public void SetupHostShouldSetChildDomainsAppBaseToTestSourceLocation()
         {
             // Arrange
             DummyClass dummyclass = new DummyClass();
@@ -121,7 +121,7 @@ public void SetupHostShouldSetChildDomainsAppBaseToAdapterLocation()
                 var expectedObject = sourceHost.Object.CreateInstanceForType(typeof(DummyClass), null) as DummyClass;
 
                 // Assert
-                Assert.AreEqual(Path.GetDirectoryName(location), expectedObject.AppDomainAppBase);
+                Assert.AreEqual(Path.GetDirectoryName(typeof(DesktopTestSourceHostTests).Assembly.Location), expectedObject.AppDomainAppBase);
             }
             finally
             {
@@ -185,66 +185,6 @@ public void SetupHostShouldSetResolutionsPaths()
             }
         }
 
-        /// <summary>
-        /// This test should ideally be choosing a different path for the test source. Currently both the test source and the adapter
-        /// are in the same location. However when we move to run these tests with the V2 itself, then this would be valid.
-        /// Leaving the test running till then.
-        /// </summary>
-        [TestMethod]
-        public void UpdateAppBaseToTestSourceLocationShouldSetDomainsAppBaseToTestSourceLocationForFullCLRTestss()
-        {
-            // Arrange
-            DummyClass dummyclass = new DummyClass();
-
-            var location = typeof(DesktopTestSourceHostTests).Assembly.Location;
-            var sourceHost = new Mock<TestSourceHost>(location, null, null) { CallBase = true };
-            try
-            {
-                sourceHost.Setup(tsh => tsh.GetTargetFrameworkVersionString(location))
-                    .Returns(".NETFramework,Version=v4.5.1");
-
-                // Act
-                sourceHost.Object.SetupHost();
-                var expectedObject =
-                    sourceHost.Object.CreateInstanceForType(typeof(DummyClass), null) as DummyClass;
-                sourceHost.Object.UpdateAppBaseToTestSourceLocation();
-
-                // Assert
-                Assert.AreEqual(Path.GetDirectoryName(location), expectedObject.AppDomainAppBase);
-            }
-            finally
-            {
-                sourceHost.Object.Dispose();
-            }
-        }
-
-        [TestMethod]
-        public void UpdateAppBaseToTestSourceLocationShouldSetDomainsAppBaseToAdaptersLocationForNonFullCLRTests()
-        {
-            // Arrange
-            DummyClass dummyclass = new DummyClass();
-
-            var location = typeof(TestSourceHost).Assembly.Location;
-            Mock<TestSourceHost> sourceHost = new Mock<TestSourceHost>(location, null, null) { CallBase = true };
-
-            try
-            {
-                sourceHost.Setup(tsh => tsh.GetTargetFrameworkVersionString(location)).Returns(".NETCore,Version=v5.0");
-
-                // Act
-                sourceHost.Object.SetupHost();
-                var expectedObject = sourceHost.Object.CreateInstanceForType(typeof(DummyClass), null) as DummyClass;
-                sourceHost.Object.UpdateAppBaseToTestSourceLocation();
-
-                // Assert
-                Assert.AreEqual(Path.GetDirectoryName(location), expectedObject.AppDomainAppBase);
-            }
-            finally
-            {
-                sourceHost.Object.Dispose();
-            }
-        }
-
         [TestMethod]
         public void DisposeShouldSetTestHostShutdownOnIssueWithAppDomainUnload()
         {