Merge with sync OUT-598
authorThomas
Tue, 12 Nov 2019 08:53:32 +0100
branchOUT-598
changeset 2857d8bc3f810959
parent 2847 982675e56e93
parent 2856 cee8bea5fc5a
child 2858 0eee1cf5ebd1
Merge with sync
UI/Views/HandshakeView.xaml
Wrappers/WatchedWindow.cs
     1.1 --- a/Properties/AssemblyInfo.cs	Thu Oct 31 17:19:38 2019 +0100
     1.2 +++ b/Properties/AssemblyInfo.cs	Tue Nov 12 08:53:32 2019 +0100
     1.3 @@ -46,5 +46,5 @@
     1.4  // You can specify all the values or you can default the Build and Revision Numbers 
     1.5  // by using the '*' as shown below:
     1.6  // [assembly: AssemblyVersion("1.0.*")]
     1.7 -[assembly: AssemblyVersion("1.0.219.0")]
     1.8 -[assembly: AssemblyFileVersion("1.0.219.0")]
     1.9 +[assembly: AssemblyVersion("1.0.220.0")]
    1.10 +[assembly: AssemblyFileVersion("1.0.220.0")]
     2.1 --- a/Properties/Resources.Designer.cs	Thu Oct 31 17:19:38 2019 +0100
     2.2 +++ b/Properties/Resources.Designer.cs	Tue Nov 12 08:53:32 2019 +0100
     2.3 @@ -1912,7 +1912,7 @@
     2.4          }
     2.5          
     2.6          /// <summary>
     2.7 -        ///   Looks up a localized string similar to Unprotected message subject.
     2.8 +        ///   Looks up a localized string similar to Protect message subject.
     2.9          /// </summary>
    2.10          public static string Options_IsUnencryptedSubjectEnabledText {
    2.11              get {
     3.1 --- a/Properties/Resources.ca.resx	Thu Oct 31 17:19:38 2019 +0100
     3.2 +++ b/Properties/Resources.ca.resx	Tue Nov 12 08:53:32 2019 +0100
     3.3 @@ -320,7 +320,7 @@
     3.4      <value>Deshabilitar format de missatge TNEF</value>
     3.5    </data>
     3.6    <data name="Options_IsUnencryptedSubjectEnabledText" xml:space="preserve">
     3.7 -    <value>Deshabilitar protecció de l’assumpte</value>
     3.8 +    <value>Habilitar protecció de l’assumpte</value>
     3.9    </data>
    3.10    <data name="Options_IsVerboseLoggingEnabledText" xml:space="preserve">
    3.11      <value>Activar registre detallat</value>
     4.1 --- a/Properties/Resources.de.resx	Thu Oct 31 17:19:38 2019 +0100
     4.2 +++ b/Properties/Resources.de.resx	Tue Nov 12 08:53:32 2019 +0100
     4.3 @@ -331,7 +331,7 @@
     4.4      <value>TNEF-Nachrichtenformat deaktivieren</value>
     4.5    </data>
     4.6    <data name="Options_IsUnencryptedSubjectEnabledText" xml:space="preserve">
     4.7 -    <value>Betreff in Nachrichten nicht schützen</value>
     4.8 +    <value>Betreff in Nachrichten schützen</value>
     4.9    </data>
    4.10    <data name="Options_IsVerboseLoggingEnabledText" xml:space="preserve">
    4.11      <value>Ausführliches Protokoll aktivieren</value>
     5.1 --- a/Properties/Resources.es.resx	Thu Oct 31 17:19:38 2019 +0100
     5.2 +++ b/Properties/Resources.es.resx	Tue Nov 12 08:53:32 2019 +0100
     5.3 @@ -319,7 +319,7 @@
     5.4      <value>Deshabilitar el formato de mensajes TNEF</value>
     5.5    </data>
     5.6    <data name="Options_IsUnencryptedSubjectEnabledText" xml:space="preserve">
     5.7 -    <value>Deshabilitar protección del asunto</value>
     5.8 +    <value>Habilitar protección del asunto</value>
     5.9    </data>
    5.10    <data name="Options_IsVerboseLoggingEnabledText" xml:space="preserve">
    5.11      <value>Habilitar el registro detallado</value>
     6.1 --- a/Properties/Resources.fr.resx	Thu Oct 31 17:19:38 2019 +0100
     6.2 +++ b/Properties/Resources.fr.resx	Tue Nov 12 08:53:32 2019 +0100
     6.3 @@ -292,7 +292,7 @@
     6.4      <value>Ne pas utiliser le format de message TNEF</value>
     6.5    </data>
     6.6    <data name="Options_IsUnencryptedSubjectEnabledText" xml:space="preserve">
     6.7 -    <value>Ne pas protéger le sujet des messages</value>
     6.8 +    <value>Protéger le sujet des messages</value>
     6.9    </data>
    6.10    <data name="Options_IsVerboseLoggingEnabledText" xml:space="preserve">
    6.11      <value>Historique abondant</value>
     7.1 --- a/Properties/Resources.hi.resx	Thu Oct 31 17:19:38 2019 +0100
     7.2 +++ b/Properties/Resources.hi.resx	Tue Nov 12 08:53:32 2019 +0100
     7.3 @@ -334,9 +334,6 @@
     7.4    <data name="Options_IsTNEFDisabledText" xml:space="preserve">
     7.5      <value>TNEF संदेश स्वरूप को रद्द करें</value>
     7.6    </data>
     7.7 -  <data name="Options_IsUnencryptedSubjectEnabledText" xml:space="preserve">
     7.8 -    <value>असुरक्षित संदेश विषयों को सक्षम करें</value>
     7.9 -  </data>
    7.10    <data name="Options_IsVerboseLoggingEnabledText" xml:space="preserve">
    7.11      <value>वाचाल संलेखन सक्षम करें </value>
    7.12    </data>
     8.1 --- a/Properties/Resources.mr.resx	Thu Oct 31 17:19:38 2019 +0100
     8.2 +++ b/Properties/Resources.mr.resx	Tue Nov 12 08:53:32 2019 +0100
     8.3 @@ -325,9 +325,6 @@
     8.4    <data name="Options_IsTNEFDisabledText" xml:space="preserve">
     8.5      <value>TNEF संदेश स्वरूप रद्द करा</value>
     8.6    </data>
     8.7 -  <data name="Options_IsUnencryptedSubjectEnabledText" xml:space="preserve">
     8.8 -    <value>असुरक्षित संदेश विषय चालू करा</value>
     8.9 -  </data>
    8.10    <data name="Options_IsVerboseLoggingEnabledText" xml:space="preserve">
    8.11      <value>वर्बोज संलेखन चालू करा</value>
    8.12    </data>
     9.1 --- a/Properties/Resources.nl.resx	Thu Oct 31 17:19:38 2019 +0100
     9.2 +++ b/Properties/Resources.nl.resx	Tue Nov 12 08:53:32 2019 +0100
     9.3 @@ -318,9 +318,6 @@
     9.4    <data name="Options_IsTNEFDisabledText" xml:space="preserve">
     9.5      <value>TNEF-bericht formaat uitschakelen</value>
     9.6    </data>
     9.7 -  <data name="Options_IsUnencryptedSubjectEnabledText" xml:space="preserve">
     9.8 -    <value>Onderwerpbescherming uitschakelen</value>
     9.9 -  </data>
    9.10    <data name="Options_IsVerboseLoggingEnabledText" xml:space="preserve">
    9.11      <value>Uitgebreide logging inschakelen</value>
    9.12    </data>
    10.1 --- a/Properties/Resources.resx	Thu Oct 31 17:19:38 2019 +0100
    10.2 +++ b/Properties/Resources.resx	Tue Nov 12 08:53:32 2019 +0100
    10.3 @@ -422,7 +422,7 @@
    10.4      <value>Disable TNEF message format</value>
    10.5    </data>
    10.6    <data name="Options_IsUnencryptedSubjectEnabledText" xml:space="preserve">
    10.7 -    <value>Unprotected message subject</value>
    10.8 +    <value>Protect message subject</value>
    10.9    </data>
   10.10    <data name="Options_IsVerboseLoggingEnabledText" xml:space="preserve">
   10.11      <value>Enable verbose logging</value>
    11.1 --- a/Properties/Resources.tr.resx	Thu Oct 31 17:19:38 2019 +0100
    11.2 +++ b/Properties/Resources.tr.resx	Tue Nov 12 08:53:32 2019 +0100
    11.3 @@ -318,9 +318,6 @@
    11.4    <data name="Options_IsTNEFDisabledText" xml:space="preserve">
    11.5      <value>TNEF mesaj formatını devre dışı bırak</value>
    11.6    </data>
    11.7 -  <data name="Options_IsUnencryptedSubjectEnabledText" xml:space="preserve">
    11.8 -    <value>Korunmasız mesaj konularını etkinleştir</value>
    11.9 -  </data>
   11.10    <data name="Options_IsVerboseLoggingEnabledText" xml:space="preserve">
   11.11      <value>Ayrıntılı günlüğü etkinleştir</value>
   11.12    </data>
    12.1 --- a/Properties/Resources.zh.resx	Thu Oct 31 17:19:38 2019 +0100
    12.2 +++ b/Properties/Resources.zh.resx	Tue Nov 12 08:53:32 2019 +0100
    12.3 @@ -321,9 +321,6 @@
    12.4    <data name="Options_IsTNEFDisabledText" xml:space="preserve">
    12.5      <value>禁止TNEF邮件格式</value>
    12.6    </data>
    12.7 -  <data name="Options_IsUnencryptedSubjectEnabledText" xml:space="preserve">
    12.8 -    <value>启用无保护的邮件主题</value>
    12.9 -  </data>
   12.10    <data name="Options_IsVerboseLoggingEnabledText" xml:space="preserve">
   12.11      <value>启用详细日志记录</value>
   12.12    </data>
    13.1 --- a/UI/FormControlOptions.xaml	Thu Oct 31 17:19:38 2019 +0100
    13.2 +++ b/UI/FormControlOptions.xaml	Tue Nov 12 08:53:32 2019 +0100
    13.3 @@ -174,6 +174,7 @@
    13.4                          <Grid.RowDefinitions>
    13.5                              <RowDefinition Height="Auto" />
    13.6                              <RowDefinition Height="Auto" />
    13.7 +                            <RowDefinition Height="Auto" />
    13.8                          </Grid.RowDefinitions>
    13.9                          <CheckBox x:Name="CheckBoxIsEncryptAllAccountsEnabled"
   13.10                                    Grid.Row="0"
   13.11 @@ -185,6 +186,21 @@
   13.12                                         Margin="{StaticResource CheckBoxContentMarginWhenTop}" />
   13.13                          </CheckBox>
   13.14                          <CheckBox Grid.Row="1"
   13.15 +                              VerticalContentAlignment="Top"
   13.16 +                              IsThreeState="False"
   13.17 +                              IsChecked="{Binding Path=IsUnencryptedSubjectEnabled, Mode=TwoWay, Converter={StaticResource InvertBool}}"
   13.18 +                              Visibility="{Binding Path=ReleaseMode, Mode=OneWay, Converter={StaticResource ReleaseModeToVisibility}, ConverterParameter=Standard}">
   13.19 +                            <CheckBox.Margin>
   13.20 +                                <Thickness Bottom="0"
   13.21 +                                           Left="0"
   13.22 +                                           Right="0"
   13.23 +                                           Top="{StaticResource PageSubSectionSpacing}" />
   13.24 +                            </CheckBox.Margin>
   13.25 +                            <TextBlock Text="{x:Static p:Resources.Options_IsUnencryptedSubjectEnabledText}"
   13.26 +                                   TextWrapping="Wrap"
   13.27 +                                   Margin="{StaticResource CheckBoxContentMarginWhenTop}" />
   13.28 +                        </CheckBox>
   13.29 +                        <CheckBox Grid.Row="2"
   13.30                                    VerticalContentAlignment="Top"
   13.31                                    IsThreeState="False"
   13.32                                    IsChecked="{Binding Path=IsSyncEnabledForAllAccounts, Mode=TwoWay}"
   13.33 @@ -517,13 +533,13 @@
   13.34                          </StackPanel>
   13.35                          <StackPanel Grid.Row="7"
   13.36                                      Orientation="Horizontal">
   13.37 -                            <Button Style="{StaticResource StyleButtonWrong}"
   13.38 +                            <Button Style="{StaticResource StyleButtonCancel}"
   13.39                                      Margin="0,0,10,0"
   13.40                                      HorizontalAlignment="Left"
   13.41                                      Content="{x:Static p:Resources.Options_LeaveDeviceGroupText}"
   13.42                                      Click="ButtonLeaveDeviceGroup_Click"
   13.43                                      Visibility="{Binding IsGrouped, Converter={StaticResource BoolToVisibility}}" />
   13.44 -                            <Button Style="{StaticResource StyleButtonWrong}"
   13.45 +                            <Button Style="{StaticResource StyleButtonCancel}"
   13.46                                      HorizontalAlignment="Left"
   13.47                                      Content="{x:Static p:Resources.Options_ResetAllOwnKeys}"
   13.48                                      Click="ButtonResetAllOwnKeys_Click" />
   13.49 @@ -542,7 +558,6 @@
   13.50                          <RowDefinition Height="Auto" />
   13.51                          <RowDefinition Height="Auto" />
   13.52                          <RowDefinition Height="Auto" />
   13.53 -                        <RowDefinition Height="Auto" />
   13.54                          <RowDefinition Height="*" />
   13.55                      </Grid.RowDefinitions>
   13.56  
   13.57 @@ -554,25 +569,8 @@
   13.58                                 FontSize="16" />
   13.59                      <Separator Grid.Row="1" />
   13.60  
   13.61 -                    <!--Unprotected subject-->
   13.62 -                    <CheckBox Grid.Row="2"
   13.63 -                              VerticalContentAlignment="Top"
   13.64 -                              IsThreeState="False"
   13.65 -                              IsChecked="{Binding Path=IsUnencryptedSubjectEnabled, Mode=TwoWay}"
   13.66 -                              Visibility="{Binding Path=ReleaseMode, Mode=OneWay, Converter={StaticResource ReleaseModeToVisibility}, ConverterParameter=Standard}">
   13.67 -                        <CheckBox.Margin>
   13.68 -                            <Thickness Bottom="0"
   13.69 -                                       Left="{StaticResource PageLeftSpacing}"
   13.70 -                                       Right="0"
   13.71 -                                       Top="{StaticResource PageTopSpacing}" />
   13.72 -                        </CheckBox.Margin>
   13.73 -                        <TextBlock Text="{x:Static p:Resources.Options_IsUnencryptedSubjectEnabledText}"
   13.74 -                                   TextWrapping="Wrap"
   13.75 -                                   Margin="{StaticResource CheckBoxContentMarginWhenTop}" />
   13.76 -                    </CheckBox>
   13.77 -
   13.78                      <!--Import key button-->
   13.79 -                    <Button Grid.Row="3"
   13.80 +                    <Button Grid.Row="2"
   13.81                              Style="{StaticResource StyleButtonConfirm}"
   13.82                              Content="{x:Static p:Resources.StoreContextMenu_OpenPGPKeyImportWizard}" 
   13.83                              HorizontalAlignment="Left"
   13.84 @@ -580,7 +578,7 @@
   13.85                              Command="{Binding CommandImportKeys}"/>
   13.86  
   13.87                      <!-- Key blacklist title -->
   13.88 -                    <TextBlock Grid.Row="4"
   13.89 +                    <TextBlock Grid.Row="3"
   13.90                                 Text="{x:Static p:Resources.Options_PageSectionBlacklistText}"
   13.91                                 FontWeight="Bold"
   13.92                                 FontSize="16">
   13.93 @@ -599,7 +597,7 @@
   13.94                                         Top="{StaticResource PageSectionSpacing}" />
   13.95                          </TextBlock.Margin>
   13.96                      </TextBlock>
   13.97 -                    <Separator Grid.Row="5">
   13.98 +                    <Separator Grid.Row="4">
   13.99                          <Separator.Visibility>
  13.100                              <MultiBinding Converter="{StaticResource MultiBooleanToVisibility}">
  13.101                                  <Binding Path="ReleaseMode"
  13.102 @@ -611,7 +609,7 @@
  13.103                      </Separator>
  13.104  
  13.105                      <!-- Blacklist -->
  13.106 -                    <Grid Grid.Row="6">
  13.107 +                    <Grid Grid.Row="5">
  13.108                          <Grid.Visibility>
  13.109                              <MultiBinding Converter="{StaticResource MultiBooleanToVisibility}">
  13.110                                  <Binding Path="ReleaseMode"
    14.1 --- a/UI/RibbonCustomizations.cs	Thu Oct 31 17:19:38 2019 +0100
    14.2 +++ b/UI/RibbonCustomizations.cs	Tue Nov 12 08:53:32 2019 +0100
    14.3 @@ -933,7 +933,7 @@
    14.4                  if (WatchedWindow.HandshakeDialog == null)
    14.5                  {
    14.6                      //Mouse.OverrideCursor = System.Windows.Input.Cursors.Wait;
    14.7 -                    Globals.ThisAddIn.GetWatchedWindow(control.Context)?.BuildAndShowManager();
    14.8 +                    Globals.ThisAddIn.GetWatchedWindow(control.Context)?.BuildAndShowHandshakeDialog();
    14.9                  }
   14.10                  else
   14.11                  {
    15.1 --- a/UI/ViewModels/SyncWizardViewModel.cs	Thu Oct 31 17:19:38 2019 +0100
    15.2 +++ b/UI/ViewModels/SyncWizardViewModel.cs	Tue Nov 12 08:53:32 2019 +0100
    15.3 @@ -44,7 +44,7 @@
    15.4                  // Waiting for completion
    15.5                  new WizardGenericPageViewModel
    15.6                  {
    15.7 -                    ButtonCancelStyle = WizardPageViewModelBase.RedButtonStyle,
    15.8 +                    ButtonCancelStyle = WizardPageViewModelBase.GreyButtonStyle,
    15.9                      ButtonCancelText = Properties.Resources.Options_CancelText,
   15.10                      ExplanationText = Properties.Resources.SyncWizard_WaitingForKeysText,
   15.11                      Image = new BitmapImage(new Uri("pack://application:,,,/pEp;component/Resources/ImageIconDeviceGroup.png", UriKind.RelativeOrAbsolute)),
    16.1 --- a/UI/Views/HandshakeView.xaml	Thu Oct 31 17:19:38 2019 +0100
    16.2 +++ b/UI/Views/HandshakeView.xaml	Tue Nov 12 08:53:32 2019 +0100
    16.3 @@ -241,7 +241,7 @@
    16.4                  <TextBlock Text="{x:Static p:Resources.DialogWindow_ResetCommunicationPartner}" 
    16.5                             VerticalAlignment="Center"
    16.6                             Margin="5"/>
    16.7 -                <Button Style="{StaticResource StyleButtonWrong}"
    16.8 +                <Button Style="{StaticResource StyleButtonCancel}"
    16.9                          HorizontalAlignment="Center"
   16.10                          Margin="5,5,0,5"
   16.11                          Content="{x:Static p:Resources.Options_Reset}"
    17.1 --- a/Wrappers/WatchedWindow.cs	Thu Oct 31 17:19:38 2019 +0100
    17.2 +++ b/Wrappers/WatchedWindow.cs	Tue Nov 12 08:53:32 2019 +0100
    17.3 @@ -175,7 +175,7 @@
    17.4          /// <summary>
    17.5          /// Builds the latest state of the encryption status manager then shows the UI.
    17.6          /// </summary>
    17.7 -        public void BuildAndShowManager()
    17.8 +        public void BuildAndShowHandshakeDialog()
    17.9          {
   17.10              /* Resolve all recipients -- this ensures the identities list is correctly populated
   17.11               * 
   17.12 @@ -191,7 +191,7 @@
   17.13              }
   17.14              catch (Exception ex)
   17.15              {
   17.16 -                Log.Verbose("BuildAndShowManager: Error resolving recipients. " + ex.ToString());
   17.17 +                Log.Verbose("BuildAndShowHandshakeDialog: Error resolving recipients. " + ex.ToString());
   17.18              }
   17.19  
   17.20              // Build the dialog
   17.21 @@ -203,7 +203,7 @@
   17.22                  // If message is a draft, create it directly from the Outlook mail item
   17.23                  if (this.IsDraft)
   17.24                  {
   17.25 -                    Log.Verbose("BuildAndShowManager: Creating PEPMessage from draft.");
   17.26 +                    Log.Verbose("BuildAndShowHandshakeDialog: Creating PEPMessage from draft.");
   17.27  
   17.28                      if (PEPMessage.Create(this.CurrentMailItem, out this.handshakeMessage, true) == Globals.ReturnStatus.Success)
   17.29                      {
   17.30 @@ -219,7 +219,7 @@
   17.31                      }
   17.32                      else
   17.33                      {
   17.34 -                        Log.Error("BuildAndShowManager: Error creating PEPMessage from draft.");
   17.35 +                        Log.Error("BuildAndShowHandshakeDialog: Error creating PEPMessage from draft.");
   17.36                          this.handshakeMessage = null;
   17.37                      }
   17.38                  }
   17.39 @@ -229,7 +229,7 @@
   17.40                      if (PEPMessage.Create(this.CurrentMailItem, out this.handshakeMessage) != Globals.ReturnStatus.Success)
   17.41                      {
   17.42                          this.handshakeMessage = null;
   17.43 -                        Log.Error("BuildAndShowManager: Error creating handshkae message.");
   17.44 +                        Log.Error("BuildAndShowHandshakeDialog: Error creating PEPMessage from mirror.");
   17.45                      }
   17.46                  }
   17.47  
   17.48 @@ -303,7 +303,7 @@
   17.49                      }
   17.50                      else
   17.51                      {
   17.52 -                        Log.Error("BuildAndShowManager: No recipients found. No dialog opened.");
   17.53 +                        Log.Error("BuildAndShowHandshakeDialog: No recipients found. No dialog opened.");
   17.54                      }
   17.55                  }
   17.56                  else
   17.57 @@ -313,7 +313,7 @@
   17.58              }
   17.59              catch (Exception ex)
   17.60              {
   17.61 -                Globals.StopAndSendCrashReport(ex);
   17.62 +                Log.Error("BuildAndShowHandshakeDialog: Error creating handshake dialog. " + ex.ToString());
   17.63              }
   17.64          }
   17.65  
    18.1 --- a/pEpForOutlook.csproj	Thu Oct 31 17:19:38 2019 +0100
    18.2 +++ b/pEpForOutlook.csproj	Tue Nov 12 08:53:32 2019 +0100
    18.3 @@ -44,7 +44,7 @@
    18.4      <PublishUrl>publish\</PublishUrl>
    18.5      <InstallUrl>https://pep-project.org/</InstallUrl>
    18.6      <TargetCulture>en</TargetCulture>
    18.7 -    <ApplicationVersion>1.0.219.0</ApplicationVersion>
    18.8 +    <ApplicationVersion>1.0.220.0</ApplicationVersion>
    18.9      <AutoIncrementApplicationRevision>true</AutoIncrementApplicationRevision>
   18.10      <UpdateEnabled>true</UpdateEnabled>
   18.11      <UpdateInterval>0</UpdateInterval>
   18.12 @@ -259,8 +259,8 @@
   18.13        <EmbedInteropTypes>False</EmbedInteropTypes>
   18.14      </Reference>
   18.15      <Reference Include="Microsoft.VisualStudio.Tools.Applications.Runtime, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
   18.16 -    <Reference Include="MimeKitLite, Version=2.3.0.0, Culture=neutral, PublicKeyToken=bede1c8a46c66814, processorArchitecture=MSIL">
   18.17 -      <HintPath>..\packages\MimeKitLite.2.3.1\lib\net45\MimeKitLite.dll</HintPath>
   18.18 +    <Reference Include="MimeKitLite, Version=2.4.0.0, Culture=neutral, PublicKeyToken=bede1c8a46c66814, processorArchitecture=MSIL">
   18.19 +      <HintPath>..\packages\MimeKitLite.2.4.1\lib\net45\MimeKitLite.dll</HintPath>
   18.20      </Reference>
   18.21      <Reference Include="Office, Version=15.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c">
   18.22        <EmbedInteropTypes>True</EmbedInteropTypes>
   18.23 @@ -285,8 +285,8 @@
   18.24      <Reference Include="PresentationFramework" />
   18.25      <Reference Include="System" />
   18.26      <Reference Include="System.Data" />
   18.27 -    <Reference Include="System.Data.SQLite, Version=1.0.111.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
   18.28 -      <HintPath>..\packages\System.Data.SQLite.Core.1.0.111.0\lib\net45\System.Data.SQLite.dll</HintPath>
   18.29 +    <Reference Include="System.Data.SQLite, Version=1.0.112.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
   18.30 +      <HintPath>..\packages\System.Data.SQLite.Core.1.0.112.0\lib\net45\System.Data.SQLite.dll</HintPath>
   18.31      </Reference>
   18.32      <Reference Include="System.Drawing" />
   18.33      <Reference Include="System.Runtime.Caching" />
   18.34 @@ -751,11 +751,13 @@
   18.35        </FlavorProperties>
   18.36      </VisualStudio>
   18.37    </ProjectExtensions>
   18.38 -  <Import Project="..\packages\System.Data.SQLite.Core.1.0.111.0\build\net45\System.Data.SQLite.Core.targets" Condition="Exists('..\packages\System.Data.SQLite.Core.1.0.111.0\build\net45\System.Data.SQLite.Core.targets')" />
   18.39 +  <Import Project="..\packages\System.Data.SQLite.Core.1.0.112.0\build\net45\System.Data.SQLite.Core.targets" Condition="Exists('..\packages\System.Data.SQLite.Core.1.0.112.0\build\net45\System.Data.SQLite.Core.targets')" />
   18.40    <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
   18.41      <PropertyGroup>
   18.42        <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>
   18.43      </PropertyGroup>
   18.44 -    <Error Condition="!Exists('..\packages\System.Data.SQLite.Core.1.0.111.0\build\net45\System.Data.SQLite.Core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\System.Data.SQLite.Core.1.0.111.0\build\net45\System.Data.SQLite.Core.targets'))" />
   18.45 +    <Error Condition="!Exists('..\packages\System.Data.SQLite.Core.1.0.112.0\build\net45\System.Data.SQLite.Core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\System.Data.SQLite.Core.1.0.112.0\build\net45\System.Data.SQLite.Core.targets'))" />
   18.46 +    <Error Condition="!Exists('..\packages\boost.1.71.0.0\build\boost.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\boost.1.71.0.0\build\boost.targets'))" />
   18.47    </Target>
   18.48 +  <Import Project="..\packages\boost.1.71.0.0\build\boost.targets" Condition="Exists('..\packages\boost.1.71.0.0\build\boost.targets')" />
   18.49  </Project>
   18.50 \ No newline at end of file
    19.1 --- a/packages.config	Thu Oct 31 17:19:38 2019 +0100
    19.2 +++ b/packages.config	Tue Nov 12 08:53:32 2019 +0100
    19.3 @@ -1,5 +1,6 @@
    19.4  <?xml version="1.0" encoding="utf-8"?>
    19.5  <packages>
    19.6 -  <package id="MimeKitLite" version="2.3.1" targetFramework="net45" />
    19.7 -  <package id="System.Data.SQLite.Core" version="1.0.111.0" targetFramework="net45" />
    19.8 +  <package id="boost" version="1.71.0.0" targetFramework="net45" />
    19.9 +  <package id="MimeKitLite" version="2.4.1" targetFramework="net45" />
   19.10 +  <package id="System.Data.SQLite.Core" version="1.0.112.0" targetFramework="net45" />
   19.11  </packages>
   19.12 \ No newline at end of file