Upgrade to v2.2.0.1

1.支持自动选择实验性模式的系统版本，并且弹出提示对话框 2.支持通过控制台参数启动（使用--help可以查看详情） 3.While循环内判断逻辑改用比较器，使运行效率提升 4.支持隐藏运行模式（--hide） 5.支持自动激活模式（--auto） 6.程序集改为嵌入式资源静态加载 7.旧版自解压临时目录改为独立临时工作区 Google Translate : 1. Support system edition of automatic selection of experimental mode, and a prompt dialog box pops up. 2. Support to start through the console parameters (use --help to see details) 3. The decision logic in the While Loop uses a comparator to improve the operating efficiency. 4. Support hidden operation mode (--hide). 5. Support automatic activation mode (--auto) 6. Assembly to embedded resources static loading. 7. The old version of the self-extracting temporary directory was changed to a separate temporary workspace.
2018-06-07 21:16:17 +08:00 · 2018-06-07 21:16:17 +08:00 · cd50996311
commit cd50996311
parent f51df4aa01
25 changed files with 1599 additions and 1467 deletions
--- a/.vs/CMWTAT_DIGITAL/DesignTimeBuild/.dtbcache
+++ b/.vs/CMWTAT_DIGITAL/DesignTimeBuild/.dtbcache
--- a/.vs/CMWTAT_DIGITAL/v15/.suo
+++ b/.vs/CMWTAT_DIGITAL/v15/.suo
--- a/.vs/CMWTAT_DIGITAL/v15/Server/sqlite3/storage.ide
+++ b/.vs/CMWTAT_DIGITAL/v15/Server/sqlite3/storage.ide
--- a/.vs/config/applicationhost.config
+++ b/.vs/config/applicationhost.config
--- a/CMWTAT_DIGITAL/App.xaml
+++ b/CMWTAT_DIGITAL/App.xaml
@ -2,7 +2,8 @@
             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
             xmlns:local="clr-namespace:CMWTAT_KMS"
-             StartupUri="MainWindow.xaml">
+             StartupUri="MainWindow.xaml"
+             >
    <Application.Resources>
        <ResourceDictionary>
            <ResourceDictionary.MergedDictionaries>
--- a/CMWTAT_DIGITAL/App.xaml.cs
+++ b/CMWTAT_DIGITAL/App.xaml.cs
@ -1,4 +1,5 @@
-using System;
+using CMWTAT_DIGITAL;
+using System;
 using System.Collections.Generic;
 using System.Configuration;
 using System.Data;
--- a/CMWTAT_DIGITAL/CMWTAT.ico
+++ b/CMWTAT_DIGITAL/CMWTAT.ico
--- a/CMWTAT_DIGITAL/CMWTAT.png
+++ b/CMWTAT_DIGITAL/CMWTAT.png
--- a/CMWTAT_DIGITAL/CMWTAT_DIGITAL.csproj
+++ b/CMWTAT_DIGITAL/CMWTAT_DIGITAL.csproj
@ -2,6 +2,7 @@
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
  <PropertyGroup>
+    <TargetPlatformVersion>10.0.10240.0</TargetPlatformVersion>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
    <ProjectGuid>{961DE925-B82C-4515-8FBD-6805E36D1212}</ProjectGuid>
@ -13,6 +14,21 @@
    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
    <WarningLevel>4</WarningLevel>
    <TargetFrameworkProfile />
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
    <PlatformTarget>AnyCPU</PlatformTarget>
@ -41,18 +57,28 @@
  <PropertyGroup>
    <ApplicationIcon>CMWTAT.ico</ApplicationIcon>
  </PropertyGroup>
+  <PropertyGroup>
+    <StartupObject>CMWTAT_DIGITAL.Program</StartupObject>
+  </PropertyGroup>
  <ItemGroup>
    <Reference Include="MaterialDesignColors, Version=1.1.3.0, Culture=neutral, processorArchitecture=MSIL">
      <HintPath>..\packages\MaterialDesignColors.1.1.3\lib\net45\MaterialDesignColors.dll</HintPath>
+      <Private>False</Private>
    </Reference>
    <Reference Include="MaterialDesignThemes.Wpf, Version=2.4.0.1044, Culture=neutral, processorArchitecture=MSIL">
      <HintPath>..\packages\MaterialDesignThemes.2.4.0.1044\lib\net45\MaterialDesignThemes.Wpf.dll</HintPath>
+      <Private>False</Private>
    </Reference>
    <Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
      <HintPath>..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <Private>False</Private>
    </Reference>
    <Reference Include="System" />
    <Reference Include="System.Data" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Runtime" />
+    <Reference Include="System.Runtime.InteropServices.WindowsRuntime" />
+    <Reference Include="System.Windows.Forms" />
    <Reference Include="System.Xml" />
    <Reference Include="Microsoft.CSharp" />
    <Reference Include="System.Core" />
@ -61,6 +87,9 @@
    <Reference Include="System.Xaml">
      <RequiredTargetFramework>4.0</RequiredTargetFramework>
    </Reference>
+    <Reference Include="Windows.Data" />
+    <Reference Include="Windows.Foundation" />
+    <Reference Include="Windows.UI" />
    <Reference Include="WindowsBase" />
    <Reference Include="PresentationCore" />
    <Reference Include="PresentationFramework" />
@ -92,6 +121,7 @@
  </ItemGroup>
  <ItemGroup>
    <Compile Include="OSVersionInfoClass.cs" />
+    <Compile Include="Program.cs" />
    <Compile Include="Properties\AssemblyInfo.cs">
      <SubType>Code</SubType>
    </Compile>
