prepair version 1.6.0

balbarak · Jan 31, 2021 · 16eebfc · 16eebfc
1 parent 03b0ecd
commit 16eebfc
Show file tree

Hide file tree

Showing 8 changed files with 201 additions and 77 deletions.
diff --git a/src/ScanX.InstallHelpers/MainInstallerHelper.cs b/src/ScanX.InstallHelpers/MainInstallerHelper.cs
@@ -2,6 +2,7 @@
 using System.Collections;
 using System.ComponentModel;
 using System.IO;
+using System.IO.Compression;
 using System.Reflection;
 using System.Text;
 using System.Windows;
@@ -32,28 +33,45 @@ protected override void OnAfterInstall(IDictionary savedState)
         {
             base.OnAfterInstall(savedState);
 
+            var zipPath = Path.Combine(GetPath(), "Scanx.zip");
 
-            string path = GetPath();
+            var protocolFolderPath = GetProtocolFolderPath();
 
-            string servicePath = Path.Combine(path,"ScanX.Protocol.exe");
+            ZipFile.ExtractToDirectory(zipPath, protocolFolderPath);
+
+
+            string servicePath = Path.Combine(protocolFolderPath, "ScanX.Protocol.exe");
 
             ServiceHelper.InstallService(servicePath);
             ServiceHelper.StartService();
         }
 
         protected override void OnBeforeUninstall(IDictionary savedState)
         {
+
             ServiceHelper.StopService();
 
             base.OnBeforeUninstall(savedState);
-
         }
 
         protected override void OnAfterUninstall(IDictionary savedState)
         {
             base.OnAfterUninstall(savedState);
 
+
             ServiceHelper.DeleteService();
+
+            try
+            {
+                var path = GetProtocolFolderPath();
+
+                if (Directory.Exists(path))
+                    Directory.Delete(path, true);
+            }
+            catch (Exception)
+            {
+
+            }
         }
 
         private string GetPath()
@@ -62,6 +80,14 @@ private string GetPath()
 
             return result;
         }
+        private string GetProtocolFolderPath()
+        {
+            var baseDir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
+
+            var result = Path.Combine(baseDir, "Protocol");
+
+            return result;
+        }
 
         private void CleanUp()
         {

diff --git a/src/ScanX.InstallHelpers/ScanX.InstallHelpers.csproj b/src/ScanX.InstallHelpers/ScanX.InstallHelpers.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>ScanX.InstallHelpers</RootNamespace>
     <AssemblyName>ScanX.InstallHelpers</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
   </PropertyGroup>
@@ -37,6 +37,11 @@
     <Reference Include="System" />
     <Reference Include="System.Configuration.Install" />
     <Reference Include="System.Core" />
+    <Reference Include="System.IO.Compression" />
+    <Reference Include="System.IO.Compression.FileSystem" />
+    <Reference Include="System.IO.Compression.ZipFile, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.IO.Compression.ZipFile.4.3.0\lib\net46\System.IO.Compression.ZipFile.dll</HintPath>
+    </Reference>
     <Reference Include="System.Management" />
     <Reference Include="System.ServiceProcess" />
     <Reference Include="System.Xml.Linq" />
@@ -63,5 +68,8 @@
   <ItemGroup>
     <WCFMetadata Include="Connected Services\" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
diff --git a/src/ScanX.InstallHelpers/ServiceHelper.cs b/src/ScanX.InstallHelpers/ServiceHelper.cs
@@ -61,7 +61,7 @@ public static void StopService()
                 ProcessStartInfo startupInfo = new ProcessStartInfo()
                 {
                     FileName = "cmd.exe",
-                    Arguments = $"/C sc stop {_serviceName}",
+                    Arguments = $"/C net stop {_serviceName}",
                     CreateNoWindow = true,
                     WindowStyle = ProcessWindowStyle.Hidden
                 };

diff --git a/src/ScanX.InstallHelpers/packages.config b/src/ScanX.InstallHelpers/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="System.IO.Compression.ZipFile" version="4.3.0" targetFramework="net46" />
+</packages>
diff --git a/src/ScanX.Protocol/.config/dotnet-tools.json b/src/ScanX.Protocol/.config/dotnet-tools.json
@@ -0,0 +1,12 @@
+{
+  "version": 1,
+  "isRoot": true,
+  "tools": {
+    "dotnet-ef": {
+      "version": "5.0.2",
+      "commands": [
+        "dotnet-ef"
+      ]
+    }
+  }
+}
diff --git a/...es/PublishProfiles/SetupFolderPath.pubxml → ...ties/PublishProfiles/FolderProfile.pubxml b/...es/PublishProfiles/SetupFolderPath.pubxml → ...ties/PublishProfiles/FolderProfile.pubxml
@@ -10,7 +10,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
     <LastUsedPlatform>Any CPU</LastUsedPlatform>
     <PublishProvider>FileSystem</PublishProvider>
-    <PublishUrl>bin\Release\netcoreapp3.1\publish\</PublishUrl>
+    <PublishUrl>bin\publish\</PublishUrl>
     <WebPublishMethod>FileSystem</WebPublishMethod>
     <SiteUrlToLaunchAfterPublish />
     <TargetFramework>netcoreapp3.1</TargetFramework>

diff --git a/src/ScanX.Protocol/ScanX.Protocol.csproj b/src/ScanX.Protocol/ScanX.Protocol.csproj
@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
+    <UserSecretsId>93bd8854-3168-49ce-990f-de49830ac2f8</UserSecretsId>
   </PropertyGroup>
 
   <ItemGroup>
@@ -13,4 +14,9 @@
     <ProjectReference Include="..\ScanX.Core\ScanX.Core.csproj" />
   </ItemGroup>
 
+
+  <ItemGroup>
+    <Folder Include="Properties\PublishProfiles\" />
+  </ItemGroup>
+
 </Project>