From 0bdcf829f60f7d6c5e99de2ed938f61621d30980 Mon Sep 17 00:00:00 2001 From: DeDaMrAzR <43572083+DeDaMrAzR@users.noreply.github.com> Date: Sat, 21 Dec 2024 23:33:39 +0100 Subject: [PATCH 01/26] Update build.yml auto-build test for PROTA tool test --- .github/workflows/build.yml | 79 +++++++++++++++++++++++++++++++++---- 1 file changed, 71 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b851355..0309c4b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,4 +1,4 @@ -name: Build PROTATool +name: Build and release PROTATool on: push: @@ -7,6 +7,7 @@ on: pull_request: branches: - main + workflow_dispatch: jobs: build: @@ -16,17 +17,79 @@ jobs: - name: Checkout repository uses: actions/checkout@v4 - - name: Setup MSBuild + - name: Set up MSBuild uses: microsoft/setup-msbuild@v1 + - name: Install NuGet + uses: NuGet/setup-nuget@v2 + - name: Restore NuGet packages - run: nuget restore PROTATool/PROTATool.sln + run: nuget restore PROTATool/PROTATool.csproj -SolutionDirectory . + + - name: Create Output Directory + run: mkdir -p BuildOutput/Release + + - name: Build the project + run: msbuild PROTATool/PROTATool.csproj /p:Configuration=Release /p:OutDir=BuildOutput\Release\ - - name: Build solution - run: msbuild PROTATool/PROTATool.sln /p:Configuration=Release + - name: Debug Build Output + run: | + echo "Checking output directory..." + dir BuildOutput + dir BuildOutput\Release - - name: Upload Build Artifact + - name: Upload Build Artifacts uses: actions/upload-artifact@v4 with: - name: PROTATool-Release - path: PROTATool/bin/Release + name: PROTATool + path: | + PROTATool/BuildOutput/Release/*.exe + PROTATool/BuildOutput/Release/*.dll + if-no-files-found: warn + + - name: Debug Build Output Directory + run: | + echo "Contents of BuildOutput/Release:" + dir PROTATool/BuildOutput/Release + + release: + needs: build + runs-on: windows-latest + + steps: + - name: Checkout repository + uses: actions/checkout@v4 + + - name: Download Build Artifacts + uses: actions/download-artifact@v4 + with: + name: PROTATool + + - name: Recreate Directory Structure + run: | + echo "Recreating BuildOutput directory..." + mkdir -p BuildOutput/Release + move *.exe BuildOutput/Release/ + move *.dll BuildOutput/Release/ + + - name: Debug Downloaded Artifacts + run: | + echo "Downloaded artifacts in BuildOutput/Release:" + dir BuildOutput/Release + + - name: Create ZIP File + run: | + mkdir release + powershell Compress-Archive -Path "BuildOutput/Release/*" -DestinationPath "release/PROTATool-v${{ github.run_number }}.zip" + + - name: Create GitHub Release + uses: softprops/action-gh-release@v2 + with: + tag_name: v${{ github.run_number }} + name: PROTATool v${{ github.run_number }} + body: | + Automated release for PROTATool. + Includes the latest .exe and .dll files. + draft: false + prerelease: false + files: release/PROTATool-v${{ github.run_number }}.zip From 3c7e6677b860989098403f7af71d6014ebd1197e Mon Sep 17 00:00:00 2001 From: DeDaMrAzR <43572083+DeDaMrAzR@users.noreply.github.com> Date: Sat, 21 Dec 2024 23:34:55 +0100 Subject: [PATCH 02/26] Update build.yml test --- .github/workflows/build.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0309c4b..d532aca 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,4 +1,4 @@ -name: Build and release PROTATool +name: Build and release PROTA Tool on: push: @@ -63,7 +63,7 @@ jobs: - name: Download Build Artifacts uses: actions/download-artifact@v4 with: - name: PROTATool + name: PROTA Tool - name: Recreate Directory Structure run: | @@ -86,10 +86,10 @@ jobs: uses: softprops/action-gh-release@v2 with: tag_name: v${{ github.run_number }} - name: PROTATool v${{ github.run_number }} + name: PROTA Tool v${{ github.run_number }} body: | Automated release for PROTATool. Includes the latest .exe and .dll files. draft: false prerelease: false - files: release/PROTATool-v${{ github.run_number }}.zip + files: release/PROTA Tool-v${{ github.run_number }}.zip From 8e0eead8d6d08416f2efbebf3a134a4a4f4c183b Mon Sep 17 00:00:00 2001 From: DeDaMrAzR <43572083+DeDaMrAzR@users.noreply.github.com> Date: Sat, 21 Dec 2024 23:52:59 +0100 Subject: [PATCH 03/26] Update build.yml --- .github/workflows/build.yml | 62 +++++++++++++++++++++++++++++++++---- 1 file changed, 56 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d532aca..12e8ca0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,3 +1,49 @@ +### .csproj Observations +The `.csproj` file defines the structure of the project, including references, build configurations, and dependencies. Based on the build log, several issues require attention: + +1. **Framework Targeting**: + - Ensure the target framework in `.csproj` is compatible with all NuGet packages and assemblies (e.g., `.NETFramework v4.8`). + +2. **Dependencies**: + - Update the `.csproj` file to explicitly include: + - `Microsoft.Bcl.AsyncInterfaces` version `9.0.0` + - `Octokit` version `13.0.1` + - `System.IO.Compression` version `4.1.2` + - Use the exact versions required to avoid compatibility issues. + +3. **Output Configuration**: + - Verify the `OutDir` is set to `BuildOutput\Release\` in `.csproj` to match the `build.yml`. + +### Updated build.yml +The `build.yml` file outlines the build and release process in GitHub Actions. + +#### Issues or Potential Improvements +1. **NuGet Package Restoration**: + - Update NuGet restore to include validation: + ```yaml + - name: Validate NuGet Packages + run: dir PROTATool/packages + ``` + +2. **Output Directory**: + - Ensure the `Create Output Directory` step aligns with `.csproj` settings (e.g., `OutDir=BuildOutput\Release\`). + +3. **Artifact Upload**: + - Adjust paths in the `Upload Build Artifacts` step to avoid mismatches: + ```yaml + path: + BuildOutput/Release/*.exe + BuildOutput/Release/*.dll + ``` + +4. **Release Creation**: + - Validate paths in `Compress-Archive` to match the output directory. + +5. **MSBuild Configuration**: + - Ensure `/p:Configuration=Release` and `OutDir` are consistent with `.csproj`. + +#### Suggested Updates to build.yml +```yaml name: Build and release PROTA Tool on: @@ -24,7 +70,10 @@ jobs: uses: NuGet/setup-nuget@v2 - name: Restore NuGet packages - run: nuget restore PROTATool/PROTATool.csproj -SolutionDirectory . + run: nuget restore PROTATool/PROTATool.csproj + + - name: Validate NuGet Packages + run: dir PROTATool/packages - name: Create Output Directory run: mkdir -p BuildOutput/Release @@ -43,14 +92,14 @@ jobs: with: name: PROTATool path: | - PROTATool/BuildOutput/Release/*.exe - PROTATool/BuildOutput/Release/*.dll + BuildOutput/Release/*.exe + BuildOutput/Release/*.dll if-no-files-found: warn - name: Debug Build Output Directory run: | echo "Contents of BuildOutput/Release:" - dir PROTATool/BuildOutput/Release + dir BuildOutput/Release release: needs: build @@ -63,7 +112,7 @@ jobs: - name: Download Build Artifacts uses: actions/download-artifact@v4 with: - name: PROTA Tool + name: PROTATool - name: Recreate Directory Structure run: | @@ -92,4 +141,5 @@ jobs: Includes the latest .exe and .dll files. draft: false prerelease: false - files: release/PROTA Tool-v${{ github.run_number }}.zip + files: release/PROTATool-v${{ github.run_number }}.zip +``` From 4be4d53ecf5970cbfd35b57c34574aadb5cbe984 Mon Sep 17 00:00:00 2001 From: DeDaMrAzR <43572083+DeDaMrAzR@users.noreply.github.com> Date: Sat, 21 Dec 2024 23:54:30 +0100 Subject: [PATCH 04/26] Update build.yml --- .github/workflows/build.yml | 46 ------------------------------------- 1 file changed, 46 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 12e8ca0..7d9de02 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,49 +1,3 @@ -### .csproj Observations -The `.csproj` file defines the structure of the project, including references, build configurations, and dependencies. Based on the build log, several issues require attention: - -1. **Framework Targeting**: - - Ensure the target framework in `.csproj` is compatible with all NuGet packages and assemblies (e.g., `.NETFramework v4.8`). - -2. **Dependencies**: - - Update the `.csproj` file to explicitly include: - - `Microsoft.Bcl.AsyncInterfaces` version `9.0.0` - - `Octokit` version `13.0.1` - - `System.IO.Compression` version `4.1.2` - - Use the exact versions required to avoid compatibility issues. - -3. **Output Configuration**: - - Verify the `OutDir` is set to `BuildOutput\Release\` in `.csproj` to match the `build.yml`. - -### Updated build.yml -The `build.yml` file outlines the build and release process in GitHub Actions. - -#### Issues or Potential Improvements -1. **NuGet Package Restoration**: - - Update NuGet restore to include validation: - ```yaml - - name: Validate NuGet Packages - run: dir PROTATool/packages - ``` - -2. **Output Directory**: - - Ensure the `Create Output Directory` step aligns with `.csproj` settings (e.g., `OutDir=BuildOutput\Release\`). - -3. **Artifact Upload**: - - Adjust paths in the `Upload Build Artifacts` step to avoid mismatches: - ```yaml - path: - BuildOutput/Release/*.exe - BuildOutput/Release/*.dll - ``` - -4. **Release Creation**: - - Validate paths in `Compress-Archive` to match the output directory. - -5. **MSBuild Configuration**: - - Ensure `/p:Configuration=Release` and `OutDir` are consistent with `.csproj`. - -#### Suggested Updates to build.yml -```yaml name: Build and release PROTA Tool on: From 3959f324719c9959ec31b5984140270f9ef18ee4 Mon Sep 17 00:00:00 2001 From: DeDaMrAzR <43572083+DeDaMrAzR@users.noreply.github.com> Date: Sat, 21 Dec 2024 23:54:54 +0100 Subject: [PATCH 05/26] Update build.yml --- .github/workflows/build.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7d9de02..fae738a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -96,4 +96,3 @@ jobs: draft: false prerelease: false files: release/PROTATool-v${{ github.run_number }}.zip -``` From 49e0ccb3bf96301cfc2a5c8170b631a0e8c49933 Mon Sep 17 00:00:00 2001 From: DeDaMrAzR <43572083+DeDaMrAzR@users.noreply.github.com> Date: Sun, 22 Dec 2024 00:00:21 +0100 Subject: [PATCH 06/26] Update build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fae738a..6d605ab 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -24,7 +24,7 @@ jobs: uses: NuGet/setup-nuget@v2 - name: Restore NuGet packages - run: nuget restore PROTATool/PROTATool.csproj + run: nuget restore PROTATool/PROTATool.csproj -SolutionDirectory PROTATool - name: Validate NuGet Packages run: dir PROTATool/packages From e9e88e06ebcd381c0b9a2600323e812eef36dddf Mon Sep 17 00:00:00 2001 From: DeDaMrAzR <43572083+DeDaMrAzR@users.noreply.github.com> Date: Sun, 22 Dec 2024 00:04:43 +0100 Subject: [PATCH 07/26] Update build.yml --- .github/workflows/build.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6d605ab..5aa261e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -68,6 +68,11 @@ jobs: with: name: PROTATool + - name: Debug Download Artifacts + run: | + echo "Downloaded artifacts:" + dir . + - name: Recreate Directory Structure run: | echo "Recreating BuildOutput directory..." From 32d64318ea00de92911bf52b3929b4787b63449c Mon Sep 17 00:00:00 2001 From: DeDaMrAzR <43572083+DeDaMrAzR@users.noreply.github.com> Date: Sun, 22 Dec 2024 00:08:30 +0100 Subject: [PATCH 08/26] Update build.yml --- .github/workflows/build.yml | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5aa261e..b7bbcd0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -35,11 +35,10 @@ jobs: - name: Build the project run: msbuild PROTATool/PROTATool.csproj /p:Configuration=Release /p:OutDir=BuildOutput\Release\ - - name: Debug Build Output + - name: Debug Build Output Directory run: | - echo "Checking output directory..." - dir BuildOutput - dir BuildOutput\Release + echo "Checking contents of BuildOutput/Release:" + dir BuildOutput/Release - name: Upload Build Artifacts uses: actions/upload-artifact@v4 @@ -50,11 +49,6 @@ jobs: BuildOutput/Release/*.dll if-no-files-found: warn - - name: Debug Build Output Directory - run: | - echo "Contents of BuildOutput/Release:" - dir BuildOutput/Release - release: needs: build runs-on: windows-latest From d4c1561e2923ae242bf47cd2add871bd4776d411 Mon Sep 17 00:00:00 2001 From: DeDaMrAzR <43572083+DeDaMrAzR@users.noreply.github.com> Date: Sun, 22 Dec 2024 00:14:19 +0100 Subject: [PATCH 09/26] Update build.yml --- .github/workflows/build.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b7bbcd0..a5e639a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -37,7 +37,7 @@ jobs: - name: Debug Build Output Directory run: | - echo "Checking contents of BuildOutput/Release:" + echo "Contents of BuildOutput/Release:" dir BuildOutput/Release - name: Upload Build Artifacts @@ -57,6 +57,11 @@ jobs: - name: Checkout repository uses: actions/checkout@v4 + - name: List Available Artifacts + run: | + echo "Checking available artifacts in this run:" + dir . + - name: Download Build Artifacts uses: actions/download-artifact@v4 with: From 4d061c4742264397932a267d911294193714cf3f Mon Sep 17 00:00:00 2001 From: DeDaMrAzR <43572083+DeDaMrAzR@users.noreply.github.com> Date: Sun, 22 Dec 2024 00:18:36 +0100 Subject: [PATCH 10/26] Update build.yml --- .github/workflows/build.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a5e639a..5792ec7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -33,7 +33,7 @@ jobs: run: mkdir -p BuildOutput/Release - name: Build the project - run: msbuild PROTATool/PROTATool.csproj /p:Configuration=Release /p:OutDir=BuildOutput\Release\ + run: msbuild PROTATool/PROTATool.csproj /p:Configuration=Release /p:OutDir=BuildOutput\\Release\\ - name: Debug Build Output Directory run: | @@ -47,7 +47,7 @@ jobs: path: | BuildOutput/Release/*.exe BuildOutput/Release/*.dll - if-no-files-found: warn + if-no-files-found: error release: needs: build @@ -59,7 +59,7 @@ jobs: - name: List Available Artifacts run: | - echo "Checking available artifacts in this run:" + echo "Available artifacts in this run:" dir . - name: Download Build Artifacts @@ -87,7 +87,7 @@ jobs: - name: Create ZIP File run: | mkdir release - powershell Compress-Archive -Path "BuildOutput/Release/*" -DestinationPath "release/PROTATool-v${{ github.run_number }}.zip" + powershell Compress-Archive -Path \"BuildOutput/Release/*\" -DestinationPath \"release/PROTATool-v${{ github.run_number }}.zip\" - name: Create GitHub Release uses: softprops/action-gh-release@v2 From ccf240321ef6c4188d4d9e12ae6654ce060226d4 Mon Sep 17 00:00:00 2001 From: DeDaMrAzR <43572083+DeDaMrAzR@users.noreply.github.com> Date: Sun, 22 Dec 2024 00:23:45 +0100 Subject: [PATCH 11/26] Update build.yml --- .github/workflows/build.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5792ec7..458bb43 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -29,14 +29,14 @@ jobs: - name: Validate NuGet Packages run: dir PROTATool/packages - - name: Create Output Directory - run: mkdir -p BuildOutput/Release - - name: Build the project - run: msbuild PROTATool/PROTATool.csproj /p:Configuration=Release /p:OutDir=BuildOutput\\Release\\ + run: msbuild PROTATool/PROTATool.csproj /p:Configuration=Release /p:OutDir=BuildOutput\Release\ - - name: Debug Build Output Directory + - name: Debug Build Output run: | + echo "Checking OutputPath directories..." + echo "Contents of bin/Release:" + dir bin/Release echo "Contents of BuildOutput/Release:" dir BuildOutput/Release @@ -87,7 +87,7 @@ jobs: - name: Create ZIP File run: | mkdir release - powershell Compress-Archive -Path \"BuildOutput/Release/*\" -DestinationPath \"release/PROTATool-v${{ github.run_number }}.zip\" + powershell Compress-Archive -Path "BuildOutput/Release/*" -DestinationPath "release/PROTATool-v${{ github.run_number }}.zip" - name: Create GitHub Release uses: softprops/action-gh-release@v2 From bec5b69cee986641d8cf77fba0c518575a530041 Mon Sep 17 00:00:00 2001 From: DeDaMrAzR <43572083+DeDaMrAzR@users.noreply.github.com> Date: Sun, 22 Dec 2024 00:28:18 +0100 Subject: [PATCH 12/26] Update build.yml --- .github/workflows/build.yml | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 458bb43..c18d001 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -30,23 +30,21 @@ jobs: run: dir PROTATool/packages - name: Build the project - run: msbuild PROTATool/PROTATool.csproj /p:Configuration=Release /p:OutDir=BuildOutput\Release\ + run: msbuild PROTATool/PROTATool.csproj /p:Configuration=Release - name: Debug Build Output run: | echo "Checking OutputPath directories..." - echo "Contents of bin/Release:" + echo "Contents of bin/Release:" # Highlighted: Matches .csproj output path dir bin/Release - echo "Contents of BuildOutput/Release:" - dir BuildOutput/Release - name: Upload Build Artifacts uses: actions/upload-artifact@v4 with: name: PROTATool path: | - BuildOutput/Release/*.exe - BuildOutput/Release/*.dll + bin/Release/*.exe # Highlighted: Updated to match .csproj OutputPath + bin/Release/*.dll if-no-files-found: error release: @@ -76,8 +74,8 @@ jobs: run: | echo "Recreating BuildOutput directory..." mkdir -p BuildOutput/Release - move *.exe BuildOutput/Release/ - move *.dll BuildOutput/Release/ + move bin/Release/*.exe BuildOutput/Release/ # Highlighted: Matches .csproj output path + move bin/Release/*.dll BuildOutput/Release/ - name: Debug Downloaded Artifacts run: | From 6f55f641f7e5263d00b898f3789801b64af89f77 Mon Sep 17 00:00:00 2001 From: DeDaMrAzR <43572083+DeDaMrAzR@users.noreply.github.com> Date: Sun, 22 Dec 2024 00:35:21 +0100 Subject: [PATCH 13/26] Update build.yml --- .github/workflows/build.yml | 35 ++++++++++++++--------------------- 1 file changed, 14 insertions(+), 21 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c18d001..1cc96ba 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -26,25 +26,22 @@ jobs: - name: Restore NuGet packages run: nuget restore PROTATool/PROTATool.csproj -SolutionDirectory PROTATool - - name: Validate NuGet Packages - run: dir PROTATool/packages - - name: Build the project run: msbuild PROTATool/PROTATool.csproj /p:Configuration=Release - name: Debug Build Output run: | - echo "Checking OutputPath directories..." - echo "Contents of bin/Release:" # Highlighted: Matches .csproj output path - dir bin/Release + echo "Verifying output in bin/Release directory..." + dir PROTATool/bin/Release # Highlighted: Ensure exact directory location - name: Upload Build Artifacts uses: actions/upload-artifact@v4 with: name: PROTATool path: | - bin/Release/*.exe # Highlighted: Updated to match .csproj OutputPath - bin/Release/*.dll + PROTATool/bin/Release/*.exe # Highlighted: Matches confirmed build output + PROTATool/bin/Release/*.dll + PROTATool/bin/Release/*.pdb if-no-files-found: error release: @@ -55,11 +52,6 @@ jobs: - name: Checkout repository uses: actions/checkout@v4 - - name: List Available Artifacts - run: | - echo "Available artifacts in this run:" - dir . - - name: Download Build Artifacts uses: actions/download-artifact@v4 with: @@ -67,25 +59,26 @@ jobs: - name: Debug Download Artifacts run: | - echo "Downloaded artifacts:" + echo "Verifying downloaded artifacts..." dir . - name: Recreate Directory Structure run: | - echo "Recreating BuildOutput directory..." + echo "Recreating directory for release packaging..." mkdir -p BuildOutput/Release - move bin/Release/*.exe BuildOutput/Release/ # Highlighted: Matches .csproj output path - move bin/Release/*.dll BuildOutput/Release/ + move PROTATool/bin/Release/*.exe BuildOutput/Release/ # Highlighted: Matches artifact paths + move PROTATool/bin/Release/*.dll BuildOutput/Release/ + move PROTATool/bin/Release/*.pdb BuildOutput/Release/ - - name: Debug Downloaded Artifacts + - name: Debug Recreated Directory run: | - echo "Downloaded artifacts in BuildOutput/Release:" + echo "Verifying files in BuildOutput/Release directory..." dir BuildOutput/Release - name: Create ZIP File run: | mkdir release - powershell Compress-Archive -Path "BuildOutput/Release/*" -DestinationPath "release/PROTATool-v${{ github.run_number }}.zip" + powershell Compress-Archive -Path \"BuildOutput/Release/*\" -DestinationPath \"release/PROTATool-v${{ github.run_number }}.zip\" - name: Create GitHub Release uses: softprops/action-gh-release@v2 @@ -94,7 +87,7 @@ jobs: name: PROTA Tool v${{ github.run_number }} body: | Automated release for PROTATool. - Includes the latest .exe and .dll files. + Includes the latest .exe, .dll, and .pdb files. draft: false prerelease: false files: release/PROTATool-v${{ github.run_number }}.zip From 7aef755a2df8de121236ae0656d4e98bc5c4f1e6 Mon Sep 17 00:00:00 2001 From: DeDaMrAzR <43572083+DeDaMrAzR@users.noreply.github.com> Date: Sun, 22 Dec 2024 00:48:11 +0100 Subject: [PATCH 14/26] Update build.yml --- .github/workflows/build.yml | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1cc96ba..805269c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -47,39 +47,39 @@ jobs: release: needs: build runs-on: windows-latest - + steps: - name: Checkout repository uses: actions/checkout@v4 - + - name: Download Build Artifacts uses: actions/download-artifact@v4 with: name: PROTATool - - - name: Debug Download Artifacts + + - name: Debug Artifact Content run: | - echo "Verifying downloaded artifacts..." - dir . - + echo "Checking downloaded artifact content:" + dir -Recurse + - name: Recreate Directory Structure run: | echo "Recreating directory for release packaging..." mkdir -p BuildOutput/Release - move PROTATool/bin/Release/*.exe BuildOutput/Release/ # Highlighted: Matches artifact paths - move PROTATool/bin/Release/*.dll BuildOutput/Release/ - move PROTATool/bin/Release/*.pdb BuildOutput/Release/ - + move *.exe BuildOutput/Release/ # Highlighted: Adjusted to work with downloaded files + move *.dll BuildOutput/Release/ + move *.pdb BuildOutput/Release/ + - name: Debug Recreated Directory run: | echo "Verifying files in BuildOutput/Release directory..." dir BuildOutput/Release - + - name: Create ZIP File run: | mkdir release powershell Compress-Archive -Path \"BuildOutput/Release/*\" -DestinationPath \"release/PROTATool-v${{ github.run_number }}.zip\" - + - name: Create GitHub Release uses: softprops/action-gh-release@v2 with: @@ -91,3 +91,4 @@ jobs: draft: false prerelease: false files: release/PROTATool-v${{ github.run_number }}.zip + From 30e0cf622a11853c20b9f812f250a4472dcfe8a4 Mon Sep 17 00:00:00 2001 From: DeDaMrAzR <43572083+DeDaMrAzR@users.noreply.github.com> Date: Sun, 22 Dec 2024 00:51:41 +0100 Subject: [PATCH 15/26] Update build.yml --- .github/workflows/build.yml | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 805269c..0aa4339 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -47,39 +47,40 @@ jobs: release: needs: build runs-on: windows-latest - + steps: - name: Checkout repository uses: actions/checkout@v4 - + - name: Download Build Artifacts uses: actions/download-artifact@v4 with: name: PROTATool - + - name: Debug Artifact Content run: | echo "Checking downloaded artifact content:" dir -Recurse - + - name: Recreate Directory Structure run: | echo "Recreating directory for release packaging..." mkdir -p BuildOutput/Release - move *.exe BuildOutput/Release/ # Highlighted: Adjusted to work with downloaded files + move *.exe BuildOutput/Release/ move *.dll BuildOutput/Release/ move *.pdb BuildOutput/Release/ - - - name: Debug Recreated Directory + + - name: Debug Archive Files run: | - echo "Verifying files in BuildOutput/Release directory..." + echo "Verifying files in BuildOutput/Release:" dir BuildOutput/Release - + - name: Create ZIP File run: | - mkdir release - powershell Compress-Archive -Path \"BuildOutput/Release/*\" -DestinationPath \"release/PROTATool-v${{ github.run_number }}.zip\" - + echo "Creating archive..." + mkdir -p release + powershell Compress-Archive -Path \"BuildOutput\\Release\\*\" -DestinationPath \"release\\PROTATool-v${{ github.run_number }}.zip\" + - name: Create GitHub Release uses: softprops/action-gh-release@v2 with: From 7f9cf5865ff8b0ed80fb75721b6b5a8ee621b55f Mon Sep 17 00:00:00 2001 From: DeDaMrAzR <43572083+DeDaMrAzR@users.noreply.github.com> Date: Sun, 22 Dec 2024 00:54:18 +0100 Subject: [PATCH 16/26] Update build.yml --- .github/workflows/build.yml | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0aa4339..4672ff1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -32,14 +32,14 @@ jobs: - name: Debug Build Output run: | echo "Verifying output in bin/Release directory..." - dir PROTATool/bin/Release # Highlighted: Ensure exact directory location + dir PROTATool/bin/Release - name: Upload Build Artifacts uses: actions/upload-artifact@v4 with: name: PROTATool path: | - PROTATool/bin/Release/*.exe # Highlighted: Matches confirmed build output + PROTATool/bin/Release/*.exe PROTATool/bin/Release/*.dll PROTATool/bin/Release/*.pdb if-no-files-found: error @@ -57,9 +57,9 @@ jobs: with: name: PROTATool - - name: Debug Artifact Content + - name: Debug Downloaded Files run: | - echo "Checking downloaded artifact content:" + echo "Verifying downloaded files:" dir -Recurse - name: Recreate Directory Structure @@ -70,14 +70,13 @@ jobs: move *.dll BuildOutput/Release/ move *.pdb BuildOutput/Release/ - - name: Debug Archive Files + - name: Debug Recreated Directory run: | - echo "Verifying files in BuildOutput/Release:" + echo "Verifying files in BuildOutput/Release directory..." dir BuildOutput/Release - name: Create ZIP File run: | - echo "Creating archive..." mkdir -p release powershell Compress-Archive -Path \"BuildOutput\\Release\\*\" -DestinationPath \"release\\PROTATool-v${{ github.run_number }}.zip\" @@ -92,4 +91,3 @@ jobs: draft: false prerelease: false files: release/PROTATool-v${{ github.run_number }}.zip - From 9021b0e25cb2976b9edf890cc614c1c8eb751535 Mon Sep 17 00:00:00 2001 From: DeDaMrAzR <43572083+DeDaMrAzR@users.noreply.github.com> Date: Sun, 22 Dec 2024 00:58:20 +0100 Subject: [PATCH 17/26] Update build.yml --- .github/workflows/build.yml | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4672ff1..5b8a5bd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -47,21 +47,21 @@ jobs: release: needs: build runs-on: windows-latest - + steps: - name: Checkout repository uses: actions/checkout@v4 - + - name: Download Build Artifacts uses: actions/download-artifact@v4 with: name: PROTATool - + - name: Debug Downloaded Files run: | - echo "Verifying downloaded files:" + echo "Verifying downloaded files and directory structure:" dir -Recurse - + - name: Recreate Directory Structure run: | echo "Recreating directory for release packaging..." @@ -69,22 +69,23 @@ jobs: move *.exe BuildOutput/Release/ move *.dll BuildOutput/Release/ move *.pdb BuildOutput/Release/ - - - name: Debug Recreated Directory + + - name: Debug Files in BuildOutput/Release run: | - echo "Verifying files in BuildOutput/Release directory..." + echo "Verifying files in BuildOutput/Release:" dir BuildOutput/Release - + - name: Create ZIP File run: | + echo "Creating archive..." mkdir -p release - powershell Compress-Archive -Path \"BuildOutput\\Release\\*\" -DestinationPath \"release\\PROTATool-v${{ github.run_number }}.zip\" - + powershell Compress-Archive -Path "BuildOutput\\Release\\*" -DestinationPath "release\\PROTATool-v${{ github.run_number }}.zip" + - name: Create GitHub Release uses: softprops/action-gh-release@v2 with: tag_name: v${{ github.run_number }} - name: PROTA Tool v${{ github.run_number }} + name: PROTATool v${{ github.run_number }} body: | Automated release for PROTATool. Includes the latest .exe, .dll, and .pdb files. From c4fdf2c14c4b374d8a1b8cf5344df26c86db2a72 Mon Sep 17 00:00:00 2001 From: DeDaMrAzR <43572083+DeDaMrAzR@users.noreply.github.com> Date: Sun, 22 Dec 2024 01:28:10 +0100 Subject: [PATCH 18/26] Update build.yml --- .github/workflows/build.yml | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5b8a5bd..83de32b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -42,26 +42,27 @@ jobs: PROTATool/bin/Release/*.exe PROTATool/bin/Release/*.dll PROTATool/bin/Release/*.pdb + PROTATool/bin/Release/PROTATool.exe.config # Include the .config file if-no-files-found: error release: needs: build runs-on: windows-latest - + steps: - name: Checkout repository uses: actions/checkout@v4 - + - name: Download Build Artifacts uses: actions/download-artifact@v4 with: name: PROTATool - + - name: Debug Downloaded Files run: | echo "Verifying downloaded files and directory structure:" dir -Recurse - + - name: Recreate Directory Structure run: | echo "Recreating directory for release packaging..." @@ -69,26 +70,27 @@ jobs: move *.exe BuildOutput/Release/ move *.dll BuildOutput/Release/ move *.pdb BuildOutput/Release/ - + move *.config BuildOutput/Release/ # Ensure the .config file is moved + - name: Debug Files in BuildOutput/Release run: | echo "Verifying files in BuildOutput/Release:" dir BuildOutput/Release - + - name: Create ZIP File run: | echo "Creating archive..." mkdir -p release - powershell Compress-Archive -Path "BuildOutput\\Release\\*" -DestinationPath "release\\PROTATool-v${{ github.run_number }}.zip" - + powershell Compress-Archive -Path \"BuildOutput\\Release\\*\" -DestinationPath \"release\\PROTATool-v${{ github.run_number }}.zip\" + - name: Create GitHub Release uses: softprops/action-gh-release@v2 with: tag_name: v${{ github.run_number }} - name: PROTATool v${{ github.run_number }} + name: PROTA Tool v${{ github.run_number }} body: | Automated release for PROTATool. - Includes the latest .exe, .dll, and .pdb files. + Includes the latest .exe, .dll, .pdb, and .config files. draft: false prerelease: false files: release/PROTATool-v${{ github.run_number }}.zip From 97dd5ab1bd4f1cccabc0bb57138665b7c8908ad0 Mon Sep 17 00:00:00 2001 From: DeDaMrAzR <43572083+DeDaMrAzR@users.noreply.github.com> Date: Sun, 22 Dec 2024 01:32:31 +0100 Subject: [PATCH 19/26] Update build.yml --- .github/workflows/build.yml | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 83de32b..7aa001f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -48,21 +48,21 @@ jobs: release: needs: build runs-on: windows-latest - + steps: - name: Checkout repository uses: actions/checkout@v4 - + - name: Download Build Artifacts uses: actions/download-artifact@v4 with: name: PROTATool - + - name: Debug Downloaded Files run: | echo "Verifying downloaded files and directory structure:" dir -Recurse - + - name: Recreate Directory Structure run: | echo "Recreating directory for release packaging..." @@ -70,19 +70,25 @@ jobs: move *.exe BuildOutput/Release/ move *.dll BuildOutput/Release/ move *.pdb BuildOutput/Release/ - move *.config BuildOutput/Release/ # Ensure the .config file is moved - - - name: Debug Files in BuildOutput/Release + move *.config BuildOutput/Release/ + + - name: Debug Archive Files run: | - echo "Verifying files in BuildOutput/Release:" + echo "Checking BuildOutput/Release for files:" dir BuildOutput/Release - + + - name: Validate BuildOutput/Release + run: | + if (!(Test-Path -Path BuildOutput/Release/*)) { + Write-Error \"BuildOutput/Release is empty or does not exist.\" + } + - name: Create ZIP File run: | echo "Creating archive..." mkdir -p release - powershell Compress-Archive -Path \"BuildOutput\\Release\\*\" -DestinationPath \"release\\PROTATool-v${{ github.run_number }}.zip\" - + powershell Compress-Archive -Path \"BuildOutput/Release/*\" -DestinationPath \"release/PROTATool-v${{ github.run_number }}.zip\" + - name: Create GitHub Release uses: softprops/action-gh-release@v2 with: From a95866b1a65da74d2f92d428b4c43b6fe6080244 Mon Sep 17 00:00:00 2001 From: DeDaMrAzR <43572083+DeDaMrAzR@users.noreply.github.com> Date: Sun, 22 Dec 2024 01:38:17 +0100 Subject: [PATCH 20/26] Update build.yml --- .github/workflows/build.yml | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7aa001f..a1a6fe6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -70,33 +70,27 @@ jobs: move *.exe BuildOutput/Release/ move *.dll BuildOutput/Release/ move *.pdb BuildOutput/Release/ - move *.config BuildOutput/Release/ + move *.config BuildOutput/Release/ # Ensure the .config file is moved - - name: Debug Archive Files + - name: Debug Files in BuildOutput/Release run: | - echo "Checking BuildOutput/Release for files:" + echo "Verifying files in BuildOutput/Release:" dir BuildOutput/Release - - name: Validate BuildOutput/Release - run: | - if (!(Test-Path -Path BuildOutput/Release/*)) { - Write-Error \"BuildOutput/Release is empty or does not exist.\" - } - - name: Create ZIP File run: | echo "Creating archive..." mkdir -p release - powershell Compress-Archive -Path \"BuildOutput/Release/*\" -DestinationPath \"release/PROTATool-v${{ github.run_number }}.zip\" + powershell Compress-Archive -Path "BuildOutput\\Release\\*" -DestinationPath "release\\PROTATool-v${{ github.run_number }}.zip" - name: Create GitHub Release uses: softprops/action-gh-release@v2 with: tag_name: v${{ github.run_number }} - name: PROTA Tool v${{ github.run_number }} + name: PROTATool v${{ github.run_number }} body: | Automated release for PROTATool. - Includes the latest .exe, .dll, .pdb, and .config files. + Includes the latest .exe, .dll, and .pdb files. draft: false prerelease: false files: release/PROTATool-v${{ github.run_number }}.zip From 8ac0f8de6e4b71870b6f5d6e2218c27f386860e7 Mon Sep 17 00:00:00 2001 From: DeDaMrAzR <43572083+DeDaMrAzR@users.noreply.github.com> Date: Sun, 22 Dec 2024 01:44:21 +0100 Subject: [PATCH 21/26] Update build.yml --- .github/workflows/build.yml | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a1a6fe6..f6453d2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -29,10 +29,14 @@ jobs: - name: Build the project run: msbuild PROTATool/PROTATool.csproj /p:Configuration=Release - - name: Debug Build Output + - name: Debug Config File run: | - echo "Verifying output in bin/Release directory..." - dir PROTATool/bin/Release + echo "Checking for PROTATool.exe.config..." + if (Test-Path PROTATool/bin/Release/PROTATool.exe.config) { + echo "PROTATool.exe.config exists." + } else { + Write-Error "PROTATool.exe.config is missing." + } - name: Upload Build Artifacts uses: actions/upload-artifact@v4 @@ -42,7 +46,7 @@ jobs: PROTATool/bin/Release/*.exe PROTATool/bin/Release/*.dll PROTATool/bin/Release/*.pdb - PROTATool/bin/Release/PROTATool.exe.config # Include the .config file + PROTATool/bin/Release/PROTATool.exe.config if-no-files-found: error release: @@ -58,7 +62,7 @@ jobs: with: name: PROTATool - - name: Debug Downloaded Files + - name: Debug Downloaded Artifacts run: | echo "Verifying downloaded files and directory structure:" dir -Recurse @@ -70,7 +74,7 @@ jobs: move *.exe BuildOutput/Release/ move *.dll BuildOutput/Release/ move *.pdb BuildOutput/Release/ - move *.config BuildOutput/Release/ # Ensure the .config file is moved + move *.config BuildOutput/Release/ - name: Debug Files in BuildOutput/Release run: | @@ -90,7 +94,7 @@ jobs: name: PROTATool v${{ github.run_number }} body: | Automated release for PROTATool. - Includes the latest .exe, .dll, and .pdb files. + Includes the latest .exe, .dll, .pdb, and .config files. draft: false prerelease: false files: release/PROTATool-v${{ github.run_number }}.zip From 158c1f6369a9b9e4bab73067824b0f5913b0c884 Mon Sep 17 00:00:00 2001 From: DeDaMrAzR <43572083+DeDaMrAzR@users.noreply.github.com> Date: Tue, 24 Dec 2024 10:41:43 +0100 Subject: [PATCH 22/26] name change from Form1 to PROTATool --- PROTATool/Form1.Designer.cs | 10 +++++----- PROTATool/Form1.cs | 32 ++++++++++++++++---------------- PROTATool/GitUtils.cs | 4 ++-- PROTATool/Platforms.cs | 4 +++- PROTATool/Program.cs | 2 +- 5 files changed, 27 insertions(+), 25 deletions(-) diff --git a/PROTATool/Form1.Designer.cs b/PROTATool/Form1.Designer.cs index ebef3f1..7d34fc8 100644 --- a/PROTATool/Form1.Designer.cs +++ b/PROTATool/Form1.Designer.cs @@ -1,6 +1,6 @@ namespace PROTATool { - partial class Form1 + partial class PROTATool { /// /// Required designer variable. @@ -140,7 +140,7 @@ private void InitializeComponent() this.textBoxPassword.Text = "??????????????"; this.textBoxPassword.UseSystemPasswordChar = true; // - // Form1 + // PROTATool // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; @@ -156,9 +156,9 @@ private void InitializeComponent() this.Controls.Add(this.textBoxPR); this.Controls.Add(this.label1); this.Margin = new System.Windows.Forms.Padding(2); - this.Name = "Form1"; - this.Text = "Form1"; - this.Load += new System.EventHandler(this.Form1_Load); + this.Name = "PROTATool"; + this.Text = "PROTATool"; + this.Load += new System.EventHandler(this.PROTATool_Load); this.ResumeLayout(false); this.PerformLayout(); diff --git a/PROTATool/Form1.cs b/PROTATool/Form1.cs index 496908b..933bd7c 100644 --- a/PROTATool/Form1.cs +++ b/PROTATool/Form1.cs @@ -19,10 +19,10 @@ namespace PROTATool { - public partial class Form1 : Form + public partial class PROTATool : Form { Settings settings; - public Form1() + public PROTATool() { InitializeComponent(); } @@ -55,7 +55,7 @@ void startRefreshIfPossible() } private async void RefreshCommits() { - Form1.setState("Entering..."); + PROTATool.setState("Entering..."); LogUtil.log("Entering refresh commits"); string prLink = textBoxPR.Text; @@ -72,7 +72,7 @@ private async void RefreshCommits() try { - Form1.setState("Getting commits..."); + PROTATool.setState("Getting commits..."); LogUtil.log($"Fetching commits for PR: {owner}/{repo}/pull/{pullRequestNumber}"); var client = new GitHubClient(new Octokit.ProductHeaderValue("PROTATool")); @@ -117,7 +117,7 @@ private async void RefreshCommits() string youngestSha = youngestCommit.Sha; if (prevTopCommit != youngestSha) { - Form1.setState("Fetching artifacts..."); + PROTATool.setState("Fetching artifacts..."); LogUtil.log("Commit has changed, fetching artifacts..."); CommitInfo c = await GitUtils.fetchCommitInfo(owner, repo, youngestSha, pullRequestNumber.ToString()); @@ -146,7 +146,7 @@ private async void RefreshCommits() MessageBox.Show("Invalid PR link format. Please enter a valid link, e.g., https://github.com/owner/repo/pull/1234.", "Invalid Input"); } - Form1.setState("Done..."); + PROTATool.setState("Done..."); bBusy = false; LogUtil.log("Exiting refresh commits."); } @@ -171,7 +171,7 @@ private async Task sendToDevices(CommitInfo c) } private async Task sendToDevice(CommitInfo c, string ip) { - Form1.setState("Sending OTA to " + ip + "..."); + PROTATool.setState("Sending OTA to " + ip + "..."); LogUtil.log("Starting OTA " + ip + "process..."); string prefix = "OpenBK7231T_"; string ext = "rbl"; @@ -272,18 +272,18 @@ private async Task sendToDevice(CommitInfo c, string ip) } public static void setState(string s) - { - if (Singleton.InvokeRequired) - { - Singleton.Invoke(new Action(setState), s); - } - else + { + if (Singleton.InvokeRequired) + { + Singleton.Invoke(new Action(setState), s); + } + else { - Singleton.labelState.Text = "State: " + s; + Singleton.labelState.Text = "State: " + s; } } - static Form1 Singleton; - private void Form1_Load(object sender, EventArgs e) + static PROTATool Singleton; + private void PROTATool_Load(object sender, EventArgs e) { settings = Settings.Load(); settings.BindTextBox(textBoxPassword, "ApiKey"); diff --git a/PROTATool/GitUtils.cs b/PROTATool/GitUtils.cs index 95fe424..9453bba 100644 --- a/PROTATool/GitUtils.cs +++ b/PROTATool/GitUtils.cs @@ -76,7 +76,7 @@ public static async Task fetchCommitInfo(string owner, string repo, continue; if (run.Status == "in_progress") { - Form1.setState("Waiting for build to finish - " + run.Name + ""); + PROTATool.setState("Waiting for build to finish - " + run.Name + ""); LogUtil.log("Waiting for build to finish - " + run.Name + ""); await Task.Delay(5000); break; @@ -106,7 +106,7 @@ public static async Task fetchCommitInfo(string owner, string repo, } else { - Form1.setState("Waiting for build"); + PROTATool.setState("Waiting for build"); LogUtil.log("Waiting for build"); await Task.Delay(5000); } diff --git a/PROTATool/Platforms.cs b/PROTATool/Platforms.cs index 825f5b9..16ddcee 100644 --- a/PROTATool/Platforms.cs +++ b/PROTATool/Platforms.cs @@ -3,6 +3,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; +using System.Xml.XPath; namespace PROTATool { @@ -37,7 +38,8 @@ internal static Platform[] CreatePlatformsArray() new Platform { name = "OpenLN882H", extension = "_OTA.bin" }, new Platform { name = "OpenTR6260", extension = ".bin" }, new Platform { name = "OpenW600", extension = ".img" }, - new Platform { name = "OpenW800", extension = ".img" } + new Platform { name = "OpenW800", extension = ".img" }, + new Platform { name = "OpenRTL87x0C", extension = "ota.img" } }; } diff --git a/PROTATool/Program.cs b/PROTATool/Program.cs index e548d11..743234c 100644 --- a/PROTATool/Program.cs +++ b/PROTATool/Program.cs @@ -16,7 +16,7 @@ static void Main() { Application.EnableVisualStyles(); Application.SetCompatibleTextRenderingDefault(false); - Application.Run(new Form1()); + Application.Run(new PROTATool()); } } } From 6001a7e8c0c5743019c521edcaaf23a5ba12213b Mon Sep 17 00:00:00 2001 From: DeDaMrAzR <43572083+DeDaMrAzR@users.noreply.github.com> Date: Tue, 24 Dec 2024 13:07:24 +0100 Subject: [PATCH 23/26] Update Form1.cs --- PROTATool/Form1.cs | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/PROTATool/Form1.cs b/PROTATool/Form1.cs index e0f8c24..bf8bb16 100644 --- a/PROTATool/Form1.cs +++ b/PROTATool/Form1.cs @@ -171,13 +171,10 @@ private async Task sendToDevices(CommitInfo c) } private async Task sendToDevice(CommitInfo c, string ip) { -<<<<<<< HEAD + PROTATool.setState("Sending OTA to " + ip + "..."); LogUtil.log("Starting OTA " + ip + "process..."); -======= - Form1.setState("Sending OTA to " + ip + "..."); - LogUtil.log("Starting OTA " + ip + " process..."); ->>>>>>> 06f303688f1f7478be07f08510a0b90acde8fde8 + string prefix = "OpenBK7231T_"; string ext = "rbl"; From 717273e4ed78b8304999a2f59ab11c9bd1c166a9 Mon Sep 17 00:00:00 2001 From: DeDaMrAzR <43572083+DeDaMrAzR@users.noreply.github.com> Date: Tue, 24 Dec 2024 13:50:51 +0100 Subject: [PATCH 24/26] Update Platforms.cs --- PROTATool/Platforms.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PROTATool/Platforms.cs b/PROTATool/Platforms.cs index 16ddcee..8f94072 100644 --- a/PROTATool/Platforms.cs +++ b/PROTATool/Platforms.cs @@ -39,7 +39,7 @@ internal static Platform[] CreatePlatformsArray() new Platform { name = "OpenTR6260", extension = ".bin" }, new Platform { name = "OpenW600", extension = ".img" }, new Platform { name = "OpenW800", extension = ".img" }, - new Platform { name = "OpenRTL87x0C", extension = "ota.img" } + new Platform { name = "OpenRTL87x0C", extension = ".ota.img" } }; } From 5bdee13efa7aaf9c4a526bdf36e8336adda3789c Mon Sep 17 00:00:00 2001 From: DeDaMrAzR <43572083+DeDaMrAzR@users.noreply.github.com> Date: Tue, 24 Dec 2024 13:56:10 +0100 Subject: [PATCH 25/26] Update Platforms.cs corrected extension for RTL ota file --- PROTATool/Platforms.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PROTATool/Platforms.cs b/PROTATool/Platforms.cs index 8f94072..6e18842 100644 --- a/PROTATool/Platforms.cs +++ b/PROTATool/Platforms.cs @@ -39,7 +39,7 @@ internal static Platform[] CreatePlatformsArray() new Platform { name = "OpenTR6260", extension = ".bin" }, new Platform { name = "OpenW600", extension = ".img" }, new Platform { name = "OpenW800", extension = ".img" }, - new Platform { name = "OpenRTL87x0C", extension = ".ota.img" } + new Platform { name = "OpenRTL87x0C", extension = ".img" } }; } From c3f8702088e6f9e5e3d300c4ba0ca7f797b63fb4 Mon Sep 17 00:00:00 2001 From: DeDaMrAzR <43572083+DeDaMrAzR@users.noreply.github.com> Date: Tue, 24 Dec 2024 14:00:32 +0100 Subject: [PATCH 26/26] Update Platforms.cs so many spelling mistakes :X --- PROTATool/Platforms.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PROTATool/Platforms.cs b/PROTATool/Platforms.cs index 6e18842..a795bf4 100644 --- a/PROTATool/Platforms.cs +++ b/PROTATool/Platforms.cs @@ -39,7 +39,7 @@ internal static Platform[] CreatePlatformsArray() new Platform { name = "OpenTR6260", extension = ".bin" }, new Platform { name = "OpenW600", extension = ".img" }, new Platform { name = "OpenW800", extension = ".img" }, - new Platform { name = "OpenRTL87x0C", extension = ".img" } + new Platform { name = "OpenRTL87X0C", extension = ".img" } }; }