Removed the x64 platform in favor of Any CPU.

Added a link to `PCK Bruteforcer` to the encryption key input window.
DmitriySalnikov · Jan 21, 2024 · b8a7617 · b8a7617
1 parent 7324b7b
commit b8a7617
Show file tree

Hide file tree

Showing 11 changed files with 42 additions and 78 deletions.
diff --git a/.github/workflows/dotnet-desktop.yml b/.github/workflows/dotnet-desktop.yml
@@ -18,7 +18,6 @@ env:
   Bruteforcer_Project_Name: Bruteforcer\PCKBruteforcer_UI
   Solution_Path: GodotPCKExplorer.sln
   SDK_Name: net8.0-windows
-  Platform_Name: x64
 
 jobs:
   build:
@@ -56,33 +55,25 @@ jobs:
 
       - name: Build ${{env.MSBuild_Project_Name}}
         shell: powershell
-        run: msbuild ${{env.Solution_Path}} /t:${{env.MSBuild_Project_Name}} /p:Configuration=${{matrix.configuration}} /p:Platform="${{env.Platform_Name}}" /m:4
+        run: msbuild ${{env.Solution_Path}} /t:${{env.MSBuild_Project_Name}} /p:Configuration=${{matrix.configuration}} /m:4
 
       - name: Prepare artifacts
         if: matrix.configuration == 'Release'
         shell: powershell
         run: |
-          Get-ChildItem "bin/${{env.Project_Name}}/x64/${{matrix.configuration}}/" -Directory | ForEach-Object {
+          Get-ChildItem "bin/${{env.Project_Name}}/${{matrix.configuration}}/" -Directory | ForEach-Object {
              Get-ChildItem $_.FullName | Where-Object { ('.pdb', '.xml').Contains($_.Extension) } | Remove-Item -Force
           }
 
       - name: Upload build artifacts
-        if: matrix.configuration == 'Release'
-        uses: actions/upload-artifact@v4
-        with:
-          name: ${{env.Artifact_Name}}
-          path: bin/${{env.Project_Name}}/x64/${{matrix.configuration}}/${{env.SDK_Name}}
-
-      - name: Upload build artifacts
-        if: matrix.configuration != 'Release'
         uses: actions/upload-artifact@v4
         with:
-          name: ${{env.Artifact_Name}}_${{matrix.configuration}}
+          name: ${{matrix.configuration == 'Release' && env.Artifact_Name || format('{0}_{1}', env.Artifact_Name, matrix.configuration)}}
           path: bin/${{env.Project_Name}}/${{matrix.configuration}}/${{env.SDK_Name}}
 
       - name: Build ${{env.Bruteforcer_Project_Name}}
         shell: powershell
-        run: msbuild ${{env.Solution_Path}} /t:${{env.Bruteforcer_Project_Name}} /p:Configuration=${{matrix.configuration}} /p:Platform="${{env.Platform_Name}}" /m:4
+        run: msbuild ${{env.Solution_Path}} /t:${{env.Bruteforcer_Project_Name}} /p:Configuration=${{matrix.configuration}} /m:4
 
 
   tests:

diff --git a/Bruteforcer/Console/PCKBruteforcer.Console.csproj b/Bruteforcer/Console/PCKBruteforcer.Console.csproj
@@ -7,6 +7,7 @@
 		<ApplicationIcon>icon.ico</ApplicationIcon>
 		<Nullable>enable</Nullable>
 		<RootNamespace>$(MSBuildProjectName.Replace(" ", "_").Replace("Console", "Cmd"))</RootNamespace>
+		<Platforms>AnyCPU</Platforms>
 	</PropertyGroup>
 
 	<Import Project="..\..\Core\Global.Shared\Global.Shared.projitems" Label="Shared" />

diff --git a/Bruteforcer/PCKBruteforcer/PCKBruteforcer.csproj b/Bruteforcer/PCKBruteforcer/PCKBruteforcer.csproj
@@ -4,6 +4,7 @@
 		<TargetFramework>net8.0</TargetFramework>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>
+		<Platforms>AnyCPU</Platforms>
 	</PropertyGroup>
 
 	<ItemGroup>

diff --git a/Bruteforcer/UI/PCKBruteforcer.UI.csproj b/Bruteforcer/UI/PCKBruteforcer.UI.csproj
@@ -25,7 +25,7 @@
 		<ApplicationIcon>icon.ico</ApplicationIcon>
 		<NoWarn>$(NoWarn);IDE1006</NoWarn>
 
-		<Platforms>AnyCPU;x64</Platforms>
+		<Platforms>AnyCPU</Platforms>
 	</PropertyGroup>
 
 	<ItemGroup>

diff --git a/Core/GodotPCKExplorer/GodotPCKExplorer.csproj b/Core/GodotPCKExplorer/GodotPCKExplorer.csproj
@@ -3,7 +3,7 @@
 	<PropertyGroup>
 		<TargetFramework>netstandard2.1</TargetFramework>
 		<Configurations>Debug;Release;Dev</Configurations>
-		<Platforms>AnyCPU;x64</Platforms>
+		<Platforms>AnyCPU</Platforms>
 		<NoWarn>$(NoWarn);IDE1006</NoWarn>
 		<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
 
@@ -14,8 +14,6 @@
 			mbedTLS\**\*.pdb;
 			**\.gitignore
 		</DefaultItemExcludes>
-
-		<PlatformTarget>AnyCPU</PlatformTarget>
 		<Version>1.4.0</Version>
 		<AssemblyVersion>$(Version)</AssemblyVersion>
 	</PropertyGroup>
@@ -24,10 +22,6 @@
 		<DefineConstants>$(DefineConstants);DEV_ENABLED</DefineConstants>
 	</PropertyGroup>
 
-	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Dev|x64'">
-		<DefineConstants>$(DefineConstants);DEV_ENABLED</DefineConstants>
-	</PropertyGroup>
-
 	<ItemGroup>
 	  <Compile Remove="bin\**" />
 	  <Compile Remove="obj\**" />

diff --git a/Explorer/Console/GodotPCKExplorer.Console.csproj b/Explorer/Console/GodotPCKExplorer.Console.csproj
@@ -6,6 +6,7 @@
 		<ImplicitUsings>enable</ImplicitUsings>
 		<ApplicationIcon>icon.ico</ApplicationIcon>
 		<RootNamespace>$(MSBuildProjectName.Replace(" ", "_").Replace("Console", "Cmd"))</RootNamespace>
+		<Platforms>AnyCPU</Platforms>
 	</PropertyGroup>
 
 	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

diff --git a/Explorer/UI/Forms/AboutBox1.cs b/Explorer/UI/Forms/AboutBox1.cs
@@ -16,7 +16,7 @@ public AboutBox1()
             this.labelVersion.Text = String.Format("Version {0}", AssemblyVersion);
             this.labelCopyright.Text = AssemblyCopyright;
             this.labelCompanyName.Text = AssemblyCompany;
-            this.textBoxDescription.Text = AssemblyDescription;
+            this.textBoxDescription.Text = AssemblyDescription.Trim();
         }
 
         #region Assembly Attribute Accessors

