Added workaround for .NET 4.5.1 not being able to load plugins Startup class (#135)

ivaylokenov · ivaylokenov · commit 9e57031594c8 · 2016-07-07T15:09:23.000+03:00
diff --git a/samples/ApplicationParts/ApplicationParts.Test/project.lock.json b/samples/ApplicationParts/ApplicationParts.Test/project.lock.json
@@ -1709,18 +1709,6 @@
       },
       "Microsoft.VisualStudio.Web.BrowserLink.Loader/14.0.0-rc2-final": {
         "type": "package",
-        "dependencies": {
-          "Microsoft.AspNetCore.Http.Abstractions": "1.0.0-rc2-final",
-          "Microsoft.Extensions.FileProviders.Physical": "1.0.0-rc2-final",
-          "Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc2-final",
-          "Microsoft.NETCore.Platforms": "1.0.1-rc2-24027",
-          "Microsoft.Win32.Registry": "4.0.0-rc2-24027",
-          "System.Collections": "4.0.11-rc2-24027",
-          "System.Net.Sockets": "4.1.0-rc2-24027",
-          "System.Runtime.Loader": "4.0.0-rc2-24027",
-          "System.Text.Encoding": "4.0.11-rc2-24027",
-          "System.Threading": "4.0.11-rc2-24027"
-        },
         "compile": {
           "lib/netstandard1.5/Microsoft.VisualStudio.Web.BrowserLink.Loader.dll": {}
         },
diff --git a/samples/ApplicationParts/ApplicationParts.Web/project.lock.json b/samples/ApplicationParts/ApplicationParts.Web/project.lock.json
@@ -1705,18 +1705,6 @@
       },
       "Microsoft.VisualStudio.Web.BrowserLink.Loader/14.0.0-rc2-final": {
         "type": "package",
-        "dependencies": {
-          "Microsoft.AspNetCore.Http.Abstractions": "1.0.0-rc2-final",
-          "Microsoft.Extensions.FileProviders.Physical": "1.0.0-rc2-final",
-          "Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc2-final",
-          "Microsoft.NETCore.Platforms": "1.0.1-rc2-24027",
-          "Microsoft.Win32.Registry": "4.0.0-rc2-24027",
-          "System.Collections": "4.0.11-rc2-24027",
-          "System.Net.Sockets": "4.1.0-rc2-24027",
-          "System.Runtime.Loader": "4.0.0-rc2-24027",
-          "System.Text.Encoding": "4.0.11-rc2-24027",
-          "System.Threading": "4.0.11-rc2-24027"
-        },
         "compile": {
           "lib/netstandard1.5/Microsoft.VisualStudio.Web.BrowserLink.Loader.dll": {}
         },
diff --git a/samples/MusicStore/MusicStore.Test/TestStartup.cs b/samples/MusicStore/MusicStore.Test/TestStartup.cs
@@ -6,6 +6,12 @@
     using Mocks;
     using Models;
     using MyTested.AspNetCore.Mvc;
+#if NET451
+    using System.Reflection;
+    using Microsoft.AspNetCore.Mvc.ApplicationParts;
+    using MyTested.AspNetCore.Mvc.Internal;
+    using MyTested.AspNetCore.Mvc.Session;
+#endif
 
     public class TestStartup : Startup
     {
@@ -19,6 +25,22 @@ public void ConfigureTestServices(IServiceCollection services)
             base.ConfigureServices(services);
             
             services.ReplaceSingleton<SignInManager<ApplicationUser>, MockedSignInManager>();
+
+            // temporary workaround while DependencyContext issues are fixed for .NET 4.5.1
+#if NET451
+            var mvc = services.AddMvc();
+            var applicationParts = mvc.PartManager.ApplicationParts;
+            applicationParts.Clear();
+            applicationParts.Add(new AssemblyPart(typeof(Startup).GetTypeInfo().Assembly));
+
+            TestHelper.HttpFeatureRegistrationPlugins.Add(new SessionTestPlugin());
+
+            services.ReplaceDbContext();
+            services.ReplaceMemoryCache();
+            services.ReplaceSession();
+            services.ReplaceOptions();
+            services.ReplaceTempDataProvider();
+#endif
         }
     }
 }
