Set exe icon and update setup script.

diff --git a/Parasitemia/ParasitemiaUI/ParasitemiaUI.fsproj b/Parasitemia/ParasitemiaUI/ParasitemiaUI.fsproj
index d22fd41..db15b1e 100644 (file)
--- a/Parasitemia/ParasitemiaUI/ParasitemiaUI.fsproj
+++ b/Parasitemia/ParasitemiaUI/ParasitemiaUI.fsproj
@@ -9,6 +9,11 @@
     <Version>1.0.12</Version>
     <Authors>Greg Burri</Authors>
     <Company>CHUV &amp; HES-SO</Company>
+    <Win32Resource></Win32Resource>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+    <OtherFlags>--win32res:resources.res</OtherFlags>
   </PropertyGroup>
 
   <ItemGroup>
@@ -24,7 +29,6 @@
     <Compile Include="CommandLineArguments.fs" />
     <Compile Include="About.fs" />
     <Compile Include="GUI.fs" />
-    <Content Include="packages.config" />
     <Compile Include="Program.fs" />
     <Content Include="License-LGPL.txt" />
     <Content Include="OpenTK.dll.config" />

diff --git a/Parasitemia/ParasitemiaUI/packages.config b/Parasitemia/ParasitemiaUI/packages.config
deleted file mode 100644 (file)
index f15ea27..0000000
--- a/Parasitemia/ParasitemiaUI/packages.config
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="EmguCV" version="3.1.0.1" targetFramework="net452" />
-  <package id="Expression.Blend.Sdk" version="1.0.2" targetFramework="net46" />
-  <package id="FSharp.Core" version="4.7.2" targetFramework="net48" />
-  <package id="FSharp.ViewModule.Core" version="1.0.7.0" targetFramework="net462" />
-  <package id="FsXaml.Wpf" version="3.1.6" targetFramework="net462" />
-  <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net48" />
-  <package id="OpenTK" version="3.2" targetFramework="net48" />
-  <package id="OpenTK.GLControl" version="3.1.0" targetFramework="net48" />
-  <package id="System.ValueTuple" version="4.5.0" targetFramework="net48" />
-  <package id="ZedGraph" version="5.1.7" targetFramework="net452" />
-</packages>
\ No newline at end of file

diff --git a/Parasitemia/Setup/setup.iss b/Parasitemia/Setup/setup.iss
index 00579bb..19f8bf3 100644 (file)
--- a/Parasitemia/Setup/setup.iss
+++ b/Parasitemia/Setup/setup.iss
@@ -2,14 +2,14 @@
 #define ApplicationDir ".."
 
 #define AppName "Parasitemia"
