Bump to netcoreapp3.1

ceilingwaffle · Aug 1, 2020 · a2f73a1 · a2f73a1
1 parent 530eb5f
commit a2f73a1
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/Focusu.GUI/Focusu.GUI.csproj b/Focusu.GUI/Focusu.GUI.csproj
@@ -2,8 +2,9 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
-    <UseWPF>true</UseWPF>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <UseWpf>true</UseWpf>
+    <UseWindowsForms>true</UseWindowsForms>
     <ApplicationIcon>resources\focusu_icon_w1ll_v1.ico</ApplicationIcon>
     <StartupObject>Focusu.GUI.App</StartupObject>
     <Version>0.2.0</Version>
@@ -43,13 +44,15 @@
 
   <ItemGroup>
     <PackageReference Include="Config.Net" Version="4.13.7" />
+    <PackageReference Include="System.Configuration.ConfigurationManager" Version="4.7.0" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\..\DependentValuePresentationFramework\DVPF.Core\DVPF.Core.csproj" />
     <ProjectReference Include="..\..\OsuStatePresenter\OsuStatePresenter\OsuStatePresenter.csproj" />
   </ItemGroup>
 
+
   <ItemGroup>
     <Resource Include="resources\fonts\password.ttf" />
     <Resource Include="resources\images\small\Monitor_black.png" />

diff --git a/Focusu.sln b/Focusu.sln
@@ -11,10 +11,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DVPF.Core", "..\DependentVa
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OsuStatePresenter", "..\OsuStatePresenter\OsuStatePresenter\OsuStatePresenter.csproj", "{4ED44B13-BB8E-40AD-A486-EA7CEA6C9297}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProcessMemoryDataFinder", "..\submodules\ProcessMemoryDataFinder\ProcessMemoryDataFinder\ProcessMemoryDataFinder.csproj", "{9960D641-300A-432C-AA04-C351A99B9ADB}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OsuMemoryDataProvider", "..\submodules\ProcessMemoryDataFinder\OsuMemoryDataProvider\OsuMemoryDataProvider.csproj", "{D117800F-072D-4AE4-9679-3E2A129A1A3C}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Oppai.w.Net", "..\submodules\Oppai.w.Net\Oppai.w.Net\Oppai.w.Net.csproj", "{D02CC1ED-E1E8-4553-8942-0A1A855BEDB8}"
 EndProject
 Global

diff --git a/global.json b/global.json
@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "3.0.100-preview4-011223"
+    "version": ""
   }
 }