From db578d243ddd4e12052018b1a441fc7141124a4f Mon Sep 17 00:00:00 2001
From: gummigroda <me@gummigroda.se>
Date: Wed, 25 Sep 2019 13:32:11 +0200
Subject: [PATCH] rinsed vmware discovery to be more correct

---
 .../Discoveries/LOST.VirtualMachine.WMI.Discovery.mpx         | 4 ++--
 .../LOST.Virtual.Machine.Addendum.mpproj                      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/LOST.Virtual.Machine.Addendum/Discoveries/LOST.VirtualMachine.WMI.Discovery.mpx b/LOST.Virtual.Machine.Addendum/Discoveries/LOST.VirtualMachine.WMI.Discovery.mpx
index 7167de4..c4a1a53 100644
--- a/LOST.Virtual.Machine.Addendum/Discoveries/LOST.VirtualMachine.WMI.Discovery.mpx
+++ b/LOST.Virtual.Machine.Addendum/Discoveries/LOST.VirtualMachine.WMI.Discovery.mpx
@@ -11,7 +11,7 @@
         </DiscoveryTypes>
         <DataSource ID="DS" TypeID="Windows!Microsoft.Windows.WmiProviderWithClassSnapshotDataMapper">
           <NameSpace>root\cimv2</NameSpace>
-          <Query><![CDATA[SELECT * FROM Win32_ComputerSystem WHERE (NOT Manufacturer LIKE '%Microsoft Corporation%' AND NOT Model LIKE '%Virtual Machine%') AND (NOT Manufacturer LIKE '%VMware%' AND NOT Model LIKE '%VMware Virtual Platform%') AND (NOT Manufacturer LIKE '%Xen%' AND NOT Model LIKE '%HVM%') AND (NOT Manufacturer LIKE 'QEMU%' AND NOT Model LIKE 'Standard PC%') AND (NOT Manufacturer LIKE '%innotek%GmbH%' AND NOT Model LIKE 'VirtualBox%')]]></Query>
+          <Query><![CDATA[SELECT * FROM Win32_ComputerSystem WHERE (NOT Manufacturer LIKE '%Microsoft Corporation%' AND NOT Model LIKE '%Virtual Machine%') AND (NOT Manufacturer LIKE '%VMware%' AND NOT Model LIKE '%VMware%') AND (NOT Manufacturer LIKE '%Xen%' AND NOT Model LIKE '%HVM%') AND (NOT Manufacturer LIKE 'QEMU%' AND NOT Model LIKE 'Standard PC%') AND (NOT Manufacturer LIKE '%innotek%GmbH%' AND NOT Model LIKE 'VirtualBox%')]]></Query>
           <Frequency>86400</Frequency>
           <ClassId>$MPElement[Name="Windows!Microsoft.Windows.Computer"]$</ClassId>
           <InstanceSettings>
@@ -37,7 +37,7 @@
         </DiscoveryTypes>
         <DataSource ID="DS" TypeID="Windows!Microsoft.Windows.WmiProviderWithClassSnapshotDataMapper">
           <NameSpace>root\cimv2</NameSpace>
-          <Query><![CDATA[SELECT * FROM Win32_ComputerSystem WHERE (Manufacturer LIKE '%VMware%' AND Model LIKE '%VMware Virtual Platform%') or (Manufacturer LIKE '%Microsoft Corporation%' AND Model LIKE '%Virtual Machine%') or (Manufacturer LIKE '%Xen%' AND Model LIKE '%HVM%') or (Manufacturer LIKE 'QEMU%' AND Model LIKE 'Standard PC%') or (Manufacturer LIKE '%innotek%GmbH%' AND Model LIKE 'VirtualBox%')]]></Query>
+          <Query><![CDATA[SELECT * FROM Win32_ComputerSystem WHERE (Manufacturer LIKE '%VMware%' AND Model LIKE '%VMware%') or (Manufacturer LIKE '%Microsoft Corporation%' AND Model LIKE '%Virtual Machine%') or (Manufacturer LIKE '%Xen%' AND Model LIKE '%HVM%') or (Manufacturer LIKE 'QEMU%' AND Model LIKE 'Standard PC%') or (Manufacturer LIKE '%innotek%GmbH%' AND Model LIKE 'VirtualBox%')]]></Query>
           <Frequency>86400</Frequency>
           <ClassId>$MPElement[Name="Windows!Microsoft.Windows.Computer"]$</ClassId>
           <InstanceSettings>
diff --git a/LOST.Virtual.Machine.Addendum/LOST.Virtual.Machine.Addendum.mpproj b/LOST.Virtual.Machine.Addendum/LOST.Virtual.Machine.Addendum.mpproj
index 1c4b7d8..155f5d9 100644
--- a/LOST.Virtual.Machine.Addendum/LOST.Virtual.Machine.Addendum.mpproj
+++ b/LOST.Virtual.Machine.Addendum/LOST.Virtual.Machine.Addendum.mpproj
@@ -5,7 +5,7 @@
     <RootNamespace>LOST.Virtual.Machine.Addendum</RootNamespace>
     <Name>LOST Virtual Machine Addendum</Name>
     <ManagementPackName>LOST.Virtual.Machine.Addendum</ManagementPackName>
-    <Version>1.0.1.0</Version>
+    <Version>1.0.1.1</Version>
     <MpFrameworkVersion>v7.0.2</MpFrameworkVersion>
     <MpFrameworkProfile>OM</MpFrameworkProfile>
     <ProductVersion>1.1.0.0</ProductVersion>