-#define ExePath ApplicationDir + "/ParasitemiaUI/bin/Release/ParasitemiaUI.exe"
+#define ExePath ApplicationDir + "/ParasitemiaUI/bin/Release/net5.0-windows/ParasitemiaUI.exe"
 #define Version GetStringFileInfo(ExePath, 'ProductVersion')
 #define BuildTime GetStringFileInfo(ExePath, 'BuildTime')
 
 [Setup]
 AppName={#AppName}
 AppVersion={#Version}          
-SetupIconFile={#ApplicationDir}/ParasitemiaUI/Resources/icon.ico 
+SetupIconFile={#ApplicationDir}/ParasitemiaUIControls/Resources/icon.ico 
 DefaultDirName={pf}/{#AppName}
 DefaultGroupName={#AppName}
 UninstallDisplayIcon={app}/ParasitemiaUI.exe
@@ -19,21 +19,22 @@ OutputBaseFilename={#AppName}-{#Version}-Setup
 ChangesAssociations=yes
 
 [Files]
-Source: "{#ApplicationDir}/ParasitemiaUI/bin/Release/ParasitemiaUI.exe"; DestDir: "{app}"; Flags: comparetimestamp
-Source: "{#ApplicationDir}/ParasitemiaUI/bin/Release/Emgu.CV.World.dll"; DestDir: "{app}"; Flags: comparetimestamp
-Source: "{#ApplicationDir}/ParasitemiaUI/bin/Release/FSharp.Collections.ParallelSeq.dll"; DestDir: "{app}"; Flags: comparetimestamp
-Source: "{#ApplicationDir}/ParasitemiaUI/bin/Release/FSharp.Core.dll"; DestDir: "{app}"; Flags: comparetimestamp
-Source: "{#ApplicationDir}/ParasitemiaUI/bin/Release/FSharp.ViewModule.dll"; DestDir: "{app}"; Flags: comparetimestamp
-Source: "{#ApplicationDir}/ParasitemiaUI/bin/Release/FsXaml.Wpf.dll"; DestDir: "{app}"; Flags: comparetimestamp     
-Source: "{#ApplicationDir}/ParasitemiaUI/bin/Release/FsXaml.Wpf.TypeProvider.dll"; DestDir: "{app}"; Flags: comparetimestamp
-Source: "{#ApplicationDir}/ParasitemiaUI/bin/Release/Logger.dll"; DestDir: "{app}"; Flags: comparetimestamp
-Source: "{#ApplicationDir}/ParasitemiaUI/bin/Release/MathNet.Numerics.dll"; DestDir: "{app}"; Flags: comparetimestamp
-Source: "{#ApplicationDir}/ParasitemiaUI/bin/Release/Newtonsoft.Json.dll"; DestDir: "{app}"; Flags: comparetimestamp
-Source: "{#ApplicationDir}/ParasitemiaUI/bin/Release/ParasitemiaCore.dll"; DestDir: "{app}"; Flags: comparetimestamp   
-Source: "{#ApplicationDir}/ParasitemiaUI/bin/Release/System.Windows.Interactivity.dll"; DestDir: "{app}"; Flags: comparetimestamp
-Source: "{#ApplicationDir}/ParasitemiaUI/bin/Release/WPF.dll"; DestDir: "{app}"; Flags: comparetimestamp        
-Source: "{#ApplicationDir}/ParasitemiaUI/bin/Release/ParasitemiaUI.exe.config"; DestDir: "{app}"; Flags: comparetimestamp
-Source: "{#ApplicationDir}/ParasitemiaUI/bin/Release/x64/*"; DestDir: "{app}/x64"; Flags: comparetimestamp recursesubdirs
+Source: "{#ApplicationDir}/ParasitemiaUI/bin/Release/net5.0-windows/ParasitemiaUI.exe"; DestDir: "{app}"; Flags: comparetimestamp   
+Source: "{#ApplicationDir}/ParasitemiaUI/bin/Release/net5.0-windows/ParasitemiaUI.dll"; DestDir: "{app}"; Flags: comparetimestamp
+Source: "{#ApplicationDir}/ParasitemiaUI/bin/Release/net5.0-windows/ParasitemiaUI.runtimeconfig.json"; DestDir: "{app}"; Flags: comparetimestamp    
+Source: "{#ApplicationDir}/ParasitemiaUI/bin/Release/net5.0-windows/ParasitemiaCore.dll"; DestDir: "{app}"; Flags: comparetimestamp   
+Source: "{#ApplicationDir}/ParasitemiaUI/bin/Release/net5.0-windows/ParasitemiaUIControls.dll"; DestDir: "{app}"; Flags: comparetimestamp
+Source: "{#ApplicationDir}/ParasitemiaUI/bin/Release/net5.0-windows/runtimes/*"; DestDir: "{app}/runtimes"; Flags: comparetimestamp recursesubdirs  
+Source: "{#ApplicationDir}/ParasitemiaUI/bin/Release/net5.0-windows/Emgu.CV.Platform.NetStandard.dll"; DestDir: "{app}"; Flags: comparetimestamp
+Source: "{#ApplicationDir}/ParasitemiaUI/bin/Release/net5.0-windows/Emgu.CV.Bitmap.dll"; DestDir: "{app}"; Flags: comparetimestamp
+Source: "{#ApplicationDir}/ParasitemiaUI/bin/Release/net5.0-windows/FSharp.Collections.ParallelSeq.dll"; DestDir: "{app}"; Flags: comparetimestamp
+Source: "{#ApplicationDir}/ParasitemiaUI/bin/Release/net5.0-windows/FSharp.Core.dll"; DestDir: "{app}"; Flags: comparetimestamp
+Source: "{#ApplicationDir}/ParasitemiaUI/bin/Release/net5.0-windows/FSharp.ViewModule.dll"; DestDir: "{app}"; Flags: comparetimestamp
+Source: "{#ApplicationDir}/ParasitemiaUI/bin/Release/net5.0-windows/Logger.dll"; DestDir: "{app}"; Flags: comparetimestamp
+Source: "{#ApplicationDir}/ParasitemiaUI/bin/Release/net5.0-windows/MathNet.Numerics.dll"; DestDir: "{app}"; Flags: comparetimestamp
+Source: "{#ApplicationDir}/ParasitemiaUI/bin/Release/net5.0-windows/MathNet.Numerics.FSharp.dll"; DestDir: "{app}"; Flags: comparetimestamp
+Source: "{#ApplicationDir}/ParasitemiaUI/bin/Release/net5.0-windows/Newtonsoft.Json.dll"; DestDir: "{app}"; Flags: comparetimestamp
+Source: "{#ApplicationDir}/ParasitemiaUI/bin/Release/net5.0-windows/System.Drawing.Common.dll"; DestDir: "{app}"; Flags: comparetimestamp
 
 [Icons]     
 Name: "{group}\Parasitemia"; Filename: "{app}/ParasitemiaUI.exe"; WorkingDir: "{app}"