@ -122,5 +152,29 @@
  <ItemGroup>
    <Resource Include="CMWTAT.ico" />
  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Res\MaterialDesignColors.dll" />
+    <EmbeddedResource Include="Res\MaterialDesignThemes.Wpf.dll" />
+    <EmbeddedResource Include="Res\Newtonsoft.Json.dll" />
+  </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Res\gatherosstate.exe" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Res\slc.dll" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Res\slmgr.vbs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="bin\Debug\" />
+  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
--- a/CMWTAT_DIGITAL/CMWTAT_DIGITAL.csproj.user
+++ b/CMWTAT_DIGITAL/CMWTAT_DIGITAL.csproj.user
@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
+    <StartArguments>--hide -a</StartArguments>
+  </PropertyGroup>
+  <PropertyGroup>
+    <PublishUrlHistory>publish\</PublishUrlHistory>
+    <InstallUrlHistory />
+    <SupportUrlHistory />
+    <UpdateUrlHistory />
+    <BootstrapperUrlHistory />
+    <ErrorReportUrlHistory />
+    <FallbackCulture>zh-CN</FallbackCulture>
+    <VerifyUploadedFiles>false</VerifyUploadedFiles>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
+    <StartArguments>
+    </StartArguments>
+  </PropertyGroup>
+</Project>
--- a/CMWTAT_DIGITAL/MainWindow.xaml
+++ b/CMWTAT_DIGITAL/MainWindow.xaml
@ -17,6 +17,8 @@
        FontFamily="{DynamicResource MaterialDesignFont}"
        ResizeMode="NoResize"
        d:DataContext="{d:DesignInstance domain:ViewModel, d:IsDesignTimeCreatable=False}"
+        Icon="CMWTAT.ico"
+        Closing="Window_Closing"
        >
    <Grid>
        <StackPanel>
@ -117,6 +119,27 @@
                    </Grid>
                </materialDesign:DialogHost.DialogContent>
            </materialDesign:DialogHost>
+            <materialDesign:DialogHost x:Name="DialogHelp" IsOpen="False">
+                <materialDesign:DialogHost.DialogContent>
+                    <Grid>
+                        <materialDesign:Card>
+                            <StackPanel>
+                                <StackPanel Margin="16,16,16,8">
+                                    <!--<ProgressBar Style="{DynamicResource MaterialDesignCircularProgressBar}" HorizontalAlignment="Center" Margin="0,0,0,0" IsIndeterminate="True" Value="0" VerticalAlignment="Top" Width="32" Height="32" />-->
+                                    <TextBlock Style="{DynamicResource MaterialDesignTitleTextBlock}" Margin="0" HorizontalAlignment="Left" VerticalAlignment="Top" FontSize="16" FontWeight="Bold" Text="Help"></TextBlock>
+                                    <TextBlock Style="{DynamicResource MaterialDesignTitleTextBlock}" Margin="0,8,0,0" HorizontalAlignment="Center" VerticalAlignment="Bottom" FontSize="14" Text="This application now supports the use of console args to startup!&#10;&#10;-a&#9;--auto&#9;&#9;Auto activate.&#10;-h&#9;--hide&#9;&#9;Run with hide mode (Only be worked with -auto).&#10;-e&#9;--expact&#9;&#9;Experimental activation.&#10;-?&#9;--help&#9;&#9;Show this help Dialog."></TextBlock>
+                                </StackPanel>
+                                <StackPanel HorizontalAlignment="Right" VerticalAlignment="Bottom" Orientation="Horizontal" Margin="8,0,8,8">
+                                    <Button Style="{StaticResource MaterialDesignFlatButton}" IsCancel="True" 
+                                            Command="{x:Static materialDesign:DialogHost.CloseDialogCommand}"
+                                            CommandParameter="Sample2Cancel"
+                                            HorizontalAlignment="Center">OK</Button>
+                                </StackPanel>
+                            </StackPanel>
+                        </materialDesign:Card>
+                    </Grid>
+                </materialDesign:DialogHost.DialogContent>
+            </materialDesign:DialogHost>
            <materialDesign:DialogHost x:Name="DialogWithExit" IsOpen="False">
                <materialDesign:DialogHost.DialogContent>
                    <Grid>
--- a/CMWTAT_DIGITAL/MainWindow.xaml.cs
+++ b/CMWTAT_DIGITAL/MainWindow.xaml.cs
@ -21,6 +21,7 @@ using System.Threading;
 using Microsoft.Win32;
 using CMWTAT_DIGITAL.Domain;
 using System.Text.RegularExpressions;
