Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions .config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,25 @@
"isRoot": true,
"tools": {
"cake.tool": {
"version": "2.0.0",
"version": "6.1.0",
"commands": [
"dotnet-cake"
]
],
"rollForward": false
},
"gitversion.tool": {
"version": "5.8.1",
"version": "6.6.2",
"commands": [
"dotnet-gitversion"
]
],
"rollForward": false
},
"gitissue.tool": {
"version": "0.1.1-alpha-01",
"commands": [
"gitissue"
]
],
"rollForward": false
}
}
}
12 changes: 6 additions & 6 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,25 +5,25 @@ on:
branches:
- main
pull_request:
branches:
branches:
- '**'

jobs:
build:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [windows-latest, ubuntu-18.04]
os: [windows-latest, ubuntu-latest]
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
clean: true
fetch-depth: 0
- name: Setup
uses: actions/setup-dotnet@v1
- name: Setup .NET
uses: actions/setup-dotnet@v4
with:
dotnet-version: '6.0.x'
dotnet-version: '10.0.x'
- name: Build
uses: cake-build/cake-action@v1
with:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ jobs:
runs-on: windows-latest
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
clean: true
fetch-depth: 0
- name: Setup
uses: actions/setup-dotnet@v1
- name: Setup .NET
uses: actions/setup-dotnet@v4
with:
dotnet-version: '6.0.x'
dotnet-version: '10.0.x'
- name: Push
uses: cake-build/cake-action@v1
with:
Expand Down
5 changes: 5 additions & 0 deletions GitVersion.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
workflow: GitFlow/v1
next-version: 0.2.0
branches:
main:
label: beta
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ git issue help

# Compatibility

This project runs on .NET 5 and is compatible with both Windows and Linux.
This project runs on .NET 10 and is compatible with both Windows and Linux.

## Configuration

