Merge pull request #25 from Piotrekol/master

bfcvd

.gitattributes

@@ -0,0 +1,63 @@
+###############################################################################
+# Set default behavior to automatically normalize line endings.
+###############################################################################
+* text=auto
+
+###############################################################################
+# Set default behavior for command prompt diff.
+#
+# This is need for earlier builds of msysgit that does not have it on by
+# default for csharp files.
+# Note: This is only used by command line
+###############################################################################
+#*.cs     diff=csharp
+
+###############################################################################
+# Set the merge driver for project and solution files
+#
+# Merging from the command prompt will add diff markers to the files if there
+# are conflicts (Merging from VS is not affected by the settings below, in VS
+# the diff markers are never inserted). Diff markers may cause the following 
+# file extensions to fail to load in VS. An alternative would be to treat
+# these files as binary and thus will always conflict and require user
+# intervention with every merge. To do so, just uncomment the entries below
+###############################################################################
+#*.sln       merge=binary
+#*.csproj    merge=binary
+#*.vbproj    merge=binary
+#*.vcxproj   merge=binary
+#*.vcproj    merge=binary
+#*.dbproj    merge=binary
+#*.fsproj    merge=binary
+#*.lsproj    merge=binary
+#*.wixproj   merge=binary
+#*.modelproj merge=binary
+#*.sqlproj   merge=binary
+#*.wwaproj   merge=binary
+
+###############################################################################
+# behavior for image files
+#
+# image files are treated as binary by default.
+###############################################################################
+#*.jpg   binary
+#*.png   binary
+#*.gif   binary
+
+###############################################################################
+# diff behavior for common document formats
+# 
+# Convert binary document formats to text before diffing them. This feature
+# is only available from the command line. Turn it on by uncommenting the 
+# entries below.
+###############################################################################
+#*.doc   diff=astextplain
+#*.DOC   diff=astextplain
+#*.docx  diff=astextplain
+#*.DOCX  diff=astextplain
+#*.dot   diff=astextplain
+#*.DOT   diff=astextplain
+#*.pdf   diff=astextplain
+#*.PDF   diff=astextplain
+#*.rtf   diff=astextplain
+#*.RTF   diff=astextplain

.gitignore

@@ -1,29 +1,37 @@
+# Created by https://www.gitignore.io
+
+### VisualStudio ###
 ## Ignore Visual Studio temporary files, build results, and
 ## files generated by popular Visual Studio add-ons.
 
 # User-specific files
 *.suo
 *.user
+*.userosscache
 *.sln.docstates
 
+# User-specific files (MonoDevelop/Xamarin Studio)
+*.userprefs
+
 # Build results
 [Dd]ebug/
 [Dd]ebugPublic/
 [Rr]elease/
+[Rr]eleases/
 x64/
-build/
+x86/
 bld/
 [Bb]in/
 [Oo]bj/
 
-# Roslyn cache directories
-*.ide/
+# Visual Studo 2015 cache/options directory
+.vs/
 
 # MSTest test Results
 [Tt]est[Rr]esult*/
 [Bb]uild[Ll]og.*
 
-#NUNIT
+# NUNIT
 *.VisualState.xml
 TestResult.xml
 
@@ -42,7 +50,6 @@ dlldata.c
 *.pdb
 *.pgc
 *.pgd
-*.rsp
 *.sbr
 *.tlb
 *.tli
@@ -123,22 +130,19 @@ publish/
 # Publish Web Output
 *.[Pp]ublish.xml
 *.azurePubxml
-## TODO: Comment the next line if you want to checkin your
-## web deploy settings but do note that will include unencrypted
-## passwords
+# TODO: Comment the next line if you want to checkin your web deploy settings 
+# but database connection strings (with potential passwords) will be unencrypted
 *.pubxml
+*.publishproj
 
-# NuGet Packages Directory
-packages/*
-## TODO: If the tool you use requires repositories.config
-## uncomment the next line
-#!packages/repositories.config
-
-# Enable "build/" folder in the NuGet Packages folder since
-# NuGet packages use it for MSBuild targets.
-# This line needs to be after the ignore of the build folder
-# (and the packages folder if the line above has been uncommented)
-!packages/build/
+# NuGet Packages
+*.nupkg
+# The packages folder can be ignored because of Package Restore
+**/packages/*
+# except build/, which is used as an MSBuild target.
+!**/packages/build/
+# Uncomment if necessary however generally it will be regenerated when needed
+#!**/packages/repositories.config
 
 # Windows Azure Build Output
 csx/
@@ -148,8 +152,7 @@ csx/
 AppPackages/
 
 # Others
-sql/
-*.Cache
+*.[Cc]ache
 ClientBin/
 [Ss]tyle[Cc]op.*
 ~$*
@@ -159,6 +162,7 @@ ClientBin/
 *.pfx
 *.publishsettings
 node_modules/
+bower_components/
 
 # RIA/Silverlight projects
 Generated_Code/
