Merge branch 'hotfix/0.8.1'

TheSylence · Oct 17, 2016 · 149c42e · 149c42e
2 parents 3b8bd9a + b08cb5b
commit 149c42e
Show file tree

Hide file tree

Showing 5 changed files with 72 additions and 61 deletions.
diff --git a/Twice.smproj b/Twice.smproj
diff --git a/Twice/Properties/AssemblyInfo.cs b/Twice/Properties/AssemblyInfo.cs
@@ -17,7 +17,7 @@
 [assembly: ComVisible( false )]
 [assembly: ThemeInfo( ResourceDictionaryLocation.None, ResourceDictionaryLocation.SourceAssembly )]
 [assembly: LogMinimalMessage]
-[assembly: AssemblyVersion( "0.8.0.0" )]
-[assembly: AssemblyFileVersion( "0.8.0.0" )]
+[assembly: AssemblyVersion( "0.8.1.0" )]
+[assembly: AssemblyFileVersion( "0.8.1.0" )]
 [assembly: InternalsVisibleTo( "Twice.Tests" )]
 [assembly: InternalsVisibleTo( "DynamicProxyGenAssembly2" )]
diff --git a/Twice/Resources/Texts/Changelog.json b/Twice/Resources/Texts/Changelog.json
@@ -1,4 +1,15 @@
 [
+    {
+        "Version": "0.8.1",
+        "Date": "2016-10-17",
+        "Description": "",
+        "NewFeatures": [],
+        "Changes": [],
+        "Fixes": [
+            "Fixed crash at startup"
+        ],
+        "Issues": []
+    },
     {
         "Version": "0.8.0",
         "Date": "2016-10-17",
@@ -30,33 +41,33 @@
         "NewFeatures": [
             "Added button to settings dialog to manually clear the cache"
         ],
-        "Changes": [ ],
+        "Changes": [],
         "Fixes": [
             "Fixed slow performance for loading statuses in columns"
         ],
-        "Issues": [ ]
+        "Issues": []
     },
     {
         "Version": "0.7.5",
         "Date": "2016-09-30",
         "Description": "",
-        "NewFeatures": [ ],
-        "Changes": [ ],
+        "NewFeatures": [],
+        "Changes": [],
         "Fixes": [
             "Fixed more crashes when extracting cards from webpages"
         ],
-        "Issues": [ ]
+        "Issues": []
     },
     {
         "Version": "0.7.4",
         "Date": "2016-09-30",
         "Description": "",
-        "NewFeatures": [ ],
-        "Changes": [ ],
+        "NewFeatures": [],
+        "Changes": [],
         "Fixes": [
             "Fixed crashes when extracting cards from webpages"
         ],
-        "Issues": [ ]
+        "Issues": []
     },
     {
         "Version": "0.7.3",
@@ -77,13 +88,13 @@
             "Retweeted statuses are now correctly sorted in timelines",
             "Removed focus lines around controls in some cases"
         ],
-        "Issues": [ ]
+        "Issues": []
     },
     {
         "Version": "0.7.2",
         "Date": "2016-08-30",
         "Description": "",
-        "NewFeatures": [ ],
+        "NewFeatures": [],
         "Changes": [
             "Various UI tweaks throughout the app",
             "Added documentation for different kind of mutes"
@@ -96,7 +107,7 @@
             "Fixed rare case where statuses are displayed twice",
             "Fixed loading of statuses that contain more than one url that points to another status"
         ],
-        "Issues": [ ]
+        "Issues": []
     },
     {
         "Version": "0.7.1",
@@ -110,8 +121,8 @@
             "Audio for videos is now muted by default",
             "Added information which of your accounts is followed by a user to the profile dialog"
         ],
-        "Fixes": [ ],
-        "Issues": [ ]
+        "Fixes": [],
+        "Issues": []
     },
     {
         "Version": "0.7.0",
@@ -136,13 +147,13 @@
             "Fixed rare crash when viewing a tweet with replies",
             "Window position is saved for displays that are left to the primary display"
         ],
