From 6a319747dc7fb96b41f9d41cf3e1d84fccd3bed9 Mon Sep 17 00:00:00 2001
From: jskyzero <jskyzero@outlook.com>
Date: Thu, 28 Sep 2017 01:10:24 +0800
Subject: [PATCH] fix sqlite3.dll issue

---
 DataBase/DataBase.csproj        |  5 ++++-
 MoePicture/MoePicture.csproj    | 26 +++++++++++++++++---------
 MoePicture/Package.appxmanifest |  4 ++--
 MoePicture/UC/PictureGrid.xaml  |  2 +-
 4 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/DataBase/DataBase.csproj b/DataBase/DataBase.csproj
index 779e5e0..c31ce49 100644
--- a/DataBase/DataBase.csproj
+++ b/DataBase/DataBase.csproj
@@ -120,7 +120,10 @@
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
-    <SDKReference Include="SQLite.UWP.2015, Version=3.20.0">
+    <SDKReference Include="Microsoft.VCLibs, Version=14.0">
+      <Name>Visual C++ 2015 Runtime for Universal Windows Platform Apps</Name>
+    </SDKReference>
+    <SDKReference Include="SQLite.UWP.2015, Version=3.20.1">
       <Name>SQLite for Universal Windows Platform</Name>
     </SDKReference>
   </ItemGroup>
diff --git a/MoePicture/MoePicture.csproj b/MoePicture/MoePicture.csproj
index e0619fa..05cf231 100644
--- a/MoePicture/MoePicture.csproj
+++ b/MoePicture/MoePicture.csproj
@@ -18,10 +18,10 @@
     <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <WindowsXamlEnableOverview>true</WindowsXamlEnableOverview>
     <PackageCertificateKeyFile>MoePicture_TemporaryKey.pfx</PackageCertificateKeyFile>
-    <AppxAutoIncrementPackageRevision>True</AppxAutoIncrementPackageRevision>
+    <AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>
     <AppxBundle>Auto</AppxBundle>
-    <AppxBundlePlatforms>x64</AppxBundlePlatforms>
-    <PackageCertificateThumbprint>3E6A7DCBDB1DCADC44AED8C235DEF3CDF7ABB801</PackageCertificateThumbprint>
+    <AppxBundlePlatforms>x86|x64|arm</AppxBundlePlatforms>
+    <PackageCertificateThumbprint>474ABC31B158CB231DD834CD31B4C961ACF03D14</PackageCertificateThumbprint>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <DebugSymbols>true</DebugSymbols>
@@ -141,7 +141,6 @@
     <AppxManifest Include="Package.appxmanifest">
       <SubType>Designer</SubType>
     </AppxManifest>
-    <None Include="MoePicture_TemporaryKey.pfx" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Properties\Default.rd.xml" />
@@ -201,11 +200,6 @@
       <Name>TileUpdate</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <SDKReference Include="SQLite.UWP.2015, Version=3.20.0">
-      <Name>SQLite for Universal Windows Platform</Name>
-    </SDKReference>
-  </ItemGroup>
   <ItemGroup>
     <Page Include="Styles\Style.xaml">
       <SubType>Designer</SubType>
@@ -244,9 +238,23 @@
   <ItemGroup>
     <WCFMetadata Include="Connected Services\" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="MoePicture_TemporaryKey.pfx" />
+  </ItemGroup>
+  <ItemGroup>
+    <SDKReference Include="Microsoft.VCLibs, Version=14.0">
+      <Name>Visual C++ 2015 Runtime for Universal Windows Platform Apps</Name>
+    </SDKReference>
+    <SDKReference Include="SQLite.UWP.2015, Version=3.20.1">
+      <Name>SQLite for Universal Windows Platform</Name>
+    </SDKReference>
+  </ItemGroup>
   <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
     <VisualStudioVersion>14.0</VisualStudioVersion>
   </PropertyGroup>
+  <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+  </PropertyGroup>
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/MoePicture/Package.appxmanifest b/MoePicture/Package.appxmanifest
index 08cd09b..079a867 100644
--- a/MoePicture/Package.appxmanifest
+++ b/MoePicture/Package.appxmanifest
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" IgnorableNamespaces="uap mp">
-  <Identity Name="4ceea491-d703-4bad-a265-180d0f2c7dbc" Publisher="CN=84832" Version="1.0.3.0" />
+  <Identity Name="4ceea491-d703-4bad-a265-180d0f2c7dbc" Publisher="CN=jskyzero" Version="1.0.3.0" />
   <mp:PhoneIdentity PhoneProductId="4ceea491-d703-4bad-a265-180d0f2c7dbc" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
   <Properties>
     <DisplayName>MoePicture</DisplayName>
-    <PublisherDisplayName>84832</PublisherDisplayName>
+    <PublisherDisplayName>jskyzero</PublisherDisplayName>
     <Logo>Assets\StoreLogo.png</Logo>
   </Properties>
   <Dependencies>
diff --git a/MoePicture/UC/PictureGrid.xaml b/MoePicture/UC/PictureGrid.xaml
index 63976d2..271ce05 100644
--- a/MoePicture/UC/PictureGrid.xaml
+++ b/MoePicture/UC/PictureGrid.xaml
@@ -35,7 +35,7 @@
   <Grid DataContext="{Binding PicturesVM, Source={StaticResource Locator}}">
     <ProgressRing IsActive="{Binding PictureItems.Count, Converter={StaticResource IntBoolConverter}, Mode=OneWay}" 
                   Style="{StaticResource MyProgressRingStyle}" />
-    <CC:AdaptiveGridView Name="listView"
+    <CC:AdaptiveGridView 
               MinItemHeight="180"
               MinItemWidth="180"
               ItemsSource="{Binding PictureItems}"