项目架构文件夹改名前工作

vonchengk · Mar 21, 2021 · 51a10e6 · 51a10e6
1 parent 8a4758f
commit 51a10e6
Show file tree

Hide file tree

Showing 26 changed files with 98 additions and 44 deletions.
diff --git a/...ication.Repositories.sqlite-net-pcl/System.Application.Repositories.sqlite-net-pcl.csproj b/...ication.Repositories.sqlite-net-pcl/System.Application.Repositories.sqlite-net-pcl.csproj
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.1</TargetFramework>
     <RootNamespace>System</RootNamespace>
+    <AssemblyName>System.Application.Repositories.sqlite-net-pcl</AssemblyName>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/System.Application.Services.SmsSender/System.Application.Services.SmsSender.csproj b/System.Application.Services.SmsSender/System.Application.Services.SmsSender.csproj
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net5.0</TargetFramework>
     <RootNamespace>System.Application</RootNamespace>
+    <AssemblyName>System.Application.Services.SmsSender</AssemblyName>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/...ools.Client.Desktop.Avalonia/System.Application.SteamTools.Client.Desktop.Avalonia.csproj b/...ools.Client.Desktop.Avalonia/System.Application.SteamTools.Client.Desktop.Avalonia.csproj
@@ -5,6 +5,7 @@
     <RootNamespace>System</RootNamespace>
     <SignAssembly>false</SignAssembly>
     <!--(SignAssembly)对此程序集进行签名会导致编译失败(CompileAvaloniaXamlTask)-->
+    <AssemblyName>System.Application.SteamTools.Client.Desktop.Avalonia</AssemblyName>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/...SteamTools.Client.Desktop.Linux/System.Application.SteamTools.Client.Desktop.Linux.csproj b/...SteamTools.Client.Desktop.Linux/System.Application.SteamTools.Client.Desktop.Linux.csproj
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.1</TargetFramework>
     <RootNamespace>System</RootNamespace>
+    <AssemblyName>System.Application.SteamTools.Client.Desktop.Linux</AssemblyName>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/...ion.SteamTools.Client.Desktop.Mac/System.Application.SteamTools.Client.Desktop.Mac.csproj b/...ion.SteamTools.Client.Desktop.Mac/System.Application.SteamTools.Client.Desktop.Mac.csproj
@@ -5,6 +5,7 @@
     <RootNamespace>System</RootNamespace>
     <DefineConstants>MONO_MAC;$(DefineConstants)</DefineConstants>
     <!--<DefineConstants>XAMARIN_MAC;$(DefineConstants)</DefineConstants>-->
+    <AssemblyName>System.Application.SteamTools.Client.Desktop.Mac</AssemblyName>
   </PropertyGroup>
 
   <!--<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">

diff --git a/...mTools.Client.Desktop.Windows/System.Application.SteamTools.Client.Desktop.Windows.csproj b/...mTools.Client.Desktop.Windows/System.Application.SteamTools.Client.Desktop.Windows.csproj
@@ -6,6 +6,7 @@
     <RootNamespace>System</RootNamespace>
     <UseWindowsForms>false</UseWindowsForms>
     <UseWPF>false</UseWPF>
+    <AssemblyName>System.Application.SteamTools.Client.Desktop.Windows</AssemblyName>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/...Application.SteamTools.Client.Desktop/System.Application.SteamTools.Client.Desktop.csproj b/...Application.SteamTools.Client.Desktop/System.Application.SteamTools.Client.Desktop.csproj
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.1</TargetFramework>
     <RootNamespace>System.Application</RootNamespace>
+    <AssemblyName>System.Application.SteamTools.Client.Desktop</AssemblyName>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/System.Application.SteamTools.Client.Test/System.Application.SteamTools.Client.Test.csproj b/System.Application.SteamTools.Client.Test/System.Application.SteamTools.Client.Test.csproj
@@ -4,6 +4,7 @@
     <TargetFramework>net5.0</TargetFramework>
     <RootNamespace>System.Application</RootNamespace>
     <DefineConstants>UnitTest;$(DefineConstants)</DefineConstants>
+    <AssemblyName>System.Application.SteamTools.Client.Test</AssemblyName>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/System.Application.SteamTools.Client/System.Application.SteamTools.Client.csproj b/System.Application.SteamTools.Client/System.Application.SteamTools.Client.csproj
@@ -4,6 +4,7 @@
     <TargetFramework>netstandard2.1</TargetFramework>
     <RootNamespace>System.Application</RootNamespace>
     <DefineConstants>ORM_SQLITE_PCL;$(DefineConstants)</DefineConstants>
