Skip to content

Commit

Permalink
Merge pull request #205 from pyrocumulus/develop
Browse files Browse the repository at this point in the history
Release 0.11.3
  • Loading branch information
pyrocumulus authored Sep 12, 2024
2 parents ba9f21a + 74445c4 commit c20fe77
Show file tree
Hide file tree
Showing 12 changed files with 49 additions and 37 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/codecov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Setup .NET Core
uses: actions/setup-dotnet@v3.0.3
uses: actions/setup-dotnet@v4.0.1
with:
dotnet-version: 3.1.100
- name: Test with dotnet
run: dotnet test --configuration Release /p:CollectCoverage=true /p:CoverletOutputFormat=opencover
- name: Code coverage
uses: codecov/codecov-action@v3
uses: codecov/codecov-action@v4

8 changes: 4 additions & 4 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
uses: github/codeql-action/init@v3
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
Expand All @@ -43,7 +43,7 @@ jobs:
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v2
uses: github/codeql-action/autobuild@v3

# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl
Expand All @@ -57,4 +57,4 @@ jobs:
# make release

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
uses: github/codeql-action/analyze@v3
4 changes: 2 additions & 2 deletions .github/workflows/docfx.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Setup .NET Core
uses: actions/setup-dotnet@v3.0.3
uses: actions/setup-dotnet@v4.0.1
with:
dotnet-version: 3.1.100

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: .NET Core
name: .NET build

on:
push:
Expand All @@ -13,11 +13,12 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- name: Setup .NET Core
uses: actions/setup-dotnet@v3.0.3
- uses: actions/checkout@v4
- name: Setup .NET
uses: actions/setup-dotnet@v4.0.1
with:
dotnet-version: 3.1.100
dotnet-version: 8.x
dotnet-quality: 'ga'
- name: Build with dotnet
run: dotnet build --configuration Release
- name: Test with dotnet
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish-nuget.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
name: build, pack & publish
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

# - name: Setup dotnet
# uses: actions/setup-dotnet@v1
Expand All @@ -18,7 +18,7 @@ jobs:
# Publish
- name: publish on version change
id: publish_nuget
uses: alirezanet/publish-nuget@v3.0.5
uses: alirezanet/publish-nuget@v3.1.0
with:
# Filepath of the project to be packaged, relative to root of repository
PROJECT_FILE_PATH: src/PVOutput.Net/PVOutput.Net.csproj
Expand Down
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).

## [0.11.3] - 2024-09-12

### Updated

- Updated `Microsoft.CodeAnalysis.NetAnalyzers` from `v7.0.1` to `v8.0.0`
- Updated `Microsoft.Extensions.DependencyInjection.Abstractions` from `v7.0.0` to `v8.0.1`
- Updated `Microsoft.Extensions.Logging.Abstractions` from `v7.0.0` to `v8.0.1`

## [0.11.2] - 2023-05-04

### Fixed
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ All other copyright for project PVOutput.Net are held by:

The MIT License (MIT)

Copyright (c) [2018 - 2023] Marcel Boersma and contributors.
Copyright (c) [2018 - 2024] Marcel Boersma and contributors.


