From 6ebfafb307dc1cff765ee95d65ec4f89ba0c0f2d Mon Sep 17 00:00:00 2001
From: rmbgame <rmb@rmbgame.net>
Date: Sun, 28 Feb 2021 19:06:09 +0800
Subject: [PATCH] path edit (exist error)

---
 .../App.axaml                                 |   8 +-
 .../App.axaml.cs                              |   4 +-
 ...amTools.Client.Desktop.Avalonia.App.csproj | 123 +++++++++---------
 .../Views/MainWindow.axaml                    |   6 +-
 .../UI}/Assets/AppResources/app.png           | Bin
 .../Application/UI}/Assets/Icon.ico           | Bin
 .../Application/UI}/Assets/Icon_16.png        | Bin
 .../Application/UI}/Controls/CardView.axaml   |   2 +-
 .../UI}/Controls/CardView.axaml.cs            |   0
 .../Application/UI}/Pages/GameList.axaml      |   0
 .../Application/UI}/Pages/GameList.axaml.cs   |   0
 .../Application/UI}/Pages/SettingsPage.axaml  |   0
 .../UI}/Pages/SettingsPage.axaml.cs           |   0
 .../UI}/Styles/Controls/SideBar.xaml          |   0
 .../Application/UI}/Styles/Styles.xaml        |   0
 .../Settings/SettingsPageViewModel.cs         |  54 --------
 .../Application/UI/Windows}/MainView.axaml    |   2 +-
 .../Application/UI/Windows}/MainView.axaml.cs |   0
 ....SteamTools.Client.Desktop.Avalonia.csproj | 108 ++++++++++-----
 ...plication.SteamTools.Client.Desktop.csproj |   4 +
 .../UI/ViewModels/MainWindowViewModel.cs      |   0
 .../Settings/SettingsPageViewModel.cs         |  53 ++++++++
 ...amTools.Tools.OpenSourceLibraryList.csproj |   2 +-
 ...plication.SteamTools.Tools.Packager.csproj |   2 +-
 ...n.SteamTools.Tools.Win7Troubleshoot.csproj |   2 +-
 25 files changed, 210 insertions(+), 160 deletions(-)
 rename {System.Application.SteamTools.Client.Desktop.Avalonia.App => System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI}/Assets/AppResources/app.png (100%)
 rename {System.Application.SteamTools.Client.Desktop.Avalonia.App => System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI}/Assets/Icon.ico (100%)
 rename {System.Application.SteamTools.Client.Desktop.Avalonia.App => System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI}/Assets/Icon_16.png (100%)
 rename {System.Application.SteamTools.Client.Desktop.Avalonia.App/Views => System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI}/Controls/CardView.axaml (91%)
 rename {System.Application.SteamTools.Client.Desktop.Avalonia.App/Views => System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI}/Controls/CardView.axaml.cs (100%)
 rename {System.Application.SteamTools.Client.Desktop.Avalonia.App/Views => System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI}/Pages/GameList.axaml (100%)
 rename {System.Application.SteamTools.Client.Desktop.Avalonia.App/Views => System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI}/Pages/GameList.axaml.cs (100%)
 rename {System.Application.SteamTools.Client.Desktop.Avalonia.App/Views => System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI}/Pages/SettingsPage.axaml (100%)
 rename {System.Application.SteamTools.Client.Desktop.Avalonia.App/Views => System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI}/Pages/SettingsPage.axaml.cs (100%)
 rename {System.Application.SteamTools.Client.Desktop.Avalonia.App => System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI}/Styles/Controls/SideBar.xaml (100%)
 rename {System.Application.SteamTools.Client.Desktop.Avalonia.App => System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI}/Styles/Styles.xaml (100%)
 delete mode 100644 System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/ViewModels/Settings/SettingsPageViewModel.cs
 rename {System.Application.SteamTools.Client.Desktop.Avalonia.App/Views => System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Windows}/MainView.axaml (98%)
 rename {System.Application.SteamTools.Client.Desktop.Avalonia.App/Views => System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Windows}/MainView.axaml.cs (100%)
 rename {System.Application.SteamTools.Client.Desktop.Avalonia/Application => System.Application.SteamTools.Client.Desktop}/UI/ViewModels/MainWindowViewModel.cs (100%)
 create mode 100644 System.Application.SteamTools.Client.Desktop/UI/ViewModels/Settings/SettingsPageViewModel.cs

diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia.App/App.axaml b/System.Application.SteamTools.Client.Desktop.Avalonia.App/App.axaml
index e8c048a6c..b489e6934 100644
--- a/System.Application.SteamTools.Client.Desktop.Avalonia.App/App.axaml
+++ b/System.Application.SteamTools.Client.Desktop.Avalonia.App/App.axaml
@@ -7,11 +7,13 @@
   </Application.DataTemplates>
   <Application.Styles>
     <FluentTheme Mode="Dark" />
