From c162acd8a7a810afa13f6a4da271fefc592d02eb Mon Sep 17 00:00:00 2001
From: RMBGAME <rmb@rmbgame.net>
Date: Fri, 30 Jun 2023 14:46:26 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=91=20CI=20Fix?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ref/WTTS.MicroServices.ClientSDK              |   2 +-
 .../FodyWeavers.xml                           |   3 +
 .../ArchiSteamFarmServiceImpl.cs              |   4 +-
 ...D.WTTS.Client.Plugins.Authenticator.csproj |  22 ++--
 .../FodyWeavers.xml                           |   3 +
 .../UI/Views/Pages/AuthenticatorPage.axaml    | 114 +++++++++---------
 .../UI/Views/Pages/AuthenticatorPage.axaml.cs |   2 +-
 7 files changed, 75 insertions(+), 75 deletions(-)
 create mode 100644 src/BD.WTTS.Client.Plugins.Accelerator/FodyWeavers.xml
 create mode 100644 src/BD.WTTS.Client.Plugins.Authenticator/FodyWeavers.xml

diff --git a/ref/WTTS.MicroServices.ClientSDK b/ref/WTTS.MicroServices.ClientSDK
index a611baaa1..d8a473807 160000
--- a/ref/WTTS.MicroServices.ClientSDK
+++ b/ref/WTTS.MicroServices.ClientSDK
@@ -1 +1 @@
-Subproject commit a611baaa1e8591205767ba646e0e6e56e369802a
+Subproject commit d8a473807593e24fea35c555306212955ff9cb51
diff --git a/src/BD.WTTS.Client.Plugins.Accelerator/FodyWeavers.xml b/src/BD.WTTS.Client.Plugins.Accelerator/FodyWeavers.xml
new file mode 100644
index 000000000..63fc14848
--- /dev/null
+++ b/src/BD.WTTS.Client.Plugins.Accelerator/FodyWeavers.xml
@@ -0,0 +1,3 @@
+<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
+  <ReactiveUI />
+</Weavers>
\ No newline at end of file
diff --git a/src/BD.WTTS.Client.Plugins.ArchiSteamFarmPlus/Services.Implementation/ArchiSteamFarmServiceImpl.cs b/src/BD.WTTS.Client.Plugins.ArchiSteamFarmPlus/Services.Implementation/ArchiSteamFarmServiceImpl.cs
index e9e3c7109..bb4a6c176 100644
--- a/src/BD.WTTS.Client.Plugins.ArchiSteamFarmPlus/Services.Implementation/ArchiSteamFarmServiceImpl.cs
+++ b/src/BD.WTTS.Client.Plugins.ArchiSteamFarmPlus/Services.Implementation/ArchiSteamFarmServiceImpl.cs
@@ -57,13 +57,13 @@ public partial class ArchiSteamFarmServiceImpl : ReactiveObject, IArchiSteamFarm
             MaxArchiveFiles = 10,
             MaxArchiveDays = 7,
         };
-        IApplication.InitializeTarget(config, fileTarget, NLogLevel.Debug);
+        //IApplication.InitializeTarget(config, fileTarget, NLogLevel.Debug);
         var historyTarget = new HistoryTarget("History")
         {
             Layout = ASFPathHelper.NLogGeneralLayout,
             MaxCount = 20,
         };
-        IApplication.InitializeTarget(config, historyTarget, NLogLevel.Debug);
+        //IApplication.InitializeTarget(config, historyTarget, NLogLevel.Debug);
         ASFNLogManager.Configuration = config;
     }
 
diff --git a/src/BD.WTTS.Client.Plugins.Authenticator/BD.WTTS.Client.Plugins.Authenticator.csproj b/src/BD.WTTS.Client.Plugins.Authenticator/BD.WTTS.Client.Plugins.Authenticator.csproj
index ba239131b..d6c93763a 100644
--- a/src/BD.WTTS.Client.Plugins.Authenticator/BD.WTTS.Client.Plugins.Authenticator.csproj
+++ b/src/BD.WTTS.Client.Plugins.Authenticator/BD.WTTS.Client.Plugins.Authenticator.csproj
@@ -7,21 +7,10 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<AvaloniaXaml Remove="StepControls_Test\**" />
-		<Compile Remove="StepControls_Test\**" />
-		<EmbeddedResource Remove="StepControls_Test\**" />
-		<None Remove="StepControls_Test\**" />
-		<Compile Update="UI\Views\Pages\SteamLoginImportPage.axaml.cs">
-			<DependentUpon>ImportPage.axaml</DependentUpon>
-			<SubType>Code</SubType>
-		</Compile>
-	</ItemGroup>
-
-	<ItemGroup>
+		<!-- ImplicitUsings -->
 		<Compile Include="..\AssemblyInfo.Xaml.cs">
 			<LinkBase>Properties</LinkBase>
 		</Compile>
