-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <Import Project="..\packages\EmguCV.3.1.0.1\build\EmguCV.props" Condition="Exists('..\packages\EmguCV.3.1.0.1\build\EmguCV.props')" />
- <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
+
<PropertyGroup>
- <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <SchemaVersion>2.0</SchemaVersion>
- <ProjectGuid>70838e65-f211-44fc-b28f-0ed1ca6e850f</ProjectGuid>
<OutputType>WinExe</OutputType>
- <RootNamespace>ParasitemiaUI</RootNamespace>
- <AssemblyName>ParasitemiaUI</AssemblyName>
- <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
- <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
- <TargetFSharpCoreVersion>4.4.1.0</TargetFSharpCoreVersion>
- <Name>ParasitemiaUI</Name>
- <NuGetPackageImportStamp>
- </NuGetPackageImportStamp>
- <TargetFrameworkProfile />
- <Win32Resource>resources.res</Win32Resource>
+ <TargetFramework>net5.0-windows</TargetFramework>
+ <UseWPF>true</UseWPF>
+ <AssemblyVersion>1.0.0.12</AssemblyVersion>
+ <FileVersion>1.0.0.12</FileVersion>
+ <Version>1.0.12</Version>
+ <Authors>Greg Burri</Authors>
+ <Company>CHUV & HES-SO</Company>
+ <Win32Resource></Win32Resource>
</PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <DebugSymbols>true</DebugSymbols>
- <DebugType>full</DebugType>
- <Optimize>false</Optimize>
- <Tailcalls>false</Tailcalls>
- <OutputPath>bin\Debug\</OutputPath>
- <DefineConstants>DEBUG;TRACE</DefineConstants>
- <WarningLevel>3</WarningLevel>
- <PlatformTarget>AnyCPU</PlatformTarget>
- <DocumentationFile>bin\Debug\ParasitemiaUI.XML</DocumentationFile>
- <Prefer32Bit>false</Prefer32Bit>
- <StartArguments>--folder "../../../Images/debug" --output "../../../Images/output" --debug</StartArguments>
+
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+ <OtherFlags>--win32res:resources.res</OtherFlags>
</PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugGUI|AnyCPU' ">
- <DebugSymbols>true</DebugSymbols>
- <DebugType>full</DebugType>
- <Optimize>false</Optimize>
- <Tailcalls>false</Tailcalls>
- <DefineConstants>DEBUG;TRACE</DefineConstants>
- <WarningLevel>3</WarningLevel>
- <PlatformTarget>AnyCPU</PlatformTarget>
- <DocumentationFile>bin\Debug\ParasitemiaUI.XML</DocumentationFile>
- <Prefer32Bit>false</Prefer32Bit>
- <StartArguments>--output "../../../Images/output" --debug</StartArguments>
- <OutputPath>bin\DebugGUI\</OutputPath>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <DebugType>pdbonly</DebugType>
- <Optimize>true</Optimize>
- <Tailcalls>true</Tailcalls>
- <OutputPath>bin\Release\</OutputPath>
- <DefineConstants>TRACE</DefineConstants>
- <WarningLevel>1</WarningLevel>
- <PlatformTarget>AnyCPU</PlatformTarget>
- <DocumentationFile>
- </DocumentationFile>
- <Prefer32Bit>false</Prefer32Bit>
- <StartArguments>--folder "../../../Images/release" --output "../../../Images/output" --debug</StartArguments>
- </PropertyGroup>
- <PropertyGroup>
- <MinimumVisualStudioVersion Condition="'$(MinimumVisualStudioVersion)' == ''">11</MinimumVisualStudioVersion>
- </PropertyGroup>
- <PropertyGroup Condition="Exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets')">
- <FSharpTargetsPath>$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets</FSharpTargetsPath>
- </PropertyGroup>
- <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\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\CommandLineArgumentsWindow.xaml" />
- <Compile Include="XAML\CommandLineArgumentsWindow.xaml.fs" />
- <Resource Include="XAML\AboutWindow.xaml" />
- <Compile Include="XAML\AboutWindow.xaml.fs" />
- <Resource Include="XAML\MainWindow.xaml" />
- <Compile Include="XAML\MainWindow.xaml.fs" />
<Compile Include="Types.fs" />
<Compile Include="Utils.fs" />
<Compile Include="SourceImage.fs" />
<Compile Include="State.fs" />
<Compile Include="Export.fs" />
<Compile Include="DPICalculator.fs" />
+ <Compile Include="BitmapSourceConvert.fs" />
<Compile Include="Analysis.fs" />
<Compile Include="CommandLineArguments.fs" />
<Compile Include="About.fs" />
<Compile Include="GUI.fs" />
- <None Include="App.config" />
- <Content Include="packages.config" />
<Compile Include="Program.fs" />
<Content Include="License-LGPL.txt" />
<Content Include="OpenTK.dll.config" />
</ItemGroup>
+
<ItemGroup>
- <Reference Include="Emgu.CV.UI">
- <HintPath>..\packages\EmguCV.3.1.0.1\lib\net30\Emgu.CV.UI.dll</HintPath>
- </Reference>
- <Reference Include="Emgu.CV.UI.GL">
- <HintPath>..\packages\EmguCV.3.1.0.1\lib\net30\Emgu.CV.UI.GL.dll</HintPath>
- </Reference>
- <Reference Include="Emgu.CV.World">
- <HintPath>..\packages\EmguCV.3.1.0.1\lib\net30\Emgu.CV.World.dll</HintPath>
- </Reference>
- <Reference Include="FSharp.Core">
- <HintPath>..\packages\FSharp.Core.4.3.4\lib\net45\FSharp.Core.dll</HintPath>
- </Reference>
- <Reference Include="FSharp.ViewModule">
- <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.3.1.6\lib\net45\FsXaml.Wpf.dll</HintPath>
- </Reference>
- <Reference Include="FsXaml.Wpf.TypeProvider">
- <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.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
- </Reference>
- <Reference Include="OpenTK">
- <HintPath>..\packages\OpenTK.3.0.0\lib\net20\OpenTK.dll</HintPath>
- </Reference>
- <Reference Include="OpenTK.GLControl">
- <HintPath>..\packages\OpenTK.GLControl.3.0.0\lib\net20\OpenTK.GLControl.dll</HintPath>
- </Reference>
- <Reference Include="PresentationCore" />
- <Reference Include="PresentationFramework" />
- <Reference Include="System" />
- <Reference Include="System.Core" />
- <Reference Include="System.Data" />
- <Reference Include="System.Data.DataSetExtensions" />
- <Reference Include="System.Data.Linq" />
- <Reference Include="System.Drawing" />
- <Reference Include="System.IO.Compression" />
- <Reference Include="System.IO.Compression.FileSystem" />
- <Reference Include="System.Numerics" />
- <Reference Include="System.ValueTuple">
- <HintPath>..\packages\System.ValueTuple.4.4.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
- </Reference>
- <Reference Include="System.Windows.Forms" />
- <Reference Include="System.Windows.Interactivity">
- <HintPath>..\packages\Expression.Blend.Sdk.1.0.2\lib\net45\System.Windows.Interactivity.dll</HintPath>
- <Private>True</Private>
- </Reference>
- <Reference Include="System.Xaml" />
- <Reference Include="System.Xml" />
- <Reference Include="System.Xml.Linq" />
- <Reference Include="WindowsBase" />
- <Reference Include="ZedGraph">
- <HintPath>..\packages\ZedGraph.5.1.7\lib\net35-Client\ZedGraph.dll</HintPath>
- </Reference>
+ <PackageReference Include="Emgu.CV" Version="4.5.1.4349" />
+ <PackageReference Include="Emgu.CV.Bitmap" Version="4.5.1.4349" />
+ <PackageReference Include="Emgu.CV.runtime.windows" Version="4.5.1.4349" />
+ <PackageReference Include="FSharp.ViewModule.Core" Version="1.0.7" />
+ <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
+ <PackageReference Include="System.Drawing.Common" Version="5.0.2" />
</ItemGroup>
+
<ItemGroup>
- <ProjectReference Include="..\Logger\Logger.fsproj">
- <Name>Logger</Name>
- <Project>{a4f183ae-562a-4bad-88e6-658b4ce15dc3}</Project>
- <Private>True</Private>
- </ProjectReference>
- <ProjectReference Include="..\ParasitemiaCore\ParasitemiaCore.fsproj">
- <Name>ParasitemiaCore</Name>
- <Project>{0f8a85f4-9328-40c3-b8ff-44fb39ceb01f}</Project>
- <Private>True</Private>
- </ProjectReference>
- <ProjectReference Include="..\WPF\WPF.csproj">
- <Name>WPF</Name>
- <Project>{314fd78e-870e-4794-bb16-ea4586f2abdb}</Project>
- <Private>True</Private>
- </ProjectReference>
+ <ProjectReference Include="..\Logger\Logger.fsproj" />
+ <ProjectReference Include="..\ParasitemiaCore\ParasitemiaCore.fsproj" />
+ <ProjectReference Include="..\ParasitemiaUIControls\ParasitemiaUIControls.csproj" />
</ItemGroup>
- <PropertyGroup>
- <PostBuildEvent>
- </PostBuildEvent>
- </PropertyGroup>
- <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
- <PropertyGroup>
- <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
- </PropertyGroup>
- <Error Condition="!Exists('..\packages\EmguCV.3.1.0.1\build\EmguCV.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EmguCV.3.1.0.1\build\EmguCV.props'))" />
- <Error Condition="!Exists('..\packages\EmguCV.3.1.0.1\build\EmguCV.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EmguCV.3.1.0.1\build\EmguCV.targets'))" />
- </Target>
- <Import Project="..\packages\EmguCV.3.1.0.1\build\EmguCV.targets" Condition="Exists('..\packages\EmguCV.3.1.0.1\build\EmguCV.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>
- -->
+
+ <ItemGroup>
+ <PackageReference Update="FSharp.Core" Version="5.0.1" />
+ </ItemGroup>
+
</Project>
\ No newline at end of file
projects / master-thesis.git / blobdiff