Skip to content

Commit

Permalink
Merge pull request #5 from IowaComputerGurus/feature/net6
Browse files Browse the repository at this point in the history
Updated to .NET 6
  • Loading branch information
mitchelsellers authored Dec 7, 2021
2 parents edf4ec3 + 15bba70 commit 55c3ad7
Show file tree
Hide file tree
Showing 9 changed files with 125 additions and 15 deletions.
2 changes: 1 addition & 1 deletion .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# These are supported funding model platforms

github: mitchelsellers
github: mitchelsellers
38 changes: 38 additions & 0 deletions .github/workflows/ci-build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
name: CI Build

on:
push:
branches: [ develop ]
pull_request:
branches: [ develop ]
workflow_dispatch:

jobs:
build:
runs-on: ubuntu-latest
name: Validate Build
env:
solution-path: './src/NetCoreUtilities.UnitTesting.sln'
steps:
- uses: actions/checkout@v2
with:
fetch-depth: 0

- name: Ensure .NET Installed
uses: actions/setup-dotnet@v1
with:
dotnet-version: 6.0.x

- name: Install GitVersion
run: dotnet tool install --global GitVersion.Tool

- name: Determine Version
id: gitversion
uses: gittools/actions/gitversion/[email protected]
with:
useConfigFile: true

- name: Restore Packages
run: dotnet restore "${{ env.solution-path }}"
- name: Build
run: dotnet build "${{ env.solution-path }}" --no-restore --configuration Release -p:version=${{ steps.gitversion.outputs.majorMinorPatch }}
40 changes: 40 additions & 0 deletions .github/workflows/release-build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
name: Release Build

on:
push:
tags:
- 'v*'

jobs:
build:
runs-on: ubuntu-latest
name: Build & Publish to NuGet
environment: nuget
env:
solution-path: './src/NetCoreUtilities.UnitTesting.sln'
steps:
- uses: actions/checkout@v2
with:
fetch-depth: 0

- name: Ensure .NET Installed
uses: actions/setup-dotnet@v1
with:
dotnet-version: 6.0.x

- name: Install GitVersion
run: dotnet tool install --global GitVersion.Tool

- name: Determine Version
id: gitversion
uses: gittools/actions/gitversion/[email protected]
with:
useConfigFile: true

- name: Restore Packages
run: dotnet restore "${{ env.solution-path }}"
- name: Build
run: dotnet build "${{ env.solution-path }}" --no-restore --configuration Release -p:version=${{ steps.gitversion.outputs.majorMinorPatch }}

- name: Publish
run: nuget push **\*.nupkg -Source 'https://api.nuget.org/v3/index.json' -ApiKey ${{secrets.ICG_NUGET_API_KEY}}
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ We want to welcome contributions from all interested parties to help continue to

## Branching Strategy

We are using a simplified GitFlow structure for management of contributions. All Pull Requests should be submitted to the Development branch, and once we are ready to create a production release the organizers will merge development into master for the release.
We are using a simplified GitFlow structure for management of contributions. All Pull Requests should be submitted to the `develop` branch, and once we are ready to create a production release the organizers will tag for release

## Automated Build Verifications

Expand Down
19 changes: 19 additions & 0 deletions GitVersion.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
mode: ContinuousDeployment
next-version: 5.1.4
branches:
develop:
regex: develop
tag: 'alpha'
increment: Patch
source-branches: []
pull-request:
regex: (pull|pull\-requests|pr)[/-]
tag: 'pr'
tag-number-pattern: '[/-](?<number>\d+)[-/]'
increment: Patch
prevent-increment-of-merged-branch-version: false
is-release-branch: false
source-branches: []
ignore:
sha: []
merge-message-formats: {}
9 changes: 4 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# netcore.utilities.unittesting ![](https://img.shields.io/github/license/iowacomputergurus/netcore.utilities.unittesting.svg)
| Master | Develop |
| --- | --- |
| ![Master Branch Status](https://iowacomputergurus.visualstudio.com/ICG%20Open%20Source/_apis/build/status/NetCore%20Utilities%20UnitTesting?branchName=master) | ![Develop Branch Status](https://iowacomputergurus.visualstudio.com/ICG%20Open%20Source/_apis/build/status/NetCore%20Utilities%20UnitTesting?branchName=develop) |

![Build Status](https://github.com/IowaComputerGurus/netcore.utilities.unittesting/actions/workflows/ci-build.yml/badge.svg)

## NuGet Package Information
ICG.NetCore.Utilities.UnitTesting | ![](https://img.shields.io/nuget/v/icg.netcore.utilities.unittesting.svg) ![](https://img.shields.io/nuget/dt/icg.netcore.utilities.unittesting.svg)|
Expand All @@ -14,14 +13,14 @@ This library provides helpful items to speed the development of unit tests acros

Install from NuGet

```
``` powershell
Install-Package ICG.NetCore.Utilities.UnitTesting
```
### Register Dependencies (If using Dependency Injection)

Inside of of your project's Startus.cs within the RegisterServices method add this line of code.

```
``` csharp
services.UseIcgUnitTestUtilities();
```

Expand Down
Binary file removed icgAppIcon.png
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<Version>0.0.0</Version>
</PropertyGroup>
<PropertyGroup>
<PackageId>ICG.NetCore.Utilities.UnitTesting</PackageId>
<Title>NetCore Utilities UnitTesting</Title>
Expand All @@ -13,16 +10,33 @@
<RepositoryUrl>https://github.com/IowaComputerGurus/netcore.utilities.unittesting</RepositoryUrl>
<Authors>MitchelSellers;IowaComputerGurus</Authors>
<Owners>IowaComputerGurus</Owners>
<PackageIconUrl>https://raw.githubusercontent.com/IowaComputerGurus/netcore.utilities.unittesting/master/icgAppIcon.png</PackageIconUrl>
<PackageIcon>icgAppIcon.png</PackageIcon>
<IsPackable>True</IsPackable>
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<IncludeSymbols>true</IncludeSymbols>
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
<EmbedUntrackedSources>true</EmbedUntrackedSources>
</PropertyGroup>
<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<RootNamespace>ICG.NetCore.Utilities.UnitTesting</RootNamespace>
<IsPackable>true</IsPackable>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
</PropertyGroup>
<PropertyGroup Condition="'$GITHUB_ACTIONS)' == 'true'">
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
</PropertyGroup>

<ItemGroup>
<None Include="icgAppIcon.png" Pack="true" PackagePath="\" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="5.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="6.0.0" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Xunit" Version="2.4.1" />
</ItemGroup>

Expand Down
Binary file added src/NetCore.Utilities.UnitTesting/icgAppIcon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 55c3ad7

Please sign in to comment.