Skip to content

Commit

Permalink
Fixed readline
Browse files Browse the repository at this point in the history
  • Loading branch information
Joshua Hegedus committed Apr 13, 2023
1 parent 2e4a903 commit 98a8017
Show file tree
Hide file tree
Showing 64 changed files with 867 additions and 588 deletions.
50 changes: 50 additions & 0 deletions .github/tags.yml.bak
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
- name: Get Build Version
run: |
Get-ChildItem
Import-Module .\Solution\Tools\GetBuildVersion.psm1
$version_text = $(git log -1 --no-merges --pretty='format:%C(auto)%s')
Write-Host $version_text
$version = GetBuildVersion -VersionString $version_text
echo "BUILD_VERSION=$version" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf-8 -Append
shell: pwsh

# name: "Deploy to NuGet"

# on:
# push:
# tags:
# - 'v*'

# env:
# PROJECT_PATH: 'PasswordBoxMVVM/PasswordBoxMVVM.csproj'
# PACKAGE_OUTPUT_DIRECTORY: ${{ github.workspace }}\output
# NUGET_SOURCE_URL: 'https://api.nuget.org/v3/index.json'

# jobs:
# deploy:
# name: 'Deploy'
# runs-on: 'windows-latest'
# steps:
# - name: 'Checkout'
# uses: actions/checkout@v2

# - name: 'Install dotnet'
# uses: actions/setup-dotnet@v1
# with:
# dotnet-version: '3.1.x'

# - name: 'Restore packages'
# run: dotnet restore ${{ env.PROJECT_PATH }}

# - name: 'Build project'
# run: dotnet build ${{ env.PROJECT_PATH }} --no-restore --configuration Release

# - name: 'Get Version'
# id: version
# uses: battila7/get-version-action@v2

# - name: 'Pack project'
# run: dotnet pack ${{ env.PROJECT_PATH }} --no-restore --no-build --configuration Release --include-symbols -p:PackageVersion=${{ steps.version.outputs.version-without-v }} --output ${{ env.PACKAGE_OUTPUT_DIRECTORY }}

# - name: 'Push package'
# run: dotnet nuget push ${{ env.PACKAGE_OUTPUT_DIRECTORY }}\*.nupkg -k ${{ secrets.NUGET_AUTH_TOKEN }} -s ${{ env.NUGET_SOURCE_URL }}
170 changes: 81 additions & 89 deletions .github/workflows/modules-cicd.yml
Original file line number Diff line number Diff line change
@@ -1,115 +1,107 @@
# 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
name: CI-CD

on:
push:
branches: [ "master" ]
pull_request:
branches: [ "master" ]

tags:
- 'v*'

jobs:

build:
name: 'Build'
env:
BUILD_CONFIG: 'Release'
SOLUTION: 'Solution/Modules.sln'

strategy:
matrix:
configuration: [Release]
runs-on: windows-latest

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
steps:
- name: Checkout
uses: actions/checkout@v3
with:
fetch-depth: 0

- name: Install .NET Core
uses: actions/setup-dotnet@v3
with:
dotnet-version: 5.0.x

- name: Setup MSBuild.exe
uses: microsoft/[email protected]

- name: Restore dependencies
run: nuget restore $env:SOLUTION

- name: Build
run: dotnet build $env:SOLUTION --configuration $env:BUILD_CONFIG --no-restore
test:
name: 'Test'
needs:
- build
env:
Solution_Name: Modules\Modules.sln # Replace with your solution name, i.e. MyWpfApp.sln.
Test_Project_Path: Modules\ImplementationTest\ImplementationTest.csproj # 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.
BUILD_CONFIG: 'Release'
SOLUTION: 'Solution/Modules.sln'

runs-on: windows-latest

steps:
- name: Checkout
uses: actions/checkout@v3
with:
fetch-depth: 0

# Install the .NET Core workload
- name: Install .NET Core
uses: actions/setup-dotnet@v3
with:
dotnet-version: 7.0.5
dotnet-version: 5.0.x

# Add MSBuild to the PATH: https://github.com/microsoft/setup-msbuild
- name: Setup MSBuild.exe
uses: microsoft/[email protected]

# Execute all unit tests in the solution
- name: Execute unit tests
run: dotnet test
- name: Restore dependencies
run: nuget restore $env:SOLUTION

# 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 }}
- name: Build
run: dotnet build $env:SOLUTION --configuration $env:BUILD_CONFIG --no-restore

# 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
- name: Run tests
run: dotnet test $env:SOLUTION /p:Configuration=$env:BUILD_CONFIG --no-restore --no-build --verbosity normal
deploy:
name: 'Deploy'
needs: [build, test]
env:
BUILD_CONFIG: 'Publish'
SOLUTION: './Solution/Modules.sln'

runs-on: windows-latest

steps:
- name: Checkout
uses: actions/checkout@v3
with:
fetch-depth: 0

- name: 'Get Version'
id: get_version
uses: battila7/get-version-action@v2

- name: Install .NET Core
uses: actions/setup-dotnet@v3
with:
name: MSIX Package
path: ${{ env.Wap_Project_Directory }}\AppPackages
dotnet-version: 5.0.x

- name: Setup MSBuild.exe
uses: microsoft/[email protected]

- name: Restore dependencies
run: nuget restore $env:SOLUTION

- name: Build
run: dotnet build $env:SOLUTION --configuration $env:BUILD_CONFIG -p:PackageVersion=${{ steps.get_version.outputs.version-without-v }} --no-restore

- name: Run tests
run: dotnet test $env:SOLUTION /p:Configuration=$env:BUILD_CONFIG --no-restore --no-build --verbosity normal

- name: Publish
run: |
dotnet nuget push **\*.nupkg --source 'https://api.nuget.org/v3/index.json' --api-key ${{secrets.NUGET_API_KEY}}
dotnet nuget push **\*.nupkg --source 'https://nuget.pkg.github.com/joshika39/index.json' --api-key ${{secrets.GIT_API_KEY}}
25 changes: 0 additions & 25 deletions ColorGenerator/ColorGenerator.sln

This file was deleted.

42 changes: 0 additions & 42 deletions Modules/Implementation/Core/Bootsrapper.cs

This file was deleted.

Loading

0 comments on commit 98a8017

Please sign in to comment.