From 90efb967fe875bdbd835e14d792dc589c780ab91 Mon Sep 17 00:00:00 2001
From: Yeechan Lu <wz.bluesnow@gmail.com>
Date: Wed, 26 Mar 2014 11:50:21 +0800
Subject: [PATCH] Revert "Use short name of Assembly instead of full name."
 since there are some Assembly loading issues.

This reverts commit cf7ae900.

Short name will produce no errors when debugging using Visual Studio hosting process. However, this will crash outside Visual Studio.
---
 Wox/MainWindow.xaml    |  2 +-
 Wox/SettingWindow.xaml |  2 +-
 Wox/Wox.csproj         | 15 +++++++++++++++
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/Wox/MainWindow.xaml b/Wox/MainWindow.xaml
index 278ce5754..63c980ec7 100644
--- a/Wox/MainWindow.xaml
+++ b/Wox/MainWindow.xaml
@@ -13,7 +13,7 @@
         Icon="Images\app.png"
         >
     <Window.Resources>
-        <ResourceDictionary Source="/PresentationFramework.Classic;component/themes/Classic.xaml"/>
+        <ResourceDictionary Source="/PresentationFramework.Classic,Version=3.0.0.0,Culture=neutral,PublicKeyToken=31bf3856ad364e35,processorArchitecture=MSIL;component/themes/Classic.xaml"/>
     </Window.Resources>
     <Border Style="{DynamicResource WindowBorderStyle}" MouseDown="Border_OnMouseDown">
         <StackPanel Orientation="Vertical">
diff --git a/Wox/SettingWindow.xaml b/Wox/SettingWindow.xaml
index 1d9e0d941..9893c58d3 100644
--- a/Wox/SettingWindow.xaml
+++ b/Wox/SettingWindow.xaml
@@ -188,7 +188,7 @@
                     </Grid.ColumnDefinitions>
                     <StackPanel HorizontalAlignment="Center" Orientation="Horizontal" Grid.ColumnSpan="2" Grid.Row="0" Margin="10">
                         <StackPanel.Resources>
-                            <ResourceDictionary Source="/PresentationFramework.Classic;component/themes/Classic.xaml"/>
+                            <ResourceDictionary Source="/PresentationFramework.Classic,Version=3.0.0.0,Culture=neutral,PublicKeyToken=31bf3856ad364e35,processorArchitecture=MSIL;component/themes/Classic.xaml"/>
                         </StackPanel.Resources>
                         <Border Width="500" Style="{DynamicResource WindowBorderStyle}">
                             <Grid>
diff --git a/Wox/Wox.csproj b/Wox/Wox.csproj
index b2c732c22..9eef3d314 100644
--- a/Wox/Wox.csproj
+++ b/Wox/Wox.csproj
@@ -186,6 +186,16 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <None Include="Themes\Aero Dark.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="Themes\Aero Light.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <Page Include="Themes\Dark.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -206,6 +216,11 @@
       <SubType>Designer</SubType>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Include="Themes\Metro Server.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <Page Include="WebSearchSetting.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>