<OutputType>WinExe</OutputType>
<RootNamespace>ParasitemiaUI</RootNamespace>
<AssemblyName>ParasitemiaUI</AssemblyName>
- <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
- <TargetFSharpCoreVersion>4.4.0.0</TargetFSharpCoreVersion>
+ <TargetFSharpCoreVersion>4.4.1.0</TargetFSharpCoreVersion>
<Name>ParasitemiaUI</Name>
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
<Tailcalls>true</Tailcalls>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
- <WarningLevel>3</WarningLevel>
+ <WarningLevel>1</WarningLevel>
<PlatformTarget>AnyCPU</PlatformTarget>
<DocumentationFile>bin\Release\ParasitemiaUI.XML</DocumentationFile>
<Prefer32Bit>false</Prefer32Bit>
<Import Project="$(FSharpTargetsPath)" />
<ItemGroup>
<Compile Include="AssemblyInfo.fs" />
+ <Resource Include="Resources\chuv_logo.png" />
+ <Resource Include="Resources\hes-so_logo.png" />
<Resource Include="Resources\icon.ico" />
- <Resource Include="XAML\NumericUpDown.xaml" />
- <Compile Include="XAML\NumericUpDown.xaml.fs" />
<Resource Include="XAML\ImageSourcePreview.xaml" />
<Compile Include="XAML\ImageSourcePreview.xaml.fs" />
<Resource Include="XAML\ImageSourceSelection.xaml" />
<Compile Include="XAML\ImageSourceSelection.xaml.fs" />
<Resource Include="XAML\RBCFrame.xaml" />
<Compile Include="XAML\RBCFrame.xaml.fs" />
+ <Resource Include="XAML\PPICalculatorWindow.xaml" />
+ <Compile Include="XAML\PPICalculatorWindow.xaml.fs" />
<Resource Include="XAML\AnalysisWindow.xaml" />
<Compile Include="XAML\AnalysisWindow.xaml.fs" />
<Resource Include="XAML\AboutWindow.xaml" />
<Resource Include="XAML\MainWindow.xaml" />
<Compile Include="XAML\MainWindow.xaml.fs" />
<Compile Include="Types.fs" />
+ <Compile Include="Utils.fs" />
<Compile Include="PiaZ.fs" />
<Compile Include="State.fs" />
- <Compile Include="About.fs" />
+ <Compile Include="Export.fs" />
+ <Compile Include="DPICalculator.fs" />
<Compile Include="Analysis.fs" />
+ <Compile Include="About.fs" />
<Compile Include="GUI.fs" />
<None Include="App.config" />
<Content Include="packages.config" />
<Compile Include="Program.fs" />
</ItemGroup>
<ItemGroup>
- <Reference Include="Emgu.CV">
- <HintPath>..\..\..\Emgu\emgucv-windows-universal 3.0.0.2157\bin\Emgu.CV.dll</HintPath>
+ <Reference Include="Emgu.CV.World">
+ <HintPath>..\..\..\Emgu\emgucv-windesktop 3.1.0.2282\bin\Emgu.CV.World.dll</HintPath>
</Reference>
- <Reference Include="Emgu.Util">
- <HintPath>..\..\..\Emgu\emgucv-windows-universal 3.0.0.2157\bin\Emgu.Util.dll</HintPath>
- </Reference>
- <Reference Include="FSharp.Core, Version=$(TargetFSharpCoreVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
- <HintPath>..\packages\FSharp.Core.4.0.0.1\lib\net40\FSharp.Core.dll</HintPath>
- <Private>True</Private>
+ <Reference Include="FSharp.Core">
+ <HintPath>..\packages\FSharp.Core.4.1.2\lib\net45\FSharp.Core.dll</HintPath>
</Reference>
<Reference Include="FSharp.ViewModule">
- <HintPath>..\packages\FSharp.ViewModule.Core.0.9.9.2\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\FSharp.ViewModule.dll</HintPath>
- <Private>True</Private>
+ <HintPath>..\packages\FSharp.ViewModule.Core.1.0.7.0\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\FSharp.ViewModule.dll</HintPath>
</Reference>
<Reference Include="FsXaml.Wpf">
- <HintPath>..\packages\FsXaml.Wpf.0.9.9\lib\net45\FsXaml.Wpf.dll</HintPath>
- <Private>True</Private>
+ <HintPath>..\packages\FsXaml.Wpf.3.1.6\lib\net45\FsXaml.Wpf.dll</HintPath>
</Reference>
<Reference Include="FsXaml.Wpf.TypeProvider">
- <HintPath>..\packages\FsXaml.Wpf.0.9.9\lib\net45\FsXaml.Wpf.TypeProvider.dll</HintPath>
- <Private>True</Private>
+ <HintPath>..\packages\FsXaml.Wpf.3.1.6\lib\net45\FsXaml.Wpf.TypeProvider.dll</HintPath>
</Reference>
<Reference Include="mscorlib" />
<Reference Include="Newtonsoft.Json">
- <HintPath>..\packages\Newtonsoft.Json.8.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
- <Private>True</Private>
+ <HintPath>..\packages\Newtonsoft.Json.10.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
<Reference Include="System.IO.Compression" />
<Reference Include="System.IO.Compression.FileSystem" />
<Reference Include="System.Numerics" />
+ <Reference Include="System.ValueTuple">
+ <HintPath>..\packages\System.ValueTuple.4.3.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
+ </Reference>
<Reference Include="System.Windows.Interactivity">
<HintPath>..\packages\Expression.Blend.Sdk.1.0.2\lib\net45\System.Windows.Interactivity.dll</HintPath>
<Private>True</Private>
</ProjectReference>
</ItemGroup>
<PropertyGroup>
- <PostBuildEvent>xcopy "D:\Emgu\emgucv-windows-universal 3.0.0.2157\bin\x64" "$(TargetDir)x64" /Y /D /I
-xcopy "D:\Emgu\emgucv-windows-universal 3.0.0.2157\bin\x86" "$(TargetDir)x86" /Y /D /I</PostBuildEvent>
+ <PostBuildEvent>xcopy "D:\Emgu\emgucv-windesktop 3.1.0.2282\bin\x64" "$(TargetDir)x64" /Y /D /I
+xcopy "D:\Emgu\emgucv-windesktop 3.1.0.2282\bin\x86" "$(TargetDir)x86" /Y /D /I</PostBuildEvent>
</PropertyGroup>
<!-- 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.