From 822f6ccdeade6657d170984cee7ffe6a80f85be7 Mon Sep 17 00:00:00 2001
From: Chris Kaczor <chris@kaczorzoo.net>
Date: Wed, 11 Jun 2014 14:22:17 -0400
Subject: [PATCH] Update security and packages

---
 App.config            | 80 ++++++++++++++++---------------------------
 WeatherService.csproj | 19 ++++------
 packages.config       |  6 ++--
 3 files changed, 39 insertions(+), 66 deletions(-)

diff --git a/App.config b/App.config
index 436f91f..ce42248 100644
--- a/App.config
+++ b/App.config
@@ -1,41 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <configSections>
-        <sectionGroup name="applicationSettings"
-                      type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-            <section name="WeatherService.Settings"
-                     type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"
-                     requirePermission="false" />
+        <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+            <section name="WeatherService.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
         </sectionGroup>
     </configSections>
     <startup>
-        <supportedRuntime version="v4.0"
-                          sku=".NETFramework,Version=v4.5" />
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
     </startup>
     <applicationSettings>
         <WeatherService.Settings>
-            <setting name="LogDatabase"
-                     serializeAs="String">
+            <setting name="LogDatabase" serializeAs="String">
                 <value>False</value>
             </setting>
-            <setting name="LcdTemplate"
-                     serializeAs="String">
+            <setting name="LcdTemplate" serializeAs="String">
                 <value />
             </setting>
-            <setting name="PollingInterval"
-                     serializeAs="String">
+            <setting name="PollingInterval" serializeAs="String">
                 <value>00:00:01</value>
             </setting>
-            <setting name="DatabaseFile"
-                     serializeAs="String">
+            <setting name="DatabaseFile" serializeAs="String">
                 <value>C:\WeatherCenter\WeatherCenter.sdf</value>
             </setting>
-            <setting name="SignalR_ListenUrl"
-                     serializeAs="String">
+            <setting name="SignalR_ListenUrl" serializeAs="String">
                 <value>http://*:9090</value>
             </setting>
-            <setting name="SignalR_ConnectUrl"
-                     serializeAs="String">
+            <setting name="SignalR_ConnectUrl" serializeAs="String">
                 <value>http://localhost:9090</value>
             </setting>
         </WeatherService.Settings>
@@ -43,8 +33,7 @@
     <system.serviceModel>
         <bindings>
             <webHttpBinding>
-                <binding name="webHttpBindingWithJson"
-                         crossDomainScriptAccessEnabled="true" />
+                <binding name="webHttpBindingWithJson" crossDomainScriptAccessEnabled="true" />
             </webHttpBinding>
             <netTcpBinding>
                 <binding name="netTcpBindingNoSecurity">
@@ -53,27 +42,17 @@
             </netTcpBinding>
         </bindings>
         <services>
-            <service behaviorConfiguration="Default"
-                     name="WeatherService.WeatherServiceDuplex">
-                <endpoint address=""
-                          binding="netTcpBinding"
-                          bindingConfiguration="netTcpBindingNoSecurity"
-                          contract="WeatherService.IWeatherServiceDuplex" />
-                <endpoint address="mex"
-                          binding="mexTcpBinding"
-                          contract="IMetadataExchange" />
+            <service behaviorConfiguration="Default" name="WeatherService.WeatherServiceDuplex">
+                <endpoint address="" binding="netTcpBinding" bindingConfiguration="netTcpBindingNoSecurity" contract="WeatherService.IWeatherServiceDuplex" />
+                <endpoint address="mex" binding="mexTcpBinding" contract="IMetadataExchange" />
                 <host>
                     <baseAddresses>
                         <add baseAddress="net.tcp://server:9001" />
                     </baseAddresses>
                 </host>
             </service>
-            <service behaviorConfiguration="Default"
-                     name="WeatherService.WeatherService">
-                <endpoint address="json"
-                          binding="webHttpBinding"
-                          bindingConfiguration="webHttpBindingWithJson"
-                          contract="WeatherService.IWeatherService" />
+            <service behaviorConfiguration="Default" name="WeatherService.WeatherService">
+                <endpoint address="json" binding="webHttpBinding" bindingConfiguration="webHttpBindingWithJson" contract="WeatherService.IWeatherService" />
                 <host>
                     <baseAddresses>
                         <add baseAddress="http://server:9000" />
@@ -92,25 +71,24 @@
     <runtime>
         <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
             <dependentAssembly>
-                <assemblyIdentity name="Microsoft.AspNet.SignalR.Core"
-                                  publicKeyToken="31bf3856ad364e35"
-                                  culture="neutral" />
-                <bindingRedirect oldVersion="0.0.0.0-2.0.3.0"
-                                 newVersion="2.0.3.0" />
+                <assemblyIdentity name="Microsoft.AspNet.SignalR.Core" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-2.0.3.0" newVersion="2.0.3.0" />
             </dependentAssembly>
             <dependentAssembly>
-                <assemblyIdentity name="Microsoft.Owin"
-                                  publicKeyToken="31bf3856ad364e35"
-                                  culture="neutral" />
-                <bindingRedirect oldVersion="0.0.0.0-2.1.0.0"
-                                 newVersion="2.1.0.0" />
+                <assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-2.1.0.0" newVersion="2.1.0.0" />
             </dependentAssembly>
             <dependentAssembly>