Expand Down
4 changes: 2 additions & 2 deletions build.cake
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ Task("Publish")
{
DotNetPublish("src/GitIssue.Tool/GitIssue.Tool.csproj", new DotNetPublishSettings
{
Framework = "net6.0",
Runtime = "win10-x64",
Framework = "net10.0",
Runtime = "win-x64",
PublishReadyToRun = false,
PublishTrimmed = false,
SelfContained = true,
Expand Down
356 changes: 336 additions & 20 deletions src/.editorconfig

Large diffs are not rendered by default.

84 changes: 50 additions & 34 deletions src/Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,43 +1,59 @@
<Project>

<PropertyGroup>
<DirectoryBuildPath>$(MSBuildThisFileDirectory)</DirectoryBuildPath>
<SolutionOutputPath>$(MSBuildThisFileDirectory).output</SolutionOutputPath>
<ProjectOutputPath>$(SolutionOutputPath)\$(MSBuildProjectName)</ProjectOutputPath>
<BaseOutputPath>$(ProjectOutputPath)\bin</BaseOutputPath>
<BaseIntermediateOutputPath>$(ProjectOutputPath)\obj</BaseIntermediateOutputPath>
<PackageOutputPath>$(SolutionOutputPath)\Packages</PackageOutputPath>
</PropertyGroup>
<PropertyGroup>
<DirectoryBuildPath>$(MSBuildThisFileDirectory)</DirectoryBuildPath>
<SolutionOutputPath>$(MSBuildThisFileDirectory).output</SolutionOutputPath>
<ProjectOutputPath>$(SolutionOutputPath)\$(MSBuildProjectName)</ProjectOutputPath>
<BaseOutputPath>$(ProjectOutputPath)\bin</BaseOutputPath>
<BaseIntermediateOutputPath>$(ProjectOutputPath)\obj</BaseIntermediateOutputPath>
<PackageOutputPath>$(SolutionOutputPath)\Packages</PackageOutputPath>
</PropertyGroup>

<PropertyGroup>
<LanguageTargets>$(MSBuildBinPath)\Microsoft.CSharp.targets</LanguageTargets>
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
<NoWarn>1701;1702;1705;NU1603;NU5105</NoWarn>
<DocumentationFile>$(ProjectOutputPath)\$(MSBuildProjectName).xml</DocumentationFile>
<RootNamespace>$(MSBuildProjectName)</RootNamespace>
</PropertyGroup>
<PropertyGroup>
<LanguageTargets>$(MSBuildBinPath)\Microsoft.CSharp.targets</LanguageTargets>
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
<NoWarn>1701;1702;1705;NU1603;NU5105</NoWarn>
<DocumentationFile>$(ProjectOutputPath)\$(MSBuildProjectName).xml</DocumentationFile>
<RootNamespace>$(MSBuildProjectName)</RootNamespace>
</PropertyGroup>

<PropertyGroup>
<Description>An 'in-source' issue management system built on GIT.</Description>
<ProjectUrl>https://github.com/lennoncork/GitIssue</ProjectUrl>
<License>MIT</License>
<PackageReadmeFile>README.md</PackageReadmeFile>
<RepositoryType>GIT</RepositoryType>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
</PropertyGroup>
<PropertyGroup>
<Description>An 'in-source' issue management system built on GIT.</Description>
<ProjectUrl>https://github.com/lennoncork/GitIssue</ProjectUrl>
<License>MIT</License>
<PackageReadmeFile>README.md</PackageReadmeFile>
<RepositoryType>GIT</RepositoryType>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
</PropertyGroup>

<ItemGroup>
<None Include="..\..\LICENSE.md" Link="Properties\LICENSE.md" Pack="true" PackagePath="\"/>
<None Include="..\..\README.md" Link="Properties\README.md" Pack="true" PackagePath="\"/>
</ItemGroup>
<ItemGroup>
<None
Include="..\..\LICENSE.md"
Link="Properties\LICENSE.md"
Pack="true"
PackagePath="\" />
<None
Include="..\..\README.md"
Link="Properties\README.md"
Pack="true"
PackagePath="\" />
</ItemGroup>

<PropertyGroup>
<SolutionDir Condition="'$(SolutionDir)' == ''">$(DirectoryBuildPath)</SolutionDir>
<OutputDir Condition="'$(OutputDir)' == ''">$(BaseOutputPath)\$(Configuration)</OutputDir>
</PropertyGroup>
<PropertyGroup>
<SolutionDir
Condition="'$(SolutionDir)' == ''">
$(DirectoryBuildPath)
</SolutionDir>
<OutputDir
Condition="'$(OutputDir)' == ''">
$(BaseOutputPath)\$(Configuration)
</OutputDir>
</PropertyGroup>

<ItemGroup>
<None Include="$(MSBuildThisFileFullPath)" Link="Properties\$(MSBuildThisFile)" />
</ItemGroup>
<ItemGroup>
<None
Include="$(MSBuildThisFileFullPath)"
Link="Properties\$(MSBuildThisFile)" />
</ItemGroup>

</Project>
8 changes: 5 additions & 3 deletions src/Directory.Build.targets
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
<Project>

<ItemGroup>
<None Include="$(MSBuildThisFileFullPath)" Link="Properties\$(MSBuildThisFile)" />
</ItemGroup>
<ItemGroup>
<None
Include="$(MSBuildThisFileFullPath)"
Link="Properties\$(MSBuildThisFile)" />
</ItemGroup>

</Project>
11 changes: 6 additions & 5 deletions src/GitIssue.Tests/Extensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,21 @@ namespace GitIssue.Tests
public static class Extensions
{
/// <summary>
/// Asserts if the result wasn't successful, otherwise returns the result
/// Asserts if the result wasn't successful, otherwise returns the result
/// </summary>
/// <typeparam name="T"></typeparam>
/// <param name="result"></param>
/// <returns></returns>
public static async Task<T> AssertIfNotSuccess<T>(this Task<SafeResult<T>> result)
{
var safe = await result;
if (safe.IsSuccess == false && safe.Exception != null)
SafeResult<T> safe = await result;
if (!safe.IsSuccess && (safe.Exception != null))
{
TestContext.Out.Write(safe.Exception);
}
Assert.That(safe.IsSuccess, Is.True, $"SafeResult was not successful, {safe.Exception?.Message}", safe);

Assert.That(safe.IsSuccess, Is.True, $"SafeResult was not successful, {safe.Exception?.Message}");
return safe.Result;
}
}
}
}
1 change: 0 additions & 1 deletion src/GitIssue.Tests/Formatting/SimpleFormatterTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,5 @@ namespace GitIssue.Tests.Formatting
[TestFixture]
public partial class SimpleFormatterTests : TestsBase
{

}
}
7 changes: 4 additions & 3 deletions src/GitIssue.Tests/Formatting/SimpleFormatterTests_Format.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using GitIssue.Formatters;
using GitIssue.Issues;
using NUnit.Framework;

namespace GitIssue.Tests.Formatting
Expand All @@ -12,9 +13,9 @@ public class Format : SimpleFormatterTests
[Test]
public void FormatsIssue()
{
var issue = Moqs.CreateIssue(nameof(FormatsIssue));
var output = issue.Format();
var expected = $"{issue.Key}: {issue.Title}";
IReadOnlyIssue issue = Moqs.CreateIssue(nameof(Format.FormatsIssue));
string output = issue.Format();
string expected = $"{issue.Key}: {issue.Title}";
Assert.That(output, Is.EqualTo(expected));
}
}
Expand Down
16 changes: 8 additions & 8 deletions src/GitIssue.Tests/GitIssue.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0</TargetFrameworks>
<TargetFramework>net10.0</TargetFramework>
<Nullable>enable</Nullable>
<LangVersion>latest</LangVersion>
<DocumentationFile></DocumentationFile>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Autofac" Version="6.3.0" />
<PackageReference Include="Autofac" Version="9.1.0" />
<PackageReference Include="GitTools.Testing" Version="1.2.0" />
<PackageReference Include="LibGit2Sharp" Version="0.26.2" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
<PackageReference Include="Moq" Version="4.16.1" />
<PackageReference Include="NUnit" Version="3.13.2" />
<PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
<PackageReference Include="System.Linq.Async" Version="5.1.0" />
<PackageReference Include="LibGit2Sharp" Version="0.31.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.3.0" />
<PackageReference Include="Moq" Version="4.20.72" />
<PackageReference Include="NUnit" Version="4.5.1" />
<PackageReference Include="NUnit3TestAdapter" Version="6.1.0" />
<PackageReference Include="System.Linq.Async" Version="7.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down
Loading
Loading