diff --git a/Explorer/UI/Forms/OpenWithPCKEncryption.Designer.cs b/Explorer/UI/Forms/OpenWithPCKEncryption.Designer.cs
diff --git a/Explorer/UI/Forms/OpenWithPCKEncryption.cs b/Explorer/UI/Forms/OpenWithPCKEncryption.cs
@@ -1,4 +1,6 @@
-namespace GodotPCKExplorer.UI
+using System.Diagnostics;
+
+namespace GodotPCKExplorer.UI
 {
     public partial class OpenWithPCKEncryption : Form
     {
@@ -25,5 +27,10 @@ private void btn_ok_Click(object? sender, EventArgs e)
             DialogResult = DialogResult.OK;
             Close();
         }
+
+        private void linkLabel1_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
+        {
+            Process.Start(new ProcessStartInfo("https://github.com/DmitriySalnikov/GodotPCKExplorer/blob/master/Bruteforcer/README.md") { UseShellExecute = true });
+        }
     }
 }
diff --git a/Explorer/UI/GodotPCKExplorer.UI.csproj b/Explorer/UI/GodotPCKExplorer.UI.csproj
@@ -12,8 +12,7 @@
 		<PackageId>GodotPCKExplorer.UI</PackageId>
 		<Authors>Dmitriy Salnikov</Authors>
 		<Description>
-			C# implementation of the Godot's PCK file format with the ability to export
-			files from it and create new PCK packs, as well as giving several more useful features.
+			C# implementation of the Godot's PCK file format with the ability to export files from it and create new PCK packs, as well as giving several more useful features.
 		</Description>
 		<Copyright>Copyright © 2024</Copyright>
 		<PackageProjectUrl>https://github.com/DmitriySalnikov/GodotPCKExplorer</PackageProjectUrl>
@@ -25,7 +24,7 @@
 
 		<NoWarn>$(NoWarn);IDE1006</NoWarn>
 
-		<Platforms>AnyCPU;x64</Platforms>
+		<Platforms>AnyCPU</Platforms>
 	</PropertyGroup>
 
 	<ItemGroup>

diff --git a/GodotPCKExplorer.sln b/GodotPCKExplorer.sln
@@ -35,97 +35,52 @@ EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
-		Debug|x64 = Debug|x64
 		Dev|Any CPU = Dev|Any CPU