+using System.Windows.Forms;

 namespace CMWTAT_DIGITAL
 {
@ -31,18 +32,169 @@ namespace CMWTAT_DIGITAL
    {
        [DllImport("Kernel32.dll")]
        private static extern bool Wow64EnableWow64FsRedirection(bool Wow64FsEnableRedirection);//重定向
+
        public struct Frequency
        {
            public int ID { get; set; }
            public string DisplayOS { get; set; }
        }
+
+        string tempfile = System.IO.Path.GetTempPath() + @"CMWTAT_DIGITAL\";
+
+        public void DelectTempFile()
+        {
+            //string tempfile = System.IO.Path.GetTempPath() + @"CMWTAT_DIGITAL\";
+            if (Directory.Exists(tempfile))
+            {
+                try
+                {
+                    //DirectoryInfo dir = new DirectoryInfo(srcPath);
+                    //FileSystemInfo[] fileinfo = dir.GetFileSystemInfos();  //返回目录中所有文件和子目录
+                    //foreach (FileSystemInfo i in fileinfo)
+                    //{
+                    //    if (i is DirectoryInfo)            //判断是否文件夹
+                    //    {
+                    //        DirectoryInfo subdir = new DirectoryInfo(i.FullName);
+                    //        subdir.Delete(true);          //删除子目录和文件
+                    //    }
+                    //    else
+                    //    {
+                    //        File.Delete(i.FullName);      //删除指定文件
+                    //    }
+                    //}
+                    FileAttributes attr = File.GetAttributes(tempfile);
+                    if (attr == FileAttributes.Directory)
+                    {
+                        Directory.Delete(tempfile, true);
+                    }
+                    else
+                    {
+                        File.Delete(tempfile);
+                    }
+                }
+                catch (Exception e)
+                {
+                    Console.WriteLine("DelectTempFile:" + e.Message);
+                }
+            }
+        }
+
+        public void ExportTempFile()
+        {
+            //string tempfile = System.IO.Path.GetTempPath() + @"CMWTAT_DIGITAL\";
+
+            //if (tempfile.EndsWith(@"\"))
+            //{
+            //    tempfile = tempfile.Remove(tempfile.Length - 1, 1);
+            //}
+
+            if (!Directory.Exists(tempfile))
+            {
+                Directory.CreateDirectory(tempfile);
+            }
+
+            byte[] temp;
+            System.IO.FileStream fileStream;
+
+            temp = CMWTAT_DIGITAL.Properties.Resources.gatherosstate;
+            fileStream = new System.IO.FileStream(tempfile + "gatherosstate" + ".exe", System.IO.FileMode.CreateNew);
+            fileStream.Write(temp, 0, (int)(temp.Length));
+            fileStream.Close();
+
+            temp = CMWTAT_DIGITAL.Properties.Resources.slc;
+            fileStream = new System.IO.FileStream(tempfile + "slc" + ".dll", System.IO.FileMode.CreateNew);
+            fileStream.Write(temp, 0, (int)(temp.Length));
+            fileStream.Close();
+
+            temp = CMWTAT_DIGITAL.Properties.Resources.slmgr;
+            fileStream = new System.IO.FileStream(tempfile + "slmgr" + ".vbs", System.IO.FileMode.CreateNew);
+            fileStream.Write(temp, 0, (int)(temp.Length));
+            fileStream.Close();
+        }
+
+        bool autoact = false;
+        bool hiderun = false;
+        bool expact = false;
+        bool showhelp = false;
+
        //public string SystemEdition = OSVersionInfo.Name + " " + OSVersionInfo.Edition;
        public string SystemEdition = OSVersionInfo.Edition;
+
+        NotifyIcon notifyIcon;
+
        public MainWindow()
        {

+            autoact = Program.autoact;
+            hiderun = Program.hiderun;
+            expact = Program.expact;
+            showhelp = Program.showhelp;
+
+            //MessageBox.Show("A:" + autoact.ToString() + ";H:" + hiderun.ToString());
+
            InitializeComponent();

+            if (showhelp == true)
+            {
+                DialogHelp.IsOpen = true;
+            }
+
+            notifyIcon = new System.Windows.Forms.NotifyIcon();
+            notifyIcon.Text = "CloudMoe Windows 10 Activation Toolkit V2";
+            notifyIcon.Icon = ((System.Drawing.Icon)(CMWTAT_DIGITAL.Properties.Resources.CMWTAT_ICON));
+
+            if (hiderun == true && autoact == true)
+            {
+                this.Hide();
+                //notifyIcon.BalloonTipText = "The app has been minimised. Click the tray icon to show.";
+                //notifyIcon.BalloonTipTitle = "The App";
+
+                //notifyIcon.Icon = new System.Drawing.Icon("TheAppIcon.ico");
+
+                //notifyIcon.Click += new EventHandler(notifyIcon_Click);
+
+                notifyIcon.Visible = true;
+
+                //打开菜单项
+                //System.Windows.Forms.MenuItem open = new System.Windows.Forms.MenuItem("Open");
+                //open.Click += new EventHandler((o, e) =>
+                //{
+                //    this.Show();
+                //});
+
+                //退出菜单项
+                System.Windows.Forms.MenuItem exit = new System.Windows.Forms.MenuItem("Exit");
+                exit.Click += new EventHandler(Exit_Button_Click);
+
+                //关联托盘控件
+                //System.Windows.Forms.MenuItem[] childen = new System.Windows.Forms.MenuItem[] { open, exit };
+
+                System.Windows.Forms.MenuItem[] childen = new System.Windows.Forms.MenuItem[] { exit };
+
+                notifyIcon.ContextMenu = new System.Windows.Forms.ContextMenu(childen);
+
+                //this.notifyIcon.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler((o, e) =>
+                //{
+                //    if (e.Button == MouseButtons.Left) this.Show();
+                //});
+
+                int tipShowMilliseconds = 0;
+                string tipTitle = "CloudMoe Windows 10 Activation Toolkit V2";
+                string tipContent = "Running.";
+                ToolTipIcon tipType = ToolTipIcon.None;
+                notifyIcon.ShowBalloonTip(tipShowMilliseconds, tipTitle, tipContent, tipType);
+
+                //notifyIcon.BalloonTipClicked += new EventHandler((o, e) =>
+                //{
+                //    //System.Windows.MessageBox.Show(System.Windows.Forms.Control.MouseButtons.ToString());
+                //    if (System.Windows.Forms.Control.MouseButtons == MouseButtons.None) //左键返回不是Right是None
+                //    {
+                //        System.Windows.MessageBox.Show("Hello");
+                //    };
+                //});
+            }
+
+            //初始化动态表单数据绑定
            DataContext = new ViewModel();

            this.DialogHostGrid.Visibility = Visibility.Visible;
@ -63,7 +215,9 @@ namespace CMWTAT_DIGITAL
            //SystemEditionText.Text = SystemEdition;
            Thread loadthread = new Thread(LoadOSList);
            loadthread.Start();
+
        }
+
        JArray ositems;
        int now_os_index = 0;
        string checked_os = "unknow";
@ -79,6 +233,9 @@ namespace CMWTAT_DIGITAL
        }
        private void LoadOSList()
        {
+
+            int is_selected = 0; //是否已经自动选择,0未选择，1普通模式，2实验模式
+
            actbtn.Dispatcher.Invoke(new Action(() =>
            {
                DialogWait.IsOpen = true;
@ -90,24 +247,32 @@ namespace CMWTAT_DIGITAL
                List<Frequency> list = new List<Frequency>();
                Frequency freq = new Frequency();
                ositems = (JArray)jsonobj["OS"];
+
                for (int i = 0; i < ositems.Count(); i++)
                {
                    freq.ID = i;
                    freq.DisplayOS = jsonobj["OS"][i].ToString();
-                    if (jsonobj["OS"][i].ToString() == SystemEdition)
-                    {
-                        now_os_index = i;
-                        checked_os = SystemEdition;
-                    }
-                    if (jsonobj["OS"][i].ToString() == SystemEdition + OSVersionInfo.BuildVersion)
+
+                    //按照优先级判断，如果已经自动选择则忽略新的
+                    if (String.Equals(jsonobj["OS"][i].ToString(), SystemEdition + OSVersionInfo.BuildVersion, StringComparison.CurrentCultureIgnoreCase) && is_selected == 0)//jsonobj["OS"][i].ToString() == SystemEdition + OSVersionInfo.BuildVersion
                    {
                        now_os_index = i;
                        checked_os = SystemEdition + OSVersionInfo.BuildVersion;
+                        is_selected = 1;
                    }
-                    if (jsonobj["OS"][i].ToString() == "(Experimental) " + SystemEdition)
+
+                    if (String.Equals(jsonobj["OS"][i].ToString(), SystemEdition, StringComparison.CurrentCultureIgnoreCase) && is_selected == 0)//jsonobj["OS"][i].ToString() == SystemEdition
+                    {
+                        now_os_index = i;
+                        checked_os = SystemEdition;
+                        is_selected = 1;
+                    }
+
+                    if (String.Equals(jsonobj["OS"][i].ToString(), "(Experimental) " + SystemEdition, StringComparison.CurrentCultureIgnoreCase) && is_selected == 0)//旧的方法：jsonobj["OS"][i].ToString() == "(Experimental) " + SystemEdition，新方法忽略大小写并提升效率
                    {
                        now_os_index = i;
                        checked_os = "(Experimental) " + SystemEdition;
+                        is_selected = 2;
                    }
                    list.Add(freq);
                }
@ -116,11 +281,18 @@ namespace CMWTAT_DIGITAL
                {
                    this.SystemEditionText.ItemsSource = list;//控件的ID

-                    if (checked_os == "unknow")
+                    if (is_selected == 0)//没有匹配
                    {
                        this.SystemEditionText.SelectedIndex = 0;
                        this.DialogWithOKToCloseDialogTitle.Text = "Attention";
-                        this.DialogWithOKToCloseDialogText.Text = "Unable to correctly identify your operating system, may be not be supported.\r\n(System edition: " + SystemEdition + OSVersionInfo.BuildVersion + ")";
+                        this.DialogWithOKToCloseDialogText.Text = "Unable to correctly identify your operating system edition, may be not be supported.\r\n(System edition: " + SystemEdition + OSVersionInfo.BuildVersion + ")";
+                        this.DialogWithOKToCloseDialog.IsOpen = true;
+                    }
+                    else if (is_selected == 2)//只找到实验性
+                    {
+                        this.SystemEditionText.SelectedIndex = 0;
+                        this.DialogWithOKToCloseDialogTitle.Text = "Attention";
+                        this.DialogWithOKToCloseDialogText.Text = "Only find experimental options that can be used with this operating system edition, little hope of activation success.\r\n(System edition: " + SystemEdition + OSVersionInfo.BuildVersion + ")";
                        this.DialogWithOKToCloseDialog.IsOpen = true;
                    }
                    else
@ -130,19 +302,78 @@ namespace CMWTAT_DIGITAL
                }));

                //this.SystemEditionText.SelectedIndex = now_os_index;
+
+                actbtn.Dispatcher.Invoke(new Action(() =>
+                {
+                    DialogWait.IsOpen = false;
+                }));
+
+                if (autoact == true)//自动激活
+                {
+                    Thread actthread = new Thread(RunAct);
+                    switch (is_selected)
+                    {
+                        case 1: //正常
+                            actthread.Start();
+                            break;
+                        case 2: //实验性
+                            if (expact == true)
+                            {
+                                actbtn.Dispatcher.Invoke(new Action(() =>
+                                {
+                                    DialogWithOKToCloseDialog.IsOpen = false;
+                                }));
+                                actthread.Start();
+                            }
+                            else
+                            {
+                                if (hiderun == true)
+                                {
+                                    int tipShowMilliseconds = 0;
+                                    string tipTitle = "CloudMoe Windows 10 Activation Toolkit V2";
+                                    string tipContent = "Your system edition may not be supported, program will exit. you can try add --expact or -e to startup.";
+                                    ToolTipIcon tipType = ToolTipIcon.None;
+                                    notifyIcon.ShowBalloonTip(tipShowMilliseconds, tipTitle, tipContent, tipType);
+                                    Exit_Button_Click(null, null);//退出
+                                }
+                            }
+                            break;
+                        default:
+                            if (hiderun == true)
+                            {
+                                int tipShowMilliseconds = 0;
+                                string tipTitle = "CloudMoe Windows 10 Activation Toolkit V2";
+                                string tipContent = "Your system edition may not be supported, program will exit.";
+                                ToolTipIcon tipType = ToolTipIcon.None;
+                                notifyIcon.ShowBalloonTip(tipShowMilliseconds, tipTitle, tipContent, tipType);
+                                Exit_Button_Click(null, null);//退出
+                            }
+                            break;
+                    }
+                }
            }
            catch
            {
+                actbtn.Dispatcher.Invoke(new Action(() =>
+                {
+                    DialogWait.IsOpen = false;
+                }));
+
                actbtn.Dispatcher.Invoke(new Action(() =>
                {
                    DialogWithExit.IsOpen = true;
                }));
-            }
-            actbtn.Dispatcher.Invoke(new Action(() =>
-            {
-                DialogWait.IsOpen = false;
-            }));

+                if (hiderun == true && autoact == true)
+                {
+                    int tipShowMilliseconds = 0;
+                    string tipTitle = "CloudMoe Windows 10 Activation Toolkit V2";
+                    string tipContent = "Unable to connect to server, program will exit.";
+                    ToolTipIcon tipType = ToolTipIcon.None;
+                    notifyIcon.ShowBalloonTip(tipShowMilliseconds, tipTitle, tipContent, tipType);
+                    Exit_Button_Click(null, null);//退出
+                }
+            }
        }
        private void Activate_Button_Click(object sender, RoutedEventArgs e)
        {
@ -181,13 +412,17 @@ namespace CMWTAT_DIGITAL
            return strHTML;
        }

