Skip to content

Commit 32e589d

Browse files
authored
Merge pull request #5 from CodeShayk/release/2.0.1
Release v2.0.1
2 parents 8f9eddb + d594915 commit 32e589d

39 files changed

+211
-83
lines changed

.github/workflows/Master-CodeQL.yml

Lines changed: 56 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -7,70 +7,96 @@
77
# ******** NOTE ********
88
# We have attempted to detect the languages in your repository. Please check
99
# the `language` matrix defined below to confirm you have the correct set of
10-
# supported CodeQL languages.
10+
# supported CodeQL languages.
1111
#
1212
name: "master-codeql"
1313

1414
on:
1515
push:
16-
pull_request:
17-
types: [opened, reopened, edited, synchronize]
16+
branches: [ "master" ]
1817
paths-ignore:
1918
- "**/*.md"
2019
- "**/*.gitignore"
21-
- "**/*.gitattributes"
20+
- "**/*.gitattributes"
2221
schedule:
23-
- cron: '35 15 * * 2'
22+
- cron: '42 7 * * 5'
2423

2524
jobs:
2625
analyze:
27-
name: Analyze
28-
runs-on: ubuntu-latest
26+
name: Analyze (${{ matrix.language }})
27+
# Runner size impacts CodeQL analysis time. To learn more, please see:
28+
# - https://gh.io/recommended-hardware-resources-for-running-codeql
29+
# - https://gh.io/supported-runners-and-hardware-resources
30+
# - https://gh.io/using-larger-runners (GitHub.com only)
31+
# Consider using larger runners or machines with greater resources for possible analysis time improvements.
32+
runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }}
2933
permissions:
34+
# required for all workflows
35+
security-events: write
36+
37+
# required to fetch internal or private CodeQL packs
38+
packages: read
39+
40+
# only required for workflows in private repositories
3041
actions: read
3142
contents: read
32-
security-events: write
3343

3444
strategy:
3545
fail-fast: false
3646
matrix:
37-
language: [ 'csharp' ]
38-
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
39-
# Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
40-
47+
include:
48+
- language: actions
49+
build-mode: none
50+
- language: csharp
51+
build-mode: none
52+
# CodeQL supports the following values keywords for 'language': 'actions', 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'swift'
53+
# Use `c-cpp` to analyze code written in C, C++ or both
54+
# Use 'java-kotlin' to analyze code written in Java, Kotlin or both
55+
# Use 'javascript-typescript' to analyze code written in JavaScript, TypeScript or both
56+
# To learn more about changing the languages that are analyzed or customizing the build mode for your analysis,
57+
# see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/customizing-your-advanced-setup-for-code-scanning.
58+
# If you are analyzing a compiled language, you can modify the 'build-mode' for that language to customize how
59+
# your codebase is analyzed, see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages
4160
steps:
4261
- name: Checkout repository
43-
uses: actions/checkout@v3
62+
uses: actions/checkout@v4
63+
64+
# Add any setup steps before running the `github/codeql-action/init` action.
65+
# This includes steps like installing compilers or runtimes (`actions/setup-node`
66+
# or others). This is typically only required for manual builds.
67+
# - name: Setup runtime (example)
68+
# uses: actions/setup-example@v1
4469

4570
# Initializes the CodeQL tools for scanning.
4671
- name: Initialize CodeQL
47-
uses: github/codeql-action/init@v2
72+
uses: github/codeql-action/init@v3
4873
with:
4974
languages: ${{ matrix.language }}
75+
build-mode: ${{ matrix.build-mode }}
5076
# If you wish to specify custom queries, you can do so here or in a config file.
5177
# By default, queries listed here will override any specified in a config file.
5278
# Prefix the list here with "+" to use these queries and those in the config file.
5379

54-
# Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
80+
# For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
5581
# queries: security-extended,security-and-quality
5682

