Merge pull request #236 from WPFDevelopersOrg/dev

Merge: dev branch to 0.0.0.3

Author: yanjinhuagood

src/WPFDevelopers.Shared/Controls/Filter/FilterPopup.xaml

@@ -47,7 +47,7 @@ public static void GetDpi(this Screen screen, DpiType dpiType, out uint dpiX, ou
 
         public static bool CanUsePerMonitorDpi()
         {
-            IntPtr hModule = Win32.LoadLibrary("shcore.dll");
+            IntPtr hModule = Win32.LoadLibrary(Win32.Shcore);
             if (hModule == IntPtr.Zero)
                 return false;
             IntPtr procAddr = Win32.GetProcAddress(hModule, "GetDpiForMonitor");

src/WPFDevelopers.Shared/Controls/Filter/FilterPopup.xaml.cs

@@ -30,9 +30,6 @@
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Filter\FilterCondition.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Filter\FilterEngine.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Filter\FilterItem.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Controls\Filter\FilterPopup.xaml.cs">
-      <DependentUpon>FilterPopup.xaml</DependentUpon>
-    </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Filter\PropertyAccessor.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Gauge\Gauge.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\GestureUnlock\GestureItem.cs" />
@@ -310,10 +307,6 @@
     <Compile Include="$(MSBuildThisFileDirectory)Core\Utilities\DoubleUtil.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Page Include="$(MSBuildThisFileDirectory)Controls\Filter\FilterPopup.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
     <Page Include="$(MSBuildThisFileDirectory)Microsoft.Expression.Controls\Themes\Generic.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>