-		<!-- ImplicitUsings -->
 		<Compile Include="..\ImplicitUsings.MessagePack.cs">
 			<LinkBase>Properties</LinkBase>
 		</Compile>
@@ -71,12 +60,17 @@
 			<LinkBase>Properties</LinkBase>
 		</Compile>
 	</ItemGroup>
-
+	
+	<ItemGroup>
+		<PackageReference Include="ReactiveUI.Fody" />
+	</ItemGroup>
+	
 	<ItemGroup>
 		<ProjectReference Include="..\BD.WTTS.Client\BD.WTTS.Client.csproj" />
 		<ProjectReference Include="..\BD.WTTS.Client.Avalonia\BD.WTTS.Client.Avalonia.csproj" />
 	</ItemGroup>
 
-	<Import Project="..\TFM_NETX_WITH_ALL.props" />
+	<!--<Import Project="..\TFM_NETX_WITH_ALL.props" />-->
+	<Import Project="..\TFM_NETX_WITH_DESKTOP.props" />
 
 </Project>
diff --git a/src/BD.WTTS.Client.Plugins.Authenticator/FodyWeavers.xml b/src/BD.WTTS.Client.Plugins.Authenticator/FodyWeavers.xml
new file mode 100644
index 000000000..63fc14848
--- /dev/null
+++ b/src/BD.WTTS.Client.Plugins.Authenticator/FodyWeavers.xml
@@ -0,0 +1,3 @@
+<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
+  <ReactiveUI />
+</Weavers>
\ No newline at end of file
diff --git a/src/BD.WTTS.Client.Plugins.Authenticator/UI/Views/Pages/AuthenticatorPage.axaml b/src/BD.WTTS.Client.Plugins.Authenticator/UI/Views/Pages/AuthenticatorPage.axaml
index 690e8f83e..95b4454be 100644
--- a/src/BD.WTTS.Client.Plugins.Authenticator/UI/Views/Pages/AuthenticatorPage.axaml
+++ b/src/BD.WTTS.Client.Plugins.Authenticator/UI/Views/Pages/AuthenticatorPage.axaml
@@ -1,28 +1,28 @@
 <spp:PageBase
-    d:DesignHeight="450"
-    d:DesignWidth="800"
-    mc:Ignorable="d"
     x:Class="BD.WTTS.UI.Views.Pages.AuthenticatorPage"
-    x:CompileBindings="True"
-    x:DataType="spp:AuthenticatorPageViewModel"
     xmlns="https://github.com/avaloniaui"
-    xmlns:controls="clr-namespace:BD.WTTS.UI.Views.Controls"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:controls="using:BD.WTTS.UI.Views.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:model="clr-namespace:BD.WTTS.Models"
+    xmlns:model="using:BD.WTTS.Models"
     xmlns:s="https://steampp.net/services"
     xmlns:spp="https://steampp.net/ui"
     xmlns:ui="using:FluentAvalonia.UI.Controls"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    d:DesignHeight="450"
+    d:DesignWidth="800"
+    x:CompileBindings="True"
+    x:DataType="spp:AuthenticatorPageViewModel"
+    mc:Ignorable="d">
     <spp:PageBase.Styles>
         <Style Selector="Border#BorderBottom">
             <Setter Property="Transitions">
                 <Transitions>
                     <TransformOperationsTransition
                         Delay="0:0:0.25"
-                        Duration="0:0:0.7"
                         Easing="ExponentialEaseOut"
-                        Property="RenderTransform" />
+                        Property="RenderTransform"
+                        Duration="0:0:0.7" />
                 </Transitions>
             </Setter>
             <Style.Animations>
@@ -48,38 +48,38 @@
     </spp:PageBase.PreviewImage>
     <spp:PageBase.TabContent>
         <TabStrip
+            Margin="4"
+            HorizontalAlignment="Right"
+            VerticalAlignment="Top"
             Background="{DynamicResource ControlOnImageFillColorDefaultBrush}"
             CornerRadius="{StaticResource ControlCornerRadius}"