-        private void Exit_Button_Click(object sender, RoutedEventArgs e)
+        private void Exit_Button_Click(object sender, EventArgs e)
        {
-            Application.Current.Shutdown();
+            DelectTempFile();
+            notifyIcon.Visible = false;
+            System.Windows.Application.Current.Shutdown();
        }

        private void RunInstall()
        {
+            ExportTempFile();
+            //释放文件
            actbtn.Dispatcher.Invoke(new Action(() =>
            {
                this.DialogActProg.IsOpen = true;
@ -203,7 +438,11 @@ namespace CMWTAT_DIGITAL
            string system = "";

            string slmgr = Environment.GetFolderPath(Environment.SpecialFolder.SystemX86) + "\\slmgr.vbs";
-            string slmgr_self = System.AppDomain.CurrentDomain.BaseDirectory + "slmgr.vbs";
+
+            string slmgr_self = tempfile + "slmgr.vbs";
+
+            //旧的位置
+            //string slmgr_self = System.AppDomain.CurrentDomain.BaseDirectory + "slmgr.vbs";

            string changepk = Environment.SystemDirectory + "\\changepk.exe";

@ -283,8 +522,8 @@ namespace CMWTAT_DIGITAL
                code = "-1";
                msg = "无法卸载旧密钥 :(\nCannot to uninstall old key. :(";
            }
-            //string runend = RunCScript(slmgr_self, "-upk").Trim();
-            EndLine:;
+        //string runend = RunCScript(slmgr_self, "-upk").Trim();
+        EndLine:;
            if (code != "200")
            {
                actbtn.Dispatcher.Invoke(new Action(() =>
@ -309,14 +548,34 @@ namespace CMWTAT_DIGITAL
                }));
                //MessageBox.Show("Congratulation!");
            }
+            DelectTempFile();
+            //清理文件
+        }
+
+        private void ShowBallSameDig()
+        {
+            actbtn.Dispatcher.Invoke(new Action(() =>
+            {
+                if (hiderun == true && autoact == true)
+                {
+                    int tipShowMilliseconds = 0;
+                    string tipTitle = "CloudMoe Windows 10 Activation Toolkit V2";
+                    string tipContent = this.activatingtext.Text;
+                    ToolTipIcon tipType = ToolTipIcon.None;
+                    notifyIcon.ShowBalloonTip(tipShowMilliseconds, tipTitle, tipContent, tipType);
+                }
+            }));
        }

        private void RunAct()
        {
+            ExportTempFile();
+            //释放文件
            actbtn.Dispatcher.Invoke(new Action(() =>
            {
                this.DialogActProg.IsOpen = true;
                this.activatingtext.Text = "Activating";
+                ShowBallSameDig();
            }));

            Wow64EnableWow64FsRedirection(false);//关闭文件重定向
@ -329,7 +588,11 @@ namespace CMWTAT_DIGITAL
            string mode = "1"; //1：普通（SYS、SKU、KEY完全）；2.需要获取SKU（SYS、KEY）；3.手动输入KEY

            string slmgr = Environment.GetFolderPath(Environment.SpecialFolder.SystemX86) + "\\slmgr.vbs";
-            string slmgr_self = System.AppDomain.CurrentDomain.BaseDirectory + "slmgr.vbs";
+
+            string slmgr_self = tempfile + "slmgr.vbs";
+
+            //旧的位置
+            //string slmgr_self = System.AppDomain.CurrentDomain.BaseDirectory + "slmgr.vbs";

            string changepk = Environment.SystemDirectory + "\\changepk.exe";

@ -344,6 +607,7 @@ namespace CMWTAT_DIGITAL
                actbtn.Dispatcher.Invoke(new Action(() =>
                {
                    this.activatingtext.Text = "Getting Key";
+                    ShowBallSameDig();
                }));

                //获取密钥和SKU
@ -386,6 +650,7 @@ namespace CMWTAT_DIGITAL
            actbtn.Dispatcher.Invoke(new Action(() =>
            {
                this.activatingtext.Text = "Uninstalling old Key";
+                ShowBallSameDig();
            }));

            //卸载
@ -402,6 +667,7 @@ namespace CMWTAT_DIGITAL
                    actbtn.Dispatcher.Invoke(new Action(() =>
                    {
                        this.activatingtext.Text = "Getting edition code (Experimental)";
+                        ShowBallSameDig();
                    }));

                    //安装转换密钥
@ -417,6 +683,7 @@ namespace CMWTAT_DIGITAL
                            actbtn.Dispatcher.Invoke(new Action(() =>
                            {
                                this.activatingtext.Text = "Uninstalling old Key (Experimental)";
+                                ShowBallSameDig();
                            }));

                            runend = RunCScript(slmgr_self, "-upk").Trim();
@ -426,6 +693,7 @@ namespace CMWTAT_DIGITAL
                                actbtn.Dispatcher.Invoke(new Action(() =>
                                {
                                    this.activatingtext.Text = "Prepare for the next step (Experimental)";
+                                    ShowBallSameDig();
                                }));
                            }
                        }
