Remove System.Web dependency from core React assembly. Now the System.Web dependency is solely contained in the React.Web assembly.

Also disabled "warnings as errors" for debug builds (still on for release builds)

Author: Daniel15

build.proj

@@ -10,7 +10,7 @@ of patent rights can be found in the PATENTS file in the same directory.
 <Project ToolsVersion="4.0" DefaultTargets="Build;Test;Package" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 	<PropertyGroup>
 		<Major>0</Major>
-		<Minor>1</Minor>
+		<Minor>2</Minor>
 		<Build>0</Build>
 		<Revision>0</Revision>
 		<DevBuild>true</DevBuild>

src/React.Web/React.Web.csproj

@@ -21,7 +21,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <DocumentationFile>..\..\bin\Debug\React.Web\React.Web.XML</DocumentationFile>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
     <NoWarn>1607</NoWarn>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
@@ -65,6 +65,7 @@
     <Compile Include="AspNetFileSystem.cs" />
     <Compile Include="AssemblyRegistration.cs" />
     <Compile Include="IJsxHandler.cs" />
+    <Compile Include="TinyIoCAspNetExtensions.cs" />
     <Compile Include="WebInitializer.cs" />
     <Compile Include="JsxHandler.cs" />
     <Compile Include="JsxHandlerFactory.cs" />

src/React.Web/TinyIoCAspNetExtensions.cs

@@ -0,0 +1,80 @@
+/*
+ *  Copyright (c) 2014, Facebook, Inc.
+ *  All rights reserved.
+ *
+ *  This source code is licensed under the BSD-style license found in the
+ *  LICENSE file in the root directory of this source tree. An additional grant 
+ *  of patent rights can be found in the PATENTS file in the same directory.
+ */
+
+using System;
+using System.Linq;
+using System.Web;
+using React.TinyIoC;
+
+namespace React.Web.TinyIoC
+{
+	/// <summary>
+	/// Scopes IoC registrations to the context of an ASP.NET web request. All instantiated
+	/// components will be automatically disposed at the end of the request.
+	/// </summary>
+	public class HttpContextLifetimeProvider : TinyIoCContainer.ITinyIoCObjectLifetimeProvider
+	{
+		/// <summary>
+		/// Prefix to use on HttpContext items
+		/// </summary>
+		private const string PREFIX = "TinyIoC.HttpContext.";
+		/// <summary>
+		/// Name of the key for this particular registration
+		/// </summary>
+		private readonly string _keyName = PREFIX + Guid.NewGuid();
+
+		/// <summary>
+		/// Gets the stored object if it exists, or null if not
+		/// </summary>
+		/// <returns>Object instance or null</returns>
+		public object GetObject()
+		{
+			return HttpContext.Current.Items[_keyName];
+		}
+
+		/// <summary>
+		/// Store the object
+		/// </summary>
+		/// <param name="value">Object to store</param>
+		public void SetObject(object value)
+		{
+			HttpContext.Current.Items[_keyName] = value;
+		}
+
+		/// <summary>
+		/// Release the object
+		/// </summary>
+		public void ReleaseObject()
+		{
+			var item = GetObject() as IDisposable;
+
+			if (item != null)
+				item.Dispose();
+
+			SetObject(null);
+		}
+
+		/// <summary>
+		/// Disposes all instantiated components
+		/// </summary>
+		public static void DisposeAll()
+		{
+			var items = HttpContext.Current.Items;
+			var disposableItems = items.Keys.OfType<string>()
+				.Where(key => key.StartsWith(PREFIX))
+				.Select(key => items[key])
+				.Where(item => item is IDisposable);
+
+			foreach (var item in disposableItems)
+			{
+				((IDisposable)item).Dispose();
+			}
+		}
+	}
+}

src/React.Web/WebInitializer.cs

@@ -9,8 +9,8 @@
 
 using System.Web;
 using Microsoft.Web.Infrastructure.DynamicModuleHelper;
-using React.TinyIoC;
 using React.Web;
+using React.Web.TinyIoC;
 
 [assembly: WebActivatorEx.PreApplicationStartMethod(typeof(WebInitializer), "Initialize")]
 
@@ -26,7 +26,7 @@ internal static class WebInitializer
 		/// </summary>
 		public static void Initialize()
 		{
-			Initializer.Initialize(isInAspNet: true);
+			Initializer.Initialize(() => new HttpContextLifetimeProvider());
 			DynamicModuleUtility.RegisterModule(typeof(IocPerRequestDisposal));
 		}
 

src/React/AssemblyRegistration.cs

@@ -42,8 +42,8 @@ public void Register(TinyIoCContainer container)
 				EngineMode = JsEngineMode.ChakraActiveScript
 			});
 