-    <StyleInclude Source="/Styles/Styles.xaml" />
-    <StyleInclude Source="/Styles/Controls/SideBar.xaml" />
+      <!--<StyleInclude Source="avares://System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Styles/Styles.xaml" />
+      <StyleInclude Source="avares://System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Styles/SideBar.xaml" />-->
+    <!--<StyleInclude Source="/Styles/Styles.xaml" />-->
+    <!--<StyleInclude Source="/Styles/Controls/SideBar.xaml" />-->
     <!--<StyleInclude Source="avares://AvaloniaEdit/AvaloniaEdit.xaml"/>-->
     <Style Selector="Window">
-      <Setter Property="Icon" Value="/Assets/Icon.ico"/>
+      <Setter Property="Icon" Value="avares://System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Assets/Icon.ico"/>
     </Style>
   </Application.Styles>
 </Application>
\ No newline at end of file
diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia.App/App.axaml.cs b/System.Application.SteamTools.Client.Desktop.Avalonia.App/App.axaml.cs
index 7374297ea..834caba5b 100644
--- a/System.Application.SteamTools.Client.Desktop.Avalonia.App/App.axaml.cs
+++ b/System.Application.SteamTools.Client.Desktop.Avalonia.App/App.axaml.cs
@@ -73,10 +73,10 @@ namespace System.Application.UI
                 {
                     case Platform.Windows:
                     case Platform.Linux:
-                        notifyIcon.IconPath = "avares://Steam++/Assets/Icon.ico";
+                        notifyIcon.IconPath = "avares://System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Assets/Icon.ico";
                         break;
                     case Platform.Apple:
-                        notifyIcon.IconPath = "avares://Steam++/Assets/Icon_16.png";
+                        notifyIcon.IconPath = "avares://System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Assets/Icon_16.png";
                         break;
                 }
 
diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia.App/System.Application.SteamTools.Client.Desktop.Avalonia.App.csproj b/System.Application.SteamTools.Client.Desktop.Avalonia.App/System.Application.SteamTools.Client.Desktop.Avalonia.App.csproj
index aff7b0395..c42db659b 100644
--- a/System.Application.SteamTools.Client.Desktop.Avalonia.App/System.Application.SteamTools.Client.Desktop.Avalonia.App.csproj
+++ b/System.Application.SteamTools.Client.Desktop.Avalonia.App/System.Application.SteamTools.Client.Desktop.Avalonia.App.csproj
@@ -1,73 +1,74 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <OutputType>WinExe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
-    <SignAssembly>false</SignAssembly>
-    <!--(SignAssembly)对此程序集进行签名会导致编译失败(CompileAvaloniaXamlTask)-->
-    <RootNamespace>System.Application.UI</RootNamespace>
-    <AssemblyName>Steam++</AssemblyName>
-    <ApplicationIcon>Assets\Icon.ico</ApplicationIcon>
-    <ApplicationManifest>Properties\app.manifest</ApplicationManifest>
-  </PropertyGroup>
+    <PropertyGroup>
+        <OutputType>WinExe</OutputType>
+        <TargetFramework>net5.0</TargetFramework>
+        <SignAssembly>false</SignAssembly>
+        <!--(SignAssembly)对此程序集进行签名会导致编译失败(CompileAvaloniaXamlTask)-->
+        <RootNamespace>System.Application.UI</RootNamespace>
+        <AssemblyName>Steam++</AssemblyName>
+        <ApplicationIcon>..\System.Application.SteamTools.Client.Desktop.Avalonia\Application\UI\Assets\Icon.ico</ApplicationIcon>
+        <ApplicationManifest>Properties\app.manifest</ApplicationManifest>
+    </PropertyGroup>
 
-  <PropertyGroup Condition=" $(RuntimeIdentifier.Contains(`win`)) Or ('$(OS)' == 'Windows_NT' And !$(DefineConstants.Contains(`PUBLISH`))) ">
-    <TargetFramework>net5.0-windows</TargetFramework>
-  </PropertyGroup>
+    <PropertyGroup Condition=" $(RuntimeIdentifier.Contains(`win`)) Or ('$(OS)' == 'Windows_NT' And !$(DefineConstants.Contains(`PUBLISH`))) ">
+        <TargetFramework>net5.0-windows</TargetFramework>
+    </PropertyGroup>
 
