Release 1.0.0.334

GUI/Netfox.Detective/App.xaml.cs

@@ -93,8 +93,8 @@ public static void Main()
 
         protected override void OnStartup(StartupEventArgs e)
         {
-            //var splashScreen = new SplashScreen("splash.png");
-            //splashScreen.Show(true);
+            var splashScreen = new SplashScreen(@"Views\Resources\Netfox_splash.png");
+            splashScreen.Show(true);
 
             base.OnStartup(e);
             StyleManager.ApplicationTheme = new Windows8Theme();

GUI/Netfox.Detective/Netfox.Detective.csproj

@@ -42,6 +42,9 @@
   <PropertyGroup>
     <StartupObject>Netfox.Detective.App</StartupObject>
   </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationIcon>Views\Resources\Netfox.ico</ApplicationIcon>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="BencodeLibrary">
       <HintPath>..\..\lib\BencodeLibrary.dll</HintPath>
@@ -246,6 +249,11 @@
     <Compile Include="..\..\SharedAssemblyInfo.cs">
       <Link>Properties\SharedAssemblyInfo.cs</Link>
     </Compile>
+    <Compile Include="Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
     <Compile Include="Services\BgTasksManagerService.cs" />
     <Compile Include="Services\CrossContainerHierarchyResolver.cs" />
     <Compile Include="Services\DetectiveApplicationServiceBase.cs" />
@@ -820,11 +828,6 @@
     <Compile Include="Properties\AssemblyInfo.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
     <Compile Include="Properties\Settings.Designer.cs">
       <AutoGen>True</AutoGen>
       <DependentUpon>Settings.settings</DependentUpon>
@@ -889,12 +892,6 @@
   <ItemGroup>
     <Resource Include="Views\Resources\Files\zip.png" />
   </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Views\Resources\fox2black.ico" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Views\Resources\fox2white.ico" />
-  </ItemGroup>
   <ItemGroup>
     <Resource Include="Views\Resources\Icons\arr_r.png" />
   </ItemGroup>
@@ -1075,14 +1072,9 @@
     <Folder Include="Views\Query\" />
   </ItemGroup>
   <ItemGroup>
-    <Resource Include="fox2black.ico">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Resource>
-  </ItemGroup>
-  <ItemGroup>
-    <SplashScreen Include="splash.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </SplashScreen>
+    <Resource Include="Views\Resources\Netfox.ico" />
+    <Resource Include="Views\Resources\Netfox128x128.ico" />
+    <SplashScreen Include="Views\Resources\Netfox_splash.png" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="..\..\packages\cef.redist.x64.3.2987.1601\build\cef.redist.x64.targets" Condition="Exists('..\..\packages\cef.redist.x64.3.2987.1601\build\cef.redist.x64.targets')" />

GUI/Netfox.Detective/Properties/Resources.resx

@@ -46,7 +46,7 @@
     
     mimetype: application/x-microsoft.net.object.binary.base64
     value   : The object must be serialized with 
-            : System.Serialization.Formatters.Binary.BinaryFormatter
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
             : and then encoded with base64 encoding.
     
     mimetype: application/x-microsoft.net.object.soap.base64
@@ -60,6 +60,7 @@
             : and then encoded with base64 encoding.
     -->
   <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
     <xsd:element name="root" msdata:IsDataSet="true">
       <xsd:complexType>
         <xsd:choice maxOccurs="unbounded">
@@ -68,9 +69,10 @@
               <xsd:sequence>
                 <xsd:element name="value" type="xsd:string" minOccurs="0" />
               </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" />
+              <xsd:attribute name="name" use="required" type="xsd:string" />
               <xsd:attribute name="type" type="xsd:string" />
               <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="assembly">
@@ -85,9 +87,10 @@
                 <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
                 <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
               </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
               <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
               <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="resheader">
@@ -109,9 +112,19 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="Netfox" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Views\Resources\Netfox.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Netfox128x128" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Views\Resources\Netfox128x128.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Netfox_splash" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Views\Resources\Netfox_splash.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>

GUI/Netfox.Detective/Views/Windows/ApplicationView.xaml

@@ -21,7 +21,6 @@
                                     CommandParameter="{Binding ElementName=ApplicationView}" />
         </i:EventTrigger>
     </i:Interaction.Triggers>
-    <!--Icon="pack://application:,,,/Netfox.Detective;component/Views/Resources/fox2white.ico">-->
     <!-- RESOURCES -->
     <telerik:RadWindow.Resources>
         <ResourceDictionary>
@@ -31,6 +30,9 @@
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </telerik:RadWindow.Resources>
+    <telerik:RadWindow.Icon>
+        <Image Source="pack://application:,,,/Netfox.Detective;component/Views/Resources/Netfox.ico" Height="20" />
+    </telerik:RadWindow.Icon>
     <Grid x:Name="MainApplicationGrid">
 
         <Grid.RowDefinitions>

GUI/Netfox.Detective/Views/Windows/HelpDialog.xaml

@@ -12,7 +12,7 @@
                            xmlns:windows="clr-namespace:Netfox.Detective.ViewModels.Windows"
                            d:DataContext="{d:DesignInstance windows:HelpDialogVm, IsDesignTimeCreatable=False}">
     <telerik:RadWindow.Icon>
-        <Image Source="pack://application:,,,/Netfox.Detective;component/Views/Resources/fox2white.ico" Height="30" />
+        <Image Source="pack://application:,,,/Netfox.Detective;component/Views/Resources/Netfox.ico" Height="30" />
     </telerik:RadWindow.Icon>
     <Grid>
         <TextBlock Grid.Row="0" TextWrapping="Wrap" Margin="12,12,12,12"

GUI/Netfox.Detective/Views/Windows/NewWorkspaceInvestionWizardView.xaml

@@ -28,7 +28,7 @@
         </ResourceDictionary>
     </telerik:RadWindow.Resources>
     <telerik:RadWindow.Icon>
-        <Image Source="pack://application:,,,/Netfox.Detective;component/Views/Resources/fox2white.ico" Height="30" />
+        <Image Source="pack://application:,,,/Netfox.Detective;component/Views/Resources/Netfox.ico" Height="20" />
     </telerik:RadWindow.Icon>
     <Grid>
         <telerik:RadTabControl x:Name="WizardTabControl"

GUI/Netfox.Detective/Views/Windows/SettingsWindow.xaml

@@ -10,7 +10,7 @@
                              mc:Ignorable="d"
                              d:DataContext="{d:DesignInstance windows:SettingsWindowVm, IsDesignTimeCreatable=False}">
     <telerik:RadWindow.Icon>
-        <Image Source="pack://application:,,,/Netfox.Detective;component/Views/Resources/fox2white.ico" Height="30" />
+        <Image Source="pack://application:,,,/Netfox.Detective;component/Views/Resources/Netfox.ico" Height="30" />
     </telerik:RadWindow.Icon>
     <Grid>
         <telerik:RadTabControl TabStripPlacement="Left" Name="SettingsTabsHost" ItemsSource="{Binding Tabs}"

GUI/Netfox.Detective/Views/Windows/TasksWindow.xaml

@@ -12,7 +12,7 @@
                            mc:Ignorable="d"
                            d:DataContext="{d:DesignInstance bgTasks:BgTasksManagerVm, IsDesignTimeCreatable=False}">
     <controls:RadWindow.Icon>
-        <Image Source="pack://application:,,,/Netfox.Detective;component/Views/Resources/fox2white.ico" Height="30" />
+        <Image Source="pack://application:,,,/Netfox.Detective;component/Views/Resources/Netfox.ico" Height="30" />
     </controls:RadWindow.Icon>
     <controls:RadWindow.Resources>
         <ResourceDictionary>

GUI/Netfox.Detective/Views/Workspaces/WorkspacesManagerView.xaml

@@ -112,7 +112,7 @@
                             </Grid.ColumnDefinitions>
 
                             <Image Grid.RowSpan="2"
-                                   Source="pack://application:,,,/Netfox.Detective;component/Views/Resources/fox2black.ico"
+                                   Source="pack://application:,,,/Netfox.Detective;component/Views/Resources/Netfox.ico"
                                    Height="48" Width="48" HorizontalAlignment="Center" />
                             <TextBlock FontStyle="Italic" Grid.Row="0" Grid.Column="1" FontWeight="Normal"
                                        HorizontalAlignment="Left" Text="{Binding Path=TimeStamp}" />

README.md

@@ -36,35 +36,51 @@ To demonstrate Netfox Detective analysis capcabilitie, you may analyze PCAP file
  * YMSG  
  \* SSL/TLS decryption key is mandatory
 
+## Supported PCAP files
+* [LibPCAP](https://wiki.wireshark.org/Development/LibpcapFileFormat)
+* [Pcap-ng](https://wiki.wireshark.org/Development/PcapNg)
+* [Microsoft Network Monitor cap](https://en.wikipedia.org/wiki/Microsoft_Network_Monitor)
+
+# Download
+
+Netfox Detective can be installed from release builds available on [FourceForge](https://sourceforge.net/projects/netfox-detective/).
+
 # Before you start
 Before you start installing NFX Detective, please check that your system meets the requirements. Microsoft Windows Vista SP2 and newer is reauired to run Netfox Detective.
 ### Minimal hardware configuration:
- * 1 gigahertz (GHz) 64-bit (x64) processor
- * 2 gigabyte (GB) RAM
+ * 1 GHz 64-bit (x64) processor
+ * 2 GB RAM
  * 4 GB available hard disk space
  * DirectX 9 graphics device with WDDM 1.0 or higher driver
  * 1,024 x 768 with true color
 ### Recommended hardware configuration
- * 1 gigahertz (GHz) 64-bit (x64) processor
- * 8 gigabyte (GB) RAM
+ * 1 GHz 64-bit (x64) processor
+ * 8 GB RAM
  * 64 GB available SSD hard disk space
  * DirectX 9 graphics device with WDDM 1.0 or higher driver
  * 1,920 x 1,200 with true color
 
 # Prerequisites for successful compilation and easy development: #
 
-It is **mandatory** to develop according to *GitFlow*. More information can be found in [contributing notes](/docs/CONTRIBUTING.md).
-
 ## Mandatory tools to download
 * Visual Studio 2017 Enterprise
 * [Microsoft .NET Framework 4.7 Developer Pack](https://www.microsoft.com/en-us/download/details.aspx?id=55168)
-* [SQL Server 2016 SP1 Express](https://www.microsoft.com/en-us/sql-server/sql-server-downloads)
+* [SQL Server 2016 SP1 Express](https://www.microsoft.com/en-us/sql-server/sql-server-downloads) - for data persistence support
 * [Git LFS](https://git-lfs.github.com/)
  * `git config --global lfs.dialtimeout 0`
  * Without this the HTTP session while pushing LFS tracked file will timeout.
 
 It is strongly advised to remove any obj and bin folders from solution upon repeatedly unsuccessful compilation.
 
+## Required libraries
+* Telerik UI for WPF - [FreeTrial](http://www.telerik.com/products/wpf/overview.aspx) - copy to /lib
+* Infragistics WPF - [FreeTrial](https://www.infragistics.com/free-downloads) - copy to /lib
+* PostSharp - [FreeTrial](https://www.postsharp.net/download)
+* Additional libraries are installed from NuGet.
+
+## Contribution
+It is **mandatory** to develop according to *GitFlow*. More information can be found in [contributing notes](/docs/CONTRIBUTING.md).
+
 ## Useful Visual Studio tools
 * [Resharper](https://www.jetbrains.com/resharper/download/)
 * [MarkdownEditor](https://marketplace.visualstudio.com/items?itemName=MadsKristensen.MarkdownEditor)