@@ -182,4 +186,12 @@ UpgradeLog*.htm
 
 # Microsoft Fakes
 FakesAssemblies/
-o!RA Locale Generator/GlobalVars.cs
+
+# Node.js Tools for Visual Studio
+.ntvs_analysis.dat
+
+# Visual Studio 6 build log
+*.plg
+
+# Visual Studio 6 workspace options file
+*.opt

osu-trainer.sln

@@ -1,19 +1,14 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29911.84
+# Visual Studio Version 17
+VisualStudioVersion = 17.5.33326.253
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "osu-trainer", "osu-trainer\osu-trainer.csproj", "{88026F3A-2BC2-4542-87CE-6A7E796FD2DD}"
 	ProjectSection(ProjectDependencies) = postProject
 		{C0D3B730-5F38-459D-A4A1-9E9953A31B68} = {C0D3B730-5F38-459D-A4A1-9E9953A31B68}
 		{8340F8A9-185E-48D4-B544-3809C10CBD62} = {8340F8A9-185E-48D4-B544-3809C10CBD62}
-		{B7EEDCDD-8F5A-46A9-97AF-4294D7FF912F} = {B7EEDCDD-8F5A-46A9-97AF-4294D7FF912F}
 	EndProjectSection
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OsuMemoryDataProvider", "osu-trainer\submodules\ProcessMemoryDataFinder\OsuMemoryDataProvider\OsuMemoryDataProvider.csproj", "{B7EEDCDD-8F5A-46A9-97AF-4294D7FF912F}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ProcessMemoryDataFinder", "osu-trainer\submodules\ProcessMemoryDataFinder\ProcessMemoryDataFinder\ProcessMemoryDataFinder.csproj", "{514B627C-2693-47EE-8C67-0B2CBA9ADAC5}"
-EndProject
 Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FsBeatmapProcessor", "osu-trainer\submodules\FsBeatmapParser\FsBeatmapProcessor.fsproj", "{C0D3B730-5F38-459D-A4A1-9E9953A31B68}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "key preview", "osu-trainer\submodules\globalKeyboardHook\key preview.csproj", "{8340F8A9-185E-48D4-B544-3809C10CBD62}"
@@ -40,28 +35,6 @@ Global
 		{88026F3A-2BC2-4542-87CE-6A7E796FD2DD}.Release|x64.Build.0 = Release|Any CPU
 		{88026F3A-2BC2-4542-87CE-6A7E796FD2DD}.Release|x86.ActiveCfg = Release|Any CPU
 		{88026F3A-2BC2-4542-87CE-6A7E796FD2DD}.Release|x86.Build.0 = Release|Any CPU
-		{B7EEDCDD-8F5A-46A9-97AF-4294D7FF912F}.Debug|Any CPU.ActiveCfg = Debug|x86
-		{B7EEDCDD-8F5A-46A9-97AF-4294D7FF912F}.Debug|Any CPU.Build.0 = Debug|x86
-		{B7EEDCDD-8F5A-46A9-97AF-4294D7FF912F}.Debug|x64.ActiveCfg = Debug|x86
-		{B7EEDCDD-8F5A-46A9-97AF-4294D7FF912F}.Debug|x86.ActiveCfg = Debug|x86
-		{B7EEDCDD-8F5A-46A9-97AF-4294D7FF912F}.Debug|x86.Build.0 = Debug|x86
-		{B7EEDCDD-8F5A-46A9-97AF-4294D7FF912F}.Release|Any CPU.ActiveCfg = Release|x86
-		{B7EEDCDD-8F5A-46A9-97AF-4294D7FF912F}.Release|Any CPU.Build.0 = Release|x86
-		{B7EEDCDD-8F5A-46A9-97AF-4294D7FF912F}.Release|x64.ActiveCfg = Release|x86
-		{B7EEDCDD-8F5A-46A9-97AF-4294D7FF912F}.Release|x86.ActiveCfg = Release|x86
-		{B7EEDCDD-8F5A-46A9-97AF-4294D7FF912F}.Release|x86.Build.0 = Release|x86
-		{514B627C-2693-47EE-8C67-0B2CBA9ADAC5}.Debug|Any CPU.ActiveCfg = Debug|x86
-		{514B627C-2693-47EE-8C67-0B2CBA9ADAC5}.Debug|Any CPU.Build.0 = Debug|x86
-		{514B627C-2693-47EE-8C67-0B2CBA9ADAC5}.Debug|x64.ActiveCfg = Debug|x64
-		{514B627C-2693-47EE-8C67-0B2CBA9ADAC5}.Debug|x64.Build.0 = Debug|x64
-		{514B627C-2693-47EE-8C67-0B2CBA9ADAC5}.Debug|x86.ActiveCfg = Debug|x86
-		{514B627C-2693-47EE-8C67-0B2CBA9ADAC5}.Debug|x86.Build.0 = Debug|x86
-		{514B627C-2693-47EE-8C67-0B2CBA9ADAC5}.Release|Any CPU.ActiveCfg = Release|x86
-		{514B627C-2693-47EE-8C67-0B2CBA9ADAC5}.Release|Any CPU.Build.0 = Release|x86
-		{514B627C-2693-47EE-8C67-0B2CBA9ADAC5}.Release|x64.ActiveCfg = Release|x64
-		{514B627C-2693-47EE-8C67-0B2CBA9ADAC5}.Release|x64.Build.0 = Release|x64
-		{514B627C-2693-47EE-8C67-0B2CBA9ADAC5}.Release|x86.ActiveCfg = Release|x86
-		{514B627C-2693-47EE-8C67-0B2CBA9ADAC5}.Release|x86.Build.0 = Release|x86
 		{C0D3B730-5F38-459D-A4A1-9E9953A31B68}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{C0D3B730-5F38-459D-A4A1-9E9953A31B68}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C0D3B730-5F38-459D-A4A1-9E9953A31B68}.Debug|x64.ActiveCfg = Debug|Any CPU

