From 108005c9fe894fd67042471bfae47a700f710854 Mon Sep 17 00:00:00 2001 From: Aigio Liu Date: Wed, 13 Jul 2022 16:15:30 +0800 Subject: [PATCH] Update .NET 6.0.7 --- Directory.Packages.props | 78 ++--- references/ArchiSteamFarm | 2 +- references/Steam++.Launcher.exe.bin | Bin 284672 -> 284160 bytes src/AboutAppInfoPopup.cs | 2 +- .../Common.PinyinLib.TinyPinyin.csproj | 3 +- src/FDELauncher/Program.cs | 4 +- .../ST.Client.Android.App.Modern.csproj | 268 +++++++++--------- .../ST.Client.Android.Shadowsocks.csproj | 3 +- .../ST.Client.Android.V2Ray.csproj | 3 +- .../ST.Client.AppCenter.csproj | 3 +- .../UserControl/WebView2Compat.axaml.cs | 2 - 11 files changed, 185 insertions(+), 183 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 10d48850956..1e652bf8263 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -5,42 +5,42 @@ - + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - + @@ -122,12 +122,12 @@ - - - - - - + + + + + + @@ -145,7 +145,7 @@ - + @@ -190,7 +190,7 @@ - + @@ -201,10 +201,10 @@ - + - + @@ -303,7 +303,7 @@ - + diff --git a/references/ArchiSteamFarm b/references/ArchiSteamFarm index eee00cf2943..55304aadee9 160000 --- a/references/ArchiSteamFarm +++ b/references/ArchiSteamFarm @@ -1 +1 @@ -Subproject commit eee00cf2943b7d815fe6a40f976caffcad523570 +Subproject commit 55304aadee914eb7788223a91c42ac3e41d6ed4d diff --git a/references/Steam++.Launcher.exe.bin b/references/Steam++.Launcher.exe.bin index 07a64ac5de153c80c58ec5e937fad4b129b45eff..630bdd12b87a9dc106f3452cd72abe6ea25183ce 100644 GIT binary patch delta 298 zcmZqJAlR@*a6*Sv>4KIQ3{dcZL5YEz(SU*B8zTcl+{8s$Oh2M0^D)li`Vq~>_T1L+4@qsLMKx$zii8>Fx77{>3 x<(YXY`Q^pIsU;cOj}|n^D)li+7ipez@Pxc zag#SOYBPpyzQ_2LgI}gNkb!}%L4bjQMMg|MtN9Vv_D5WddHV!3yCe4BxUkr1;^&25 zH%M;0*Pd{a5r~<#C!A!iX=ggYGW}ivOD&565KNB=WU+&=W(TsEfrP-orZ_dZv?#Nr z(vFu4CI+IXKMG`V5I`0Ii>d{&c*P=%+UOUh7M7+Km!zfy6lIoW=A@>l79*KuqmO2R zjebc{X>o~XURpj>nN4zjZb4#6W>RJj&>hqD16h>nQH1o$43&_LOe`qK$xH_7$j?I( z2D!?nxU`@kzX<3U|6m2r6kDZgV^c$8izLfLUDFgxGhLIkq!e9?RHGE#L?aUu10y5T zG)v>eS|xonbLue-GE6fwH%m4*)3q>2HPkgRGPcyUG)+psQ=XZZl3!jNoLW+nnU{_nEg&V+e+98*^1u{>Mbd& - MonoAndroid12.0;netstandard2.1;net6.0-android + + MonoAndroid12.0;netstandard2.1 System System.Common.PinyinLib.TinyPinyin enable diff --git a/src/FDELauncher/Program.cs b/src/FDELauncher/Program.cs index 353e30775ef..611a1a23907 100644 --- a/src/FDELauncher/Program.cs +++ b/src/FDELauncher/Program.cs @@ -16,8 +16,8 @@ internal static class Program { const string ExecutiveName = "Steam++"; static BundleArch matchArch; - static readonly SemanticVersion runtimeVersion = new(6, 0, 6); - static readonly SemanticVersion sdkVersion = new(6, 0, 106); + static readonly SemanticVersion runtimeVersion = new(6, 0, 7); + static readonly SemanticVersion sdkVersion = new(6, 0, 107); /// /// 应用程序的主入口点。 diff --git a/src/ST.Client.Android.App.Modern/ST.Client.Android.App.Modern.csproj b/src/ST.Client.Android.App.Modern/ST.Client.Android.App.Modern.csproj index dc4c6a5207d..0792f72acc7 100644 --- a/src/ST.Client.Android.App.Modern/ST.Client.Android.App.Modern.csproj +++ b/src/ST.Client.Android.App.Modern/ST.Client.Android.App.Modern.csproj @@ -493,213 +493,213 @@ Resources\layout\activity_about_not_binding.xml - + Resources\layout\activity_barcode_scanner.xml - - + + Resources\layout\activity_ca_cert_status.xml - - + + Resources\layout\activity_ca_cert_status_content.xml - - + + Resources\layout\activity_detail_auth.xml - - + + Resources\layout\activity_donate.xml - - + + Resources\layout\activity_encryption_auth.xml - - + + Resources\layout\activity_explorer.xml - - + + Resources\layout\activity_export_auth.xml - + Resources\layout\activity_guide_ca_cert.xml - + Resources\layout\activity_guide_vpn.xml - - + + Resources\layout\activity_guide_vpn_content.xml - - + + Resources\layout\activity_login_or_register.xml - - + + Resources\layout\activity_main_3.xml - - + + Resources\layout\activity_proxy_settings.xml - + Resources\layout\activity_settings_not_binding.xml - + Resources\layout\activity_steam_auth_data.xml - - + + Resources\layout\activity_steam_auth_trade.xml - - + + Resources\layout\activity_tablayout_viewpager2.xml - - + + Resources\layout\activity_textblock.xml - - + + Resources\layout\activity_toolbar_tablayout_viewpager2.xml - - + + Resources\layout\fragment_about.xml - - + + Resources\layout\fragment_account_binding.xml - - + + Resources\layout\fragment_account_binding_content.xml - - + + Resources\layout\fragment_asf_plus_bot.xml - - + + Resources\layout\fragment_asf_plus_config.xml - - + + Resources\layout\fragment_asf_plus_console.xml - - + + Resources\layout\fragment_basic_profile.xml - - + + Resources\layout\fragment_basic_profile_content.xml - - + + Resources\layout\fragment_bind_phone_number.xml - - + + Resources\layout\fragment_bind_phone_number_content.xml - - + + Resources\layout\fragment_change_bind_phone_number.xml - - + + Resources\layout\fragment_change_bind_phone_number_content.xml - - + + Resources\layout\fragment_community_fix.xml - - + + Resources\layout\fragment_community_fix_content_ready.xml - - + + Resources\layout\fragment_community_fix_content_starting.xml - - + + Resources\layout\fragment_game_list.xml - - + + Resources\layout\fragment_guide_export_ca_cert.xml - - + + Resources\layout\fragment_guide_export_ca_cert_content.xml - - + + Resources\layout\fragment_guide_how_install_ca_cert.xml - - + + Resources\layout\fragment_guide_how_install_ca_cert_content.xml - - + + Resources\layout\fragment_local_auth.xml - - + + Resources\layout\fragment_local_auth_import_other.xml - - + + Resources\layout\fragment_local_auth_import_steam_app.xml - - + + Resources\layout\fragment_local_auth_import_steam_plus_plus.xml - - + + Resources\layout\fragment_local_auth_import_steam_user.xml - - + + Resources\layout\fragment_login_and_register_by_fast.xml - - + + Resources\layout\fragment_login_and_register_by_phone_number.xml - - + + Resources\layout\fragment_login_and_register_by_phone_number_content.xml - - + + Resources\layout\fragment_my.xml - - + + Resources\layout\fragment_my_content.xml - - + + Resources\layout\fragment_settings.xml - - + + Resources\layout\layout_card_accelerate_project.xml - - + + Resources\layout\layout_card_accelerate_project_group.xml - - + + Resources\layout\layout_card_accelerate_project_group_content.xml - - + + Resources\layout\layout_card_gap_authenticator.xml - - + + Resources\layout\layout_card_gap_authenticator_content.xml - - + + Resources\layout\layout_card_steam_auth_trade_confirmation.xml - - + + Resources\layout\layout_card_steam_auth_trade_confirmation_content.xml - - + + Resources\layout\layout_donate_user.xml - - + + Resources\layout\layout_file_or_dir.xml - - + + Resources\layout\layout_login_and_register_by_fast_channel.xml - - + + Resources\layout\layout_preference_large_button.xml - - + + Resources\layout\layout_preference_small_button.xml - - + + Resources\layout\list_combobox_item.xml - - + + Resources\layout\local_auth_appwidget.xml - - + + Resources\layout\shared_divider.xml - - + + Resources\layout\shared_loading.xml - - + + Resources\layout\shared_toolbar.xml - - + + Resources\layout\textbox_password.xml - + Resources\menu\asf_plus_toolbar_menu.xml diff --git a/src/ST.Client.Android.Shadowsocks/ST.Client.Android.Shadowsocks.csproj b/src/ST.Client.Android.Shadowsocks/ST.Client.Android.Shadowsocks.csproj index 6b4f720109b..df6dae6e109 100644 --- a/src/ST.Client.Android.Shadowsocks/ST.Client.Android.Shadowsocks.csproj +++ b/src/ST.Client.Android.Shadowsocks/ST.Client.Android.Shadowsocks.csproj @@ -1,7 +1,8 @@ - MonoAndroid12.0;net6.0-android + + MonoAndroid12.0 true GPL-3.0-only diff --git a/src/ST.Client.Android.V2Ray/ST.Client.Android.V2Ray.csproj b/src/ST.Client.Android.V2Ray/ST.Client.Android.V2Ray.csproj index ad52b2f1731..6362f03c00d 100644 --- a/src/ST.Client.Android.V2Ray/ST.Client.Android.V2Ray.csproj +++ b/src/ST.Client.Android.V2Ray/ST.Client.Android.V2Ray.csproj @@ -1,7 +1,8 @@ - MonoAndroid12.0;net6.0-android + + MonoAndroid12.0 true GPL-3.0-only diff --git a/src/ST.Client.AppCenter/ST.Client.AppCenter.csproj b/src/ST.Client.AppCenter/ST.Client.AppCenter.csproj index 7d9751654c7..394550ecc37 100644 --- a/src/ST.Client.AppCenter/ST.Client.AppCenter.csproj +++ b/src/ST.Client.AppCenter/ST.Client.AppCenter.csproj @@ -1,7 +1,8 @@ - MonoAndroid12.0;Xamarin.iOS10;net6.0-android;net6.0-windows + + MonoAndroid12.0;Xamarin.iOS10;net6.0-windows System.Application.AppCenter System.Application.SteamTools.Client.AppCenter enable diff --git a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Controls/UserControl/WebView2Compat.axaml.cs b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Controls/UserControl/WebView2Compat.axaml.cs index 0de588c6165..355ba999d93 100644 --- a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Controls/UserControl/WebView2Compat.axaml.cs +++ b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Controls/UserControl/WebView2Compat.axaml.cs @@ -294,8 +294,6 @@ void OnHtmlSourceChanged(EventArgs e) void IsVisibleChanged(EventArgs e) { -#if WINDOWS WebView2.IsVisible = IsVisible; -#endif } }