From b8a761721a8293e630a1ac6f782bb26745e4569b Mon Sep 17 00:00:00 2001 From: DmitriySalnikov Date: Mon, 22 Jan 2024 00:20:12 +0300 Subject: [PATCH] Removed the x64 platform in favor of Any CPU. Added a link to `PCK Bruteforcer` to the encryption key input window. --- .github/workflows/dotnet-desktop.yml | 17 ++----- .../Console/PCKBruteforcer.Console.csproj | 1 + .../PCKBruteforcer/PCKBruteforcer.csproj | 1 + Bruteforcer/UI/PCKBruteforcer.UI.csproj | 2 +- Core/GodotPCKExplorer/GodotPCKExplorer.csproj | 8 +--- .../Console/GodotPCKExplorer.Console.csproj | 1 + Explorer/UI/Forms/AboutBox1.cs | 2 +- .../Forms/OpenWithPCKEncryption.Designer.cs | 29 +++++++++--- Explorer/UI/Forms/OpenWithPCKEncryption.cs | 9 +++- Explorer/UI/GodotPCKExplorer.UI.csproj | 5 +-- GodotPCKExplorer.sln | 45 ------------------- 11 files changed, 42 insertions(+), 78 deletions(-) diff --git a/.github/workflows/dotnet-desktop.yml b/.github/workflows/dotnet-desktop.yml index b8aa6ad..10bb9a6 100644 --- 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 index 32f02ab..53c0adb 100644 --- a/Bruteforcer/Console/PCKBruteforcer.Console.csproj +++ b/Bruteforcer/Console/PCKBruteforcer.Console.csproj @@ -7,6 +7,7 @@ icon.ico enable $(MSBuildProjectName.Replace(" ", "_").Replace("Console", "Cmd")) + AnyCPU diff --git a/Bruteforcer/PCKBruteforcer/PCKBruteforcer.csproj b/Bruteforcer/PCKBruteforcer/PCKBruteforcer.csproj index 85adb8f..7dcbed6 100644 --- a/Bruteforcer/PCKBruteforcer/PCKBruteforcer.csproj +++ b/Bruteforcer/PCKBruteforcer/PCKBruteforcer.csproj @@ -4,6 +4,7 @@ net8.0 enable enable + AnyCPU diff --git a/Bruteforcer/UI/PCKBruteforcer.UI.csproj b/Bruteforcer/UI/PCKBruteforcer.UI.csproj index e8c3104..90f868c 100644 --- a/Bruteforcer/UI/PCKBruteforcer.UI.csproj +++ b/Bruteforcer/UI/PCKBruteforcer.UI.csproj @@ -25,7 +25,7 @@ icon.ico $(NoWarn);IDE1006 - AnyCPU;x64 + AnyCPU diff --git a/Core/GodotPCKExplorer/GodotPCKExplorer.csproj b/Core/GodotPCKExplorer/GodotPCKExplorer.csproj index 1c9e6f0..c11f2d4 100644 --- a/Core/GodotPCKExplorer/GodotPCKExplorer.csproj +++ b/Core/GodotPCKExplorer/GodotPCKExplorer.csproj @@ -3,7 +3,7 @@ netstandard2.1 Debug;Release;Dev - AnyCPU;x64 + AnyCPU $(NoWarn);IDE1006 True @@ -14,8 +14,6 @@ mbedTLS\**\*.pdb; **\.gitignore - - AnyCPU 1.4.0 $(Version) @@ -24,10 +22,6 @@ $(DefineConstants);DEV_ENABLED - - $(DefineConstants);DEV_ENABLED - - diff --git a/Explorer/Console/GodotPCKExplorer.Console.csproj b/Explorer/Console/GodotPCKExplorer.Console.csproj index 119abb8..30bf32b 100644 --- a/Explorer/Console/GodotPCKExplorer.Console.csproj +++ b/Explorer/Console/GodotPCKExplorer.Console.csproj @@ -6,6 +6,7 @@ enable icon.ico $(MSBuildProjectName.Replace(" ", "_").Replace("Console", "Cmd")) + AnyCPU diff --git a/Explorer/UI/Forms/AboutBox1.cs b/Explorer/UI/Forms/AboutBox1.cs index bd57e2a..022b0ca 100644 --- 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 index cee675a..d5540ff 100644 --- a/Explorer/UI/Forms/OpenWithPCKEncryption.Designer.cs +++ b/Explorer/UI/Forms/OpenWithPCKEncryption.Designer.cs @@ -31,6 +31,7 @@ private void InitializeComponent() label1 = new Label(); btn_ok = new Button(); tb_key = new TextBoxWithPlaceholder(); + linkLabel1 = new LinkLabel(); SuspendLayout(); // // label1 @@ -45,10 +46,10 @@ private void InitializeComponent() // // btn_ok // - btn_ok.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - btn_ok.Location = new Point(12, 56); + btn_ok.Anchor = AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right; + btn_ok.Location = new Point(12, 73); btn_ok.Name = "btn_ok"; - btn_ok.Size = new Size(424, 27); + btn_ok.Size = new Size(455, 27); btn_ok.TabIndex = 4; btn_ok.Text = "Confirm"; btn_ok.UseVisualStyleBackColor = true; @@ -60,20 +61,33 @@ private void InitializeComponent() tb_key.CueBanner = "04bf1d.., 04 BF 1D.., 04-BF-1D.."; tb_key.Location = new Point(12, 27); tb_key.Name = "tb_key"; - tb_key.Size = new Size(424, 23); + tb_key.Size = new Size(455, 23); tb_key.TabIndex = 5; // + // linkLabel1 + // + linkLabel1.Anchor = AnchorStyles.Bottom | AnchorStyles.Right; + linkLabel1.AutoSize = true; + linkLabel1.Location = new Point(225, 55); + linkLabel1.Name = "linkLabel1"; + linkLabel1.Size = new Size(242, 15); + linkLabel1.TabIndex = 6; + linkLabel1.TabStop = true; + linkLabel1.Text = "Don't know the key? Try the PCK Bruteforcer."; + linkLabel1.LinkClicked += linkLabel1_LinkClicked; + // // OpenWithPCKEncryption // AutoScaleDimensions = new SizeF(7F, 15F); AutoScaleMode = AutoScaleMode.Font; - ClientSize = new Size(448, 89); + ClientSize = new Size(479, 106); + Controls.Add(linkLabel1); Controls.Add(tb_key); Controls.Add(btn_ok); Controls.Add(label1); Margin = new Padding(4, 3, 4, 3); - MaximumSize = new Size(1192, 128); - MinimumSize = new Size(338, 128); + MaximumSize = new Size(1192, 145); + MinimumSize = new Size(338, 145); Name = "OpenWithPCKEncryption"; StartPosition = FormStartPosition.CenterParent; Text = "Enter the encryption key"; @@ -86,5 +100,6 @@ private void InitializeComponent() private Label label1; private Button btn_ok; private TextBoxWithPlaceholder tb_key; + private LinkLabel linkLabel1; } } \ No newline at end of file diff --git a/Explorer/UI/Forms/OpenWithPCKEncryption.cs b/Explorer/UI/Forms/OpenWithPCKEncryption.cs index 8f6ebe4..1035656 100644 --- 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 index 6c7d06b..9bfd68f 100644 --- a/Explorer/UI/GodotPCKExplorer.UI.csproj +++ b/Explorer/UI/GodotPCKExplorer.UI.csproj @@ -12,8 +12,7 @@ GodotPCKExplorer.UI Dmitriy Salnikov - 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. Copyright © 2024 https://github.com/DmitriySalnikov/GodotPCKExplorer @@ -25,7 +24,7 @@ $(NoWarn);IDE1006 - AnyCPU;x64 + AnyCPU diff --git a/GodotPCKExplorer.sln b/GodotPCKExplorer.sln index bcc2e4f..f4f7d36 100644 --- 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