Permission is hereby granted, free of charge, to any person obtaining a copy of
Expand Down
4 changes: 2 additions & 2 deletions PVOutput.Net.sln
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Project files", "Project files", "{0BCF7233-827B-4A45-8FB8-CDE08CB4B9AE}"
ProjectSection(SolutionItems) = preProject
CHANGELOG.md = CHANGELOG.md
CODE_OF_CONDUCT.md = CODE_OF_CONDUCT.md
codecov.yml = codecov.yml
CODE_OF_CONDUCT.md = CODE_OF_CONDUCT.md
CONTRIBUTING.md = CONTRIBUTING.md
.github\dependabot.yml = .github\dependabot.yml
LICENSE = LICENSE
Expand All @@ -28,8 +28,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Workflows", "Workflows", "{
.github\workflows\codecov.yml = .github\workflows\codecov.yml
.github\workflows\codeql-analysis.yml = .github\workflows\codeql-analysis.yml
.github\workflows\docfx.yml = .github\workflows\docfx.yml
.github\workflows\dotnetcore.yml = .github\workflows\dotnetcore.yml
.github\workflows\publish-nuget.yml = .github\workflows\publish-nuget.yml
.github\workflows\dotnet-build.yml = .github\workflows\dotnet-build.yml
EndProjectSection
EndProject
Global
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
![GitHub last commit (main)](https://img.shields.io/github/last-commit/pyrocumulus/PVOutput.Net/main?label=last%20commit%20%28main%29)
[![NuGet Version](https://img.shields.io/nuget/v/PVOutput.Net.svg?logo=nuget)](https://www.nuget.org/packages/PVOutput.Net/)
[![NuGet Downloads](https://img.shields.io/nuget/dt/PVOutput.Net.svg?logo=nuget)](https://www.nuget.org/packages/PVOutput.Net/)
[![.NET Core](https://img.shields.io/github/workflow/status/pyrocumulus/PVOutput.Net/.NET%20Core/develop)](https://github.com/pyrocumulus/pvoutput.net/actions?query=workflow%3A%22.NET+Core%22)
[![NET Build](https://github.com/pyrocumulus/pvoutput.net/actions/workflows/dotnet-build.yml/badge.svg?branch=develop)](https://github.com/pyrocumulus/pvoutput.net/actions?query=workflow%3A%22.NET+build%22)
[![Code coverage](https://img.shields.io/codecov/c/github/pyrocumulus/PVOutput.Net/develop)](https://codecov.io/gh/pyrocumulus/pvoutput.net)

## Installation
Expand Down
10 changes: 5 additions & 5 deletions src/PVOutput.Net/PVOutput.Net.csproj
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<LangVersion>7.3</LangVersion>
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
<Authors>Marcel Boersma</Authors>
<Version>0.11.2</Version>
<Version>0.11.3</Version>
<Copyright></Copyright>
<PackageLicenseFile>LICENSE</PackageLicenseFile>
<PackageProjectUrl>https://pyrocumulus.github.io/pvoutput.net/</PackageProjectUrl>
Expand Down Expand Up @@ -45,12 +45,12 @@ https://github.com/pyrocumulus/pvoutput.net/blob/main/CHANGELOG.md</PackageRelea

<ItemGroup>
<PackageReference Include="Dawn.Guard" Version="1.12.0" />
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="7.0.1">
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.1" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
<PackageReference Include="System.Runtime" Version="4.3.1" />
<PackageReference Include="Tavis.UriTemplates" Version="2.0.0" />
</ItemGroup>
Expand Down
21 changes: 12 additions & 9 deletions tests/PVOutput.Net.Tests/PVOutput.Net.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,24 +1,27 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<OutputPath>..\..\artifacts\</OutputPath>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="coverlet.msbuild" Version="3.2.0">
<PackageReference Include="coverlet.msbuild" Version="6.0.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="NSubstitute" Version="5.0.0" />
<PackageReference Include="NUnit" Version="3.13.3" />
<PackageReference Include="NUnit.Analyzers" Version="3.6.1" />
<PackageReference Include="RichardSzalay.MockHttp" Version="6.0.0" />
<PackageReference Include="NUnit3TestAdapter" Version="4.4.2">
<PackageReference Include="NSubstitute" Version="5.1.0" />
<PackageReference Include="NUnit" Version="4.2.2" />
<PackageReference Include="NUnit.Analyzers" Version="4.3.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="RichardSzalay.MockHttp" Version="7.0.0" />
<PackageReference Include="NUnit3TestAdapter" Version="4.6.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\PVOutput.Net\PVOutput.Net.csproj" />
Expand Down
6 changes: 3 additions & 3 deletions tests/PVOutput.Net.Tests/packages.config
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="NUnit" version="3.13.3" targetFramework="net471" />
<package id="RichardSzalay.MockHttp" version="6.0.0" targetFramework="net471" />
<package id="NUnit" version="4.0.1" targetFramework="net8" />
<package id="RichardSzalay.MockHttp" version="7.0.0" targetFramework="net471" />
<package id="Tavis.UriTemplates" version="2.0.0" targetFramework="net471" />
</packages>

0 comments on commit c20fe77

Please sign in to comment.