57-
58-
# Autobuild attempts to build any compiled languages (C/C++, C#, Go, or Java).
59-
# If this step fails, then you should remove it and run the build manually (see below)
60-
- name: Autobuild
61-
uses: github/codeql-action/autobuild@v2
62-
83+
# If the analyze step fails for one of the languages you are analyzing with
84+
# "We were unable to automatically build your code", modify the matrix above
85+
# to set the build mode to "manual" for that language. Then modify this step
86+
# to build your code.
6387
# ℹ️ Command-line programs to run using the OS shell.
6488
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
65-
66-
# If the Autobuild fails above, remove it and uncomment the following three lines.
67-
# modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
68-
69-
# - run: |
70-
# echo "Run, Build Application using script"
71-
# ./location_of_script_within_repo/buildscript.sh
89+
- if: matrix.build-mode == 'manual'
90+
shell: bash
91+
run: |
92+
echo 'If you are using a "manual" build mode for one or more of the' \
93+
'languages you are analyzing, replace this with the commands to build' \
94+
'your code, for example:'
95+
echo ' make bootstrap'
96+
echo ' make release'
97+
exit 1
7298
7399
- name: Perform CodeQL Analysis
74-
uses: github/codeql-action/analyze@v2
100+
uses: github/codeql-action/analyze@v3
75101
with:
76-
category: "/language:${{matrix.language}}"
102+
category: "/language:${{matrix.language}}"

.github/workflows/PullRequest-CI.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
github-token: '${{ secrets.GH_Packages }}'
1414
steps:
1515
- name: Step-01 Checkout code
16-
uses: actions/checkout@v3
16+
uses: actions/checkout@v4
1717
with:
1818
fetch-depth: 0
1919
- name: Step-02 Lint Code Base
@@ -39,7 +39,7 @@ jobs:
3939
versionSpec: 5.x
4040

4141
- name: Step-02 Check out Code
42-
uses: actions/checkout@v2
42+
uses: actions/checkout@v4
4343
with:
4444
fetch-depth: 0
4545

@@ -73,7 +73,7 @@ jobs:
7373
working-directory: '${{ env.working-directory }}'
7474

7575
- name: Step-08 Upload Build Artifacts
76-
uses: actions/upload-artifact@v3
76+
uses: actions/upload-artifact@v4
7777
with:
7878
name: build-artifact
7979
path: ${{env.working-directory}}
@@ -90,7 +90,7 @@ jobs:
9090
working-directory: /home/runner/work/ApiAggregator/ApiAggregator
9191
steps:
9292
- name: Step-01 Retrieve Build Artifacts
93-
uses: actions/download-artifact@v3
93+
uses: actions/download-artifact@v4
9494
with:
9595
name: build-artifact
9696
path: ${{env.working-directory}}
@@ -111,7 +111,7 @@ jobs:
111111
working-directory: /home/runner/work/ApiAggregator/ApiAggregator
112112
steps:
113113
- name: Step-01 Retrieve Build Artifacts
114-
uses: actions/download-artifact@v3
114+
uses: actions/download-artifact@v4
115115
with:
116116
name: build-artifact
117117
path: ${{env.working-directory}}

.github/workflows/PullRequest-CodeQL.yml

Lines changed: 53 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -18,59 +18,86 @@ on:
1818
paths-ignore:
1919
- "**/*.md"
2020
- "**/*.gitignore"
21-
- "**/*.gitattributes"
21+
- "**/*.gitattributes"
2222
schedule:
2323
- cron: '35 15 * * 2'
2424

2525
jobs:
2626
analyze:
27-
name: Analyze
28-
runs-on: ubuntu-latest
27+
name: Analyze (${{ matrix.language }})
28+
# Runner size impacts CodeQL analysis time. To learn more, please see:
29+
# - https://gh.io/recommended-hardware-resources-for-running-codeql
30+
# - https://gh.io/supported-runners-and-hardware-resources
31+
# - https://gh.io/using-larger-runners (GitHub.com only)
32+
# Consider using larger runners or machines with greater resources for possible analysis time improvements.
33+
runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }}
2934
permissions:
35+
# required for all workflows
36+
security-events: write
37+
38+
# required to fetch internal or private CodeQL packs
39+
packages: read
40+
41+
# only required for workflows in private repositories
3042
actions: read
3143
contents: read
32-
security-events: write
3344

