RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into fix-bindable-ctor

This commit is contained in:
Dean Herbert 2021-07-13 12:46:01 +09:00
parent ac15dae930 d85fc08d12
commit 5af2190246
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Android.props
View File

@ -56,6 +56,6 @@
</ItemGroup> </ItemGroup>
<ItemGroup Label="Transitive Dependencies"> <ItemGroup Label="Transitive Dependencies">
<!-- Realm needs to be directly referenced in all Xamarin projects, as it will not pull in its transitive dependencies otherwise. --> <!-- Realm needs to be directly referenced in all Xamarin projects, as it will not pull in its transitive dependencies otherwise. -->
<PackageReference Include="Realm" Version="10.2.1" /> <PackageReference Include="Realm" Version="10.3.0" />
</ItemGroup> </ItemGroup>
</Project> </Project>

4
osu.Desktop/Updater/SquirrelUpdateManager.cs
View File

@ -68,6 +68,8 @@ private async Task<bool> checkForUpdateAsync(bool useDeltaPatching = true, Updat
return false; return false;
} }
scheduleRecheck = false;
if (notification == null) if (notification == null)
{ {
notification = new UpdateProgressNotification(this) { State = ProgressNotificationState.Active }; notification = new UpdateProgressNotification(this) { State = ProgressNotificationState.Active };
@ -98,7 +100,6 @@ private async Task<bool> checkForUpdateAsync(bool useDeltaPatching = true, Updat
// could fail if deltas are unavailable for full update path (https://github.com/Squirrel/Squirrel.Windows/issues/959) // could fail if deltas are unavailable for full update path (https://github.com/Squirrel/Squirrel.Windows/issues/959)
// try again without deltas. // try again without deltas.
await checkForUpdateAsync(false, notification).ConfigureAwait(false); await checkForUpdateAsync(false, notification).ConfigureAwait(false);
scheduleRecheck = false;
} }
else else
{ {
@ -110,6 +111,7 @@ private async Task<bool> checkForUpdateAsync(bool useDeltaPatching = true, Updat
catch (Exception) catch (Exception)
{ {
// we'll ignore this and retry later. can be triggered by no internet connection or thread abortion. // we'll ignore this and retry later. can be triggered by no internet connection or thread abortion.
scheduleRecheck = true;
} }
finally finally
{ {

2
osu.Game/osu.Game.csproj
View File

@ -35,7 +35,7 @@
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference> </PackageReference>
<PackageReference Include="Realm" Version="10.2.1" /> <PackageReference Include="Realm" Version="10.3.0" />
<PackageReference Include="ppy.osu.Framework" Version="2021.713.0" /> <PackageReference Include="ppy.osu.Framework" Version="2021.713.0" />
<PackageReference Include="ppy.osu.Game.Resources" Version="2021.706.0" /> <PackageReference Include="ppy.osu.Game.Resources" Version="2021.706.0" />
<PackageReference Include="Sentry" Version="3.6.0" /> <PackageReference Include="Sentry" Version="3.6.0" />

2
osu.iOS.props
View File

@ -99,6 +99,6 @@
<PackageReference Include="SharpRaven" Version="2.4.0" /> <PackageReference Include="SharpRaven" Version="2.4.0" />
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" /> <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
<PackageReference Include="ppy.osu.Framework.NativeLibs" Version="2021.115.0" ExcludeAssets="all" /> <PackageReference Include="ppy.osu.Framework.NativeLibs" Version="2021.115.0" ExcludeAssets="all" />
<PackageReference Include="Realm" Version="10.2.1" /> <PackageReference Include="Realm" Version="10.3.0" />
</ItemGroup> </ItemGroup>
</Project> </Project>