1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-30 20:12:56 +08:00
Commit Graph

72 Commits

Author SHA1 Message Date
smoogipoo
687c889345 Add back osu.Desktop versions (used in deploy) 2018-03-29 12:47:17 +09:00
Dean Herbert
9aae568bbe Tidy up csproj further 2018-03-28 15:19:56 +09:00
Dean Herbert
81a8385c8c Remove lingering reference to tests 2018-03-28 15:17:09 +09:00
Dean Herbert
d76bc1a8ad Revert "Move NoWarns"
This reverts commit 75a413a40e.
2018-03-27 21:13:06 +09:00
Dean Herbert
75a413a40e Move NoWarns 2018-03-27 19:19:09 +09:00
Dean Herbert
1a8aa87469 Make everything better 2018-03-27 18:56:54 +09:00
Dean Herbert
868a221b6c Fix VisualTests build configuration 2018-03-26 19:43:35 +09:00
smoogipoo
bdaba97d62 Merge remote-tracking branch 'smoogipoo/update-netstandard' into update-netstandard 2018-03-26 19:00:04 +09:00
Dean Herbert
0b38c8ec4f Fix some VS specific issues 2018-03-26 18:58:19 +09:00
smoogipoo
c6b9c4b588 Fix startup failures 2018-03-26 18:40:59 +09:00
smoogipoo
5159127bce Fix SQLite failing to initialize on test projects 2018-03-26 18:07:09 +09:00
smoogipoo
35ef9d99c6 Only compile with net461 in visual studio 2018-03-26 15:44:55 +09:00
smoogipoo
76588a1029 Target WinExe to remove console window 2018-03-26 15:12:17 +09:00
smoogipoo
4dc317d4df Fix msbuild warnings 2018-03-25 03:38:52 +09:00
smoogipoo
0b2c1930bd Reference osu.Game.Tests in the desktop project 2018-03-25 02:28:10 +09:00
smoogipoo
a30270658d Merge remote-tracking branch 'origin/master' into netstandard 2017-12-01 18:50:28 +09:00
smoogipoo
36be171c29 Fix up/clean up csprojs for C#7 support 2017-11-30 02:06:03 +09:00
smoogipoo
a0c3349935 Add LangVer.props and osu.Game.props for common csproj properties 2017-11-30 00:45:37 +09:00
smoogipoo
6003282e66 Give osu!lazer an application icon again
Fixes https://github.com/ppy/osu/issues/1548.
2017-11-22 22:07:55 +09:00
smoogipoo
d364603e45 Make registry checking work again 2017-11-22 20:02:31 +09:00
smoogipoo
a66edea6dc Move sqlite batteries to osu.Desktop
Fixes e_sqlite.dll not being copied to output on Windows
2017-11-21 15:33:05 +09:00
smoogipoo
e98d9e8a8c Explicitly define constant 2017-11-20 19:44:06 +09:00
smoogipoo
e608d2841b Prefer net461 2017-11-20 16:10:34 +09:00
smoogipoo
5fd16c6268 Make osu.Desktop.Deploy work 2017-11-19 16:30:41 +09:00
smoogipoo
db4c912e1e Fix up assembly name 2017-11-19 14:46:51 +09:00
smoogipoo
440c1a9f83 Make osu.Desktop and osu.Game.Tests compile under net461+netstandard 2017-11-19 14:30:56 +09:00
smoogipoo
f461f03b08 Make osu! compile with framework changes 2017-11-16 14:51:31 +09:00
Dean Herbert
f66747b63d Merge branch 'master' into fix-missing-sqlite 2017-10-24 08:14:55 +09:00
Dean Herbert
dc9c474033 Move all TestCases to Testing project
This allows tests to successfully retrieve rulesets, as they are referenced.
2017-10-23 19:32:02 +09:00
Dean Herbert
b1d5fc523f Add sqlite raw packages to osu.Desktop to ensure sqlite is copied locally 2017-10-23 00:36:50 +09:00
Dean Herbert
365e2343a1 Remove AllRuleset references 2017-10-19 21:09:29 +09:00
Dean Herbert
eff1c20e38 CI fixing 2017-10-16 22:00:54 +09:00
Dean Herbert
a5ccf12e4a Fix ValueTuple mess 2017-10-16 14:04:04 +09:00
TocoToucan
5f083f10a7 Add System.ValueTuple NuGet package 2017-10-14 16:19:03 +03:00
Dean Herbert
c5046f6b3c Add back osu.Desktop project
While it was nice having less projects to deal with, it meant hacks to get around circular dependencies between rulesets and osu.Game. For now, let's just restore the osu.Desktop project and call it a day.

This allows for the project to build again with default visual studio settings.
2017-10-14 14:33:05 +09:00
Dean Herbert
6d3d485565 And then everything became one 2017-09-19 16:06:58 +09:00
Dean Herbert
d62ad89150 Remove unnecessary Microsoft.Net.Http include 2017-09-18 14:10:59 +09:00
Dean Herbert
db6437eea9 Remove very old defined constants 2017-09-14 17:58:42 +09:00
Dean Herbert
160f48bf85 Make VisualTests target 64 bit where possible 2017-09-14 17:55:56 +09:00
Dean Herbert
fb7740a3ab Update all dependencies in line with framework 2017-09-13 20:25:40 +09:00
Dean Herbert
7170fbd087 Target .NET 4.6.1 2017-09-11 12:39:00 +09:00
Jorolf
56caa6ef10 fix tests argument 2017-08-09 01:49:50 +02:00
Dean Herbert
fc97fdb8c1 Use a common build directory between both build ccnfigurations
There's no need to build to VisualTests when they share everything
2017-08-04 16:07:25 +09:00
Dean Herbert
f8448b8b19 Update to support new framework VisualTests structure 2017-08-04 15:37:31 +09:00
Dean Herbert
898a601098 Introduce a reference counting file store 2017-07-26 20:22:02 +09:00
Vlad K
b105d6d741 Insert icon into osu exe 2017-06-27 02:10:00 +03:00
Dean Herbert
41d4aee4f5 Update nuget packages
- [ ] Depends on framework partner in crime https://github.com/ppy/osu-framework/pull/820
2017-06-13 11:50:46 +09:00
Dean Herbert
fbd26a1d5e
Mode -> Ruleset. 2017-04-18 16:05:58 +09:00
Adrian Kaz Scherzinger
60f7879875 Explicitly set C# 6.0 for now. 2017-04-16 06:44:08 +09:00
Dean Herbert
c0338a82e7
Update nuget packages.
Includes fix in OpenTK for focus issues.
2017-04-12 19:35:16 +09:00