3445
strategy:
3546
fail-fast: false
3647
matrix:
37-
language: [ 'csharp' ]
38-
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
39-
# Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
40-
48+
include:
49+
- language: actions
50+
build-mode: none
51+
- language: csharp
52+
build-mode: none
53+
# CodeQL supports the following values keywords for 'language': 'actions', 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'swift'
54+
# Use `c-cpp` to analyze code written in C, C++ or both
55+
# Use 'java-kotlin' to analyze code written in Java, Kotlin or both
56+
# Use 'javascript-typescript' to analyze code written in JavaScript, TypeScript or both
57+
# To learn more about changing the languages that are analyzed or customizing the build mode for your analysis,
58+
# see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/customizing-your-advanced-setup-for-code-scanning.
59+
# If you are analyzing a compiled language, you can modify the 'build-mode' for that language to customize how
60+
# your codebase is analyzed, see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages
4161
steps:
4262
- name: Checkout repository
43-
uses: actions/checkout@v3
63+
uses: actions/checkout@v4
64+
65+
# Add any setup steps before running the `github/codeql-action/init` action.
66+
# This includes steps like installing compilers or runtimes (`actions/setup-node`
67+
# or others). This is typically only required for manual builds.
68+
# - name: Setup runtime (example)
69+
# uses: actions/setup-example@v1
4470

4571
# Initializes the CodeQL tools for scanning.
4672
- name: Initialize CodeQL
47-
uses: github/codeql-action/init@v2
73+
uses: github/codeql-action/init@v3
4874
with:
4975
languages: ${{ matrix.language }}
76+
build-mode: ${{ matrix.build-mode }}
5077
# If you wish to specify custom queries, you can do so here or in a config file.
5178
# By default, queries listed here will override any specified in a config file.
5279
# Prefix the list here with "+" to use these queries and those in the config file.
5380

54-
# Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
81+
# For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
5582
# queries: security-extended,security-and-quality
5683

57-
58-
# Autobuild attempts to build any compiled languages (C/C++, C#, Go, or Java).
59-
# If this step fails, then you should remove it and run the build manually (see below)
60-
- name: Autobuild
61-
uses: github/codeql-action/autobuild@v2
62-
84+
# If the analyze step fails for one of the languages you are analyzing with
85+
# "We were unable to automatically build your code", modify the matrix above
86+
# to set the build mode to "manual" for that language. Then modify this step
87+
# to build your code.
6388
# ℹ️ Command-line programs to run using the OS shell.
6489
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
65-
66-
# If the Autobuild fails above, remove it and uncomment the following three lines.
67-
# modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
68-
69-
# - run: |
70-
# echo "Run, Build Application using script"
71-
# ./location_of_script_within_repo/buildscript.sh
90+
- if: matrix.build-mode == 'manual'
91+
shell: bash
92+
run: |
93+
echo 'If you are using a "manual" build mode for one or more of the' \
94+
'languages you are analyzing, replace this with the commands to build' \
95+
'your code, for example:'
96+
echo ' make bootstrap'
97+
echo ' make release'
98+
exit 1
7299
73100
- name: Perform CodeQL Analysis
74-
uses: github/codeql-action/analyze@v2
101+
uses: github/codeql-action/analyze@v3
75102
with:
76-
category: "/language:${{matrix.language}}"
103+
category: "/language:${{matrix.language}}"

