From f80d477599290b36be7b0d423de8a0c3f98f5be8 Mon Sep 17 00:00:00 2001 From: Aigio Liu Date: Mon, 20 Nov 2023 14:38:59 +0800 Subject: [PATCH] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Misc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BD.SteamClient8.sln | 12 ++++++------ ref/Common | 2 +- src/Directory.Packages.props | 5 ----- .../Properties/launchSettings.json | 0 .../Tools.Build.csproj} | 8 ++++---- .../Tools.DocFX.csproj} | 6 +++--- .../Tools.Sort.PackageVersion.csproj} | 6 +++--- 7 files changed, 17 insertions(+), 22 deletions(-) rename src/{BD.SteamClient8.Tools.Build => Tools.Build}/Properties/launchSettings.json (100%) rename src/{BD.SteamClient8.Tools.Build/BD.SteamClient8.Tools.Build.csproj => Tools.Build/Tools.Build.csproj} (54%) rename src/{BD.SteamClient8.Tools.DocFX/BD.SteamClient8.Tools.DocFX.csproj => Tools.DocFX/Tools.DocFX.csproj} (50%) rename src/{BD.SteamClient8.Tools.Sort.PackageVersion/BD.SteamClient8.Tools.Sort.PackageVersion.csproj => Tools.Sort.PackageVersion/Tools.Sort.PackageVersion.csproj} (50%) diff --git a/BD.SteamClient8.sln b/BD.SteamClient8.sln index bc129617..9b55c497 100644 --- a/BD.SteamClient8.sln +++ b/BD.SteamClient8.sln @@ -35,7 +35,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "0.Root", "0.Root", "{49150E src\.editorconfig = src\.editorconfig src\Directory.Build.props = src\Directory.Build.props src\Directory.Build.targets = src\Directory.Build.targets - src\Directory.Packages.props = src\Directory.Packages.props + ref\Common\src\Directory.Packages.props = ref\Common\src\Directory.Packages.props EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "2.SharedLibrary", "2.SharedLibrary", "{0CE5250A-9E2C-43A7-BE3F-763ADE47652E}" @@ -46,11 +46,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "4.UnitTest", "4.UnitTest", EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BD.SteamClient8", "src\BD.SteamClient8\BD.SteamClient8.csproj", "{D43C1445-8222-4223-B59B-08AC9D859F1E}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BD.SteamClient8.Tools.Build", "src\BD.SteamClient8.Tools.Build\BD.SteamClient8.Tools.Build.csproj", "{B1059059-F554-4CC4-8C6F-7D8F4AF44B8B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tools.Build", "src\Tools.Build\Tools.Build.csproj", "{B1059059-F554-4CC4-8C6F-7D8F4AF44B8B}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BD.SteamClient8.Tools.DocFX", "src\BD.SteamClient8.Tools.DocFX\BD.SteamClient8.Tools.DocFX.csproj", "{DCF57D81-B75D-4656-96FB-556584F18126}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tools.DocFX", "src\Tools.DocFX\Tools.DocFX.csproj", "{DCF57D81-B75D-4656-96FB-556584F18126}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BD.SteamClient8.Tools.Sort.PackageVersion", "src\BD.SteamClient8.Tools.Sort.PackageVersion\BD.SteamClient8.Tools.Sort.PackageVersion.csproj", "{A7B9F024-609D-495B-84EE-338AD375893D}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tools.Sort.PackageVersion", "src\Tools.Sort.PackageVersion\Tools.Sort.PackageVersion.csproj", "{A7B9F024-609D-495B-84EE-338AD375893D}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "1.Reference", "1.Reference", "{C03124F2-9977-4ACC-A9A3-862A18F514A9}" EndProject @@ -66,9 +66,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BD.SteamClient8.Primitives" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ValveKeyValue", "ref\ValveKeyValue\ValveKeyValue\ValveKeyValue\ValveKeyValue.csproj", "{FF904629-87CF-440D-A888-CD69DB2D2D88}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BD.SteamClient8.ViewModels", "src\BD.SteamClient8.ViewModels\BD.SteamClient8.ViewModels.csproj", "{85D3AD5F-40E5-4701-9246-72459AFEF849}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BD.SteamClient8.ViewModels", "src\BD.SteamClient8.ViewModels\BD.SteamClient8.ViewModels.csproj", "{85D3AD5F-40E5-4701-9246-72459AFEF849}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BD.SteamClient8.Impl", "src\BD.SteamClient8.Impl\BD.SteamClient8.Impl.csproj", "{2AC5DD20-057C-431C-A13D-34010421F4BB}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BD.SteamClient8.Impl", "src\BD.SteamClient8.Impl\BD.SteamClient8.Impl.csproj", "{2AC5DD20-057C-431C-A13D-34010421F4BB}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BD.Common8.Crawler", "ref\Common\src\BD.Common8.Crawler\BD.Common8.Crawler.csproj", "{FD62C258-A1C0-498B-8DBE-4502E5BF6F56}" EndProject diff --git a/ref/Common b/ref/Common index aef86be1..33536ca9 160000 --- a/ref/Common +++ b/ref/Common @@ -1 +1 @@ -Subproject commit aef86be11bf9abe428809c6537a10ab446e736c1 +Subproject commit 33536ca9536b5e044e426ffba32689df731c72da diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props index 52e2dbfc..b618b91a 100644 --- a/src/Directory.Packages.props +++ b/src/Directory.Packages.props @@ -1,8 +1,3 @@ - - - - - diff --git a/src/BD.SteamClient8.Tools.Build/Properties/launchSettings.json b/src/Tools.Build/Properties/launchSettings.json similarity index 100% rename from src/BD.SteamClient8.Tools.Build/Properties/launchSettings.json rename to src/Tools.Build/Properties/launchSettings.json diff --git a/src/BD.SteamClient8.Tools.Build/BD.SteamClient8.Tools.Build.csproj b/src/Tools.Build/Tools.Build.csproj similarity index 54% rename from src/BD.SteamClient8.Tools.Build/BD.SteamClient8.Tools.Build.csproj rename to src/Tools.Build/Tools.Build.csproj index f3304544..c050b9c0 100644 --- a/src/BD.SteamClient8.Tools.Build/BD.SteamClient8.Tools.Build.csproj +++ b/src/Tools.Build/Tools.Build.csproj @@ -9,12 +9,12 @@ - + Properties\GlobalUsings - - - + + + diff --git a/src/BD.SteamClient8.Tools.DocFX/BD.SteamClient8.Tools.DocFX.csproj b/src/Tools.DocFX/Tools.DocFX.csproj similarity index 50% rename from src/BD.SteamClient8.Tools.DocFX/BD.SteamClient8.Tools.DocFX.csproj rename to src/Tools.DocFX/Tools.DocFX.csproj index de753a2f..61f7214b 100644 --- a/src/BD.SteamClient8.Tools.DocFX/BD.SteamClient8.Tools.DocFX.csproj +++ b/src/Tools.DocFX/Tools.DocFX.csproj @@ -7,9 +7,9 @@ - - - + + + diff --git a/src/BD.SteamClient8.Tools.Sort.PackageVersion/BD.SteamClient8.Tools.Sort.PackageVersion.csproj b/src/Tools.Sort.PackageVersion/Tools.Sort.PackageVersion.csproj similarity index 50% rename from src/BD.SteamClient8.Tools.Sort.PackageVersion/BD.SteamClient8.Tools.Sort.PackageVersion.csproj rename to src/Tools.Sort.PackageVersion/Tools.Sort.PackageVersion.csproj index 7d6ba9f6..9af2ae77 100644 --- a/src/BD.SteamClient8.Tools.Sort.PackageVersion/BD.SteamClient8.Tools.Sort.PackageVersion.csproj +++ b/src/Tools.Sort.PackageVersion/Tools.Sort.PackageVersion.csproj @@ -8,9 +8,9 @@ - - - + + +