From 048a1b5269dc7278849dfa2621a014c4bba83208 Mon Sep 17 00:00:00 2001 From: DaveKP Date: Mon, 28 Nov 2016 09:47:20 +0000 Subject: [PATCH 1/2] Fixed a problem registering React assemblies with TinyIoC in some instances In some instances (unknown cause) RuntimeLibrary names are lower case. In this case they were failing to register with TinyIoC. --- src/React.Core/Initializer.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/React.Core/Initializer.cs b/src/React.Core/Initializer.cs index 48c727c84..36d319da8 100644 --- a/src/React.Core/Initializer.cs +++ b/src/React.Core/Initializer.cs @@ -97,10 +97,10 @@ private static bool IsReactAssembly(Assembly assembly) private static bool IsReactAssembly(string assemblyName) { return - (assemblyName == "React" || - assemblyName.StartsWith("React.") || - assemblyName.EndsWith(".React")) && - !_obsoleteAssemblies.Contains(assemblyName); + (assemblyName.Equals("React", StringComparison.OrdinalIgnoreCase) || + assemblyName.StartsWith("React.", StringComparison.OrdinalIgnoreCase) || + assemblyName.EndsWith(".React", StringComparison.OrdinalIgnoreCase)) && + !_obsoleteAssemblies.Contains(assemblyName, StringComparison.OrdinalIgnoreCase); } /// From df4634338d1eb1000bbbc96c99aa5af823f14f34 Mon Sep 17 00:00:00 2001 From: DaveKP Date: Mon, 28 Nov 2016 09:59:16 +0000 Subject: [PATCH 2/2] StringComparison->StringComparer for Linq Contains() --- src/React.Core/Initializer.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/React.Core/Initializer.cs b/src/React.Core/Initializer.cs index 36d319da8..5200f1063 100644 --- a/src/React.Core/Initializer.cs +++ b/src/React.Core/Initializer.cs @@ -100,7 +100,7 @@ private static bool IsReactAssembly(string assemblyName) (assemblyName.Equals("React", StringComparison.OrdinalIgnoreCase) || assemblyName.StartsWith("React.", StringComparison.OrdinalIgnoreCase) || assemblyName.EndsWith(".React", StringComparison.OrdinalIgnoreCase)) && - !_obsoleteAssemblies.Contains(assemblyName, StringComparison.OrdinalIgnoreCase); + !_obsoleteAssemblies.Contains(assemblyName, StringComparer.OrdinalIgnoreCase); } ///