Updated samples to use new cors middleware.

YakhontovYaroslav · Jul 16, 2013 · db05f8b · db05f8b
1 parent 846b94d
commit db05f8b
Show file tree

Hide file tree

Showing 6 changed files with 69 additions and 4 deletions.
diff --git a/samples/Microsoft.AspNet.SelfHost.Samples/Microsoft.AspNet.SelfHost.Samples.csproj b/samples/Microsoft.AspNet.SelfHost.Samples/Microsoft.AspNet.SelfHost.Samples.csproj
@@ -40,7 +40,10 @@
   <ItemGroup>
     <Reference Include="Microsoft.Owin, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\Microsoft.Owin.2.0.0-rc1-20710-448\lib\net45\Microsoft.Owin.dll</HintPath>
+      <HintPath>..\..\packages\Microsoft.Owin.2.0.0-rc1-20715-463\lib\net45\Microsoft.Owin.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Owin.Cors">
+      <HintPath>..\..\packages\Microsoft.Owin.Cors.2.0.0-rc1-20715-463\lib\net45\Microsoft.Owin.Cors.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Owin.Host.HttpListener, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -61,6 +64,9 @@
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Web.Cors">
+      <HintPath>..\..\packages\Microsoft.AspNet.Cors.5.0.0-rc1-130715\lib\net45\System.Web.Cors.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\Microsoft.AspNet.SignalR.Samples\Raw\RawConnection.cs">

diff --git a/samples/Microsoft.AspNet.SelfHost.Samples/Startup.cs b/samples/Microsoft.AspNet.SelfHost.Samples/Startup.cs
@@ -1,7 +1,9 @@
 using System.Diagnostics;
+using System.Web.Cors;
 using Microsoft.AspNet.SignalR;
 using Microsoft.AspNet.SignalR.Samples;
 using Microsoft.AspNet.SignalR.Tracing;
+using Microsoft.Owin.Cors;
 using Owin;
 
 namespace Microsoft.AspNet.SelfHost.Samples
@@ -12,6 +14,17 @@ public void Configuration(IAppBuilder app)
         {
             app.Map("/raw-connection", subApp =>
             {
+                subApp.UseCors(new CorsOptions
+                {
+                    CorsPolicy = new CorsPolicy
+                    {
+                        AllowAnyHeader = true,
+                        AllowAnyMethod = true,
+                        AllowAnyOrigin = true,
+                        SupportsCredentials = true
+                    }
+                });
+
                 subApp.UseConnection<RawConnection>();
             });
 

diff --git a/samples/Microsoft.AspNet.SelfHost.Samples/packages.config b/samples/Microsoft.AspNet.SelfHost.Samples/packages.config
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.Owin" version="2.0.0-rc1-20710-448" targetFramework="net45" />
+  <package id="Microsoft.AspNet.Cors" version="5.0.0-rc1-130715" targetFramework="net45" />
+  <package id="Microsoft.Owin" version="2.0.0-rc1-20715-463" targetFramework="net45" />
+  <package id="Microsoft.Owin.Cors" version="2.0.0-rc1-20715-463" targetFramework="net45" />
   <package id="Microsoft.Owin.Host.HttpListener" version="2.0.0-rc1-20710-448" targetFramework="net45" />
   <package id="Microsoft.Owin.Hosting" version="2.0.0-rc1-20710-448" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="5.0.6" targetFramework="net45" />

diff --git a/tests/Microsoft.AspNet.SignalR.Tests.Common/App_Start/Initializer.cs b/tests/Microsoft.AspNet.SignalR.Tests.Common/App_Start/Initializer.cs
@@ -4,13 +4,15 @@
 using System.IO;
 using System.Threading.Tasks;
 using System.Web;
+using System.Web.Cors;
 using System.Web.Routing;
 using Microsoft.AspNet.SignalR.Infrastructure;
 using Microsoft.AspNet.SignalR.StressServer.Connections;
 using Microsoft.AspNet.SignalR.Tests.Common;
 using Microsoft.AspNet.SignalR.Tests.Common.Connections;
 using Microsoft.AspNet.SignalR.Tests.Common.Handlers;
 using Microsoft.Owin;
+using Microsoft.Owin.Cors;
 using Owin;
 
 [assembly: PreApplicationStartMethod(typeof(Initializer), "Start")]
@@ -98,14 +100,48 @@ public static void ConfigureRoutes(IAppBuilder app, IDependencyResolver resolver
                 Resolver = resolver
             };
 
+<<<<<<< HEAD
             app.MapConnection<MySendingConnection>("/multisend", crossDomainConfig);
             app.MapConnection<AutoEncodedJsonConnection>("/autoencodedjson", crossDomainConfig);
             app.MapConnection<RedirectionConnection>("/redirectionConnection", crossDomainConfig);
+=======
+            app.Map("/multisend", subApp =>
+            {
+                app.UseCors(new CorsOptions
+                {
+                    CorsPolicy = new CorsPolicy
+                    {
+                        AllowAnyHeader = true,
+                        AllowAnyMethod = true,
+                        AllowAnyOrigin = true,
+                        SupportsCredentials = true
+                    }
+                });
+
+                subApp.UseConnection<MySendingConnection>(config);
+            });
+>>>>>>> Updated samples to use new cors middleware.
 
             var config = new ConnectionConfiguration
             {
+<<<<<<< HEAD
                 Resolver = resolver
             };
+=======
+                app.UseCors(new CorsOptions
+                {
+                    CorsPolicy = new CorsPolicy
+                    {
+                        AllowAnyHeader = true,
+                        AllowAnyMethod = true,
+                        AllowAnyOrigin = true,
+                        SupportsCredentials = true
+                    }
+                });
+
+                subApp.UseConnection<AutoEncodedJsonConnection>(config);
+            });
+>>>>>>> Updated samples to use new cors middleware.
 
             app.MapConnection<MyBadConnection>("/ErrorsAreFun", config);
             app.MapConnection<MyGroupEchoConnection>("/group-echo", config);