@ -450,6 +718,7 @@ namespace CMWTAT_DIGITAL
                actbtn.Dispatcher.Invoke(new Action(() =>
                {
                    this.activatingtext.Text = "Writing feature of old Windows version";
+                    ShowBallSameDig();
                }));

                RunCMD(@"reg add ""HKLM\SYSTEM\Tokens"" /v ""Channel"" /t REG_SZ /d ""Retail"" /f");
@ -460,6 +729,7 @@ namespace CMWTAT_DIGITAL
                actbtn.Dispatcher.Invoke(new Action(() =>
                {
                    this.activatingtext.Text = "Installing Key";
+                    ShowBallSameDig();
                }));

                //安装数字权利升级密钥
@ -472,21 +742,26 @@ namespace CMWTAT_DIGITAL
                    actbtn.Dispatcher.Invoke(new Action(() =>
                    {
                        this.activatingtext.Text = "Getting free upgrade permissions";
+                        ShowBallSameDig();
                    }));

-                    RunCMD(System.AppDomain.CurrentDomain.BaseDirectory + "gatherosstate.exe");
+                    RunCMD(tempfile + "gatherosstate.exe");

-                    for (int i = 0; i < 3 || !File.Exists(System.AppDomain.CurrentDomain.BaseDirectory + "GenuineTicket.xml"); i++)
+                    //旧的位置
+                    //RunCMD(System.AppDomain.CurrentDomain.BaseDirectory + "gatherosstate.exe"); tempfile
+
+                    for (int i = 0; i < 3 || !File.Exists(tempfile + "GenuineTicket.xml"); i++) //旧的位置： for (int i = 0; i < 3 || !File.Exists(System.AppDomain.CurrentDomain.BaseDirectory + "GenuineTicket.xml"); i++)
                    {
                        Thread.Sleep(3000);
                    }