-        "Issues": [ ]
+        "Issues": []
     },
     {
         "Version": "0.6.6",
         "Date": "2016-07-10",
         "Description": "",
-        "NewFeatures": [ ],
+        "NewFeatures": [],
         "Changes": [
             "Clicking a quote in a tweet now opens the quote instead of the tweet"
         ],
@@ -154,7 +165,7 @@
             "Fixed crash when viewing details of test tweets in settings dialog",
             "Favourites column now has correct title"
         ],
-        "Issues": [ ]
+        "Issues": []
     },
     {
         "Version": "0.6.5",
@@ -176,13 +187,13 @@
             "Fixed issue where some statuses would display more than once",
             "Accounts in user profile and search are no longer marked as verified when they are not"
         ],
-        "Issues": [ ]
+        "Issues": []
     },
     {
         "Version": "0.6.4",
         "Date": "2016-06-25",
         "Description": "",
-        "NewFeatures": [ ],
+        "NewFeatures": [],
         "Changes": [
             "Update check is now done once an hour",
             "(Un)following a user from the profile dialog is now done using the default account"
@@ -192,18 +203,18 @@
             "Fixed crash when opening user profile via retweet message",
             "Select all checkbox in account column selection is now behaving correctly"
         ],
-        "Issues": [ ]
+        "Issues": []
     },
     {
         "Version": "0.6.3",
         "Date": "2016-06-23",
         "Description": "",
-        "NewFeatures": [ ],
-        "Changes": [ ],
+        "NewFeatures": [],
+        "Changes": [],
         "Fixes": [
             "Fixed potential crash in status/profile parser"
         ],
-        "Issues": [ ]
+        "Issues": []
     },
     {
         "Version": "0.6.2",
@@ -224,18 +235,18 @@
             "Improved UI responsiveness when opening user profiles",
             "Retweet dialog now closes after retweeting/quoting the tweet"
         ],
-        "Issues": [ ]
+        "Issues": []
     },
     {
         "Version": "0.6.1",
         "Date": "2016-06-19",
         "Description": "",
-        "NewFeatures": [ ],
-        "Changes": [ ],
+        "NewFeatures": [],
+        "Changes": [],
         "Fixes": [
             "In-App notification displays at correct position"
         ],
-        "Issues": [ ]
+        "Issues": []
     },
     {
         "Version": "0.6.0",
@@ -260,7 +271,7 @@
             "Options for a tweet now work when menu was opened by clicking the options button",
             "Compose dialogs now have correct keyboard focus when opened"
         ],
-        "Issues": [ ]
+        "Issues": []
     },
     {
         "Version": "0.5.1",
@@ -273,8 +284,8 @@
         "Changes": [
             "Own statuses can be retweeted"
         ],
-        "Fixes": [ ],
-        "Issues": [ ]
+        "Fixes": [],
+        "Issues": []
     },
     {
         "Version": "0.5.0",
@@ -298,13 +309,13 @@
             "Fixed many crashes when no internet connection is available",
             "Fixed crash when openeing profile of a non existing user"
         ],
-        "Issues": [ ]
+        "Issues": []
     },
     {
         "Version": "0.4.2",
         "Date": "2016-06-05",
         "Description": "",
-        "NewFeatures": [ ],
+        "NewFeatures": [],
         "Changes": [
             "Reply to all' is now enabled for every tweet",
             "Own username is not used in reply when using 'Reply to all",
@@ -316,18 +327,18 @@
             "(un)following a user now updates the (un)follow button immediately",
             "Autocompletebox in light theme now uses correct colors"
         ],
-        "Issues": [ ]
+        "Issues": []
     },
     {
         "Version": "0.4.1",
         "Date": "2016-06-04",
         "Description": "",
-        "NewFeatures": [ ],
-        "Changes": [ ],
+        "NewFeatures": [],
+        "Changes": [],
         "Fixes": [
             "Fixed crash when Twitter reported a status deletion in realtime streaming"
         ],
-        "Issues": [ ]
+        "Issues": []
     },
     {
         "Version": "0.4.0",
@@ -355,7 +366,7 @@
             "When a status contains multiple images, all of them are now displayed",
             "Emojis in statuses no longer break following entities"
         ],