-  <ItemGroup>
-    <Compile Include="..\System.Common.CoreLib\Properties\AssemblyInfo.cs">
-      <Link>Properties\AssemblyInfo.cs</Link>
-    </Compile>
-  </ItemGroup>
+    <ItemGroup>
+        <Compile Include="..\System.Common.CoreLib\Properties\AssemblyInfo.cs">
+            <Link>Properties\AssemblyInfo.cs</Link>
+        </Compile>
+    </ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\System.Application.SteamTools.Client.Desktop.Avalonia\System.Application.SteamTools.Client.Desktop.Avalonia.csproj" />
-    <ProjectReference Include="..\System.Application.SteamTools.Client.Desktop\System.Application.SteamTools.Client.Desktop.csproj" />
-    <ProjectReference Include="..\System.Common.CoreLib\System.Common.CoreLib.csproj" />
-  </ItemGroup>
+    <ItemGroup>
+        <ProjectReference Include="..\System.Application.SteamTools.Client.Desktop.Avalonia\System.Application.SteamTools.Client.Desktop.Avalonia.csproj" />
+        <ProjectReference Include="..\System.Application.SteamTools.Client.Desktop\System.Application.SteamTools.Client.Desktop.csproj" />
+        <ProjectReference Include="..\System.Common.CoreLib\System.Common.CoreLib.csproj" />
+    </ItemGroup>
 
-  <ItemGroup Condition=" $(RuntimeIdentifier.Contains(`win`)) Or ('$(OS)' == 'Windows_NT' And !$(DefineConstants.Contains(`PUBLISH`))) ">
-    <ProjectReference Include="..\System.Application.SteamTools.Client.Desktop.Windows\System.Application.SteamTools.Client.Desktop.Windows.csproj" />
-  </ItemGroup>
+    <ItemGroup Condition=" $(RuntimeIdentifier.Contains(`win`)) Or ('$(OS)' == 'Windows_NT' And !$(DefineConstants.Contains(`PUBLISH`))) ">
+        <ProjectReference Include="..\System.Application.SteamTools.Client.Desktop.Windows\System.Application.SteamTools.Client.Desktop.Windows.csproj" />
+    </ItemGroup>
 
-  <ItemGroup Condition=" $(RuntimeIdentifier.Contains(`osx`)) Or ('$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::OSX)))' == 'true' And !$(DefineConstants.Contains(`PUBLISH`))) ">
-    <ProjectReference Include="..\System.Application.SteamTools.Client.Desktop.Mac\System.Application.SteamTools.Client.Desktop.Mac.csproj" />
-  </ItemGroup>
+    <ItemGroup Condition=" $(RuntimeIdentifier.Contains(`osx`)) Or ('$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::OSX)))' == 'true' And !$(DefineConstants.Contains(`PUBLISH`))) ">
+        <ProjectReference Include="..\System.Application.SteamTools.Client.Desktop.Mac\System.Application.SteamTools.Client.Desktop.Mac.csproj" />
+    </ItemGroup>
 
-  <ItemGroup Condition=" $(RuntimeIdentifier.Contains(`linux`)) Or ('$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))' == 'true' And !$(DefineConstants.Contains(`PUBLISH`))) ">
-    <ProjectReference Include="..\System.Application.SteamTools.Client.Desktop.Linux\System.Application.SteamTools.Client.Desktop.Linux.csproj" />
-  </ItemGroup>
+    <ItemGroup Condition=" $(RuntimeIdentifier.Contains(`linux`)) Or ('$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))' == 'true' And !$(DefineConstants.Contains(`PUBLISH`))) ">
+        <ProjectReference Include="..\System.Application.SteamTools.Client.Desktop.Linux\System.Application.SteamTools.Client.Desktop.Linux.csproj" />
+    </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="MessageBox.Avalonia" Version="1.0.5">
-      <Aliases>MessageBox_Avalonia</Aliases>
-    </PackageReference>
-  </ItemGroup>
+    <ItemGroup>
+        <PackageReference Include="MessageBox.Avalonia" Version="1.0.5">
+            <Aliases>MessageBox_Avalonia</Aliases>
+        </PackageReference>
+    </ItemGroup>
 
-  <ItemGroup>
-    <Compile Update="**\*.xaml.cs">
-      <DependentUpon>%(Filename)</DependentUpon>
-    </Compile>
-    <AvaloniaResource Include="**\*.xaml">
-      <SubType>Designer</SubType>
-    </AvaloniaResource>
-    <AvaloniaResource Include="Assets\**" />
-  </ItemGroup>
+    <ItemGroup>
+        <Compile Update="**\*.xaml.cs">
+            <DependentUpon>%(Filename)</DependentUpon>
+        </Compile>
+        <AvaloniaResource Include="**\*.xaml">
+            <SubType>Designer</SubType>
+        </AvaloniaResource>
+        <AvaloniaResource Include="Assets\**" />
+    </ItemGroup>
 