+    <AssemblyName>System.Application.SteamTools.Client</AssemblyName>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/...ces.CloudService.Models/System.Application.SteamTools.Services.CloudService.Models.csproj b/...ces.CloudService.Models/System.Application.SteamTools.Services.CloudService.Models.csproj
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.1</TargetFramework>
     <RootNamespace>System.Application</RootNamespace>
+    <AssemblyName>System.Application.SteamTools.Services.CloudService.Models</AssemblyName>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/...eamTools.Services.CloudService/System.Application.SteamTools.Services.CloudService.csproj b/...eamTools.Services.CloudService/System.Application.SteamTools.Services.CloudService.csproj
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <TargetFrameworks>netstandard2.1;net5.0</TargetFrameworks>
     <RootNamespace>System.Application</RootNamespace>
+    <AssemblyName>System.Application.SteamTools.Services.CloudService</AssemblyName>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/System.Application.SteamTools.Tools.OpenSourceLibraryList/Program.cs b/System.Application.SteamTools.Tools.OpenSourceLibraryList/Program.cs
@@ -6,16 +6,19 @@
 using System.Linq;
 using System.Net.Http;
 using System.Threading.Tasks;
+using static System.ProjectPathUtil;
 
 namespace System
 {
+    /// <summary>
+    /// 开源协议清单列表自动生成工具
+    /// </summary>
     static class Program
     {
         const string OpenSourceLibraryListEmoji = "📄";
 
         static async Task Main(string[] args)
         {
-            var projPath = GetProjectPath();
             var readmePath = Path.Combine(projPath, README);
 
             var file = Path.Combine(projPath, "resources", "OpenSourceLibraryList.mpo");
@@ -174,18 +177,6 @@ static async Task Main(string[] args)
 
         const string README = "README.md";
 
-        static string GetProjectPath(string? path = null)
-        {
-            path ??= AppContext.BaseDirectory;
-            if (!Directory.GetFiles(path, README).Any())
-            {
-                var parent = Directory.GetParent(path);
-                if (parent == null) return string.Empty;
-                return GetProjectPath(parent.FullName);
-            }
-            return path;
-        }
-
         static void Print(List<OpenSourceLibrary> items)
         {
             Console.WriteLine(OpenSourceLibrary.ToString(items));

diff --git a/...ls.OpenSourceLibraryList/System.Application.SteamTools.Tools.OpenSourceLibraryList.csproj b/...ls.OpenSourceLibraryList/System.Application.SteamTools.Tools.OpenSourceLibraryList.csproj
@@ -21,6 +21,9 @@
     <Compile Include="..\System.Common.CoreLib\Extensions\StringExtensions.cs">
       <Link>Extensions\StringExtensions.cs</Link>
     </Compile>
+    <Compile Include="..\resources\ProjectPathUtil.cs">
+      <Link>ProjectPathUtil.cs</Link>
+    </Compile>
   </ItemGroup>
 
   <ItemGroup>

diff --git a/System.Application.SteamTools.Tools.Packager/Application/UI/Views/Form1.cs b/System.Application.SteamTools.Tools.Packager/Application/UI/Views/Form1.cs
@@ -3,6 +3,7 @@
 using System.Linq;
 using System.Threading.Tasks;
 using System.Windows.Forms;
+using static System.ProjectPathUtil;
 
 namespace System.Application.UI.Views
 {
@@ -11,7 +12,7 @@ namespace System.Application.UI.Views
     /// </summary>
     public partial class Form1 : Form
     {
-        readonly string app_path = @"\System.Application.SteamTools.Client.Desktop.Avalonia.App\bin\Release\Publish\win-x86";
+        readonly string app_path = DirPublishWinX86;
 
         static string GetPath(string path)
         {
@@ -22,19 +23,7 @@ static string GetPath(string path)
         public Form1()
         {
             InitializeComponent();
-            textBox1.Text = GetPath(GetProjectPath() + app_path);
-        }
-
-        static string GetProjectPath(string? path = null)
-        {
-            path ??= AppContext.BaseDirectory;
-            if (!Directory.GetFiles(path, "*.sln").Any())
-            {
-                var parent = Directory.GetParent(path);
-                if (parent == null) return string.Empty;
-                return GetProjectPath(parent.FullName);
-            }
-            return path;
+            textBox1.Text = GetPath(projPath + app_path);
         }
 
         void OnBtnSelectPathClick(object sender, EventArgs e)

diff --git a/System.Application.SteamTools.Tools.Packager/Program.cs b/System.Application.SteamTools.Tools.Packager/Program.cs
@@ -4,6 +4,9 @@
 
 namespace System
 {
+    /// <summary>
+    /// 压缩包测试，压缩与解压，进度条UI
+    /// </summary>
     static class Program
     {
         /// <summary>

diff --git a/...Application.SteamTools.Tools.Packager/System.Application.SteamTools.Tools.Packager.csproj b/...Application.SteamTools.Tools.Packager/System.Application.SteamTools.Tools.Packager.csproj
@@ -28,6 +28,9 @@
     <Compile Include="..\System.Common.CoreLib\FileEx.cs">
       <Link>FileEx.cs</Link>
     </Compile>
+    <Compile Include="..\resources\ProjectPathUtil.cs">
+      <Link>ProjectPathUtil.cs</Link>
+    </Compile>
   </ItemGroup>
 
   <ItemGroup>

diff --git a/System.Application.SteamTools.Tools.Translate/Program.cs b/System.Application.SteamTools.Tools.Translate/Program.cs
@@ -5,6 +5,9 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using static System.ProjectPathUtil;
+
+// 已知BUG：疑似部分语言中存在键，其他语言中没有此键，则不会自动翻译？
 
 namespace System
 {
@@ -15,7 +18,7 @@ namespace System
     /// <para>人工审阅与校对</para>
     /// <para>从Excel中读取翻译结果自动插入resx文件中</para>
     /// </summary>
-    class Program
+    static class Program
     {
         static readonly string[] langs = new[] {
             "en",
@@ -25,15 +28,13 @@ class Program
             "ko",
         };
 
-        static readonly string projPath = GetProjectPath();
-
         static void ConfigureServices(IServiceCollection services)
         {
             services.AddHttpClient();
         }
 
-        public const string CoreLib = @"System.Common.CoreLib\Properties\SR";
-        public const string AppRes = @"System.Application.SteamTools.Client.Desktop\UI\Resx\AppResources";
+        public const string CoreLib = ProjectDir_CoreLib + @"\Properties\SR";
+        public const string AppRes = ProjectDir_ClientDesktop + @"\UI\Resx\AppResources";
 
         static async Task Main(string[] args)
         {
@@ -283,18 +284,6 @@ static IDictionary<string, string> ReadResx(string path)
             return dict;
         }
 
-        static string GetProjectPath(string? path = null)
-        {
-            path ??= AppContext.BaseDirectory;
-            if (!Directory.GetFiles(path, "*.sln").Any())
-            {
-                var parent = Directory.GetParent(path);
-                if (parent == null) return string.Empty;
-                return GetProjectPath(parent.FullName);
-            }
-            return path;
-        }
-
         public static bool Is_zh_Hans(string? input) => input?.Any(Is_zh_Hans) ?? false;
 
         public static bool Is_zh_Hans(char input) => input >= 0x4e00 && input <= 0x9fbb;

diff --git a/...plication.SteamTools.Tools.Translate/System.Application.SteamTools.Tools.Translate.csproj b/...plication.SteamTools.Tools.Translate/System.Application.SteamTools.Tools.Translate.csproj
@@ -12,6 +12,9 @@
     <Compile Include="..\System.Common.CoreLib\Properties\AssemblyInfo.cs">
       <Link>Properties\AssemblyInfo.cs</Link>
     </Compile>
+    <Compile Include="..\resources\ProjectPathUtil.cs">
+      <Link>ProjectPathUtil.cs</Link>
+    </Compile>
   </ItemGroup>
 
   <ItemGroup>

diff --git a/System.Application.SteamTools/System.Application.SteamTools.csproj b/System.Application.SteamTools/System.Application.SteamTools.csproj
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.1</TargetFramework>
     <RootNamespace>System.Application</RootNamespace>
+    <AssemblyName>System.Application.SteamTools</AssemblyName>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/System.Common.ClientLib.Droid/System.Common.ClientLib.Droid.csproj b/System.Common.ClientLib.Droid/System.Common.ClientLib.Droid.csproj
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <TargetFramework>MonoAndroid10.0</TargetFramework>
     <RootNamespace>System</RootNamespace>
+    <AssemblyName>System.Common.ClientLib.Droid</AssemblyName>
     <AndroidUseIntermediateDesignerFile>false</AndroidUseIntermediateDesignerFile>
   </PropertyGroup>
 

diff --git a/System.Common.ClientLib.iOS/System.Common.ClientLib.iOS.csproj b/System.Common.ClientLib.iOS/System.Common.ClientLib.iOS.csproj
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <TargetFramework>Xamarin.iOS10</TargetFramework>
     <RootNamespace>System</RootNamespace>
+    <AssemblyName>System.Common.ClientLib.iOS</AssemblyName>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/System.Common.ClientLib/System.Common.ClientLib.csproj b/System.Common.ClientLib/System.Common.ClientLib.csproj
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.1</TargetFramework>
     <RootNamespace>System</RootNamespace>
+    <AssemblyName>System.Common.ClientLib</AssemblyName>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/System.Common.CoreLib/System.Common.CoreLib.csproj b/System.Common.CoreLib/System.Common.CoreLib.csproj
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.1</TargetFramework>
     <RootNamespace>System</RootNamespace>
+    <AssemblyName>System.Common.CoreLib</AssemblyName>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/System.Common.UnitTest.Droid/System.Common.UnitTest.Droid.csproj b/System.Common.UnitTest.Droid/System.Common.UnitTest.Droid.csproj
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <TargetFramework>MonoAndroid10.0</TargetFramework>
     <RootNamespace>System.UnitTest</RootNamespace>
+    <AssemblyName>System.Common.UnitTest.Droid</AssemblyName>
     <IsPackable>false</IsPackable>
     <DefineConstants>UnitTest;$(DefineConstants)</DefineConstants>
     <AndroidUseIntermediateDesignerFile>false</AndroidUseIntermediateDesignerFile>

diff --git a/System.Common.UnitTest/System.Common.UnitTest.csproj b/System.Common.UnitTest/System.Common.UnitTest.csproj
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net5.0</TargetFramework>
     <RootNamespace>System</RootNamespace>
+    <AssemblyName>System.Common.UnitTest</AssemblyName>
     <IsPackable>false</IsPackable>
     <DefineConstants>UnitTest;$(DefineConstants)</DefineConstants>
   </PropertyGroup>

diff --git a/resources/ProjectPathUtil.cs b/resources/ProjectPathUtil.cs
@@ -0,0 +1,55 @@
+using System.IO;
+using System.Linq;
+
+namespace System
+{
+    public static class ProjectPathUtil
+    {
+        public static readonly string projPath;
+
+        public const string ProjectDir_AvaloniaApp = "System.Application.SteamTools.Client.Desktop.Avalonia.App";
+
+        public const string ProjectDir_CoreLib = "System.Common.CoreLib";
+
+        public const string ProjectDir_ClientDesktop = "System.Application.SteamTools.Client.Desktop";
+
+        public const string DirPublishWinX86 =
+            @"\" + ProjectDir_AvaloniaApp + @"\bin\Release\Publish\win-x86";
+
+        static ProjectPathUtil()
+        {
+            projPath = GetProjectPath();
+            if (!Directory.Exists(Path.Combine(projPath, ProjectDir_AvaloniaApp)))
+            {
+                projPath = GetProjectPathByServerTool();
+            }
+        }
+
+        /// <summary>
+        /// 获取当前项目绝对路径(.sln文件所在目录)
+        /// </summary>
+        /// <param name="path"></param>
+        /// <returns></returns>
+        static string GetProjectPath(string? path = null)
+        {
+            path ??= AppContext.BaseDirectory;
+            if (!Directory.GetFiles(path, "*.sln").Any())
+            {
+                var parent = Directory.GetParent(path);
+                if (parent == null) return string.Empty;
+                return GetProjectPath(parent.FullName);
+            }
+            return path;
+        }
+
+        /// <summary>
+        /// 获取公开客户端项目绝对路径，仅供服务端工具项目中使用
+        /// </summary>
+        /// <returns></returns>
+        static string GetProjectPathByServerTool()
+        {
+            var projPath_ = GetProjectPath();
+            return Path.GetFullPath(Path.Combine(projPath_, "..", "SteamTools"));
+        }
+    }
+}