-            HorizontalAlignment="Right"
-            ItemContainerTheme="{StaticResource TabItemStyle}"
-            Margin="4"
-            VerticalAlignment="Top" />
+            ItemContainerTheme="{StaticResource TabItemStyle}" />
     </spp:PageBase.TabContent>
     <spp:PageBase.ActionContent>
         <StackPanel Orientation="Horizontal" Spacing="2">
             <Button
-                DockPanel.Dock="Right"
                 Padding="8,4"
+                DockPanel.Dock="Right"
                 Theme="{StaticResource TransparentButton}">
                 <Panel>
                     <Viewbox
+                        Width="16"
                         Height="16"
-                        HorizontalAlignment="Left"
-                        Width="16">
+                        HorizontalAlignment="Left">
                         <ui:SymbolIcon Symbol="Add" />
                     </Viewbox>
                     <TextBlock
-                        HorizontalAlignment="Left"
                         Margin="28,4,0,4"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Center"
                         Text="{ReflectionBinding Path=Res.Add,
                                                  Mode=OneWay,
-                                                 Source={x:Static s:ResourceService.Current}}"
-                        VerticalAlignment="Center" />
+                                                 Source={x:Static s:ResourceService.Current}}" />
                 </Panel>
             </Button>
             <Button
-                DockPanel.Dock="Right"
                 Padding="8,4"
+                DockPanel.Dock="Right"
                 Theme="{StaticResource TransparentButton}">
                 <Button.Flyout>
                     <Flyout Placement="BottomEdgeAlignedLeft">
@@ -106,49 +106,49 @@
                 </Button.Flyout>
                 <Panel>
                     <Viewbox
+                        Width="16"
                         Height="16"
-                        HorizontalAlignment="Left"
-                        Width="16">
+                        HorizontalAlignment="Left">
                         <ui:FontIcon FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="{StaticResource Lock}" />
                     </Viewbox>
                     <TextBlock
-                        HorizontalAlignment="Left"
                         Margin="28,4,0,4"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Center"
                         Text="{ReflectionBinding Path=Res.Encrypt,
                                                  Mode=OneWay,
-                                                 Source={x:Static s:ResourceService.Current}}"
-                        VerticalAlignment="Center" />
+                                                 Source={x:Static s:ResourceService.Current}}" />
                 </Panel>
             </Button>
             <Button
+                Padding="8,4"
                 Command="{Binding Initialize}"
                 DockPanel.Dock="Right"
-                Padding="8,4"
                 Theme="{StaticResource TransparentButton}">
                 <Panel>
                     <Viewbox
+                        Width="16"
                         Height="16"
-                        HorizontalAlignment="Left"
-                        Width="16">
+                        HorizontalAlignment="Left">
                         <ui:SymbolIcon Symbol="Refresh" />
                     </Viewbox>
                     <TextBlock
-                        HorizontalAlignment="Left"
                         Margin="28,4,0,4"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Center"
                         Text="{ReflectionBinding Path=Res.Refresh,
                                                  Mode=OneWay,
-                                                 Source={x:Static s:ResourceService.Current}}"
-                        VerticalAlignment="Center" />
+                                                 Source={x:Static s:ResourceService.Current}}" />
                 </Panel>
             </Button>
             <DropDownButton
+                Padding="8"
+                HorizontalContentAlignment="Center"
+                VerticalContentAlignment="Center"
                 Content="{StaticResource More}"
                 FontFamily="{StaticResource SymbolThemeFontFamily}"
                 FontSize="20"
-                HorizontalContentAlignment="Center"
-                Padding="8"
-                Theme="{StaticResource TransparentButton}"
-                VerticalContentAlignment="Center">
+                Theme="{StaticResource TransparentButton}">
                 <DropDownButton.Flyout>
                     <ui:FAMenuFlyout Placement="BottomEdgeAlignedRight">
                         <!-- <ui:MenuFlyoutSubItem Text="令牌加密"> -->
@@ -193,17 +193,17 @@
     <DockPanel>
         <!-- <views:ImportControl IsVisible="True" /> -->
         <Border
+            Name="BorderBottom"
             Background="{DynamicResource ControlFillColorDefaultBrush}"
             BorderBrush="{DynamicResource CardStrokeColorDefaultBrush}"
             Classes.IsActive="{Binding BorderBottomIsActive}"
             CornerRadius="{StaticResource ControlCornerRadius}"
-            DockPanel.Dock="Bottom"
-            Name="BorderBottom">
+            DockPanel.Dock="Bottom">
             <DockPanel>
                 <ui:CommandBar
