Merge pull request 8393 from hotfix/v4.4.23 into master

51Degrees · Mar 24, 2023 · ae49bb3 · ae49bb3
2 parents e42e42d + 1046903
commit ae49bb3
Show file tree

Hide file tree

Showing 9 changed files with 33 additions and 48 deletions.
diff --git a/Examples/Cloud/Framework-Web/Framework-Web.csproj b/Examples/Cloud/Framework-Web/Framework-Web.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="..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props" Condition="Exists('..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
@@ -51,28 +51,28 @@
     <Reference Include="FiftyOne.Common, Version=4.4.3.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\..\packages\FiftyOne.Common.4.4.3\lib\netstandard2.0\FiftyOne.Common.dll</HintPath>
     </Reference>
-    <Reference Include="FiftyOne.Pipeline.CloudRequestEngine, Version=4.4.14.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="FiftyOne.Pipeline.CloudRequestEngine, Version=4.4.15.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\..\packages\FiftyOne.Pipeline.CloudRequestEngine.4.4.15\lib\netstandard2.0\FiftyOne.Pipeline.CloudRequestEngine.dll</HintPath>
     </Reference>
-    <Reference Include="FiftyOne.Pipeline.Core, Version=4.4.14.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="FiftyOne.Pipeline.Core, Version=4.4.15.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\..\packages\FiftyOne.Pipeline.Core.4.4.15\lib\netstandard2.0\FiftyOne.Pipeline.Core.dll</HintPath>
     </Reference>
-    <Reference Include="FiftyOne.Pipeline.Engines, Version=4.4.14.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="FiftyOne.Pipeline.Engines, Version=4.4.15.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\..\packages\FiftyOne.Pipeline.Engines.4.4.15\lib\netstandard2.0\FiftyOne.Pipeline.Engines.dll</HintPath>
     </Reference>
-    <Reference Include="FiftyOne.Pipeline.Engines.FiftyOne, Version=4.4.14.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="FiftyOne.Pipeline.Engines.FiftyOne, Version=4.4.15.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\..\packages\FiftyOne.Pipeline.Engines.FiftyOne.4.4.15\lib\netstandard2.0\FiftyOne.Pipeline.Engines.FiftyOne.dll</HintPath>
     </Reference>
-    <Reference Include="FiftyOne.Pipeline.JavaScriptBuilderElement, Version=4.4.14.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="FiftyOne.Pipeline.JavaScriptBuilderElement, Version=4.4.15.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\..\packages\FiftyOne.Pipeline.JavaScriptBuilder.4.4.15\lib\netstandard2.0\FiftyOne.Pipeline.JavaScriptBuilderElement.dll</HintPath>
     </Reference>
-    <Reference Include="FiftyOne.Pipeline.JsonBuilder, Version=4.4.14.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="FiftyOne.Pipeline.JsonBuilder, Version=4.4.15.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\..\packages\FiftyOne.Pipeline.JsonBuilder.4.4.15\lib\netstandard2.0\FiftyOne.Pipeline.JsonBuilder.dll</HintPath>
     </Reference>
-    <Reference Include="FiftyOne.Pipeline.Web.Framework, Version=4.4.14.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="FiftyOne.Pipeline.Web.Framework, Version=4.4.15.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\..\packages\FiftyOne.Pipeline.Web.4.4.15\lib\net462\FiftyOne.Pipeline.Web.Framework.dll</HintPath>
     </Reference>
-    <Reference Include="FiftyOne.Pipeline.Web.Shared, Version=4.4.14.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="FiftyOne.Pipeline.Web.Shared, Version=4.4.15.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\..\packages\FiftyOne.Pipeline.Web.Shared.4.4.15\lib\netstandard2.0\FiftyOne.Pipeline.Web.Shared.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=6.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
@@ -124,6 +124,9 @@
     <Reference Include="Microsoft.Extensions.Primitives, Version=6.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
       <HintPath>..\..\..\packages\Microsoft.Extensions.Primitives.6.0.0\lib\net461\Microsoft.Extensions.Primitives.dll</HintPath>
     </Reference>