-  <ItemGroup Condition=" $(RuntimeIdentifier.Contains(`win`)) Or ('$(OS)' == 'Windows_NT' And !$(DefineConstants.Contains(`PUBLISH`))) ">
-    <!--Win8/8.1/10的[开始菜单(屏幕)]磁贴配置-->
-    <None Include="..\Resources\AppIcon\VisualElements_150.png">
-      <Link>Assets\VisualElements_150.png</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="..\Resources\AppIcon\VisualElements_70.png">
-      <Link>Assets\VisualElements_70.png</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="..\Resources\AppIcon\visualelementsmanifest.xml">
-      <Link>steam++.visualelementsmanifest.xml</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
+    <ItemGroup Condition=" $(RuntimeIdentifier.Contains(`win`)) Or ('$(OS)' == 'Windows_NT' And !$(DefineConstants.Contains(`PUBLISH`))) ">
+        <!--Win8/8.1/10的[开始菜单(屏幕)]磁贴配置-->
+        <None Include="..\Resources\AppIcon\visualelementsmanifest.xml">
+            <Link>steam++.visualelementsmanifest.xml</Link>
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+    </ItemGroup>
+
+    <ItemGroup>
+      <None Include="..\Resources\AppIcon\VisualElements_150.png" Link="Assets\VisualElements_150.png">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
+      <None Include="..\Resources\AppIcon\VisualElements_70.png" Link="Assets\VisualElements_70.png">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
+    </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia.App/Views/MainWindow.axaml b/System.Application.SteamTools.Client.Desktop.Avalonia.App/Views/MainWindow.axaml
index 6af31eead..f5e33b2d0 100644
--- a/System.Application.SteamTools.Client.Desktop.Avalonia.App/Views/MainWindow.axaml
+++ b/System.Application.SteamTools.Client.Desktop.Avalonia.App/Views/MainWindow.axaml
@@ -1,13 +1,13 @@
 <FluentWindow xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:vm="clr-namespace:System.Application.UI.ViewModels;assembly=System.Application.SteamTools.Client.Desktop.Avalonia"
+        xmlns:vm="clr-namespace:System.Application.UI.ViewModels;assembly=System.Application.SteamTools.Client.Desktop"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         mc:Ignorable="d"
         d:DesignWidth="1200" Width="1400" MinWidth="800"
         d:DesignHeight="600" Height="800" MinHeight="600"
-        xmlns:pages="clr-namespace:System.Application.UI.Pages"
-        xmlns:local="clr-namespace:System.Application.UI.Views"
+        xmlns:pages="clr-namespace:System.Application.UI.Pages;assembly=System.Application.SteamTools.Client.Desktop.Avalonia"
+        xmlns:local="clr-namespace:System.Application.UI.Views;assembly=System.Application.SteamTools.Client.Desktop.Avalonia"
         x:Class="System.Application.UI.Views.MainWindow"
         x:Name="MainWindow"
         WindowStartupLocation="CenterScreen"
diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia.App/Assets/AppResources/app.png b/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Assets/AppResources/app.png
similarity index 100%
rename from System.Application.SteamTools.Client.Desktop.Avalonia.App/Assets/AppResources/app.png
rename to System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Assets/AppResources/app.png
diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia.App/Assets/Icon.ico b/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Assets/Icon.ico
similarity index 100%
rename from System.Application.SteamTools.Client.Desktop.Avalonia.App/Assets/Icon.ico
rename to System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Assets/Icon.ico
diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia.App/Assets/Icon_16.png b/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Assets/Icon_16.png
similarity index 100%
rename from System.Application.SteamTools.Client.Desktop.Avalonia.App/Assets/Icon_16.png
rename to System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Assets/Icon_16.png
diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia.App/Views/Controls/CardView.axaml b/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Controls/CardView.axaml
similarity index 91%
rename from System.Application.SteamTools.Client.Desktop.Avalonia.App/Views/Controls/CardView.axaml
rename to System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Controls/CardView.axaml
index 2a36e14b3..2841c9b62 100644
--- a/System.Application.SteamTools.Client.Desktop.Avalonia.App/Views/Controls/CardView.axaml
+++ b/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Controls/CardView.axaml
@@ -25,7 +25,7 @@
     </UserControl.Styles>
     <Border BorderBrush="Gray" BorderThickness="0">
         <Panel>
