diff --git a/DerpingDrivers/App.config b/DerpingDrivers/App.config index 3b919fa..4fef6f9 100644 --- a/DerpingDrivers/App.config +++ b/DerpingDrivers/App.config @@ -11,7 +11,7 @@ - + diff --git a/DerpingDrivers/DerpingDrivers.csproj b/DerpingDrivers/DerpingDrivers.csproj index c3c3375..7ef8b74 100644 --- a/DerpingDrivers/DerpingDrivers.csproj +++ b/DerpingDrivers/DerpingDrivers.csproj @@ -53,8 +53,8 @@ ..\packages\Costura.Fody.3.3.2\lib\net40\Costura.dll - - ..\packages\DotNetZip.1.13.2\lib\net40\DotNetZip.dll + + ..\packages\DotNetZip.1.13.3\lib\net40\DotNetZip.dll ..\packages\ExceptionReporter.4.0.2\lib\net40\ExceptionReporter.NET.dll @@ -68,12 +68,6 @@ ..\packages\MahApps.Metro.IconPacks.FontAwesome.2.3.0\lib\net46\MahApps.Metro.IconPacks.FontAwesome.dll - - ..\packages\Markdig.0.15.4\lib\net40\Markdig.dll - - - ..\packages\Markdig.Wpf.0.2.5\lib\net452\Markdig.Wpf.dll - ..\packages\PInvoke.Kernel32.0.5.184\lib\net45\PInvoke.Kernel32.dll @@ -150,6 +144,7 @@ ResXFileCodeGenerator Resources.Designer.cs + Designer Designer @@ -159,14 +154,6 @@ SettingsSingleFileGenerator Settings.Designer.cs - - - - - - - - @@ -177,16 +164,13 @@ - - - - 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}. - + + \ No newline at end of file diff --git a/DerpingDrivers/MainWindow.xaml b/DerpingDrivers/MainWindow.xaml index 653fc73..af68f01 100644 --- a/DerpingDrivers/MainWindow.xaml +++ b/DerpingDrivers/MainWindow.xaml @@ -6,7 +6,6 @@ xmlns:local="clr-namespace:DerpingDrivers" xmlns:controls="clr-namespace:MahApps.Metro.Controls;assembly=MahApps.Metro" xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks" - xmlns:markdig="clr-namespace:Markdig.Wpf;assembly=Markdig.Wpf" mc:Ignorable="d" Title="Derping Drivers - Windows driver compatibility detection tool" Height="440" Width="700" @@ -16,9 +15,6 @@ BorderThickness="0" GlowBrush="{DynamicResource AccentColorBrush}" DataContext="{Binding RelativeSource={RelativeSource Self}}"> - - - @@ -78,11 +74,6 @@ - - - - - diff --git a/DerpingDrivers/MainWindow.xaml.cs b/DerpingDrivers/MainWindow.xaml.cs index 4cf802b..778f99c 100644 --- a/DerpingDrivers/MainWindow.xaml.cs +++ b/DerpingDrivers/MainWindow.xaml.cs @@ -1,11 +1,7 @@ using System.Diagnostics; -using System.Text; using System.Windows; -using System.Windows.Input; using DerpingDrivers.Util; using MahApps.Metro.Controls; -using Markdig; -using Markdig.Wpf; namespace DerpingDrivers { @@ -17,8 +13,6 @@ namespace DerpingDrivers public MainWindow() { InitializeComponent(); - - Loaded += OnLoaded; } /// @@ -51,7 +45,7 @@ namespace DerpingDrivers /// Gets Secure Boot status. /// public string SecureBootEnabled => UefiHelper.IsRunningInUefiMode - ? (UefiHelper.IsSecureBootEnabled ? "Enabled" : "Disabled") + ? UefiHelper.IsSecureBootEnabled ? "Enabled" : "Disabled" : "Not available"; /// @@ -88,61 +82,6 @@ namespace DerpingDrivers /// public bool IsWindows10 => OsVersionInfo.IsWindows10; - private string MatchingSummaryContent - { - get - { - #region TESTSIGNING mode - - if (CodeIntegrityHelper.IsTestSignEnabled) - return Encoding.UTF8.GetString(Properties.Resources.testsigning); - - #endregion - - #region Windows 10, x64 - - if (OsVersionInfo.IsWindows10 - && OsVersionInfo.OsBits == OsVersionInfo.SoftwareArchitecture.Bit64) - { - if (UefiHelper.IsRunningInUefiMode - && !UefiHelper.IsSecureBootEnabled - && !OsUpgradeDetection.IsGrandfathered) - return Encoding.UTF8.GetString(Properties.Resources.win10_x64_uefi_clean); - - if (UefiHelper.IsRunningInUefiMode - && UefiHelper.IsSecureBootEnabled - && !OsUpgradeDetection.IsGrandfathered) - return Encoding.UTF8.GetString(Properties.Resources.win10_x64_uefi_secure_clean); - - if (UefiHelper.IsRunningInUefiMode - && UefiHelper.IsSecureBootEnabled - && OsUpgradeDetection.IsGrandfathered) - return Encoding.UTF8.GetString(Properties.Resources.win10_x64_uefi_secure_upgraded); - - if (UefiHelper.IsRunningInUefiMode - && !UefiHelper.IsSecureBootEnabled - && OsUpgradeDetection.IsGrandfathered) - return Encoding.UTF8.GetString(Properties.Resources.win10_x64_uefi_upgraded); - } - - #endregion - - return "*None available*"; - } - } - - private void OnLoaded(object sender, RoutedEventArgs e) - { - SummaryViewer.Pipeline = new MarkdownPipelineBuilder().UseSupportedExtensions().Build(); - - SummaryViewer.Markdown = MatchingSummaryContent; - } - - private void OpenHyperlink(object sender, ExecutedRoutedEventArgs e) - { - Process.Start(e.Parameter.ToString()); - } - private void Web_OnClick(object sender, RoutedEventArgs e) { Process.Start("https://vigem.org"); diff --git a/DerpingDrivers/Properties/Resources.Designer.cs b/DerpingDrivers/Properties/Resources.Designer.cs index 10ee6f7..da6a21a 100644 --- a/DerpingDrivers/Properties/Resources.Designer.cs +++ b/DerpingDrivers/Properties/Resources.Designer.cs @@ -59,95 +59,5 @@ namespace DerpingDrivers.Properties { resourceCulture = value; } } - - /// - /// Looks up a localized resource of type System.Byte[]. - /// - internal static byte[] testsigning { - get { - object obj = ResourceManager.GetObject("testsigning", resourceCulture); - return ((byte[])(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Byte[]. - /// - internal static byte[] win10_x64_uefi_clean { - get { - object obj = ResourceManager.GetObject("win10_x64_uefi_clean", resourceCulture); - return ((byte[])(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Byte[]. - /// - internal static byte[] win10_x64_uefi_secure_clean { - get { - object obj = ResourceManager.GetObject("win10_x64_uefi_secure_clean", resourceCulture); - return ((byte[])(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Byte[]. - /// - internal static byte[] win10_x64_uefi_secure_upgraded { - get { - object obj = ResourceManager.GetObject("win10_x64_uefi_secure_upgraded", resourceCulture); - return ((byte[])(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Byte[]. - /// - internal static byte[] win10_x64_uefi_upgraded { - get { - object obj = ResourceManager.GetObject("win10_x64_uefi_upgraded", resourceCulture); - return ((byte[])(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Byte[]. - /// - internal static byte[] win10_x86_uefi_clean { - get { - object obj = ResourceManager.GetObject("win10_x86_uefi_clean", resourceCulture); - return ((byte[])(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Byte[]. - /// - internal static byte[] win10_x86_uefi_secure_clean { - get { - object obj = ResourceManager.GetObject("win10_x86_uefi_secure_clean", resourceCulture); - return ((byte[])(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Byte[]. - /// - internal static byte[] win10_x86_uefi_secure_upgraded { - get { - object obj = ResourceManager.GetObject("win10_x86_uefi_secure_upgraded", resourceCulture); - return ((byte[])(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Byte[]. - /// - internal static byte[] win10_x86_uefi_upgraded { - get { - object obj = ResourceManager.GetObject("win10_x86_uefi_upgraded", resourceCulture); - return ((byte[])(obj)); - } - } } } diff --git a/DerpingDrivers/Properties/Resources.resx b/DerpingDrivers/Properties/Resources.resx index 5bced40..2f96abe 100644 --- a/DerpingDrivers/Properties/Resources.resx +++ b/DerpingDrivers/Properties/Resources.resx @@ -118,31 +118,4 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ..\Resources\testsigning.md;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\Resources\win10_x64_uefi_clean.md;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\Resources\win10_x64_uefi_secure_clean.md;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\Resources\win10_x64_uefi_secure_upgraded.md;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\Resources\win10_x64_uefi_upgraded.md;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\Resources\win10_x86_uefi_clean.md;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\Resources\win10_x86_uefi_secure_clean.md;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\Resources\win10_x86_uefi_secure_upgraded.md;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\Resources\win10_x86_uefi_upgraded.md;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - \ No newline at end of file diff --git a/DerpingDrivers/Resources/testsigning.md b/DerpingDrivers/Resources/testsigning.md deleted file mode 100644 index e89ea82..0000000 --- a/DerpingDrivers/Resources/testsigning.md +++ /dev/null @@ -1,7 +0,0 @@ -# ☠️ TESTSIGNING enabled ☠️ - -To disable test-signing, execute the following command in an [elevated prompt](https://www.thewindowsclub.com/how-to-run-command-prompt-as-an-administrator): - -```cmd -bcdedit.exe -set TESTSIGNING OFF -``` \ No newline at end of file diff --git a/DerpingDrivers/Resources/win10_x64_uefi_clean.md b/DerpingDrivers/Resources/win10_x64_uefi_clean.md deleted file mode 100644 index 6195ceb..0000000 --- a/DerpingDrivers/Resources/win10_x64_uefi_clean.md +++ /dev/null @@ -1,7 +0,0 @@ -# Windows 10 64-bits (UEFI) - -## Abstract - -- 👌 running on [64-Bit](https://en.wikipedia.org/wiki/X86-64) installation; you can use more than 4 GiB of memory. -- 👌 running in [UEFI mode](https://en.wikipedia.org/wiki/Unified_Extensible_Firmware_Interface); you can use all modern features of your mainboard and processor like booting from drives greater than 2 TiB and advanced security solutions like [TPM chips](https://en.wikipedia.org/wiki/Trusted_Platform_Module) and [Secure Boot](https://en.wikipedia.org/wiki/Unified_Extensible_Firmware_Interface#Secure_boot_criticism). -- ⚠️ Secure Boot is available but disabled. \ No newline at end of file diff --git a/DerpingDrivers/Resources/win10_x64_uefi_secure_clean.md b/DerpingDrivers/Resources/win10_x64_uefi_secure_clean.md deleted file mode 100644 index e69de29..0000000 diff --git a/DerpingDrivers/Resources/win10_x64_uefi_secure_upgraded.md b/DerpingDrivers/Resources/win10_x64_uefi_secure_upgraded.md deleted file mode 100644 index e69de29..0000000 diff --git a/DerpingDrivers/Resources/win10_x64_uefi_upgraded.md b/DerpingDrivers/Resources/win10_x64_uefi_upgraded.md deleted file mode 100644 index e69de29..0000000 diff --git a/DerpingDrivers/Resources/win10_x86_uefi_clean.md b/DerpingDrivers/Resources/win10_x86_uefi_clean.md deleted file mode 100644 index e69de29..0000000 diff --git a/DerpingDrivers/Resources/win10_x86_uefi_secure_clean.md b/DerpingDrivers/Resources/win10_x86_uefi_secure_clean.md deleted file mode 100644 index e69de29..0000000 diff --git a/DerpingDrivers/Resources/win10_x86_uefi_secure_upgraded.md b/DerpingDrivers/Resources/win10_x86_uefi_secure_upgraded.md deleted file mode 100644 index e69de29..0000000 diff --git a/DerpingDrivers/Resources/win10_x86_uefi_upgraded.md b/DerpingDrivers/Resources/win10_x86_uefi_upgraded.md deleted file mode 100644 index e69de29..0000000 diff --git a/DerpingDrivers/Util/OSVersionInfo.cs b/DerpingDrivers/Util/OSVersionInfo.cs index fc94951..8ba9c9e 100644 --- a/DerpingDrivers/Util/OSVersionInfo.cs +++ b/DerpingDrivers/Util/OSVersionInfo.cs @@ -3,7 +3,6 @@ using System.Collections.Generic; using System.Diagnostics; using System.Linq; using System.Runtime.InteropServices; -using Markdig.Helpers; using Microsoft.Win32; // http://www.codeproject.com/Articles/73000/Getting-Operating-System-Version-Info-Even-for-Win @@ -21,7 +20,7 @@ namespace DerpingDrivers.Util /// public static class OsVersionInfo { - private static readonly List Windows10ReleaseIds = new OrderedList + private static readonly List Windows10ReleaseIds = new List { "1507", "1607", diff --git a/DerpingDrivers/packages.config b/DerpingDrivers/packages.config index 29208e4..d9936a6 100644 --- a/DerpingDrivers/packages.config +++ b/DerpingDrivers/packages.config @@ -2,14 +2,12 @@ - + - + - -