+    <Reference Include="Microsoft.Web.Infrastructure, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\Microsoft.Web.Infrastructure.2.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
+    </Reference>
     <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\..\..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
@@ -224,10 +227,6 @@
     <Reference Include="System.Web.DynamicData" />
     <Reference Include="System.Web.Entity" />
     <Reference Include="System.Web.ApplicationServices" />
-    <Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <Private>True</Private>
-      <HintPath>..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
-    </Reference>
     <Reference Include="AspNet.ScriptManager.bootstrap">
       <HintPath>..\..\..\packages\AspNet.ScriptManager.bootstrap.3.4.1\lib\net45\AspNet.ScriptManager.bootstrap.dll</HintPath>
     </Reference>

diff --git a/Examples/Cloud/Framework-Web/packages.config b/Examples/Cloud/Framework-Web/packages.config
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Antlr" version="3.5.0.2" targetFramework="net472" />
   <package id="AspNet.ScriptManager.bootstrap" version="3.4.1" targetFramework="net472" />
@@ -39,7 +39,7 @@
   <package id="Microsoft.Extensions.Logging.Abstractions" version="6.0.3" targetFramework="net481" />
   <package id="Microsoft.Extensions.Options" version="6.0.0" targetFramework="net481" />
   <package id="Microsoft.Extensions.Primitives" version="6.0.0" targetFramework="net481" />
-  <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net472" />
+  <package id="Microsoft.Web.Infrastructure" version="2.0.0" targetFramework="net481" />
   <package id="Modernizr" version="2.8.3" targetFramework="net472" />
   <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net481" />
   <package id="NUglify" version="1.20.5" targetFramework="net481" />

diff --git a/Examples/ExampleBase/FiftyOne.DeviceDetection.Examples.csproj b/Examples/ExampleBase/FiftyOne.DeviceDetection.Examples.csproj
@@ -91,7 +91,7 @@
     </When>
     <Otherwise>
       <ItemGroup>
-        <PackageReference Include="FiftyOne.DeviceDetection" Version="4.4.21" />
+        <PackageReference Include="FiftyOne.DeviceDetection" Version="4.4.22" />
       </ItemGroup>
     </Otherwise>
   </Choose>