-            <Image Source="/Assets/AppResources/app.png"></Image>
+            <Image Source="avares://System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Assets/Icon.ico"></Image>
             <Label IsHitTestVisible="False" Content="Test" HorizontalAlignment="Center" VerticalAlignment="Bottom" FontSize="18"></Label>
         </Panel>
     </Border>
diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia.App/Views/Controls/CardView.axaml.cs b/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Controls/CardView.axaml.cs
similarity index 100%
rename from System.Application.SteamTools.Client.Desktop.Avalonia.App/Views/Controls/CardView.axaml.cs
rename to System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Controls/CardView.axaml.cs
diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia.App/Views/Pages/GameList.axaml b/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Pages/GameList.axaml
similarity index 100%
rename from System.Application.SteamTools.Client.Desktop.Avalonia.App/Views/Pages/GameList.axaml
rename to System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Pages/GameList.axaml
diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia.App/Views/Pages/GameList.axaml.cs b/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Pages/GameList.axaml.cs
similarity index 100%
rename from System.Application.SteamTools.Client.Desktop.Avalonia.App/Views/Pages/GameList.axaml.cs
rename to System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Pages/GameList.axaml.cs
diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia.App/Views/Pages/SettingsPage.axaml b/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Pages/SettingsPage.axaml
similarity index 100%
rename from System.Application.SteamTools.Client.Desktop.Avalonia.App/Views/Pages/SettingsPage.axaml
rename to System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Pages/SettingsPage.axaml
diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia.App/Views/Pages/SettingsPage.axaml.cs b/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Pages/SettingsPage.axaml.cs
similarity index 100%
rename from System.Application.SteamTools.Client.Desktop.Avalonia.App/Views/Pages/SettingsPage.axaml.cs
rename to System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Pages/SettingsPage.axaml.cs
diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia.App/Styles/Controls/SideBar.xaml b/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Styles/Controls/SideBar.xaml
similarity index 100%
rename from System.Application.SteamTools.Client.Desktop.Avalonia.App/Styles/Controls/SideBar.xaml
rename to System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Styles/Controls/SideBar.xaml
diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia.App/Styles/Styles.xaml b/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Styles/Styles.xaml
similarity index 100%
rename from System.Application.SteamTools.Client.Desktop.Avalonia.App/Styles/Styles.xaml
rename to System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Styles/Styles.xaml
diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/ViewModels/Settings/SettingsPageViewModel.cs b/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/ViewModels/Settings/SettingsPageViewModel.cs
deleted file mode 100644
index 7d4a79f91..000000000
--- a/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/ViewModels/Settings/SettingsPageViewModel.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-using Avalonia.Controls;
-using ReactiveUI;
-using System.Application.UI.Resx;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace System.Application.UI.ViewModels
-{
-    public class SettingsPageViewModel : ViewModelBase
-    {
-        public SettingsPageViewModel()
-        {
-            Languages = R.Languages.Select(Convert).ToList();
-        }
-
-        int mCurrentLanguageIndex;
-
-        public int CurrentLanguageIndex
-        {
-            get => mCurrentLanguageIndex;
-            set
-            {
-                this.RaiseAndSetIfChanged(ref mCurrentLanguageIndex, value);
-                var cultureName = Languages[value].Tag?.ToString();
-                if (string.IsNullOrWhiteSpace(cultureName))
-                {
-                    cultureName = R.DefaultCurrentUICulture?.Name;
-                }
-                if (!string.IsNullOrWhiteSpace(cultureName))
-                {
-                    R.ChangeLanguage(cultureName);
-                }
-                //if (!IsInDesignMode)
-                //{
-                //    var localizationService = DI.Get<ILocalizationService>();
-                //    var cultureName = Languages[value].Tag?.ToString();
-                //    if (string.IsNullOrWhiteSpace(cultureName))
-                //    {
-                //        cultureName = localizationService.DefaultCurrentUICulture?.Name;
-                //    }
-                //    if (!string.IsNullOrWhiteSpace(cultureName))
-                //    {
-                //        localizationService.ChangeLanguage(cultureName);
-                //    }
-                //}
-            }
-        }
-
-        public List<ComboBoxItem> Languages { get; }
-
-        static ComboBoxItem Convert(KeyValuePair<string, string> pair)
-            => new ComboBoxItem { Tag = pair.Key, Content = pair.Value };
-    }
-}
\ No newline at end of file
diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia.App/Views/MainView.axaml b/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Windows/MainView.axaml
similarity index 98%
rename from System.Application.SteamTools.Client.Desktop.Avalonia.App/Views/MainView.axaml
rename to System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Windows/MainView.axaml
index e2d9a8afc..ff79b2e45 100644
--- a/System.Application.SteamTools.Client.Desktop.Avalonia.App/Views/MainView.axaml
+++ b/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Windows/MainView.axaml
@@ -5,7 +5,7 @@
         mc:Ignorable="d" d:DesignWidth="1200" d:DesignHeight="600"
         xmlns:pages="clr-namespace:System.Application.UI.Views.Pages"
         xmlns:controls="clr-namespace:System.Application.UI.Views.Controls"
