Migrate to .Net 5.0

sabihoshi · May 19, 2021 · 96eed7c · 96eed7c
1 parent 98ee4f5
commit 96eed7c
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 7 deletions.
diff --git a/GenshinLyreMidiPlayer.Data/GenshinLyreMidiPlayer.Data.csproj b/GenshinLyreMidiPlayer.Data/GenshinLyreMidiPlayer.Data.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0-windows10.0.19041.0</TargetFramework>
     <LangVersion>latest</LangVersion>
     <Nullable>enable</Nullable>
   </PropertyGroup>

diff --git a/GenshinLyreMidiPlayer.WPF/GenshinLyreMidiPlayer.WPF.csproj b/GenshinLyreMidiPlayer.WPF/GenshinLyreMidiPlayer.WPF.csproj
@@ -2,11 +2,11 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0-windows10.0.19041.0</TargetFramework>
     <UseWPF>true</UseWPF>
     <StartupObject>GenshinLyreMidiPlayer.WPF.App</StartupObject>
     <ApplicationManifest>app.manifest</ApplicationManifest>
-    <Version>1.10.4</Version>
+    <Version>2.0.0</Version>
     <ApplicationIcon>item_windsong_lyre.ico</ApplicationIcon>
     <Nullable>enable</Nullable>
     <RepositoryUrl>https://github.com/sabihoshi/GenshinLyreMidiPlayer</RepositoryUrl>
@@ -17,6 +17,7 @@
     <Description>A music player that plays MIDI files into Genshin Impact's Windsong Lyre.</Description>
     <LangVersion>latest</LangVersion>
     <PackageLicenseFile>LICENSE.md</PackageLicenseFile>
+    <IncludeNativeLibrariesForSelfExtract>true</IncludeNativeLibrariesForSelfExtract>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/GenshinLyreMidiPlayer.sln b/GenshinLyreMidiPlayer.sln
@@ -1,11 +1,10 @@
-
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.31112.23
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GenshinLyreMidiPlayer.WPF", "GenshinLyreMidiPlayer.WPF\GenshinLyreMidiPlayer.WPF.csproj", "{32F5B26F-65DB-46EE-8CEA-E432EA9F8806}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GenshinLyreMidiPlayer.WPF", "GenshinLyreMidiPlayer.WPF\GenshinLyreMidiPlayer.WPF.csproj", "{32F5B26F-65DB-46EE-8CEA-E432EA9F8806}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GenshinLyreMidiPlayer.Data", "GenshinLyreMidiPlayer.Data\GenshinLyreMidiPlayer.Data.csproj", "{F1395E61-6B43-4502-9214-221CF1A88588}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GenshinLyreMidiPlayer.Data", "GenshinLyreMidiPlayer.Data\GenshinLyreMidiPlayer.Data.csproj", "{F1395E61-6B43-4502-9214-221CF1A88588}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/README.md b/README.md
@@ -119,14 +119,21 @@ dotnet publish
 ### Notes
 If you want to build using the [.Net Core 3.1 SDK](https://dotnet.microsoft.com/download), you need to make a few changes to the project files.
 
+#### Target Framework
+Change the `TargetFramework` of both projects into `netcoreapp3.1`.
+```diff
+- <TargetFramework>net5.0-windows10.0.19041.0</TargetFramework>
++ <TargetFramework>netcoreapp3.1</TargetFramework>
+```
+
 #### Project SDK
 Change the Project SDK of `GenshinLyreMidiPlayer.WPF.csproj` into `Microsoft.NET.Sdk.WindowsDesktop`.
 ```diff
 - <Project Sdk="Microsoft.NET.Sdk">
 + <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
 ```
 
-### Language Version
+#### Language Version
 Change the `LangVersion` of both projects into `preview`.
 ```diff
 - <LangVersion>latest</LangVersion>