Merge pull request #2426 from peppy/net471

Update to .NET 4.7.1

.vscode/launch.json

@@ -2,55 +2,55 @@
     "version": "0.2.0",
     "configurations": [
         {
-            "name": "VisualTests (Debug, net461)",
+            "name": "VisualTests (Debug, net471)",
             "windows": {
                 "type": "clr"
             },
             "type": "mono",
             "request": "launch",
-            "program": "${workspaceRoot}/osu.Game.Tests/bin/Debug/net461/osu.Game.Tests.exe",
+            "program": "${workspaceRoot}/osu.Game.Tests/bin/Debug/net471/osu.Game.Tests.exe",
             "cwd": "${workspaceRoot}",
             "preLaunchTask": "Build (Debug, msbuild)",
             "runtimeExecutable": null,
             "env": {},
             "console": "internalConsole"
         },
         {
-            "name": "VisualTests (Release, net461)",
+            "name": "VisualTests (Release, net471)",
             "windows": {
                 "type": "clr"
             },
             "type": "mono",
             "request": "launch",
-            "program": "${workspaceRoot}/osu.Game.Tests/bin/Debug/net461/osu.Game.Tests.exe",
+            "program": "${workspaceRoot}/osu.Game.Tests/bin/Debug/net471/osu.Game.Tests.exe",
             "cwd": "${workspaceRoot}",
             "preLaunchTask": "Build (Release, msbuild)",
             "runtimeExecutable": null,
             "env": {},
             "console": "internalConsole"
         },
         {
-            "name": "osu! (Debug, net461)",
+            "name": "osu! (Debug, net471)",
             "windows": {
                 "type": "clr"
             },
             "type": "mono",
             "request": "launch",
-            "program": "${workspaceRoot}/osu.Desktop/bin/Debug/net461/osu!.exe",
+            "program": "${workspaceRoot}/osu.Desktop/bin/Debug/net471/osu!.exe",
             "cwd": "${workspaceRoot}",
             "preLaunchTask": "Build (Debug, msbuild)",
             "runtimeExecutable": null,
             "env": {},
             "console": "internalConsole"
         },
         {
-            "name": "osu! (Release, net461)",
+            "name": "osu! (Release, net471)",
             "windows": {
                 "type": "clr"
             },
             "type": "mono",
             "request": "launch",
-            "program": "${workspaceRoot}/osu.Desktop/bin/Release/net461/osu!.exe",
+            "program": "${workspaceRoot}/osu.Desktop/bin/Release/net471/osu!.exe",
             "cwd": "${workspaceRoot}",
             "preLaunchTask": "Build (Release, msbuild)",
             "runtimeExecutable": null,

.vscode/tasks.json

@@ -8,7 +8,7 @@
             "type": "shell",
             "command": "msbuild",
             "args": [
-                "/p:TargetFramework=net461",
+                "/p:TargetFramework=net471",
                 "/p:GenerateFullPaths=true",
                 "/m",
                 "/verbosity:m"
@@ -22,7 +22,7 @@
             "command": "msbuild",
             "args": [
                 "/p:Configuration=Release",
-                "/p:TargetFramework=net461",
+                "/p:TargetFramework=net471",
                 "/p:GenerateFullPaths=true",
                 "/m",
                 "/verbosity:m"
@@ -64,7 +64,7 @@
             "problemMatcher": "$msCompile"
         },
         {
-            "label": "Restore (net461)",
+            "label": "Restore (net471)",
             "type": "shell",
             "command": "nuget",
             "args": [

README.md

@@ -8,7 +8,7 @@ This is still heavily under development and is not intended for end-user use. Th
 
 # Requirements
 
-- A desktop platform that can compile .NET 4.6.1. We recommend using [Visual Studio Community Edition](https://www.visualstudio.com/) (Windows), [Visual Studio for Mac](https://www.visualstudio.com/vs/visual-studio-mac/) (macOS) or [MonoDevelop](http://www.monodevelop.com/download/) (Linux), all of which are free. [Visual Studio Code](https://code.visualstudio.com/) may also be used but requires further setup steps which are not covered here.
+- A desktop platform that can compile .NET 4.7.1. We recommend using [Visual Studio Community Edition](https://www.visualstudio.com/) (Windows), [Visual Studio for Mac](https://www.visualstudio.com/vs/visual-studio-mac/) (macOS) or [MonoDevelop](http://www.monodevelop.com/download/) (Linux), all of which are free. [Visual Studio Code](https://code.visualstudio.com/) may also be used but requires further setup steps which are not covered here.
 
 # Getting Started
 - Clone the repository including submodules (`git clone --recurse-submodules https://github.com/ppy/osu`)

appveyor.yml

@@ -1,26 +1,26 @@
-clone_depth: 1
-version: '{branch}-{build}'
-image: Visual Studio 2017
-configuration: Debug
-cache:
-  - C:\ProgramData\chocolatey\bin -> appveyor.yml
-  - C:\ProgramData\chocolatey\lib -> appveyor.yml
-  - inspectcode -> appveyor.yml
-  - packages -> **\packages.config
-install:
-  - cmd: git submodule update --init --recursive --depth=5
-  - cmd: choco install resharper-clt -y
-  - cmd: choco install nvika -y
-  - cmd: appveyor DownloadFile https://github.com/peppy/CodeFileSanity/releases/download/v0.2.4/CodeFileSanity.exe
-before_build:
-  - cmd: CodeFileSanity.exe
-  - cmd: nuget restore -verbosity quiet
-environment:
-  TargetFramework: net461
-build:
-  project: osu.sln
-  parallel: true
-  verbosity: minimal
-after_build:
-  - cmd: inspectcode --o="inspectcodereport.xml" --projects:osu.Game* --caches-home="inspectcode" osu.sln > NUL
+clone_depth: 1
+version: '{branch}-{build}'
+image: Visual Studio 2017
+configuration: Debug
+cache:
+  - C:\ProgramData\chocolatey\bin -> appveyor.yml
+  - C:\ProgramData\chocolatey\lib -> appveyor.yml
+  - inspectcode -> appveyor.yml
+  - packages -> **\packages.config
+install:
+  - cmd: git submodule update --init --recursive --depth=5
+  - cmd: choco install resharper-clt -y
+  - cmd: choco install nvika -y
+  - cmd: appveyor DownloadFile https://github.com/peppy/CodeFileSanity/releases/download/v0.2.4/CodeFileSanity.exe
+before_build:
+  - cmd: CodeFileSanity.exe
+  - cmd: nuget restore -verbosity quiet
+environment:
+  TargetFramework: net471
+build:
+  project: osu.sln
+  parallel: true
+  verbosity: minimal
+after_build:
+  - cmd: inspectcode --o="inspectcodereport.xml" --projects:osu.Game* --caches-home="inspectcode" osu.sln > NUL
   - cmd: NVika parsereport "inspectcodereport.xml" --treatwarningsaserrors

appveyor_deploy.yml

@@ -21,11 +21,11 @@ after_build:
   - appveyor DownloadFile https://puu.sh/A6g5K/4d08705438.enc # signing certificate
   - cmd: appveyor-tools\secure-file -decrypt 4d08705438.enc -secret %decode_secret% -out %HOMEPATH%\deanherbert.pfx
   - appveyor DownloadFile https://puu.sh/A6g75/fdc6f19b04.enc # deploy configuration
-  - cmd: appveyor-tools\secure-file -decrypt fdc6f19b04.enc -secret %decode_secret% -out osu.Desktop.Deploy\bin\Debug\net461\osu.Desktop.Deploy.exe.config
-  - cd osu.Desktop.Deploy\bin\Debug\net461\
+  - cmd: appveyor-tools\secure-file -decrypt fdc6f19b04.enc -secret %decode_secret% -out osu.Desktop.Deploy\bin\Debug\net471\osu.Desktop.Deploy.exe.config
+  - cd osu.Desktop.Deploy\bin\Debug\net471\
   - osu.Desktop.Deploy.exe %code_signing_password%
 environment:
-  TargetFramework: net461
+  TargetFramework: net471
   decode_secret:
     secure: i67IC2xj6DjjxmA6Oj2jing3+MwzLkq6CbGsjfZ7rdY=
   code_signing_password:

osu.Desktop.Deploy/.vscode/launch.json

@@ -7,7 +7,7 @@
             "name": "Deploy (Debug)",
             "request": "launch",
             "type": "mono",
-            "program": "${workspaceRoot}/bin/Debug/net461/osu.Desktop.Deploy.exe",
+            "program": "${workspaceRoot}/bin/Debug/net471/osu.Desktop.Deploy.exe",
             "cwd": "${workspaceRoot}",
             "preLaunchTask": "Build (Debug)",
             "runtimeExecutable": null,
@@ -18,7 +18,7 @@
             "name": "Deploy (Release)",
             "request": "launch",
             "type": "clr",
-            "program": "${workspaceRoot}/bin/Release/net461/osu.Desktop.Deploy.exe",
+            "program": "${workspaceRoot}/bin/Release/net471/osu.Desktop.Deploy.exe",
             "cwd": "${workspaceRoot}",
             "preLaunchTask": "Build (Release)",
             "runtimeExecutable": null,

osu.Desktop.Deploy/osu.Desktop.Deploy.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\osu.Game.props" />
   <PropertyGroup Label="Project">
-    <TargetFrameworks>net461</TargetFrameworks>
+    <TargetFrameworks>net471</TargetFrameworks>
     <OutputType>Exe</OutputType>
     <PlatformTarget>AnyCPU</PlatformTarget>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
@@ -12,7 +12,7 @@
   <ItemGroup Label="Package References">
     <PackageReference Include="NuGet.CommandLine" Version="4.5.1" />
     <PackageReference Include="NUnit" Version="3.10.1" />
-    <PackageReference Include="squirrel.windows" Version="1.7.8" Condition="'$(TargetFramework)' == 'net461'" />
+    <PackageReference Include="squirrel.windows" Version="1.7.8" Condition="'$(TargetFramework)' == 'net471'" />
     <PackageReference Include="System.Configuration.ConfigurationManager" Version="4.4.0" />
     <PackageReference Include="System.Management.Automation.dll" Version="10.0.10586" />
   </ItemGroup>

osu.Desktop/osu.Desktop.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\osu.Game.props" />
   <PropertyGroup Label="Project">
-    <TargetFrameworks>net461;netcoreapp2.0</TargetFrameworks>
+    <TargetFrameworks>net471;netcoreapp2.0</TargetFrameworks>
     <OutputType>WinExe</OutputType>
     <PlatformTarget>AnyCPU</PlatformTarget>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
@@ -14,7 +14,7 @@
     <FileVersion>0.0.0.0</FileVersion>
   </PropertyGroup>
   <PropertyGroup Label="Defines">
-    <DefineConstants Condition="'$(TargetFramework)' == 'net461'">$(DefineConstants);NET_FRAMEWORK</DefineConstants>
+    <DefineConstants Condition="'$(TargetFramework)' == 'net471'">$(DefineConstants);NET_FRAMEWORK</DefineConstants>
   </PropertyGroup>
   <PropertyGroup>
     <StartupObject>osu.Desktop.Program</StartupObject>
@@ -31,7 +31,7 @@
   </ItemGroup>
   <ItemGroup Label="Package References">
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.0.1" />
-    <PackageReference Include="squirrel.windows" Version="1.7.8" Condition="'$(TargetFramework)' == 'net461'" />
+    <PackageReference Include="squirrel.windows" Version="1.7.8" Condition="'$(TargetFramework)' == 'net471'" />
   </ItemGroup>
   <ItemGroup Label="Resources">
     <EmbeddedResource Include="lazer.ico" />

osu.Game.Rulesets.Catch.Tests/.vscode/launch.json

@@ -2,27 +2,27 @@
     "version": "0.2.0",
     "configurations": [
         {
-            "name": "VisualTests (Debug, net461)",
+            "name": "VisualTests (Debug, net471)",
             "windows": {
                 "type": "clr"
             },
             "type": "mono",
             "request": "launch",
-            "program": "${workspaceRoot}/bin/Debug/net461/osu.Game.Rulesets.Catch.Tests.exe",
+            "program": "${workspaceRoot}/bin/Debug/net471/osu.Game.Rulesets.Catch.Tests.exe",
             "cwd": "${workspaceRoot}",
             "preLaunchTask": "Build (Debug, msbuild)",
             "runtimeExecutable": null,
             "env": {},
             "console": "internalConsole"
         },
         {
-            "name": "VisualTests (Release, net461)",
+            "name": "VisualTests (Release, net471)",
             "windows": {
                 "type": "clr"
             },
             "type": "mono",
             "request": "launch",
-            "program": "${workspaceRoot}/bin/Debug/net461/osu.Game.Rulesets.Catch.Tests.exe",
+            "program": "${workspaceRoot}/bin/Debug/net471/osu.Game.Rulesets.Catch.Tests.exe",
             "cwd": "${workspaceRoot}",
             "preLaunchTask": "Build (Release, msbuild)",
             "runtimeExecutable": null,