-		Dev|x64 = Dev|x64
 		Release|Any CPU = Release|Any CPU
-		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{37268AA0-B7A7-494D-9DF0-7C08240E44C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{37268AA0-B7A7-494D-9DF0-7C08240E44C4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{37268AA0-B7A7-494D-9DF0-7C08240E44C4}.Debug|x64.ActiveCfg = Debug|x64
-		{37268AA0-B7A7-494D-9DF0-7C08240E44C4}.Debug|x64.Build.0 = Debug|x64
 		{37268AA0-B7A7-494D-9DF0-7C08240E44C4}.Dev|Any CPU.ActiveCfg = Dev|Any CPU
 		{37268AA0-B7A7-494D-9DF0-7C08240E44C4}.Dev|Any CPU.Build.0 = Dev|Any CPU
-		{37268AA0-B7A7-494D-9DF0-7C08240E44C4}.Dev|x64.ActiveCfg = Dev|x64
-		{37268AA0-B7A7-494D-9DF0-7C08240E44C4}.Dev|x64.Build.0 = Dev|x64
 		{37268AA0-B7A7-494D-9DF0-7C08240E44C4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{37268AA0-B7A7-494D-9DF0-7C08240E44C4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{37268AA0-B7A7-494D-9DF0-7C08240E44C4}.Release|x64.ActiveCfg = Release|x64
-		{37268AA0-B7A7-494D-9DF0-7C08240E44C4}.Release|x64.Build.0 = Release|x64
 		{6747C3ED-4F67-4457-B439-F18A90E3D084}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{6747C3ED-4F67-4457-B439-F18A90E3D084}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6747C3ED-4F67-4457-B439-F18A90E3D084}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{6747C3ED-4F67-4457-B439-F18A90E3D084}.Debug|x64.Build.0 = Debug|Any CPU
 		{6747C3ED-4F67-4457-B439-F18A90E3D084}.Dev|Any CPU.ActiveCfg = Debug|Any CPU
 		{6747C3ED-4F67-4457-B439-F18A90E3D084}.Dev|Any CPU.Build.0 = Debug|Any CPU
-		{6747C3ED-4F67-4457-B439-F18A90E3D084}.Dev|x64.ActiveCfg = Debug|Any CPU
-		{6747C3ED-4F67-4457-B439-F18A90E3D084}.Dev|x64.Build.0 = Debug|Any CPU
 		{6747C3ED-4F67-4457-B439-F18A90E3D084}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6747C3ED-4F67-4457-B439-F18A90E3D084}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6747C3ED-4F67-4457-B439-F18A90E3D084}.Release|x64.ActiveCfg = Release|x64
-		{6747C3ED-4F67-4457-B439-F18A90E3D084}.Release|x64.Build.0 = Release|x64
 		{E16FDF11-E3A7-4248-915C-F6E0E581EF72}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E16FDF11-E3A7-4248-915C-F6E0E581EF72}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E16FDF11-E3A7-4248-915C-F6E0E581EF72}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E16FDF11-E3A7-4248-915C-F6E0E581EF72}.Debug|x64.Build.0 = Debug|Any CPU
 		{E16FDF11-E3A7-4248-915C-F6E0E581EF72}.Dev|Any CPU.ActiveCfg = Debug|Any CPU
 		{E16FDF11-E3A7-4248-915C-F6E0E581EF72}.Dev|Any CPU.Build.0 = Debug|Any CPU
-		{E16FDF11-E3A7-4248-915C-F6E0E581EF72}.Dev|x64.ActiveCfg = Debug|Any CPU
-		{E16FDF11-E3A7-4248-915C-F6E0E581EF72}.Dev|x64.Build.0 = Debug|Any CPU
 		{E16FDF11-E3A7-4248-915C-F6E0E581EF72}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E16FDF11-E3A7-4248-915C-F6E0E581EF72}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E16FDF11-E3A7-4248-915C-F6E0E581EF72}.Release|x64.ActiveCfg = Release|Any CPU
-		{E16FDF11-E3A7-4248-915C-F6E0E581EF72}.Release|x64.Build.0 = Release|Any CPU
 		{D9815CB2-44FD-44B6-A145-21052779CC98}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D9815CB2-44FD-44B6-A145-21052779CC98}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D9815CB2-44FD-44B6-A145-21052779CC98}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D9815CB2-44FD-44B6-A145-21052779CC98}.Debug|x64.Build.0 = Debug|Any CPU
 		{D9815CB2-44FD-44B6-A145-21052779CC98}.Dev|Any CPU.ActiveCfg = Debug|Any CPU
 		{D9815CB2-44FD-44B6-A145-21052779CC98}.Dev|Any CPU.Build.0 = Debug|Any CPU
