Skip to content

Commit

Permalink
7.0.1
Browse files Browse the repository at this point in the history
Update modules-cicd.yml
Update modules-cicd.yml
Update modules-cicd.yml
Update modules-cicd.yml
added astray project and organized stuff (#3)

Co-authored-by: Joshua Hegedus <jhegedus9@gmail.com>
Create main.yml
added to readme (#4)

Co-authored-by: Joshua Hegedus <jhegedus9@gmail.com>
Update modules-cicd.yml
Asd (#5)

* changed nuget

* asd

---------

Co-authored-by: Joshua Hegedus <jhegedus9@gmail.com>
Fixes yml
Update modules-cicd.yml
Update modules-cicd.yml
Update modules-cicd.yml
Update modules-cicd.yml
added push yml (#6)

Co-authored-by: Joshua Hegedus <jhegedus9@gmail.com>
Release/6.0.1 (#7)

* fixed pusblisj

* asd

* asdsd


small fix


added assembly version


asd


version fix


asd

* fixed yml

---------

Co-authored-by: Joshua Hegedus <jhegedus9@gmail.com>
6.1.1 (#8)

* 6.1.0

* 6.1.1

---------

Co-authored-by: Joshua Hegedus <jhegedus9@gmail.com>
6.1.2 (#9)

* asd

* 6.1.2

---------

Co-authored-by: Joshua Hegedus <jhegedus9@gmail.com>
6.1.3 (#10)

Co-authored-by: Joshua Hegedus <jhegedus9@gmail.com>
some fixes (#11)

Co-authored-by: Joshua Hegedus <jhegedus9@gmail.com>
7.0.0 (#12)

Co-authored-by: Joshua Hegedus <jhegedus9@gmail.com>
7.0.0
  • Loading branch information
Joshua Hegedus committed Apr 12, 2023
1 parent 2e4a903 commit 1e0064c
Show file tree
Hide file tree
Showing 45 changed files with 146 additions and 197 deletions.
111 changes: 20 additions & 91 deletions .github/workflows/modules-cicd.yml
Original file line number Diff line number Diff line change
@@ -1,115 +1,44 @@
# 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

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

branches:
- master
# pull_request:
# branches:
# - master

jobs:

build:

strategy:
matrix:
configuration: [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: 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/setup-msbuild@v1.0.2

# 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 }}
# - name: Setup NuGet
# uses: NuGet/setup-nuget@v1.0.5

# 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)
- name: Restore dependencies
run: nuget restore $env:SOLUTION

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

# 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
- name: Run tests
run: dotnet test $env:SOLUTION /p:Configuration=$env:BUILD_CONFIG --no-restore --no-build --verbosity normal
57 changes: 57 additions & 0 deletions .github/workflows/publish-packages.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
name: CD


on:
workflow_run:
workflows: ["CI"]
branches: [ master ]
types:
- completed

jobs:
build:

env:
BUILD_CONFIG: 'Release'
SOLUTION: './Solution/Modules.sln'

runs-on: windows-latest

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

- 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: Install .NET Core
uses: actions/setup-dotnet@v3
with:
dotnet-version: 5.0.x

- name: Setup MSBuild.exe
uses: microsoft/setup-msbuild@v1.0.2

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

- name: Build
run: dotnet build $env:SOLUTION --configuration $env:BUILD_CONFIG /p:AssemblyVersion=$BUILD_VERSION --no-restore

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

- name: Publish
if: startsWith(github.ref, 'refs/heads/master')
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.

16 changes: 0 additions & 16 deletions Modules/Implementation/StandardIOManager/StandardIOManager.cs

This file was deleted.

This file was deleted.

10 changes: 0 additions & 10 deletions Modules/Infrastructure/IO/IIOManager.cs

This file was deleted.

9 changes: 0 additions & 9 deletions Modules/Infrastructure/IO/IIOManagerFactory.cs

This file was deleted.

2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
# CsTools

[![CI](https://github.com/joshika39/cs-tools/actions/workflows/main.yml/badge.svg)](https://github.com/joshika39/cs-tools/actions/workflows/main.yml)
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
using System;
using System.Reflection;
using Implementation.StandardIOManager;
using Implementation.IO;
using Infrastructure.IO;
using Infrastructure.IOManager;
using Infrastructure.Logger;
using Infrastructure.Navigator;
using Unity;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,11 @@
using System.IO;
using System.Linq;
using System.Text;
using System.Xml.Linq;
using Infrastructure;
using Infrastructure.IO;
using Infrastructure.Logger;

namespace Implementation.StandardIOManager
namespace Implementation.IO
{
internal class Reader : IReader
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
using System;
using Infrastructure;
using Infrastructure.IO;
using Infrastructure.Logger;

namespace Implementation.StandardIOManager
namespace Implementation.IO
{
public class Writer : IWriter
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,9 @@
<TargetFramework>net5.0</TargetFramework>
<PackageId>joshika39-$(AssemblyName)</PackageId>
<Title>Implementation</Title>
<Version>0.0.6</Version>
<Authors>Joshua Hegedus</Authors>
<Company>JHost</Company>
<Description>This is the backend for my base library.</Description>
<AssemblyVersion>0.0.6</AssemblyVersion>
<FileVersion>0.0.6</FileVersion>
<NeutralLanguage>en</NeutralLanguage>
</PropertyGroup>

Expand Down Expand Up @@ -37,4 +34,8 @@
<PackageReference Include="Unity.RegistrationByConvention" Version="5.11.1" />
</ItemGroup>

<ItemGroup>
<Folder Include="IO\Factories\" />
</ItemGroup>

</Project>
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
using System;
using System.Collections.Generic;
using Implementation.StandardIOManager;
using Infrastructure.IOManager;
using Infrastructure.IO;
using Infrastructure.Navigator;

namespace Implementation.Navigator
Expand Down
7 changes: 7 additions & 0 deletions Solution/Infrastructure/IO/Factories/IReaderFactory.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
namespace Infrastructure.IO.Factories
{
public interface IReaderFactory
{

}
}
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
using Infrastructure;

namespace Implementation.StandardIOManager
namespace Infrastructure.IO
{
public interface IWriter
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,9 @@
<TargetFramework>net5.0</TargetFramework>
<PackageId>joshika39-$(AssemblyName)</PackageId>
<Title>Infrastructure</Title>
<Version>0.0.6</Version>
<Authors>Joshua Hegedus</Authors>
<Company>JHost</Company>
<Description>This contains the interfaces for my base library.</Description>
<AssemblyVersion>0.0.6</AssemblyVersion>
<FileVersion>0.0.6</FileVersion>
<NeutralLanguage>en</NeutralLanguage>
</PropertyGroup>

Expand Down
File renamed without changes.
File renamed without changes.

0 comments on commit 1e0064c

Please sign in to comment.