mirror of
https://github.com/ppy/osu.git
synced 2025-02-13 15:43:21 +08:00
Added the specific exception
This commit is contained in:
parent
2f4855b00f
commit
e803564b5a
@ -15,7 +15,7 @@ using osu.Framework.Graphics.Textures;
|
|||||||
using osu.Game.Graphics;
|
using osu.Game.Graphics;
|
||||||
using OpenTK;
|
using OpenTK;
|
||||||
using OpenTK.Graphics;
|
using OpenTK.Graphics;
|
||||||
using System;
|
using System.Net.Http;
|
||||||
|
|
||||||
namespace osu.Desktop.Overlays
|
namespace osu.Desktop.Overlays
|
||||||
{
|
{
|
||||||
@ -116,32 +116,33 @@ namespace osu.Desktop.Overlays
|
|||||||
try
|
try
|
||||||
{
|
{
|
||||||
updateManager = await UpdateManager.GitHubUpdateManager(@"https://github.com/ppy/osu", @"osulazer", null, null, true);
|
updateManager = await UpdateManager.GitHubUpdateManager(@"https://github.com/ppy/osu", @"osulazer", null, null, true);
|
||||||
|
|
||||||
if (!updateManager.IsInstalledApp)
|
|
||||||
return;
|
|
||||||
|
|
||||||
var info = await updateManager.CheckForUpdate();
|
|
||||||
if (info.ReleasesToApply.Count > 0)
|
|
||||||
{
|
|
||||||
ProgressNotification n = new UpdateProgressNotification
|
|
||||||
{
|
|
||||||
Text = @"Downloading update..."
|
|
||||||
};
|
|
||||||
Schedule(() => notification.Post(n));
|
|
||||||
Schedule(() => n.State = ProgressNotificationState.Active);
|
|
||||||
await updateManager.DownloadReleases(info.ReleasesToApply, (int p) => Schedule(() => n.Progress = p / 100f));
|
|
||||||
Schedule(() => n.Text = @"Installing update...");
|
|
||||||
await updateManager.ApplyReleases(info, (int p) => Schedule(() => n.Progress = p / 100f));
|
|
||||||
Schedule(() => n.State = ProgressNotificationState.Completed);
|
|
||||||
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
//check again every 30 minutes.
|
|
||||||
Scheduler.AddDelayed(updateChecker, 60000 * 30);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
catch(Exception e)
|
catch(HttpRequestException)
|
||||||
|
{
|
||||||
|
//check again every 30 minutes.
|
||||||
|
Scheduler.AddDelayed(updateChecker, 60000 * 30);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!updateManager.IsInstalledApp)
|
||||||
|
return;
|
||||||
|
|
||||||
|
var info = await updateManager.CheckForUpdate();
|
||||||
|
if (info.ReleasesToApply.Count > 0)
|
||||||
|
{
|
||||||
|
ProgressNotification n = new UpdateProgressNotification
|
||||||
|
{
|
||||||
|
Text = @"Downloading update..."
|
||||||
|
};
|
||||||
|
Schedule(() => notification.Post(n));
|
||||||
|
Schedule(() => n.State = ProgressNotificationState.Active);
|
||||||
|
await updateManager.DownloadReleases(info.ReleasesToApply, (int p) => Schedule(() => n.Progress = p / 100f));
|
||||||
|
Schedule(() => n.Text = @"Installing update...");
|
||||||
|
await updateManager.ApplyReleases(info, (int p) => Schedule(() => n.Progress = p / 100f));
|
||||||
|
Schedule(() => n.State = ProgressNotificationState.Completed);
|
||||||
|
|
||||||
|
}
|
||||||
|
else
|
||||||
{
|
{
|
||||||
//check again every 30 minutes.
|
//check again every 30 minutes.
|
||||||
Scheduler.AddDelayed(updateChecker, 60000 * 30);
|
Scheduler.AddDelayed(updateChecker, 60000 * 30);
|
||||||
|
@ -137,6 +137,16 @@
|
|||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="System" />
|
<Reference Include="System" />
|
||||||
<Reference Include="System.Drawing" />
|
<Reference Include="System.Drawing" />
|
||||||
|
<Reference Include="System.Net.Http" />
|
||||||
|
<Reference Include="System.Net.Http.Extensions, Version=2.2.29.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||||
|
<HintPath>..\packages\Microsoft.Net.Http.2.2.29\lib\net45\System.Net.Http.Extensions.dll</HintPath>
|
||||||
|
<Private>True</Private>
|
||||||
|
</Reference>
|
||||||
|
<Reference Include="System.Net.Http.Primitives, Version=4.2.29.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||||
|
<HintPath>..\packages\Microsoft.Net.Http.2.2.29\lib\net45\System.Net.Http.Primitives.dll</HintPath>
|
||||||
|
<Private>True</Private>
|
||||||
|
</Reference>
|
||||||
|
<Reference Include="System.Net.Http.WebRequest" />
|
||||||
<Reference Include="System.Windows.Forms" />
|
<Reference Include="System.Windows.Forms" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
@ -219,7 +229,9 @@
|
|||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Content Include="lazer.ico" />
|
<Content Include="lazer.ico" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup />
|
<ItemGroup>
|
||||||
|
<WCFMetadata Include="Service References\" />
|
||||||
|
</ItemGroup>
|
||||||
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
|
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
|
||||||
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
|
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
|
||||||
Other similar extension points exist, see Microsoft.Common.targets.
|
Other similar extension points exist, see Microsoft.Common.targets.
|
||||||
@ -240,4 +252,9 @@
|
|||||||
<PostBuildEvent>
|
<PostBuildEvent>
|
||||||
</PostBuildEvent>
|
</PostBuildEvent>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
<Import Project="..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets" Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" />
|
||||||
|
<Target Name="EnsureBclBuildImported" BeforeTargets="BeforeBuild" Condition="'$(BclBuildImported)' == ''">
|
||||||
|
<Error Condition="!Exists('..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" Text="This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=317567." HelpKeyword="BCLBUILD2001" />
|
||||||
|
<Error Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" Text="The build restored NuGet packages. Build the project again to include these packages in the build. For more information, see http://go.microsoft.com/fwlink/?LinkID=317568." HelpKeyword="BCLBUILD2002" />
|
||||||
|
</Target>
|
||||||
</Project>
|
</Project>
|
@ -5,6 +5,9 @@ Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/maste
|
|||||||
-->
|
-->
|
||||||
<packages>
|
<packages>
|
||||||
<package id="DeltaCompressionDotNet" version="1.0.0" targetFramework="net45" />
|
<package id="DeltaCompressionDotNet" version="1.0.0" targetFramework="net45" />
|
||||||
|
<package id="Microsoft.Bcl" version="1.1.10" targetFramework="net45" />
|
||||||
|
<package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="net45" />
|
||||||
|
<package id="Microsoft.Net.Http" version="2.2.29" targetFramework="net45" />
|
||||||
<package id="Mono.Cecil" version="0.9.6.1" targetFramework="net45" />
|
<package id="Mono.Cecil" version="0.9.6.1" targetFramework="net45" />
|
||||||
<package id="Splat" version="1.6.2" targetFramework="net45" />
|
<package id="Splat" version="1.6.2" targetFramework="net45" />
|
||||||
<package id="squirrel.windows" version="1.5.2" targetFramework="net45" />
|
<package id="squirrel.windows" version="1.5.2" targetFramework="net45" />
|
||||||
|
Loading…
Reference in New Issue
Block a user