3 files changed, 11 insertions, 15 deletions
diff --git a/gpio/samples/simdevice/simdevice.inx b/gpio/samples/simdevice/simdevice.inx
index 34e65a68..330ed46c 100644
--- a/gpio/samples/simdevice/simdevice.inx
+++ b/gpio/samples/simdevice/simdevice.inx
@@ -15,7 +15,7 @@
 Signature="$WINDOWS NT$"
 Class=System
 ClassGuid={4d36e97d-e325-11ce-bfc1-08002be10318}
-Provider=%MSFT%
+Provider=%ProviderName%
 DriverVer=05/07/2010
 CatalogFile=gpiosamples.cat
 
@@ -37,9 +37,9 @@ ExcludeFromSelect=*
 ;*****************************************
 
 [Manufacturer]
-%MSFT%=Microsoft,NT$ARCH$
+%ManufacturerName%=Standard,NT$ARCH$
 
-[Microsoft.NT$ARCH$]
+[Standard.NT$ARCH$]
 %DeviceDesc%=DriverInstall,ACPI\TEST0003
 
 [DriverInstall.NT]
@@ -60,8 +60,8 @@ ServiceBinary  = %12%\Simdevice.sys
 
 [Strings]
 ;Localizable Strings
-MSFT       = "Microsoft"
-Std        = "(Standard system devices) Test device"
+ProviderName = "TODO-Set-Provider"
+ManufacturerName = "TODO-Set-Manufacturer"
 SvcDesc    = "Test device service"
 DeviceDesc = "Test device description"
 
diff --git a/gpio/samples/simdevice/simdevice.vcxproj b/gpio/samples/simdevice/simdevice.vcxproj
index 3df57b24..6f18d8a5 100644
--- a/gpio/samples/simdevice/simdevice.vcxproj
+++ b/gpio/samples/simdevice/simdevice.vcxproj
@@ -19,12 +19,12 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{1683AFEC-30BD-4F42-B05C-070C4502CCC3}</ProjectGuid>
+    <ProjectGuid>{C68A56B6-2E14-451F-99F5-5FA2D4DC5B64}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <KMDF_VERSION_MAJOR>1</KMDF_VERSION_MAJOR>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{59D8C9BB-479F-4995-BDB1-3493C6F6EE6C}</SampleGuid>
+    <SampleGuid>{3B61F907-9D2D-4BB5-A02F-A9B3AD146899}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -175,7 +175,6 @@
   <ItemGroup>
     <Inf Exclude="@(Inf)" Include="*.inf" />
     <FilesToPackage Include="$(TargetPath)" Condition="'$(ConfigurationType)'=='Driver' or '$(ConfigurationType)'=='DynamicLibrary'" />
-    <FilesToPackage Include="@(Inf->'%(CopyOutput)')" Condition="'@(Inf)'!=''" />
   </ItemGroup>
   <ItemGroup>
     <None Exclude="@(None)" Include="*.txt;*.htm;*.html" />
diff --git a/gpio/samples/simdevice/simdevice.vcxproj.Filters b/gpio/samples/simdevice/simdevice.vcxproj.Filters
index c031c4fe..f848b4ab 100644
--- a/gpio/samples/simdevice/simdevice.vcxproj.Filters
+++ b/gpio/samples/simdevice/simdevice.vcxproj.Filters
@@ -3,25 +3,22 @@
   <ItemGroup>
     <Filter Include="Source Files">
       <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx;*</Extensions>
-      <UniqueIdentifier>{A4E7927D-2349-4071-BB6A-5A88985C9C5C}</UniqueIdentifier>
+      <UniqueIdentifier>{7EEBC80E-7D1E-487B-9B5C-640CA9103354}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{77C0EAF1-5ED7-4F36-95C8-F195123751D7}</UniqueIdentifier>
+      <UniqueIdentifier>{CDA01452-B2D7-4FFE-B79F-1927EC219EEC}</UniqueIdentifier>
     </Filter>
     <Filter Include="Resource Files">
       <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms;man;xml</Extensions>
-      <UniqueIdentifier>{FA74BC3C-6CFA-48DF-8233-655E0197C9A5}</UniqueIdentifier>
+      <UniqueIdentifier>{1C43D598-56AE-41AF-A280-5971AF597A4A}</UniqueIdentifier>
     </Filter>
     <Filter Include="Driver Files">
       <Extensions>inf;inv;inx;mof;mc;</Extensions>
-      <UniqueIdentifier>{ABBAD374-35FA-4C9E-A4F6-EBBBA3F54511}</UniqueIdentifier>
+      <UniqueIdentifier>{CFBD4D42-FFFB-478D-86FD-F543854F66ED}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <FilesToPackage Include=".\Debug\\simdevice.inf">
-      <Filter>Driver Files</Filter>
-    </FilesToPackage>
     <Inf Include=".\simdevice.inx">
       <Filter>Driver Files</Filter>
     </Inf>