From a5a0fc6c95b89d2c2a456116756757836aacd474 Mon Sep 17 00:00:00 2001 From: JoftheV <162925657+JoftheV@users.noreply.github.com> Date: Mon, 22 Jul 2024 18:39:13 -0500 Subject: [PATCH 1/6] Create dotnet-desktop.yml --- .github/workflows/dotnet-desktop.yml | 115 +++++++++++++++++++++++++++ 1 file changed, 115 insertions(+) create mode 100644 .github/workflows/dotnet-desktop.yml diff --git a/.github/workflows/dotnet-desktop.yml b/.github/workflows/dotnet-desktop.yml new file mode 100644 index 0000000..e718dd9 --- /dev/null +++ b/.github/workflows/dotnet-desktop.yml @@ -0,0 +1,115 @@ +# This workflow uses actions that are not certified by GitHub. +# They are provided by a third-party and are governed by +# separate terms of service, privacy policy, and support +# documentation. + +# This workflow will build, test, sign and package a WPF or Windows Forms desktop application +# built on .NET Core. +# To learn how to migrate your existing application to .NET Core, +# refer to https://docs.microsoft.com/en-us/dotnet/desktop-wpf/migration/convert-project-from-net-framework +# +# To configure this workflow: +# +# 1. Configure environment variables +# GitHub sets default environment variables for every workflow run. +# Replace the variables relative to your project in the "env" section below. +# +# 2. Signing +# Generate a signing certificate in the Windows Application +# Packaging Project or add an existing signing certificate to the project. +# Next, use PowerShell to encode the .pfx file using Base64 encoding +# by running the following Powershell script to generate the output string: +# +# $pfx_cert = Get-Content '.\SigningCertificate.pfx' -Encoding Byte +# [System.Convert]::ToBase64String($pfx_cert) | Out-File 'SigningCertificate_Encoded.txt' +# +# Open the output file, SigningCertificate_Encoded.txt, and copy the +# string inside. Then, add the string to the repo as a GitHub secret +# and name it "Base64_Encoded_Pfx." +# For more information on how to configure your signing certificate for +# this workflow, refer to https://github.com/microsoft/github-actions-for-desktop-apps#signing +# +# Finally, add the signing certificate password to the repo as a secret and name it "Pfx_Key". +# See "Build the Windows Application Packaging project" below to see how the secret is used. +# +# For more information on GitHub Actions, refer to https://github.com/features/actions +# For a complete CI/CD sample to get started with GitHub Action workflows for Desktop Applications, +# refer to https://github.com/microsoft/github-actions-for-desktop-apps + +name: .NET Core Desktop + +on: + push: + branches: [ "master" ] + pull_request: + branches: [ "master" ] + +jobs: + + build: + + strategy: + matrix: + configuration: [Debug, Release] + + runs-on: windows-latest # For a list of available runner types, refer to + # https://help.github.com/en/actions/reference/workflow-syntax-for-github-actions#jobsjob_idruns-on + + env: + Solution_Name: your-solution-name # Replace with your solution name, i.e. MyWpfApp.sln. + Test_Project_Path: your-test-project-path # Replace with the path to your test project, i.e. MyWpfApp.Tests\MyWpfApp.Tests.csproj. + Wap_Project_Directory: your-wap-project-directory-name # Replace with the Wap project directory relative to the solution, i.e. MyWpfApp.Package. + Wap_Project_Path: your-wap-project-path # Replace with the path to your Wap project, i.e. MyWpf.App.Package\MyWpfApp.Package.wapproj. + + steps: + - name: Checkout + uses: actions/checkout@v4 + with: + fetch-depth: 0 + + # Install the .NET Core workload + - name: Install .NET Core + uses: actions/setup-dotnet@v4 + with: + dotnet-version: 8.0.x + + # Add MSBuild to the PATH: https://github.com/microsoft/setup-msbuild + - name: Setup MSBuild.exe + uses: microsoft/setup-msbuild@v2 + + # Execute all unit tests in the solution + - name: Execute unit tests + run: dotnet test + + # Restore the application to populate the obj folder with RuntimeIdentifiers + - name: Restore the application + run: msbuild $env:Solution_Name /t:Restore /p:Configuration=$env:Configuration + env: + Configuration: ${{ matrix.configuration }} + + # Decode the base 64 encoded pfx and save the Signing_Certificate + - name: Decode the pfx + run: | + $pfx_cert_byte = [System.Convert]::FromBase64String("${{ secrets.Base64_Encoded_Pfx }}") + $certificatePath = Join-Path -Path $env:Wap_Project_Directory -ChildPath GitHubActionsWorkflow.pfx + [IO.File]::WriteAllBytes("$certificatePath", $pfx_cert_byte) + + # Create the app package by building and packaging the Windows Application Packaging project + - name: Create the app package + run: msbuild $env:Wap_Project_Path /p:Configuration=$env:Configuration /p:UapAppxPackageBuildMode=$env:Appx_Package_Build_Mode /p:AppxBundle=$env:Appx_Bundle /p:PackageCertificateKeyFile=GitHubActionsWorkflow.pfx /p:PackageCertificatePassword=${{ secrets.Pfx_Key }} + env: + Appx_Bundle: Always + Appx_Bundle_Platforms: x86|x64 + Appx_Package_Build_Mode: StoreUpload + Configuration: ${{ matrix.configuration }} + + # Remove the pfx + - name: Remove the pfx + run: Remove-Item -path $env:Wap_Project_Directory\GitHubActionsWorkflow.pfx + + # Upload the MSIX package: https://github.com/marketplace/actions/upload-a-build-artifact + - name: Upload build artifacts + uses: actions/upload-artifact@v3 + with: + name: MSIX Package + path: ${{ env.Wap_Project_Directory }}\AppPackages From bd38052b29e974539348e00e6ff46b5d10151929 Mon Sep 17 00:00:00 2001 From: JoftheV <162925657+JoftheV@users.noreply.github.com> Date: Fri, 26 Jul 2024 16:31:52 -0500 Subject: [PATCH 2/6] Create build-and-test.yml Updated workflow test --- .github/workflows/build-and-test.yml | 29 ++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 .github/workflows/build-and-test.yml diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml new file mode 100644 index 0000000..32630da --- /dev/null +++ b/.github/workflows/build-and-test.yml @@ -0,0 +1,29 @@ +name: Build and Test + +on: + push: + branches: + - master + pull_request: + branches: + - master + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - name: Checkout code + uses: actions/checkout@v3 + + - name: Set up Node.js + uses: actions/setup-node@v3 + with: + node-version: '16' + + - name: Install dependencies + run: npm install + + - name: Run tests + run: npm test From 13163b42d5f629e8d3f4956bd123ab1efa20e71c Mon Sep 17 00:00:00 2001 From: JoftheV <162925657+JoftheV@users.noreply.github.com> Date: Fri, 26 Jul 2024 18:00:41 -0500 Subject: [PATCH 3/6] Create devcontainer.json --- .devcontainer/devcontainer.json | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .devcontainer/devcontainer.json diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json new file mode 100644 index 0000000..ad93c14 --- /dev/null +++ b/.devcontainer/devcontainer.json @@ -0,0 +1,5 @@ +{ + "image": "mcr.microsoft.com/devcontainers/universal:2", + "features": { + } +} From a451ad773a9b82f868622a8ef0d2ea67ec7e9694 Mon Sep 17 00:00:00 2001 From: JoftheV <162925657+JoftheV@users.noreply.github.com> Date: Fri, 26 Jul 2024 18:14:08 -0500 Subject: [PATCH 4/6] Create enhanced_fix_paths_and_install.sh #!/bin/bash # Default values DEFAULT _PATH="/home/runner/work/OpenAI-API-dotnet/OpenAI-API-dotnet/package.json" FALLBACK _DIR="/home/runner/work/OpenAI-API-dotnet/OpenAI-API-dotnet/" LOG FILE="install _ _log.txt" # Function to log messages log_message() { local message="$1" echo "$(date '+%Y-%m-%d %H:%M:%S') - $message" >> "$LOG FILE" _ } # Function to check if a file exists file _exists() { [ -f "$1" ] } # Function to find package.json in a directory find _package_json() { local search dir="$1" _ find "$search _dir" -name "package.json" -print -quit } # Main script log_message "Starting path correction and installation process..." # Check if package.json exists at the default path if file exists "$DEFAULT _ _PATH"; then log_message "package.json found at $DEFAULT _ PATH." else log_message "package.json not found at $DEFAULT _ PATH." # Attempt to locate package.json in the fallback directory log_message "Searching for package.json in fallback directory $FALLBACK _ PACKAGE JSON _ _ PATH=$(find_package_json "$FALLBACK _DIR") DIR..." if [ -n "$PACKAGE JSON _ _PATH" ]; then log_message "package.json found at $PACKAGE JSON _ _ DEFAULT PATH="$PACKAGE JSON PATH" _ _ _ PATH." else log_message "Error: package.json not found in fallback directory." echo "Error: package.json not found. Check the log file $LOG _ exit 1 FILE for details." fi fi # Navigate to the directory containing package.json WORKING _ DIR=$(dirname "$DEFAULT _PATH") log_message "Changing directory to $WORKING DIR" _ cd "$WORKING _DIR" || { log_message "Failed to change directory to $WORKING _DIR."; echo "Failed to change directory. Check the log file $LOG _FILE for details."; exit 1; } # Run npm install log_message "Running npm install..." npm install >> "$LOG FILE" 2>&1 _ # Check if npm install was successful if [ $? -eq 0 ]; then log_message "npm install completed successfully." else log_message "Error: npm install failed." echo "Error: npm install failed. Check the log file $LOG _ exit 1 FILE for details." fi --- enhanced_fix_paths_and_install.sh | 107 ++++++++++++++++++++++++++++++ 1 file changed, 107 insertions(+) create mode 100644 enhanced_fix_paths_and_install.sh diff --git a/enhanced_fix_paths_and_install.sh b/enhanced_fix_paths_and_install.sh new file mode 100644 index 0000000..10cf70f --- /dev/null +++ b/enhanced_fix_paths_and_install.sh @@ -0,0 +1,107 @@ +#!/bin/bash +# Default values +DEFAULT +_PATH="/home/runner/work/OpenAI-API-dotnet/OpenAI-API-dotnet/package.json" +FALLBACK +_DIR="/home/runner/work/OpenAI-API-dotnet/OpenAI-API-dotnet/" +LOG +FILE="install +_ +_log.txt" +# Function to log messages +log_message() { +local message="$1" +echo "$(date '+%Y-%m-%d %H:%M:%S') - $message" >> "$LOG +FILE" +_ +} +# Function to check if a file exists +file +_exists() { +[ -f "$1" ] +} +# Function to find package.json in a directory +find +_package_json() { +local search +dir="$1" +_ +find "$search +_dir" -name "package.json" -print -quit +} +# Main script +log_message "Starting path correction and installation process..." +# Check if package.json exists at the default path +if file +exists "$DEFAULT +_ +_PATH"; then +log_message "package.json found at $DEFAULT +_ +PATH." +else +log_message "package.json not found at $DEFAULT +_ +PATH." +# Attempt to locate package.json in the fallback directory +log_message "Searching for package.json in fallback directory $FALLBACK +_ +PACKAGE +JSON +_ +_ +PATH=$(find_package_json "$FALLBACK +_DIR") +DIR..." +if [ -n "$PACKAGE +JSON +_ +_PATH" ]; then +log_message "package.json found at $PACKAGE +JSON +_ +_ +DEFAULT +PATH="$PACKAGE +JSON +PATH" +_ +_ +_ +PATH." +else +log_message "Error: package.json not found in fallback directory." +echo "Error: package.json not found. Check the log file $LOG +_ +exit 1 +FILE for details." +fi +fi +# Navigate to the directory containing package.json +WORKING +_ +DIR=$(dirname "$DEFAULT +_PATH") +log_message "Changing directory to $WORKING +DIR" +_ +cd "$WORKING +_DIR" || { log_message "Failed to change directory to $WORKING +_DIR."; echo +"Failed to change directory. Check the log file $LOG +_FILE for details."; exit 1; } +# Run npm install +log_message "Running npm install..." +npm install >> "$LOG +FILE" 2>&1 +_ +# Check if npm install was successful +if [ $? -eq 0 ]; then +log_message "npm install completed successfully." +else +log_message "Error: npm install failed." +echo "Error: npm install failed. Check the log file $LOG +_ +exit 1 +FILE for details." +fi From 4fbaa9c3ac498f2c2718129899947fae07fd4938 Mon Sep 17 00:00:00 2001 From: JoftheV <162925657+JoftheV@users.noreply.github.com> Date: Fri, 26 Jul 2024 19:23:20 -0500 Subject: [PATCH 5/6] Update devcontainer.json Co-authored-by: sourcery-ai[bot] <58596630+sourcery-ai[bot]@users.noreply.github.com> --- .devcontainer/devcontainer.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index ad93c14..290e235 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,5 +1,7 @@ { "image": "mcr.microsoft.com/devcontainers/universal:2", "features": { + "ghcr.io/devcontainers/features/git:1": {} + } } } From 631cfabe7def16836adece71cac0746278ddb84b Mon Sep 17 00:00:00 2001 From: JoftheV <162925657+JoftheV@users.noreply.github.com> Date: Fri, 26 Jul 2024 19:23:35 -0500 Subject: [PATCH 6/6] Update devcontainer.json Co-authored-by: sourcery-ai[bot] <58596630+sourcery-ai[bot]@users.noreply.github.com> --- .devcontainer/devcontainer.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 290e235..7f66c8d 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,5 +1,8 @@ { - "image": "mcr.microsoft.com/devcontainers/universal:2", +{ + "image": "mcr.microsoft.com/devcontainers/universal:2-focal", + "features": { + } "features": { "ghcr.io/devcontainers/features/git:1": {} }