GitVersion.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
next-version: 2.0.0
1+
next-version: 2.0.1
22
tag-prefix: '[vV]'
33
mode: ContinuousDeployment
44
branches:

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2024 Code Shayk
3+
Copyright (c) 2025 Code Shayk
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# <img src="https://github.com/CodeShayk/ApiAggregator/blob/master/Images/ninja-icon-16.png" alt="ninja" style="width:30px;"/> ApiAggregator v2.0.0
1+
# <img src="https://github.com/CodeShayk/ApiAggregator/blob/master/Images/ninja-icon-16.png" alt="ninja" style="width:30px;"/> ApiAggregator v2.0.1
22
[![NuGet version](https://badge.fury.io/nu/ApiAggregator.svg)](https://badge.fury.io/nu/ApiAggregator) [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://github.com/CodeShayk/ApiAggregator/blob/master/LICENSE.md)
33
[![Master-Build](https://github.com/CodeShayk/ApiAggregator/actions/workflows/Master-Build.yml/badge.svg)](https://github.com/CodeShayk/ApiAggregator/actions/workflows/Master-Build.yml)
44
[![GitHub Release](https://img.shields.io/github/v/release/CodeShayk/ApiAggregator?logo=github&sort=semver)](https://github.com/CodeShayk/ApiAggregator/releases/latest)

src/ApiAggregator/ApiAggregate.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
using System.Collections.Generic;
2+
13
namespace ApiAggregator
24
{
35
/// <summary>

src/ApiAggregator/ApiAggregator.csproj

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net9.0</TargetFramework>
5-
<ImplicitUsings>enable</ImplicitUsings>
6-
<Nullable>enable</Nullable>
4+
<TargetFrameworks>net462; netstandard2.0;netstandard2.1;net5.0; net6.0; net8.0; net9.0</TargetFrameworks>
5+
<ImplicitUsings>disable</ImplicitUsings>
6+
<Nullable>disable</Nullable>
77
<Title>ApiAggregator</Title>
88
<Authors>CodeShayk</Authors>
99
<Company>CodeShayk</Company>
1010
<Description>.Net utility to combine multiple api requests to return a single aggregated response. </Description>
1111
<PackageIcon>ninja-icon-16.png</PackageIcon>
1212
<PackageReadmeFile>README.md</PackageReadmeFile>
1313
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
14-
<Copyright>Copyright (c) 2024 Code Shayk</Copyright>
14+
<Copyright>Copyright (c) 2025 Code Shayk</Copyright>
1515
<RepositoryType></RepositoryType>
1616
<PackageTags>api, aggregator, api-aggregator, utility, api-utility, data-aggregator, api-response, api-response-aggregator</PackageTags>
1717
<IncludeSymbols>True</IncludeSymbols>
@@ -20,9 +20,10 @@
2020
<GenerateDocumentationFile>True</GenerateDocumentationFile>
2121
<PackageProjectUrl>https://github.com/CodeShayk/ApiAggregator/wiki</PackageProjectUrl>
2222
<RepositoryUrl>https://github.com/CodeShayk/ApiAggregator</RepositoryUrl>
23-
<PackageReleaseNotes>v2.0 - Targets .Net9.0
23+
<PackageReleaseNotes>
24+
v2.0.1 - Targets .Net9.0, net5.0, net6.0, net8.0, .Net Standard 2.0, and .Net Framework 4.6.2. <br />
2425
- Includes core functionality for aggregating apis.</PackageReleaseNotes>
25-
<Version>2.0.0</Version>
26+
<Version>2.0.1</Version>
2627
</PropertyGroup>
2728

2829
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
@@ -46,6 +47,7 @@
4647

4748
<ItemGroup>
4849
<PackageReference Include="Microsoft.Extensions.Http" Version="9.0.0" />
50+
<PackageReference Include="System.Text.Json" Version="4.7.2" />
4951
</ItemGroup>
5052

5153
<ItemGroup>

src/ApiAggregator/ApiComparer.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
using System.Collections.Generic;
2+
13
namespace ApiAggregator
24
{
35
internal class ApiComparer : IEqualityComparer<IWebApi>

src/ApiAggregator/ApiList.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
using System.Collections.Generic;
2+
using System.Linq;
3+
14
namespace ApiAggregator
25
{
36
internal class ApiList : IApiList

0 commit comments

Comments
 (0)