-                <assemblyIdentity name="Newtonsoft.Json"
-                                  publicKeyToken="30ad4fe6b2a6aeed"
-                                  culture="neutral" />
-                <bindingRedirect oldVersion="0.0.0.0-6.0.0.0"
-                                 newVersion="6.0.0.0" />
+                <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+            </dependentAssembly>
+            <dependentAssembly>
+                <assemblyIdentity name="Microsoft.Owin.Security" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-2.1.0.0" newVersion="2.1.0.0" />
+            </dependentAssembly>
+            <dependentAssembly>
+                <assemblyIdentity name="System.Web.Cors" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-5.1.0.0" newVersion="5.1.0.0" />
             </dependentAssembly>
         </assemblyBinding>
     </runtime>
diff --git a/WeatherService.csproj b/WeatherService.csproj
index bde324a..0a034e3 100644
--- a/WeatherService.csproj
+++ b/WeatherService.csproj
@@ -54,12 +54,10 @@
     <Reference Include="Microsoft.AspNet.SignalR.Client">
       <HintPath>packages\Microsoft.AspNet.SignalR.Client.2.0.3\lib\net45\Microsoft.AspNet.SignalR.Client.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.AspNet.SignalR.Core, Version=2.0.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
+    <Reference Include="Microsoft.AspNet.SignalR.Core">
       <HintPath>packages\Microsoft.AspNet.SignalR.Core.2.0.3\lib\net45\Microsoft.AspNet.SignalR.Core.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.AspNet.SignalR.Owin, Version=1.2.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
+    <Reference Include="Microsoft.AspNet.SignalR.Owin">
       <HintPath>packages\Microsoft.AspNet.SignalR.Owin.1.2.1\lib\net45\Microsoft.AspNet.SignalR.Owin.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Owin">
@@ -68,23 +66,20 @@
     <Reference Include="Microsoft.Owin.Cors">
       <HintPath>packages\Microsoft.Owin.Cors.2.1.0\lib\net45\Microsoft.Owin.Cors.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Owin.Host.HttpListener, Version=2.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
+    <Reference Include="Microsoft.Owin.Host.HttpListener">
       <HintPath>packages\Microsoft.Owin.Host.HttpListener.2.1.0\lib\net45\Microsoft.Owin.Host.HttpListener.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Owin.Hosting, Version=2.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
+    <Reference Include="Microsoft.Owin.Hosting">
       <HintPath>packages\Microsoft.Owin.Hosting.2.1.0\lib\net45\Microsoft.Owin.Hosting.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Owin.Security">
-      <HintPath>packages\Microsoft.Owin.Security.2.0.1\lib\net45\Microsoft.Owin.Security.dll</HintPath>
+      <HintPath>packages\Microsoft.Owin.Security.2.1.0\lib\net45\Microsoft.Owin.Security.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>packages\Newtonsoft.Json.6.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
-    <Reference Include="Owin, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f0ebd12fd5e55cc5, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
+    <Reference Include="Owin">
       <HintPath>packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
     </Reference>
     <Reference Include="System" />
@@ -96,7 +91,7 @@
     <Reference Include="System.ServiceModel" />
     <Reference Include="System.ServiceModel.Web" />
     <Reference Include="System.Web.Cors">
-      <HintPath>packages\Microsoft.AspNet.Cors.5.0.0\lib\net45\System.Web.Cors.dll</HintPath>
+      <HintPath>packages\Microsoft.AspNet.Cors.5.1.2\lib\net45\System.Web.Cors.dll</HintPath>
     </Reference>
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
diff --git a/packages.config b/packages.config
index 51e63ea..6f3aff0 100644
--- a/packages.config
+++ b/packages.config
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.AspNet.Cors" version="5.0.0" targetFramework="net45" />
+  <package id="Microsoft.AspNet.Cors" version="5.1.2" targetFramework="net45" />
   <package id="Microsoft.AspNet.SignalR.Client" version="2.0.3" targetFramework="net45" />
   <package id="Microsoft.AspNet.SignalR.Core" version="2.0.3" targetFramework="net45" />
   <package id="Microsoft.AspNet.SignalR.Owin" version="1.2.1" targetFramework="net45" />
-  <package id="Microsoft.Bcl" version="1.1.8" targetFramework="net45" />
+  <package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />
   <package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="net45" />
   <package id="Microsoft.Owin" version="2.1.0" targetFramework="net45" />
   <package id="Microsoft.Owin.Cors" version="2.1.0" targetFramework="net45" />
   <package id="Microsoft.Owin.Host.HttpListener" version="2.1.0" targetFramework="net45" />
   <package id="Microsoft.Owin.Hosting" version="2.1.0" targetFramework="net45" />
-  <package id="Microsoft.Owin.Security" version="2.0.1" targetFramework="net45" />
+  <package id="Microsoft.Owin.Security" version="2.1.0" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="6.0.3" targetFramework="net45" />
   <package id="Owin" version="1.0" targetFramework="net45" />
 </packages>
\ No newline at end of file