Compare commits

...

10 Commits

Author SHA1 Message Date
Aigio Liu 99cfe5c8fb #1992 2022-09-09 00:17:04 +08:00
Aigio Liu 07385d0040 ISteamService 添加 StartSteamWithParameter 函数替换 StartSteam(SteamSettings.SteamStratParameter.Value)
改进 SaveEditedAppInfoWindowViewModel.SaveSteamEditedApps
2022-09-08 23:55:19 +08:00
dependabot[bot] c9000b1653 Bump AspNet.Security.OAuth.QQ from 6.0.10 to 6.0.11 (#1985)
Bumps [AspNet.Security.OAuth.QQ](https://github.com/aspnet-contrib/AspNet.Security.OAuth.Providers) from 6.0.10 to 6.0.11.
- [Release notes](https://github.com/aspnet-contrib/AspNet.Security.OAuth.Providers/releases)
- [Commits](https://github.com/aspnet-contrib/AspNet.Security.OAuth.Providers/compare/6.0.10...6.0.11)

---
updated-dependencies:
- dependency-name: AspNet.Security.OAuth.QQ
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Aigio L <24450093+AigioL@users.noreply.github.com>
2022-09-06 09:30:04 +08:00
dependabot[bot] 09bd0f6b5b Bump AspNet.Security.OAuth.Apple from 6.0.10 to 6.0.11 (#1984)
Bumps [AspNet.Security.OAuth.Apple](https://github.com/aspnet-contrib/AspNet.Security.OAuth.Providers) from 6.0.10 to 6.0.11.
- [Release notes](https://github.com/aspnet-contrib/AspNet.Security.OAuth.Providers/releases)
- [Commits](https://github.com/aspnet-contrib/AspNet.Security.OAuth.Providers/compare/6.0.10...6.0.11)

---
updated-dependencies:
- dependency-name: AspNet.Security.OAuth.Apple
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-09-06 09:29:23 +08:00
dependabot[bot] 6a90230dbb Bump NLog.Web.AspNetCore from 5.1.1 to 5.1.4 (#1972)
Bumps [NLog.Web.AspNetCore](https://github.com/NLog/NLog.Web) from 5.1.1 to 5.1.4.
- [Release notes](https://github.com/NLog/NLog.Web/releases)
- [Changelog](https://github.com/NLog/NLog.Web/blob/master/CHANGELOG.MD)
- [Commits](https://github.com/NLog/NLog.Web/compare/v5.1.1...v5.1.4)

---
updated-dependencies:
- dependency-name: NLog.Web.AspNetCore
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Aigio L <24450093+AigioL@users.noreply.github.com>
2022-09-02 20:45:06 +08:00
dependabot[bot] ec70128239 Bump NLog.Extensions.Logging from 5.0.2 to 5.0.4 (#1971)
Bumps [NLog.Extensions.Logging](https://github.com/NLog/NLog.Extensions.Logging) from 5.0.2 to 5.0.4.
- [Release notes](https://github.com/NLog/NLog.Extensions.Logging/releases)
- [Changelog](https://github.com/NLog/NLog.Extensions.Logging/blob/master/CHANGELOG.MD)
- [Commits](https://github.com/NLog/NLog.Extensions.Logging/compare/v5.0.2...v5.0.4)

---
updated-dependencies:
- dependency-name: NLog.Extensions.Logging
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Aigio L <24450093+AigioL@users.noreply.github.com>
2022-09-02 20:44:38 +08:00
dependabot[bot] f2048bc3e5 Bump NLog from 5.0.2 to 5.0.4 (#1969)
Bumps [NLog](https://github.com/NLog/NLog) from 5.0.2 to 5.0.4.
- [Release notes](https://github.com/NLog/NLog/releases)
- [Changelog](https://github.com/NLog/NLog/blob/dev/CHANGELOG.md)
- [Commits](https://github.com/NLog/NLog/compare/v5.0.2...v5.0.4)

---
updated-dependencies:
- dependency-name: NLog
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-09-02 20:43:59 +08:00
dependabot[bot] 9000c3bf2a Bump AspNet.Security.OAuth.Apple from 6.0.9 to 6.0.10 (#1966)
Bumps [AspNet.Security.OAuth.Apple](https://github.com/aspnet-contrib/AspNet.Security.OAuth.Providers) from 6.0.9 to 6.0.10.
- [Release notes](https://github.com/aspnet-contrib/AspNet.Security.OAuth.Providers/releases)
- [Commits](https://github.com/aspnet-contrib/AspNet.Security.OAuth.Providers/compare/6.0.9...6.0.10)

---
updated-dependencies:
- dependency-name: AspNet.Security.OAuth.Apple
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Aigio L <24450093+AigioL@users.noreply.github.com>
2022-09-02 20:43:50 +08:00
dependabot[bot] 3725f9b62f Bump AspNet.Security.OAuth.QQ from 6.0.9 to 6.0.10 (#1964)
Bumps [AspNet.Security.OAuth.QQ](https://github.com/aspnet-contrib/AspNet.Security.OAuth.Providers) from 6.0.9 to 6.0.10.
- [Release notes](https://github.com/aspnet-contrib/AspNet.Security.OAuth.Providers/releases)
- [Commits](https://github.com/aspnet-contrib/AspNet.Security.OAuth.Providers/compare/6.0.9...6.0.10)

---
updated-dependencies:
- dependency-name: AspNet.Security.OAuth.QQ
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-09-02 20:43:15 +08:00
dependabot[bot] 2c92e3e6f8 Bump Microsoft.NET.Test.Sdk from 17.3.0 to 17.3.1 (#1961)
Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 17.3.0 to 17.3.1.
- [Release notes](https://github.com/microsoft/vstest/releases)
- [Commits](https://github.com/microsoft/vstest/compare/v17.3.0...v17.3.1)

---
updated-dependencies:
- dependency-name: Microsoft.NET.Test.Sdk
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-09-02 20:43:06 +08:00
7 changed files with 21 additions and 14 deletions
+6 -6
View File
@@ -44,8 +44,8 @@
<!-- AspNetCore 6 OpenId/OAuth -->
<PackageVersion Include="AspNet.Security.OpenId.Steam" Version="6.0.0" />
<PackageVersion Include="AspNet.Security.OAuth.QQ" Version="6.0.9" />
<PackageVersion Include="AspNet.Security.OAuth.Apple" Version="6.0.9" />
<PackageVersion Include="AspNet.Security.OAuth.QQ" Version="6.0.11" />
<PackageVersion Include="AspNet.Security.OAuth.Apple" Version="6.0.11" />
</ItemGroup>
<ItemGroup>
</ItemGroup>
@@ -74,7 +74,7 @@
</ItemGroup>
<ItemGroup>
<!-- Microsoft.* -->
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.3.0" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.3.1" />
<!--<PackageVersion Include="Microsoft.Windows.CsWinRT" Version="1.4.1" />-->
<!--<PackageVersion Include="Microsoft.Windows.SDK.NET.Ref" Version="10.0.19041.22" />-->
<!--<PackageVersion Include="Microsoft.Windows.SDK.Contracts" Version="10.0.19041.1" />-->
@@ -117,9 +117,9 @@
<PackageVersion Include="Moq" Version="4.18.2" />
<!-- NLog -->
<PackageVersion Include="NLog" Version="5.0.2" />
<PackageVersion Include="NLog.Extensions.Logging" Version="5.0.2" />
<PackageVersion Include="NLog.Web.AspNetCore" Version="5.1.1" />
<PackageVersion Include="NLog" Version="5.0.4" />
<PackageVersion Include="NLog.Extensions.Logging" Version="5.0.4" />
<PackageVersion Include="NLog.Web.AspNetCore" Version="5.1.4" />
<PackageVersion Include="AspNetCore2.NETStandard.NLog.Web.AspNetCore" Version="5.0.0" />
<!-- ReactiveUI -->
+1 -1
View File
@@ -266,7 +266,7 @@ public abstract class CommandLineHost : IDisposable
steamService.SetCurrentUser(account);
}
steamService.StartSteam();
steamService.StartSteamWithParameter();
}
});
rootCommand.AddCommand(steamuser);
+6
View File
@@ -1,4 +1,5 @@
using System.Application.Models;
using System.Application.Settings;
using System.Collections.Generic;
using System.IO;
using System.Text.RegularExpressions;
@@ -55,6 +56,11 @@ namespace System.Application.Services
/// <param name="arguments"></param>
void StartSteam(string? arguments = null);
/// <summary>
/// 使用配置的参数启动 Steam
/// </summary>
void StartSteamWithParameter() => StartSteam(SteamSettings.SteamStratParameter.Value);
/// <summary>
/// 安全退出 Steam(如果有修改Steam数据的操作请退出后在执行不然Steam安全退出会还原修改)
/// </summary>
@@ -246,7 +246,7 @@ namespace System.Application.Services
public void Initialize()
{
if (!stmService.IsRunningSteamProcess && SteamSettings.IsAutoRunSteam.Value)
stmService.StartSteam(SteamSettings.SteamStratParameter.Value);
stmService.StartSteamWithParameter();
Task.Factory.StartNew(async () =>
{
@@ -144,7 +144,7 @@ namespace System.Application.UI.ViewModels
steamService.SetCurrentUser(string.Empty);
}
steamService.StartSteam(SteamSettings.SteamStratParameter.Value);
steamService.StartSteamWithParameter();
}
public async void DeleteUserButton_Click(SteamUser user)
@@ -47,12 +47,13 @@ namespace System.Application.UI.ViewModels
public async Task SaveSteamEditedApps()
{
if (await ISteamService.Instance.SaveAppInfosToSteam())
var stmService = ISteamService.Instance;
if (await stmService.SaveAppInfosToSteam())
{
if (await MessageBox.ShowAsync(AppResources.SaveEditedAppInfo_RestartSteamTip, ThisAssembly.AssemblyTrademark, MessageBox.Button.OKCancel) == MessageBox.Result.OK)
{
await ISteamService.Instance.ShutdownSteamAsync();
ISteamService.Instance.StartSteam();
await stmService.ShutdownSteamAsync();
stmService.StartSteamWithParameter();
}
Toast.Show(AppResources.SaveEditedAppInfo_SaveToSteamSuccess);
}
@@ -173,7 +173,7 @@ namespace System.Application.UI.ViewModels
var index = item.Index;
if (up ? item.Index != 0 : item.Index != _AuthorizedSourceList.Count - 1)
{
var dest = AuthorizedList[(up ? index - 1 : index + 1)];
var dest = AuthorizedList[up ? index - 1 : index + 1];
item.Index = dest.Index;
dest.Index = index;
@@ -198,7 +198,7 @@ namespace System.Application.UI.ViewModels
if (result.IsOK())
{
steamService.TryKillSteamProcess();
steamService.StartSteam();
steamService.StartSteamWithParameter();
}
}
}