-                    if (File.Exists(System.AppDomain.CurrentDomain.BaseDirectory + "GenuineTicket.xml"))
+                    if (File.Exists(tempfile + "GenuineTicket.xml")) //旧的位置： if (File.Exists(System.AppDomain.CurrentDomain.BaseDirectory + "GenuineTicket.xml"))
                    {

                        actbtn.Dispatcher.Invoke(new Action(() =>
                        {
                            this.activatingtext.Text = "Cleaning changes";
+                            ShowBallSameDig();
                        }));

                        RunCMD(@"reg delete ""HKLM\SYSTEM\Tokens"" /f");
@ -495,6 +770,7 @@ namespace CMWTAT_DIGITAL
                        actbtn.Dispatcher.Invoke(new Action(() =>
                        {
                            this.activatingtext.Text = "Getting digital license";
+                            ShowBallSameDig();
                        }));

                        Wow64EnableWow64FsRedirection(false);//关闭文件重定向
@ -503,6 +779,7 @@ namespace CMWTAT_DIGITAL
                        actbtn.Dispatcher.Invoke(new Action(() =>
                        {
                            this.activatingtext.Text = "Activating";
+                            ShowBallSameDig();
                        }));

                        runend = RunCScript(slmgr_self, "-ato").Trim();
@ -533,8 +810,8 @@ namespace CMWTAT_DIGITAL
                code = "-1";
                msg = "无法卸载旧密钥 :(\nCannot to uninstall old key. :(";
            }
-            //string runend = RunCScript(slmgr_self, "-upk").Trim();
-            EndLine:;
+        //string runend = RunCScript(slmgr_self, "-upk").Trim();
+        EndLine:;
            if (code != "200")
            {
                actbtn.Dispatcher.Invoke(new Action(() =>
@ -544,6 +821,15 @@ namespace CMWTAT_DIGITAL
                    this.DialogWithOKToCloseDialog.IsOpen = true;
                    this.DialogWithOKToCloseDialogTitle.Text = "Error";
                    this.DialogWithOKToCloseDialogText.Text = msg + "\r\nCode:" + code;
+                    if (hiderun == true && autoact == true)
+                    {
+                        int tipShowMilliseconds = 0;
+                        string tipTitle = "CloudMoe Windows 10 Activation Toolkit V2";
+                        string tipContent = msg;
+                        ToolTipIcon tipType = ToolTipIcon.None;
+                        notifyIcon.ShowBalloonTip(tipShowMilliseconds, tipTitle, tipContent, tipType);
+                        Exit_Button_Click(null, null);
+                    }
                }));
                //MessageBox.Show(msg + "\r\nCode:" + code);
            }
