Mirrored_Repos/wabbajack
1
0
Fork 0
mirror of https://github.com/wabbajack-tools/wabbajack.git synced 2024-08-30 18:42:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge fixes

Browse Source
This commit is contained in:
Justin Swanson 2020-01-07 19:30:22 -06:00
parent c5dd5c05bc
commit b3a61a00a7
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Wabbajack.Lib/Downloaders/AbstractNeedsLoginDownloader.cs
View File

@ -2,6 +2,7 @@
using System.IO;
using System.Linq;
using System.Net.Http;
using System.Reactive;
using System.Reactive.Linq;
using System.Threading;
using System.Threading.Tasks;
@ -48,11 +49,11 @@ namespace Wabbajack.Lib.Downloaders
canExecute: IsLoggedIn.ObserveOn(RxApp.MainThreadScheduler));
}
public ICommand TriggerLogin { get; }
public ICommand ClearLogin { get; }
public ReactiveCommand<Unit, Unit> TriggerLogin { get; }
public ReactiveCommand<Unit, Unit> ClearLogin { get; }
public IObservable<bool> IsLoggedIn => Utils.HaveEncryptedJsonObservable(_encryptedKeyName);
public abstract string SiteName { get; }
public virtual string MetaInfo { get; }
public virtual IObservable<string> MetaInfo { get; }
public abstract Uri SiteURL { get; }
public virtual Uri IconUri { get; }

4
Wabbajack.Lib/Wabbajack.Lib.csproj
View File

@ -4,6 +4,10 @@
<TargetFramework>netstandard2.0</TargetFramework>
<Platforms>AnyCPU;x64</Platforms>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<NoWarn>1701;1702; CS1998</NoWarn>
<WarningsAsErrors>NU1605, CS4014</WarningsAsErrors>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="CefSharp.Common">
<Version>75.1.143</Version>