From 9de1286290a1f512086d79550dfeb27ddd5cde31 Mon Sep 17 00:00:00 2001
From: Thermo_SIM <fbolis@SIMPRDWINCMS>
Date: Mon, 15 Mar 2021 12:38:22 +0100
Subject: [PATCH] Fix Setup

---
 Build.ps1                          | 6 ++++--
 Thermo.Active/SetupActive_Auto.iss | 7 +++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Build.ps1 b/Build.ps1
index fcf0bfd6..189cf0ff 100644
--- a/Build.ps1
+++ b/Build.ps1
@@ -253,7 +253,7 @@ if($outFile -eq "True")
 if ($excludeNugetUpdate -ne 1) {
    Write-Host "Update the Nuget Packages"
    CheckNugetScm
-   ExecuteLog "nuget restore"
+   ExecuteLog "nuget restore Thermo.Active.sln "
 }
 
 if ($version -ne "") {
@@ -332,12 +332,14 @@ if ($zipOutput -eq 1) {
    ExecuteLog "Copy-Item -Path ""$PSScriptRoot\Thermo.Active\wwwroot\Assets\fonts"" -Destination ""view\Assets"" -Recurse"
    ExecuteLog "Copy-Item -Path ""$PSScriptRoot\Thermo.Active\wwwroot\Assets\images"" -Destination ""view\Assets"" -Recurse"
    ExecuteLog "Copy-Item -Path ""$PSScriptRoot\Thermo.Active\wwwroot\Assets\icons"" -Destination ""view\Assets"" -Recurse"
+   ExecuteLog "Copy-Item -Path ""$PSScriptRoot\Thermo.Active\wwwroot\Assets\svg"" -Destination ""view\Assets"" -Recurse"
+   ExecuteLog "Copy-Item -Path ""$PSScriptRoot\Thermo.Active\wwwroot\Assets\animations"" -Destination ""view\Assets"" -Recurse"
    ExecuteLog "Copy-Item -Path ""$PSScriptRoot\Thermo.Active\wwwroot\Assets\styles\style.css"" -Destination ""view\Assets\styles"" "
    ExecuteLog "Copy-Item -Path ""$PSScriptRoot\Thermo.Active\wwwroot\Assets\styles\style.css.map"" -Destination ""view\Assets\styles"" "
    ExecuteLog "Copy-Item -Path ""$PSScriptRoot\Thermo.Active\wwwroot\Assets\styles\iziToast.min.css"" -Destination ""view\Assets\styles"" "
-   ExecuteLog "Copy-Item -Path ""$PSScriptRoot\Thermo.Active\wwwroot\Assets\styles\vue2-datepicker.css"" -Destination ""view\Assets\styles"" "
    ExecuteLog "Copy-Item -Path ""$PSScriptRoot\Thermo.Active\wwwroot\index.html"" -Destination ""view"" -Recurse"
    ExecuteLog "Copy-Item -Path ""$PSScriptRoot\Thermo.Active\wwwroot\favicon.ico"" -Destination ""view"" -Recurse"
+   ExecuteLog "Copy-Item -Path ""$PSScriptRoot\Thermo.Active\wwwroot\config.development.json"" -Destination ""view"" -Recurse"
    
    Write-Host "Copy view in Zip file"
    $outFile = Test-Path ".\View"
diff --git a/Thermo.Active/SetupActive_Auto.iss b/Thermo.Active/SetupActive_Auto.iss
index 67a7aa36..ed3b5bf5 100644
--- a/Thermo.Active/SetupActive_Auto.iss
+++ b/Thermo.Active/SetupActive_Auto.iss
@@ -86,8 +86,7 @@ english.InstallingDotNet = Installing .Net
 [Tasks]
 Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: checkablealone; 
 Name: quicklaunchicon; Description: {cm:CreateQuickLaunchIcon}; GroupDescription: {cm:AdditionalIcons}; Flags: checkablealone;  
-Name: startupicon; Description: {cm:CreateStartupIcon}; GroupDescription: {cm:AdditionalIcons}; Flags: checkablealone; 
-Name: sinumerikicons; Description: {cm:CreateSinumerikIcons}; GroupDescription: {cm:AdditionalIcons}; Flags: checkablealone;   
+Name: startupicon; Description: {cm:CreateStartupIcon}; GroupDescription: {cm:AdditionalIcons}; Flags: checkablealone;   
 
 [Files]
 Source: "{#MySourcePath}\Thermo.Active.exe"; DestDir: "{app}"; Flags: ignoreversion
@@ -98,8 +97,8 @@ Source: "{#MySourcePath}\*.config"; DestDir: "{app}"; Flags: ignoreversion;
 Source: "{#MySourcePath}\Config\*.xml"; DestDir: "{app}\Config\"; Flags: ignoreversion; 
 ; Languages
 Source: "{#MySourcePath}\languages\*.*"; DestDir: "{app}\languages\"; Flags: ignoreversion;
-; Libs
-Source: "{#MySourcePath}\lib\*.*"; DestDir: "{app}\lib\"; Flags: ignoreversion;
+; dll
+Source: "{#MySourcePath}\dll\*.*"; DestDir: "{app}\dll\"; Flags: ignoreversion recursesubdirs;
 ; Client copy
 Source: "{#MySourcePath}\Client\*.*"; DestDir: "{app}\Client\"; Flags: recursesubdirs ignoreversion; AfterInstall: DeleteLocalStorage
 ; WWWRoot Files