From e8ad30578b04927694a4b4ba3b3c1bed2d18be7a Mon Sep 17 00:00:00 2001
From: Sergey Plashenko <spl@sitecore.net>
Date: Mon, 14 May 2018 12:04:35 +0300
Subject: [PATCH] Fix for the issue

---
 .../zzz/Sitecore.Support.201408.config        |  1 +
 .../Rules/RuleDeviceInformationManager.cs     | 10 +++--
 .../Sitecore.Support.201408.csproj            | 39 ++++++++++++++++++-
 3 files changed, 44 insertions(+), 6 deletions(-)

diff --git a/src/Sitecore.Support.201408/App_Config/Include/zzz/Sitecore.Support.201408.config b/src/Sitecore.Support.201408/App_Config/Include/zzz/Sitecore.Support.201408.config
index 07a20b1..523eacc 100644
--- a/src/Sitecore.Support.201408/App_Config/Include/zzz/Sitecore.Support.201408.config
+++ b/src/Sitecore.Support.201408/App_Config/Include/zzz/Sitecore.Support.201408.config
@@ -1,4 +1,5 @@
 <configuration xmlns:patch="http://www.sitecore.net/xmlconfig/" xmlns:set="http://www.sitecore.net/xmlconfig/set/" xmlns:role="http://www.sitecore.net/xmlconfig/role/">
   <sitecore role:require="Standalone OR ContentManagement OR ContentDelivery OR Processing OR Reporting">
+    <RuleDeviceInformationManager type="Sitecore.Support.CES.DeviceDetection.Rules.RuleDeviceInformationManager, Sitecore.Support.201408" />
   </sitecore>
 </configuration>
\ No newline at end of file
diff --git a/src/Sitecore.Support.201408/CES/DeviceDetection/Rules/RuleDeviceInformationManager.cs b/src/Sitecore.Support.201408/CES/DeviceDetection/Rules/RuleDeviceInformationManager.cs
index e006e9b..51ca66c 100644
--- a/src/Sitecore.Support.201408/CES/DeviceDetection/Rules/RuleDeviceInformationManager.cs
+++ b/src/Sitecore.Support.201408/CES/DeviceDetection/Rules/RuleDeviceInformationManager.cs
@@ -1,6 +1,4 @@
-
-
-using System;
+using System;
 using Sitecore.Analytics;
 using Sitecore.CES.DeviceDetection;
 using Sitecore.CES.DeviceDetection.Exceptions;
@@ -37,7 +35,11 @@ public string GetExtendedProperty(RuleContext ruleContext, string propertyName)
     private string GetUserAgentFromDeviceRuleContext(DeviceRuleContext deviceRuleContext)
     {
       Assert.ArgumentNotNull(deviceRuleContext, "deviceRuleContext");
-      Assert.IsNotNull(deviceRuleContext.HttpContext, "deviceRuleContext.HttpContext is null");
+      if (deviceRuleContext.HttpContext == null)
+      {
+        return null;
+      }
+
       Assert.IsNotNull(deviceRuleContext.HttpContext.Request, "deviceRuleContext.HttpContext.Request is null");
       return deviceRuleContext.HttpContext.Request.UserAgent;
     }
diff --git a/src/Sitecore.Support.201408/Sitecore.Support.201408.csproj b/src/Sitecore.Support.201408/Sitecore.Support.201408.csproj
index 60c1ef1..5b20c1b 100644
--- a/src/Sitecore.Support.201408/Sitecore.Support.201408.csproj
+++ b/src/Sitecore.Support.201408/Sitecore.Support.201408.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
@@ -41,10 +41,26 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Sitecore.Analytics, Version=11.18.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\SC.Sitecore.Analytics.9.0.0\lib\Sitecore.Analytics.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Sitecore.CES.DeviceDetection, Version=2.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\SC.Sitecore.CES.DeviceDetection.9.0.0\lib\Sitecore.CES.DeviceDetection.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Sitecore.CES.DeviceDetection.Rules, Version=2.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\SC.Sitecore.CES.DeviceDetection.Rules.9.0.0\lib\Sitecore.CES.DeviceDetection.Rules.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
     <Reference Include="Sitecore.Kernel">
       <HintPath>..\packages\SC.Sitecore.Kernel.9.0.0\lib\Sitecore.Kernel.dll</HintPath>
       <Private>False</Private>
     </Reference>
+    <Reference Include="Sitecore.Xdb.Configuration, Version=11.40.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\SC.Sitecore.Xdb.Configuration.9.0.0\lib\Sitecore.Xdb.Configuration.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Web" />
@@ -52,6 +68,7 @@
     <Reference Include="System.Configuration" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="CES\DeviceDetection\Rules\RuleDeviceInformationManager.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
@@ -68,4 +85,22 @@
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="$(VSToolsPath)\WebApplications\Microsoft.WebApplication.targets" Condition="'$(VSToolsPath)' != ''" />
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" Condition="false" />
-</Project>
+  <ProjectExtensions>
+    <VisualStudio>
+      <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
+        <WebProjectProperties>
+          <UseIIS>True</UseIIS>
+          <AutoAssignPort>True</AutoAssignPort>
+          <DevelopmentServerPort>0</DevelopmentServerPort>
+          <DevelopmentServerVPath>/</DevelopmentServerVPath>
+          <IISUrl>http://localhost:54036/</IISUrl>
+          <NTLMAuthentication>False</NTLMAuthentication>
+          <UseCustomServer>False</UseCustomServer>
+          <CustomServerUrl>
+          </CustomServerUrl>
+          <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
+        </WebProjectProperties>
+      </FlavorProperties>
+    </VisualStudio>
+  </ProjectExtensions>
+</Project>
\ No newline at end of file