@ -556,9 +842,20 @@ namespace CMWTAT_DIGITAL
                    this.DialogWithOKToCloseDialogDonate.IsOpen = true;
                    this.DialogWithOKToCloseDialogDonateTitle.Text = "Complete";
                    this.DialogWithOKToCloseDialogDonateText.Text = "\nCongratulation! \n\nWindows 10 has been successful activated.\n";
+                    if (hiderun == true && autoact == true)
+                    {
+                        int tipShowMilliseconds = 0;
+                        string tipTitle = "CloudMoe Windows 10 Activation Toolkit V2";
+                        string tipContent = "Congratulation!\nWindows 10 has been successful activated.";
+                        ToolTipIcon tipType = ToolTipIcon.None;
+                        notifyIcon.ShowBalloonTip(tipShowMilliseconds, tipTitle, tipContent, tipType);
+                        Exit_Button_Click(null, null);
+                    }
                }));
                //MessageBox.Show("Congratulation!");
            }
+            DelectTempFile();
+            //清理文件
        }

        private void RunCMD(string var)
@ -582,7 +879,7 @@ namespace CMWTAT_DIGITAL
        public static string RunCScript(string path, string var = "")
        {
            Wow64EnableWow64FsRedirection(false);//关闭文件重定向
-            //执行命令行函数
+                                                 //执行命令行函数
            try
            {
                System.Diagnostics.Process myProcess = new System.Diagnostics.Process();
@ -610,7 +907,7 @@ namespace CMWTAT_DIGITAL
        public static string GetSKU()
        {
            Wow64EnableWow64FsRedirection(false);//关闭文件重定向
-            //执行命令行函数
+                                                 //执行命令行函数
            try
            {
                System.Diagnostics.Process p = new System.Diagnostics.Process();
@ -673,5 +970,11 @@ namespace CMWTAT_DIGITAL
            SystemEditionTextInput.Visibility = Visibility.Visible;
            is_auto = false;
        }
+
+        private void Window_Closing(object sender, System.ComponentModel.CancelEventArgs e)
+        {
+            DelectTempFile();
+            notifyIcon.Visible = false;
+        }
    }
 }
--- a/CMWTAT_DIGITAL/Program.cs
+++ b/CMWTAT_DIGITAL/Program.cs
@ -0,0 +1,82 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+
+namespace CMWTAT_DIGITAL
+{
+    public static class Program
+    {
+
+        public static bool autoact = false;
+        public static bool hiderun = false;
+        public static bool expact = false;
+        public static bool showhelp = false;
+
+        /// <summary>
+        /// Application Entry Point.
+        /// </summary>
+        [System.STAThreadAttribute()]
+        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
+
+        public static void Main(string[] startup_args)
+        {
+            //添加程序集解析事件  
+            AppDomain.CurrentDomain.AssemblyResolve += (sender, args) =>
+            {
+                String resourceName = "CMWTAT_DIGITAL.Res." +
+
+                new AssemblyName(args.Name).Name + ".dll";
+
+                using (var stream = Assembly.GetExecutingAssembly().GetManifestResourceStream(resourceName))
+                {
+                    Byte[] assemblyData = new Byte[stream.Length];
+
+                    stream.Read(assemblyData, 0, assemblyData.Length);
+
+                    return Assembly.Load(assemblyData);
+                }
+            };
+
+            //if (startup_args.Length == 0)
+            //{
+            //    //MessageBox.Show("ARGS NULL");
+            //    //Console.WriteLine("CMWTAT Digital Edition V2");
+            //    //Console.WriteLine("This application can use console args.");
+            //}
+            foreach (string arg in startup_args)
+            {
+                Console.WriteLine("arg: " + arg);
+                if (arg == "-a" || arg == "--auto")
+                {
+                    Console.WriteLine("AUTO: True");
+                    autoact = true;
+                }
+                if (arg == "-h" || arg == "--hide")
+                {
+                    Console.WriteLine("HIDE: True");
+                    hiderun = true;
+                }
+                if (arg == "-e" || arg == "--expact")
+                {
+                    Console.WriteLine("EXPACT: True");
+                    expact = true;
+                }
+                if (arg == "-?" || arg == "--help")
+                {
+                    Console.WriteLine("EXPACT: True");
+                    showhelp = true;
+                }
+            }
+
+            CMWTAT_DIGITAL.App app = new CMWTAT_DIGITAL.App();//WPF项目的Application实例，用来启动WPF项目的
+            app.InitializeComponent();
+            app.Run();
+        }
+    }
+}
--- a/CMWTAT_DIGITAL/Properties/AssemblyInfo.cs
+++ b/CMWTAT_DIGITAL/Properties/AssemblyInfo.cs
@ -12,7 +12,7 @@ using System.Windows;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("CloudMoe Network")]
 [assembly: AssemblyProduct("CMWTAT Digital Edition V2")]
-[assembly: AssemblyCopyright("Copyright © CloudMoe Saltfish Studio 2017")]
+[assembly: AssemblyCopyright("Copyright © CloudMoe Saltfish Studio 2018")]
 [assembly: AssemblyTrademark("CloudMoe Saltfish Studio")]
 [assembly: AssemblyCulture("")]

@ -51,5 +51,5 @@ using System.Windows;
 // 可以指定所有值，也可以使用以下所示的 "*" 预置版本号和修订号
 // 方法是按如下所示使用“*”: :
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.1.0.0")]
-[assembly: AssemblyFileVersion("2.1.0.0")]
+[assembly: AssemblyVersion("2.2.0.1")]
+[assembly: AssemblyFileVersion("2.2.0.1")]
--- a/CMWTAT_DIGITAL/Properties/Resources.Designer.cs
+++ b/CMWTAT_DIGITAL/Properties/Resources.Designer.cs
@ -59,5 +59,45 @@ namespace CMWTAT_DIGITAL.Properties {
                resourceCulture = value;
            }
        }