-        xmlns:vm="clr-namespace:System.Application.UI.ViewModels;assembly=System.Application.SteamTools.Client.Desktop.Avalonia"
+        xmlns:vm="clr-namespace:System.Application.UI.ViewModels;assembly=System.Application.SteamTools.Client.Desktop"
         xmlns:resx="clr-namespace:System.Application.UI.Resx;assembly=System.Application.SteamTools.Client.Desktop"
         x:Class="System.Application.UI.Views.MainView"
         FontSize="14"
diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia.App/Views/MainView.axaml.cs b/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Windows/MainView.axaml.cs
similarity index 100%
rename from System.Application.SteamTools.Client.Desktop.Avalonia.App/Views/MainView.axaml.cs
rename to System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Windows/MainView.axaml.cs
diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia/System.Application.SteamTools.Client.Desktop.Avalonia.csproj b/System.Application.SteamTools.Client.Desktop.Avalonia/System.Application.SteamTools.Client.Desktop.Avalonia.csproj
index baf14309f..2a40d121f 100644
--- a/System.Application.SteamTools.Client.Desktop.Avalonia/System.Application.SteamTools.Client.Desktop.Avalonia.csproj
+++ b/System.Application.SteamTools.Client.Desktop.Avalonia/System.Application.SteamTools.Client.Desktop.Avalonia.csproj
@@ -1,41 +1,85 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
-    <RootNamespace>System</RootNamespace>
-    <SignAssembly>false</SignAssembly>
-    <!--(SignAssembly)对此程序集进行签名会导致编译失败(CompileAvaloniaXamlTask)-->
-  </PropertyGroup>
+    <PropertyGroup>
+        <TargetFramework>net5.0</TargetFramework>
+        <RootNamespace>System</RootNamespace>
+        <SignAssembly>false</SignAssembly>
+        <!--(SignAssembly)对此程序集进行签名会导致编译失败(CompileAvaloniaXamlTask)-->
+    </PropertyGroup>
 
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-  </PropertyGroup>
+    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+        <PlatformTarget>AnyCPU</PlatformTarget>
+    </PropertyGroup>
 
-  <ItemGroup>
-    <Compile Include="..\System.Common.CoreLib\Properties\AssemblyInfo.cs">
-      <Link>Properties\AssemblyInfo.cs</Link>
-    </Compile>
-  </ItemGroup>
+    <ItemGroup>
+        <None Remove="Application\UI\Assets\AppResources\app.png" />
+        <None Remove="Application\UI\Assets\Icon.ico" />
+        <None Remove="Application\UI\Assets\Icon_16.png" />
+        <None Remove="Application\UI\Styles\Controls\SideBar.xaml" />
+        <None Remove="Application\UI\Styles\Styles.xaml" />
+    </ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\System.Application.SteamTools.Client.Desktop\System.Application.SteamTools.Client.Desktop.csproj" />
-    <ProjectReference Include="..\System.Common.CoreLib\System.Common.CoreLib.csproj" />
-  </ItemGroup>
+    <ItemGroup>
+        <AvaloniaResource Include="Application\UI\Assets\AppResources\app.png" />
+        <AvaloniaResource Include="Application\UI\Assets\Icon.ico" />
+        <AvaloniaResource Include="Application\UI\Assets\Icon_16.png" />
+    </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Avalonia" Version="0.10.0" />
-    <PackageReference Include="Avalonia.Desktop" Version="0.10.0" />
-    <PackageReference Include="Avalonia.ReactiveUI" Version="0.10.0" />
-    <PackageReference Include="MessageBox.Avalonia" Version="1.0.5">
-      <Aliases>MessageBox_Avalonia</Aliases>
-    </PackageReference>
-  </ItemGroup>
+    <ItemGroup>
+        <Compile Include="..\System.Common.CoreLib\Properties\AssemblyInfo.cs">
+            <Link>Properties\AssemblyInfo.cs</Link>
+        </Compile>
+    </ItemGroup>
 
-  <ItemGroup Condition="'$(Configuration)'=='Debug'">
-    <PackageReference Include="Avalonia.Diagnostics" Version="0.10.0" />
-  </ItemGroup>
+    <ItemGroup>
+        <ProjectReference Include="..\System.Application.SteamTools.Client.Desktop\System.Application.SteamTools.Client.Desktop.csproj" />
+        <ProjectReference Include="..\System.Common.CoreLib\System.Common.CoreLib.csproj" />
+    </ItemGroup>
 