-		{D9815CB2-44FD-44B6-A145-21052779CC98}.Dev|x64.ActiveCfg = Debug|Any CPU
-		{D9815CB2-44FD-44B6-A145-21052779CC98}.Dev|x64.Build.0 = Debug|Any CPU
 		{D9815CB2-44FD-44B6-A145-21052779CC98}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D9815CB2-44FD-44B6-A145-21052779CC98}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D9815CB2-44FD-44B6-A145-21052779CC98}.Release|x64.ActiveCfg = Release|Any CPU
-		{D9815CB2-44FD-44B6-A145-21052779CC98}.Release|x64.Build.0 = Release|Any CPU
 		{B605FA7E-7FBC-4AEC-8EF6-1E653CD3CF31}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B605FA7E-7FBC-4AEC-8EF6-1E653CD3CF31}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B605FA7E-7FBC-4AEC-8EF6-1E653CD3CF31}.Debug|x64.ActiveCfg = Debug|x64
-		{B605FA7E-7FBC-4AEC-8EF6-1E653CD3CF31}.Debug|x64.Build.0 = Debug|x64
 		{B605FA7E-7FBC-4AEC-8EF6-1E653CD3CF31}.Dev|Any CPU.ActiveCfg = Debug|Any CPU
 		{B605FA7E-7FBC-4AEC-8EF6-1E653CD3CF31}.Dev|Any CPU.Build.0 = Debug|Any CPU
-		{B605FA7E-7FBC-4AEC-8EF6-1E653CD3CF31}.Dev|x64.ActiveCfg = Debug|x64
-		{B605FA7E-7FBC-4AEC-8EF6-1E653CD3CF31}.Dev|x64.Build.0 = Debug|x64
 		{B605FA7E-7FBC-4AEC-8EF6-1E653CD3CF31}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B605FA7E-7FBC-4AEC-8EF6-1E653CD3CF31}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B605FA7E-7FBC-4AEC-8EF6-1E653CD3CF31}.Release|x64.ActiveCfg = Release|x64
-		{B605FA7E-7FBC-4AEC-8EF6-1E653CD3CF31}.Release|x64.Build.0 = Release|x64
 		{6D0449F6-EC27-4A9D-97C9-005611947C37}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{6D0449F6-EC27-4A9D-97C9-005611947C37}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6D0449F6-EC27-4A9D-97C9-005611947C37}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{6D0449F6-EC27-4A9D-97C9-005611947C37}.Debug|x64.Build.0 = Debug|Any CPU
 		{6D0449F6-EC27-4A9D-97C9-005611947C37}.Dev|Any CPU.ActiveCfg = Debug|Any CPU
 		{6D0449F6-EC27-4A9D-97C9-005611947C37}.Dev|Any CPU.Build.0 = Debug|Any CPU
-		{6D0449F6-EC27-4A9D-97C9-005611947C37}.Dev|x64.ActiveCfg = Debug|Any CPU
-		{6D0449F6-EC27-4A9D-97C9-005611947C37}.Dev|x64.Build.0 = Debug|Any CPU
 		{6D0449F6-EC27-4A9D-97C9-005611947C37}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6D0449F6-EC27-4A9D-97C9-005611947C37}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6D0449F6-EC27-4A9D-97C9-005611947C37}.Release|x64.ActiveCfg = Release|Any CPU
-		{6D0449F6-EC27-4A9D-97C9-005611947C37}.Release|x64.Build.0 = Release|Any CPU
 		{92349402-96E5-45FF-8E8B-5C7BC8FE534F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{92349402-96E5-45FF-8E8B-5C7BC8FE534F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{92349402-96E5-45FF-8E8B-5C7BC8FE534F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{92349402-96E5-45FF-8E8B-5C7BC8FE534F}.Debug|x64.Build.0 = Debug|Any CPU
 		{92349402-96E5-45FF-8E8B-5C7BC8FE534F}.Dev|Any CPU.ActiveCfg = Debug|Any CPU
 		{92349402-96E5-45FF-8E8B-5C7BC8FE534F}.Dev|Any CPU.Build.0 = Debug|Any CPU
-		{92349402-96E5-45FF-8E8B-5C7BC8FE534F}.Dev|x64.ActiveCfg = Debug|Any CPU
-		{92349402-96E5-45FF-8E8B-5C7BC8FE534F}.Dev|x64.Build.0 = Debug|Any CPU
 		{92349402-96E5-45FF-8E8B-5C7BC8FE534F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{92349402-96E5-45FF-8E8B-5C7BC8FE534F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{92349402-96E5-45FF-8E8B-5C7BC8FE534F}.Release|x64.ActiveCfg = Release|x64
-		{92349402-96E5-45FF-8E8B-5C7BC8FE534F}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE