From 60f7879875b18260e65feae1308f5c5fc2ca5fa6 Mon Sep 17 00:00:00 2001 From: Adrian Kaz Scherzinger Date: Sun, 16 Apr 2017 06:44:08 +0900 Subject: [PATCH 1/3] Explicitly set C# 6.0 for now. --- osu.Desktop.Deploy/osu.Desktop.Deploy.csproj | 1 + osu.Desktop.Tests/osu.Desktop.Tests.csproj | 1 + osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj | 1 + osu.Desktop/osu.Desktop.csproj | 1 + osu.Game.Modes.Catch/osu.Game.Modes.Catch.csproj | 1 + osu.Game.Modes.Mania/osu.Game.Modes.Mania.csproj | 1 + osu.Game.Modes.Osu/osu.Game.Modes.Osu.csproj | 1 + osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj | 1 + osu.Game.Tests/osu.Game.Tests.csproj | 1 + osu.Game/osu.Game.csproj | 1 + 10 files changed, 10 insertions(+) diff --git a/osu.Desktop.Deploy/osu.Desktop.Deploy.csproj b/osu.Desktop.Deploy/osu.Desktop.Deploy.csproj index 901117b026..1f9726b573 100644 --- a/osu.Desktop.Deploy/osu.Desktop.Deploy.csproj +++ b/osu.Desktop.Deploy/osu.Desktop.Deploy.csproj @@ -22,6 +22,7 @@ DEBUG;TRACE prompt 4 + 6 AnyCPU diff --git a/osu.Desktop.Tests/osu.Desktop.Tests.csproj b/osu.Desktop.Tests/osu.Desktop.Tests.csproj index ccb979afaa..8afd632bd1 100644 --- a/osu.Desktop.Tests/osu.Desktop.Tests.csproj +++ b/osu.Desktop.Tests/osu.Desktop.Tests.csproj @@ -21,6 +21,7 @@ prompt 4 false + 6 pdbonly diff --git a/osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj b/osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj index d75bb94308..4fc0a93fb4 100644 --- a/osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj +++ b/osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj @@ -61,6 +61,7 @@ false false false + 6 none diff --git a/osu.Desktop/osu.Desktop.csproj b/osu.Desktop/osu.Desktop.csproj index dbd26b4640..553dff6c6f 100644 --- a/osu.Desktop/osu.Desktop.csproj +++ b/osu.Desktop/osu.Desktop.csproj @@ -63,6 +63,7 @@ false + 6 none diff --git a/osu.Game.Modes.Catch/osu.Game.Modes.Catch.csproj b/osu.Game.Modes.Catch/osu.Game.Modes.Catch.csproj index 50b1a095af..b3e847a5be 100644 --- a/osu.Game.Modes.Catch/osu.Game.Modes.Catch.csproj +++ b/osu.Game.Modes.Catch/osu.Game.Modes.Catch.csproj @@ -21,6 +21,7 @@ prompt 4 false + 6 pdbonly diff --git a/osu.Game.Modes.Mania/osu.Game.Modes.Mania.csproj b/osu.Game.Modes.Mania/osu.Game.Modes.Mania.csproj index 896e9c68c6..6c666fd6ea 100644 --- a/osu.Game.Modes.Mania/osu.Game.Modes.Mania.csproj +++ b/osu.Game.Modes.Mania/osu.Game.Modes.Mania.csproj @@ -21,6 +21,7 @@ prompt 4 false + 6 pdbonly diff --git a/osu.Game.Modes.Osu/osu.Game.Modes.Osu.csproj b/osu.Game.Modes.Osu/osu.Game.Modes.Osu.csproj index 21f0f03d8c..c98f554ba5 100644 --- a/osu.Game.Modes.Osu/osu.Game.Modes.Osu.csproj +++ b/osu.Game.Modes.Osu/osu.Game.Modes.Osu.csproj @@ -22,6 +22,7 @@ prompt 4 false + 6 pdbonly diff --git a/osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj b/osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj index 19ba5c77e4..03137802d4 100644 --- a/osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj +++ b/osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj @@ -21,6 +21,7 @@ prompt 4 false + 6 pdbonly diff --git a/osu.Game.Tests/osu.Game.Tests.csproj b/osu.Game.Tests/osu.Game.Tests.csproj index 2844528d0c..ddaf33c0fc 100644 --- a/osu.Game.Tests/osu.Game.Tests.csproj +++ b/osu.Game.Tests/osu.Game.Tests.csproj @@ -19,6 +19,7 @@ 4 false false + 6 true diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj index f810eeec96..d73e6d0b61 100644 --- a/osu.Game/osu.Game.csproj +++ b/osu.Game/osu.Game.csproj @@ -24,6 +24,7 @@ prompt 4 false + 6 pdbonly From fbda18176941d911e76161a73599a3ce53198a4d Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Sun, 16 Apr 2017 20:15:36 +0900 Subject: [PATCH 2/3] Update framework. --- osu-framework | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osu-framework b/osu-framework index 2234013e59..979fb1ffdf 160000 --- a/osu-framework +++ b/osu-framework @@ -1 +1 @@ -Subproject commit 2234013e59a99116ee9f9e56a95ff8a6667db2a7 +Subproject commit 979fb1ffdfaa08c39ff4f0cdda42e5b313d70534 From 6239eab233c8f3d4866b1b70d9ecbf63c6f46a8d Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Sun, 16 Apr 2017 22:40:29 +0900 Subject: [PATCH 3/3] Update forgotten submodule. --- osu-resources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osu-resources b/osu-resources index 0cba3cbc16..ce76f812d3 160000 --- a/osu-resources +++ b/osu-resources @@ -1 +1 @@ -Subproject commit 0cba3cbc167cfe94e07fe5b629c925e190be939e +Subproject commit ce76f812d3e059233e1dea395b125352f638b2da