-  <ItemGroup>
-    <Folder Include="Application\UI\ViewModels\Pages\" />
-  </ItemGroup>
+    <ItemGroup>
+        <PackageReference Include="Avalonia" Version="0.10.0" />
+        <PackageReference Include="Avalonia.Desktop" Version="0.10.0" />
+        <PackageReference Include="Avalonia.ReactiveUI" Version="0.10.0" />
+        <PackageReference Include="MessageBox.Avalonia" Version="1.0.5">
+            <Aliases>MessageBox_Avalonia</Aliases>
+        </PackageReference>
+    </ItemGroup>
+
+    <ItemGroup Condition="'$(Configuration)'=='Debug'">
+        <PackageReference Include="Avalonia.Diagnostics" Version="0.10.0" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <Compile Update="**\*.xaml.cs">
+            <DependentUpon>%(Filename)</DependentUpon>
+        </Compile>
+        <AvaloniaResource Include="**\*.xaml">
+            <SubType>Designer</SubType>
+        </AvaloniaResource>
+        <AvaloniaResource Include="Assets\**" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <AvaloniaResource Update="Application\UI\Styles\Controls\SideBar.xaml">
+        <Generator>MSBuild:Compile</Generator>
+      </AvaloniaResource>
+      <AvaloniaResource Update="Application\UI\Styles\Styles.xaml">
+        <Generator>MSBuild:Compile</Generator>
+      </AvaloniaResource>
+    </ItemGroup>
+
+    <ItemGroup>
+        <Compile Update="Application\UI\Controls\CardView.axaml.cs">
+            <DependentUpon>%(Filename)</DependentUpon>
+        </Compile>
+        <Compile Update="Application\UI\Windows\MainView.axaml.cs">
+            <DependentUpon>%(Filename)</DependentUpon>
+        </Compile>
+        <Compile Update="Application\UI\Pages\GameList.axaml.cs">
+            <DependentUpon>%(Filename)</DependentUpon>
+        </Compile>
+        <Compile Update="Application\UI\Pages\SettingsPage.axaml.cs">
+            <DependentUpon>%(Filename)</DependentUpon>
+        </Compile>
+    </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/System.Application.SteamTools.Client.Desktop/System.Application.SteamTools.Client.Desktop.csproj b/System.Application.SteamTools.Client.Desktop/System.Application.SteamTools.Client.Desktop.csproj
index c8d0f3416..62bcab7a3 100644
--- a/System.Application.SteamTools.Client.Desktop/System.Application.SteamTools.Client.Desktop.csproj
+++ b/System.Application.SteamTools.Client.Desktop/System.Application.SteamTools.Client.Desktop.csproj
@@ -63,4 +63,8 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>
+
+  <ItemGroup>
+    <Folder Include="UI\ViewModels\Pages\" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/ViewModels/MainWindowViewModel.cs b/System.Application.SteamTools.Client.Desktop/UI/ViewModels/MainWindowViewModel.cs
similarity index 100%
rename from System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/ViewModels/MainWindowViewModel.cs
rename to System.Application.SteamTools.Client.Desktop/UI/ViewModels/MainWindowViewModel.cs
diff --git a/System.Application.SteamTools.Client.Desktop/UI/ViewModels/Settings/SettingsPageViewModel.cs b/System.Application.SteamTools.Client.Desktop/UI/ViewModels/Settings/SettingsPageViewModel.cs
new file mode 100644
index 000000000..d178893f4
--- /dev/null
+++ b/System.Application.SteamTools.Client.Desktop/UI/ViewModels/Settings/SettingsPageViewModel.cs
@@ -0,0 +1,53 @@
+using ReactiveUI;
+using System.Application.UI.Resx;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace System.Application.UI.ViewModels
+{
+    public class SettingsPageViewModel : ViewModelBase
+    {
+        public SettingsPageViewModel()
+        {
+            //Languages = R.Languages.Select(Convert).ToList();
+        }
+
+        //int mCurrentLanguageIndex;
+
+        //public int CurrentLanguageIndex
+        //{
+        //    get => mCurrentLanguageIndex;
+        //    set
+        //    {
+        //        this.RaiseAndSetIfChanged(ref mCurrentLanguageIndex, value);
+        //        var cultureName = Languages[value].Tag?.ToString();
+        //        if (string.IsNullOrWhiteSpace(cultureName))
+        //        {
+        //            cultureName = R.DefaultCurrentUICulture?.Name;
+        //        }
+        //        if (!string.IsNullOrWhiteSpace(cultureName))
+        //        {
+        //            R.ChangeLanguage(cultureName);
+        //        }
+        //        //if (!IsInDesignMode)
+        //        //{
+        //        //    var localizationService = DI.Get<ILocalizationService>();
+        //        //    var cultureName = Languages[value].Tag?.ToString();
+        //        //    if (string.IsNullOrWhiteSpace(cultureName))
+        //        //    {
+        //        //        cultureName = localizationService.DefaultCurrentUICulture?.Name;
+        //        //    }
+        //        //    if (!string.IsNullOrWhiteSpace(cultureName))
+        //        //    {
+        //        //        localizationService.ChangeLanguage(cultureName);
+        //        //    }
+        //        //}
+        //    }
+        //}
+
+        //public List<Object> Languages { get; }
+
+        //static Object Convert(KeyValuePair<string, string> pair)
+        //    => new Object { Tag = pair.Key, Content = pair.Value };
+    }
+}
\ No newline at end of file
diff --git a/System.Application.SteamTools.Tools.OpenSourceLibraryList/System.Application.SteamTools.Tools.OpenSourceLibraryList.csproj b/System.Application.SteamTools.Tools.OpenSourceLibraryList/System.Application.SteamTools.Tools.OpenSourceLibraryList.csproj
index 4ec6a9f79..d27451f18 100644
--- a/System.Application.SteamTools.Tools.OpenSourceLibraryList/System.Application.SteamTools.Tools.OpenSourceLibraryList.csproj
+++ b/System.Application.SteamTools.Tools.OpenSourceLibraryList/System.Application.SteamTools.Tools.OpenSourceLibraryList.csproj
@@ -5,7 +5,7 @@
     <TargetFramework>net5.0</TargetFramework>
     <RootNamespace>System</RootNamespace>
     <AssemblyName>Steam++.OpenSourceLibraryListGenerate</AssemblyName>