-			container.Register<IReactEnvironment, ReactEnvironment>().AsReactSingleton();
-			container.Register<IJavaScriptEngineFactory, JavaScriptEngineFactory>().AsReactSingleton();
+			container.Register<IReactEnvironment, ReactEnvironment>().AsPerRequestSingleton();
+			container.Register<IJavaScriptEngineFactory, JavaScriptEngineFactory>().AsPerRequestSingleton();
 		}
 	}
 }

src/React/Initializer.cs

@@ -10,7 +10,6 @@
 using System;
 using System.Linq;
 using System.Reflection;
-using System.Web;
 using React.TinyIoC;
 
 namespace React
@@ -23,19 +22,18 @@ public static class Initializer
 		/// <summary>
 		/// Intialise ReactJS.NET
 		/// </summary>
-		public static void Initialize(bool isInAspNet)
+		public static void Initialize(Func<TinyIoCContainer.ITinyIoCObjectLifetimeProvider> requestLifetimeProviderFactory)
 		{
-			InitializeIoC(isInAspNet);
+			InitializeIoC(requestLifetimeProviderFactory);
 		}
 
 		/// <summary>
 		/// Initialises the IoC container by finding all <see cref="IAssemblyRegistration"/> 
 		/// implementations and calling their <see cref="IAssemblyRegistration.Register"/> methods.
 		/// </summary>
-		private static void InitializeIoC(bool isInAspNet)
+		private static void InitializeIoC(Func<TinyIoCContainer.ITinyIoCObjectLifetimeProvider> requestLifetimeProviderFactory)
 		{
-			TinyIoCAspNetExtensions.IsInAspNet = isInAspNet;
-
+			TinyIoCExtensions.RequestLifetimeProviderFactory = requestLifetimeProviderFactory;
 			var types = AppDomain.CurrentDomain.GetAssemblies()
 				// Only bother checking React assemblies
 				.Where(IsReactAssembly)

src/React/React.csproj

@@ -22,7 +22,7 @@
     <WarningLevel>4</WarningLevel>
     <PlatformTarget>AnyCPU</PlatformTarget>
     <DocumentationFile>..\..\bin\Debug\React\React.XML</DocumentationFile>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
     <NoWarn>1607</NoWarn>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
@@ -66,7 +66,6 @@
     <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
     <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Web" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\SharedAssemblyInfo.cs">
@@ -93,8 +92,8 @@
     <Compile Include="ReactComponent.cs" />
     <Compile Include="ReactEnvironment.cs" />
     <Compile Include="ReactSiteConfiguration.cs" />
+    <Compile Include="TinyIoCExtensions.cs" />
     <Compile Include="TinyIoC\TinyIoC.cs" />
-    <Compile Include="TinyIoC\TinyIoCAspNetExtensions.cs" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Resources\JSXTransformer.js" />

src/React/TinyIoC/TinyIoCAspNetExtensions.cs

@@ -0,0 +1,49 @@
+/*
+ *  Copyright (c) 2014, Facebook, Inc.
+ *  All rights reserved.
+ *
+ *  This source code is licensed under the BSD-style license found in the
+ *  LICENSE file in the root directory of this source tree. An additional grant 
+ *  of patent rights can be found in the PATENTS file in the same directory.
+ */
+
+using System;
+using React.TinyIoC;
+
+namespace React
+{
+	/// <summary>
+	/// ReactJS.NET extensions to TinyIoC
+	/// </summary>
+	public static class TinyIoCExtensions
+	{
+		/// <summary>
+		/// Gets or sets the factory used to create per-request lifetime providers
+		/// </summary>
+		internal static Func<TinyIoCContainer.ITinyIoCObjectLifetimeProvider> RequestLifetimeProviderFactory { private get; set; }
+
+		/// <summary>
+		/// Registers a class in IoC that uses a singleton per "request". This is generally in the
+		/// context of a web request.
+		/// </summary>
+		/// <param name="registerOptions">Class registration options</param>
+		/// <returns>The class registration (fluent interface)</returns>
+		public static TinyIoCContainer.RegisterOptions AsPerRequestSingleton(this TinyIoCContainer.RegisterOptions registerOptions)
+		{
+			if (RequestLifetimeProviderFactory == null)
+			{
+				throw new Exception(
+					"RequestLifetimeProviderFactory needs to be set for per-request ReactJS.NET " +
+					"assembly registrations to work. Please ensure you are calling " +
+					"React.Initializer.Initialize() before using any ReactJS.NET functionality."
+				);
+			}
+
+			return TinyIoCContainer.RegisterOptions.ToCustomLifetimeManager(
+				registerOptions,
+				RequestLifetimeProviderFactory(),
+				"per request singleton"
+			);
+		}
+	}
+}