Merge pull request #147 from nickbabcock/bump-libre

Bump libre to latest

LibreHardwareMonitor

@@ -1 +1 @@
-Subproject commit 85857b62910283a1f110954c3c22ad202b760bc8
+Subproject commit 47ad851feb054246b03d9fcf5df9f041a0caa03d

OhmGraphite/Translation.cs

@@ -32,14 +32,11 @@ namespace OhmGraphite
     {
         Mainboard,
         SuperIO,
-        Aquacomputer,
-        AeroCool,
         CPU,
         RAM,
         GpuNvidia,
         GpuAti,
-        TBalancer,
-        Heatmaster,
+        Cooler,
         HDD,
         NIC
     }
@@ -90,10 +87,6 @@ namespace OhmGraphite
                     return HardwareType.Mainboard;
                 case LibreHardwareMonitor.Hardware.HardwareType.SuperIO:
                     return HardwareType.SuperIO;
-                case LibreHardwareMonitor.Hardware.HardwareType.AquaComputer:
-                    return HardwareType.Aquacomputer;
-                case LibreHardwareMonitor.Hardware.HardwareType.AeroCool:
-                    return HardwareType.AeroCool;
                 case LibreHardwareMonitor.Hardware.HardwareType.Cpu:
                     return HardwareType.CPU;
                 case LibreHardwareMonitor.Hardware.HardwareType.Memory:
@@ -102,10 +95,8 @@ namespace OhmGraphite
                     return HardwareType.GpuNvidia;
                 case LibreHardwareMonitor.Hardware.HardwareType.GpuAmd:
                     return HardwareType.GpuAti;
-                case LibreHardwareMonitor.Hardware.HardwareType.TBalancer:
-                    return HardwareType.TBalancer;
-                case LibreHardwareMonitor.Hardware.HardwareType.Heatmaster:
-                    return HardwareType.Heatmaster;
+                case LibreHardwareMonitor.Hardware.HardwareType.Cooler:
+                    return HardwareType.Cooler;
                 case LibreHardwareMonitor.Hardware.HardwareType.Storage:
                     return HardwareType.HDD;
                 case LibreHardwareMonitor.Hardware.HardwareType.Network:

appveyor.yml

@@ -1,4 +1,4 @@
-image: 'Visual Studio 2017'
+image: 'Visual Studio 2019'
 install:
   - git submodule update --init --recursive
   - msbuild /t:restore

ci/Dockerfile.tests

@@ -1,4 +1,4 @@
-FROM mono:5
+FROM mono:6
 COPY . /tmp/
 WORKDIR /tmp
 RUN msbuild /t:restore /p:TargetFrameworks=net461 && \