osu-trainer/App.config

@@ -7,7 +7,7 @@
     </configSections>
     <startup> 
 
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/></startup>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup>
     <runtime>
         <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
             <probing privatePath="lib"/>

osu-trainer/osu-trainer.csproj

@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>osu_trainer</RootNamespace>
     <AssemblyName>osu-trainer</AssemblyName>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
     <NuGetPackageImportStamp>
@@ -35,7 +35,7 @@
     <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>x64</PlatformTarget>
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
@@ -46,7 +46,7 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>x64</PlatformTarget>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
@@ -80,8 +80,8 @@
     <SignManifests>false</SignManifests>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="FSharp.Core, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\FSharp.Core.6.0.1\lib\netstandard2.0\FSharp.Core.dll</HintPath>
+    <Reference Include="FSharp.Core, Version=7.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\FSharp.Core.7.0.0\lib\netstandard2.0\FSharp.Core.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Win32.Registry, Version=4.1.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Win32.Registry.4.7.0\lib\net461\Microsoft.Win32.Registry.dll</HintPath>
@@ -128,6 +128,12 @@
     <Reference Include="NVorbis">
       <HintPath>..\packages\NVorbis.0.10.4\lib\net45\NVorbis.dll</HintPath>
     </Reference>
+    <Reference Include="OsuMemoryDataProvider, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\OsuMemoryDataProvider.0.8.12\lib\net472\OsuMemoryDataProvider.dll</HintPath>
+    </Reference>
+    <Reference Include="ProcessMemoryDataFinder, Version=0.8.5.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\ProcessMemoryDataFinder.0.8.5\lib\net472\ProcessMemoryDataFinder.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Buffers, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Buffers.4.4.0\lib\netstandard2.0\System.Buffers.dll</HintPath>
@@ -363,10 +369,6 @@
       <Project>{8340f8a9-185e-48d4-b544-3809c10cbd62}</Project>
       <Name>key preview</Name>
     </ProjectReference>
-    <ProjectReference Include="submodules\ProcessMemoryDataFinder\OsuMemoryDataProvider\OsuMemoryDataProvider.csproj">
-      <Project>{b7eedcdd-8f5a-46a9-97af-4294d7ff912f}</Project>
-      <Name>OsuMemoryDataProvider</Name>
-    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>

osu-trainer/packages.config

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="FSharp.Core" version="6.0.1" targetFramework="net471" />
+  <package id="FSharp.Core" version="7.0.0" targetFramework="net48" />
+  <package id="Microsoft.CSharp" version="4.7.0" targetFramework="net472" />
   <package id="Microsoft.Win32.Registry" version="4.7.0" targetFramework="net472" />
   <package id="Microsoft.WindowsAPICodePack-Core" version="1.1.0.2" targetFramework="net471" />
   <package id="Microsoft.WindowsAPICodePack-Shell" version="1.1.0.0" targetFramework="net471" />
@@ -15,7 +16,10 @@
   <package id="NAudio.WinMM" version="2.0.1" targetFramework="net472" />
   <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net471" />
   <package id="NVorbis" version="0.10.4" targetFramework="net472" />
+  <package id="OsuMemoryDataProvider" version="0.8.12" targetFramework="net472" />
+  <package id="ProcessMemoryDataFinder" version="0.8.5" targetFramework="net472" />
   <package id="System.Buffers" version="4.4.0" targetFramework="net472" />
+  <package id="System.Data.DataSetExtensions" version="4.5.0" targetFramework="net472" />
   <package id="System.Drawing.Common" version="6.0.0" targetFramework="net471" />
   <package id="System.Memory" version="4.5.3" targetFramework="net472" />
   <package id="System.Numerics.Vectors" version="4.4.0" targetFramework="net472" />

osu-trainer/submodules/globalKeyboardHook/key preview.csproj

@@ -14,7 +14,7 @@
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
     <OldToolsVersion>2.0</OldToolsVersion>
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <TargetFrameworkProfile />
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>