-        "Issues": [ ]
+        "Issues": []
     },
     {
         "Version": "0.3.0",
@@ -378,7 +389,7 @@
             "Profile pictures are now sharp in every dialog",
             "Editing a muting no longer creates a new one"
         ],
-        "Issues": [ ]
+        "Issues": []
     },
     {
         "Version": "0.2.0",
@@ -400,48 +411,48 @@
             "Changelogs are no longer being cut off in about dialog",
             "Using certain colors for entities no longer crashes"
         ],
-        "Issues": [ ]
+        "Issues": []
     },
     {
         "Version": "0.1.3",
         "Date": "2016-04-03",
         "Description": "",
-        "NewFeatures": [ ],
-        "Changes": [ ],
+        "NewFeatures": [],
+        "Changes": [],
         "Fixes": [
             "Fixed update search not working"
         ],
-        "Issues": [ ]
+        "Issues": []
     },
     {
         "Version": "0.1.2",
         "Date": "2016-04-03",
         "Description": "",
-        "NewFeatures": [ ],
-        "Changes": [ ],
+        "NewFeatures": [],
+        "Changes": [],
         "Fixes": [
             "Fixed crash when looking for updates"
         ],
-        "Issues": [ ]
+        "Issues": []
     },
     {
         "Version": "0.1.1",
         "Date": "2016-04-03",
         "Description": "",
-        "NewFeatures": [ ],
-        "Changes": [ ],
+        "NewFeatures": [],
+        "Changes": [],
         "Fixes": [
             "Fixed crash when adding a new account"
         ],
-        "Issues": [ ]
+        "Issues": []
     },
     {
         "Version": "0.1.0",
         "Date": "2016-04-03",
         "Description": "First beta release",
-        "NewFeatures": [ ],
-        "Changes": [ ],
-        "Fixes": [ ],
+        "NewFeatures": [],
+        "Changes": [],
+        "Fixes": [],
         "Issues": [
             "Adding columns doesn't work",
             "Loading more content in the timeline column doesn't work",

diff --git a/Twice/Twice.csproj b/Twice/Twice.csproj
@@ -175,8 +175,8 @@
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
-    <Reference Include="System.Data.SQLite, Version=1.0.103.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Data.SQLite.Core.1.0.103\lib\net46\System.Data.SQLite.dll</HintPath>
+    <Reference Include="System.Data.SQLite, Version=1.0.102.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Data.SQLite.Core.1.0.102.0\lib\net46\System.Data.SQLite.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Drawing" />
@@ -806,14 +806,14 @@
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
     <Error Condition="!Exists('..\packages\Fody.1.29.4\build\dotnet\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.1.29.4\build\dotnet\Fody.targets'))" />
-    <Error Condition="!Exists('..\packages\System.Data.SQLite.Core.1.0.103\build\net46\System.Data.SQLite.Core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\System.Data.SQLite.Core.1.0.103\build\net46\System.Data.SQLite.Core.targets'))" />
+    <Error Condition="!Exists('..\packages\System.Data.SQLite.Core.1.0.102.0\build\net46\System.Data.SQLite.Core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\System.Data.SQLite.Core.1.0.102.0\build\net46\System.Data.SQLite.Core.targets'))" />
   </Target>
-  <Import Project="..\packages\OctoPack.3.4.2\tools\OctoPack.targets" Condition="Exists('..\packages\OctoPack.3.4.2\tools\OctoPack.targets')" />
+  <Import Project="..\packages\System.Data.SQLite.Core.1.0.102.0\build\net46\System.Data.SQLite.Core.targets" Condition="Exists('..\packages\System.Data.SQLite.Core.1.0.102.0\build\net46\System.Data.SQLite.Core.targets')" />
+  <Import Project="..\packages\OctoPack.3.4.1\tools\OctoPack.targets" Condition="Exists('..\packages\OctoPack.3.4.1\tools\OctoPack.targets')" />
   <Target Name="EnsureOctoPackImported" BeforeTargets="BeforeBuild" Condition="'$(OctoPackImported)' == ''">
-    <Error Condition="!Exists('..\packages\OctoPack.3.4.2\tools\OctoPack.targets') And ('$(RunOctoPack)' != '' And $(RunOctoPack))" Text="You are trying to build with OctoPack, but the NuGet targets file that OctoPack depends on is not available on this computer. This is probably because the OctoPack package has not been committed to source control, or NuGet Package Restore is not enabled. Please enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=317567." HelpKeyword="BCLBUILD2001" />
-    <Error Condition="Exists('..\packages\OctoPack.3.4.2\tools\OctoPack.targets') And ('$(RunOctoPack)' != '' And $(RunOctoPack))" Text="OctoPack cannot be run because NuGet packages were restored prior to the build running, and the targets file was unavailable when the build started. Please build the project again to include these packages in the build. You may also need to make sure that your build server does not delete packages prior to each build. For more information, see http://go.microsoft.com/fwlink/?LinkID=317568." HelpKeyword="BCLBUILD2002" />
+    <Error Condition="!Exists('..\packages\OctoPack.3.4.1\tools\OctoPack.targets') And ('$(RunOctoPack)' != '' And $(RunOctoPack))" Text="You are trying to build with OctoPack, but the NuGet targets file that OctoPack depends on is not available on this computer. This is probably because the OctoPack package has not been committed to source control, or NuGet Package Restore is not enabled. Please enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=317567." HelpKeyword="BCLBUILD2001" />
+    <Error Condition="Exists('..\packages\OctoPack.3.4.1\tools\OctoPack.targets') And ('$(RunOctoPack)' != '' And $(RunOctoPack))" Text="OctoPack cannot be run because NuGet packages were restored prior to the build running, and the targets file was unavailable when the build started. Please build the project again to include these packages in the build. You may also need to make sure that your build server does not delete packages prior to each build. For more information, see http://go.microsoft.com/fwlink/?LinkID=317568." HelpKeyword="BCLBUILD2002" />
   </Target>
-  <Import Project="..\packages\System.Data.SQLite.Core.1.0.103\build\net46\System.Data.SQLite.Core.targets" Condition="Exists('..\packages\System.Data.SQLite.Core.1.0.103\build\net46\System.Data.SQLite.Core.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.
   <Target Name="BeforeBuild">

diff --git a/Twice/packages.config b/Twice/packages.config
@@ -20,7 +20,7 @@
   <package id="Ninject" version="3.2.2.0" targetFramework="net461" />
   <package id="NLog" version="4.3.10" targetFramework="net461" />
   <package id="NotificationsExtensions.Win10" version="14332.0.2" targetFramework="net461" />
-  <package id="OctoPack" version="3.4.2" targetFramework="net461" developmentDependency="true" />
+  <package id="OctoPack" version="3.4.1" targetFramework="net461" developmentDependency="true" />
   <package id="Resourcer.Fody" version="1.4.2" targetFramework="net461" developmentDependency="true" />
   <package id="Rx-Core" version="2.2.5" targetFramework="net461" />
   <package id="Rx-Interfaces" version="2.2.5" targetFramework="net461" />
@@ -31,7 +31,7 @@
   <package id="Seal.Fody" version="1.0.3" targetFramework="net461" />
   <package id="Splat" version="1.6.2" targetFramework="net461" />
   <package id="squirrel.windows" version="1.4.4" targetFramework="net461" />
-  <package id="System.Data.SQLite.Core" version="1.0.103" targetFramework="net461" />
+  <package id="System.Data.SQLite.Core" version="1.0.102.0" targetFramework="net461" />
   <package id="WpfLocalizeExtension" version="2.3.2" targetFramework="net461" />
   <package id="XAMLMarkupExtensions" version="1.2.2" targetFramework="net461" />
 </packages>