+                    HorizontalAlignment="Center"
                     DefaultLabelPosition="Right"
-                    DockPanel.Dock="Left"
-                    HorizontalAlignment="Center">
+                    DockPanel.Dock="Left">
                     <ui:CommandBar.PrimaryCommands>
                         <ui:CommandBarButton Command="{Binding KeepDisplay}" Label="固定展示">
                             <ui:CommandBarButton.IconSource>
@@ -239,9 +239,9 @@
                             <ui:CommandBarButton.Flyout>
                                 <Flyout Placement="Top">
                                     <Image
+                                        Width="200"
                                         Height="200"
-                                        Source="{Binding QrCodeStream, Converter={StaticResource BitmapAssetValueConverter}, Mode=OneWay}"
-                                        Width="200" />
+                                        Source="{Binding QrCodeStream, Converter={StaticResource BitmapAssetValueConverter}, Mode=OneWay}" />
                                 </Flyout>
                             </ui:CommandBarButton.Flyout>
                         </ui:CommandBarButton>
@@ -258,29 +258,29 @@
         <Panel DockPanel.Dock="Left">
             <StackPanel
                 HorizontalAlignment="Center"
+                VerticalAlignment="Center"
                 IsVisible="{CompiledBinding AuthenticatorIsEmpty}"
                 Orientation="Horizontal"
-                Spacing="5"
-                VerticalAlignment="Center">
+                Spacing="5">
                 <TextBlock
                     HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
                     Text="{ReflectionBinding Source={x:Static s:ResourceService.Current},
                                              Path=Res.LocalAuth_NoAuthTip,
                                              Mode=OneWay}"
-                    TextWrapping="WrapWithOverflow"
-                    VerticalAlignment="Center" />
+                    TextWrapping="WrapWithOverflow" />
                 <Button
+                    HorizontalAlignment="Center"
+                    HorizontalContentAlignment="Center"
                     Content="{ReflectionBinding Source={x:Static s:ResourceService.Current},
                                                 Path=Res.Add,
-                                                Mode=OneWay}"
-                    HorizontalAlignment="Center"
-                    HorizontalContentAlignment="Center" />
+                                                Mode=OneWay}" />
             </StackPanel>
             <StackPanel
                 HorizontalAlignment="Center"
+                VerticalAlignment="Center"
                 Orientation="Horizontal"
-                Spacing="5"
-                VerticalAlignment="Center">
+                Spacing="5">
                 <StackPanel.IsVisible>
                     <MultiBinding Converter="{x:Static BoolConverters.And}">
                         <Binding Path="!IsVerificationPass" />
@@ -289,19 +289,19 @@
                 </StackPanel.IsVisible>
                 <TextBlock
                     HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
                     Text="您的令牌具有密码保护，请先进行密码验证"
-                    TextWrapping="WrapWithOverflow"
-                    VerticalAlignment="Center" />
+                    TextWrapping="WrapWithOverflow" />
                 <Button
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
                     Command="{Binding Initialize}"
                     Content="验证"
-                    HorizontalAlignment="Center"
-                    IsEnabled="True"
-                    VerticalAlignment="Center" />
+                    IsEnabled="True" />
             </StackPanel>
             <ScrollViewer
-                HorizontalScrollBarVisibility="Disabled"
                 Margin="0,0,0,0"
+                HorizontalScrollBarVisibility="Disabled"
                 VerticalScrollBarVisibility="Auto">
                 <ScrollViewer.IsVisible>
                     <MultiBinding Converter="{x:Static BoolConverters.And}">
diff --git a/src/BD.WTTS.Client.Plugins.Authenticator/UI/Views/Pages/AuthenticatorPage.axaml.cs b/src/BD.WTTS.Client.Plugins.Authenticator/UI/Views/Pages/AuthenticatorPage.axaml.cs
index ba2497171..75281b129 100644
--- a/src/BD.WTTS.Client.Plugins.Authenticator/UI/Views/Pages/AuthenticatorPage.axaml.cs
+++ b/src/BD.WTTS.Client.Plugins.Authenticator/UI/Views/Pages/AuthenticatorPage.axaml.cs
@@ -4,7 +4,7 @@ public partial class AuthenticatorPage : PageBase<AuthenticatorPageViewModel>
 {
     public AuthenticatorPage()
     {
-        InitializeComponent();
+        //InitializeComponent();
         DataContext = new AuthenticatorPageViewModel();
 
         Title = "云令牌";