Skip to content

Commit 6d3d485

Browse files
committed
And then everything became one
1 parent 4a0370a commit 6d3d485

File tree

109 files changed

+6399
-939
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

109 files changed

+6399
-939
lines changed

osu-framework

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

-4
Original file line numberDiff line numberDiff line change
@@ -111,10 +111,6 @@
111111
<None Include="packages.config" />
112112
</ItemGroup>
113113
<ItemGroup>
114-
<ProjectReference Include="..\osu-framework\osu.Framework.Desktop\osu.Framework.Desktop.csproj">
115-
<Project>{65dc628f-a640-4111-ab35-3a5652bc1e17}</Project>
116-
<Name>osu.Framework.Desktop</Name>
117-
</ProjectReference>
118114
<ProjectReference Include="..\osu-framework\osu.Framework\osu.Framework.csproj">
119115
<Project>{C76BF5B3-985E-4D39-95FE-97C9C879B83A}</Project>
120116
<Name>osu.Framework</Name>

osu.Desktop.Tests/Platform/TestStorage.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
33

44
using osu.Framework;
5-
using osu.Framework.Desktop.Platform;
5+
using osu.Framework.Platform;
66
using SQLite.Net;
77
using SQLite.Net.Interop;
88
using SQLite.Net.Platform.Generic;

osu.Desktop.Tests/Visual/OsuTestCase.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
22
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
33

4-
using osu.Framework.Desktop.Platform;
4+
using osu.Framework.Platform;
55
using osu.Framework.Testing;
66
using osu.Game;
77

osu.Desktop.Tests/osu.Desktop.Tests.csproj

+5-10
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
66
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
77
<ProjectGuid>{230AC4F3-7783-49FB-9AEC-B83CDA3B9F3D}</ProjectGuid>
8-
<OutputType>Library</OutputType>
8+
<OutputType>WinExe</OutputType>
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>osu.Desktop.Tests</RootNamespace>
1111
<AssemblyName>osu.Desktop.Tests</AssemblyName>
@@ -32,6 +32,9 @@
3232
<WarningLevel>4</WarningLevel>
3333
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
3434
</PropertyGroup>
35+
<PropertyGroup>
36+
<StartupObject />
37+
</PropertyGroup>
3538
<ItemGroup>
3639
<Reference Include="mscorlib" />
3740
<Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
@@ -116,14 +119,6 @@
116119
<Compile Include="Visual\TestCaseUserProfile.cs" />
117120
</ItemGroup>
118121
<ItemGroup>
119-
<ProjectReference Include="..\osu-framework\osu.Framework.Desktop\osu.Framework.Desktop.csproj">
120-
<Project>{65DC628F-A640-4111-AB35-3A5652BC1E17}</Project>
121-
<Name>osu.Framework.Desktop</Name>
122-
</ProjectReference>
123-
<ProjectReference Include="..\osu-framework\osu.Framework.Testing\osu.Framework.Testing.csproj">
124-
<Project>{007b2356-ab6f-4bd9-96d5-116fc2dce69a}</Project>
125-
<Name>osu.Framework.Testing</Name>
126-
</ProjectReference>
127122
<ProjectReference Include="..\osu-framework\osu.Framework\osu.Framework.csproj">
128123
<Project>{C76BF5B3-985E-4D39-95FE-97C9C879B83A}</Project>
129124
<Name>osu.Framework</Name>
@@ -149,7 +144,7 @@
149144
<Name>osu.Game.Rulesets.Taiko</Name>
150145
</ProjectReference>
151146
<ProjectReference Include="..\osu.Game\osu.Game.csproj">
152-
<Project>{0D3FBF8A-7464-4CF7-8C90-3E7886DF2D4D}</Project>
147+
<Project>{2a66dd92-adb1-4994-89e2-c94e04acda0d}</Project>
153148
<Name>osu.Game</Name>
154149
</ProjectReference>
155150
</ItemGroup>

osu.Desktop/OpenTK.dll.config

-25
This file was deleted.

osu.Desktop/Properties/AssemblyInfo.cs

-28
This file was deleted.

osu.Desktop/app.config

-15
This file was deleted.

0 commit comments

Comments
 (0)