Update to .NET 4.7.1

2026-03-15 03:20:30 +00:00 · 2018-04-20 14:43:11 +09:00
parent 46ea6cd644
commit a5e5b64a92
8 changed files with 40 additions and 40 deletions
--- a/.idea/.idea.osu-framework/.idea/runConfigurations/VisualTests__net471_.xml
+++ b/.idea/.idea.osu-framework/.idea/runConfigurations/VisualTests__net471_.xml
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="VisualTests (net461)" type="DotNetProject" factoryName=".NET Project">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Framework.Tests/bin/Debug/net461/osu.Framework.Tests.exe" />
+  <configuration default="false" name="VisualTests (net471)" type="DotNetProject" factoryName=".NET Project">
+    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Framework.Tests/bin/Debug/net471/osu.Framework.Tests.exe" />
    <option name="PROGRAM_PARAMETERS" value="" />
    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Framework.Tests" />
    <option name="PASS_PARENT_ENVS" value="1" />
@@ -12,7 +12,7 @@
    <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
    <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />
    <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value=".NETFramework,Version=v4.6.1" />
+    <option name="PROJECT_TFM" value=".NETFramework,Version=v4.7.1" />
    <method />
  </configuration>
 </component>
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -2,13 +2,13 @@
    "version": "0.2.0",
    "configurations": [
        {
-            "name": "VisualTests (Debug, net461)",
+            "name": "VisualTests (Debug, net471)",
            "windows": {
                "type": "clr"
            },
            "type": "mono",
            "request": "launch",
-            "program": "${workspaceRoot}/osu.Framework.Tests/bin/Debug/net461/osu.Framework.Tests.exe",
+            "program": "${workspaceRoot}/osu.Framework.Tests/bin/Debug/net471/osu.Framework.Tests.exe",
            "cwd": "${workspaceRoot}",
            "preLaunchTask": "Build (Debug, msbuild)",
            "runtimeExecutable": null,
@@ -16,13 +16,13 @@
            "console": "internalConsole"
        },
        {
-            "name": "VisualTests (Release, net461)",
+            "name": "VisualTests (Release, net471)",
            "windows": {
                "type": "clr"
            },
            "type": "mono",
            "request": "launch",
-            "program": "${workspaceRoot}/osu.Framework.Tests/bin/Release/net461/osu.Framework.Tests.exe",
+            "program": "${workspaceRoot}/osu.Framework.Tests/bin/Release/net471/osu.Framework.Tests.exe",
            "cwd": "${workspaceRoot}",
            "preLaunchTask": "Build (Release, msbuild)",
            "runtimeExecutable": null,
--- a/.vscode/tasks.json
+++ b/.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": [
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@ A game framework written with osu! in mind.

 # Requirements

- A desktop platform which can compile .NET 4.6.1 (tested on macOS, linux and windows), using C# 7 and [.NET Core 2.0 SDK](https://www.microsoft.com/net/download/core).
+- A desktop platform which can compile .NET 4.7.1 (tested on macOS, linux and windows), using C# 7 and [.NET Core 2.0 SDK](https://www.microsoft.com/net/download/core).
 - We recommend using [Visual Studio Code](https://code.visualstudio.com/) (all platforms) or [Visual Studio Community Edition](https://www.visualstudio.com/) 2017+ (windows only), both of which are free.

 # Objectives
--- a/SampleGame/SampleGame.csproj
+++ b/SampleGame/SampleGame.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <Import Project="..\osu.Framework.props" />
  <PropertyGroup Label="Project">
-    <TargetFrameworks>net461;netcoreapp2.0</TargetFrameworks>
+    <TargetFrameworks>net471;netcoreapp2.0</TargetFrameworks>
    <OutputType>WinExe</OutputType>
    <PlatformTarget>AnyCPU</PlatformTarget>
  </PropertyGroup>
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,27 +1,27 @@
-# 2017-09-14
-clone_depth: 1
-version: '{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
-  - cmd: choco install resharper-clt -y
-  - cmd: choco install nvika -y
-  - cmd: appveyor DownloadFile https://github.com/peppy/CodeFileSanity/releases/download/v0.2.2/CodeFileSanity.exe
-before_build:
-  - cmd: CodeFileSanity.exe
-  - cmd: nuget restore
-environment:
-  TargetFramework: net461
-build:
-  project: osu-framework.sln
-  parallel: true
-  verbosity: minimal
-after_build:
-  - cmd: inspectcode /o="inspectcodereport.xml" /caches-home="inspectcode" osu-framework.sln
+# 2017-09-14
+clone_depth: 1
+version: '{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
+  - cmd: choco install resharper-clt -y
+  - cmd: choco install nvika -y
+  - cmd: appveyor DownloadFile https://github.com/peppy/CodeFileSanity/releases/download/v0.2.2/CodeFileSanity.exe
+before_build:
+  - cmd: CodeFileSanity.exe
+  - cmd: nuget restore
+environment:
+  TargetFramework: net471
+build:
+  project: osu-framework.sln
+  parallel: true
+  verbosity: minimal
+after_build:
+  - cmd: inspectcode /o="inspectcodereport.xml" /caches-home="inspectcode" osu-framework.sln
  - cmd: NVika parsereport "inspectcodereport.xml" --treatwarningsaserrors
--- a/osu.Framework.Tests/osu.Framework.Tests.csproj
+++ b/osu.Framework.Tests/osu.Framework.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <Import Project="..\osu.Framework.props" />
  <PropertyGroup Label="Project">
-    <TargetFrameworks>net461;netcoreapp2.0</TargetFrameworks>
+    <TargetFrameworks>net471;netcoreapp2.0</TargetFrameworks>
    <OutputType>WinExe</OutputType>
  </PropertyGroup>
  <PropertyGroup>
--- a/osu.Framework/osu.Framework.csproj
+++ b/osu.Framework/osu.Framework.csproj
@@ -14,6 +14,7 @@
  </ItemGroup>
  <ItemGroup Label="Package References">
    <PackageReference Include="CoreCompat.System.Drawing.v2" Version="5.2.0-preview1-r131" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="2.7.0" />
    <PackageReference Include="runtime.linux-x64.CoreCompat.System.Drawing" Version="1.0.0-beta009" />
    <PackageReference Include="runtime.osx.10.10-x64.CoreCompat.System.Drawing" Version="5.4.0-r8" />
    <PackageReference Include="ppy.OpenTK.NS20" Version="1.0.3" />
@@ -24,7 +25,6 @@
    <PackageReference Include="Cyotek.Drawing.BitmapFont" Version="1.3.4-beta1" />
    <PackageReference Include="ManagedBass" Version="2.0.3" />
    <PackageReference Include="ManagedBass.Fx" Version="2.0.0" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="2.4.0" />
    <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
    <PackageReference Include="System.Reflection.Emit.Lightweight" Version="4.3.0" />
    <PackageReference Include="System.Reflection.Emit.ILGeneration" Version="4.3.0" />