diff --git a/Examples/OnPremise/Framework-Web/Framework-Web.csproj b/Examples/OnPremise/Framework-Web/Framework-Web.csproj
@@ -1,4 +1,4 @@
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props" Condition="Exists('..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
@@ -87,40 +87,28 @@
     <Reference Include="FiftyOne.Common, Version=4.4.3.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\..\packages\FiftyOne.Common.4.4.3\lib\netstandard2.0\FiftyOne.Common.dll</HintPath>
     </Reference>
-    <Reference Include="FiftyOne.DeviceDetection, Version=4.4.21.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\FiftyOne.DeviceDetection.4.4.21\lib\netstandard2.0\FiftyOne.DeviceDetection.dll</HintPath>
-    </Reference>
-    <Reference Include="FiftyOne.DeviceDetection.Cloud, Version=4.4.21.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\FiftyOne.DeviceDetection.Cloud.4.4.21\lib\netstandard2.0\FiftyOne.DeviceDetection.Cloud.dll</HintPath>
-    </Reference>
-    <Reference Include="FiftyOne.DeviceDetection.Hash.Engine.OnPremise, Version=4.4.21.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\FiftyOne.DeviceDetection.Hash.Engine.OnPremise.4.4.21\lib\netstandard2.0\FiftyOne.DeviceDetection.Hash.Engine.OnPremise.dll</HintPath>
-    </Reference>
-    <Reference Include="FiftyOne.DeviceDetection.Shared, Version=4.4.21.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\FiftyOne.DeviceDetection.Shared.4.4.21\lib\netstandard2.0\FiftyOne.DeviceDetection.Shared.dll</HintPath>
-    </Reference>
-    <Reference Include="FiftyOne.Pipeline.CloudRequestEngine, Version=4.4.14.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="FiftyOne.Pipeline.CloudRequestEngine, Version=4.4.15.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\..\packages\FiftyOne.Pipeline.CloudRequestEngine.4.4.15\lib\netstandard2.0\FiftyOne.Pipeline.CloudRequestEngine.dll</HintPath>
     </Reference>
-    <Reference Include="FiftyOne.Pipeline.Core, Version=4.4.14.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="FiftyOne.Pipeline.Core, Version=4.4.15.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\..\packages\FiftyOne.Pipeline.Core.4.4.15\lib\netstandard2.0\FiftyOne.Pipeline.Core.dll</HintPath>
     </Reference>
-    <Reference Include="FiftyOne.Pipeline.Engines, Version=4.4.14.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="FiftyOne.Pipeline.Engines, Version=4.4.15.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\..\packages\FiftyOne.Pipeline.Engines.4.4.15\lib\netstandard2.0\FiftyOne.Pipeline.Engines.dll</HintPath>
     </Reference>
-    <Reference Include="FiftyOne.Pipeline.Engines.FiftyOne, Version=4.4.14.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="FiftyOne.Pipeline.Engines.FiftyOne, Version=4.4.15.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\..\packages\FiftyOne.Pipeline.Engines.FiftyOne.4.4.15\lib\netstandard2.0\FiftyOne.Pipeline.Engines.FiftyOne.dll</HintPath>
     </Reference>
-    <Reference Include="FiftyOne.Pipeline.JavaScriptBuilderElement, Version=4.4.14.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="FiftyOne.Pipeline.JavaScriptBuilderElement, Version=4.4.15.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\..\packages\FiftyOne.Pipeline.JavaScriptBuilder.4.4.15\lib\netstandard2.0\FiftyOne.Pipeline.JavaScriptBuilderElement.dll</HintPath>
     </Reference>
-    <Reference Include="FiftyOne.Pipeline.JsonBuilder, Version=4.4.14.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="FiftyOne.Pipeline.JsonBuilder, Version=4.4.15.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\..\packages\FiftyOne.Pipeline.JsonBuilder.4.4.15\lib\netstandard2.0\FiftyOne.Pipeline.JsonBuilder.dll</HintPath>
     </Reference>
-    <Reference Include="FiftyOne.Pipeline.Web.Framework, Version=4.4.14.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="FiftyOne.Pipeline.Web.Framework, Version=4.4.15.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\..\packages\FiftyOne.Pipeline.Web.4.4.15\lib\net462\FiftyOne.Pipeline.Web.Framework.dll</HintPath>
     </Reference>
-    <Reference Include="FiftyOne.Pipeline.Web.Shared, Version=4.4.14.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="FiftyOne.Pipeline.Web.Shared, Version=4.4.15.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\..\packages\FiftyOne.Pipeline.Web.Shared.4.4.15\lib\netstandard2.0\FiftyOne.Pipeline.Web.Shared.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=6.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
@@ -309,6 +297,10 @@
     </None>
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\..\FiftyOne.DeviceDetection\FiftyOne.DeviceDetection.Hash.Engine.OnPremise\FiftyOne.DeviceDetection.Hash.Engine.OnPremise.csproj">
+      <Project>{7b1d2221-1d2b-449b-9d97-bd35a3197ca9}</Project>
+      <Name>FiftyOne.DeviceDetection.Hash.Engine.OnPremise</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\ExampleBase\FiftyOne.DeviceDetection.Examples.csproj">
       <Project>{cdad980c-bf23-4bdb-8391-bfb6ed8ddcfc}</Project>
       <Name>FiftyOne.DeviceDetection.Examples</Name>
@@ -345,14 +337,12 @@
     </PropertyGroup>
     <Error Condition="!Exists('..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props'))" />
     <Error Condition="!Exists('..\..\..\packages\System.Text.Json.6.0.0\build\System.Text.Json.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\System.Text.Json.6.0.0\build\System.Text.Json.targets'))" />
-    <Error Condition="!Exists('..\..\..\packages\FiftyOne.DeviceDetection.Hash.Engine.OnPremise.4.4.21\build\FiftyOne.DeviceDetection.Hash.Engine.OnPremise.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\FiftyOne.DeviceDetection.Hash.Engine.OnPremise.4.4.21\build\FiftyOne.DeviceDetection.Hash.Engine.OnPremise.targets'))" />
   </Target>
   <PropertyGroup>
     <PostBuildEvent>
     </PostBuildEvent>
   </PropertyGroup>
   <Import Project="..\..\..\packages\System.Text.Json.6.0.0\build\System.Text.Json.targets" Condition="Exists('..\..\..\packages\System.Text.Json.6.0.0\build\System.Text.Json.targets')" />
-  <Import Project="..\..\..\packages\FiftyOne.DeviceDetection.Hash.Engine.OnPremise.4.4.21\build\FiftyOne.DeviceDetection.Hash.Engine.OnPremise.targets" Condition="Exists('..\..\..\packages\FiftyOne.DeviceDetection.Hash.Engine.OnPremise.4.4.21\build\FiftyOne.DeviceDetection.Hash.Engine.OnPremise.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

diff --git a/Examples/OnPremise/Framework-Web/packages.config b/Examples/OnPremise/Framework-Web/packages.config
@@ -1,11 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="FiftyOne.Caching" version="4.4.4" targetFramework="net481" />
   <package id="FiftyOne.Common" version="4.4.3" targetFramework="net472" />
-  <package id="FiftyOne.DeviceDetection" version="4.4.21" targetFramework="net481" />
-  <package id="FiftyOne.DeviceDetection.Cloud" version="4.4.21" targetFramework="net481" />
-  <package id="FiftyOne.DeviceDetection.Hash.Engine.OnPremise" version="4.4.21" targetFramework="net481" />
-  <package id="FiftyOne.DeviceDetection.Shared" version="4.4.21" targetFramework="net481" />
   <package id="FiftyOne.Pipeline.CloudRequestEngine" version="4.4.15" targetFramework="net481" />
   <package id="FiftyOne.Pipeline.Core" version="4.4.15" targetFramework="net481" />
   <package id="FiftyOne.Pipeline.Engines" version="4.4.15" targetFramework="net481" />

diff --git a/...One.DeviceDetection/Examples/Cloud-UACH-manual/Cloud - Client-Hints Not Integrated.csproj b/...One.DeviceDetection/Examples/Cloud-UACH-manual/Cloud - Client-Hints Not Integrated.csproj
@@ -68,7 +68,7 @@
     </When>
     <Otherwise>
       <ItemGroup>
-        <PackageReference Include="FiftyOne.DeviceDetection" Version="4.4.21" />
+        <PackageReference Include="FiftyOne.DeviceDetection" Version="4.4.22" />
       </ItemGroup>
     </Otherwise>
   </Choose>

diff --git a/FiftyOne.DeviceDetection/Examples/Cloud-UACH/Cloud - Client-Hints.csproj b/FiftyOne.DeviceDetection/Examples/Cloud-UACH/Cloud - Client-Hints.csproj
@@ -68,7 +68,7 @@
     </When>
     <Otherwise>
       <ItemGroup>
-        <PackageReference Include="FiftyOne.DeviceDetection" Version="4.4.21" />
+        <PackageReference Include="FiftyOne.DeviceDetection" Version="4.4.22" />
       </ItemGroup>
     </Otherwise>
   </Choose>

diff --git a/FiftyOne.DeviceDetection/Examples/UACH-manual/Client-Hints Not Integrated.csproj b/FiftyOne.DeviceDetection/Examples/UACH-manual/Client-Hints Not Integrated.csproj
@@ -68,7 +68,7 @@
     </When>
     <Otherwise>
       <ItemGroup>
-        <PackageReference Include="FiftyOne.DeviceDetection" Version="4.4.21" />
+        <PackageReference Include="FiftyOne.DeviceDetection" Version="4.4.22" />
       </ItemGroup>
     </Otherwise>
   </Choose>

diff --git a/FiftyOne.DeviceDetection/Examples/UACH/Client-Hints.csproj b/FiftyOne.DeviceDetection/Examples/UACH/Client-Hints.csproj
@@ -68,7 +68,7 @@
     </When>
     <Otherwise>
       <ItemGroup>
-        <PackageReference Include="FiftyOne.DeviceDetection" Version="4.4.21" />
+        <PackageReference Include="FiftyOne.DeviceDetection" Version="4.4.22" />
       </ItemGroup>
     </Otherwise>
   </Choose>