fix moto g(x) models

thyn · Aug 20, 2020 · 8672ad3 · 8672ad3
1 parent c7b1db5
commit 8672ad3
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/UAParser.FormFactor.Tests/Resources/test_device.yaml b/UAParser.FormFactor.Tests/Resources/test_device.yaml
@@ -80434,3 +80434,8 @@ test_cases:
     family: 'Spider'
     brand: 'Spider'
     model: 'Smartphone'
+
+  - user_agent_string: 'Dalvik/2.1.0 (Linux; U; Android 10; moto g(8) power Build/QPE30.79-124)'
+    family: 'moto g(8) power'
+    brand: 'Generic_Android'
+    model: 'moto g(8) power'
diff --git a/UAParser.FormFactor.Tests/UAParser.FormFactor.Tests.csproj b/UAParser.FormFactor.Tests/UAParser.FormFactor.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net472;net462</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/UAParser.FormFactor/regexes.yaml b/UAParser.FormFactor/regexes.yaml
@@ -5488,7 +5488,10 @@ device_parsers:
   - regex: 'Android \d+?(?:\.\d+|)(?:\.\d+|); ([^;]+?)(?: Build|\) AppleWebKit).+? Safari'
     brand_replacement: 'Generic_Android_Tablet'
     model_replacement: '$1'
-  - regex: 'Android \d+?(?:\.\d+|)(?:\.\d+|); ([^;]+?)(?: Build|\))'
+  - regex: 'Android \d+?(?:\.\d+|)(?:\.\d+|); ([^;]+?) Build'
+    brand_replacement: 'Generic_Android'
+    model_replacement: '$1'
+  - regex: 'Android \d+?(?:\.\d+|)(?:\.\d+|); ([^;]+?)\)'
     brand_replacement: 'Generic_Android'
     model_replacement: '$1'
 

diff --git a/appveyor.yml b/appveyor.yml
@@ -1,7 +1,7 @@
 # common configuration
 
 environment:
-  project_version: '3.0.3'
+  project_version: '3.0.4'
   project_informational_version: '$(project_version)'
   project_version_is_prerelease: false