Explicitly define constant

This commit is contained in:
smoogipoo 2017-11-20 19:44:06 +09:00
parent 7cfca866e2
commit e98d9e8a8c
4 changed files with 13 additions and 10 deletions

@ -1 +1 @@
Subproject commit b77ceb37e6186cbf6f5b8a72959d753fbb56f9a5
Subproject commit 6b305b3332cdc424ef7fc3c9499c21e174f9eec5

View File

@ -11,7 +11,7 @@
using osu.Game;
using OpenTK.Input;
#if NET461
#if NET_FRAMEWORK
using Microsoft.Win32;
#endif
@ -48,7 +48,7 @@ protected override string LocateBasePath()
{
Func<string, bool> checkExists = p => Directory.Exists(Path.Combine(p, "Songs"));
#if NET461
#if NET_FRAMEWORK
string stableInstallPath;
try
@ -64,7 +64,7 @@ protected override string LocateBasePath()
}
#endif
#if NET461
#if NET_FRAMEWORK
stableInstallPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), @"osu!");
#else
var stableInstallPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), @"osu!");

View File

@ -19,7 +19,7 @@
using OpenTK;
using OpenTK.Graphics;
#if NET461
#if NET_FRAMEWORK
using System;
using System.Net.Http;
using osu.Framework.Logging;
@ -30,7 +30,7 @@ namespace osu.Desktop.Overlays
{
public class VersionManager : OverlayContainer
{
#if NET461
#if NET_FRAMEWORK
private UpdateManager updateManager;
#endif
@ -101,7 +101,7 @@ private void load(NotificationOverlay notification, OsuColour colours, TextureSt
}
};
#if NET461
#if NET_FRAMEWORK
if (game.IsDeployedBuild)
checkForUpdateAsync();
#endif
@ -147,12 +147,12 @@ protected override void Dispose(bool isDisposing)
{
base.Dispose(isDisposing);
#if NET461
#if NET_FRAMEWORK
updateManager?.Dispose();
#endif
}
#if NET461
#if NET_FRAMEWORK
private async void checkForUpdateAsync(bool useDeltaPatching = true, UpdateProgressNotification notification = null)
{
//should we schedule a retry on completion of this check?
@ -247,7 +247,7 @@ private class UpdateProgressNotification : ProgressNotification
Activated = () =>
{
// Squirrel returns execution to us after the update process is started, so it's safe to use Wait() here
#if NET461
#if NET_FRAMEWORK
UpdateManager.RestartAppWhenExited().Wait();
#endif
game.GracefullyExit();

View File

@ -15,6 +15,9 @@
<Version>0.0.0.0</Version>
<FileVersion>0.0.0.0</FileVersion>
</PropertyGroup>
<PropertyGroup Label="Defines">
<DefineConstants Condition="'$(TargetFramework)' == 'net461'">$(DefineConstants);NET_FRAMEWORK</DefineConstants>
</PropertyGroup>
<ItemGroup Label="Project References">
<ProjectReference Include="..\osu-framework\osu.Framework\osu.Framework.csproj" />
<ProjectReference Include="..\osu.Game.Rulesets.Osu\osu.Game.Rulesets.Osu.csproj" />