♻️ Misc

BeyondDimension · Nov 20, 2023 · f80d477 · f80d477
1 parent a0b8c69
commit f80d477
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 22 deletions.
diff --git 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
diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
@@ -1,8 +1,3 @@
 <Project>
 	<Import Project="..\ref\Common\src\Directory.Packages.props" />
-
-	<!-- NuGet 错误 NU1011 PackageVersion 项不能包含浮动版本。 -->
-	<ItemGroup>
-		<PackageVersion Include="SteamKit2" Version="2.5.0" />
-	</ItemGroup>
 </Project>
diff --git a/...ools.Build/Properties/launchSettings.json → ...ools.Build/Properties/launchSettings.json b/...ools.Build/Properties/launchSettings.json → ...ools.Build/Properties/launchSettings.json
diff --git a/....Build/BD.SteamClient8.Tools.Build.csproj → src/Tools.Build/Tools.Build.csproj b/....Build/BD.SteamClient8.Tools.Build.csproj → src/Tools.Build/Tools.Build.csproj
@@ -9,12 +9,12 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<Compile Include="..\..\ref\Common\src\Shared\GlobalUsings.BD.Common8.Tools.Build.cs">
+		<Compile Include="..\..\ref\Common\src\Shared\GlobalUsings.Tools.Build.cs">
 			<LinkBase>Properties\GlobalUsings</LinkBase>
 		</Compile>
-		<Compile Include="..\..\ref\Common\src\BD.Common8.Tools.Build\**\*.cs" />
-		<Compile Remove="..\..\ref\Common\src\BD.Common8.Tools.Build\bin\**\*.cs" />
-		<Compile Remove="..\..\ref\Common\src\BD.Common8.Tools.Build\obj\**\*.cs" />
+		<Compile Include="..\..\ref\Common\src\Tools.Build\**\*.cs" />
+		<Compile Remove="..\..\ref\Common\src\Tools.Build\bin\**\*.cs" />
+		<Compile Remove="..\..\ref\Common\src\Tools.Build\obj\**\*.cs" />
 	</ItemGroup>
 
 </Project>
diff --git a/....DocFX/BD.SteamClient8.Tools.DocFX.csproj → src/Tools.DocFX/Tools.DocFX.csproj b/....DocFX/BD.SteamClient8.Tools.DocFX.csproj → src/Tools.DocFX/Tools.DocFX.csproj
@@ -7,9 +7,9 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<Compile Include="..\..\ref\Common\src\BD.Common8.Tools.DocFX\**\*.cs" />
-		<Compile Remove="..\..\ref\Common\src\BD.Common8.Tools.DocFX\bin\**\*.cs" />
-		<Compile Remove="..\..\ref\Common\src\BD.Common8.Tools.DocFX\obj\**\*.cs" />
+		<Compile Include="..\..\ref\Common\src\Tools.DocFX\**\*.cs" />
+		<Compile Remove="..\..\ref\Common\src\Tools.DocFX\bin\**\*.cs" />
+		<Compile Remove="..\..\ref\Common\src\Tools.DocFX\obj\**\*.cs" />
 	</ItemGroup>
 
 </Project>
diff --git a/...mClient8.Tools.Sort.PackageVersion.csproj → ...eVersion/Tools.Sort.PackageVersion.csproj b/...mClient8.Tools.Sort.PackageVersion.csproj → ...eVersion/Tools.Sort.PackageVersion.csproj
@@ -8,9 +8,9 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<Compile Include="..\..\ref\Common\src\BD.Common8.Tools.Sort.PackageVersion\**\*.cs" />
-		<Compile Remove="..\..\ref\Common\src\BD.Common8.Tools.Sort.PackageVersion\bin\**\*.cs" />
-		<Compile Remove="..\..\ref\Common\src\BD.Common8.Tools.Sort.PackageVersion\obj\**\*.cs" />
+		<Compile Include="..\..\ref\Common\src\Tools.Sort.PackageVersion\**\*.cs" />
+		<Compile Remove="..\..\ref\Common\src\Tools.Sort.PackageVersion\bin\**\*.cs" />
+		<Compile Remove="..\..\ref\Common\src\Tools.Sort.PackageVersion\obj\**\*.cs" />
 	</ItemGroup>
 
 </Project>
+4 −4		BD.Common8.sln
+0 −8		api/toc.yml
+1 −3		....Common8.Essentials.Implementation.Avalonia/Services/Implementation/AvaloniaClipboardPlatformServiceImpl.cs
+1 −1		src/BD.Common8.SourceGenerator.Ipc.Client/BD.Common8.SourceGenerator.Ipc.Client.csproj
+1 −1		src/BD.Common8.SourceGenerator.Ipc.Server/BD.Common8.SourceGenerator.Ipc.Server.csproj
+1 −1		src/BD.Common8.SourceGenerator.ResX/BD.Common8.SourceGenerator.ResX.csproj
+1 −1		src/Directory.Build.props
+3 −1		src/Directory.Packages.props
+23 −2		src/Sdk/BD.Common8.Sdk.targets
+1 −2		src/Shared/GlobalUsings.Avalonia.ReactiveUI.cs
+10 −0		src/Shared/GlobalUsings.Avalonia.Xaml.Interactivity.cs
+10 −0		src/Shared/GlobalUsings.Avalonia.cs
+17 −0		src/Shared/GlobalUsings.FluentAvaloniaUI.cs
+1 −0		src/Shared/GlobalUsings.Newtonsoft.Json.cs
+9 −0		src/Shared/GlobalUsings.ReactiveUI.Fody.cs
+10 −0		src/Shared/GlobalUsings.ReactiveUI.cs
+4 −0		src/Shared/GlobalUsings.System.Text.Json.cs
+9 −0		src/Shared/GlobalUsings.Tools.Build.cs
+1 −1		src/Tools.Build/Commands/Abstractions/ICommand.cs
+1 −1		src/Tools.Build/Commands/IBuildCommand.cs
+2 −2		src/Tools.Build/Commands/INugetPushCommand.cs
+0 −0		src/Tools.Build/Program.cs
+0 −0		src/Tools.Build/Properties/launchSettings.json
+0 −0		src/Tools.Build/Tools.Build.csproj
+0 −0		src/Tools.DocFX/Program.cs
+0 −0		src/Tools.DocFX/Tools.DocFX.csproj
+0 −0		src/Tools.Sort.PackageVersion/Program.cs
+0 −0		src/Tools.Sort.PackageVersion/Tools.Sort.PackageVersion.csproj