diff --git a/samples/MusicStore/MusicStore.Test/project.json b/samples/MusicStore/MusicStore.Test/project.json
@@ -3,7 +3,8 @@
     "warningsAsErrors": true,
     "copyToOutput": {
       "include": [
-        "config.json"
+        "config.json",
+        "testconfig.json"
       ]
     }
   },
diff --git a/samples/MusicStore/MusicStore.Test/project.lock.json b/samples/MusicStore/MusicStore.Test/project.lock.json
@@ -8130,7 +8130,7 @@
       ]
     },
     "Microsoft.IdentityModel.Logging/1.0.0": {
-      "sha512": "8lt3q7o9xSLyKfja/D2J67N8EZLwISjXktkwxK275yOrZY16iNCHCWqtDVP1M/DHuC/LWFMoheF3lmaJC9UXQg==",
+      "sha512": "Ol7aYJKsY1UDDTnCjXai17G3bJ0Q7Xj97Ao4nCoSU3+sc1/uMaWhCs3RjsZnrapYbdBPtt1xTPbhC8R6M1MqWQ==",
       "type": "package",
       "path": "Microsoft.IdentityModel.Logging/1.0.0",
       "files": [
@@ -8143,7 +8143,7 @@
       ]
     },
     "Microsoft.IdentityModel.Protocols/2.0.0": {
-      "sha512": "dHV39tCYxj8yMySDOUhNGakFQSNl3PZcweBWevtHyUeX/8UbroL0sQUHNjE38/UE0c4RS43WvWn+GO39R0PqOA==",
+      "sha512": "ACezwKCnK5e+SECvwo1l7VWTd6tMdXhg2UPXOAJ7rh/v06q72VBFmc1hb40QEglDVRyV132HBI9zWRfHDCO2Gw==",
       "type": "package",
       "path": "Microsoft.IdentityModel.Protocols/2.0.0",
       "files": [
@@ -8156,7 +8156,7 @@
       ]
     },
     "Microsoft.IdentityModel.Protocols.OpenIdConnect/2.0.0": {
-      "sha512": "0TVkFvDN2fnDt7DelqZ5w7SEwpOiCycNc/CV1ZZjFEBY0Kn4EwG100Lhf7nvylm5CrgiDWYHb6Db8hnDDTpiWg==",
+      "sha512": "JNVtDo5nnrBL15wSFQPuXxDd+bhuqjLHSVpkoEK9j7uKNG6oT1G7jheM8B9zHhcmQAUtnuFabRtZy+HadGBcNw==",
       "type": "package",
       "path": "Microsoft.IdentityModel.Protocols.OpenIdConnect/2.0.0",
       "files": [
@@ -8169,7 +8169,7 @@
       ]
     },
     "Microsoft.IdentityModel.Tokens/5.0.0": {
-      "sha512": "VwNw+fm2nlbkL3GRO8b6WBlqs6M4q9Dft0CAg0TMHUYwuiU+4dciiIlZRC6q/HEcllKUvc0KDXt20n2PGcO1pA==",
+      "sha512": "EINdydCekJeyG+IyaB/3GbIfEeaOIU5GJiMmpCI+G+o1g9RvRHkS1hpG4KCp3J5nOLzr31k+rRtNrEQcJJEGOQ==",
       "type": "package",
       "path": "Microsoft.IdentityModel.Tokens/5.0.0",
       "files": [
@@ -9941,7 +9941,7 @@
       ]
     },
     "System.IdentityModel.Tokens.Jwt/5.0.0": {
-      "sha512": "Ne69BCr2FPAysLG7pOM/+U/XFwGg849GIML2NuqtfEwBC3l74SaUPN3AmJfHccBcgOSDL3jVLQ3/ZQTtd3g6JA==",
+      "sha512": "qq2qmY/lV/474QRm5/YBRX44Ez3K4qcqIeB7PC3TG+LlFRoTtVokUttj4TFTXyzOZ1B2JsuEFNFfW1W2FdtsFg==",
       "type": "package",
       "path": "System.IdentityModel.Tokens.Jwt/5.0.0",
       "files": [
diff --git a/samples/MusicStore/MusicStore.Test/testconfig.json b/samples/MusicStore/MusicStore.Test/testconfig.json
@@ -0,0 +1,3 @@
+﻿{
+    "TestAssemblyName":  "MusicStore.Test"
+}
diff --git a/samples/MusicStore/MusicStore.Web/project.lock.json b/samples/MusicStore/MusicStore.Web/project.lock.json
@@ -7031,7 +7031,7 @@
       ]
     },
     "Microsoft.IdentityModel.Logging/1.0.0": {
-      "sha512": "8lt3q7o9xSLyKfja/D2J67N8EZLwISjXktkwxK275yOrZY16iNCHCWqtDVP1M/DHuC/LWFMoheF3lmaJC9UXQg==",
+      "sha512": "Ol7aYJKsY1UDDTnCjXai17G3bJ0Q7Xj97Ao4nCoSU3+sc1/uMaWhCs3RjsZnrapYbdBPtt1xTPbhC8R6M1MqWQ==",
       "type": "package",
       "path": "Microsoft.IdentityModel.Logging/1.0.0",
       "files": [
@@ -7044,7 +7044,7 @@
       ]
     },
     "Microsoft.IdentityModel.Protocols/2.0.0": {
-      "sha512": "dHV39tCYxj8yMySDOUhNGakFQSNl3PZcweBWevtHyUeX/8UbroL0sQUHNjE38/UE0c4RS43WvWn+GO39R0PqOA==",
+      "sha512": "ACezwKCnK5e+SECvwo1l7VWTd6tMdXhg2UPXOAJ7rh/v06q72VBFmc1hb40QEglDVRyV132HBI9zWRfHDCO2Gw==",
       "type": "package",
       "path": "Microsoft.IdentityModel.Protocols/2.0.0",
       "files": [
@@ -7057,7 +7057,7 @@
       ]
     },
     "Microsoft.IdentityModel.Protocols.OpenIdConnect/2.0.0": {
-      "sha512": "0TVkFvDN2fnDt7DelqZ5w7SEwpOiCycNc/CV1ZZjFEBY0Kn4EwG100Lhf7nvylm5CrgiDWYHb6Db8hnDDTpiWg==",
+      "sha512": "JNVtDo5nnrBL15wSFQPuXxDd+bhuqjLHSVpkoEK9j7uKNG6oT1G7jheM8B9zHhcmQAUtnuFabRtZy+HadGBcNw==",
       "type": "package",
       "path": "Microsoft.IdentityModel.Protocols.OpenIdConnect/2.0.0",
       "files": [
@@ -7070,7 +7070,7 @@
       ]
     },
     "Microsoft.IdentityModel.Tokens/5.0.0": {
-      "sha512": "VwNw+fm2nlbkL3GRO8b6WBlqs6M4q9Dft0CAg0TMHUYwuiU+4dciiIlZRC6q/HEcllKUvc0KDXt20n2PGcO1pA==",
+      "sha512": "EINdydCekJeyG+IyaB/3GbIfEeaOIU5GJiMmpCI+G+o1g9RvRHkS1hpG4KCp3J5nOLzr31k+rRtNrEQcJJEGOQ==",
       "type": "package",
       "path": "Microsoft.IdentityModel.Tokens/5.0.0",
       "files": [
@@ -8749,7 +8749,7 @@
       ]
     },
     "System.IdentityModel.Tokens.Jwt/5.0.0": {
-      "sha512": "Ne69BCr2FPAysLG7pOM/+U/XFwGg849GIML2NuqtfEwBC3l74SaUPN3AmJfHccBcgOSDL3jVLQ3/ZQTtd3g6JA==",
+      "sha512": "qq2qmY/lV/474QRm5/YBRX44Ez3K4qcqIeB7PC3TG+LlFRoTtVokUttj4TFTXyzOZ1B2JsuEFNFfW1W2FdtsFg==",
       "type": "package",
       "path": "System.IdentityModel.Tokens.Jwt/5.0.0",
       "files": [
diff --git a/src/MyTested.AspNetCore.Mvc.Core/Internal/Application/TestApplication.cs b/src/MyTested.AspNetCore.Mvc.Core/Internal/Application/TestApplication.cs
@@ -210,7 +210,7 @@ internal static void TryInitialize()
         internal static Type TryFindDefaultStartupType()
         {
             var applicationAssembly = Assembly.Load(new AssemblyName(testAssemblyName));
-
+            
             var startupName = TestConfiguration.FullStartupName ?? $"{Environment.EnvironmentName}Startup";
 
             // check root of the test project
@@ -245,7 +245,7 @@ private static IConfiguration PrepareTestConfiguration()
 
         private static void FindTestAssemblyName()
         {
-            testAssemblyName = DependencyContext
+            testAssemblyName = TestConfiguration.TestAssemblyName ?? DependencyContext
                 .Default
                 .GetDefaultAssemblyNames()
                 .First()
diff --git a/src/MyTested.AspNetCore.Mvc.Core/Internal/TestConfiguration.cs b/src/MyTested.AspNetCore.Mvc.Core/Internal/TestConfiguration.cs
@@ -5,6 +5,7 @@
 
     internal class TestConfiguration
     {
+        private const string TestAssemblyNameConfigKey = "TestAssemblyName";
         private const string ApplicationNameConfigKey = "ApplicationName";
         private const string EnvironmentNameConfigKey = "Environment";
         private const string AutomaticStartupConfigKey = "AutomaticStartup";
@@ -20,6 +21,8 @@ private TestConfiguration(IConfiguration configuration)
             this.configuration = configuration;
         }
 
+        internal string TestAssemblyName => this.configuration[TestAssemblyNameConfigKey];
+
         internal string ApplicationName => this.configuration[ApplicationNameConfigKey];
 
         internal string EnvironmentName => this.configuration[EnvironmentNameConfigKey] ?? "Test";
diff --git a/src/MyTested.AspNetCore.Mvc.Core/Internal/TestHelper.cs b/src/MyTested.AspNetCore.Mvc.Core/Internal/TestHelper.cs
@@ -15,7 +15,7 @@ public static class TestHelper
     {
         public static Action GlobalTestCleanup { get; set; }
         
-        internal static ISet<IHttpFeatureRegistrationPlugin> HttpFeatureRegistrationPlugins { get; }
+        public static ISet<IHttpFeatureRegistrationPlugin> HttpFeatureRegistrationPlugins { get; }
             = new HashSet<IHttpFeatureRegistrationPlugin>();
 
         /// <summary>
diff --git a/test/MyTested.AspNetCore.Mvc.Core.Test/project.lock.json b/test/MyTested.AspNetCore.Mvc.Core.Test/project.lock.json

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,8 @@`
`3`	`3`	`"warningsAsErrors": true,`
`4`	`4`	`"copyToOutput": {`
`5`	`5`	`"include": [`
`6`		`- "config.json"`
	`6`	`+ "config.json",`
	`7`	`+ "testconfig.json"`
`7`	`8`	`]`
`8`	`9`	`}`
`9`	`10`	`},`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+{`
	`2`	`+ "TestAssemblyName": "MusicStore.Test"`
	`3`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`
`6`	`6`	`internal class TestConfiguration`
`7`	`7`	`{`
	`8`	`+ private const string TestAssemblyNameConfigKey = "TestAssemblyName";`
`8`	`9`	`private const string ApplicationNameConfigKey = "ApplicationName";`
`9`	`10`	`private const string EnvironmentNameConfigKey = "Environment";`
`10`	`11`	`private const string AutomaticStartupConfigKey = "AutomaticStartup";`
`@@ -20,6 +21,8 @@ private TestConfiguration(IConfiguration configuration)`
`20`	`21`	`this.configuration = configuration;`
`21`	`22`	`}`
`22`	`23`
	`24`	`+ internal string TestAssemblyName => this.configuration[TestAssemblyNameConfigKey];`
	`25`	`+`
`23`	`26`	`internal string ApplicationName => this.configuration[ApplicationNameConfigKey];`
`24`	`27`
`25`	`28`	`internal string EnvironmentName => this.configuration[EnvironmentNameConfigKey] ?? "Test";`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ public static class TestHelper`
`15`	`15`	`{`
`16`	`16`	`public static Action GlobalTestCleanup { get; set; }`
`17`	`17`
`18`		`- internal static ISet<IHttpFeatureRegistrationPlugin> HttpFeatureRegistrationPlugins { get; }`
	`18`	`+ public static ISet<IHttpFeatureRegistrationPlugin> HttpFeatureRegistrationPlugins { get; }`
`19`	`19`	`= new HashSet<IHttpFeatureRegistrationPlugin>();`
`20`	`20`
`21`	`21`	`/// <summary>`