diff --git a/tests/Microsoft.AspNet.SignalR.Tests.Common/Microsoft.AspNet.SignalR.Tests.Common.csproj b/tests/Microsoft.AspNet.SignalR.Tests.Common/Microsoft.AspNet.SignalR.Tests.Common.csproj
@@ -34,7 +34,10 @@
   <ItemGroup>
     <Reference Include="Microsoft.Owin, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\Microsoft.Owin.2.0.0-rc1-20710-448\lib\net45\Microsoft.Owin.dll</HintPath>
+      <HintPath>..\..\packages\Microsoft.Owin.2.0.0-rc1-20715-463\lib\net45\Microsoft.Owin.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Owin.Cors">
+      <HintPath>..\..\packages\Microsoft.Owin.Cors.2.0.0-rc1-20715-463\lib\net45\Microsoft.Owin.Cors.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Owin.Hosting, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -70,6 +73,9 @@
     <Reference Include="System.Core" />
     <Reference Include="System.Management" />
     <Reference Include="System.Web.ApplicationServices" />
+    <Reference Include="System.Web.Cors">
+      <HintPath>..\..\packages\Microsoft.AspNet.Cors.5.0.0-rc1-130715\lib\net45\System.Web.Cors.dll</HintPath>
+    </Reference>
     <Reference Include="System.Web.DynamicData" />
     <Reference Include="System.Web.Entity" />
     <Reference Include="System.Web.Extensions" />

diff --git a/tests/Microsoft.AspNet.SignalR.Tests.Common/packages.config b/tests/Microsoft.AspNet.SignalR.Tests.Common/packages.config
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.Owin" version="2.0.0-rc1-20710-448" targetFramework="net45" />
+  <package id="Microsoft.AspNet.Cors" version="5.0.0-rc1-130715" targetFramework="net45" />
+  <package id="Microsoft.Owin" version="2.0.0-rc1-20715-463" targetFramework="net45" />
+  <package id="Microsoft.Owin.Cors" version="2.0.0-rc1-20715-463" targetFramework="net45" />
   <package id="Microsoft.Owin.Hosting" version="2.0.0-rc1-20710-448" targetFramework="net45" />
   <package id="Microsoft.Owin.Security.Basic" version="0.24.0-pre-20628-427" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="5.0.6" targetFramework="net45" />