+        
+        /// <summary>
+        ///   查找类似于 (图标) 的 System.Drawing.Icon 类型的本地化资源。
+        /// </summary>
+        internal static System.Drawing.Icon CMWTAT_ICON {
+            get {
+                object obj = ResourceManager.GetObject("CMWTAT_ICON", resourceCulture);
+                return ((System.Drawing.Icon)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   查找 System.Byte[] 类型的本地化资源。
+        /// </summary>
+        internal static byte[] gatherosstate {
+            get {
+                object obj = ResourceManager.GetObject("gatherosstate", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   查找 System.Byte[] 类型的本地化资源。
+        /// </summary>
+        internal static byte[] slc {
+            get {
+                object obj = ResourceManager.GetObject("slc", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   查找 System.Byte[] 类型的本地化资源。
+        /// </summary>
+        internal static byte[] slmgr {
+            get {
+                object obj = ResourceManager.GetObject("slmgr", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
    }
 }
--- a/CMWTAT_DIGITAL/Properties/Resources.resx
+++ b/CMWTAT_DIGITAL/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,22 @@
    <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="CMWTAT_ICON" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\CMWTAT.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="gatherosstate" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Res\gatherosstate.exe;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="slc" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Res\slc.dll;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="slmgr" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Res\slmgr.vbs;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
 </root>
--- a/CMWTAT_Digital_Release_2_2_0_1.exe
+++ b/CMWTAT_Digital_Release_2_2_0_1.exe
--- a/OSVersionInfoDLL/OSVersionInfoClass.cs
+++ b/OSVersionInfoDLL/OSVersionInfoClass.cs
--- a/OSVersionInfoDLL/OSVersionInfoDLL.csproj
+++ b/OSVersionInfoDLL/OSVersionInfoDLL.csproj
@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{9599DF4F-9D56-4448-8F56-76B3966982A4}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>JCS</RootNamespace>
-    <AssemblyName>OSVersionInfo</AssemblyName>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <StartupObject>
-    </StartupObject>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>3.5</OldToolsVersion>
-    <TargetFrameworkProfile />
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Xml.Linq">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Data.DataSetExtensions">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Data" />
-    <Reference Include="System.Deployment" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="OSVersionInfoClass.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resources.resx</DependentUpon>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <None Include="app.config" />
-    <None Include="Properties\Settings.settings">
-      <Generator>SettingsSingleFileGenerator</Generator>
-      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
-    </None>
-    <Compile Include="Properties\Settings.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Settings.settings</DependentUpon>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-    </Compile>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
--- a/OSVersionInfoDLL/Properties/AssemblyInfo.cs
+++ b/OSVersionInfoDLL/Properties/AssemblyInfo.cs
@ -1,36 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("OSVersionInfoDLL")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("OSVersionInfoDLL")]
-[assembly: AssemblyCopyright("Copyright ©  2010-2016")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("a3be4af5-b38a-442d-a0a8-8c63450c2888")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.0.0.0")]
-[assembly: AssemblyFileVersion("3.0.0.0")]
--- a/OSVersionInfoDLL/Properties/Resources.Designer.cs
+++ b/OSVersionInfoDLL/Properties/Resources.Designer.cs
@ -1,63 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace JCS.Properties {
-    using System;
-    
-    
-    /// <summary>
-    ///   A strongly-typed resource class, for looking up localized strings, etc.
-    /// </summary>
-    // This class was auto-generated by the StronglyTypedResourceBuilder
-    // class via a tool like ResGen or Visual Studio.
-    // To add or remove a member, edit your .ResX file then rerun ResGen
-    // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    internal class Resources {
-        
-        private static global::System.Resources.ResourceManager resourceMan;
-        
-        private static global::System.Globalization.CultureInfo resourceCulture;
-        
-        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal Resources() {
-        }
-        
-        /// <summary>
-        ///   Returns the cached ResourceManager instance used by this class.
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Resources.ResourceManager ResourceManager {
-            get {
-                if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("JCS.Properties.Resources", typeof(Resources).Assembly);
-                    resourceMan = temp;
-                }
-                return resourceMan;
-            }
-        }
-        
-        /// <summary>
-        ///   Overrides the current thread's CurrentUICulture property for all
-        ///   resource lookups using this strongly typed resource class.
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Globalization.CultureInfo Culture {
-            get {
-                return resourceCulture;
-            }
-            set {
-                resourceCulture = value;
-            }
-        }
-    }
-}
--- a/OSVersionInfoDLL/Properties/Resources.resx
+++ b/OSVersionInfoDLL/Properties/Resources.resx
@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : 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:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <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="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <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>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>
--- a/OSVersionInfoDLL/Properties/Settings.Designer.cs
+++ b/OSVersionInfoDLL/Properties/Settings.Designer.cs
@ -1,26 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace JCS.Properties {
-    
-    
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "14.0.0.0")]
-    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
-        
-        private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
-        
-        public static Settings Default {
-            get {
-                return defaultInstance;
-            }
-        }
-    }
-}
--- a/OSVersionInfoDLL/Properties/Settings.settings
+++ b/OSVersionInfoDLL/Properties/Settings.settings
@ -1,7 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)">
-  <Profiles>
-    <Profile Name="(Default)" />
-  </Profiles>
-  <Settings />
-</SettingsFile>
--- a/OSVersionInfoDLL/app.config
+++ b/OSVersionInfoDLL/app.config
@ -1,3 +0,0 @@
-<?xml version="1.0"?>
-<configuration>
-	<startup><supportedRuntime version="v2.0.50727"/></startup></configuration>