-    <ApplicationIcon>..\System.Application.SteamTools.Client.Desktop.Avalonia.App\Assets\Icon.ico</ApplicationIcon>
+    <ApplicationIcon>..\System.Application.SteamTools.Client.Desktop.Avalonia\Application\UI\Assets\Icon.ico</ApplicationIcon>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/System.Application.SteamTools.Tools.Packager/System.Application.SteamTools.Tools.Packager.csproj b/System.Application.SteamTools.Tools.Packager/System.Application.SteamTools.Tools.Packager.csproj
index cf1e0ed90..90e7091f2 100644
--- a/System.Application.SteamTools.Tools.Packager/System.Application.SteamTools.Tools.Packager.csproj
+++ b/System.Application.SteamTools.Tools.Packager/System.Application.SteamTools.Tools.Packager.csproj
@@ -6,7 +6,7 @@
     <UseWindowsForms>true</UseWindowsForms>
     <AssemblyName>Steam++.Packager</AssemblyName>
     <RootNamespace>System</RootNamespace>
-    <ApplicationIcon>..\System.Application.SteamTools.Client.Desktop.Avalonia.App\Assets\Icon.ico</ApplicationIcon>
+    <ApplicationIcon>..\System.Application.SteamTools.Client.Desktop.Avalonia\Application\UI\Assets\Icon.ico</ApplicationIcon>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/System.Application.SteamTools.Tools.Win7Troubleshoot/System.Application.SteamTools.Tools.Win7Troubleshoot.csproj b/System.Application.SteamTools.Tools.Win7Troubleshoot/System.Application.SteamTools.Tools.Win7Troubleshoot.csproj
index c8ea7d260..c873b61ee 100644
--- a/System.Application.SteamTools.Tools.Win7Troubleshoot/System.Application.SteamTools.Tools.Win7Troubleshoot.csproj
+++ b/System.Application.SteamTools.Tools.Win7Troubleshoot/System.Application.SteamTools.Tools.Win7Troubleshoot.csproj
@@ -7,7 +7,7 @@
     <ApplicationIcon>..\System.Application.SteamTools.Client.Desktop.Avalonia.App\Assets\Icon.ico</ApplicationIcon>
     <AssemblyName>Steam++.Win7</AssemblyName>
     <RootNamespace>System</RootNamespace>
-    <ApplicationManifest>..\System.Application.SteamTools.Client.Desktop.Avalonia.App\Properties\app.manifest</ApplicationManifest>
+    <ApplicationManifest>..\System.Application.SteamTools.Client.Desktop.Avalonia\Application\UI\Assets\Icon.ico</ApplicationManifest>
   </PropertyGroup>
 
   <ItemGroup>