diff --git a/osu.Desktop/OpenTK.dll.config b/osu.Desktop/OpenTK.dll.config
deleted file mode 100644
index 5620e3d9e2..0000000000
--- a/osu.Desktop/OpenTK.dll.config
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/osu.Desktop/OsuGameDesktop.cs b/osu.Desktop/OsuGameDesktop.cs
index 3eaa23f4c7..b8eeeb1a5b 100644
--- a/osu.Desktop/OsuGameDesktop.cs
+++ b/osu.Desktop/OsuGameDesktop.cs
@@ -47,6 +47,7 @@ namespace osu.Desktop
string stableInstallPath;
+#if NET461
try
{
using (RegistryKey key = Registry.ClassesRoot.OpenSubKey("osu"))
@@ -58,6 +59,7 @@ namespace osu.Desktop
catch
{
}
+#endif
stableInstallPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), @"osu!");
if (checkExists(stableInstallPath))
diff --git a/osu.Desktop/Overlays/VersionManager.cs b/osu.Desktop/Overlays/VersionManager.cs
index 8c17e18ed8..8bb9d596d1 100644
--- a/osu.Desktop/Overlays/VersionManager.cs
+++ b/osu.Desktop/Overlays/VersionManager.cs
@@ -21,13 +21,19 @@ using osu.Game.Overlays;
using osu.Game.Overlays.Notifications;
using OpenTK;
using OpenTK.Graphics;
+
+#if NET461
using Squirrel;
+#endif
namespace osu.Desktop.Overlays
{
public class VersionManager : OverlayContainer
{
+#if NET461
private UpdateManager updateManager;
+#endif
+
private NotificationOverlay notificationOverlay;
private OsuConfigManager config;
private OsuGameBase game;
@@ -138,11 +144,15 @@ namespace osu.Desktop.Overlays
protected override void Dispose(bool isDisposing)
{
base.Dispose(isDisposing);
+
+#if NET461
updateManager?.Dispose();
+#endif
}
private async void checkForUpdateAsync(bool useDeltaPatching = true, UpdateProgressNotification notification = null)
{
+#if NET461
//should we schedule a retry on completion of this check?
bool scheduleRetry = true;
@@ -213,6 +223,7 @@ namespace osu.Desktop.Overlays
notification.State = ProgressNotificationState.Cancelled;
}
}
+#endif
}
protected override void PopIn()
@@ -234,7 +245,9 @@ namespace osu.Desktop.Overlays
Activated = () =>
{
// Squirrel returns execution to us after the update process is started, so it's safe to use Wait() here
+#if NET461
UpdateManager.RestartAppWhenExited().Wait();
+#endif
game.GracefullyExit();
return true;
}
diff --git a/osu.Desktop/Properties/AssemblyInfo.cs b/osu.Desktop/Properties/AssemblyInfo.cs
deleted file mode 100644
index 2ed304ebd7..0000000000
--- a/osu.Desktop/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright (c) 2007-2017 ppy Pty Ltd .
-// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
-
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("osu!lazer")]
-[assembly: AssemblyDescription("click the circles. to the beat.")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("ppy Pty Ltd")]
-[assembly: AssemblyProduct("osu!lazer")]
-[assembly: AssemblyCopyright("ppy Pty Ltd 2007-2017")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components. If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("b0cb1d48-e4c2-4612-a347-beea7b1a71e7")]
-
-[assembly: AssemblyVersion("0.0.0")]
-[assembly: AssemblyFileVersion("0.0.0")]
diff --git a/osu.Desktop/Properties/app.manifest b/osu.Desktop/Properties/app.manifest
deleted file mode 100644
index 555db8513d..0000000000
--- a/osu.Desktop/Properties/app.manifest
+++ /dev/null
@@ -1,57 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- true
-
-
-
-
-
-
-
-
diff --git a/osu.Desktop/app.config b/osu.Desktop/app.config
deleted file mode 100644
index ea1576b3d8..0000000000
--- a/osu.Desktop/app.config
+++ /dev/null
@@ -1,44 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/osu.Desktop/osu.Desktop.csproj b/osu.Desktop/osu.Desktop.csproj
index dd328858e0..fd0644bc5d 100644
--- a/osu.Desktop/osu.Desktop.csproj
+++ b/osu.Desktop/osu.Desktop.csproj
@@ -1,287 +1,32 @@
-
-
-
- {419659FD-72EA-4678-9EB8-B22A746CED70}
- Debug
- AnyCPU
- WinExe
- Properties
- osu.Desktop
- osu!
- 3CF060CD28877D0E3112948951A64B2A7CEEC909
- codesigning.pfx
- false
- false
- false
-
-
- 3.5
-
-
- osu.Desktop.Program
- OnOutputUpdated
- false
- LocalIntranet
- v4.6.1
- true
- publish\
- true
- Disk
- false
- Foreground
- 7
- Days
- false
- false
- true
- 2
- 1.0.0.%2a
- false
- true
- 12.0.0
- 2.0
-
-
-
-
-
-
- true
- full
- false
- bin\Debug\
- DEBUG
- prompt
- 0
- true
- false
+
+
+
+
+ netcoreapp2.0;net461
+ Exe
AnyCPU
true
- false
- false
- false
-
-
- 6
+ ppy Pty Ltd
+ 0.0.0.0
+ click the circles. to the beat.
+ ppy Pty Ltd 2007-2017
+ osu!lazer
+ osu!lazer
-
- none
- true
- bin\Release\
- CuttingEdge NoUpdate
- prompt
- 4
- true
- false
- AnyCPU
- true
- false
- false
-
-
-
-
-
-
- lazer.ico
-
-
- Properties\app.manifest
-
-
- true
- bin\Debug\
- DEBUG
- true
- 0
- true
- full
- AnyCPU
- false
- 6
- prompt
- --tests
-
-
-
- $(SolutionDir)\packages\DeltaCompressionDotNet.1.1.0\lib\net20\DeltaCompressionDotNet.dll
- True
-
-
- $(SolutionDir)\packages\DeltaCompressionDotNet.1.1.0\lib\net20\DeltaCompressionDotNet.MsDelta.dll
- True
-
-
- $(SolutionDir)\packages\DeltaCompressionDotNet.1.1.0\lib\net20\DeltaCompressionDotNet.PatchApi.dll
- True
-
-
- $(SolutionDir)\packages\Mono.Cecil.0.9.6.4\lib\net45\Mono.Cecil.dll
- True
-
-
- $(SolutionDir)\packages\Mono.Cecil.0.9.6.4\lib\net45\Mono.Cecil.Mdb.dll
- True
-
-
- $(SolutionDir)\packages\Mono.Cecil.0.9.6.4\lib\net45\Mono.Cecil.Pdb.dll
- True
-
-
- $(SolutionDir)\packages\Mono.Cecil.0.9.6.4\lib\net45\Mono.Cecil.Rocks.dll
- True
-
-
-
- $(SolutionDir)\packages\squirrel.windows.1.7.8\lib\Net45\NuGet.Squirrel.dll
- True
-
-
- True
-
-
- $(SolutionDir)\packages\SharpCompress.0.18.1\lib\net45\SharpCompress.dll
- True
-
-
- $(SolutionDir)\packages\Splat.2.0.0\lib\Net45\Splat.dll
- True
-
-
- $(SolutionDir)\packages\SQLitePCLRaw.bundle_green.1.1.8\lib\net45\SQLitePCLRaw.batteries_green.dll
-
-
- $(SolutionDir)\packages\SQLitePCLRaw.bundle_green.1.1.8\lib\net45\SQLitePCLRaw.batteries_v2.dll
-
-
- $(SolutionDir)\packages\SQLitePCLRaw.core.1.1.8\lib\net45\SQLitePCLRaw.core.dll
-
-
- $(SolutionDir)\packages\SQLitePCLRaw.provider.e_sqlite3.net45.1.1.8\lib\net45\SQLitePCLRaw.provider.e_sqlite3.dll
-
-
- $(SolutionDir)\packages\squirrel.windows.1.7.8\lib\Net45\Squirrel.dll
- True
-
-
-
-
-
- $(SolutionDir)\packages\System.ValueTuple.4.4.0\lib\net461\System.ValueTuple.dll
- True
-
-
+
+
+
+
+
+
+
+
-
-
- osu.licenseheader
-
-
-
-
-
-
+
+
+
-
-
- False
- .NET Framework 3.5 SP1 Client Profile
- false
-
-
- False
- .NET Framework 2.0 %28x86%29
- true
-
-
- False
- .NET Framework 3.0 %28x86%29
- false
-
-
- False
- .NET Framework 3.5
- false
-
-
- False
- .NET Framework 3.5 SP1
- false
-
-
-
-
-
-
-
-
-
-
+
-
-
- {c76bf5b3-985e-4d39-95fe-97c9c879b83a}
- osu.Framework
-
-
- {d9a367c9-4c1a-489f-9b05-a0cea2b53b58}
- osu.Game.Resources
-
-
- {58f6c80c-1253-4a0e-a465-b8c85ebeadf3}
- osu.Game.Rulesets.Catch
-
-
- {48f4582b-7687-4621-9cbe-5c24197cb536}
- osu.Game.Rulesets.Mania
-
-
- {c92a607b-1fdd-4954-9f92-03ff547d9080}
- osu.Game.Rulesets.Osu
-
-
- {f167e17a-7de6-4af5-b920-a5112296c695}
- osu.Game.Rulesets.Taiko
-
-
- {54377672-20b1-40af-8087-5cf73bf3953a}
- osu.Game.Tests
-
-
- {2a66dd92-adb1-4994-89e2-c94e04acda0d}
- osu.Game
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/osu.Game.Tests/osu.Game.Tests.csproj b/osu.Game.Tests/osu.Game.Tests.csproj
index 3d134f79bf..e34fb4638f 100644
--- a/osu.Game.Tests/osu.Game.Tests.csproj
+++ b/osu.Game.Tests/osu.Game.Tests.csproj
@@ -1,150 +1,30 @@
-
-
-
- Debug
- AnyCPU
- {54377672-20B1-40AF-8087-5CF73BF3953A}
+
+
+
+
+ netstandard2.0;net461
Library
- osu.Game.Tests
- osu.Game.Tests
- v4.6.1
+ AnyCPU
+ true
+ ppy Pty Ltd
+ 1.0.0.0
+ ppy Pty Ltd 2007-2017
+ osu.Game.Tests
+ osu.Game.Tests
-
- true
- full
- false
- bin\Debug
- DEBUG;
- prompt
- 4
- false
- false
- 6
-
-
- true
- bin\Release
- prompt
- 4
- false
- false
-
-
-
- $(SolutionDir)\packages\NUnit.3.8.1\lib\net45\nunit.framework.dll
- True
-
-
- True
-
-
-
- $(SolutionDir)\packages\System.ValueTuple.4.4.0\lib\net461\System.ValueTuple.dll
- True
-
+
+
+
+
+
+
+
+
-
-
- osu.licenseheader
-
-
-
-
+
+
-
-
- {c76bf5b3-985e-4d39-95fe-97c9c879b83a}
- osu.Framework
-
-
- {c92a607b-1fdd-4954-9f92-03ff547d9080}
- osu.Game.Rulesets.Osu
-
-
- {58f6c80c-1253-4a0e-a465-b8c85ebeadf3}
- osu.Game.Rulesets.Catch
-
-
- {48f4582b-7687-4621-9cbe-5c24197cb536}
- osu.Game.Rulesets.Mania
-
-
- {f167e17a-7de6-4af5-b920-a5112296c695}
- osu.Game.Rulesets.Taiko
-
-
- {2a66dd92-adb1-4994-89e2-c94e04acda0d}
- osu.Game
-
-
- {D9A367C9-4C1A-489F-9B05-A0CEA2B53B58}
- osu.Game.Resources
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
\ No newline at end of file
diff --git a/osu.sln b/osu.sln
index 86a0e4818b..c75ff78f2d 100644
--- a/osu.sln
+++ b/osu.sln
@@ -19,9 +19,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "osu.Game.Rulesets.Mania", "
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "osu.Desktop.Deploy", "osu.Desktop.Deploy\osu.Desktop.Deploy.csproj", "{BAEA2F74-0315-4667-84E0-ACAC0B4BF785}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "osu.Game.Tests", "osu.Game.Tests\osu.Game.Tests.csproj", "{54377672-20B1-40AF-8087-5CF73BF3953A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "osu.Game.Tests", "osu.Game.Tests\osu.Game.Tests.csproj", "{54377672-20B1-40AF-8087-5CF73BF3953A}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "osu.Desktop", "osu.Desktop\osu.Desktop.csproj", "{419659FD-72EA-4678-9EB8-B22A746CED70}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "osu.Desktop", "osu.Desktop\osu.Desktop.csproj", "{419659FD-72EA-4678-9EB8-B22A746CED70}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution